Move ID_OPTIONS_SHOW* menu handler in CMainFrame to CDirView

--HG--
branch : stable

diff --git a/Src/DirDoc.cpp b/Src/DirDoc.cpp
index 3b09e15..a4cef8f 100644 (file)
--- a/Src/DirDoc.cpp
+++ b/Src/DirDoc.cpp
@@ -363,95 +363,6 @@ void CDirDoc::Rescan()
 }
 
 /**
- * @brief Determines if the user wants to see given item.
- * This function determines what items to show and what items to hide. There
- * are lots of combinations, but basically we check if menuitem is enabled or
- * disabled and show/hide matching items. For non-recursive compare we never
- * hide folders as that would disable user browsing into them. And we even
- * don't really know if folders are identical or different as we haven't
- * compared them.
- * @param [in] di Item to check.
- * @return TRUE if item should be shown, FALSE if not.
- * @sa CDirDoc::Redisplay()
- */
-bool CDirDoc::IsShowable(const DIFFITEM & di) const
-{
-       if (di.customFlags1 & ViewCustomFlags::HIDDEN)
-               return FALSE;
-
-       if (di.diffcode.isResultFiltered())
-       {
-               // Treat SKIPPED as a 'super'-flag. If item is skipped and user
-               // wants to see skipped items show item regardless of other flags
-               return GetOptionsMgr()->GetBool(OPT_SHOW_SKIPPED);
-       }
-
-       if (di.diffcode.isDirectory())
-       {
-               // Subfolders in non-recursive compare can only be skipped or unique
-               if (!m_bRecursive)
-               {
-                       // left/right filters
-                       if (di.diffcode.isSideFirstOnly() && !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_LEFT))
-                               return FALSE;
-                       if (di.diffcode.isSideSecondOnly() && !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_RIGHT))
-                               return FALSE;
-
-                       // result filters
-                       if (di.diffcode.isResultError())
-                               return FALSE;
-               }
-               else // recursive mode (including tree-mode)
-               {
-                       // left/right filters
-                       if (di.diffcode.isSideFirstOnly() &&    !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_LEFT))
-                               return FALSE;
-                       if (di.diffcode.isSideSecondOnly() && !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_RIGHT))
-                               return FALSE;
-
-                       // ONLY filter folders by result (identical/different) for tree-view.
-                       // In the tree-view we show subfolders with identical/different
-                       // status. The flat view only shows files inside folders. So if we
-                       // filter by status the files inside folder are filtered too and
-                       // users see files appearing/disappearing without clear logic.          
-                       if (GetOptionsMgr()->GetBool(OPT_TREE_MODE))
-                       {
-                               // result filters
-                               if (di.diffcode.isResultError() && FALSE)
-                                       return FALSE;
-
-                               // result filters
-                               if (di.diffcode.isResultSame() && !GetOptionsMgr()->GetBool(OPT_SHOW_IDENTICAL))
-                                       return FALSE;
-                               if (di.diffcode.isResultDiff() && !GetOptionsMgr()->GetBool(OPT_SHOW_DIFFERENT))
-                                       return FALSE;
-                       }
-               }
-       }
-       else
-       {
-               // left/right filters
-               if (di.diffcode.isSideFirstOnly() && !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_LEFT))
-                       return FALSE;
-               if (di.diffcode.isSideSecondOnly() && !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_RIGHT))
-                       return FALSE;
-
-               // file type filters
-               if (di.diffcode.isBin() && !GetOptionsMgr()->GetBool(OPT_SHOW_BINARIES))
-                       return FALSE;
-
-               // result filters
-               if (di.diffcode.isResultSame() && !GetOptionsMgr()->GetBool(OPT_SHOW_IDENTICAL))
-                       return FALSE;
-               if (di.diffcode.isResultError() && FALSE)
-                       return FALSE;
-               if (di.diffcode.isResultDiff() && !GetOptionsMgr()->GetBool(OPT_SHOW_DIFFERENT))
-                       return FALSE;
-       }
-       return TRUE;
-}
-
-/**
  * @brief Empty & reload listview (of files & columns) with comparison results
  * @todo Better solution for special items ("..")?
  */

