#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "lyxfunc.h"
#include "version.h"
#include "kbmap.h"
#include "lyxrow.h"
#include "bufferlist.h"
+#include "buffer.h"
+#include "buffer_funcs.h"
#include "BufferView.h"
#include "lyxserver.h"
#include "intl.h"
#include "gettext.h"
#include "Lsstream.h"
#include "trans_mgr.h"
+#include "encoding.h"
#include "layout.h"
#include "bufferview_funcs.h"
#include "frontends/LyXView.h"
#include "frontends/lyx_gui.h"
#include "vspace.h"
#include "FloatList.h"
-#include "converter.h"
+#include "format.h"
#include "exporter.h"
#include "importer.h"
#include "TextCache.h"
#include "ParagraphParameters.h"
#include "insets/insetcommand.h"
+#include "insets/insetexternal.h"
#include "insets/insettabular.h"
#include "mathed/formulamacro.h"
#include "support/FileInfo.h"
#include "support/forkedcontr.h"
#include "support/lstrings.h"
+#include "support/tostr.h"
#include "support/path.h"
+#include "support/path_defines.h"
#include "support/lyxfunctional.h"
#include <ctime>
#include <utility>
#include <algorithm>
+using namespace lyx::support;
+
using std::pair;
using std::make_pair;
using std::endl;
using std::vector;
using std::transform;
using std::back_inserter;
+using namespace bv_funcs;
extern BufferList bufferlist;
extern LyXServer * lyxserver;
LyXFunc::LyXFunc(LyXView * o)
: owner(o),
+ encoded_last_key(0),
keyseq(toplevel_keymap.get(), toplevel_keymap.get()),
cancel_meta_seq(toplevel_keymap.get(), toplevel_keymap.get()),
meta_fake_bit(key_modifier::none)
}
-inline
-LyXText * LyXFunc::TEXT(bool flag = true) const
-{
- if (flag)
- return view()->text;
- return view()->getLyXText();
-}
-
-
-inline
-void LyXFunc::moveCursorUpdate(bool flag, bool selecting)
+void LyXFunc::moveCursorUpdate()
{
- if (selecting || TEXT(flag)->selection.mark()) {
- TEXT(flag)->setSelection(view());
- if (TEXT(flag)->bv_owner)
- view()->toggleToggle();
- }
- view()->update(TEXT(flag), BufferView::SELECT|BufferView::FITCUR);
- view()->showCursor();
-
+ LyXText * lt = view()->text;
+ if (lt->selection.mark())
+ lt->setSelection();
+ view()->update();
view()->switchKeyMap();
}
void LyXFunc::handleKeyFunc(kb_action action)
{
- char c = keyseq.getLastKeyEncoded();
+ char c = encoded_last_key;
- if (keyseq.length() > 1) {
+ if (keyseq.length()) {
c = 0;
}
owner->getIntl().getTransManager()
- .deadkey(c, get_accent(action).accent, TEXT(false));
+ .deadkey(c, get_accent(action).accent, view()->getLyXText());
// Need to clear, in case the minibuffer calls these
// actions
keyseq.clear();
// copied verbatim from do_accent_char
- view()->update(TEXT(false),
- BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
- TEXT(false)->selection.cursor = TEXT(false)->cursor;
+ view()->update();
+ view()->getLyXText()->selection.cursor = view()->getLyXText()->cursor;
}
}
if (keysym->isModifier()) {
+ lyxerr[Debug::KEY] << "isModifier true" << endl;
return;
}
+ Encoding const * encoding = view()->getEncoding();
+
+ encoded_last_key = keysym->getISOEncoded(encoding ? encoding->Name() : "");
+
// Do a one-deep top-level lookup for
// cancel and meta-fake keys. RVDK_PATCH_5
cancel_meta_seq.reset();
int action = cancel_meta_seq.addkey(keysym, state);
- lyxerr[Debug::KEY] << "action first set to [" << action << "]" << endl;
+ lyxerr[Debug::KEY] << "action first set to [" << action << ']' << endl;
// When not cancel or meta-fake, do the normal lookup.
// Note how the meta_fake Mod1 bit is OR-ed in and reset afterwards.
// remove Caps Lock and Mod2 as a modifiers
action = keyseq.addkey(keysym, (state | meta_fake_bit));
lyxerr[Debug::KEY] << "action now set to ["
- << action << "]" << endl;
+ << action << ']' << endl;
}
// Dont remove this unless you know what you are doing.
if (lyxerr.debugging(Debug::KEY)) {
lyxerr << "Key [action="
<< action << "]["
- << keyseq.print() << "]"
+ << keyseq.print() << ']'
<< endl;
}
owner->message(keyseq.print());
}
- if (action == LFUN_UNKNOWN_ACTION) {
- // It is unknown, but what if we remove all
- // the modifiers? (Lgb)
- action = keyseq.addkey(keysym, key_modifier::none);
- lyxerr[Debug::KEY] << "Removing modifiers...\n"
- << "Action now set to ["
- << action << "]" << endl;
+ // Maybe user can only reach the key via holding down shift.
+ // Let's see. But only if shift is the only modifier
+ if (action == LFUN_UNKNOWN_ACTION && state == key_modifier::shift) {
+ lyxerr[Debug::KEY] << "Trying without shift" << endl;
+ action = keyseq.addkey(keysym, key_modifier::none);
+ lyxerr[Debug::KEY] << "Action now " << action << endl;
+ }
- if (action == LFUN_UNKNOWN_ACTION) {
+ if (action == LFUN_UNKNOWN_ACTION) {
+ // Hmm, we didn't match any of the keysequences. See
+ // 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;
+ action = LFUN_SELFINSERT;
+ } else {
+ lyxerr[Debug::KEY] << "Unknown, !isText() - giving up" << endl;
owner->message(_("Unknown function."));
return;
}
}
if (action == LFUN_SELFINSERT) {
- char c = keysym->getISOEncoded();
- string argument;
+ if (encoded_last_key != 0) {
+ string arg;
+ arg += encoded_last_key;
- if (c != 0)
- argument = c;
+ dispatch(FuncRequest(view(), LFUN_SELFINSERT, arg));
- dispatch(FuncRequest(view(), LFUN_SELFINSERT, argument));
- lyxerr[Debug::KEY] << "SelfInsert arg[`"
+ lyxerr[Debug::KEY] << "SelfInsert arg[`"
<< argument << "']" << endl;
+ }
} else {
dispatch(action);
}
return flag.disabled(true);
}
- if (ev.action == LFUN_UNKNOWN_ACTION) {
+ switch (ev.action) {
+ case LFUN_UNKNOWN_ACTION:
+#ifndef HAVE_LIBAIKSAURUS
+ case LFUN_THESAURUS_ENTRY:
+#endif
+ flag.unknown(true);
+ break;
+ default:
+ flag |= lyx_gui::getStatus(ev);
+ }
+
+ if (flag.unknown()) {
setStatusMessage(N_("Unknown action"));
- return flag.unknown(true);
+ return flag;
}
// the default error message if we disable the command
// encode this in the function itself.
bool disable = false;
switch (ev.action) {
- case LFUN_MENUPRINT:
- disable = !Exporter::IsExportable(buf, "dvi")
- || lyxrc.print_command == "none";
- break;
case LFUN_EXPORT:
- disable = ev.argument == "fax" &&
- !Exporter::IsExportable(buf, ev.argument);
+ disable = ev.argument != "custom"
+ && !Exporter::IsExportable(buf, ev.argument);
break;
case LFUN_UNDO:
disable = buf->undostack.empty();
break;
case LFUN_CUT:
case LFUN_COPY:
- if (tli && tli->lyxCode() == Inset::TABULAR_CODE) {
- InsetTabular * t(static_cast<InsetTabular*>(tli));
- if (t->hasSelection()) {
+ if (tli) {
+ UpdatableInset * in = tli;
+ if (in->lyxCode() != InsetOld::TABULAR_CODE) {
+ in = tli->getFirstLockingInsetOfType(InsetOld::TABULAR_CODE);
+ }
+ if (in && static_cast<InsetTabular*>(in)->hasSelection()) {
disable = false;
break;
}
}
disable = !mathcursor && !view()->getLyXText()->selection.set();
break;
-#ifndef HAVE_LIBAIKSAURUS
- case LFUN_THESAURUS_ENTRY:
- disable = true;
- break;
-#endif
case LFUN_RUNCHKTEX:
- disable = lyxrc.chktex_command == "none";
+ disable = !buf->isLatex() || lyxrc.chktex_command == "none";
break;
case LFUN_BUILDPROG:
disable = !Exporter::IsExportable(buf, "program");
break;
- case LFUN_LAYOUT_CHARACTER:
- disable = tli && tli->lyxCode() == Inset::ERT_CODE;
- break;
-
case LFUN_LAYOUT_TABULAR:
disable = !tli
- || (tli->lyxCode() != Inset::TABULAR_CODE
- && !tli->getFirstLockingInsetOfType(Inset::TABULAR_CODE));
+ || (tli->lyxCode() != InsetOld::TABULAR_CODE
+ && !tli->getFirstLockingInsetOfType(InsetOld::TABULAR_CODE));
+ break;
+
+ case LFUN_DEPTH_MIN:
+ disable = !changeDepth(view(), view()->getLyXText(), DEC_DEPTH, true);
+ break;
+
+ case LFUN_DEPTH_PLUS:
+ disable = !changeDepth(view(), view()->getLyXText(), INC_DEPTH, true);
break;
case LFUN_LAYOUT:
case LFUN_LAYOUT_PARAGRAPH: {
- Inset * inset = TEXT(false)->cursor.par()->inInset();
+ InsetOld * inset = view()->getLyXText()->cursor.par()->inInset();
disable = inset && inset->forceDefaultParagraphs(inset);
break;
}
case LFUN_INSET_OPTARG:
- disable = (TEXT(false)->cursor.par()->layout()->optionalargs == 0);
+ disable = (view()->getLyXText()->cursor.par()->layout()->optionalargs == 0);
break;
case LFUN_TABULAR_FEATURE:
if (tli) {
FuncStatus ret;
//ret.disabled(true);
- if (tli->lyxCode() == Inset::TABULAR_CODE) {
+ if (tli->lyxCode() == InsetOld::TABULAR_CODE) {
ret = static_cast<InsetTabular *>(tli)
->getStatus(ev.argument);
- } else if (tli->getFirstLockingInsetOfType(Inset::TABULAR_CODE)) {
+ flag |= ret;
+ disable = false;
+ } else if (tli->getFirstLockingInsetOfType(InsetOld::TABULAR_CODE)) {
ret = static_cast<InsetTabular *>
- (tli->getFirstLockingInsetOfType(Inset::TABULAR_CODE))
+ (tli->getFirstLockingInsetOfType(InsetOld::TABULAR_CODE))
->getStatus(ev.argument);
+ flag |= ret;
+ disable = false;
+ } else {
+ disable = true;
}
- flag |= ret;
- disable = false;
} else {
static InsetTabular inset(*owner->buffer(), 1, 1);
FuncStatus ret;
break;
case LFUN_VC_REVERT:
case LFUN_VC_UNDO:
- case LFUN_VC_HISTORY:
disable = !buf->lyxvc.inUse();
break;
+ case LFUN_MENURELOAD:
+ disable = buf->isUnnamed() || buf->isClean();
+ break;
case LFUN_BOOKMARK_GOTO:
disable = !view()->
isSavedPosition(strToUnsignedInt(ev.argument));
break;
+ case LFUN_MERGE_CHANGES:
+ case LFUN_ACCEPT_CHANGE:
+ case LFUN_REJECT_CHANGE:
+ case LFUN_ACCEPT_ALL_CHANGES:
+ case LFUN_REJECT_ALL_CHANGES:
+ disable = !buf->params.tracking_changes;
+ break;
case LFUN_INSET_TOGGLE: {
LyXText * lt = view()->getLyXText();
disable = !(isEditableInset(lt->getInset())
&& lt->inset_owner->owner()->isOpen()));
break;
}
- case LFUN_LATEX_LOG:
- disable = !IsFileReadable(buf->getLogName().second);
+
+ case LFUN_INSET_SETTINGS: {
+ disable = true;
+ UpdatableInset * inset = view()->theLockingInset();
+
+ if (!inset)
+ break;
+
+ // get the innermost inset
+ inset = inset->getLockingInset();
+
+ // jump back to owner if an InsetText, so
+ // we get back to the InsetTabular or whatever
+ if (inset->lyxCode() == InsetOld::TEXT_CODE)
+ inset = inset->owner();
+
+ InsetOld::Code code = inset->lyxCode();
+ switch (code) {
+ case InsetOld::TABULAR_CODE:
+ disable = ev.argument != "tabular";
+ break;
+ case InsetOld::ERT_CODE:
+ disable = ev.argument != "ert";
+ break;
+ case InsetOld::FLOAT_CODE:
+ disable = ev.argument != "float";
+ break;
+ case InsetOld::MINIPAGE_CODE:
+ disable = ev.argument != "minipage";
+ break;
+ case InsetOld::WRAP_CODE:
+ disable = ev.argument != "wrap";
+ break;
+ case InsetOld::NOTE_CODE:
+ disable = ev.argument != "note";
+ break;
+ default:
+ break;
+ }
break;
+ }
case LFUN_MATH_MUTATE:
if (mathcursor)
disable = !mathcursor;
break;
+ case LFUN_DIALOG_SHOW: {
+ string const name = ev.getArg(0);
+ if (!buf) {
+ disable = !(name == "aboutlyx" ||
+ name == "file" ||
+ name == "forks" ||
+ name == "preferences" ||
+ name == "texinfo");
+ break;
+ }
+
+ if (name == "print") {
+ disable = !Exporter::IsExportable(buf, "dvi") ||
+ lyxrc.print_command == "none";
+ } else if (name == "character") {
+ UpdatableInset * tli = view()->theLockingInset();
+ disable = tli && tli->lyxCode() == InsetOld::ERT_CODE;
+ } else if (name == "vclog") {
+ disable = !buf->lyxvc.inUse();
+ } else if (name == "latexlog") {
+ disable = !IsFileReadable(buf->getLogName().second);
+ }
+ break;
+ }
+
default:
break;
}
// the functions which insert insets
- Inset::Code code = Inset::NO_CODE;
+ InsetOld::Code code = InsetOld::NO_CODE;
switch (ev.action) {
- case LFUN_INSET_ERT:
- code = Inset::ERT_CODE;
+ case LFUN_DIALOG_SHOW_NEW_INSET:
+ if (ev.argument == "bibitem")
+ code = InsetOld::BIBITEM_CODE;
+ else if (ev.argument == "bibtex")
+ code = InsetOld::BIBTEX_CODE;
+ else if (ev.argument == "citation")
+ code = InsetOld::CITE_CODE;
+ else if (ev.argument == "ert")
+ code = InsetOld::ERT_CODE;
+ else if (ev.argument == "external")
+ code = InsetOld::EXTERNAL_CODE;
+ else if (ev.argument == "float")
+ code = InsetOld::FLOAT_CODE;
+ else if (ev.argument == "graphics")
+ code = InsetOld::GRAPHICS_CODE;
+ else if (ev.argument == "include")
+ code = InsetOld::INCLUDE_CODE;
+ else if (ev.argument == "index")
+ code = InsetOld::INDEX_CODE;
+ else if (ev.argument == "label")
+ code = InsetOld::LABEL_CODE;
+ else if (ev.argument == "minipage")
+ code = InsetOld::MINIPAGE_CODE;
+ else if (ev.argument == "ref")
+ code = InsetOld::REF_CODE;
+ else if (ev.argument == "toc")
+ code = InsetOld::TOC_CODE;
+ else if (ev.argument == "url")
+ code = InsetOld::URL_CODE;
+ else if (ev.argument == "wrap")
+ code = InsetOld::WRAP_CODE;
break;
- case LFUN_INSET_GRAPHICS:
- code = Inset::GRAPHICS_CODE;
+
+ case LFUN_INSET_ERT:
+ code = InsetOld::ERT_CODE;
break;
case LFUN_INSET_FOOTNOTE:
- code = Inset::FOOT_CODE;
+ code = InsetOld::FOOT_CODE;
break;
case LFUN_TABULAR_INSERT:
- code = Inset::TABULAR_CODE;
- break;
- case LFUN_INSET_EXTERNAL:
- code = Inset::EXTERNAL_CODE;
+ code = InsetOld::TABULAR_CODE;
break;
case LFUN_INSET_MARGINAL:
- code = Inset::MARGIN_CODE;
+ code = InsetOld::MARGIN_CODE;
break;
case LFUN_INSET_MINIPAGE:
- code = Inset::MINIPAGE_CODE;
+ code = InsetOld::MINIPAGE_CODE;
break;
case LFUN_INSET_FLOAT:
case LFUN_INSET_WIDE_FLOAT:
- code = Inset::FLOAT_CODE;
+ code = InsetOld::FLOAT_CODE;
break;
case LFUN_INSET_WRAP:
- code = Inset::WRAP_CODE;
+ code = InsetOld::WRAP_CODE;
break;
case LFUN_FLOAT_LIST:
- code = Inset::FLOAT_LIST_CODE;
+ code = InsetOld::FLOAT_LIST_CODE;
break;
#if 0
case LFUN_INSET_LIST:
- code = Inset::LIST_CODE;
+ code = InsetOld::LIST_CODE;
break;
case LFUN_INSET_THEOREM:
- code = Inset::THEOREM_CODE;
+ code = InsetOld::THEOREM_CODE;
break;
#endif
case LFUN_INSET_CAPTION:
- code = Inset::CAPTION_CODE;
+ code = InsetOld::CAPTION_CODE;
break;
case LFUN_INSERT_NOTE:
- code = Inset::NOTE_CODE;
+ code = InsetOld::NOTE_CODE;
break;
case LFUN_INSERT_LABEL:
- code = Inset::LABEL_CODE;
+ code = InsetOld::LABEL_CODE;
break;
case LFUN_INSET_OPTARG:
- code = Inset::OPTARG_CODE;
- break;
- case LFUN_REF_INSERT:
- code = Inset::REF_CODE;
- break;
- case LFUN_CITATION_CREATE:
- case LFUN_CITATION_INSERT:
- code = Inset::CITE_CODE;
+ code = InsetOld::OPTARG_CODE;
break;
- case LFUN_INSERT_BIBTEX:
- code = Inset::BIBTEX_CODE;
+ case LFUN_ENVIRONMENT_INSERT:
+ code = InsetOld::MINIPAGE_CODE;
break;
case LFUN_INDEX_INSERT:
- code = Inset::INDEX_CODE;
+ code = InsetOld::INDEX_CODE;
break;
case LFUN_INDEX_PRINT:
- code = Inset::INDEX_PRINT_CODE;
- break;
- case LFUN_CHILD_INSERT:
- code = Inset::INCLUDE_CODE;
+ code = InsetOld::INDEX_PRINT_CODE;
break;
case LFUN_TOC_INSERT:
- code = Inset::TOC_CODE;
- break;
- case LFUN_PARENTINSERT:
- code = Inset::PARENT_CODE;
+ code = InsetOld::TOC_CODE;
break;
case LFUN_HTMLURL:
case LFUN_URL:
- case LFUN_INSERT_URL:
- code = Inset::URL_CODE;
+ code = InsetOld::URL_CODE;
break;
case LFUN_QUOTE:
// always allow this, since we will inset a raw quote
case LFUN_MENU_SEPARATOR:
case LFUN_LDOTS:
case LFUN_END_OF_SENTENCE:
- code = Inset::SPECIALCHAR_CODE;
+ code = InsetOld::SPECIALCHAR_CODE;
break;
- case LFUN_PROTECTEDSPACE:
+ case LFUN_SPACE_INSERT:
// slight hack: we know this is allowed in math mode
if (!mathcursor)
- code = Inset::SPECIALCHAR_CODE;
+ code = InsetOld::SPACE_CODE;
break;
default:
break;
}
- if (code != Inset::NO_CODE && tli && !tli->insetAllowed(code))
+ if (code != InsetOld::NO_CODE && tli && !tli->insetAllowed(code))
disable = true;
if (disable)
flag.setOnOff(buf->isReadonly());
break;
case LFUN_APPENDIX:
- flag.setOnOff(TEXT(false)->cursor.par()->params().startOfAppendix());
+ flag.setOnOff(view()->getLyXText()->cursor.par()->params().startOfAppendix());
break;
case LFUN_SWITCHBUFFER:
// toggle on the current buffer, but do not toggle off
if (ev.argument == buf->fileName())
flag.setOnOff(true);
break;
+ case LFUN_TRACK_CHANGES:
+ flag.setOnOff(buf->params.tracking_changes);
+ break;
default:
break;
}
// the font related toggles
if (!mathcursor) {
- LyXFont const & font = TEXT(false)->real_current_font;
+ LyXFont const & font = view()->getLyXText()->real_current_font;
switch (ev.action) {
case LFUN_EMPH:
flag.setOnOff(font.emph() == LyXFont::ON);
int const action = lyxaction.LookupFunc(s);
if (action == LFUN_UNKNOWN_ACTION) {
- string const msg = string(_("Unknown function ("))
- + s + ")";
- owner->message(msg);
+ owner->message(bformat(_("Unknown function (%1$s)"), s));
return;
}
dispatch(lyxaction.retrieveActionArg(ac), verbose);
}
+namespace {
+ bool ensureBufferClean(BufferView * bv) {
+
+ Buffer & buf = *bv->buffer();
+ if (buf.isClean())
+ return true;
+
+ string const file = MakeDisplayPath(buf.fileName(), 30);
+ string text = bformat(_("The document %1$s has unsaved "
+ "changes.\n\nDo you want to save "
+ "the document?"), file);
+ int const ret = Alert::prompt(_("Save changed document?"),
+ text, 0, 1, _("&Save"),
+ _("&Cancel"));
+
+ if (ret == 0)
+ bv->owner()->dispatch(FuncRequest(LFUN_MENUWRITE));
+
+ return buf.isClean();
+ }
+
+} //namespace anon
void LyXFunc::dispatch(FuncRequest const & ev, bool verbose)
{
lyxerr[Debug::ACTION] << "LyXFunc::dispatch: action[" << ev.action
- <<"] arg[" << ev.argument << "]" << endl;
+ <<"] arg[" << ev.argument << ']' << endl;
// we have not done anything wrong yet.
errorstat = false;
selection_possible = false;
- if (view()->available())
- view()->hideCursor();
-
string argument = ev.argument;
kb_action action = ev.action;
goto exit_with_message;
}
+ if (view()->available())
+ view()->hideCursor();
+
if (view()->available() && view()->theLockingInset()) {
- Inset::RESULT result;
- if ((action > 1) || ((action == LFUN_UNKNOWN_ACTION) &&
- (!keyseq.deleted())))
+ InsetOld::RESULT result;
+ if (action > 1 || (action == LFUN_UNKNOWN_ACTION &&
+ !keyseq.deleted()))
{
UpdatableInset * inset = view()->theLockingInset();
#if 1
#endif
if ((action == LFUN_UNKNOWN_ACTION)
&& argument.empty()) {
- argument = keyseq.getLastKeyEncoded();
+ argument = encoded_last_key;
+ }
+
+ // the insets can't try to handle this,
+ // a table cell in the dummy position will
+ // lock its insettext, the insettext will
+ // pass it the bufferview, and succeed,
+ // so it will stay not locked. Not good
+ // if we've just done LFUN_ESCAPE (which
+ // injects an LFUN_PARAGRAPH_UPDATE)
+ if (action == LFUN_PARAGRAPH_UPDATE) {
+ view()->dispatch(ev);
+ goto exit_with_message;
}
+
// Undo/Redo is a bit tricky for insets.
if (action == LFUN_UNDO) {
view()->undo();
} else if (((result=inset->
// Hand-over to inset's own dispatch:
localDispatch(FuncRequest(view(), action, argument))) ==
- UpdatableInset::DISPATCHED) ||
- (result == UpdatableInset::DISPATCHED_NOUPDATE))
+ DISPATCHED) ||
+ (result == DISPATCHED_NOUPDATE))
goto exit_with_message;
// If UNDISPATCHED, just soldier on
- else if (result == UpdatableInset::FINISHED) {
+ else if (result == FINISHED) {
+ owner->clearMessage();
goto exit_with_message;
// We do not need special RTL handling here:
// FINISHED means that the cursor should be
// one position after the inset.
- } else if (result == UpdatableInset::FINISHED_RIGHT) {
- TEXT()->cursorRight(view());
- moveCursorUpdate(true, false);
- owner->view_state_changed();
+ } else if (result == FINISHED_RIGHT) {
+ view()->text->cursorRight(view());
+ moveCursorUpdate();
+ owner->clearMessage();
goto exit_with_message;
- } else if (result == UpdatableInset::FINISHED_UP) {
- if (TEXT()->cursor.irow()->previous()) {
+ } else if (result == FINISHED_UP) {
+ RowList::iterator const irow = view()->text->cursorIRow();
+ if (irow != view()->text->rows().begin()) {
#if 1
- TEXT()->setCursorFromCoordinates(
- view(), TEXT()->cursor.ix() + inset_x,
- TEXT()->cursor.iy() -
- TEXT()->cursor.irow()->baseline() - 1);
- TEXT()->cursor.x_fix(TEXT()->cursor.x());
+ view()->text->setCursorFromCoordinates(
+ view()->text->cursor.ix() + inset_x,
+ view()->text->cursor.iy() -
+ irow->baseline() - 1);
+ view()->text->cursor.x_fix(view()->text->cursor.x());
#else
- TEXT()->cursorUp(view());
+ view()->text->cursorUp(view());
#endif
- moveCursorUpdate(true, false);
- owner->view_state_changed();
+ moveCursorUpdate();
} else {
- view()->update(TEXT(), BufferView::SELECT|BufferView::FITCUR);
+ view()->update();
}
+ owner->clearMessage();
goto exit_with_message;
- } else if (result == UpdatableInset::FINISHED_DOWN) {
- if (TEXT()->cursor.irow()->next()) {
+ } else if (result == FINISHED_DOWN) {
+ RowList::iterator const irow = view()->text->cursorIRow();
+ if (boost::next(irow) != view()->text->rows().end()) {
#if 1
- TEXT()->setCursorFromCoordinates(
- view(), TEXT()->cursor.ix() + inset_x,
- TEXT()->cursor.iy() -
- TEXT()->cursor.irow()->baseline() +
- TEXT()->cursor.irow()->height() + 1);
- TEXT()->cursor.x_fix(TEXT()->cursor.x());
+ view()->text->setCursorFromCoordinates(
+ view()->text->cursor.ix() + inset_x,
+ view()->text->cursor.iy() -
+ irow->baseline() +
+ irow->height() + 1);
+ view()->text->cursor.x_fix(view()->text->cursor.x());
#else
- TEXT()->cursorDown(view());
+ view()->text->cursorDown(view());
#endif
} else {
- TEXT()->cursorRight(view());
+ view()->text->cursorRight(view());
}
- moveCursorUpdate(true, false);
- owner->view_state_changed();
+ moveCursorUpdate();
+ owner->clearMessage();
goto exit_with_message;
}
#warning I am not sure this is still right, please have a look! (Jug 20020417)
case LFUN_UNKNOWN_ACTION:
case LFUN_BREAKPARAGRAPH:
case LFUN_BREAKLINE:
- TEXT()->cursorRight(view());
+ view()->text->cursorRight(view());
view()->switchKeyMap();
owner->view_state_changed();
break;
case LFUN_RIGHT:
- if (!TEXT()->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
- TEXT()->cursorRight(view());
- moveCursorUpdate(true, false);
+ if (!view()->text->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
+ view()->text->cursorRight(view());
+ moveCursorUpdate();
owner->view_state_changed();
}
goto exit_with_message;
case LFUN_LEFT:
- if (TEXT()->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
- TEXT()->cursorRight(view());
- moveCursorUpdate(true, false);
+ if (view()->text->cursor.par()->isRightToLeftPar(owner->buffer()->params)) {
+ view()->text->cursorRight(view());
+ moveCursorUpdate();
owner->view_state_changed();
}
goto exit_with_message;
case LFUN_DOWN:
- if (TEXT()->cursor.row()->next())
- TEXT()->cursorDown(view());
+ if (boost::next(view()->text->cursorRow()) != view()->text->rows().end())
+ view()->text->cursorDown(view());
else
- TEXT()->cursorRight(view());
- moveCursorUpdate(true, false);
+ view()->text->cursorRight(view());
+ moveCursorUpdate();
owner->view_state_changed();
goto exit_with_message;
default:
switch (action) {
- case LFUN_ESCAPE:
- {
- if (!view()->available()) break;
+ case LFUN_ESCAPE: {
+ if (!view()->available())
+ break;
// this function should be used always [asierra060396]
- UpdatableInset * tli =
- view()->theLockingInset();
+ UpdatableInset * tli = view()->theLockingInset();
if (tli) {
UpdatableInset * lock = tli->getLockingInset();
if (tli == lock) {
view()->unlockInset(tli);
- TEXT()->cursorRight(view());
- moveCursorUpdate(true, false);
+ view()->text->cursorRight(view());
+ moveCursorUpdate();
owner->view_state_changed();
} else {
- tli->unlockInsetInInset(view(),
- lock,
- true);
+ tli->unlockInsetInInset(view(), lock, true);
}
finishUndo();
// Tell the paragraph dialog that we changed paragraph
- owner->getDialogs().updateParagraph();
+ dispatch(FuncRequest(LFUN_PARAGRAPH_UPDATE));
}
+ break;
}
- break;
- // --- Misc -------------------------------------------
- case LFUN_WORDFINDFORWARD :
- case LFUN_WORDFINDBACKWARD : {
+ case LFUN_WORDFINDFORWARD:
+ case LFUN_WORDFINDBACKWARD: {
static string last_search;
string searched_string;
} else {
searched_string = last_search;
}
- bool fw = (action == LFUN_WORDFINDBACKWARD);
- if (!searched_string.empty()) {
- lyxfind::LyXFind(view(), searched_string, fw);
- }
-// view()->showCursor();
+ bool fw = (action == LFUN_WORDFINDFORWARD);
+ if (!searched_string.empty())
+ lyx::find::find(view(), searched_string, fw);
+ break;
}
- break;
case LFUN_PREFIX:
- {
- if (view()->available() && !view()->theLockingInset()) {
- view()->update(TEXT(),
- BufferView::SELECT|BufferView::FITCUR);
- }
+ if (view()->available() && !view()->theLockingInset())
+ view()->update();
owner->message(keyseq.printOptions());
- }
- break;
+ break;
// --- Misc -------------------------------------------
case LFUN_EXEC_COMMAND:
owner->focus_command_buffer();
break;
- case LFUN_CANCEL: // RVDK_PATCH_5
+ case LFUN_CANCEL:
keyseq.reset();
meta_fake_bit = key_modifier::none;
if (view()->available())
setMessage(N_("Cancel"));
break;
- case LFUN_META_FAKE: // RVDK_PATCH_5
- {
+ case LFUN_META_FAKE:
meta_fake_bit = key_modifier::alt;
setMessage(keyseq.print());
- }
- break;
+ break;
case LFUN_READ_ONLY_TOGGLE:
- if (owner->buffer()->lyxvc.inUse()) {
+ if (owner->buffer()->lyxvc.inUse())
owner->buffer()->lyxvc.toggleReadOnly();
- } else {
+ else
owner->buffer()->setReadonly(
!owner->buffer()->isReadonly());
- }
break;
case LFUN_CENTER: // this is center and redraw.
case LFUN_MENUWRITE:
if (!owner->buffer()->isUnnamed()) {
- ostringstream s1;
- s1 << _("Saving document") << ' '
- << MakeDisplayPath(owner->buffer()->fileName() + "...");
- owner->message(STRCONV(s1.str()));
- MenuWrite(view(), owner->buffer());
- s1 << _(" done.");
- owner->message(STRCONV(s1.str()));
+ string const str = bformat(_("Saving document %1$s..."),
+ MakeDisplayPath(owner->buffer()->fileName()));
+ owner->message(str);
+ MenuWrite(owner->buffer());
+ owner->message(str + _(" done."));
} else
- WriteAs(view(), owner->buffer());
+ WriteAs(owner->buffer());
break;
case LFUN_WRITEAS:
- WriteAs(view(), owner->buffer(), argument);
+ WriteAs(owner->buffer(), argument);
break;
- case LFUN_MENURELOAD:
- reloadBuffer();
+ case LFUN_MENURELOAD: {
+ string const file = MakeDisplayPath(view()->buffer()->fileName(), 20);
+ string 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?"),
+ text, 0, 1, _("&Revert"), _("&Cancel"));
+
+ if (ret == 0)
+ view()->reload();
break;
+ }
case LFUN_UPDATE:
Exporter::Export(owner->buffer(), argument, true);
+ view()->showErrorList(BufferFormat(*owner->buffer()));
break;
case LFUN_PREVIEW:
Exporter::Preview(owner->buffer(), argument);
+ view()->showErrorList(BufferFormat(*owner->buffer()));
break;
case LFUN_BUILDPROG:
Exporter::Export(owner->buffer(), "program", true);
+ view()->showErrorList(_("Build"));
break;
case LFUN_RUNCHKTEX:
- MenuRunChktex(owner->buffer());
- break;
-
- case LFUN_MENUPRINT:
- owner->getDialogs().showPrint();
+ owner->buffer()->runChktex();
+ view()->showErrorList(_("ChkTeX"));
break;
case LFUN_EXPORT:
if (argument == "custom")
owner->getDialogs().showSendto();
- else
+ else {
Exporter::Export(owner->buffer(), argument, false);
+ view()->showErrorList(BufferFormat(*owner->buffer()));
+ }
break;
case LFUN_IMPORT:
break;
case LFUN_TOCVIEW:
-#if 0
- case LFUN_LOFVIEW:
- case LFUN_LOTVIEW:
- case LFUN_LOAVIEW:
-#endif
{
- InsetCommandParams p;
-
-#if 0
- if (action == LFUN_TOCVIEW)
-#endif
- p.setCmdName("tableofcontents");
-#if 0
- else if (action == LFUN_LOAVIEW)
- p.setCmdName("listof{algorithm}{List of Algorithms}");
- else if (action == LFUN_LOFVIEW)
- p.setCmdName("listoffigures");
- else
- p.setCmdName("listoftables");
-#endif
- owner->getDialogs().createTOC(p.getAsString());
+ InsetCommandParams p("tableofcontents");
+ string const data = InsetCommandMailer::params2string("toc", p);
+ owner->getDialogs().show("toc", data, 0);
break;
}
view()->redo();
break;
- case LFUN_MENUSEARCH:
- owner->getDialogs().showSearch();
- break;
-
- case LFUN_REMOVEERRORS:
- if (view()->removeAutoInsets()) {
-#warning repaint() or update() or nothing ?
- view()->repaint();
- view()->fitCursor();
- }
- break;
-
case LFUN_DEPTH_MIN:
- changeDepth(view(), TEXT(false), -1);
+ changeDepth(view(), view()->getLyXText(), DEC_DEPTH, false);
+ owner->view_state_changed();
break;
case LFUN_DEPTH_PLUS:
- changeDepth(view(), TEXT(false), 1);
+ changeDepth(view(), view()->getLyXText(), INC_DEPTH, false);
+ owner->view_state_changed();
break;
- case LFUN_FREE:
- owner->getDialogs().setUserFreeFont();
+ case LFUN_FREEFONT_APPLY:
+ apply_freefont(view());
+ break;
+
+ case LFUN_FREEFONT_UPDATE:
+ update_and_apply_freefont(view(), argument);
break;
case LFUN_RECONFIGURE:
//#warning Find another implementation here (or another lyxfunc)!
#endif
#endif
- case LFUN_HELP_ABOUTLYX:
- owner->getDialogs().showAboutlyx();
- break;
-
- case LFUN_HELP_TEXINFO:
- owner->getDialogs().showTexinfo();
- break;
-
case LFUN_HELP_OPEN:
{
string const arg = argument;
setErrorMessage(N_("Missing argument"));
break;
}
- owner->prohibitInput();
string const fname = i18nLibFileSearch("doc", arg, "lyx");
if (fname.empty()) {
lyxerr << "LyX: unable to find documentation file `"
<< arg << "'. Bad installation?" << endl;
- owner->allowInput();
break;
}
- ostringstream str;
- str << _("Opening help file") << ' '
- << MakeDisplayPath(fname) << "...";
- owner->message(STRCONV(str.str()));
- view()->buffer(bufferlist.loadLyXFile(fname, false));
- owner->allowInput();
+ owner->message(bformat(_("Opening help file %1$s..."),
+ MakeDisplayPath(fname)));
+ view()->loadLyXFile(fname, false);
break;
}
// --- version control -------------------------------
case LFUN_VC_REGISTER:
{
- if (!owner->buffer()->lyxvc.inUse())
+ if (!ensureBufferClean(view()))
+ break;
+ if (!owner->buffer()->lyxvc.inUse()) {
owner->buffer()->lyxvc.registrer();
+ view()->reload();
+ }
}
break;
case LFUN_VC_CHECKIN:
{
+ if (!ensureBufferClean(view()))
+ break;
if (owner->buffer()->lyxvc.inUse()
- && !owner->buffer()->isReadonly())
+ && !owner->buffer()->isReadonly()) {
owner->buffer()->lyxvc.checkIn();
+ view()->reload();
+ }
}
break;
case LFUN_VC_CHECKOUT:
{
+ if (!ensureBufferClean(view()))
+ break;
if (owner->buffer()->lyxvc.inUse()
- && owner->buffer()->isReadonly())
+ && owner->buffer()->isReadonly()) {
owner->buffer()->lyxvc.checkOut();
+ view()->reload();
+ }
}
break;
case LFUN_VC_REVERT:
{
owner->buffer()->lyxvc.revert();
+ view()->reload();
}
break;
case LFUN_VC_UNDO:
{
owner->buffer()->lyxvc.undoLast();
+ view()->reload();
}
break;
- case LFUN_VC_HISTORY:
- {
- owner->getDialogs().showVCLogFile();
- break;
- }
-
// --- buffers ----------------------------------------
case LFUN_SWITCHBUFFER:
break;
case LFUN_FILE_NEW:
- {
- // servercmd: argument must be <file>:<template>
- Buffer * tmpbuf = NewFile(argument);
- if (tmpbuf)
- view()->buffer(tmpbuf);
- }
- break;
+ NewFile(view(), argument);
+ break;
case LFUN_FILE_OPEN:
open(argument);
break;
- case LFUN_LATEX_LOG:
- owner->getDialogs().showLogFile();
- break;
-
- case LFUN_LAYOUT_DOCUMENT:
- owner->getDialogs().showDocument();
- break;
-
- case LFUN_LAYOUT_PARAGRAPH:
- owner->getDialogs().showParagraph();
- break;
-
- case LFUN_LAYOUT_CHARACTER:
- owner->getDialogs().showCharacter();
- break;
-
case LFUN_LAYOUT_TABULAR:
if (view()->theLockingInset()) {
- if (view()->theLockingInset()->lyxCode()==Inset::TABULAR_CODE) {
+ if (view()->theLockingInset()->lyxCode()== InsetOld::TABULAR_CODE) {
InsetTabular * inset = static_cast<InsetTabular *>
(view()->theLockingInset());
inset->openLayoutDialog(view());
} else if (view()->theLockingInset()->
- getFirstLockingInsetOfType(Inset::TABULAR_CODE)!=0) {
+ getFirstLockingInsetOfType(InsetOld::TABULAR_CODE)!=0) {
InsetTabular * inset = static_cast<InsetTabular *>(
- view()->theLockingInset()->getFirstLockingInsetOfType(Inset::TABULAR_CODE));
+ view()->theLockingInset()->getFirstLockingInsetOfType(InsetOld::TABULAR_CODE));
inset->openLayoutDialog(view());
}
}
break;
- case LFUN_LAYOUT_PREAMBLE:
- owner->getDialogs().showPreamble();
- break;
-
case LFUN_DROP_LAYOUTS_CHOICE:
owner->getToolbar().openLayoutList();
break;
owner->getMenubar().openByName(argument);
break; // RVDK_PATCH_5
- case LFUN_SPELLCHECK:
- owner->getDialogs().showSpellchecker();
- break;
-
// --- lyxserver commands ----------------------------
if (bufferlist.exists(s)) {
view()->buffer(bufferlist.getBuffer(s));
} else {
- view()->buffer(bufferlist.loadLyXFile(s));
+ view()->loadLyXFile(s);
}
view()->setCursorFromRow(row);
int id;
istr >> id;
- Paragraph * par = owner->buffer()->getParFromID(id);
- if (par == 0) {
+ ParIterator par = owner->buffer()->getParFromID(id);
+ if (par == owner->buffer()->par_iterator_end()) {
lyxerr[Debug::INFO] << "No matching paragraph found! ["
- << id << "]" << endl;
+ << id << ']' << endl;
break;
} else {
lyxerr[Debug::INFO] << "Paragraph " << par->id()
if (view()->theLockingInset())
view()->unlockInset(view()->theLockingInset());
if (par->inInset()) {
- par->inInset()->edit(view());
+ FuncRequest cmd(view(), LFUN_INSET_EDIT, "left");
+ par->inInset()->localDispatch(cmd);
}
// Set the cursor
- view()->getLyXText()->setCursor(view(), par, 0);
+ view()->getLyXText()->setCursor(par.pit(), 0);
view()->switchKeyMap();
owner->view_state_changed();
}
break;
- case LFUN_APROPOS:
- case LFUN_GETTIP:
- {
- int const qa = lyxaction.LookupFunc(argument);
- setMessage(lyxaction.helpText(static_cast<kb_action>(qa)));
- }
- break;
-
// --- insert characters ----------------------------------------
// --- Mathed stuff. If we are here, there is no locked inset yet.
dispatch(FuncRequest(view(), LFUN_SELFINSERT, "^"));
break;
- case LFUN_MATH_PANEL:
- owner->getDialogs().showMathPanel();
- break;
+ case LFUN_DIALOG_SHOW: {
+ string const name = ev.getArg(0);
+ string data = trim(ev.argument.substr(name.size()));
+
+ if (name == "character") {
+ data = freefont2string();
+ if (!data.empty())
+ owner->getDialogs().show("character", data);
+ } else if (name == "document")
+ owner->getDialogs().showDocument();
+ else if (name == "findreplace")
+ owner->getDialogs().showSearch();
+ else if (name == "forks")
+ owner->getDialogs().showForks();
+ else if (name == "preamble")
+ owner->getDialogs().showPreamble();
+ else if (name == "preferences")
+ owner->getDialogs().showPreferences();
+ else if (name == "print")
+ owner->getDialogs().showPrint();
+ else if (name == "spellchecker")
+ owner->getDialogs().showSpellchecker();
+ else
+ owner->getDialogs().show(name, data);
+ break;
+ }
+
+ case LFUN_DIALOG_SHOW_NEW_INSET: {
+ string const & name = argument;
+ string data;
+ if (name == "bibitem" ||
+ name == "bibtex" ||
+ name == "include" ||
+ name == "index" ||
+ name == "ref" ||
+ name == "toc" ||
+ name == "url") {
+ InsetCommandParams p(name);
+ data = InsetCommandMailer::params2string(name, p);
+ } else if (name == "citation") {
+ InsetCommandParams p("cite");
+ data = InsetCommandMailer::params2string(name, p);
+ }
+ owner->getDialogs().show(name, data, 0);
+ }
+ break;
- case LFUN_CITATION_CREATE:
- {
- InsetCommandParams p("cite");
+ case LFUN_DIALOG_SHOW_NEXT_INSET: {
+ }
+ break;
- if (!argument.empty()) {
- // This should be set at source, ie when typing
- // "citation-insert foo" in the minibuffer.
- // Question: would pybibliographer also need to be
- // changed. Suspect so. Leave as-is therefore.
- if (contains(argument, "|")) {
- p.setContents(token(argument, '|', 0));
- p.setOptions(token(argument, '|', 1));
- } else {
- p.setContents(argument);
- }
- dispatch(FuncRequest(view(), LFUN_CITATION_INSERT, p.getAsString()));
- } else
- owner->getDialogs().createCitation(p.getAsString());
+ case LFUN_DIALOG_UPDATE: {
+ string const & name = argument;
+ // Can only update a dialog connected to an existing inset
+ InsetBase * inset = owner->getDialogs().getOpenInset(name);
+ if (inset) {
+ FuncRequest fr(view(), LFUN_INSET_DIALOG_UPDATE,
+ ev.argument);
+ inset->localDispatch(fr);
+ } else if (name == "paragraph") {
+ dispatch(FuncRequest(LFUN_PARAGRAPH_UPDATE));
+ }
}
break;
+ case LFUN_DIALOG_HIDE:
+ Dialogs::hide(argument, 0);
+ break;
+
+ case LFUN_DIALOG_DISCONNECT_INSET:
+ owner->getDialogs().disconnect(argument);
+ break;
+
case LFUN_CHILDOPEN:
{
string const filename =
if (bufferlist.exists(filename))
view()->buffer(bufferlist.getBuffer(filename));
else
- view()->buffer(bufferlist.loadLyXFile(filename));
+ view()->loadLyXFile(filename);
}
break;
}
break;
- case LFUN_DIALOG_PREFERENCES:
- owner->getDialogs().showPreferences();
- break;
-
case LFUN_SAVEPREFERENCES:
{
- Path p(user_lyxdir);
+ Path p(user_lyxdir());
lyxrc.write("preferences");
}
break;
// if values really changed...but not very important right now. (Lgb)
// All visible buffers will need resize
view()->resize();
- view()->repaint();
+ view()->update();
}
break;
x11_name != lcolor.getX11Name(LColor::graphicsbg));
if (!lcolor.setColor(lyx_name, x11_name)) {
- static string const err1 (N_("Set-color \""));
- static string const err2 (
- N_("\" failed - color is undefined "
- "or may not be redefined"));
- setErrorMessage(_(err1) + lyx_name + _(err2));
+ setErrorMessage(
+ bformat(_("Set-color \"%1$s\" failed "
+ "- color is undefined or "
+ "may not be redefined"), lyx_name));
break;
}
#warning FIXME!! The graphics cache no longer has a changeDisplay method.
#endif
#if 0
- grfx::GCache & gc = grfx::GCache::get();
+ lyx::graphics::GCache & gc =
+ lyx::graphics::GCache::get();
gc.changeDisplay(true);
#endif
}
- view()->repaint();
+ view()->update();
break;
}
owner->message(argument);
break;
- case LFUN_FORKS_SHOW:
- owner->getDialogs().showForks();
- break;
-
case LFUN_FORKS_KILL:
{
if (!isStrInt(argument))
owner->getDialogs().toggleTooltips();
break;
+ case LFUN_EXTERNAL_EDIT: {
+ InsetExternal()
+ .localDispatch(FuncRequest(view(), action, argument));
+ break;
+ }
+
default:
// Then if it was none of the above
// Trying the BufferView::pimpl dispatch:
} // end of switch
exit_with_message:
+
+ view()->owner()->updateLayoutChoice();
+
+ if (view()->available()) {
+ view()->fitCursor();
+
+ // If we executed a mutating lfun, mark the buffer as dirty
+ if (!getStatus(ev).disabled()
+ && !lyxaction.funcHasFlag(ev.action, LyXAction::NoBuffer)
+ && !lyxaction.funcHasFlag(ev.action, LyXAction::ReadOnly))
+ view()->buffer()->markDirty();
+ }
+
sendDispatchMessage(getMessage(), ev, verbose);
}
string dispatch_msg = msg;
if (!dispatch_msg.empty())
- dispatch_msg += " ";
+ dispatch_msg += ' ';
string comname = lyxaction.getActionName(ev.action);
if (pseudoaction == LFUN_UNKNOWN_ACTION) {
pseudoaction = ev.action;
} else {
- comname += " " + ev.argument;
+ comname += ' ' + ev.argument;
argsadded = true;
}
}
if (!shortcuts.empty()) {
comname += ": " + shortcuts;
} else if (!argsadded && !ev.argument.empty()) {
- comname += " " + ev.argument;
+ comname += ' ' + ev.argument;
}
if (!comname.empty()) {
comname = rtrim(comname);
- dispatch_msg += "(" + comname + ')';
+ dispatch_msg += '(' + comname + ')';
}
lyxerr[Debug::ACTION] << "verbose dispatch msg " << dispatch_msg << endl;
// The template stuff
string templname;
if (fromTemplate) {
- FileDialog fileDlg(owner, _("Select template file"),
+ FileDialog fileDlg(_("Select template file"),
LFUN_SELECT_FILE_SYNC,
make_pair(string(_("Documents|#o#O")),
string(lyxrc.document_path)),
string(lyxrc.template_path)));
FileDialog::Result result =
- fileDlg.Select(lyxrc.template_path,
- _("*.lyx|LyX Documents (*.lyx)"));
+ fileDlg.open(lyxrc.template_path,
+ _("*.lyx| LyX Documents (*.lyx)"));
if (result.first == FileDialog::Later)
return;
templname = fname;
}
- view()->buffer(bufferlist.newFile(filename, templname, !name.empty()));
+ view()->newFile(filename, templname, !name.empty());
}
string filename;
if (fname.empty()) {
- FileDialog fileDlg(owner, _("Select document to open"),
+ FileDialog fileDlg(_("Select document to open"),
LFUN_FILE_OPEN,
make_pair(string(_("Documents|#o#O")),
string(lyxrc.document_path)),
make_pair(string(_("Examples|#E#e")),
- string(AddPath(system_lyxdir, "examples"))));
+ string(AddPath(system_lyxdir(), "examples"))));
FileDialog::Result result =
- fileDlg.Select(initpath,
- "*.lyx|LyX Documents (*.lyx)");
+ fileDlg.open(initpath,
+ _("*.lyx| LyX Documents (*.lyx)"));
if (result.first == FileDialog::Later)
return;
// if the file doesn't exist, let the user create one
FileInfo const f(filename, true);
if (!f.exist()) {
- if (!Alert::askQuestion(_("No such file"), disp_fn,
- _("Start a new document with this filename ?"))) {
- owner->message(_("Canceled"));
- return;
- }
// the user specifically chose this name. Believe them.
- Buffer * buffer = bufferlist.newFile(filename, "", true);
- view()->buffer(buffer);
+ view()->newFile(filename, "", true);
return;
}
- ostringstream str;
- str << _("Opening document") << ' ' << disp_fn << "...";
-
- owner->message(STRCONV(str.str()));
+ owner->message(bformat(_("Opening document %1$s..."), disp_fn));
- Buffer * openbuf = bufferlist.loadLyXFile(filename);
- ostringstream str2;
- if (openbuf) {
- view()->buffer(openbuf);
- str2 << _("Document") << ' ' << disp_fn << ' ' << _("opened.");
+ string str2;
+ if (view()->loadLyXFile(filename)) {
+ str2 = bformat(_("Document %1$s opened."), disp_fn);
} else {
- str2 << _("Could not open document") << ' ' << disp_fn;
+ str2 = bformat(_("Could not open document %1$s"), disp_fn);
}
- owner->message(STRCONV(str2.str()));
+ owner->message(str2);
}
initpath = trypath;
}
- string const text = _("Select ") + formats.prettyName(format)
- + _(" file to import");
+ string const text = bformat(_("Select %1$s file to import"),
+ formats.prettyName(format));
- FileDialog fileDlg(owner, text,
+ FileDialog fileDlg(text,
LFUN_IMPORT,
make_pair(string(_("Documents|#o#O")),
string(lyxrc.document_path)),
make_pair(string(_("Examples|#E#e")),
- string(AddPath(system_lyxdir, "examples"))));
+ string(AddPath(system_lyxdir(), "examples"))));
string const extension = "*." + formats.extension(format)
+ "| " + formats.prettyName(format)
- + " (*." + formats.extension(format) + ")";
+ + " (*." + formats.extension(format) + ')';
- FileDialog::Result result = fileDlg.Select(initpath,
+ FileDialog::Result result = fileDlg.open(initpath,
extension);
if (result.first == FileDialog::Later)
string const lyxfile = ChangeExtension(filename, ".lyx");
// Check if the document already is open
- if (lyxrc.use_gui && bufferlist.exists(lyxfile)) {
- switch (Alert::askConfirmation(_("Document is already open:"),
- MakeDisplayPath(lyxfile, 50),
- _("Do you want to close that document now?\n"
- "('No' will just switch to the open version)")))
- {
- case 1:
- // If close is canceled, we cancel here too.
- if (!bufferlist.close(bufferlist.getBuffer(lyxfile)))
- return;
- break;
- case 2:
- view()->buffer(bufferlist.getBuffer(lyxfile));
- return;
- case 3:
- owner->message(_("Canceled."));
- return;
- }
+ if (lyx_gui::use_gui && bufferlist.exists(lyxfile)) {
+ if (!bufferlist.close(bufferlist.getBuffer(lyxfile), true)) {
+ owner->message(_("Canceled."));
+ return;
+ }
}
// if the file exists already, and we didn't do
// -i lyx thefile.lyx, warn
if (FileInfo(lyxfile, true).exist() && filename != lyxfile) {
- if (!Alert::askQuestion(_("A document by the name"),
- MakeDisplayPath(lyxfile), _("already exists. Overwrite?"))) {
- owner->message(_("Canceled"));
+ string const file = MakeDisplayPath(lyxfile, 30);
+
+ string text = bformat(_("The document %1$s already exists.\n\n"
+ "Do you want to over-write that document?"), file);
+ int const ret = Alert::prompt(_("Over-write document?"),
+ text, 0, 1, _("&Over-write"), _("&Cancel"));
+
+ if (ret == 1) {
+ owner->message(_("Canceled."));
return;
}
}
}
-void LyXFunc::reloadBuffer()
-{
- string const fn = owner->buffer()->fileName();
- if (bufferlist.close(owner->buffer()))
- view()->buffer(bufferlist.loadLyXFile(fn));
-}
-
-
void LyXFunc::closeBuffer()
{
- if (bufferlist.close(owner->buffer()) && !quitting) {
+ if (bufferlist.close(owner->buffer(), true) && !quitting) {
if (bufferlist.empty()) {
- // need this otherwise SEGV may occur while trying to
- // set variables that don't exist
+ // need this otherwise SEGV may occur while
+ // trying to set variables that don't exist
// since there's no current buffer
owner->getDialogs().hideBufferDependent();
} else {
BufferView * LyXFunc::view() const
{
- lyx::Assert(owner);
+ Assert(owner);
return owner->view().get();
}
+
+
+bool LyXFunc::wasMetaKey() const
+{
+ return (meta_fake_bit != key_modifier::none);
+}
+
projects / lyx.git / blobdiff