From 175132539b14be2681bfbaf3f380f0a9b8a69a26 Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <jmansfield@cadixdev.org>
Date: Sat, 16 Oct 2021 23:31:27 +0100
Subject: NOISSUE Filter all pack's by name to search for modpacks.ch

modpacks.ch searching has changed, and while likely a bug - we may as
well make this change while we fetch all packs anyway. This makes MMC
more reactive for searchs for the platform.

This should be reverted if/when the modpacks.ch hits a size where we
need to restrict how many packs are fetched.
---
 launcher/pages/modplatform/ftb/FtbPage.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'launcher/pages/modplatform/ftb/FtbPage.cpp')

diff --git a/launcher/pages/modplatform/ftb/FtbPage.cpp b/launcher/pages/modplatform/ftb/FtbPage.cpp
index b7f35c5d..5917b979 100644
--- a/launcher/pages/modplatform/ftb/FtbPage.cpp
+++ b/launcher/pages/modplatform/ftb/FtbPage.cpp
@@ -63,7 +63,12 @@ bool FtbPage::shouldDisplay() const
 
 void FtbPage::openedImpl()
 {
-    triggerSearch();
+    if(!initialised)
+    {
+        listModel->request();
+        initialised = true;
+    }
+
     suggestCurrent();
 }
 
@@ -96,7 +101,7 @@ void FtbPage::suggestCurrent()
 
 void FtbPage::triggerSearch()
 {
-    listModel->searchWithTerm(ui->searchEdit->text());
+    filterModel->setSearchTerm(ui->searchEdit->text());
 }
 
 void FtbPage::onSortingSelectionChanged(QString data)
-- 
cgit 


From 1869dd0de3bf490abb0fe789236dd6f6909ecf8d Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <jmansfield@cadixdev.org>
Date: Sat, 16 Oct 2021 23:36:31 +0100
Subject: NOISSUE Search as you type for modpacks.ch

Since we just filter data locally now, this isn't painfully slow -
indeed it's very quick. This also matches other platforms, such as
ATLauncher.
---
 launcher/pages/modplatform/ftb/FtbPage.cpp |  8 +++++++-
 launcher/pages/modplatform/ftb/FtbPage.h   |  2 ++
 launcher/pages/modplatform/ftb/FtbPage.ui  | 12 ++++++------
 3 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'launcher/pages/modplatform/ftb/FtbPage.cpp')

diff --git a/launcher/pages/modplatform/ftb/FtbPage.cpp b/launcher/pages/modplatform/ftb/FtbPage.cpp
index 5917b979..aca93cfe 100644
--- a/launcher/pages/modplatform/ftb/FtbPage.cpp
+++ b/launcher/pages/modplatform/ftb/FtbPage.cpp
@@ -32,7 +32,8 @@ FtbPage::FtbPage(NewInstanceDialog* dialog, QWidget *parent)
     }
     ui->sortByBox->setCurrentText(filterModel->translateCurrentSorting());
 
-    connect(ui->searchButton, &QPushButton::clicked, this, &FtbPage::triggerSearch);
+    connect(ui->searchEdit, &QLineEdit::textChanged, this, &FtbPage::triggerSearch);
+    connect(ui->resetButton, &QPushButton::clicked, this, &FtbPage::resetSearch);
     connect(ui->sortByBox, &QComboBox::currentTextChanged, this, &FtbPage::onSortingSelectionChanged);
     connect(ui->packView->selectionModel(), &QItemSelectionModel::currentChanged, this, &FtbPage::onSelectionChanged);
     connect(ui->versionSelectionBox, &QComboBox::currentTextChanged, this, &FtbPage::onVersionSelectionChanged);
@@ -104,6 +105,11 @@ void FtbPage::triggerSearch()
     filterModel->setSearchTerm(ui->searchEdit->text());
 }
 
