#include "buffermodel.h"
#include "chatlinemodel.h"
#include "contextmenuactionprovider.h"
+#include "icon.h"
#include "mainwin.h"
#include "qtuimessageprocessor.h"
#include "qtuisettings.h"
setupIconTheme();
- QApplication::setWindowIcon(QIcon::fromTheme("quassel"));
+ QApplication::setWindowIcon(icon::get("quassel"));
setContextMenuActionProvider(new ContextMenuActionProvider(this));
setToolBarActionProvider(new ToolBarActionProvider(this));
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;
}
+QString QtUi::systemIconTheme() const
+{
+ return _systemIconTheme;
+}
+
+
void QtUi::setupIconTheme()
{
// Add paths to our own icon sets to the theme search paths
}
}
- 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();