GH-3720 Fix UI inconsistencies with Modplatforms

Fixes GH-3118
Fixes GH-3720
Fixes GH-3731

Icons and Ok button state will now switch consistently when moving
between tabs. ATLaunchers packlist is now no longer redownloaded
each time you open its Tab. All lists are striped now. And all
search and filter fields now have a placeholder text.

13 files changed, 198 insertions, 117 deletions

diff --git a/application/pages/modplatform/ImportPage.cpp b/application/pages/modplatform/ImportPage.cpp
index 3910dfda..c2369bdc 100644
--- a/application/pages/modplatform/ImportPage.cpp
+++ b/application/pages/modplatform/ImportPage.cpp
@@ -71,6 +71,7 @@ void ImportPage::updateState()
             {
                 QFileInfo fi(url.fileName());
                 dialog->setSuggestedPack(fi.completeBaseName(), new InstanceImportTask(url));
+                dialog->setSuggestedIcon("default");
             }
         }
         else
@@ -83,6 +84,7 @@ void ImportPage::updateState()
             // hook, line and sinker.
             QFileInfo fi(url.fileName());
             dialog->setSuggestedPack(fi.completeBaseName(), new InstanceImportTask(url));
+            dialog->setSuggestedIcon("default");
         }
     }
     else
diff --git a/application/pages/modplatform/VanillaPage.cpp b/application/pages/modplatform/VanillaPage.cpp
index 17535f1e..02638315 100644
--- a/application/pages/modplatform/VanillaPage.cpp
+++ b/application/pages/modplatform/VanillaPage.cpp
@@ -82,10 +82,19 @@ BaseVersionPtr VanillaPage::selectedVersion() const
 
 void VanillaPage::suggestCurrent()
 {
-    if(m_selectedVersion && isOpened)
+    if (!isOpened)
     {
-        dialog->setSuggestedPack(m_selectedVersion->descriptor(), new InstanceCreationTask(m_selectedVersion));
+        return;
     }
+        
+    if(!m_selectedVersion)
+    {
+        dialog->setSuggestedPack();
+        return;
+    }
+
+    dialog->setSuggestedPack(m_selectedVersion->descriptor(), new InstanceCreationTask(m_selectedVersion));
+    dialog->setSuggestedIcon("default");
 }
 
 void VanillaPage::setSelectedVersion(BaseVersionPtr version)
diff --git a/application/pages/modplatform/atlauncher/AtlPage.cpp b/application/pages/modplatform/atlauncher/AtlPage.cpp
index 748f467c..1b61ebd0 100644
--- a/application/pages/modplatform/atlauncher/AtlPage.cpp
+++ b/application/pages/modplatform/atlauncher/AtlPage.cpp
@@ -45,15 +45,29 @@ bool AtlPage::shouldDisplay() const
 
 void AtlPage::openedImpl()
 {
-    listModel->request();
+    if(!initialized)
+    {
+        listModel->request();
+        initialized = true;
+    }
+
+    suggestCurrent();
 }
 
 void AtlPage::suggestCurrent()
 {
-    if(isOpened) {
-        dialog->setSuggestedPack(selected.name, new ATLauncher::PackInstallTask(this, selected.safeName, selectedVersion));
+    if(!isOpened)
+    {
+        return;
+    }
+
+    if (selectedVersion.isEmpty())
+    {
+        dialog->setSuggestedPack();
+        return;
     }
 
+    dialog->setSuggestedPack(selected.name, new ATLauncher::PackInstallTask(this, selected.safeName, selectedVersion));
     auto editedLogoName = selected.safeName;
     auto url = QString(BuildConfig.ATL_DOWNLOAD_SERVER_URL + "launcher/images/%1.png").arg(selected.safeName.toLower());
     listModel->getLogo(selected.safeName, url, [this, editedLogoName](QString logo)
diff --git a/application/pages/modplatform/atlauncher/AtlPage.h b/application/pages/modplatform/atlauncher/AtlPage.h
index 6a89b609..18f8b1c6 100644
--- a/application/pages/modplatform/atlauncher/AtlPage.h
+++ b/application/pages/modplatform/atlauncher/AtlPage.h
@@ -81,4 +81,6 @@ private:
 
     ATLauncher::IndexedPack selected;
     QString selectedVersion;
+
+    bool initialized = false;
 };
diff --git a/application/pages/modplatform/atlauncher/AtlPage.ui b/application/pages/modplatform/atlauncher/AtlPage.ui
index bb0d5310..0860a873 100644
--- a/application/pages/modplatform/atlauncher/AtlPage.ui
+++ b/application/pages/modplatform/atlauncher/AtlPage.ui
@@ -21,6 +21,9 @@
          <height>48</height>
         </size>
        </property>
+       <property name="alternatingRowColors">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
      <item row="1" column="1">
@@ -48,7 +51,14 @@
    <item row="2" column="0" colspan="2">
     <layout class="QGridLayout" name="gridLayout_4" columnstretch="0,0,0" rowminimumheight="0" columnminimumwidth="0,0,0">
      <item row="0" column="2">
-      <widget class="QComboBox" name="versionSelectionBox"/>
+      <widget class="QComboBox" name="versionSelectionBox">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+      </widget>
      </item>
      <item row="0" column="1">
       <widget class="QLabel" name="label">
diff --git a/application/pages/modplatform/flame/FlamePage.cpp b/application/pages/modplatform/flame/FlamePage.cpp
index 171d8d65..2dd58e16 100644
--- a/application/pages/modplatform/flame/FlamePage.cpp
+++ b/application/pages/modplatform/flame/FlamePage.cpp
@@ -18,6 +18,8 @@ FlamePage::FlamePage(NewInstanceDialog* dialog, QWidget *parent)
     ui->packView->setModel(listModel);
 
     ui->versionSelectionBox->setMaxVisibleItems(10);
+    // fix height for themes that dont respect max visible like fusion
+    ui->versionSelectionBox->setStyleSheet("combobox-popup: 0;");
 
     // index is used to set the sorting with the curseforge api
     ui->sortByBox->addItem(tr("Sort by featured"));
@@ -157,6 +159,12 @@ void FlamePage::suggestCurrent()
         return;
     }
 
+    if (selectedVersion.isEmpty())
+    {
+        dialog->setSuggestedPack();
+        return;
+    }
+
     dialog->setSuggestedPack(current.name, new InstanceImportTask(selectedVersion));
     QString editedLogoName;
     editedLogoName = "curseforge_" + current.logoName.section(".", 0, 0);
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">
diff --git a/application/pages/modplatform/legacy_ftb/Page.cpp b/application/pages/modplatform/legacy_ftb/Page.cpp
index 8e40ba9e..3bcc42c1 100644
--- a/application/pages/modplatform/legacy_ftb/Page.cpp
+++ b/application/pages/modplatform/legacy_ftb/Page.cpp
@@ -122,49 +122,50 @@ void Page::openedImpl()
 
 void Page::suggestCurrent()
 {
-    if(isOpened)
+    if(!isOpened)
     {
-        if(!selected.broken)
-        {
-            dialog->setSuggestedPack(selected.name, new PackInstallTask(selected, selectedVersion));
-            QString editedLogoName;
-            if(selected.logo.toLower().startsWith("ftb"))
-            {
-                editedLogoName = selected.logo;
-            }
-            else
-            {
-                editedLogoName = "ftb_" + selected.logo;
-            }
+        return;
+    }
 
-            editedLogoName = editedLogoName.left(editedLogoName.lastIndexOf(".png"));
+    if(!selected.broken || !selectedVersion.isEmpty())
+    {
+        dialog->setSuggestedPack();
+        return;
+    }
 
-            if(selected.type == PackType::Public)
-            {
-                publicListModel->getLogo(selected.logo, [this, editedLogoName](QString logo)
-                {
-                    dialog->setSuggestedIconFromFile(logo, editedLogoName);
-                });
-            }
-            else if (selected.type == PackType::ThirdParty)
-            {
-                thirdPartyModel->getLogo(selected.logo, [this, editedLogoName](QString logo)
-                {
-                    dialog->setSuggestedIconFromFile(logo, editedLogoName);
-                });
-            }
-            else if (selected.type == PackType::Private)
-            {
-                privateListModel->getLogo(selected.logo, [this, editedLogoName](QString logo)
-                {
-                    dialog->setSuggestedIconFromFile(logo, editedLogoName);
-                });
-            }
-        }
-        else
+    dialog->setSuggestedPack(selected.name, new PackInstallTask(selected, selectedVersion));
+    QString editedLogoName;
+    if(selected.logo.toLower().startsWith("ftb"))
+    {
+        editedLogoName = selected.logo;
+    }
+    else
+    {
+        editedLogoName = "ftb_" + selected.logo;
+    }
+
+    editedLogoName = editedLogoName.left(editedLogoName.lastIndexOf(".png"));
+
+    if(selected.type == PackType::Public)
+    {
+        publicListModel->getLogo(selected.logo, [this, editedLogoName](QString logo)
         {
-            dialog->setSuggestedPack();
-        }
+            dialog->setSuggestedIconFromFile(logo, editedLogoName);
+        });
+    }
+    else if (selected.type == PackType::ThirdParty)
+    {
+        thirdPartyModel->getLogo(selected.logo, [this, editedLogoName](QString logo)
+        {
+            dialog->setSuggestedIconFromFile(logo, editedLogoName);
+        });
+    }
+    else if (selected.type == PackType::Private)
+    {
+        privateListModel->getLogo(selected.logo, [this, editedLogoName](QString logo)
+        {
+            dialog->setSuggestedIconFromFile(logo, editedLogoName);
+        });
     }
 }
 
