fede/prismlauncher-crack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97
2023-11-17 22:26:17 +02:00
parent 10ae808da9 1150249cec
commit 2bfb5fc138
119 changed files with 7407 additions and 904 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
launcher/ui/pages/modplatform/atlauncher/AtlListModel.h
View File

@@ -24,8 +24,8 @@
namespace Atl {
typedef QMap<QString, QIcon> LogoMap;
typedef std::function<void(QString)> LogoCallback;
using LogoMap = QMap<QString, QIcon>;
using LogoCallback = std::function<void(QString)>;
class ListModel : public QAbstractListModel {
Q_OBJECT

4
launcher/ui/pages/modplatform/flame/FlameModel.h
View File

@@ -19,8 +19,8 @@
namespace Flame {
typedef QMap<QString, QIcon> LogoMap;
typedef std::function<void(QString)> LogoCallback;
using LogoMap = QMap<QString, QIcon>;
using LogoCallback = std::function<void(QString)>;
class ListModel : public QAbstractListModel {
Q_OBJECT

2
launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.cpp
View File

@@ -90,7 +90,7 @@ void ImportFTBPage::suggestCurrent()
}
dialog->setSuggestedPack(selected.name, new PackInstallTask(selected));
QString editedLogoName = QString("ftb_%1_%2,jpg").arg(selected.name, selected.id);
QString editedLogoName = QString("ftb_%1_%2.jpg").arg(selected.name, QString::number(selected.id));
dialog->setSuggestedIconFromFile(FS::PathCombine(selected.path, "folder.jpg"), editedLogoName);
}

4
launcher/ui/pages/modplatform/legacy_ftb/ListModel.h
View File

@@ -13,8 +13,8 @@
namespace LegacyFTB {
typedef QMap<QString, QIcon> FTBLogoMap;
typedef std::function<void(QString)> LogoCallback;
using FTBLogoMap = QMap<QString, QIcon>;
using LogoCallback = std::function<void(QString)>;
class FilterModel : public QSortFilterProxyModel {
Q_OBJECT

2
launcher/ui/pages/modplatform/technic/TechnicModel.h
View File

@@ -42,7 +42,7 @@
namespace Technic {
typedef std::function<void(QString)> LogoCallback;
using LogoCallback = std::function<void(QString)>;
class ListModel : public QAbstractListModel {
Q_OBJECT