[LyX/2.0.x] Shortcut box now stays open if bad input (#8703)

[Scott Kostyshak]

commit 2ec8880e47fec249cf70c21a0e3eea816ca84e60
Author: Scott Kostyshak <skost...@lyx.org>
Date:   Tue Jan 14 08:04:05 2014 -0500

    Shortcut box now stays open if bad input (#8703)
    
    This allows the user to correct the bad input without
    having to enter the other fields again in a new dialog.
    
    Patch from Martin Hoffmann.
    (cherry picked from commit 27131e655af4a1b4b917c1d8b24c58cd9251d1b8)
    
    Conflicts:
        lib/generate_contributions.py

diff --git a/lib/generate_contributions.py b/lib/generate_contributions.py
index 2240790..42916e8 100755
--- a/lib/generate_contributions.py
+++ b/lib/generate_contributions.py
@@ -825,6 +825,14 @@ contributers = [
                  "22 February 2005",
                  u"Danish translation"),
 
+     contributer(u"Martin Hoffmann",
+                 "hoffi...@gmail.com",
+                 "GPL",
+                 "Re: #8703: 'new shortcut' box closes if no shortcut",
+                 "m=138105799411067",
+                 "6 October 2013",
+                 u"Dialog usability fix"),
+
      contributer(u"Bernard Hurley",
                  "bernard () fong-hurley ! org ! uk",
                  "GPL",
diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index 5a9c810..c486692 100644
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -2744,8 +2744,6 @@ PrefShortcuts::PrefShortcuts(GuiPreferences * form)
        shortcut_bc_.setCancel(shortcut_->cancelPB);
 
        connect(shortcut_->okPB, SIGNAL(clicked()),
-               shortcut_, SLOT(accept()));
-       connect(shortcut_->okPB, SIGNAL(clicked()),
                this, SIGNAL(changed()));
        connect(shortcut_->cancelPB, SIGNAL(clicked()),
                shortcut_, SLOT(reject()));
@@ -3119,6 +3117,8 @@ 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)
diff --git a/status.20x b/status.20x
index eb077d8..00781c8 100644
--- a/status.20x
+++ b/status.20x
@@ -89,6 +89,8 @@ What's new
 
 - Prevent recurrent pop-up of "missing module requirements" warning (bug 8864).
 
+- Do not close shortcut box if we receive bad input (bug 8703).
+
 
 * DOCUMENTATION AND LOCALIZATION