From d2073ef2bd62527034864fd0cacd5537aff33218 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Sat, 30 Nov 2019 05:37:34 -0500
Subject: made all categories positive fixed context menu sometimes appearing

---
 src/categories.cpp       | 16 ++++++++--------
 src/categories.h         |  8 ++++----
 src/filterlist.cpp       | 10 +++++-----
 src/mainwindow.ui        |  3 +++
 src/modlistsortproxy.cpp | 29 ++++++++++++++++-------------
 5 files changed, 36 insertions(+), 30 deletions(-)

(limited to 'src')

diff --git a/src/categories.cpp b/src/categories.cpp
index 1bd56f7f..5c9a4d55 100644
--- a/src/categories.cpp
+++ b/src/categories.cpp
@@ -324,15 +324,15 @@ QString CategoryFactory::getSpecialCategoryName(SpecialCategories type) const
 {
   switch (type)
   {
-    case Checked:         return QObject::tr("<Checked>");
-    case UpdateAvailable: return QObject::tr("<Update>");
-    case HasNoCategory:      return QObject::tr("<No category>");
+    case Checked:         return QObject::tr("<Active>");
+    case UpdateAvailable: return QObject::tr("<Update available>");
+    case HasCategory:     return QObject::tr("<Has category>");
     case Conflict:        return QObject::tr("<Conflicted>");
-    case NotEndorsed:     return QObject::tr("<Not Endorsed>");
-    case Backup:          return QObject::tr("<Mod Backup>");
-    case Managed:         return QObject::tr("<Managed by MO>");
-    case NoGameData:      return QObject::tr("<No valid game data>");
-    case NoNexusID:       return QObject::tr("<No Nexus ID>");
+    case Endorsed:        return QObject::tr("<Endorsed>");
+    case Backup:          return QObject::tr("<Has backup>");
+    case Managed:         return QObject::tr("<Managed>");
+    case HasGameData:     return QObject::tr("<Has valid game data>");
+    case HasNexusID:      return QObject::tr("<Has Nexus ID>");
     default: return {};
   }
 }
diff --git a/src/categories.h b/src/categories.h
index 296e7711..02695e4d 100644
--- a/src/categories.h
+++ b/src/categories.h
@@ -41,13 +41,13 @@ public:
   {
     Checked = 10000,
     UpdateAvailable,
-    HasNoCategory,
+    HasCategory,
     Conflict,
-    NotEndorsed,
+    Endorsed,
     Backup,
     Managed,
-    NoGameData,
-    NoNexusID
+    HasGameData,
+    HasNexusID
   };
 
 public:
diff --git a/src/filterlist.cpp b/src/filterlist.cpp
index 0dee8544..b65f0f4a 100644
--- a/src/filterlist.cpp
+++ b/src/filterlist.cpp
@@ -11,7 +11,7 @@ using Criteria = ModListSortProxy::Criteria;
 class FilterList::CriteriaItem : public QTreeWidgetItem
 {
 public:
-  enum States : int
+  enum States
   {
     FirstState = 0,
 
@@ -234,11 +234,11 @@ void FilterList::refresh()
   addSpecialCriteria(F::UpdateAvailable);
   addSpecialCriteria(F::Backup);
   addSpecialCriteria(F::Managed);
-  addSpecialCriteria(F::HasNoCategory);
+  addSpecialCriteria(F::HasCategory);
   addSpecialCriteria(F::Conflict);
-  addSpecialCriteria(F::NotEndorsed);
-  addSpecialCriteria(F::NoNexusID);
-  addSpecialCriteria(F::NoGameData);
+  addSpecialCriteria(F::Endorsed);
+  addSpecialCriteria(F::HasNexusID);
+  addSpecialCriteria(F::HasGameData);
 
   addContentCriteria();
 
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index 1a64dfdd..92a41c67 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -76,6 +76,9 @@
             <height>0</height>
            </size>
           </property>
+          <property name="contextMenuPolicy">
+           <enum>Qt::NoContextMenu</enum>
+          </property>
           <property name="selectionMode">
            <enum>QAbstractItemView::NoSelection</enum>
           </property>
diff --git a/src/modlistsortproxy.cpp b/src/modlistsortproxy.cpp
index e6bed49c..fd3dbc9e 100644
--- a/src/modlistsortproxy.cpp
+++ b/src/modlistsortproxy.cpp
@@ -371,9 +371,9 @@ bool ModListSortProxy::categoryMatchesMod(
       break;
     }
 
-    case CategoryFactory::HasNoCategory:
+    case CategoryFactory::HasCategory:
     {
-      b = (info->getCategories().size() == 0);
+      b = !info->getCategories().empty();
       break;
     }
 
@@ -383,10 +383,9 @@ bool ModListSortProxy::categoryMatchesMod(
       break;
     }
 
-    case CategoryFactory::NotEndorsed:
+    case CategoryFactory::Endorsed:
     {
-      ModInfo::EEndorsedState state = info->endorsedState();
-      b = (state != ModInfo::ENDORSED_TRUE);
+      b = (info->endorsedState() == ModInfo::ENDORSED_TRUE);
       break;
     }
 
@@ -402,20 +401,24 @@ bool ModListSortProxy::categoryMatchesMod(
       break;
     }
 
-    case CategoryFactory::NoGameData:
+    case CategoryFactory::HasGameData:
     {
-      b = (info->hasFlag(ModInfo::FLAG_INVALID));
+      b = !info->hasFlag(ModInfo::FLAG_INVALID);
       break;
     }
 
-    case CategoryFactory::NoNexusID:
+    case CategoryFactory::HasNexusID:
     {
-      b = (
-        info->getNexusID() == -1 &&
-        !info->hasFlag(ModInfo::FLAG_FOREIGN) &&
-        !info->hasFlag(ModInfo::FLAG_BACKUP) &&
-        !info->hasFlag(ModInfo::FLAG_OVERWRITE));
+      // never show these
+      if (
+        info->hasFlag(ModInfo::FLAG_FOREIGN) ||
+        info->hasFlag(ModInfo::FLAG_BACKUP) ||
+        info->hasFlag(ModInfo::FLAG_OVERWRITE))
+      {
+        return false;
+      }
 
+      b = (info->getNexusID() > 0);
       break;
     }
 
-- 
cgit v1.3.1