anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-28 20:45:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Handle sending a FuncRequest object to lyxerr

Browse Source 
* Implement the corresponding operator<<

  * Use it in a couple new places
This commit is contained in:
Jean-Marc Lasgouttes 2012-06-07 17:19:04 +02:00
parent 6db7ac6eb9
commit fb80ce20ca
5 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/BufferView.cpp
View File

@ -1204,14 +1204,7 @@ void BufferView::editInset(string const & name, Inset * inset)
void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr) void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
{ {
//lyxerr << [ cmd = " << cmd << "]" << endl; LYXERR(Debug::ACTION, "BufferView::dispatch: cmd: " << cmd);
// Make sure that the cached BufferView is correct.
LYXERR(Debug::ACTION, " action[" << cmd.action() << ']'
<< " arg[" << to_utf8(cmd.argument()) << ']'
<< " x[" << cmd.x() << ']'
<< " y[" << cmd.y() << ']'
<< " button[" << cmd.button() << ']');
string const argument = to_utf8(cmd.argument()); string const argument = to_utf8(cmd.argument());
Cursor & cur = d->cursor_; Cursor & cur = d->cursor_;

12
src/FuncRequest.cpp
View File

@ -13,6 +13,7 @@
#include "FuncRequest.h" #include "FuncRequest.h"
#include "LyXAction.h" #include "LyXAction.h"
#include "support/debug.h"
#include "support/lstrings.h" #include "support/lstrings.h"
#include <climits> #include <climits>
@ -132,12 +133,19 @@ bool operator==(FuncRequest const & lhs, FuncRequest const & rhs)
ostream & operator<<(ostream & os, FuncRequest const & cmd) ostream & operator<<(ostream & os, FuncRequest const & cmd)
{ {
return os return os
<< " action: " << cmd.action() << " action: " << cmd.action()
<< " [" << lyxaction.getActionName(cmd.action()) << "] " << " [" << lyxaction.getActionName(cmd.action()) << "] "
<< " arg: '" << to_utf8(cmd.argument()) << "'" << " arg: '" << to_utf8(cmd.argument()) << "'"
<< " x: " << cmd.x() << " x: " << cmd.x()
<< " y: " << cmd.y(); << " y: " << cmd.y();
} }
LyXErr & operator<<(LyXErr &l, FuncRequest const &fr)
{
ostringstream oss;
oss << fr;
return l << oss.str();
}
} // namespace lyx } // namespace lyx

4
src/FuncRequest.h
View File

@ -21,6 +21,8 @@
namespace lyx { namespace lyx {
class LyXErr;
/** /**
* This class encapsulates a LyX action and its argument * This class encapsulates a LyX action and its argument
* in order to pass it around easily. * in order to pass it around easily.
@ -108,6 +110,8 @@ bool operator==(FuncRequest const & lhs, FuncRequest const & rhs);
std::ostream & operator<<(std::ostream &, FuncRequest const &); std::ostream & operator<<(std::ostream &, FuncRequest const &);
LyXErr & operator<<(LyXErr &, FuncRequest const &);
} // namespace lyx } // namespace lyx

3
src/insets/InsetText.cpp
View File

@ -261,8 +261,7 @@ Inset * InsetText::editXY(Cursor & cur, int x, int y)
void InsetText::doDispatch(Cursor & cur, FuncRequest & cmd) void InsetText::doDispatch(Cursor & cur, FuncRequest & cmd)
{ {
LYXERR(Debug::ACTION, "InsetText::doDispatch()" LYXERR(Debug::ACTION, "InsetText::doDispatch(): cmd: " << cmd);
<< " [ cmd.action() = " << cmd.action() << ']');
if (getLayout().isPassThru()) { if (getLayout().isPassThru()) {
// Force any new text to latex_language FIXME: This // Force any new text to latex_language FIXME: This

3
status.20x
View File

@ -291,6 +291,9 @@ What's new
- Fixed compilation with clang. - Fixed compilation with clang.
- In debugging messages related to LyX actions, make sure that the
action and its arguments are correctly reported.
- Included the qt gif plugin in the Windows installer. This - Included the qt gif plugin in the Windows installer. This
enables the busy icon in the status bar. enables the busy icon in the status bar.