GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-24 13:39:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use upper camel case for enum options

Browse Source 
Contributes to issue CURA-5876.
This commit is contained in:
Ghostkeeper 2018-12-06 16:22:26 +01:00
parent e29baf0cec
commit c39674cd0c
No known key found for this signature in database
GPG Key ID: 86BEF881AE2CF276
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
View File

@ -30,8 +30,8 @@ Cura.ExpandableComponent
enum ConfigurationMethod enum ConfigurationMethod
{ {
AUTO, Auto,
CUSTOM Custom
} }
iconSource: expanded ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left") iconSource: expanded ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left")
@ -134,7 +134,7 @@ Cura.ExpandableComponent
is_connected = Cura.MachineManager.activeMachineNetworkKey !== "" && Cura.MachineManager.printerConnected //Re-evaluate. is_connected = Cura.MachineManager.activeMachineNetworkKey !== "" && Cura.MachineManager.printerConnected //Re-evaluate.
} }
property int configuration_method: is_connected ? ConfigurationMenu.ConfigurationMethod.AUTO : ConfigurationMenu.ConfigurationMethod.CUSTOM //Auto if connected to a printer at start-up, or Custom if not. property int configuration_method: is_connected ? ConfigurationMenu.ConfigurationMethod.Auto : ConfigurationMenu.ConfigurationMethod.Custom //Auto if connected to a printer at start-up, or Custom if not.
Item Item
{ {
@ -143,13 +143,13 @@ Cura.ExpandableComponent
AutoConfiguration AutoConfiguration
{ {
id: autoConfiguration id: autoConfiguration
visible: popupItem.configuration_method == ConfigurationMenu.ConfigurationMethod.AUTO visible: popupItem.configuration_method == ConfigurationMenu.ConfigurationMethod.Auto
} }
CustomConfiguration CustomConfiguration
{ {
id: customConfiguration id: customConfiguration
visible: popupItem.configuration_method == ConfigurationMenu.ConfigurationMethod.CUSTOM visible: popupItem.configuration_method == ConfigurationMenu.ConfigurationMethod.Custom
} }
} }
@ -177,7 +177,7 @@ Cura.ExpandableComponent
Cura.SecondaryButton Cura.SecondaryButton
{ {
id: goToCustom id: goToCustom
visible: popupItem.configuration_method == ConfigurationMenu.ConfigurationMethod.AUTO visible: popupItem.configuration_method == ConfigurationMenu.ConfigurationMethod.Auto
text: catalog.i18nc("@label", "Custom") text: catalog.i18nc("@label", "Custom")
anchors.right: parent.right anchors.right: parent.right
@ -185,18 +185,18 @@ Cura.ExpandableComponent
iconSource: UM.Theme.getIcon("arrow_right") iconSource: UM.Theme.getIcon("arrow_right")
isIconOnRightSide: true isIconOnRightSide: true
onClicked: popupItem.configuration_method = ConfigurationMenu.ConfigurationMethod.CUSTOM onClicked: popupItem.configuration_method = ConfigurationMenu.ConfigurationMethod.Custom
} }
Cura.SecondaryButton Cura.SecondaryButton
{ {
id: goToAuto id: goToAuto
visible: popupItem.configuration_method == ConfigurationMenu.ConfigurationMethod.CUSTOM visible: popupItem.configuration_method == ConfigurationMenu.ConfigurationMethod.Custom
text: catalog.i18nc("@label", "Configurations") text: catalog.i18nc("@label", "Configurations")
iconSource: UM.Theme.getIcon("arrow_left") iconSource: UM.Theme.getIcon("arrow_left")
onClicked: popupItem.configuration_method = ConfigurationMenu.ConfigurationMethod.AUTO onClicked: popupItem.configuration_method = ConfigurationMenu.ConfigurationMethod.Auto
} }
} }
} }