From 416caba0ec2d155d64c0dfe0543d1e334b603474 Mon Sep 17 00:00:00 2001 From: Abdelrazak Younes Date: Sat, 19 Sep 2009 11:54:23 +0000 Subject: [PATCH] Transfer completely LFUN_COMMAND_EXECUTE and LFUN_MESSAGE to GuiView. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31396 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/LyXFunc.cpp | 7 ------- src/frontends/qt4/GuiView.cpp | 8 +++++++- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/LyXFunc.cpp b/src/LyXFunc.cpp index b06bf0f1bc..e84331d655 100644 --- a/src/LyXFunc.cpp +++ b/src/LyXFunc.cpp @@ -591,7 +591,6 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const } case LFUN_COMMAND_PREFIX: - case LFUN_COMMAND_EXECUTE: case LFUN_CANCEL: case LFUN_META_PREFIX: case LFUN_BUFFER_CLOSE: @@ -612,7 +611,6 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const case LFUN_REPEAT: case LFUN_BUFFER_EXPORT_CUSTOM: case LFUN_PREFERENCES_SAVE: - case LFUN_MESSAGE: case LFUN_INSET_EDIT: case LFUN_BUFFER_LANGUAGE: case LFUN_TEXTCLASS_APPLY: @@ -1267,11 +1265,6 @@ void LyXFunc::dispatch(FuncRequest const & cmd) break; } - case LFUN_MESSAGE: - LASSERT(lyx_view_, /**/); - lyx_view_->message(from_utf8(argument)); - break; - case LFUN_BUFFER_LANGUAGE: { LASSERT(lyx_view_, /**/); Language const * oldL = buffer->params().language; diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index b245b02a68..7518834ce7 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -1278,7 +1278,9 @@ bool GuiView::getStatus(FuncRequest const & cmd, FuncStatus & flag) enable = name == "prefs"; break; } - + + case LFUN_COMMAND_EXECUTE: + case LFUN_MESSAGE: case LFUN_MENU_OPEN: // Nothing to check. break; @@ -2526,6 +2528,10 @@ bool GuiView::dispatch(FuncRequest const & cmd) break; } + case LFUN_MESSAGE: + message(cmd.argument()); + break; + case LFUN_INSET_APPLY: { string const name = cmd.getArg(0); Inset * inset = getOpenInset(name); -- 2.39.2