diff --git a/Src/DirDoc.h b/Src/DirDoc.h
index 66af331..7167b73 100644 (file)
--- a/Src/DirDoc.h
+++ b/Src/DirDoc.h
@@ -117,7 +117,6 @@ public:
        void SetPluginPrediffer(const String& filteredFilenames, const String & prediffer);
        void FetchPluginInfos(const String& filteredFilenames, 
                              PackingInfo ** infoUnpacker, PrediffingInfo ** infoPrediffer);
-       bool IsShowable(const DIFFITEM & di) const;
 
        bool HasDiffs() const { return m_pCtxt != NULL; }
        const CDiffContext & GetDiffContext() const { return *m_pCtxt; }

diff --git a/Src/DirView.cpp b/Src/DirView.cpp
index b1a042c..ec98b77 100644 (file)
--- a/Src/DirView.cpp
+++ b/Src/DirView.cpp
@@ -140,6 +140,12 @@ CDirView::CDirView()
                , m_pCmpProgressBar(nullptr)
                , m_compareStart(0)
                , m_bTreeMode(false)
+               , m_bShowDifferent(true)
+               , m_bShowIdentical(true)
+               , m_bShowUniqueLeft(true)
+               , m_bShowUniqueRight(true)
+               , m_bShowBinaries(true)
+               , m_bShowSkipped(true)
                , m_pShellContextMenuLeft(nullptr)
                , m_pShellContextMenuMiddle(nullptr)
                , m_pShellContextMenuRight(nullptr)
@@ -152,6 +158,12 @@ CDirView::CDirView()
        m_dwDefaultStyle |= LVS_REPORT | LVS_SHOWSELALWAYS | LVS_EDITLABELS;
 
        m_bTreeMode =  GetOptionsMgr()->GetBool(OPT_TREE_MODE);
+       m_bShowDifferent =  GetOptionsMgr()->GetBool(OPT_SHOW_IDENTICAL);
+       m_bShowIdentical =  GetOptionsMgr()->GetBool(OPT_SHOW_DIFFERENT);
+       m_bShowUniqueLeft =  GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_LEFT);
+       m_bShowUniqueRight =  GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_RIGHT);
+       m_bShowBinaries =  GetOptionsMgr()->GetBool(OPT_SHOW_BINARIES);
+       m_bShowSkipped =  GetOptionsMgr()->GetBool(OPT_SHOW_SKIPPED);
        m_bExpandSubdirs = GetOptionsMgr()->GetBool(OPT_DIRVIEW_EXPAND_SUBDIRS);
        m_bEscCloses = GetOptionsMgr()->GetBool(OPT_CLOSE_WITH_ESC);
        Options::DiffColors::Load(m_cachedColors);
@@ -281,6 +293,18 @@ BEGIN_MESSAGE_MAP(CDirView, CListView)
        ON_COMMAND(ID_VIEW_COLLAPSE_ALLSUBDIRS, OnViewCollapseAllSubdirs)
        ON_UPDATE_COMMAND_UI(ID_VIEW_COLLAPSE_ALLSUBDIRS, OnUpdateViewCollapseAllSubdirs)
        ON_COMMAND(ID_VIEW_DIR_STATISTICS, OnViewCompareStatistics)
