PATCH: [ 924521 ] Add context menu for file compare

diff --git a/Src/DirView.cpp b/Src/DirView.cpp
index aa3f015..dab4423 100644 (file)
--- a/Src/DirView.cpp
+++ b/Src/DirView.cpp
@@ -42,6 +42,7 @@
 #include "paths.h"     // paths_GetParentPath()
 #include "7zCommon.h"
 #include "OptionsDef.h"
+#include "BCMenu.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -394,12 +395,12 @@ static CWnd * GetNonChildAncestor(CWnd * w)
 /**
  * @brief Format context menu string and disable item if it cannot be applied.
  */
-static void NTAPI FormatContextMenu(CMenu *pPopup, UINT uIDItem, int n1, int n2 = 0, int n3 = 0)
+static void NTAPI FormatContextMenu(BCMenu *pPopup, UINT uIDItem, int n1, int n2 = 0, int n3 = 0)
 {
        CString s1, s2;
-       pPopup->GetMenuString(uIDItem, s1, MF_BYCOMMAND);
-       s2.FormatMessage(s1, NumToStr(n1), NumToStr(n2), NumToStr(n3));
-       pPopup->ModifyMenu(uIDItem, MF_BYCOMMAND, uIDItem, s2);
+       pPopup->GetMenuText(uIDItem, s1, MF_BYCOMMAND);
+       s2.FormatMessage((LPTSTR)(LPCTSTR)s1, NumToStr(n1), NumToStr(n2), NumToStr(n3));
+       pPopup->SetMenuText(uIDItem, s2, MF_BYCOMMAND);
        if (n1 == 0)
        {
                pPopup->EnableMenuItem(uIDItem, MF_GRAYED);
@@ -411,11 +412,15 @@ static void NTAPI FormatContextMenu(CMenu *pPopup, UINT uIDItem, int n1, int n2
  */
 void CDirView::ListContextMenu(CPoint point, int /*i*/)
 {
-       CMenu menu;
+       // Make sure window is active
+       GetParentFrame()->ActivateFrame();
+
+       BCMenu menu;
        VERIFY(menu.LoadMenu(IDR_POPUP_DIRVIEW));
+       VERIFY(menu.LoadToolbar(IDR_MAINFRAME));
 
        // 1st submenu of IDR_POPUP_DIRVIEW is for item popup
-       CMenu* pPopup = menu.GetSubMenu(0);
+       BCMenu *pPopup = (BCMenu*) menu.GetSubMenu(0);
        ASSERT(pPopup != NULL);
 
        // set the menu items with the proper directory names
@@ -487,7 +492,7 @@ void CDirView::ListContextMenu(CPoint point, int /*i*/)
        // invoke context menu
        // this will invoke all the OnUpdate methods to enable/disable the individual items
        pPopup->TrackPopupMenu(TPM_LEFTALIGN | TPM_RIGHTBUTTON, point.x, point.y,
-               pFrame);
+               AfxGetMainWnd());
        pFrame->m_bAutoMenuEnable = TRUE;
 }
 
@@ -497,20 +502,18 @@ void CDirView::ListContextMenu(CPoint point, int /*i*/)
 void CDirView::HeaderContextMenu(CPoint point, int /*i*/)
 {
        ToDoDeleteThisValidateColumnOrdering();
-       CMenu menu;
+       BCMenu menu;
        VERIFY(menu.LoadMenu(IDR_POPUP_DIRVIEW));
+       VERIFY(menu.LoadToolbar(IDR_MAINFRAME));
 
        // 2nd submenu of IDR_POPUP_DIRVIEW is for header popup
-       CMenu* pPopup = menu.GetSubMenu(1);
+       BCMenu* pPopup = (BCMenu *)menu.GetSubMenu(1);
        ASSERT(pPopup != NULL);
 
-       // find non-child ancestor to use as menu parent
-       CFrameWnd *pFrame = GetTopLevelFrame();
-       ASSERT(pFrame != NULL);
        // invoke context menu
        // this will invoke all the OnUpdate methods to enable/disable the individual items
        pPopup->TrackPopupMenu(TPM_LEFTALIGN | TPM_RIGHTBUTTON, point.x, point.y,
-               pFrame);
+               AfxGetMainWnd());
 }      
 
 /// Make a string out of a number

diff --git a/Src/FilepathEdit.cpp b/Src/FilepathEdit.cpp
index fe06efe..3010355 100644 (file)
--- a/Src/FilepathEdit.cpp
+++ b/Src/FilepathEdit.cpp
@@ -23,6 +23,7 @@
 
 #include "stdafx.h"
 #include "Merge.h"
+#include "BCMenu.h"
 
 #include "FilepathEdit.h"
 
@@ -273,10 +274,10 @@ void CFilepathEdit::OnContextMenu(CWnd*, CPoint point)
                        point.Offset(5, 5);
                }
 
-               CMenu menu;
+               BCMenu menu;
                VERIFY(menu.LoadMenu(IDR_POPUP_EDITOR_HEADERBAR));
 
-               CMenu* pPopup = menu.GetSubMenu(0);
+               BCMenu* pPopup = (BCMenu *) menu.GetSubMenu(0);
                ASSERT(pPopup != NULL);
 
                if (wholeText.Right(1) == '\\')
@@ -286,7 +287,7 @@ void CFilepathEdit::OnContextMenu(CWnd*, CPoint point)
                // invoke context menu
                // we don't want to use the main application handlers, so we use flags TPM_NONOTIFY | TPM_RETURNCMD
                // and handle the command after TrackPopupMenu
-               int command = pPopup->TrackPopupMenu(TPM_LEFTALIGN | TPM_RIGHTBUTTON | TPM_NONOTIFY  | TPM_RETURNCMD, point.x, point.y, this);
+               int command = pPopup->TrackPopupMenu(TPM_LEFTALIGN | TPM_RIGHTBUTTON | TPM_NONOTIFY  | TPM_RETURNCMD, point.x, point.y, AfxGetMainWnd());
                if (command != ID_EDITOR_COPY_FILENAME && command != ID_EDITOR_COPY_PATH)
                        return;
 

diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc
index 81bd74b..3970dd0 100644 (file)
--- a/Src/Languages/Brazilian/MergeBrazilian.rc
+++ b/Src/Languages/Brazilian/MergeBrazilian.rc
@@ -75,21 +75,23 @@ IDR_MERGETYPE           ICON    DISCARDABLE     "res\\MergeDoc.ico"
 // Menu
 //
 
-IDR_POPUP_DIFFVIEW MENU DISCARDABLE
+IDR_POPUP_MERGEVIEW MENU 
 BEGIN
     POPUP "_POPUP_"
     BEGIN
+        MENUITEM "&Desfazer",                   ID_EDIT_UNDO
+        MENUITEM "&Refazer",                    ID_EDIT_REDO
+        MENUITEM SEPARATOR
         MENUITEM "Copiar para o outro lado",    ID_POPUP_COPYTOOTHERSIDE
         MENUITEM "Copiar do outro lado",        ID_POPUP_COPYFROMOTHERSIDE
         MENUITEM SEPARATOR
