Added sizes to the stage menu

This isn't themed, but right now it does adhere to the sizes I got from UX

CURA-5785
This commit is contained in:
Jaime van Kessel 2018-11-12 15:53:09 +01:00
parent 783fe9ab73
commit 4c1a45f904
2 changed files with 41 additions and 34 deletions

View file

@ -1,5 +1,5 @@
import QtQuick 2.7 import QtQuick 2.7
import QtQuick.Layouts 1.1
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import UM 1.3 as UM import UM 1.3 as UM
@ -19,9 +19,12 @@ Item
name: "cura" name: "cura"
} }
Row // Item to ensure that all of the buttons are nicely centered.
Item
{ {
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
width: openFileButton.width + UM.Theme.getSize("default_margin").width + itemRow.width
height: parent.height
Button Button
{ {
@ -33,42 +36,46 @@ Item
action: Cura.Actions.open action: Cura.Actions.open
} }
Item RowLayout
{ {
id: spacing id: itemRow
width: UM.Theme.getSize("default_margin").width
height: prepareMenu.height
}
Cura.MachineSelector anchors.left: openFileButton.right
{ anchors.leftMargin: UM.Theme.getSize("default_margin").width
id: machineSelection
width: UM.Theme.getSize("machine_selector_widget").width - configSelection.width
height: prepareMenu.height
z: openFileButton.z - 1
}
Cura.QuickConfigurationSelector width: 0.9 * prepareMenu.width
{ height: parent.height
height: prepareMenu.height
width: UM.Theme.getSize("configuration_selector_widget").width
/*id: configSelection
width: visible ? UM.Theme.getSize("machine_selector_widget").width * 0.2 : 0
panelWidth: UM.Theme.getSize("machine_selector_widget").width
height: prepareMenu.height*/
}
/*Cura.CustomConfigurationSelector Cura.MachineSelector
{ {
width: UM.Theme.getSize("configuration_selector_widget").width id: machineSelection
}*/ z: openFileButton.z - 1
Cura.PrintSetupSelector Layout.minimumWidth: 240
{ Layout.maximumWidth: 240
width: UM.Theme.getSize("print_setup_widget").width Layout.fillWidth: true
height: prepareMenu.height Layout.fillHeight: true
onShowTooltip: prepareMenu.showTooltip(item, location, text) }
onHideTooltip: prepareMenu.hideTooltip()
Cura.QuickConfigurationSelector
{
Layout.fillHeight: true
Layout.fillWidth: true
Layout.preferredWidth: itemRow.width - machineSelection.width - printSetupSelector.width
}
Cura.PrintSetupSelector
{
id: printSetupSelector
onShowTooltip: prepareMenu.showTooltip(item, location, text)
onHideTooltip: prepareMenu.hideTooltip()
Layout.minimumWidth: 460
Layout.maximumWidth: 460
Layout.fillWidth: true
Layout.fillHeight: true
}
} }
} }
} }

View file

@ -19,7 +19,7 @@ ToolButton
text: isNetworkPrinter ? Cura.MachineManager.activeMachineNetworkGroupName : Cura.MachineManager.activeMachineName text: isNetworkPrinter ? Cura.MachineManager.activeMachineNetworkGroupName : Cura.MachineManager.activeMachineName
tooltip: Cura.MachineManager.activeMachineName tooltip: Cura.MachineManager.activeMachineName
width: 240
style: ButtonStyle style: ButtonStyle
{ {
background: Rectangle background: Rectangle