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
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
#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
#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
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
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
#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
#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
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
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
#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
#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
MENUITEM "¸´ÖÆ(&C)", ID_EDIT_COPY
MENUITEM "Õ³Ìù(&P)", ID_EDIT_PASTE
MENUITEM SEPARATOR
- MENUITEM "&Goto...", ID_EDIT_WMGOTO
+ MENUITEM "&Goto...", ID_EDIT_WMGOTO
END
END
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
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
#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
#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
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
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
#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
#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
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
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
#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
#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
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
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
#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
#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
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
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
#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
#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
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
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
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
#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
#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
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
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
#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
#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
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
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
#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
#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
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
+
/////////////////////////////////////////////////////////////////////////////
//
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"
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
/////////////////////////////////////////////////////////////////////////////
#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
#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
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
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
#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
#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
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
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
#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
#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
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
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
#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
#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
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
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
#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
#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
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
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
#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
#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
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
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
#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
#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
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
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
#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
#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
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);
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
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
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);
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
#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
#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