+       ON_COMMAND(ID_OPTIONS_SHOWDIFFERENT, OnOptionsShowDifferent)
+       ON_COMMAND(ID_OPTIONS_SHOWIDENTICAL, OnOptionsShowIdentical)
+       ON_COMMAND(ID_OPTIONS_SHOWUNIQUELEFT, OnOptionsShowUniqueLeft)
+       ON_COMMAND(ID_OPTIONS_SHOWUNIQUERIGHT, OnOptionsShowUniqueRight)
+       ON_COMMAND(ID_OPTIONS_SHOWBINARIES, OnOptionsShowBinaries)
+       ON_COMMAND(ID_OPTIONS_SHOWSKIPPED, OnOptionsShowSkipped)
+       ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWDIFFERENT, OnUpdateOptionsShowdifferent)
+       ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWIDENTICAL, OnUpdateOptionsShowidentical)
+       ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWUNIQUELEFT, OnUpdateOptionsShowuniqueleft)
+       ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWUNIQUERIGHT, OnUpdateOptionsShowuniqueright)
+       ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWBINARIES, OnUpdateOptionsShowBinaries)
+       ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWSKIPPED, OnUpdateOptionsShowSkipped)
        ON_COMMAND(ID_FILE_ENCODING, OnFileEncoding)
        ON_UPDATE_COMMAND_UI(ID_FILE_ENCODING, OnUpdateFileEncoding)
        ON_COMMAND(ID_HELP, OnHelp)
