17045 Commits

Author SHA1 Message Date
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
18bb403413
No longer switch away from extruder when disabling
It feels confusing when this happens.

Contributes to issue CURA-5876.
2018-11-30 15:42:46 +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
4e2f51e7e8
Use public activeExtruderIndex rather than internal _activeExtruderIndex
So that this getter still does what it needs to do if we ever decide to add side-effects.

Contributes to issue CURA-5876.
2018-11-30 11:13:04 +01:00
Ghostkeeper
1c96c81ba9
Remove unnecessary extra setMetaDataEntry
This is a relic from when you first had to add the metadata entry. Now it does nothing any more because it's being set directly afterwards to the actual value that is desired in the end.

Contributes to issue CURA-5876.
2018-11-30 11:11:17 +01:00
Ghostkeeper
0b8a56458d
Remove unused CustomConfigurationSelector
I checked. It is no longer used.

Contributes to issue CURA-5876.
2018-11-27 17:11:32 +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
c1bb1a9b98
Use normal font size for shorthand label
This element had been designed when very_small was in the theme equal to default. I changed the entire application to use default instead of very_small and made very_small a smaller font, but didn't change that on the branch that this element was designed on. So now also change it here.

Contributes to issue CURA-5876.
2018-11-27 15:12:44 +01:00
Ghostkeeper
55dd9be062
Move PrinterTypeLabel to a more central location
So that we can re-use it in other places too.

Contributes to issue CURA-5876.
2018-11-27 15:11:13 +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
Diego Prado Gesto
e863c34f68 Align the text to the center of the button
Contributes to CURA-5942.
2018-11-27 13:33:35 +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
Diego Prado Gesto
fcde6e3a34 Fix the open file button
Now it has the correct size and it doesn't look blurry.

Contributes to CURA-5942.
2018-11-27 13:28:28 +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
Diego Prado Gesto
ea75a60dd8 Merge branch 'master' into ui_rework_4_0 2018-11-27 13:17:10 +01:00
Diego Prado Gesto
a6a364c337 Move material diameter and machine nozzle size to the extruder
definition.

Contributes to CURA-5902.
2018-11-27 13:12:47 +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
Diego Prado Gesto
0794a2c8c9 Remove not needed printer and extruder definitions.
Contributes to CURA-5902.
2018-11-27 13:03:36 +01:00
Ghostkeeper
81cadf702c
Give configuration items a rounded radius
Contributes to issue CURA-5876.
2018-11-27 13:00:51 +01:00
Diego Prado Gesto
c56098d82c
Merge pull request #4816 from Ultimaker/tests-for-um3networkplugin
Tests for um3networkplugin
2018-11-27 12:59:44 +01:00
Jaime van Kessel
fb84b344ec Add gradient to header bar 2018-11-27 12:58:06 +01:00
Ghostkeeper
e751b59b1c
Remove unused configuration item theme entries
The theme of configuration items is now in sync with the rest of the interface.

Contributes to issue CURA-5876.
2018-11-27 12:55:58 +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
Jaime van Kessel
1a6822436d Add missing HoverEnabled property
Some systems, like mine, don't have the hoverEnabled default set to true.
2018-11-27 12:01:43 +01:00
Jaime van Kessel
e04f14b50c Also add shadow to openFile button 2018-11-27 12:01:05 +01:00
Jaime van Kessel
44c415ff78 Add shadow to ExpandableComponent 2018-11-27 11:58:32 +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
Diego Prado Gesto
75b827d373 Modify the hover behavior by removing the mouse area.
Contributes to CURA-5942.
2018-11-27 11:26:20 +01:00
Diego Prado Gesto
e2f85fcdc4 Add extra space to printer button.
Contributes to CURA-5942.
2018-11-27 11:25:43 +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
Diego Prado Gesto
a01ff9419d Merge branch 'ui_rework_4_0' into CURA-5942_printer_selector 2018-11-27 11:13:34 +01:00
Diego Prado Gesto
729d37cabb Merge branch 'master' into ui_rework_4_0 2018-11-27 11:12:48 +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
Lipu Fei
a99c1f4f73
Merge pull request #4885 from Ultimaker/CURA-5961-NaN_infill_before_adding_printer
Ensure that no weird data is set in the printSetupSelector on first start
2018-11-27 10:23:58 +01:00
Diego Prado Gesto
f91dbd356d Merge branch 'master' of github.com:Ultimaker/Cura 2018-11-27 09:51:00 +01:00
Diego Prado Gesto
48853d0d06 Merge branch 'pinchies-add-a-u20' 2018-11-27 09:50:43 +01:00