switched ini Option FlatList -> GroupResults

Author: daddel80

src/MultiReplacePanel.cpp

@@ -6161,15 +6161,12 @@ void MultiReplace::handleFindAllButton()
         }
 
         // (d) Build dock text
-        std::wstring header =
-            flatListEnabled
-            ? L"Search in List – flat (" + std::to_wstring(totalHits) + L" hits in 1 file)\r\n"
-            : L"Search in List (" + std::to_wstring(totalHits) + L" hits in 1 file)\r\n";
+        std::wstring header = L"Search in List (" + std::to_wstring(totalHits) + L" hits in 1 file)\r\n";
 
         std::wstring dockText;
         dock.buildListText(
             /* files: */    fileMap,
-            /* flatView: */ flatListEnabled,
+            /* groupView:*/ groupResultsEnabled,
             /* header: */   header,
             /* sciSend: */  sciSend,
             /* outText: */  dockText,
@@ -9968,7 +9965,7 @@ void MultiReplace::saveSettingsToIni(const std::wstring& iniFilePath) {
     outFile << Encoding::wstringToUtf8(L"EditFieldSize=" + std::to_wstring(editFieldSize) + L"\n");
     outFile << Encoding::wstringToUtf8(L"ListStatistics=" + std::to_wstring(listStatisticsEnabled ? 1 : 0) + L"\n");
     outFile << Encoding::wstringToUtf8(L"StayAfterReplace=" + std::to_wstring(stayAfterReplaceEnabled ? 1 : 0) + L"\n");
-    outFile << Encoding::wstringToUtf8(L"FlatList=" + std::to_wstring(flatListEnabled) + L"\n");
+    outFile << Encoding::wstringToUtf8(L"GroupResults=" + std::to_wstring(groupResultsEnabled) + L"\n");
 
     // Convert and Store the scope options
     int selection = IsDlgButtonChecked(_hSelf, IDC_SELECTION_RADIO) == BST_CHECKED ? 1 : 0;
@@ -10165,7 +10162,7 @@ void MultiReplace::loadSettingsFromIni() {
 
     listStatisticsEnabled = CFG.readBool(L"Options", L"ListStatistics", false);
     stayAfterReplaceEnabled = CFG.readBool(L"Options", L"StayAfterReplace", false);
-    flatListEnabled = CFG.readBool(L"Options", L"FlatList", false);
+    groupResultsEnabled = CFG.readBool(L"Options", L"GroupResults", false);
 
     // Loading and setting the scope
     int selection = CFG.readInt(L"Scope", L"Selection", 0);

src/MultiReplacePanel.h

@@ -611,7 +611,7 @@ class MultiReplace : public StaticDialog
     inline static int  editFieldSize = 5;                // Size of the edit field for find/replace input
     inline static bool listStatisticsEnabled = false;    // Status for showing list statistics
     inline static bool stayAfterReplaceEnabled = false; // Status for keeping panel open after replace
-    inline static bool flatListEnabled = false;          // Status for flat list view
+    inline static bool groupResultsEnabled = false;          // Status for flat list view
 
     bool isHoverTextSuppressed = false;    // Temporarily suppress HoverText to avoid flickering when Edit in list is open
 

src/ResultDock.cpp

@@ -509,7 +509,7 @@ void ResultDock::formatHitsLines(const SciSendFn& sciSend,
 
 void ResultDock::buildListText(
     const FileMap& files,
-    bool flatView,
+    bool groupView,
     const std::wstring& header,
     const SciSendFn& sciSend,
     std::wstring& outText,
@@ -525,23 +525,7 @@ void ResultDock::buildListText(
         body += fileHdr;
         utf8Len += Encoding::wstringToUtf8(fileHdr).size();
 
-        if (flatView)
-        {
-            // flat: collect all hits per file and sort by position
-            std::vector<Hit> merged;
-            for (auto& c : f.crits)
-                merged.insert(merged.end(),
-                    std::make_move_iterator(c.hits.begin()),
-                    std::make_move_iterator(c.hits.end()));
-            std::sort(merged.begin(), merged.end(),
-                [](auto const& a, auto const& b) { return a.pos < b.pos; });
-
-            formatHitsLines(sciSend, merged, body, utf8Len);
-            outHits.insert(outHits.end(),
-                std::make_move_iterator(merged.begin()),
-                std::make_move_iterator(merged.end()));
-        }
-        else
+        if (groupView)
         {
             // grouped: first the file header, then each criterion block
             for (auto& c : f.crits)
@@ -561,6 +545,22 @@ void ResultDock::buildListText(
                     std::make_move_iterator(hitsCopy.end()));
             }
         }
+        else
+        {
+            // flat: collect all hits per file and sort by position
+            std::vector<Hit> merged;
+            for (auto& c : f.crits)
+                merged.insert(merged.end(),
+                    std::make_move_iterator(c.hits.begin()),
+                    std::make_move_iterator(c.hits.end()));
+            std::sort(merged.begin(), merged.end(),
+                [](auto const& a, auto const& b) { return a.pos < b.pos; });
+
+            formatHitsLines(sciSend, merged, body, utf8Len);
+            outHits.insert(outHits.end(),
+                std::make_move_iterator(merged.begin()),
+                std::make_move_iterator(merged.end()));
+        }
     }
 
     outText = header + body;

src/ResultDock.h

@@ -90,7 +90,7 @@ class ResultDock final
     using FileMap = std::unordered_map<std::string, FileAgg>;
 
     void buildListText(const FileMap& files,
-        bool flatView,
+        bool groupView,
         const std::wstring& header,
         const SciSendFn& sciSend,
         std::wstring& outText,