#include "BufferView.h"
#include "CmdDef.h"
#include "Color.h"
+#include "Converter.h"
#include "Cursor.h"
#include "CutAndPaste.h"
#include "debug.h"
#include "FuncRequest.h"
#include "FuncStatus.h"
#include "gettext.h"
-#include "Importer.h"
#include "InsetIterator.h"
#include "Intl.h"
#include "KeyMap.h"
#include "frontends/Dialogs.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/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::trim;
using support::prefixIs;
+
namespace Alert = frontend::Alert;
extern bool quitting;
+extern bool use_gui;
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;
}
-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, 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."));
- 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();
}
enable = buf->lyxvc().inUse();
break;
case LFUN_BUFFER_RELOAD:
- enable = !buf->isUnnamed() && fs::exists(buf->absFileName())
+ enable = !buf->isUnnamed() && buf->fileName().exists()
&& (!buf->isClean() || buf->isExternallyModified(Buffer::timestamp_method));
break;
}
}
else if (name == "latexlog")
- enable = FileName(buf->logName().second).isFileReadable();
+ 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_WINDOW_CLOSE: {
- enable = (theApp()->gui().viewIds().size() > 1);
+ enable = (theApp()->viewIds().size() > 1);
break;
}
if (buf.isClean())
return true;
- docstring const file = makeDisplayPath(buf.absFileName(), 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_BUFFER_EXPORT:
BOOST_ASSERT(lyx_view_ && lyx_view_->buffer());
if (argument == "custom")
- lyx_view_->getDialogs().show("sendto");
+ lyx_view_->showDialog("sendto");
else
lyx_view_->buffer()->doExport(argument, false);
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
// (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:
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()->absFileName()));
- LYXERR(Debug::INFO) << "FNAME["
- << lyx_view_->buffer()->absFileName()
- << "] " << endl;
+ LYXERR(Debug::INFO, "FNAME["
+ << lyx_view_->buffer()->absFileName() << ']');
break;
case LFUN_SERVER_NOTIFY:
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()->logName();
- 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;
}
// default type is requested
data = "include";
InsetCommandParams p(INCLUDE_CODE, data);
- data = InsetIncludeMailer::params2string(p);
+ data = InsetCommandMailer::params2string("include", p);
break;
}
case BOX_CODE: {
} 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;
}
- 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_);
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),
}
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(
&& (inset_code == NO_CODE
|| inset_code == it->lyxCode())) {
Cursor tmpcur = cur;
- tmpcur.pushLeft(*it);
+ tmpcur.pushBackward(*it);
it->dispatch(tmpcur, fr);
}
}
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);
}
// 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());
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());
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()) {
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());
}
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?
}
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);
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:
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;
projects / lyx.git / blobdiff