summaryrefslogtreecommitdiffstats
path: root/logic/lists
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-12-31 01:24:28 +0100
committerPetr Mrázek <peterix@gmail.com>2013-12-31 01:32:51 +0100
commit952b63f68de93e8acf7aab81373661dae8d5098b (patch)
treea3be2560a2c34f8827a37998c7baa5a525dde22f /logic/lists
parentc44bcfab4bf4f25a7f39d6154fc366db4c0fcfbc (diff)
downloadMultiMC-952b63f68de93e8acf7aab81373661dae8d5098b.tar
MultiMC-952b63f68de93e8acf7aab81373661dae8d5098b.tar.gz
MultiMC-952b63f68de93e8acf7aab81373661dae8d5098b.tar.lz
MultiMC-952b63f68de93e8acf7aab81373661dae8d5098b.tar.xz
MultiMC-952b63f68de93e8acf7aab81373661dae8d5098b.zip
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.
Diffstat (limited to 'logic/lists')
-rw-r--r--logic/lists/IconList.cpp271
-rw-r--r--logic/lists/IconList.h54
-rw-r--r--logic/lists/InstanceList.cpp7
3 files changed, 4 insertions, 328 deletions
diff --git a/logic/lists/IconList.cpp b/logic/lists/IconList.cpp
deleted file mode 100644
index ecfb8c3c..00000000
--- a/logic/lists/IconList.cpp
+++ /dev/null
@@ -1,271 +0,0 @@
-/* Copyright 2013 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "IconList.h"
-#include <pathutils.h>
-#include <QMap>
-#include <QEventLoop>
-#include <QDir>
-#include <QMimeData>
-#include <QUrl>
-#define MAX_SIZE 1024
-
-struct entry
-{
- QString key;
- QString name;
- QIcon icon;
- bool is_builtin;
- QString filename;
-};
-
-class Private : public QObject
-{
- Q_OBJECT
-public:
- QMap<QString, int> index;
- QVector<entry> icons;
- Private()
- {
- }
-};
-
-IconList::IconList() : QAbstractListModel(), d(new Private())
-{
- QDir instance_icons(":/icons/instances/");
- auto file_info_list = instance_icons.entryInfoList(QDir::Files, QDir::Name);
- for (auto file_info : file_info_list)
- {
- QString key = file_info.baseName();
- addIcon(key, key, file_info.absoluteFilePath(), true);
- }
-
- // FIXME: get from settings
- ensureFolderPathExists("icons");
- QDir user_icons("icons");
- file_info_list = user_icons.entryInfoList(QDir::Files, QDir::Name);
- for (auto file_info : file_info_list)
- {
- QString filename = file_info.absoluteFilePath();
- QString key = file_info.baseName();
- addIcon(key, key, filename);
- }
-}
-
-IconList::~IconList()
-{
- delete d;
- d = nullptr;
-}
-
-QStringList IconList::mimeTypes() const
-{
- QStringList types;
- types << "text/uri-list";
- return types;
-}
-Qt::DropActions IconList::supportedDropActions() const
-{
- return Qt::CopyAction;
-}
-
-bool IconList::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column,
- const QModelIndex &parent)
-{
- if (action == Qt::IgnoreAction)
- return true;
- // check if the action is supported
- if (!data || !(action & supportedDropActions()))
- return false;
-
- // files dropped from outside?
- if (data->hasUrls())
- {
- /*
- bool was_watching = is_watching;
- if(was_watching)
- stopWatching();
- */
- auto urls = data->urls();
- QStringList iconFiles;
- for (auto url : urls)
- {
- // only local files may be dropped...
- if (!url.isLocalFile())
- continue;
- iconFiles += url.toLocalFile();
- }
- installIcons(iconFiles);
- /*
- if(was_watching)
- startWatching();
- */
- return true;
- }
- return false;
-}
-
-Qt::ItemFlags IconList::flags(const QModelIndex &index) const
-{
- Qt::ItemFlags defaultFlags = QAbstractListModel::flags(index);
- if (index.isValid())
- return Qt::ItemIsDropEnabled | defaultFlags;
- else
- return Qt::ItemIsDropEnabled | defaultFlags;
-}
-
-QVariant IconList::data(const QModelIndex &index, int role) const
-{
- if (!index.isValid())
- return QVariant();
-
- int row = index.row();
-
- if (row < 0 || row >= d->icons.size())
- return QVariant();
-
- switch (role)
- {
- case Qt::DecorationRole:
- return d->icons[row].icon;
- case Qt::DisplayRole:
- return d->icons[row].name;
- case Qt::UserRole:
- return d->icons[row].key;
- default:
- return QVariant();
- }
-}
-
-int IconList::rowCount(const QModelIndex &parent) const
-{
- return d->icons.size();
-}
-
-void IconList::installIcons(QStringList iconFiles)
-{
- for (QString file : iconFiles)
- {
- QFileInfo fileinfo(file);
- if (!fileinfo.isReadable() || !fileinfo.isFile())
- continue;
- QString target = PathCombine("icons", fileinfo.fileName());
-
- QString suffix = fileinfo.suffix();
- if (suffix != "jpeg" && suffix != "png" && suffix != "jpg")
- continue;
-
- if (!QFile::copy(file, target))
- continue;
-
- QString key = fileinfo.baseName();
- addIcon(key, key, target);
- }
-}
-
-bool IconList::deleteIcon(QString key)
-{
- int iconIdx = getIconIndex(key);
- if (iconIdx == -1)
- return false;
- auto &iconEntry = d->icons[iconIdx];
- if (iconEntry.is_builtin)
- return false;
- if (QFile::remove(iconEntry.filename))
- {
- beginRemoveRows(QModelIndex(), iconIdx, iconIdx);
- d->icons.remove(iconIdx);
- reindex();
- endRemoveRows();
- }
- return true;
-}
-
-bool IconList::addIcon(QString key, QString name, QString path, bool is_builtin)
-{
- auto iter = d->index.find(key);
- if (iter != d->index.end())
- {
- if (d->icons[*iter].is_builtin)
- return false;
-
- QIcon icon(path);
- if (icon.isNull())
- return false;
-
- auto &oldOne = d->icons[*iter];
-
- if (!QFile::remove(oldOne.filename))
- return false;
-
- // replace the icon
- oldOne = {key, name, icon, is_builtin, path};
- dataChanged(index(*iter), index(*iter));
- return true;
- }
- else
- {
- QIcon icon(path);
- if (icon.isNull())
- return false;
-
- // add a new icon
- beginInsertRows(QModelIndex(), d->icons.size(), d->icons.size());
- d->icons.push_back({key, name, icon, is_builtin, path});
- d->index[key] = d->icons.size() - 1;
- endInsertRows();
- return true;
- }
-}
-
-void IconList::reindex()
-{
- d->index.clear();
- int i = 0;
- for (auto &iter : d->icons)
- {
- d->index[iter.key] = i;
- i++;
- }
-}
-
-QIcon IconList::getIcon(QString key)
-{
- int icon_index = getIconIndex(key);
-
- if (icon_index != -1)
- return d->icons[icon_index].icon;
-
- // Fallback for icons that don't exist.
- icon_index = getIconIndex("infinity");
-
- if (icon_index != -1)
- return d->icons[icon_index].icon;
- return QIcon();
-}
-
-int IconList::getIconIndex(QString key)
-{
- if (key == "default")
- key = "infinity";
-
- auto iter = d->index.find(key);
- if (iter != d->index.end())
- return *iter;
-
- return -1;
-}
-
-#include "IconList.moc" \ No newline at end of file
diff --git a/logic/lists/IconList.h b/logic/lists/IconList.h
deleted file mode 100644
index 40ad043b..00000000
--- a/logic/lists/IconList.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Copyright 2013 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <QMutex>
-#include <QAbstractListModel>
-#include <QtGui/QIcon>
-
-class Private;
-
-class IconList : public QAbstractListModel
-{
-public:
- IconList();
- virtual ~IconList();
-
- QIcon getIcon(QString key);
- int getIconIndex(QString key);
-
- virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
- virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
-
- bool addIcon(QString key, QString name, QString path, bool is_builtin = false);
- bool deleteIcon(QString key);
-
- virtual QStringList mimeTypes() const;
- virtual Qt::DropActions supportedDropActions() const;
- virtual bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column,
- const QModelIndex &parent);
- virtual Qt::ItemFlags flags(const QModelIndex &index) const;
-
- void installIcons(QStringList iconFiles);
-
-private:
- // hide copy constructor
- IconList(const IconList &) = delete;
- // hide assign op
- IconList &operator=(const IconList &) = delete;
- void reindex();
- Private *d;
-};
diff --git a/logic/lists/InstanceList.cpp b/logic/lists/InstanceList.cpp
index 0ecb387d..48a2865a 100644
--- a/logic/lists/InstanceList.cpp
+++ b/logic/lists/InstanceList.cpp
@@ -28,7 +28,7 @@
#include "MultiMC.h"
#include "logic/lists/InstanceList.h"
-#include "logic/lists/IconList.h"
+#include "logic/icons/IconList.h"
#include "logic/lists/MinecraftVersionList.h"
#include "logic/BaseInstance.h"
#include "logic/InstanceFactory.h"
@@ -356,12 +356,13 @@ void InstanceList::loadForgeInstances(QMap<QString, QString> groupMap)
QString iconKey = record.logo;
iconKey.remove(QRegularExpression("\\..*"));
- MMC->icons()->addIcon(iconKey, iconKey, PathCombine(templateDir, record.logo), true);
+ MMC->icons()->addIcon(iconKey, iconKey, PathCombine(templateDir, record.logo),
+ MMCIcon::Transient);
if (!QFileInfo(PathCombine(instanceDir, "instance.cfg")).exists())
{
BaseInstance *instPtr = NULL;
- auto & factory = InstanceFactory::get();
+ auto &factory = InstanceFactory::get();
auto version = MMC->minecraftlist()->findVersion(record.mcVersion);
if (!version)
{