From db32d1b155e24c636930bc11690d065c55ebf54a Mon Sep 17 00:00:00 2001 From: Vincent van Ravesteijn Date: Tue, 14 May 2013 17:44:19 +0200 Subject: [PATCH] Only show the configuration of theme icons on X11 Also hide the ui items in the constructor to prevent flickering. --- src/frontends/qt4/GuiPrefs.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp index 4d3e61c50f..5a59521268 100644 --- a/src/frontends/qt4/GuiPrefs.cpp +++ b/src/frontends/qt4/GuiPrefs.cpp @@ -2524,6 +2524,11 @@ PrefUserInterface::PrefUserInterface(GuiPreferences * form) iconSetCO->addItem(qt_("Default"), QString()); iconSetCO->addItem(qt_("Classic"), "classic"); 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) iconset = 0; iconSetCO->setCurrentIndex(iconset); -#if (QT_VERSION < 0x040600) - useSystemThemeIconsCB->hide(); - themeIconsLA->hide(); -#endif useSystemThemeIconsCB->setChecked(rc.use_system_theme_icons); uiFileED->setText(toqstr(external_path(rc.ui_file))); lastfilesSB->setValue(rc.num_lastfiles); -- 2.39.2