anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-07 12:32:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

No need to issue an error if the shortcut binding did not change.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33905 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2010-03-29 09:13:00 +00:00
parent 520709d2bb
commit df1b413587
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2803,13 +2803,9 @@ void PrefShortcuts::shortcutOkPressed()
FuncRequest oldBinding = system_bind_.getBinding(k);
if (oldBinding.action == LFUN_UNKNOWN_ACTION)
oldBinding = user_bind_.getBinding(k);
if (oldBinding == func) {
docstring const actionStr = makeCmdString(func);
Alert::error(_("Failed to create shortcut"),
bformat(_("Shortcut `%1$s' is already bound to:\n%2$s"),
k.print(KeySequence::ForGui), actionStr));
if (oldBinding == func)
// nothing has changed
return;
}
// make sure this key isn't already bound---and, if so, not unbound
FuncCode const unbind = user_unbind_.getBinding(k).action;