From 261e0665c57993bd5d7a9f87ebdc1637ef747e1f Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Sun, 23 Jan 2005 13:04:55 +0000 Subject: [PATCH] PATCH: [ 1107508 ] Add dirview statusbar panel showing current filter name --- Src/DirDoc.cpp | 3 +++ Src/DirFrame.cpp | 34 +++++++++++++++++++++++++---- Src/DirFrame.h | 1 + Src/Languages/Brazilian/resource.h | 2 +- Src/Languages/Bulgarian/resource.h | 2 +- Src/Languages/Catalan/resource.h | 2 +- Src/Languages/ChineseSimplified/resource.h | 2 +- Src/Languages/ChineseTraditional/resource.h | 2 +- Src/Languages/Czech/resource.h | 2 +- Src/Languages/Danish/resource.h | 2 +- Src/Languages/Dutch/resource.h | 2 +- Src/Languages/French/resource.h | 2 +- Src/Languages/German/resource.h | 2 +- Src/Languages/Hungarian/resource.h | 2 +- Src/Languages/Italian/resource.h | 2 +- Src/Languages/Japanese/resource.h | 2 +- Src/Languages/Korean/resource.h | 2 +- Src/Languages/Norwegian/resource.h | 2 +- Src/Languages/Polish/resource.h | 2 +- Src/Languages/Russian/resource.h | 2 +- Src/Languages/Slovak/resource.h | 2 +- Src/Languages/Spanish/resource.h | 2 +- Src/Languages/Swedish/resource.h | 2 +- Src/readme.txt | 5 +++++ Src/resource.h | 2 +- 25 files changed, 60 insertions(+), 25 deletions(-) diff --git a/Src/DirDoc.cpp b/Src/DirDoc.cpp index 212cf987e..d627fe0eb 100644 --- a/Src/DirDoc.cpp +++ b/Src/DirDoc.cpp @@ -202,6 +202,9 @@ void CDirDoc::Rescan() m_pCtxt->m_piFilterGlobal = &theApp.m_globalFileFilter; + // Show active filter name in statusbar + pf->SetFilter(theApp.m_globalFileFilter.GetFilter()); + // Empty display before new compare m_pDirView->DeleteAllDisplayItems(); diff --git a/Src/DirFrame.cpp b/Src/DirFrame.cpp index 78e496480..d3f213e73 100644 --- a/Src/DirFrame.cpp +++ b/Src/DirFrame.cpp @@ -40,6 +40,21 @@ static char THIS_FILE[] = __FILE__; #endif /** + * @brief Statusbar pane indexes + */ +enum +{ + PANE_FILTER = 1, + PANE_LEFT_RO, + PANE_RIGHT_RO, +}; + +/** + * @brief Width of filter name pane in statusbar + */ +const int FILTER_PANEL_WIDTH = 180; + +/** * @brief Bottom statusbar panels and indicators */ static UINT indicators[] = @@ -47,6 +62,7 @@ static UINT indicators[] = ID_SEPARATOR, // status line indicator ID_SEPARATOR, ID_SEPARATOR, + ID_SEPARATOR, }; /** @@ -119,10 +135,11 @@ int CDirFrame::OnCreate(LPCREATESTRUCT lpCreateStruct) CString sText; VERIFY(sText.LoadString(IDS_STATUSBAR_READONLY)); - m_wndStatusBar.SetPaneInfo(1, ID_STATUS_LEFTDIR_RO, 0, RO_PANEL_WIDTH); - m_wndStatusBar.SetPaneInfo(2, ID_STATUS_RIGHTDIR_RO, 0, RO_PANEL_WIDTH); - m_wndStatusBar.SetPaneText(1, sText, TRUE); - m_wndStatusBar.SetPaneText(2, sText, TRUE); + 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_RIGHT_RO, ID_STATUS_RIGHTDIR_RO, 0, RO_PANEL_WIDTH); + m_wndStatusBar.SetPaneText(PANE_LEFT_RO, sText, TRUE); + m_wndStatusBar.SetPaneText(PANE_RIGHT_RO, sText, TRUE); return 0; } @@ -153,6 +170,15 @@ void CDirFrame::SetStatus(LPCTSTR szStatus) } /** + * @brief Set active filter name to statusbar + * @param [in] szFilter Filtername to show + */ +void CDirFrame::SetFilter(LPCTSTR szFilter) +{ + m_wndStatusBar.SetPaneText(PANE_FILTER, szFilter); +} + +/** * @brief Get the interface to the header (path) bar */ IHeaderBar * CDirFrame::GetHeaderInterface() { diff --git a/Src/DirFrame.h b/Src/DirFrame.h index 79ef6950d..9c0ebcace 100644 --- a/Src/DirFrame.h +++ b/Src/DirFrame.h @@ -50,6 +50,7 @@ public: // Operations public: void SetStatus(LPCTSTR szStatus); + void SetFilter(LPCTSTR szFilter); CStatusBar m_wndStatusBar; void SetClosableCallback(bool (*canclose)(void *), void * param); IHeaderBar * GetHeaderInterface(); diff --git a/Src/Languages/Brazilian/resource.h b/Src/Languages/Brazilian/resource.h index ef9339639..af3a1b865 100644 --- a/Src/Languages/Brazilian/resource.h +++ b/Src/Languages/Brazilian/resource.h @@ -809,7 +809,7 @@ #define ID_STATUS_LEFTFILE_INFO 32967 #define ID_STATUS_RIGHTFILE_EOL 32968 #define ID_STATUS_LEFTFILE_EOL 32969 - +#define ID_STATUS_FILTER 32970 #define ID_DIR_ZIP_LEFT 32976 #define ID_DIR_ZIP_RIGHT 32977 #define ID_DIR_ZIP_BOTH 32978 diff --git a/Src/Languages/Bulgarian/resource.h b/Src/Languages/Bulgarian/resource.h index ef9339639..af3a1b865 100644 --- a/Src/Languages/Bulgarian/resource.h +++ b/Src/Languages/Bulgarian/resource.h @@ -809,7 +809,7 @@ #define ID_STATUS_LEFTFILE_INFO 32967 #define ID_STATUS_RIGHTFILE_EOL 32968 #define ID_STATUS_LEFTFILE_EOL 32969 - +#define ID_STATUS_FILTER 32970 #define ID_DIR_ZIP_LEFT 32976 #define ID_DIR_ZIP_RIGHT 32977 #define ID_DIR_ZIP_BOTH 32978 diff --git a/Src/Languages/Catalan/resource.h b/Src/Languages/Catalan/resource.h index ef9339639..af3a1b865 100644 --- a/Src/Languages/Catalan/resource.h +++ b/Src/Languages/Catalan/resource.h @@ -809,7 +809,7 @@ #define ID_STATUS_LEFTFILE_INFO 32967 #define ID_STATUS_RIGHTFILE_EOL 32968 #define ID_STATUS_LEFTFILE_EOL 32969 - +#define ID_STATUS_FILTER 32970 #define ID_DIR_ZIP_LEFT 32976 #define ID_DIR_ZIP_RIGHT 32977 #define ID_DIR_ZIP_BOTH 32978 diff --git a/Src/Languages/ChineseSimplified/resource.h b/Src/Languages/ChineseSimplified/resource.h index ef9339639..af3a1b865 100644 --- a/Src/Languages/ChineseSimplified/resource.h +++ b/Src/Languages/ChineseSimplified/resource.h @@ -809,7 +809,7 @@ #define ID_STATUS_LEFTFILE_INFO 32967 #define ID_STATUS_RIGHTFILE_EOL 32968 #define ID_STATUS_LEFTFILE_EOL 32969 - +#define ID_STATUS_FILTER 32970 #define ID_DIR_ZIP_LEFT 32976 #define ID_DIR_ZIP_RIGHT 32977 #define ID_DIR_ZIP_BOTH 32978 diff --git a/Src/Languages/ChineseTraditional/resource.h b/Src/Languages/ChineseTraditional/resource.h index ef9339639..af3a1b865 100644 --- a/Src/Languages/ChineseTraditional/resource.h +++ b/Src/Languages/ChineseTraditional/resource.h @@ -809,7 +809,7 @@ #define ID_STATUS_LEFTFILE_INFO 32967 #define ID_STATUS_RIGHTFILE_EOL 32968 #define ID_STATUS_LEFTFILE_EOL 32969 - +#define ID_STATUS_FILTER 32970 #define ID_DIR_ZIP_LEFT 32976 #define ID_DIR_ZIP_RIGHT 32977 #define ID_DIR_ZIP_BOTH 32978 diff --git a/Src/Languages/Czech/resource.h b/Src/Languages/Czech/resource.h index ef9339639..af3a1b865 100644 --- a/Src/Languages/Czech/resource.h +++ b/Src/Languages/Czech/resource.h @@ -809,7 +809,7 @@ #define ID_STATUS_LEFTFILE_INFO 32967 #define ID_STATUS_RIGHTFILE_EOL 32968 #define ID_STATUS_LEFTFILE_EOL 32969 - +#define ID_STATUS_FILTER 32970 #define ID_DIR_ZIP_LEFT 32976 #define ID_DIR_ZIP_RIGHT 32977 #define ID_DIR_ZIP_BOTH 32978 diff --git a/Src/Languages/Danish/resource.h b/Src/Languages/Danish/resource.h index ef9339639..af3a1b865 100644 --- a/Src/Languages/Danish/resource.h +++ b/Src/Languages/Danish/resource.h @@ -809,7 +809,7 @@ #define ID_STATUS_LEFTFILE_INFO 32967 #define ID_STATUS_RIGHTFILE_EOL 32968 #define ID_STATUS_LEFTFILE_EOL 32969 - +#define ID_STATUS_FILTER 32970 #define ID_DIR_ZIP_LEFT 32976 #define ID_DIR_ZIP_RIGHT 32977 #define ID_DIR_ZIP_BOTH 32978 diff --git a/Src/Languages/Dutch/resource.h b/Src/Languages/Dutch/resource.h index ef9339639..af3a1b865 100644 --- a/Src/Languages/Dutch/resource.h +++ b/Src/Languages/Dutch/resource.h @@ -809,7 +809,7 @@ #define ID_STATUS_LEFTFILE_INFO 32967 #define ID_STATUS_RIGHTFILE_EOL 32968 #define ID_STATUS_LEFTFILE_EOL 32969 - +#define ID_STATUS_FILTER 32970 #define ID_DIR_ZIP_LEFT 32976 #define ID_DIR_ZIP_RIGHT 32977 #define ID_DIR_ZIP_BOTH 32978 diff --git a/Src/Languages/French/resource.h b/Src/Languages/French/resource.h index ef9339639..af3a1b865 100644 --- a/Src/Languages/French/resource.h +++ b/Src/Languages/French/resource.h @@ -809,7 +809,7 @@ #define ID_STATUS_LEFTFILE_INFO 32967 #define ID_STATUS_RIGHTFILE_EOL 32968 #define ID_STATUS_LEFTFILE_EOL 32969 - +#define ID_STATUS_FILTER 32970 #define ID_DIR_ZIP_LEFT 32976 #define ID_DIR_ZIP_RIGHT 32977 #define ID_DIR_ZIP_BOTH 32978 diff --git a/Src/Languages/German/resource.h b/Src/Languages/German/resource.h index ef9339639..af3a1b865 100644 --- a/Src/Languages/German/resource.h +++ b/Src/Languages/German/resource.h @@ -809,7 +809,7 @@ #define ID_STATUS_LEFTFILE_INFO 32967 #define ID_STATUS_RIGHTFILE_EOL 32968 #define ID_STATUS_LEFTFILE_EOL 32969 - +#define ID_STATUS_FILTER 32970 #define ID_DIR_ZIP_LEFT 32976 #define ID_DIR_ZIP_RIGHT 32977 #define ID_DIR_ZIP_BOTH 32978 diff --git a/Src/Languages/Hungarian/resource.h b/Src/Languages/Hungarian/resource.h index ef9339639..af3a1b865 100644 --- a/Src/Languages/Hungarian/resource.h +++ b/Src/Languages/Hungarian/resource.h @@ -809,7 +809,7 @@ #define ID_STATUS_LEFTFILE_INFO 32967 #define ID_STATUS_RIGHTFILE_EOL 32968 #define ID_STATUS_LEFTFILE_EOL 32969 - +#define ID_STATUS_FILTER 32970 #define ID_DIR_ZIP_LEFT 32976 #define ID_DIR_ZIP_RIGHT 32977 #define ID_DIR_ZIP_BOTH 32978 diff --git a/Src/Languages/Italian/resource.h b/Src/Languages/Italian/resource.h index ef9339639..af3a1b865 100644 --- a/Src/Languages/Italian/resource.h +++ b/Src/Languages/Italian/resource.h @@ -809,7 +809,7 @@ #define ID_STATUS_LEFTFILE_INFO 32967 #define ID_STATUS_RIGHTFILE_EOL 32968 #define ID_STATUS_LEFTFILE_EOL 32969 - +#define ID_STATUS_FILTER 32970 #define ID_DIR_ZIP_LEFT 32976 #define ID_DIR_ZIP_RIGHT 32977 #define ID_DIR_ZIP_BOTH 32978 diff --git a/Src/Languages/Japanese/resource.h b/Src/Languages/Japanese/resource.h index ef9339639..af3a1b865 100644 --- a/Src/Languages/Japanese/resource.h +++ b/Src/Languages/Japanese/resource.h @@ -809,7 +809,7 @@ #define ID_STATUS_LEFTFILE_INFO 32967 #define ID_STATUS_RIGHTFILE_EOL 32968 #define ID_STATUS_LEFTFILE_EOL 32969 - +#define ID_STATUS_FILTER 32970 #define ID_DIR_ZIP_LEFT 32976 #define ID_DIR_ZIP_RIGHT 32977 #define ID_DIR_ZIP_BOTH 32978 diff --git a/Src/Languages/Korean/resource.h b/Src/Languages/Korean/resource.h index ef9339639..af3a1b865 100644 --- a/Src/Languages/Korean/resource.h +++ b/Src/Languages/Korean/resource.h @@ -809,7 +809,7 @@ #define ID_STATUS_LEFTFILE_INFO 32967 #define ID_STATUS_RIGHTFILE_EOL 32968 #define ID_STATUS_LEFTFILE_EOL 32969 - +#define ID_STATUS_FILTER 32970 #define ID_DIR_ZIP_LEFT 32976 #define ID_DIR_ZIP_RIGHT 32977 #define ID_DIR_ZIP_BOTH 32978 diff --git a/Src/Languages/Norwegian/resource.h b/Src/Languages/Norwegian/resource.h index ef9339639..af3a1b865 100644 --- a/Src/Languages/Norwegian/resource.h +++ b/Src/Languages/Norwegian/resource.h @@ -809,7 +809,7 @@ #define ID_STATUS_LEFTFILE_INFO 32967 #define ID_STATUS_RIGHTFILE_EOL 32968 #define ID_STATUS_LEFTFILE_EOL 32969 - +#define ID_STATUS_FILTER 32970 #define ID_DIR_ZIP_LEFT 32976 #define ID_DIR_ZIP_RIGHT 32977 #define ID_DIR_ZIP_BOTH 32978 diff --git a/Src/Languages/Polish/resource.h b/Src/Languages/Polish/resource.h index ef9339639..af3a1b865 100644 --- a/Src/Languages/Polish/resource.h +++ b/Src/Languages/Polish/resource.h @@ -809,7 +809,7 @@ #define ID_STATUS_LEFTFILE_INFO 32967 #define ID_STATUS_RIGHTFILE_EOL 32968 #define ID_STATUS_LEFTFILE_EOL 32969 - +#define ID_STATUS_FILTER 32970 #define ID_DIR_ZIP_LEFT 32976 #define ID_DIR_ZIP_RIGHT 32977 #define ID_DIR_ZIP_BOTH 32978 diff --git a/Src/Languages/Russian/resource.h b/Src/Languages/Russian/resource.h index ef9339639..af3a1b865 100644 --- a/Src/Languages/Russian/resource.h +++ b/Src/Languages/Russian/resource.h @@ -809,7 +809,7 @@ #define ID_STATUS_LEFTFILE_INFO 32967 #define ID_STATUS_RIGHTFILE_EOL 32968 #define ID_STATUS_LEFTFILE_EOL 32969 - +#define ID_STATUS_FILTER 32970 #define ID_DIR_ZIP_LEFT 32976 #define ID_DIR_ZIP_RIGHT 32977 #define ID_DIR_ZIP_BOTH 32978 diff --git a/Src/Languages/Slovak/resource.h b/Src/Languages/Slovak/resource.h index ef9339639..af3a1b865 100644 --- a/Src/Languages/Slovak/resource.h +++ b/Src/Languages/Slovak/resource.h @@ -809,7 +809,7 @@ #define ID_STATUS_LEFTFILE_INFO 32967 #define ID_STATUS_RIGHTFILE_EOL 32968 #define ID_STATUS_LEFTFILE_EOL 32969 - +#define ID_STATUS_FILTER 32970 #define ID_DIR_ZIP_LEFT 32976 #define ID_DIR_ZIP_RIGHT 32977 #define ID_DIR_ZIP_BOTH 32978 diff --git a/Src/Languages/Spanish/resource.h b/Src/Languages/Spanish/resource.h index ef9339639..af3a1b865 100644 --- a/Src/Languages/Spanish/resource.h +++ b/Src/Languages/Spanish/resource.h @@ -809,7 +809,7 @@ #define ID_STATUS_LEFTFILE_INFO 32967 #define ID_STATUS_RIGHTFILE_EOL 32968 #define ID_STATUS_LEFTFILE_EOL 32969 - +#define ID_STATUS_FILTER 32970 #define ID_DIR_ZIP_LEFT 32976 #define ID_DIR_ZIP_RIGHT 32977 #define ID_DIR_ZIP_BOTH 32978 diff --git a/Src/Languages/Swedish/resource.h b/Src/Languages/Swedish/resource.h index ef9339639..af3a1b865 100644 --- a/Src/Languages/Swedish/resource.h +++ b/Src/Languages/Swedish/resource.h @@ -809,7 +809,7 @@ #define ID_STATUS_LEFTFILE_INFO 32967 #define ID_STATUS_RIGHTFILE_EOL 32968 #define ID_STATUS_LEFTFILE_EOL 32969 - +#define ID_STATUS_FILTER 32970 #define ID_DIR_ZIP_LEFT 32976 #define ID_DIR_ZIP_RIGHT 32977 #define ID_DIR_ZIP_BOTH 32978 diff --git a/Src/readme.txt b/Src/readme.txt index b5e0c80df..4462593da 100644 --- a/Src/readme.txt +++ b/Src/readme.txt @@ -1,3 +1,8 @@ +2005-01-23 Kimmo + PATCH: [ 1107508 ] Add dirview statusbar panel showing current filter name + Src: DirDoc.cpp DirFrame.cpp DirFrame.h resource.h + Languages: resource.h + 2005-01-23 Perry PATCH: [ 1107516 ] Suggest code simplification for DiffFileInfo ctr Src: DiffFileInfo.h diff --git a/Src/resource.h b/Src/resource.h index ef9339639..af3a1b865 100644 --- a/Src/resource.h +++ b/Src/resource.h @@ -809,7 +809,7 @@ #define ID_STATUS_LEFTFILE_INFO 32967 #define ID_STATUS_RIGHTFILE_EOL 32968 #define ID_STATUS_LEFTFILE_EOL 32969 - +#define ID_STATUS_FILTER 32970 #define ID_DIR_ZIP_LEFT 32976 #define ID_DIR_ZIP_RIGHT 32977 #define ID_DIR_ZIP_BOTH 32978 -- 2.11.0