Solved merge conflict. CURA-3321

2025-11-24 19:31:16 -07:00 · 2017-03-07 10:34:53 +01:00 · 2017-03-07 10:34:53 +01:00 · 42d939b34e
commit 42d939b34e
parent b2e06bed37 3468bae732
65 changed files with 1358 additions and 418 deletions
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@ -870,6 +870,21 @@ UM.MainWindow
        }
    }

+    DiscardOrKeepProfileChangesDialog
+    {
+        id: discardOrKeepProfileChangesDialog
+    }
+
+    Connections
+    {
+        target: Printer
+        onShowDiscardOrKeepProfileChanges:
+        {
+            discardOrKeepProfileChangesDialog.show()
+        }
+
+    }
+
    Connections
    {
        target: Cura.Actions.addMachine