#include "insets/InsetVSpace.h"
#include "insets/InsetWrap.h"
-#include "frontends/Application.h"
#include "frontends/alert.h"
-#include "frontends/Dialogs.h"
+#include "frontends/Application.h"
#include "frontends/FileDialog.h"
#include "frontends/FontLoader.h"
-#include "frontends/Gui.h"
#include "frontends/KeySymbol.h"
#include "frontends/LyXView.h"
#include "frontends/Selection.h"
namespace Alert = frontend::Alert;
extern bool quitting;
+extern bool use_gui;
namespace {
void LyXFunc::processKeySym(KeySymbol const & keysym, KeyModifier state)
{
- LYXERR(Debug::KEY) << "KeySym is " << keysym.getSymbolName() << endl;
+ LYXERR(Debug::KEY, "KeySym is " << keysym.getSymbolName());
// Do nothing if we have nothing (JMarc)
if (!keysym.isOK()) {
- LYXERR(Debug::KEY) << "Empty kbd action (probably composing)"
- << endl;
+ LYXERR(Debug::KEY, "Empty kbd action (probably composing)");
lyx_view_->restartCursor();
return;
}
if (keysym.isModifier()) {
- LYXERR(Debug::KEY) << "isModifier true" << endl;
+ LYXERR(Debug::KEY, "isModifier true");
lyx_view_->restartCursor();
return;
}
cancel_meta_seq.reset();
FuncRequest func = cancel_meta_seq.addkey(keysym, state);
- LYXERR(Debug::KEY) << BOOST_CURRENT_FUNCTION
- << " action first set to [" << func.action << ']'
- << endl;
+ LYXERR(Debug::KEY, BOOST_CURRENT_FUNCTION
+ << " action first set to [" << func.action << ']');
// When not cancel or meta-fake, do the normal lookup.
// Note how the meta_fake Mod1 bit is OR-ed in and reset afterwards.
if ((func.action != LFUN_CANCEL) && (func.action != LFUN_META_PREFIX)) {
// remove Caps Lock and Mod2 as a modifiers
func = keyseq.addkey(keysym, (state | meta_fake_bit));
- LYXERR(Debug::KEY) << BOOST_CURRENT_FUNCTION
- << "action now set to ["
- << func.action << ']' << endl;
+ LYXERR(Debug::KEY, BOOST_CURRENT_FUNCTION
+ << "action now set to [" << func.action << ']');
}
// Dont remove this unless you know what you are doing.
if (func.action == LFUN_NOACTION)
func = FuncRequest(LFUN_COMMAND_PREFIX);
- LYXERR(Debug::KEY) << BOOST_CURRENT_FUNCTION
- << " Key [action="
- << func.action << "]["
- << to_utf8(keyseq.print(KeySequence::Portable)) << ']'
- << endl;
+ LYXERR(Debug::KEY, BOOST_CURRENT_FUNCTION
+ << " Key [action=" << func.action << "]["
+ << to_utf8(keyseq.print(KeySequence::Portable)) << ']');
// already here we know if it any point in going further
// why not return already here if action == -1 and
// Maybe user can only reach the key via holding down shift.
// Let's see. But only if shift is the only modifier
if (func.action == LFUN_UNKNOWN_ACTION && state == ShiftModifier) {
- LYXERR(Debug::KEY) << "Trying without shift" << endl;
+ LYXERR(Debug::KEY, "Trying without shift");
func = keyseq.addkey(keysym, NoModifier);
- LYXERR(Debug::KEY) << "Action now " << func.action << endl;
+ LYXERR(Debug::KEY, "Action now " << func.action);
}
if (func.action == LFUN_UNKNOWN_ACTION) {
// if it's normal insertable text not already covered
// by a binding
if (keysym.isText() && keyseq.length() == 1) {
- LYXERR(Debug::KEY) << "isText() is true, inserting." << endl;
+ LYXERR(Debug::KEY, "isText() is true, inserting.");
func = FuncRequest(LFUN_SELF_INSERT,
FuncRequest::KEYBOARD);
} else {
- LYXERR(Debug::KEY) << "Unknown, !isText() - giving up" << endl;
+ LYXERR(Debug::KEY, "Unknown, !isText() - giving up");
lyx_view_->message(_("Unknown function."));
lyx_view_->restartCursor();
return;
docstring const arg(1, encoded_last_key);
dispatch(FuncRequest(LFUN_SELF_INSERT, arg,
FuncRequest::KEYBOARD));
- LYXERR(Debug::KEY)
- << "SelfInsert arg[`" << to_utf8(arg) << "']" << endl;
+ LYXERR(Debug::KEY, "SelfInsert arg[`" << to_utf8(arg) << "']");
}
} else {
dispatch(func);
break;
}
string const name = cmd.getArg(0);
- Inset * inset = lyx_view_->getDialogs().getOpenInset(name);
+ Inset * inset = lyx_view_->getOpenInset(name);
if (inset) {
FuncRequest fr(LFUN_INSET_MODIFY, cmd.argument());
FuncStatus fs;
}
case LFUN_DIALOG_TOGGLE:
- flag.setOnOff(lyx_view_->getDialogs().visible(cmd.getArg(0)));
+ flag.setOnOff(lyx_view_?
+ lyx_view_->isDialogVisible(cmd.getArg(0)) : false);
// fall through to set "enable"
case LFUN_DIALOG_SHOW: {
string const name = cmd.getArg(0);
break;
case LFUN_TOOLBAR_TOGGLE: {
- bool const current = lyx_view_->isToolbarVisible(cmd.getArg(0));
+ bool const current = lyx_view_?
+ lyx_view_->isToolbarVisible(cmd.getArg(0)) : false;
flag.setOnOff(current);
break;
}
case LFUN_WINDOW_CLOSE: {
- enable = (theApp()->gui().viewIds().size() > 1);
+ enable = theApp()->viewCount() > 0;
break;
}
case LFUN_CALL: {
FuncRequest func;
- std::string name(to_utf8(cmd.argument()));
+ std::string name = to_utf8(cmd.argument());
if (LyX::ref().topLevelCmdDef().lock(name, func)) {
func.origin = cmd.origin;
flag = getStatus(func);
string const argument = to_utf8(cmd.argument());
kb_action const action = cmd.action;
- LYXERR(Debug::ACTION) << endl << "LyXFunc::dispatch: cmd: " << cmd << endl;
+ LYXERR(Debug::ACTION, "\nLyXFunc::dispatch: cmd: " << cmd);
//lyxerr << "LyXFunc::dispatch: cmd: " << cmd << endl;
// we have not done anything wrong yet.
FuncStatus const flag = getStatus(cmd);
if (!flag.enabled()) {
// We cannot use this function here
- LYXERR(Debug::ACTION) << "LyXFunc::dispatch: "
+ LYXERR(Debug::ACTION, "LyXFunc::dispatch: "
<< lyxaction.getActionName(action)
- << " [" << action << "] is disabled at this location"
- << endl;
+ << " [" << action << "] is disabled at this location");
setErrorMessage(flag.message());
} else {
switch (action) {
case LFUN_BUFFER_EXPORT:
BOOST_ASSERT(lyx_view_ && lyx_view_->buffer());
if (argument == "custom")
- lyx_view_->showDialog("sendto");
+ lyx_view_->showDialog("sendto", string());
else
lyx_view_->buffer()->doExport(argument, false);
break;
// (leaving the event loop).
lyx_view_->message(from_utf8(N_("Exiting.")));
if (theBufferList().quitWriteAll())
- theApp()->gui().closeAllViews();
+ theApp()->closeAllViews();
break;
case LFUN_BUFFER_AUTO_SAVE:
case LFUN_SERVER_GET_NAME:
BOOST_ASSERT(lyx_view_ && lyx_view_->buffer());
setMessage(from_utf8(lyx_view_->buffer()->absFileName()));
- LYXERR(Debug::INFO) << "FNAME["
- << lyx_view_->buffer()->absFileName()
- << "] " << endl;
+ LYXERR(Debug::INFO, "FNAME["
+ << lyx_view_->buffer()->absFileName() << ']');
break;
case LFUN_SERVER_NOTIFY:
if (name == "character") {
data = freefont2string();
if (!data.empty())
- lyx_view_->showDialogWithData("character", data);
+ lyx_view_->showDialog("character", data);
} else if (name == "latexlog") {
Buffer::LogType type;
string const logfile = lyx_view_->buffer()->logName(&type);
break;
}
data += Lexer::quoteString(logfile);
- lyx_view_->showDialogWithData("log", data);
+ lyx_view_->showDialog("log", data);
} else if (name == "vclog") {
string const data = "vc " +
Lexer::quoteString(lyx_view_->buffer()->lyxvc().getLogFile());
- lyx_view_->showDialogWithData("log", data);
+ lyx_view_->showDialog("log", data);
} else
- lyx_view_->showDialogWithData(name, data);
+ lyx_view_->showDialog(name, data);
break;
}
break;
} // end switch(code)
if (insetCodeOK)
- lyx_view_->getDialogs().show(name, data, 0);
+ lyx_view_->showDialog(name, data, 0);
break;
}
BOOST_ASSERT(lyx_view_);
string const & name = argument;
// Can only update a dialog connected to an existing inset
- Inset * inset = lyx_view_->getDialogs().getOpenInset(name);
+ Inset * inset = lyx_view_->getOpenInset(name);
if (inset) {
FuncRequest fr(LFUN_INSET_DIALOG_UPDATE, cmd.argument());
inset->dispatch(view()->cursor(), fr);
break;
}
- case LFUN_DIALOG_HIDE:
- LyX::cref().hideDialogs(argument, 0);
+ case LFUN_DIALOG_HIDE: {
+ if (quitting || !use_gui)
+ break;
+ theApp()->hideDialogs(argument, 0);
break;
+ }
case LFUN_DIALOG_TOGGLE: {
BOOST_ASSERT(lyx_view_);
- if (lyx_view_->getDialogs().visible(cmd.getArg(0)))
+ if (lyx_view_->isDialogVisible(cmd.getArg(0)))
dispatch(FuncRequest(LFUN_DIALOG_HIDE, argument));
else
dispatch(FuncRequest(LFUN_DIALOG_SHOW, argument));
case LFUN_DIALOG_DISCONNECT_INSET:
BOOST_ASSERT(lyx_view_);
- lyx_view_->getDialogs().disconnect(argument);
+ lyx_view_->disconnectDialog(argument);
break;
case LFUN_INSET_APPLY: {
BOOST_ASSERT(lyx_view_);
string const name = cmd.getArg(0);
- Inset * inset = lyx_view_->getDialogs().getOpenInset(name);
+ Inset * inset = lyx_view_->getOpenInset(name);
if (inset) {
FuncRequest fr(LFUN_INSET_MODIFY, argument);
inset->dispatch(view()->cursor(), fr);
|| cmd.origin == FuncRequest::COMMANDBUFFER);
if (cmd.action == LFUN_SELF_INSERT || !verbose) {
- LYXERR(Debug::ACTION) << "dispatch msg is " << to_utf8(msg) << endl;
+ LYXERR(Debug::ACTION, "dispatch msg is " << to_utf8(msg));
if (!msg.empty())
lyx_view_->message(msg);
return;
dispatch_msg += '(' + rtrim(comname) + ')';
}
- LYXERR(Debug::ACTION) << "verbose dispatch msg "
- << to_utf8(dispatch_msg) << endl;
+ LYXERR(Debug::ACTION, "verbose dispatch msg " << to_utf8(dispatch_msg));
if (!dispatch_msg.empty())
lyx_view_->message(dispatch_msg);
}
string format;
string filename = split(argument, format, ' ');
- LYXERR(Debug::INFO) << "LyXFunc::doImport: " << format
- << " file: " << filename << endl;
+ LYXERR(Debug::INFO, "LyXFunc::doImport: " << format
+ << " file: " << filename);
// need user interaction
if (filename.empty()) {
case LyXRC::RC_SCREEN_FONT_SIZES:
case LyXRC::RC_SCREEN_FONT_TYPEWRITER:
case LyXRC::RC_SCREEN_FONT_TYPEWRITER_FOUNDRY:
- case LyXRC::RC_SCREEN_GEOMETRY_HEIGHT:
- case LyXRC::RC_SCREEN_GEOMETRY_WIDTH:
- case LyXRC::RC_SCREEN_GEOMETRY_XYSAVED:
+ case LyXRC::RC_GEOMETRY_SESSION:
case LyXRC::RC_SCREEN_ZOOM:
case LyXRC::RC_SERVERPIPE:
case LyXRC::RC_SET_COLOR:
projects / lyx.git / blobdiff