@@ -523,6 +547,95 @@ void CDirView::ReloadColumns()
 }
 
 /**
+ * @brief Determines if the user wants to see given item.
+ * This function determines what items to show and what items to hide. There
+ * are lots of combinations, but basically we check if menuitem is enabled or
+ * disabled and show/hide matching items. For non-recursive compare we never
+ * hide folders as that would disable user browsing into them. And we even
+ * don't really know if folders are identical or different as we haven't
+ * compared them.
+ * @param [in] di Item to check.
+ * @return TRUE if item should be shown, FALSE if not.
+ * @sa CDirDoc::Redisplay()
+ */
+bool CDirView::IsShowable(const DIFFITEM & di) const
+{
+       if (di.customFlags1 & ViewCustomFlags::HIDDEN)
+               return FALSE;
+
+       if (di.diffcode.isResultFiltered())
+       {
+               // Treat SKIPPED as a 'super'-flag. If item is skipped and user
+               // wants to see skipped items show item regardless of other flags
+               return m_bShowSkipped;
+       }
+
+       if (di.diffcode.isDirectory())
+       {
+               // Subfolders in non-recursive compare can only be skipped or unique
+               if (!GetDocument()->GetRecursive())
+               {
+                       // left/right filters
+                       if (di.diffcode.isSideFirstOnly() && !m_bShowUniqueLeft)
+                               return FALSE;
+                       if (di.diffcode.isSideSecondOnly() && !m_bShowUniqueRight)
+                               return FALSE;
+
+                       // result filters
+                       if (di.diffcode.isResultError())
+                               return FALSE;
+               }
+               else // recursive mode (including tree-mode)
+               {
+                       // left/right filters
+                       if (di.diffcode.isSideFirstOnly() &&  !m_bShowUniqueLeft)
+                               return FALSE;
+                       if (di.diffcode.isSideSecondOnly() && !m_bShowUniqueRight)
+                               return FALSE;
+
+                       // ONLY filter folders by result (identical/different) for tree-view.
+                       // In the tree-view we show subfolders with identical/different
+                       // status. The flat view only shows files inside folders. So if we
+                       // filter by status the files inside folder are filtered too and
+                       // users see files appearing/disappearing without clear logic.          
+                       if (m_bTreeMode)
+                       {
+                               // result filters
+                               if (di.diffcode.isResultError() && FALSE)
+                                       return FALSE;
+
+                               // result filters
+                               if (di.diffcode.isResultSame() && !m_bShowIdentical)
+                                       return FALSE;
+                               if (di.diffcode.isResultDiff() && !m_bShowDifferent)
+                                       return FALSE;
+                       }
+               }
+       }
+       else
+       {
+               // left/right filters
+               if (di.diffcode.isSideFirstOnly() && !m_bShowUniqueLeft)
+                       return FALSE;
+               if (di.diffcode.isSideSecondOnly() && !m_bShowUniqueRight)
+                       return FALSE;
+
+               // file type filters
+               if (di.diffcode.isBin() && !m_bShowBinaries)
+                       return FALSE;
+
+               // result filters
+               if (di.diffcode.isResultSame() && !m_bShowIdentical)
+                       return FALSE;
+               if (di.diffcode.isResultError() && FALSE)
+                       return FALSE;
+               if (di.diffcode.isResultDiff() && !m_bShowDifferent)
+                       return FALSE;
+       }
+       return TRUE;
+}
+
+/**
  * @brief Redisplay items in subfolder
  * @param [in] diffpos First item position in subfolder.
  * @param [in] level Indent level
@@ -541,7 +654,7 @@ void CDirView::RedisplayChildren(uintptr_t diffpos, int level, UINT &index, int
                if (di.diffcode.isResultDiff() || (!di.diffcode.existAll(pDoc->m_nDirs) && !di.diffcode.isResultFiltered()))
                        ++alldiffs;
 
-               bool bShowable = pDoc->IsShowable(di);
+               bool bShowable = IsShowable(di);
                if (bShowable)
                {
                        if (m_bTreeMode)
@@ -4069,6 +4182,96 @@ void CDirView::OnUpdateViewCollapseAllSubdirs(CCmdUI* pCmdUI)
        pCmdUI->Enable(m_bTreeMode && GetDocument()->GetRecursive());
 }
 
+/**
+ * @brief Show/Hide different files/directories
+ */
+void CDirView::OnOptionsShowDifferent() 
+{
+       m_bShowDifferent = !m_bShowDifferent;
+       GetOptionsMgr()->SaveOption(OPT_SHOW_DIFFERENT, m_bShowDifferent);
+       Redisplay();
+}
+
+/**
+ * @brief Show/Hide identical files/directories
+ */
+void CDirView::OnOptionsShowIdentical() 
+{
+       m_bShowIdentical = !m_bShowIdentical;
+       GetOptionsMgr()->SaveOption(OPT_SHOW_IDENTICAL, m_bShowIdentical);
+       Redisplay();
+}
+
+/**
+ * @brief Show/Hide left-only files/directories
+ */
+void CDirView::OnOptionsShowUniqueLeft() 
+{
+       m_bShowUniqueLeft = !m_bShowUniqueLeft;
+       GetOptionsMgr()->SaveOption(OPT_SHOW_UNIQUE_LEFT, m_bShowUniqueLeft);
+       Redisplay();
+}
+
+/**
+ * @brief Show/Hide right-only files/directories
+ */
+void CDirView::OnOptionsShowUniqueRight() 
+{
+       m_bShowUniqueRight = !m_bShowUniqueRight;
+       GetOptionsMgr()->SaveOption(OPT_SHOW_UNIQUE_RIGHT, m_bShowUniqueRight);
+       Redisplay();
+}
+
+/**
+ * @brief Show/Hide binary files
+ */
+void CDirView::OnOptionsShowBinaries()
+{
+       m_bShowBinaries = !m_bShowBinaries;
+       GetOptionsMgr()->SaveOption(OPT_SHOW_BINARIES, m_bShowBinaries);
+       Redisplay();
+}
+
+/**
+ * @brief Show/Hide skipped files/directories
+ */
+void CDirView::OnOptionsShowSkipped()
+{
+       m_bShowSkipped = !m_bShowSkipped;
+       GetOptionsMgr()->SaveOption(OPT_SHOW_SKIPPED, m_bShowSkipped);
+       Redisplay();
+}
+
+void CDirView::OnUpdateOptionsShowdifferent(CCmdUI* pCmdUI) 
+{
+       pCmdUI->SetCheck(m_bShowDifferent);
+}
+
+void CDirView::OnUpdateOptionsShowidentical(CCmdUI* pCmdUI) 
+{
+       pCmdUI->SetCheck(m_bShowIdentical);
+}
+
+void CDirView::OnUpdateOptionsShowuniqueleft(CCmdUI* pCmdUI) 
+{
+       pCmdUI->SetCheck(m_bShowUniqueLeft);
+}
+
+void CDirView::OnUpdateOptionsShowuniqueright(CCmdUI* pCmdUI) 
+{
+       pCmdUI->SetCheck(m_bShowUniqueRight);
+}
+
+void CDirView::OnUpdateOptionsShowBinaries(CCmdUI* pCmdUI) 
+{
+       pCmdUI->SetCheck(m_bShowBinaries);
+}
+
+void CDirView::OnUpdateOptionsShowSkipped(CCmdUI* pCmdUI)
+{
+       pCmdUI->SetCheck(m_bShowSkipped);
+}
+
 void CDirView::OnMergeCompare()
 {
        CWaitCursor waitstatus;

diff --git a/Src/DirView.h b/Src/DirView.h
index e34fe8c..0c1d677 100644 (file)
--- a/Src/DirView.h
+++ b/Src/DirView.h
@@ -107,6 +107,7 @@ public:
        CDirFrame * GetParentFrame();
 
        void StartCompare(CompareStats *pCompareStats);
+       bool IsShowable(const DIFFITEM & di) const;
        void Redisplay();
        void RedisplayChildren(uintptr_t diffpos, int level, UINT &index, int &alldiffs);
        void UpdateResources();
@@ -282,6 +283,12 @@ protected:
        CFont m_font; /**< User-selected font */
        UINT m_nHiddenItems; /**< Count of items we have hidden */
        bool m_bTreeMode; /**< TRUE if tree mode is on*/
+       bool m_bShowDifferent;
+       bool m_bShowIdentical;
+       bool m_bShowUniqueLeft;
+       bool m_bShowUniqueRight;
+       bool m_bShowBinaries;
+       bool m_bShowSkipped;
        std::unique_ptr<DirCompProgressBar> m_pCmpProgressBar;
        clock_t m_compareStart; /**< Starting process time of the compare */
        bool m_bUserCancelEdit; /**< TRUE if the user cancels rename */
@@ -406,6 +413,18 @@ protected:
        afx_msg void OnUpdateViewExpandAllSubdirs(CCmdUI* pCmdUI);
        afx_msg void OnViewCollapseAllSubdirs();
        afx_msg void OnUpdateViewCollapseAllSubdirs(CCmdUI* pCmdUI);
+       afx_msg void OnOptionsShowDifferent();
+       afx_msg void OnOptionsShowIdentical();
+       afx_msg void OnOptionsShowUniqueLeft();
+       afx_msg void OnOptionsShowUniqueRight();
+       afx_msg void OnOptionsShowBinaries();
+       afx_msg void OnOptionsShowSkipped();
+       afx_msg void OnUpdateOptionsShowdifferent(CCmdUI* pCmdUI);
+       afx_msg void OnUpdateOptionsShowidentical(CCmdUI* pCmdUI);
+       afx_msg void OnUpdateOptionsShowuniqueleft(CCmdUI* pCmdUI);
+       afx_msg void OnUpdateOptionsShowuniqueright(CCmdUI* pCmdUI);
+       afx_msg void OnUpdateOptionsShowBinaries(CCmdUI* pCmdUI);
+       afx_msg void OnUpdateOptionsShowSkipped(CCmdUI* pCmdUI);
        afx_msg void OnMergeCompare();
        afx_msg void OnMergeCompareLeft1Left2();
        afx_msg void OnMergeCompareRight1Right2();

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index afc5324..b6e1df8 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -174,18 +174,6 @@ BEGIN_MESSAGE_MAP(CMainFrame, CMDIFrameWnd)
        ON_WM_MEASUREITEM()
        ON_WM_INITMENUPOPUP()
        ON_WM_INITMENU()
-       ON_COMMAND(ID_OPTIONS_SHOWDIFFERENT, OnOptionsShowDifferent)
-       ON_COMMAND(ID_OPTIONS_SHOWIDENTICAL, OnOptionsShowIdentical)
-       ON_COMMAND(ID_OPTIONS_SHOWUNIQUELEFT, OnOptionsShowUniqueLeft)
-       ON_COMMAND(ID_OPTIONS_SHOWUNIQUERIGHT, OnOptionsShowUniqueRight)
-       ON_COMMAND(ID_OPTIONS_SHOWBINARIES, OnOptionsShowBinaries)
-       ON_COMMAND(ID_OPTIONS_SHOWSKIPPED, OnOptionsShowSkipped)
-       ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWDIFFERENT, OnUpdateOptionsShowdifferent)
-       ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWIDENTICAL, OnUpdateOptionsShowidentical)
-       ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWUNIQUELEFT, OnUpdateOptionsShowuniqueleft)
-       ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWUNIQUERIGHT, OnUpdateOptionsShowuniqueright)
-       ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWBINARIES, OnUpdateOptionsShowBinaries)
-       ON_UPDATE_COMMAND_UI(ID_OPTIONS_SHOWSKIPPED, OnUpdateOptionsShowSkipped)
        ON_WM_CREATE()
        ON_COMMAND(ID_FILE_OPEN, OnFileOpen)
        ON_COMMAND(ID_HELP_GNULICENSE, OnHelpGnulicense)
