470 Commits

Author SHA1 Message Date
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
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
e159cbdb1a Rename all the references from 'popup' to 'content'
Contributes to CURA-5941.
2018-12-04 13:14:12 +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
7df4c01814
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown
Conflicts:
	cura/Settings/MachineManager.py -> rowCount vs. count
	resources/qml/ExtruderIcon.qml -> Someone changed stuff that I had overwritten.
	resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml -> Someone changed stuff that I had removed.
	resources/qml/Toolbar.qml -> Git was wrong, not a conflict.
	resources/themes/cura-light/theme.json -> Git was wrong, not a conflict.
2018-12-03 11:45:05 +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
Lipu Fei
6db52dde46 Fix merge conflicts from ui_rework_40
CURA-5943
2018-11-29 15:27:06 +01:00
Lipu Fei
5df7cdde48 Merge remote-tracking branch 'origin/master' into ui_rework_4_0 2018-11-29 08:54:22 +01:00
Jaime van Kessel
d09d8a6ae3 Minor codestyle fixes
CURA-5879
2018-11-28 11:18:36 +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
Lipu Fei
2c8ed99281 Add is_experimental to Qt models and QMLs
CURA-5879
2018-11-27 15:50:03 +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
Ghostkeeper
c6a9aca346
Switch checked and hovered themes
I misunderstood the theme as it was in the screenshots.

Contributes to issue CURA-5876.
2018-11-27 13:05:32 +01:00
Ghostkeeper
81cadf702c
Give configuration items a rounded radius
Contributes to issue CURA-5876.
2018-11-27 13:00:51 +01:00
Ghostkeeper
0be2453daf
Update style of border of configuration items
Contributes to issue CURA-5876.
2018-11-27 12:55:07 +01:00
Ghostkeeper
e58409b1ef
Correct colours for the selected configuration
This should always be the same as the ExpandableComponent's background, so white when it's not active and light blue when it's active, regardless of theme.
The naming of this theme entry is a bit weird because the ActionButton theme is used for ExpandableComponent and now for ConfigurationItem as well, but that's why we should NEVER name these theme entries to something specific to one item. Oh well, I'm not about to refactor that now with all the branches going on everywhere.

Contributes to issue CURA-5876.
2018-11-27 12:51:52 +01:00
Ghostkeeper
a2b1f53979
Use normal text colour instead of specialised configuration item text
They were the same anyway, and they should always be the same.

Contributes to issue CURA-5876.
2018-11-27 11:53:17 +01:00
Ghostkeeper
6876c12106
Remove weird padding from button
I don't know why the default Button has padding everywhere, but I don't want it.

Contributes to issue CURA-5876.
2018-11-27 11:43:32 +01:00
Ghostkeeper
e05566865a
Use ExtruderIcon component to display extruder icon
Since we already have that component pre-designed, let's use it.

Contributes to issue CURA-5876.
2018-11-27 11:19:03 +01:00
Ghostkeeper
c489f911fb
Use QtQuick 2.0 and simplify ConfigurationItem
It now uses a ButtonGroup (from QtQuick2). Also, all the mess with when the border and background colours are updated and force-updated and such is now cleaned up.

Contributes to issue CURA-5876.
2018-11-27 11:04:41 +01:00
Ghostkeeper
4be8af7cb2
Restyle printer type headers
It's now a grey box with the printer type name inside and some padding and such.

Contributes to issue CURA-5876.
2018-11-27 09:38:32 +01:00
Ghostkeeper
a3fe9839ba
Change all uses of 'small' and 'very small' fonts to default
These two fonts are exactly the same, but I want to use the 'small' font to be something a bit smaller. I'm 'removing' the superfluous font but will be re-using it immediately to look a bit smaller.

Contributes to issue CURA-5876.
2018-11-26 17:33:37 +01:00
Ghostkeeper
a03e1be601
Simplify sectionHeading element
No need to define that component in a higher location, just define it where you need it. Also, no need to use a Rectangle for this if it has no colour, just use an Item, but the Item itself is also not necessary if you just need the padding.

Contributes to issue CURA-5876.
2018-11-26 17:19:32 +01:00
Ghostkeeper
3b219e3ac3
Remove padding
The padding is already done by the enveloping Column and its parent popupItem.

Contributes to issue CURA-5876.
2018-11-26 17:13:25 +01:00
Ghostkeeper
a268c95559
Remove double header
This header is no longer necessary since the AutoConfiguration item provides its own header that doesn't scroll along.

Contributes to issue CURA-5876.
2018-11-26 17:10:56 +01:00
Ghostkeeper
87a0dc65e1
Add list of available configurations to AutoConfiguration
This is the main item it needs to display.

Contributes to issue CURA-5876.
2018-11-26 17:09:36 +01:00
Ghostkeeper
4b897ffd67
Fix width of content in tabbed content
Contributes to issue CURA-5876.
2018-11-26 16:03:40 +01:00