iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow sub-categories (first level only) to also have icons.

Browse Source
This commit is contained in:
craig.p.drummond
2013-08-29 18:26:14 +00:00
parent e5659490cc
commit eea89729f5
4 changed files with 46 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
streams/streamssettings.cpp
View File

@@ -156,7 +156,8 @@ void StreamsSettings::install()
}
QMap<QString, QByteArray> files=tar.extract(QStringList() << StreamsModel::constXmlFile << StreamsModel::constCompressedXmlFile
<< StreamsModel::constPngIcon << StreamsModel::constSvgIcon);
<< StreamsModel::constPngIcon << StreamsModel::constSvgIcon
<< ".png" << ".svg");
QString streamsName=files.contains(StreamsModel::constCompressedXmlFile) ? StreamsModel::constCompressedXmlFile : StreamsModel::constXmlFile;
QString iconName=files.contains(StreamsModel::constSvgIcon) ? StreamsModel::constSvgIcon : StreamsModel::constPngIcon;
QByteArray xml=files[streamsName];
@@ -188,6 +189,18 @@ void StreamsSettings::install()
QIcon icn;
icn.addFile(dir+"/"+iconName);
// Write all other png and svg files...
QMap<QString, QByteArray>::ConstIterator it=files.constBegin();
QMap<QString, QByteArray>::ConstIterator end=files.constEnd();
for (; it!=end; ++it) {
if (it.key()!=iconName && (it.key().endsWith(".png") || it.key().endsWith(".svg"))) {
QFile f(dir+"/"+it.key());
if (f.open(QIODevice::WriteOnly)) {
f.write(it.value());
}
}
}
StreamsModel::CategoryItem *cat=StreamsModel::self()->addXmlCategory(name, icn, dir+"/"+streamsName, true);
if (existing) {
delete existing;