3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'CURA-5785-Restyle_stage_menu' of github.com:Ultimaker/Cura into CURA-5785-Restyle_stage_menu

Browse source
This commit is contained in:
Jaime van Kessel 2018-11-16 14:58:47 +01:00
commit 320efa443e
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/PreviewStage/PreviewMenu.qml
View file

@ -54,13 +54,13 @@ Item
{ {
for (var i = 0; i < viewModel.rowCount(); i++) for (var i = 0; i < viewModel.rowCount(); i++)
{ {
if(viewModel.getItem(i).active) if (viewModel.getItem(i).active)
{ {
return viewModel.getItem(i) return viewModel.getItem(i)
} }
} }
// Nothing was active, so just return the first one (the list is sorted by priority, so the most // Nothing was active, so just return the first one (the list is sorted by priority, so the most
// important one sshould be returned) // important one should be returned)
return viewModel.getItem(0) return viewModel.getItem(0)
} }

2
resources/qml/IconWithText.qml
View file

@ -10,7 +10,7 @@ import Cura 1.0 as Cura
// Reusable component that holds an (re-colorable) icon on the left with some text on the right. // Reusable component that holds an (re-colorable) icon on the left with some text on the right.
// This component is also designed to be used with layouts. It will use the width of the text + icon as preferred width // This component is also designed to be used with layouts. It will use the width of the text + icon as preferred width
// It sets the icon size + half of the content as it's minium width (in which case it will elide the text) // It sets the icon size + half of the content as its minium width (in which case it will elide the text)
Item Item
{ {
property alias iconColor: icon.color property alias iconColor: icon.color

4
resources/qml/MachineSelector.qml
View file

@ -82,8 +82,8 @@ Cura.ExpandableComponent
radius: UM.Theme.getSize("default_radius").width radius: UM.Theme.getSize("default_radius").width
onClicked: onClicked:
{ {
togglePopup() togglePopup()
Cura.MachineManager.setActiveMachine(model.id) Cura.MachineManager.setActiveMachine(model.id)
} }
Connections Connections