From a6edf645eb82c754209106593018b410c9422431 Mon Sep 17 00:00:00 2001
From: AL <26797547+Al12rs@users.noreply.github.com>
Date: Fri, 30 Oct 2020 01:52:27 +0100
Subject: Add advanced counters as tooltip to general conflicts tab. Loose,
 archive, totals, percentages.

---
 src/modinfodialogconflicts.h | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

(limited to 'src/modinfodialogconflicts.h')

diff --git a/src/modinfodialogconflicts.h b/src/modinfodialogconflicts.h
index 945f464d..d840c0dd 100644
--- a/src/modinfodialogconflicts.h
+++ b/src/modinfodialogconflicts.h
@@ -51,6 +51,39 @@ private:
   FilterWidget m_filterOverwritten;
   FilterWidget m_filterNoConflicts;
 
+  struct GeneralConflictNumbers
+  {
+    int numTotalFiles = 0;
+    int numTotalLoose = 0;
+    int numTotalArchive = 0;
+    int numNonConflicting = 0;
+    int numNonConflictingLoose = 0;
+    int numNonConflictingArchive = 0;
+    int numOverwrite = 0;
+    int numOverwriteLoose = 0;
+    int numOverwriteArchive = 0;
+    int numOverwritten = 0;
+    int numOverwrittenLoose = 0;
+    int numOverwrittenArchive = 0;
+
+    void clear() {
+      numTotalFiles = 0;
+      numTotalLoose = 0;
+      numTotalArchive = 0;
+      numNonConflicting = 0;
+      numNonConflictingLoose = 0;
+      numNonConflictingArchive = 0;
+      numOverwrite = 0;
+      numOverwriteLoose = 0;
+      numOverwriteArchive = 0;
+      numOverwritten = 0;
+      numOverwrittenLoose = 0;
+      numOverwrittenArchive = 0;
+    };
+  };
+
+  GeneralConflictNumbers m_counts;
+
   ConflictItem createOverwriteItem(
     MOShared::FileIndex index, bool archive,
     QString fileName, QString relativeName,
@@ -64,6 +97,8 @@ private:
     MOShared::FileIndex index, int fileOrigin, bool archive,
     QString fileName, QString relativeName);
 
+  void updateUICounters();
+
   void onOverwriteActivated(const QModelIndex& index);
   void onOverwrittenActivated(const QModelIndex& index);
 };
@@ -141,6 +176,8 @@ private:
   GeneralConflictsTab m_general;
   AdvancedConflictsTab m_advanced;
 
+  
+
   Actions createMenuActions(QTreeView* tree);
   std::vector<QAction*> createGotoActions(const ConflictItem* item);
 };
-- 
cgit v1.3.1


From ad4e8897fffbfa4164cd776dde2571540fcdfe69 Mon Sep 17 00:00:00 2001
From: AL <26797547+Al12rs@users.noreply.github.com>
Date: Sat, 31 Oct 2020 16:38:49 +0100
Subject: Remove random extra whitespace

---
 src/modinfodialogconflicts.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/modinfodialogconflicts.h')

diff --git a/src/modinfodialogconflicts.h b/src/modinfodialogconflicts.h
index d840c0dd..5c0e9158 100644
--- a/src/modinfodialogconflicts.h
+++ b/src/modinfodialogconflicts.h
@@ -176,8 +176,6 @@ private:
   GeneralConflictsTab m_general;
   AdvancedConflictsTab m_advanced;
 
-  
-
   Actions createMenuActions(QTreeView* tree);
   std::vector<QAction*> createGotoActions(const ConflictItem* item);
 };
-- 
cgit v1.3.1


From d330a9d74b88a4d24c2e97b877c2641c94984737 Mon Sep 17 00:00:00 2001
From: AL <26797547+Al12rs@users.noreply.github.com>
Date: Sat, 31 Oct 2020 17:54:56 +0100
Subject: Cleanup clear()

---
 src/modinfodialogconflicts.cpp |  3 ++-
 src/modinfodialogconflicts.h   | 13 +------------
 2 files changed, 3 insertions(+), 13 deletions(-)

(limited to 'src/modinfodialogconflicts.h')

diff --git a/src/modinfodialogconflicts.cpp b/src/modinfodialogconflicts.cpp
index 358571d6..f7a27bf8 100644
--- a/src/modinfodialogconflicts.cpp
+++ b/src/modinfodialogconflicts.cpp
@@ -593,6 +593,8 @@ GeneralConflictsTab::GeneralConflictsTab(
 
 void GeneralConflictsTab::clear()
 {
+  m_counts.clear();
+
   m_overwriteModel->clear();
   m_overwrittenModel->clear();
   m_noConflictModel->clear();
@@ -625,7 +627,6 @@ void GeneralConflictsTab::restoreState(const Settings& s)
 bool GeneralConflictsTab::update()
 {
   clear();
-  m_counts.clear();
 
   if (m_tab->origin() != nullptr) {
     const auto rootPath = m_tab->mod().absolutePath();
diff --git a/src/modinfodialogconflicts.h b/src/modinfodialogconflicts.h
index 5c0e9158..db195e3d 100644
--- a/src/modinfodialogconflicts.h
+++ b/src/modinfodialogconflicts.h
@@ -67,18 +67,7 @@ private:
     int numOverwrittenArchive = 0;
 
     void clear() {
-      numTotalFiles = 0;
-      numTotalLoose = 0;
-      numTotalArchive = 0;
-      numNonConflicting = 0;
-      numNonConflictingLoose = 0;
-      numNonConflictingArchive = 0;
-      numOverwrite = 0;
-      numOverwriteLoose = 0;
-      numOverwriteArchive = 0;
-      numOverwritten = 0;
-      numOverwrittenLoose = 0;
-      numOverwrittenArchive = 0;
+      *this = {};
     };
   };
 
-- 
cgit v1.3.1