mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-08 14:34:01 -06:00
Make sidebar view working for active stage
This commit is contained in:
parent
0e1c9146cf
commit
a57a5aab6b
14 changed files with 605 additions and 812 deletions
|
@ -366,8 +366,7 @@ UM.MainWindow
|
|||
onStopMonitoringPrint: base.showPrintMonitor = false
|
||||
}
|
||||
|
||||
Sidebar
|
||||
{
|
||||
Loader {
|
||||
id: sidebar
|
||||
|
||||
anchors
|
||||
|
@ -379,7 +378,8 @@ UM.MainWindow
|
|||
|
||||
width: UM.Theme.getSize("sidebar").width
|
||||
z: 1
|
||||
monitoringPrint: base.showPrintMonitor
|
||||
|
||||
sourceComponent: UM.Controller.activeStage.sidebarComponent
|
||||
}
|
||||
|
||||
Rectangle
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -6,7 +6,7 @@ import QtQuick.Controls 1.1
|
|||
import QtQuick.Controls.Styles 1.1
|
||||
import QtQuick.Layouts 1.1
|
||||
|
||||
import UM 1.2 as UM
|
||||
import UM 1.4 as UM
|
||||
import Cura 1.0 as Cura
|
||||
import "Menus"
|
||||
|
||||
|
@ -83,34 +83,13 @@ Rectangle
|
|||
style: UM.Theme.styles.topbar_header_tab
|
||||
height: UM.Theme.getSize("sidebar_header").height
|
||||
onClicked: UM.Controller.setActiveStage(model.id)
|
||||
iconSource: model.stage.iconSource
|
||||
|
||||
property color overlayColor: "transparent"
|
||||
property string overlayIconSource: ""
|
||||
}
|
||||
}
|
||||
|
||||
// Button
|
||||
// {
|
||||
// id: showSettings
|
||||
// height: UM.Theme.getSize("sidebar_header").height
|
||||
// text: catalog.i18nc("@title:tab", "Prepare")
|
||||
// checkable: true
|
||||
// checked: isChecked()
|
||||
// exclusiveGroup: sidebarHeaderBarGroup
|
||||
// style: UM.Theme.styles.topbar_header_tab
|
||||
//
|
||||
// // We use a Qt.binding to re-bind the checkbox state after manually setting it
|
||||
// // https://stackoverflow.com/questions/38798450/qt-5-7-qml-why-are-my-checkbox-property-bindings-disappearing
|
||||
// onClicked: {
|
||||
// base.stopMonitoringPrint()
|
||||
// checked = Qt.binding(isChecked)
|
||||
// }
|
||||
//
|
||||
// function isChecked () {
|
||||
// return !base.monitoringPrint
|
||||
// }
|
||||
//
|
||||
// property color overlayColor: "transparent"
|
||||
// property string overlayIconSource: ""
|
||||
// }
|
||||
|
||||
// Button
|
||||
// {
|
||||
// id: showMonitor
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue