theApp.m_pGlobalFileFilter->ReloadUpdatedFilters();
m_pCtxt->m_piFilterGlobal = theApp.m_pGlobalFileFilter.get();
- // Show active filter name in statusbar
+ // Show current compare method name and active filter name in statusbar
pf->SetFilterStatusDisplay(theApp.m_pGlobalFileFilter->GetFilterNameOrMask().c_str());
+ pf->SetCompareMethodStatusDisplay(m_pCtxt->GetCompareMethod());
// Folder names to compare are in the compare context
m_diffThread.SetContext(m_pCtxt.get());
*/
enum
{
- PANE_FILTER = 1,
+ PANE_COMPMETHOD = 1,
+ PANE_FILTER,
PANE_LEFT_RO,
PANE_MIDDLE_RO,
PANE_RIGHT_RO,
};
/**
+ * @brief Width of compare method name pane in statusbar
+ */
+const int COMPMETHOD_PANEL_WIDTH = 140;
+/**
* @brief Width of filter name pane in statusbar
*/
const int FILTER_PANEL_WIDTH = 180;
ID_SEPARATOR,
ID_SEPARATOR,
ID_SEPARATOR,
+ ID_SEPARATOR,
};
/**
}
String sText = theApp.LoadString(IDS_STATUSBAR_READONLY);
+ m_wndStatusBar.SetPaneInfo(PANE_COMPMETHOD, ID_STATUS_FILTER, 0, COMPMETHOD_PANEL_WIDTH);
m_wndStatusBar.SetPaneInfo(PANE_FILTER, ID_STATUS_FILTER, 0, FILTER_PANEL_WIDTH);
m_wndStatusBar.SetPaneInfo(PANE_LEFT_RO, ID_STATUS_LEFTDIR_RO, 0, RO_PANEL_WIDTH);
m_wndStatusBar.SetPaneInfo(PANE_MIDDLE_RO, ID_STATUS_MIDDLEDIR_RO, 0, RO_PANEL_WIDTH);
}
/**
+ * @brief Set current compare method name to statusbar
+ * @param [in] nCompMethod compare method to show
+ */
+void CDirFrame::SetCompareMethodStatusDisplay(int nCompMethod)
+{
+ m_wndStatusBar.SetPaneText(PANE_COMPMETHOD, LoadResString(ID_COMPMETHOD_FULL_CONTENTS + nCompMethod).c_str());
+}
+
+/**
* @brief Set active filter name to statusbar
* @param [in] szFilter Filtername to show
*/
// Operations
public:
void SetStatus(LPCTSTR szStatus);
+ void SetCompareMethodStatusDisplay(int nCompMethod);
void SetFilterStatusDisplay(LPCTSTR szFilter);
CStatusBar m_wndStatusBar;
IHeaderBar * GetHeaderInterface();