#include "GuiApplication.h"
#include "ColorCache.h"
+#include "ColorSet.h"
#include "GuiClipboard.h"
#include "GuiImage.h"
#include "GuiKeySymbol.h"
#include "support/linkback/LinkBackProxy.h"
#endif
+#include <queue>
+
#include <QByteArray>
#include <QClipboard>
+#include <QDateTime>
#include <QDir>
#include <QEventLoop>
#include <QFileOpenEvent>
+#include <QFileInfo>
#include <QHash>
#include <QIcon>
#include <QImageReader>
#include <QPixmapCache>
#include <QRegExp>
#include <QSessionManager>
+#include <QSettings>
#include <QSocketNotifier>
#include <QSortFilterProxyModel>
#include <QStandardItemModel>
#ifdef Q_WS_WIN
#include <QWindowsMime>
-#if defined(Q_CYGWIN_WIN) || defined(Q_CC_MINGW)
+#ifdef Q_CC_GNU
#include <wtypes.h>
#endif
#include <objidl.h>
frontend::Application * createApplication(int & argc, char * argv[])
{
+#ifndef Q_WS_X11
+ // prune -geometry argument(s) by shifting
+ // the following ones 2 places down.
+ for (int i = 0 ; i < argc ; ++i) {
+ if (strcmp(argv[i], "-geometry") == 0) {
+ int const remove = (i+1) < argc ? 2 : 1;
+ argc -= remove;
+ for (int j = i; j < argc; ++j)
+ argv[j] = argv[j + remove];
+ --i;
+ }
+ }
+#endif
return new frontend::GuiApplication(argc, argv);
}
return fmts;
}
-
+
+
////////////////////////////////////////////////////////////////////////
-// Icon loading support code.
+//
+// Icon loading support code
+//
////////////////////////////////////////////////////////////////////////
namespace {
path = "commands/";
name1 = toqstr(f.argument());
break;
+ case LFUN_COMMAND_ALTERNATIVES: {
+ // use the first of the alternative commands
+ docstring firstcom;
+ docstring dummy = split(f.argument(), firstcom, ';');
+ name1 = toqstr(firstcom);
+ name1.replace(' ', '_');
+ break;
+ }
default:
name2 = toqstr(lyxaction.getActionName(f.action));
name1 = name2;
if (!f.argument().empty()) {
name1 = name2 + ' ' + toqstr(f.argument());
name1.replace(' ', '_');
+ name1.replace('\\', "backslash");
}
}
if (res.exists(name2))
return path + name2;
- LYXERR(Debug::GUI, "Cannot find icon for command \""
+ LYXERR(Debug::GUI, "Cannot find icon with filename "
+ << "\"" << name1 << "\""
+ << " or filename "
+ << "\"" << name2 << "\""
+ << " for command \""
<< 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)
{
////////////////////////////////////////////////////////////////////////
+//
// LyX server support code.
+//
////////////////////////////////////////////////////////////////////////
+
class SocketNotifier : public QSocketNotifier
{
public:
////////////////////////////////////////////////////////////////////////
+//
// Mac specific stuff goes here...
+//
////////////////////////////////////////////////////////////////////////
class MenuTranslator : public QTranslator
#endif
///////////////////////////////////////////////////////////////
-// You can find more platform specific stuff
-// at the end of this file...
+//
+// You can find more platform specific stuff at the end of this file...
+//
///////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
}
- QVector<FORMATETC> formatsForMime(QString const & mimeType,
- QMimeData const * mimeData) const
+ QVector<FORMATETC> formatsForMime(QString const & mimetype,
+ QMimeData const * mimedata) const
{
QVector<FORMATETC> formats;
- formats += cfFromMime(mimeType);
+ if (mimetype == emfMimeType() || mimetype == wmfMimeType())
+ formats += cfFromMime(mimetype);
return formats;
}
struct GuiApplication::Private
{
- Private()
- : language_model_(0), global_menubar_(0)
+ Private(): language_model_(0), global_menubar_(0)
{
-#ifdef Q_WS_MACX
- // Create the global default menubar which is shown for the dialogs
- // and if no GuiView is visible.
- global_menubar_ = new GlobalMenuBar();
-#endif
+ #ifdef Q_WS_WIN
+ /// WMF Mime handler for Windows clipboard.
+ wmf_mime_ = new QWindowsMimeMetafile();
+ #endif
}
///
/// are done.
QTimer general_timer_;
+ /// delayed FuncRequests
+ std::queue<FuncRequest> func_request_queue_;
+
/// Multiple views container.
/**
* Warning: This must not be a smart pointer as the destruction of the
#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_);
}
+GuiApplication * theGuiApp()
+{
+ return dynamic_cast<GuiApplication *>(theApp());
+}
+
+
+void GuiApplication::clearSession()
+{
+ QSettings settings;
+ settings.clear();
+}
+
+
docstring GuiApplication::iconName(FuncRequest const & f, bool unknown)
{
return qstring_to_ucs4(lyx::frontend::iconName(f, unknown));
crc = for_each(fname.begin(), fname.end(), crc);
createView(crc.checksum());
current_view_->openDocument(fname);
- if (!current_view_->buffer())
+ if (current_view_ && !current_view_->buffer())
current_view_->close();
} else
current_view_->openDocument(to_utf8(cmd.argument()));
}
+void GuiApplication::dispatchDelayed(FuncRequest const & func)
+{
+ d->func_request_queue_.push(func);
+ QTimer::singleShot(0, this, SLOT(processFuncRequestQueue()));
+}
+
+
void GuiApplication::resetGui()
{
// Set the language defined by the user.
// Gives some error box here.
return;
-#ifdef Q_WS_MACX
- d->global_menubar_->clear();
- delete d->global_menubar_;
- // Create the global default menubar which is shown for the dialogs
- // and if no GuiView is visible.
- d->global_menubar_ = new GlobalMenuBar();
-
- // init the global menubar on Mac. This must be done after the session
- // was recovered to know the "last files".
- d->menus_.fillMenuBar(d->global_menubar_, 0, true);
-#endif
+ if (d->global_menubar_)
+ d->menus_.fillMenuBar(d->global_menubar_, 0, false);
QHash<int, GuiView *>::iterator it;
for (it = d->views_.begin(); it != d->views_.end(); ++it) {
#endif
}
view->setFocus();
- setCurrentView(view);
}
int GuiApplication::exec()
{
- QTimer::singleShot(1, this, SLOT(execBatchCommands()));
+ // asynchronously handle batch commands. This event will be in
+ // the event queue in front of other asynchronous events. Hence,
+ // we can assume in the latter that the gui is setup already.
+ QTimer::singleShot(0, this, SLOT(execBatchCommands()));
+
return QApplication::exec();
}
}
+void GuiApplication::processFuncRequestQueue()
+{
+ while (!d->func_request_queue_.empty()) {
+ lyx::dispatch(d->func_request_queue_.back());
+ d->func_request_queue_.pop();
+ }
+}
+
+
void GuiApplication::execBatchCommands()
{
setGuiLanguage();
// Gives some error box here.
return;
- // init the global menubar on Mac. This must be done after the session
- // was recovered to know the "last files".
- if (d->global_menubar_)
- d->menus_.fillMenuBar(d->global_menubar_, 0, true);
+#ifdef Q_WS_MACX
+ // Create the global default menubar which is shown for the dialogs
+ // and if no GuiView is visible.
+ // This must be done after the session was recovered to know the "last files".
+ d->global_menubar_ = new GlobalMenuBar();
+ d->menus_.fillMenuBar(d->global_menubar_, 0, true);
+#endif
lyx::execBatchCommands();
}
+
QAbstractItemModel * GuiApplication::languageModel()
{
if (d->language_model_)
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();
{
switch(e->type()) {
case QEvent::FileOpen: {
- // Open a file; this happens only on Mac OS X for now
+ // Open a file; this happens only on Mac OS X for now.
+ //
+ // We do this asynchronously because on startup the batch
+ // commands are not executed here yet and the gui is not ready
+ // therefore.
QFileOpenEvent * foe = static_cast<QFileOpenEvent *>(e);
- lyx::dispatch(FuncRequest(LFUN_FILE_OPEN,
- qstring_to_ucs4(foe->file())));
+ dispatchDelayed(FuncRequest(LFUN_FILE_OPEN, qstring_to_ucs4(foe->file())));
e->accept();
return true;
}
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
- };
+ LYXERR(Debug::INIT, "About to read " << name << "...");
- LexerKeyword uitags[] = {
- { "include", ui_include },
- { "menuset", ui_menuset },
- { "toolbars", ui_toolbars },
- { "toolbarset", ui_toolbarset }
- };
+ FileName ui_path;
+ if (include) {
+ ui_path = libFileSearch("ui", name, "inc");
+ if (ui_path.empty())
+ ui_path = libFileSearch("ui", changeExtension(name, "inc"));
+ } else {
+ ui_path = libFileSearch("ui", name, "ui");
+ }
+
+ 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"
+ "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;
- if (uifiles.contains(name)) {
+ QString const uifile = toqstr(ui_path.absFilename());
+ if (uifiles.contains(uifile)) {
if (!include) {
// We are reading again the top uifile so reset the safeguard:
uifiles.clear();
return false;
}
}
+ uifiles.push_back(uifile);
- LYXERR(Debug::INIT, "About to read " << name << "...");
-
- FileName ui_path;
- if (include) {
- ui_path = libFileSearch("ui", name, "inc");
- if (ui_path.empty())
- ui_path = libFileSearch("ui", changeExtension(name, "inc"));
- } else {
- ui_path = libFileSearch("ui", name, "ui");
- }
+ LYXERR(Debug::INIT, "Found " << name << " in " << ui_path);
- if (ui_path.empty()) {
- LYXERR(Debug::INIT, "Could not find " << name);
- 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;
- }
+ enum {
+ ui_menuset = 1,
+ ui_toolbars,
+ ui_toolbarset,
+ ui_include,
+ ui_last
+ };
- uifiles.push_back(name);
+ LexerKeyword uitags[] = {
+ { "include", ui_include },
+ { "menuset", ui_menuset },
+ { "toolbars", ui_toolbars },
+ { "toolbarset", ui_toolbarset }
+ };
- LYXERR(Debug::INIT, "Found " << name << " in " << ui_path);
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:
break;
}
}
+
+ if (include)
+ return true;
+
+ QSettings settings;
+ settings.beginGroup("ui_files");
+ bool touched = false;
+ for (int i = 0; i != uifiles.size(); ++i) {
+ QFileInfo fi(uifiles[i]);
+ QDateTime const date_value = fi.lastModified();
+ QString const name_key = QString::number(i);
+ // 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)) {
+ touched = true;
+ settings.setValue(name_key, uifiles[i]);
+ settings.setValue(name_key + "/date", date_value);
+ }
+ }
+ settings.endGroup();
+ if (touched)
+ settings.remove("views");
+
return true;
}
return frontend::guiApp->selection();
}
+
} // namespace lyx
-#include "GuiApplication_moc.cpp"
+#include "moc_GuiApplication.cpp"
projects / lyx.git / blobdiff