Browse Source

Change some colors for the arrows in some setting selectors

Contributes to CURA-5876.
Diego Prado Gesto 6 years ago
parent
commit
f99c788eb6

+ 1 - 1
resources/qml/ActionButton.qml

@@ -62,7 +62,7 @@ Button
             id: buttonText
             text: button.text
             color: button.enabled ? (button.hovered ? button.textHoverColor : button.textColor): button.textDisabledColor
-            font: UM.Theme.getFont("action_button")
+            font: UM.Theme.getFont("medium")
             visible: text != ""
             renderType: Text.NativeRendering
             anchors.verticalCenter: parent.verticalCenter

+ 2 - 2
resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml

@@ -20,8 +20,8 @@ Button
     {
         height: childrenRect.height
         color: parent.hovered ? UM.Theme.getColor("action_button_hovered") : UM.Theme.getColor("action_button")
-        border.color: (parent.checked || parent.hovered) ? UM.Theme.getColor("primary") : UM.Theme.getColor("lining")
-        border.width: parent.checked ? UM.Theme.getSize("thick_lining").width : UM.Theme.getSize("default_lining").width
+        border.color: parent.checked ? UM.Theme.getColor("primary") : UM.Theme.getColor("lining")
+        border.width: UM.Theme.getSize("default_lining").width
         radius: UM.Theme.getSize("default_radius").width
 
         Column

+ 6 - 6
resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml

@@ -60,7 +60,7 @@ Item
         {
             text: catalog.i18nc("@label", "Printer")
             width: Math.round(parent.width * 0.3) - UM.Theme.getSize("default_margin").width
-            height: contentHeight
+//            height: contentHeight
             font: UM.Theme.getFont("default")
             color: UM.Theme.getColor("text")
             anchors.verticalCenter: printerTypeSelector.verticalCenter
@@ -72,7 +72,7 @@ Item
             id: printerTypeSelector
             text: Cura.MachineManager.activeMachineDefinitionName
             tooltip: Cura.MachineManager.activeMachineDefinitionName
-            height: UM.Theme.getSize("setting_control").height
+            height: UM.Theme.getSize("print_setup_big_item").height
             width: Math.round(parent.width * 0.7) + UM.Theme.getSize("default_margin").width
             anchors.right: parent.right
             style: UM.Theme.styles.print_setup_header_button
@@ -222,7 +222,7 @@ Item
 
             Row
             {
-                height: UM.Theme.getSize("print_setup_item").height
+                height: UM.Theme.getSize("print_setup_big_item").height
                 visible: Cura.MachineManager.hasMaterials
 
                 Label
@@ -246,7 +246,7 @@ Item
                     text: Cura.MachineManager.activeStack != null ? Cura.MachineManager.activeStack.material.name : ""
                     tooltip: text
 
-                    height: UM.Theme.getSize("setting_control").height
+                    height: UM.Theme.getSize("print_setup_big_item").height
                     width: selectors.controlWidth
 
                     style: UM.Theme.styles.print_setup_header_button
@@ -260,7 +260,7 @@ Item
 
             Row
             {
-                height: UM.Theme.getSize("print_setup_item").height
+                height: UM.Theme.getSize("print_setup_big_item").height
                 visible: Cura.MachineManager.hasVariants
 
                 Label
@@ -280,7 +280,7 @@ Item
                     text: Cura.MachineManager.activeVariantName
                     tooltip: Cura.MachineManager.activeVariantName
 
-                    height: UM.Theme.getSize("setting_control").height
+                    height: UM.Theme.getSize("print_setup_big_item").height
                     width: selectors.controlWidth
                     style: UM.Theme.styles.print_setup_header_button
                     activeFocusOnPress: true;

+ 1 - 1
resources/qml/PrinterOutput/ExtruderBox.qml

@@ -326,7 +326,7 @@ Item
                                 return UM.Theme.getColor("action_button_text");
                             }
                         }
-                        font: UM.Theme.getFont("action_button")
+                        font: UM.Theme.getFont("medium")
                         text:
                         {
                             if(extruderModel == null)

+ 1 - 1
resources/qml/PrinterOutput/HeatedBedBox.qml

@@ -320,7 +320,7 @@ Item
                                 return UM.Theme.getColor("action_button_text");
                             }
                         }
-                        font: UM.Theme.getFont("action_button")
+                        font: UM.Theme.getFont("medium")
                         text:
                         {
                             if(printerModel == null)

+ 1 - 1
resources/qml/PrinterOutput/MonitorSection.qml

@@ -27,7 +27,7 @@ Item
             anchors.left: parent.left
             anchors.leftMargin: UM.Theme.getSize("default_margin").width
             text: label
-            font: UM.Theme.getFont("setting_category")
+            font: UM.Theme.getFont("default")
             color: UM.Theme.getColor("setting_category_text")
         }
     }

+ 1 - 1
resources/qml/PrinterSelector/MachineSelectorButton.qml

@@ -42,7 +42,7 @@ Button
             }
             text: machineSelectorButton.text
             color: UM.Theme.getColor("text")
-            font: UM.Theme.getFont("action_button")
+            font: UM.Theme.getFont("medium")
             visible: text != ""
             renderType: Text.NativeRendering
             verticalAlignment: Text.AlignVCenter

+ 2 - 21
resources/qml/Settings/SettingCategory.qml

@@ -73,7 +73,7 @@ Button
             text: definition.label
             textFormat: Text.PlainText
             renderType: Text.NativeRendering
-            font: UM.Theme.getFont("setting_category")
+            font: UM.Theme.getFont("default")
             color:
             {
                 if (!base.enabled)
@@ -106,26 +106,7 @@ Button
             width: UM.Theme.getSize("standard_arrow").width
             height: UM.Theme.getSize("standard_arrow").height
             sourceSize.height: width
-            color:
-            {
-                if (!base.enabled)
-                {
-                    return UM.Theme.getColor("setting_category_disabled_text")
-                }
-                else if ((base.hovered || base.activeFocus) && base.checkable && base.checked)
-                {
-                    return UM.Theme.getColor("setting_category_active_hover_text")
-                }
-                else if (base.pressed || (base.checkable && base.checked))
-                {
-                    return UM.Theme.getColor("setting_category_active_text")
-                }
-                else if (base.hovered || base.activeFocus)
-                {
-                    return UM.Theme.getColor("setting_category_hover_text")
-                }
-                return UM.Theme.getColor("setting_category_text")
-            }
+            color: UM.Theme.getColor("setting_control_button")
             source: base.checked ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left")
         }
     }

+ 1 - 1
resources/qml/Settings/SettingComboBox.qml

@@ -63,7 +63,7 @@ SettingItem
             sourceSize.width: width + 5 * screenScaleFactor
             sourceSize.height: width + 5 * screenScaleFactor
 
-            color: UM.Theme.getColor("setting_control_text")
+            color: UM.Theme.getColor("setting_control_button")
         }
 
         contentItem: Label

+ 1 - 1
resources/qml/Settings/SettingExtruder.qml

@@ -105,7 +105,7 @@ SettingItem
             sourceSize.width: width + 5 * screenScaleFactor
             sourceSize.height: width + 5 * screenScaleFactor
 
-            color: UM.Theme.getColor("setting_control_text");
+            color: UM.Theme.getColor("setting_control_button");
         }
 
         background: Rectangle

Some files were not shown because too many files changed in this diff