From 67f1afb9ce2b41e104741cc2ba8878a2a94e8565 Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Wed, 7 Dec 2016 14:32:40 +0100 Subject: [PATCH] Revert "Show extruder tabs only in custom mode. CURA-2763" This reverts commit f916c9b4cfc47e8fa99c7a9888b0d12f118503af. --- resources/qml/Sidebar.qml | 5 ++--- resources/qml/SidebarHeader.qml | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/resources/qml/Sidebar.qml b/resources/qml/Sidebar.qml index afb5e77b8d..77e82b5f92 100644 --- a/resources/qml/Sidebar.qml +++ b/resources/qml/Sidebar.qml @@ -149,7 +149,6 @@ Rectangle SidebarHeader { id: header width: parent.width - property bool showExtruderTabs: modesListModel.get(base.currentModeIndex).showExtruderTabs anchors.top: sidebarHeaderBar.bottom anchors.topMargin: UM.Theme.getSize("default_margin").height @@ -409,8 +408,8 @@ Rectangle Component.onCompleted: { - modesListModel.append({ text: catalog.i18nc("@title:tab", "Recommended"), item: sidebarSimple, showFilterButton: false, showExtruderTabs: false }) - modesListModel.append({ text: catalog.i18nc("@title:tab", "Custom"), item: sidebarAdvanced, showFilterButton: true, showExtruderTabs: true }) + modesListModel.append({ text: catalog.i18nc("@title:tab", "Recommended"), item: sidebarSimple, showFilterButton: false }) + modesListModel.append({ text: catalog.i18nc("@title:tab", "Custom"), item: sidebarAdvanced, showFilterButton: true }) sidebarContents.push({ "item": modesListModel.get(base.currentModeIndex).item, "immediate": true }); var index = parseInt(UM.Preferences.getValue("cura/active_mode")) diff --git a/resources/qml/SidebarHeader.qml b/resources/qml/SidebarHeader.qml index 58261bf7e6..105431c3ee 100644 --- a/resources/qml/SidebarHeader.qml +++ b/resources/qml/SidebarHeader.qml @@ -65,7 +65,7 @@ Column { id: extruderSelectionRow height: UM.Theme.getSize("sidebar_tabs").height - visible: showExtruderTabs && machineExtruderCount.properties.value > 1 && !sidebar.monitoringPrint + visible: machineExtruderCount.properties.value > 1 && !sidebar.monitoringPrint anchors {