mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-18 14:00:09 +00:00
Code Issues Releases Wiki Activity

Use LXQt's StatusNotifierItem implementation instead of appindicator

Browse Source
This commit is contained in:
Ilya Fedin
2020-01-31 10:34:37 +04:00
committed by John Preston
parent 1b1f9d9985
commit 3b4dfa1381
22 changed files with 1089 additions and 567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Telegram/SourceFiles/platform/linux/linux_desktop_environment.cpp
View File

@@ -9,10 +9,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "platform/linux/specific_linux.h"
#ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
#include <QDBusInterface>
#endif
namespace Platform {
namespace DesktopEnvironment {
namespace {
@@ -44,18 +40,15 @@ Type Compute() {
return Type::Gnome;
}
return Type::Unity;
} else if (list.contains("pantheon")) {
return Type::Pantheon;
} else if (list.contains("gnome")) {
if (list.contains("ubuntu"))
return Type::Ubuntu;
return Type::Gnome;
} else if (list.contains("kde")) {
if (kdeSession == qstr("5")) {
return Type::KDE5;
}
return Type::KDE4;
} else if (list.contains("mate")) {
return Type::MATE;
}
}
@@ -70,6 +63,8 @@ Type Compute() {
return Type::KDE4;
}
return Type::KDE3;
} else if (desktopSession == qstr("mate")) {
return Type::MATE;
}
}
@@ -96,9 +91,8 @@ Type ComputeAndLog() {
case Type::KDE3: return "KDE3";
case Type::KDE4: return "KDE4";
case Type::KDE5: return "KDE5";
case Type::Ubuntu: return "Ubuntu";
case Type::Unity: return "Unity";
case Type::Pantheon: return "Pantheon";
case Type::MATE: return "MATE";
}
return QString::number(static_cast<int>(result));
};
@@ -114,20 +108,5 @@ Type Get() {
return result;
}
bool TryQtTrayIcon() {
return !IsPantheon();
}
bool PreferAppIndicatorTrayIcon() {
return (InSandbox() && !IsKDE())
|| IsUnity()
|| IsUbuntu()
#ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
|| (IsGnome() && QDBusInterface("org.kde.StatusNotifierWatcher", "/").isValid());
#else
|| IsGnome();
#endif
}
} // namespace DesktopEnvironment
} // namespace Platform