On Mac, moving down a paragraph should place the cursor at the end of the current...

[lyx.git] / src / frontends / qt4 / GuiApplication.cpp

diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index de09a1b2bff2cc44645bf521cd5b03bec8aef42a..c319054803854e40f1089eb80df683a50756c1b0 100644 (file)
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -549,12 +549,14 @@ QPixmap getPixmap(QString const & path, QString const & name, QString const & ex
 QIcon getIcon(FuncRequest const & f, bool unknown)
 {
 #if (QT_VERSION >= 0x040600)
-       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);
+       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);
@@ -944,6 +946,8 @@ GuiApplication::GuiApplication(int & argc, char ** argv)
        QCoreApplication::setOrganizationDomain("lyx.org");
        QCoreApplication::setApplicationName(lyx_package);
 
+       qsrand(QDateTime::currentDateTime().toTime_t());
+
        // Install translator for GUI elements.
        installTranslator(&d->qt_trans_);