ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor Controller

Browse Source
This commit is contained in:
Tobias Fella
2025-08-24 16:12:52 +02:00
parent bb3e28bc43
commit e7f6adaa01
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/app/controller.cpp
View File

@@ -19,6 +19,7 @@
#include "accountmanager.h" #include "accountmanager.h"
#include "enums/roomsortparameter.h" #include "enums/roomsortparameter.h"
#include "general_logging.h"
#include "mediasizehelper.h" #include "mediasizehelper.h"
#include "models/actionsmodel.h" #include "models/actionsmodel.h"
#include "models/messagemodel.h" #include "models/messagemodel.h"
@@ -133,7 +134,7 @@ Controller::Controller(QObject *parent)
connect(NeoChatConfig::self(), &NeoChatConfig::SystemTrayChanged, this, &Controller::setQuitOnLastWindowClosed); connect(NeoChatConfig::self(), &NeoChatConfig::SystemTrayChanged, this, &Controller::setQuitOnLastWindowClosed);
#endif #endif
QObject::connect(QGuiApplication::instance(), &QCoreApplication::aboutToQuit, QGuiApplication::instance(), [this] { connect(QGuiApplication::instance(), &QCoreApplication::aboutToQuit, QGuiApplication::instance(), [this] {
delete m_trayIcon; delete m_trayIcon;
NeoChatConfig::self()->save(); NeoChatConfig::self()->save();
}); });
@@ -200,13 +201,15 @@ void Controller::setAccountManager(AccountManager *manager)
m_accountManager = manager; m_accountManager = manager;
if (m_accountManager) { if (!m_accountManager) {
connect(m_accountManager, &AccountManager::errorOccured, this, &Controller::errorOccured); return;
connect(m_accountManager, &AccountManager::accountsLoadingChanged, this, &Controller::accountsLoadingChanged);
connect(m_accountManager, &AccountManager::connectionAdded, this, &Controller::initConnection);
connect(m_accountManager, &AccountManager::connectionDropped, this, &Controller::teardownConnection);
connect(m_accountManager, &AccountManager::activeConnectionChanged, this, &Controller::initActiveConnection);
} }
connect(m_accountManager, &AccountManager::errorOccured, this, &Controller::errorOccured);
connect(m_accountManager, &AccountManager::accountsLoadingChanged, this, &Controller::accountsLoadingChanged);
connect(m_accountManager, &AccountManager::connectionAdded, this, &Controller::initConnection);
connect(m_accountManager, &AccountManager::connectionDropped, this, &Controller::teardownConnection);
connect(m_accountManager, &AccountManager::activeConnectionChanged, this, &Controller::initActiveConnection);
} }
void Controller::initConnection(NeoChatConnection *connection) void Controller::initConnection(NeoChatConnection *connection)
@@ -262,8 +265,8 @@ bool Controller::supportSystemTray() const
#ifdef Q_OS_ANDROID #ifdef Q_OS_ANDROID
return false; return false;
#else #else
auto de = QString::fromLatin1(qgetenv("XDG_CURRENT_DESKTOP")); QStringList unsupportedPlatforms{u"GNOME"_s, u"Pantheon"_s};
return de != u"GNOME"_s && de != u"Pantheon"_s; return !unsupportedPlatforms.contains(QString::fromLatin1(qgetenv("XDG_CURRENT_DESKTOP")));
#endif #endif
} }
@@ -273,11 +276,8 @@ void Controller::setQuitOnLastWindowClosed()
if (supportSystemTray() && NeoChatConfig::self()->systemTray()) { if (supportSystemTray() && NeoChatConfig::self()->systemTray()) {
m_trayIcon = new TrayIcon(this); m_trayIcon = new TrayIcon(this);
m_trayIcon->show(); m_trayIcon->show();
} else { } else if (m_trayIcon) {
if (m_trayIcon) { delete m_trayIcon;
delete m_trayIcon;
m_trayIcon = nullptr;
}
} }
#endif #endif
} }
@@ -378,7 +378,10 @@ QString Controller::loadFileContent(const QString &path) const
{ {
QUrl url(path); QUrl url(path);
QFile file(url.isLocalFile() ? url.toLocalFile() : url.toString()); QFile file(url.isLocalFile() ? url.toLocalFile() : url.toString());
file.open(QFile::ReadOnly); if (!file.open(QFile::ReadOnly)) {
qCWarning(GENERAL) << "Failed to open file" << path;
return {};
}
return QString::fromLatin1(file.readAll()); return QString::fromLatin1(file.readAll());
} }

2
src/app/controller.h
View File

@@ -110,7 +110,7 @@ private:
void initActiveConnection(NeoChatConnection *oldConnection, NeoChatConnection *newConnection); void initActiveConnection(NeoChatConnection *oldConnection, NeoChatConnection *newConnection);
QPointer<NeoChatConnection> m_connection; QPointer<NeoChatConnection> m_connection;
TrayIcon *m_trayIcon = nullptr; QPointer<TrayIcon> m_trayIcon;
QString m_endpoint; QString m_endpoint;
QStringList m_shownImages; QStringList m_shownImages;