PATCH: [ 967700 ] Add Goto-items to location pane context menu

diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc
index 96bfa3e..9b960c2 100644 (file)
--- a/Src/Languages/Brazilian/MergeBrazilian.rc
+++ b/Src/Languages/Brazilian/MergeBrazilian.rc
@@ -315,6 +315,9 @@ IDR_POPUP_LOCATIONBAR MENU
 BEGIN
     POPUP "_POPUP_"
     BEGIN
+        MENUITEM "G&oto Diff"                   ID_LOCBAR_GOTODIFF
+        MENUITEM "&Goto...",                    ID_EDIT_WMGOTO
+        MENUITEM SEPARATOR
         MENUITEM "&No Moved Blocks",            ID_DISPLAY_MOVED_NONE
         MENUITEM "&All Moved Blocks",           ID_DISPLAY_MOVED_ALL
         MENUITEM "Moved Block for &Current Diff", ID_DISPLAY_MOVED_FOLLOW_DIFF
@@ -1993,6 +1996,8 @@ BEGIN
     ID_DISPLAY_MOVED_NONE   "Do not display moved blocks"
     ID_DISPLAY_MOVED_ALL    "Display all moved blacks"
     ID_DISPLAY_MOVED_FOLLOW_DIFF "Display moved blocks only from current diff"
+    ID_LOCBAR_GOTODIFF      "Go to diff under cursor"
+    ID_LOCBAR_GOTODIFF_FMT  "G&oto Diff %1 of %2"
 END
 
 // END STRINGS SYNCHRO

diff --git a/Src/Languages/Brazilian/resource.h b/Src/Languages/Brazilian/resource.h
index e0c2ae6..f2733ab 100644 (file)
--- a/Src/Languages/Brazilian/resource.h
+++ b/Src/Languages/Brazilian/resource.h
@@ -696,6 +696,8 @@
 #define ID_DISPLAY_MOVED_NONE           33088
 #define ID_DISPLAY_MOVED_ALL            33089
 #define ID_DISPLAY_MOVED_FOLLOW_DIFF    33090
+#define ID_LOCBAR_GOTODIFF              33091
+#define ID_LOCBAR_GOTODIFF_FMT          33092
 
 
 
@@ -705,7 +707,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        163
-#define _APS_NEXT_COMMAND_VALUE         33091
+#define _APS_NEXT_COMMAND_VALUE         33093
 #define _APS_NEXT_CONTROL_VALUE         1146
 #define _APS_NEXT_SYMED_VALUE           106
 #endif

diff --git a/Src/Languages/Bulgarian/MergeBulgarian.rc b/Src/Languages/Bulgarian/MergeBulgarian.rc
index faeea76..fdebdd3 100644 (file)
--- a/Src/Languages/Bulgarian/MergeBulgarian.rc
+++ b/Src/Languages/Bulgarian/MergeBulgarian.rc
@@ -315,6 +315,9 @@ IDR_POPUP_LOCATIONBAR MENU
 BEGIN
     POPUP "_POPUP_"
     BEGIN
+        MENUITEM "G&oto Diff"                   ID_LOCBAR_GOTODIFF
+        MENUITEM "Îò&èäè íà...",                ID_EDIT_WMGOTO
+        MENUITEM SEPARATOR
         MENUITEM "&No Moved Blocks",            ID_DISPLAY_MOVED_NONE
         MENUITEM "&All Moved Blocks",           ID_DISPLAY_MOVED_ALL
         MENUITEM "Moved Block for &Current Diff", ID_DISPLAY_MOVED_FOLLOW_DIFF
@@ -1878,6 +1881,8 @@ BEGIN
     ID_DISPLAY_MOVED_NONE   "Do not display moved blocks"
     ID_DISPLAY_MOVED_ALL    "Display all moved blacks"
     ID_DISPLAY_MOVED_FOLLOW_DIFF "Display moved blocks only from current diff"
+    ID_LOCBAR_GOTODIFF      "Go to diff under cursor"
+    ID_LOCBAR_GOTODIFF_FMT  "G&oto Diff %1 of %2"
 END
 
 // END STRINGS SYNCHRO

diff --git a/Src/Languages/Bulgarian/resource.h b/Src/Languages/Bulgarian/resource.h
index e0c2ae6..f2733ab 100644 (file)
--- a/Src/Languages/Bulgarian/resource.h
+++ b/Src/Languages/Bulgarian/resource.h
@@ -696,6 +696,8 @@
 #define ID_DISPLAY_MOVED_NONE           33088
 #define ID_DISPLAY_MOVED_ALL            33089
 #define ID_DISPLAY_MOVED_FOLLOW_DIFF    33090
+#define ID_LOCBAR_GOTODIFF              33091
+#define ID_LOCBAR_GOTODIFF_FMT          33092
 
 
 
@@ -705,7 +707,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        163
-#define _APS_NEXT_COMMAND_VALUE         33091
+#define _APS_NEXT_COMMAND_VALUE         33093
 #define _APS_NEXT_CONTROL_VALUE         1146
 #define _APS_NEXT_SYMED_VALUE           106
 #endif

diff --git a/Src/Languages/Catalan/MergeCatalan.rc b/Src/Languages/Catalan/MergeCatalan.rc
index c7f5e59..b2d6a2f 100644 (file)
--- a/Src/Languages/Catalan/MergeCatalan.rc
+++ b/Src/Languages/Catalan/MergeCatalan.rc
@@ -315,6 +315,9 @@ IDR_POPUP_LOCATIONBAR MENU
 BEGIN
     POPUP "_POPUP_"
     BEGIN
+        MENUITEM "G&oto Diff"                   ID_LOCBAR_GOTODIFF
+        MENUITEM "&Vés a...\tCtrl+G",           ID_EDIT_WMGOTO
+        MENUITEM SEPARATOR
         MENUITEM "Blocs &no moguts ",            ID_DISPLAY_MOVED_NONE
         MENUITEM "&Tots el blocs moguts",           ID_DISPLAY_MOVED_ALL
         MENUITEM "Blocs moguts per a la &diferència actual", ID_DISPLAY_MOVED_FOLLOW_DIFF
@@ -1894,6 +1897,8 @@ BEGIN
     ID_DISPLAY_MOVED_NONE   "No mostra els blocs moguts"
     ID_DISPLAY_MOVED_ALL    "Mostra tots els blocs moguts"
     ID_DISPLAY_MOVED_FOLLOW_DIFF "Mostra només els blocs moguts des de la diferència actual"
+    ID_LOCBAR_GOTODIFF      "Go to diff under cursor"
+    ID_LOCBAR_GOTODIFF_FMT  "G&oto Diff %1 of %2"
 END
 
 // END STRINGS SYNCHRO

diff --git a/Src/Languages/Catalan/resource.h b/Src/Languages/Catalan/resource.h
index e0c2ae6..f2733ab 100644 (file)
--- a/Src/Languages/Catalan/resource.h
+++ b/Src/Languages/Catalan/resource.h
@@ -696,6 +696,8 @@
 #define ID_DISPLAY_MOVED_NONE           33088
 #define ID_DISPLAY_MOVED_ALL            33089
 #define ID_DISPLAY_MOVED_FOLLOW_DIFF    33090
+#define ID_LOCBAR_GOTODIFF              33091
+#define ID_LOCBAR_GOTODIFF_FMT          33092
 
 
 
@@ -705,7 +707,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        163
-#define _APS_NEXT_COMMAND_VALUE         33091
+#define _APS_NEXT_COMMAND_VALUE         33093
 #define _APS_NEXT_CONTROL_VALUE         1146
 #define _APS_NEXT_SYMED_VALUE           106
 #endif

diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
index 74abc41..b597145 100644 (file)
--- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
+++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
@@ -90,7 +90,7 @@ BEGIN
         MENUITEM "¸´ÖÆ(&C)",                    ID_EDIT_COPY
         MENUITEM "Õ³Ìù(&P)",                    ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "&Goto...",                     ID_EDIT_WMGOTO
+        MENUITEM "&Goto...",                    ID_EDIT_WMGOTO
     END
 END
 
@@ -314,6 +314,9 @@ IDR_POPUP_LOCATIONBAR MENU
 BEGIN
     POPUP "_POPUP_"
     BEGIN
+        MENUITEM "G&oto Diff"                   ID_LOCBAR_GOTODIFF
+        MENUITEM "&Goto...",                    ID_EDIT_WMGOTO
+        MENUITEM SEPARATOR
         MENUITEM "&No Moved Blocks",            ID_DISPLAY_MOVED_NONE
         MENUITEM "&All Moved Blocks",           ID_DISPLAY_MOVED_ALL
         MENUITEM "Moved Block for &Current Diff", ID_DISPLAY_MOVED_FOLLOW_DIFF
@@ -1864,6 +1867,8 @@ BEGIN
     ID_DISPLAY_MOVED_NONE   "Do not display moved blocks"
     ID_DISPLAY_MOVED_ALL    "Display all moved blacks"
     ID_DISPLAY_MOVED_FOLLOW_DIFF "Display moved blocks only from current diff"
+    ID_LOCBAR_GOTODIFF      "Go to diff under cursor"
+    ID_LOCBAR_GOTODIFF_FMT  "G&oto Diff %1 of %2"
 END
 
 // END STRINGS SYNCHRO

diff --git a/Src/Languages/ChineseSimplified/resource.h b/Src/Languages/ChineseSimplified/resource.h
index e0c2ae6..f2733ab 100644 (file)
--- a/Src/Languages/ChineseSimplified/resource.h
+++ b/Src/Languages/ChineseSimplified/resource.h
@@ -696,6 +696,8 @@
 #define ID_DISPLAY_MOVED_NONE           33088
 #define ID_DISPLAY_MOVED_ALL            33089
 #define ID_DISPLAY_MOVED_FOLLOW_DIFF    33090
+#define ID_LOCBAR_GOTODIFF              33091
+#define ID_LOCBAR_GOTODIFF_FMT          33092
 
 
 
@@ -705,7 +707,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        163
-#define _APS_NEXT_COMMAND_VALUE         33091
+#define _APS_NEXT_COMMAND_VALUE         33093
 #define _APS_NEXT_CONTROL_VALUE         1146
 #define _APS_NEXT_SYMED_VALUE           106
 #endif

diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
index 9e4fc73..108ec60 100644 (file)
--- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
+++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
@@ -315,6 +315,9 @@ IDR_POPUP_LOCATIONBAR MENU
 BEGIN
     POPUP "_POPUP_"
     BEGIN
+        MENUITEM "G&oto Diff"                   ID_LOCBAR_GOTODIFF
+        MENUITEM "&Goto...",                    ID_EDIT_WMGOTO
+        MENUITEM SEPARATOR
         MENUITEM "&No Moved Blocks",            ID_DISPLAY_MOVED_NONE
         MENUITEM "&All Moved Blocks",           ID_DISPLAY_MOVED_ALL
         MENUITEM "Moved Block for &Current Diff", ID_DISPLAY_MOVED_FOLLOW_DIFF
@@ -1978,6 +1981,8 @@ BEGIN
     ID_DISPLAY_MOVED_NONE   "Do not display moved blocks"
     ID_DISPLAY_MOVED_ALL    "Display all moved blacks"
     ID_DISPLAY_MOVED_FOLLOW_DIFF "Display moved blocks only from current diff"
+    ID_LOCBAR_GOTODIFF      "Go to diff under cursor"
+    ID_LOCBAR_GOTODIFF_FMT  "G&oto Diff %1 of %2"
 END
 
 // END STRINGS SYNCHRO

diff --git a/Src/Languages/ChineseTraditional/resource.h b/Src/Languages/ChineseTraditional/resource.h
index e0c2ae6..f2733ab 100644 (file)
--- a/Src/Languages/ChineseTraditional/resource.h
+++ b/Src/Languages/ChineseTraditional/resource.h
@@ -696,6 +696,8 @@
 #define ID_DISPLAY_MOVED_NONE           33088
 #define ID_DISPLAY_MOVED_ALL            33089
 #define ID_DISPLAY_MOVED_FOLLOW_DIFF    33090
+#define ID_LOCBAR_GOTODIFF              33091
+#define ID_LOCBAR_GOTODIFF_FMT          33092
 
 
 
@@ -705,7 +707,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        163
-#define _APS_NEXT_COMMAND_VALUE         33091
+#define _APS_NEXT_COMMAND_VALUE         33093
 #define _APS_NEXT_CONTROL_VALUE         1146
 #define _APS_NEXT_SYMED_VALUE           106
 #endif

diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc
index 207d04f..bb54685 100644 (file)
--- a/Src/Languages/Czech/MergeCzech.rc
+++ b/Src/Languages/Czech/MergeCzech.rc
@@ -315,6 +315,9 @@ IDR_POPUP_LOCATIONBAR MENU
 BEGIN
     POPUP "_POPUP_"
     BEGIN
