Semi-yearly copyright bump

[quassel.git] / src / qtui / settingspages / appearancesettingspage.cpp

diff --git a/src/qtui/settingspages/appearancesettingspage.cpp b/src/qtui/settingspages/appearancesettingspage.cpp
index 6891c74..44c53fd 100644 (file)
--- 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
 }