-        MENUITEM "Copiar todos diferentes para o outro lado...",
-                                                ID_POPUP_COPYALLDIFFSTOOTHERSIDE
-        MENUITEM "Copiar todos diferentes do outro lado...",
-                                                ID_POPUP_COPYALLDIFFSFROMOTHERSIDE
+        MENUITEM "&Highlight Line Diff",         ID_SHOWLINEDIFF
         MENUITEM SEPARATOR
-        MENUITEM "Desfazer",                    ID_UNDO
+        MENUITEM "Cor&tar",                      ID_EDIT_CUT
+        MENUITEM "&Copiar",                      ID_EDIT_COPY
+        MENUITEM "Co&lar",                       ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "Salvar alterações...",        ID_POPUP_SAVE
+        MENUITEM "&Goto...",                     ID_EDIT_WMGOTO
     END
 END
 

diff --git a/Src/Languages/Brazilian/resource.h b/Src/Languages/Brazilian/resource.h
index 734d1c4..8f96201 100644 (file)
--- a/Src/Languages/Brazilian/resource.h
+++ b/Src/Languages/Brazilian/resource.h
@@ -8,7 +8,7 @@
 #define IDC_UNDO                        6
 #define IDSAVEAS                        7
 #define IDD_ABOUTBOX                    100
-#define IDR_POPUP_DIFFVIEW              101
+#define IDR_POPUP_MERGEVIEW             101
 #define IDR_POPUP_DIRVIEW               102
 #define IDD_PROP_VSS                    103
 #define IDR_MAINFRAME                   104

diff --git a/Src/Languages/Bulgarian/MergeBulgarian.rc b/Src/Languages/Bulgarian/MergeBulgarian.rc
index 880fb59..19a3a0e 100644 (file)
--- a/Src/Languages/Bulgarian/MergeBulgarian.rc
+++ b/Src/Languages/Bulgarian/MergeBulgarian.rc
@@ -75,23 +75,23 @@ IDR_MERGETYPE           ICON                    "res\\MergeDoc.ico"
 // Menu
 //
 
-IDR_POPUP_DIFFVIEW MENU 
+IDR_POPUP_MERGEVIEW MENU 
 BEGIN
     POPUP "_POPUP_"
     BEGIN
+        MENUITEM "&Ïðåäèøíî",                     ID_EDIT_UNDO
+        MENUITEM "Âú&ðíè",                        ID_EDIT_REDO
+        MENUITEM SEPARATOR
         MENUITEM "Êîïèðàé íà äðóãàòà ñòðàíà",          ID_POPUP_COPYTOOTHERSIDE
         MENUITEM "Êîïèðàé îò äðóãàòà ñòðàíà",        ID_POPUP_COPYFROMOTHERSIDE
         MENUITEM SEPARATOR
-        MENUITEM "Êîïèðàé âñè÷êè ðàçëè÷èÿ íà äðóãàòà ñòðàíà...", 
-                                                ID_POPUP_COPYALLDIFFSTOOTHERSIDE
-
-        MENUITEM "Êîïèðàé âñè÷êè ðàçëè÷èÿ îò äðóãàòà ñòðàíà...",
-                                                ID_POPUP_COPYALLDIFFSFROMOTHERSIDE
-
+        MENUITEM "Ïî&ä÷åðòàé ðàçëèêèòå",         ID_SHOWLINEDIFF
         MENUITEM SEPARATOR
-        MENUITEM "Ïðåäèøíî",                        ID_UNDO
+        MENUITEM "Ðå&æà",                        ID_EDIT_CUT
+        MENUITEM "Ê&îïèðàì",                     ID_EDIT_COPY
+        MENUITEM "Ïî&ñàòâÿì",                    ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "Çàïàçè ïðîìåíèòå...",             ID_POPUP_SAVE
+        MENUITEM "Îò&èäè íà...",                 ID_EDIT_WMGOTO
     END
 END
 

diff --git a/Src/Languages/Bulgarian/resource.h b/Src/Languages/Bulgarian/resource.h
index 734d1c4..8f96201 100644 (file)
--- a/Src/Languages/Bulgarian/resource.h
+++ b/Src/Languages/Bulgarian/resource.h
@@ -8,7 +8,7 @@
 #define IDC_UNDO                        6
 #define IDSAVEAS                        7
 #define IDD_ABOUTBOX                    100
-#define IDR_POPUP_DIFFVIEW              101
+#define IDR_POPUP_MERGEVIEW             101
 #define IDR_POPUP_DIRVIEW               102
 #define IDD_PROP_VSS                    103
 #define IDR_MAINFRAME                   104

diff --git a/Src/Languages/Catalan/MergeCatalan.rc b/Src/Languages/Catalan/MergeCatalan.rc
index 10599da..bae63e3 100644 (file)
--- a/Src/Languages/Catalan/MergeCatalan.rc
+++ b/Src/Languages/Catalan/MergeCatalan.rc
@@ -75,21 +75,23 @@ IDR_MERGETYPE           ICON    DISCARDABLE     "res\\MergeDoc.ico"
 // Menu
 //
 
-IDR_POPUP_DIFFVIEW MENU DISCARDABLE
+IDR_POPUP_MERGEVIEW MENU 
 BEGIN
     POPUP "_POPUP_"
     BEGIN
+        MENUITEM "&Desfés",                      ID_EDIT_UNDO
+        MENUITEM "Re&fés",                       ID_EDIT_REDO
+        MENUITEM SEPARATOR
         MENUITEM "Copia &a l'altra banda",      ID_POPUP_COPYTOOTHERSIDE
         MENUITEM "Copia &de l'altra banda",     ID_POPUP_COPYFROMOTHERSIDE
         MENUITEM SEPARATOR
-        MENUITEM "Copia &totes les diferències a l'altra banda...",
-                                                ID_POPUP_COPYALLDIFFSTOOTHERSIDE
-        MENUITEM "Copia t&otes les diferències de l'altra banda...",
-                                                ID_POPUP_COPYALLDIFFSFROMOTHERSIDE
+        MENUITEM "R&essalta les diferències de línia", ID_SHOWLINEDIFF
         MENUITEM SEPARATOR
-        MENUITEM "&Desfés",                     ID_UNDO
+        MENUITEM "&Retalla",                     ID_EDIT_CUT
+        MENUITEM "C&opia",                       ID_EDIT_COPY
+        MENUITEM "Engan&xa",                     ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "De&sa els canvis...",         ID_POPUP_SAVE
+        MENUITEM "&Goto...",                     ID_EDIT_WMGOTO
     END
 END
 

diff --git a/Src/Languages/Catalan/resource.h b/Src/Languages/Catalan/resource.h
index 734d1c4..8f96201 100644 (file)
--- a/Src/Languages/Catalan/resource.h
+++ b/Src/Languages/Catalan/resource.h
@@ -8,7 +8,7 @@
 #define IDC_UNDO                        6
 #define IDSAVEAS                        7
 #define IDD_ABOUTBOX                    100
-#define IDR_POPUP_DIFFVIEW              101
+#define IDR_POPUP_MERGEVIEW             101
 #define IDR_POPUP_DIRVIEW               102
 #define IDD_PROP_VSS                    103
 #define IDR_MAINFRAME                   104

diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
index 85f940f..4454e27 100644 (file)
--- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
+++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
@@ -74,19 +74,23 @@ IDR_MERGETYPE           ICON    DISCARDABLE     "res\\MergeDoc.ico"
 // Menu
 //
 
