Add "Swap Panes" menu item to Folder Compare window

diff --git a/Src/CompareStats.cpp b/Src/CompareStats.cpp
index 426e5a1..9bda045 100644 (file)
--- a/Src/CompareStats.cpp
+++ b/Src/CompareStats.cpp
@@ -238,3 +238,12 @@ CompareStats::RESULT CompareStats::GetResultFromCode(unsigned diffcode) const
                }
        }
 }
+
+void CompareStats::Swap(int idx1, int idx2)
+{
+       idx2 = m_nDirs < 3 ? idx2 + 1 : idx2;
+       std::swap(m_counts[RESULT_LUNIQUE + idx1], m_counts[RESULT_LUNIQUE + idx2]);
+       std::swap(m_counts[RESULT_LMISSING + idx1], m_counts[RESULT_LMISSING + idx2]);
+       std::swap(m_counts[RESULT_LDIRUNIQUE + idx1], m_counts[RESULT_LDIRUNIQUE + idx2]);
+       std::swap(m_counts[RESULT_LDIRMISSING + idx1], m_counts[RESULT_LDIRMISSING + idx2]);
+}

diff --git a/Src/CompareStats.h b/Src/CompareStats.h
index d81b5b8..49a0b46 100644 (file)
--- a/Src/CompareStats.h
+++ b/Src/CompareStats.h
@@ -90,8 +90,8 @@ public:
        CompareStats::CMP_STATE GetCompareState() const;
        void SetCurrentDiffItem(const DIFFITEM *di);
        bool IsCompareDone() const { return m_bCompareDone; }
-
        CompareStats::RESULT GetResultFromCode(unsigned diffcode) const;
+       void Swap(int idx1, int idx2);
 
 private:
        int m_counts[RESULT_COUNT]; /**< Table storing result counts */

diff --git a/Src/DiffContext.h b/Src/DiffContext.h
index 15c092e..e7096b5 100644 (file)
--- a/Src/DiffContext.h
+++ b/Src/DiffContext.h
@@ -144,6 +144,15 @@ public:
 
        int GetCompareDirs() const { return m_paths.GetSize(); }
 
+       void Swap(int idx1, int idx2)
+       {
+               String tmp;
+               tmp = m_paths.GetPath(idx1);
+               m_paths.SetPath(idx1, m_paths.GetPath(idx2));
+               m_paths.SetPath(idx2, tmp);
+               DiffItemList::Swap(idx1, idx2);
+       }
+
        IDiffFilter * m_piFilterGlobal; /**< Interface for file filtering. */
        IPluginInfos * m_piPluginInfos;
        int m_iGuessEncodingType;

diff --git a/Src/DiffItem.cpp b/Src/DiffItem.cpp
index a1d70a1..0acdcbd 100644 (file)
--- a/Src/DiffItem.cpp
+++ b/Src/DiffItem.cpp
@@ -65,3 +65,14 @@ void DIFFITEM::RemoveChildren()
                delete p;
        }
 }
+
+void DIFFITEM::Swap(int idx1, int idx2)
+{
+       std::swap(diffFileInfo[idx1], diffFileInfo[idx2]);
+       diffcode.swap(idx1, idx2);
+       if (HasChildren())
+       {
+               for (ListEntry *p = children.IsSibling(children.Flink); p; p = children.IsSibling(p->Flink))
+                       static_cast<DIFFITEM *>(p)->Swap(idx1, idx2);
+       }
+}

diff --git a/Src/DiffItem.h b/Src/DiffItem.h
index 3b6a685..b2cf0a1 100644 (file)
--- a/Src/DiffItem.h
+++ b/Src/DiffItem.h
@@ -162,6 +162,16 @@ public:
        // rescan
        bool isScanNeeded() const { return ((diffcode & DIFFCODE::SCANFLAGS) == DIFFCODE::NEEDSCAN); }
 
