mirror/MultiMC5
1
0
Fork 0
mirror of https://github.com/MultiMC/MultiMC5.git synced 2024-12-27 03:14:49 +00:00
Code Issues Projects Releases Wiki Activity

NOISSUE Added 3rd party pack support

Browse Source
This commit is contained in:
Janrupf 2018-04-05 19:33:31 +02:00
parent bbd523acb8
commit df6e66101c
4 changed files with 47 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
application/FtbListModel.cpp
View File

@ -172,22 +172,20 @@ void FtbListModel::requestLogo(QString file)
return;
}
MetaEntryPtr entry = ENV.metacache()->resolveEntry("FTBPacks", QString("logos/%1").arg(file));
MetaEntryPtr entry = ENV.metacache()->resolveEntry("FTBPacks", QString("logos/%1").arg(file.section(".", 0, 0)));
NetJob *job = new NetJob(QString("FTB Icon Download for %1").arg(file));
job->addNetAction(Net::Download::makeCached(QUrl(QString("https://ftb.cursecdn.com/FTB2/static/%1").arg(file)), entry));
QString *_file = new QString(file);
MetaEntry *_entry = entry.get();
QObject::connect(job, &NetJob::finished, this, [this, _file, _entry]{
auto fullPath = entry->getFullPath();
QObject::connect(job, &NetJob::finished, this, [this, file, fullPath]{
QPixmap pixmap;
pixmap.load(_entry->getFullPath());
pixmap.load(fullPath);
pixmap = pixmap.scaled(QSize(42, 42));
emit logoLoaded(*_file, pixmap);
emit logoLoaded(file, pixmap);
});
QObject::connect(job, &NetJob::failed, this, [this, _file]{
emit logoFailed(*_file);
QObject::connect(job, &NetJob::failed, this, [this, file]{
emit logoFailed(file);
});
job->start();

11
application/pages/modplatform/FTBPage.cpp
View File

@ -53,7 +53,12 @@ FTBPage::FTBPage(NewInstanceDialog* dialog, QWidget *parent)
connect(ui->publicPackList->selectionModel(), &QItemSelectionModel::currentChanged, this, &FTBPage::onPublicPackSelectionChanged);
connect(ui->thirdPartyPackList->selectionModel(), &QItemSelectionModel::currentChanged, this, &FTBPage::onThirdPartyPackSelectionChanged);
connect(ui->ftbTabWidget, &QTabWidget::currentChanged, this, &FTBPage::onTabChanged);
ui->modpackInfo->setOpenExternalLinks(true);
ui->publicPackList->selectionModel()->reset();
ui->thirdPartyPackList->selectionModel()->reset();
}
FTBPage::~FTBPage()
@ -172,3 +177,9 @@ void FTBPage::onSortingSelectionChanged(QString data)
publicFilterModel->setSorting(toSet);
thirdPartyFilterModel->setSorting(toSet);
}
void FTBPage::onTabChanged(int tab)
{
ui->publicPackList->selectionModel()->reset();
ui->thirdPartyPackList->selectionModel()->reset();
}

2
application/pages/modplatform/FTBPage.h
View File

@ -75,6 +75,8 @@ private slots:
void onPublicPackSelectionChanged(QModelIndex first, QModelIndex second);
void onThirdPartyPackSelectionChanged(QModelIndex first, QModelIndex second);
void onTabChanged(int tab);
private:
bool initialized = false;
FtbModpack selectedPack;

56
application/pages/modplatform/FTBPage.ui
View File

@ -10,7 +10,7 @@
<height>602</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<layout class="QVBoxLayout" name="verticalLayout">
<property name="leftMargin">
<number>0</number>
</property>
@ -23,7 +23,7 @@
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0">
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>0</number>
@ -57,7 +57,7 @@
<widget class="QComboBox" name="sortByBox"/>
</item>
<item row="0" column="0" rowspan="2">
<widget class="QTabWidget" name="tabWidget_2">
<widget class="QTabWidget" name="ftbTabWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch>
@ -74,37 +74,35 @@
<attribute name="title">
<string>Public Packs</string>
</attribute>
<widget class="QTreeView" name="publicPackList">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>221</width>
<height>491</height>
</rect>
</property>
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOn</enum>
</property>
</widget>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QTreeView" name="publicPackList">
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAsNeeded</enum>
</property>
<property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_3">
<attribute name="title">
<string>3rd Party Packs</string>
</attribute>
<widget class="QTreeView" name="thirdPartyPackList">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>221</width>
<height>491</height>
</rect>
</property>
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOn</enum>
</property>
</widget>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QTreeView" name="thirdPartyPackList">
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAsNeeded</enum>
</property>
<property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</item>