-IDR_POPUP_DIFFVIEW MENU DISCARDABLE
+IDR_POPUP_MERGEVIEW MENU 
 BEGIN
     POPUP "_POPUP_"
     BEGIN
+        MENUITEM "³·Ïú(&U)",                    ID_EDIT_UNDO
+        MENUITEM "Öظ´(&R)",                    ID_EDIT_REDO
+        MENUITEM SEPARATOR
         MENUITEM "¸´ÖƵ½ÁíÒ»±ß",                ID_POPUP_COPYTOOTHERSIDE
         MENUITEM "´ÓÁíÒ»±ß¸´ÖÆ",                ID_POPUP_COPYFROMOTHERSIDE
         MENUITEM SEPARATOR
-        MENUITEM "¸´ÖÆËùÓв»Í¬µ½ÁíÒ»±ß...",     ID_POPUP_COPYALLDIFFSTOOTHERSIDE
-        MENUITEM "´ÓÁíÒ»±ß¸´ÖÆËùÓв»Í¬...",     ID_POPUP_COPYALLDIFFSFROMOTHERSIDE
+        MENUITEM "&Highlight Line Diff",        ID_SHOWLINEDIFF
         MENUITEM SEPARATOR
-        MENUITEM "³·Ïú",                        ID_UNDO
+        MENUITEM "¼ôÇÐ(&U)",                    ID_EDIT_CUT
+        MENUITEM "¸´ÖÆ(&C)",                    ID_EDIT_COPY
+        MENUITEM "Õ³Ìù(&P)",                    ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "Áí´æΪ...",                 ID_POPUP_SAVE
+        MENUITEM "&Goto...",                     ID_EDIT_WMGOTO
     END
 END
 

diff --git a/Src/Languages/ChineseSimplified/resource.h b/Src/Languages/ChineseSimplified/resource.h
index 734d1c4..8f96201 100644 (file)
--- a/Src/Languages/ChineseSimplified/resource.h
+++ b/Src/Languages/ChineseSimplified/resource.h
@@ -8,7 +8,7 @@
 #define IDC_UNDO                        6
 #define IDSAVEAS                        7
 #define IDD_ABOUTBOX                    100
-#define IDR_POPUP_DIFFVIEW              101
+#define IDR_POPUP_MERGEVIEW             101
 #define IDR_POPUP_DIRVIEW               102
 #define IDD_PROP_VSS                    103
 #define IDR_MAINFRAME                   104

diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
index be46a48..40f58f7 100644 (file)
--- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
+++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
@@ -75,19 +75,23 @@ IDR_MERGETYPE           ICON    DISCARDABLE     "res\\MergeDoc.ico"
 // Menu
 //
 
-IDR_POPUP_DIFFVIEW MENU DISCARDABLE
+IDR_POPUP_MERGEVIEW MENU 
 BEGIN
     POPUP "_POPUP_"
     BEGIN
+        MENUITEM "´_­ì(&U)",                    ID_EDIT_UNDO
+        MENUITEM "­«°µ(&R)",                    ID_EDIT_REDO
+        MENUITEM SEPARATOR
         MENUITEM "½Æ»s¨ì¥t¤@Ãä",                ID_POPUP_COPYTOOTHERSIDE
         MENUITEM "±q¥t¤@Ãä½Æ»s",                ID_POPUP_COPYFROMOTHERSIDE
         MENUITEM SEPARATOR
-        MENUITEM "½Æ»s©Ò¦³¤£¦P¨ì¥t¤@Ãä...",     ID_POPUP_COPYALLDIFFSTOOTHERSIDE
-        MENUITEM "±q¥t¤@Ãä½Æ»s©Ò¦³¤£¦P...",     ID_POPUP_COPYALLDIFFSFROMOTHERSIDE
+        MENUITEM "&Highlight Line Diff",         ID_SHOWLINEDIFF
         MENUITEM SEPARATOR
-        MENUITEM "´_­ì",                        ID_UNDO
+        MENUITEM "°Å¤U(&U)",                    ID_EDIT_CUT
+        MENUITEM "½Æ»s(&C)",                    ID_EDIT_COPY
+        MENUITEM "¶K¤W(&P)",                    ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "Àx¦s§ó§ï...",                 ID_POPUP_SAVE
+        MENUITEM "&Goto...",                     ID_EDIT_WMGOTO
     END
 END
 

diff --git a/Src/Languages/ChineseTraditional/resource.h b/Src/Languages/ChineseTraditional/resource.h
index 734d1c4..8f96201 100644 (file)
--- a/Src/Languages/ChineseTraditional/resource.h
+++ b/Src/Languages/ChineseTraditional/resource.h
@@ -8,7 +8,7 @@
 #define IDC_UNDO                        6
 #define IDSAVEAS                        7
 #define IDD_ABOUTBOX                    100
-#define IDR_POPUP_DIFFVIEW              101
+#define IDR_POPUP_MERGEVIEW             101
 #define IDR_POPUP_DIRVIEW               102
 #define IDD_PROP_VSS                    103
 #define IDR_MAINFRAME                   104

diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc
index 46d64ed..8cea433 100644 (file)
--- a/Src/Languages/Czech/MergeCzech.rc
+++ b/Src/Languages/Czech/MergeCzech.rc
@@ -75,22 +75,23 @@ IDR_MERGETYPE           ICON    DISCARDABLE     "res\\MergeDoc.ico"
 // Menu
 //
 
-IDR_POPUP_DIFFVIEW MENU DISCARDABLE
+IDR_POPUP_MERGEVIEW MENU 
 BEGIN
     POPUP "_POPUP_"
     BEGIN
+        MENUITEM "&Zpet",                        ID_EDIT_UNDO
+        MENUITEM "&Redo",                        ID_EDIT_REDO
+        MENUITEM SEPARATOR
         MENUITEM "Kopírovat na druhou stranu",  ID_POPUP_COPYTOOTHERSIDE
         MENUITEM "Kopírovat z druhé strany",    ID_POPUP_COPYFROMOTHERSIDE
         MENUITEM SEPARATOR
-        MENUITEM "Kopírovat v\9aechny rozdíly na druhou stranu...",
-                                                ID_POPUP_COPYALLDIFFSTOOTHERSIDE
-
-        MENUITEM "Kopírovat v\9aechny rozdíly z druhé strany...",
-                                                ID_POPUP_COPYALLDIFFSFROMOTHERSIDE
+        MENUITEM "&Highlight Line Diff",         ID_SHOWLINEDIFF
         MENUITEM SEPARATOR
-        MENUITEM "Zpet",                        ID_UNDO
+        MENUITEM "V&yoíznout",                  ID_EDIT_CUT
+        MENUITEM "&Kopírovat",                  ID_EDIT_COPY
+        MENUITEM "V&lo\9eit",                     ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "Ulo\9eit zmeny...",             ID_POPUP_SAVE
+        MENUITEM "&Goto...",                     ID_EDIT_WMGOTO
     END
 END
 

diff --git a/Src/Languages/Czech/resource.h b/Src/Languages/Czech/resource.h
index 734d1c4..8f96201 100644 (file)
--- a/Src/Languages/Czech/resource.h
+++ b/Src/Languages/Czech/resource.h
@@ -8,7 +8,7 @@
 #define IDC_UNDO                        6
 #define IDSAVEAS                        7
 #define IDD_ABOUTBOX                    100
