AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

editing linux sources

Browse source
This commit is contained in:
leetthewire 2022-04-02 07:31:54 -07:00
parent 39de79d3cd
commit a261ab4f0c
3 changed files with 41 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

71
client/platforms/linux/linuxsystemtraynotificationhandler.cpp
View file

@ -6,8 +6,10 @@
#include "constants.h"
#include "leakdetector.h"
#include "logger.h"
#include "defines.h"
#include <QtDBus/QtDBus>
#include <QDesktopServices>
constexpr const char* DBUS_ITEM = "org.freedesktop.Notifications";
constexpr const char* DBUS_PATH = "/org/freedesktop/Notifications";
@ -38,11 +40,30 @@ bool LinuxSystemTrayNotificationHandler::requiredCustomImpl() {
LinuxSystemTrayNotificationHandler::LinuxSystemTrayNotificationHandler(
QObject* parent)
: SystemTrayNotificationHandler(parent) {
MVPN_COUNT_CTOR(LinuxSystemTrayNotificationHandler);
QDBusConnection::sessionBus().connect(DBUS_ITEM, DBUS_PATH, DBUS_INTERFACE,
"ActionInvoked", this,
SLOT(actionInvoked(uint, QString)));
m_systemTrayIcon.show();
connect(&m_systemTrayIcon, &QSystemTrayIcon::activated, this);
m_menu.addAction(QIcon(":/images/tray/application.png"), tr("Show") + " " + APPLICATION_NAME, this, [this](){
emit raiseRequested();
});
m_menu.addSeparator();
m_trayActionConnect = m_menu.addAction(tr("Connect"), this, [this](){ emit connectRequested(); });
m_trayActionDisconnect = m_menu.addAction(tr("Disconnect"), this, [this](){ emit disconnectRequested(); });
m_menu.addSeparator();
m_menu.addAction(QIcon(":/images/tray/link.png"), tr("Visit Website"), [&](){
QDesktopServices::openUrl(QUrl("https://amnezia.org"));
});
m_menu.addAction(QIcon(":/images/tray/cancel.png"), tr("Quit") + " " + APPLICATION_NAME, this, [&](){
qApp->quit();
});
m_systemTrayIcon.setContextMenu(&m_menu);
setTrayState(VpnProtocol::Disconnected);
}
LinuxSystemTrayNotificationHandler::~LinuxSystemTrayNotificationHandler() {
@ -53,50 +74,8 @@ void LinuxSystemTrayNotificationHandler::notify(Message type,
const QString& title,
const QString& message,
int timerMsec) {
QString actionMessage;
switch (type) {
case None:
return SystemTrayNotificationHandler::notify(type, title, message,
timerMsec);
case UnsecuredNetwork:
actionMessage = qtTrId("vpn.toggle.on");
break;
case CaptivePortalBlock:
actionMessage = qtTrId("vpn.toggle.off");
break;
case CaptivePortalUnblock:
actionMessage = qtTrId("vpn.toggle.on");
break;
default:
Q_ASSERT(false);
}
m_lastMessage = type;
emit notificationShown(title, message);
QDBusInterface n(DBUS_ITEM, DBUS_PATH, DBUS_INTERFACE,
QDBusConnection::sessionBus());
if (!n.isValid()) {
qWarning("Failed to connect to the notification manager via system dbus");
return;
}
uint32_t replacesId = 0; // Don't replace.
const char* appIcon = MVPN_ICON_PATH;
QStringList actions{ACTION_ID, actionMessage};
QMap<QString, QVariant> hints;
QDBusReply<uint> reply = n.call("Notify", "Mozilla VPN", replacesId, appIcon,
title, message, actions, hints, timerMsec);
if (!reply.isValid()) {
logger.warning() << "Failed to show the notification";
}
m_lastNotificationId = reply;
}
void LinuxSystemTrayNotificationHandler::actionInvoked(uint actionId,

14
client/platforms/linux/linuxsystemtraynotificationhandler.h
View file

@ -23,11 +23,25 @@ class LinuxSystemTrayNotificationHandler final
private:
void notify(Message type, const QString& title, const QString& message,
int timerMsec) override;
void setTrayState(VpnProtocol::VpnConnectionState state);
private slots:
void actionInvoked(uint actionId, QString action);
private:
QMenu m_menu;
QSystemTrayIcon m_systemTrayIcon;
QAction* m_trayActionConnect = nullptr;
QAction* m_trayActionDisconnect = nullptr;
QAction* m_preferencesAction = nullptr;
QAction* m_statusLabel = nullptr;
QAction* m_separator = nullptr;
const QString ConnectedTrayIconName = "active.png";
const QString DisconnectedTrayIconName = "default.png";
const QString ErrorTrayIconName = "error.png";
uint m_lastNotificationId = 0;
};