Commit graph

7365 commits

Author SHA1 Message Date
Diego Prado Gesto
23744e42d1 Remove SaveButton file, since it's not used anymore.
Contributes to CURA-5942
2018-11-21 09:15:18 +01:00
ChrisTerBeke
60ed0ddc24
Revert "Revert "Merge branch 'fix-oauth2-client' into CURA-5785-Restyle_stage_menu""
This reverts commit 791929d689.
2018-11-20 23:49:33 +01:00
ChrisTerBeke
791929d689
Revert "Merge branch 'fix-oauth2-client' into CURA-5785-Restyle_stage_menu"
This reverts commit 4caf770a62, reversing
changes made to 0cdcd61ff2.
2018-11-20 23:47:46 +01:00
ChrisTerBeke
4caf770a62
Merge branch 'fix-oauth2-client' into CURA-5785-Restyle_stage_menu
* fix-oauth2-client:
  Switch Ultimaker Account OAuth2 client
  Fix the title's top margin size in the add machine dialog.
2018-11-20 20:48:52 +01:00
Diego Prado Gesto
669648d3e1 Improve the toolbar style by modifying the rectangles and the behavior
to get a rounded rectangle on the right-top and right-bottom.

Contributes to CURA-5962.
2018-11-20 16:28:21 +01:00
Diego Prado Gesto
895590c3d0 Change the size of the progress bar control. Also add the rounded
rectangle.

Contributes to the new Cura UI-Flow.
2018-11-20 14:28:54 +01:00
Diego Prado Gesto
76f2aeb43c Fix the title's top margin size in the add machine dialog. 2018-11-20 11:27:45 +01:00
Diego Prado Gesto
20285f26d6 Merge branch 'ui_rework_4_0' into CURA-5785-Restyle_stage_menu 2018-11-20 11:20:26 +01:00
Diego Prado Gesto
1844a9bed2 Merge branch 'master' into ui_rework_4_0 2018-11-20 11:08:05 +01:00
Jaime van Kessel
10621aacee Merge branch 'CURA-5785-Restyle_stage_menu' of github.com:Ultimaker/Cura into CURA-5785-Restyle_stage_menu 2018-11-19 16:17:07 +01:00
Jaime van Kessel
8683a1e07e Add previewStage to bundled cura package list
CURA-5785
2018-11-19 16:16:41 +01:00
Lipu Fei
b0f3fedc94 Fix import QtQuick versions to suit Qt 5.10
CURA-5785
2018-11-19 13:42:22 +01:00
Dario Minnucci
2f624cc78f Add BIBO2 printer (dual and single extruder settings) 2018-11-19 12:37:57 +01:00
Jaime van Kessel
a490e420f0 Prevent the setting items from being recreated every stage switch
CURA-5785
2018-11-19 11:42:04 +01:00
Ghostkeeper
f10bd28c4a
Improve grammar and do similar fix for extruder end g-code
Contributes to issue CURA-5906.
2018-11-16 17:25:32 +01:00
Jaime van Kessel
52b2f4579a Fix a number of QML warnings
CURA-5785
2018-11-16 16:13:09 +01:00
Jaime van Kessel
7f99ed1af3 ExtruderIcon will now display that it's disabled correctly
CURA-5785
2018-11-16 16:04:11 +01:00
Jaime van Kessel
d661a8e626 Merge branch 'CURA-5785-Restyle_stage_menu' of github.com:Ultimaker/Cura into CURA-5785-Restyle_stage_menu 2018-11-16 15:23:38 +01:00
Jaime van Kessel
42399ecb24 Let headerItem fill entire component if no icon is set
CURA-5785
2018-11-16 15:17:34 +01:00
Jaime van Kessel
b72f1bb314 Add missing screenScaleFactor for implicit sizes
CURA-5785
2018-11-16 15:15:44 +01:00
Ghostkeeper
816d844258
Use textwidth instead of round
CURA-5785

Co-Authored-By: nallath <nallath@gmail.com>
2018-11-16 15:14:08 +01:00
Jaime van Kessel
fe15a0a513 Made width of machineSelector popup depend on size of the element
CURA-5785
2018-11-16 15:09:47 +01:00
Jaime van Kessel
5972bfaf03 Add round to minContentWidth
This prevents text from getting a weird width

