}
updateLabels(*buf);
lv->setBuffer(buf);
- lv->errors("Parse");
+ buf->errors("Parse");
} else {
Buffer * const b = newFile(lyxfile.absFilename(), string(), true);
if (b)
//lyxerr << "LyXFunc::getStatus: cmd: " << cmd << endl;
FuncStatus flag;
- /* In LyX/Mac, when a dialog is open, the menus of the
- application can still be accessed without giving focus to
- the main window. In this case, we want to disable the menu
- entries that are buffer-related.
-
- Note that this code is not perfect, as bug 1941 attests:
- http://bugzilla.lyx.org/show_bug.cgi?id=1941#c4
- */
Buffer * buf = lyx_view_? lyx_view_->buffer() : 0;
- if (lyx_view_ && cmd.origin == FuncRequest::MENU && !lyx_view_->hasFocus())
- buf = 0;
if (cmd.action == LFUN_NOACTION) {
flag.message(from_utf8(N_("Nothing to do")));
// to handle (Andre')
bool enable = true;
switch (cmd.action) {
+
+ case LFUN_DIALOG_TOGGLE:
+ case LFUN_DIALOG_SHOW:
+ case LFUN_DIALOG_UPDATE:
+ case LFUN_TOOLBAR_TOGGLE:
+ case LFUN_INSET_APPLY:
+ if (lyx_view_)
+ return lyx_view_->getStatus(cmd);
+ enable = false;
+ break;
+
case LFUN_BUFFER_TOGGLE_READ_ONLY:
flag.setOnOff(buf->isReadonly());
break;
&& (!buf->isClean() || buf->isExternallyModified(Buffer::timestamp_method));
break;
- case LFUN_INSET_APPLY: {
- if (!view()) {
- enable = false;
- break;
- }
- string const name = cmd.getArg(0);
- Inset * inset = lyx_view_->getOpenInset(name);
- if (inset) {
- FuncRequest fr(LFUN_INSET_MODIFY, cmd.argument());
- FuncStatus fs;
- if (!inset->getStatus(view()->cursor(), fr, fs)) {
- // Every inset is supposed to handle this
- BOOST_ASSERT(false);
- }
- flag |= fs;
- } else {
- FuncRequest fr(LFUN_INSET_INSERT, cmd.argument());
- flag |= getStatus(fr);
- }
- enable = flag.enabled();
- break;
- }
-
- case LFUN_DIALOG_TOGGLE:
- flag.setOnOff(lyx_view_?
- lyx_view_->isDialogVisible(cmd.getArg(0)) : false);
- // fall through to set "enable"
- case LFUN_DIALOG_SHOW: {
- string const name = cmd.getArg(0);
- if (!buf)
- enable = name == "aboutlyx"
- || name == "file" //FIXME: should be removed.
- || name == "prefs"
- || name == "texinfo";
- else if (name == "print")
- enable = buf->isExportable("dvi")
- && lyxrc.print_command != "none";
- else if (name == "character") {
- if (!view())
- enable = false;
- else {
- InsetCode ic = view()->cursor().inset().lyxCode();
- enable = ic != ERT_CODE && ic != LISTINGS_CODE;
- }
- }
- else if (name == "latexlog")
- enable = FileName(buf->logName()).isFileReadable();
- else if (name == "spellchecker")
-#if defined (USE_ASPELL) || defined (USE_ISPELL) || defined (USE_PSPELL)
- enable = !buf->isReadonly();
-#else
- enable = false;
-#endif
- else if (name == "vclog")
- enable = buf->lyxvc().inUse();
- break;
- }
-
- case LFUN_DIALOG_UPDATE: {
- string const name = cmd.getArg(0);
- if (!buf)
- enable = name == "prefs";
- break;
- }
-
case LFUN_CITATION_INSERT: {
FuncRequest fr(LFUN_INSET_INSERT, "citation");
enable = getStatus(fr).enabled();
enable = LyX::ref().session().bookmarks().size() > 0;
break;
- case LFUN_TOOLBAR_TOGGLE: {
- bool const current = lyx_view_?
- lyx_view_->isToolbarVisible(cmd.getArg(0)) : false;
- flag.setOnOff(current);
- break;
- }
- case LFUN_WINDOW_CLOSE: {
+ case LFUN_WINDOW_CLOSE:
enable = theApp()->viewCount() > 0;
break;
- }
// this one is difficult to get right. As a half-baked
// solution, we consider only the first action of the sequence
} else {
switch (action) {
// Let lyx_view_ dispatch its own actions.
+ case LFUN_BUFFER_SWITCH:
+ case LFUN_BUFFER_NEXT:
+ case LFUN_BUFFER_PREVIOUS:
case LFUN_COMMAND_EXECUTE:
case LFUN_DROP_LAYOUTS_CHOICE:
case LFUN_MENU_OPEN:
case LFUN_TOOLBAR_TOGGLE:
+ case LFUN_DIALOG_UPDATE:
+ case LFUN_DIALOG_TOGGLE:
+ case LFUN_DIALOG_DISCONNECT_INSET:
+ case LFUN_DIALOG_HIDE:
+ case LFUN_DIALOG_SHOW:
+ case LFUN_INSET_APPLY:
BOOST_ASSERT(lyx_view_);
lyx_view_->dispatch(cmd);
+ if (lyx_view_->view())
+ updateFlags = lyx_view_->view()->cursor().result().update();
break;
case LFUN_WORD_FIND_FORWARD:
case LFUN_BUFFER_EXPORT:
BOOST_ASSERT(lyx_view_ && lyx_view_->buffer());
if (argument == "custom")
- lyx_view_->showDialog("sendto", string());
+ dispatch(FuncRequest(LFUN_DIALOG_SHOW, "sendto"));
else
lyx_view_->buffer()->doExport(argument, false);
break;
if (buf) {
updateLabels(*buf);
lyx_view_->setBuffer(buf);
- lyx_view_->errors("Parse");
+ buf->errors("Parse");
}
updateFlags = Update::None;
break;
break;
// --- buffers ----------------------------------------
- case LFUN_BUFFER_SWITCH:
- BOOST_ASSERT(lyx_view_);
- lyx_view_->setBuffer(theBufferList().getBuffer(argument));
- updateFlags = Update::None;
- break;
-
- case LFUN_BUFFER_NEXT:
- BOOST_ASSERT(lyx_view_);
- lyx_view_->setBuffer(theBufferList().next(lyx_view_->buffer()));
- updateFlags = Update::None;
- break;
-
- case LFUN_BUFFER_PREVIOUS:
- BOOST_ASSERT(lyx_view_);
- lyx_view_->setBuffer(theBufferList().previous(lyx_view_->buffer()));
- updateFlags = Update::None;
- break;
case LFUN_FILE_NEW: {
BOOST_ASSERT(lyx_view_);
lyx_view_->setBuffer(buf);
view()->setCursorFromRow(row);
if (loaded)
- lyx_view_->errors("Parse");
+ buf->errors("Parse");
updateFlags = Update::FitCursor;
break;
}
- case LFUN_DIALOG_SHOW: {
- BOOST_ASSERT(lyx_view_);
- string const name = cmd.getArg(0);
- string data = trim(to_utf8(cmd.argument()).substr(name.size()));
-
- if (name == "character") {
- data = freefont2string();
- if (!data.empty())
- lyx_view_->showDialog("character", data);
- } else if (name == "latexlog") {
- Buffer::LogType type;
- string const logfile = lyx_view_->buffer()->logName(&type);
- switch (type) {
- case Buffer::latexlog:
- data = "latex ";
- break;
- case Buffer::buildlog:
- data = "literate ";
- break;
- }
- data += Lexer::quoteString(logfile);
- lyx_view_->showDialog("log", data);
- } else if (name == "vclog") {
- string const data = "vc " +
- Lexer::quoteString(lyx_view_->buffer()->lyxvc().getLogFile());
- lyx_view_->showDialog("log", data);
- } else
- lyx_view_->showDialog(name, data);
- break;
- }
case LFUN_DIALOG_SHOW_NEW_INSET: {
BOOST_ASSERT(lyx_view_);
break;
} // end switch(code)
if (insetCodeOK)
- lyx_view_->showDialog(name, data, 0);
+ dispatch(FuncRequest(LFUN_DIALOG_SHOW, name + " " + data));
break;
}
- case LFUN_DIALOG_UPDATE: {
- BOOST_ASSERT(lyx_view_);
- string const & name = argument;
- // Can only update a dialog connected to an existing inset
- Inset * inset = lyx_view_->getOpenInset(name);
- if (inset) {
- FuncRequest fr(LFUN_INSET_DIALOG_UPDATE, cmd.argument());
- inset->dispatch(view()->cursor(), fr);
- } else if (name == "paragraph") {
- dispatch(FuncRequest(LFUN_PARAGRAPH_UPDATE));
- } else if (name == "prefs") {
- lyx_view_->updateDialog(name, string());
- }
- break;
- }
-
- case LFUN_DIALOG_HIDE: {
- if (quitting || !use_gui)
- break;
- theApp()->hideDialogs(argument, 0);
- break;
- }
-
- case LFUN_DIALOG_TOGGLE: {
- BOOST_ASSERT(lyx_view_);
- if (lyx_view_->isDialogVisible(cmd.getArg(0)))
- dispatch(FuncRequest(LFUN_DIALOG_HIDE, argument));
- else
- dispatch(FuncRequest(LFUN_DIALOG_SHOW, argument));
- break;
- }
-
- case LFUN_DIALOG_DISCONNECT_INSET:
- BOOST_ASSERT(lyx_view_);
- lyx_view_->disconnectDialog(argument);
- break;
-
-
case LFUN_CITATION_INSERT: {
BOOST_ASSERT(lyx_view_);
if (!argument.empty()) {
updateLabels(*child->masterBuffer());
lyx_view_->setBuffer(child);
if (parsed)
- lyx_view_->errors("Parse");
+ child->errors("Parse");
}
// If a screen update is required (in case where auto_open is false),
break;
}
- case LFUN_INSET_APPLY: {
- BOOST_ASSERT(lyx_view_);
- string const name = cmd.getArg(0);
- Inset * inset = lyx_view_->getOpenInset(name);
- if (inset) {
- FuncRequest fr(LFUN_INSET_MODIFY, argument);
- inset->dispatch(view()->cursor(), fr);
- } else {
- FuncRequest fr(LFUN_INSET_INSERT, argument);
- dispatch(fr);
- }
- // ideally, the update flag should be set by the insets,
- // but this is not possible currently
- updateFlags = Update::Force | Update::FitCursor;
- break;
- }
-
case LFUN_ALL_INSETS_TOGGLE: {
BOOST_ASSERT(lyx_view_);
string action;
actOnUpdatedPrefs(lyxrc_orig, lyxrc);
- if (lyx_view_ && lyx_view_->buffer())
- lyx_view_->updateLayoutChoice(true);
+ theApp()->resetGui();
/// We force the redraw in any case because there might be
/// some screen font changes.
}
case LFUN_WINDOW_NEW:
- LyX::ref().newLyXView();
+ theApp()->createView();
break;
case LFUN_WINDOW_CLOSE:
// (at least partially) visible top-level paragraphs.
// We will redraw the screen only if needed.
view()->processUpdateFlags(updateFlags);
- lyx_view_->updateStatusBar();
// if we executed a mutating lfun, mark the buffer as dirty
if (flag.enabled()
theSelection().haveSelection(view()->cursor().selection());
if (view()->cursor().inTexted()) {
- lyx_view_->updateLayoutChoice(false);
}
}
}
if (!quitting && lyx_view_) {
- lyx_view_->updateToolbars();
// Some messages may already be translated, so we cannot use _()
sendDispatchMessage(translateIfPossible(getMessage()), cmd);
}
if (!newBuffer) {
lyx_view_->message(_("Document not loaded."));
- lyx_view_->updateStatusBar();
lyx_view_->setBusy(false);
return 0;
}
if (buf) {
updateLabels(*buf);
lyx_view_->setBuffer(buf);
- lyx_view_->errors("Parse");
+ buf->errors("Parse");
str2 = bformat(_("Document %1$s opened."), disp_fn);
} else {
str2 = bformat(_("Could not open document %1$s"), disp_fn);
if (buf) {
updateLabels(*buf);
lyx_view_->setBuffer(buf);
- lyx_view_->errors("Parse");
+ buf->errors("Parse");
str = bformat(_("Document %1$s reloaded."), disp_fn);
} else {
str = bformat(_("Could not reload document %1$s"), disp_fn);
projects / lyx.git / blobdiff