From d2566d72ff3d4db3270246c9a2c04c6dd383ce73 Mon Sep 17 00:00:00 2001
From: Saumya Jain <saumya.jain@ultimaker.com>
Date: Tue, 20 Feb 2024 16:56:34 +0100
Subject: [PATCH] for preference to open dialo while saving ucp

CURA-11403
---
 plugins/3MFWriter/UCPDialog.qml                  | 12 +++++++++---
 resources/qml/Dialogs/WorkspaceSummaryDialog.qml |  2 +-
 resources/qml/Menus/FileMenu.qml                 | 13 ++++++++++++-
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/plugins/3MFWriter/UCPDialog.qml b/plugins/3MFWriter/UCPDialog.qml
index 7eaf57c96b..3a0e6bf842 100644
--- a/plugins/3MFWriter/UCPDialog.qml
+++ b/plugins/3MFWriter/UCPDialog.qml
@@ -19,12 +19,12 @@ UM.Dialog
     minimumHeight: UM.Theme.getSize("modal_window_minimum").height
 
     backgroundColor: UM.Theme.getColor("detail_background")
-    property bool dontShowAgain: true
+    property bool dontShowAgain: false
 
     function storeDontShowAgain()
     {
         UM.Preferences.setValue("cura/dialog_on_ucp_project_save", !dontShowAgainCheckbox.checked)
-        UM.Preferences.setValue("asked_dialog_on_ucp_project_save", true)
+        UM.Preferences.setValue("cura/asked_dialog_on_ucp_project_save", false)
     }
 
     onVisibleChanged:
@@ -115,5 +115,11 @@ UM.Dialog
 
     buttonSpacing: UM.Theme.getSize("wide_margin").width
 
-    onClosing: manager.notifyClosed()
+    onClosing:
+    {
+        storeDontShowAgain()
+        manager.notifyClosed()
+    }
+    onRejected: storeDontShowAgain()
+    onAccepted: storeDontShowAgain()
 }
diff --git a/resources/qml/Dialogs/WorkspaceSummaryDialog.qml b/resources/qml/Dialogs/WorkspaceSummaryDialog.qml
index a174959807..1eca2f395c 100644
--- a/resources/qml/Dialogs/WorkspaceSummaryDialog.qml
+++ b/resources/qml/Dialogs/WorkspaceSummaryDialog.qml
@@ -25,7 +25,7 @@ UM.Dialog
     function storeDontShowAgain()
     {
         UM.Preferences.setValue("cura/dialog_on_project_save", !dontShowAgainCheckbox.checked)
-        UM.Preferences.setValue("asked_dialog_on_project_save", true)
+        UM.Preferences.setValue("cura/asked_dialog_on_project_save", true)
     }
 
     onClosing: storeDontShowAgain()
diff --git a/resources/qml/Menus/FileMenu.qml b/resources/qml/Menus/FileMenu.qml
index bc0d1e6aef..3f8c0daac0 100644
--- a/resources/qml/Menus/FileMenu.qml
+++ b/resources/qml/Menus/FileMenu.qml
@@ -77,7 +77,18 @@ Cura.Menu
         enabled: UM.WorkspaceFileHandler.enabled && CuraApplication.getPackageManager().allEnabledPackages.includes("3MFWriter")
         onTriggered:
         {
-             CuraApplication.exportUcp()
+            if(UM.Preferences.getValue("cura/dialog_on_ucp_project_save"))
+            {
+                CuraApplication.exportUcp()
+            }
+            else
+            {
+                var args = { "filter_by_machine": false,
+                         "file_type": "workspace",
+                         "preferred_mimetypes": "application/x-ucp",
+                         "limit_mimetypes": ["application/x-ucp"]};
+                UM.OutputDeviceManager.requestWriteToDevice("local_file", PrintInformation.jobName, args)
+            }
         }
     }