projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use Qt's native icon theme support rather than our own
[quassel.git]
/
src
/
qtui
/
qtuiapplication.cpp
diff --git
a/src/qtui/qtuiapplication.cpp
b/src/qtui/qtuiapplication.cpp
index
e13fa0f
..
5bf11bb
100644
(file)
--- a/
src/qtui/qtuiapplication.cpp
+++ b/
src/qtui/qtuiapplication.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
3
by the Quassel Project *
+ * Copyright (C) 2005-201
4
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-20,6
+20,7
@@
#include "qtuiapplication.h"
#include "qtuiapplication.h"
+#include <QIcon>
#include <QStringList>
#ifdef HAVE_KDE
#include <QStringList>
#ifdef HAVE_KDE
@@
-62,7
+63,15
@@
QtUiApplication::QtUiApplication(int &argc, char **argv)
#endif /* HAVE_KDE || Q_OS_MAC */
setRunMode(Quassel::ClientOnly);
#endif /* HAVE_KDE || Q_OS_MAC */
setRunMode(Quassel::ClientOnly);
+#if QT_VERSION < 0x050000
qInstallMsgHandler(Client::logMessage);
qInstallMsgHandler(Client::logMessage);
+#else
+ qInstallMessageHandler(Client::logMessage);
+#endif
+
+ // Some platforms don't set a default icon theme; chances are we can find our bundled Oxygen theme though
+ if (QIcon::themeName().isEmpty())
+ QIcon::setThemeName("oxygen");
}
}
@@
-71,11
+80,11
@@
bool QtUiApplication::init()
if (Quassel::init()) {
// FIXME: MIGRATION 0.3 -> 0.4: Move database and core config to new location
// Move settings, note this does not delete the old files
if (Quassel::init()) {
// FIXME: MIGRATION 0.3 -> 0.4: Move database and core config to new location
// Move settings, note this does not delete the old files
-#ifdef Q_
W
S_MAC
+#ifdef Q_
O
S_MAC
QSettings newSettings("quassel-irc.org", "quasselclient");
#else
QSettings newSettings("quassel-irc.org", "quasselclient");
#else
-# ifdef Q_
W
S_WIN
+# ifdef Q_
O
S_WIN
QSettings::Format format = QSettings::IniFormat;
# else
QSettings::Format format = QSettings::NativeFormat;
QSettings::Format format = QSettings::IniFormat;
# else
QSettings::Format format = QSettings::NativeFormat;
@@
-84,10
+93,10
@@
bool QtUiApplication::init()
QString newFilePath = Quassel::configDirPath() + "quasselclient"
+ ((format == QSettings::NativeFormat) ? QLatin1String(".conf") : QLatin1String(".ini"));
QSettings newSettings(newFilePath, format);
QString newFilePath = Quassel::configDirPath() + "quasselclient"
+ ((format == QSettings::NativeFormat) ? QLatin1String(".conf") : QLatin1String(".ini"));
QSettings newSettings(newFilePath, format);
-#endif /* Q_
W
S_MAC */
+#endif /* Q_
O
S_MAC */
if (newSettings.value("Config/Version").toUInt() == 0) {
if (newSettings.value("Config/Version").toUInt() == 0) {
-# ifdef Q_
W
S_MAC
+# ifdef Q_
O
S_MAC
QString org = "quassel-irc.org";
# else
QString org = "Quassel Project";
QString org = "quassel-irc.org";
# else
QString org = "Quassel Project";