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

Merge branch 'CURA-5785-Restyle_stage_menu' into CURA-5942_printer_selector

Browse Source
This commit is contained in:
Diego Prado Gesto 2018-11-21 13:19:23 +01:00
commit 7c9cd75cf9
5 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/PreviewStage/PreviewMenu.qml
View File

@ -68,6 +68,7 @@ Item
elide: Text.ElideRight
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
}
popupItem: Column

7
plugins/SimulationView/SimulationViewMenuComponent.qml
View File

@ -132,6 +132,7 @@ Cura.ExpandableComponent
visible: UM.SimulationView.compatibilityMode
height: UM.Theme.getSize("layerview_row").height
width: parent.width
renderType: Text.NativeRendering
}
Item // Spacer
@ -188,7 +189,7 @@ Cura.ExpandableComponent
leftMargin: UM.Theme.getSize("checkbox").width + Math.round(UM.Theme.getSize("default_margin").width / 2)
rightMargin: UM.Theme.getSize("default_margin").width * 2
}
renderType: Text.NativeRendering
}
}
}
@ -254,6 +255,7 @@ Cura.ExpandableComponent
text: label
font: UM.Theme.getFont("default")
elide: Text.ElideRight
renderType: Text.NativeRendering
color: UM.Theme.getColor("setting_control_text")
anchors.verticalCenter: parent.verticalCenter
anchors.left: legendModelCheckBox.left
@ -310,7 +312,7 @@ Cura.ExpandableComponent
width: parent.width
color: UM.Theme.getColor("setting_control_text")
font: UM.Theme.getFont("default")
renderType: Text.NativeRendering
Rectangle
{
anchors.verticalCenter: parent.verticalCenter
@ -357,6 +359,7 @@ Cura.ExpandableComponent
anchors.left: parent.left
color: UM.Theme.getColor("setting_control_text")
font: UM.Theme.getFont("default")
renderType: Text.NativeRendering
}
Label

1
resources/qml/ExtruderIcon.qml
View File

@ -53,6 +53,7 @@ Item
width: contentWidth
height: contentHeight
visible: extruderEnabled
renderType: Text.NativeRendering
}
UM.RecolorImage

3
resources/qml/MachineSelector.qml
View File

@ -36,6 +36,7 @@ Cura.ExpandableComponent
renderType: Text.NativeRendering
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
}
popupItem: Item
@ -64,6 +65,7 @@ Cura.ExpandableComponent
renderType: Text.NativeRendering
font: UM.Theme.getFont("medium_bold")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
verticalAlignment: Text.AlignVCenter
}
@ -107,6 +109,7 @@ Cura.ExpandableComponent
font: UM.Theme.getFont("medium_bold")
color: UM.Theme.getColor("text")
verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
}
Repeater

1
resources/qml/PrintSetupSelector.qml
View File

@ -182,6 +182,7 @@ Cura.ExpandableComponent
verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering
elide: Text.ElideRight
color:
{
if(control.pressed)