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 createGotoActions(const ConflictItem* item); }; -- cgit v1.3.1