From 952b63f68de93e8acf7aab81373661dae8d5098b Mon Sep 17 00:00:00 2001 From: Petr Mrázek Date: Tue, 31 Dec 2013 01:24:28 +0100 Subject: Refactor icon lists heavily * Icon list now uses a filesystem watcher for updates * Icon folder is user-customizable * All the little details. ALL OF THEM. --- gui/dialogs/IconPickerDialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gui/dialogs/IconPickerDialog.cpp') diff --git a/gui/dialogs/IconPickerDialog.cpp b/gui/dialogs/IconPickerDialog.cpp index 99d6dc9a..cb832d95 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) -- cgit From c0b6fd0647fe90084f3d2750cb26e3b9cb611266 Mon Sep 17 00:00:00 2001 From: Jan Dalheimer Date: Thu, 2 Jan 2014 18:51:40 +0100 Subject: Make .ico files usable (the plugin is already included) --- gui/dialogs/IconPickerDialog.cpp | 2 +- logic/icons/IconList.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'gui/dialogs/IconPickerDialog.cpp') 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" -- cgit