anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Shortcut box now stays open if bad input (#8703)

Browse Source 
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.
This commit is contained in:
Scott Kostyshak 2014-01-14 08:04:05 -05:00
parent 2a99afee94
commit 27131e655a
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/generate_contributions.py
View File

@ -851,6 +851,14 @@ contributors = [
"22 February 2005", "22 February 2005",
u"Danish translation"), 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", contributor(u"Bernard Hurley",
"bernard () fong-hurley ! org ! uk", "bernard () fong-hurley ! org ! uk",
"GPL", "GPL",

4
src/frontends/qt4/GuiPrefs.cpp
View File

@ -2804,8 +2804,6 @@ PrefShortcuts::PrefShortcuts(GuiPreferences * form)
shortcut_bc_.setOK(shortcut_->okPB); shortcut_bc_.setOK(shortcut_->okPB);
shortcut_bc_.setCancel(shortcut_->cancelPB); shortcut_bc_.setCancel(shortcut_->cancelPB);
connect(shortcut_->okPB, SIGNAL(clicked()),
shortcut_, SLOT(accept()));
connect(shortcut_->okPB, SIGNAL(clicked()), connect(shortcut_->okPB, SIGNAL(clicked()),
this, SIGNAL(changed())); this, SIGNAL(changed()));
connect(shortcut_->cancelPB, SIGNAL(clicked()), connect(shortcut_->cancelPB, SIGNAL(clicked()),
@ -3180,6 +3178,8 @@ void PrefShortcuts::shortcutOkPressed()
return; return;
} }
shortcut_->accept();
// check to see if there's been any change // check to see if there's been any change
FuncRequest oldBinding = system_bind_.getBinding(k); FuncRequest oldBinding = system_bind_.getBinding(k);
if (oldBinding.action() == LFUN_UNKNOWN_ACTION) if (oldBinding.action() == LFUN_UNKNOWN_ACTION)