From f9e377ec43c278cc61784845b18a861264132b47 Mon Sep 17 00:00:00 2001
From: Lipu Fei <lipu.fei815@gmail.com>
Date: Wed, 22 Mar 2017 13:07:58 +0100
Subject: [PATCH] Enable/disable Keep/Discard buttons according to selection

---
 .../qml/DiscardOrKeepProfileChangesDialog.qml | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/resources/qml/DiscardOrKeepProfileChangesDialog.qml b/resources/qml/DiscardOrKeepProfileChangesDialog.qml
index e2212a8f9f..2aa44f0bf0 100644
--- a/resources/qml/DiscardOrKeepProfileChangesDialog.qml
+++ b/resources/qml/DiscardOrKeepProfileChangesDialog.qml
@@ -155,7 +155,24 @@ UM.Dialog
                     }
                 }
 
-                onActivated: UM.Preferences.setValue("cura/choice_on_profile_override", model.get(index).code)
+                onCurrentIndexChanged:
+                {
+                    var code = model.get(currentIndex).code;
+                    UM.Preferences.setValue("cura/choice_on_profile_override", code);
+
+                    if (code == "always_keep") {
+                        keepButton.enabled = true;
+                        discardButton.enabled = false;
+                    }
+                    else if (code == "always_discard") {
+                        keepButton.enabled = false;
+                        discardButton.enabled = true;
+                    }
+                    else {
+                        keepButton.enabled = true;
+                        discardButton.enabled = true;
+                    }
+                }
             }
         }