/***************************************************************************
- * Copyright (C) 2005-09 by the Quassel Project *
+ * Copyright (C) 2005-2015 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include "qtuiapplication.h"
+#include <QIcon>
#include <QStringList>
-#ifdef HAVE_KDE
+#ifdef HAVE_KDE4
# include <KStandardDirs>
#endif
#include "client.h"
#include "cliparser.h"
+#include "mainwin.h"
#include "qtui.h"
#include "qtuisettings.h"
+
QtUiApplication::QtUiApplication(int &argc, char **argv)
-#ifdef HAVE_KDE
- : KApplication(),
+#ifdef HAVE_KDE4
+ : KApplication(), // KApplication is deprecated in KF5
#else
- : QApplication(argc, argv),
+ : QApplication(argc, argv),
#endif
Quassel(),
_aboutToQuit(false)
{
-#ifdef HAVE_KDE
- Q_UNUSED(argc); Q_UNUSED(argv);
+#ifdef HAVE_KDE4
+ Q_UNUSED(argc); Q_UNUSED(argv);
+
+ // Setup KDE's data dirs
+ // Because we can't use KDE stuff in (the class) Quassel directly, we need to do this here...
+ QStringList dataDirs = KGlobal::dirs()->findDirs("data", "");
+
+ // Just in case, also check our install prefix
+ dataDirs << QCoreApplication::applicationDirPath() + "/../share/apps/";
+
+ // Normalize and append our application name
+ for (int i = 0; i < dataDirs.count(); i++)
+ dataDirs[i] = QDir::cleanPath(dataDirs.at(i)) + "/quassel/";
+
+ // Add resource path and just in case.
+ // Workdir should have precedence
+ dataDirs.prepend(QCoreApplication::applicationDirPath() + "/data/");
+ dataDirs.append(":/data/");
+
+ // Append trailing '/' and check for existence
+ auto iter = dataDirs.begin();
+ while (iter != dataDirs.end()) {
+ if (!iter->endsWith(QDir::separator()) && !iter->endsWith('/'))
+ iter->append(QDir::separator());
+ if (!QFile::exists(*iter))
+ iter = dataDirs.erase(iter);
+ else
+ ++iter;
+ }
- // We need to setup KDE's data dirs
- QStringList dataDirs = KGlobal::dirs()->findDirs("data", "");
- for(int i = 0; i < dataDirs.count(); i++)
- dataDirs[i].append("quassel/");
- dataDirs.append(":/data/");
- setDataDirPaths(dataDirs);
+ dataDirs.removeDuplicates();
+ setDataDirPaths(dataDirs);
-#else /* HAVE_KDE */
+#else /* HAVE_KDE4 */
- setDataDirPaths(findDataDirPaths());
+ setDataDirPaths(findDataDirPaths());
-#endif /* HAVE_KDE */
+#endif /* HAVE_KDE4 */
- setRunMode(Quassel::ClientOnly);
+#if defined(HAVE_KDE4) || defined(Q_OS_MAC)
+ disableCrashhandler();
+#endif /* HAVE_KDE4 || Q_OS_MAC */
+ setRunMode(Quassel::ClientOnly);
- qInstallMsgHandler(Client::logMessage);
+#if QT_VERSION < 0x050000
+ qInstallMsgHandler(Client::logMessage);
+#else
+ qInstallMessageHandler(Client::logMessage);
+#endif
}
-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
-#ifdef Q_WS_MAC
- QSettings newSettings("quassel-irc.org", "quasselclient");
+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
+#ifdef Q_OS_MAC
+ QSettings newSettings("quassel-irc.org", "quasselclient");
#else
-# ifdef Q_WS_WIN
- QSettings::Format format = QSettings::IniFormat;
+# ifdef Q_OS_WIN
+ QSettings::Format format = QSettings::IniFormat;
# else
- QSettings::Format format = QSettings::NativeFormat;
+ QSettings::Format format = QSettings::NativeFormat;
# endif
- QString newFilePath = Quassel::configDirPath() + "quasselclient"
- + ((format == QSettings::NativeFormat) ? QLatin1String(".conf") : QLatin1String(".ini"));
- QSettings newSettings(newFilePath, format);
-#endif /* Q_WS_MAC */
+ QString newFilePath = Quassel::configDirPath() + "quasselclient"
+ + ((format == QSettings::NativeFormat) ? QLatin1String(".conf") : QLatin1String(".ini"));
+ QSettings newSettings(newFilePath, format);
+#endif /* Q_OS_MAC */
- if(newSettings.value("Config/Version").toUInt() == 0) {
-# ifdef Q_WS_MAC
- QString org = "quassel-irc.org";
+ if (newSettings.value("Config/Version").toUInt() == 0) {
+# ifdef Q_OS_MAC
+ QString org = "quassel-irc.org";
# else
- QString org = "Quassel Project";
+ QString org = "Quassel Project";
# endif
- QSettings oldSettings(org, "Quassel Client");
- if(oldSettings.allKeys().count()) {
- qWarning() << "\n\n*** IMPORTANT: Config and data file locations have changed. Attempting to auto-migrate your client settings...";
- foreach(QString key, oldSettings.allKeys())
- newSettings.setValue(key, oldSettings.value(key));
- newSettings.setValue("Config/Version", 1);
- qWarning() << "* Your client settings have been migrated to" << newSettings.fileName();
- qWarning() << "*** Migration completed.\n\n";
- }
+ QSettings oldSettings(org, "Quassel Client");
+ if (oldSettings.allKeys().count()) {
+ qWarning() << "\n\n*** IMPORTANT: Config and data file locations have changed. Attempting to auto-migrate your client settings...";
+ foreach(QString key, oldSettings.allKeys())
+ newSettings.setValue(key, oldSettings.value(key));
+ newSettings.setValue("Config/Version", 1);
+ qWarning() << "* Your client settings have been migrated to" << newSettings.fileName();
+ qWarning() << "*** Migration completed.\n\n";
+ }
+ }
+
+ // MIGRATION end
+
+ // check settings version
+ // so far, we only have 1
+ QtUiSettings s;
+ if (s.version() != 1) {
+ qCritical() << "Invalid client settings version, terminating!";
+ return false;
+ }
+
+ // Set the icon theme
+ if (Quassel::isOptionSet("icontheme"))
+ QIcon::setThemeName(Quassel::optionValue("icontheme"));
+ else if (QIcon::themeName().isEmpty())
+ // Some platforms don't set a default icon theme; chances are we can find our bundled Oxygen theme though
+ QIcon::setThemeName("oxygen");
+
+ // session resume
+ QtUi *gui = new QtUi();
+ Client::init(gui);
+ // init gui only after the event loop has started
+ // QTimer::singleShot(0, gui, SLOT(init()));
+ gui->init();
+ resumeSessionIfPossible();
+ return true;
}
+ return false;
+}
- // MIGRATION end
-
- // check settings version
- // so far, we only have 1
- QtUiSettings s;
- if(s.version() != 1) {
- qCritical() << "Invalid client settings version, terminating!";
- return false;
- }
- // session resume
- QtUi *gui = new QtUi();
- Client::init(gui);
- // init gui only after the event loop has started
- // QTimer::singleShot(0, gui, SLOT(init()));
- gui->init();
- resumeSessionIfPossible();
- return true;
- }
- return false;
+QtUiApplication::~QtUiApplication()
+{
+ Client::destroy();
}
-QtUiApplication::~QtUiApplication() {
- Client::destroy();
-}
-void QtUiApplication::commitData(QSessionManager &manager) {
- Q_UNUSED(manager)
- _aboutToQuit = true;
+void QtUiApplication::quit()
+{
+ QtUi::mainWindow()->quit();
}
-void QtUiApplication::saveState(QSessionManager & manager) {
- //qDebug() << QString("saving session state to id %1").arg(manager.sessionId());
- AccountId activeCore = Client::currentCoreAccount();
- SessionSettings s(manager.sessionId());
- s.setSessionAge(0);
- emit saveStateToSession(manager.sessionId());
- emit saveStateToSessionSettings(s);
+
+void QtUiApplication::commitData(QSessionManager &manager)
+{
+ Q_UNUSED(manager)
+ _aboutToQuit = true;
}
-void QtUiApplication::resumeSessionIfPossible() {
- // load all sessions
- if(isSessionRestored()) {
- qDebug() << QString("restoring from session %1").arg(sessionId());
- SessionSettings s(sessionId());
- s.sessionAging();
+
+void QtUiApplication::saveState(QSessionManager &manager)
+{
+ //qDebug() << QString("saving session state to id %1").arg(manager.sessionId());
+ // AccountId activeCore = Client::currentCoreAccount().accountId(); // FIXME store this!
+ SessionSettings s(manager.sessionId());
s.setSessionAge(0);
- emit resumeFromSession(sessionId());
- emit resumeFromSessionSettings(s);
- s.cleanup();
- } else {
- SessionSettings s(QString("1"));
- s.sessionAging();
- s.cleanup();
- }
+ QtUi::mainWindow()->saveStateToSettings(s);
+}
+
+
+void QtUiApplication::resumeSessionIfPossible()
+{
+ // load all sessions
+ if (isSessionRestored()) {
+ qDebug() << QString("restoring from session %1").arg(sessionId());
+ SessionSettings s(sessionId());
+ s.sessionAging();
+ s.setSessionAge(0);
+ QtUi::mainWindow()->restoreStateFromSettings(s);
+ s.cleanup();
+ }
+ else {
+ SessionSettings s(QString("1"));
+ s.sessionAging();
+ s.cleanup();
+ }
}
projects / quassel.git / blobdiff