From 07ad6b8d9d989c2f3fd67875d34faac1dd85ef3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= Date: Mon, 22 Dec 2008 10:47:50 +0000 Subject: [PATCH] * GuiPrefs.cpp (apply): - unbind existing shortcuts before binding new ones (bug 5444). Patch submitted and tested by Bennett. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@27949 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiPrefs.cpp | 4 ++-- status.16x | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp index 435d00d639..222833b325 100644 --- a/src/frontends/qt4/GuiPrefs.cpp +++ b/src/frontends/qt4/GuiPrefs.cpp @@ -2092,8 +2092,8 @@ void PrefShortcuts::apply(LyXRC & rc) const return; } FileName user_bind_file(bind_dir.absFilename() + "/user.bind"); - user_bind_.write(user_bind_file.toFilesystemEncoding(), false, false); - user_unbind_.write(user_bind_file.toFilesystemEncoding(), true, true); + user_unbind_.write(user_bind_file.toFilesystemEncoding(), false, true); + user_bind_.write(user_bind_file.toFilesystemEncoding(), true, false); // immediately apply the keybindings. Why this is not done before? // The good thing is that the menus are updated automatically. theTopLevelKeymap().clear(); diff --git a/status.16x b/status.16x index 248e751806..90870f40a8 100644 --- a/status.16x +++ b/status.16x @@ -83,6 +83,8 @@ What's new - Enable "dissolve" item in context menus of collapsable insets (bug 4985). +- Fix unbinding/binding behaviour of shortcuts (bug 4544). + * DOCUMENTATION AND LOCALIZATION