PATCH: [ 880769 ] Select all in Dir compare

diff --git a/Src/DirView.cpp b/Src/DirView.cpp
index 85fefff..4637f1b 100644 (file)
--- a/Src/DirView.cpp
+++ b/Src/DirView.cpp
@@ -137,6 +137,8 @@ BEGIN_MESSAGE_MAP(CDirView, CListViewEx)
        ON_COMMAND(ID_DIR_ZIP_RIGHT, OnCtxtDirZipRight)
        ON_COMMAND(ID_DIR_ZIP_BOTH, OnCtxtDirZipBoth)
        ON_COMMAND(ID_DIR_ZIP_BOTH_DIFFS_ONLY, OnCtxtDirZipBothDiffsOnly)
+       ON_COMMAND(ID_EDIT_SELECT_ALL, OnSelectAll)
+       ON_UPDATE_COMMAND_UI(ID_EDIT_SELECT_ALL, OnUpdateSelectAll)
        //}}AFX_MSG_MAP
        ON_NOTIFY_REFLECT(LVN_COLUMNCLICK, OnColumnClick)
        ON_NOTIFY_REFLECT(LVN_GETINFOTIP, OnInfoTip)
@@ -1966,3 +1968,31 @@ void CDirView::OnCtxtDirZipBothDiffsOnly()
        |       DirItemEnumerator::DiffsOnly
        ).CompressArchive();
 }
+
+
+/**
+ * @brief Select all visible items in dir compare
+ */
+void CDirView::OnSelectAll()
+{
+       int selCount = m_pList->GetItemCount();
+
+       for (int i = 0; i < selCount; i++)
+       {
+               // Don't select special items (POSITION -1)
+               POSITION diffpos = GetItemKey(i);
+               if (diffpos != (POSITION) -1)
+                       m_pList->SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
+       }
+}
+
+/**
+ * @brief Update "Select All" item
+ */
+void CDirView::OnUpdateSelectAll(CCmdUI* pCmdUI)
+{
+       if (m_pList->GetItemCount() > 0)
+               pCmdUI->Enable(TRUE);
+       else
+               pCmdUI->Enable(FALSE);
+}

diff --git a/Src/DirView.h b/Src/DirView.h
index ac8365a..3272027 100644 (file)
--- a/Src/DirView.h
+++ b/Src/DirView.h
@@ -276,6 +276,8 @@ protected:
        afx_msg void OnCtxtDirZipBoth();
        afx_msg void OnCtxtDirZipBothDiffsOnly();
        afx_msg void OnUpdateCtxtDir(CCmdUI* pCmdUI);
+       afx_msg void OnSelectAll();
+       afx_msg void OnUpdateSelectAll(CCmdUI* pCmdUI);
        //}}AFX_MSG
        DECLARE_MESSAGE_MAP()
        BOOL OnHeaderBeginDrag(LPNMHEADER hdr, LRESULT* pResult);
@@ -326,3 +328,4 @@ CString NumToStr(int n);
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
 
 #endif // !defined(AFX_DirView_H__16E7C721_351C_11D1_95CD_444553540000__INCLUDED_)
+

diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc
index 99782cb..21aa9bb 100644 (file)
--- a/Src/Languages/Brazilian/MergeBrazilian.rc
+++ b/Src/Languages/Brazilian/MergeBrazilian.rc
@@ -133,12 +133,14 @@ BEGIN
         MENUITEM "&Copiar\tCtrl+C",             ID_EDIT_COPY
         MENUITEM "Co&lar\tCtrl+V",              ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "Highlight Line Diff\tF4",     ID_SHOWLINEDIFF
+        MENUITEM "Select &All\tCtrl+A",         ID_EDIT_SELECT_ALL
+        MENUITEM SEPARATOR
+        MENUITEM "&Highlight Line Diff\tF4",     ID_SHOWLINEDIFF
         MENUITEM SEPARATOR
         MENUITEM "Pr&ocurar...\tCtrl+F",        ID_EDIT_FIND
         MENUITEM "Al&terar...\tCtrl+H",         ID_EDIT_REPLACE
         MENUITEM SEPARATOR
