50 Commits

Author SHA1 Message Date
Ghostkeeper
cf6cce5df0
Make 'Profile' text larger
As per the design.

Contributes to issue CURA-6025.
2018-12-31 14:00:39 +01:00
Ghostkeeper
4be9fbb75e
Give tick marks a font
Otherwise it uses your system's font, which is not consistent.

Contributes to issue CURA-6025.
2018-12-31 13:57:49 +01:00
Ghostkeeper
44f21b37ac
Make labels on left side of recommended mode larger
Contributes to issue CURA-6025.
2018-12-31 13:49:03 +01:00
Ghostkeeper
c6fb0d70af
Use medium font size for everything in stage menu
Except the material manufacturer, which should remain default.

Contributes to issue CURA-6025.
2018-12-31 13:22:53 +01:00
Lipu Fei
6017c2b4d2 Replace isProfileUserCreated with hasCustomQuality
CURA-6028
2018-12-18 08:56:56 +01:00
Aleksei S
9146a775a4 After resetting the custom settings the quality slider did not update selected value
CURA-6028
2018-12-14 16:17:05 +01:00
Jaime van Kessel
b70a4ae0a2 Merge branch 'CURA-6015_fix_osx_crash' of github.com:Ultimaker/Cura into 4.0 2018-12-14 13:35:37 +01:00
Jaime van Kessel
d379f94775 Make the dark theme a bit more readable 2018-12-14 13:23:28 +01:00
Lipu Fei
cd3a9e02d6 Merge remote-tracking branch 'origin/4.0' into CURA-6015_fix_osx_crash 2018-12-14 11:45:51 +01:00
Jaime van Kessel
15cd2a9269 Changed textColor of recommended infill slider text to be themed.
This is required to make the dark theme work correctly
2018-12-14 11:36:40 +01:00
Jaime van Kessel
c4700b2752 Also update the model if the data changed
CURA-6028
2018-12-13 14:30:00 +01:00
Lipu Fei
620790ae3d Reduce the creations of ExtrudersModels
CURA-6015
2018-12-13 14:12:23 +01:00
Diego Prado Gesto
437ba3848d Fix typo. Missing parenthesis
Contributes to CURA-5941.
2018-12-10 14:26:20 +01:00
Diego Prado Gesto
3f97f83c47 Add a disabled state to the expandable components
In this case, when the component is disabled, there is an optional message that will show. It works for instance when loading a gcode and the print setup panel has to be disabled.

Contributes to CURA-5941.
2018-12-10 14:17:56 +01:00
Diego Prado Gesto
af37f51cf8 Make the expandable content header to be a common header for every expandable component.
Contributes to CURA-5941.
2018-12-10 13:36:06 +01:00
Diego Prado Gesto
dff364ee30 Change the panel to have also rounded rectangle in the top part
Contributes to CURA-5941.
2018-12-10 12:03:29 +01:00
Diego Prado Gesto
12522c9293 Change hover colors of the small buttons.
Contributes to CURA-5941
2018-12-10 11:19:44 +01:00
Ghostkeeper
9dc8450db0
Fix typo 2018-12-07 17:37:10 +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
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
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
Lipu Fei
f7f3c96f81 Fix typo
CURA-5941
2018-12-06 10:53:43 +01:00
Diego Prado Gesto
07d58c3aef Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-05 13:56:21 +01:00
Diego Prado Gesto
0e22f6b672 Fix an issue that caused a non-deterministic segfault
Also add a topMargin only when there are tabs in the custom print setup.

Contributes to CURA-5941.
2018-12-05 13:30:01 +01:00
Diego Prado Gesto
034b1660f7 Adjust sizes in the custom print setup mode
Contributes to CURA-5941.
2018-12-05 13:05:22 +01:00
Diego Prado Gesto
cdb8020029 Add another expandable component
Use one of them if the drop-panel has to act as a Popup and the other if it has to act as a standard component.

Contributes to CURA-5941.
2018-12-05 09:39:04 +01:00
Diego Prado Gesto
47ff95b1f3 Set contentType to the different expandable components.
Also add a color for the active state when the contentType is 'Fixed'.

