3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-05 04:54:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Move active view panel to previewStage

Browse source 
CURA-5829
This commit is contained in:
Jaime van Kessel 2018-10-29 13:39:00 +01:00
parent 9cc7a7ca23
commit ebe533bdc8
2 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

15
plugins/PreviewStage/PreviewMenu.qml
View file

@ -21,6 +21,8 @@ Item
Row
{
anchors.horizontalCenter: parent.horizontalCenter
spacing: UM.Theme.getSize("default_margin").width
ComboBox
{
// This item contains the views selector, a combobox that is dynamically created from
@ -67,6 +69,19 @@ Item
currentIndex: getActiveIndex()
}
Loader
{
// TODO: Make this panel collapsable and ensure it has a standardised background.
id: viewPanel
property var buttonTarget: Qt.point(viewModeButton.x + Math.round(viewModeButton.width / 2), viewModeButton.y + Math.round(viewModeButton.height / 2))
height: childrenRect.height
width: childrenRect.width
source: UM.ActiveView.valid ? UM.ActiveView.activeViewPanel : ""
}
Cura.PrintSetupSelector
{
width: UM.Theme.getSize("print_setup_widget").width

16
resources/qml/Cura.qml
View file

@ -230,22 +230,6 @@ UM.MainWindow
}
}
Loader
{
id: viewPanel
anchors.bottom: viewModeButton.top
anchors.topMargin: UM.Theme.getSize("default_margin").height
anchors.right: viewModeButton.right
property var buttonTarget: Qt.point(viewModeButton.x + Math.round(viewModeButton.width / 2), viewModeButton.y + Math.round(viewModeButton.height / 2))
height: childrenRect.height
width: childrenRect.width
source: UM.ActiveView.valid ? UM.ActiveView.activeViewPanel : ""
}
Cura.ActionPanelWidget
{
anchors.right: parent.right