From f99f5f5c7eefa1e8f13aeb81c1fb4f5bf4c991dd Mon Sep 17 00:00:00 2001 From: sledgehammer999 Date: Mon, 5 May 2014 21:23:32 +0300 Subject: [PATCH] Enable system tray in MACOSX (Nick Korotysh). --- src/preferences/options_imp.cpp | 4 ---- src/preferences/preferences.h | 4 ---- 2 files changed, 8 deletions(-) diff --git a/src/preferences/options_imp.cpp b/src/preferences/options_imp.cpp index 9122c1693..81f36db74 100755 --- a/src/preferences/options_imp.cpp +++ b/src/preferences/options_imp.cpp @@ -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); diff --git a/src/preferences/preferences.h b/src/preferences/preferences.h index 1db115801..4bb10456d 100755 --- a/src/preferences/preferences.h +++ b/src/preferences/preferences.h @@ -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) {