Contributes to CURA-5941.
2018-12-04 13:53:11 +01:00
Diego Prado Gesto
4dcce7616b Fix some leftover renamings
Contributes to CURA-5941
2018-12-04 13:21:26 +01:00
Diego Prado Gesto
e159cbdb1a Rename all the references from 'popup' to 'content'
Contributes to CURA-5941.
2018-12-04 13:14:12 +01:00
Diego Prado Gesto
692686597c Fix an issues that didn't calculate the correct height of the popup when the custom mode was selected from previous runs.
Contributes to CURA-5941.
2018-12-04 12:07:31 +01:00
Diego Prado Gesto
004405e5f9 Change the colors to match the designs.
Contributes to CURA-5941.
2018-12-03 17:25:07 +01:00
Diego Prado Gesto
d3b5b2717d Add rounded corners to the settings
Contributes to CURA-5941
2018-12-03 15:56:21 +01:00
Diego Prado Gesto
ce6a0676dd Add a rectangle surrounding the settings listview
Contributes to CURA-5941.
2018-12-03 14:43:35 +01:00
Diego Prado Gesto
4c468831f0 Add tabs for select the extruder in the custom print setup.
Align some elements beneath the tabs.

Contributes to CURA-5941.
2018-12-03 13:58:13 +01:00
Diego Prado Gesto
90281c455b Add global profile selector to the custom print setup panel
Also modify some styles to adjust to the designs.

Contributes to CURA-5941.
2018-12-03 09:45:49 +01:00
Diego Prado Gesto
7dc3320b06 Remove all the signal propagation for the tooltip and allow only Cura.qml to handle them
Contributes to CURA-5941.
2018-12-02 20:32:55 +01:00
Diego Prado Gesto
adabb833e0 Add row for the adhesion setting in the recommended mode
Contributes to CURA-5941.
2018-12-02 19:14:34 +01:00
Diego Prado Gesto
1cea36b08a Add the row for the support selection in the recommended mode
Contributes to CURA-5941.
2018-12-02 19:01:54 +01:00
Diego Prado Gesto
1caccfb577 Add a binding to react when the infill density changes in the custom panel
Also make the icon dinamic, that will change when the infill density changes.

Contributes to CURA-5941.
2018-12-02 13:40:41 +01:00
Diego Prado Gesto
4154ec2fe8 Add enable gradual checkbox to the infill panel
Contributes to CURA-5941.
2018-12-02 12:39:52 +01:00
Diego Prado Gesto
1238aa7304 Format the slider for the infill in the recommended mode
Contributes to CURA-5941
2018-12-02 12:03:58 +01:00
Diego Prado Gesto
2c5f5170c2 Add the labels of the layer height to the slider
Contributes to CURA-5941.
2018-11-30 15:38:28 +01:00
Diego Prado Gesto
47b7d7bed8 Make the slider available for clicking
This was accidentally removed in the previous commit.

Contributes to CURA-5941.
2018-11-30 15:17:59 +01:00
Diego Prado Gesto
1fbcff2cb9 Fix the tooltips in the profile selector in the recommended mode
Contributes to CURA-5941.
2018-11-30 15:06:53 +01:00
Diego Prado Gesto
1a778b3078 Fix qualiy slider alignments
Contributes to CURA-5941.
2018-11-30 14:18:07 +01:00
Diego Prado Gesto
17945c6b16 [WIP] Separate components in different files
Contributes to CURA-5941
2018-11-30 11:32:24 +01:00
Diego Prado Gesto
bc8bf87809 Align the buttons at the bottom of the panel
Contributes to CURA-5941.
2018-11-29 15:54:02 +01:00
Diego Prado Gesto
7639983925 Clean the recommended mode print setup
Contributes to CURA-5941
2018-11-29 08:54:04 +01:00
Diego Prado Gesto
990c653af4 Refactor the code a bit more to better align the components in the
recommended mode.

Contributes to CURA-5941.
2018-11-28 17:29:25 +01:00
Diego Prado Gesto
85b34d6005 Refactor the PrintSetupSelector
The file was splitted in several other files to improve readability.
There is a new folder called PrintSetupSelector where all those files
will be.

Contributes to CURA-5941.
2018-11-28 13:07:39 +01:00