From e51f9ba678b10b06b9a87329ae3b62e269c4872b Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 7 Nov 2016 11:54:20 +0100 Subject: [PATCH] fix: exclude command line settings from being viewed in the frontend (CURA-566) --- cura/CuraApplication.py | 2 +- plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml | 2 +- resources/qml/Preferences/SettingVisibilityPage.qml | 2 +- resources/qml/Settings/SettingView.qml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index d5f90f6846..59e5a15f71 100644 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -258,7 +258,7 @@ class CuraApplication(QtApplication): Preferences.getInstance().setDefault("general/visible_settings", """ machine_settings - resolution + resolution layer_height shell wall_thickness diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml index fa6957a991..82512dd1e6 100644 --- a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml +++ b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml @@ -401,7 +401,7 @@ Item { } visibilityHandler: UM.SettingPreferenceVisibilityHandler {} expanded: [ "*" ] - exclude: [ "machine_settings" ] + exclude: [ "machine_settings", "command_line_settings" ] } delegate:Loader { diff --git a/resources/qml/Preferences/SettingVisibilityPage.qml b/resources/qml/Preferences/SettingVisibilityPage.qml index ea4fd0142c..282f366994 100644 --- a/resources/qml/Preferences/SettingVisibilityPage.qml +++ b/resources/qml/Preferences/SettingVisibilityPage.qml @@ -116,7 +116,7 @@ UM.PreferencesPage id: definitionsModel containerId: Cura.MachineManager.activeDefinitionId showAll: true - exclude: ["machine_settings"] + exclude: ["machine_settings", "command_line_settings"] showAncestors: true expanded: ["*"] visibilityHandler: UM.SettingPreferenceVisibilityHandler { } diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml index 16b5dada72..09a68d1244 100644 --- a/resources/qml/Settings/SettingView.qml +++ b/resources/qml/Settings/SettingView.qml @@ -30,7 +30,7 @@ ScrollView id: definitionsModel; containerId: Cura.MachineManager.activeDefinitionId visibilityHandler: UM.SettingPreferenceVisibilityHandler { } - exclude: ["machine_settings", "infill_mesh", "infill_mesh_order"] + exclude: ["machine_settings", "command_line_settings", "infill_mesh", "infill_mesh_order"] # TODO: infill_mesh settigns are excluded hardcoded, but should be based on the fact that settable_globally, settable_per_meshgroup and settable_per_extruder are false. expanded: Printer.expandedCategories onExpandedChanged: Printer.setExpandedCategories(expanded) onVisibilityChanged: Cura.SettingInheritanceManager.forceUpdate()