CURA-5785
2018-11-16 15:06:21 +01:00
Jaime van Kessel
320efa443e Merge branch 'CURA-5785-Restyle_stage_menu' of github.com:Ultimaker/Cura into CURA-5785-Restyle_stage_menu 2018-11-16 14:58:47 +01:00
Jaime van Kessel
3fd1cc0e8c Ensure that the added labels are also themable
CURA-5785
2018-11-16 14:58:11 +01:00
Ghostkeeper
3ef6d0544a
Fix spelling and indents
Ant-fuckery, as they say in the low lands.

Contributes to issue CURA-5785.
2018-11-16 14:11:23 +01:00
Ghostkeeper
514fc13045
Remove redundant documentation
CURA-5875

Co-Authored-By: nallath <nallath@gmail.com>
2018-11-16 14:04:33 +01:00
Ghostkeeper
81b6f3ab11
Update unclear qml ID's
CURA-5785

Co-Authored-By: nallath <nallath@gmail.com>
2018-11-16 14:03:39 +01:00
Jaime van Kessel
240ac1f06b Clarify some setting descriptions 2018-11-16 13:03:45 +01:00
Ghostkeeper
bee563f01b
Merge branch 'ui_rework_4_0' into CURA-5785-Restyle_stage_menu 2018-11-16 13:02:24 +01:00
Aleksei S
2bf4354fed Removed minimum_value for the setting support_roof_offset and support_bottom_offset
CURA-5880
2018-11-15 15:57:34 +01:00
Ghostkeeper
d732a2f953
Merge branch 'master' into ui_rework_4_0 2018-11-15 15:55:08 +01:00
Jaime van Kessel
6dd6f5ecc7 Made the hardcoded values of ExpandableComponent themable
CURA-5785
2018-11-15 14:11:46 +01:00
Jaime van Kessel
3629e3b604 Added highlight to ExpandableComponent
CURA-5785
2018-11-15 14:04:52 +01:00
Jaime van Kessel
eca9820fc4 Add toggle function to expandable popup
Also ensures that the machineSelector closes the popup on making a choice

CURA-5785
2018-11-15 13:55:33 +01:00
Jaime van Kessel
f0b8c1e611 Fix some minor display issues
CURA-5785
2018-11-15 09:45:46 +01:00
Jaime van Kessel
c08aa2205c Fix enabled checkbox for extruder selection
CURA-5785
2018-11-15 09:37:54 +01:00
Jaime van Kessel
21d7619a45 Added a hover effect to the expandableComponent
CURA-5785
2018-11-14 16:57:05 +01:00
Jaime van Kessel
c27f51d944 Make the view selector also use the expandableComponent
CURA-5785
2018-11-14 16:44:36 +01:00
Jaime van Kessel
429a49aa2e Make the default size of the expandableComponent icon depend on the height of the element
This is a way more sensible default.

CURA-5785
2018-11-14 14:06:55 +01:00
Jaime van Kessel
7ca3490097 Make the collapse arrows consistent with the rest of the UI
CURA-5785
2018-11-14 14:00:19 +01:00
Jaime van Kessel
b589920f53 Move a few hardcoded sizes to the theme
CURA-5785
2018-11-14 13:55:39 +01:00
Jaime van Kessel
878b743232 Add elide to machine selector label.
CURA-5785
2018-11-14 10:39:03 +01:00
Jaime van Kessel
c35b4f1d31 Removed old unusued code
CURA-5785
2018-11-14 10:00:44 +01:00
Jaime van Kessel
fb72f9a059 Fixed size of expandableItem not being the correct width
CURA-5785
2018-11-14 09:59:56 +01:00
Jaime van Kessel
1569fd7396 Merge branch 'ui_rework_4_0' of github.com:Ultimaker/Cura into CURA-5785-Restyle_stage_menu 2018-11-14 09:34:08 +01:00
Remco Burema
13a9bb7eba Remove enables for min. support area in case of TreeSupport. [CURA-5903] 2018-11-13 17:03:27 +01:00
Remco Burema
6307784a79 Fix some English grammar. [CURA-5903] 2018-11-13 16:50:00 +01:00
Ghostkeeper
4b8d20cad7
Correct the link to create a new account
Previously this button just took you to the log-in page.

Fixes issue CURA-5921.
2018-11-13 16:27:19 +01:00
Remco Burema
9181b5a3b9 Merge branch 'feature_minimum_support_area' of https://github.com/DesktopMetal/Cura into DesktopMetal-feature_minimum_support_area 2018-11-13 16:26:36 +01:00