3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-11 16:00:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into feature_firmware_updater

Browse source
This commit is contained in:
fieldOfView 2018-10-02 15:10:44 +02:00
commit 91ee691c80
16 changed files with 426 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

11
resources/qml/PrepareSidebar.qml
View file

@ -14,7 +14,7 @@ Rectangle
{
id: base
property int currentModeIndex
property int currentModeIndex: -1
property bool hideSettings: PrintInformation.preSliced
property bool hideView: Cura.MachineManager.activeMachineName == ""
@ -262,7 +262,6 @@ Rectangle
ListView
{
id: modesList
property var index: 0
model: modesListModel
delegate: wizardDelegate
anchors.top: parent.top
@ -582,13 +581,17 @@ Rectangle
tooltipText: catalog.i18nc("@tooltip", "<b>Custom Print Setup</b><br/><br/>Print with finegrained control over every last bit of the slicing process."),
item: sidebarAdvanced
})
sidebarContents.replace(modesListModel.get(base.currentModeIndex).item, { "immediate": true })
var index = Math.round(UM.Preferences.getValue("cura/active_mode"))
if(index)
if(index != null && !isNaN(index))
{
currentModeIndex = index;
}
else
{
currentModeIndex = 0;
}
}
UM.SettingPropertyProvider

2
resources/qml/SidebarSimple.qml
View file

@ -784,8 +784,10 @@ Item
Label {
id: gradualInfillLabel
height: parent.height
anchors.left: enableGradualInfillCheckBox.right
anchors.leftMargin: Math.round(UM.Theme.getSize("sidebar_margin").width / 2)
verticalAlignment: Text.AlignVCenter;
text: catalog.i18nc("@label", "Enable gradual")
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")