summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2018-10-31 21:54:22 +0100
committerPetr Mrázek <peterix@gmail.com>2018-10-31 21:54:22 +0100
commitaef0ccb1a25ff9989256796dcb5264ff936f81b7 (patch)
tree2635bf6feabddbd4081176b818b6ad8280a68a4e
parentd9c1fc09e7432cfc962ef369b293df791c9c0a7b (diff)
downloadMultiMC-aef0ccb1a25ff9989256796dcb5264ff936f81b7.tar
MultiMC-aef0ccb1a25ff9989256796dcb5264ff936f81b7.tar.gz
MultiMC-aef0ccb1a25ff9989256796dcb5264ff936f81b7.tar.lz
MultiMC-aef0ccb1a25ff9989256796dcb5264ff936f81b7.tar.xz
MultiMC-aef0ccb1a25ff9989256796dcb5264ff936f81b7.zip
GH-2232 add gif icon support (not animated)
-rw-r--r--api/gui/icons/IconList.cpp2
-rw-r--r--application/dialogs/IconPickerDialog.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/api/gui/icons/IconList.cpp b/api/gui/icons/IconList.cpp
index 870b347e..5bf5f5e7 100644
--- a/api/gui/icons/IconList.cpp
+++ b/api/gui/icons/IconList.cpp
@@ -261,7 +261,7 @@ void IconList::installIcons(const QStringList &iconFiles)
QString target = FS::PathCombine(m_dir.dirName(), fileinfo.fileName());
QString suffix = fileinfo.suffix();
- if (suffix != "jpeg" && suffix != "png" && suffix != "jpg" && suffix != "ico" && suffix != "svg")
+ if (suffix != "jpeg" && suffix != "png" && suffix != "jpg" && suffix != "ico" && suffix != "svg" && suffix != "gif")
continue;
if (!QFile::copy(file, target))
diff --git a/application/dialogs/IconPickerDialog.cpp b/application/dialogs/IconPickerDialog.cpp
index 2306bad0..b4260861 100644
--- a/application/dialogs/IconPickerDialog.cpp
+++ b/application/dialogs/IconPickerDialog.cpp
@@ -104,7 +104,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 *.ico *.svg)");
+ tr("Icons") + "(*.png *.jpg *.jpeg *.ico *.svg *.gif)");
MMC->icons()->installIcons(fileNames);
}