Merge branch 'feature_CURA-3397_profile_override_dialog_options' of https://github.com/LipuFei/Cura

cura/CuraApplication.py

@@ -243,6 +243,7 @@ class CuraApplication(QtApplication):
         Preferences.getInstance().addPreference("mesh/scale_tiny_meshes", True)
         Preferences.getInstance().addPreference("cura/dialog_on_project_save", True)
         Preferences.getInstance().addPreference("cura/asked_dialog_on_project_save", False)
+        Preferences.getInstance().addPreference("cura/choice_on_profile_override", 0)
 
         Preferences.getInstance().addPreference("cura/currency", "€")
         Preferences.getInstance().addPreference("cura/material_settings", "{}")
@@ -334,7 +335,16 @@ class CuraApplication(QtApplication):
     showDiscardOrKeepProfileChanges = pyqtSignal()
 
     def discardOrKeepProfileChanges(self):
-        self.showDiscardOrKeepProfileChanges.emit()
+        choice = Preferences.getInstance().getValue("cura/choice_on_profile_override")
+        if choice == 1:
+            # don't show dialog and DISCARD the profile
+            self.discardOrKeepProfileChangesClosed("discard")
+        elif choice == 2:
+            # don't show dialog and KEEP the profile
+            self.discardOrKeepProfileChangesClosed("keep")
+        else:
+            # ALWAYS ask whether to keep or discard the profile
+            self.showDiscardOrKeepProfileChanges.emit()
 
     @pyqtSlot(str)
     def discardOrKeepProfileChangesClosed(self, option):

resources/qml/DiscardOrKeepProfileChangesDialog.qml

@@ -101,7 +101,7 @@ UM.Dialog
             TableViewColumn
             {
                 role: "label"
-                title: catalog.i18nc("@title:column", "Settings")
+                title: catalog.i18nc("@title:column", "Profile settings")
                 delegate: labelDelegate
                 width: tableView.width * 0.5
             }
@@ -109,7 +109,7 @@ UM.Dialog
             TableViewColumn
             {
                 role: "original_value"
-                title: "Profile"
+                title: "Default"
                 width: tableView.width * 0.25
                 delegate: defaultDelegate
             }
@@ -129,6 +129,27 @@ UM.Dialog
             model: base.changesModel
         }
 
+        Item
+        {
+            anchors.right: parent.right
+            anchors.left: parent.left
+            anchors.margins: UM.Theme.getSize("default_margin").width
+            height:childrenRect.height
+
+            ComboBox
+            {
+                id: discardOrKeepProfileChangesDropDownButton
+                model: [
+                    catalog.i18nc("@option:discardOrKeep", "Always ask me this"),
+                    catalog.i18nc("@option:discardOrKeep", "Discard and never ask again"),
+                    catalog.i18nc("@option:discardOrKeep", "Keep and never ask again")
+                ]
+                width: 300
+                currentIndex: UM.Preferences.getValue("cura/choice_on_profile_override")
+                onCurrentIndexChanged: UM.Preferences.setValue("cura/choice_on_profile_override", currentIndex)
+            }
+        }
+
         Item
         {
             anchors.right: parent.right
@@ -146,6 +167,7 @@ UM.Dialog
                     Printer.discardOrKeepProfileChangesClosed("discard")
                     base.hide()
                 }
+                isDefault: true
             }
 
             Button

resources/qml/Preferences/GeneralPage.qml

@@ -47,6 +47,8 @@ UM.PreferencesPage
         centerOnSelectCheckbox.checked = boolCheck(UM.Preferences.getValue("view/center_on_select"))
         UM.Preferences.resetPreference("view/top_layer_count");
         topLayerCountCheckbox.checked = boolCheck(UM.Preferences.getValue("view/top_layer_count"))
+        UM.Preferences.resetPreference("cura/choice_on_profile_override")
+        choiceOnProfileOverrideDropDownButton.currentIndex = UM.Preferences.getValue("cura/choice_on_profile_override")
 
         if (plugins.find("id", "SliceInfoPlugin") > -1) {
             UM.Preferences.resetPreference("info/send_slice_info")
@@ -377,6 +379,40 @@ UM.PreferencesPage
                 }
             }
 
+            Item
+            {
+                //: Spacer
+                height: UM.Theme.getSize("default_margin").height
+                width: UM.Theme.getSize("default_margin").width
+            }
+
+            Label
+            {
+                font.bold: true
+                text: catalog.i18nc("@label", "Override Profile")
+            }
+
+            UM.TooltipArea
+            {
+                width: childrenRect.width;
+                height: childrenRect.height;
+
+                text: catalog.i18nc("@info:tooltip", "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again.")
+
+                ComboBox
+                {
+                    id: choiceOnProfileOverrideDropDownButton
+
+                    model: [
+                        catalog.i18nc("@option:discardOrKeep", "Always ask me this"),
+                        catalog.i18nc("@option:discardOrKeep", "Discard and never ask again"),
+                        catalog.i18nc("@option:discardOrKeep", "Keep and never ask again")
+                    ]
+                    width: 300
+                    currentIndex: UM.Preferences.getValue("cura/choice_on_profile_override")
+                    onCurrentIndexChanged: UM.Preferences.setValue("cura/choice_on_profile_override", currentIndex)
+                }
+            }
 
             Item
             {