GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 05:15:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix now showing any sidebar when in monitor mode

Browse Source
This commit is contained in:
ChrisTerBeke 2017-12-05 12:19:00 +01:00
parent e33288b7c8
commit 030dc74f3f
2 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
resources/qml/Cura.qml
View File

@ -366,7 +366,7 @@ UM.MainWindow
onStopMonitoringPrint: base.showPrintMonitor = false onStopMonitoringPrint: base.showPrintMonitor = false
} }
Rectangle Sidebar
{ {
id: sidebar id: sidebar
@ -378,24 +378,8 @@ UM.MainWindow
} }
width: UM.Theme.getSize("sidebar").width width: UM.Theme.getSize("sidebar").width
z: 1
// This is the default sidebar view. monitoringPrint: base.showPrintMonitor
// It is hidden when the active sidebar view ID is not default.
Sidebar
{
id: defaultSidebar
anchors {
top: parent.top
bottom: parent.bottom
left: parent.left
right: parent.right
}
width: parent.width
z: 1
monitoringPrint: base.showPrintMonitor
}
} }
Rectangle Rectangle

18
resources/qml/Sidebar.qml
View File

@ -87,15 +87,6 @@ Rectangle
} }
} }
onCurrentModeIndexChanged:
{
UM.Preferences.setValue("cura/active_mode", currentModeIndex);
if(modesListModel.count > base.currentModeIndex)
{
sidebarContents.push({ "item": modesListModel.get(base.currentModeIndex).item, "replace": true });
}
}
SidebarHeader { SidebarHeader {
id: header id: header
width: parent.width width: parent.width
@ -114,6 +105,15 @@ Rectangle
anchors.topMargin: visible ? UM.Theme.getSize("sidebar_margin").height : 0 anchors.topMargin: visible ? UM.Theme.getSize("sidebar_margin").height : 0
} }
onCurrentModeIndexChanged:
{
UM.Preferences.setValue("cura/active_mode", currentModeIndex);
if(modesListModel.count > base.currentModeIndex)
{
sidebarContents.push({ "item": modesListModel.get(base.currentModeIndex).item, "replace": true });
}
}
Label { Label {
id: settingsModeLabel id: settingsModeLabel
text: !hideSettings ? catalog.i18nc("@label:listbox", "Print Setup") : catalog.i18nc("@label:listbox","Print Setup disabled\nG-code files cannot be modified"); text: !hideSettings ? catalog.i18nc("@label:listbox", "Print Setup") : catalog.i18nc("@label:listbox","Print Setup disabled\nG-code files cannot be modified");