X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fappearancesettingspage.cpp;h=44c53fd7a70745b7a01e416265ec884bc845a577;hb=63fc3ba0333a0555f6f04d49a45aa321b07d10ac;hp=6891c7441ecc96e99074668e2a485d64f5190b3d;hpb=0603a509f3a29006560197a7901624954a1671d6;p=quassel.git diff --git a/src/qtui/settingspages/appearancesettingspage.cpp b/src/qtui/settingspages/appearancesettingspage.cpp index 6891c744..44c53fd7 100644 --- a/src/qtui/settingspages/appearancesettingspage.cpp +++ b/src/qtui/settingspages/appearancesettingspage.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2016 by the Quassel Project * + * Copyright (C) 2005-2018 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -36,9 +36,6 @@ AppearanceSettingsPage::AppearanceSettingsPage(QWidget *parent) { ui.setupUi(this); -#ifdef Q_OS_MAC - ui.minimizeOnClose->hide(); -#endif #ifdef QT_NO_SYSTEMTRAYICON ui.useSystemTrayIcon->hide(); #endif @@ -101,17 +98,19 @@ void AppearanceSettingsPage::initLanguageComboBox() void AppearanceSettingsPage::initIconThemeComboBox() { + // TODO Replace by runtime detection #if defined WITH_OXYGEN || defined WITH_BREEZE || defined WITH_BREEZE_DARK -# if defined WITH_OXYGEN - ui.iconthemeComboBox->addItem(tr("Oxygen"), QVariant("oxygen")); -# endif # if defined WITH_BREEZE ui.iconthemeComboBox->addItem(tr("Breeze Light"), QVariant("breeze")); # endif # if defined WITH_BREEZE_DARK ui.iconthemeComboBox->addItem(tr("Breeze Dark"), QVariant("breezedark")); # endif +# if defined WITH_OXYGEN + ui.iconthemeComboBox->addItem(tr("Oxygen"), QVariant("oxygen")); +# endif #else + ui.iconthemeLabel->hide(); ui.iconthemeComboBox->hide(); #endif }