+void FtbPage::resetSearch()
+{
+    ui->searchEdit->setText("");
+}
+
 void FtbPage::onSortingSelectionChanged(QString data)
 {
     auto toSet = filterModel->getAvailableSortings().value(data);
diff --git a/launcher/pages/modplatform/ftb/FtbPage.h b/launcher/pages/modplatform/ftb/FtbPage.h
index bca09e25..0dfac1a4 100644
--- a/launcher/pages/modplatform/ftb/FtbPage.h
+++ b/launcher/pages/modplatform/ftb/FtbPage.h
@@ -65,6 +65,8 @@ private:
 
 private slots:
     void triggerSearch();
+    void resetSearch();
+
     void onSortingSelectionChanged(QString data);
     void onSelectionChanged(QModelIndex first, QModelIndex second);
     void onVersionSelectionChanged(QString data);
diff --git a/launcher/pages/modplatform/ftb/FtbPage.ui b/launcher/pages/modplatform/ftb/FtbPage.ui
index 135afc6d..dc800497 100644
--- a/launcher/pages/modplatform/ftb/FtbPage.ui
+++ b/launcher/pages/modplatform/ftb/FtbPage.ui
@@ -39,9 +39,9 @@
     </widget>
    </item>
    <item row="0" column="1">
-    <widget class="QPushButton" name="searchButton">
+    <widget class="QPushButton" name="resetButton">
      <property name="text">
-      <string>Search</string>
+      <string>Reset</string>
      </property>
     </widget>
    </item>
@@ -49,15 +49,15 @@
     <layout class="QGridLayout" name="gridLayout_3">
      <item row="0" column="0">
       <widget class="QTreeView" name="packView">
+       <property name="alternatingRowColors">
+        <bool>true</bool>
+       </property>
        <property name="iconSize">
         <size>
          <width>48</width>
          <height>48</height>
         </size>
        </property>
-       <property name="alternatingRowColors">
-        <bool>true</bool>
-       </property>
       </widget>
      </item>
      <item row="0" column="1">
@@ -76,7 +76,7 @@
  </widget>
  <tabstops>
   <tabstop>searchEdit</tabstop>
-  <tabstop>searchButton</tabstop>
+  <tabstop>resetButton</tabstop>
   <tabstop>versionSelectionBox</tabstop>
  </tabstops>
  <resources/>
-- 
cgit 


From b93997501d3c18832d0511abaf1514e73494bf56 Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <jmansfield@cadixdev.org>
Date: Sun, 17 Oct 2021 20:14:16 +0100
Subject: NOISSUE Use Qt's clear button for modpacks.ch page

This replaces our 'Reset' button.
---
 launcher/pages/modplatform/ftb/FtbPage.cpp | 6 ------
 launcher/pages/modplatform/ftb/FtbPage.h   | 1 -
 launcher/pages/modplatform/ftb/FtbPage.ui  | 9 ++-------
 3 files changed, 2 insertions(+), 14 deletions(-)

(limited to 'launcher/pages/modplatform/ftb/FtbPage.cpp')

diff --git a/launcher/pages/modplatform/ftb/FtbPage.cpp b/launcher/pages/modplatform/ftb/FtbPage.cpp
index aca93cfe..bafcfac9 100644
--- a/launcher/pages/modplatform/ftb/FtbPage.cpp
+++ b/launcher/pages/modplatform/ftb/FtbPage.cpp
@@ -33,7 +33,6 @@ FtbPage::FtbPage(NewInstanceDialog* dialog, QWidget *parent)
     ui->sortByBox->setCurrentText(filterModel->translateCurrentSorting());
 
     connect(ui->searchEdit, &QLineEdit::textChanged, this, &FtbPage::triggerSearch);
-    connect(ui->resetButton, &QPushButton::clicked, this, &FtbPage::resetSearch);
     connect(ui->sortByBox, &QComboBox::currentTextChanged, this, &FtbPage::onSortingSelectionChanged);
     connect(ui->packView->selectionModel(), &QItemSelectionModel::currentChanged, this, &FtbPage::onSelectionChanged);
     connect(ui->versionSelectionBox, &QComboBox::currentTextChanged, this, &FtbPage::onVersionSelectionChanged);
@@ -105,11 +104,6 @@ void FtbPage::triggerSearch()
     filterModel->setSearchTerm(ui->searchEdit->text());
 }
 
-void FtbPage::resetSearch()
-{
-    ui->searchEdit->setText("");
-}
-
 void FtbPage::onSortingSelectionChanged(QString data)
 {
     auto toSet = filterModel->getAvailableSortings().value(data);
diff --git a/launcher/pages/modplatform/ftb/FtbPage.h b/launcher/pages/modplatform/ftb/FtbPage.h
index 0dfac1a4..25b531fb 100644
--- a/launcher/pages/modplatform/ftb/FtbPage.h
+++ b/launcher/pages/modplatform/ftb/FtbPage.h
@@ -65,7 +65,6 @@ private:
 
 private slots:
     void triggerSearch();
-    void resetSearch();
 
     void onSortingSelectionChanged(QString data);
     void onSelectionChanged(QModelIndex first, QModelIndex second);
diff --git a/launcher/pages/modplatform/ftb/FtbPage.ui b/launcher/pages/modplatform/ftb/FtbPage.ui
index dc800497..e9c783e3 100644
--- a/launcher/pages/modplatform/ftb/FtbPage.ui
+++ b/launcher/pages/modplatform/ftb/FtbPage.ui
@@ -36,12 +36,8 @@
      <property name="placeholderText">
       <string>Search and filter ...</string>
      </property>
-    </widget>
-   </item>
-   <item row="0" column="1">
-    <widget class="QPushButton" name="resetButton">
-     <property name="text">
-      <string>Reset</string>
+     <property name="clearButtonEnabled">
+      <bool>true</bool>
      </property>
     </widget>
    </item>
@@ -76,7 +72,6 @@
  </widget>
  <tabstops>
   <tabstop>searchEdit</tabstop>
-  <tabstop>resetButton</tabstop>
   <tabstop>versionSelectionBox</tabstop>
  </tabstops>
  <resources/>
-- 
cgit