1 files changed, 95 insertions, 94 deletions

diff --git a/application/dialogs/IconPickerDialog.cpp b/application/dialogs/IconPickerDialog.cpp
index 4ffd12bc..7f930717 100644
--- a/application/dialogs/IconPickerDialog.cpp
+++ b/application/dialogs/IconPickerDialog.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2013-2018 MultiMC Contributors
+/* Copyright 2013-2019 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,138 +25,139 @@
 #include "groupview/InstanceDelegate.h"
 
 #include "icons/IconList.h"
+#include "icons/IconUtils.h"
 #include <DesktopServices.h>
 
 IconPickerDialog::IconPickerDialog(QWidget *parent)
-	: QDialog(parent), ui(new Ui::IconPickerDialog)
+    : QDialog(parent), ui(new Ui::IconPickerDialog)
 {
-	ui->setupUi(this);
-	setWindowModality(Qt::WindowModal);
-
-	auto contentsWidget = ui->iconView;
-	contentsWidget->setViewMode(QListView::IconMode);
-	contentsWidget->setFlow(QListView::LeftToRight);
-	contentsWidget->setIconSize(QSize(48, 48));
-	contentsWidget->setMovement(QListView::Static);
-	contentsWidget->setResizeMode(QListView::Adjust);
-	contentsWidget->setSelectionMode(QAbstractItemView::SingleSelection);
-	contentsWidget->setSpacing(5);
-	contentsWidget->setWordWrap(false);
-	contentsWidget->setWrapping(true);
-	contentsWidget->setUniformItemSizes(true);
-	contentsWidget->setTextElideMode(Qt::ElideRight);
-	contentsWidget->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
-	contentsWidget->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
-	contentsWidget->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-	contentsWidget->setItemDelegate(new ListViewDelegate());
-
-	// contentsWidget->setAcceptDrops(true);
-	contentsWidget->setDropIndicatorShown(true);
-	contentsWidget->viewport()->setAcceptDrops(true);
-	contentsWidget->setDragDropMode(QAbstractItemView::DropOnly);
-	contentsWidget->setDefaultDropAction(Qt::CopyAction);
-
-	contentsWidget->installEventFilter(this);
-
-	contentsWidget->setModel(MMC->icons().get());
-
-	// NOTE: ResetRole forces the button to be on the left, while the OK/Cancel ones are on the right. We win.
-	auto buttonAdd = ui->buttonBox->addButton(tr("Add Icon"), QDialogButtonBox::ResetRole);
-	auto buttonRemove = ui->buttonBox->addButton(tr("Remove Icon"), QDialogButtonBox::ResetRole);
-
-	connect(buttonAdd, SIGNAL(clicked(bool)), SLOT(addNewIcon()));
-	connect(buttonRemove, SIGNAL(clicked(bool)), SLOT(removeSelectedIcon()));
-
-	connect(contentsWidget, SIGNAL(doubleClicked(QModelIndex)), SLOT(activated(QModelIndex)));
-
-	connect(contentsWidget->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), SLOT(selectionChanged(QItemSelection, QItemSelection)));
-
-	auto buttonFolder = ui->buttonBox->addButton(tr("Open Folder"), QDialogButtonBox::ResetRole);
-	connect(buttonFolder, &QPushButton::clicked, this, &IconPickerDialog::openFolder);
+    ui->setupUi(this);
+    setWindowModality(Qt::WindowModal);
+
+    auto contentsWidget = ui->iconView;
+    contentsWidget->setViewMode(QListView::IconMode);
+    contentsWidget->setFlow(QListView::LeftToRight);
+    contentsWidget->setIconSize(QSize(48, 48));
+    contentsWidget->setMovement(QListView::Static);
+    contentsWidget->setResizeMode(QListView::Adjust);
+    contentsWidget->setSelectionMode(QAbstractItemView::SingleSelection);
+    contentsWidget->setSpacing(5);
+    contentsWidget->setWordWrap(false);
+    contentsWidget->setWrapping(true);
+    contentsWidget->setUniformItemSizes(true);
+    contentsWidget->setTextElideMode(Qt::ElideRight);
+    contentsWidget->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
+    contentsWidget->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
+    contentsWidget->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    contentsWidget->setItemDelegate(new ListViewDelegate());
+
+    // contentsWidget->setAcceptDrops(true);
+    contentsWidget->setDropIndicatorShown(true);
+    contentsWidget->viewport()->setAcceptDrops(true);
+    contentsWidget->setDragDropMode(QAbstractItemView::DropOnly);
+    contentsWidget->setDefaultDropAction(Qt::CopyAction);
+
+    contentsWidget->installEventFilter(this);
+
+    contentsWidget->setModel(MMC->icons().get());
+
+    // NOTE: ResetRole forces the button to be on the left, while the OK/Cancel ones are on the right. We win.
+    auto buttonAdd = ui->buttonBox->addButton(tr("Add Icon"), QDialogButtonBox::ResetRole);
+    auto buttonRemove = ui->buttonBox->addButton(tr("Remove Icon"), QDialogButtonBox::ResetRole);
+
+    connect(buttonAdd, SIGNAL(clicked(bool)), SLOT(addNewIcon()));
+    connect(buttonRemove, SIGNAL(clicked(bool)), SLOT(removeSelectedIcon()));
+
+    connect(contentsWidget, SIGNAL(doubleClicked(QModelIndex)), SLOT(activated(QModelIndex)));
+
+    connect(contentsWidget->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), SLOT(selectionChanged(QItemSelection, QItemSelection)));
+
+    auto buttonFolder = ui->buttonBox->addButton(tr("Open Folder"), QDialogButtonBox::ResetRole);
+    connect(buttonFolder, &QPushButton::clicked, this, &IconPickerDialog::openFolder);
 }
 
 bool IconPickerDialog::eventFilter(QObject *obj, QEvent *evt)
 {
-	if (obj != ui->iconView)
-		return QDialog::eventFilter(obj, evt);
-	if (evt->type() != QEvent::KeyPress)
-	{
-		return QDialog::eventFilter(obj, evt);
-	}
-	QKeyEvent *keyEvent = static_cast<QKeyEvent *>(evt);
-	switch (keyEvent->key())
-	{
-	case Qt::Key_Delete:
-		removeSelectedIcon();
-		return true;
-	case Qt::Key_Plus:
-		addNewIcon();
-		return true;
-	default:
-		break;
-	}
-	return QDialog::eventFilter(obj, evt);
+    if (obj != ui->iconView)
+        return QDialog::eventFilter(obj, evt);
+    if (evt->type() != QEvent::KeyPress)
+    {
+        return QDialog::eventFilter(obj, evt);
+    }
+    QKeyEvent *keyEvent = static_cast<QKeyEvent *>(evt);
+    switch (keyEvent->key())
+    {
+    case Qt::Key_Delete:
+        removeSelectedIcon();
+        return true;
+    case Qt::Key_Plus:
+        addNewIcon();
+        return true;
+    default:
+        break;
+    }
+    return QDialog::eventFilter(obj, evt);
 }
 
 void IconPickerDialog::addNewIcon()
 {
-	//: The title of the select icons open file dialog
-	QString selectIcons = tr("Select Icons");
-	//: The type of icon files
-	QStringList fileNames = QFileDialog::getOpenFileNames(this, selectIcons, QString(),
-														  tr("Icons") + "(*.png *.jpg *.jpeg *.ico *.svg)");
-	MMC->icons()->installIcons(fileNames);
+    //: The title of the select icons open file dialog
+    QString selectIcons = tr("Select Icons");
+    //: The type of icon files
+    auto filter = IconUtils::getIconFilter();
+    QStringList fileNames = QFileDialog::getOpenFileNames(this, selectIcons, QString(), tr("Icons %1").arg(filter));
+    MMC->icons()->installIcons(fileNames);
 }
 
 void IconPickerDialog::removeSelectedIcon()
 {
-	MMC->icons()->deleteIcon(selectedIconKey);
+    MMC->icons()->deleteIcon(selectedIconKey);
 }
 
 void IconPickerDialog::activated(QModelIndex index)
 {
-	selectedIconKey = index.data(Qt::UserRole).toString();
-	accept();
+    selectedIconKey = index.data(Qt::UserRole).toString();
+    accept();
 }
 
 void IconPickerDialog::selectionChanged(QItemSelection selected, QItemSelection deselected)
 {
-	if (selected.empty())
-		return;
+    if (selected.empty())
+        return;
 
-	QString key = selected.first().indexes().first().data(Qt::UserRole).toString();
-	if (!key.isEmpty())
-		selectedIconKey = key;
+    QString key = selected.first().indexes().first().data(Qt::UserRole).toString();
+    if (!key.isEmpty())
+        selectedIconKey = key;
 }
 
 int IconPickerDialog::execWithSelection(QString selection)
 {
-	auto list = MMC->icons();
-	auto contentsWidget = ui->iconView;
-	selectedIconKey = selection;
-
-	int index_nr = list->getIconIndex(selection);
-	auto model_index = list->index(index_nr);
-	contentsWidget->selectionModel()->select(
-		model_index, QItemSelectionModel::Current | QItemSelectionModel::Select);
-
-	QMetaObject::invokeMethod(this, "delayed_scroll", Qt::QueuedConnection,
-							  Q_ARG(QModelIndex, model_index));
-	return QDialog::exec();
+    auto list = MMC->icons();
+    auto contentsWidget = ui->iconView;
+    selectedIconKey = selection;
+
+    int index_nr = list->getIconIndex(selection);
+    auto model_index = list->index(index_nr);
+    contentsWidget->selectionModel()->select(
+        model_index, QItemSelectionModel::Current | QItemSelectionModel::Select);
+
+    QMetaObject::invokeMethod(this, "delayed_scroll", Qt::QueuedConnection,
+                              Q_ARG(QModelIndex, model_index));
+    return QDialog::exec();
 }
 
 void IconPickerDialog::delayed_scroll(QModelIndex model_index)
 {
-	auto contentsWidget = ui->iconView;
-	contentsWidget->scrollTo(model_index);
+    auto contentsWidget = ui->iconView;
+    contentsWidget->scrollTo(model_index);
 }
 
 IconPickerDialog::~IconPickerDialog()
 {
-	delete ui;
+    delete ui;
 }
 
 void IconPickerDialog::openFolder()
 {
-	DesktopServices::openDirectory(MMC->icons()->getDirectory(), true);
+    DesktopServices::openDirectory(MMC->icons()->getDirectory(), true);
 }