7454 Commits

Author SHA1 Message Date
Ghostkeeper
024bf409c9
Merge branch 'CURA-5876-Configuration_dropdown' into ui_rework_4_0 2018-12-05 13:29:06 +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
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
Jaime van Kessel
fd6a8d7642 Merge branch 'master' of github.com:Ultimaker/Cura 2018-12-04 15:47:27 +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
Ghostkeeper
b5bb3232f3
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown
Conflicts:
	resources/qml/ActionPanel/OutputProcessWidget.qml -> Due to removed theme entry.
2018-12-04 15:21:36 +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
Lipu Fei
5255bca9dd Merge remote-tracking branch 'origin/master' into ui_rework_4_0 2018-12-04 15:08:50 +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
Lipu Fei
43096c1baf Update USBPrinting version to 1.0.1
CURA-5943
2018-12-04 15:03:45 +01:00
Jaime van Kessel
5b4fad3c08 When toggling auto-slice, force a re-slice
CURA-5997
2018-12-04 14:54:15 +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
Ghostkeeper
a1f579a528
Improve wording of iconOnRightSide documentation
Contributes to issue CURA-5876.
2018-12-04 14:01:49 +01:00
Lipu Fei
0d086008ae Merge remote-tracking branch 'origin/master' into ui_rework_4_0 2018-12-04 11:38:47 +01:00
Lipu Fei
9ec7428620 Fix setting visiblity current index
CURA-5981
2018-12-04 10:55:01 +01:00
Diego Prado Gesto
57a852a15a Don't show the background if there are less than 2 extruders to show in the Toolbar
It caused a very tiny rectangle if the printer has only 1 extruder.

Contributes to CURA-5984.
2018-12-04 09:19:08 +01:00
Diego Prado Gesto
c1f5c00a7e Forgot to add the icon 2018-12-04 09:18:45 +01:00
Diego Prado Gesto
e9f8757fac Change the info button in the action panel according to the designs
Adjust the padding in the preview shortcut.
2018-12-04 09:12:57 +01:00
Ghostkeeper
6af1e72ea3
Show progress bar while autoslice is preparing
Previously it would say 'preparing to slice'. Now it just says 'auto slicing' but with an indeterminate progress bar. Only the indeterminate progress bar just appears empty right now...

Contributes to issue CURA-5997.
2018-12-04 07:51:48 +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
f320000ce5
Change default profile of Aurora and Alfawise printers
Instead of the default layer height, we should change the default quality profile.
This is necessary because the 'normal' quality profile doesn't define a layer height, so that should inherit from the 0.1mm default layer height. But if the printer turned the default into a 0.15mm layer height then that is wrong.
Maybe we should let the normal quality profile overwrite it to 0.1mm, always?

Contributes to issue CURA-5902.
2018-12-03 17:23:44 +01:00
Ghostkeeper
65d3aa4480
Fix broken sizes due to merged theme entry
Merge conflict went wrong, I think.

Contributes to issue CURA-5876.
2018-12-03 11:59:03 +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
39411222da
Use normal font size for Auto slicing... message
It should've been the normal font size anyway. This is not small!

Contributes to issue CURA-5876.
2018-12-03 11:37:22 +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
Lipu Fei
c688f0ea88
Merge pull request #4864 from Ultimaker/CURA-5943_ui_usb_printing
Cura 5943 ui usb printing
2018-12-03 10:42:58 +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
Diego Prado Gesto
e73a91e746 Merge branch 'master' into ui_rework_4_0 2018-12-02 12:11:12 +01:00
Ghostkeeper
0a6e420710
Make active tab white
Contributes to issue CURA-5876.
2018-11-30 17:05:25 +01:00
Ghostkeeper
f4950cf92b
Give checkboxes a style if they're disabled
Contributes to issue CURA-5876.
2018-11-30 17:04:50 +01:00
Jaime van Kessel
6ab2ce7690 Decrease padding between time & material specification headers 2018-11-30 16:44:55 +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
Jaime van Kessel
ad26962cb9 Fix setting visibility not working in settingVisibilityPage
CURA-5981
2018-11-30 15:49:50 +01:00