Fix for bug #8939: Don't just close if the user enters a shortcut

that is already assigned.

From new contributor Roy Xia.

diff --git a/lib/generate_contributions.py b/lib/generate_contributions.py
index 0c7e59a80dc39fd9414a65cf119c91e622bfe3eb..f3983559865e40c22f3c10b6cbd2bcb0f892789e 100755 (executable)
--- a/lib/generate_contributions.py
+++ b/lib/generate_contributions.py
@@ -1907,6 +1907,14 @@ contributors = [
                  "3 March 2014",
                  u"Chinese (traditional) translations"),
 
+     contributor(u"Roy Xia",
+                 "royxia062 () gmail ! com",
+                 "GPL",
+                 "GPL Statement",
+                 "m=139434481324689",
+                 "9 March 2014",
+                 u"Bugfixing"),
+
      contributor(u"Yihui Xie",
                  "xie () yihui ! name",
                  "GPL",

diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index e910b0cd974580f9b7dbc777ff3e6bd60898dac5..d93124931e24071c6de0462b1d68ddc8efc94d8f 100644 (file)
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -3182,8 +3182,6 @@ void PrefShortcuts::shortcutOkPressed()
                return;
        }
 
-       shortcut_->accept();
-
        // check to see if there's been any change
        FuncRequest oldBinding = system_bind_.getBinding(k);
        if (oldBinding.action() == LFUN_UNKNOWN_ACTION)
@@ -3192,20 +3190,40 @@ void PrefShortcuts::shortcutOkPressed()
                // nothing has changed
                return;
        
-       // make sure this key isn't already bound---and, if so, not unbound
+       // make sure this key isn't already bound---and, if so, prompt user
        FuncCode const unbind = user_unbind_.getBinding(k).action();
        docstring const action_string = makeCmdString(oldBinding);
        if (oldBinding.action() > LFUN_NOACTION && unbind == LFUN_UNKNOWN_ACTION
                  && save_lfun_ != toqstr(action_string)) {
-               // FIXME Perhaps we should offer to over-write the old shortcut?
-               // If so, we'll need to remove it from our list, etc.
-               Alert::error(_("Failed to create shortcut"),
-                       bformat(_("Shortcut `%1$s' is already bound to:\n%2$s\n"
-                         "You need to remove that binding before creating a new one."), 
-                       k.print(KeySequence::ForGui), action_string));
-               return;
+               docstring const new_action_string = makeCmdString(func);
+               docstring const text = bformat(_("Shortcut `%1$s' is already bound to "
+                                                "%2$s.\n"
+                                                "Are you sure you want to unbind the "
+                                                "current shortcut and bind it to %3$s?"),
+                                              k.print(KeySequence::ForGui), action_string,
+                                              new_action_string);
+               int ret = Alert::prompt(_("Redefine shortcut?"),
+                                       text, 0, 1, _("&Redefine"), _("&Cancel"));
+               if (ret != 0)
+                       return;
+               QString const sequence_text = toqstr(k.print(KeySequence::ForGui));
+               QList<QTreeWidgetItem*> items = shortcutsTW->findItems(sequence_text,
+                       Qt::MatchFlags(Qt::MatchExactly | Qt::MatchRecursive), 1);
+               if (items.size() > 0) {
+                       // should always happen
+                       bool expanded = items[0]->parent()->isExpanded();
+                       shortcutsTW->setCurrentItem(items[0]);
+                       removeShortcut();
+                       shortcutsTW->setCurrentItem(0);
+                       // make sure user doesn't see tree expansion if
+                       // old binding wasn't in an expanded tree
+                       if (!expanded)
+                               items[0]->parent()->setExpanded(false);
+               }
        }
 
+       shortcut_->accept();
+
        if (!save_lfun_.isEmpty())
                // real modification of the lfun's shortcut,
                // so remove the previous one