-        MENUITEM "Go To...\tCtrl+G",            ID_EDIT_WMGOTO
+        MENUITEM "&Go To...\tCtrl+G",            ID_EDIT_WMGOTO
         MENUITEM SEPARATOR
         MENUITEM "Opçõe&s...",                  ID_OPTIONS
         MENUITEM SEPARATOR
@@ -1502,3 +1504,4 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 #endif    // not APSTUDIO_INVOKED
 
 
+

diff --git a/Src/Languages/Catalan/MergeCatalan.rc b/Src/Languages/Catalan/MergeCatalan.rc
index 67ed57a..218a704 100644 (file)
--- a/Src/Languages/Catalan/MergeCatalan.rc
+++ b/Src/Languages/Catalan/MergeCatalan.rc
@@ -133,12 +133,14 @@ BEGIN
         MENUITEM "C&opia\tCtrl+C",              ID_EDIT_COPY
         MENUITEM "Engan&xa\tCtrl+V",            ID_EDIT_PASTE
         MENUITEM SEPARATOR
+        MENUITEM "Select &All\tCtrl+A",         ID_EDIT_SELECT_ALL
+        MENUITEM SEPARATOR
         MENUITEM "R&essalta les diferències de línia\tF4", ID_SHOWLINEDIFF
         MENUITEM SEPARATOR
         MENUITEM "&Cerca...\tCtrl+F",           ID_EDIT_FIND
         MENUITEM "Subst&itueix...\tCtrl+H",     ID_EDIT_REPLACE
         MENUITEM SEPARATOR
-        MENUITEM "Go To...\tCtrl+G",            ID_EDIT_WMGOTO
+        MENUITEM "&Go To...\tCtrl+G",            ID_EDIT_WMGOTO
         MENUITEM SEPARATOR
         MENUITEM "&Opcions...",                 ID_OPTIONS
         MENUITEM SEPARATOR
@@ -1670,3 +1672,4 @@ LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT
 
 
 
+

diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
index 3d4caeb..673fef6 100644 (file)
--- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
+++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
@@ -130,12 +130,14 @@ BEGIN
         MENUITEM "¸´ÖÆ(&C)\tCtrl+C",            ID_EDIT_COPY
         MENUITEM "Õ³Ìù(&P)\tCtrl+V",            ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "Highlight Line Diff\tF4",     ID_SHOWLINEDIFF
+        MENUITEM "Select &All\tCtrl+A",         ID_EDIT_SELECT_ALL
+        MENUITEM SEPARATOR
+        MENUITEM "&Highlight Line Diff\tF4",     ID_SHOWLINEDIFF
         MENUITEM SEPARATOR
         MENUITEM "Ñ°ÕÒ(&I)...\tCtrl+F",         ID_EDIT_FIND
         MENUITEM "Ìæ»»(&C)...\tCtrl+H",         ID_EDIT_REPLACE
         MENUITEM SEPARATOR
-        MENUITEM "Go To...\tCtrl+G",            ID_EDIT_WMGOTO
+        MENUITEM "&Go To...\tCtrl+G",            ID_EDIT_WMGOTO
         MENUITEM SEPARATOR
         MENUITEM "Ñ¡Ïî(&O)...",                 ID_OPTIONS
         MENUITEM SEPARATOR
@@ -1354,3 +1356,4 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 #endif    // not APSTUDIO_INVOKED
 
 
+

diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
index 377a68f..b63673f 100644 (file)
--- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
+++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
@@ -131,12 +131,14 @@ BEGIN
         MENUITEM "½Æ»s(&C)\tCtrl+C",            ID_EDIT_COPY
         MENUITEM "¶K¤W(&P)\tCtrl+V",            ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "Highlight Line Diff\tF4",     ID_SHOWLINEDIFF
+        MENUITEM "Select &All\tCtrl+A",         ID_EDIT_SELECT_ALL
+        MENUITEM SEPARATOR
+        MENUITEM "&Highlight Line Diff\tF4",     ID_SHOWLINEDIFF
         MENUITEM SEPARATOR
         MENUITEM "´M§ä(&I)...\tCtrl+F",         ID_EDIT_FIND
         MENUITEM "¨ú¥N(&C)...\tCtrl+H",         ID_EDIT_REPLACE
         MENUITEM SEPARATOR
