diff options
author | Janrupf <werbung.janrupf@t-online.de> | 2018-04-01 20:24:28 +0200 |
---|---|---|
committer | Janrupf <werbung.janrupf@t-online.de> | 2018-04-02 23:02:33 +0200 |
commit | bbd523acb8bf846d27a7859d1d79f28ea92de245 (patch) | |
tree | b8cb693f9558b99e27f730840ca1764da08495d2 /application/pages/modplatform/FTBPage.h | |
parent | 67d2f283da3bf9538e6a31de3759cd959010b36c (diff) | |
download | MultiMC-bbd523acb8bf846d27a7859d1d79f28ea92de245.tar MultiMC-bbd523acb8bf846d27a7859d1d79f28ea92de245.tar.gz MultiMC-bbd523acb8bf846d27a7859d1d79f28ea92de245.tar.lz MultiMC-bbd523acb8bf846d27a7859d1d79f28ea92de245.tar.xz MultiMC-bbd523acb8bf846d27a7859d1d79f28ea92de245.zip |
NOISSUE Added FTB Pack logos to chooser and fixed some missing includes
Diffstat (limited to 'application/pages/modplatform/FTBPage.h')
-rw-r--r-- | application/pages/modplatform/FTBPage.h | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/application/pages/modplatform/FTBPage.h b/application/pages/modplatform/FTBPage.h index f7d6ca8b..ba8dd299 100644 --- a/application/pages/modplatform/FTBPage.h +++ b/application/pages/modplatform/FTBPage.h @@ -21,6 +21,7 @@ #include <MultiMC.h> #include "tasks/Task.h" #include "modplatform/ftb/PackHelpers.h" +#include "modplatform/ftb/FtbPackFetchTask.h" namespace Ui { @@ -29,7 +30,6 @@ class FTBPage; class FtbListModel; class FtbFilterModel; -class FtbPackDownloader; class NewInstanceDialog; class FTBPage : public QWidget, public BasePage @@ -58,28 +58,36 @@ public: bool shouldDisplay() const override; void openedImpl() override; - FtbPackDownloader* getFtbPackDownloader(); FtbModpack getSelectedModpack(); QString getSelectedVersion(); private: void suggestCurrent(); + void onPackSelectionChanged(QModelIndex first, QModelIndex second, FtbFilterModel *model); private slots: - void ftbPackDataDownloadSuccessfully(); - void ftbPackDataDownloadFailed(); + void ftbPackDataDownloadSuccessfully(FtbModpackList publicPacks, FtbModpackList thirdPartyPacks); + void ftbPackDataDownloadFailed(QString reason); + void onSortingSelectionChanged(QString data); void onVersionSelectionItemChanged(QString data); - void onPackSelectionChanged(QModelIndex first, QModelIndex second); + + void onPublicPackSelectionChanged(QModelIndex first, QModelIndex second); + void onThirdPartyPackSelectionChanged(QModelIndex first, QModelIndex second); private: bool initialized = false; - FtbPackDownloader* ftbPackDownloader = nullptr; FtbModpack selectedPack; FtbModpack selected; QString selectedVersion; - FtbListModel* listModel = nullptr; - FtbFilterModel* filterModel = nullptr; + + FtbListModel* publicListModel = nullptr; + FtbFilterModel* publicFilterModel = nullptr; + + FtbListModel *thirdPartyModel = nullptr; + FtbFilterModel *thirdPartyFilterModel = nullptr; + + FtbPackFetchTask *ftbFetchTask; NewInstanceDialog* dialog = nullptr; Ui::FTBPage *ui = nullptr; |