From f18947681a6ba9eefd24ddd024c41231057c07f6 Mon Sep 17 00:00:00 2001
From: fieldOfView <aldo@fieldofview.com>
Date: Sun, 30 Apr 2017 23:25:14 +0200
Subject: [PATCH] Disambiguate theme name

---
 resources/qml/Sidebar.qml        | 14 +++++++-------
 resources/themes/cura/styles.qml | 16 ++++++++--------
 resources/themes/cura/theme.json | 18 +++++++++---------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/resources/qml/Sidebar.qml b/resources/qml/Sidebar.qml
index f4d264b12c..132d1d2f41 100755
--- a/resources/qml/Sidebar.qml
+++ b/resources/qml/Sidebar.qml
@@ -419,15 +419,15 @@ Rectangle
             {
                 if(toggleLeftTextMouseArea.containsMouse)
                 {
-                    return UM.Theme.getColor("toggle_button_text_hover");
+                    return UM.Theme.getColor("mode_switch_text_hover");
                 }
                 else if(!modeToggleSwitch.checked)
                 {
-                    return UM.Theme.getColor("toggle_button_text_checked");
+                    return UM.Theme.getColor("mode_switch_text_checked");
                 }
                 else
                 {
-                    return UM.Theme.getColor("toggle_button_text");
+                    return UM.Theme.getColor("mode_switch_text");
                 }
             }
             font: UM.Theme.getFont("default")
@@ -483,7 +483,7 @@ Rectangle
                 UM.Preferences.setValue("cura/active_mode", index);
             }
 
-            style: UM.Theme.styles.toggle_button
+            style: UM.Theme.styles.mode_switch
         }
 
         Label
@@ -496,15 +496,15 @@ Rectangle
             {
                 if(toggleRightTextMouseArea.containsMouse)
                 {
-                    return UM.Theme.getColor("toggle_button_text_hover");
+                    return UM.Theme.getColor("mode_switch_text_hover");
                 }
                 else if(modeToggleSwitch.checked)
                 {
-                    return UM.Theme.getColor("toggle_button_text_checked");
+                    return UM.Theme.getColor("mode_switch_text_checked");
                 }
                 else
                 {
-                    return UM.Theme.getColor("toggle_button_text");
+                    return UM.Theme.getColor("mode_switch_text");
                 }
             }
             font: UM.Theme.getFont("default")
diff --git a/resources/themes/cura/styles.qml b/resources/themes/cura/styles.qml
index 9d302c3494..ffe866f2c6 100755
--- a/resources/themes/cura/styles.qml
+++ b/resources/themes/cura/styles.qml
@@ -8,25 +8,25 @@ import QtQuick.Controls.Styles 1.1
 import UM 1.1 as UM
 
 QtObject {
-    property Component toggle_button: Component {
+    property Component mode_switch: Component {
         SwitchStyle {
             groove: Rectangle {
-                implicitWidth: UM.Theme.getSize("toggle_button").width
-                implicitHeight: UM.Theme.getSize("toggle_button").height
+                implicitWidth: UM.Theme.getSize("mode_switch").width
+                implicitHeight: UM.Theme.getSize("mode_switch").height
                 radius: implicitHeight / 2
                 color: {
                     if(control.hovered || control._hovered) {
-                        return UM.Theme.getColor("toggle_button_hover");
+                        return UM.Theme.getColor("mode_switch_hover");
                     } else {
-                        return UM.Theme.getColor("toggle_button");
+                        return UM.Theme.getColor("mode_switch");
                     }
                 }
                 Behavior on color { ColorAnimation { duration: 50; } }
                 border.color: {
                     if(control.hovered || control._hovered) {
-                        return UM.Theme.getColor("toggle_button_border_hover");
+                        return UM.Theme.getColor("mode_switch_border_hover");
                     } else {
-                        return UM.Theme.getColor("toggle_button_border");
+                        return UM.Theme.getColor("mode_switch_border");
                     }
                 }
                 Behavior on border.color { ColorAnimation { duration: 50; } }
@@ -35,7 +35,7 @@ QtObject {
 
             handle: Rectangle {
                 implicitWidth: implicitHeight
-                implicitHeight: UM.Theme.getSize("toggle_button").height
+                implicitHeight: UM.Theme.getSize("mode_switch").height
                 radius: implicitHeight / 2
 
                 color: {
diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json
index 37267046b0..da58af4c14 100644
--- a/resources/themes/cura/theme.json
+++ b/resources/themes/cura/theme.json
@@ -175,14 +175,14 @@
         "checkbox_mark": [24, 41, 77, 255],
         "checkbox_text": [24, 41, 77, 255],
 
-        "toggle_button": [255, 255, 255, 255],
-        "toggle_button_hover": [255, 255, 255, 255],
-        "toggle_button_border": [127, 127, 127, 255],
-        "toggle_button_border_hover": [12, 169, 227, 255],
-        "toggle_button_handle": [24, 41, 77, 255],
-        "toggle_button_text": [24, 41, 77, 255],
-        "toggle_button_text_hover": [24, 41, 77, 255],
-        "toggle_button_text_checked": [12, 169, 227, 255],
+        "mode_switch": [255, 255, 255, 255],
+        "mode_switch_hover": [255, 255, 255, 255],
+        "mode_switch_border": [127, 127, 127, 255],
+        "mode_switch_border_hover": [12, 169, 227, 255],
+        "mode_switch_handle": [24, 41, 77, 255],
+        "mode_switch_text": [24, 41, 77, 255],
+        "mode_switch_text_hover": [24, 41, 77, 255],
+        "mode_switch_text_checked": [12, 169, 227, 255],
 
         "tooltip": [12, 169, 227, 255],
         "tooltip_text": [255, 255, 255, 255],
@@ -310,7 +310,7 @@
         "layerview_row_spacing": [0.0, 0.5],
 
         "checkbox": [2.0, 2.0],
-        "toggle_button": [2.0, 1.0],
+        "mode_switch": [2.0, 1.0],
 
         "tooltip": [20.0, 10.0],
         "tooltip_margins": [1.0, 1.0],