Commit graph

10581 commits

Author SHA1 Message Date
Simon Edwards
5865d52000 CL-474 Fix the image used for the camera icon
Subtask of CL-457 Cura plugin: primary visual improvements
2017-10-01 12:01:08 +02:00
Simon Edwards
553a309d23 CL-473 Print job duration time has the wrong format. Use the Cura format from the Prepare tab.
Subtask of CL-457 Cura plugin: primary visual improvements
2017-09-30 12:59:46 +02:00
Simon Edwards
eb85c28c10 CL-476 "View print jobs" and "View printers" buttons should be blue
Subtask of CL-457 Cura plugin: primary visual improvements
2017-09-30 11:46:55 +02:00
Simon Edwards
cee8a687da Show the printer status as 'printing' in the case that a running print job isn't under control of Cura Connect 2017-09-30 11:06:31 +02:00
Simon Edwards
43a6231131 CL-469 Remove the "Printer Group" text from the sidebar.
Subtask of  CL-457 Cura plugin: primary visual improvements
2017-09-30 11:05:47 +02:00
Simon Edwards
7aa2f5f0b8 Disable the fade on the monitor blue overlay to prevent the annoying "flash of blue" problem
CL-457 CL-468
2017-09-30 10:52:34 +02:00
Simon Edwards
e04a63d337 CL-468 The sidebar in the monitor tab should have a grey background
Subtask of CL-457 Cura plugin: primary visual improvements
2017-09-30 10:48:16 +02:00
Simon Edwards
21af3fb109 Show a notification when a configuration change is needed for your print
CL-271
2017-09-29 17:17:57 +02:00
Diego Prado Gesto
4d9908364a Now empty message in materials and variants doesn't appear - CURA-4377 2017-09-29 16:28:18 +02:00
Jaime van Kessel
437da52f65 Merge branch 'fix_multiple_extruder_issues' of github.com:Ultimaker/Cura into 3.0 2017-09-29 15:17:11 +02:00
Diego Prado Gesto
402617af1e Loading extruder stack files also for single extruder printers - CURA-4379 2017-09-29 15:16:14 +02:00
A.Sasin
0912348cbe Merge branch '3.0' of github.com:Ultimaker/cura into 3.0 2017-09-29 13:53:18 +02:00
A.Sasin
3082038261 Fixed code style and machine default name is retrieved from machine definition
CURA-4345
2017-09-29 13:52:00 +02:00
Jaime van Kessel
0900a0ff07 Merge branch 'fix_multiple_extruder_issues' of github.com:Ultimaker/Cura into fix_multiple_extruder_issues 2017-09-29 13:51:07 +02:00
Jaime van Kessel
6d687d6f06 Re-enable changing of multi-extrusion machines to single extrusion
CURA-4359
2017-09-29 13:50:31 +02:00
jack
08baeabc4f Merge pull request #2509 from Ultimaker/CL-455_cura_connect_pause_abort
CL-455 Implement the print job pause, resume and abort for Cura Connect
2017-09-29 13:47:05 +02:00
Ghostkeeper
89de83254d
Update end g-code for Ultimaker 3
As requested by Coen.

Contributes to issue EM-1859.
2017-09-29 13:38:35 +02:00
Simon Edwards
e868b972b5 Implement the print job pause, resume and abort for Cura Connect
CL-455
2017-09-29 13:07:06 +02:00
Diego Prado Gesto
1d61740d1a Added some comments to the code and minor changes - CURA-4386 CURA-4379 2017-09-29 11:39:52 +02:00
Jack Ha
b7dd756427 CL-506 changed Aborted to Print aborted and added it to all translations on the top 2017-09-29 11:21:15 +02:00
Ghostkeeper
4932cc1e85
Revert string changes that can easily be reverted
These strings can be re-used from other places.

Contributes to issue CL-506.
2017-09-29 11:03:33 +02:00
Diego Prado Gesto
f0e89b7e01 Reverted a previous workaround that fixed errors when selecting material and variants in the application menus - CURA-4386 CURA-4379 2017-09-29 09:40:54 +02:00
Ghostkeeper
dbf13b0d1a
Fix calling loggers
Because UM.Logger is a module, not the Logger class.
2017-09-29 09:14:43 +02:00
Diego Prado Gesto
afb83fac88 Update the active extruder index when the global container changes. This
fixes a problem when Cura starts with a single extruder printer but the
user then choose a multiextruder printer - CURA-4386
Also added a quality definition in UM3E extruder with the ids of the UM3
extruders, so that the profiles for UM3 are also valid for UM3E and viceversa - CURA-4389
All are related issues with profiles and multiextruder printers
2017-09-28 18:02:39 +02:00
fieldOfView
940a8a44c8 Apply screenScaleFactor to Cura Connect UI
Any pixel size specified in QML should not either use UM.Theme.getSize(), or use screenScaleFactor to make sure the pixel size is as intended on OSX, Windows and Linux regardless of display DPI.

