/***************************************************************************
- * Copyright (C) 2005-08 by the Quassel IRC Team *
+ * Copyright (C) 2005-09 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+#ifndef HAVE_KDE
+
+#include <QCoreApplication>
#include <QDebug>
#include <QDir>
#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(':');
+ QStringList dataDirNames = dataDirPaths();
// System theme in $data/icons/$theme
foreach(QString dir, dataDirNames) {
_themedIconDirNames.append(path);
}
// Resource for system theme :/icons/$theme
- path = QString(":/icons/%2");
+ path = QString(":/icons/%1").arg(theme);
if(QFile::exists(path))
_themedIconDirNames.append(path);
// Own icons in $data/apps/quassel/icons/hicolor
// Also, plain icon dirs $data/apps/quassel/pics
foreach(QString dir, dataDirNames) {
- path = QString("%1/apps/quassel/icons/hicolor").arg(dir);
+ path = QString("%1/icons/hicolor").arg(dir);
if(QFile::exists(path))
_themedIconDirNames.append(path);
path = QString("%1/apps/quassel/pics").arg(dir);
if(QFile::exists(path)) return path;
}
+ qWarning() << "Icon not found:" << name << size;
return QString();
}
IconLoader *loader = IconLoader::global();
return loader->loadIcon(name, IconLoader::Small, force_size);
}
+
+#endif