PATCH: [ 1533457 ] Add Refresh Selected -item to Folder compare main menu

diff --git a/Src/Changes.txt b/Src/Changes.txt
index 86625be..8d0a345 100644 (file)
--- a/Src/Changes.txt
+++ b/Src/Changes.txt
@@ -2,6 +2,11 @@ Src\Changes.txt
 Add new items to top.
 (This summarizes all changes to all files under Src, including Src\Languages.)
 
+2006-08-03 Kimmo
+ PATCH: [ 1533457 ] Add Refresh Selected -item to Folder compare main menu
+  Src: DirActions.cpp DirView.cpp DirView.h Merge.rc
+  Src/Languages/*: Merge*.rc
+
 2006-08-02 Kimmo
  PATCH: [ 1532743 ] Improve difference count columns in folder compare
   Src: DiffItem.h DiffItemList.cpp DirScan.cpp DirVierwColItems.cpp

diff --git a/Src/DirActions.cpp b/Src/DirActions.cpp
index 2d6166d..21f6e43 100644 (file)
--- a/Src/DirActions.cpp
+++ b/Src/DirActions.cpp
@@ -975,18 +975,27 @@ void CDirView::ApplyPluginPrediffSetting(int newsetting)
 
 /**
  * @brief Mark selected items as needing for rescan.
+ * @return Count of items to rescan.
  */
-void CDirView::MarkForRescan()
+UINT CDirView::MarkSelectedForRescan()
 {
        int sel = -1;
        CString slFile, srFile;
+       int items = 0;
        while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
        {
+               // Don't try to rescan special items
+               if (GetItemKey(sel) == (POSITION)SPECIAL_ITEM_POS)
+                       continue;
+
                DIFFITEM di = GetDiffItem(sel);
                GetDocument()->SetDiffStatus(0, DIFFCODE::TEXTFLAGS | DIFFCODE::SIDEFLAGS | DIFFCODE::COMPAREFLAGS, sel);               
                GetDocument()->SetDiffStatus(DIFFCODE::NEEDSCAN, DIFFCODE::SCANFLAGS, sel);
+               ++items;
        }
-       GetDocument()->SetMarkedRescan();
+       if (items > 0)
+               GetDocument()->SetMarkedRescan();
+       return items;
 }
 
 /**

diff --git a/Src/DirView.cpp b/Src/DirView.cpp
index b40a223..b682210 100644 (file)
--- a/Src/DirView.cpp
+++ b/Src/DirView.cpp
@@ -2860,12 +2860,13 @@ afx_msg void CDirView::OnEndLabelEdit(NMHDR* pNMHDR, LRESULT* pResult)
 
 /**
  * @brief Called when item is marked for rescan.
+ * This function marks selected items for rescan and rescans them.
  */
 void CDirView::OnMarkedRescan()
 {
-       GetDocument()->SetMarkedRescan();
-       MarkForRescan();
-       GetDocument()->Rescan();
+       UINT items = MarkSelectedForRescan();
+       if (items > 0)
+               GetDocument()->Rescan();
 }
 
 /**

diff --git a/Src/DirView.h b/Src/DirView.h
index e31d33e..93c6794 100644 (file)
--- a/Src/DirView.h
+++ b/Src/DirView.h
@@ -168,7 +168,7 @@ private:
        BOOL ConfirmActionList(const FileActionScript & actions, int selCount);
        void PerformActionList(FileActionScript & actions);
        void UpdateAfterFileScript(FileActionScript & actionList);
-       void MarkForRescan();
+       UINT MarkSelectedForRescan();
        void DoFileEncodingDialog();
        void DoUpdateFileEncodingDialog(CCmdUI* pCmdUI);
        BOOL DoItemRename(LPCTSTR szNewItemName);

diff --git a/Src/Merge.rc b/Src/Merge.rc
index bf53e2a..66e7182 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -230,6 +230,7 @@ BEGIN
         MENUITEM "&Options...",                 ID_OPTIONS
         MENUITEM SEPARATOR
         MENUITEM "Refre&sh\tF5",                ID_REFRESH
+        MENUITEM "&Refresh Selected\tCtrl+F5",  ID_DIR_RESCAN
     END
     POPUP "&View"
     BEGIN
@@ -610,6 +611,7 @@ BEGIN
     VK_F3,          ID_EDIT_REPEAT,         VIRTKEY, CONTROL, NOINVERT
     VK_F4,          ID_SELECTLINEDIFF,      VIRTKEY, NOINVERT
     VK_F5,          ID_REFRESH,             VIRTKEY, NOINVERT
+    VK_F5,          ID_DIR_RESCAN,          VIRTKEY, CONTROL, NOINVERT
     VK_F6,          ID_NEXT_PANE,           VIRTKEY, NOINVERT
     VK_F6,          ID_PREV_PANE,           VIRTKEY, SHIFT, NOINVERT
     VK_F9,          ID_FILE_MERGINGMODE,    VIRTKEY, NOINVERT