}
}
- FileName fname = libFileSearch("images/" + path, name1, "png");
+ QString imagedir = "images/" + path;
+ FileName fname = imageLibFileSearch(imagedir, name1, "png");
if (fname.exists())
return toqstr(fname.absFileName());
- fname = libFileSearch("images/" + path, name2, "png");
+ fname = imageLibFileSearch(imagedir, name2, "png");
if (fname.exists())
return toqstr(fname.absFileName());
<< '(' << to_utf8(f.argument()) << ")\"");
if (unknown) {
- fname = libFileSearch(QString("images/"), "unknown", "png");
+ imagedir = "images/";
+ fname = imageLibFileSearch(imagedir, "unknown", "png");
if (fname.exists())
return toqstr(fname.absFileName());
return QString(":/images/unknown.png");
QPixmap getPixmap(QString const & path, QString const & name, QString const & ext)
{
QPixmap pixmap;
- FileName fname = libFileSearch(path, name, ext);
+ QString imagedir = path;
+ FileName fname = imageLibFileSearch(imagedir, name, ext);
QString path1 = toqstr(fname.absFileName());
QString path2 = ":/" + path + name + "." + ext;
BufferView * bv = current_view_->currentBufferView();
if (bv) {
- Cursor & cursor = bv->cursor();
- Buffer & buf = bv->buffer();
-
- // FIXME
- // This check out to be done somewhere else. It got moved here
- // from TextMetrics.cpp, where it definitely didn't need to be.
- // Actually, this test ought not to be done at all, since the
- // whole InsetBibitem business is a mess. But that is a different
- // story.
- int moveCursor = 0;
- if (cursor.inTexted()) {
- moveCursor = cursor.paragraph().checkBiblio(buf);
- if (moveCursor > 0)
- cursor.posForward();
- else if (moveCursor < 0 && cursor.pos() >= -moveCursor)
- cursor.posBackward();
- }
- if (moveCursor != 0 || dr.needBufferUpdate()) {
- cursor.clearBufferUpdate();
- buf.updateBuffer();
+ if (dr.needBufferUpdate()) {
+ bv->cursor().clearBufferUpdate();
+ bv->buffer().updateBuffer();
}
// BufferView::update() updates the ViewMetricsInfo and
// also initializes the position cache for all insets in
dispatch(FuncRequest(LFUN_BOOKMARK_SAVE, "0"));
// if the current buffer is not that one, switch to it.
- BufferView * doc_bv = current_view_->documentBufferView();
+ BufferView * doc_bv = current_view_ ?
+ current_view_->documentBufferView() : 0;
if (!doc_bv || doc_bv->buffer().fileName() != tmp.filename) {
if (switchToBuffer) {
dispatch(FuncRequest(LFUN_BUFFER_SWITCH, file));
+ if (!current_view_)
+ return;
doc_bv = current_view_->documentBufferView();
} else
return;
"updated document class specifications."));
}
+void GuiApplication::validateCurrentView()
+{
+ if (!d->views_.empty() && !current_view_) {
+ // currently at least one view exists but no view has the focus.
+ // choose the last view to make it current.
+ // a view without any open document is preferred.
+ GuiView * candidate = 0;
+ QHash<int, GuiView *>::const_iterator it = d->views_.begin();
+ QHash<int, GuiView *>::const_iterator end = d->views_.end();
+ for (; it != end; ++it) {
+ candidate = *it;
+ if (!candidate->documentBufferView())
+ break;
+ }
+ setCurrentView(candidate);
+ }
+}
void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
{
LYXERR(Debug::ACTION, "action "
<< lyxaction.getActionName(action)
<< " [" << action << "] is disabled at this location");
- if (current_view_)
- current_view_->restartCursor();
dr.setMessage(flag.message());
dr.setError(true);
dr.dispatched(false);
// clear the last opened list, because
// maybe this will end the session
theSession().lastOpened().clear();
- current_view_->closeScheduled();
+ // check for valid current_view_
+ validateCurrentView();
+ if (current_view_)
+ current_view_->closeScheduled();
break;
case LFUN_LYX_QUIT:
}
case LFUN_BUFFER_NEW:
+ validateCurrentView();
if (d->views_.empty()
|| (!lyxrc.open_buffers_in_tabs && current_view_->documentBufferView() != 0)) {
createView(QString(), false); // keep hidden
break;
case LFUN_BUFFER_NEW_TEMPLATE:
+ validateCurrentView();
if (d->views_.empty()
|| (!lyxrc.open_buffers_in_tabs && current_view_->documentBufferView() != 0)) {
createView();
break;
case LFUN_FILE_OPEN: {
+ validateCurrentView();
// FIXME: create a new method shared with LFUN_HELP_OPEN.
string const fname = to_utf8(cmd.argument());
if (d->views_.empty() || (!lyxrc.open_buffers_in_tabs
break;
}
+#if 0
+ // FIXME: The graphics cache no longer has a changeDisplay method.
string const graphicsbg = lcolor.getLyXName(Color_graphicsbg);
bool const graphicsbg_changed =
lyx_name == graphicsbg && x11_name != graphicsbg;
- if (graphicsbg_changed) {
- // FIXME: The graphics cache no longer has a changeDisplay method.
-#if 0
+ if (graphicsbg_changed)
graphics::GCache::get().changeDisplay(true);
#endif
- }
if (!lcolor.setColor(lyx_name, x11_name)) {
- current_view_->message(
- bformat(_("Set-color \"%1$s\" failed "
+ if (current_view_)
+ current_view_->message(
+ bformat(_("Set-color \"%1$s\" failed "
"- color is undefined or "
"may not be redefined"),
from_utf8(lyx_name)));
}
actOnUpdatedPrefs(lyxrc_orig, lyxrc);
- setSpellChecker();
resetGui();
break;
// --- lyxserver commands ----------------------------
case LFUN_SERVER_GET_FILENAME: {
- LASSERT(current_view_ && current_view_->documentBufferView(), return);
- docstring const fname = from_utf8(
+ if (current_view_ && current_view_->documentBufferView()) {
+ docstring const fname = from_utf8(
current_view_->documentBufferView()->buffer().absFileName());
- dr.setMessage(fname);
- LYXERR(Debug::INFO, "FNAME[" << fname << ']');
+ dr.setMessage(fname);
+ LYXERR(Debug::INFO, "FNAME[" << fname << ']');
+ } else {
+ dr.setMessage(docstring());
+ LYXERR(Debug::INFO, "No current file for LFUN_SERVER_GET_FILENAME");
+ }
break;
}
+
case LFUN_SERVER_NOTIFY: {
docstring const dispatch_buffer = d->keyseq.print(KeySequence::Portable);
dr.setMessage(dispatch_buffer);
}
if (keysym.isModifier()) {
- LYXERR(Debug::KEY, "isModifier true");
if (current_view_)
current_view_->restartCursor();
return;
LastOpenedSection::LastOpened const & lastopened =
session.lastOpened().getfiles();
+ validateCurrentView();
+
FileName active_file;
// do not add to the lastfile list since these files are restored from
// last session, and should be already there (regular files), or should
// Restore last active buffer
Buffer * buffer = theBufferList().getBuffer(active_file);
- if (buffer)
+ if (buffer && current_view_)
current_view_->setBuffer(buffer);
// clear this list to save a few bytes of RAM
this->exit(1);
case BufferException: {
- if (!current_view_->documentBufferView())
+ if (!current_view_ || !current_view_->documentBufferView())
return false;
Buffer * buf = ¤t_view_->documentBufferView()->buffer();
docstring details = e.details_ + '\n';
ui_toolbars,
ui_toolbarset,
ui_include,
+ ui_format,
ui_last
};
LexerKeyword uitags[] = {
+ { "format", ui_format },
{ "include", ui_include },
{ "menuset", ui_menuset },
{ "toolbars", ui_toolbars },
lex.printTable(lyxerr);
bool error = false;
+ // format before introduction of format tag
+ unsigned int format = 0;
while (lex.isOK()) {
- switch (lex.lex()) {
+ int const status = lex.lex();
+
+ // we have to do this check here, outside the switch,
+ // because otherwise we would start reading include files,
+ // e.g., if the first tag we hit was an include tag.
+ if (status == ui_format)
+ if (lex.next()) {
+ format = lex.getInteger();
+ continue;
+ }
+
+ // this will trigger unless the first tag we hit is a format
+ // tag, with the right format.
+ if (format != LFUN_FORMAT)
+ return FormatMismatch;
+
+ switch (status) {
+ case Lexer::LEX_FEOF:
+ continue;
+
case ui_include: {
lex.next(true);
QString const file = toqstr(lex.getString());
- if (!readUIFile(file, true))
+ bool const success = readUIFile(file, true);
+ if (!success) {
+ LYXERR0("Failed to read inlcuded file: " << fromqstr(file));
return ReadError;
+ }
break;
}
+
case ui_menuset:
d->menus_.read(lex);
break;
default:
if (!rtrim(lex.getString()).empty())
lex.printError("LyX::ReadUIFile: "
- "Unknown menu tag: `$$Token'");
+ "Unknown menu tag: `$$Token'");
+ else
+ LYXERR0("Error with status: " << status);
error = true;
break;
}
+
}
return (error ? ReadError : ReadOK);
}
LYXERR(Debug::INIT, "Found " << name << " in " << ui_path);
- readUIFile(ui_path);
+ ReturnValues retval = readUIFile(ui_path);
+
+ if (retval == FormatMismatch) {
+ LYXERR(Debug::FILES, "Converting ui file to format " << LFUN_FORMAT);
+ FileName const tempfile = FileName::tempName("convert_ui");
+ bool const success = prefs2prefs(ui_path, tempfile, true);
+ if (!success) {
+ LYXERR0("Unable to convert " << ui_path.absFileName() <<
+ " to format " << LFUN_FORMAT << ".");
+ } else {
+ retval = readUIFile(tempfile);
+ tempfile.removeFile();
+ }
+ }
+
+ if (retval != ReadOK) {
+ LYXERR0("Unable to read UI file: " << ui_path.absFileName());
+ return false;
+ }
if (include)
return true;