aboutsummaryrefslogtreecommitdiff
path: root/application/pages/modplatform/ftb
diff options
context:
space:
mode:
Diffstat (limited to 'application/pages/modplatform/ftb')
-rw-r--r--application/pages/modplatform/ftb/FtbPage.cpp35
-rw-r--r--application/pages/modplatform/ftb/FtbPage.ui9
2 files changed, 29 insertions, 15 deletions
diff --git a/application/pages/modplatform/ftb/FtbPage.cpp b/application/pages/modplatform/ftb/FtbPage.cpp
index dd2ff666..b49982d5 100644
--- a/application/pages/modplatform/ftb/FtbPage.cpp
+++ b/application/pages/modplatform/ftb/FtbPage.cpp
@@ -60,26 +60,33 @@ bool FtbPage::shouldDisplay() const
void FtbPage::openedImpl()
{
- dialog->setSuggestedPack();
triggerSearch();
+ suggestCurrent();
}
void FtbPage::suggestCurrent()
{
- if(isOpened)
+ if(!isOpened)
+ {
+ return;
+ }
+
+ if (selectedVersion.isEmpty())
{
- 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);
- });
- }
+ dialog->setSuggestedPack();
+ return;
+ }
+
+ 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);
+ });
}
}
}
diff --git a/application/pages/modplatform/ftb/FtbPage.ui b/application/pages/modplatform/ftb/FtbPage.ui
index 475d78bb..135afc6d 100644
--- a/application/pages/modplatform/ftb/FtbPage.ui
+++ b/application/pages/modplatform/ftb/FtbPage.ui
@@ -32,7 +32,11 @@
</layout>
</item>
<item row="0" column="0">
- <widget class="QLineEdit" name="searchEdit"/>
+ <widget class="QLineEdit" name="searchEdit">
+ <property name="placeholderText">
+ <string>Search and filter ...</string>
+ </property>
+ </widget>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="searchButton">
@@ -51,6 +55,9 @@
<height>48</height>
</size>
</property>
+ <property name="alternatingRowColors">
+ <bool>true</bool>
+ </property>
</widget>
</item>
<item row="0" column="1">