+        MENUITEM "G&oto Diff"                   ID_LOCBAR_GOTODIFF
+        MENUITEM "&Goto...",                    ID_EDIT_WMGOTO
+        MENUITEM SEPARATOR
         MENUITEM "&No Moved Blocks",            ID_DISPLAY_MOVED_NONE
         MENUITEM "&All Moved Blocks",           ID_DISPLAY_MOVED_ALL
         MENUITEM "Moved Block for &Current Diff", ID_DISPLAY_MOVED_FOLLOW_DIFF
@@ -1960,6 +1963,8 @@ BEGIN
     ID_DISPLAY_MOVED_NONE   "Do not display moved blocks"
     ID_DISPLAY_MOVED_ALL    "Display all moved blacks"
     ID_DISPLAY_MOVED_FOLLOW_DIFF "Display moved blocks only from current diff"
+    ID_LOCBAR_GOTODIFF      "Go to diff under cursor"
+    ID_LOCBAR_GOTODIFF_FMT  "G&oto Diff %1 of %2"
 END
 
 // END STRINGS SYNCHRO

diff --git a/Src/Languages/Czech/resource.h b/Src/Languages/Czech/resource.h
index e0c2ae6..f2733ab 100644 (file)
--- a/Src/Languages/Czech/resource.h
+++ b/Src/Languages/Czech/resource.h
@@ -696,6 +696,8 @@
 #define ID_DISPLAY_MOVED_NONE           33088
 #define ID_DISPLAY_MOVED_ALL            33089
 #define ID_DISPLAY_MOVED_FOLLOW_DIFF    33090
+#define ID_LOCBAR_GOTODIFF              33091
+#define ID_LOCBAR_GOTODIFF_FMT          33092
 
 
 
@@ -705,7 +707,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        163
-#define _APS_NEXT_COMMAND_VALUE         33091
+#define _APS_NEXT_COMMAND_VALUE         33093
 #define _APS_NEXT_CONTROL_VALUE         1146
 #define _APS_NEXT_SYMED_VALUE           106
 #endif

diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc
index 2bf4803..751bfb8 100644 (file)
--- a/Src/Languages/Danish/MergeDanish.rc
+++ b/Src/Languages/Danish/MergeDanish.rc
@@ -315,6 +315,9 @@ IDR_POPUP_LOCATIONBAR MENU
 BEGIN
     POPUP "_POPUP_"
     BEGIN
+        MENUITEM "G&oto Diff"                   ID_LOCBAR_GOTODIFF
+        MENUITEM "&Goto...",                    ID_EDIT_WMGOTO
+        MENUITEM SEPARATOR
         MENUITEM "&No Moved Blocks",            ID_DISPLAY_MOVED_NONE
         MENUITEM "&All Moved Blocks",           ID_DISPLAY_MOVED_ALL
         MENUITEM "Moved Block for &Current Diff", ID_DISPLAY_MOVED_FOLLOW_DIFF
@@ -1989,6 +1992,8 @@ BEGIN
     ID_DISPLAY_MOVED_NONE   "Do not display moved blocks"
     ID_DISPLAY_MOVED_ALL    "Display all moved blacks"
     ID_DISPLAY_MOVED_FOLLOW_DIFF "Display moved blocks only from current diff"
+    ID_LOCBAR_GOTODIFF      "Go to diff under cursor"
+    ID_LOCBAR_GOTODIFF_FMT  "G&oto Diff %1 of %2"
 END
 
 // END STRINGS SYNCHRO

diff --git a/Src/Languages/Danish/resource.h b/Src/Languages/Danish/resource.h
index e0c2ae6..f2733ab 100644 (file)
--- a/Src/Languages/Danish/resource.h
+++ b/Src/Languages/Danish/resource.h
@@ -696,6 +696,8 @@
 #define ID_DISPLAY_MOVED_NONE           33088
 #define ID_DISPLAY_MOVED_ALL            33089
 #define ID_DISPLAY_MOVED_FOLLOW_DIFF    33090
+#define ID_LOCBAR_GOTODIFF              33091
+#define ID_LOCBAR_GOTODIFF_FMT          33092
 
 
 
@@ -705,7 +707,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        163
-#define _APS_NEXT_COMMAND_VALUE         33091
+#define _APS_NEXT_COMMAND_VALUE         33093
 #define _APS_NEXT_CONTROL_VALUE         1146
 #define _APS_NEXT_SYMED_VALUE           106
 #endif

diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc
index 7206451..0ec3309 100644 (file)
--- a/Src/Languages/Dutch/MergeDutch.rc
+++ b/Src/Languages/Dutch/MergeDutch.rc
@@ -316,6 +316,9 @@ IDR_POPUP_LOCATIONBAR MENU
 BEGIN
     POPUP "_POPUP_"
     BEGIN
+        MENUITEM "G&oto Diff"                   ID_LOCBAR_GOTODIFF
+        MENUITEM "&Goto...",                    ID_EDIT_WMGOTO
+        MENUITEM SEPARATOR
         MENUITEM "&No Moved Blocks",            ID_DISPLAY_MOVED_NONE
         MENUITEM "&All Moved Blocks",           ID_DISPLAY_MOVED_ALL
         MENUITEM "Moved Block for &Current Diff", ID_DISPLAY_MOVED_FOLLOW_DIFF
@@ -1993,6 +1996,8 @@ BEGIN
     ID_DISPLAY_MOVED_NONE   "Do not display moved blocks"
     ID_DISPLAY_MOVED_ALL    "Display all moved blacks"
     ID_DISPLAY_MOVED_FOLLOW_DIFF "Display moved blocks only from current diff"
+    ID_LOCBAR_GOTODIFF      "Go to diff under cursor"
+    ID_LOCBAR_GOTODIFF_FMT  "G&oto Diff %1 of %2"
 END
 
 // END STRINGS SYNCHRO

diff --git a/Src/Languages/Dutch/resource.h b/Src/Languages/Dutch/resource.h
index e0c2ae6..f2733ab 100644 (file)
--- a/Src/Languages/Dutch/resource.h
+++ b/Src/Languages/Dutch/resource.h
@@ -696,6 +696,8 @@
 #define ID_DISPLAY_MOVED_NONE           33088
 #define ID_DISPLAY_MOVED_ALL            33089
 #define ID_DISPLAY_MOVED_FOLLOW_DIFF    33090
+#define ID_LOCBAR_GOTODIFF              33091
+#define ID_LOCBAR_GOTODIFF_FMT          33092
 
 
 
@@ -705,7 +707,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        163
-#define _APS_NEXT_COMMAND_VALUE         33091
+#define _APS_NEXT_COMMAND_VALUE         33093
 #define _APS_NEXT_CONTROL_VALUE         1146
 #define _APS_NEXT_SYMED_VALUE           106
 #endif

diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc
index 0feb4fb..fc5131a 100644 (file)
--- a/Src/Languages/French/MergeFrench.rc
+++ b/Src/Languages/French/MergeFrench.rc
@@ -91,7 +91,7 @@ BEGIN
         MENUITEM "Co&pier",                     ID_EDIT_COPY
         MENUITEM "C&oller",                     ID_EDIT_PASTE
         MENUITEM SEPARATOR
-        MENUITEM "&Goto...",                     ID_EDIT_WMGOTO
+        MENUITEM "&Goto...",                    ID_EDIT_WMGOTO
     END
 END
 
@@ -315,6 +315,9 @@ IDR_POPUP_LOCATIONBAR MENU
 BEGIN
     POPUP "_POPUP_"
     BEGIN
+        MENUITEM "G&oto Diff"                   ID_LOCBAR_GOTODIFF
+        MENUITEM "&Goto...",                    ID_EDIT_WMGOTO
+        MENUITEM SEPARATOR
         MENUITEM "&No Moved Blocks",            ID_DISPLAY_MOVED_NONE
         MENUITEM "&All Moved Blocks",           ID_DISPLAY_MOVED_ALL
         MENUITEM "Moved Block for &Current Diff", ID_DISPLAY_MOVED_FOLLOW_DIFF
@@ -1960,6 +1963,8 @@ BEGIN
     ID_DISPLAY_MOVED_NONE   "Do not display moved blocks"
     ID_DISPLAY_MOVED_ALL    "Display all moved blacks"
     ID_DISPLAY_MOVED_FOLLOW_DIFF "Display moved blocks only from current diff"
+    ID_LOCBAR_GOTODIFF      "Go to diff under cursor"
+    ID_LOCBAR_GOTODIFF_FMT  "G&oto Diff %1 of %2"
 END
 
 // END STRINGS SYNCHRO

diff --git a/Src/Languages/French/resource.h b/Src/Languages/French/resource.h
index e0c2ae6..f2733ab 100644 (file)
--- a/Src/Languages/French/resource.h
+++ b/Src/Languages/French/resource.h
@@ -696,6 +696,8 @@
 #define ID_DISPLAY_MOVED_NONE           33088
 #define ID_DISPLAY_MOVED_ALL            33089
 #define ID_DISPLAY_MOVED_FOLLOW_DIFF    33090
+#define ID_LOCBAR_GOTODIFF              33091
+#define ID_LOCBAR_GOTODIFF_FMT          33092
 
 
 
@@ -705,7 +707,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        163
-#define _APS_NEXT_COMMAND_VALUE         33091
+#define _APS_NEXT_COMMAND_VALUE         33093
 #define _APS_NEXT_CONTROL_VALUE         1146
 #define _APS_NEXT_SYMED_VALUE           106
 #endif

diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc
index f79a4d8..fdd50f5 100644 (file)
--- a/Src/Languages/German/MergeGerman.rc
+++ b/Src/Languages/German/MergeGerman.rc
@@ -322,6 +322,9 @@ IDR_POPUP_LOCATIONBAR MENU
 BEGIN
     POPUP "_POPUP_"
     BEGIN
+        MENUITEM "G&oto Diff"                   ID_LOCBAR_GOTODIFF
+        MENUITEM "&Gehe nach...",               ID_EDIT_WMGOTO
+        MENUITEM SEPARATOR
         MENUITEM "&No Moved Blocks",            ID_DISPLAY_MOVED_NONE
         MENUITEM "&All Moved Blocks",           ID_DISPLAY_MOVED_ALL
         MENUITEM "Moved Block for &Current Diff", ID_DISPLAY_MOVED_FOLLOW_DIFF
@@ -1996,6 +1999,8 @@ BEGIN
     ID_DISPLAY_MOVED_NONE   "Do not display moved blocks"
     ID_DISPLAY_MOVED_ALL    "Display all moved blacks"
     ID_DISPLAY_MOVED_FOLLOW_DIFF "Display moved blocks only from current diff"
+    ID_LOCBAR_GOTODIFF      "Go to diff under cursor"
+    ID_LOCBAR_GOTODIFF_FMT  "G&oto Diff %1 of %2"
 END
 
 // END STRINGS SYNCHRO

diff --git a/Src/Languages/German/resource.h b/Src/Languages/German/resource.h
index e0c2ae6..f2733ab 100644 (file)
--- a/Src/Languages/German/resource.h
+++ b/Src/Languages/German/resource.h
@@ -696,6 +696,8 @@
 #define ID_DISPLAY_MOVED_NONE           33088
 #define ID_DISPLAY_MOVED_ALL            33089
 #define ID_DISPLAY_MOVED_FOLLOW_DIFF    33090
+#define ID_LOCBAR_GOTODIFF              33091
+#define ID_LOCBAR_GOTODIFF_FMT          33092
 
 
 
@@ -705,7 +707,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        163
-#define _APS_NEXT_COMMAND_VALUE         33091
+#define _APS_NEXT_COMMAND_VALUE         33093
 #define _APS_NEXT_CONTROL_VALUE         1146
 #define _APS_NEXT_SYMED_VALUE           106
 #endif

diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc
index c20e7cd..2b3ad48 100644 (file)
--- a/Src/Languages/Italian/MergeItalian.rc
+++ b/Src/Languages/Italian/MergeItalian.rc
@@ -315,6 +315,9 @@ IDR_POPUP_LOCATIONBAR MENU
 BEGIN
     POPUP "_POPUP_"
     BEGIN
+        MENUITEM "G&oto Diff"                   ID_LOCBAR_GOTODIFF
+        MENUITEM "&Goto...",                    ID_EDIT_WMGOTO
+        MENUITEM SEPARATOR
         MENUITEM "&No Moved Blocks",            ID_DISPLAY_MOVED_NONE
         MENUITEM "&All Moved Blocks",           ID_DISPLAY_MOVED_ALL
         MENUITEM "Moved Block for &Current Diff", ID_DISPLAY_MOVED_FOLLOW_DIFF
@@ -1960,6 +1963,8 @@ BEGIN
     ID_DISPLAY_MOVED_NONE   "Do not display moved blocks"
     ID_DISPLAY_MOVED_ALL    "Display all moved blacks"
     ID_DISPLAY_MOVED_FOLLOW_DIFF "Display moved blocks only from current diff"
