139 Commits

Author SHA1 Message Date
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
05075c44ee Add renderType to some labels in the Configuration panel
Contributes to CURA-5876.
2018-12-06 14:19:34 +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
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
Ghostkeeper
48e15daf64
Fix height of scroll view and make scrollable
Contributes to issue CURA-5876.
2018-12-06 11:16:42 +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
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
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
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
Ghostkeeper
9c75f3fe0f
Merge branch 'CURA-5876-Configuration_dropdown' of ssh://github.com/Ultimaker/Cura into CURA-5876-Configuration_dropdown 2018-12-04 15:19:48 +01:00
Ghostkeeper
4d87c46423
Remove sourceSize.width: width from all RecolorImages
It is now the default in Uranium.

Contributes to issue CURA-5876.
2018-12-04 15:04:51 +01:00
Ghostkeeper
2fdfdaa00b
Rename iconOnRightSide to isIconOnRightSide
More accurately represents the type of value that's in this property.

Contributes to issue CURA-5876.
2018-12-04 14:47:34 +01:00
Ghostkeeper
ef29fb0cfa
Remove unnecessary item wrapper
Contributes to issue CURA-5876.
2018-12-04 14:44:12 +01:00
Jaime van Kessel
8a257f0184
Change valueWarning property to bool instead of var
A bit more specific.

Contributes to issue CURA-5876.

Co-Authored-By: Ghostkeeper <Ghostkeeper@users.noreply.github.com>
2018-12-04 14:39:39 +01:00
Jaime van Kessel
023100f4c3
Changed valueError property to bool instead of var
A bit more specific.

Contributes to issue CURA-5876.

Co-Authored-By: Ghostkeeper <Ghostkeeper@users.noreply.github.com>
2018-12-04 14:39:08 +01:00
Ghostkeeper
2dde2438b2
Remove unnecessary anchors
Contributes to issue CURA-5876.
2018-12-04 14:38:13 +01:00
Ghostkeeper
347240410a
Use enumeration to check and switch state of configuration menu
Instead of a string. This is a bit more restrictive.

Contributes to issue CURA-5876.
2018-12-04 14:35:28 +01:00
Ghostkeeper
7cc1f021c1
Fix right-alignment of configuration items in list
The scrollbar will go on top of it now, but it looks nicer if you don't scroll. Maybe we have to make it adaptable?

Contributes to issue CURA-5876.
2018-12-04 14:25:58 +01:00
Ghostkeeper
759b5b5847
Use anchors rather than a calculation with padding
It's supposed to be slightly more efficient.

Contributes to issue CURA-5876.
2018-12-04 14:23:41 +01:00
Ghostkeeper
801701623e
Remove unnecessary top anchor in first subitem of item
It already gets aligned to the top anyway.

Contributes to issue CURA-5876.
2018-12-04 14:04:07 +01:00
Jaime van Kessel
9b8b91b6a4
More specific variable type for is_connected
Contributes to issue CURA-5876.

Co-Authored-By: Ghostkeeper <Ghostkeeper@users.noreply.github.com>
2018-12-03 17:34:08 +01:00
Ghostkeeper
c8cb3a094a
Re-use SecondaryButton instead of setting colours ourselves
It has a pre-defined theme.

Contributes to issue CURA-5876.
2018-12-03 11:52:10 +01:00
Ghostkeeper
af747ae09c
Don't hide tab bar when disabling all but one extruder
And make sure the checkbox for enabling also disappears.
We don't want to make this dependent on the number of enabled extruders, but on the total number of extruders. This way you can actually re-enable an extruder again because the tab bar shouldn't disappear.

Contributes to issue CURA-5876.
2018-12-03 11:19:25 +01:00
Ghostkeeper
6012ea0b9e
Don't use QtQuick imports from Qt 5.11
Our build system uses 5.10.

Contributes to issue CURA-5876.
2018-12-03 11:15:11 +01:00
Ghostkeeper
f3af5a72ad
Use ListModel.count instead of rowCount
The .count property properly updates when the model is changed.

Contributes to issue CURA-5876.
2018-12-03 11:13:26 +01:00
Ghostkeeper
db05d7853a
Remove background colour from tab window
The colour is the same as what is behind it anyway.

Contributes to issue CURA-5876.
2018-12-03 09:04:35 +01:00
Ghostkeeper
82e66eeaa1
Remove tabs and lining with single-extruder printers
There's no sense in showing tabs if the user can't use them.

Contributes to issue CURA-5876.
2018-12-03 09:02:41 +01:00
Ghostkeeper
0a6e420710
Make active tab white
Contributes to issue CURA-5876.
2018-11-30 17:05:25 +01:00
Ghostkeeper
d5d49fcec8
Disable extruder enabled checkbox if it's the last one
You can't disable the last extruder.

