Commit graph

574 commits

Author SHA1 Message Date
Jaime van Kessel
9e5b72c5b6 Merge branch 'fix_unnecessary_imports' of https://github.com/fieldOfView/Cura 2018-10-08 16:41:29 +02:00
Ghostkeeper
314b966cc9
Improvements to translated strings
These strings were recently found to have been confusing to the translators. Improvements are:
- Pulling the (untranslated) error message out of the message sentence. We really want the error message to be at the end so we'll force the translators to translate it as a prefix.
- Remove extra spaces at the end.
- Remove Python logic from within the i18nc call, since gettext doesn't understand that.

Contributes to issue CURA-5741.
2018-10-08 15:03:21 +02:00
fieldOfView
9ac744b9ba Remove unnecessary import and declaration of i18n in plugins 2018-10-03 22:00:24 +02:00
Diego Prado Gesto
c0c66649b8 Merge branch '3.5' 2018-10-02 20:27:18 +02:00
Jaime van Kessel
c15f8aa693 Move printer type checking to where it belongs; inside the UM3 plugin. 2018-09-27 15:54:23 +02:00
Simon Edwards
e99b376374 Merge remote-tracking branch 'origin/3.5' into cura_connect_improvements_3.5 2018-09-25 16:59:33 +02:00
Ghostkeeper
3a096cdb23
Add confirmation dialogue for deleting jobs
Re-using MessageDialog again.

Contributes to issues CL-1053 and CURA-5729.
2018-09-18 11:42:34 +02:00
Ghostkeeper
83528ffb48
Add confirmation dialogue for sending prints to top of queue
Very simple. Just re-use the MessageDialog component.

Contributes to issues CL-1053 and CURA-5729.
2018-09-18 11:41:51 +02:00
Ghostkeeper
a7a022eca0
Add confirmation dialogue before aborting a print
It's a destructive operation so we should ask first.

Contributes to issue CL-1053 and CURA-5729.
2018-09-18 11:24:30 +02:00
Ian Paschal
942d20a8d8 Monitor Tab - Fix pause button
Contributes to CL-1050
2018-09-13 16:31:07 +02:00
Ian Paschal
f93413d3a3 Monitor Tab - Context menu improvements
Fixed:
- In the Queued jobs area, the context menu doesn't close when clicking on the right half of the card.
- Context menu trigger button should be more in the corner for both the print job tiles and the printer tiles
- Context menu text should not be centered
- Context menu should be closer to the context menu trigger button
- Context menu should be aligned further right in relation to the context menu trigger button
- Context menu options that are not available should not be shown.
- Context button dots should be grey.

Contributes to CL-1050
2018-09-13 14:52:52 +02:00
Ian Paschal
7226bc45b5 Monitor Tab - Queued header is properly aligned
Contributes to CL-1052
2018-09-13 10:35:31 +02:00
Ian Paschal
0b66bf0448 Monitor Tab - Use camera button on camera stream
- Fixes: Video feed close button is always out of sight
- Makes improvement to camera icon

Contributes to CL-1049
2018-09-12 17:07:10 +02:00
Ian Paschal
08d5e48407 Monitor Tab - Create reusable button
Contributes to CL-1049
2018-09-12 16:52:26 +02:00
Ian Paschal
dccc95f817 Monitor Tab - Camera button toggles
Contributes to CL-1049
2018-09-12 16:46:18 +02:00
Ian Paschal
0a01e7c25b Monitor Tab - Improved camera icon
- Fixed: Camera icon is too small, and the icon does not look centred
- Fixed: No hover effect for the camera button

Contributes to CL-1049
2018-09-12 16:31:59 +02:00
Ian Paschal
e51089a880 Mointor Tab - CL-1046 Make fonts bold 2018-09-12 13:03:12 +02:00
Ian Paschal
e7704ede3c Monitor Tab - Fix queue/manage queue alignment
Contributes to CL-1052
2018-09-11 17:01:26 +02:00
Ian Paschal
ac5a038065 Monitor Tab - Fix syntax error
Contributes to CL-1048
2018-09-11 10:27:50 +02:00
Ian Paschal
333cea4e6d Some tweaks were not really improvements
Contributes to CL-1048
2018-09-10 15:06:19 +02:00
Ian Paschal
1c8b086403 Improve inactive coloring
Contributes to CL-1048
2018-09-10 14:35:05 +02:00
Ian Paschal
0d67420601 Monitor Tab - Accordion-style printer blocks
Includes some unsuccessful attempts at scaling the outer-shadow

