Merge pull request #1456 from Trial97/icons
This commit is contained in:
commit
5b8c997180
@ -1,7 +1,8 @@
|
|||||||
// SPDX-License-Identifier: GPL-3.0-only
|
// SPDX-License-Identifier: GPL-3.0-only
|
||||||
/*
|
/*
|
||||||
* PolyMC - Minecraft Launcher
|
* Prism Launcher - Minecraft Launcher
|
||||||
* Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
|
* Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
|
||||||
|
* Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -35,32 +36,30 @@
|
|||||||
|
|
||||||
#include "IconList.h"
|
#include "IconList.h"
|
||||||
#include <FileSystem.h>
|
#include <FileSystem.h>
|
||||||
#include <QMap>
|
|
||||||
#include <QEventLoop>
|
|
||||||
#include <QMimeData>
|
|
||||||
#include <QUrl>
|
|
||||||
#include <QFileSystemWatcher>
|
|
||||||
#include <QSet>
|
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
|
#include <QEventLoop>
|
||||||
|
#include <QFileSystemWatcher>
|
||||||
|
#include <QMap>
|
||||||
|
#include <QMimeData>
|
||||||
|
#include <QSet>
|
||||||
|
#include <QUrl>
|
||||||
|
#include "icons/IconUtils.h"
|
||||||
|
|
||||||
#define MAX_SIZE 1024
|
#define MAX_SIZE 1024
|
||||||
|
|
||||||
IconList::IconList(const QStringList &builtinPaths, QString path, QObject *parent) : QAbstractListModel(parent)
|
IconList::IconList(const QStringList& builtinPaths, QString path, QObject* parent) : QAbstractListModel(parent)
|
||||||
{
|
{
|
||||||
QSet<QString> builtinNames;
|
QSet<QString> builtinNames;
|
||||||
|
|
||||||
// add builtin icons
|
// add builtin icons
|
||||||
for(auto & builtinPath: builtinPaths)
|
for (auto& builtinPath : builtinPaths) {
|
||||||
{
|
|
||||||
QDir instance_icons(builtinPath);
|
QDir instance_icons(builtinPath);
|
||||||
auto file_info_list = instance_icons.entryInfoList(QDir::Files, QDir::Name);
|
auto file_info_list = instance_icons.entryInfoList(QDir::Files, QDir::Name);
|
||||||
for (auto file_info : file_info_list)
|
for (auto file_info : file_info_list) {
|
||||||
{
|
|
||||||
builtinNames.insert(file_info.completeBaseName());
|
builtinNames.insert(file_info.completeBaseName());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for(auto & builtinName : builtinNames)
|
for (auto& builtinName : builtinNames) {
|
||||||
{
|
|
||||||
addThemeIcon(builtinName);
|
addThemeIcon(builtinName);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -78,31 +77,27 @@ IconList::IconList(const QStringList &builtinPaths, QString path, QObject *paren
|
|||||||
void IconList::sortIconList()
|
void IconList::sortIconList()
|
||||||
{
|
{
|
||||||
qDebug() << "Sorting icon list...";
|
qDebug() << "Sorting icon list...";
|
||||||
std::sort(icons.begin(), icons.end(), [](const MMCIcon& a, const MMCIcon& b) {
|
std::sort(icons.begin(), icons.end(), [](const MMCIcon& a, const MMCIcon& b) { return a.m_key.localeAwareCompare(b.m_key) < 0; });
|
||||||
return a.m_key.localeAwareCompare(b.m_key) < 0;
|
|
||||||
});
|
|
||||||
reindex();
|
reindex();
|
||||||
}
|
}
|
||||||
|
|
||||||
void IconList::directoryChanged(const QString &path)
|
void IconList::directoryChanged(const QString& path)
|
||||||
{
|
{
|
||||||
QDir new_dir (path);
|
QDir new_dir(path);
|
||||||
if(m_dir.absolutePath() != new_dir.absolutePath())
|
if (m_dir.absolutePath() != new_dir.absolutePath()) {
|
||||||
{
|
|
||||||
m_dir.setPath(path);
|
m_dir.setPath(path);
|
||||||
m_dir.refresh();
|
m_dir.refresh();
|
||||||
if(is_watching)
|
if (is_watching)
|
||||||
stopWatching();
|
stopWatching();
|
||||||
startWatching();
|
startWatching();
|
||||||
}
|
}
|
||||||
if(!m_dir.exists())
|
if (!m_dir.exists())
|
||||||
if(!FS::ensureFolderPathExists(m_dir.absolutePath()))
|
if (!FS::ensureFolderPathExists(m_dir.absolutePath()))
|
||||||
return;
|
return;
|
||||||
m_dir.refresh();
|
m_dir.refresh();
|
||||||
auto new_list = m_dir.entryList(QDir::Files, QDir::Name);
|
auto new_list = m_dir.entryList(QDir::Files, QDir::Name);
|
||||||
for (auto it = new_list.begin(); it != new_list.end(); it++)
|
for (auto it = new_list.begin(); it != new_list.end(); it++) {
|
||||||
{
|
QString& foo = (*it);
|
||||||
QString &foo = (*it);
|
|
||||||
foo = m_dir.filePath(foo);
|
foo = m_dir.filePath(foo);
|
||||||
}
|
}
|
||||||
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
|
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
|
||||||
@ -111,8 +106,7 @@ void IconList::directoryChanged(const QString &path)
|
|||||||
auto new_set = new_list.toSet();
|
auto new_set = new_list.toSet();
|
||||||
#endif
|
#endif
|
||||||
QList<QString> current_list;
|
QList<QString> current_list;
|
||||||
for (auto &it : icons)
|
for (auto& it : icons) {
|
||||||
{
|
|
||||||
if (!it.has(IconType::FileBased))
|
if (!it.has(IconType::FileBased))
|
||||||
continue;
|
continue;
|
||||||
current_list.push_back(it.m_images[IconType::FileBased].filename);
|
current_list.push_back(it.m_images[IconType::FileBased].filename);
|
||||||
@ -129,38 +123,33 @@ void IconList::directoryChanged(const QString &path)
|
|||||||
QSet<QString> to_add = new_set;
|
QSet<QString> to_add = new_set;
|
||||||
to_add -= current_set;
|
to_add -= current_set;
|
||||||
|
|
||||||
for (auto remove : to_remove)
|
for (auto remove : to_remove) {
|
||||||
{
|
|
||||||
qDebug() << "Removing " << remove;
|
qDebug() << "Removing " << remove;
|
||||||
QFileInfo rmfile(remove);
|
QFileInfo rmfile(remove);
|
||||||
QString key = rmfile.completeBaseName();
|
QString key = rmfile.completeBaseName();
|
||||||
|
|
||||||
QString suffix = rmfile.suffix();
|
QString suffix = rmfile.suffix();
|
||||||
// The icon doesnt have a suffix, but it can have other .s in the name, so we account for those as well
|
// The icon doesnt have a suffix, but it can have other .s in the name, so we account for those as well
|
||||||
if (suffix != "jpeg" && suffix != "png" && suffix != "jpg" && suffix != "ico" && suffix != "svg" && suffix != "gif")
|
if (!IconUtils::isIconSuffix(suffix))
|
||||||
key = rmfile.fileName();
|
key = rmfile.fileName();
|
||||||
|
|
||||||
int idx = getIconIndex(key);
|
int idx = getIconIndex(key);
|
||||||
if (idx == -1)
|
if (idx == -1)
|
||||||
continue;
|
continue;
|
||||||
icons[idx].remove(IconType::FileBased);
|
icons[idx].remove(IconType::FileBased);
|
||||||
if (icons[idx].type() == IconType::ToBeDeleted)
|
if (icons[idx].type() == IconType::ToBeDeleted) {
|
||||||
{
|
|
||||||
beginRemoveRows(QModelIndex(), idx, idx);
|
beginRemoveRows(QModelIndex(), idx, idx);
|
||||||
icons.remove(idx);
|
icons.remove(idx);
|
||||||
reindex();
|
reindex();
|
||||||
endRemoveRows();
|
endRemoveRows();
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
dataChanged(index(idx), index(idx));
|
dataChanged(index(idx), index(idx));
|
||||||
}
|
}
|
||||||
m_watcher->removePath(remove);
|
m_watcher->removePath(remove);
|
||||||
emit iconUpdated(key);
|
emit iconUpdated(key);
|
||||||
}
|
}
|
||||||
|
|
||||||
for (auto add : to_add)
|
for (auto add : to_add) {
|
||||||
{
|
|
||||||
qDebug() << "Adding " << add;
|
qDebug() << "Adding " << add;
|
||||||
|
|
||||||
QFileInfo addfile(add);
|
QFileInfo addfile(add);
|
||||||
@ -168,11 +157,10 @@ void IconList::directoryChanged(const QString &path)
|
|||||||
|
|
||||||
QString suffix = addfile.suffix();
|
QString suffix = addfile.suffix();
|
||||||
// The icon doesnt have a suffix, but it can have other .s in the name, so we account for those as well
|
// The icon doesnt have a suffix, but it can have other .s in the name, so we account for those as well
|
||||||
if (suffix != "jpeg" && suffix != "png" && suffix != "jpg" && suffix != "ico" && suffix != "svg" && suffix != "gif")
|
if (!IconUtils::isIconSuffix(suffix))
|
||||||
key = addfile.fileName();
|
key = addfile.fileName();
|
||||||
|
|
||||||
if (addIcon(key, QString(), addfile.filePath(), IconType::FileBased))
|
if (addIcon(key, QString(), addfile.filePath(), IconType::FileBased)) {
|
||||||
{
|
|
||||||
m_watcher->addPath(add);
|
m_watcher->addPath(add);
|
||||||
emit iconUpdated(key);
|
emit iconUpdated(key);
|
||||||
}
|
}
|
||||||
@ -181,7 +169,7 @@ void IconList::directoryChanged(const QString &path)
|
|||||||
sortIconList();
|
sortIconList();
|
||||||
}
|
}
|
||||||
|
|
||||||
void IconList::fileChanged(const QString &path)
|
void IconList::fileChanged(const QString& path)
|
||||||
{
|
{
|
||||||
qDebug() << "Checking " << path;
|
qDebug() << "Checking " << path;
|
||||||
QFileInfo checkfile(path);
|
QFileInfo checkfile(path);
|
||||||
@ -200,9 +188,9 @@ void IconList::fileChanged(const QString &path)
|
|||||||
emit iconUpdated(key);
|
emit iconUpdated(key);
|
||||||
}
|
}
|
||||||
|
|
||||||
void IconList::SettingChanged(const Setting &setting, QVariant value)
|
void IconList::SettingChanged(const Setting& setting, QVariant value)
|
||||||
{
|
{
|
||||||
if(setting.id() != "IconsDir")
|
if (setting.id() != "IconsDir")
|
||||||
return;
|
return;
|
||||||
|
|
||||||
directoryChanged(value.toString());
|
directoryChanged(value.toString());
|
||||||
@ -213,12 +201,9 @@ void IconList::startWatching()
|
|||||||
auto abs_path = m_dir.absolutePath();
|
auto abs_path = m_dir.absolutePath();
|
||||||
FS::ensureFolderPathExists(abs_path);
|
FS::ensureFolderPathExists(abs_path);
|
||||||
is_watching = m_watcher->addPath(abs_path);
|
is_watching = m_watcher->addPath(abs_path);
|
||||||
if (is_watching)
|
if (is_watching) {
|
||||||
{
|
|
||||||
qDebug() << "Started watching " << abs_path;
|
qDebug() << "Started watching " << abs_path;
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
qDebug() << "Failed to start watching " << abs_path;
|
qDebug() << "Failed to start watching " << abs_path;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -241,7 +226,11 @@ Qt::DropActions IconList::supportedDropActions() const
|
|||||||
return Qt::CopyAction;
|
return Qt::CopyAction;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool IconList::dropMimeData(const QMimeData *data, Qt::DropAction action, [[maybe_unused]] int row, [[maybe_unused]] int column, [[maybe_unused]] const QModelIndex &parent)
|
bool IconList::dropMimeData(const QMimeData* data,
|
||||||
|
Qt::DropAction action,
|
||||||
|
[[maybe_unused]] int row,
|
||||||
|
[[maybe_unused]] int column,
|
||||||
|
[[maybe_unused]] const QModelIndex& parent)
|
||||||
{
|
{
|
||||||
if (action == Qt::IgnoreAction)
|
if (action == Qt::IgnoreAction)
|
||||||
return true;
|
return true;
|
||||||
@ -250,12 +239,10 @@ bool IconList::dropMimeData(const QMimeData *data, Qt::DropAction action, [[mayb
|
|||||||
return false;
|
return false;
|
||||||
|
|
||||||
// files dropped from outside?
|
// files dropped from outside?
|
||||||
if (data->hasUrls())
|
if (data->hasUrls()) {
|
||||||
{
|
|
||||||
auto urls = data->urls();
|
auto urls = data->urls();
|
||||||
QStringList iconFiles;
|
QStringList iconFiles;
|
||||||
for (auto url : urls)
|
for (auto url : urls) {
|
||||||
{
|
|
||||||
// only local files may be dropped...
|
// only local files may be dropped...
|
||||||
if (!url.isLocalFile())
|
if (!url.isLocalFile())
|
||||||
continue;
|
continue;
|
||||||
@ -267,16 +254,13 @@ bool IconList::dropMimeData(const QMimeData *data, Qt::DropAction action, [[mayb
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
Qt::ItemFlags IconList::flags(const QModelIndex &index) const
|
Qt::ItemFlags IconList::flags(const QModelIndex& index) const
|
||||||
{
|
{
|
||||||
Qt::ItemFlags defaultFlags = QAbstractListModel::flags(index);
|
Qt::ItemFlags defaultFlags = QAbstractListModel::flags(index);
|
||||||
if (index.isValid())
|
return Qt::ItemIsDropEnabled | defaultFlags;
|
||||||
return Qt::ItemIsDropEnabled | defaultFlags;
|
|
||||||
else
|
|
||||||
return Qt::ItemIsDropEnabled | defaultFlags;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
QVariant IconList::data(const QModelIndex &index, int role) const
|
QVariant IconList::data(const QModelIndex& index, int role) const
|
||||||
{
|
{
|
||||||
if (!index.isValid())
|
if (!index.isValid())
|
||||||
return QVariant();
|
return QVariant();
|
||||||
@ -286,64 +270,49 @@ QVariant IconList::data(const QModelIndex &index, int role) const
|
|||||||
if (row < 0 || row >= icons.size())
|
if (row < 0 || row >= icons.size())
|
||||||
return QVariant();
|
return QVariant();
|
||||||
|
|
||||||
switch (role)
|
switch (role) {
|
||||||
{
|
case Qt::DecorationRole:
|
||||||
case Qt::DecorationRole:
|
return icons[row].icon();
|
||||||
return icons[row].icon();
|
case Qt::DisplayRole:
|
||||||
case Qt::DisplayRole:
|
return icons[row].name();
|
||||||
return icons[row].name();
|
case Qt::UserRole:
|
||||||
case Qt::UserRole:
|
return icons[row].m_key;
|
||||||
return icons[row].m_key;
|
default:
|
||||||
default:
|
return QVariant();
|
||||||
return QVariant();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int IconList::rowCount(const QModelIndex &parent) const
|
int IconList::rowCount(const QModelIndex& parent) const
|
||||||
{
|
{
|
||||||
return parent.isValid() ? 0 : icons.size();
|
return parent.isValid() ? 0 : icons.size();
|
||||||
}
|
}
|
||||||
|
|
||||||
void IconList::installIcons(const QStringList &iconFiles)
|
void IconList::installIcons(const QStringList& iconFiles)
|
||||||
{
|
{
|
||||||
for (QString file : iconFiles)
|
for (QString file : iconFiles)
|
||||||
{
|
installIcon(file, {});
|
||||||
QFileInfo fileinfo(file);
|
|
||||||
if (!fileinfo.isReadable() || !fileinfo.isFile())
|
|
||||||
continue;
|
|
||||||
QString target = FS::PathCombine(getDirectory(), fileinfo.fileName());
|
|
||||||
|
|
||||||
QString suffix = fileinfo.suffix();
|
|
||||||
if (suffix != "jpeg" && suffix != "png" && suffix != "jpg" && suffix != "ico" && suffix != "svg" && suffix != "gif")
|
|
||||||
continue;
|
|
||||||
|
|
||||||
if (!QFile::copy(file, target))
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void IconList::installIcon(const QString &file, const QString &name)
|
void IconList::installIcon(const QString& file, const QString& name)
|
||||||
{
|
{
|
||||||
QFileInfo fileinfo(file);
|
QFileInfo fileinfo(file);
|
||||||
if(!fileinfo.isReadable() || !fileinfo.isFile())
|
if (!fileinfo.isReadable() || !fileinfo.isFile())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
QString target = FS::PathCombine(getDirectory(), name);
|
if (!IconUtils::isIconSuffix(fileinfo.suffix()))
|
||||||
|
return;
|
||||||
|
|
||||||
|
QString target = FS::PathCombine(getDirectory(), name.isEmpty() ? fileinfo.fileName() : name);
|
||||||
QFile::copy(file, target);
|
QFile::copy(file, target);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool IconList::iconFileExists(const QString &key) const
|
bool IconList::iconFileExists(const QString& key) const
|
||||||
{
|
{
|
||||||
auto iconEntry = icon(key);
|
auto iconEntry = icon(key);
|
||||||
if(!iconEntry)
|
return iconEntry && iconEntry->has(IconType::FileBased);
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return iconEntry->has(IconType::FileBased);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const MMCIcon *IconList::icon(const QString &key) const
|
const MMCIcon* IconList::icon(const QString& key) const
|
||||||
{
|
{
|
||||||
int iconIdx = getIconIndex(key);
|
int iconIdx = getIconIndex(key);
|
||||||
if (iconIdx == -1)
|
if (iconIdx == -1)
|
||||||
@ -351,100 +320,84 @@ const MMCIcon *IconList::icon(const QString &key) const
|
|||||||
return &icons[iconIdx];
|
return &icons[iconIdx];
|
||||||
}
|
}
|
||||||
|
|
||||||
bool IconList::deleteIcon(const QString &key)
|
bool IconList::deleteIcon(const QString& key)
|
||||||
{
|
{
|
||||||
if (!iconFileExists(key))
|
return iconFileExists(key) && QFile::remove(icon(key)->getFilePath());
|
||||||
return false;
|
|
||||||
|
|
||||||
return QFile::remove(icon(key)->getFilePath());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool IconList::trashIcon(const QString &key)
|
bool IconList::trashIcon(const QString& key)
|
||||||
{
|
{
|
||||||
if (!iconFileExists(key))
|
return iconFileExists(key) && FS::trash(icon(key)->getFilePath(), nullptr);
|
||||||
return false;
|
|
||||||
|
|
||||||
return FS::trash(icon(key)->getFilePath(), nullptr);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool IconList::addThemeIcon(const QString& key)
|
bool IconList::addThemeIcon(const QString& key)
|
||||||
{
|
{
|
||||||
auto iter = name_index.find(key);
|
auto iter = name_index.find(key);
|
||||||
if (iter != name_index.end())
|
if (iter != name_index.end()) {
|
||||||
{
|
auto& oldOne = icons[*iter];
|
||||||
auto &oldOne = icons[*iter];
|
|
||||||
oldOne.replace(Builtin, key);
|
oldOne.replace(Builtin, key);
|
||||||
dataChanged(index(*iter), index(*iter));
|
dataChanged(index(*iter), index(*iter));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
else
|
// add a new icon
|
||||||
|
beginInsertRows(QModelIndex(), icons.size(), icons.size());
|
||||||
{
|
{
|
||||||
// add a new icon
|
MMCIcon mmc_icon;
|
||||||
beginInsertRows(QModelIndex(), icons.size(), icons.size());
|
mmc_icon.m_name = key;
|
||||||
{
|
mmc_icon.m_key = key;
|
||||||
MMCIcon mmc_icon;
|
mmc_icon.replace(Builtin, key);
|
||||||
mmc_icon.m_name = key;
|
icons.push_back(mmc_icon);
|
||||||
mmc_icon.m_key = key;
|
name_index[key] = icons.size() - 1;
|
||||||
mmc_icon.replace(Builtin, key);
|
|
||||||
icons.push_back(mmc_icon);
|
|
||||||
name_index[key] = icons.size() - 1;
|
|
||||||
}
|
|
||||||
endInsertRows();
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
endInsertRows();
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool IconList::addIcon(const QString &key, const QString &name, const QString &path, const IconType type)
|
bool IconList::addIcon(const QString& key, const QString& name, const QString& path, const IconType type)
|
||||||
{
|
{
|
||||||
// replace the icon even? is the input valid?
|
// replace the icon even? is the input valid?
|
||||||
QIcon icon(path);
|
QIcon icon(path);
|
||||||
if (icon.isNull())
|
if (icon.isNull())
|
||||||
return false;
|
return false;
|
||||||
auto iter = name_index.find(key);
|
auto iter = name_index.find(key);
|
||||||
if (iter != name_index.end())
|
if (iter != name_index.end()) {
|
||||||
{
|
auto& oldOne = icons[*iter];
|
||||||
auto &oldOne = icons[*iter];
|
|
||||||
oldOne.replace(type, icon, path);
|
oldOne.replace(type, icon, path);
|
||||||
dataChanged(index(*iter), index(*iter));
|
dataChanged(index(*iter), index(*iter));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
else
|
// add a new icon
|
||||||
|
beginInsertRows(QModelIndex(), icons.size(), icons.size());
|
||||||
{
|
{
|
||||||
// add a new icon
|
MMCIcon mmc_icon;
|
||||||
beginInsertRows(QModelIndex(), icons.size(), icons.size());
|
mmc_icon.m_name = name;
|
||||||
{
|
mmc_icon.m_key = key;
|
||||||
MMCIcon mmc_icon;
|
mmc_icon.replace(type, icon, path);
|
||||||
mmc_icon.m_name = name;
|
icons.push_back(mmc_icon);
|
||||||
mmc_icon.m_key = key;
|
name_index[key] = icons.size() - 1;
|
||||||
mmc_icon.replace(type, icon, path);
|
|
||||||
icons.push_back(mmc_icon);
|
|
||||||
name_index[key] = icons.size() - 1;
|
|
||||||
}
|
|
||||||
endInsertRows();
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
endInsertRows();
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void IconList::saveIcon(const QString &key, const QString &path, const char * format) const
|
void IconList::saveIcon(const QString& key, const QString& path, const char* format) const
|
||||||
{
|
{
|
||||||
auto icon = getIcon(key);
|
auto icon = getIcon(key);
|
||||||
auto pixmap = icon.pixmap(128, 128);
|
auto pixmap = icon.pixmap(128, 128);
|
||||||
pixmap.save(path, format);
|
pixmap.save(path, format);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void IconList::reindex()
|
void IconList::reindex()
|
||||||
{
|
{
|
||||||
name_index.clear();
|
name_index.clear();
|
||||||
int i = 0;
|
int i = 0;
|
||||||
for (auto &iter : icons)
|
for (auto& iter : icons) {
|
||||||
{
|
|
||||||
name_index[iter.m_key] = i;
|
name_index[iter.m_key] = i;
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
QIcon IconList::getIcon(const QString &key) const
|
QIcon IconList::getIcon(const QString& key) const
|
||||||
{
|
{
|
||||||
int icon_index = getIconIndex(key);
|
int icon_index = getIconIndex(key);
|
||||||
|
|
||||||
@ -459,7 +412,7 @@ QIcon IconList::getIcon(const QString &key) const
|
|||||||
return QIcon();
|
return QIcon();
|
||||||
}
|
}
|
||||||
|
|
||||||
int IconList::getIconIndex(const QString &key) const
|
int IconList::getIconIndex(const QString& key) const
|
||||||
{
|
{
|
||||||
auto iter = name_index.find(key == "default" ? "grass" : key);
|
auto iter = name_index.find(key == "default" ? "grass" : key);
|
||||||
if (iter != name_index.end())
|
if (iter != name_index.end())
|
||||||
@ -472,5 +425,3 @@ QString IconList::getDirectory() const
|
|||||||
{
|
{
|
||||||
return m_dir.absolutePath();
|
return m_dir.absolutePath();
|
||||||
}
|
}
|
||||||
|
|
||||||
//#include "IconList.moc"
|
|
||||||
|
@ -1,24 +1,43 @@
|
|||||||
/* Copyright 2013-2021 MultiMC Contributors
|
// SPDX-License-Identifier: GPL-3.0-only
|
||||||
|
/*
|
||||||
|
* Prism Launcher - Minecraft Launcher
|
||||||
|
* Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* you may not use this file except in compliance with the License.
|
* it under the terms of the GNU General Public License as published by
|
||||||
* You may obtain a copy of the License at
|
* the Free Software Foundation, version 3.
|
||||||
*
|
*
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
* You should have received a copy of the GNU General Public License
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
*
|
||||||
* See the License for the specific language governing permissions and
|
* This file incorporates work covered by the following copyright and
|
||||||
* limitations under the License.
|
* permission notice:
|
||||||
|
*
|
||||||
|
* Copyright 2013-2021 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
|
#pragma once
|
||||||
|
|
||||||
#include <QMutex>
|
|
||||||
#include <QAbstractListModel>
|
#include <QAbstractListModel>
|
||||||
#include <QFile>
|
|
||||||
#include <QDir>
|
#include <QDir>
|
||||||
|
#include <QFile>
|
||||||
|
#include <QMutex>
|
||||||
#include <QtGui/QIcon>
|
#include <QtGui/QIcon>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
@ -29,58 +48,58 @@
|
|||||||
|
|
||||||
class QFileSystemWatcher;
|
class QFileSystemWatcher;
|
||||||
|
|
||||||
class IconList : public QAbstractListModel
|
class IconList : public QAbstractListModel {
|
||||||
{
|
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
explicit IconList(const QStringList &builtinPaths, QString path, QObject *parent = 0);
|
explicit IconList(const QStringList& builtinPaths, QString path, QObject* parent = 0);
|
||||||
virtual ~IconList() {};
|
virtual ~IconList(){};
|
||||||
|
|
||||||
QIcon getIcon(const QString &key) const;
|
QIcon getIcon(const QString& key) const;
|
||||||
int getIconIndex(const QString &key) const;
|
int getIconIndex(const QString& key) const;
|
||||||
QString getDirectory() const;
|
QString getDirectory() const;
|
||||||
|
|
||||||
virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
|
virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
|
||||||
virtual int rowCount(const QModelIndex &parent = QModelIndex()) const override;
|
virtual int rowCount(const QModelIndex& parent = QModelIndex()) const override;
|
||||||
|
|
||||||
virtual QStringList mimeTypes() const override;
|
virtual QStringList mimeTypes() const override;
|
||||||
virtual Qt::DropActions supportedDropActions() const override;
|
virtual Qt::DropActions supportedDropActions() const override;
|
||||||
virtual bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override;
|
virtual bool dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) override;
|
||||||
virtual Qt::ItemFlags flags(const QModelIndex &index) const override;
|
virtual Qt::ItemFlags flags(const QModelIndex& index) const override;
|
||||||
|
|
||||||
bool addThemeIcon(const QString &key);
|
bool addThemeIcon(const QString& key);
|
||||||
bool addIcon(const QString &key, const QString &name, const QString &path, const IconType type);
|
bool addIcon(const QString& key, const QString& name, const QString& path, const IconType type);
|
||||||
void saveIcon(const QString &key, const QString &path, const char * format) const;
|
void saveIcon(const QString& key, const QString& path, const char* format) const;
|
||||||
bool deleteIcon(const QString &key);
|
bool deleteIcon(const QString& key);
|
||||||
bool trashIcon(const QString &key);
|
bool trashIcon(const QString& key);
|
||||||
bool iconFileExists(const QString &key) const;
|
bool iconFileExists(const QString& key) const;
|
||||||
|
|
||||||
void installIcons(const QStringList &iconFiles);
|
void installIcons(const QStringList& iconFiles);
|
||||||
void installIcon(const QString &file, const QString &name);
|
void installIcon(const QString& file, const QString& name);
|
||||||
|
|
||||||
const MMCIcon * icon(const QString &key) const;
|
const MMCIcon* icon(const QString& key) const;
|
||||||
|
|
||||||
void startWatching();
|
void startWatching();
|
||||||
void stopWatching();
|
void stopWatching();
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void iconUpdated(QString key);
|
void iconUpdated(QString key);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
// hide copy constructor
|
// hide copy constructor
|
||||||
IconList(const IconList &) = delete;
|
IconList(const IconList&) = delete;
|
||||||
// hide assign op
|
// hide assign op
|
||||||
IconList &operator=(const IconList &) = delete;
|
IconList& operator=(const IconList&) = delete;
|
||||||
void reindex();
|
void reindex();
|
||||||
void sortIconList();
|
void sortIconList();
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
void directoryChanged(const QString &path);
|
void directoryChanged(const QString& path);
|
||||||
|
|
||||||
protected slots:
|
protected slots:
|
||||||
void fileChanged(const QString &path);
|
void fileChanged(const QString& path);
|
||||||
void SettingChanged(const Setting & setting, QVariant value);
|
void SettingChanged(const Setting& setting, QVariant value);
|
||||||
private:
|
|
||||||
|
private:
|
||||||
shared_qobject_ptr<QFileSystemWatcher> m_watcher;
|
shared_qobject_ptr<QFileSystemWatcher> m_watcher;
|
||||||
bool is_watching;
|
bool is_watching;
|
||||||
QMap<QString, int> name_index;
|
QMap<QString, int> name_index;
|
||||||
|
@ -1,25 +1,51 @@
|
|||||||
|
// SPDX-License-Identifier: GPL-3.0-only
|
||||||
|
/*
|
||||||
|
* Prism Launcher - Minecraft Launcher
|
||||||
|
* Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, version 3.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
* This file incorporates work covered by the following copyright and
|
||||||
|
* permission notice:
|
||||||
|
*
|
||||||
|
* Copyright 2013-2021 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 "IconUtils.h"
|
#include "IconUtils.h"
|
||||||
|
|
||||||
#include "FileSystem.h"
|
|
||||||
#include <QDirIterator>
|
#include <QDirIterator>
|
||||||
|
#include "FileSystem.h"
|
||||||
#include <array>
|
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
std::array<const char *, 6> validIconExtensions = {{
|
static const QStringList validIconExtensions = { { "svg", "png", "ico", "gif", "jpg", "jpeg" } };
|
||||||
"svg",
|
|
||||||
"png",
|
|
||||||
"ico",
|
|
||||||
"gif",
|
|
||||||
"jpg",
|
|
||||||
"jpeg"
|
|
||||||
}};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace IconUtils{
|
namespace IconUtils {
|
||||||
|
|
||||||
QString findBestIconIn(const QString &folder, const QString & iconKey) {
|
QString findBestIconIn(const QString& folder, const QString& iconKey)
|
||||||
int best_found = validIconExtensions.size();
|
{
|
||||||
QString best_filename;
|
QString best_filename;
|
||||||
|
|
||||||
QDirIterator it(folder, QDir::NoDotAndDotDot | QDir::Files, QDirIterator::NoIteratorFlags);
|
QDirIterator it(folder, QDir::NoDotAndDotDot | QDir::Files, QDirIterator::NoIteratorFlags);
|
||||||
@ -27,36 +53,20 @@ QString findBestIconIn(const QString &folder, const QString & iconKey) {
|
|||||||
it.next();
|
it.next();
|
||||||
auto fileInfo = it.fileInfo();
|
auto fileInfo = it.fileInfo();
|
||||||
|
|
||||||
if(fileInfo.completeBaseName() != iconKey)
|
if (fileInfo.completeBaseName() == iconKey && isIconSuffix(fileInfo.suffix()))
|
||||||
continue;
|
return fileInfo.absoluteFilePath();
|
||||||
|
|
||||||
auto extension = fileInfo.suffix();
|
|
||||||
|
|
||||||
for(int i = 0; i < best_found; i++) {
|
|
||||||
if(extension == validIconExtensions[i]) {
|
|
||||||
best_found = i;
|
|
||||||
qDebug() << i << " : " << fileInfo.fileName();
|
|
||||||
best_filename = fileInfo.fileName();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return FS::PathCombine(folder, best_filename);
|
return {};
|
||||||
}
|
}
|
||||||
|
|
||||||
QString getIconFilter() {
|
QString getIconFilter()
|
||||||
QString out;
|
{
|
||||||
QTextStream stream(&out);
|
return "(*." + validIconExtensions.join(" *.") + ")";
|
||||||
stream << '(';
|
|
||||||
for(size_t i = 0; i < validIconExtensions.size() - 1; i++) {
|
|
||||||
if(i > 0) {
|
|
||||||
stream << " ";
|
|
||||||
}
|
|
||||||
stream << "*." << validIconExtensions[i];
|
|
||||||
}
|
|
||||||
stream << " *." << validIconExtensions[validIconExtensions.size() - 1];
|
|
||||||
stream << ')';
|
|
||||||
return out;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool isIconSuffix(QString suffix)
|
||||||
|
{
|
||||||
|
return validIconExtensions.contains(suffix);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
} // namespace IconUtils
|
||||||
|
@ -1,3 +1,38 @@
|
|||||||
|
// SPDX-License-Identifier: GPL-3.0-only
|
||||||
|
/*
|
||||||
|
* Prism Launcher - Minecraft Launcher
|
||||||
|
* Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, version 3.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
* This file incorporates work covered by the following copyright and
|
||||||
|
* permission notice:
|
||||||
|
*
|
||||||
|
* Copyright 2013-2021 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
|
#pragma once
|
||||||
|
|
||||||
#include <QString>
|
#include <QString>
|
||||||
@ -5,9 +40,10 @@
|
|||||||
namespace IconUtils {
|
namespace IconUtils {
|
||||||
|
|
||||||
// Given a folder and an icon key, find 'best' of the icons with the given key in there and return its path
|
// Given a folder and an icon key, find 'best' of the icons with the given key in there and return its path
|
||||||
QString findBestIconIn(const QString &folder, const QString & iconKey);
|
QString findBestIconIn(const QString& folder, const QString& iconKey);
|
||||||
|
|
||||||
// Get icon file type filter for file browser dialogs
|
// Get icon file type filter for file browser dialogs
|
||||||
QString getIconFilter();
|
QString getIconFilter();
|
||||||
|
|
||||||
}
|
bool isIconSuffix(QString suffix);
|
||||||
|
} // namespace IconUtils
|
||||||
|
@ -1,7 +1,8 @@
|
|||||||
// SPDX-License-Identifier: GPL-3.0-only
|
// SPDX-License-Identifier: GPL-3.0-only
|
||||||
/*
|
/*
|
||||||
* PolyMC - Minecraft Launcher
|
* Prism Launcher - Minecraft Launcher
|
||||||
* Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
|
* Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
|
||||||
|
* Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -37,23 +38,21 @@
|
|||||||
#include <QFileInfo>
|
#include <QFileInfo>
|
||||||
#include <QIcon>
|
#include <QIcon>
|
||||||
|
|
||||||
IconType operator--(IconType &t, int)
|
IconType operator--(IconType& t, int)
|
||||||
{
|
{
|
||||||
IconType temp = t;
|
IconType temp = t;
|
||||||
switch (t)
|
switch (t) {
|
||||||
{
|
case IconType::Builtin:
|
||||||
case IconType::Builtin:
|
t = IconType::ToBeDeleted;
|
||||||
t = IconType::ToBeDeleted;
|
break;
|
||||||
break;
|
case IconType::Transient:
|
||||||
case IconType::Transient:
|
t = IconType::Builtin;
|
||||||
t = IconType::Builtin;
|
break;
|
||||||
break;
|
case IconType::FileBased:
|
||||||
case IconType::FileBased:
|
t = IconType::Transient;
|
||||||
t = IconType::Transient;
|
break;
|
||||||
break;
|
default:
|
||||||
default:
|
break;
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return temp;
|
return temp;
|
||||||
}
|
}
|
||||||
@ -79,8 +78,8 @@ QIcon MMCIcon::icon() const
|
|||||||
{
|
{
|
||||||
if (m_current_type == IconType::ToBeDeleted)
|
if (m_current_type == IconType::ToBeDeleted)
|
||||||
return QIcon();
|
return QIcon();
|
||||||
auto & icon = m_images[m_current_type].icon;
|
auto& icon = m_images[m_current_type].icon;
|
||||||
if(!icon.isNull())
|
if (!icon.isNull())
|
||||||
return icon;
|
return icon;
|
||||||
// FIXME: inject this.
|
// FIXME: inject this.
|
||||||
return QIcon::fromTheme(m_images[m_current_type].key);
|
return QIcon::fromTheme(m_images[m_current_type].key);
|
||||||
@ -90,10 +89,8 @@ void MMCIcon::remove(IconType rm_type)
|
|||||||
{
|
{
|
||||||
m_images[rm_type].filename = QString();
|
m_images[rm_type].filename = QString();
|
||||||
m_images[rm_type].icon = QIcon();
|
m_images[rm_type].icon = QIcon();
|
||||||
for (auto iter = rm_type; iter != IconType::ToBeDeleted; iter--)
|
for (auto iter = rm_type; iter != IconType::ToBeDeleted; iter--) {
|
||||||
{
|
if (m_images[iter].present()) {
|
||||||
if (m_images[iter].present())
|
|
||||||
{
|
|
||||||
m_current_type = iter;
|
m_current_type = iter;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -103,8 +100,7 @@ void MMCIcon::remove(IconType rm_type)
|
|||||||
|
|
||||||
void MMCIcon::replace(IconType new_type, QIcon icon, QString path)
|
void MMCIcon::replace(IconType new_type, QIcon icon, QString path)
|
||||||
{
|
{
|
||||||
if (new_type > m_current_type || m_current_type == IconType::ToBeDeleted)
|
if (new_type > m_current_type || m_current_type == IconType::ToBeDeleted) {
|
||||||
{
|
|
||||||
m_current_type = new_type;
|
m_current_type = new_type;
|
||||||
}
|
}
|
||||||
m_images[new_type].icon = icon;
|
m_images[new_type].icon = icon;
|
||||||
@ -114,8 +110,7 @@ void MMCIcon::replace(IconType new_type, QIcon icon, QString path)
|
|||||||
|
|
||||||
void MMCIcon::replace(IconType new_type, const QString& key)
|
void MMCIcon::replace(IconType new_type, const QString& key)
|
||||||
{
|
{
|
||||||
if (new_type > m_current_type || m_current_type == IconType::ToBeDeleted)
|
if (new_type > m_current_type || m_current_type == IconType::ToBeDeleted) {
|
||||||
{
|
|
||||||
m_current_type = new_type;
|
m_current_type = new_type;
|
||||||
}
|
}
|
||||||
m_images[new_type].icon = QIcon();
|
m_images[new_type].icon = QIcon();
|
||||||
@ -125,13 +120,12 @@ void MMCIcon::replace(IconType new_type, const QString& key)
|
|||||||
|
|
||||||
QString MMCIcon::getFilePath() const
|
QString MMCIcon::getFilePath() const
|
||||||
{
|
{
|
||||||
if(m_current_type == IconType::ToBeDeleted){
|
if (m_current_type == IconType::ToBeDeleted) {
|
||||||
return QString();
|
return QString();
|
||||||
}
|
}
|
||||||
return m_images[m_current_type].filename;
|
return m_images[m_current_type].filename;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool MMCIcon::isBuiltIn() const
|
bool MMCIcon::isBuiltIn() const
|
||||||
{
|
{
|
||||||
return m_current_type == IconType::Builtin;
|
return m_current_type == IconType::Builtin;
|
||||||
|
@ -1,45 +1,52 @@
|
|||||||
/* Copyright 2013-2021 MultiMC Contributors
|
// SPDX-License-Identifier: GPL-3.0-only
|
||||||
|
/*
|
||||||
|
* Prism Launcher - Minecraft Launcher
|
||||||
|
* Copyright (c) 2023 Trial97 <alexandru.tripon97@gmail.com>
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* you may not use this file except in compliance with the License.
|
* it under the terms of the GNU General Public License as published by
|
||||||
* You may obtain a copy of the License at
|
* the Free Software Foundation, version 3.
|
||||||
*
|
*
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
* You should have received a copy of the GNU General Public License
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
*
|
||||||
* See the License for the specific language governing permissions and
|
* This file incorporates work covered by the following copyright and
|
||||||
* limitations under the License.
|
* permission notice:
|
||||||
|
*
|
||||||
|
* Copyright 2013-2021 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
|
#pragma once
|
||||||
#include <QString>
|
|
||||||
#include <QDateTime>
|
#include <QDateTime>
|
||||||
#include <QIcon>
|
#include <QIcon>
|
||||||
|
#include <QString>
|
||||||
|
|
||||||
enum IconType : unsigned
|
enum IconType : unsigned { Builtin, Transient, FileBased, ICONS_TOTAL, ToBeDeleted };
|
||||||
{
|
|
||||||
Builtin,
|
|
||||||
Transient,
|
|
||||||
FileBased,
|
|
||||||
ICONS_TOTAL,
|
|
||||||
ToBeDeleted
|
|
||||||
};
|
|
||||||
|
|
||||||
struct MMCImage
|
struct MMCImage {
|
||||||
{
|
|
||||||
QIcon icon;
|
QIcon icon;
|
||||||
QString key;
|
QString key;
|
||||||
QString filename;
|
QString filename;
|
||||||
bool present() const
|
bool present() const { return !icon.isNull() || !key.isEmpty(); }
|
||||||
{
|
|
||||||
return !icon.isNull() || !key.isEmpty();
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct MMCIcon
|
struct MMCIcon {
|
||||||
{
|
|
||||||
QString m_key;
|
QString m_key;
|
||||||
QString m_name;
|
QString m_name;
|
||||||
MMCImage m_images[ICONS_TOTAL];
|
MMCImage m_images[ICONS_TOTAL];
|
||||||
@ -51,7 +58,7 @@ struct MMCIcon
|
|||||||
QIcon icon() const;
|
QIcon icon() const;
|
||||||
void remove(IconType rm_type);
|
void remove(IconType rm_type);
|
||||||
void replace(IconType new_type, QIcon icon, QString path = QString());
|
void replace(IconType new_type, QIcon icon, QString path = QString());
|
||||||
void replace(IconType new_type, const QString &key);
|
void replace(IconType new_type, const QString& key);
|
||||||
bool isBuiltIn() const;
|
bool isBuiltIn() const;
|
||||||
QString getFilePath() const;
|
QString getFilePath() const;
|
||||||
};
|
};
|
||||||
|
@ -284,28 +284,27 @@ QString NewInstanceDialog::iconKey() const
|
|||||||
|
|
||||||
void NewInstanceDialog::on_iconButton_clicked()
|
void NewInstanceDialog::on_iconButton_clicked()
|
||||||
{
|
{
|
||||||
importIconNow(); //so the user can switch back
|
importIconNow(); // so the user can switch back
|
||||||
IconPickerDialog dlg(this);
|
IconPickerDialog dlg(this);
|
||||||
dlg.execWithSelection(InstIconKey);
|
dlg.execWithSelection(InstIconKey);
|
||||||
|
|
||||||
if (dlg.result() == QDialog::Accepted)
|
if (dlg.result() == QDialog::Accepted) {
|
||||||
{
|
|
||||||
InstIconKey = dlg.selectedIconKey;
|
InstIconKey = dlg.selectedIconKey;
|
||||||
ui->iconButton->setIcon(APPLICATION->icons()->getIcon(InstIconKey));
|
ui->iconButton->setIcon(APPLICATION->icons()->getIcon(InstIconKey));
|
||||||
importIcon = false;
|
importIcon = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void NewInstanceDialog::on_instNameTextBox_textChanged(const QString &arg1)
|
void NewInstanceDialog::on_instNameTextBox_textChanged(const QString& arg1)
|
||||||
{
|
{
|
||||||
updateDialogState();
|
updateDialogState();
|
||||||
}
|
}
|
||||||
|
|
||||||
void NewInstanceDialog::importIconNow()
|
void NewInstanceDialog::importIconNow()
|
||||||
{
|
{
|
||||||
if(importIcon) {
|
if (importIcon) {
|
||||||
APPLICATION->icons()->installIcon(importIconPath, importIconName);
|
APPLICATION->icons()->installIcon(importIconPath, importIconName);
|
||||||
InstIconKey = importIconName;
|
InstIconKey = importIconName.mid(0, importIconName.lastIndexOf('.'));
|
||||||
importIcon = false;
|
importIcon = false;
|
||||||
}
|
}
|
||||||
APPLICATION->settings()->set("NewInstanceGeometry", saveGeometry().toBase64());
|
APPLICATION->settings()->set("NewInstanceGeometry", saveGeometry().toBase64());
|
||||||
|
@ -139,8 +139,7 @@ void ListModel::requestFailed(QString reason)
|
|||||||
void ListModel::getLogo(const QString& logo, const QString& logoUrl, LogoCallback callback)
|
void ListModel::getLogo(const QString& logo, const QString& logoUrl, LogoCallback callback)
|
||||||
{
|
{
|
||||||
if (m_logoMap.contains(logo)) {
|
if (m_logoMap.contains(logo)) {
|
||||||
callback(
|
callback(APPLICATION->metacache()->resolveEntry("ATLauncherPacks", QString("logos/%1").arg(logo))->getFullPath());
|
||||||
APPLICATION->metacache()->resolveEntry("ATLauncherPacks", QString("logos/%1").arg(logo.section(".", 0, 0)))->getFullPath());
|
|
||||||
} else {
|
} else {
|
||||||
requestLogo(logo, logoUrl);
|
requestLogo(logo, logoUrl);
|
||||||
}
|
}
|
||||||
@ -170,7 +169,7 @@ void ListModel::requestLogo(QString file, QString url)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
MetaEntryPtr entry = APPLICATION->metacache()->resolveEntry("ATLauncherPacks", QString("logos/%1").arg(file.section(".", 0, 0)));
|
MetaEntryPtr entry = APPLICATION->metacache()->resolveEntry("ATLauncherPacks", QString("logos/%1").arg(file));
|
||||||
auto job = new NetJob(QString("ATLauncher Icon Download %1").arg(file), APPLICATION->network());
|
auto job = new NetJob(QString("ATLauncher Icon Download %1").arg(file), APPLICATION->network());
|
||||||
job->addNetAction(Net::ApiDownload::makeCached(QUrl(url), entry));
|
job->addNetAction(Net::ApiDownload::makeCached(QUrl(url), entry));
|
||||||
|
|
||||||
|
@ -42,14 +42,16 @@ QVariant ListModel::data(const QModelIndex& index, int role) const
|
|||||||
return edit;
|
return edit;
|
||||||
}
|
}
|
||||||
return pack.description;
|
return pack.description;
|
||||||
} case Qt::DecorationRole: {
|
}
|
||||||
|
case Qt::DecorationRole: {
|
||||||
if (m_logoMap.contains(pack.logoName)) {
|
if (m_logoMap.contains(pack.logoName)) {
|
||||||
return (m_logoMap.value(pack.logoName));
|
return (m_logoMap.value(pack.logoName));
|
||||||
}
|
}
|
||||||
QIcon icon = APPLICATION->getThemedIcon("screenshot-placeholder");
|
QIcon icon = APPLICATION->getThemedIcon("screenshot-placeholder");
|
||||||
((ListModel*)this)->requestLogo(pack.logoName, pack.logoUrl);
|
((ListModel*)this)->requestLogo(pack.logoName, pack.logoUrl);
|
||||||
return icon;
|
return icon;
|
||||||
} case Qt::UserRole: {
|
}
|
||||||
|
case Qt::UserRole: {
|
||||||
QVariant v;
|
QVariant v;
|
||||||
v.setValue(pack);
|
v.setValue(pack);
|
||||||
return v;
|
return v;
|
||||||
@ -70,7 +72,7 @@ QVariant ListModel::data(const QModelIndex& index, int role) const
|
|||||||
return QVariant();
|
return QVariant();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ListModel::setData(const QModelIndex &index, const QVariant &value, int role)
|
bool ListModel::setData(const QModelIndex& index, const QVariant& value, int role)
|
||||||
{
|
{
|
||||||
int pos = index.row();
|
int pos = index.row();
|
||||||
if (pos >= modpacks.size() || pos < 0 || !index.isValid())
|
if (pos >= modpacks.size() || pos < 0 || !index.isValid())
|
||||||
@ -104,7 +106,7 @@ void ListModel::requestLogo(QString logo, QString url)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
MetaEntryPtr entry = APPLICATION->metacache()->resolveEntry("FlamePacks", QString("logos/%1").arg(logo.section(".", 0, 0)));
|
MetaEntryPtr entry = APPLICATION->metacache()->resolveEntry("FlamePacks", QString("logos/%1").arg(logo));
|
||||||
auto job = new NetJob(QString("Flame Icon Download %1").arg(logo), APPLICATION->network());
|
auto job = new NetJob(QString("Flame Icon Download %1").arg(logo), APPLICATION->network());
|
||||||
job->addNetAction(Net::ApiDownload::makeCached(QUrl(url), entry));
|
job->addNetAction(Net::ApiDownload::makeCached(QUrl(url), entry));
|
||||||
|
|
||||||
@ -130,7 +132,7 @@ void ListModel::requestLogo(QString logo, QString url)
|
|||||||
void ListModel::getLogo(const QString& logo, const QString& logoUrl, LogoCallback callback)
|
void ListModel::getLogo(const QString& logo, const QString& logoUrl, LogoCallback callback)
|
||||||
{
|
{
|
||||||
if (m_logoMap.contains(logo)) {
|
if (m_logoMap.contains(logo)) {
|
||||||
callback(APPLICATION->metacache()->resolveEntry("FlamePacks", QString("logos/%1").arg(logo.section(".", 0, 0)))->getFullPath());
|
callback(APPLICATION->metacache()->resolveEntry("FlamePacks", QString("logos/%1").arg(logo))->getFullPath());
|
||||||
} else {
|
} else {
|
||||||
requestLogo(logo, logoUrl);
|
requestLogo(logo, logoUrl);
|
||||||
}
|
}
|
||||||
|
@ -42,9 +42,9 @@
|
|||||||
#include "FlameModel.h"
|
#include "FlameModel.h"
|
||||||
#include "InstanceImportTask.h"
|
#include "InstanceImportTask.h"
|
||||||
#include "Json.h"
|
#include "Json.h"
|
||||||
|
#include "modplatform/flame/FlameAPI.h"
|
||||||
#include "ui/dialogs/NewInstanceDialog.h"
|
#include "ui/dialogs/NewInstanceDialog.h"
|
||||||
#include "ui/widgets/ProjectItem.h"
|
#include "ui/widgets/ProjectItem.h"
|
||||||
#include "modplatform/flame/FlameAPI.h"
|
|
||||||
|
|
||||||
#include "net/ApiDownload.h"
|
#include "net/ApiDownload.h"
|
||||||
|
|
||||||
@ -209,7 +209,7 @@ void FlamePage::suggestCurrent()
|
|||||||
|
|
||||||
dialog->setSuggestedPack(current.name, new InstanceImportTask(version.downloadUrl, this, std::move(extra_info)));
|
dialog->setSuggestedPack(current.name, new InstanceImportTask(version.downloadUrl, this, std::move(extra_info)));
|
||||||
QString editedLogoName;
|
QString editedLogoName;
|
||||||
editedLogoName = "curseforge_" + current.logoName.section(".", 0, 0);
|
editedLogoName = "curseforge_" + current.logoName;
|
||||||
listModel->getLogo(current.logoName, current.logoUrl,
|
listModel->getLogo(current.logoName, current.logoUrl,
|
||||||
[this, editedLogoName](QString logo) { dialog->setSuggestedIconFromFile(logo, editedLogoName); });
|
[this, editedLogoName](QString logo) { dialog->setSuggestedIconFromFile(logo, editedLogoName); });
|
||||||
}
|
}
|
||||||
@ -254,10 +254,8 @@ void FlamePage::updateUi()
|
|||||||
text += "<br>" + tr(" by ") + authorStrs.join(", ");
|
text += "<br>" + tr(" by ") + authorStrs.join(", ");
|
||||||
}
|
}
|
||||||
|
|
||||||
if(current.extraInfoLoaded) {
|
if (current.extraInfoLoaded) {
|
||||||
if (!current.extra.issuesUrl.isEmpty()
|
if (!current.extra.issuesUrl.isEmpty() || !current.extra.sourceUrl.isEmpty() || !current.extra.wikiUrl.isEmpty()) {
|
||||||
|| !current.extra.sourceUrl.isEmpty()
|
|
||||||
|| !current.extra.wikiUrl.isEmpty()) {
|
|
||||||
text += "<br><br>" + tr("External links:") + "<br>";
|
text += "<br><br>" + tr("External links:") + "<br>";
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -269,7 +267,6 @@ void FlamePage::updateUi()
|
|||||||
text += "- " + tr("Source code: <a href=%1>%1</a>").arg(current.extra.sourceUrl) + "<br>";
|
text += "- " + tr("Source code: <a href=%1>%1</a>").arg(current.extra.sourceUrl) + "<br>";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
text += "<hr>";
|
text += "<hr>";
|
||||||
text += api.getModDescription(current.addonId).toUtf8();
|
text += api.getModDescription(current.addonId).toUtf8();
|
||||||
|
|
||||||
|
@ -230,7 +230,7 @@ void ListModel::requestLogo(QString file)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
MetaEntryPtr entry = APPLICATION->metacache()->resolveEntry("FTBPacks", QString("logos/%1").arg(file.section(".", 0, 0)));
|
MetaEntryPtr entry = APPLICATION->metacache()->resolveEntry("FTBPacks", QString("logos/%1").arg(file));
|
||||||
NetJob* job = new NetJob(QString("FTB Icon Download for %1").arg(file), APPLICATION->network());
|
NetJob* job = new NetJob(QString("FTB Icon Download for %1").arg(file), APPLICATION->network());
|
||||||
job->addNetAction(Net::ApiDownload::makeCached(QUrl(QString(BuildConfig.LEGACY_FTB_CDN_BASE_URL + "static/%1").arg(file)), entry));
|
job->addNetAction(Net::ApiDownload::makeCached(QUrl(QString(BuildConfig.LEGACY_FTB_CDN_BASE_URL + "static/%1").arg(file)), entry));
|
||||||
|
|
||||||
@ -256,7 +256,7 @@ void ListModel::requestLogo(QString file)
|
|||||||
void ListModel::getLogo(const QString& logo, LogoCallback callback)
|
void ListModel::getLogo(const QString& logo, LogoCallback callback)
|
||||||
{
|
{
|
||||||
if (m_logoMap.contains(logo)) {
|
if (m_logoMap.contains(logo)) {
|
||||||
callback(APPLICATION->metacache()->resolveEntry("FTBPacks", QString("logos/%1").arg(logo.section(".", 0, 0)))->getFullPath());
|
callback(APPLICATION->metacache()->resolveEntry("FTBPacks", QString("logos/%1").arg(logo))->getFullPath());
|
||||||
} else {
|
} else {
|
||||||
requestLogo(logo);
|
requestLogo(logo);
|
||||||
}
|
}
|
||||||
|
@ -220,9 +220,7 @@ void ModpackListModel::searchWithTerm(const QString& term, const int sort)
|
|||||||
void ModpackListModel::getLogo(const QString& logo, const QString& logoUrl, LogoCallback callback)
|
void ModpackListModel::getLogo(const QString& logo, const QString& logoUrl, LogoCallback callback)
|
||||||
{
|
{
|
||||||
if (m_logoMap.contains(logo)) {
|
if (m_logoMap.contains(logo)) {
|
||||||
callback(APPLICATION->metacache()
|
callback(APPLICATION->metacache()->resolveEntry(m_parent->metaEntryBase(), QString("logos/%1").arg(logo))->getFullPath());
|
||||||
->resolveEntry(m_parent->metaEntryBase(), QString("logos/%1").arg(logo.section(".", 0, 0)))
|
|
||||||
->getFullPath());
|
|
||||||
} else {
|
} else {
|
||||||
requestLogo(logo, logoUrl);
|
requestLogo(logo, logoUrl);
|
||||||
}
|
}
|
||||||
@ -234,8 +232,7 @@ void ModpackListModel::requestLogo(QString logo, QString url)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
MetaEntryPtr entry =
|
MetaEntryPtr entry = APPLICATION->metacache()->resolveEntry(m_parent->metaEntryBase(), QString("logos/%1").arg(logo));
|
||||||
APPLICATION->metacache()->resolveEntry(m_parent->metaEntryBase(), QString("logos/%1").arg(logo.section(".", 0, 0)));
|
|
||||||
auto job = new NetJob(QString("%1 Icon Download %2").arg(m_parent->debugName()).arg(logo), APPLICATION->network());
|
auto job = new NetJob(QString("%1 Icon Download %2").arg(m_parent->debugName()).arg(logo), APPLICATION->network());
|
||||||
job->addNetAction(Net::ApiDownload::makeCached(QUrl(url), entry));
|
job->addNetAction(Net::ApiDownload::makeCached(QUrl(url), entry));
|
||||||
|
|
||||||
|
@ -159,7 +159,7 @@ void Technic::ListModel::searchRequestFinished()
|
|||||||
pack.logoName = "null";
|
pack.logoName = "null";
|
||||||
} else {
|
} else {
|
||||||
pack.logoUrl = rawURL;
|
pack.logoUrl = rawURL;
|
||||||
pack.logoName = rawURL.section(QLatin1Char('/'), -1).section(QLatin1Char('.'), 0, 0);
|
pack.logoName = rawURL.section(QLatin1Char('/'), -1);
|
||||||
}
|
}
|
||||||
pack.broken = false;
|
pack.broken = false;
|
||||||
newList.append(pack);
|
newList.append(pack);
|
||||||
@ -181,7 +181,7 @@ void Technic::ListModel::searchRequestFinished()
|
|||||||
auto iconUrl = Json::requireString(iconObj, "url");
|
auto iconUrl = Json::requireString(iconObj, "url");
|
||||||
|
|
||||||
pack.logoUrl = iconUrl;
|
pack.logoUrl = iconUrl;
|
||||||
pack.logoName = iconUrl.section(QLatin1Char('/'), -1).section(QLatin1Char('.'), 0, 0);
|
pack.logoName = iconUrl.section(QLatin1Char('/'), -1);
|
||||||
} else {
|
} else {
|
||||||
pack.logoUrl = "null";
|
pack.logoUrl = "null";
|
||||||
pack.logoName = "null";
|
pack.logoName = "null";
|
||||||
|
@ -131,14 +131,11 @@ void TechnicPage::suggestCurrent()
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
QString editedLogoName = "technic_" + current.logoName.section(".", 0, 0);
|
QString editedLogoName = "technic_" + current.logoName;
|
||||||
model->getLogo(current.logoName, current.logoUrl, [this, editedLogoName](QString logo)
|
model->getLogo(current.logoName, current.logoUrl,
|
||||||
{
|
[this, editedLogoName](QString logo) { dialog->setSuggestedIconFromFile(logo, editedLogoName); });
|
||||||
dialog->setSuggestedIconFromFile(logo, editedLogoName);
|
|
||||||
});
|
|
||||||
|
|
||||||
if (current.metadataLoaded)
|
if (current.metadataLoaded) {
|
||||||
{
|
|
||||||
metadataLoaded();
|
metadataLoaded();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user