X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtui.cpp;h=801fb9462452e268c55739fb226322716e8c0837;hp=7b658b9c296a9bdbc08b1c1e6fb32fa624d86256;hb=HEAD;hpb=911f181e0e179eb51279c0880eb701a43163b8b5 diff --git a/src/qtui/qtui.cpp b/src/qtui/qtui.cpp index 7b658b9c..20f03eed 100644 --- a/src/qtui/qtui.cpp +++ b/src/qtui/qtui.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2018 by the Quassel Project * + * Copyright (C) 2005-2022 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -20,6 +20,8 @@ #include "qtui.h" +#include + #include #include #include @@ -30,6 +32,7 @@ #include "buffermodel.h" #include "chatlinemodel.h" #include "contextmenuactionprovider.h" +#include "icon.h" #include "mainwin.h" #include "qtuimessageprocessor.h" #include "qtuisettings.h" @@ -39,95 +42,81 @@ #include "types.h" #include "util.h" -QtUi *QtUi::_instance = nullptr; -MainWin *QtUi::_mainWin = nullptr; -QList QtUi::_notificationBackends; +QList QtUi::_notificationBackends; QList QtUi::_notifications; +QtUi* QtUi::instance() +{ + return static_cast(GraphicalUi::instance()); +} + QtUi::QtUi() : GraphicalUi() , _systemIconTheme{QIcon::themeName()} { - if (_instance != nullptr) { - qWarning() << "QtUi has been instantiated again!"; - return; - } - _instance = this; + QtUiSettings uiSettings; + Quassel::loadTranslation(uiSettings.value("Locale", QLocale::system()).value()); if (Quassel::isOptionSet("icontheme")) { _systemIconTheme = Quassel::optionValue("icontheme"); QIcon::setThemeName(_systemIconTheme); } - - QtUiSettings uiSettings; - Quassel::loadTranslation(uiSettings.value("Locale", QLocale::system()).value()); - setupIconTheme(); - - QApplication::setWindowIcon(QIcon::fromTheme("quassel")); - - setContextMenuActionProvider(new ContextMenuActionProvider(this)); - setToolBarActionProvider(new ToolBarActionProvider(this)); + QApplication::setWindowIcon(icon::get("quassel")); setUiStyle(new QtUiStyle(this)); - _mainWin = new MainWin(); - - setMainWidget(_mainWin); - - connect(_mainWin, SIGNAL(connectToCore(const QVariantMap &)), this, SIGNAL(connectToCore(const QVariantMap &))); - connect(_mainWin, SIGNAL(disconnectFromCore()), this, SIGNAL(disconnectFromCore())); - connect(Client::instance(), SIGNAL(bufferMarkedAsRead(BufferId)), SLOT(closeNotifications(BufferId))); } - QtUi::~QtUi() { unregisterAllNotificationBackends(); - delete _mainWin; - _mainWin = nullptr; - _instance = nullptr; } - void QtUi::init() { + setContextMenuActionProvider(new ContextMenuActionProvider(this)); + setToolBarActionProvider(new ToolBarActionProvider(this)); + + _mainWin = std::make_unique(); + setMainWidget(_mainWin.get()); + + connect(_mainWin.get(), &MainWin::connectToCore, this, &QtUi::connectToCore); + connect(_mainWin.get(), &MainWin::disconnectFromCore, this, &QtUi::disconnectFromCore); + connect(Client::instance(), &Client::bufferMarkedAsRead, this, &QtUi::closeNotifications); + _mainWin->init(); + QtUiSettings uiSettings; - uiSettings.initAndNotify("UseSystemTrayIcon", this, SLOT(useSystemTrayChanged(QVariant)), true); + uiSettings.initAndNotify("UseSystemTrayIcon", this, &QtUi::useSystemTrayChanged, true); - GraphicalUi::init(); // needs to be called after the mainWin is initialized + GraphicalUi::init(); // needs to be called after the mainWin is initialized } - -MessageModel *QtUi::createMessageModel(QObject *parent) +MessageModel* QtUi::createMessageModel(QObject* parent) { return new ChatLineModel(parent); } - -AbstractMessageProcessor *QtUi::createMessageProcessor(QObject *parent) +AbstractMessageProcessor* QtUi::createMessageProcessor(QObject* parent) { return new QtUiMessageProcessor(parent); } - void QtUi::connectedToCore() { _mainWin->connectedToCore(); } - void QtUi::disconnectedFromCore() { _mainWin->disconnectedFromCore(); GraphicalUi::disconnectedFromCore(); } - -void QtUi::useSystemTrayChanged(const QVariant &v) +void QtUi::useSystemTrayChanged(const QVariant& v) { _useSystemTray = v.toBool(); - SystemTray *tray = mainWindow()->systemTray(); + SystemTray* tray = mainWindow()->systemTray(); if (_useSystemTray) { if (tray->isSystemTrayAvailable()) tray->setVisible(true); @@ -138,22 +127,19 @@ void QtUi::useSystemTrayChanged(const QVariant &v) } } - bool QtUi::haveSystemTray() { return mainWindow()->systemTray()->isSystemTrayAvailable() && instance()->_useSystemTray; } - bool QtUi::isHidingMainWidgetAllowed() const { return haveSystemTray(); } - void QtUi::minimizeRestore(bool show) { - SystemTray *tray = mainWindow()->systemTray(); + SystemTray* tray = mainWindow()->systemTray(); if (show) { if (tray && !_useSystemTray) tray->setVisible(false); @@ -165,80 +151,73 @@ void QtUi::minimizeRestore(bool show) GraphicalUi::minimizeRestore(show); } - -void QtUi::registerNotificationBackend(AbstractNotificationBackend *backend) +void QtUi::registerNotificationBackend(AbstractNotificationBackend* backend) { if (!_notificationBackends.contains(backend)) { _notificationBackends.append(backend); - instance()->connect(backend, SIGNAL(activated(uint)), SLOT(notificationActivated(uint))); + connect(backend, &AbstractNotificationBackend::activated, instance(), &QtUi::notificationActivated); } } - -void QtUi::unregisterNotificationBackend(AbstractNotificationBackend *backend) +void QtUi::unregisterNotificationBackend(AbstractNotificationBackend* backend) { _notificationBackends.removeAll(backend); } - void QtUi::unregisterAllNotificationBackends() { _notificationBackends.clear(); } - -const QList &QtUi::notificationBackends() +const QList& QtUi::notificationBackends() { return _notificationBackends; } - -uint QtUi::invokeNotification(BufferId bufId, AbstractNotificationBackend::NotificationType type, const QString &sender, const QString &text) +uint QtUi::invokeNotification(BufferId bufId, AbstractNotificationBackend::NotificationType type, const QString& sender, const QString& text) { static int notificationId = 0; AbstractNotificationBackend::Notification notification(++notificationId, bufId, type, sender, text); _notifications.append(notification); - foreach(AbstractNotificationBackend *backend, _notificationBackends) - backend->notify(notification); + foreach (AbstractNotificationBackend* backend, _notificationBackends) + backend->notify(notification); return notificationId; } - void QtUi::closeNotification(uint notificationId) { QList::iterator i = _notifications.begin(); while (i != _notifications.end()) { if (i->notificationId == notificationId) { - foreach(AbstractNotificationBackend *backend, _notificationBackends) - backend->close(notificationId); + foreach (AbstractNotificationBackend* backend, _notificationBackends) + backend->close(notificationId); i = _notifications.erase(i); } - else ++i; + else + ++i; } } - void QtUi::closeNotifications(BufferId bufferId) { QList::iterator i = _notifications.begin(); while (i != _notifications.end()) { if (!bufferId.isValid() || i->bufferId == bufferId) { - foreach(AbstractNotificationBackend *backend, _notificationBackends) - backend->close(i->notificationId); + foreach (AbstractNotificationBackend* backend, _notificationBackends) + backend->close(i->notificationId); i = _notifications.erase(i); } - else ++i; + else + ++i; } } - -const QList &QtUi::activeNotifications() +const QList& QtUi::activeNotifications() { return _notifications; } - void QtUi::notificationActivated(uint notificationId) { if (notificationId != 0) { @@ -258,7 +237,6 @@ void QtUi::notificationActivated(uint notificationId) activateMainWidget(); } - void QtUi::bufferMarkedAsRead(BufferId bufferId) { if (bufferId.isValid()) { @@ -266,19 +244,19 @@ void QtUi::bufferMarkedAsRead(BufferId bufferId) } } - std::vector> QtUi::availableIconThemes() const { //: Supported icon theme names - static const std::vector> supported { - { "breeze", tr("Breeze") }, - { "breeze-dark", tr("Breeze Dark") }, - { "oxygen", tr("Oxygen") } + static const std::vector> supported{{"breeze", tr("Breeze")}, + {"breeze-dark", tr("Breeze Dark")}, +#ifdef WITH_OXYGEN_ICONS + {"oxygen", tr("Oxygen")} +#endif }; std::vector> result; - for (auto &&themePair : supported) { - for (auto &&dir : QIcon::themeSearchPaths()) { + for (auto&& themePair : supported) { + for (auto&& dir : QIcon::themeSearchPaths()) { if (QFileInfo{dir + "/" + themePair.first + "/index.theme"}.exists()) { result.push_back(themePair); break; @@ -289,19 +267,17 @@ std::vector> QtUi::availableIconThemes() const return result; } - QString QtUi::systemIconTheme() const { return _systemIconTheme; } - void QtUi::setupIconTheme() { // Add paths to our own icon sets to the theme search paths QStringList themePaths = QIcon::themeSearchPaths(); themePaths.removeAll(":/icons"); // this should come last - for (auto &&dataDir : Quassel::dataDirPaths()) { + for (auto&& dataDir : Quassel::dataDirPaths()) { QString iconDir{dataDir + "icons"}; if (QFileInfo{iconDir}.isDir()) { themePaths << iconDir; @@ -313,12 +289,11 @@ void QtUi::setupIconTheme() refreshIconTheme(); } - void QtUi::refreshIconTheme() { // List of available fallback themes QStringList availableThemes; - for (auto &&themePair : availableIconThemes()) { + for (auto&& themePair : availableIconThemes()) { availableThemes << themePair.first; } @@ -326,7 +301,8 @@ void QtUi::refreshIconTheme() // We could probably introduce a more sophisticated fallback handling, such as putting the "most important" icons into hicolor, // but this just gets complex for no good reason. We really rely on a supported theme to be installed, if not system-wide, then // as part of the Quassel installation (which is enabled by default anyway). - qWarning() << tr("No supported icon theme installed, you'll lack icons! Supported are the KDE/Plasma themes Breeze, Breeze Dark and Oxygen."); + qWarning() << tr( + "No supported icon theme installed, you'll lack icons! Supported are the KDE/Plasma themes Breeze, Breeze Dark and Oxygen."); return; } @@ -342,14 +318,13 @@ void QtUi::refreshIconTheme() } } - if (_systemIconTheme.isEmpty() || _systemIconTheme == fallbackTheme || s.value("Icons/OverrideSystemTheme", false).toBool()) { + if (_systemIconTheme.isEmpty() || _systemIconTheme == fallbackTheme || s.value("Icons/OverrideSystemTheme", true).toBool()) { // We have a valid fallback theme and want to override the system theme (if it's even defined), so we're basically done QIcon::setThemeName(fallbackTheme); emit iconThemeRefreshed(); return; } -#if QT_VERSION >= 0x050000 // At this point, we have a system theme that we don't want to override, but that may not contain all // required icons. // We create a dummy theme that inherits first from the system theme, then from the supported fallback. @@ -358,7 +333,7 @@ void QtUi::refreshIconTheme() // Since we can't get notified when the system theme changes, this means that a restart may be required // to apply a theme change... but you can't have everything, I guess. if (!_dummyThemeDir) { - _dummyThemeDir.reset(new QTemporaryDir{}); + _dummyThemeDir = std::make_unique(); if (!_dummyThemeDir->isValid() || !QDir{_dummyThemeDir->path()}.mkpath("icons/quassel-icon-proxy/apps/32")) { qWarning() << "Could not create temporary directory for proxying the system icon theme, using fallback"; QIcon::setThemeName(fallbackTheme); @@ -376,7 +351,7 @@ void QtUi::refreshIconTheme() } QFile indexFile{_dummyThemeDir->path() + "/icons/quassel-icon-proxy/index.theme"}; - if (!indexFile.open(QFile::WriteOnly|QFile::Truncate)) { + if (!indexFile.open(QFile::WriteOnly | QFile::Truncate)) { qWarning() << "Could not create index file for proxying the system icon theme, using fallback"; QIcon::setThemeName(fallbackTheme); emit iconThemeRefreshed(); @@ -384,13 +359,12 @@ void QtUi::refreshIconTheme() } // Write a dummy index file that is sufficient to make QIconLoader happy - auto indexContents = QString{ - "[Icon Theme]\n" - "Name=quassel-icon-proxy\n" - "Inherits=%1,%2\n" - "Directories=apps/32\n" - "[apps/32]\nSize=32\nType=Fixed\n" - }.arg(_systemIconTheme, fallbackTheme); + auto indexContents = QString{"[Icon Theme]\n" + "Name=quassel-icon-proxy\n" + "Inherits=%1,%2\n" + "Directories=apps/32\n" + "[apps/32]\nSize=32\nType=Fixed\n"} + .arg(_systemIconTheme, fallbackTheme); if (indexFile.write(indexContents.toLatin1()) < 0) { qWarning() << "Could not write index file for proxying the system icon theme, using fallback"; QIcon::setThemeName(fallbackTheme); @@ -399,10 +373,4 @@ void QtUi::refreshIconTheme() } indexFile.close(); QIcon::setThemeName("quassel-icon-proxy"); -#else - // Qt4 doesn't support QTemporaryDir. Since it's deprecated and slated to be removed soon anyway, we don't bother - // writing a replacement and simply don't support not overriding the system theme. - QIcon::setThemeName(fallbackTheme); - emit iconThemeRefreshed(); -#endif }