From 27131e655af4a1b4b917c1d8b24c58cd9251d1b8 Mon Sep 17 00:00:00 2001 From: Scott Kostyshak Date: Tue, 14 Jan 2014 08:04:05 -0500 Subject: [PATCH] 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. --- lib/generate_contributions.py | 8 ++++++++ src/frontends/qt4/GuiPrefs.cpp | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/generate_contributions.py b/lib/generate_contributions.py index e2dcf7dcd3..50348db4b4 100755 --- a/lib/generate_contributions.py +++ b/lib/generate_contributions.py @@ -851,6 +851,14 @@ contributors = [ "22 February 2005", u"Danish translation"), + contributor(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"), + contributor(u"Bernard Hurley", "bernard () fong-hurley ! org ! uk", "GPL", diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp index 68f6aaeb63..868669099c 100644 --- a/src/frontends/qt4/GuiPrefs.cpp +++ b/src/frontends/qt4/GuiPrefs.cpp @@ -2804,8 +2804,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()), @@ -3180,6 +3178,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) -- 2.39.5