@@ -812,107 +800,6 @@ int CMainFrame::ShowImgMergeDoc(CDirDoc * pDirDoc, int nFiles, const FileLocatio
        return 0;
 }
 
-void CMainFrame::RedisplayAllDirDocs()
-{
-       const DirDocList &dirdocs = GetAllDirDocs();
-       POSITION pos = dirdocs.GetHeadPosition();
-       while (pos)
-       {
-               CDirDoc * pDirDoc = dirdocs.GetNext(pos);
-               pDirDoc->Redisplay();
-       }
-}
-
-/**
- * @brief Show/Hide different files/directories
- */
-void CMainFrame::OnOptionsShowDifferent() 
-{
-       bool val = GetOptionsMgr()->GetBool(OPT_SHOW_DIFFERENT);
-       GetOptionsMgr()->SaveOption(OPT_SHOW_DIFFERENT, !val); // reverse
-       RedisplayAllDirDocs();
-}
-
-/**
- * @brief Show/Hide identical files/directories
- */
-void CMainFrame::OnOptionsShowIdentical() 
-{
-       bool val = GetOptionsMgr()->GetBool(OPT_SHOW_IDENTICAL);
-       GetOptionsMgr()->SaveOption(OPT_SHOW_IDENTICAL, !val); // reverse
-       RedisplayAllDirDocs();
-}
-
-/**
- * @brief Show/Hide left-only files/directories
- */
-void CMainFrame::OnOptionsShowUniqueLeft() 
-{
-       bool val = GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_LEFT);
-       GetOptionsMgr()->SaveOption(OPT_SHOW_UNIQUE_LEFT, !val); // reverse
-       RedisplayAllDirDocs();
-}
-
-/**
- * @brief Show/Hide right-only files/directories
- */
-void CMainFrame::OnOptionsShowUniqueRight() 
-{
-       bool val = GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_RIGHT);
-       GetOptionsMgr()->SaveOption(OPT_SHOW_UNIQUE_RIGHT, !val); // reverse
-       RedisplayAllDirDocs();
-}
-
-/**
- * @brief Show/Hide binary files
- */
-void CMainFrame::OnOptionsShowBinaries()
-{
-       bool val = GetOptionsMgr()->GetBool(OPT_SHOW_BINARIES);
-       GetOptionsMgr()->SaveOption(OPT_SHOW_BINARIES, !val); // reverse
-       RedisplayAllDirDocs();
-}
-
-/**
- * @brief Show/Hide skipped files/directories
- */
-void CMainFrame::OnOptionsShowSkipped()
-{
-       bool val = GetOptionsMgr()->GetBool(OPT_SHOW_SKIPPED);
-       GetOptionsMgr()->SaveOption(OPT_SHOW_SKIPPED, !val); // reverse
-       RedisplayAllDirDocs();
-}
-
-void CMainFrame::OnUpdateOptionsShowdifferent(CCmdUI* pCmdUI) 
-{
-       pCmdUI->SetCheck(GetOptionsMgr()->GetBool(OPT_SHOW_DIFFERENT));
-}
-
-void CMainFrame::OnUpdateOptionsShowidentical(CCmdUI* pCmdUI) 
-{
-       pCmdUI->SetCheck(GetOptionsMgr()->GetBool(OPT_SHOW_IDENTICAL));
-}
-
-void CMainFrame::OnUpdateOptionsShowuniqueleft(CCmdUI* pCmdUI) 
-{
-       pCmdUI->SetCheck(GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_LEFT));
-}
-
-void CMainFrame::OnUpdateOptionsShowuniqueright(CCmdUI* pCmdUI) 
-{
-       pCmdUI->SetCheck(GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_RIGHT));
-}
-
-void CMainFrame::OnUpdateOptionsShowBinaries(CCmdUI* pCmdUI) 
-{
-       pCmdUI->SetCheck(GetOptionsMgr()->GetBool(OPT_SHOW_BINARIES));
-}
-
-void CMainFrame::OnUpdateOptionsShowSkipped(CCmdUI* pCmdUI)
-{
-       pCmdUI->SetCheck(GetOptionsMgr()->GetBool(OPT_SHOW_SKIPPED));
-}
-
 /**
  * @brief Show GNU licence information in notepad (local file) or in Web Browser
  */

diff --git a/Src/MainFrm.h b/Src/MainFrm.h
index 93b6908..fd0888b 100644 (file)
--- a/Src/MainFrm.h
+++ b/Src/MainFrm.h
@@ -210,18 +210,6 @@ protected:
        afx_msg void OnMeasureItem(int nIDCtl, LPMEASUREITEMSTRUCT lpMeasureItemStruct);
        afx_msg LRESULT OnMenuChar(UINT nChar, UINT nFlags, CMenu* pMenu) ;
        afx_msg void OnInitMenuPopup(CMenu* pPopupMenu, UINT nIndex, BOOL bSysMenu);
-       afx_msg void OnOptionsShowDifferent();
-       afx_msg void OnOptionsShowIdentical();
-       afx_msg void OnOptionsShowUniqueLeft();
-       afx_msg void OnOptionsShowUniqueRight();
-       afx_msg void OnOptionsShowBinaries();
-       afx_msg void OnOptionsShowSkipped();
-       afx_msg void OnUpdateOptionsShowdifferent(CCmdUI* pCmdUI);
-       afx_msg void OnUpdateOptionsShowidentical(CCmdUI* pCmdUI);
-       afx_msg void OnUpdateOptionsShowuniqueleft(CCmdUI* pCmdUI);
-       afx_msg void OnUpdateOptionsShowuniqueright(CCmdUI* pCmdUI);
-       afx_msg void OnUpdateOptionsShowBinaries(CCmdUI* pCmdUI);
-       afx_msg void OnUpdateOptionsShowSkipped(CCmdUI* pCmdUI);
        afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
        afx_msg void OnFileOpen();
        afx_msg void OnHelpGnulicense();
@@ -298,7 +286,6 @@ private:
        const MergeDocList &GetAllMergeDocs();
        const DirDocList &GetAllDirDocs();
        const HexMergeDocList &GetAllHexMergeDocs();
-       void RedisplayAllDirDocs();
        void UpdateFont(FRAMETYPE frame);
        BOOL CreateToolbar();
        BOOL CreateComboBoxOnToolbar();