-        MENUITEM "Go To...\tCtrl+G",            ID_EDIT_WMGOTO
+        MENUITEM "&Go To...\tCtrl+G",            ID_EDIT_WMGOTO
         MENUITEM SEPARATOR
         MENUITEM "¿ï¶µ(&O)...",                 ID_OPTIONS
         MENUITEM SEPARATOR
@@ -1469,3 +1471,4 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 #endif    // not APSTUDIO_INVOKED
 
 
+

diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc
index 0011481..96858f7 100644 (file)
--- a/Src/Languages/Czech/MergeCzech.rc
+++ b/Src/Languages/Czech/MergeCzech.rc
@@ -135,12 +135,14 @@ BEGIN
         MENUITEM "&Kopírovat\tCtrl+C",          ID_EDIT_COPY
         MENUITEM "V&lo\9eit\tCtrl+V",             ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "Highlight Line Diff\tF4",     ID_SHOWLINEDIFF
+        MENUITEM "Select &All\tCtrl+A",         ID_EDIT_SELECT_ALL
+        MENUITEM SEPARATOR
+        MENUITEM "&Highlight Line Diff\tF4",     ID_SHOWLINEDIFF
         MENUITEM SEPARATOR
         MENUITEM "F&ind...\tCtrl+F",            ID_EDIT_FIND
         MENUITEM "Repla&ce...\tCtrl+H",         ID_EDIT_REPLACE
         MENUITEM SEPARATOR
-        MENUITEM "Go To...\tCtrl+G",            ID_EDIT_WMGOTO
+        MENUITEM "&Go To...\tCtrl+G",            ID_EDIT_WMGOTO
         MENUITEM SEPARATOR
         MENUITEM "&Vlastnosti",                 ID_OPTIONS
         MENUITEM SEPARATOR
@@ -1492,3 +1494,4 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
 
+

diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc
index 832075f..214be3f 100644 (file)
--- a/Src/Languages/Danish/MergeDanish.rc
+++ b/Src/Languages/Danish/MergeDanish.rc
@@ -133,12 +133,14 @@ BEGIN
         MENUITEM "Ko&pier\tCtrl+C",             ID_EDIT_COPY
         MENUITEM "&Indsæt\tCtrl+V",             ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "Highlight Line Diff\tF4",     ID_SHOWLINEDIFF
+        MENUITEM "Select &All\tCtrl+A",         ID_EDIT_SELECT_ALL
+        MENUITEM SEPARATOR
+        MENUITEM "&Highlight Line Diff\tF4",     ID_SHOWLINEDIFF
         MENUITEM SEPARATOR
         MENUITEM "Sø&g...\tCtrl+F",             ID_EDIT_FIND
         MENUITEM "&Erstat...\tCtrl+H",          ID_EDIT_REPLACE
         MENUITEM SEPARATOR
-        MENUITEM "Go To...\tCtrl+G",            ID_EDIT_WMGOTO
+        MENUITEM "&Go To...\tCtrl+G",            ID_EDIT_WMGOTO
         MENUITEM SEPARATOR
         MENUITEM "&Egenskaber...",              ID_OPTIONS
         MENUITEM SEPARATOR
@@ -1492,3 +1494,4 @@ LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 
 
+

diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc
index 16208f4..70002ba 100644 (file)
--- a/Src/Languages/Dutch/MergeDutch.rc
+++ b/Src/Languages/Dutch/MergeDutch.rc
@@ -133,12 +133,14 @@ BEGIN
         MENUITEM "Ko&piëeren\tCtrl+C",          ID_EDIT_COPY
         MENUITEM "Pl&akken\tCtrl+V",            ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "Highlight Line Diff\tF4",     ID_SHOWLINEDIFF
+        MENUITEM "Select &All\tCtrl+A",         ID_EDIT_SELECT_ALL
+        MENUITEM SEPARATOR
+        MENUITEM "&Highlight Line Diff\tF4",     ID_SHOWLINEDIFF
         MENUITEM SEPARATOR
         MENUITEM "F&ind...\tCtrl+F",            ID_EDIT_FIND
         MENUITEM "Repla&ce...\tCtrl+H",         ID_EDIT_REPLACE
         MENUITEM SEPARATOR
-        MENUITEM "Go To...\tCtrl+G",            ID_EDIT_WMGOTO
+        MENUITEM "&Go To...\tCtrl+G",            ID_EDIT_WMGOTO
         MENUITEM SEPARATOR
         MENUITEM "&Eigenschappen...",           ID_OPTIONS
         MENUITEM SEPARATOR
