#include "Converter.h"
#include "Cursor.h"
#include "CutAndPaste.h"
-#include "debug.h"
+#include "support/debug.h"
#include "DispatchResult.h"
#include "Encoding.h"
#include "ErrorList.h"
#include "Format.h"
#include "FuncRequest.h"
#include "FuncStatus.h"
-#include "gettext.h"
+#include "support/gettext.h"
#include "InsetIterator.h"
#include "Intl.h"
#include "KeyMap.h"
#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"
-#include "frontends/WorkArea.h"
#include "support/environment.h"
#include "support/FileFilterList.h"
+#include "support/FileName.h"
#include "support/filetools.h"
#include "support/lstrings.h"
#include "support/Path.h"
#include "support/convert.h"
#include "support/os.h"
-#include <boost/current_function.hpp>
-
#include <sstream>
-using std::endl;
-using std::make_pair;
-using std::pair;
-using std::string;
-using std::istringstream;
-using std::ostringstream;
-using std::find;
-using std::vector;
+using namespace std;
+using namespace lyx::support;
namespace lyx {
using frontend::LyXView;
-using support::absolutePath;
-using support::addName;
-using support::addPath;
-using support::bformat;
-using support::changeExtension;
-using support::contains;
-using support::FileFilterList;
-using support::FileName;
-using support::fileSearch;
-using support::i18nLibFileSearch;
-using support::makeDisplayPath;
-using support::makeAbsPath;
-using support::package;
-using support::quoteName;
-using support::rtrim;
-using support::split;
-using support::subst;
-using support::Systemcall;
-using support::token;
-using support::trim;
-using support::prefixIs;
-
-
namespace Alert = frontend::Alert;
extern bool quitting;
+extern bool use_gui;
namespace {
if (loader_format == "lyx") {
- Buffer * buf = lv->loadLyXFile(lyxfile);
+ Buffer * buf = theLyXFunc().loadAndViewFile(lyxfile);
if (!buf) {
// we are done
lv->message(_("file not imported!"));
}
updateLabels(*buf);
lv->setBuffer(buf);
- lv->showErrorList("Parse");
+ buf->errors("Parse");
} else {
Buffer * const b = newFile(lyxfile.absFilename(), string(), true);
if (b)
string filename2 = (loader_format == format) ? filename.absFilename()
: changeExtension(filename.absFilename(),
formats.extension(loader_format));
- lv->view()->insertPlaintextFile(filename2, as_paragraphs);
- lv->dispatch(FuncRequest(LFUN_MARK_OFF));
+ lv->view()->insertPlaintextFile(FileName(filename2), as_paragraphs);
+ theLyXFunc().setLyXView(lv);
+ lyx::dispatch(FuncRequest(LFUN_MARK_OFF));
}
// we are done
lv.message(_("Running configure..."));
// Run configure in user lyx directory
- support::Path p(package().user_support());
+ PathChanger p(package().user_support());
string configure_command = package().configure_command();
configure_command += option;
Systemcall one;
p.pop();
// emit message signal.
lv.message(_("Reloading configuration..."));
- lyxrc.read(support::libFileSearch(string(), "lyxrc.defaults"));
+ lyxrc.read(libFileSearch(string(), "lyxrc.defaults"));
// Re-read packages.lst
LaTeXFeatures::getAvailable();
}
-namespace {
-void restartCursor(LyXView * lv)
-{
- /* When we move around, or type, it's nice to be able to see
- * the cursor immediately after the keypress.
- */
- if (lv && lv->currentWorkArea())
- lv->currentWorkArea()->startBlinkingCursor();
-}
-}
-
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;
- restartCursor(lyx_view_);
+ LYXERR(Debug::KEY, "Empty kbd action (probably composing)");
+ lyx_view_->restartCursor();
return;
}
if (keysym.isModifier()) {
- LYXERR(Debug::KEY) << "isModifier true" << endl;
- restartCursor(lyx_view_);
+ 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, "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, "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, " Key [action=" << func.action << "]["
+ << 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."));
- restartCursor(lyx_view_);
+ 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);
}
- restartCursor(lyx_view_);
+ lyx_view_->restartCursor();
}
//lyxerr << "LyXFunc::getStatus: cmd: " << cmd << endl;
FuncStatus flag;
- /* In LyX/Mac, when a dialog is open, the menus of the
- application can still be accessed without giving focus to
- the main window. In this case, we want to disable the menu
- entries that are buffer-related.
-
- Note that this code is not perfect, as bug 1941 attests:
- http://bugzilla.lyx.org/show_bug.cgi?id=1941#c4
- */
Buffer * buf = lyx_view_? lyx_view_->buffer() : 0;
- if (lyx_view_ && cmd.origin == FuncRequest::MENU && !lyx_view_->hasFocus())
- buf = 0;
if (cmd.action == LFUN_NOACTION) {
flag.message(from_utf8(N_("Nothing to do")));
// to handle (Andre')
bool enable = true;
switch (cmd.action) {
+
+ // FIXME: these cases should be hidden in GuiApplication::getStatus().
+ case LFUN_WINDOW_CLOSE:
+ if (theApp())
+ return theApp()->getStatus(cmd);
+ enable = false;
+ break;
+
+ // FIXME: these cases should be hidden in GuiView::getStatus().
+ case LFUN_DIALOG_TOGGLE:
+ case LFUN_DIALOG_SHOW:
+ case LFUN_DIALOG_UPDATE:
+ if (cmd.argument() == "prefs"
+ || cmd.argument() == "aboutlyx")
+ enable = true;
+ else if (lyx_view_)
+ return lyx_view_->getStatus(cmd);
+ else
+ enable = false;
+ break;
+
+ case LFUN_TOOLBAR_TOGGLE:
+ case LFUN_INSET_APPLY:
+ case LFUN_BUFFER_WRITE:
+ case LFUN_BUFFER_WRITE_AS:
+ if (lyx_view_)
+ return lyx_view_->getStatus(cmd);
+ enable = false;
+ break;
+
case LFUN_BUFFER_TOGGLE_READ_ONLY:
flag.setOnOff(buf->isReadonly());
break;
&& (!buf->isClean() || buf->isExternallyModified(Buffer::timestamp_method));
break;
- case LFUN_INSET_APPLY: {
- if (!view()) {
- enable = false;
- break;
- }
- string const name = cmd.getArg(0);
- Inset * inset = lyx_view_->getDialogs().getOpenInset(name);
- if (inset) {
- FuncRequest fr(LFUN_INSET_MODIFY, cmd.argument());
- FuncStatus fs;
- if (!inset->getStatus(view()->cursor(), fr, fs)) {
- // Every inset is supposed to handle this
- BOOST_ASSERT(false);
- }
- flag |= fs;
- } else {
- FuncRequest fr(LFUN_INSET_INSERT, cmd.argument());
- flag |= getStatus(fr);
- }
- enable = flag.enabled();
- break;
- }
-
- case LFUN_DIALOG_TOGGLE:
- flag.setOnOff(lyx_view_->getDialogs().visible(cmd.getArg(0)));
- // fall through to set "enable"
- case LFUN_DIALOG_SHOW: {
- string const name = cmd.getArg(0);
- if (!buf)
- enable = name == "aboutlyx"
- || name == "file" //FIXME: should be removed.
- || name == "prefs"
- || name == "texinfo";
- else if (name == "print")
- enable = buf->isExportable("dvi")
- && lyxrc.print_command != "none";
- else if (name == "character") {
- if (!view())
- enable = false;
- else {
- InsetCode ic = view()->cursor().inset().lyxCode();
- enable = ic != ERT_CODE && ic != LISTINGS_CODE;
- }
- }
- else if (name == "latexlog")
- enable = FileName(buf->logName()).isFileReadable();
- else if (name == "spellchecker")
-#if defined (USE_ASPELL) || defined (USE_ISPELL) || defined (USE_PSPELL)
- enable = !buf->isReadonly();
-#else
- enable = false;
-#endif
- else if (name == "vclog")
- enable = buf->lyxvc().inUse();
- break;
- }
-
- case LFUN_DIALOG_UPDATE: {
- string const name = cmd.getArg(0);
- if (!buf)
- enable = name == "prefs";
- break;
- }
-
case LFUN_CITATION_INSERT: {
FuncRequest fr(LFUN_INSET_INSERT, "citation");
enable = getStatus(fr).enabled();
break;
}
-
- case LFUN_BUFFER_WRITE: {
- enable = lyx_view_->buffer()->isUnnamed()
- || !lyx_view_->buffer()->isClean();
+
+ // This could be used for the no-GUI version. The GUI version is handled in
+ // LyXView::getStatus(). See above.
+ /*
+ case LFUN_BUFFER_WRITE:
+ case LFUN_BUFFER_WRITE_AS: {
+ Buffer * b = theBufferList().getBuffer(cmd.getArg(0));
+ enable = b && (b->isUnnamed() || !b->isClean());
break;
}
-
+ */
case LFUN_BUFFER_WRITE_ALL: {
- // We enable the command only if there are some modified buffers
+ // We enable the command only if there are some modified buffers
Buffer * first = theBufferList().first();
- bool modified = false;
- if (first) {
- Buffer * b = first;
-
+ enable = false;
+ if (!first)
+ break;
+ Buffer * b = first;
// We cannot use a for loop as the buffer list is a cycle.
- do {
- if (!b->isClean()) {
- modified = true;
- break;
- }
- b = theBufferList().next(b);
- } while (b != first);
- }
-
- enable = modified;
-
+ do {
+ if (!b->isClean()) {
+ enable = true;
+ break;
+ }
+ b = theBufferList().next(b);
+ } while (b != first);
break;
}
enable = LyX::ref().session().bookmarks().size() > 0;
break;
- case LFUN_TOOLBAR_TOGGLE: {
- bool const current = lyx_view_->isToolbarVisible(cmd.getArg(0));
- flag.setOnOff(current);
- break;
- }
- case LFUN_WINDOW_CLOSE: {
- enable = (theApp()->gui().viewIds().size() > 1);
- break;
- }
-
// this one is difficult to get right. As a half-baked
// solution, we consider only the first action of the sequence
case LFUN_COMMAND_SEQUENCE: {
case LFUN_CALL: {
FuncRequest func;
- std::string name(to_utf8(cmd.argument()));
+ string name = to_utf8(cmd.argument());
if (LyX::ref().topLevelCmdDef().lock(name, func)) {
func.origin = cmd.origin;
flag = getStatus(func);
case LFUN_CANCEL:
case LFUN_META_PREFIX:
case LFUN_BUFFER_CLOSE:
- case LFUN_BUFFER_WRITE_AS:
case LFUN_BUFFER_UPDATE:
case LFUN_BUFFER_VIEW:
case LFUN_MASTER_BUFFER_UPDATE:
void loadTextClass(string const & name)
{
- std::pair<bool, textclass_type> const tc_pair =
+ pair<bool, textclass_type> const tc_pair =
textclasslist.numberOfClass(name);
if (!tc_pair.first) {
lyxerr << "Document class \"" << name
<< "\" does not exist."
- << std::endl;
+ << endl;
return;
}
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) {
lyx_view_->message(keyseq.printOptions(true));
break;
- case LFUN_COMMAND_EXECUTE:
- BOOST_ASSERT(lyx_view_);
- lyx_view_->showMiniBuffer(true);
- break;
-
case LFUN_CANCEL:
BOOST_ASSERT(lyx_view_ && lyx_view_->view());
keyseq.reset();
// --- Menus -----------------------------------------------
case LFUN_BUFFER_NEW:
- menuNew(argument, false);
+ lyx_view_->newDocument(argument, false);
updateFlags = Update::None;
break;
case LFUN_BUFFER_NEW_TEMPLATE:
- menuNew(argument, true);
+ lyx_view_->newDocument(argument, true);
updateFlags = Update::None;
break;
updateFlags = Update::None;
break;
- case LFUN_BUFFER_WRITE:
- BOOST_ASSERT(lyx_view_ && lyx_view_->buffer());
- if (!lyx_view_->buffer()->isUnnamed()) {
- docstring const str = bformat(_("Saving document %1$s..."),
- makeDisplayPath(lyx_view_->buffer()->absFileName()));
- lyx_view_->message(str);
- lyx_view_->buffer()->menuWrite();
- lyx_view_->message(str + _(" done."));
- } else {
- lyx_view_->buffer()->writeAs();
- }
- updateFlags = Update::None;
- break;
-
- case LFUN_BUFFER_WRITE_AS:
- BOOST_ASSERT(lyx_view_ && lyx_view_->buffer());
- lyx_view_->buffer()->writeAs(argument);
- updateFlags = Update::None;
- break;
-
- case LFUN_BUFFER_WRITE_ALL: {
- Buffer * first = theBufferList().first();
- if (first) {
- Buffer * b = first;
- lyx_view_->message(_("Saving all documents..."));
-
- // We cannot use a for loop as the buffer list cycles.
- do {
- if (!b->isClean()) {
- if (!b->isUnnamed()) {
- b->menuWrite();
- lyxerr[Debug::ACTION] << "Saved " << b->absFileName() << endl;
- } else
- b->writeAs();
- }
- b = theBufferList().next(b);
- } while (b != first);
- lyx_view_->message(_("All documents saved."));
- }
-
- updateFlags = Update::None;
- break;
- }
-
case LFUN_BUFFER_RELOAD: {
BOOST_ASSERT(lyx_view_ && lyx_view_->buffer());
docstring const file = makeDisplayPath(lyx_view_->buffer()->absFileName(), 20);
case LFUN_BUFFER_EXPORT:
BOOST_ASSERT(lyx_view_ && lyx_view_->buffer());
if (argument == "custom")
- lyx_view_->getDialogs().show("sendto");
+ dispatch(FuncRequest(LFUN_DIALOG_SHOW, "sendto"));
else
lyx_view_->buffer()->doExport(argument, false);
break;
if (!format) {
lyxerr << "Format \"" << format_name
<< "\" not recognized!"
- << std::endl;
+ << endl;
break;
}
string const path = buffer->temppath();
// Prevent the compiler from optimizing away p
FileName pp(path);
- support::Path p(pp);
+ PathChanger p(pp);
// there are three cases here:
// 1. we print to a file
doImport(argument);
break;
- case LFUN_LYX_QUIT:
- // quitting is triggered by the gui code
- // (leaving the event loop).
- lyx_view_->message(from_utf8(N_("Exiting.")));
- if (theBufferList().quitWriteAll())
- theApp()->gui().closeAllViews();
- break;
-
case LFUN_BUFFER_AUTO_SAVE:
lyx_view_->buffer()->autoSave();
break;
}
lyx_view_->message(bformat(_("Opening help file %1$s..."),
makeDisplayPath(fname.absFilename())));
- Buffer * buf = lyx_view_->loadLyXFile(fname, false);
+ Buffer * buf = loadAndViewFile(fname, false);
if (buf) {
updateLabels(*buf);
lyx_view_->setBuffer(buf);
- lyx_view_->showErrorList("Parse");
+ buf->errors("Parse");
}
updateFlags = Update::None;
break;
break;
// --- buffers ----------------------------------------
- case LFUN_BUFFER_SWITCH:
- BOOST_ASSERT(lyx_view_);
- lyx_view_->setBuffer(theBufferList().getBuffer(argument));
- updateFlags = Update::None;
- break;
-
- case LFUN_BUFFER_NEXT:
- BOOST_ASSERT(lyx_view_);
- lyx_view_->setBuffer(theBufferList().next(lyx_view_->buffer()));
- updateFlags = Update::None;
- break;
-
- case LFUN_BUFFER_PREVIOUS:
- BOOST_ASSERT(lyx_view_);
- lyx_view_->setBuffer(theBufferList().previous(lyx_view_->buffer()));
- updateFlags = Update::None;
- break;
case LFUN_FILE_NEW: {
BOOST_ASSERT(lyx_view_);
updateFlags = Update::None;
break;
- case LFUN_DROP_LAYOUTS_CHOICE:
- BOOST_ASSERT(lyx_view_);
- lyx_view_->openLayoutList();
- break;
-
- case LFUN_MENU_OPEN:
- BOOST_ASSERT(lyx_view_);
- lyx_view_->openMenu(from_utf8(argument));
- break;
-
// --- lyxserver commands ----------------------------
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 (theBufferList().exists(s.absFilename()))
buf = theBufferList().getBuffer(s.absFilename());
else {
- buf = lyx_view_->loadLyXFile(s);
+ buf = loadAndViewFile(s);
loaded = true;
}
}
lyx_view_->setBuffer(buf);
view()->setCursorFromRow(row);
if (loaded)
- lyx_view_->showErrorList("Parse");
+ buf->errors("Parse");
updateFlags = Update::FitCursor;
break;
}
- case LFUN_DIALOG_SHOW: {
- BOOST_ASSERT(lyx_view_);
- string const name = cmd.getArg(0);
- string data = trim(to_utf8(cmd.argument()).substr(name.size()));
-
- if (name == "character") {
- data = freefont2string();
- if (!data.empty())
- lyx_view_->getDialogs().show("character", data);
- } else if (name == "latexlog") {
- Buffer::LogType type;
- string const logfile = lyx_view_->buffer()->logName(&type);
- switch (type) {
- case Buffer::latexlog:
- data = "latex ";
- break;
- case Buffer::buildlog:
- data = "literate ";
- break;
- }
- data += Lexer::quoteString(logfile);
- lyx_view_->getDialogs().show("log", data);
- } else if (name == "vclog") {
- string const data = "vc " +
- Lexer::quoteString(lyx_view_->buffer()->lyxvc().getLogFile());
- lyx_view_->getDialogs().show("log", data);
- } else
- lyx_view_->getDialogs().show(name, data);
- break;
- }
case LFUN_DIALOG_SHOW_NEW_INSET: {
BOOST_ASSERT(lyx_view_);
}
default:
lyxerr << "Inset type '" << name <<
- "' not recognized in LFUN_DIALOG_SHOW_NEW_INSET" << std:: endl;
+ "' not recognized in LFUN_DIALOG_SHOW_NEW_INSET" << endl;
insetCodeOK = false;
break;
} // end switch(code)
if (insetCodeOK)
- lyx_view_->getDialogs().show(name, data, 0);
+ dispatch(FuncRequest(LFUN_DIALOG_SHOW, name + " " + data));
break;
}
- case LFUN_DIALOG_UPDATE: {
- 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);
- if (inset) {
- FuncRequest fr(LFUN_INSET_DIALOG_UPDATE, cmd.argument());
- inset->dispatch(view()->cursor(), fr);
- } else if (name == "paragraph") {
- dispatch(FuncRequest(LFUN_PARAGRAPH_UPDATE));
- } else if (name == "prefs") {
- lyx_view_->getDialogs().update(name, string());
- }
- break;
- }
-
- case LFUN_DIALOG_HIDE:
- LyX::cref().hideDialogs(argument, 0);
- break;
-
- case LFUN_DIALOG_TOGGLE: {
- BOOST_ASSERT(lyx_view_);
- if (lyx_view_->getDialogs().visible(cmd.getArg(0)))
- dispatch(FuncRequest(LFUN_DIALOG_HIDE, argument));
- else
- dispatch(FuncRequest(LFUN_DIALOG_SHOW, argument));
- break;
- }
-
- case LFUN_DIALOG_DISCONNECT_INSET:
- BOOST_ASSERT(lyx_view_);
- lyx_view_->getDialogs().disconnect(argument);
- break;
-
-
case LFUN_CITATION_INSERT: {
BOOST_ASSERT(lyx_view_);
if (!argument.empty()) {
} else {
setMessage(bformat(_("Opening child document %1$s..."),
makeDisplayPath(filename.absFilename())));
- child = lyx_view_->loadLyXFile(filename, true);
+ child = loadAndViewFile(filename, true);
parsed = true;
}
if (child) {
// Set the parent name of the child document.
// This makes insertion of citations and references in the child work,
// when the target is in the parent or another child document.
- child->setParentName(parent->absFileName());
+ child->setParent(parent);
updateLabels(*child->masterBuffer());
lyx_view_->setBuffer(child);
if (parsed)
- lyx_view_->showErrorList("Parse");
+ child->errors("Parse");
}
// If a screen update is required (in case where auto_open is false),
break;
}
- case LFUN_SCREEN_FONT_UPDATE:
- BOOST_ASSERT(lyx_view_);
- // handle the screen font changes.
- theFontLoader().update();
- /// FIXME: only the current view will be updated. the Gui
- /// class is able to furnish the list of views.
- updateFlags = Update::Force;
- break;
-
case LFUN_SET_COLOR: {
string lyx_name;
string const x11_name = split(argument, lyx_name, ' ');
break;
}
- case LFUN_INSET_APPLY: {
- BOOST_ASSERT(lyx_view_);
- string const name = cmd.getArg(0);
- Inset * inset = lyx_view_->getDialogs().getOpenInset(name);
- if (inset) {
- FuncRequest fr(LFUN_INSET_MODIFY, argument);
- inset->dispatch(view()->cursor(), fr);
- } else {
- FuncRequest fr(LFUN_INSET_INSERT, argument);
- dispatch(fr);
- }
- // ideally, the update flag should be set by the insets,
- // but this is not possible currently
- updateFlags = Update::Force | Update::FitCursor;
- break;
- }
-
case LFUN_ALL_INSETS_TOGGLE: {
BOOST_ASSERT(lyx_view_);
string action;
}
updateFlags = Update::Force | Update::FitCursor;
+ // We are here most certainaly because of a change in the document
+ // It is then better to make sure that all dialogs are in sync
+ // with current document settings. LyXView::restartCursor() achieve this.
+ lyx_view_->restartCursor();
break;
}
TextClassPtr oldClass = buffer->params().getTextClassPtr();
view()->cursor().recordUndoFullDocument();
buffer->params().clearLayoutModules();
+ buffer->params().makeTextClass();
updateLayout(oldClass, buffer);
updateFlags = Update::Force | Update::FitCursor;
break;
TextClassPtr oldClass = buffer->params().getTextClassPtr();
view()->cursor().recordUndoFullDocument();
buffer->params().addLayoutModule(argument);
+ buffer->params().makeTextClass();
updateLayout(oldClass, buffer);
updateFlags = Update::Force | Update::FitCursor;
break;
loadTextClass(argument);
- std::pair<bool, textclass_type> const tc_pair =
+ pair<bool, textclass_type> const tc_pair =
textclasslist.numberOfClass(argument);
if (!tc_pair.first)
TextClassPtr oldClass = buffer->params().getTextClassPtr();
view()->cursor().recordUndoFullDocument();
buffer->params().setBaseClass(new_class);
+ buffer->params().makeTextClass();
updateLayout(oldClass, buffer);
updateFlags = Update::Force | Update::FitCursor;
break;
textclass_type const tc = buffer->params().getBaseClass();
textclasslist.reset(tc);
buffer->params().setBaseClass(tc);
+ buffer->params().makeTextClass();
updateLayout(oldClass, buffer);
updateFlags = Update::Force | Update::FitCursor;
break;
actOnUpdatedPrefs(lyxrc_orig, lyxrc);
+ theApp()->resetGui();
+
/// We force the redraw in any case because there might be
/// some screen font changes.
/// FIXME: only the current view will be updated. the Gui
break;
}
- case LFUN_WINDOW_NEW:
- LyX::ref().newLyXView();
- break;
-
- case LFUN_WINDOW_CLOSE:
- BOOST_ASSERT(lyx_view_);
- BOOST_ASSERT(theApp());
- // update bookmark pit of the current buffer before window close
- for (size_t i = 0; i < LyX::ref().session().bookmarks().size(); ++i)
- gotoBookmark(i+1, false, false);
- // ask the user for saving changes or cancel quit
- if (!theBufferList().quitWriteAll())
- break;
- lyx_view_->close();
- return;
-
case LFUN_BOOKMARK_GOTO:
// go to bookmark, open unopened file and switch to buffer if necessary
gotoBookmark(convert<unsigned int>(to_utf8(cmd.argument())), true, true);
+ updateFlags = Update::FitCursor;
break;
case LFUN_BOOKMARK_CLEAR:
LyX::ref().session().bookmarks().clear();
break;
- case LFUN_TOOLBAR_TOGGLE: {
+ default:
+ BOOST_ASSERT(theApp());
+ // Let the frontend dispatch its own actions.
+ if (theApp()->dispatch(cmd))
+ // Nothing more to do.
+ return;
+
+ // Let the current LyXView dispatch its own actions.
BOOST_ASSERT(lyx_view_);
- string const name = cmd.getArg(0);
- bool const allowauto = cmd.getArg(1) == "allowauto";
- lyx_view_->toggleToolbarState(name, allowauto);
- ToolbarInfo * tbi = lyx_view_->getToolbarInfo(name);
- if (!tbi) {
- setMessage(bformat(_("Unknown toolbar \"%1$s\""),
- from_utf8(name)));
+ if (lyx_view_->dispatch(cmd)) {
+ if (lyx_view_->view())
+ updateFlags = lyx_view_->view()->cursor().result().update();
break;
}
- docstring state;
- if (tbi->flags & ToolbarInfo::ON)
- state = _("on");
- else if (tbi->flags & ToolbarInfo::OFF)
- state = _("off");
- else if (tbi->flags & ToolbarInfo::AUTO)
- state = _("auto");
-
- setMessage(bformat(_("Toolbar \"%1$s\" state set to %2$s"),
- _(tbi->gui_name), state));
- break;
- }
- default: {
- BOOST_ASSERT(lyx_view_);
+ BOOST_ASSERT(lyx_view_->view());
+ // Let the current BufferView dispatch its own actions.
+ if (view()->dispatch(cmd)) {
+ // The BufferView took care of its own updates if needed.
+ updateFlags = Update::None;
+ break;
+ }
+
+ // Let the current Cursor dispatch its own actions.
+ view()->cursor().getPos(cursorPosBeforeDispatchX_,
+ cursorPosBeforeDispatchY_);
view()->cursor().dispatch(cmd);
updateFlags = view()->cursor().result().update();
- if (!view()->cursor().result().dispatched())
- updateFlags = view()->dispatch(cmd);
- break;
- }
+ if (!view()->cursor().result().dispatched()) {
+ // No update needed in this case (e.g. when reaching
+ // top of document.
+ updateFlags = Update::None;
+ }
}
if (lyx_view_ && lyx_view_->buffer()) {
// (at least partially) visible top-level paragraphs.
// We will redraw the screen only if needed.
view()->processUpdateFlags(updateFlags);
- lyx_view_->updateStatusBar();
// if we executed a mutating lfun, mark the buffer as dirty
if (flag.enabled()
&& !lyxaction.funcHasFlag(action, LyXAction::NoBuffer)
&& !lyxaction.funcHasFlag(action, LyXAction::ReadOnly))
- lyx_view_->buffer()->markDirty();
+ lyx_view_->buffer()->markDirty();
//Do we have a selection?
theSelection().haveSelection(view()->cursor().selection());
-
- if (view()->cursor().inTexted()) {
- lyx_view_->updateLayoutChoice();
- }
}
}
if (!quitting && lyx_view_) {
- lyx_view_->updateToolbars();
// Some messages may already be translated, so we cannot use _()
sendDispatchMessage(translateIfPossible(getMessage()), cmd);
}
|| 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);
}
-void LyXFunc::menuNew(string const & name, bool fromTemplate)
+Buffer * LyXFunc::loadAndViewFile(FileName const & filename, bool tolastfiles)
{
- // FIXME: initpath is not used. What to do?
- string initpath = lyxrc.document_path;
- string filename(name);
-
- if (lyx_view_->buffer()) {
- string const trypath = lyx_view_->buffer()->filePath();
- // If directory is writeable, use this as default.
- if (FileName(trypath).isDirWritable())
- initpath = trypath;
- }
+ lyx_view_->setBusy(true);
- static int newfile_number;
+ Buffer * newBuffer = checkAndLoadLyXFile(filename);
- if (filename.empty()) {
- filename = addName(lyxrc.document_path,
- "newfile" + convert<string>(++newfile_number) + ".lyx");
- while (theBufferList().exists(filename) ||
- FileName(filename).isReadable()) {
- ++newfile_number;
- filename = addName(lyxrc.document_path,
- "newfile" + convert<string>(newfile_number) +
- ".lyx");
- }
+ if (!newBuffer) {
+ lyx_view_->message(_("Document not loaded."));
+ lyx_view_->setBusy(false);
+ return 0;
}
- // The template stuff
- string templname;
- if (fromTemplate) {
- FileDialog dlg(_("Select template file"));
- dlg.setButton1(_("Documents|#o#O"), from_utf8(lyxrc.document_path));
- dlg.setButton1(_("Templates|#T#t"), from_utf8(lyxrc.template_path));
-
- FileDialog::Result result =
- dlg.open(from_utf8(lyxrc.template_path),
- FileFilterList(_("LyX Documents (*.lyx)")),
- docstring());
+ lyx_view_->setBuffer(newBuffer);
- if (result.first == FileDialog::Later)
- return;
- if (result.second.empty())
- return;
- templname = to_utf8(result.second);
+ // scroll to the position when the file was last closed
+ if (lyxrc.use_lastfilepos) {
+ LastFilePosSection::FilePos filepos =
+ LyX::ref().session().lastFilePos().load(filename);
+ lyx_view_->view()->moveToPosition(filepos.pit, filepos.pos, 0, 0);
}
- Buffer * const b = newFile(filename, templname, !name.empty());
- if (b)
- lyx_view_->setBuffer(b);
+ if (tolastfiles)
+ LyX::ref().session().lastFiles().add(filename);
+
+ lyx_view_->setBusy(false);
+ return newBuffer;
}
lyx_view_->message(bformat(_("Opening document %1$s..."), disp_fn));
docstring str2;
- Buffer * buf = lyx_view_->loadLyXFile(fullname);
+ Buffer * buf = loadAndViewFile(fullname);
if (buf) {
updateLabels(*buf);
lyx_view_->setBuffer(buf);
- lyx_view_->showErrorList("Parse");
+ buf->errors("Parse");
str2 = bformat(_("Document %1$s opened."), disp_fn);
} else {
str2 = bformat(_("Could not open document %1$s"), disp_fn);
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()) {
FileName const lyxfile(changeExtension(fullname.absFilename(), ".lyx"));
// Check if the document already is open
- if (use_gui && theBufferList().exists(lyxfile.absFilename())) {
- if (!theBufferList().close(theBufferList().getBuffer(lyxfile.absFilename()), true)) {
+ Buffer * buf = theBufferList().getBuffer(lyxfile.absFilename());
+ if (use_gui && buf) {
+ lyx_view_->setBuffer(buf);
+ if (!lyx_view_->closeBuffer()) {
lyx_view_->message(_("Canceled."));
return;
}
for (size_t i = 0; i < LyX::ref().session().bookmarks().size(); ++i)
gotoBookmark(i+1, false, false);
- theBufferList().close(lyx_view_->buffer(), true);
+ lyx_view_->closeBuffer();
}
void LyXFunc::reloadBuffer()
{
- FileName filename(lyx_view_->buffer()->absFileName());
+ FileName filename = lyx_view_->buffer()->fileName();
+ // The user has already confirmed that the changes, if any, should
+ // be discarded. So we just release the Buffer and don't call closeBuffer();
+ theBufferList().release(lyx_view_->buffer());
+ Buffer * buf = loadAndViewFile(filename);
docstring const disp_fn = makeDisplayPath(filename.absFilename());
docstring str;
- closeBuffer();
- Buffer * buf = lyx_view_->loadLyXFile(filename);
if (buf) {
updateLabels(*buf);
lyx_view_->setBuffer(buf);
- lyx_view_->showErrorList("Parse");
+ buf->errors("Parse");
str = bformat(_("Document %1$s reloaded."), disp_fn);
} else {
str = bformat(_("Could not reload document %1$s"), disp_fn);
case LyXRC::RC_DATE_INSERT_FORMAT:
case LyXRC::RC_DEFAULT_LANGUAGE:
case LyXRC::RC_DEFAULT_PAPERSIZE:
+ case LyXRC::RC_DEFFILE:
case LyXRC::RC_DIALOGS_ICONIFY_WITH_MAIN:
case LyXRC::RC_DISPLAY_GRAPHICS:
case LyXRC::RC_DOCUMENTPATH:
if (lyxrc_orig.document_path != lyxrc_new.document_path) {
FileName path(lyxrc_new.document_path);
if (path.exists() && path.isDirectory())
- support::package().document_dir() = FileName(lyxrc.document_path);
+ package().document_dir() = FileName(lyxrc.document_path);
}
case LyXRC::RC_ESC_CHARS:
+ case LyXRC::RC_EXAMPLEPATH:
case LyXRC::RC_FONT_ENCODING:
case LyXRC::RC_FORMAT:
case LyXRC::RC_INDEX_COMMAND:
case LyXRC::RC_NUMLASTFILES:
case LyXRC::RC_PATH_PREFIX:
if (lyxrc_orig.path_prefix != lyxrc_new.path_prefix) {
- support::prependEnvPath("PATH", lyxrc.path_prefix);
+ prependEnvPath("PATH", lyxrc.path_prefix);
}
case LyXRC::RC_PERS_DICT:
case LyXRC::RC_PREVIEW:
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:
case LyXRC::RC_TEX_ALLOWS_SPACES:
case LyXRC::RC_TEX_EXPECTS_WINDOWS_PATHS:
if (lyxrc_orig.windows_style_tex_paths != lyxrc_new.windows_style_tex_paths) {
- support::os::windows_style_tex_paths(lyxrc_new.windows_style_tex_paths);
+ os::windows_style_tex_paths(lyxrc_new.windows_style_tex_paths);
}
case LyXRC::RC_UIFILE:
case LyXRC::RC_USER_EMAIL:
case LyXRC::RC_USE_ESC_CHARS:
case LyXRC::RC_USE_INP_ENC:
case LyXRC::RC_USE_PERS_DICT:
+ case LyXRC::RC_USE_TOOLTIP:
case LyXRC::RC_USE_PIXMAP_CACHE:
case LyXRC::RC_USE_SPELL_LIB:
case LyXRC::RC_VIEWDVI_PAPEROPTION:
+ case LyXRC::RC_SORT_LAYOUTS:
case LyXRC::RC_VIEWER:
case LyXRC::RC_LAST:
break;
projects / lyx.git / blobdiff