-#define IDR_POPUP_DIFFVIEW              101
+#define IDR_POPUP_MERGEVIEW             101
 #define IDR_POPUP_DIRVIEW               102
 #define IDD_PROP_VSS                    103
 #define IDR_MAINFRAME                   104

diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc
index 5250cd8..8988f48 100644 (file)
--- a/Src/Languages/Danish/MergeDanish.rc
+++ b/Src/Languages/Danish/MergeDanish.rc
@@ -75,21 +75,23 @@ IDR_MERGETYPE           ICON    DISCARDABLE     "res\\MergeDoc.ico"
 // Menu
 //
 
-IDR_POPUP_DIFFVIEW MENU DISCARDABLE
+IDR_POPUP_MERGEVIEW MENU 
 BEGIN
     POPUP "_POPUP_"
     BEGIN
+        MENUITEM "&Fortryd",                     ID_EDIT_UNDO
+        MENUITEM "&Redo",                        ID_EDIT_REDO
+        MENUITEM SEPARATOR
         MENUITEM "Kopier til den anden side",   ID_POPUP_COPYTOOTHERSIDE
         MENUITEM "Kopier fra den anden side",   ID_POPUP_COPYFROMOTHERSIDE
         MENUITEM SEPARATOR
-        MENUITEM "Kopier alle forskelle til den anden side...",
-                                                ID_POPUP_COPYALLDIFFSTOOTHERSIDE
-        MENUITEM "Kopier alle forskelle fra den anden side...",
-                                                ID_POPUP_COPYALLDIFFSFROMOTHERSIDE
+        MENUITEM "&Highlight Line Diff",         ID_SHOWLINEDIFF
         MENUITEM SEPARATOR
-        MENUITEM "Fortryd",                     ID_UNDO
+        MENUITEM "&Klip",                       ID_EDIT_CUT
+        MENUITEM "Ko&pier",                     ID_EDIT_COPY
+        MENUITEM "&Indsæt",                     ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "Gem ændringer...",            ID_POPUP_SAVE
+        MENUITEM "&Goto...",                     ID_EDIT_WMGOTO
     END
 END
 

diff --git a/Src/Languages/Danish/resource.h b/Src/Languages/Danish/resource.h
index 734d1c4..8f96201 100644 (file)
--- a/Src/Languages/Danish/resource.h
+++ b/Src/Languages/Danish/resource.h
@@ -8,7 +8,7 @@
 #define IDC_UNDO                        6
 #define IDSAVEAS                        7
 #define IDD_ABOUTBOX                    100
-#define IDR_POPUP_DIFFVIEW              101
+#define IDR_POPUP_MERGEVIEW             101
 #define IDR_POPUP_DIRVIEW               102
 #define IDD_PROP_VSS                    103
 #define IDR_MAINFRAME                   104

diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc
index 5fad400..0845639 100644 (file)
--- a/Src/Languages/Dutch/MergeDutch.rc
+++ b/Src/Languages/Dutch/MergeDutch.rc
@@ -75,21 +75,23 @@ IDR_MERGETYPE           ICON    DISCARDABLE     "res\\MergeDoc.ico"
 // Menu
 //
 
-IDR_POPUP_DIFFVIEW MENU DISCARDABLE
+IDR_POPUP_MERGEVIEW MENU 
 BEGIN
     POPUP "_POPUP_"
     BEGIN
+        MENUITEM "&Ongedaan maken",             ID_EDIT_UNDO
+        MENUITEM "&Redo",                        ID_EDIT_REDO
+        MENUITEM SEPARATOR
         MENUITEM "Kopieer naar andere kant",    ID_POPUP_COPYTOOTHERSIDE
         MENUITEM "Kopieer van andere kant",     ID_POPUP_COPYFROMOTHERSIDE
         MENUITEM SEPARATOR
-        MENUITEM "Kopieer alle verschillen naar de andere kant",
-                                                ID_POPUP_COPYALLDIFFSTOOTHERSIDE
-        MENUITEM "Kopieer alle verschillen van de andere kant",
-                                                ID_POPUP_COPYALLDIFFSFROMOTHERSIDE
+        MENUITEM "&Highlight Line Diff",         ID_SHOWLINEDIFF
         MENUITEM SEPARATOR
-        MENUITEM "Ongedaan maken",              ID_UNDO
+        MENUITEM "&Knippen",                    ID_EDIT_CUT
+        MENUITEM "Ko&piëeren",                  ID_EDIT_COPY
+        MENUITEM "Pl&akken",                    ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "Wijzigingen opslaan",         ID_POPUP_SAVE
+        MENUITEM "&Goto...",                     ID_EDIT_WMGOTO
     END
 END
 

diff --git a/Src/Languages/Dutch/resource.h b/Src/Languages/Dutch/resource.h
index 734d1c4..8f96201 100644 (file)
--- a/Src/Languages/Dutch/resource.h
+++ b/Src/Languages/Dutch/resource.h
@@ -8,7 +8,7 @@
 #define IDC_UNDO                        6
 #define IDSAVEAS                        7
 #define IDD_ABOUTBOX                    100
-#define IDR_POPUP_DIFFVIEW              101
+#define IDR_POPUP_MERGEVIEW             101
 #define IDR_POPUP_DIRVIEW               102
 #define IDD_PROP_VSS                    103
 #define IDR_MAINFRAME                   104

diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc
index 487f01e..3f01a67 100644 (file)
--- a/Src/Languages/French/MergeFrench.rc
+++ b/Src/Languages/French/MergeFrench.rc
@@ -75,21 +75,23 @@ IDR_MERGETYPE           ICON    DISCARDABLE     "res\\MergeDoc.ico"
 // Menu
 //
 
-IDR_POPUP_DIFFVIEW MENU DISCARDABLE
+IDR_POPUP_MERGEVIEW MENU 
 BEGIN
     POPUP "_POPUP_"
     BEGIN
+        MENUITEM "&Annuler",                    ID_EDIT_UNDO
+        MENUITEM "&Rétablir",                   ID_EDIT_REDO
+        MENUITEM SEPARATOR
         MENUITEM "Copier vers l'autre côté",    ID_POPUP_COPYTOOTHERSIDE
         MENUITEM "Copier depuis l'autre côté",  ID_POPUP_COPYFROMOTHERSIDE
         MENUITEM SEPARATOR
-        MENUITEM "Copier toutes les différences vers l'autre côté...",
-                                                ID_POPUP_COPYALLDIFFSTOOTHERSIDE
-        MENUITEM "Copier toutes les différences depuis l'autre côté...",
-                                                ID_POPUP_COPYALLDIFFSFROMOTHERSIDE
+        MENUITEM "Premier mot différent de la ligne", ID_SHOWLINEDIFF
         MENUITEM SEPARATOR
-        MENUITEM "Annuler",                     ID_UNDO
+        MENUITEM "&Couper",                     ID_EDIT_CUT
+        MENUITEM "Co&pier",                     ID_EDIT_COPY
+        MENUITEM "C&oller",                     ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "Enregistrer les changements...", ID_POPUP_SAVE
+        MENUITEM "&Goto...",                     ID_EDIT_WMGOTO
     END
 END
 