@@ -1499,3 +1501,4 @@ LANGUAGE 9, 1
 #endif    // not APSTUDIO_INVOKED
 
 
+

diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc
index 2fe7d3e..ac890e0 100644 (file)
--- a/Src/Languages/French/MergeFrench.rc
+++ b/Src/Languages/French/MergeFrench.rc
@@ -133,12 +133,14 @@ BEGIN
         MENUITEM "Co&pier\tCtrl+C",           ID_EDIT_COPY
         MENUITEM "C&oller\tCtrl+V",           ID_EDIT_PASTE
         MENUITEM SEPARATOR
+        MENUITEM "Select &All\tCtrl+A",         ID_EDIT_SELECT_ALL
+        MENUITEM SEPARATOR
         MENUITEM "Premier mot différent de la ligne\tF4",     ID_SHOWLINEDIFF
         MENUITEM SEPARATOR
         MENUITEM "&Trouver...\tCtrl+F",         ID_EDIT_FIND
         MENUITEM "Rempla&cer...\tCtrl+H",       ID_EDIT_REPLACE
         MENUITEM SEPARATOR
-        MENUITEM "Go To...\tCtrl+G",            ID_EDIT_WMGOTO
+        MENUITEM "&Go To...\tCtrl+G",            ID_EDIT_WMGOTO
         MENUITEM SEPARATOR
         MENUITEM "&Options",                    ID_OPTIONS
         MENUITEM SEPARATOR
@@ -1497,3 +1499,4 @@ LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
 #endif    // not APSTUDIO_INVOKED
 
 
+

diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc
index ef2dbab..8ae7cf6 100644 (file)
--- a/Src/Languages/German/MergeGerman.rc
+++ b/Src/Languages/German/MergeGerman.rc
@@ -133,13 +133,15 @@ BEGIN
         MENUITEM "&Kopieren\tStrg+C",           ID_EDIT_COPY
         MENUITEM "E&infügen\tStrg+V",           ID_EDIT_PASTE
         MENUITEM SEPARATOR
+        MENUITEM "Select &All\tCtrl+A",         ID_EDIT_SELECT_ALL
+        MENUITEM SEPARATOR
         MENUITEM "Zeilenunterschied hervorheben\tF4",
                                                 ID_SHOWLINEDIFF
         MENUITEM SEPARATOR
         MENUITEM "&Suchen...\tStrg+F",          ID_EDIT_FIND
         MENUITEM "Erse&tzen...\tStrg+H",        ID_EDIT_REPLACE
         MENUITEM SEPARATOR
-        MENUITEM "Go To...\tCtrl+G",            ID_EDIT_WMGOTO
+        MENUITEM "&Go To...\tCtrl+G",            ID_EDIT_WMGOTO
         MENUITEM SEPARATOR
         MENUITEM "&Einstellungen...",           ID_OPTIONS
         MENUITEM SEPARATOR
@@ -1509,3 +1511,4 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
 #endif    // not APSTUDIO_INVOKED
 
 
+

diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc
index 496517a..54deb6f 100644 (file)
--- a/Src/Languages/Italian/MergeItalian.rc
+++ b/Src/Languages/Italian/MergeItalian.rc
@@ -132,12 +132,14 @@ BEGIN
         MENUITEM "C&opia\tCtrl+C",              ID_EDIT_COPY
         MENUITEM "I&ncolla\tCtrl+V",            ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "Highlight Line Diff\tF4",     ID_SHOWLINEDIFF
+        MENUITEM "Select &All\tCtrl+A",         ID_EDIT_SELECT_ALL
+        MENUITEM SEPARATOR
+        MENUITEM "&Highlight Line Diff\tF4",     ID_SHOWLINEDIFF
         MENUITEM SEPARATOR
         MENUITEM "F&ind...\tCtrl+F",            ID_EDIT_FIND
         MENUITEM "Repla&ce...\tCtrl+H",         ID_EDIT_REPLACE
         MENUITEM SEPARATOR
