procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

returned appindicator tray icon in pantheon and gnome

This commit is contained in:
John Preston 2015-02-19 15:50:59 +03:00
parent 6077043939
commit 3102ca1133
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Telegram/SourceFiles/pspecific_linux.cpp
View File

@ -43,7 +43,7 @@ extern "C" {
namespace { namespace {
bool frameless = true; bool frameless = true;
bool finished = true; bool finished = true;
bool isUnity = false; bool noQtTrayIcon = false;
bool useGtkBase = false, useAppIndicator = false, useStatusIcon = false, trayIconChecked = false, useUnityCount = false; bool useGtkBase = false, useAppIndicator = false, useStatusIcon = false, trayIconChecked = false, useUnityCount = false;
AppIndicator *_trayIndicator = 0; AppIndicator *_trayIndicator = 0;
@ -326,9 +326,10 @@ namespace {
class _PsInitializer { class _PsInitializer {
public: public:
_PsInitializer() { _PsInitializer() {
isUnity = (QString(getenv("XDG_CURRENT_DESKTOP")).toLower() == QLatin1String("unity")); QString cdesktop = QString(getenv("XDG_CURRENT_DESKTOP")).toLower();
noQtTrayIcon = (cdesktop == QLatin1String("unity")) || (cdesktop == QLatin1String("pantheon")) || (cdesktop == QLatin1String("gnome"));
if (isUnity) cSetSupportTray(false); if (noQtTrayIcon) cSetSupportTray(false);
std::cout << "libs init..\n"; std::cout << "libs init..\n";
setupGtk(); setupGtk();
setupUnity(); setupUnity();
@ -383,7 +384,7 @@ namespace {
} }
void setupGtk() { void setupGtk() {
if (!isUnity) return; if (!noQtTrayIcon) return;
QLibrary lib_gtk, lib_indicator; QLibrary lib_gtk, lib_indicator;
if (loadLibrary(lib_indicator, "appindicator3", 1)) { if (loadLibrary(lib_indicator, "appindicator3", 1)) {
@ -432,7 +433,7 @@ namespace {
} }
void setupUnity() { void setupUnity() {
if (!useGtkBase || !isUnity) return; if (!useGtkBase || !noQtTrayIcon) return;
QLibrary lib_unity(QLatin1String("unity"), 9, 0); QLibrary lib_unity(QLatin1String("unity"), 9, 0);
if (!loadLibrary(lib_unity, "unity", 9)) return; if (!loadLibrary(lib_unity, "unity", 9)) return;
@ -491,7 +492,7 @@ void PsMainWindow::psRefreshTaskbarIcon() {
} }
void PsMainWindow::psTrayMenuUpdated() { void PsMainWindow::psTrayMenuUpdated() {
if (isUnity && (useAppIndicator || useStatusIcon)) { if (noQtTrayIcon && (useAppIndicator || useStatusIcon)) {
const QList<QAction*> &actions = trayIconMenu->actions(); const QList<QAction*> &actions = trayIconMenu->actions();
if (_trayItems.isEmpty()) { if (_trayItems.isEmpty()) {
DEBUG_LOG(("Creating tray menu!")); DEBUG_LOG(("Creating tray menu!"));
@ -517,7 +518,7 @@ void PsMainWindow::psTrayMenuUpdated() {
} }
void PsMainWindow::psSetupTrayIcon() { void PsMainWindow::psSetupTrayIcon() {
if (isUnity) { if (noQtTrayIcon) {
if (!cSupportTray()) return; if (!cSupportTray()) return;
psUpdateCounter(); psUpdateCounter();
} else { } else {
@ -543,7 +544,7 @@ void PsMainWindow::psUpdateWorkmode() {
if (!cSupportTray()) return; if (!cSupportTray()) return;
if (cWorkMode() == dbiwmWindowOnly) { if (cWorkMode() == dbiwmWindowOnly) {
if (isUnity) { if (noQtTrayIcon) {
if (useAppIndicator) { if (useAppIndicator) {
ps_app_indicator_set_status(_trayIndicator, APP_INDICATOR_STATUS_PASSIVE); ps_app_indicator_set_status(_trayIndicator, APP_INDICATOR_STATUS_PASSIVE);
} else if (useStatusIcon) { } else if (useStatusIcon) {
@ -557,7 +558,7 @@ void PsMainWindow::psUpdateWorkmode() {
trayIcon = 0; trayIcon = 0;
} }
} else { } else {
if (isUnity) { if (noQtTrayIcon) {
if (useAppIndicator) { if (useAppIndicator) {
ps_app_indicator_set_status(_trayIndicator, APP_INDICATOR_STATUS_ACTIVE); ps_app_indicator_set_status(_trayIndicator, APP_INDICATOR_STATUS_ACTIVE);
} else if (useStatusIcon) { } else if (useStatusIcon) {
@ -597,7 +598,7 @@ void PsMainWindow::psUpdateCounter() {
} }
} }
if (isUnity) { if (noQtTrayIcon) {
if (useAppIndicator) { if (useAppIndicator) {
if (getms() > _psLastIndicatorUpdate + 1000) { if (getms() > _psLastIndicatorUpdate + 1000) {
psUpdateIndicator(); psUpdateIndicator();
@ -712,7 +713,7 @@ void PsMainWindow::psUpdatedPosition() {
} }
void PsMainWindow::psCreateTrayIcon() { void PsMainWindow::psCreateTrayIcon() {
if (!isUnity) { if (!noQtTrayIcon) {
cSetSupportTray(QSystemTrayIcon::isSystemTrayAvailable()); cSetSupportTray(QSystemTrayIcon::isSystemTrayAvailable());
return; return;
} }