3755 Commits

Author SHA1 Message Date
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
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
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
ChrisTerBeke
ec03b012a7 fix merge conflict 2018-12-06 16:39:58 +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
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
Diego Prado Gesto
46c209a993 Add one pixel margin to the view selector. 2018-12-06 14:45:24 +01:00
Aleksei S
3c517d3fcc The top bar background overlaps settings bar 2018-12-06 14:25:18 +01:00
Diego Prado Gesto
05075c44ee Add renderType to some labels in the Configuration panel
Contributes to CURA-5876.
2018-12-06 14:19:34 +01:00
Lipu Fei
85f2a7e8f6 Move visible to Rows for extruder configs
CURA-5941

So the whole row, such as "material", will be shown/hiden based on
whether the machine has materials.
2018-12-06 14:06:18 +01:00
Ghostkeeper
298c68c93b
Disable configuration menu if there are no configurations
This then prevents you from dropping down into an empty menu.

Contributes to issue CURA-5876.
2018-12-06 13:56:06 +01:00
Ghostkeeper
1e69960464
Make it possible to disable ExpandableComponent
It won't show the drop-down icon then, won't do hovers and won't allow you to click on it. This will not remove the contents of the ExpandableComponent menu bar item though, so that has to be done in ConfigurationMenu.qml.

Contributes to issue CURA-5876.
2018-12-06 13:52:57 +01:00
Diego Prado Gesto
4b79770d58 Align the buttons in the output process widget
The menu in the output device selector has now a rounded corner.
2018-12-06 13:42:29 +01:00
Ghostkeeper
f1fec2f280
Theme the scroll bar
We need to make this a reusable component at some point, I think. This is the first time we're using the QtQuick2 version of ScrollView.

Contributes to issue CURA-5876.
2018-12-06 12:07:03 +01:00
Diego Prado Gesto
47626f6033 Fix the color and proportions of the cura logo in the about panel 2018-12-06 11:57:55 +01:00
Diego Prado Gesto
1d877cbade Merge branch 'ui_rework_4_0' into small_ui_fixes 2018-12-06 11:47:29 +01:00
Diego Prado Gesto
26a41c3726 Adjust the color of the printer in the printer selector
For that I needed to get rid of the IconLabel component, since in this case the color of the icon and the text is the same (and it makes sense)
2018-12-06 11:45:14 +01:00
Diego Prado Gesto
f655e6c43e Add a pattern in the background of the header.
Adjust some main colors to the ones in the designs.
2018-12-06 11:30:59 +01:00
Ghostkeeper
48e15daf64
Fix height of scroll view and make scrollable
Contributes to issue CURA-5876.
2018-12-06 11:16:42 +01:00
Lipu Fei
109586f69c Merge remote-tracking branch 'origin/ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-06 11:09:26 +01:00
Lipu Fei
f7f3c96f81 Fix typo
CURA-5941
2018-12-06 10:53:43 +01:00
Diego Prado Gesto
b0c3a4e17a Align the additional components to the right of the job specs
The model checker now shows centered
2018-12-06 09:25:31 +01:00
Diego Prado Gesto
c757bf128e Adjust colors and alignments in the print info panel 2018-12-06 09:12:43 +01:00
Diego Prado Gesto
218fa3aded Align the print info to the left 2018-12-05 14:22:04 +01:00
Ghostkeeper
5ba8820f18
Remove unnecessary setting height to 0 when invisible
Turns out that it doesn't count for the childrenRect.height anyway when the item is invisible.

Contributes to issue CURA-5876.
2018-12-05 14:10:51 +01:00
Diego Prado Gesto
a2587aca59 Merge branch 'ui_rework_4_0' into place_print_info_back 2018-12-05 14:05:38 +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
Ghostkeeper
024bf409c9
Merge branch 'CURA-5876-Configuration_dropdown' into ui_rework_4_0 2018-12-05 13:29:06 +01:00
Diego Prado Gesto
5b57e6bf30 Code style in JobSpecs 2018-12-05 13:24:34 +01:00
Diego Prado Gesto
909b0f3f7e Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-05 13:10:42 +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
Ghostkeeper
5d95d11437
Use setCurrentIndex to switch tabs at activeExtruderChanged
This fixes a mysterious segfault. We still don't know why the segfault occurred though. All we know is that QML logs something about a binding loop on currentIndex, and Qt logs something about removing range [-1 through 0] from VisualItemModel. When the tab bar is then made visible, Cura crashes. It is a nondeterministic crash. After this change, we are not seeing it any more (but with any nondeterministic bug, it's hard to verify that it was actually fixed).

Contributes to issue CURA-5876.
2018-12-05 09:52:43 +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
Jaime van Kessel
a62da4e523 Use setCurrentIndex instead of direct assignment
This should prevent the binding from breaking and hopefully the segfault

CURA-5876
2018-12-05 09:13:48 +01:00
ChrisTerBeke
d0513e40e1
Remove crappy implementation 2018-12-04 22:21:36 +01:00
ChrisTerBeke
467d347008
Merge branch 'ui_rework_4_0' into STAR-322_cloud-connection
* ui_rework_4_0:
  Ensure that reset always correctly gets set to basic
  Remove semi-colon
  Simplify preview icon logic
  Always return a string for preview icon
  Update USBPrinting version to 1.0.1
  Fix module importing in USBPrinting
  When toggling auto-slice, force a re-slice
  Fix multi-argument i18n string
  Improve printer status handling
  Make "finishes at" single translatable string
  Improve exposed progress prop
  Simplify logic slightly
  Handle idle, unavailable, and unreachable states
  Improve printer status and progress bar
  Improve date rendering
  Add some typings
  Move isActive and timeRemaining logic from QML to Python
2018-12-04 21:30:24 +01:00
Lipu Fei
a13fb4a81e Merge remote-tracking branch 'origin/master' into ui_rework_4_0 2018-12-04 17:12:24 +01:00
Ghostkeeper
780e5e1691
Fix binding loop in PrintCoreConfiguration
Contributes to issue CURA-5876.
2018-12-04 17:09:55 +01:00
Ghostkeeper
1544ab6cf0
Explicitly enable hover on ConfigurationItem
Apparently the default for this depends on some system setting. In Nallath's computer that system setting makes it false by default for some reason.

Contributes to issue CURA-5876.
2018-12-04 17:07:59 +01:00
Ghostkeeper
de78c44461
Fix configuration drop-down for dark theme
This actually changes the secondary colour to be darker for the dark theme, to be more in line with the general theme then.

Contributes to issue CURA-5876.
2018-12-04 16:43:13 +01:00
ChrisTerBeke
0887817f7d use special icon for cloud connected 2018-12-04 16:35:09 +01:00
Jaime van Kessel
b2238420fb Ensure that reset always correctly gets set to basic
The old code that simply resetted the preferences was still active, but this could cause a race condition
in some situations. In those cases it would first set it to basic and then clear the preferences (thus
resulting in no settings being visible)

CURA-5981
2018-12-04 15:46:13 +01:00