From ed503cb6ecc714a23b4de3590ec82fc5eadb81e9 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 5 Apr 2019 17:07:12 +0200 Subject: [PATCH] Removed platform check that always had the same result The UM.Application.platform property has been removed by someone for quite some time. I don't know why the check was in there, but it doesn't seem needed at all as the property was always undefined --- .../resources/qml/ToolboxConfirmUninstallResetDialog.qml | 2 +- resources/qml/Cura.qml | 2 +- resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml | 2 +- resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml b/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml index e238132680..81649fdfef 100644 --- a/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml +++ b/plugins/Toolbox/resources/qml/ToolboxConfirmUninstallResetDialog.qml @@ -26,7 +26,7 @@ UM.Dialog minimumWidth: 450 * screenScaleFactor minimumHeight: 150 * screenScaleFactor - modality: UM.Application.platform == "linux" ? Qt.NonModal : Qt.WindowModal + modality: Qt.WindowModal Column { diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index dd985fe5c3..982f371a7b 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -563,7 +563,7 @@ UM.MainWindow //: File open dialog title title: catalog.i18nc("@title:window","Open file(s)") - modality: UM.Application.platform == "linux" ? Qt.NonModal : Qt.WindowModal; + modality: Qt.WindowModal selectMultiple: true nameFilters: UM.MeshFileHandler.supportedReadFileTypes; folder: CuraApplication.getDefaultPath("dialog_load_path") diff --git a/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml b/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml index 6b1856723b..f6436f62c5 100644 --- a/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml +++ b/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml @@ -26,7 +26,7 @@ UM.Dialog minimumHeight: maximumHeight minimumWidth: maximumWidth - modality: UM.Application.platform == "linux" ? Qt.NonModal : Qt.WindowModal + modality: Qt.WindowModal property var fileUrl diff --git a/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml b/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml index 3dcd4b6236..0df914805a 100644 --- a/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml +++ b/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml @@ -25,7 +25,7 @@ UM.Dialog minimumHeight: height minimumWidth: width - modality: UM.Application.platform == "linux" ? Qt.NonModal : Qt.WindowModal; + modality: Qt.WindowModal property var fileUrls: [] property int spacerHeight: 10 * screenScaleFactor