#include "GuiApplication.h"
#include "ColorCache.h"
+#include "ColorSet.h"
#include "GuiClipboard.h"
#include "GuiImage.h"
#include "GuiKeySymbol.h"
<< lyxaction.getActionName(f.action)
<< '(' << to_utf8(f.argument()) << ")\"");
- if (unknown)
+ if (unknown) {
+ fname = libFileSearch(QString("images/"), "unknown", "png");
+ if (fname.exists())
+ return toqstr(fname.absFilename());
return QString(":/images/unknown.png");
+ }
return QString();
}
+QPixmap getPixmap(QString const & path, QString const & name, QString const & ext)
+{
+ QPixmap pixmap;
+ FileName fname = libFileSearch(path, name, ext);
+ QString path1 = toqstr(fname.absFilename());
+ QString path2 = ":/" + path + name + "." + ext;
+
+ if (pixmap.load(path1)) {
+ return pixmap;
+ }
+ else if (pixmap.load(path2)) {
+ return pixmap;
+ }
+
+ LYXERR0("Cannot load pixmap \""
+ << path << name << '.' << ext
+ << "\", please verify resource system!");
+
+ return QPixmap();
+}
QIcon getIcon(FuncRequest const & f, bool unknown)
{
struct GuiApplication::Private
{
- Private(): language_model_(0), global_menubar_(0) {}
+ Private(): language_model_(0), global_menubar_(0)
+ {
+ #ifdef Q_WS_WIN
+ /// WMF Mime handler for Windows clipboard.
+ wmf_mime_ = new QWindowsMimeMetafile();
+ #endif
+ }
///
QSortFilterProxyModel * language_model_;
#ifdef Q_WS_WIN
/// WMF Mime handler for Windows clipboard.
- /// \warning: see comment in ~GuiApplication and in bug 4846.
- QWindowsMimeMetafile wmf_mime_;
+ QWindowsMimeMetafile * wmf_mime_;
#endif
};
#ifdef Q_WS_MACX
closeAllLinkBackLinks();
#endif
- // FIXME: Work around bug 4846 for Windows Vista and Qt4
- // (see http://bugzilla.lyx.org/show_bug.cgi?id=4846)
- // If the clipboard is not cleared, LyX crashes on exit when it is
- // compiled in release mode and if there is something in the clipboard.
- // This is related to QWindowsMimeMetafile which is apparently not
- // properly destroyed.
- qApp->clipboard()->clear(QClipboard::Clipboard);
delete d;
}
GuiApplication::GuiApplication(int & argc, char ** argv)
- : QApplication(argc, argv), current_view_(0), d(new GuiApplication::Private)
+ : QApplication(argc, argv), current_view_(0),
+ d(new GuiApplication::Private)
{
QString app_name = "LyX";
QCoreApplication::setOrganizationName(app_name);
QCoreApplication::setOrganizationDomain("lyx.org");
- QCoreApplication::setApplicationName(app_name + "-" + lyx_version);
+ QCoreApplication::setApplicationName(lyx_package);
// Install translator for GUI elements.
installTranslator(&d->qt_trans_);
return;
Session & session = theSession();
- vector<FileName> const & lastopened = session.lastOpened().getfiles();
+ LastOpenedSection::LastOpened const & lastopened =
+ session.lastOpened().getfiles();
+
+ 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
// not be added at all (help files).
- for_each(lastopened.begin(), lastopened.end(),
- bind(&GuiView::loadDocument, current_view_, _1, false));
+ // Note that we open them in reverse order. This is because we close
+ // buffers also in reverse order (aesthetically motivated).
+ for (size_t i = lastopened.size(); i > 0; --i) {
+ FileName const & file_name = lastopened[i - 1].file_name;
+ if (d->views_.empty() || (!lyxrc.open_buffers_in_tabs
+ && current_view_->buffer() != 0)) {
+ boost::crc_32_type crc;
+ string const & fname = file_name.absFilename();
+ crc = for_each(fname.begin(), fname.end(), crc);
+ createView(crc.checksum());
+ }
+ current_view_->loadDocument(file_name, false);
+
+ if (lastopened[i - 1].active)
+ active_file = file_name;
+ }
+
+ // Restore last active buffer
+ Buffer * buffer = theBufferList().getBuffer(active_file);
+ if (buffer)
+ current_view_->setBuffer(buffer);
// clear this list to save a few bytes of RAM
session.lastOpened().clear();
case BufferException: {
Buffer * buf = current_view_->buffer();
docstring details = e.details_ + '\n';
- details += theBufferList().emergencyWrite(buf);
+ details += buf->emergencyWrite();
theBufferList().release(buf);
details += "\n" + _("The current document was closed.");
Alert::error(e.title_, details);
if (d->views_.empty())
return true;
+ // When a view/window was closed before without quitting LyX, there
+ // are already entries in the lastOpened list.
+ theSession().lastOpened().clear();
+
QList<GuiView *> views = d->views_.values();
foreach (GuiView * view, views) {
if (!view->close())
bool GuiApplication::readUIFile(QString const & name, bool include)
{
- enum {
- ui_menuset = 1,
- ui_toolbars,
- ui_toolbarset,
- ui_include,
- ui_last
- };
-
- LexerKeyword uitags[] = {
- { "include", ui_include },
- { "menuset", ui_menuset },
- { "toolbars", ui_toolbars },
- { "toolbarset", ui_toolbarset }
- };
-
LYXERR(Debug::INIT, "About to read " << name << "...");
FileName ui_path;
}
if (ui_path.empty()) {
+ static const QString defaultUIFile = "default";
LYXERR(Debug::INIT, "Could not find " << name);
+ if (include) {
+ Alert::warning(_("Could not find UI definition file"),
+ bformat(_("Error while reading the included file\n%1$s\n"
+ "Please check your installation."), qstring_to_ucs4(name)));
+ return false;
+ }
+ if (name == defaultUIFile) {
+ LYXERR(Debug::INIT, "Could not find default UI file!!");
+ Alert::warning(_("Could not find default UI file"),
+ _("LyX could not find the default UI file!\n"
+ "Please check your installation."));
+ return false;
+ }
Alert::warning(_("Could not find UI definition file"),
- bformat(_("Error while reading the configuration file\n%1$s.\n"
- "Please check your installation."), qstring_to_ucs4(name)));
- return false;
+ bformat(_("Error while reading the configuration file\n%1$s\n"
+ "Falling back to default.\n"
+ "Please look under Tools>Preferences>User Interface and\n"
+ "check which User Interface file you are using."), qstring_to_ucs4(name)));
+ return readUIFile(defaultUIFile, false);
}
-
// Ensure that a file is read only once (prevents include loops)
static QStringList uifiles;
QString const uifile = toqstr(ui_path.absFilename());
LYXERR(Debug::INIT, "Found " << name << " in " << ui_path);
+ enum {
+ ui_menuset = 1,
+ ui_toolbars,
+ ui_toolbarset,
+ ui_include,
+ ui_last
+ };
+
+ LexerKeyword uitags[] = {
+ { "include", ui_include },
+ { "menuset", ui_menuset },
+ { "toolbars", ui_toolbars },
+ { "toolbarset", ui_toolbarset }
+ };
+
Lexer lex(uitags);
lex.setFile(ui_path);
if (!lex.isOK()) {
if (lyxerr.debugging(Debug::PARSER))
lex.printTable(lyxerr);
+ // store which ui files define Toolbars
+ static QStringList toolbar_uifiles;
+
while (lex.isOK()) {
switch (lex.lex()) {
case ui_include: {
case ui_toolbars:
d->toolbars_.readToolbarSettings(lex);
+ toolbar_uifiles.push_back(uifile);
break;
default:
QFileInfo fi(uifiles[i]);
QDateTime const date_value = fi.lastModified();
QString const name_key = QString::number(i);
- if (!settings.contains(name_key)
+ // if an ui file which defines Toolbars has changed,
+ // we have to reset the settings
+ if (toolbar_uifiles.contains(uifiles[i])
+ && (!settings.contains(name_key)
|| settings.value(name_key).toString() != uifiles[i]
- || settings.value(name_key + "/date").toDateTime() != date_value) {
+ || settings.value(name_key + "/date").toDateTime() != date_value)) {
touched = true;
settings.setValue(name_key, uifiles[i]);
settings.setValue(name_key + "/date", date_value);
projects / lyx.git / blobdiff