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

Rename iconOnRightSide to isIconOnRightSide

Browse Source 
More accurately represents the type of value that's in this property.

Contributes to issue CURA-5876.
This commit is contained in:
Ghostkeeper 2018-12-04 14:47:34 +01:00
parent ef29fb0cfa
commit 2fdfdaa00b
No known key found for this signature in database
GPG Key ID: 86BEF881AE2CF276
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
resources/qml/ActionButton.qml
View File

@ -12,7 +12,7 @@ Button
{ {
id: button id: button
property alias iconSource: buttonIconLeft.source property alias iconSource: buttonIconLeft.source
property var iconOnRightSide: false property bool isIconOnRightSide: false
property alias textFont: buttonText.font property alias textFont: buttonText.font
property alias cornerRadius: backgroundRect.radius property alias cornerRadius: backgroundRect.radius
property alias tooltip: tooltip.text property alias tooltip: tooltip.text
@ -43,7 +43,7 @@ Button
contentItem: Row contentItem: Row
{ {
//Left side icon. Only displayed if !iconOnRightSide. //Left side icon. Only displayed if !isIconOnRightSide.
UM.RecolorImage UM.RecolorImage
{ {
id: buttonIconLeft id: buttonIconLeft
@ -53,7 +53,7 @@ Button
sourceSize.width: width sourceSize.width: width
sourceSize.height: height sourceSize.height: height
color: button.hovered ? button.textHoverColor : button.textColor color: button.hovered ? button.textHoverColor : button.textColor
visible: source != "" && !button.iconOnRightSide visible: source != "" && !button.isIconOnRightSide
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
@ -71,7 +71,7 @@ Button
elide: Text.ElideRight elide: Text.ElideRight
} }
//Right side icon. Only displayed if iconOnRightSide. //Right side icon. Only displayed if isIconOnRightSide.
UM.RecolorImage UM.RecolorImage
{ {
id: buttonIconRight id: buttonIconRight
@ -81,7 +81,7 @@ Button
sourceSize.width: width sourceSize.width: width
sourceSize.height: height sourceSize.height: height
color: buttonIconLeft.color color: buttonIconLeft.color
visible: source != "" && button.iconOnRightSide visible: source != "" && button.isIconOnRightSide
anchors.verticalCenter: buttonIconLeft.verticalCenter anchors.verticalCenter: buttonIconLeft.verticalCenter
} }
} }

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

@ -162,7 +162,7 @@ Cura.ExpandableComponent
anchors.right: parent.right anchors.right: parent.right
iconSource: UM.Theme.getIcon("arrow_right") iconSource: UM.Theme.getIcon("arrow_right")
iconOnRightSide: true isIconOnRightSide: true
onClicked: popupItem.configuration_method = ConfigurationMenu.ConfigurationMethod.CUSTOM onClicked: popupItem.configuration_method = ConfigurationMenu.ConfigurationMethod.CUSTOM
} }