projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix issues with AppearanceSettingsPage
[quassel.git]
/
src
/
common
/
quassel.cpp
diff --git
a/src/common/quassel.cpp
b/src/common/quassel.cpp
index
50651bd
..
4be4db1
100644
(file)
--- a/
src/common/quassel.cpp
+++ b/
src/common/quassel.cpp
@@
-20,6
+20,7
@@
#include "quassel.h"
#include "quassel.h"
+#include <iostream>
#include <signal.h>
#include <QCoreApplication>
#include <signal.h>
#include <QCoreApplication>
@@
-84,6
+85,11
@@
bool Quassel::init() {
return false;
}
return false;
}
+ if(isOptionSet("version")) {
+ std::cout << qPrintable("Quassel IRC: " + Quassel::buildInfo().plainVersionString) << std::endl;
+ return false;
+ }
+
DEBUG = isOptionSet("debug");
return true;
}
DEBUG = isOptionSet("debug");
return true;
}
@@
-336,6
+342,13
@@
QString Quassel::findDataFilePath(const QString &fileName) {
return QString();
}
return QString();
}
+QStringList Quassel::scriptDirPaths() {
+ QStringList res(configDirPath() + "scripts/");
+ foreach(QString path, dataDirPaths())
+ res << path + "scripts/";
+ return res;
+}
+
QString Quassel::translationDirPath() {
if(_translationDirPath.isEmpty()) {
// We support only one translation dir; fallback mechanisms wouldn't work else.
QString Quassel::translationDirPath() {
if(_translationDirPath.isEmpty()) {
// We support only one translation dir; fallback mechanisms wouldn't work else.