projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add Quassel::scriptDirPaths() to get a list of locations we look for scripts in
[quassel.git]
/
src
/
common
/
quassel.cpp
diff --git
a/src/common/quassel.cpp
b/src/common/quassel.cpp
index
35c674b
..
08652ab
100644
(file)
--- a/
src/common/quassel.cpp
+++ b/
src/common/quassel.cpp
@@
-60,7
+60,6
@@
Quassel::Quassel() {
signal(SIGBUS, handleSignal);
# endif
#endif
signal(SIGBUS, handleSignal);
# endif
#endif
-
}
Quassel::~Quassel() {
}
Quassel::~Quassel() {
@@
-219,7
+218,8
@@
void Quassel::logFatalMessage(const char *msg) {
const QString &Quassel::coreDumpFileName() {
if(_coreDumpFileName.isEmpty()) {
const QString &Quassel::coreDumpFileName() {
if(_coreDumpFileName.isEmpty()) {
- _coreDumpFileName = QString("Quassel-Crash-%1.log").arg(QDateTime::currentDateTime().toString("yyyyMMdd-hhmm"));
+ QDir configDir(configDirPath());
+ _coreDumpFileName = configDir.absoluteFilePath(QString("Quassel-Crash-%1.log").arg(QDateTime::currentDateTime().toString("yyyyMMdd-hhmm")));
QFile dumpFile(_coreDumpFileName);
dumpFile.open(QIODevice::Append);
QTextStream dumpStream(&dumpFile);
QFile dumpFile(_coreDumpFileName);
dumpFile.open(QIODevice::Append);
QTextStream dumpStream(&dumpFile);
@@
-336,10
+336,17
@@
QString Quassel::findDataFilePath(const QString &fileName) {
return QString();
}
return QString();
}
-void Quassel::loadTranslation(const QLocale &locale) {
+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.
if(_translationDirPath.isEmpty()) {
// We support only one translation dir; fallback mechanisms wouldn't work else.
- // This means that if we have a $data/
i18n
dir, the internal :/i18n resource won't be considered.
+ // This means that if we have a $data/
translations
dir, the internal :/i18n resource won't be considered.
foreach(const QString &dir, dataDirPaths()) {
if(QFile::exists(dir + "translations/")) {
_translationDirPath = dir + "translations/";
foreach(const QString &dir, dataDirPaths()) {
if(QFile::exists(dir + "translations/")) {
_translationDirPath = dir + "translations/";
@@
-349,7
+356,10
@@
void Quassel::loadTranslation(const QLocale &locale) {
if(_translationDirPath.isEmpty())
_translationDirPath = ":/i18n/";
}
if(_translationDirPath.isEmpty())
_translationDirPath = ":/i18n/";
}
+ return _translationDirPath;
+}
+void Quassel::loadTranslation(const QLocale &locale) {
QTranslator *qtTranslator = QCoreApplication::instance()->findChild<QTranslator *>("QtTr");
QTranslator *quasselTranslator = QCoreApplication::instance()->findChild<QTranslator *>("QuasselTr");
QTranslator *qtTranslator = QCoreApplication::instance()->findChild<QTranslator *>("QtTr");
QTranslator *quasselTranslator = QCoreApplication::instance()->findChild<QTranslator *>("QuasselTr");
@@
-369,8
+379,8
@@
void Quassel::loadTranslation(const QLocale &locale) {
if(locale.language() == QLocale::C)
return;
if(locale.language() == QLocale::C)
return;
- bool success = qtTranslator->load(QString("qt_%1").arg(locale.name()),
_translationDirPath
);
+ bool success = qtTranslator->load(QString("qt_%1").arg(locale.name()),
translationDirPath()
);
if(!success)
qtTranslator->load(QString("qt_%1").arg(locale.name()), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
if(!success)
qtTranslator->load(QString("qt_%1").arg(locale.name()), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
- quasselTranslator->load(QString("quassel_%1").arg(locale.name()),
_translationDirPath
);
+ quasselTranslator->load(QString("quassel_%1").arg(locale.name()),
translationDirPath()
);
}
}