mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-11-02 20:52:20 -07:00
Merge branch 'master' of github.com:Ultimaker/Cura
This commit is contained in:
commit
3dde93e7f4
2 changed files with 7 additions and 1 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue