External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-12-31 12:47:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge pull request #9 from MultiMC/develop"

Browse Source 
This reverts commit ccc86e4e02, reversing
changes made to 306c655ab5.
This commit is contained in:
Sebastian-byte
2021-07-13 19:44:51 -05:00
parent 5019fafeb7
commit 869a92b2a2
100 changed files with 275 additions and 4805 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
application/pages/modplatform/ftb/FtbPage.cpp
View File

@@ -23,9 +23,6 @@ FtbPage::FtbPage(NewInstanceDialog* dialog, QWidget *parent)
ui->searchEdit->installEventFilter(this);
ui->versionSelectionBox->view()->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
ui->versionSelectionBox->view()->parentWidget()->setMaximumHeight(300);
for(int i = 0; i < filterModel->getAvailableSortings().size(); i++)
{
ui->sortByBox->addItem(filterModel->getAvailableSortings().keys().at(i));
@@ -63,33 +60,26 @@ bool FtbPage::shouldDisplay() const
void FtbPage::openedImpl()
{
dialog->setSuggestedPack();
triggerSearch();
suggestCurrent();
}
void FtbPage::suggestCurrent()
{
if(!isOpened)
if(isOpened)
{
return;
}
dialog->setSuggestedPack(selected.name, new ModpacksCH::PackInstallTask(selected, selectedVersion));
if (selectedVersion.isEmpty())
{
dialog->setSuggestedPack();
return;
}
for(auto art : selected.art) {
if(art.type == "square") {
QString editedLogoName;
editedLogoName = selected.name;
dialog->setSuggestedPack(selected.name, new ModpacksCH::PackInstallTask(selected, selectedVersion));
for(auto art : selected.art) {
if(art.type == "square") {
QString editedLogoName;
editedLogoName = selected.name;
listModel->getLogo(selected.name, art.url, [this, editedLogoName](QString logo)
{
dialog->setSuggestedIconFromFile(logo + ".small", editedLogoName);
});
listModel->getLogo(selected.name, art.url, [this, editedLogoName](QString logo)
{
dialog->setSuggestedIconFromFile(logo + ".small", editedLogoName);
});
}
}
}
}