Contributes to CURA-4376
2017-09-28 17:36:35 +02:00
Diego Prado Gesto
61e65d5cb0 Fixing code style -
CURA-4386 CURA-4379
2017-09-28 16:14:58 +02:00
Jaime van Kessel
a7d06ff866 Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0 2017-09-28 16:07:23 +02:00
Jaime van Kessel
38a2245d74 XML materials are now added in one batch 2017-09-28 16:07:03 +02:00
ChrisTerBeke
1b8766b953 CURA-4386 CURA-4379 change stack behaviours to fix crashes 2017-09-28 16:00:16 +02:00
Ghostkeeper
92c407580a
Comment out visibility of flow temperature graph
Apparently it's not allowed to be in there. By being commented out I hope that a future developer won't make the same mistake and add it there to be editable in the interface.
2017-09-28 15:33:00 +02:00
jack
585b1dea3a Merge pull request #2508 from Ultimaker/CL-118_config_change
CL-118 Add support and text for disabled printers and print jobs which require config changes.
2017-09-28 15:15:51 +02:00
Mark
4e4e71ad4b Change AGPL to LGPL 2017-09-28 15:04:24 +02:00
Simon Edwards
8658053a3b Improved status messages, and the 'printing' counter in the sidebar.
CL-118
2017-09-28 14:37:38 +02:00
alekseisasin
2a302a3e27 Merge branch '3.0' of github.com:Ultimaker/cura into 3.0 2017-09-28 13:24:13 +02:00
Ghostkeeper
5d4a2ae097
Remove erroneously added CuraEngine
Bad. Bad
2017-09-28 13:23:54 +02:00
alekseisasin
5402092bb4 During adding a new printer the printer name generated from default name and not from custom name (changed by user)
CURA-4345
2017-09-28 13:22:15 +02:00
Diego Prado Gesto
e3edc79a3e modified some code to fix the multiple extrusion issues - CURA-4379 2017-09-28 13:21:03 +02:00
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
Simon Edwards
01ff608a09 Change "Required action" to "Action required"
CL-118
2017-09-28 11:40:48 +02:00
Simon Edwards
4ca8bc5a9e CL-118 Add support and text for disabled printers and print jobs which require config changes. 2017-09-28 11:25:34 +02:00
ChrisTerBeke
07899ba798 Merge branch 'feature_hide_gradual_infill' into 3.0 2017-09-28 09:34:25 +02:00
ChrisTerBeke
bff79c63d5 Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0 2017-09-28 09:21:53 +02:00
ChrisTerBeke
8f4692b3bb Merge branch '3.0' into FieldOfView/fix_quality_disabled_alignment 2017-09-28 09:19:13 +02:00
Ghostkeeper
2884e1e5b5
Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0 2017-09-28 09:17:40 +02:00
ChrisTerBeke
f2e362838e Merge branch 'fix_quality_disabled_alignment' of https://github.com/FieldOfView/Cura into FieldOfView/fix_quality_disabled_alignment 2017-09-28 09:16:52 +02:00
fieldOfView
0b03681890 Hide gradual infill checkbox if the gradual infill steps setting is disabled 2017-09-27 22:28:20 +02:00
Ghostkeeper
fcc914cf0d
Make material colour indication a circle instead of square
The rest of them are circles. This one should be one too.
2017-09-27 17:28:32 +02:00
Ghostkeeper
33fdca4a6b
Fix mistakes in translations from Bothof
What do we pay these guys for?

Contributes to issue CURA-4341.
2017-09-27 17:27:47 +02:00
Ghostkeeper
609187a4ce
Update translations from Bothof
These are the new translations we got from Bothof for German, Spanish, Finnish, French, Italian, Dutch, Turkish and Simplified Chinese.

Contributes to issue CURA-4341.
2017-09-27 17:26:29 +02:00
Diego Prado Gesto
dcf07e4f35 Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0 2017-09-27 17:25:22 +02:00