Also we move finding those directories out of iconloader.cpp into util.cpp such that we
can reuse that elsewhere.
Oh, and we make IconLoader spit out a warning if an icon isn't found now, as sometimes icons
change names upstream.
#include <QCoreApplication>
#include <QDebug>
+#include <QFile>
#include <QLibraryInfo>
#include <QTextCodec>
#include <QTranslator>
return qDir;
}
+QStringList dataDirPaths() {
+ QStringList dataDirNames = QString(qgetenv("XDG_DATA_DIRS")).split(':', QString::SkipEmptyParts);
+
+ // Provide a fallback
+# ifdef Q_OS_UNIX
+ if(dataDirNames.isEmpty()) dataDirNames.append("/usr/share");
+ // on UNIX, we always check our install prefix
+ QString appDir = QCoreApplication::applicationDirPath();
+ int binpos = appDir.lastIndexOf("/bin");
+ if(binpos >= 0) {
+ appDir.replace(binpos, 4, "/share");
+ if(!dataDirNames.contains(appDir)) dataDirNames.append(appDir);
+ }
+# endif
+
+ return dataDirNames;
+}
+
+QString findDataFilePath(const QString &fileName) {
+ QStringList dataDirs = dataDirPaths();
+ foreach(QString dataDir, dataDirs) {
+ QString path = dataDir + "/apps/quassel/" + fileName;
+ if(QFile::exists(path))
+ return path;
+ }
+ return QString();
+}
+
void loadTranslation(const QLocale &locale) {
QTranslator *qtTranslator = QCoreApplication::instance()->findChild<QTranslator *>("QtTr");
QTranslator *quasselTranslator = QCoreApplication::instance()->findChild<QTranslator *>("QuasselTr");
QDir quasselDir();
+//! Returns a list of data directory paths
+/** There are several locations for applications to install their data files in. On Unix,
+ * a common location is /usr/share; others include $PREFIX/share and additional directories
+ * specified in the env variable XDG_DATA_DIRS.
+ * \return A list of directory paths to look for data files in
+ */
+QStringList dataDirPaths();
+
+//! Searches for a data file in the possible data directories
+/** Data files can reside in $DATA_DIR/apps/quassel, where $DATA_DIR is one of the directories
+ * returned by \sa dataDirPaths().
+ * \return The full path to the data file if found; a null QString else
+ */
+QString findDataFilePath(const QString &fileName);
+
void loadTranslation(const QLocale &locale);
template<typename T>
#include <QFile>
#include "iconloader.h"
+#include "util.h"
IconLoader IconLoader::_iconLoader;
int IconLoader::_groupSize[] = { 48, 22, 22, 16, 32, 22 }; // default sizes taken from Oxygen
_themedIconDirNames.clear();
_plainIconDirNames.clear();
QString path;
- QStringList dataDirNames = QString(qgetenv("XDG_DATA_DIRS")).split(':', QString::SkipEmptyParts);
-
-// Provide a fallback
-# ifdef Q_OS_UNIX
- if(dataDirNames.isEmpty()) dataDirNames.append("/usr/share");
- // on UNIX, we always check our install prefix
- QString appDir = QCoreApplication::applicationDirPath();
- int binpos = appDir.lastIndexOf("/bin");
- if(binpos >= 0) {
- appDir.replace(binpos, 4, "/share");
- if(!dataDirNames.contains(appDir)) dataDirNames.append(appDir);
- }
-# endif
+ QStringList dataDirNames = dataDirPaths();
// System theme in $data/icons/$theme
foreach(QString dir, dataDirNames) {
if(QFile::exists(path)) return path;
}
+ qWarning() << "Icon not found:" << name << size;
return QString();
}