-        MENUITEM "Go To...\tCtrl+G",            ID_EDIT_WMGOTO
+        MENUITEM "&Go To...\tCtrl+G",            ID_EDIT_WMGOTO
         MENUITEM SEPARATOR
         MENUITEM "Op&zioni",                    ID_OPTIONS
         MENUITEM SEPARATOR
@@ -1492,3 +1494,4 @@ LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN
 #endif    // not APSTUDIO_INVOKED
 
 
+

diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc
index 4e54fb4..53700ca 100644 (file)
--- a/Src/Languages/Korean/MergeKorean.rc
+++ b/Src/Languages/Korean/MergeKorean.rc
@@ -96,12 +96,14 @@ BEGIN
         MENUITEM "º¹»ç(&C)\tCtrl+C",            ID_EDIT_COPY
         MENUITEM "ºÙ¿©³Ö±â(&P)\tCtrl+V",        ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "Highlight Line Diff\tF4",     ID_SHOWLINEDIFF
+        MENUITEM "Select &All\tCtrl+A",         ID_EDIT_SELECT_ALL
+        MENUITEM SEPARATOR
+        MENUITEM "&Highlight Line Diff\tF4",     ID_SHOWLINEDIFF
         MENUITEM SEPARATOR
         MENUITEM "ã±â(&I)...\tCtrl+F",         ID_EDIT_FIND
         MENUITEM "¹Ù²Ù±â(&C)...\tCtrl+H",       ID_EDIT_REPLACE
         MENUITEM SEPARATOR
-        MENUITEM "Go To...\tCtrl+G",            ID_EDIT_WMGOTO
+        MENUITEM "&Go To...\tCtrl+G",            ID_EDIT_WMGOTO
         MENUITEM SEPARATOR
         MENUITEM "¿É¼Ç(&O)...",                 ID_OPTIONS
         MENUITEM SEPARATOR
@@ -1674,3 +1676,4 @@ LANGUAGE 9, 1
 #endif    // not APSTUDIO_INVOKED
 
 
+

diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc
index a2a1a06..f9056fa 100644 (file)
--- a/Src/Languages/Norwegian/MergeNorwegian.rc
+++ b/Src/Languages/Norwegian/MergeNorwegian.rc
@@ -133,12 +133,14 @@ BEGIN
         MENUITEM "Ko&pier\tCtrl+C",             ID_EDIT_COPY
         MENUITEM "&Lim inn\tCtrl+V",            ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "Highlight Line Diff\tF4",     ID_SHOWLINEDIFF
+        MENUITEM "Select &All\tCtrl+A",         ID_EDIT_SELECT_ALL
+        MENUITEM SEPARATOR
+        MENUITEM "&Highlight Line Diff\tF4",     ID_SHOWLINEDIFF
         MENUITEM SEPARATOR
         MENUITEM "Sø&k...\tCtrl+F",             ID_EDIT_FIND
         MENUITEM "&Erstatt...\tCtrl+H",         ID_EDIT_REPLACE
         MENUITEM SEPARATOR
-        MENUITEM "Go To...\tCtrl+G",            ID_EDIT_WMGOTO
+        MENUITEM "&Go To...\tCtrl+G",            ID_EDIT_WMGOTO
         MENUITEM SEPARATOR
         MENUITEM "&Egenskaper...",              ID_OPTIONS
         MENUITEM SEPARATOR
@@ -1492,3 +1494,4 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT
 #endif    // not APSTUDIO_INVOKED
 
 
+

diff --git a/Src/Languages/Polish/MergePolish.rc b/Src/Languages/Polish/MergePolish.rc
index e11ab62..c292266 100644 (file)
--- a/Src/Languages/Polish/MergePolish.rc
+++ b/Src/Languages/Polish/MergePolish.rc
@@ -133,12 +133,14 @@ BEGIN
         MENUITEM "&Kopiuj\tCtrl+C",             ID_EDIT_COPY
         MENUITEM "Wk&lej\tCtrl+V",              ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "Highlight Line Diff\tF4",     ID_SHOWLINEDIFF
+        MENUITEM "Select &All\tCtrl+A",         ID_EDIT_SELECT_ALL
+        MENUITEM SEPARATOR
+        MENUITEM "&Highlight Line Diff\tF4",     ID_SHOWLINEDIFF
         MENUITEM SEPARATOR
         MENUITEM "W&yszukaj...\tCtrl+F",        ID_EDIT_FIND
         MENUITEM "&Zast¹p...\tCtrl+H",          ID_EDIT_REPLACE
         MENUITEM SEPARATOR
