From: Juergen Spitzmueller Date: Sun, 15 Oct 2023 09:02:35 +0000 (+0200) Subject: Simplify X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=cfcc57bd895fc3c74dd47b8cb40fd40c0c57dbcb;p=features.git Simplify --- diff --git a/src/frontends/qt/GuiApplication.cpp b/src/frontends/qt/GuiApplication.cpp index d1c91fbb01..44b4278be6 100644 --- a/src/frontends/qt/GuiApplication.cpp +++ b/src/frontends/qt/GuiApplication.cpp @@ -1270,7 +1270,7 @@ docstring Application::mathIcon(docstring const & c) void Application::applyPrefs() { - if (lyxrc.ui_style != system_lyxrc.ui_style) + if (lyxrc.ui_style != "default") lyx::frontend::GuiApplication::setStyle(toqstr(lyxrc.ui_style)); } diff --git a/src/frontends/qt/GuiPrefs.cpp b/src/frontends/qt/GuiPrefs.cpp index 0884746e62..dd9fcf8cf5 100644 --- a/src/frontends/qt/GuiPrefs.cpp +++ b/src/frontends/qt/GuiPrefs.cpp @@ -2519,17 +2519,9 @@ PrefUserInterface::PrefUserInterface(GuiPreferences * form) iconSetCO->addItem(qt_("Classic"), "classic"); iconSetCO->addItem(qt_("Oxygen"), "oxygen"); - QString uistyletr = (system_lyxrc.ui_style == "default") - ? qt_("Default") - : toqstr(system_lyxrc.ui_style); - uiStyleCO->addItem(uistyletr, toqstr(system_lyxrc.ui_style)); + uiStyleCO->addItem(qt_("Default"), toqstr("default")); for (auto const & style : QStyleFactory::keys()) - { - uistyletr = (style == "default") - ? qt_("Default") - : style; uiStyleCO->addItem(style, style.toLower()); - } if (guiApp->platformName() != "xcb" && !guiApp->platformName().contains("wayland"))