From 1d5345289c8f6ae083390d56e2c847343f74087d Mon Sep 17 00:00:00 2001 From: Abdelrazak Younes Date: Sat, 19 Sep 2009 16:59:36 +0000 Subject: [PATCH] Move LFUN_KEYMAP_* to BufferView. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31410 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/BufferView.cpp | 19 +++++++++++++++++++ src/LyXFunc.cpp | 24 ------------------------ 2 files changed, 19 insertions(+), 24 deletions(-) diff --git a/src/BufferView.cpp b/src/BufferView.cpp index 9b16202c3a..b5a4ebc25c 100644 --- a/src/BufferView.cpp +++ b/src/BufferView.cpp @@ -937,6 +937,10 @@ bool BufferView::getStatus(FuncRequest const & cmd, FuncStatus & flag) case LFUN_ALL_INSETS_TOGGLE: case LFUN_STATISTICS: case LFUN_BRANCH_ADD_INSERT: + case LFUN_KEYMAP_OFF: + case LFUN_KEYMAP_PRIMARY: + case LFUN_KEYMAP_SECONDARY: + case LFUN_KEYMAP_TOGGLE: flag.setEnabled(true); break; @@ -1552,6 +1556,21 @@ bool BufferView::dispatch(FuncRequest const & cmd) break; } + case LFUN_KEYMAP_OFF: + getIntl().keyMapOn(false); + break; + + case LFUN_KEYMAP_PRIMARY: + getIntl().keyMapPrim(); + break; + + case LFUN_KEYMAP_SECONDARY: + getIntl().keyMapSec(); + break; + + case LFUN_KEYMAP_TOGGLE: + getIntl().toggleKeyMap(); + break; default: return false; diff --git a/src/LyXFunc.cpp b/src/LyXFunc.cpp index 05c8d471f4..46929f83cb 100644 --- a/src/LyXFunc.cpp +++ b/src/LyXFunc.cpp @@ -564,10 +564,6 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const case LFUN_SERVER_NOTIFY: case LFUN_SERVER_GOTO_FILE_ROW: case LFUN_CURSOR_FOLLOWS_SCROLLBAR_TOGGLE: - case LFUN_KEYMAP_OFF: - case LFUN_KEYMAP_PRIMARY: - case LFUN_KEYMAP_SECONDARY: - case LFUN_KEYMAP_TOGGLE: case LFUN_REPEAT: case LFUN_PREFERENCES_SAVE: case LFUN_INSET_EDIT: @@ -968,26 +964,6 @@ void LyXFunc::dispatch(FuncRequest const & cmd) lyxrc.cursor_follows_scrollbar = !lyxrc.cursor_follows_scrollbar; break; - case LFUN_KEYMAP_OFF: - LASSERT(lyx_view_ && lyx_view_->currentBufferView(), /**/); - lyx_view_->currentBufferView()->getIntl().keyMapOn(false); - break; - - case LFUN_KEYMAP_PRIMARY: - LASSERT(lyx_view_ && lyx_view_->currentBufferView(), /**/); - lyx_view_->currentBufferView()->getIntl().keyMapPrim(); - break; - - case LFUN_KEYMAP_SECONDARY: - LASSERT(lyx_view_ && lyx_view_->currentBufferView(), /**/); - lyx_view_->currentBufferView()->getIntl().keyMapSec(); - break; - - case LFUN_KEYMAP_TOGGLE: - LASSERT(lyx_view_ && lyx_view_->currentBufferView(), /**/); - lyx_view_->currentBufferView()->getIntl().toggleKeyMap(); - break; - case LFUN_REPEAT: { // repeat command string countstr; -- 2.39.2