anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-27 14:29:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Only show the configuration of theme icons on X11

Browse Source 
Also hide the ui items in the constructor to prevent flickering.
This commit is contained in:
Vincent van Ravesteijn 2013-05-14 17:44:19 +02:00
parent 4738ba0f1a
commit db32d1b155
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/frontends/qt4/GuiPrefs.cpp
View File

@ -2524,6 +2524,11 @@ PrefUserInterface::PrefUserInterface(GuiPreferences * form)
iconSetCO->addItem(qt_("Default"), QString()); iconSetCO->addItem(qt_("Default"), QString());
iconSetCO->addItem(qt_("Classic"), "classic"); iconSetCO->addItem(qt_("Classic"), "classic");
iconSetCO->addItem(qt_("Oxygen"), "oxygen"); iconSetCO->addItem(qt_("Oxygen"), "oxygen");
#if (!defined Q_WS_X11 || QT_VERSION < 0x040600)
useSystemThemeIconsCB->hide();
themeIconsLA->hide();
#endif
} }
@ -2545,10 +2550,6 @@ void PrefUserInterface::update(LyXRC const & rc)
if (iconset < 0) if (iconset < 0)
iconset = 0; iconset = 0;
iconSetCO->setCurrentIndex(iconset); iconSetCO->setCurrentIndex(iconset);
#if (QT_VERSION < 0x040600)
useSystemThemeIconsCB->hide();
themeIconsLA->hide();
#endif
useSystemThemeIconsCB->setChecked(rc.use_system_theme_icons); useSystemThemeIconsCB->setChecked(rc.use_system_theme_icons);
uiFileED->setText(toqstr(external_path(rc.ui_file))); uiFileED->setText(toqstr(external_path(rc.ui_file)));
lastfilesSB->setValue(rc.num_lastfiles); lastfilesSB->setValue(rc.num_lastfiles);