+    ID_LOCBAR_GOTODIFF      "Go to diff under cursor"
+    ID_LOCBAR_GOTODIFF_FMT  "G&oto Diff %1 of %2"
 END
 
 // END STRINGS SYNCHRO

diff --git a/Src/Languages/Italian/resource.h b/Src/Languages/Italian/resource.h
index e0c2ae6..f2733ab 100644 (file)
--- a/Src/Languages/Italian/resource.h
+++ b/Src/Languages/Italian/resource.h
@@ -696,6 +696,8 @@
 #define ID_DISPLAY_MOVED_NONE           33088
 #define ID_DISPLAY_MOVED_ALL            33089
 #define ID_DISPLAY_MOVED_FOLLOW_DIFF    33090
+#define ID_LOCBAR_GOTODIFF              33091
+#define ID_LOCBAR_GOTODIFF_FMT          33092
 
 
 
@@ -705,7 +707,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        163
-#define _APS_NEXT_COMMAND_VALUE         33091
+#define _APS_NEXT_COMMAND_VALUE         33093
 #define _APS_NEXT_CONTROL_VALUE         1146
 #define _APS_NEXT_SYMED_VALUE           106
 #endif

diff --git a/Src/Languages/Japanese/MergeJapanese.rc b/Src/Languages/Japanese/MergeJapanese.rc
index a7b1c61..52d6e66 100644 (file)
--- a/Src/Languages/Japanese/MergeJapanese.rc
+++ b/Src/Languages/Japanese/MergeJapanese.rc
@@ -312,6 +312,19 @@ BEGIN
     END
 END
 
+IDR_POPUP_LOCATIONBAR MENU 
+BEGIN
+    POPUP "_POPUP_"
+    BEGIN
+        MENUITEM "G&oto Diff"                   ID_LOCBAR_GOTODIFF
+        MENUITEM "&Goto...",                    ID_EDIT_WMGOTO
+        MENUITEM SEPARATOR
+        MENUITEM "&No Moved Blocks",            ID_DISPLAY_MOVED_NONE
+        MENUITEM "&All Moved Blocks",           ID_DISPLAY_MOVED_ALL
+        MENUITEM "Moved Block for &Current Diff", ID_DISPLAY_MOVED_FOLLOW_DIFF
+    END
+END
+
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -931,7 +944,7 @@ BEGIN
             VALUE "LegalCopyright", "© 1996-2004 Dean P. Grimm / Thingamahoochie Software\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "WinMerge.EXE\0"
-            VALUE "PrivateBuild", "\0"
+            VALUE "PrivateBuild", ""
             VALUE "ProductName", "WinMerge\0"
             VALUE "ProductVersion", "000.000.000.000\0"
             VALUE "SpecialBuild", "\0"
@@ -1865,6 +1878,16 @@ BEGIN
     IDS_USERCHOICE_AUTOMATIC "<\8e©\93®>"
 END
 
+// LOCATIONBAR CONTEXT MENU
+STRINGTABLE 
+BEGIN
+    ID_DISPLAY_MOVED_NONE   "Do not display moved blocks"
+    ID_DISPLAY_MOVED_ALL    "Display all moved blacks"
+    ID_DISPLAY_MOVED_FOLLOW_DIFF "Display moved blocks only from current diff"
+    ID_LOCBAR_GOTODIFF      "Go to diff under cursor"
+    ID_LOCBAR_GOTODIFF_FMT  "G&oto Diff %1 of %2"
+END
+
 // END STRINGS SYNCHRO
 #endif    // \93ú\96{\8cê resources
 /////////////////////////////////////////////////////////////////////////////

diff --git a/Src/Languages/Japanese/resource.h b/Src/Languages/Japanese/resource.h
index 118605a..f2733ab 100644 (file)
--- a/Src/Languages/Japanese/resource.h
+++ b/Src/Languages/Japanese/resource.h
@@ -10,6 +10,7 @@
 #define IDR_POPUP_PLUGINS_SETTINGS      103
 #define IDR_POPUP_MERGEVIEW             104
 #define IDR_POPUP_DIRVIEW               105
+#define IDR_POPUP_LOCATIONBAR           106
 
 #define IDD_ABOUTBOX                    200
 #define IDD_PROP_VSS                    201
@@ -692,18 +693,21 @@
 #define ID_PREDIFFERS_FIRST             33040
 #define ID_PREDIFFERS_LAST              33087
 
-
-
+#define ID_DISPLAY_MOVED_NONE           33088
+#define ID_DISPLAY_MOVED_ALL            33089
+#define ID_DISPLAY_MOVED_FOLLOW_DIFF    33090
+#define ID_LOCBAR_GOTODIFF              33091
+#define ID_LOCBAR_GOTODIFF_FMT          33092
 
 
 
 // Next default values for new objects
-//
+// 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        162
-#define _APS_NEXT_COMMAND_VALUE         33088
+#define _APS_NEXT_RESOURCE_VALUE        163
+#define _APS_NEXT_COMMAND_VALUE         33093
 #define _APS_NEXT_CONTROL_VALUE         1146
 #define _APS_NEXT_SYMED_VALUE           106
 #endif

diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc
index 9c8170b..dce9ed2 100644 (file)
--- a/Src/Languages/Korean/MergeKorean.rc
+++ b/Src/Languages/Korean/MergeKorean.rc
@@ -280,6 +280,9 @@ IDR_POPUP_LOCATIONBAR MENU
 BEGIN
     POPUP "_POPUP_"
     BEGIN
+        MENUITEM "G&oto Diff"                   ID_LOCBAR_GOTODIFF
+        MENUITEM "&Goto...",                    ID_EDIT_WMGOTO
+        MENUITEM SEPARATOR
         MENUITEM "&No Moved Blocks",            ID_DISPLAY_MOVED_NONE
         MENUITEM "&All Moved Blocks",           ID_DISPLAY_MOVED_ALL
         MENUITEM "Moved Block for &Current Diff", ID_DISPLAY_MOVED_FOLLOW_DIFF
@@ -1952,6 +1955,8 @@ BEGIN
     ID_DISPLAY_MOVED_NONE   "Do not display moved blocks"
     ID_DISPLAY_MOVED_ALL    "Display all moved blacks"
     ID_DISPLAY_MOVED_FOLLOW_DIFF "Display moved blocks only from current diff"
+    ID_LOCBAR_GOTODIFF      "Go to diff under cursor"
+    ID_LOCBAR_GOTODIFF_FMT  "G&oto Diff %1 of %2"
 END
 
 // END STRINGS SYNCHRO

