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

Allow to assign the shortcut to an action not only if this was an unknown action, but also when it is a no-action.

Browse Source 
This could be seen by adding a shortcut "Ctrl-R" to accent-acute. Then changing this to "Ctrl-R Ctrl-R". And then changing this back to "Ctrl-R". Now the oldBinding is NOACTION and a warning is issued that "Ctrl-R" was already bound.

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

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

@ -2810,7 +2810,7 @@ void PrefShortcuts::shortcutOkPressed()
// make sure this key isn't already bound---and, if so, not unbound
FuncCode const unbind = user_unbind_.getBinding(k).action;
docstring const action_string = makeCmdString(oldBinding);
if (oldBinding.action != LFUN_UNKNOWN_ACTION && unbind == LFUN_UNKNOWN_ACTION
if (oldBinding.action > LFUN_NOACTION && unbind == LFUN_UNKNOWN_ACTION
&& save_lfun_ != toqstr(action_string)) {
// FIXME Perhaps we should offer to over-write the old shortcut?
// If so, we'll need to remove it from our list, etc.