diff --git a/application/pages/modplatform/legacy_ftb/Page.ui b/application/pages/modplatform/legacy_ftb/Page.ui
index 36fb2359..15e5d432 100644
--- a/application/pages/modplatform/legacy_ftb/Page.ui
+++ b/application/pages/modplatform/legacy_ftb/Page.ui
@@ -29,6 +29,9 @@
            <height>16777215</height>
           </size>
          </property>
+         <property name="alternatingRowColors">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item row="0" column="1">
@@ -52,6 +55,9 @@
            <height>16777215</height>
           </size>
          </property>
+         <property name="alternatingRowColors">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
       </layout>
@@ -69,6 +75,9 @@
            <height>16777215</height>
           </size>
          </property>
+         <property name="alternatingRowColors">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item row="1" column="0">
diff --git a/application/pages/modplatform/technic/TechnicModel.cpp b/application/pages/modplatform/technic/TechnicModel.cpp
index bf256ab6..a240a94a 100644
--- a/application/pages/modplatform/technic/TechnicModel.cpp
+++ b/application/pages/modplatform/technic/TechnicModel.cpp
@@ -72,7 +72,7 @@ int Technic::ListModel::rowCount(const QModelIndex&) const
 
 void Technic::ListModel::searchWithTerm(const QString& term)
 {
-    if(currentSearchTerm == term) {
+    if(currentSearchTerm == term && currentSearchTerm.isNull() == term.isNull()) {
         return;
     }
     currentSearchTerm = term;
@@ -93,9 +93,18 @@ void Technic::ListModel::searchWithTerm(const QString& term)
 void Technic::ListModel::performSearch()
 {
     NetJob *netJob = new NetJob("Technic::Search");
-    auto searchUrl = QString(
-        "https://api.technicpack.net/search?build=multimc&q=%1"
-    ).arg(currentSearchTerm);
+    QString searchUrl = "";
+    if (currentSearchTerm.isEmpty()) {
+        searchUrl = QString(
+            "https://api.technicpack.net/trending?build=multimc"
+        ).arg(currentSearchTerm);
+    }
+    else
+    {
+        searchUrl = QString(
+            "https://api.technicpack.net/search?build=multimc&q=%1"
+        ).arg(currentSearchTerm);
+    }
     netJob->addNetAction(Net::Download::makeByteArray(QUrl(searchUrl), &response));
     jobPtr = netJob;
     jobPtr->start();
diff --git a/application/pages/modplatform/technic/TechnicPage.cpp b/application/pages/modplatform/technic/TechnicPage.cpp
index d246edf2..e836f767 100644
--- a/application/pages/modplatform/technic/TechnicPage.cpp
+++ b/application/pages/modplatform/technic/TechnicPage.cpp
@@ -60,7 +60,8 @@ bool TechnicPage::shouldDisplay() const
 
 void TechnicPage::openedImpl()
 {
-    dialog->setSuggestedPack();
+    suggestCurrent();
+    triggerSearch();
 }
 
 void TechnicPage::triggerSearch() {
@@ -95,8 +96,7 @@ void TechnicPage::suggestCurrent()
         return;
     }
 
-    QString editedLogoName;
-    editedLogoName = "technic_" + current.logoName.section(".", 0, 0);
+    QString editedLogoName = "technic_" + current.logoName.section(".", 0, 0);
     model->getLogo(current.logoName, current.logoUrl, [this, editedLogoName](QString logo)
     {
         dialog->setSuggestedIconFromFile(logo, editedLogoName);
@@ -105,67 +105,66 @@ void TechnicPage::suggestCurrent()
     if (current.metadataLoaded)
     {
         metadataLoaded();
+        return;
     }
-    else
+    
+    NetJob *netJob = new NetJob(QString("Technic::PackMeta(%1)").arg(current.name));
+    std::shared_ptr<QByteArray> response = std::make_shared<QByteArray>();
+    QString slug = current.slug;
+    netJob->addNetAction(Net::Download::makeByteArray(QString("https://api.technicpack.net/modpack/%1?build=multimc").arg(slug), response.get()));
+    QObject::connect(netJob, &NetJob::succeeded, this, [this, response, slug]
     {
-        NetJob *netJob = new NetJob(QString("Technic::PackMeta(%1)").arg(current.name));
-        std::shared_ptr<QByteArray> response = std::make_shared<QByteArray>();
-        QString slug = current.slug;
-        netJob->addNetAction(Net::Download::makeByteArray(QString("https://api.technicpack.net/modpack/%1?build=multimc").arg(slug), response.get()));
-        QObject::connect(netJob, &NetJob::succeeded, this, [this, response, slug]
+        if (current.slug != slug)
         {
-            if (current.slug != slug)
-            {
-                return;
-            }
-            QJsonParseError parse_error;
-            QJsonDocument doc = QJsonDocument::fromJson(*response, &parse_error);
-            QJsonObject obj = doc.object();
-            if(parse_error.error != QJsonParseError::NoError)
-            {
-                qWarning() << "Error while parsing JSON response from Technic at " << parse_error.offset << " reason: " << parse_error.errorString();
-                qWarning() << *response;
-                return;
-            }
-            if (!obj.contains("url"))
+            return;
+        }
+        QJsonParseError parse_error;
+        QJsonDocument doc = QJsonDocument::fromJson(*response, &parse_error);
+        QJsonObject obj = doc.object();
+        if(parse_error.error != QJsonParseError::NoError)
+        {
+            qWarning() << "Error while parsing JSON response from Technic at " << parse_error.offset << " reason: " << parse_error.errorString();
+            qWarning() << *response;
+            return;
+        }
+        if (!obj.contains("url"))
+        {
+            qWarning() << "Json doesn't contain an url key";
+            return;
+        }
+        QJsonValueRef url = obj["url"];
+        if (url.isString())
+        {
+            current.url = url.toString();
+        }
+        else
+        {
+            if (!obj.contains("solder"))
             {
-                qWarning() << "Json doesn't contain an url key";
+                qWarning() << "Json doesn't contain a valid url or solder key";
                 return;
             }
-            QJsonValueRef url = obj["url"];
-            if (url.isString())
+            QJsonValueRef solderUrl = obj["solder"];
+            if (solderUrl.isString())
             {
-                current.url = url.toString();
+                current.url = solderUrl.toString();
+                current.isSolder = true;
             }
             else
             {
-                if (!obj.contains("solder"))
-                {
-                    qWarning() << "Json doesn't contain a valid url or solder key";
-                    return;
-                }
-                QJsonValueRef solderUrl = obj["solder"];
-                if (solderUrl.isString())
-                {
-                    current.url = solderUrl.toString();
-                    current.isSolder = true;
-                }
-                else
-                {
-                    qWarning() << "Json doesn't contain a valid url or solder key";
-                    return;
-                }
+                qWarning() << "Json doesn't contain a valid url or solder key";
+                return;
             }
+        }
 
-            current.minecraftVersion = Json::ensureString(obj, "minecraft", QString(), "__placeholder__");
-            current.websiteUrl = Json::ensureString(obj, "platformUrl", QString(), "__placeholder__");
-            current.author = Json::ensureString(obj, "user", QString(), "__placeholder__");
-            current.description = Json::ensureString(obj, "description", QString(), "__placeholder__");
-            current.metadataLoaded = true;
-            metadataLoaded();
-        });
-        netJob->start();
-    }
+        current.minecraftVersion = Json::ensureString(obj, "minecraft", QString(), "__placeholder__");
+        current.websiteUrl = Json::ensureString(obj, "platformUrl", QString(), "__placeholder__");
+        current.author = Json::ensureString(obj, "user", QString(), "__placeholder__");
+        current.description = Json::ensureString(obj, "description", QString(), "__placeholder__");
+        current.metadataLoaded = true;
+        metadataLoaded();
+    });
+    netJob->start();
 }
 
 // expects current.metadataLoaded to be true
diff --git a/application/pages/modplatform/technic/TechnicPage.ui b/application/pages/modplatform/technic/TechnicPage.ui
index 36ce2ecf..2ca45dd2 100644
--- a/application/pages/modplatform/technic/TechnicPage.ui
+++ b/application/pages/modplatform/technic/TechnicPage.ui
@@ -27,7 +27,11 @@
        <number>0</number>
       </property>
       <item>
-       <widget class="QLineEdit" name="searchEdit"/>
+       <widget class="QLineEdit" name="searchEdit">
+        <property name="placeholderText">
+         <string>Search and filter ...</string>
+        </property>
+       </widget>
       </item>
       <item>
        <widget class="QPushButton" name="searchButton">