diff --git a/Src/Languages/Korean/resource.h b/Src/Languages/Korean/resource.h
index e0c2ae6..f2733ab 100644 (file)
--- a/Src/Languages/Korean/resource.h
+++ b/Src/Languages/Korean/resource.h
@@ -696,6 +696,8 @@
 #define ID_DISPLAY_MOVED_NONE           33088
 #define ID_DISPLAY_MOVED_ALL            33089
 #define ID_DISPLAY_MOVED_FOLLOW_DIFF    33090
+#define ID_LOCBAR_GOTODIFF              33091
+#define ID_LOCBAR_GOTODIFF_FMT          33092
 
 
 
@@ -705,7 +707,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        163
-#define _APS_NEXT_COMMAND_VALUE         33091
+#define _APS_NEXT_COMMAND_VALUE         33093
 #define _APS_NEXT_CONTROL_VALUE         1146
 #define _APS_NEXT_SYMED_VALUE           106
 #endif

diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc
index afa9d97..06f5213 100644 (file)
--- a/Src/Languages/Norwegian/MergeNorwegian.rc
+++ b/Src/Languages/Norwegian/MergeNorwegian.rc
@@ -315,6 +315,9 @@ IDR_POPUP_LOCATIONBAR MENU
 BEGIN
     POPUP "_POPUP_"
     BEGIN
+        MENUITEM "G&oto Diff"                   ID_LOCBAR_GOTODIFF
+        MENUITEM "&Goto...",                    ID_EDIT_WMGOTO
+        MENUITEM SEPARATOR
         MENUITEM "&No Moved Blocks",            ID_DISPLAY_MOVED_NONE
         MENUITEM "&All Moved Blocks",           ID_DISPLAY_MOVED_ALL
         MENUITEM "Moved Block for &Current Diff", ID_DISPLAY_MOVED_FOLLOW_DIFF
@@ -1990,6 +1993,8 @@ BEGIN
     ID_DISPLAY_MOVED_NONE   "Do not display moved blocks"
     ID_DISPLAY_MOVED_ALL    "Display all moved blacks"
     ID_DISPLAY_MOVED_FOLLOW_DIFF "Display moved blocks only from current diff"
+    ID_LOCBAR_GOTODIFF      "Go to diff under cursor"
+    ID_LOCBAR_GOTODIFF_FMT  "G&oto Diff %1 of %2"
 END
 
 // END STRINGS SYNCHRO

diff --git a/Src/Languages/Norwegian/resource.h b/Src/Languages/Norwegian/resource.h
index e0c2ae6..f2733ab 100644 (file)
--- a/Src/Languages/Norwegian/resource.h
+++ b/Src/Languages/Norwegian/resource.h
@@ -696,6 +696,8 @@
 #define ID_DISPLAY_MOVED_NONE           33088
 #define ID_DISPLAY_MOVED_ALL            33089
 #define ID_DISPLAY_MOVED_FOLLOW_DIFF    33090
+#define ID_LOCBAR_GOTODIFF              33091
+#define ID_LOCBAR_GOTODIFF_FMT          33092
 
 
 
@@ -705,7 +707,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        163
-#define _APS_NEXT_COMMAND_VALUE         33091
+#define _APS_NEXT_COMMAND_VALUE         33093
 #define _APS_NEXT_CONTROL_VALUE         1146
 #define _APS_NEXT_SYMED_VALUE           106
 #endif

diff --git a/Src/Languages/Polish/MergePolish.rc b/Src/Languages/Polish/MergePolish.rc
index 65d2353..a2e5a6d 100644 (file)
--- a/Src/Languages/Polish/MergePolish.rc
+++ b/Src/Languages/Polish/MergePolish.rc
@@ -315,6 +315,9 @@ IDR_POPUP_LOCATIONBAR MENU
 BEGIN
     POPUP "_POPUP_"
     BEGIN
+        MENUITEM "G&oto Diff"                   ID_LOCBAR_GOTODIFF
+        MENUITEM "&Goto...",                    ID_EDIT_WMGOTO
+        MENUITEM SEPARATOR
         MENUITEM "&No Moved Blocks",            ID_DISPLAY_MOVED_NONE
         MENUITEM "&All Moved Blocks",           ID_DISPLAY_MOVED_ALL
         MENUITEM "Moved Block for &Current Diff", ID_DISPLAY_MOVED_FOLLOW_DIFF
@@ -1991,6 +1994,8 @@ BEGIN
     ID_DISPLAY_MOVED_NONE   "Do not display moved blocks"
     ID_DISPLAY_MOVED_ALL    "Display all moved blacks"
     ID_DISPLAY_MOVED_FOLLOW_DIFF "Display moved blocks only from current diff"
+    ID_LOCBAR_GOTODIFF      "Go to diff under cursor"
+    ID_LOCBAR_GOTODIFF_FMT  "G&oto Diff %1 of %2"
 END
 
 // END STRINGS SYNCHRO

diff --git a/Src/Languages/Polish/resource.h b/Src/Languages/Polish/resource.h
index e0c2ae6..f2733ab 100644 (file)
--- a/Src/Languages/Polish/resource.h
+++ b/Src/Languages/Polish/resource.h
@@ -696,6 +696,8 @@
 #define ID_DISPLAY_MOVED_NONE           33088
 #define ID_DISPLAY_MOVED_ALL            33089
 #define ID_DISPLAY_MOVED_FOLLOW_DIFF    33090
+#define ID_LOCBAR_GOTODIFF              33091
+#define ID_LOCBAR_GOTODIFF_FMT          33092
 
 
 
@@ -705,7 +707,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        163
-#define _APS_NEXT_COMMAND_VALUE         33091
+#define _APS_NEXT_COMMAND_VALUE         33093
 #define _APS_NEXT_CONTROL_VALUE         1146
 #define _APS_NEXT_SYMED_VALUE           106
 #endif

diff --git a/Src/Languages/Russian/MergeRussian.rc b/Src/Languages/Russian/MergeRussian.rc
index d392628..f532894 100644 (file)
--- a/Src/Languages/Russian/MergeRussian.rc
+++ b/Src/Languages/Russian/MergeRussian.rc
@@ -326,6 +326,9 @@ IDR_POPUP_LOCATIONBAR MENU
 BEGIN
     POPUP "_POPUP_"
     BEGIN
+        MENUITEM "G&oto Diff"                   ID_LOCBAR_GOTODIFF
+        MENUITEM "Ïåðåéòè ê ñòðîêå...",         ID_EDIT_WMGOTO
+        MENUITEM SEPARATOR
         MENUITEM "&No Moved Blocks",            ID_DISPLAY_MOVED_NONE
         MENUITEM "&All Moved Blocks",           ID_DISPLAY_MOVED_ALL
         MENUITEM "Moved Block for &Current Diff", ID_DISPLAY_MOVED_FOLLOW_DIFF
