#include "buffermodel.h"
#include "chatlinemodel.h"
#include "contextmenuactionprovider.h"
+#include "icon.h"
#include "mainwin.h"
#include "qtuimessageprocessor.h"
#include "qtuisettings.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(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.reset(new MainWin()); // TODO C++14: std::make_unique
+ setMainWidget(_mainWin.get());
+
+ connect(_mainWin.get(), SIGNAL(connectToCore(const QVariantMap &)), this, SIGNAL(connectToCore(const QVariantMap &)));
+ connect(_mainWin.get(), SIGNAL(disconnectFromCore()), this, SIGNAL(disconnectFromCore()));
+ connect(Client::instance(), SIGNAL(bufferMarkedAsRead(BufferId)), SLOT(closeNotifications(BufferId)));
+
_mainWin->init();
+
QtUiSettings uiSettings;
uiSettings.initAndNotify("UseSystemTrayIcon", this, SLOT(useSystemTrayChanged(QVariant)), true);
static const std::vector<std::pair<QString, QString>> supported {
{ "breeze", tr("Breeze") },
{ "breeze-dark", tr("Breeze Dark") },
+#ifdef WITH_OXYGEN_ICONS
{ "oxygen", tr("Oxygen") }
+#endif
};
std::vector<std::pair<QString, QString>> result;
}
}
- 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();