+       void swap(int idx1, int idx2)
+       {
+               bool e[3] = { false, false, false };
+               for (int i = 0; i < 3; ++i)
+                       e[i] = exists(i);
+               std::swap(e[idx1], e[idx2]);
+               setSideNone();
+               for (int i = 0; i < 3; ++i)
+                       if (e[i]) setSideFlag(i);
+       }
 };
 
 /**
@@ -199,4 +209,5 @@ struct DIFFITEM : ListEntry
        bool IsAncestor(const DIFFITEM *pdi) const;
        bool HasChildren() const;
        void RemoveChildren();
+       void Swap(int idx1, int idx2);
 };

diff --git a/Src/DiffItemList.cpp b/Src/DiffItemList.cpp
index c7d352a..f30a568 100644 (file)
--- a/Src/DiffItemList.cpp
+++ b/Src/DiffItemList.cpp
@@ -198,3 +198,9 @@ void DiffItemList::SetCustomFlags1(uintptr_t diffpos, unsigned flag)
        DIFFITEM & di = GetDiffRefAt(diffpos);
        di.customFlags1 = flag;
 }
+
+void DiffItemList::Swap(int idx1, int idx2)
+{
+       for (ListEntry *p = m_root.IsSibling(m_root.Flink); p; p = m_root.IsSibling(p->Flink))
+               static_cast<DIFFITEM *>(p)->Swap(idx1, idx2);
+}

diff --git a/Src/DiffItemList.h b/Src/DiffItemList.h
index a26172e..bef2e2e 100644 (file)
--- a/Src/DiffItemList.h
+++ b/Src/DiffItemList.h
@@ -40,6 +40,8 @@ public:
        unsigned GetCustomFlags1(uintptr_t diffpos) const;
        void SetCustomFlags1(uintptr_t diffpos, unsigned flag);
 
+       void Swap(int idx1, int idx2);
+
 protected:
        ListEntry m_root; /**< Root of list of diffitems */
 };

diff --git a/Src/DirDoc.cpp b/Src/DirDoc.cpp
index dfd9451..43fed2d 100644 (file)
--- a/Src/DirDoc.cpp
+++ b/Src/DirDoc.cpp
@@ -634,3 +634,13 @@ bool CDirDoc::IsArchiveFolders() const
        else
                return false;
 }
+
+void CDirDoc::Swap(int idx1, int idx2)
+{
+       std::swap(m_bRO[idx1], m_bRO[idx2]);
+       std::swap(m_strDesc[idx1], m_strDesc[idx2]);
+       m_pCtxt->Swap(idx1, idx2);
+       m_pCompareStats->Swap(idx1, idx2);
+       for (int nIndex = 0; nIndex < m_nDirs; nIndex++)
+               UpdateHeaderPath(nIndex);
+}

diff --git a/Src/DirDoc.h b/Src/DirDoc.h
index 1002e87..d23efbb 100644 (file)
--- a/Src/DirDoc.h
+++ b/Src/DirDoc.h
@@ -112,6 +112,7 @@ public:
        const CompareStats * GetCompareStats() const { return m_pCompareStats.get(); };
        bool IsArchiveFolders() const;
        PluginManager& GetPluginManager() { return m_pluginman; };
+       void Swap(int idx1, int idx2);
 
 protected:
        void LoadLineFilterList();

diff --git a/Src/DirView.cpp b/Src/DirView.cpp
index 57cbfad..d846c08 100644 (file)
--- a/Src/DirView.cpp
+++ b/Src/DirView.cpp
@@ -297,6 +297,7 @@ BEGIN_MESSAGE_MAP(CDirView, CListView)
        ON_UPDATE_COMMAND_UI(ID_VIEW_EXPAND_ALLSUBDIRS, OnUpdateViewExpandAllSubdirs)
        ON_COMMAND(ID_VIEW_COLLAPSE_ALLSUBDIRS, OnViewCollapseAllSubdirs)
        ON_UPDATE_COMMAND_UI(ID_VIEW_COLLAPSE_ALLSUBDIRS, OnUpdateViewCollapseAllSubdirs)
