19026 Commits

Author SHA1 Message Date
Ghostkeeper
c663681e66
Simplify buildplate icon
Removed all unnecessary crap added by Sketch.

Contributes to issue CURA-5876.
2018-12-07 14:39:43 +01:00
Ghostkeeper
8e2c130416
Use default lining style as separator for buildplate
Normal colour, normal thickness.

Contributes to issue CURA-5876.
2018-12-07 14:31:06 +01:00
Ghostkeeper
c44b74454f
Revert "No longer make BuildVolume set max bounds."
This reverts commit 1467e703ae121c3f2fa02ee7258bdeba63f80c5c.
This variable was actually used... In Uranium, by the scale tiny models feature.
2018-12-07 14:22:39 +01:00
Ghostkeeper
43a06fdc3d
Add more margin above printer type labels
A bit of Gestalt.

Contributes to issue CURA-5876.
2018-12-07 13:49:32 +01:00
Diego Prado Gesto
15f81da95b Do not show the layer height in the header panel when the profile is not supported 2018-12-07 13:47:58 +01:00
Ghostkeeper
e74258c26b
Don't show materials if printer has no materials
But if the printer does have other configurations to change, do show a placeholder text to indicate that the configuration can be selected here.
This also simplifies a bit of code where it would need to call an updateEnabled() function, since it turns out that these properties in Cura.MachineManager have proper signals (contrary to what was previously used, the metadata entry stuff).

Contributes to issue UCRA-5876.
2018-12-07 13:40:10 +01:00
alekseisasin
c232107e95
Merge pull request #4942 from Ultimaker/place_print_info_back
Place print info back
2018-12-07 13:39:12 +01:00
Diego Prado Gesto
e93e3f36b0 Merge branch 'place_print_info_back' of github.com:Ultimaker/Cura into place_print_info_back 2018-12-07 13:30:21 +01:00
Diego Prado Gesto
26be65e405 Fix some other merge conflicts
Contributes to CURA-6008.
2018-12-07 13:29:16 +01:00
Daniel Schiavini
5b963de2ea STAR-322: Checking if response changed before updating cluster 2018-12-07 13:19:45 +01:00
Diego Prado Gesto
46fa33fda5 Merge branch 'ui_rework_4_0' into place_print_info_back 2018-12-07 13:19:19 +01:00
Diego Prado Gesto
9c873faace Merge branch 'ui_rework_4_0' into place_print_info_back 2018-12-07 13:11:15 +01:00
Ghostkeeper
2593849798
Merge branch 'ui_rework_4_0' of ssh://github.com/Ultimaker/Cura into ui_rework_4_0 2018-12-07 13:04:13 +01:00
Aleksei S
6a696a57f2 Removed unused property 2018-12-07 13:01:49 +01:00
Ghostkeeper
dfe55b8f23
Fix height of expandable component adapting to contents
Since the children don't adjust their height based on if they are visible (which would cause a binding loop) we just need to adjust the height of the total menu based on which children are visible. Easy enough.

Contributes to issue CURA-5876.
2018-12-07 12:59:51 +01:00
Lipu Fei
1c83a2f227
Merge pull request #4937 from Ultimaker/CURA-5941_restyle_setting_dropdown
Restyle of the print setup panel
2018-12-07 12:39:38 +01:00
Daniel Schiavini
2b8358fda8 STAR-322: Improvements to date calculation and signalling 2018-12-07 12:39:37 +01:00
Diego Prado Gesto
1d33fe081f Clean up the code
Remove all the references to the sidebar and use the term print_setup instead.

Contributes to CURA-5941.
2018-12-07 12:07:41 +01:00
Daniel Schiavini
4f82a2759a STAR-322: Improving configuration models interface 2018-12-07 12:04:02 +01:00
Diego Prado Gesto
898fd25ddb Remove the component IconLabel since we have a similar one in IconWithText
Contributes to CURA-5941.
2018-12-07 11:43:41 +01:00
Diego Prado Gesto
8f0d8c7d25 Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-07 11:28:09 +01:00
Diego Prado Gesto
da052fbe81 Not show a tooltip in the output device selector when the popup shows up 2018-12-07 11:21:25 +01:00
Lipu Fei
677edd51ee Remove unnecessary visibles
CURA-5941

