CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE add svg instance icon support

Browse Source
This commit is contained in:
Petr Mrázek 2017-11-14 00:16:04 +01:00
parent fede712a26
commit 322922e013
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/gui/icons/IconList.cpp
View File

@ -261,7 +261,7 @@ void IconList::installIcons(const QStringList &iconFiles)
QString target = FS::PathCombine(m_dir.dirName(), fileinfo.fileName()); QString target = FS::PathCombine(m_dir.dirName(), fileinfo.fileName());
QString suffix = fileinfo.suffix(); QString suffix = fileinfo.suffix();
if (suffix != "jpeg" && suffix != "png" && suffix != "jpg" && suffix != "ico") if (suffix != "jpeg" && suffix != "png" && suffix != "jpg" && suffix != "ico" && suffix != "svg")
continue; continue;
if (!QFile::copy(file, target)) if (!QFile::copy(file, target))
@ -331,7 +331,7 @@ bool IconList::addIcon(const QString &key, const QString &name, const QString &p
{ {
// replace the icon even? is the input valid? // replace the icon even? is the input valid?
QIcon icon(path); QIcon icon(path);
if (!icon.availableSizes().size()) if (icon.isNull())
return false; return false;
auto iter = name_index.find(key); auto iter = name_index.find(key);
if (iter != name_index.end()) if (iter != name_index.end())

2
application/dialogs/IconPickerDialog.cpp
View File

@ -101,7 +101,7 @@ void IconPickerDialog::addNewIcon()
QString selectIcons = tr("Select Icons"); QString selectIcons = tr("Select Icons");
//: The type of icon files //: The type of icon files
QStringList fileNames = QFileDialog::getOpenFileNames(this, selectIcons, QString(), QStringList fileNames = QFileDialog::getOpenFileNames(this, selectIcons, QString(),
tr("Icons") + "(*.png *.jpg *.jpeg *.ico)"); tr("Icons") + "(*.png *.jpg *.jpeg *.ico *.svg)");
MMC->icons()->installIcons(fileNames); MMC->icons()->installIcons(fileNames);
} }