diff --git a/Src/Languages/French/resource.h b/Src/Languages/French/resource.h
index 734d1c4..8f96201 100644 (file)
--- a/Src/Languages/French/resource.h
+++ b/Src/Languages/French/resource.h
@@ -8,7 +8,7 @@
 #define IDC_UNDO                        6
 #define IDSAVEAS                        7
 #define IDD_ABOUTBOX                    100
-#define IDR_POPUP_DIFFVIEW              101
+#define IDR_POPUP_MERGEVIEW             101
 #define IDR_POPUP_DIRVIEW               102
 #define IDD_PROP_VSS                    103
 #define IDR_MAINFRAME                   104

diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc
index 2ea3e02..a4e7250 100644 (file)
--- a/Src/Languages/German/MergeGerman.rc
+++ b/Src/Languages/German/MergeGerman.rc
@@ -75,21 +75,23 @@ IDR_MERGETYPE           ICON    DISCARDABLE     "res\\MergeDoc.ico"
 // Menu
 //
 
-IDR_POPUP_DIFFVIEW MENU DISCARDABLE
+IDR_POPUP_MERGEVIEW MENU 
 BEGIN
     POPUP "_POPUP_"
     BEGIN
+        MENUITEM "&Rückgängig",                 ID_EDIT_UNDO
+        MENUITEM "&Wiederherstellen",           ID_EDIT_REDO
+        MENUITEM SEPARATOR
         MENUITEM "Zur anderen Seite kopieren",  ID_POPUP_COPYTOOTHERSIDE
         MENUITEM "Von der anderen Seite kopieren", ID_POPUP_COPYFROMOTHERSIDE
         MENUITEM SEPARATOR
-        MENUITEM "Alle Unterschiede zur anderen Seite kopieren...",
-                                                ID_POPUP_COPYALLDIFFSTOOTHERSIDE
-        MENUITEM "Alle Unterschiede von der anderen Seite kopieren...",
-                                                ID_POPUP_COPYALLDIFFSFROMOTHERSIDE
+        MENUITEM "Zeilenunterschied &hervorheben", ID_SHOWLINEDIFF
         MENUITEM SEPARATOR
-        MENUITEM "Rückgängig",                  ID_UNDO
+        MENUITEM "Auss&chneiden",               ID_EDIT_CUT
+        MENUITEM "&Kopieren",                   ID_EDIT_COPY
+        MENUITEM "E&infügen",                   ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "Änderungen speichern...",     ID_POPUP_SAVE
+        MENUITEM "&Gehe nach...",               ID_EDIT_WMGOTO
     END
 END
 

diff --git a/Src/Languages/German/resource.h b/Src/Languages/German/resource.h
index 734d1c4..8f96201 100644 (file)
--- a/Src/Languages/German/resource.h
+++ b/Src/Languages/German/resource.h
@@ -8,7 +8,7 @@
 #define IDC_UNDO                        6
 #define IDSAVEAS                        7
 #define IDD_ABOUTBOX                    100
-#define IDR_POPUP_DIFFVIEW              101
+#define IDR_POPUP_MERGEVIEW             101
 #define IDR_POPUP_DIRVIEW               102
 #define IDD_PROP_VSS                    103
 #define IDR_MAINFRAME                   104

diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc
index 9d53e13..4636754 100644 (file)
--- a/Src/Languages/Italian/MergeItalian.rc
+++ b/Src/Languages/Italian/MergeItalian.rc
@@ -75,20 +75,23 @@ IDR_MERGETYPE           ICON    DISCARDABLE     "res\\MergeDoc.ico"
 // Menu
 //
 
-IDR_POPUP_DIFFVIEW MENU DISCARDABLE
+IDR_POPUP_MERGEVIEW MENU 
 BEGIN
     POPUP "_POPUP_"
     BEGIN
+        MENUITEM "&Annulla",                    ID_EDIT_UNDO
+        MENUITEM "&Redo",                        ID_EDIT_REDO
+        MENUITEM SEPARATOR
         MENUITEM "Copia dall'altro lato",       ID_POPUP_COPYTOOTHERSIDE
         MENUITEM "Copia l'altro lato",          ID_POPUP_COPYFROMOTHERSIDE
         MENUITEM SEPARATOR
-        MENUITEM "Copia tutto dall'altro lato...",
-                                                ID_POPUP_COPYALLDIFFSTOOTHERSIDE
-        MENUITEM "Copia tutto l'altro lato...", ID_POPUP_COPYALLDIFFSFROMOTHERSIDE
+        MENUITEM "&Highlight Line Diff",         ID_SHOWLINEDIFF
         MENUITEM SEPARATOR
-        MENUITEM "Annulla",                     ID_UNDO
+        MENUITEM "&Taglia",                     ID_EDIT_CUT
+        MENUITEM "C&opia",                      ID_EDIT_COPY
+        MENUITEM "I&ncolla",                    ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "Salva modifiche...",          ID_POPUP_SAVE
+        MENUITEM "&Goto...",                     ID_EDIT_WMGOTO
     END
 END
 

diff --git a/Src/Languages/Italian/resource.h b/Src/Languages/Italian/resource.h
index 734d1c4..8f96201 100644 (file)
--- a/Src/Languages/Italian/resource.h
+++ b/Src/Languages/Italian/resource.h
@@ -8,7 +8,7 @@
 #define IDC_UNDO                        6
 #define IDSAVEAS                        7
 #define IDD_ABOUTBOX                    100
-#define IDR_POPUP_DIFFVIEW              101
+#define IDR_POPUP_MERGEVIEW             101
 #define IDR_POPUP_DIRVIEW               102
 #define IDD_PROP_VSS                    103
 #define IDR_MAINFRAME                   104

diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc
index cf3666c..321f5e6 100644 (file)
--- a/Src/Languages/Korean/MergeKorean.rc
+++ b/Src/Languages/Korean/MergeKorean.rc
@@ -38,21 +38,23 @@ IDR_MERGETYPE           ICON                    "res\\MergeDoc.ico"
 // Menu
 //
 
-IDR_POPUP_DIFFVIEW MENU
+IDR_POPUP_MERGEVIEW MENU 
 BEGIN
     POPUP "_POPUP_"
     BEGIN
+        MENUITEM "»ìÇà Ãë¼Ò(&U)",               ID_EDIT_UNDO
+        MENUITEM "´Ù½Ã ½ÇÇà",                   ID_EDIT_REDO
+        MENUITEM SEPARATOR
         MENUITEM "¹Ý´ë ÆíÀ¸·Î º¹»ç",            ID_POPUP_COPYTOOTHERSIDE
         MENUITEM "¹Ý´ë ÆíÀ¸·ÎºÎÅÍ º¹»ç",        ID_POPUP_COPYFROMOTHERSIDE
         MENUITEM SEPARATOR
-        MENUITEM "¹Ý´ëÆíÀ¸·Î ´Ù¸¥ ºÎºÐ ¸ðµÎ º¹»ç...",
-                                                ID_POPUP_COPYALLDIFFSTOOTHERSIDE
-        MENUITEM "¹Ý´ëÆíÀ¸·ÎºÎÅÍ ´Ù¸¥ ºÎºÐ ¸ðµÎ º¹»ç...",
-                                                ID_POPUP_COPYALLDIFFSFROMOTHERSIDE
+        MENUITEM "&Highlight Line Diff",         ID_SHOWLINEDIFF
         MENUITEM SEPARATOR
