GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-12 03:51:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fieldOfView-fix_toggle_filter_oopsies'

Browse Source
This commit is contained in:
Ghostkeeper 2016-11-29 10:35:29 +01:00
commit c86d867adf
No known key found for this signature in database
GPG Key ID: C5F96EE2BC0F7E75
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
resources/qml/Sidebar.qml
View File

@ -166,15 +166,6 @@ Rectangle
anchors.topMargin: UM.Theme.getSize("default_margin").height anchors.topMargin: UM.Theme.getSize("default_margin").height
} }
currentModeIndex:
{
var index = parseInt(UM.Preferences.getValue("cura/active_mode"))
if(index)
{
return index;
}
return 0;
}
onCurrentModeIndexChanged: onCurrentModeIndexChanged:
{ {
UM.Preferences.setValue("cura/active_mode", currentModeIndex); UM.Preferences.setValue("cura/active_mode", currentModeIndex);
@ -268,7 +259,7 @@ Rectangle
height: settingsModeSelection.height height: settingsModeSelection.height
width: visible ? height : 0 width: visible ? height : 0
visible: !monitoringPrint && modesListModel.get(base.currentModeIndex).showFilterButton visible: !monitoringPrint && modesListModel.get(base.currentModeIndex) != undefined && modesListModel.get(base.currentModeIndex).showFilterButton
opacity: visible ? 1 : 0 opacity: visible ? 1 : 0
onClicked: sidebarContents.currentItem.toggleFilterField() onClicked: sidebarContents.currentItem.toggleFilterField()
@ -284,7 +275,7 @@ Rectangle
} }
label: UM.RecolorImage label: UM.RecolorImage
{ {
anchors.verticalCenter: control.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: UM.Theme.getSize("default_margin").width / 2 anchors.rightMargin: UM.Theme.getSize("default_margin").width / 2
@ -420,6 +411,12 @@ Rectangle
modesListModel.append({ text: catalog.i18nc("@title:tab", "Recommended"), item: sidebarSimple, showFilterButton: false }) modesListModel.append({ text: catalog.i18nc("@title:tab", "Recommended"), item: sidebarSimple, showFilterButton: false })
modesListModel.append({ text: catalog.i18nc("@title:tab", "Custom"), item: sidebarAdvanced, showFilterButton: true }) modesListModel.append({ text: catalog.i18nc("@title:tab", "Custom"), item: sidebarAdvanced, showFilterButton: true })
sidebarContents.push({ "item": modesListModel.get(base.currentModeIndex).item, "immediate": true }); sidebarContents.push({ "item": modesListModel.get(base.currentModeIndex).item, "immediate": true });
var index = parseInt(UM.Preferences.getValue("cura/active_mode"))
if(index)
{
currentModeIndex = index;
}
} }
UM.SettingPropertyProvider UM.SettingPropertyProvider