Browse Source

Enable system tray in MACOSX (Nick Korotysh).

adaptive-webui-19844
sledgehammer999 11 years ago
parent
commit
f99f5f5c7e
  1. 4
      src/preferences/options_imp.cpp
  2. 4
      src/preferences/preferences.h

4
src/preferences/options_imp.cpp

@ -106,14 +106,10 @@ options_imp::options_imp(QWidget *parent): @@ -106,14 +106,10 @@ options_imp::options_imp(QWidget *parent):
// Load options
loadOptions();
// Disable systray integration if it is not supported by the system
#ifndef Q_OS_MAC
if (!QSystemTrayIcon::isSystemTrayAvailable()) {
#endif
checkShowSystray->setChecked(false);
checkShowSystray->setEnabled(false);
#ifndef Q_OS_MAC
}
#endif
#if (!defined(Q_OS_UNIX) || defined(Q_OS_MAC))
label_trayIconStyle->setVisible(false);
comboTrayIcon->setVisible(false);

4
src/preferences/preferences.h

@ -135,11 +135,7 @@ public: @@ -135,11 +135,7 @@ public:
}
bool systrayIntegration() const {
#ifdef Q_OS_MAC
return false;
#else
return value(QString::fromUtf8("Preferences/General/SystrayEnabled"), true).toBool();
#endif
}
void setSystrayIntegration(bool enabled) {

Loading…
Cancel
Save