Merge branch '5.0'

6 files changed, 7 insertions, 4 deletions

diff --git a/resources/qml/Preferences/MachinesPage.qml b/resources/qml/Preferences/MachinesPage.qml
index 93a35ff9bb..9b6f5bf609 100644
--- a/resources/qml/Preferences/MachinesPage.qml
+++ b/resources/qml/Preferences/MachinesPage.qml
@@ -12,6 +12,7 @@ import Cura 1.0 as Cura
 UM.ManagementPage
 {
     id: base
+    Item { enabled: false; UM.I18nCatalog { id: catalog; name: "cura"} }
 
     title: catalog.i18nc("@title:tab", "Printers")
     detailsPlaneCaption: base.currentItem && base.currentItem.name ? base.currentItem.name : ""
@@ -93,8 +94,6 @@ UM.ManagementPage
             maximumHeight: minimumHeight * 3
         }
 
-        UM.I18nCatalog { id: catalog; name: "cura"; }
-
         UM.ConfirmRemoveDialog
         {
             id: confirmDialog
diff --git a/resources/qml/Preferences/Materials/MaterialsPage.qml b/resources/qml/Preferences/Materials/MaterialsPage.qml
index 22f8091314..d677658a37 100644
--- a/resources/qml/Preferences/Materials/MaterialsPage.qml
+++ b/resources/qml/Preferences/Materials/MaterialsPage.qml
@@ -11,7 +11,7 @@ import Cura 1.5 as Cura
 UM.ManagementPage
 {
     id: base
-
+    Item { enabled: false; UM.I18nCatalog { id: catalog; name: "cura"} }
     // Keep PreferencesDialog happy
     property var resetEnabled: false
     property var currentItem: null
diff --git a/resources/qml/Preferences/ProfilesPage.qml b/resources/qml/Preferences/ProfilesPage.qml
index 2a7c50fe59..9b062a0347 100644
--- a/resources/qml/Preferences/ProfilesPage.qml
+++ b/resources/qml/Preferences/ProfilesPage.qml
@@ -13,6 +13,7 @@ import Cura 1.6 as Cura
 UM.ManagementPage
 {
     id: base
+    Item { enabled: false; UM.I18nCatalog { id: catalog; name: "cura"} }
 
     property var extrudersModel: CuraApplication.getExtrudersModel()
     property var qualityManagementModel: CuraApplication.getQualityManagementModel()
diff --git a/resources/qml/Preferences/SettingVisibilityPage.qml b/resources/qml/Preferences/SettingVisibilityPage.qml
index 035f121537..476ba999cf 100644
--- a/resources/qml/Preferences/SettingVisibilityPage.qml
+++ b/resources/qml/Preferences/SettingVisibilityPage.qml
@@ -12,6 +12,8 @@ UM.PreferencesPage
 {
     title: catalog.i18nc("@title:tab", "Setting Visibility")
 
+    Item { enabled: false; UM.I18nCatalog { id: catalog; name: "cura"} }
+
     property QtObject settingVisibilityPresetsModel: CuraApplication.getSettingVisibilityPresetsModel()
 
     property int scrollToIndex: 0
diff --git a/resources/qml/Settings/SettingTextField.qml b/resources/qml/Settings/SettingTextField.qml
index 5b051178b1..feca1d51a1 100644
--- a/resources/qml/Settings/SettingTextField.qml
+++ b/resources/qml/Settings/SettingTextField.qml
@@ -60,7 +60,7 @@ SettingItem
         color: {
             if(!enabled)
             {
-                return UM.Theme.getColor("text_field")
+                return UM.Theme.getColor("setting_control_disabled")
             }
             switch(propertyProvider.properties.validationState)
             {
diff --git a/resources/qml/Widgets/Menu.qml b/resources/qml/Widgets/Menu.qml
index b3cdfc6967..1a64b981fa 100644
--- a/resources/qml/Widgets/Menu.qml
+++ b/resources/qml/Widgets/Menu.qml
@@ -12,6 +12,7 @@ import Cura 1.0 as Cura
 UM.Menu
 {
     id: menu
+    Item { enabled: false; UM.I18nCatalog { id: catalog; name: "cura"} }
     topPadding: UM.Theme.getSize("narrow_margin").height
     bottomPadding: UM.Theme.getSize("narrow_margin").height
     padding: 0