Because the parent Rows already have it set.
2018-12-07 10:55:22 +01:00
Jaime van Kessel
ab8a2a9b2b Merge branch 'ui_rework_4_0' of github.com:Ultimaker/Cura into CURA-6006-login-required 2018-12-07 10:51:48 +01:00
Daniel Schiavini
a1c252d3a2 Revert "Revert "fix merge conflict""
This reverts commit 4bffa6d90f2e6e9784c7e5508b61e00a92ecb74f.
2018-12-07 10:25:46 +01:00
Daniel Schiavini
4bffa6d90f Revert "fix merge conflict"
This reverts commit ec03b012a77a766e45a43a224bbb76cd32d0915a, reversing
changes made to 2af33738d17f95c87dcb8c826b0940576e4359c3.
2018-12-07 10:22:32 +01:00
Jaime van Kessel
eaf413997d Changed the installed button to be a secondary button
CURA-6006
2018-12-07 09:44:09 +01:00
Jaime van Kessel
9eb09132d6 Fix minor layout issue installed page
CURA-6006
2018-12-07 09:38:02 +01:00
Jaime van Kessel
2a0954f246 Gracefully handle the conectionError when logging in 2018-12-07 09:35:53 +01:00
Jaime van Kessel
b33ce7a50f Fix alignment of download grid tile
CURA-6006
2018-12-07 09:35:08 +01:00
Jaime van Kessel
eddf4e7f3d Simplify QML 2018-12-06 19:38:12 +01:00
Jaime van Kessel
d4a255c9e5 Also add the login required label at the installed plugin list
CURA-6006
2018-12-06 17:35:58 +01:00
Jaime van Kessel
2c9c9d8c96 Handle non-happy path for downloading
CURA-6006
2018-12-06 17:23:02 +01:00
ChrisTerBeke
3ebefa4f8a Add more TODO comments to clarify 2018-12-06 16:59:09 +01:00
Jaime van Kessel
717fb260c1 Change toolbox tabs to controls2
CURA-6006
2018-12-06 16:58:40 +01:00
ChrisTerBeke
ec03b012a7 fix merge conflict 2018-12-06 16:39:58 +01:00
Jaime van Kessel
4b8e3c32cb Also show the login required if an update is needed
CURA-6006
2018-12-06 16:37:47 +01:00
Diego Prado Gesto
3b8b70bddf Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-06 16:35:07 +01:00
Marijn Deé
2af33738d1 Don't look at the timer 2018-12-06 16:32:00 +01:00
Ghostkeeper
05b32548f3
Code style: Start comments with a space
Contributes to issue CURA-5876.
2018-12-06 16:27:56 +01:00
Marijn Deé
373c953dbf Showing print queue, works with multiple printers in cluster, Add TODO 2018-12-06 16:25:04 +01:00
Jaime van Kessel
4e2ab163ed Add login fequired link to packages that have the login-required tag
CURA-6006
2018-12-06 16:24:12 +01:00
Ghostkeeper
c39674cd0c
Use upper camel case for enum options
Contributes to issue CURA-5876.
2018-12-06 16:23:24 +01:00
Diego Prado Gesto
9bce373520 Merge branch 'small_ui_fixes' into ui_rework_4_0 2018-12-06 16:08:33 +01:00
Diego Prado Gesto
4b9e6e7708 Add the linear gradient back, that I removed in a previous commit
Contributes to CURA-6010.
2018-12-06 16:06:22 +01:00
alekseisasin
e29baf0cec
Merge pull request #4943 from Ultimaker/small_ui_fixes
Small ui fixes
2018-12-06 15:23:35 +01:00
Diego Prado Gesto
b55ead8c89 Fix typo
Contributes to CURA-6010.
2018-12-06 15:18:32 +01:00
Jaime van Kessel
62c5398933 Change buttons to use either secondary or primary
CURA-6006
2018-12-06 14:58:46 +01:00
Diego Prado Gesto
46c209a993 Add one pixel margin to the view selector. 2018-12-06 14:45:24 +01:00
Jaime van Kessel
a77ad32999 Move all the seperate tiles into loaders instead of the entire page
Otherwise the details selection didn't work anymore and I didn't want to add more hacks.

CURA-6006
2018-12-06 14:35:07 +01:00