-        MENUITEM "Go To...\tCtrl+G",            ID_EDIT_WMGOTO
+        MENUITEM "&Go To...\tCtrl+G",            ID_EDIT_WMGOTO
         MENUITEM SEPARATOR
         MENUITEM "W³&a\9cciwo\9cci...",             ID_OPTIONS
         MENUITEM SEPARATOR
@@ -1489,3 +1491,4 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 #endif    // not APSTUDIO_INVOKED
 
 
+

diff --git a/Src/Languages/Russian/MergeRussian.rc b/Src/Languages/Russian/MergeRussian.rc
index 2ee04dc..2688647 100644 (file)
--- a/Src/Languages/Russian/MergeRussian.rc
+++ b/Src/Languages/Russian/MergeRussian.rc
@@ -133,12 +133,14 @@ BEGIN
         MENUITEM "&Êîïèðîâàòü\tCtrl+C",               ID_EDIT_COPY
         MENUITEM "&Âñòàâèòü\tCtrl+V",              ID_EDIT_PASTE
         MENUITEM SEPARATOR
+        MENUITEM "Select &All\tCtrl+A",         ID_EDIT_SELECT_ALL
+        MENUITEM SEPARATOR
         MENUITEM "Ïîäñâåòèòü ðàçëè÷èÿ â ëèíèè\tF4",     ID_SHOWLINEDIFF
         MENUITEM SEPARATOR
         MENUITEM "&Íàéòè...\tCtrl+F",            ID_EDIT_FIND
         MENUITEM "&Çàìåíèòü...\tCtrl+H",         ID_EDIT_REPLACE
         MENUITEM SEPARATOR
-        MENUITEM "Go To...\tCtrl+G",            ID_EDIT_WMGOTO
+        MENUITEM "&Go To...\tCtrl+G",            ID_EDIT_WMGOTO
         MENUITEM SEPARATOR
         MENUITEM "&Íàñòðîéêè...",                 ID_OPTIONS
         MENUITEM SEPARATOR
@@ -1488,3 +1490,4 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DUTCH
 #endif    // not APSTUDIO_INVOKED
 
 
+

diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc
index 72bcda8..54b7853 100644 (file)
--- a/Src/Languages/Slovak/MergeSlovak.rc
+++ b/Src/Languages/Slovak/MergeSlovak.rc
@@ -133,12 +133,14 @@ BEGIN
         MENUITEM "&Kopírova\9d\tCtrl+C",          ID_EDIT_COPY
         MENUITEM "V&lo\9ei\9d\tCtrl+V",             ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "Highlight Line Diff\tF4",     ID_SHOWLINEDIFF
+        MENUITEM "Select &All\tCtrl+A",         ID_EDIT_SELECT_ALL
+        MENUITEM SEPARATOR
+        MENUITEM "&Highlight Line Diff\tF4",     ID_SHOWLINEDIFF
         MENUITEM SEPARATOR
         MENUITEM "&H¾adaj...\tCtrl+F",          ID_EDIT_FIND
         MENUITEM "Nahraï...\tCtrl+H",           ID_EDIT_REPLACE
         MENUITEM SEPARATOR
-        MENUITEM "Go To...\tCtrl+G",            ID_EDIT_WMGOTO
+        MENUITEM "&Go To...\tCtrl+G",            ID_EDIT_WMGOTO
         MENUITEM SEPARATOR
         MENUITEM "&Vlastnosti",                 ID_OPTIONS
         MENUITEM SEPARATOR
@@ -1494,3 +1496,4 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
 
+

diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc
index c6519e8..74bd7bc 100644 (file)
--- a/Src/Languages/Spanish/MergeSpanish.rc
+++ b/Src/Languages/Spanish/MergeSpanish.rc
@@ -133,12 +133,14 @@ BEGIN
         MENUITEM "Copi&ar\tCtrl+C",             ID_EDIT_COPY
         MENUITEM "Pe&gar\tCtrl+V",              ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "Highlight Line Diff\tF4",     ID_SHOWLINEDIFF