Contributes to CL-1048
2018-09-10 13:38:26 +02:00
Ian Paschal
0ecac9f01e Merge remote-tracking branch 'origin/master' into cura_connect_improvements 2018-09-10 11:46:44 +02:00
Ian Paschal
90426749a2 Change deactiveStates to inactiveStates
Contributes to CL-1047
2018-09-10 11:35:58 +02:00
Ian Paschal
2bc1e4b397 Fix bug where disovery window does not appear 2018-09-10 09:27:59 +02:00
Ian Paschal
79aeca9663 Monitor Tab - Grey progress bar for pause/abort
Contributes to CL-1047
2018-09-07 16:46:11 +02:00
Ian Paschal
97e8db577a Monitor Tab - Add grey monitor tab text
Contributes to CL-1047
2018-09-07 16:45:30 +02:00
Ian Paschal
90e8c41fa2 Show time remaining instead of "Paused"
Contributes to CL-1047
2018-09-07 16:09:25 +02:00
Ian Paschal
13717d3ce6 Monitor Tab - Fix -1h -1m bug
Contributes to CL-1047
2018-09-07 16:05:24 +02:00
Ian Paschal
28324ff2f6 Monitor Tab - Font improvements
Contributes to CL-1046
2018-09-07 15:28:35 +02:00
Diego Prado Gesto
a9f151670e Remove unused components. They are no longer used. 2018-09-07 14:31:53 +02:00
Ian Paschal
18e0dacda4 Organize files better
First things first... organize!
2018-09-07 14:11:37 +02:00
Ian Paschal
4cc1b6ce02 Add typings and fix code style 2018-09-06 16:57:45 +02:00
Jaime van Kessel
57a7c3bcd2 Decrease margin for "manage queue" label
CL-896
2018-09-05 14:26:11 +02:00
Jaime van Kessel
534e60d8e1 Added pausing text for pausing state
CL-896
2018-09-05 14:22:41 +02:00
Jaime van Kessel
8e66686d6f Change "waiting" lable to "available"
Cl-896
2018-09-05 14:06:18 +02:00
Jaime van Kessel
23cd46824f Ensure that printer icon has disabled color if the printer is disabled
CL-896
2018-09-05 13:52:41 +02:00
Jaime van Kessel
5be65688a0 Change label to action required
In some cases it's not a configuration change that's required, so this is a more correct label

CL-896
2018-09-05 13:48:47 +02:00
Jaime van Kessel
7096c7382b Add width to labels in printcore qml object.
This ensures that the elide works correctly

CL-896
2018-09-05 13:43:24 +02:00
Jaime van Kessel
cd6832544b Fix for compatible_machine_families breaking for older firmwares
Older firmwares didn't have the compatible_machine_families field yet.

Cl-894
2018-09-05 13:17:33 +02:00
Jaime van Kessel
882cc000ac Move to top is now disabled for the first job
CL-896
2018-09-05 13:15:09 +02:00
Jaime van Kessel
1b9deb2790 Add unreachable label if a printer can not be reached inside a cluster
CL-896
2018-09-05 10:25:20 +02:00
Jaime van Kessel
7ad2e67074 Fix margins for active print job name in printer tile for cluster
CL-896
2018-09-05 10:09:44 +02:00
Jaime van Kessel
a0302684d6 Add handling for cluster print jobs that are in error state
CL-896
2018-09-05 10:06:37 +02:00
Jaime van Kessel
be4357c635 Show different state when printer is disabled
CL-896
2018-09-04 13:45:16 +02:00
Jaime van Kessel
132366fa61 Revert "Add enabled state to printer, so that it can be displayed."
This reverts commit dd778f0450.
2018-09-04 13:42:24 +02:00
Jaime van Kessel
dd778f0450 Add enabled state to printer, so that it can be displayed.
This ensures that if a printer is set to "Not available", that the interface can correctly show it

CL-896
2018-09-04 13:27:17 +02:00
Jaime van Kessel
3969463758 Remove the old "not setup as group" notification
CL-896
2018-09-03 11:16:17 +02:00
Jaime van Kessel
b7d7091de8 Add padding around the printer icons
CL-893
2018-09-03 10:26:27 +02:00
Jaime van Kessel
2e5b11af9d Fixed codestyle issue
Switching between codestyles is hard :(
2018-09-03 10:05:20 +02:00