#include "support/Messages.h"
#include "support/os.h"
#include "support/Package.h"
-#include "support/Path.h"
+#include "support/PathChanger.h"
#include "support/Systemcall.h"
+#include "support/TempFile.h"
#ifdef Q_WS_MACX
#include "support/AppleScript.h"
#include <QLocale>
#include <QLibraryInfo>
#include <QList>
-#include <QMacPasteboardMime>
#include <QMenuBar>
#include <QMimeData>
#include <QObject>
#include <QTextCodec>
#include <QTimer>
#include <QTranslator>
-#if QT_VERSION >= 0x040400
#include <QThreadPool>
-#endif
#include <QWidget>
#ifdef Q_WS_X11
#include <objidl.h>
#endif // Q_WS_WIN
+#ifdef Q_WS_MACX
+#include <QMacPasteboardMime>
+#endif // Q_WS_MACX
+
#include "support/bind.h"
#include <boost/crc.hpp>
return guiApp;
}
+
+void setLocale()
+{
+ QLocale theLocale;
+ if (lyxrc.gui_language == "auto") {
+ theLocale = QLocale::system();
+ } else {
+ Language const * l = languages.getLanguage(lyxrc.gui_language);
+ string const code = l ? l->code() : string();
+ theLocale = QLocale(toqstr(code));
+ }
+ string const code = fromqstr(theLocale.name());
+ // Qt tries to outsmart us and transforms en_US to C.
+ Messages::guiLanguage((code == "C") ? "en_US" : code);
+ QLocale::setDefault(theLocale);
+ setlocale(LC_NUMERIC, "C");
+}
+
+
namespace frontend {
// this must be sorted alphabetically
// Upper case comes before lower case
+// Please don't change the formatting, this list is parsed by
+// development/tools/generate_symbols_images.py.
PngMap sorted_png_map[] = {
+ { "Arrownot", "arrownot2"},
+ { "Arrowvert", "arrowvert2"},
+ { "Bowtie", "bowtie2" },
+ { "Box", "box2" },
{ "Bumpeq", "bumpeq2" },
+ { "CIRCLE", "circle3" },
{ "Cap", "cap2" },
+ { "CheckedBox", "checkedbox2" },
+ { "Circle", "circle2" },
+ { "Colonapprox", "colonapprox2" },
+ { "Coloneq", "coloneq2" },
+ { "Coloneqq", "coloneqq2" },
+ { "Colonsim", "colonsim2" },
{ "Cup", "cup2" },
+ { "DOWNarrow", "downarrow3" },
{ "Delta", "delta2" },
{ "Diamond", "diamond2" },
+ { "Doteq", "doteq2" },
{ "Downarrow", "downarrow2" },
+ { "Eqcolon", "eqcolon2" },
+ { "Eqqcolon", "eqqcolon2" },
{ "Gamma", "gamma2" },
+ { "Join", "join2" },
+ { "LEFTCIRCLE", "leftcircle3" },
+ { "LEFTarrow", "leftarrow3" },
+ { "LEFTcircle", "leftcircle4" },
+ { "LHD", "lhd2" },
{ "Lambda", "lambda2" },
+ { "Lbag", "lbag2"},
{ "Leftarrow", "leftarrow2" },
+ { "Leftcircle", "leftcircle2" },
{ "Leftrightarrow", "leftrightarrow2" },
+ { "Longarrownot", "longarrownot2"},
{ "Longleftarrow", "longleftarrow2" },
{ "Longleftrightarrow", "longleftrightarrow2" },
+ { "Longmapsfrom", "longmapsfrom2"},
+ { "Longmapsto", "longmapsto2"},
{ "Longrightarrow", "longrightarrow2" },
+ { "Mapsfrom", "mapsfrom2"},
+ { "Mapsfromchar", "mapsfromchar2"},
+ { "Mapsto", "mapsto2"},
+ { "Mapstochar", "mapstochar2"},
{ "Omega", "omega2" },
{ "Phi", "phi2" },
{ "Pi", "pi2" },
{ "Psi", "psi2" },
+ { "RHD", "rhd2" },
+ { "RIGHTCIRCLE", "rightcircle3" },
+ { "RIGHTarrow", "rightarrow3" },
+ { "RIGHTcircle", "rightcircle4" },
+ { "Rbag", "rbag2"},
{ "Rightarrow", "rightarrow2" },
+ { "Rightcircle", "rightcircle2" },
{ "Sigma", "sigma2" },
+ { "Square", "square2" },
{ "Subset", "subset2" },
{ "Supset", "supset2" },
{ "Theta", "theta2" },
+ { "Thorn", "thorn2" },
+ { "UParrow", "uparrow3" },
{ "Uparrow", "uparrow2" },
{ "Updownarrow", "updownarrow2" },
{ "Upsilon", "upsilon2" },
{ "Vdash", "vdash3" },
{ "Vert", "vert2" },
+ { "XBox", "xbox3" },
+ { "Xbox", "xbox2" },
{ "Xi", "xi2" },
{ "nLeftarrow", "nleftarrow2" },
{ "nLeftrightarrow", "nleftrightarrow2" },
{ "nRightarrow", "nrightarrow2" },
{ "nVDash", "nvdash3" },
+ { "nVdash", "nvdash4" },
{ "nvDash", "nvdash2" },
{ "textrm \\AA", "textrm_AA"},
{ "textrm \\O", "textrm_O"},
- { "vDash", "vdash2" }
+ { "vDash", "vdash2" },
+ { "varDelta", "vardelta2" },
+ { "varGamma", "vargamma2" },
+ { "varLambda", "varlambda2" },
+ { "varOmega", "varomega2" },
+ { "varPhi", "varphi2" },
+ { "varPi", "varpi2" },
+ { "varPsi", "varpsi2" },
+ { "varSigma", "varsigma2" },
+ { "varTheta", "vartheta2" },
+ { "varUpsilon", "varupsilon2" },
+ { "varXi", "varxi2" }
};
+
size_t const nr_sorted_png_map = sizeof(sorted_png_map) / sizeof(PngMap);
+// This list specifies which system's theme icon is related to which lyx
+// command. It was based on:
+// http://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html
+// this must be sorted alphabetically
+// Upper case comes before lower case
+PngMap sorted_theme_icon_map[] = {
+ { "bookmark-goto 0", "go-jump" },
+ { "buffer-new", "document-new" },
+ { "buffer-print", "document-print" },
+ { "buffer-write", "document-save" },
+ { "buffer-write-as", "document-save-as" },
+ { "buffer-zoom-in", "zoom-in" },
+ { "buffer-zoom-out", "zoom-out" },
+ { "copy", "edit-copy" },
+ { "cut", "edit-cut" },
+ { "depth-decrement", "format-indent-less" },
+ { "depth-increment", "format-indent-more" },
+ { "dialog-show print", "document-print" },
+ { "dialog-show spellchecker", "tools-check-spelling" },
+ { "dialog-show-new-inset graphics", "insert-image" },
+ { "dialog-toggle findreplaceadv", "edit-find-replace" },
+ { "file-open", "document-open" },
+ { "font-bold", "format-text-bold" },
+ { "font-ital", "format-text-italic" },
+ { "font-strikeout", "format-text-strikethrough" },
+ { "font-underline", "format-text-underline" },
+ { "lyx-quit", "application-exit" },
+ { "paste", "edit-paste" },
+ { "redo", "edit-redo" },
+ { "undo", "edit-undo" },
+ { "window-close", "window-close" },
+ { "window-new", "window-new" }
+};
+
+size_t const nr_sorted_theme_icon_map = sizeof(sorted_theme_icon_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), /**/);
+ LATTEST(sorted(begin, end));
PngMap const * const it = find_if(begin, end, CompareKey(name));
} // namespace anon
+QString themeIconName(QString const & action)
+{
+ PngMap const * const begin = sorted_theme_icon_map;
+ PngMap const * const end = begin + nr_sorted_theme_icon_map;
+ LASSERT(sorted(begin, end), /**/);
+
+ PngMap const * const it = find_if(begin, end, CompareKey(action));
+
+ if (it != end)
+ return it->value;
+ return QString();
+}
+
+
QString iconName(FuncRequest const & f, bool unknown)
{
initializeResources();
QIcon getIcon(FuncRequest const & f, bool unknown)
{
+#if (QT_VERSION >= 0x040600)
+ if (lyxrc.use_system_theme_icons) {
+ QString action = toqstr(lyxaction.getActionName(f.action()));
+ if (!f.argument().empty())
+ action += " " + toqstr(f.argument());
+ QString const theme_icon = themeIconName(action);
+ if (QIcon::hasThemeIcon(theme_icon))
+ return QIcon::fromTheme(theme_icon);
+ }
+#endif
+
QString icon = iconName(f, unknown);
if (icon.isEmpty())
return QIcon();
case QEvent::Show:
case QEvent::Hide:
case QEvent::Resize:
+ case QEvent::UpdateRequest:
+ case QEvent::CursorChange:
+ case QEvent::ActionChanged:
+ case QEvent::EnabledChange:
+ case QEvent::SockAct:
+ case QEvent::Timer:
+ case QEvent::Paint:
+ case QEvent::ToolTipChange:
+ case QEvent::LayoutRequest:
+ case QEvent::MetaCall:
return QObject::eventFilter(obj, event);
default:
+ // FIXME Blocking all these events is a bad idea.
QKeyEvent *keyEvent = dynamic_cast<QKeyEvent*>(event);
if (keyEvent && keyEvent->key() == Qt::Key_Escape)
pressed_ = true;
QCoreApplication::setOrganizationDomain("lyx.org");
QCoreApplication::setApplicationName(lyx_package);
+ qsrand(QDateTime::currentDateTime().toTime_t());
+
// Install translator for GUI elements.
installTranslator(&d->qt_trans_);
this, SLOT(handleRegularEvents()));
d->general_timer_.start();
-#if QT_VERSION >= 0x040400
// maxThreadCount() defaults in general to 2 on single or dual-processor.
// This is clearly not enough in a time where we use threads for
// document preview and/or export. 20 should be OK.
QThreadPool::globalInstance()->setMaxThreadCount(20);
-#endif
}
break;
}
+ case LFUN_DIALOG_SHOW: {
+ string const name = cmd.getArg(0);
+ return name == "aboutlyx"
+ || name == "prefs"
+ || name == "texinfo"
+ || name == "progress"
+ || name == "compare";
+ }
default:
return false;
return;
BookmarksSection::Bookmark const & bm =
theSession().bookmarks().bookmark(idx);
- LASSERT(!bm.filename.empty(), /**/);
+ LASSERT(!bm.filename.empty(), return);
string const file = bm.filename.absFileName();
// if the file is not opened, open it.
if (!theBufferList().exists(bm.filename)) {
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
- && current_view_->documentBufferView() != 0)) {
+ bool const is_open = FileName::isAbsolute(fname)
+ && theBufferList().getBuffer(FileName(fname));
+ if (d->views_.empty()
+ || (!lyxrc.open_buffers_in_tabs
+ && current_view_->documentBufferView() != 0
+ && !is_open)) {
// 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;
}
actOnUpdatedPrefs(lyxrc_orig, lyxrc);
- resetGui();
+
+ // If the request comes from the minibuffer, then we can't reset
+ // the GUI, since that would destory the minibuffer itself and
+ // cause a crash, since we are currently in one of the methods of
+ // GuiCommandBuffer. See bug #8540.
+ if (cmd.origin() != FuncRequest::COMMANDBUFFER)
+ resetGui();
+ // else
+ // FIXME Unfortunately, that leaves a bug here, since we cannot
+ // reset the GUI in this case. If the changes to lyxrc affected the
+ // UI, then, nothing would happen. This seems fairly unlikely, but
+ // it definitely is a bug.
break;
}
lyxerr.setLevel(Debug::value(to_utf8(cmd.argument())));
break;
+ case LFUN_DIALOG_SHOW: {
+ string const name = cmd.getArg(0);
+
+ if ( name == "aboutlyx"
+ || name == "prefs"
+ || name == "texinfo"
+ || name == "progress"
+ || name == "compare")
+ {
+ // work around: on Mac OS the application
+ // is not terminated when closing the last view.
+ // Create a new one to be able to dispatch the
+ // LFUN_DIALOG_SHOW to this view.
+ if (current_view_ == 0)
+ createView();
+ }
+ }
+
default:
// The LFUN must be for one of GuiView, BufferView, Buffer or Cursor;
// let's try that:
void GuiApplication::setGuiLanguage()
{
- QString const default_language = toqstr(getGuiMessages().language());
- LYXERR(Debug::LOCALE, "Trying to set default locale to: " << default_language);
- QLocale const default_locale(default_language);
- QLocale::setDefault(default_locale);
-
+ setLocale();
+ QLocale theLocale;
// install translation file for Qt built-in dialogs
- QString const language_name = QString("qt_") + default_locale.name();
-
+ QString const language_name = QString("qt_") + theLocale.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.
<< language_name);
}
- switch (default_locale.language()) {
+ switch (theLocale.language()) {
case QLocale::Arabic :
case QLocale::Hebrew :
case QLocale::Persian :
}
d->language_model_ = new QSortFilterProxyModel(this);
d->language_model_->setSourceModel(lang_model);
-#if QT_VERSION >= 0x040300
d->language_model_->setSortLocaleAware(true);
-#endif
return d->language_model_;
}
void GuiApplication::unregisterView(GuiView * gv)
{
- LASSERT(d->views_[gv->id()] == gv, /**/);
+ LAPPERR(d->views_[gv->id()] == gv);
d->views_.remove(gv->id());
if (current_view_ == gv)
current_view_ = 0;
GuiView & GuiApplication::view(int id) const
{
- LASSERT(d->views_.contains(id), /**/);
+ LAPPERR(d->views_.contains(id));
return *d->views_.value(id);
}
if (retval == FormatMismatch) {
LYXERR(Debug::FILES, "Converting ui file to format " << LFUN_FORMAT);
- FileName const tempfile = FileName::tempName("convert_ui");
+ TempFile tmp("convertXXXXXX.ui");
+ FileName const tempfile = tmp.name();
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();
}
}
frontend::FontLoader & theFontLoader()
{
- LASSERT(frontend::guiApp, /**/);
+ LAPPERR(frontend::guiApp);
return frontend::guiApp->fontLoader();
}
frontend::FontMetrics const & theFontMetrics(FontInfo const & f)
{
- LASSERT(frontend::guiApp, /**/);
+ LAPPERR(frontend::guiApp);
return frontend::guiApp->fontLoader().metrics(f);
}
frontend::Clipboard & theClipboard()
{
- LASSERT(frontend::guiApp, /**/);
+ LAPPERR(frontend::guiApp);
return frontend::guiApp->clipboard();
}
frontend::Selection & theSelection()
{
- LASSERT(frontend::guiApp, /**/);
+ LAPPERR(frontend::guiApp);
return frontend::guiApp->selection();
}
projects / lyx.git / blobdiff