+        MENUITEM "Select &All\tCtrl+A",         ID_EDIT_SELECT_ALL
+        MENUITEM SEPARATOR
+        MENUITEM "&Highlight Line Diff\tF4",     ID_SHOWLINEDIFF
         MENUITEM SEPARATOR
         MENUITEM "F&ind...\tCtrl+F",            ID_EDIT_FIND
         MENUITEM "Repla&ce...\tCtrl+H",         ID_EDIT_REPLACE
         MENUITEM SEPARATOR
-        MENUITEM "Go To...\tCtrl+G",            ID_EDIT_WMGOTO
+        MENUITEM "&Go To...\tCtrl+G",            ID_EDIT_WMGOTO
         MENUITEM SEPARATOR
         MENUITEM "Pr&opiedades...",             ID_OPTIONS
         MENUITEM SEPARATOR
@@ -1495,3 +1497,4 @@ LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN
 #endif    // not APSTUDIO_INVOKED
 
 
+

diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc
index 7d9188a..f07ce65 100644 (file)
--- a/Src/Languages/Swedish/MergeSwedish.rc
+++ b/Src/Languages/Swedish/MergeSwedish.rc
@@ -132,12 +132,14 @@ BEGIN
         MENUITEM "K&opiera\tCtrl+C",            ID_EDIT_COPY
         MENUITEM "K&listra in\tCtrl+V",         ID_EDIT_PASTE
         MENUITEM SEPARATOR
+        MENUITEM "Select &All\tCtrl+A",         ID_EDIT_SELECT_ALL
+        MENUITEM SEPARATOR
         MENUITEM "Markera radskillnader\tF4",   ID_SHOWLINEDIFF
         MENUITEM SEPARATOR
         MENUITEM "S&ök...\tCtrl+F",             ID_EDIT_FIND
         MENUITEM "&Ersätt...\tCtrl+H",          ID_EDIT_REPLACE
         MENUITEM SEPARATOR
-        MENUITEM "Go To...\tCtrl+G",            ID_EDIT_WMGOTO
+        MENUITEM "&Go To...\tCtrl+G",            ID_EDIT_WMGOTO
         MENUITEM SEPARATOR
         MENUITEM "E&genskaper...",              ID_OPTIONS
         MENUITEM SEPARATOR
@@ -1490,3 +1492,4 @@ LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
 #endif    // not APSTUDIO_INVOKED
 
 
+

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 381eddd..4c9d913 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -133,12 +133,14 @@ BEGIN
         MENUITEM "&Copy\tCtrl+C",               ID_EDIT_COPY
         MENUITEM "&Paste\tCtrl+V",              ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "Highlight Line Diff\tF4",     ID_SHOWLINEDIFF
+        MENUITEM "Select &All\tCtrl+A",         ID_EDIT_SELECT_ALL
+        MENUITEM SEPARATOR
+        MENUITEM "&Highlight Line Diff\tF4",     ID_SHOWLINEDIFF
         MENUITEM SEPARATOR
         MENUITEM "F&ind...\tCtrl+F",            ID_EDIT_FIND
         MENUITEM "Repla&ce...\tCtrl+H",         ID_EDIT_REPLACE
         MENUITEM SEPARATOR
-        MENUITEM "Go To...\tCtrl+G",            ID_EDIT_WMGOTO
+        MENUITEM "&Go To...\tCtrl+G",            ID_EDIT_WMGOTO
         MENUITEM SEPARATOR
         MENUITEM "&Options...",                 ID_OPTIONS
         MENUITEM SEPARATOR
@@ -1654,3 +1656,4 @@ LANGUAGE 9, 1
 #endif    // not APSTUDIO_INVOKED
 
 
+

diff --git a/Src/readme.txt b/Src/readme.txt
index f3e6f87..095ee66 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,6 +1,9 @@
 2004-01-23 Kimmo
  PATCH: [ 881602 ] Don't allow canceling saving when its pointless
   src: MainFrm.cpp MergeDiffDetailView.cpp MergeDoc.cpp MergeDoc.h MergeEditView.cpp
+ PATCH: [ 880769 ] Select all in Dir compare
+  src: DirView.h DirView.cpp Merge.rc
+  Languages: *.rc
 
 2004-01-23 Perry
  PATCH: [ 880006 ] Code cleanup--old commented out lines in DirView.h