#include "BufferList.h"
#include "BufferParams.h"
#include "BufferView.h"
+#include "CmdDef.h"
#include "Color.h"
+#include "Converter.h"
#include "Cursor.h"
#include "CutAndPaste.h"
#include "debug.h"
#include "DispatchResult.h"
#include "Encoding.h"
#include "ErrorList.h"
-#include "Exporter.h"
#include "Format.h"
#include "FuncRequest.h"
#include "FuncStatus.h"
#include "gettext.h"
-#include "Importer.h"
#include "InsetIterator.h"
#include "Intl.h"
#include "KeyMap.h"
#include "Session.h"
#include "TextClassList.h"
#include "ToolbarBackend.h"
-#include "Undo.h"
#include "insets/InsetBox.h"
#include "insets/InsetBranch.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/filetools.h"
-#include "support/fs_extras.h"
#include "support/lstrings.h"
#include "support/Path.h"
#include "support/Package.h"
#include "support/os.h"
#include <boost/current_function.hpp>
-#include <boost/filesystem/operations.hpp>
#include <sstream>
using std::string;
using std::istringstream;
using std::ostringstream;
-
-namespace fs = boost::filesystem;
+using std::find;
+using std::vector;
namespace lyx {
using support::FileName;
using support::fileSearch;
using support::i18nLibFileSearch;
-using support::isDirWriteable;
-using support::isFileReadable;
-using support::isStrInt;
-using support::makeAbsPath;
using support::makeDisplayPath;
+using support::makeAbsPath;
using support::package;
using support::quoteName;
using support::rtrim;
using support::trim;
using support::prefixIs;
+
namespace Alert = frontend::Alert;
extern bool quitting;
namespace {
+
+bool import(LyXView * lv, FileName const & filename,
+ string const & format, ErrorList & errorList)
+{
+ docstring const displaypath = makeDisplayPath(filename.absFilename());
+ lv->message(bformat(_("Importing %1$s..."), displaypath));
+
+ FileName const lyxfile(changeExtension(filename.absFilename(), ".lyx"));
+
+ string loader_format;
+ vector<string> loaders = theConverters().loaders();
+ if (find(loaders.begin(), loaders.end(), format) == loaders.end()) {
+ for (vector<string>::const_iterator it = loaders.begin();
+ it != loaders.end(); ++it) {
+ if (theConverters().isReachable(format, *it)) {
+ string const tofile =
+ changeExtension(filename.absFilename(),
+ formats.extension(*it));
+ if (!theConverters().convert(0, filename, FileName(tofile),
+ filename, format, *it, errorList))
+ return false;
+ loader_format = *it;
+ break;
+ }
+ }
+ if (loader_format.empty()) {
+ frontend::Alert::error(_("Couldn't import file"),
+ bformat(_("No information for importing the format %1$s."),
+ formats.prettyName(format)));
+ return false;
+ }
+ } else {
+ loader_format = format;
+ }
+
+
+ if (loader_format == "lyx") {
+ Buffer * buf = lv->loadLyXFile(lyxfile);
+ if (!buf) {
+ // we are done
+ lv->message(_("file not imported!"));
+ return false;
+ }
+ updateLabels(*buf);
+ lv->setBuffer(buf);
+ lv->errors("Parse");
+ } else {
+ Buffer * const b = newFile(lyxfile.absFilename(), string(), true);
+ if (b)
+ lv->setBuffer(b);
+ else
+ return false;
+ bool as_paragraphs = loader_format == "textparagraph";
+ 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));
+ }
+
+ // we are done
+ lv->message(_("imported."));
+ return true;
+}
+
+
+
// This function runs "configure" and then rereads lyx.defaults to
// reconfigure the automatic settings.
void reconfigure(LyXView & lv, string const & option)
lv.message(_("Running configure..."));
// Run configure in user lyx directory
- support::Path p(package().user_support());
+ support::PathChanger p(package().user_support());
string configure_command = package().configure_command();
configure_command += option;
Systemcall one;
- one.startscript(Systemcall::Wait, configure_command);
+ int ret = one.startscript(Systemcall::Wait, configure_command);
p.pop();
// emit message signal.
lv.message(_("Reloading configuration..."));
// Re-read packages.lst
LaTeXFeatures::getAvailable();
- Alert::information(_("System reconfigured"),
+ if (ret)
+ Alert::information(_("System reconfiguration failed"),
+ _("The system reconfiguration has failed.\n"
+ "Default textclass is used but LyX may "
+ "not be able to work properly.\n"
+ "Please reconfigure again if needed."));
+ else
+
+ Alert::information(_("System reconfigured"),
_("The system has been reconfigured.\n"
"You need to restart LyX to make use of any\n"
"updated document class specifications."));
return;
// if the current buffer is not that one, switch to it.
- if (lyx_view_->buffer()->fileName() != file) {
+ if (lyx_view_->buffer()->absFileName() != file) {
if (!switchToBuffer)
return;
dispatch(FuncRequest(LFUN_BUFFER_SWITCH, file));
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(false)) << ']'
- << 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
// num_bytes == 0? (Lgb)
if (keyseq.length() > 1)
- lyx_view_->message(keyseq.print(true));
+ lyx_view_->message(keyseq.print(KeySequence::ForGui));
// 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);
}
+
+ lyx_view_->restartCursor();
}
return flag;
}
- Cursor * cur = view()? &view()->cursor(): 0;
-
// I would really like to avoid having this switch and rather try to
// encode this in the function itself.
// -- And I'd rather let an inset decide which LFUNs it is willing
case LFUN_BUFFER_SWITCH:
// toggle on the current buffer, but do not toggle off
// the other ones (is that a good idea?)
- if (buf && to_utf8(cmd.argument()) == buf->fileName())
+ if (buf && to_utf8(cmd.argument()) == buf->absFileName())
flag.setOnOff(true);
break;
case LFUN_BUFFER_EXPORT:
enable = cmd.argument() == "custom"
- || Exporter::isExportable(*buf, to_utf8(cmd.argument()));
+ || buf->isExportable(to_utf8(cmd.argument()));
break;
case LFUN_BUFFER_CHKTEX:
break;
case LFUN_BUILD_PROGRAM:
- enable = Exporter::isExportable(*buf, "program");
- break;
-
- case LFUN_LAYOUT_TABULAR:
- enable = cur? cur->innerInsetOfType(Inset::TABULAR_CODE) : false;
- break;
-
- case LFUN_LAYOUT:
- case LFUN_LAYOUT_PARAGRAPH:
- enable = cur? !cur->inset().forceDefaultParagraphs(cur->idx()) : false;
+ enable = buf->isExportable("program");
break;
case LFUN_VC_REGISTER:
enable = buf->lyxvc().inUse();
break;
case LFUN_BUFFER_RELOAD:
- enable = !buf->isUnnamed() && fs::exists(buf->fileName())
+ enable = !buf->isUnnamed() && buf->fileName().exists()
&& (!buf->isClean() || buf->isExternallyModified(Buffer::timestamp_method));
break;
- case LFUN_INSET_SETTINGS: {
- enable = false;
- if (!cur)
- break;
- Inset::Code code = cur->inset().lyxCode();
- switch (code) {
- case Inset::TABULAR_CODE:
- enable = cmd.argument() == "tabular";
- break;
- case Inset::ERT_CODE:
- enable = cmd.argument() == "ert";
- break;
- case Inset::FLOAT_CODE:
- enable = cmd.argument() == "float";
- break;
- case Inset::WRAP_CODE:
- enable = cmd.argument() == "wrap";
- break;
- case Inset::NOTE_CODE:
- enable = cmd.argument() == "note";
- break;
- case Inset::BRANCH_CODE:
- enable = cmd.argument() == "branch";
- break;
- case Inset::BOX_CODE:
- enable = cmd.argument() == "box";
- break;
- case Inset::LISTINGS_CODE:
- enable = cmd.argument() == "listings";
- break;
- default:
- break;
- }
- break;
- }
-
case LFUN_INSET_APPLY: {
- enable = false;
- if (!cur)
+ 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(*cur, fr, fs)) {
+ if (!inset->getStatus(view()->cursor(), fr, fs)) {
// Every inset is supposed to handle this
BOOST_ASSERT(false);
}
flag.setOnOff(lyx_view_->getDialogs().visible(cmd.getArg(0)));
// fall through to set "enable"
case LFUN_DIALOG_SHOW: {
- enable = false;
- if (!cur)
- break;
string const name = cmd.getArg(0);
if (!buf)
enable = name == "aboutlyx"
|| name == "prefs"
|| name == "texinfo";
else if (name == "print")
- enable = Exporter::isExportable(*buf, "dvi")
+ enable = buf->isExportable("dvi")
&& lyxrc.print_command != "none";
- else if (name == "character")
- enable = cur->inset().lyxCode() != Inset::ERT_CODE &&
- cur->inset().lyxCode() != Inset::LISTINGS_CODE;
+ 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 = isFileReadable(FileName(buf->getLogName().second));
+ enable = FileName(buf->logName()).isFileReadable();
else if (name == "spellchecker")
#if defined (USE_ASPELL) || defined (USE_ISPELL) || defined (USE_PSPELL)
enable = !buf->isReadonly();
break;
}
- case LFUN_DIALOG_SHOW_NEW_INSET:
- enable = false;
- if (!cur)
- break;
- enable = cur->inset().lyxCode() != Inset::ERT_CODE &&
- cur->inset().lyxCode() != Inset::LISTINGS_CODE;
- if (cur->inset().lyxCode() == Inset::CAPTION_CODE) {
- FuncStatus flag;
- if (cur->inset().getStatus(*cur, cmd, flag))
- return flag;
- }
- break;
-
case LFUN_DIALOG_UPDATE: {
string const name = cmd.getArg(0);
if (!buf)
FuncRequest func(lyxaction.lookupFunc(firstcmd));
func.origin = cmd.origin;
flag = getStatus(func);
+ break;
+ }
+
+ case LFUN_CALL: {
+ FuncRequest func;
+ std::string name(to_utf8(cmd.argument()));
+ if (LyX::ref().topLevelCmdDef().lock(name, func)) {
+ func.origin = cmd.origin;
+ flag = getStatus(func);
+ LyX::ref().topLevelCmdDef().release(name);
+ } else {
+ // catch recursion or unknown command definiton
+ // all operations until the recursion or unknown command
+ // definiton occures are performed, so set the state to enabled
+ enable = true;
+ }
+ break;
}
case LFUN_BUFFER_NEW:
break;
default:
- enable = false;
- if (!cur)
+ if (!view()) {
+ enable = false;
break;
- if (!getLocalStatus(*cur, cmd, flag))
+ }
+ if (!getLocalStatus(view()->cursor(), cmd, flag))
flag = view()->getStatus(cmd);
}
}
// Are we in a DELETED change-tracking region?
- if (buf && cur
- && lookupChangeType(*cur, true) == Change::DELETED
+ if (buf && view()
+ && lookupChangeType(view()->cursor(), true) == Change::DELETED
&& !lyxaction.funcHasFlag(cmd.action, LyXAction::ReadOnly)
&& !lyxaction.funcHasFlag(cmd.action, LyXAction::NoBuffer)) {
flag.message(from_utf8(N_("This portion of the document is deleted.")));
if (buf.isClean())
return true;
- docstring const file = makeDisplayPath(buf.fileName(), 30);
+ docstring const file = buf.fileName().displayName(30);
docstring text = bformat(_("The document %1$s has unsaved "
"changes.\n\nDo you want to save "
"the document?"), file);
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) {
+ // Let lyx_view_ dispatch its own actions.
+ case LFUN_COMMAND_EXECUTE:
+ case LFUN_DROP_LAYOUTS_CHOICE:
+ case LFUN_MENU_OPEN:
+ case LFUN_TOOLBAR_TOGGLE:
+ BOOST_ASSERT(lyx_view_);
+ lyx_view_->dispatch(cmd);
+ break;
case LFUN_WORD_FIND_FORWARD:
case LFUN_WORD_FIND_BACKWARD: {
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();
case LFUN_META_PREFIX:
meta_fake_bit = AltModifier;
- setMessage(keyseq.print(true));
+ setMessage(keyseq.print(KeySequence::ForGui));
break;
case LFUN_BUFFER_TOGGLE_READ_ONLY: {
BOOST_ASSERT(lyx_view_ && lyx_view_->buffer());
if (!lyx_view_->buffer()->isUnnamed()) {
docstring const str = bformat(_("Saving document %1$s..."),
- makeDisplayPath(lyx_view_->buffer()->fileName()));
+ makeDisplayPath(lyx_view_->buffer()->absFileName()));
lyx_view_->message(str);
lyx_view_->buffer()->menuWrite();
lyx_view_->message(str + _(" done."));
if (!b->isClean()) {
if (!b->isUnnamed()) {
b->menuWrite();
- lyxerr[Debug::ACTION] << "Saved " << b->fileName() << endl;
+ lyxerr[Debug::ACTION] << "Saved " << b->absFileName() << endl;
} else
b->writeAs();
}
case LFUN_BUFFER_RELOAD: {
BOOST_ASSERT(lyx_view_ && lyx_view_->buffer());
- docstring const file = makeDisplayPath(lyx_view_->buffer()->fileName(), 20);
+ docstring const file = makeDisplayPath(lyx_view_->buffer()->absFileName(), 20);
docstring text = bformat(_("Any changes will be lost. Are you sure "
"you want to revert to the saved version of the document %1$s?"), file);
int const ret = Alert::prompt(_("Revert to saved document?"),
case LFUN_BUFFER_UPDATE:
BOOST_ASSERT(lyx_view_ && lyx_view_->buffer());
- Exporter::Export(lyx_view_->buffer(), argument, true);
+ lyx_view_->buffer()->doExport(argument, true);
break;
case LFUN_BUFFER_VIEW:
BOOST_ASSERT(lyx_view_ && lyx_view_->buffer());
- Exporter::preview(lyx_view_->buffer(), argument);
+ lyx_view_->buffer()->preview(argument);
break;
case LFUN_MASTER_BUFFER_UPDATE:
- BOOST_ASSERT(lyx_view_ && lyx_view_->buffer() && lyx_view_->buffer()->getMasterBuffer());
- Exporter::Export(lyx_view_->buffer()->getMasterBuffer(), argument, true);
+ BOOST_ASSERT(lyx_view_ && lyx_view_->buffer() && lyx_view_->buffer()->masterBuffer());
+ lyx_view_->buffer()->masterBuffer()->doExport(argument, true);
break;
case LFUN_MASTER_BUFFER_VIEW:
- BOOST_ASSERT(lyx_view_ && lyx_view_->buffer() && lyx_view_->buffer()->getMasterBuffer());
- Exporter::preview(lyx_view_->buffer()->getMasterBuffer(), argument);
+ BOOST_ASSERT(lyx_view_ && lyx_view_->buffer() && lyx_view_->buffer()->masterBuffer());
+ lyx_view_->buffer()->masterBuffer()->preview(argument);
break;
case LFUN_BUILD_PROGRAM:
BOOST_ASSERT(lyx_view_ && lyx_view_->buffer());
- Exporter::Export(lyx_view_->buffer(), "program", true);
+ lyx_view_->buffer()->doExport("program", true);
break;
case LFUN_BUFFER_CHKTEX:
case LFUN_BUFFER_EXPORT:
BOOST_ASSERT(lyx_view_ && lyx_view_->buffer());
if (argument == "custom")
- lyx_view_->getDialogs().show("sendto");
- else {
- Exporter::Export(lyx_view_->buffer(), argument, false);
- }
+ lyx_view_->showDialog("sendto");
+ else
+ lyx_view_->buffer()->doExport(argument, false);
break;
case LFUN_BUFFER_EXPORT_CUSTOM: {
// Output to filename
if (format->name() == "lyx") {
- string const latexname =
- buffer->getLatexName(false);
+ string const latexname = buffer->latexName(false);
filename = changeExtension(latexname,
format->extension());
filename = addName(buffer->temppath(), filename);
break;
} else {
- Exporter::Export(buffer, format_name, true, filename);
+ buffer->doExport(format_name, true, filename);
}
// Substitute $$FName for filename
Buffer * buffer = lyx_view_->buffer();
- if (!Exporter::Export(buffer, "dvi", true)) {
- showPrintError(buffer->fileName());
+ if (!buffer->doExport("dvi", true)) {
+ showPrintError(buffer->absFileName());
break;
}
string const path = buffer->temppath();
// Prevent the compiler from optimizing away p
FileName pp(path);
- support::Path p(pp);
+ support::PathChanger p(pp);
// there are three cases here:
// 1. we print to a file
Systemcall one;
int res = 0;
string const dviname =
- changeExtension(buffer->getLatexName(true),
- "dvi");
+ changeExtension(buffer->latexName(true), "dvi");
if (target == "printer") {
if (!lyxrc.print_spool_command.empty()) {
FileName const filename(makeAbsPath(target_name,
lyx_view_->buffer()->filePath()));
FileName const dvifile(makeAbsPath(dviname, path));
- if (fs::exists(filename.toFilesystemEncoding())) {
+ if (filename.exists()) {
docstring text = bformat(
_("The file %1$s already exists.\n\n"
"Do you want to overwrite that file?"),
}
if (res != 0)
- showPrintError(buffer->fileName());
+ showPrintError(buffer->absFileName());
break;
}
if (buf) {
updateLabels(*buf);
lyx_view_->setBuffer(buf);
- lyx_view_->showErrorList("Parse");
+ lyx_view_->errors("Parse");
}
updateFlags = Update::None;
break;
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()->fileName()));
- LYXERR(Debug::INFO) << "FNAME["
- << lyx_view_->buffer()->fileName()
- << "] " << endl;
+ setMessage(from_utf8(lyx_view_->buffer()->absFileName()));
+ LYXERR(Debug::INFO, "FNAME["
+ << lyx_view_->buffer()->absFileName() << ']');
break;
case LFUN_SERVER_NOTIFY:
- dispatch_buffer = keyseq.print(false);
+ dispatch_buffer = keyseq.print(KeySequence::Portable);
theServer().notifyClient(to_utf8(dispatch_buffer));
break;
lyx_view_->setBuffer(buf);
view()->setCursorFromRow(row);
if (loaded)
- lyx_view_->showErrorList("Parse");
+ lyx_view_->errors("Parse");
updateFlags = Update::FitCursor;
break;
}
if (name == "character") {
data = freefont2string();
if (!data.empty())
- lyx_view_->getDialogs().show("character", data);
+ lyx_view_->showDialogWithData("character", data);
} else if (name == "latexlog") {
- pair<Buffer::LogType, string> const logfile =
- lyx_view_->buffer()->getLogName();
- switch (logfile.first) {
+ Buffer::LogType type;
+ string const logfile = lyx_view_->buffer()->logName(&type);
+ switch (type) {
case Buffer::latexlog:
data = "latex ";
break;
data = "literate ";
break;
}
- data += Lexer::quoteString(logfile.second);
- lyx_view_->getDialogs().show("log", data);
+ data += Lexer::quoteString(logfile);
+ lyx_view_->showDialogWithData("log", data);
} else if (name == "vclog") {
string const data = "vc " +
Lexer::quoteString(lyx_view_->buffer()->lyxvc().getLogFile());
- lyx_view_->getDialogs().show("log", data);
+ lyx_view_->showDialogWithData("log", data);
} else
- lyx_view_->getDialogs().show(name, data);
+ lyx_view_->showDialogWithData(name, data);
break;
}
case LFUN_DIALOG_SHOW_NEW_INSET: {
BOOST_ASSERT(lyx_view_);
string const name = cmd.getArg(0);
+ InsetCode code = insetCode(name);
string data = trim(to_utf8(cmd.argument()).substr(name.size()));
- if (name == "bibitem" ||
- name == "bibtex" ||
- name == "index" ||
- name == "label" ||
- name == "nomenclature" ||
- name == "ref" ||
- name == "toc" ||
- name == "url") {
- InsetCommandParams p(name);
+ bool insetCodeOK = true;
+ switch (code) {
+ case BIBITEM_CODE:
+ case BIBTEX_CODE:
+ case INDEX_CODE:
+ case LABEL_CODE:
+ case NOMENCL_CODE:
+ case REF_CODE:
+ case TOC_CODE:
+ case HYPERLINK_CODE: {
+ InsetCommandParams p(code);
data = InsetCommandMailer::params2string(name, p);
- } else if (name == "include") {
+ break;
+ }
+ case INCLUDE_CODE: {
// data is the include type: one of "include",
// "input", "verbatiminput" or "verbatiminput*"
if (data.empty())
// default type is requested
data = "include";
- InsetCommandParams p(data);
- data = InsetIncludeMailer::params2string(p);
- } else if (name == "box") {
+ InsetCommandParams p(INCLUDE_CODE, data);
+ data = InsetCommandMailer::params2string("include", p);
+ break;
+ }
+ case BOX_CODE: {
// \c data == "Boxed" || "Frameless" etc
InsetBoxParams p(data);
data = InsetBoxMailer::params2string(p);
- } else if (name == "branch") {
+ break;
+ }
+ case BRANCH_CODE: {
InsetBranchParams p;
data = InsetBranchMailer::params2string(p);
- } else if (name == "citation") {
- InsetCommandParams p("citation");
+ break;
+ }
+ case CITE_CODE: {
+ InsetCommandParams p(CITE_CODE);
data = InsetCommandMailer::params2string(name, p);
- } else if (name == "ert") {
+ break;
+ }
+ case ERT_CODE: {
data = InsetERTMailer::params2string(InsetCollapsable::Open);
- } else if (name == "external") {
+ break;
+ }
+ case EXTERNAL_CODE: {
InsetExternalParams p;
Buffer const & buffer = *lyx_view_->buffer();
data = InsetExternalMailer::params2string(p, buffer);
- } else if (name == "float") {
+ break;
+ }
+ case FLOAT_CODE: {
InsetFloatParams p;
data = InsetFloatMailer::params2string(p);
- } else if (name == "listings") {
+ break;
+ }
+ case LISTINGS_CODE: {
InsetListingsParams p;
data = InsetListingsMailer::params2string(p);
- } else if (name == "graphics") {
+ break;
+ }
+ case GRAPHICS_CODE: {
InsetGraphicsParams p;
Buffer const & buffer = *lyx_view_->buffer();
data = InsetGraphicsMailer::params2string(p, buffer);
- } else if (name == "note") {
+ break;
+ }
+ case NOTE_CODE: {
InsetNoteParams p;
data = InsetNoteMailer::params2string(p);
- } else if (name == "vspace") {
+ break;
+ }
+ case VSPACE_CODE: {
VSpace space;
data = InsetVSpaceMailer::params2string(space);
- } else if (name == "wrap") {
+ break;
+ }
+ case WRAP_CODE: {
InsetWrapParams p;
data = InsetWrapMailer::params2string(p);
+ break;
}
- lyx_view_->getDialogs().show(name, data, 0);
+ default:
+ lyxerr << "Inset type '" << name <<
+ "' not recognized in LFUN_DIALOG_SHOW_NEW_INSET" << std:: endl;
+ insetCodeOK = false;
+ break;
+ } // end switch(code)
+ if (insetCodeOK)
+ lyx_view_->getDialogs().show(name, data, 0);
break;
}
} else if (name == "paragraph") {
dispatch(FuncRequest(LFUN_PARAGRAPH_UPDATE));
} else if (name == "prefs") {
- lyx_view_->getDialogs().update(name, string());
+ lyx_view_->updateDialog(name, string());
}
break;
}
arg = token(argument, '|', 0);
opt1 = token(argument, '|', 1);
}
- InsetCommandParams icp("citation");
+ InsetCommandParams icp(CITE_CODE);
icp["key"] = from_utf8(arg);
if (!opt1.empty())
icp["before"] = from_utf8(opt1);
// 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->fileName());
- updateLabels(*child->getMasterBuffer());
+ child->setParentName(parent->absFileName());
+ updateLabels(*child->masterBuffer());
lyx_view_->setBuffer(child);
if (parsed)
- lyx_view_->showErrorList("Parse");
+ lyx_view_->errors("Parse");
}
// If a screen update is required (in case where auto_open is false),
break;
}
+ case LFUN_CALL: {
+ FuncRequest func;
+ if (LyX::ref().topLevelCmdDef().lock(argument, func)) {
+ func.origin = cmd.origin;
+ dispatch(func);
+ LyX::ref().topLevelCmdDef().release(argument);
+ } else {
+ if (func.action == LFUN_UNKNOWN_ACTION) {
+ // unknown command definition
+ lyxerr << "Warning: unknown command definition `"
+ << argument << "'"
+ << endl;
+ } else {
+ // recursion detected
+ lyxerr << "Warning: Recursion in the command definition `"
+ << argument << "' detected"
+ << endl;
+ }
+ }
+ break;
+ }
+
case LFUN_PREFERENCES_SAVE: {
lyxrc.write(makeAbsPath("preferences",
package().user_support().absFilename()),
}
bool const graphicsbg_changed =
- (lyx_name == lcolor.getLyXName(Color::graphicsbg) &&
- x11_name != lcolor.getX11Name(Color::graphicsbg));
+ (lyx_name == lcolor.getLyXName(Color_graphicsbg) &&
+ x11_name != lcolor.getX11Name(Color_graphicsbg));
if (!lcolor.setColor(lyx_name, x11_name)) {
setErrorMessage(
BOOST_ASSERT(lyx_view_);
string action;
string const name = split(argument, action, ' ');
- Inset::Code const inset_code =
- Inset::translate(name);
+ InsetCode const inset_code = insetCode(name);
Cursor & cur = view()->cursor();
FuncRequest fr(LFUN_INSET_TOGGLE, action);
InsetIterator const end = inset_iterator_end(inset);
for (; it != end; ++it) {
if (!it->asInsetMath()
- && (inset_code == Inset::NO_CODE
+ && (inset_code == NO_CODE
|| inset_code == it->lyxCode())) {
Cursor tmpcur = cur;
- tmpcur.pushLeft(*it);
+ tmpcur.pushBackward(*it);
it->dispatch(tmpcur, fr);
}
}
<< endl;
}
- if (defaults.writeFile(FileName(defaults.fileName())))
+ if (defaults.writeFile(FileName(defaults.absFileName())))
setMessage(bformat(_("Document defaults saved in %1$s"),
makeDisplayPath(fname)));
else
Buffer * buffer = lyx_view_->buffer();
TextClassPtr oldClass = buffer->params().getTextClassPtr();
- recordUndoFullDocument(view());
+
+ Cursor & cur = view()->cursor();
+ cur.recordUndoFullDocument();
istringstream ss(argument);
Lexer lex(0,0);
lyx_view_->buffer()->params().getEngine();
if (oldEngine != newEngine) {
- Cursor & cur = view()->cursor();
FuncRequest fr(LFUN_INSET_REFRESH);
Inset & inset = lyx_view_->buffer()->inset();
InsetIterator it = inset_iterator_begin(inset);
InsetIterator const end = inset_iterator_end(inset);
for (; it != end; ++it)
- if (it->lyxCode() == Inset::CITE_CODE)
+ if (it->lyxCode() == CITE_CODE)
it->dispatch(cur, fr);
}
BOOST_ASSERT(lyx_view_);
Buffer * buffer = lyx_view_->buffer();
TextClassPtr oldClass = buffer->params().getTextClassPtr();
- recordUndoFullDocument(view());
+ view()->cursor().recordUndoFullDocument();
buffer->params().clearLayoutModules();
updateLayout(oldClass, buffer);
updateFlags = Update::Force | Update::FitCursor;
BOOST_ASSERT(lyx_view_);
Buffer * buffer = lyx_view_->buffer();
TextClassPtr oldClass = buffer->params().getTextClassPtr();
- recordUndoFullDocument(view());
+ view()->cursor().recordUndoFullDocument();
buffer->params().addLayoutModule(argument);
updateLayout(oldClass, buffer);
updateFlags = Update::Force | Update::FitCursor;
//Save the old, possibly modular, layout for use in conversion.
TextClassPtr oldClass = buffer->params().getTextClassPtr();
- recordUndoFullDocument(view());
+ view()->cursor().recordUndoFullDocument();
buffer->params().setBaseClass(new_class);
updateLayout(oldClass, buffer);
updateFlags = Update::Force | Update::FitCursor;
actOnUpdatedPrefs(lyxrc_orig, lyxrc);
+ if (lyx_view_ && lyx_view_->buffer())
+ lyx_view_->updateLayoutChoice(true);
+
/// 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
LyX::ref().session().bookmarks().clear();
break;
- case LFUN_TOOLBAR_TOGGLE: {
- 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)));
- 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_);
view()->cursor().dispatch(cmd);
theSelection().haveSelection(view()->cursor().selection());
if (view()->cursor().inTexted()) {
- lyx_view_->updateLayoutChoice();
+ lyx_view_->updateLayoutChoice(false);
}
}
}
|| 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;
}
}
- docstring const shortcuts = theTopLevelKeymap().printbindings(cmd);
+ docstring const shortcuts = theTopLevelKeymap().printBindings(cmd);
if (!shortcuts.empty())
comname += ": " + shortcuts;
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);
}
if (lyx_view_->buffer()) {
string const trypath = lyx_view_->buffer()->filePath();
// If directory is writeable, use this as default.
- if (isDirWriteable(FileName(trypath)))
+ if (FileName(trypath).isDirWritable())
initpath = trypath;
}
filename = addName(lyxrc.document_path,
"newfile" + convert<string>(++newfile_number) + ".lyx");
while (theBufferList().exists(filename) ||
- fs::is_readable(FileName(filename).toFilesystemEncoding())) {
+ FileName(filename).isReadable()) {
++newfile_number;
filename = addName(lyxrc.document_path,
"newfile" + convert<string>(newfile_number) +
// The template stuff
string templname;
if (fromTemplate) {
- FileDialog fileDlg(_("Select template file"),
- LFUN_SELECT_FILE_SYNC,
- make_pair(_("Documents|#o#O"), from_utf8(lyxrc.document_path)),
- make_pair(_("Templates|#T#t"), from_utf8(lyxrc.template_path)));
+ 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 =
- fileDlg.open(from_utf8(lyxrc.template_path),
+ dlg.open(from_utf8(lyxrc.template_path),
FileFilterList(_("LyX Documents (*.lyx)")),
docstring());
if (lyx_view_->buffer()) {
string const trypath = lyx_view_->buffer()->filePath();
// If directory is writeable, use this as default.
- if (isDirWriteable(FileName(trypath)))
+ if (FileName(trypath).isDirWritable())
initpath = trypath;
}
string filename;
if (fname.empty()) {
- FileDialog fileDlg(_("Select document to open"),
- LFUN_FILE_OPEN,
- make_pair(_("Documents|#o#O"), from_utf8(lyxrc.document_path)),
- make_pair(_("Examples|#E#e"), from_utf8(addPath(package().system_support().absFilename(), "examples"))));
+ FileDialog dlg(_("Select document to open"), LFUN_FILE_OPEN);
+ dlg.setButton1(_("Documents|#o#O"), from_utf8(lyxrc.document_path));
+ dlg.setButton2(_("Examples|#E#e"),
+ from_utf8(addPath(package().system_support().absFilename(), "examples")));
FileDialog::Result result =
- fileDlg.open(from_utf8(initpath),
+ dlg.open(from_utf8(initpath),
FileFilterList(_("LyX Documents (*.lyx)")),
docstring());
filename = fullname.absFilename();
// if the file doesn't exist, let the user create one
- if (!fs::exists(fullname.toFilesystemEncoding())) {
+ if (!fullname.exists()) {
// the user specifically chose this name. Believe him.
Buffer * const b = newFile(filename, string(), true);
if (b)
if (buf) {
updateLabels(*buf);
lyx_view_->setBuffer(buf);
- lyx_view_->showErrorList("Parse");
+ lyx_view_->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()) {
if (lyx_view_->buffer()) {
string const trypath = lyx_view_->buffer()->filePath();
// If directory is writeable, use this as default.
- if (isDirWriteable(FileName(trypath)))
+ if (FileName(trypath).isDirWritable())
initpath = trypath;
}
docstring const text = bformat(_("Select %1$s file to import"),
formats.prettyName(format));
- FileDialog fileDlg(text,
- LFUN_BUFFER_IMPORT,
- make_pair(_("Documents|#o#O"), from_utf8(lyxrc.document_path)),
- make_pair(_("Examples|#E#e"),
- from_utf8(addPath(package().system_support().absFilename(), "examples"))));
+ FileDialog dlg(text, LFUN_BUFFER_IMPORT);
+ dlg.setButton1(_("Documents|#o#O"), from_utf8(lyxrc.document_path));
+ dlg.setButton2(_("Examples|#E#e"),
+ from_utf8(addPath(package().system_support().absFilename(), "examples")));
docstring filter = formats.prettyName(format);
filter += " (*.";
filter += ')';
FileDialog::Result result =
- fileDlg.open(from_utf8(initpath),
+ dlg.open(from_utf8(initpath),
FileFilterList(filter),
docstring());
// if the file exists already, and we didn't do
// -i lyx thefile.lyx, warn
- if (fs::exists(lyxfile.toFilesystemEncoding()) && fullname != lyxfile) {
+ if (lyxfile.exists() && fullname != lyxfile) {
docstring const file = makeDisplayPath(lyxfile.absFilename(), 30);
docstring text = bformat(_("The document %1$s already exists.\n\n"
}
ErrorList errorList;
- Importer::Import(lyx_view_, fullname, format, errorList);
+ import(lyx_view_, fullname, format, errorList);
// FIXME (Abdel 12/08/06): Is there a need to display the error list here?
}
void LyXFunc::reloadBuffer()
{
- FileName filename(lyx_view_->buffer()->fileName());
+ FileName filename(lyx_view_->buffer()->absFileName());
docstring const disp_fn = makeDisplayPath(filename.absFilename());
docstring str;
closeBuffer();
if (buf) {
updateLabels(*buf);
lyx_view_->setBuffer(buf);
- lyx_view_->showErrorList("Parse");
+ lyx_view_->errors("Parse");
str = bformat(_("Document %1$s reloaded."), disp_fn);
} else {
str = bformat(_("Could not reload document %1$s"), disp_fn);
{
// When meta-fake key is pressed, show the key sequence so far + "M-".
if (wasMetaKey())
- return keyseq.print(true) + "M-";
+ return keyseq.print(KeySequence::ForGui) + "M-";
// Else, when a non-complete key sequence is pressed,
// show the available options.
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) {
- string const encoded = FileName(
- lyxrc_new.document_path).toFilesystemEncoding();
- if (fs::exists(encoded) && fs::is_directory(encoded))
+ FileName path(lyxrc_new.document_path);
+ if (path.exists() && path.isDirectory())
support::package().document_dir() = FileName(lyxrc.document_path);
}
case LyXRC::RC_ESC_CHARS:
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_USE_ESC_CHARS:
case LyXRC::RC_USE_INP_ENC:
case LyXRC::RC_USE_PERS_DICT:
+ 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;