GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-30 07:44:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Layer view menu items now have Cura colors, not the system colors.

Browse Source
This commit is contained in:
Jack Ha 2017-03-20 15:49:27 +01:00
parent b8d8e4fac3
commit aa79ca1d30
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/LayerView/LayerView.qml Normal file → Executable file
View File

@ -58,6 +58,7 @@ Item
anchors.left: parent.left anchors.left: parent.left
text: catalog.i18nc("@label","View Mode: Layers") text: catalog.i18nc("@label","View Mode: Layers")
font.bold: true font.bold: true
style: UM.Theme.styles.text
} }
Label Label
@ -75,6 +76,7 @@ Item
text: catalog.i18nc("@label","Color scheme") text: catalog.i18nc("@label","Color scheme")
visible: !UM.LayerView.compatibilityMode visible: !UM.LayerView.compatibilityMode
Layout.fillWidth: true Layout.fillWidth: true
style: UM.Theme.styles.text
} }
ListModel // matches LayerView.py ListModel // matches LayerView.py
@ -102,6 +104,7 @@ Item
Layout.preferredWidth: UM.Theme.getSize("layerview_row").width Layout.preferredWidth: UM.Theme.getSize("layerview_row").width
model: layerViewTypes model: layerViewTypes
visible: !UM.LayerView.compatibilityMode visible: !UM.LayerView.compatibilityMode
style: UM.Theme.styles.combobox
property int layer_view_type: UM.Preferences.getValue("layerview/layer_view_type") property int layer_view_type: UM.Preferences.getValue("layerview/layer_view_type")
currentIndex: layer_view_type // index matches type_id currentIndex: layer_view_type // index matches type_id
@ -174,6 +177,7 @@ Item
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: UM.Theme.getSize("layerview_row").height Layout.preferredHeight: UM.Theme.getSize("layerview_row").height
Layout.preferredWidth: UM.Theme.getSize("layerview_row").width Layout.preferredWidth: UM.Theme.getSize("layerview_row").width
style: UM.Theme.styles.checkbox
} }
} }
@ -197,6 +201,7 @@ Item
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: UM.Theme.getSize("layerview_row").height Layout.preferredHeight: UM.Theme.getSize("layerview_row").height
Layout.preferredWidth: UM.Theme.getSize("layerview_row").width Layout.preferredWidth: UM.Theme.getSize("layerview_row").width
style: UM.Theme.styles.checkbox
} }
CheckBox { CheckBox {
checked: view_settings.show_helpers checked: view_settings.show_helpers
@ -218,6 +223,7 @@ Item
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: UM.Theme.getSize("layerview_row").height Layout.preferredHeight: UM.Theme.getSize("layerview_row").height
Layout.preferredWidth: UM.Theme.getSize("layerview_row").width Layout.preferredWidth: UM.Theme.getSize("layerview_row").width
style: UM.Theme.styles.checkbox
} }
CheckBox { CheckBox {
checked: view_settings.show_skin checked: view_settings.show_skin
@ -239,6 +245,7 @@ Item
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: UM.Theme.getSize("layerview_row").height Layout.preferredHeight: UM.Theme.getSize("layerview_row").height
Layout.preferredWidth: UM.Theme.getSize("layerview_row").width Layout.preferredWidth: UM.Theme.getSize("layerview_row").width
style: UM.Theme.styles.checkbox
} }
CheckBox { CheckBox {
checked: view_settings.show_infill checked: view_settings.show_infill
@ -260,6 +267,7 @@ Item
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: UM.Theme.getSize("layerview_row").height Layout.preferredHeight: UM.Theme.getSize("layerview_row").height
Layout.preferredWidth: UM.Theme.getSize("layerview_row").width Layout.preferredWidth: UM.Theme.getSize("layerview_row").width
style: UM.Theme.styles.checkbox
} }
CheckBox { CheckBox {
checked: view_settings.only_show_top_layers checked: view_settings.only_show_top_layers
@ -268,6 +276,7 @@ Item
} }
text: catalog.i18nc("@label", "Only Show Top Layers") text: catalog.i18nc("@label", "Only Show Top Layers")
visible: UM.LayerView.compatibilityMode visible: UM.LayerView.compatibilityMode
style: UM.Theme.styles.checkbox
} }
CheckBox { CheckBox {
checked: view_settings.top_layer_count == 5 checked: view_settings.top_layer_count == 5
@ -276,6 +285,7 @@ Item
} }
text: catalog.i18nc("@label", "Show 5 Detailed Layers On Top") text: catalog.i18nc("@label", "Show 5 Detailed Layers On Top")
visible: UM.LayerView.compatibilityMode visible: UM.LayerView.compatibilityMode
style: UM.Theme.styles.checkbox
} }
Label Label
@ -297,6 +307,7 @@ Item
Layout.preferredHeight: UM.Theme.getSize("layerview_row").height Layout.preferredHeight: UM.Theme.getSize("layerview_row").height
Layout.preferredWidth: UM.Theme.getSize("layerview_row").width Layout.preferredWidth: UM.Theme.getSize("layerview_row").width
visible: view_settings.show_legend visible: view_settings.show_legend
style: UM.Theme.styles.text
} }
Label Label
@ -319,6 +330,7 @@ Item
Layout.preferredHeight: UM.Theme.getSize("layerview_row").height Layout.preferredHeight: UM.Theme.getSize("layerview_row").height
Layout.preferredWidth: UM.Theme.getSize("layerview_row").width Layout.preferredWidth: UM.Theme.getSize("layerview_row").width
visible: view_settings.show_legend visible: view_settings.show_legend
style: UM.Theme.styles.text
} }
} }

7
resources/themes/cura/styles.qml Normal file → Executable file
View File

@ -594,6 +594,13 @@ QtObject {
} }
} }
property Component text: Component {
TextFieldStyle {
textColor: Theme.getColor("text");
font: Theme.getFont("default");
}
}
property Component sidebar_action_button: Component { property Component sidebar_action_button: Component {
ButtonStyle ButtonStyle
{ {