-        MENUITEM "½ÇÇà Ãë¼Ò",                   ID_UNDO
+        MENUITEM "À߶󳻱â",                    ID_EDIT_CUT
+        MENUITEM "º¹»ç(&C)",                    ID_EDIT_COPY
+        MENUITEM "ºÙ¿©³Ö±â(&P)",                ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "¹Ù²ï »óÅ ÀúÀå...",           ID_POPUP_SAVE
+        MENUITEM "&Goto...",                     ID_EDIT_WMGOTO
     END
 END
 

diff --git a/Src/Languages/Korean/resource.h b/Src/Languages/Korean/resource.h
index 734d1c4..8f96201 100644 (file)
--- a/Src/Languages/Korean/resource.h
+++ b/Src/Languages/Korean/resource.h
@@ -8,7 +8,7 @@
 #define IDC_UNDO                        6
 #define IDSAVEAS                        7
 #define IDD_ABOUTBOX                    100
-#define IDR_POPUP_DIFFVIEW              101
+#define IDR_POPUP_MERGEVIEW             101
 #define IDR_POPUP_DIRVIEW               102
 #define IDD_PROP_VSS                    103
 #define IDR_MAINFRAME                   104

diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc
index b84e875..5bf02e0 100644 (file)
--- a/Src/Languages/Norwegian/MergeNorwegian.rc
+++ b/Src/Languages/Norwegian/MergeNorwegian.rc
@@ -75,21 +75,23 @@ IDR_MERGETYPE           ICON    DISCARDABLE     "res\\MergeDoc.ico"
 // Menu
 //
 
-IDR_POPUP_DIFFVIEW MENU DISCARDABLE
+IDR_POPUP_MERGEVIEW MENU 
 BEGIN
     POPUP "_POPUP_"
     BEGIN
+        MENUITEM "&Angre",                      ID_EDIT_UNDO
+        MENUITEM "&Gjenopprett",                ID_EDIT_REDO
+        MENUITEM SEPARATOR
         MENUITEM "Kopier til den andre siden",  ID_POPUP_COPYTOOTHERSIDE
         MENUITEM "Kopier fra den andre siden",  ID_POPUP_COPYFROMOTHERSIDE
         MENUITEM SEPARATOR
-        MENUITEM "Kopier alle forskjellene til den andre siden...",
-                                                ID_POPUP_COPYALLDIFFSTOOTHERSIDE
-        MENUITEM "Kopier alle forskjellene fra den andre siden...",
-                                                ID_POPUP_COPYALLDIFFSFROMOTHERSIDE
+        MENUITEM "&Highlight Line Diff",         ID_SHOWLINEDIFF
         MENUITEM SEPARATOR
-        MENUITEM "Angre",                       ID_UNDO
+        MENUITEM "&Klipp ut",                   ID_EDIT_CUT
+        MENUITEM "Ko&pier",                     ID_EDIT_COPY
+        MENUITEM "&Lim inn",                    ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "Lagre endringer...",          ID_POPUP_SAVE
+        MENUITEM "&Goto...",                     ID_EDIT_WMGOTO
     END
 END
 

diff --git a/Src/Languages/Norwegian/resource.h b/Src/Languages/Norwegian/resource.h
index 734d1c4..8f96201 100644 (file)
--- a/Src/Languages/Norwegian/resource.h
+++ b/Src/Languages/Norwegian/resource.h
@@ -8,7 +8,7 @@
 #define IDC_UNDO                        6
 #define IDSAVEAS                        7
 #define IDD_ABOUTBOX                    100
-#define IDR_POPUP_DIFFVIEW              101
+#define IDR_POPUP_MERGEVIEW             101
 #define IDR_POPUP_DIRVIEW               102
 #define IDD_PROP_VSS                    103
 #define IDR_MAINFRAME                   104

diff --git a/Src/Languages/Polish/MergePolish.rc b/Src/Languages/Polish/MergePolish.rc
index c897ab0..c958f7f 100644 (file)
--- a/Src/Languages/Polish/MergePolish.rc
+++ b/Src/Languages/Polish/MergePolish.rc
@@ -75,21 +75,23 @@ IDR_MERGETYPE           ICON    DISCARDABLE     "res\\MergeDoc.ico"
 // Menu
 //
 
-IDR_POPUP_DIFFVIEW MENU DISCARDABLE
+IDR_POPUP_MERGEVIEW MENU 
 BEGIN
     POPUP "_POPUP_"
     BEGIN
+        MENUITEM "&Cofnij",                      ID_EDIT_UNDO
+        MENUITEM "&Powtórz",                     ID_EDIT_REDO
+        MENUITEM SEPARATOR
         MENUITEM "Kopiuj na druga strone",    ID_POPUP_COPYTOOTHERSIDE
         MENUITEM "Kopiuj z drugiej strony",  ID_POPUP_COPYFROMOTHERSIDE
         MENUITEM SEPARATOR
-        MENUITEM "Kopiuj wszystkie róznice na druga strone...",
-                                                ID_POPUP_COPYALLDIFFSTOOTHERSIDE
-        MENUITEM "Kopiuj wszystkie róznice z drugiej strony...",
-                                                ID_POPUP_COPYALLDIFFSFROMOTHERSIDE
+        MENUITEM "&Highlight Line Diff",         ID_SHOWLINEDIFF
         MENUITEM SEPARATOR
-        MENUITEM "Cofnij",                     ID_UNDO
+        MENUITEM "&Wytnij",                      ID_EDIT_CUT
+        MENUITEM "&Kopiuj",                      ID_EDIT_COPY
+        MENUITEM "Wk&lej",                       ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "Zachowaj zmiany...", ID_POPUP_SAVE
+        MENUITEM "&Goto...",                     ID_EDIT_WMGOTO
     END
 END
 

diff --git a/Src/Languages/Polish/resource.h b/Src/Languages/Polish/resource.h
index 734d1c4..8f96201 100644 (file)
--- a/Src/Languages/Polish/resource.h
+++ b/Src/Languages/Polish/resource.h
@@ -8,7 +8,7 @@
 #define IDC_UNDO                        6
 #define IDSAVEAS                        7
 #define IDD_ABOUTBOX                    100
-#define IDR_POPUP_DIFFVIEW              101
+#define IDR_POPUP_MERGEVIEW             101
 #define IDR_POPUP_DIRVIEW               102
 #define IDD_PROP_VSS                    103
 #define IDR_MAINFRAME                   104

diff --git a/Src/Languages/Russian/MergeRussian.rc b/Src/Languages/Russian/MergeRussian.rc
index 6f57e5f..528d62b 100644 (file)
--- a/Src/Languages/Russian/MergeRussian.rc
+++ b/Src/Languages/Russian/MergeRussian.rc
@@ -75,21 +75,23 @@ IDR_MERGETYPE           ICON    DISCARDABLE     "res\\MergeDoc.ico"
 // Menu
 //
 
-IDR_POPUP_DIFFVIEW MENU DISCARDABLE
+IDR_POPUP_MERGEVIEW MENU 
 BEGIN
     POPUP "_POPUP_"
     BEGIN
