summaryrefslogtreecommitdiff
path: root/src/modinfodialogconflicts.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/modinfodialogconflicts.h')
-rw-r--r--src/modinfodialogconflicts.h37
1 files changed, 37 insertions, 0 deletions
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);
};