@@ -1894,6 +1897,8 @@ BEGIN
     ID_DISPLAY_MOVED_NONE   "Do not display moved blocks"
     ID_DISPLAY_MOVED_ALL    "Display all moved blacks"
     ID_DISPLAY_MOVED_FOLLOW_DIFF "Display moved blocks only from current diff"
+    ID_LOCBAR_GOTODIFF      "Go to diff under cursor"
+    ID_LOCBAR_GOTODIFF_FMT  "G&oto Diff %1 of %2"
 END
 
 // END STRINGS SYNCHRO

diff --git a/Src/Languages/Russian/resource.h b/Src/Languages/Russian/resource.h
index e0c2ae6..f2733ab 100644 (file)
--- a/Src/Languages/Russian/resource.h
+++ b/Src/Languages/Russian/resource.h
@@ -696,6 +696,8 @@
 #define ID_DISPLAY_MOVED_NONE           33088
 #define ID_DISPLAY_MOVED_ALL            33089
 #define ID_DISPLAY_MOVED_FOLLOW_DIFF    33090
+#define ID_LOCBAR_GOTODIFF              33091
+#define ID_LOCBAR_GOTODIFF_FMT          33092
 
 
 
@@ -705,7 +707,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        163
-#define _APS_NEXT_COMMAND_VALUE         33091
+#define _APS_NEXT_COMMAND_VALUE         33093
 #define _APS_NEXT_CONTROL_VALUE         1146
 #define _APS_NEXT_SYMED_VALUE           106
 #endif

diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc
index 11dd191..568eb18 100644 (file)
--- a/Src/Languages/Slovak/MergeSlovak.rc
+++ b/Src/Languages/Slovak/MergeSlovak.rc
@@ -315,6 +315,9 @@ IDR_POPUP_LOCATIONBAR MENU
 BEGIN
     POPUP "_POPUP_"
     BEGIN
+        MENUITEM "G&oto Diff"                   ID_LOCBAR_GOTODIFF
+        MENUITEM "&Goto...",                    ID_EDIT_WMGOTO
+        MENUITEM SEPARATOR
         MENUITEM "&No Moved Blocks",            ID_DISPLAY_MOVED_NONE
         MENUITEM "&All Moved Blocks",           ID_DISPLAY_MOVED_ALL
         MENUITEM "Moved Block for &Current Diff", ID_DISPLAY_MOVED_FOLLOW_DIFF
@@ -1991,6 +1994,8 @@ BEGIN
     ID_DISPLAY_MOVED_NONE   "Do not display moved blocks"
     ID_DISPLAY_MOVED_ALL    "Display all moved blacks"
     ID_DISPLAY_MOVED_FOLLOW_DIFF "Display moved blocks only from current diff"
+    ID_LOCBAR_GOTODIFF      "Go to diff under cursor"
+    ID_LOCBAR_GOTODIFF_FMT  "G&oto Diff %1 of %2"
 END
 
 // END STRINGS SYNCHRO

diff --git a/Src/Languages/Slovak/resource.h b/Src/Languages/Slovak/resource.h
index e0c2ae6..f2733ab 100644 (file)
--- a/Src/Languages/Slovak/resource.h
+++ b/Src/Languages/Slovak/resource.h
@@ -696,6 +696,8 @@
 #define ID_DISPLAY_MOVED_NONE           33088
 #define ID_DISPLAY_MOVED_ALL            33089
 #define ID_DISPLAY_MOVED_FOLLOW_DIFF    33090
+#define ID_LOCBAR_GOTODIFF              33091
+#define ID_LOCBAR_GOTODIFF_FMT          33092
 
 
 
@@ -705,7 +707,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        163
-#define _APS_NEXT_COMMAND_VALUE         33091
+#define _APS_NEXT_COMMAND_VALUE         33093
 #define _APS_NEXT_CONTROL_VALUE         1146
 #define _APS_NEXT_SYMED_VALUE           106
 #endif

diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc
index c5f173a..c364822 100644 (file)
--- a/Src/Languages/Spanish/MergeSpanish.rc
+++ b/Src/Languages/Spanish/MergeSpanish.rc
@@ -315,6 +315,9 @@ IDR_POPUP_LOCATIONBAR MENU
 BEGIN
     POPUP "_POPUP_"
     BEGIN
+        MENUITEM "G&oto Diff"                   ID_LOCBAR_GOTODIFF
+        MENUITEM "&Goto...",                    ID_EDIT_WMGOTO
+        MENUITEM SEPARATOR
         MENUITEM "&No Moved Blocks",            ID_DISPLAY_MOVED_NONE
         MENUITEM "&All Moved Blocks",           ID_DISPLAY_MOVED_ALL
         MENUITEM "Moved Block for &Current Diff", ID_DISPLAY_MOVED_FOLLOW_DIFF
@@ -1991,6 +1994,8 @@ BEGIN
     ID_DISPLAY_MOVED_NONE   "Do not display moved blocks"
     ID_DISPLAY_MOVED_ALL    "Display all moved blacks"
     ID_DISPLAY_MOVED_FOLLOW_DIFF "Display moved blocks only from current diff"
+    ID_LOCBAR_GOTODIFF      "Go to diff under cursor"
+    ID_LOCBAR_GOTODIFF_FMT  "G&oto Diff %1 of %2"
 END
 
 // END STRINGS SYNCHRO

diff --git a/Src/Languages/Spanish/resource.h b/Src/Languages/Spanish/resource.h
index e0c2ae6..f2733ab 100644 (file)
--- a/Src/Languages/Spanish/resource.h
+++ b/Src/Languages/Spanish/resource.h
@@ -696,6 +696,8 @@
 #define ID_DISPLAY_MOVED_NONE           33088
 #define ID_DISPLAY_MOVED_ALL            33089
 #define ID_DISPLAY_MOVED_FOLLOW_DIFF    33090
+#define ID_LOCBAR_GOTODIFF              33091
+#define ID_LOCBAR_GOTODIFF_FMT          33092
 
 
 
@@ -705,7 +707,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        163
-#define _APS_NEXT_COMMAND_VALUE         33091
+#define _APS_NEXT_COMMAND_VALUE         33093
 #define _APS_NEXT_CONTROL_VALUE         1146
 #define _APS_NEXT_SYMED_VALUE           106
 #endif

diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc
index ddad7ad..0792f30 100644 (file)
--- a/Src/Languages/Swedish/MergeSwedish.rc
+++ b/Src/Languages/Swedish/MergeSwedish.rc
@@ -314,6 +314,9 @@ IDR_POPUP_LOCATIONBAR MENU
 BEGIN
     POPUP "_POPUP_"
     BEGIN
+        MENUITEM "G&oto Diff"                   ID_LOCBAR_GOTODIFF
+        MENUITEM "&Gå till...",                 ID_EDIT_WMGOTO
+        MENUITEM SEPARATOR
         MENUITEM "&Inga Flyttade Block",            ID_DISPLAY_MOVED_NONE
         MENUITEM "&Alla Flyttade Block",           ID_DISPLAY_MOVED_ALL
         MENUITEM "Flyttat Block för &Aktuell Skillnad", ID_DISPLAY_MOVED_FOLLOW_DIFF
@@ -1990,6 +1993,8 @@ BEGIN
     ID_DISPLAY_MOVED_NONE   "Visa inte flyttade block"
     ID_DISPLAY_MOVED_ALL    "Visa alla flyttade block"
     ID_DISPLAY_MOVED_FOLLOW_DIFF "Visa flyttade block bara från aktuell skillnad"
+    ID_LOCBAR_GOTODIFF      "Go to diff under cursor"
+    ID_LOCBAR_GOTODIFF_FMT  "G&oto Diff %1 of %2"
 END
 
 // END STRINGS SYNCHRO

diff --git a/Src/Languages/Swedish/resource.h b/Src/Languages/Swedish/resource.h
index e0c2ae6..f2733ab 100644 (file)
--- a/Src/Languages/Swedish/resource.h
+++ b/Src/Languages/Swedish/resource.h
@@ -696,6 +696,8 @@
 #define ID_DISPLAY_MOVED_NONE           33088
 #define ID_DISPLAY_MOVED_ALL            33089
 #define ID_DISPLAY_MOVED_FOLLOW_DIFF    33090
+#define ID_LOCBAR_GOTODIFF              33091
+#define ID_LOCBAR_GOTODIFF_FMT          33092
 
 
 
@@ -705,7 +707,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        163
-#define _APS_NEXT_COMMAND_VALUE         33091
+#define _APS_NEXT_COMMAND_VALUE         33093
 #define _APS_NEXT_CONTROL_VALUE         1146
 #define _APS_NEXT_SYMED_VALUE           106
 #endif

diff --git a/Src/LocationView.cpp b/Src/LocationView.cpp
index 97fd59d..09a1025 100644 (file)
--- a/Src/LocationView.cpp
+++ b/Src/LocationView.cpp
@@ -369,6 +369,12 @@ void CLocationView::OnContextMenu(CWnd* pWnd, CPoint point)
        CMergeDoc* pDoc = GetDocument();
        switch (command)
        {
+       case ID_LOCBAR_GOTODIFF:
+               GotoLocation(point);
+               break;
+       case ID_EDIT_WMGOTO:
+               m_view0->WMGoto();
+               break;
        case ID_DISPLAY_MOVED_NONE:
                SetConnectMovedBlocks(DISPLAY_MOVED_NONE);
                pDoc->SetDetectMovedBlocks(FALSE);

diff --git a/Src/Merge.rc b/Src/Merge.rc
index e8a1284..a7ce0ee 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -315,6 +315,9 @@ IDR_POPUP_LOCATIONBAR MENU
 BEGIN
     POPUP "_POPUP_"
     BEGIN
+        MENUITEM "G&oto Diff"                   ID_LOCBAR_GOTODIFF
+        MENUITEM "&Goto...",                    ID_EDIT_WMGOTO
+        MENUITEM SEPARATOR
         MENUITEM "&No Moved Blocks",            ID_DISPLAY_MOVED_NONE
         MENUITEM "&All Moved Blocks",           ID_DISPLAY_MOVED_ALL
         MENUITEM "Moved Block for &Current Diff", ID_DISPLAY_MOVED_FOLLOW_DIFF
@@ -1876,6 +1879,8 @@ BEGIN
     ID_DISPLAY_MOVED_NONE   "Do not display moved blocks"
     ID_DISPLAY_MOVED_ALL    "Display all moved blacks"
     ID_DISPLAY_MOVED_FOLLOW_DIFF "Display moved blocks only from current diff"
+    ID_LOCBAR_GOTODIFF      "Go to diff under cursor"
+    ID_LOCBAR_GOTODIFF_FMT  "G&oto Diff %1 of %2"
 END
 
 // END STRINGS SYNCHRO

diff --git a/Src/MergeEditView.h b/Src/MergeEditView.h
index 619b2ed..ffe1873 100644 (file)
--- a/Src/MergeEditView.h
+++ b/Src/MergeEditView.h
@@ -160,6 +160,7 @@ public:
        virtual void UpdateSiblingScrollPos (BOOL bHorz);
        virtual void GetLineColors (int nLineIndex, COLORREF & crBkgnd,
                        COLORREF & crText, BOOL & bDrawWhitespace);
+       void WMGoto() { OnWMGoto(); };
 
        // to customize the mergeview menu
        static HMENU createScriptsSubmenu(HMENU hMenu);

diff --git a/Src/readme.txt b/Src/readme.txt
index 26cd0d8..2a2e1d6 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -3,6 +3,9 @@
   Src: MainFrm.cpp
  PATCH: [ 968255 ] Rename EOL sensitive in configlog
   Src: ConfigLog.cpp
+ PATCH: [ 967700 ] Add Goto-items to location pane context menu
+  Src: LocationView.cpp Merge.rc MergeEditView.h resource.h
+  Src/Languages: *.rc resource.h
 
 2004-06-07 Laoran
  PATCH: [ 966693 ] set scroll width in diffpane for widest view

diff --git a/Src/resource.h b/Src/resource.h
index e0c2ae6..f2733ab 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -696,6 +696,8 @@
 #define ID_DISPLAY_MOVED_NONE           33088
 #define ID_DISPLAY_MOVED_ALL            33089
 #define ID_DISPLAY_MOVED_FOLLOW_DIFF    33090
+#define ID_LOCBAR_GOTODIFF              33091
+#define ID_LOCBAR_GOTODIFF_FMT          33092
 
 
 
@@ -705,7 +707,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        163
-#define _APS_NEXT_COMMAND_VALUE         33091
+#define _APS_NEXT_COMMAND_VALUE         33093
 #define _APS_NEXT_CONTROL_VALUE         1146
 #define _APS_NEXT_SYMED_VALUE           106
 #endif