Merge pull request #913 from isanae/negative-filters

Negative filters

1 files changed, 7 insertions, 11 deletions

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 0c96c15d..69aee073 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -39,6 +39,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 class Executable;
 class CategoryFactory;
 class OrganizerCore;
+class FilterList;
 
 class PluginListSortProxy;
 namespace BSA { class Archive; }
@@ -235,8 +236,6 @@ private:
 
   void writeDataToFile(QFile &file, const QString &directory, const MOShared::DirectoryEntry &directoryEntry);
 
-  void refreshFilters();
-
   /**
    * Sets category selections from menu; for multiple mods, this will only apply
    * the changes made in the menu (which is the delta between the current menu selection and the reference mod)
@@ -266,10 +265,6 @@ private:
 
   size_t checkForProblems();
 
-  QTreeWidgetItem *addFilterItem(QTreeWidgetItem *root, const QString &name, int categoryID, ModListSortProxy::FilterType type);
-  void addContentFilters();
-  void addCategoryFilters(QTreeWidgetItem *root, const std::set<int> &categoriesUsed, int targetID);
-
   void setCategoryListVisible(bool visible);
 
   void displaySaveGameInfo(QListWidgetItem *newItem);
@@ -327,6 +322,8 @@ private:
 
   MOBase::TutorialControl m_Tutorial;
 
+  std::unique_ptr<FilterList> m_Filters;
+
   int m_OldProfileIndex;
 
   std::vector<QString> m_ModNameList; // the mod-list to go with the directory structure
@@ -515,8 +512,11 @@ private slots:
 
   void onRequestsChanged(const APIStats& stats, const APIUserAccount& user);
 
-  void editCategories();
   void deselectFilters();
+  void refreshFilters();
+  void onFiltersCriteria(const std::vector<ModListSortProxy::Criteria>& filters);
+  void onFiltersOptions(
+    ModListSortProxy::FilterMode mode, ModListSortProxy::SeparatorsMode sep);
 
   void displayModInformation(const QString &modName, ModInfoTabIDs tabID);
 
@@ -630,7 +630,6 @@ private slots: // ui slots
   void on_clearFiltersButton_clicked();
   void on_btnRefreshData_clicked();
   void on_btnRefreshDownloads_clicked();
-  void on_categoriesList_customContextMenuRequested(const QPoint &pos);
   void on_conflictsCheckBox_toggled(bool checked);
   void on_showArchiveDataCheckBox_toggled(bool checked);
   void on_dataTree_customContextMenuRequested(const QPoint &pos);
@@ -647,7 +646,6 @@ private slots: // ui slots
   void on_espList_customContextMenuRequested(const QPoint &pos);
   void on_displayCategoriesBtn_toggled(bool checked);
   void on_groupCombo_currentIndexChanged(int index);
-  void on_categoriesList_itemSelectionChanged();
   void on_linkButton_pressed();
   void on_showHiddenBox_toggled(bool checked);
   void on_bsaList_itemChanged(QTreeWidgetItem *item, int column);
@@ -657,8 +655,6 @@ private slots: // ui slots
   void on_restoreButton_clicked();
   void on_restoreModsButton_clicked();
   void on_saveModsButton_clicked();
-  void on_categoriesAndBtn_toggled(bool checked);
-  void on_categoriesOrBtn_toggled(bool checked);
   void on_managedArchiveLabel_linkHovered(const QString &link);
 
   void storeSettings();