+        MENUITEM "&Îòìåíà",                     ID_EDIT_UNDO
+        MENUITEM "Â&åðíóòü",                    ID_EDIT_REDO
+        MENUITEM SEPARATOR
         MENUITEM "Ñêîïèðîâàòü íà äðóãóþ ñòîðîíó", ID_POPUP_COPYTOOTHERSIDE
         MENUITEM "Ñêîïèðîâàòü ñ äðóãîé ñòîðîíû", ID_POPUP_COPYFROMOTHERSIDE
         MENUITEM SEPARATOR
-        MENUITEM "Ñêîïèðîâàòü âñå îòëè÷èÿ íà äðóãóþ ñòîðîíó...",
-                                                ID_POPUP_COPYALLDIFFSTOOTHERSIDE
-        MENUITEM "Ñêîïèðîâàòü âñå îòëè÷èÿ ñ äðóãîé ñòîðîíû...",
-                                                ID_POPUP_COPYALLDIFFSFROMOTHERSIDE
+        MENUITEM "Ïîäñâåòèòü îòëè÷èÿ â ëèíèè",  ID_SHOWLINEDIFF
         MENUITEM SEPARATOR
-        MENUITEM "Îòìåíèòü",                    ID_UNDO
+        MENUITEM "Âû&ðåçàòü",                   ID_EDIT_CUT
+        MENUITEM "&Êîïèðîâàòü",                 ID_EDIT_COPY
+        MENUITEM "&Âñòàâèòü",                   ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "Ñîõðàíèòü èçìåíåíèÿ...",      ID_POPUP_SAVE
+        MENUITEM "Ïåðåéòè ê ñòðîêå...",         ID_EDIT_WMGOTO
     END
 END
 

diff --git a/Src/Languages/Russian/resource.h b/Src/Languages/Russian/resource.h
index 734d1c4..8f96201 100644 (file)
--- a/Src/Languages/Russian/resource.h
+++ b/Src/Languages/Russian/resource.h
@@ -8,7 +8,7 @@
 #define IDC_UNDO                        6
 #define IDSAVEAS                        7
 #define IDD_ABOUTBOX                    100
-#define IDR_POPUP_DIFFVIEW              101
+#define IDR_POPUP_MERGEVIEW             101
 #define IDR_POPUP_DIRVIEW               102
 #define IDD_PROP_VSS                    103
 #define IDR_MAINFRAME                   104

diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc
index c49c9e4..cfa58b6 100644 (file)
--- a/Src/Languages/Slovak/MergeSlovak.rc
+++ b/Src/Languages/Slovak/MergeSlovak.rc
@@ -75,21 +75,23 @@ IDR_MERGETYPE           ICON    DISCARDABLE     "res\\MergeDoc.ico"
 // Menu
 //
 
-IDR_POPUP_DIFFVIEW MENU DISCARDABLE
+IDR_POPUP_MERGEVIEW MENU 
 BEGIN
     POPUP "_POPUP_"
     BEGIN
+        MENUITEM "&Spä\9d",                       ID_EDIT_UNDO
+        MENUITEM "&Znova",                      ID_EDIT_REDO
+        MENUITEM SEPARATOR
         MENUITEM "Kopírova\9d na druhú stranu",   ID_POPUP_COPYTOOTHERSIDE
         MENUITEM "Kopírova\9d z druhej strany",   ID_POPUP_COPYFROMOTHERSIDE
         MENUITEM SEPARATOR
-        MENUITEM "Kopírova\9d v\9aetky rozdiely na druhú stranu...",
-                                                ID_POPUP_COPYALLDIFFSTOOTHERSIDE
-        MENUITEM "Kopírova\9d v\9aetky rozdiely z druhej strany...",
-                                                ID_POPUP_COPYALLDIFFSFROMOTHERSIDE
+        MENUITEM "&Highlight Line Diff",         ID_SHOWLINEDIFF
         MENUITEM SEPARATOR
-        MENUITEM "Spä\9d",                        ID_UNDO
+        MENUITEM "V&ystrihnú\9d",                 ID_EDIT_CUT
+        MENUITEM "&Kopírova\9d",                  ID_EDIT_COPY
+        MENUITEM "V&lo\9ei\9d",                     ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "Ulo\9ei\9d zmeny...",             ID_POPUP_SAVE
+        MENUITEM "&Goto...",                     ID_EDIT_WMGOTO
     END
 END
 

diff --git a/Src/Languages/Slovak/resource.h b/Src/Languages/Slovak/resource.h
index 734d1c4..8f96201 100644 (file)
--- a/Src/Languages/Slovak/resource.h
+++ b/Src/Languages/Slovak/resource.h
@@ -8,7 +8,7 @@
 #define IDC_UNDO                        6
 #define IDSAVEAS                        7
 #define IDD_ABOUTBOX                    100
-#define IDR_POPUP_DIFFVIEW              101
+#define IDR_POPUP_MERGEVIEW             101
 #define IDR_POPUP_DIRVIEW               102
 #define IDD_PROP_VSS                    103
 #define IDR_MAINFRAME                   104

diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc
index 482f93b..a6c306e 100644 (file)
--- a/Src/Languages/Spanish/MergeSpanish.rc
+++ b/Src/Languages/Spanish/MergeSpanish.rc
@@ -75,21 +75,23 @@ IDR_MERGETYPE           ICON    DISCARDABLE     "res\\MergeDoc.ico"
 // Menu
 //
 
-IDR_POPUP_DIFFVIEW MENU DISCARDABLE
+IDR_POPUP_MERGEVIEW MENU 
 BEGIN
     POPUP "_POPUP_"
     BEGIN
+        MENUITEM "&Deshacer",                   ID_EDIT_UNDO
+        MENUITEM "&Redo",                        ID_EDIT_REDO
+        MENUITEM SEPARATOR
         MENUITEM "Copy to other side",          ID_POPUP_COPYTOOTHERSIDE
         MENUITEM "Copy from other side",        ID_POPUP_COPYFROMOTHERSIDE
         MENUITEM SEPARATOR
-        MENUITEM "Copy all diffs to other side...",
-                                                ID_POPUP_COPYALLDIFFSTOOTHERSIDE
-        MENUITEM "Copy all diffs from other side...",
-                                                ID_POPUP_COPYALLDIFFSFROMOTHERSIDE
+        MENUITEM "&Highlight Line Diff",         ID_SHOWLINEDIFF
         MENUITEM SEPARATOR
-        MENUITEM "Undo",                        ID_UNDO
+        MENUITEM "Cor&tar",                     ID_EDIT_CUT
+        MENUITEM "Copi&ar",                     ID_EDIT_COPY
+        MENUITEM "Pe&gar",                      ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "Save Changes...",             ID_POPUP_SAVE
+        MENUITEM "&Goto...",                     ID_EDIT_WMGOTO
     END
 END
 

diff --git a/Src/Languages/Spanish/resource.h b/Src/Languages/Spanish/resource.h
index 734d1c4..8f96201 100644 (file)
--- a/Src/Languages/Spanish/resource.h
+++ b/Src/Languages/Spanish/resource.h
@@ -8,7 +8,7 @@
 #define IDC_UNDO                        6
 #define IDSAVEAS                        7
 #define IDD_ABOUTBOX                    100
