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

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()
}
}
}

7
resources/qml/Preferences/SettingVisibilityPage.qml
View file

@ -115,15 +115,16 @@ UM.PreferencesPage
currentIndex:
{
var idx = -1;
for(var i = 0; i < settingVisibilityPresetsModel.items.length; ++i)
{
if(settingVisibilityPresetsModel.items[i].presetId == settingVisibilityPresetsModel.activePreset)
{
currentIndex = i;
return;
idx = i;
break;
}
}
return -1
return idx;
}
onActivated:

27
resources/qml/Toolbar.qml
View file

@ -115,6 +115,7 @@ Item
}
radius: UM.Theme.getSize("default_radius").width
color: UM.Theme.getColor("lining")
visible: extrudersModel.items.length > 1
}
Column
@ -131,8 +132,7 @@ Item
id: extruders
width: childrenRect.width
height: childrenRect.height
property var _model: Cura.ExtrudersModel { id: extrudersModel }
model: _model.items.length > 1 ? _model : 0
model: extrudersModel.items.length > 1 ? extrudersModel : 0
delegate: ExtruderButton
{
@ -144,13 +144,18 @@ Item
}
}
Cura.ExtrudersModel
{
id: extrudersModel
}
UM.PointingRectangle
{
id: panelBorder;
id: panelBorder
anchors.left: parent.right;
anchors.leftMargin: UM.Theme.getSize("default_margin").width;
anchors.top: base.top;
anchors.left: parent.right
anchors.leftMargin: UM.Theme.getSize("default_margin").width
anchors.top: base.top
anchors.topMargin: base.activeY
z: buttons.z - 1
@ -161,14 +166,14 @@ Item
{
if (panel.item && panel.width > 0)
{
return Math.max(panel.width + 2 * UM.Theme.getSize("default_margin").width);
return Math.max(panel.width + 2 * UM.Theme.getSize("default_margin").width)
}
else
{
return 0;
}
}
height: panel.item ? panel.height + 2 * UM.Theme.getSize("default_margin").height : 0;
height: panel.item ? panel.height + 2 * UM.Theme.getSize("default_margin").height : 0
opacity: panel.item && panel.width > 0 ? 1 : 0
Behavior on opacity { NumberAnimation { duration: 100 } }
@ -186,11 +191,11 @@ Item
{
id: panel
x: UM.Theme.getSize("default_margin").width;
y: UM.Theme.getSize("default_margin").height;
x: UM.Theme.getSize("default_margin").width
y: UM.Theme.getSize("default_margin").height
source: UM.ActiveTool.valid ? UM.ActiveTool.activeToolPanel : ""
enabled: UM.Controller.toolsEnabled;
enabled: UM.Controller.toolsEnabled
}
}