3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 14:04:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown

Browse source 
Conflicts:
	resources/qml/ActionPanel/OutputProcessWidget.qml -> Due to removed theme entry.
This commit is contained in:
Ghostkeeper 2018-12-04 15:21:36 +01:00
commit b5bb3232f3
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
13 changed files with 49 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/ActionPanel/OutputProcessWidget.qml
View file

@ -112,6 +112,8 @@ Column
id: previewStageShortcut
height: UM.Theme.getSize("action_button").height
leftPadding: UM.Theme.getSize("default_margin").width
rightPadding: UM.Theme.getSize("default_margin").width
text: catalog.i18nc("@button", "Preview")
onClicked: UM.Controller.setActiveStage("PreviewStage")

3
resources/qml/ActionPanel/PrintInformationWidget.qml
View file

@ -11,9 +11,6 @@ UM.RecolorImage
{
id: widget
//implicitHeight: UM.Theme.getSize("section_icon").height
//implicitWidth: UM.Theme.getSize("section_icon").width
source: UM.Theme.getIcon("info")
width: UM.Theme.getSize("section_icon").width
height: UM.Theme.getSize("section_icon").height

9
resources/qml/ActionPanel/SliceProcessWidget.qml
View file

@ -44,7 +44,7 @@ Column
{
id: autoSlicingLabel
width: parent.width
visible: prepareButtons.autoSlice && widget.backendState == UM.Backend.Processing
visible: prepareButtons.autoSlice && (widget.backendState == UM.Backend.Processing || widget.backendState == UM.Backend.NotStarted)
text: catalog.i18nc("@label:PrintjobStatus", "Auto slicing...")
color: UM.Theme.getColor("text")
@ -71,7 +71,8 @@ Column
width: parent.width
height: UM.Theme.getSize("progressbar").height
value: progress
visible: widget.backendState == UM.Backend.Processing
indeterminate: widget.backendState == UM.Backend.NotStarted
visible: (widget.backendState == UM.Backend.Processing || (prepareButtons.autoSlice && widget.backendState == UM.Backend.NotStarted))
background: Rectangle
{
@ -135,6 +136,10 @@ Column
{
var autoSlice = UM.Preferences.getValue("general/auto_slice")
prepareButtons.autoSlice = autoSlice
if(autoSlice)
{
CuraApplication.backend.forceSlice()
}
}
}