mirror/MultiMC5
1
0
Fork 0
mirror of https://github.com/MultiMC/MultiMC5.git synced 2024-12-28 06:18:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #32 from 02JanDal/feature_ico_icons

Browse Source 
Make .ico files usable (the plugin is already included)
This commit is contained in:
Sky 2014-01-02 10:16:25 -08:00
commit aa5f2c8120
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gui/dialogs/IconPickerDialog.cpp
View File

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

4
logic/icons/IconList.cpp
View File

@ -258,7 +258,7 @@ void IconList::installIcons(QStringList iconFiles)
QString target = PathCombine("icons", fileinfo.fileName());
QString suffix = fileinfo.suffix();
if (suffix != "jpeg" && suffix != "png" && suffix != "jpg")
if (suffix != "jpeg" && suffix != "png" && suffix != "jpg" && suffix != "ico")
continue;
if (!QFile::copy(file, target))
@ -348,4 +348,4 @@ int IconList::getIconIndex(QString key)
return -1;
}
//#include "IconList.moc"
//#include "IconList.moc"