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 27131e655a)

Conflicts:
	lib/generate_contributions.py

lib/generate_contributions.py

@@ -825,6 +825,14 @@ contributers = [
                  "22 February 2005",
                  u"Danish translation"),
 
+     contributer(u"Martin Hoffmann",
+                 "hoffimar@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",

src/frontends/qt4/GuiPrefs.cpp

@@ -2743,8 +2743,6 @@ PrefShortcuts::PrefShortcuts(GuiPreferences * form)
 	shortcut_bc_.setOK(shortcut_->okPB);
 	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()),
@@ -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)

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