diff options
| author | Sky <git@bunnies.cc> | 2014-01-02 10:16:25 -0800 |
|---|---|---|
| committer | Sky <git@bunnies.cc> | 2014-01-02 10:16:25 -0800 |
| commit | aa5f2c8120cc23de0d57c9f0280512adb9a531b3 (patch) | |
| tree | dc9fca4f81f3fbcd607c35ac935d7dd1a7819a69 | |
| parent | c85789e249056f5496bb13ed6f85f894ab0682dd (diff) | |
| parent | c0b6fd0647fe90084f3d2750cb26e3b9cb611266 (diff) | |
| download | MultiMC-aa5f2c8120cc23de0d57c9f0280512adb9a531b3.tar MultiMC-aa5f2c8120cc23de0d57c9f0280512adb9a531b3.tar.gz MultiMC-aa5f2c8120cc23de0d57c9f0280512adb9a531b3.tar.lz MultiMC-aa5f2c8120cc23de0d57c9f0280512adb9a531b3.tar.xz MultiMC-aa5f2c8120cc23de0d57c9f0280512adb9a531b3.zip | |
Merge pull request #32 from 02JanDal/feature_ico_icons
Make .ico files usable (the plugin is already included)
| -rw-r--r-- | gui/dialogs/IconPickerDialog.cpp | 2 | ||||
| -rw-r--r-- | logic/icons/IconList.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gui/dialogs/IconPickerDialog.cpp b/gui/dialogs/IconPickerDialog.cpp index cb832d95..f7970b37 100644 --- a/gui/dialogs/IconPickerDialog.cpp +++ b/gui/dialogs/IconPickerDialog.cpp @@ -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); } diff --git a/logic/icons/IconList.cpp b/logic/icons/IconList.cpp index 3a745662..cda2db7b 100644 --- a/logic/icons/IconList.cpp +++ b/logic/icons/IconList.cpp @@ -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"
\ No newline at end of file +//#include "IconList.moc" |