+       ON_COMMAND(ID_VIEW_SWAPPANES, OnViewSwapPanes)
        ON_COMMAND(ID_VIEW_DIR_STATISTICS, OnViewCompareStatistics)
        ON_COMMAND(ID_OPTIONS_SHOWDIFFERENT, OnOptionsShowDifferent)
        ON_COMMAND(ID_OPTIONS_SHOWIDENTICAL, OnOptionsShowIdentical)
@@ -2407,7 +2408,7 @@ struct FileCmpReport: public IFileCmpReport
                        return false;
                }
 
-               sLinkPath = di.diffFileInfo[0].GetFile();\r
+               sLinkPath = di.diffFileInfo[0].GetFile();
 
                string_replace(sLinkPath, _T("\\"), _T("_"));
                sLinkPath += _T(".html");
@@ -3024,6 +3025,12 @@ void CDirView::OnUpdateViewCollapseAllSubdirs(CCmdUI* pCmdUI)
        pCmdUI->Enable(m_bTreeMode && GetDiffContext().m_bRecursive);
 }
 
+void CDirView::OnViewSwapPanes()
+{
+       GetDocument()->Swap(0, GetDocument()->m_nDirs - 1);
+       Redisplay();
+}
+
 /**
  * @brief Show/Hide different files/directories
  */

diff --git a/Src/DirView.h b/Src/DirView.h
index 546a456..b2521bc 100644 (file)
--- a/Src/DirView.h
+++ b/Src/DirView.h
@@ -328,6 +328,7 @@ protected:
        afx_msg void OnUpdateViewExpandAllSubdirs(CCmdUI* pCmdUI);
        afx_msg void OnViewCollapseAllSubdirs();
        afx_msg void OnUpdateViewCollapseAllSubdirs(CCmdUI* pCmdUI);
+       afx_msg void OnViewSwapPanes();
        afx_msg void OnOptionsShowDifferent();
        afx_msg void OnOptionsShowIdentical();
        afx_msg void OnOptionsShowUniqueLeft();

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 35b9f14..fa1246e 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -278,6 +278,8 @@ BEGIN
         MENUITEM "Select &Font...",             ID_VIEW_SELECTFONT
         MENUITEM "Use Default F&ont",           ID_VIEW_USEDEFAULTFONT
         MENUITEM SEPARATOR
+        MENUITEM "Sw&ap Panes",                 ID_VIEW_SWAPPANES
+        MENUITEM SEPARATOR
         POPUP "&Toolbar"
         BEGIN
             MENUITEM "&None",                       ID_TOOLBAR_NONE

diff --git a/Testing/GoogleTest/UnitTests/UnitTests.vcxproj b/Testing/GoogleTest/UnitTests/UnitTests.vcxproj
index 6dd0993..234717e 100644 (file)
--- a/Testing/GoogleTest/UnitTests/UnitTests.vcxproj
+++ b/Testing/GoogleTest/UnitTests/UnitTests.vcxproj
@@ -183,6 +183,7 @@
     <ClCompile Include="..\..\..\Src\CompareEngines\TimeSizeCompare.cpp" />\r
     <ClCompile Include="..\..\..\Src\CompareOptions.cpp" />\r
     <ClCompile Include="..\..\..\Src\Common\coretools.cpp" />\r
+    <ClCompile Include="..\..\..\Src\DiffFileInfo.cpp" />\r
     <ClCompile Include="..\..\..\Src\DiffItem.cpp" />\r
     <ClCompile Include="..\..\..\Src\diffutils\src\Diff.cpp" />\r
     <ClCompile Include="..\..\..\Src\DirItem.cpp" />\r

diff --git a/Testing/GoogleTest/UnitTests/UnitTests.vcxproj.filters b/Testing/GoogleTest/UnitTests/UnitTests.vcxproj.filters
index 845666c..914e4f7 100644 (file)
--- a/Testing/GoogleTest/UnitTests/UnitTests.vcxproj.filters
+++ b/Testing/GoogleTest/UnitTests/UnitTests.vcxproj.filters
@@ -246,6 +246,9 @@
     <ClCompile Include="..\..\..\Src\OptionsDef.cpp">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="..\..\..\Src\DiffFileInfo.cpp">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="..\..\..\Src\CompareEngines\ByteComparator.h">\r