add author search type

Author: noisecode3

src/LevelViewList.cpp

@@ -230,22 +230,32 @@ void LevelListProxy::setSearchFilter(const QString &s) {
     invalidateFilter();
 }
 
+void LevelListProxy::setSearchType(const QString &t) {
+    if (t == "Level") {
+        m_searchType = 0;
+    } else if (t ==  "Author") {
+        m_searchType = 1;
+    }
+    invalidateFilter();
+}
+
 void LevelListProxy::setInstalledFilter(bool on) {
     m_installed = on;
     invalidateFilter();
 }
 
 void LevelListProxy::setSortMode(SortMode mode) {
-    qDebug() << "LevelListProxy::setSortMode";
-    Qt::SortOrder order;
-    if (m_sortMode == mode){
-        order = Qt::AscendingOrder;
+    if (m_sortMode == mode) {
+        // same mode, toggle order
+        m_sortOrder = (m_sortOrder == Qt::AscendingOrder) ?
+                        Qt::DescendingOrder : Qt::AscendingOrder;
     } else {
+        // new mode, reset order
         m_sortMode = mode;
-        order = Qt::DescendingOrder;
+        m_sortOrder = Qt::DescendingOrder;
     }
     invalidate();
-    this->sort(0, order);
+    this->sort(0, m_sortOrder);
 }
 
 bool LevelListProxy::lessThan(const QModelIndex &left,
@@ -314,10 +324,18 @@ bool LevelListProxy::filterAcceptsRow(int sourceRow,
     }
 
     if (status == true) {
-        auto title = sourceModel()->data(idx, Qt::DisplayRole).toString();
-        if (!m_search.isEmpty() &&
-                !title.contains(m_search, Qt::CaseInsensitive)) {
-            status = false;
+        if (m_searchType == 0) {
+            auto title = sourceModel()->data(idx, Qt::DisplayRole).toString();
+            if (!m_search.isEmpty() &&
+                    !title.contains(m_search, Qt::CaseInsensitive)) {
+                status = false;
+            }
+        } else if (m_searchType == 1) {
+            auto authors = sourceModel()->data(idx, Qt::UserRole+6).toString();
+            if (!m_search.isEmpty() &&
+                    !authors.contains(m_search, Qt::CaseInsensitive)) {
+                status = false;
+            }
         }
     }
 

src/LevelViewList.hpp

@@ -101,6 +101,7 @@ class LevelListProxy : public QSortFilterProxyModel {
         m_type(0),
         m_difficulty(0),
         m_duration(0),
+        m_searchType(0),
         m_all(" - All -"),
         m_installed(false),
         m_sortMode(ReleaseDate)
@@ -115,6 +116,7 @@ class LevelListProxy : public QSortFilterProxyModel {
     void setDifficultyFilter(const QString &d);
     void setDurationFilter(const QString &d);
     void setSearchFilter(const QString &s);
+    void setSearchType(const QString &t);
     void setInstalledFilter(bool on);
 
     enum SortMode {
@@ -145,9 +147,11 @@ class LevelListProxy : public QSortFilterProxyModel {
         Qt::UserRole+3
     };
     SortMode m_sortMode = ReleaseDate;
+    Qt::SortOrder m_sortOrder = Qt::DescendingOrder;
     quint64 m_class, m_type, m_difficulty, m_duration;
     const QString m_all;
     QString m_search;
+    quint64 m_searchType;
     bool m_installed;
 };
 

src/TombRaiderLinuxLauncher.cpp

@@ -137,10 +137,12 @@ TombRaiderLinuxLauncher::TombRaiderLinuxLauncher(QWidget *parent)
         this,
         &TombRaiderLinuxLauncher::onCurrentItemChanged);
 
-
     connect(ui->checkBoxInstalled, &QCheckBox::toggled,
             levelListProxy, &LevelListProxy::setInstalledFilter);
 
+    connect(ui->comboBoxSearch, &QComboBox::currentTextChanged,
+            levelListProxy, &LevelListProxy::setSearchType);
+
     connect(ui->lineEditSearch, &QLineEdit::textChanged,
             levelListProxy, &LevelListProxy::setSearchFilter);
 
@@ -164,6 +166,9 @@ TombRaiderLinuxLauncher::TombRaiderLinuxLauncher(QWidget *parent)
     ui->Tabs->setTabEnabled(
         ui->Tabs->indexOf(ui->Tabs->findChild<QWidget*>("Modding")), false);
 
+    ui->Tabs->setTabEnabled(
+        ui->Tabs->indexOf(ui->Tabs->findChild<QWidget*>("Controller")), false);
+
     // Read settings
     QString value = g_settings.value("setup").toString();
     if (value != "yes") {
@@ -472,6 +477,10 @@ QVector<QPair<QString, QString>>
 void TombRaiderLinuxLauncher::runClicked() {
     if (m_current.isValid()) {
         ui->listViewLevels->setEnabled(false);
+        ui->groupBoxSearch->setEnabled(false);
+        ui->groupBoxFilter->setEnabled(false);
+        ui->groupBoxToggle->setEnabled(false);
+        ui->groupBoxSort->setEnabled(false);
         ui->pushButtonRun->setEnabled(false);
         ui->checkBoxSetup->setEnabled(false);
 
@@ -543,6 +552,10 @@ void TombRaiderLinuxLauncher::runClicked() {
 
 void TombRaiderLinuxLauncher::runningLevelDone() {
     ui->listViewLevels->setEnabled(true);
+    ui->groupBoxSearch->setEnabled(true);
+    ui->groupBoxFilter->setEnabled(true);
+    ui->groupBoxToggle->setEnabled(true);
+    ui->groupBoxSort->setEnabled(true);
     ui->pushButtonRun->setEnabled(true);
     ui->checkBoxSetup->setEnabled(true);
 }
@@ -551,8 +564,12 @@ void TombRaiderLinuxLauncher::downloadClicked() {
     if (m_current.isValid()) {
         qint64 id = levelListProxy->getLid(m_current);
         qDebug() << "void TombRaiderLinuxLauncher" <<
-                    "::downloadClicked() quint64 id: " << id; 
+                    "::downloadClicked() qint64 id: " << id;
         ui->listViewLevels->setEnabled(false);
+        ui->groupBoxSearch->setEnabled(false);
+        ui->groupBoxFilter->setEnabled(false);
+        ui->groupBoxToggle->setEnabled(false);
+        ui->groupBoxSort->setEnabled(false);
         ui->progressBar->setValue(0);
         ui->stackedWidgetBar->setCurrentWidget(
             ui->stackedWidgetBar->findChild<QWidget*>("progress"));
@@ -687,6 +704,10 @@ void TombRaiderLinuxLauncher::workTick() {
             ui->stackedWidgetBar->setCurrentWidget(
                 ui->stackedWidgetBar->findChild<QWidget*>("navigate"));
             ui->listViewLevels->setEnabled(true);
+            ui->groupBoxSearch->setEnabled(true);
+            ui->groupBoxFilter->setEnabled(true);
+            ui->groupBoxToggle->setEnabled(true);
+            ui->groupBoxSort->setEnabled(true);
         }
     }
 }