From 6e35fc5035b5333157adcd78797de3e0578c8b67 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Sun, 4 Mar 2018 12:53:16 +0100 Subject: [PATCH] CURA-4870 Modify printer menu visibility of the items. Show local or network submenu only when there is local or network printers respectively --- resources/qml/Menus/PrinterMenu.qml | 35 ++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/resources/qml/Menus/PrinterMenu.qml b/resources/qml/Menus/PrinterMenu.qml index 283063b522..741d927c13 100644 --- a/resources/qml/Menus/PrinterMenu.qml +++ b/resources/qml/Menus/PrinterMenu.qml @@ -3,35 +3,58 @@ import QtQuick 2.2 import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 import UM 1.2 as UM import Cura 1.0 as Cura Menu { - id: menu; + id: menu +// TODO Enable custom style to the menu +// style: MenuStyle +// { +// frame: Rectangle +// { +// color: "white" +// } +// } MenuItem { - text: catalog.i18nc("@label:category menu label", "Network printers") + text: catalog.i18nc("@label:category menu label", "Network enabled printers") enabled: false + visible: networkPrinterMenu.count > 0 } - NetworkPrinterMenu { } + NetworkPrinterMenu + { + id: networkPrinterMenu + } - MenuSeparator { } + MenuSeparator + { + visible: networkPrinterMenu.count > 0 + } MenuItem { text: catalog.i18nc("@label:category menu label", "Local printers") enabled: false + visible: localPrinterMenu.count > 0 } - LocalPrinterMenu { } + LocalPrinterMenu + { + id: localPrinterMenu + } ExclusiveGroup { id: group; } - MenuSeparator { } + MenuSeparator + { + visible: localPrinterMenu.count > 0 + } MenuItem { action: Cura.Actions.addMachine; } MenuItem { action: Cura.Actions.configureMachines; }