Contributes to issue CURA-5876.
2018-11-30 16:43:48 +01:00
Ghostkeeper
82d4897ba4
Use MouseArea to catch click instead of onClicked
This is necessary because when you click it, the 'checked' property no longer depends on the active extruder. So prevent it from being clicked at all and handle the click separately in this MouseArea.

Contributes to issue CURA-5876.
2018-11-30 16:18:46 +01:00
Ghostkeeper
ed37e692a3
Don't disable enable checkbox before machine is loaded
It is unnecessary because you can't see it or click on it before adding a machine.

Contributes to issue CURA-5876.
2018-11-30 15:45:04 +01:00
Ghostkeeper
ede50ef3ca
Simplify dependencies on activeStack
The properties, being formulas, were not properly updated when the active stack changed.

Contributes to issue CURA-5876.
2018-11-30 15:44:15 +01:00
Ghostkeeper
1d9a13cac2
Reset tab index when repeater's model is rebuilt
We can't prevent the model from being rebuilt. At least, not without a major refactor.

Contributes to issue CURA-5876.
2018-11-30 15:40:59 +01:00
Ghostkeeper
e93bbf07a4
Fix circular dependency with tab index and active stack
Only when actually clicking the tab should it change the active extruder index; not when the current index is changed for any other reason.
Next up: Don't change the current index for any other reason.

Contributes to issue CURA-5876.
2018-11-30 14:53:10 +01:00
Ghostkeeper
26c7558a53
Don't show labels if controls themselves are not shown
The height of the popup is luckily automatically adjusted now.

Contributes to issue CURA-5876.
2018-11-27 16:44:16 +01:00
Ghostkeeper
41a5f05391
Remove SyncButton
It hasn't been used now for a while.

Contributes to issue CURA-5876.
2018-11-27 15:57:26 +01:00
Ghostkeeper
3ad2e4f62a
Re-use PrinterTypeLabel component and use abbreviated name
Contributes to issue CURA-5876.
2018-11-27 15:24:58 +01:00
Ghostkeeper
289399825b
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown
Conflicts:
	plugins/PrepareStage/PrepareMenu.qml: Git was wrong, this was not really a conflict.
	resources/qml/ActionButton.qml: With iconSource being modified on ui_rework_4_0 and me modifying the icon to be able to display it on the left hand side.
	resources/qml/ActionPanel/OutputProcessWidget.qml: Git was wrong, not really a conflict.
	resources/qml/ActionPanel/SliceProcessWidget.qml: Git was wrong, not really a conflict.
	resources/qml/ExpandableComponent.qml: Both ui_rework_4_0 and me implemented a border around popups.
	resources/qml/MainWindow/MainWindowHeader.qml: Git was wrong, not really a conflict.
	resources/themes/cura-light/theme.json: Theme item was added in a place where I added whitespace.
2018-11-27 15:01:48 +01:00
Ghostkeeper
0a71a9dd3e
Increase margins around configuration item
As per the design.

Contributes to issue CURA-5876.
2018-11-27 14:47:18 +01:00
Ghostkeeper
956741922d
Make elements retain their position if hotend or material is missing
Just a space makes it keep the correct height.

Contributes to issue CURA-5876.
2018-11-27 14:41:48 +01:00
Ghostkeeper
609f07399e
Show extruder as disabled if either material or core is missing
It basically just means you can't print with it.

Contributes to issue CURA-5876.
2018-11-27 14:20:47 +01:00
Ghostkeeper
b0e9f23eee
Correct line colour when hovered
A detail that I almost missed in the design examples.

Contributes to issue CURA-5876.
2018-11-27 14:06:07 +01:00
Ghostkeeper
1555a1ab17
Make manufacturer and extruder labels lighter
The proper colour would've been 'detail' but that seems to not be used much at all, and it's too light. In other places, 'inactive' is used in this place more often.

Contributes to issue CURA-5876.
2018-11-27 14:03:05 +01:00
Ghostkeeper
bb9598afd1
Redesign layout of configuration item contents
This is the new design.

Contributes to issue CURA-5876.
2018-11-27 13:55:54 +01:00
Ghostkeeper
cf8d88054d
Use proper colour for material in configuration item
No idea this would be so easy.

Contributes to issue CURA-5876.
2018-11-27 13:29:57 +01:00
Ghostkeeper
b15c272d23
Fix applying configuration when clicking
Also no longer use that signal for it. It was completely unnecessary.

Contributes to issue CURA-5876.
2018-11-27 13:24:13 +01:00
Ghostkeeper
89126c7323
Use background instead of contentItem
This way the padding and such doesn't matter any more. And the original background disappears, which was unthemed and still behind the original contentItem.

Contributes to issue CURA-5876.
2018-11-27 13:08:41 +01:00