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

Align the buttons at the bottom of the panel

Browse source 
Contributes to CURA-5941.
This commit is contained in:
Diego Prado Gesto 2018-11-29 15:54:02 +01:00
parent f67c725b2a
commit bc8bf87809
2 changed files with 45 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

71
resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml
View file

@ -11,7 +11,7 @@ Item
{
id: popup
width: UM.Theme.getSize("print_setup_widget").width
width: UM.Theme.getSize("print_setup_widget").width - 2 * UM.Theme.getSize("default_margin").width
height: childrenRect.height
property int currentModeIndex: -1
@ -87,22 +87,50 @@ Item
color: UM.Theme.getColor("lining")
}
Loader
Item
{
id: loader
width: parent.width
id: contents
height: childrenRect.height
anchors
{
top: header.bottom
left: parent.left
right: parent.right
}
RecommendedPrintSetup
{
anchors
{
left: parent.left
right: parent.right
top: parent.top
}
onShowTooltip: base.showTooltip(item, location, text)
onHideTooltip: base.hideTooltip()
visible: currentModeIndex == 0
}
CustomPrintSetup
{
anchors
{
left: parent.left
right: parent.right
top: parent.top
}
onShowTooltip: base.showTooltip(item, location, text)
onHideTooltip: base.hideTooltip()
visible: currentModeIndex == 1
}
sourceComponent: currentModeIndex == 0 ? recommendedPrintSetup : customPrintSetup
}
Rectangle
{
id: buttonsSeparator
anchors.top: loader.bottom
anchors.top: contents.bottom
width: parent.width
height: UM.Theme.getSize("default_lining").height
color: UM.Theme.getColor("lining")
@ -111,7 +139,8 @@ Item
Item
{
id: buttonRow
height: childrenRect.height
property real padding: UM.Theme.getSize("default_margin").width
height: childrenRect.height + 2 * padding
// The buttonsSeparator is inside the buttonRow. This is to avoid some weird behaviours with the scroll bar.
anchors
@ -123,46 +152,32 @@ Item
Cura.SecondaryButton
{
anchors.top: parent.top
anchors.left: parent.left
anchors.margins: parent.padding
leftPadding: UM.Theme.getSize("default_margin").width
rightPadding: UM.Theme.getSize("default_margin").width
text: catalog.i18nc("@button", "Recommended")
iconSource: UM.Theme.getIcon("arrow_left")
visible: currentModeIndex == 1
onClicked: currentModeIndex = 0
}
Cura.SecondaryButton
{
anchors.top: parent.top
anchors.right: parent.right
anchors.margins: UM.Theme.getSize("default_margin").width
leftPadding: UM.Theme.getSize("default_margin").width
rightPadding: UM.Theme.getSize("default_margin").width
text: catalog.i18nc("@button", "Custom")
iconSource: UM.Theme.getIcon("arrow_right")
iconOnRightSide: true
visible: currentModeIndex == 0
onClicked: currentModeIndex = 1
}
}
Component
{
id: recommendedPrintSetup
RecommendedPrintSetup
{
onShowTooltip: base.showTooltip(item, location, text)
onHideTooltip: base.hideTooltip()
}
}
Component
{
id: customPrintSetup
CustomPrintSetup
{
onShowTooltip: base.showTooltip(item, location, text)
onHideTooltip: base.hideTooltip()
}
}
Component.onCompleted:
{
var index = Math.round(UM.Preferences.getValue("cura/active_mode"))