From 14d27fe32402fedeba177d5cf14e391ac8060805 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Tue, 3 Feb 2004 11:49:05 +0000 Subject: [PATCH] fiix FIXMEs by moving message() from FuncRequest to the cursor git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8390 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/BufferView_pimpl.C | 10 +++++----- src/cursor.C | 20 ++++++++++++++++---- src/cursor.h | 7 ++++++- src/funcrequest.C | 27 ++------------------------- src/funcrequest.h | 6 +----- src/text3.C | 20 ++++++++++---------- 6 files changed, 40 insertions(+), 50 deletions(-) diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C index 29d9d1ac19..29fcc5391d 100644 --- a/src/BufferView_pimpl.C +++ b/src/BufferView_pimpl.C @@ -1184,7 +1184,7 @@ bool BufferView::Pimpl::dispatch(FuncRequest const & cmd) cur.clearSelection(); bv_->update(); cur.resetAnchor(); - cmd.message(N_("Mark off")); + cur.message(N_("Mark off")); break; case LFUN_MARK_ON: @@ -1192,23 +1192,23 @@ bool BufferView::Pimpl::dispatch(FuncRequest const & cmd) cur.mark() = true; bv_->update(); cur.resetAnchor(); - cmd.message(N_("Mark on")); + cur.message(N_("Mark on")); break; case LFUN_SETMARK: cur.clearSelection(); if (cur.mark()) { - cmd.message(N_("Mark removed")); + cur.message(N_("Mark removed")); } else { cur.mark() = true; - cmd.message(N_("Mark set")); + cur.message(N_("Mark set")); } cur.resetAnchor(); bv_->update(); break; case LFUN_UNKNOWN_ACTION: - cmd.errorMessage(N_("Unknown function!")); + cur.errorMessage(N_("Unknown function!")); break; default: diff --git a/src/cursor.C b/src/cursor.C index 0722215073..854886481b 100644 --- a/src/cursor.C +++ b/src/cursor.C @@ -20,9 +20,10 @@ #include "funcrequest.h" #include "iterators.h" #include "lfuns.h" +#include "lyxfunc.h" // only for setMessage() #include "lyxrc.h" -#include "lyxtext.h" #include "lyxrow.h" +#include "lyxtext.h" #include "paragraph.h" #include "insets/updatableinset.h" @@ -34,6 +35,7 @@ #include "mathed/math_support.h" #include "support/limited_stack.h" +#include "frontends/LyXView.h" #include @@ -574,9 +576,8 @@ void LCursor::info(std::ostream & os) cursor_[i].inset()->infoize(os); os << " "; } -#warning FIXME - //if (pos() != 0) - // prevAtom()->infoize2(os); + if (pos() != 0) + prevInset()->infoize2(os); // overwite old message os << " "; } @@ -1831,3 +1832,14 @@ InsetBase * LCursor::prevInset() return par.isInset(pos() - 1) ? par.getInset(pos() - 1) : 0; } + +void LCursor::message(string const & msg) const +{ + bv().owner()->getLyXFunc().setMessage(msg); +} + + +void LCursor::errorMessage(string const & msg) const +{ + bv().owner()->getLyXFunc().setErrorMessage(msg); +} diff --git a/src/cursor.h b/src/cursor.h index 0d316b2fac..c4003b3fc6 100644 --- a/src/cursor.h +++ b/src/cursor.h @@ -401,9 +401,14 @@ public: void handleFont(std::string const & font); void releaseMathCursor(); - + /// are we in mathed? bool inMathed() const; + /// display a message + void message(std::string const & msg) const; + /// display an error message + void errorMessage(std::string const & msg) const; + private: /// moves cursor index one cell to the left bool idxLeft(); diff --git a/src/funcrequest.C b/src/funcrequest.C index 8dfd9f6d79..c3b0c2d4bc 100644 --- a/src/funcrequest.C +++ b/src/funcrequest.C @@ -11,15 +11,12 @@ #include #include "funcrequest.h" -#include "BufferView.h" -#include "lyxfunc.h" // only for setMessage() -#include "frontends/LyXView.h" -#include "debug.h" + #include "support/std_sstream.h" #include +#include -using std::endl; using std::getline; using std::istringstream; @@ -59,26 +56,6 @@ mouse_button::state FuncRequest::button() const } -void FuncRequest::message(string const & msg) const -{ -#warning FIXME - //if (view_) - // view_->owner()->getLyXFunc().setMessage(msg); - //else - lyxerr << "Dropping message '" << msg << "'" << endl; -} - - -void FuncRequest::errorMessage(string const & msg) const -{ -#warning FIXME - //if (view_) - // view_->owner()->getLyXFunc().setErrorMessage(msg); - //else - lyxerr << "Dropping error message '" << msg << "'" << endl; -} - - void split(vector & args, string str) { istringstream is(str); diff --git a/src/funcrequest.h b/src/funcrequest.h index 8224d29460..d38ed13bfc 100644 --- a/src/funcrequest.h +++ b/src/funcrequest.h @@ -18,6 +18,7 @@ #include #include + /** * This class encapsulates a LyX action and its argument * in order to pass it around easily. @@ -38,11 +39,6 @@ public: /// access to button mouse_button::state button() const; - /// output a message - void message(std::string const & msg) const; - /// output an error message - void errorMessage(std::string const & msg) const; - /// argument parsing, extract argument i as std::string std::string getArg(unsigned int i) const; diff --git a/src/text3.C b/src/text3.C index a5432ea4e0..7e3e694dcd 100644 --- a/src/text3.C +++ b/src/text3.C @@ -935,7 +935,7 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd) break; case LFUN_PASTE: - cmd.message(_("Paste")); + cur.message(_("Paste")); replaceSelection(bv->getLyXText()); #warning FIXME Check if the arg is in the domain of available selections. if (isStrUnsignedInt(cmd.argument)) @@ -950,13 +950,13 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd) case LFUN_CUT: cutSelection(true, true); - cmd.message(_("Cut")); + cur.message(_("Cut")); bv->update(); break; case LFUN_COPY: copySelection(); - cmd.message(_("Copy")); + cur.message(_("Copy")); break; case LFUN_BEGINNINGBUFSEL: @@ -978,7 +978,7 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd) break; case LFUN_GETXY: - cmd.message(tostr(cursorX(cur.current())) + ' ' + cur.message(tostr(cursorX(cur.current())) + ' ' + tostr(cursorY(cur.current()))); break; @@ -997,15 +997,15 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd) case LFUN_GETFONT: if (current_font.shape() == LyXFont::ITALIC_SHAPE) - cmd.message("E"); + cur.message("E"); else if (current_font.shape() == LyXFont::SMALLCAPS_SHAPE) - cmd.message("N"); + cur.message("N"); else - cmd.message("0"); + cur.message("0"); break; case LFUN_GETLAYOUT: - cmd.message(cursorPar()->layout()->name()); + cur.message(cursorPar()->layout()->name()); break; case LFUN_LAYOUT: { @@ -1018,7 +1018,7 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd) // function list/array with information about what // functions needs arguments and their type. if (cmd.argument.empty()) { - cmd.errorMessage(_("LyX function 'layout' needs an argument.")); + cur.errorMessage(_("LyX function 'layout' needs an argument.")); break; } @@ -1036,7 +1036,7 @@ DispatchResult LyXText::dispatch(LCursor & cur, FuncRequest const & cmd) } if (!hasLayout) { - cmd.errorMessage(string(N_("Layout ")) + cmd.argument + + cur.errorMessage(string(N_("Layout ")) + cmd.argument + N_(" not known")); break; } -- 2.39.2