From 7e12269ca4e5d4ba31953fdcef466ed201333ab0 Mon Sep 17 00:00:00 2001
From: Tamara Hogenhout <t.hogenhout@ultimaker.com>
Date: Wed, 9 Dec 2015 16:49:13 +0100
Subject: [PATCH] Revert "Adds a global-only role to the SettingOverrideModel"

This reverts commit f8dbe056b2c53ac76f2ad124e26c7b8dbfd55b07.
---
 .../SettingOverrideModel.py                   | 23 ++++---------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/plugins/PerObjectSettingsTool/SettingOverrideModel.py b/plugins/PerObjectSettingsTool/SettingOverrideModel.py
index f7411524b1..74696f0ee6 100644
--- a/plugins/PerObjectSettingsTool/SettingOverrideModel.py
+++ b/plugins/PerObjectSettingsTool/SettingOverrideModel.py
@@ -1,7 +1,7 @@
 # Copyright (c) 2015 Ultimaker B.V.
 # Uranium is released under the terms of the AGPLv3 or higher.
 
-from PyQt5.QtCore import Qt, pyqtSlot, QUrl, pyqtSignal
+from PyQt5.QtCore import Qt, pyqtSlot, QUrl
 
 from UM.Application import Application
 from UM.Qt.ListModel import ListModel
@@ -18,7 +18,6 @@ class SettingOverrideModel(ListModel):
     OptionsRole = Qt.UserRole + 8
     WarningDescriptionRole = Qt.UserRole + 9
     ErrorDescriptionRole = Qt.UserRole + 10
-    GlobalOnlyRole = Qt.UserRole + 11
 
     def __init__(self, node, parent = None):
         super().__init__(parent)
@@ -39,7 +38,6 @@ class SettingOverrideModel(ListModel):
         self.addRoleName(self.OptionsRole, "options")
         self.addRoleName(self.WarningDescriptionRole, "warning_description")
         self.addRoleName(self.ErrorDescriptionRole, "error_description")
-        self.addRoleName(self.GlobalOnlyRole, "global_only")
 
     @pyqtSlot(str, "QVariant")
     def setSettingValue(self, key, value):
@@ -52,6 +50,7 @@ class SettingOverrideModel(ListModel):
         if not self._node.getDecorator(SettingOverrideDecorator):
             self.clear()
             return
+
         self._decorator = self._node.getDecorator(SettingOverrideDecorator)
         self._decorator.settingAdded.connect(self._onSettingsChanged)
         self._decorator.settingRemoved.connect(self._onSettingsChanged)
@@ -69,20 +68,6 @@ class SettingOverrideModel(ListModel):
             model.appendItem({"value": str(value), "name": str(name)})
         return model
 
-    @pyqtSlot()
-    def reload(self):
-        self.clear()
-        #if self._machine_instance:
-            #for category in self._machine_instance.getMachineDefinition().getAllCategories():
-                #self.appendItem({
-                    #"id": category.getKey(),
-                    #"name": category.getLabel(),
-                    #"icon": category.getIcon(),
-                    #"visible": category.isVisible(),
-                    #"settings": SettingsFromCategoryModel.SettingsFromCategoryModel(category),
-                    #"hiddenValuesCount": category.getHiddenValuesCount()
-                #})
-
     def _onSettingsChanged(self):
         self.clear()
 
@@ -99,9 +84,9 @@ class SettingOverrideModel(ListModel):
                 "valid": setting.validate(value),
                 "options": self._createOptionsModel(setting.getOptions()),
                 "warning_description": setting.getWarningDescription(),
-                "error_description": setting.getErrorDescription(),
-                "global_only": setting.getGlobalOnly()
+                "error_description": setting.getErrorDescription()
             })
+
         items.sort(key = lambda i: i["key"])
 
         for item in items: