3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Expand/Collapse sidebar

Browse source 
CURA-4234
This commit is contained in:
Aleksei S 2017-12-11 10:53:48 +01:00
parent 2986a17c1d
commit a5cb4cd316
4 changed files with 146 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

78
resources/qml/Cura.qml
View file

@ -17,7 +17,7 @@ UM.MainWindow
id: base
//: Cura application window title
title: catalog.i18nc("@title:window","Ultimaker Cura");
viewportRect: Qt.rect(0, 0, (base.width - sidebar.width) / base.width, 1.0)
//viewportRect: Qt.rect(0, 0, (base.width - sidebar.width) / base.width, 1.0)
property bool showPrintMonitor: false
// This connection is here to support legacy printer output devices that use the showPrintMonitor signal on Application to switch to the monitor stage
@ -34,6 +34,24 @@ UM.MainWindow
}
}
onWidthChanged:
{
// If slidebar is collapsed then it should be invisible
// otherwise after the main_window resize the sidebar will be fully re-drawn
if (sidebar.collapsed){
if (sidebar.visible == true){
sidebar.visible = false
sidebar.initialWidth = 0
}
}
else{
if (sidebar.visible == false){
sidebar.visible = true
sidebar.initialWidth = UM.Theme.getSize("sidebar").width
}
}
}
Component.onCompleted:
{
CuraApplication.setMinimumWindowSize(UM.Theme.getSize("window_minimum_size"))
@ -49,6 +67,15 @@ UM.MainWindow
// This has been fixed for QtQuick Controls 2 since the Shortcut item has a context property.
Cura.Actions.parent = backgroundItem
CuraApplication.purgeWindows()
var sidebarCollaps = UM.Preferences.getValue("general/sidebar_collaps")
if (sidebarCollaps == true){
sidebar.collapsed = true;
collapsSidebarAnimation.start();
}
}
Item
@ -369,16 +396,46 @@ UM.MainWindow
{
id: sidebar
anchors
{
top: topbar.bottom
bottom: parent.bottom
right: parent.right
property bool collapsed: false;
property var initialWidth: UM.Theme.getSize("sidebar").width;
function callExpandOrCollapse(){
if(collapsed){
sidebar.visible = true
sidebar.initialWidth = UM.Theme.getSize("sidebar").width
expandSidebarAnimation.start();
}else{
collapsSidebarAnimation.start();
}
collapsed = !collapsed;
UM.Preferences.setValue("general/sidebar_collaps", collapsed);
}
width: UM.Theme.getSize("sidebar").width
anchors
{
top: topbar.top
bottom: parent.bottom
}
width: initialWidth
x: base.width - sidebar.width
source: UM.Controller.activeStage.sidebarComponent
NumberAnimation {
id: collapsSidebarAnimation
target: sidebar
properties: "x"
to: base.width
duration: 500
}
NumberAnimation {
id: expandSidebarAnimation
target: sidebar
properties: "x"
to: base.width - sidebar.width
duration: 500
}
}
Loader
@ -417,6 +474,13 @@ UM.MainWindow
}
}
// Expand or collapse sidebar
Connections
{
target: Cura.Actions.expandSidebar
onTriggered: sidebar.callExpandOrCollapse()
}
UM.PreferencesDialog
{
id: preferences