From 3c25117fe163f7fab7afa22ba171ea2d41112f23 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Mon, 2 Dec 2019 10:41:52 -0500
Subject: three modes for separators, save state renamed enumerators

---
 src/mainwindow.cpp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'src/mainwindow.cpp')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 096ea076..b5af9aa5 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -269,7 +269,7 @@ MainWindow::MainWindow(Settings &settings
 
   connect(
     m_Filters.get(), &FilterList::optionsChanged,
-    [&](auto mode, bool sep) { onFiltersOptions(mode, sep); });
+    [&](auto&& mode, auto&& sep) { onFiltersOptions(mode, sep); });
 
   ui->logList->setCore(m_OrganizerCore);
 
@@ -2205,6 +2205,7 @@ void MainWindow::readSettings()
   }
 
   s.widgets().restoreIndex(ui->groupCombo);
+  m_Filters->restoreState(s);
 
   {
     s.geometry().restoreVisibility(ui->categoriesGroup, false);
@@ -2283,6 +2284,8 @@ void MainWindow::storeSettings()
 
   s.widgets().saveIndex(ui->groupCombo);
   s.widgets().saveIndex(ui->executablesListBox);
+
+  m_Filters->saveState(s);
 }
 
 QWidget* MainWindow::qtWidget()
@@ -4125,13 +4128,13 @@ void MainWindow::checkModsForUpdates()
 
   if (updatesAvailable || checkingModsForUpdate) {
     m_ModListSortProxy->setCriteria({{
-        ModListSortProxy::TYPE_SPECIAL,
+        ModListSortProxy::TypeSpecial,
         CategoryFactory::UpdateAvailable,
         false}
     });
 
     m_Filters->setSelection({{
-      ModListSortProxy::TYPE_SPECIAL,
+      ModListSortProxy::TypeSpecial,
       CategoryFactory::UpdateAvailable,
       false
     }});
@@ -6131,7 +6134,7 @@ void MainWindow::onFiltersCriteria(const std::vector<ModListSortProxy::Criteria>
   } else if (criteria.size() == 1) {
     const auto& c = criteria[0];
 
-    if (c.type == ModListSortProxy::TYPE_CONTENT) {
+    if (c.type == ModListSortProxy::TypeContent) {
       label = ModInfo::getContentTypeName(c.id);
     } else {
       label = m_CategoryFactory.getCategoryNameByID(c.id);
@@ -6148,9 +6151,10 @@ void MainWindow::onFiltersCriteria(const std::vector<ModListSortProxy::Criteria>
   ui->modList->reset();
 }
 
-void MainWindow::onFiltersOptions(ModListSortProxy::FilterMode mode, bool separators)
+void MainWindow::onFiltersOptions(
+  ModListSortProxy::FilterMode mode, ModListSortProxy::SeparatorsMode sep)
 {
-  m_ModListSortProxy->setOptions(mode, separators);
+  m_ModListSortProxy->setOptions(mode, sep);
 }
 
 void MainWindow::updateESPLock(bool locked)
-- 
cgit v1.3.1