Merge branch 'master' of github.com:Ultimaker/Cura

This commit is contained in:
Jaime van Kessel 2019-07-19 12:43:38 +02:00
commit 3dde93e7f4
2 changed files with 7 additions and 1 deletions

View File

@ -591,7 +591,12 @@ UM.MainWindow
modality: Qt.WindowModal modality: Qt.WindowModal
selectMultiple: true selectMultiple: true
nameFilters: UM.MeshFileHandler.supportedReadFileTypes; 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: onAccepted:
{ {
// Because several implementations of the file dialog only update the folder // Because several implementations of the file dialog only update the folder

View File

@ -55,6 +55,7 @@ Item
delegate: Button delegate: Button
{ {
id: stageSelectorButton
text: model.name.toUpperCase() text: model.name.toUpperCase()
checkable: true checkable: true
checked: UM.Controller.activeStage !== null && model.id == UM.Controller.activeStage.stageId checked: UM.Controller.activeStage !== null && model.id == UM.Controller.activeStage.stageId