From 4b8274d7cbf4223b7566d213ae7678c7e82ff03f Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 18 Jul 2019 13:42:33 +0200 Subject: [PATCH 1/2] Add ID to stage selection buttons Necessary to switch stages in the Squish tests. Contributes to issue CURA-6276. --- resources/qml/MainWindow/MainWindowHeader.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/qml/MainWindow/MainWindowHeader.qml b/resources/qml/MainWindow/MainWindowHeader.qml index 43ec03d947..5d1a20c8b1 100644 --- a/resources/qml/MainWindow/MainWindowHeader.qml +++ b/resources/qml/MainWindow/MainWindowHeader.qml @@ -55,6 +55,7 @@ Item delegate: Button { + id: stageSelectorButton text: model.name.toUpperCase() checkable: true checked: UM.Controller.activeStage !== null && model.id == UM.Controller.activeStage.stageId From 7aec564848ffb7f76fa0c5eaff4d4c9995d3d8df Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 19 Jul 2019 12:37:51 +0200 Subject: [PATCH 2/2] Attempt at fixing saving of load location on Linux Hope this also works on the Qt version used by our build system... --- resources/qml/Cura.qml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index ffa6502563..4c143dcf0b 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -591,7 +591,12 @@ UM.MainWindow modality: Qt.WindowModal selectMultiple: true nameFilters: UM.MeshFileHandler.supportedReadFileTypes; - folder: CuraApplication.getDefaultPath("dialog_load_path") + folder: + { + //Because several implementations of the file dialog only update the folder when it is explicitly set. + folder = CuraApplication.getDefaultPath("dialog_load_path"); + return CuraApplication.getDefaultPath("dialog_load_path"); + } onAccepted: { // Because several implementations of the file dialog only update the folder