diff options
| author | Forkk <forkk@forkk.net> | 2014-01-02 13:38:20 -0600 |
|---|---|---|
| committer | Forkk <forkk@forkk.net> | 2014-01-02 13:38:20 -0600 |
| commit | 17f1864a71b69b9df14d8e06ed48a65e678d09c9 (patch) | |
| tree | 4d98a2b3493a26017150d6ba8c5ae0419de3de7d /gui/dialogs/IconPickerDialog.cpp | |
| parent | 4495e20cd7f7f2ab062f3b60f19ac4b79f32c350 (diff) | |
| parent | aa5f2c8120cc23de0d57c9f0280512adb9a531b3 (diff) | |
| download | MultiMC-17f1864a71b69b9df14d8e06ed48a65e678d09c9.tar MultiMC-17f1864a71b69b9df14d8e06ed48a65e678d09c9.tar.gz MultiMC-17f1864a71b69b9df14d8e06ed48a65e678d09c9.tar.lz MultiMC-17f1864a71b69b9df14d8e06ed48a65e678d09c9.tar.xz MultiMC-17f1864a71b69b9df14d8e06ed48a65e678d09c9.zip | |
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news
Conflicts:
CMakeLists.txt
gui/MainWindow.h
Diffstat (limited to 'gui/dialogs/IconPickerDialog.cpp')
| -rw-r--r-- | gui/dialogs/IconPickerDialog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gui/dialogs/IconPickerDialog.cpp b/gui/dialogs/IconPickerDialog.cpp index 99d6dc9a..f7970b37 100644 --- a/gui/dialogs/IconPickerDialog.cpp +++ b/gui/dialogs/IconPickerDialog.cpp @@ -25,7 +25,7 @@ #include "gui/Platform.h" #include "gui/widgets/InstanceDelegate.h" -#include "logic/lists/IconList.h" +#include "logic/icons/IconList.h" IconPickerDialog::IconPickerDialog(QWidget *parent) : QDialog(parent), ui(new Ui::IconPickerDialog) @@ -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); } |