#include "GuiApplication.h"
#include "ColorCache.h"
+#include "ColorSet.h"
#include "GuiClipboard.h"
#include "GuiImage.h"
#include "GuiKeySymbol.h"
#include "Font.h"
#include "FuncRequest.h"
#include "FuncStatus.h"
+#include "Intl.h"
+#include "KeyMap.h"
#include "Language.h"
+#include "LaTeXFeatures.h"
#include "Lexer.h"
#include "LyX.h"
#include "LyXAction.h"
#include "LyXFunc.h"
#include "LyXRC.h"
+#include "Server.h"
#include "Session.h"
+#include "SpellChecker.h"
#include "version.h"
#include "support/lassert.h"
#include "support/debug.h"
#include "support/ExceptionMessage.h"
#include "support/FileName.h"
+#include "support/filetools.h"
#include "support/foreach.h"
#include "support/ForkedCalls.h"
#include "support/gettext.h"
#include "support/Messages.h"
#include "support/os.h"
#include "support/Package.h"
+#include "support/Path.h"
+#include "support/Systemcall.h"
#ifdef Q_WS_MACX
#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>
#include <boost/crc.hpp>
#include <exception>
+#include <sstream>
#include <vector>
using namespace std;
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
QKeyEvent * ke = static_cast<QKeyEvent*>(e);
KeySymbol sym;
setKeySymbol(&sym, ke);
- theLyXFunc().processKeySym(sym, q_key_state(ke->modifiers()));
+ guiApp->processKeySym(sym, q_key_state(ke->modifiers()));
e->accept();
return true;
}
#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), meta_fake_bit(NoModifier),
+ 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
+ initKeySequences(&theTopLevelKeymap());
+ }
+
+ void initKeySequences(KeyMap * kb)
+ {
+ keyseq = KeySequence(kb, kb);
+ cancel_meta_seq = KeySequence(kb, kb);
}
///
/// are done.
QTimer general_timer_;
+ /// delayed FuncRequests
+ std::queue<FuncRequest> func_request_queue_;
+
+ ///
+ KeySequence keyseq;
+ ///
+ KeySequence cancel_meta_seq;
+ ///
+ KeyModifier meta_fake_bit;
+
/// 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_);
connect(this, SIGNAL(lastWindowClosed()), this, SLOT(onLastWindowClosed()));
- using namespace lyx::graphics;
-
- Image::newImage = boost::bind(&GuiImage::newImage);
-
// needs to be done before reading lyxrc
QWidget w;
lyxrc.dpi = (w.logicalDpiX() + w.logicalDpiY()) / 2;
}
+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));
}
+LyXView * GuiApplication::currentWindow()
+{
+#ifdef Q_WS_MACX
+ /* 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 or view-related.
+ */
+ if (current_view_ && activeWindow() != current_view_)
+ return 0;
+#endif
+ return current_view_;
+}
+
bool GuiApplication::getStatus(FuncRequest const & cmd, FuncStatus & flag) const
{
case LFUN_BUFFER_NEW:
case LFUN_BUFFER_NEW_TEMPLATE:
case LFUN_FILE_OPEN:
+ case LFUN_HELP_OPEN:
case LFUN_SCREEN_FONT_UPDATE:
case LFUN_SET_COLOR:
case LFUN_WINDOW_NEW:
case LFUN_LYX_QUIT:
+ case LFUN_LYXRC_APPLY:
+ case LFUN_COMMAND_PREFIX:
+ case LFUN_CANCEL:
+ case LFUN_META_PREFIX:
+ case LFUN_RECONFIGURE:
+ case LFUN_SERVER_GET_FILENAME:
+ case LFUN_SERVER_NOTIFY:
enable = true;
break;
return true;
}
-
-bool GuiApplication::dispatch(FuncRequest const & cmd)
+
+// This function runs "configure" and then rereads lyx.defaults to
+// reconfigure the automatic settings.
+static void reconfigure(LyXView * lv, string const & option)
+{
+ // emit message signal.
+ if (lv)
+ lv->message(_("Running configure..."));
+
+ // Run configure in user lyx directory
+ PathChanger p(package().user_support());
+ string configure_command = package().configure_command();
+ configure_command += option;
+ Systemcall one;
+ int ret = one.startscript(Systemcall::Wait, configure_command);
+ p.pop();
+ // emit message signal.
+ if (lv)
+ lv->message(_("Reloading configuration..."));
+ lyxrc.read(libFileSearch(QString(), "lyxrc.defaults"));
+ // Re-read packages.lst
+ LaTeXFeatures::getAvailable();
+
+ if (ret)
+ Alert::information(_("System reconfiguration failed"),
+ _("The system reconfiguration has failed.\n"
+ "Default textclass is used but LyX may "
+ "not be able to work properly.\n"
+ "Please reconfigure again if needed."));
+ else
+
+ Alert::information(_("System reconfigured"),
+ _("The system has been reconfigured.\n"
+ "You need to restart LyX to make use of any\n"
+ "updated document class specifications."));
+}
+
+
+void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
{
switch (cmd.action) {
// update bookmark pit of the current buffer before window close
for (size_t i = 0; i < theSession().bookmarks().size(); ++i)
theLyXFunc().gotoBookmark(i+1, false, false);
+ // clear the last opened list, because
+ // maybe this will end the session
+ theSession().lastOpened().clear();
current_view_->close();
break;
case LFUN_BUFFER_NEW:
if (d->views_.empty()
- || (!lyxrc.open_buffers_in_tabs && current_view_->buffer() != 0)) {
+ || (!lyxrc.open_buffers_in_tabs && current_view_->documentBufferView() != 0)) {
createView(QString(), false); // keep hidden
current_view_->newDocument(to_utf8(cmd.argument()), false);
current_view_->show();
case LFUN_BUFFER_NEW_TEMPLATE:
if (d->views_.empty()
- || (!lyxrc.open_buffers_in_tabs && current_view_->buffer() != 0)) {
+ || (!lyxrc.open_buffers_in_tabs && current_view_->documentBufferView() != 0)) {
createView();
current_view_->newDocument(to_utf8(cmd.argument()), true);
- if (!current_view_->buffer())
+ if (!current_view_->documentBufferView())
current_view_->close();
} else {
current_view_->newDocument(to_utf8(cmd.argument()), true);
break;
case LFUN_FILE_OPEN:
+ // FIXME: create a new method shared with LFUN_HELP_OPEN.
if (d->views_.empty()
- || (!lyxrc.open_buffers_in_tabs && current_view_->buffer() != 0)) {
+ || (!lyxrc.open_buffers_in_tabs && current_view_->documentBufferView() != 0)) {
string const fname = to_utf8(cmd.argument());
// We want the ui session to be saved per document and not per
// window number. The filename crc is a good enough identifier.
crc = for_each(fname.begin(), fname.end(), crc);
createView(crc.checksum());
current_view_->openDocument(fname);
- if (!current_view_->buffer())
+ if (current_view_ && !current_view_->documentBufferView())
current_view_->close();
} else
current_view_->openDocument(to_utf8(cmd.argument()));
break;
+ case LFUN_HELP_OPEN: {
+ // FIXME: create a new method shared with LFUN_FILE_OPEN.
+ if (current_view_ == 0)
+ createView();
+ string const arg = to_utf8(cmd.argument());
+ if (arg.empty()) {
+ current_view_->message(_("Missing argument"));
+ break;
+ }
+ FileName fname = i18nLibFileSearch("doc", arg, "lyx");
+ if (fname.empty())
+ fname = i18nLibFileSearch("examples", arg, "lyx");
+
+ if (fname.empty()) {
+ lyxerr << "LyX: unable to find documentation file `"
+ << arg << "'. Bad installation?" << endl;
+ break;
+ }
+ current_view_->message(bformat(_("Opening help file %1$s..."),
+ makeDisplayPath(fname.absFilename())));
+ Buffer * buf = current_view_->loadDocument(fname, false);
+ if (buf) {
+ current_view_->setBuffer(buf);
+ buf->updateLabels();
+ buf->errors("Parse");
+ }
+ break;
+ }
+
case LFUN_SET_COLOR: {
string lyx_name;
string const x11_name = split(to_utf8(cmd.argument()), lyx_name, ' ');
break;
}
+ case LFUN_LYXRC_APPLY: {
+ // reset active key sequences, since the bindings
+ // are updated (bug 6064)
+ d->keyseq.reset();
+ LyXRC const lyxrc_orig = lyxrc;
+
+ istringstream ss(to_utf8(cmd.argument()));
+ bool const success = lyxrc.read(ss) == 0;
+
+ if (!success) {
+ lyxerr << "Warning in LFUN_LYXRC_APPLY!\n"
+ << "Unable to read lyxrc data"
+ << endl;
+ break;
+ }
+
+ actOnUpdatedPrefs(lyxrc_orig, lyxrc);
+ setSpellChecker();
+ resetGui();
+
+ break;
+ }
+
+ case LFUN_COMMAND_PREFIX:
+ lyx::dispatch(FuncRequest(LFUN_MESSAGE, d->keyseq.printOptions(true)));
+ break;
+
+ case LFUN_CANCEL: {
+ d->keyseq.reset();
+ d->meta_fake_bit = NoModifier;
+ GuiView * gv = currentView();
+ if (gv && gv->currentBufferView())
+ // cancel any selection
+ lyx::dispatch(FuncRequest(LFUN_MARK_OFF));
+ dr.setMessage(from_ascii(N_("Cancel")));
+ break;
+ }
+ case LFUN_META_PREFIX:
+ d->meta_fake_bit = AltModifier;
+ dr.setMessage(d->keyseq.print(KeySequence::ForGui));
+ break;
+
+ // --- Menus -----------------------------------------------
+ case LFUN_RECONFIGURE:
+ // argument is any additional parameter to the configure.py command
+ reconfigure(currentView(), to_utf8(cmd.argument()));
+ break;
+
+ // --- lyxserver commands ----------------------------
+ case LFUN_SERVER_GET_FILENAME: {
+ GuiView * lv = currentView();
+ LASSERT(lv && lv->documentBufferView(), return);
+ docstring const fname = from_utf8(
+ lv->documentBufferView()->buffer().absFileName());
+ dr.setMessage(fname);
+ LYXERR(Debug::INFO, "FNAME[" << fname << ']');
+ break;
+ }
+ case LFUN_SERVER_NOTIFY: {
+ docstring const dispatch_buffer = d->keyseq.print(KeySequence::Portable);
+ dr.setMessage(dispatch_buffer);
+ theServer().notifyClient(to_utf8(dispatch_buffer));
+ break;
+ }
default:
// Notify the caller that the action has not been dispatched.
- return false;
+ dr.dispatched(false);
+ return;
}
// The action has been dispatched.
- return true;
+ dr.dispatched(true);
+}
+
+
+docstring GuiApplication::viewStatusMessage()
+{
+ // When meta-fake key is pressed, show the key sequence so far + "M-".
+ if (d->meta_fake_bit != NoModifier)
+ return d->keyseq.print(KeySequence::ForGui) + "M-";
+
+ // Else, when a non-complete key sequence is pressed,
+ // show the available options.
+ if (d->keyseq.length() > 0 && !d->keyseq.deleted())
+ return d->keyseq.printOptions(true);
+
+ return docstring();
+}
+
+
+void GuiApplication::handleKeyFunc(FuncCode action)
+{
+ char_type c = 0;
+
+ if (d->keyseq.length())
+ c = 0;
+ GuiView * gv = currentView();
+ LASSERT(gv && gv->currentBufferView(), return);
+ BufferView * bv = gv->currentBufferView();
+ bv->getIntl().getTransManager().deadkey(
+ c, get_accent(action).accent, bv->cursor().innerText(),
+ bv->cursor());
+ // Need to clear, in case the minibuffer calls these
+ // actions
+ d->keyseq.clear();
+ // copied verbatim from do_accent_char
+ bv->cursor().resetAnchor();
+ bv->processUpdateFlags(Update::FitCursor);
+}
+
+
+void GuiApplication::processKeySym(KeySymbol const & keysym, KeyModifier state)
+{
+ LYXERR(Debug::KEY, "KeySym is " << keysym.getSymbolName());
+
+ GuiView * lv = currentView();
+
+ // Do nothing if we have nothing (JMarc)
+ if (!keysym.isOK()) {
+ LYXERR(Debug::KEY, "Empty kbd action (probably composing)");
+ lv->restartCursor();
+ return;
+ }
+
+ if (keysym.isModifier()) {
+ LYXERR(Debug::KEY, "isModifier true");
+ if (lv)
+ lv->restartCursor();
+ return;
+ }
+
+ char_type encoded_last_key = keysym.getUCSEncoded();
+
+ // Do a one-deep top-level lookup for
+ // cancel and meta-fake keys. RVDK_PATCH_5
+ d->cancel_meta_seq.reset();
+
+ FuncRequest func = d->cancel_meta_seq.addkey(keysym, state);
+ LYXERR(Debug::KEY, "action first set to [" << func.action << ']');
+
+ // When not cancel or meta-fake, do the normal lookup.
+ // Note how the meta_fake Mod1 bit is OR-ed in and reset afterwards.
+ // Mostly, meta_fake_bit = NoModifier. RVDK_PATCH_5.
+ if ((func.action != LFUN_CANCEL) && (func.action != LFUN_META_PREFIX)) {
+ // remove Caps Lock and Mod2 as a modifiers
+ func = d->keyseq.addkey(keysym, (state | d->meta_fake_bit));
+ LYXERR(Debug::KEY, "action now set to [" << func.action << ']');
+ }
+
+ // Dont remove this unless you know what you are doing.
+ d->meta_fake_bit = NoModifier;
+
+ // Can this happen now ?
+ if (func.action == LFUN_NOACTION)
+ func = FuncRequest(LFUN_COMMAND_PREFIX);
+
+ LYXERR(Debug::KEY, " Key [action=" << func.action << "]["
+ << d->keyseq.print(KeySequence::Portable) << ']');
+
+ // already here we know if it any point in going further
+ // why not return already here if action == -1 and
+ // num_bytes == 0? (Lgb)
+
+ if (d->keyseq.length() > 1)
+ lv->message(d->keyseq.print(KeySequence::ForGui));
+
+
+ // Maybe user can only reach the key via holding down shift.
+ // Let's see. But only if shift is the only modifier
+ if (func.action == LFUN_UNKNOWN_ACTION && state == ShiftModifier) {
+ LYXERR(Debug::KEY, "Trying without shift");
+ func = d->keyseq.addkey(keysym, NoModifier);
+ LYXERR(Debug::KEY, "Action now " << func.action);
+ }
+
+ if (func.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() && d->keyseq.length() == 1) {
+ LYXERR(Debug::KEY, "isText() is true, inserting.");
+ func = FuncRequest(LFUN_SELF_INSERT,
+ FuncRequest::KEYBOARD);
+ } else {
+ LYXERR(Debug::KEY, "Unknown, !isText() - giving up");
+ lv->message(_("Unknown function."));
+ lv->restartCursor();
+ return;
+ }
+ }
+
+ if (func.action == LFUN_SELF_INSERT) {
+ if (encoded_last_key != 0) {
+ docstring const arg(1, encoded_last_key);
+ lyx::dispatch(FuncRequest(LFUN_SELF_INSERT, arg,
+ FuncRequest::KEYBOARD));
+ LYXERR(Debug::KEY, "SelfInsert arg[`" << to_utf8(arg) << "']");
+ }
+ } else {
+ lyx::dispatch(func);
+ if (!lv)
+ return;
+ }
+}
+
+
+void GuiApplication::dispatchDelayed(FuncRequest const & func)
+{
+ d->func_request_queue_.push(func);
+ QTimer::singleShot(0, this, SLOT(processFuncRequestQueue()));
}
// 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);
+ d->menus_.fillMenuBar(d->global_menubar_, 0, false);
QHash<int, GuiView *>::iterator it;
for (it = d->views_.begin(); it != d->views_.end(); ++it) {
GuiView * gv = *it;
+ setCurrentView(gv);
gv->setLayoutDirection(layoutDirection());
gv->resetDialogs();
}
- dispatch(FuncRequest(LFUN_SCREEN_FONT_UPDATE));
+ lyx::dispatch(FuncRequest(LFUN_SCREEN_FONT_UPDATE));
}
// create new view
int id = view_id;
- if (id == 0) {
- while (d->views_.find(id) != d->views_.end())
- id++;
- }
+ while (d->views_.find(id) != d->views_.end())
+ id++;
+
LYXERR(Debug::GUI, "About to create new window with ID " << id);
GuiView * view = new GuiView(id);
// register view
#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));
+ for (size_t i = 0; i < lastopened.size(); ++i) {
+ FileName const & file_name = lastopened[i].file_name;
+ if (d->views_.empty() || (!lyxrc.open_buffers_in_tabs
+ && current_view_->documentBufferView() != 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].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;
}
this->exit(1);
case BufferException: {
- Buffer * buf = current_view_->buffer();
+ if (!current_view_->documentBufferView())
+ return false;
+ Buffer * buf = ¤t_view_->documentBufferView()->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);
{
LASSERT(d->views_[gv->id()] == gv, /**/);
d->views_.remove(gv->id());
- if (current_view_ == gv) {
+ if (current_view_ == gv)
current_view_ = 0;
- theLyXFunc().setLyXView(0);
- }
}
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;
}
if (xev->xselectionrequest.selection != XA_PRIMARY)
break;
LYXERR(Debug::SELECTION, "X requested selection.");
- BufferView * bv = current_view_->view();
+ BufferView * bv = current_view_->currentBufferView();
if (bv) {
docstring const sel = bv->requestSelection();
if (!sel.empty())
if (xev->xselectionclear.selection != XA_PRIMARY)
break;
LYXERR(Debug::SELECTION, "Lost selection.");
- BufferView * bv = current_view_->view();
+ BufferView * bv = current_view_->currentBufferView();
if (bv)
bv->clearSelection();
break;
return frontend::guiApp->selection();
}
+
} // namespace lyx
-#include "GuiApplication_moc.cpp"
+#include "moc_GuiApplication.cpp"