2005-06-27 Perry

 PATCH: 1213781 ] Fill item location into statusbar in dirview
  DirFrame.cpp DirFrame.h DirView.cpp DirView.h Merge.rc resource.h

diff --git a/Src/DirFrame.cpp b/Src/DirFrame.cpp
index 01622b5..840b797 100644 (file)
--- a/Src/DirFrame.cpp
+++ b/Src/DirFrame.cpp
@@ -90,7 +90,6 @@ CDirFrame::~CDirFrame()
 BEGIN_MESSAGE_MAP(CDirFrame, CMDIChildWnd)
        //{{AFX_MSG_MAP(CDirFrame)
        ON_WM_CREATE()
-       ON_UPDATE_COMMAND_UI(ID_STATUS_DIFFNUM, OnUpdateStatusNum)
        ON_WM_CLOSE()
        ON_WM_SIZE()
        ON_WM_MDIACTIVATE()
@@ -253,14 +252,6 @@ void CDirFrame::SetStateBarLoc()
 }
 
 /**
- * @brief Empty diff-number pane from statusbar when dirview active
- */
-void CDirFrame::OnUpdateStatusNum(CCmdUI* pCmdUI) 
-{
-       pCmdUI->SetText(_T(""));
-}
-
-/**
  * @brief Store callback which we check to see if we're allowed to close
  * This keeps us decoupled from the doc
  */

diff --git a/Src/DirFrame.h b/Src/DirFrame.h
index 9dcf400..f915a66 100644 (file)
--- a/Src/DirFrame.h
+++ b/Src/DirFrame.h
@@ -95,7 +95,6 @@ protected:
        // Generated message map functions
        //{{AFX_MSG(CDirFrame)
        afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
-       afx_msg void OnUpdateStatusNum(CCmdUI* pCmdUI);
        afx_msg void OnClose();
        afx_msg void OnSize(UINT nType, int cx, int cy);
        afx_msg void OnMDIActivate(BOOL bActivate, CWnd* pActivateWnd, CWnd* pDeactivateWnd);

diff --git a/Src/DirView.cpp b/Src/DirView.cpp
index 0812630..05b2dde 100644 (file)
--- a/Src/DirView.cpp
+++ b/Src/DirView.cpp
@@ -171,6 +171,7 @@ BEGIN_MESSAGE_MAP(CDirView, CListViewEx)
        ON_COMMAND(ID_MERGE_DELETE, OnDelete)
        ON_UPDATE_COMMAND_UI(ID_MERGE_DELETE, OnUpdateDelete)
        ON_COMMAND(ID_DIR_RESCAN, OnMarkedRescan)
+       ON_UPDATE_COMMAND_UI(ID_STATUS_DIFFNUM, OnUpdateStatusNum)
        //}}AFX_MSG_MAP
        ON_NOTIFY_REFLECT(LVN_COLUMNCLICK, OnColumnClick)
        ON_NOTIFY_REFLECT(LVN_GETINFOTIP, OnInfoTip)
@@ -2528,3 +2529,34 @@ void CDirView::OnMarkedRescan()
        MarkForRescan();
        GetDocument()->Rescan();
 }
+
+/**
+ * @brief Called to update the item count in the status bar
+ */
+void CDirView::OnUpdateStatusNum(CCmdUI* pCmdUI) 
+{
+       CString s; // text to display
+
+       int count = m_pList->GetItemCount();
+       int focusItem = GetFocusedItem();
+
+       if (focusItem == -1)
+       {
+               // No item has focus
+               CString sCnt;
+               sCnt.Format(_T("%ld"), count);
+               // "Items: %1"
+               AfxFormatString1(s, IDS_DIRVIEW_STATUS_FMT_NOFOCUS, sCnt);
+       }
+       else
+       {
+               // An item has focus
+               CString sIdx, sCnt;
+               sIdx.Format(_T("%ld"), focusItem+1);
+               sCnt.Format(_T("%ld"), count);
+               // "Item %1 of %2"
+               AfxFormatString2(s, IDS_DIRVIEW_STATUS_FMT_FOCUS, sIdx, sCnt); 
+       }
+       pCmdUI->SetText(s);
+}
+

diff --git a/Src/DirView.h b/Src/DirView.h
index e2800dc..9b912b7 100644 (file)
--- a/Src/DirView.h
+++ b/Src/DirView.h
@@ -325,6 +325,7 @@ protected:
        afx_msg void OnDelete();
        afx_msg void OnUpdateDelete(CCmdUI* pCmdUI);
        afx_msg void OnMarkedRescan();
+       afx_msg void OnUpdateStatusNum(CCmdUI* pCmdUI);
        //}}AFX_MSG
        DECLARE_MESSAGE_MAP()
        BOOL OnHeaderBeginDrag(LPNMHEADER hdr, LRESULT* pResult);

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 4c32b1f..bec967d 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -1743,6 +1743,13 @@ BEGIN
     IDS_STATUSBAR_READONLY  "RO"
 END
 
+// MORE STATUS PANES
+STRINGTABLE
+BEGIN
+       IDS_DIRVIEW_STATUS_FMT_FOCUS "Item %1 of %2"
+       IDS_DIRVIEW_STATUS_FMT_NOFOCUS "Items: %1"
+END
+
 // OPEN DIALOG
 STRINGTABLE
 BEGIN

diff --git a/Src/readme.txt b/Src/readme.txt
index a5f6f38..66ac61d 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,7 @@
+2005-06-27 Perry
+ PATCH: 1213781 ] Fill item location into statusbar in dirview
+  DirFrame.cpp DirFrame.h DirView.cpp DirView.h Merge.rc resource.h
+
 2005-06-23 Kimmo
  BUG: [ 1225257 ] cvs: FileFilters broken?
   Restore behavior in 2.3.3.5 and earlier for directory filtering

diff --git a/Src/resource.h b/Src/resource.h
index 6be3345..d9a2a32 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -352,6 +352,8 @@
 #define IDS_NO_DIFF_SEL_FMT             16837
 #define IDS_1_DIFF_FOUND                16838
 #define IDS_STATUSBAR_READONLY          16839
+#define IDS_DIRVIEW_STATUS_FMT_FOCUS    16840
+#define IDS_DIRVIEW_STATUS_FMT_NOFOCUS  16841
 #define IDS_ERROR_INCOMPARABLE          17200
 #define IDS_DIRSEL_TAG                  17201
 #define IDS_OPEN_FILESDIRS              17202