-#define IDR_POPUP_DIFFVIEW              101
+#define IDR_POPUP_MERGEVIEW             101
 #define IDR_POPUP_DIRVIEW               102
 #define IDD_PROP_VSS                    103
 #define IDR_MAINFRAME                   104

diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc
index 7c95b5f..455e504 100644 (file)
--- a/Src/Languages/Swedish/MergeSwedish.rc
+++ b/Src/Languages/Swedish/MergeSwedish.rc
@@ -74,21 +74,23 @@ IDR_MERGETYPE           ICON    DISCARDABLE     "res\\MergeDoc.ico"
 // Menu
 //
 
-IDR_POPUP_DIFFVIEW MENU DISCARDABLE 
+IDR_POPUP_MERGEVIEW MENU 
 BEGIN
     POPUP "_POPUP_"
     BEGIN
+        MENUITEM "&Ångra",                      ID_EDIT_UNDO
+        MENUITEM "&Gör om",                     ID_EDIT_REDO
+        MENUITEM SEPARATOR
         MENUITEM "Kopiera till den andra sidan", ID_POPUP_COPYTOOTHERSIDE
         MENUITEM "Kopiera från den andra sidan", ID_POPUP_COPYFROMOTHERSIDE
         MENUITEM SEPARATOR
-        MENUITEM "Kopiera alla skillnader till den andra sidan...", 
-                                                ID_POPUP_COPYALLDIFFSTOOTHERSIDE
-        MENUITEM "Kopiera alla skillnader från den andra sidan...", 
-                                                ID_POPUP_COPYALLDIFFSFROMOTHERSIDE
+        MENUITEM "Markera radskillnader",       ID_SHOWLINEDIFF
         MENUITEM SEPARATOR
-        MENUITEM "Ångra",                       ID_UNDO
+        MENUITEM "&Klipp ut",                   ID_EDIT_CUT
+        MENUITEM "K&opiera",                    ID_EDIT_COPY
+        MENUITEM "K&listra in",                 ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "Spara ändringar...",          ID_POPUP_SAVE
+        MENUITEM "&Goto...",                     ID_EDIT_WMGOTO
     END
 END
 

diff --git a/Src/Languages/Swedish/resource.h b/Src/Languages/Swedish/resource.h
index 734d1c4..8f96201 100644 (file)
--- a/Src/Languages/Swedish/resource.h
+++ b/Src/Languages/Swedish/resource.h
@@ -8,7 +8,7 @@
 #define IDC_UNDO                        6
 #define IDSAVEAS                        7
 #define IDD_ABOUTBOX                    100
-#define IDR_POPUP_DIFFVIEW              101
+#define IDR_POPUP_MERGEVIEW             101
 #define IDR_POPUP_DIRVIEW               102
 #define IDD_PROP_VSS                    103
 #define IDR_MAINFRAME                   104

diff --git a/Src/Merge.rc b/Src/Merge.rc
index bcc9043..f9658d6 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -75,23 +75,23 @@ IDR_MERGETYPE           ICON    DISCARDABLE     "res\\MergeDoc.ico"
 // Menu
 //
 
-IDR_POPUP_DIFFVIEW MENU DISCARDABLE
+IDR_POPUP_MERGEVIEW MENU 
 BEGIN
     POPUP "_POPUP_"
     BEGIN
-        MENUITEM "Copy to other side",          ID_POPUP_COPYTOOTHERSIDE
-        MENUITEM "Copy from other side",        ID_POPUP_COPYFROMOTHERSIDE
+        MENUITEM "&Undo",                        ID_EDIT_UNDO
+        MENUITEM "&Redo",                        ID_EDIT_REDO
         MENUITEM SEPARATOR
-        MENUITEM "Copy all diffs to other side...",
-                                                ID_POPUP_COPYALLDIFFSTOOTHERSIDE
-
-        MENUITEM "Copy all diffs from other side...",
-                                                ID_POPUP_COPYALLDIFFSFROMOTHERSIDE
-
+        MENUITEM "C&opy to other side",          ID_POPUP_COPYTOOTHERSIDE
+        MENUITEM "Copy from other side",         ID_POPUP_COPYFROMOTHERSIDE
+        MENUITEM SEPARATOR
+        MENUITEM "&Highlight Line Diff",         ID_SHOWLINEDIFF
         MENUITEM SEPARATOR
-        MENUITEM "Undo",                        ID_UNDO
+        MENUITEM "Cu&t",                         ID_EDIT_CUT
+        MENUITEM "&Copy",                        ID_EDIT_COPY
+        MENUITEM "&Paste",                       ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "Save Changes...",             ID_POPUP_SAVE
+        MENUITEM "&Goto...",                     ID_EDIT_WMGOTO
     END
 END
 

diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp
index 611d390..a6f8c71 100644 (file)
--- a/Src/MergeEditView.cpp
+++ b/Src/MergeEditView.cpp
@@ -1582,8 +1582,16 @@ HMENU CMergeEditView::createScriptsSubmenu(HMENU hMenu)
  */
 void CMergeEditView::OnContextMenu(CWnd* pWnd, CPoint point)
 {
-       // text is CHAR if compiled without UNICODE, WCHAR with UNICODE
-       CString text = GetSelectedText();
+       // Create the menu and populate it with the available functions
+       BCMenu menu;
+       VERIFY(menu.LoadMenu(IDR_POPUP_MERGEVIEW));
+       VERIFY(menu.LoadToolbar(IDR_MAINFRAME));
+
+       // Make sure window is active
+       GetParentFrame()->ActivateFrame();
+
+       BCMenu *pSub = (BCMenu *)menu.GetSubMenu(0);
+       ASSERT(pSub != NULL);
 
        // Context menu opened using keyboard has no coordinates
        if (point.x == -1 && point.y == -1)
@@ -1596,6 +1604,9 @@ void CMergeEditView::OnContextMenu(CWnd* pWnd, CPoint point)
                point.Offset(5, 5);
        }
 
+       pSub->TrackPopupMenu(TPM_LEFTALIGN | TPM_RIGHTBUTTON,
+               point.x, point.y, AfxGetMainWnd());
+
 }
 
 /**

diff --git a/Src/readme.txt b/Src/readme.txt
index f058d40..30fe028 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,8 @@
+2004-03-31 Kimmo
+ PATCH: [ 924521 ] Add context menu for file compare
+  Src: DirView.cpp FilePathEdit.cpp Merge.rc MergeEditView.cpp resource.h
+  Languages: resource.h *.rc
+
 2004-03-30 seier
   Fixed Swedish Language had a description of Spanish in the installer.  
   Fixed Swedish was installing along with Spanish rather than the Swedish component description in the installer.  

diff --git a/Src/resource.h b/Src/resource.h
index 734d1c4..8f96201 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -8,7 +8,7 @@
 #define IDC_UNDO                        6
 #define IDSAVEAS                        7
 #define IDD_ABOUTBOX                    100
-#define IDR_POPUP_DIFFVIEW              101
+#define IDR_POPUP_MERGEVIEW             101
 #define IDR_POPUP_DIRVIEW               102
 #define IDD_PROP_VSS                    103
 #define IDR_MAINFRAME                   104