#include <QFileInfo>
#include <QIcon>
#include <QStringList>
+#include <memory>
#include "abstractnotificationbackend.h"
#include "buffermodel.h"
#include "types.h"
#include "util.h"
-QtUi *QtUi::_instance = nullptr;
-MainWin *QtUi::_mainWin = nullptr;
QList<AbstractNotificationBackend *> QtUi::_notificationBackends;
QList<AbstractNotificationBackend::Notification> QtUi::_notifications;
+
+QtUi *QtUi::instance()
+{
+ return static_cast<QtUi*>(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<QLocale>());
if (Quassel::isOptionSet("icontheme")) {
_systemIconTheme = Quassel::optionValue("icontheme");
QIcon::setThemeName(_systemIconTheme);
}
-
- QtUiSettings uiSettings;
- Quassel::loadTranslation(uiSettings.value("Locale", QLocale::system()).value<QLocale>());
-
setupIconTheme();
-
QApplication::setWindowIcon(icon::get("quassel"));
- setContextMenuActionProvider(new ContextMenuActionProvider(this));
- setToolBarActionProvider(new ToolBarActionProvider(this));
-
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<MainWin>();
+ 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);
{
if (!_notificationBackends.contains(backend)) {
_notificationBackends.append(backend);
- instance()->connect(backend, SIGNAL(activated(uint)), SLOT(notificationActivated(uint)));
+ connect(backend, &AbstractNotificationBackend::activated, instance(), &QtUi::notificationActivated);
}
}
static const std::vector<std::pair<QString, QString>> supported {
{ "breeze", tr("Breeze") },
{ "breeze-dark", tr("Breeze Dark") },
-#ifdef WITH_OYGEN_ICONS
+#ifdef WITH_OXYGEN_ICONS
{ "oxygen", tr("Oxygen") }
#endif
};
}
}
- 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.
// 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<QTemporaryDir>();
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);
}
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
}