mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-05-18 08:55:41 +03:00
* refactor: move business logic from servers model * refactor: move containersModel initialization * refactor: added protocol ui controller and removed settings class from protocols model * refactor: moved cli management to separate controller * refactor: moved app split to separate controller * refactor: moved site split to separate controller * refactor: moved allowed dns to separate controller * refactor: moved language logic to separate ui controller * refactor: removed Settings from devices model * refactor: moved configs and services api logit to separate core controller * refactor: added a layer with a repository between the storage and controllers * refactor: use child parent system instead of smart pointers for controllers and models initialization * refactor: moved install functions from server controller to install controller * refactor: install controller refactoring * chore: renamed exportController to exportUiController * refactor: separate export controller * refactor: removed VpnConfigurationsController * chore: renamed ServerController to SshSession * refactor: replaced ServerController to SshSession * chore: moved qml controllers to separate folder * chore: include fixes * chore: moved utils from core root to core/utils * chore: include fixes * chore: rename core/utils files to camelCase foramt * chore: include fixes * chore: moved some utils to api and selfhosted folders * chore: include fixes * chore: remove unused file * chore: moved serialization folder to core/utils * chore: include fixes * chore: moved some files from client root to core/utils * chore: include fixes * chore: moved ui utils to ui/utils folder * chore: include fixes * chore: move utils from root to ui/utils * chore: include fixes * chore: moved configurators to core/configurators * chore: include fixes * refactor: moved iap logic from ui controller to core * refactor: moved remaining core logic from ApiConfigsController to SubscriptionController * chore: rename apiNewsController to apiNewsUiController * refactor: moved core logic from news ui controller to core * chore: renamed apiConfigsController to subscriptionUiController * chore: include fixes * refactor: merge ApiSettingsController with SubscriptionUiController * chore: moved ui selfhosted controllers to separate folder * chore: include fixes * chore: rename connectionController to connectiomUiController * refactor: moved core logic from connectionUiController * chore: rename settingsController to settingsUiController * refactor: move core logic from settingsUiController * refactor: moved core controller signal/slot connections to separate class * fix: newsController fixes after refactoring * chore: rename model to camelCase * chore: include fixes * chore: remove unused code * chore: move selfhosted core to separate folder * chore: include fixes * chore: rename importController to importUiController * refactor: move core logic from importUiController * chore: minor fixes * chore: remove prem v1 migration * refactor: remove openvpn over cloak and openvpn over shadowsocks * refactor: removed protocolsForContainer function * refactor: add core models * refactor: replace json with c++ structs for server config * refactor: move getDnsPair to ServerConfigUtils * feat: add admin selfhosted config export test * feat: add multi import test * refactor: use coreController for tests * feat: add few simple tests * chore: qrepos in all core controllers * feat: add test for settings * refactor: remove repo dependency from configurators * chore: moved protocols to core folder * chore: include fixes * refactor: moved containersDefs, defs, apiDefs, protocolsDefs to different places * chore: include fixes * chore: build fixes * chore: build fixes * refactor: remove q repo and interface repo * feat: add test for ui servers model and controller * chore: renamed to camelCase * chore: include fixes * refactor: moved core logic from sites ui controller * fix: fixed api config processing * fix: fixed processed server index processing * refactor: protocol models now use c++ structs instead of json configs * refactor: servers model now use c++ struct instead of json config * fix: fixed default server index processing * fix: fix logs init * fix: fix secure settings load keys * chore: build fixes * fix: fixed clear settings * fix: fixed restore backup * fix: sshSession usage * fix: fixed export functions signatures * fix: return missing part from buildContainerWorker * fix: fixed server description on page home * refactor: add container config helpers functions * refactor: c++ structs instead of json * chore: add dns protocol config struct * refactor: move config utils functions to config structs * feat: add test for selfhosted server setup * refactor: separate resources.qrc * fix: fixed server rename * chore: return nameOverriddenByUser * fix: build fixes * fix: fixed models init * refactor: cleanup models usage * fix: fixed models init * chore: cleanup connections and functions signatures * chore: cleanup updateModel calls * feat: added cache to servers repo * chore: cleanup unused functions * chore: ssxray processing * chore: remove transportProtoWithDefault and portWithDefault functions * chore: removed proto types any and l2tp * refactor: moved some constants * fix: fixed native configs export * refactor: remove json from processConfigWith functions * fix: fixed processed server index usage * fix: qml warning fixes * chore: merge fixes * chore: update tests * fix: fixed xray config processing * fix: fixed split tunneling processing * chore: rename sites controllers and model * chore: rename fixes * chore: minor fixes * chore: remove ability to load backup from "file with connection settings" button * fix: fixed api device revoke * fix: remove full model update when renaming a user * fix: fixed premium/free server rename * fix: fixed selfhosted new server install * fix: fixed updateContainer function * fix: fixed revoke for external premium configs * feat: add native configs qr processing * chore: codestyle fixes * fix: fixed admin config create * chore: again remove ability to load backup from "file with connection settings" button * chore: minor fixes * fix: fixed variables initialization * fix: fixed qml imports * fix: minor fixes * fix: fix vpnConnection function calls * feat: add buckup error handling * fix: fixed admin config revok * fix: fixed selfhosted awg installation * fix: ad visability * feat: add empty check for primary dns * chore: minor fixes
174 lines
6.2 KiB
C++
174 lines
6.2 KiB
C++
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include <QDebug>
|
|
#include "systemTrayNotificationHandler.h"
|
|
|
|
|
|
#ifdef Q_OS_MAC
|
|
# include "platforms/macos/macosutils.h"
|
|
#endif
|
|
|
|
#include <QApplication>
|
|
#include <QDesktopServices>
|
|
#include <QIcon>
|
|
#include <QWindow>
|
|
|
|
#include "version.h"
|
|
|
|
SystemTrayNotificationHandler::SystemTrayNotificationHandler(QObject* parent) :
|
|
NotificationHandler(parent),
|
|
m_systemTrayIcon(parent)
|
|
|
|
{
|
|
m_systemTrayIcon.show();
|
|
connect(&m_systemTrayIcon, &QSystemTrayIcon::activated, this, &SystemTrayNotificationHandler::onTrayActivated);
|
|
|
|
m_trayActionShow = 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_trayActionVisitWebSite = m_menu.addAction(QIcon(":/images/tray/link.png"), tr("Visit Website"), [&](){
|
|
QDesktopServices::openUrl(QUrl(websiteUrl));
|
|
});
|
|
|
|
// Quit action: disconnect VPN first on macOS NE, else quit directly
|
|
m_trayActionQuit = m_menu.addAction(QIcon(":/images/tray/cancel.png"),
|
|
tr("Quit") + " " + APPLICATION_NAME,
|
|
this,
|
|
[&](){ qApp->quit(); });
|
|
|
|
m_systemTrayIcon.setContextMenu(&m_menu);
|
|
setTrayState(Vpn::ConnectionState::Disconnected);
|
|
}
|
|
|
|
SystemTrayNotificationHandler::~SystemTrayNotificationHandler() {
|
|
}
|
|
|
|
void SystemTrayNotificationHandler::setConnectionState(Vpn::ConnectionState state)
|
|
{
|
|
setTrayState(state);
|
|
NotificationHandler::setConnectionState(state);
|
|
}
|
|
|
|
void SystemTrayNotificationHandler::onTranslationsUpdated()
|
|
{
|
|
m_trayActionShow->setText(tr("Show") + " " + APPLICATION_NAME);
|
|
m_trayActionConnect->setText(tr("Connect"));
|
|
m_trayActionDisconnect->setText(tr("Disconnect"));
|
|
m_trayActionVisitWebSite->setText(tr("Visit Website"));
|
|
m_trayActionQuit->setText(tr("Quit")+ " " + APPLICATION_NAME);
|
|
}
|
|
|
|
void SystemTrayNotificationHandler::updateWebsiteUrl(const QString &newWebsiteUrl) {
|
|
qDebug() << "Updated website URL:" << newWebsiteUrl;
|
|
websiteUrl = newWebsiteUrl;
|
|
}
|
|
|
|
void SystemTrayNotificationHandler::setTrayIcon(const QString &iconPath)
|
|
{
|
|
QIcon trayIconMask(QPixmap(iconPath).scaled(128,128));
|
|
#ifndef Q_OS_MAC
|
|
trayIconMask.setIsMask(true);
|
|
#endif
|
|
m_systemTrayIcon.setIcon(trayIconMask);
|
|
}
|
|
|
|
void SystemTrayNotificationHandler::onTrayActivated(QSystemTrayIcon::ActivationReason reason)
|
|
{
|
|
#ifndef Q_OS_MAC
|
|
if(reason == QSystemTrayIcon::DoubleClick || reason == QSystemTrayIcon::Trigger) {
|
|
emit raiseRequested();
|
|
}
|
|
#endif
|
|
}
|
|
|
|
void SystemTrayNotificationHandler::setTrayState(Vpn::ConnectionState state)
|
|
{
|
|
QString resourcesPath = ":/images/tray/%1";
|
|
|
|
switch (state) {
|
|
case Vpn::ConnectionState::Disconnected:
|
|
setTrayIcon(QString(resourcesPath).arg(DisconnectedTrayIconName));
|
|
m_trayActionConnect->setEnabled(true);
|
|
m_trayActionDisconnect->setEnabled(false);
|
|
break;
|
|
case Vpn::ConnectionState::Preparing:
|
|
setTrayIcon(QString(resourcesPath).arg(DisconnectedTrayIconName));
|
|
m_trayActionConnect->setEnabled(false);
|
|
m_trayActionDisconnect->setEnabled(true);
|
|
break;
|
|
case Vpn::ConnectionState::Connecting:
|
|
setTrayIcon(QString(resourcesPath).arg(DisconnectedTrayIconName));
|
|
m_trayActionConnect->setEnabled(false);
|
|
m_trayActionDisconnect->setEnabled(true);
|
|
break;
|
|
case Vpn::ConnectionState::Connected:
|
|
setTrayIcon(QString(resourcesPath).arg(ConnectedTrayIconName));
|
|
m_trayActionConnect->setEnabled(false);
|
|
m_trayActionDisconnect->setEnabled(true);
|
|
break;
|
|
case Vpn::ConnectionState::Disconnecting:
|
|
setTrayIcon(QString(resourcesPath).arg(DisconnectedTrayIconName));
|
|
m_trayActionConnect->setEnabled(false);
|
|
m_trayActionDisconnect->setEnabled(true);
|
|
break;
|
|
case Vpn::ConnectionState::Reconnecting:
|
|
setTrayIcon(QString(resourcesPath).arg(DisconnectedTrayIconName));
|
|
m_trayActionConnect->setEnabled(false);
|
|
m_trayActionDisconnect->setEnabled(true);
|
|
break;
|
|
case Vpn::ConnectionState::Error:
|
|
setTrayIcon(QString(resourcesPath).arg(ErrorTrayIconName));
|
|
m_trayActionConnect->setEnabled(true);
|
|
m_trayActionDisconnect->setEnabled(false);
|
|
break;
|
|
case Vpn::ConnectionState::Unknown:
|
|
default:
|
|
m_trayActionConnect->setEnabled(false);
|
|
m_trayActionDisconnect->setEnabled(true);
|
|
setTrayIcon(QString(resourcesPath).arg(DisconnectedTrayIconName));
|
|
}
|
|
|
|
//#ifdef Q_OS_MAC
|
|
// // Get theme from current user (note, this app can be launched as root application and in this case this theme can be different from theme of real current user )
|
|
// bool darkTaskBar = MacOSFunctions::instance().isMenuBarUseDarkTheme();
|
|
// darkTaskBar = forceUseBrightIcons ? true : darkTaskBar;
|
|
// resourcesPath = ":/images_mac/tray_icon/%1";
|
|
// useIconName = useIconName.replace(".png", darkTaskBar ? "@2x.png" : " dark@2x.png");
|
|
//#endif
|
|
}
|
|
|
|
|
|
void SystemTrayNotificationHandler::notify(NotificationHandler::Message type,
|
|
const QString& title,
|
|
const QString& message,
|
|
int timerMsec) {
|
|
Q_UNUSED(type);
|
|
|
|
QIcon icon(ConnectedTrayIconName);
|
|
m_systemTrayIcon.showMessage(title, message, icon, timerMsec);
|
|
}
|
|
|
|
void SystemTrayNotificationHandler::showHideWindow() {
|
|
// QmlEngineHolder* engine = QmlEngineHolder::instance();
|
|
// if (engine->window()->isVisible()) {
|
|
// engine->hideWindow();
|
|
//#ifdef MVPN_MACOS
|
|
// MacOSUtils::hideDockIcon();
|
|
//#endif
|
|
// } else {
|
|
// engine->showWindow();
|
|
//#ifdef MVPN_MACOS
|
|
// MacOSUtils::showDockIcon();
|
|
//#endif
|
|
// }
|
|
}
|
|
|