#include "GuiView.h"
#include "Menus.h"
#include "qt_helpers.h"
+#include "Toolbars.h"
#include "frontends/alert.h"
#include "frontends/Application.h"
#include "FuncRequest.h"
#include "FuncStatus.h"
#include "Language.h"
+#include "Lexer.h"
#include "LyX.h"
+#include "LyXAction.h"
#include "LyXFunc.h"
#include "LyXRC.h"
#include "Session.h"
#include "support/ForkedCalls.h"
#include "support/gettext.h"
#include "support/lstrings.h"
+#include "support/lyxalgo.h" // sorted
+#include "support/Messages.h"
#include "support/os.h"
#include "support/Package.h"
#include "support/linkback/LinkBackProxy.h"
#endif
+#include <QByteArray>
#include <QClipboard>
+#include <QDir>
#include <QEventLoop>
#include <QFileOpenEvent>
#include <QHash>
+#include <QIcon>
+#include <QImageReader>
#include <QLocale>
#include <QLibraryInfo>
+#include <QList>
#include <QMacPasteboardMime>
#include <QMenuBar>
#include <QMimeData>
+#include <QObject>
+#include <QPixmap>
#include <QPixmapCache>
#include <QRegExp>
#include <QSessionManager>
#endif
#ifdef Q_WS_WIN
-#include <QList>
#include <QWindowsMime>
#if defined(Q_CYGWIN_WIN) || defined(Q_CC_MINGW)
#include <wtypes.h>
#endif // Q_WS_WIN
#include <boost/bind.hpp>
+#include <boost/crc.hpp>
#include <exception>
+#include <vector>
using namespace std;
using namespace lyx::support;
-// FIXME: These strings are also used in GuiClipboard.cpp.
-static char const * const lyx_mime_type = "application/x-lyx";
-static char const * const pdf_mime_type = "application/pdf";
-static char const * const emf_mime_type = "image/x-emf";
-static char const * const wmf_mime_type = "image/x-wmf";
+
+static void initializeResources()
+{
+ static bool initialized = false;
+ if (!initialized) {
+ Q_INIT_RESOURCE(Resources);
+ initialized = true;
+ }
+}
+
namespace lyx {
return new frontend::GuiApplication(argc, argv);
}
-
namespace frontend {
+
+/// Return the list of loadable formats.
+vector<string> loadableImageFormats()
+{
+ vector<string> fmts;
+
+ QList<QByteArray> qt_formats = QImageReader::supportedImageFormats();
+
+ LYXERR(Debug::GRAPHICS,
+ "\nThe image loader can load the following directly:\n");
+
+ if (qt_formats.empty())
+ LYXERR(Debug::GRAPHICS, "\nQt4 Problem: No Format available!");
+
+ for (QList<QByteArray>::const_iterator it = qt_formats.begin(); it != qt_formats.end(); ++it) {
+
+ LYXERR(Debug::GRAPHICS, (const char *) *it << ", ");
+
+ string ext = ascii_lowercase((const char *) *it);
+ // special case
+ if (ext == "jpeg")
+ ext = "jpg";
+ fmts.push_back(ext);
+ }
+
+ return fmts;
+}
+
+////////////////////////////////////////////////////////////////////////
+// Icon loading support code.
+////////////////////////////////////////////////////////////////////////
+
+namespace {
+
+struct PngMap {
+ QString key;
+ QString value;
+};
+
+
+bool operator<(PngMap const & lhs, PngMap const & rhs)
+{
+ return lhs.key < rhs.key;
+}
+
+
+class CompareKey {
+public:
+ CompareKey(QString const & name) : name_(name) {}
+ bool operator()(PngMap const & other) const { return other.key == name_; }
+private:
+ QString const name_;
+};
+
+
+// this must be sorted alphabetically
+// Upper case comes before lower case
+PngMap sorted_png_map[] = {
+ { "Bumpeq", "bumpeq2" },
+ { "Cap", "cap2" },
+ { "Cup", "cup2" },
+ { "Delta", "delta2" },
+ { "Downarrow", "downarrow2" },
+ { "Gamma", "gamma2" },
+ { "Lambda", "lambda2" },
+ { "Leftarrow", "leftarrow2" },
+ { "Leftrightarrow", "leftrightarrow2" },
+ { "Longleftarrow", "longleftarrow2" },
+ { "Longleftrightarrow", "longleftrightarrow2" },
+ { "Longrightarrow", "longrightarrow2" },
+ { "Omega", "omega2" },
+ { "Phi", "phi2" },
+ { "Pi", "pi2" },
+ { "Psi", "psi2" },
+ { "Rightarrow", "rightarrow2" },
+ { "Sigma", "sigma2" },
+ { "Subset", "subset2" },
+ { "Supset", "supset2" },
+ { "Theta", "theta2" },
+ { "Uparrow", "uparrow2" },
+ { "Updownarrow", "updownarrow2" },
+ { "Upsilon", "upsilon2" },
+ { "Vdash", "vdash3" },
+ { "Vert", "vert2" },
+ { "Xi", "xi2" },
+ { "nLeftarrow", "nleftarrow2" },
+ { "nLeftrightarrow", "nleftrightarrow2" },
+ { "nRightarrow", "nrightarrow2" },
+ { "nVDash", "nvdash3" },
+ { "nvDash", "nvdash2" },
+ { "textrm \\AA", "textrm_AA"},
+ { "textrm \\O", "textrm_O"},
+ { "vDash", "vdash2" }
+};
+
+size_t const nr_sorted_png_map = sizeof(sorted_png_map) / sizeof(PngMap);
+
+
+QString findPng(QString const & name)
+{
+ PngMap const * const begin = sorted_png_map;
+ PngMap const * const end = begin + nr_sorted_png_map;
+ LASSERT(sorted(begin, end), /**/);
+
+ PngMap const * const it = find_if(begin, end, CompareKey(name));
+
+ QString png_name;
+ if (it != end) {
+ png_name = it->value;
+ } else {
+ png_name = name;
+ png_name.replace('_', "underscore");
+ png_name.replace(' ', '_');
+
+ // This way we can have "math-delim { }" on the toolbar.
+ png_name.replace('(', "lparen");
+ png_name.replace(')', "rparen");
+ png_name.replace('[', "lbracket");
+ png_name.replace(']', "rbracket");
+ png_name.replace('{', "lbrace");
+ png_name.replace('}', "rbrace");
+ png_name.replace('|', "bars");
+ png_name.replace(',', "thinspace");
+ png_name.replace(':', "mediumspace");
+ png_name.replace(';', "thickspace");
+ png_name.replace('!', "negthinspace");
+ }
+
+ LYXERR(Debug::GUI, "findPng(" << name << ")\n"
+ << "Looking for math PNG called \"" << png_name << '"');
+ return png_name;
+}
+
+} // namespace anon
+
+
+QString iconName(FuncRequest const & f, bool unknown)
+{
+ initializeResources();
+ QString name1;
+ QString name2;
+ QString path;
+ switch (f.action) {
+ case LFUN_MATH_INSERT:
+ if (!f.argument().empty()) {
+ path = "math/";
+ name1 = findPng(toqstr(f.argument()).mid(1));
+ }
+ break;
+ case LFUN_MATH_DELIM:
+ case LFUN_MATH_BIGDELIM:
+ path = "math/";
+ name1 = findPng(toqstr(f.argument()));
+ break;
+ case LFUN_CALL:
+ path = "commands/";
+ name1 = toqstr(f.argument());
+ break;
+ default:
+ name2 = toqstr(lyxaction.getActionName(f.action));
+ name1 = name2;
+
+ if (!f.argument().empty()) {
+ name1 = name2 + ' ' + toqstr(f.argument());
+ name1.replace(' ', '_');
+ }
+ }
+
+ FileName fname = libFileSearch("images/" + path, name1, "png");
+ if (fname.exists())
+ return toqstr(fname.absFilename());
+
+ fname = libFileSearch("images/" + path, name2, "png");
+ if (fname.exists())
+ return toqstr(fname.absFilename());
+
+ path = ":/images/" + path;
+ QDir res(path);
+ if (!res.exists()) {
+ LYXERR0("Directory " << path << " not found in resource!");
+ return QString();
+ }
+ name1 += ".png";
+ if (res.exists(name1))
+ return path + name1;
+
+ name2 += ".png";
+ if (res.exists(name2))
+ return path + name2;
+
+ LYXERR(Debug::GUI, "Cannot find icon for command \""
+ << lyxaction.getActionName(f.action)
+ << '(' << to_utf8(f.argument()) << ")\"");
+
+ if (unknown)
+ return QString(":/images/unknown.png");
+
+ return QString();
+}
+
+
+QIcon getIcon(FuncRequest const & f, bool unknown)
+{
+ QString icon = iconName(f, unknown);
+ if (icon.isEmpty())
+ return QIcon();
+
+ //LYXERR(Debug::GUI, "Found icon: " << icon);
+ QPixmap pm;
+ if (!pm.load(icon)) {
+ LYXERR0("Cannot load icon " << icon << " please verify resource system!");
+ return QIcon();
+ }
+
+ return QIcon(pm);
+}
+
+
+////////////////////////////////////////////////////////////////////////
+// LyX server support code.
+////////////////////////////////////////////////////////////////////////
class SocketNotifier : public QSocketNotifier
{
public:
////////////////////////////////////////////////////////////////////////
// Mac specific stuff goes here...
+////////////////////////////////////////////////////////////////////////
class MenuTranslator : public QTranslator
{
QString flavorFor(QString const & mime)
{
LYXERR(Debug::ACTION, "flavorFor " << mime);
- if (mime == QLatin1String(pdf_mime_type))
+ if (mime == pdfMimeType())
return QLatin1String("com.adobe.pdf");
return QString();
}
{
LYXERR(Debug::ACTION, "mimeFor " << flav);
if (flav == QLatin1String("com.adobe.pdf"))
- return QLatin1String(pdf_mime_type);
+ return pdfMimeType();
return QString();
}
bool canConvert(QString const & mime, QString flav)
- { return mimeFor(flav) == mime; }
+ {
+ return mimeFor(flav) == mime;
+ }
- QVariant convertToMime(QString const & mime, QList<QByteArray> data, QString flav)
+ QVariant convertToMime(QString const & /*mime*/, QList<QByteArray> data,
+ QString /*flav*/)
{
if(data.count() > 1)
qWarning("QMacPasteboardMimeGraphics: Cannot handle multiple member data");
return data.first();
}
- QList<QByteArray> convertFromMime(QString const & mime, QVariant data, QString flav)
+ QList<QByteArray> convertFromMime(QString const & /*mime*/,
+ QVariant data, QString /*flav*/)
{
QList<QByteArray> ret;
ret.append(data.toByteArray());
static FORMATETC cfFromMime(QString const & mimetype)
{
FORMATETC formatetc;
- if (mimetype == emf_mime_type) {
+ if (mimetype == emfMimeType()) {
formatetc.cfFormat = CF_ENHMETAFILE;
formatetc.tymed = TYMED_ENHMF;
- } else if (mimetype == wmf_mime_type) {
+ } else if (mimetype == wmfMimeType()) {
formatetc.cfFormat = CF_METAFILEPICT;
formatetc.tymed = TYMED_MFPICT;
}
bool canConvertToMime(QString const & mimetype,
IDataObject * pDataObj) const
{
- if (mimetype != emf_mime_type && mimetype != wmf_mime_type)
+ if (mimetype != emfMimeType() && mimetype != wmfMimeType())
return false;
FORMATETC formatetc = cfFromMime(mimetype);
return pDataObj->QueryGetData(&formatetc) == S_OK;
{
switch (formatetc.cfFormat) {
case CF_ENHMETAFILE:
- return emf_mime_type;
+ return emfMimeType();
case CF_METAFILEPICT:
- return wmf_mime_type;
+ return wmfMimeType();
}
return QString();
}
QHash<int, SocketNotifier *> socket_notifiers_;
///
Menus menus_;
+ ///
+ /// The global instance
+ Toolbars toolbars_;
+
/// this timer is used for any regular events one wants to
/// perform. at present it is used to check if forked processes
/// are done.
#ifdef Q_WS_WIN
/// WMF Mime handler for Windows clipboard.
- // FIXME for Windows Vista and Qt4 (see http://bugzilla.lyx.org/show_bug.cgi?id=4846)
- // But this makes LyX crash on exit when LyX is compiled in release mode and if there
- // is something in the clipboard.
+ /// \warning: see comment in ~GuiApplication and in bug 4846.
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;
}
QCoreApplication::setOrganizationDomain("lyx.org");
QCoreApplication::setApplicationName(app_name + "-" + lyx_version);
+ // Install translator for GUI elements.
+ installTranslator(&d->qt_trans_);
+
// FIXME: quitOnLastWindowClosed is true by default. We should have a
// lyxrc setting for this in order to let the application stay resident.
// But then we need some kind of dock icon, at least on Windows.
// FIXME: Do we need a lyxrc setting for this on Mac? This behaviour
// seems to be the default case for applications like LyX.
setQuitOnLastWindowClosed(false);
+
+ // This allows to translate the strings that appear in the LyX menu.
+ /// A translator suitable for the entries in the LyX menu.
+ /// Only needed with Qt/Mac.
+ installTranslator(new MenuTranslator(this));
#endif
#ifdef Q_WS_X11
QApplication::setDoubleClickInterval(300);
#endif
- // install translation file for Qt built-in dialogs
- QString language_name = QString("qt_") + QLocale::system().name();
-
- // language_name can be short (e.g. qt_zh) or long (e.g. qt_zh_CN).
- // Short-named translator can be loaded from a long name, but not the
- // opposite. Therefore, long name should be used without truncation.
- // c.f. http://doc.trolltech.com/4.1/qtranslator.html#load
- if (d->qt_trans_.load(language_name,
- QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
- {
- installTranslator(&d->qt_trans_);
- // even if the language calls for RtL, don't do that
- setLayoutDirection(Qt::LeftToRight);
- LYXERR(Debug::GUI, "Successfully installed Qt translations for locale "
- << language_name);
- } else
- LYXERR(Debug::GUI, "Could not find Qt translations for locale "
- << language_name);
-
-#ifdef Q_WS_MACX
- // This allows to translate the strings that appear in the LyX menu.
- /// A translator suitable for the entries in the LyX menu.
- /// Only needed with Qt/Mac.
- installTranslator(new MenuTranslator(this));
-#endif
connect(this, SIGNAL(lastWindowClosed()), this, SLOT(onLastWindowClosed()));
using namespace lyx::graphics;
Image::newImage = boost::bind(&GuiImage::newImage);
- Image::loadableFormats = boost::bind(&GuiImage::loadableFormats);
// needs to be done before reading lyxrc
QWidget w;
}
+docstring GuiApplication::iconName(FuncRequest const & f, bool unknown)
+{
+ return qstring_to_ucs4(lyx::frontend::iconName(f, unknown));
+}
+
+
+
bool GuiApplication::getStatus(FuncRequest const & cmd, FuncStatus & flag) const
{
bool enable = true;
}
if (!enable)
- flag.enabled(false);
+ flag.setEnabled(false);
return true;
}
case LFUN_WINDOW_CLOSE:
// update bookmark pit of the current buffer before window close
- for (size_t i = 0; i < LyX::ref().session().bookmarks().size(); ++i)
+ for (size_t i = 0; i < theSession().bookmarks().size(); ++i)
theLyXFunc().gotoBookmark(i+1, false, false);
current_view_->close();
break;
case LFUN_FILE_OPEN:
if (d->views_.empty()
|| (!lyxrc.open_buffers_in_tabs && current_view_->buffer() != 0)) {
- createView();
- current_view_->openDocument(to_utf8(cmd.argument()));
+ 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.
+ boost::crc_32_type crc;
+ crc = for_each(fname.begin(), fname.end(), crc);
+ createView(crc.checksum());
+ current_view_->openDocument(fname);
if (!current_view_->buffer())
current_view_->close();
} else
void GuiApplication::resetGui()
{
+ // Set the language defined by the user.
+ setGuiLanguage();
+
+ // Read menus
+ if (!readUIFile(toqstr(lyxrc.ui_file)))
+ // 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);
+
QHash<int, GuiView *>::iterator it;
- for (it = d->views_.begin(); it != d->views_.end(); ++it)
- (*it)->resetDialogs();
+ for (it = d->views_.begin(); it != d->views_.end(); ++it) {
+ GuiView * gv = *it;
+ gv->setLayoutDirection(layoutDirection());
+ gv->resetDialogs();
+ }
dispatch(FuncRequest(LFUN_SCREEN_FONT_UPDATE));
}
-void GuiApplication::createView(QString const & geometry_arg, bool autoShow)
+void GuiApplication::createView(int view_id)
+{
+ createView(QString(), true, view_id);
+}
+
+
+void GuiApplication::createView(QString const & geometry_arg, bool autoShow,
+ int view_id)
{
// release the keyboard which might have been grabed by the global
// menubar on Mac to catch shortcuts even without any GuiView.
d->global_menubar_->releaseKeyboard();
// create new view
- int id = 0;
- while (d->views_.find(id) != d->views_.end())
- id++;
+ int id = view_id;
+ if (id == 0) {
+ 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);
-
- // copy the icon size from old view
- if (current_view_)
- view->setIconSize(current_view_->iconSize());
-
// register view
d->views_[id] = view;
}
+Toolbars const & GuiApplication::toolbars() const
+{
+ return d->toolbars_;
+}
+
+
+Toolbars & GuiApplication::toolbars()
+{
+ return d->toolbars_;
+}
+
+
Menus const & GuiApplication::menus() const
{
return d->menus_;
}
+void GuiApplication::setGuiLanguage()
+{
+ // Set the language defined by the user.
+ setRcGuiLanguage();
+
+ QString const default_language = toqstr(Messages::defaultLanguage());
+ LYXERR(Debug::LOCALE, "Tring to set default locale to: " << default_language);
+ QLocale const default_locale(default_language);
+ QLocale::setDefault(default_locale);
+
+ // install translation file for Qt built-in dialogs
+ QString const language_name = QString("qt_") + default_locale.name();
+
+ // language_name can be short (e.g. qt_zh) or long (e.g. qt_zh_CN).
+ // Short-named translator can be loaded from a long name, but not the
+ // opposite. Therefore, long name should be used without truncation.
+ // c.f. http://doc.trolltech.com/4.1/qtranslator.html#load
+ if (!d->qt_trans_.load(language_name,
+ QLibraryInfo::location(QLibraryInfo::TranslationsPath))) {
+ LYXERR(Debug::LOCALE, "Could not find Qt translations for locale "
+ << language_name);
+ } else {
+ LYXERR(Debug::LOCALE, "Successfully installed Qt translations for locale "
+ << language_name);
+ }
+
+ switch (default_locale.language()) {
+ case QLocale::Arabic :
+ case QLocale::Hebrew :
+ case QLocale::Persian :
+ case QLocale::Urdu :
+ setLayoutDirection(Qt::RightToLeft);
+ break;
+ default:
+ setLayoutDirection(Qt::LeftToRight);
+ }
+}
+
+
void GuiApplication::execBatchCommands()
{
+ setGuiLanguage();
+
+ // Read menus
+ if (!readUIFile(toqstr(lyxrc.ui_file)))
+ // 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);
- LyX::ref().execBatchCommands();
+ lyx::execBatchCommands();
}
QAbstractItemModel * GuiApplication::languageModel()
if (!lyxrc.load_session)
return;
- Session & session = LyX::ref().session();
+ Session & session = theSession();
vector<FileName> const & lastopened = session.lastOpened().getfiles();
// do not add to the lastfile list since these files are restored from
// last session, and should be already there (regular files), or should
case QEvent::FileOpen: {
// Open a file; this happens only on Mac OS X for now
QFileOpenEvent * foe = static_cast<QFileOpenEvent *>(e);
-
- if (!current_view_ || !current_view_->view())
- // The application is not properly initialized yet.
- // So we acknowledge the event and delay the file opening
- // until LyX is ready.
- // FIXME UNICODE: FileName accept an utf8 encoded string.
- LyX::ref().addFileToLoad(fromqstr(foe->file()));
- else
- lyx::dispatch(FuncRequest(LFUN_FILE_OPEN,
- qstring_to_ucs4(foe->file())));
-
+ lyx::dispatch(FuncRequest(LFUN_FILE_OPEN,
+ qstring_to_ucs4(foe->file())));
e->accept();
return true;
}
catch (ExceptionMessage const & e) {
switch(e.type_) {
case ErrorException:
- LyX::cref().emergencyCleanup();
+ emergencyCleanup();
setQuitOnLastWindowClosed(false);
closeAllViews();
Alert::error(e.title_, e.details_);
"\n\nException: ");
s += from_ascii(e.what());
Alert::error(_("Software exception Detected"), s);
- LyX::cref().exit(1);
+ lyx_exit(1);
}
catch (...) {
docstring s = _("LyX has caught some really weird exception, it will "
"now attempt to save all unsaved documents and exit.");
Alert::error(_("Software exception Detected"), s);
- LyX::cref().exit(1);
+ lyx_exit(1);
}
return false;
}
-void GuiApplication::readMenus(Lexer & lex)
+bool GuiApplication::searchMenu(FuncRequest const & func,
+ docstring_list & names) const
{
- menus().read(lex);
+ return d->menus_.searchMenu(func, names);
}
-bool GuiApplication::searchMenu(FuncRequest const & func,
- vector<docstring> & names) const
+bool GuiApplication::readUIFile(QString const & name, bool include)
{
- return menus().searchMenu(func, names);
+ 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 }
+ };
+
+ // Ensure that a file is read only once (prevents include loops)
+ static QStringList uifiles;
+ if (uifiles.contains(name)) {
+ if (!include) {
+ // We are reading again the top uifile so reset the safeguard:
+ uifiles.clear();
+ d->menus_.reset();
+ d->toolbars_.reset();
+ } else {
+ LYXERR(Debug::INIT, "UI file '" << name << "' has been read already. "
+ << "Is this an include loop?");
+ return false;
+ }
+ }
+
+ 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");
+ }
+
+ 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;
+ }
+
+ uifiles.push_back(name);
+
+ LYXERR(Debug::INIT, "Found " << name << " in " << ui_path);
+ Lexer lex(uitags);
+ lex.setFile(ui_path);
+ if (!lex.isOK()) {
+ lyxerr << "Unable to set LyXLeX for ui file: " << ui_path
+ << endl;
+ }
+
+ if (lyxerr.debugging(Debug::PARSER))
+ lex.printTable(lyxerr);
+
+ while (lex.isOK()) {
+ switch (lex.lex()) {
+ case ui_include: {
+ lex.next(true);
+ QString const file = toqstr(lex.getString());
+ if (!readUIFile(file, true))
+ return false;
+ break;
+ }
+ case ui_menuset:
+ d->menus_.read(lex);
+ break;
+
+ case ui_toolbarset:
+ d->toolbars_.readToolbars(lex);
+ break;
+
+ case ui_toolbars:
+ d->toolbars_.readToolbarSettings(lex);
+ break;
+
+ default:
+ if (!rtrim(lex.getString()).empty())
+ lex.printError("LyX::ReadUIFile: "
+ "Unknown menu tag: `$$Token'");
+ break;
+ }
+ }
+ return true;
}
case SelectionRequest: {
if (xev->xselectionrequest.selection != XA_PRIMARY)
break;
- LYXERR(Debug::GUI, "X requested selection.");
+ LYXERR(Debug::SELECTION, "X requested selection.");
BufferView * bv = current_view_->view();
if (bv) {
docstring const sel = bv->requestSelection();
case SelectionClear: {
if (xev->xselectionclear.selection != XA_PRIMARY)
break;
- LYXERR(Debug::GUI, "Lost selection.");
+ LYXERR(Debug::SELECTION, "Lost selection.");
BufferView * bv = current_view_->view();
if (bv)
bv->clearSelection();