//Microsoft Developer Studio generated resource script.
//
+// $Id$
+
#include "resource.h"
#define APSTUDIO_READONLY_SYMBOLS
MENUITEM "&Copiar\tCtrl+C", ID_EDIT_COPY
MENUITEM "Co&lar\tCtrl+V", ID_EDIT_PASTE
MENUITEM SEPARATOR
- MENUITEM "&Próxima diferença\tTab", ID_NEXTDIFF
- MENUITEM "Diferença &anterior\tShift+Tab", ID_PREVDIFF
- MENUITEM SEPARATOR
- MENUITEM "Primeira &Diferença\tAlt+Home", ID_FIRSTDIFF
- MENUITEM "Diferença Corre&nte\tAlt+Enter", ID_CURDIFF
- MENUITEM "&Ultima Diferença\tAlt+End", ID_LASTDIFF
- MENUITEM SEPARATOR
- MENUITEM "Copiar para a &Direita\tArrow right", ID_L2R
- MENUITEM "Copiar para a &Esquerda\tArrow left", ID_R2L
- MENUITEM SEPARATOR
- MENUITEM "Copiar tudo para a Direita", ID_ALL_RIGHT
- MENUITEM "Copiar tudo para a Esquerda", ID_ALL_LEFT
+ MENUITEM "Highlight Line Diff\tF4", ID_SHOWLINEDIFF
MENUITEM SEPARATOR
MENUITEM "Pr&ocurar...\tCtrl+F", ID_EDIT_FIND
MENUITEM "Al&terar...\tCtrl+H", ID_EDIT_REPLACE
MENUITEM SEPARATOR
MENUITEM "&Idioma...", ID_VIEW_LANGUAGE
END
+ POPUP "&Merge"
+ BEGIN
+ MENUITEM "&Próxima diferença\tAlt+Down", ID_NEXTDIFF
+ MENUITEM "Diferença &anterior\tAlt+Up", ID_PREVDIFF
+ MENUITEM SEPARATOR
+ MENUITEM "Primeira &Diferença\tAlt+Home", ID_FIRSTDIFF
+ MENUITEM "Diferença Corre&nte\tAlt+Enter", ID_CURDIFF
+ MENUITEM "&Ultima Diferença\tAlt+End", ID_LASTDIFF
+ MENUITEM SEPARATOR
+ MENUITEM "Copiar para a &Direita\tAlt+Right", ID_L2R
+ MENUITEM "Copiar para a &Esquerda\tAlt+Left", ID_R2L
+ MENUITEM SEPARATOR
+ MENUITEM "Copiar tudo para a Direita", ID_ALL_RIGHT
+ MENUITEM "Copiar tudo para a Esquerda", ID_ALL_LEFT
+ END
POPUP "Ja&nela"
BEGIN
MENUITEM "Fechar", ID_FILE_CLOSE
END
END
+IDR_POPUP_EDITOR_HEADERBAR MENU DISCARDABLE
+BEGIN
+ POPUP "_POPUP_"
+ BEGIN
+ MENUITEM "Copy full Path", ID_EDITOR_COPY_PATH
+ MENUITEM "Copy Filename", ID_EDITOR_COPY_FILENAME
+ END
+END
+
/////////////////////////////////////////////////////////////////////////////
//
VK_END, ID_LASTDIFF, VIRTKEY, ALT, NOINVERT
VK_F3, ID_EDIT_REPEAT, VIRTKEY, NOINVERT
VK_F3, ID_EDIT_FIND_PREVIOUS, VIRTKEY, SHIFT, NOINVERT
+ VK_F4, ID_SHOWLINEDIFF, VIRTKEY, NOINVERT
VK_F5, ID_REFRESH, VIRTKEY, NOINVERT
VK_F6, ID_NEXT_PANE, VIRTKEY, NOINVERT
VK_F6, ID_PREV_PANE, VIRTKEY, SHIFT, NOINVERT
CAPTION "Registro"
FONT 8, "MS Sans Serif"
BEGIN
- CONTROL "Associar a diretórios",IDC_ASSOC_DIRECTORY,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,221,15
+ CONTROL "&Add to explorer context menu",IDC_EXPLORER_CONTEXT,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,108,10
+ EDITTEXT IDC_WINMERGE_PATH,7,19,167,14,ES_AUTOHSCROLL
+ PUSHBUTTON "&Browse...",IDC_WINMERGE_PATH_BROWSE,180,19,50,14
+ PUSHBUTTON "&Save path",IDC_WINMERGE_PATH_SAVE,7,36,50,14
+END
+
+IDD_EDITOR_HEADERBAR DIALOGEX 0, 0, 373, 12
+STYLE WS_CHILD
+FONT 8, "MS Sans Serif", 0, 0, 0x1
+BEGIN
+ EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL |
+ ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT
+ WS_TABSTOP,WS_EX_STATICEDGE
+ EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL |
+ ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT
+ WS_TABSTOP,WS_EX_STATICEDGE
END
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
-// Used by MergeBrazilian.rc
+// Used by Merge.rc
//
#define IDC_CUT 3
#define IDC_COPY 4
#define IDD_PROPPAGE_FILTER 111
#define IDD_OUTPUT 112
#define IDD_PROPPAGE_REGISTRY 113
+#define IDD_EDITOR_HEADERBAR 114
+#define IDR_POPUP_EDITOR_HEADERBAR 115
#define IDS_VERSION_FMT 130
#define IDS_ALLFILES 131
#define IDS_CONFIRM_ALL_LEFT 132
#define IDS_STATUS_COPYR2L 198
#define IDS_STATUS_COPYALL2L 199
#define IDS_STATUS_COPYALL2R 200
+#define IDS_PROGRAMFILES 201
#define IDB_EQUAL 213
#define IDB_NOTEQUAL 214
#define IDB_RFOLDER 215
#define IDC_EDIT1 1033
#define IDC_PROP_INSERT_TABS 1034
#define IDC_PROP_INSERT_SPACES 1035
-#define IDC_ASSOC_DIRECTORY 1036
#define IDC_LANGUAGE_LIST 1037
#define IDC_AUTOMRESCAN_CHECK 1038
#define IDC_FILE_FILTER 1039
#define IDC_DIFFERENCE_DELETED_COLOR 1041
#define IDC_SEL_DIFFERENCE_DELETED_COLOR 1042
#define IDC_SEL_DIFFERENCE_TEXT_COLOR 1043
+#define IDC_EXPLORER_CONTEXT 1044
+#define IDC_WINMERGE_PATH_BROWSE 1045
+#define IDC_WINMERGE_PATH 1046
+#define IDC_WINMERGE_PATH_SAVE 1047
+#define IDC_STATIC_TITLE_LEFT 1048
+#define IDC_STATIC_TITLE_RIGHT 1049
#define IDS_NUM_REPLACED 8501
#define IDS_EDIT_TEXT_NOT_FOUND 8502
#define IDS_LINE_STATUS_INFO 8503
#define ID_VIEW_WHITESPACE 32818
#define ID_REFRESH 32819
#define ID_EDIT_FIND_PREVIOUS 32820
+#define ID_SHOWLINEDIFF 32821
+#define ID_EDITOR_COPY_PATH 32822
+#define ID_EDITOR_COPY_FILENAME 32823
// Next default values for new objects
-//
+//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
-#define _APS_NEXT_RESOURCE_VALUE 114
-#define _APS_NEXT_COMMAND_VALUE 32820
-#define _APS_NEXT_CONTROL_VALUE 1044
+#define _APS_NEXT_RESOURCE_VALUE 116
+#define _APS_NEXT_COMMAND_VALUE 32822
+#define _APS_NEXT_CONTROL_VALUE 1050
#define _APS_NEXT_SYMED_VALUE 108
#endif
#endif
END
END
+IDR_POPUP_EDITOR_HEADERBAR MENU DISCARDABLE
+BEGIN
+ POPUP "_POPUP_"
+ BEGIN
+ MENUITEM "Copy full Path", ID_EDITOR_COPY_PATH
+ MENUITEM "Copy Filename", ID_EDITOR_COPY_FILENAME
+ END
+END
+
/////////////////////////////////////////////////////////////////////////////
//
CAPTION "怬"
FONT 9, "ËÎÌå", 0, 0, 0x1
BEGIN
- CONTROL "ͬÎļþ¼Ð¹ØÁª",IDC_ASSOC_DIRECTORY,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,7,221,15
- CONTROL "Add to explorer context menu",IDC_EXPLORER_CONTEXT,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,108,10
- EDITTEXT IDC_WINMERGE_PATH,7,34,167,14,ES_AUTOHSCROLL
- PUSHBUTTON "Browse...",IDC_WINMERGE_PATH_BROWSE,180,34,50,14
- PUSHBUTTON "Save path",IDC_WINMERGE_PATH_SAVE,8,51,50,14
+ CONTROL "&Add to explorer context menu",IDC_EXPLORER_CONTEXT,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,108,10
+ EDITTEXT IDC_WINMERGE_PATH,7,19,167,14,ES_AUTOHSCROLL
+ PUSHBUTTON "&Browse...",IDC_WINMERGE_PATH_BROWSE,180,19,50,14
+ PUSHBUTTON "&Save path",IDC_WINMERGE_PATH_SAVE,7,36,50,14
+END
+
+IDD_EDITOR_HEADERBAR DIALOGEX 0, 0, 373, 12
+STYLE WS_CHILD
+FONT 8, "MS Sans Serif", 0, 0, 0x1
+BEGIN
+ EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL |
+ ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT
+ WS_TABSTOP,WS_EX_STATICEDGE
+ EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL |
+ ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT
+ WS_TABSTOP,WS_EX_STATICEDGE
END
#define IDD_PROPPAGE_FILTER 111
#define IDD_OUTPUT 112
#define IDD_PROPPAGE_REGISTRY 113
+#define IDD_EDITOR_HEADERBAR 114
+#define IDR_POPUP_EDITOR_HEADERBAR 115
#define IDS_VERSION_FMT 130
#define IDS_ALLFILES 131
#define IDS_CONFIRM_ALL_LEFT 132
#define IDS_STATUS_COPYR2L 198
#define IDS_STATUS_COPYALL2L 199
#define IDS_STATUS_COPYALL2R 200
+#define IDS_PROGRAMFILES 201
#define IDB_EQUAL 213
#define IDB_NOTEQUAL 214
#define IDB_RFOLDER 215
#define IDC_EDIT1 1033
#define IDC_PROP_INSERT_TABS 1034
#define IDC_PROP_INSERT_SPACES 1035
-#define IDC_ASSOC_DIRECTORY 1036
#define IDC_LANGUAGE_LIST 1037
#define IDC_AUTOMRESCAN_CHECK 1038
#define IDC_FILE_FILTER 1039
#define IDC_WINMERGE_PATH_BROWSE 1045
#define IDC_WINMERGE_PATH 1046
#define IDC_WINMERGE_PATH_SAVE 1047
+#define IDC_STATIC_TITLE_LEFT 1048
+#define IDC_STATIC_TITLE_RIGHT 1049
#define IDS_NUM_REPLACED 8501
#define IDS_EDIT_TEXT_NOT_FOUND 8502
#define IDS_LINE_STATUS_INFO 8503
#define ID_REFRESH 32819
#define ID_EDIT_FIND_PREVIOUS 32820
#define ID_SHOWLINEDIFF 32821
+#define ID_EDITOR_COPY_PATH 32822
+#define ID_EDITOR_COPY_FILENAME 32823
// Next default values for new objects
-//
+//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
-#define _APS_NEXT_RESOURCE_VALUE 114
+#define _APS_NEXT_RESOURCE_VALUE 116
#define _APS_NEXT_COMMAND_VALUE 32822
-#define _APS_NEXT_CONTROL_VALUE 1048
+#define _APS_NEXT_CONTROL_VALUE 1050
#define _APS_NEXT_SYMED_VALUE 108
#endif
#endif
END
END
+IDR_POPUP_EDITOR_HEADERBAR MENU DISCARDABLE
+BEGIN
+ POPUP "_POPUP_"
+ BEGIN
+ MENUITEM "Copy full Path", ID_EDITOR_COPY_PATH
+ MENUITEM "Copy Filename", ID_EDITOR_COPY_FILENAME
+ END
+END
+
/////////////////////////////////////////////////////////////////////////////
//
CAPTION "µn¿ý"
FONT 9, "·s²Ó©úÅé", 0, 0, 0x1
BEGIN
- CONTROL "ÃöÁp¨ì¸ê®Æ§¨",IDC_ASSOC_DIRECTORY,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,7,221,15
- CONTROL "Add to explorer context menu",IDC_EXPLORER_CONTEXT,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,108,10
- EDITTEXT IDC_WINMERGE_PATH,7,34,167,14,ES_AUTOHSCROLL
- PUSHBUTTON "Browse...",IDC_WINMERGE_PATH_BROWSE,180,34,50,14
- PUSHBUTTON "Save path",IDC_WINMERGE_PATH_SAVE,8,51,50,14
+ CONTROL "&Add to explorer context menu",IDC_EXPLORER_CONTEXT,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,108,10
+ EDITTEXT IDC_WINMERGE_PATH,7,19,167,14,ES_AUTOHSCROLL
+ PUSHBUTTON "&Browse...",IDC_WINMERGE_PATH_BROWSE,180,19,50,14
+ PUSHBUTTON "&Save path",IDC_WINMERGE_PATH_SAVE,7,36,50,14
+END
+
+IDD_EDITOR_HEADERBAR DIALOGEX 0, 0, 373, 12
+STYLE WS_CHILD
+FONT 8, "MS Sans Serif", 0, 0, 0x1
+BEGIN
+ EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL |
+ ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT
+ WS_TABSTOP,WS_EX_STATICEDGE
+ EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL |
+ ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT
+ WS_TABSTOP,WS_EX_STATICEDGE
END
#define IDD_PROPPAGE_FILTER 111
#define IDD_OUTPUT 112
#define IDD_PROPPAGE_REGISTRY 113
+#define IDD_EDITOR_HEADERBAR 114
+#define IDR_POPUP_EDITOR_HEADERBAR 115
#define IDS_VERSION_FMT 130
#define IDS_ALLFILES 131
#define IDS_CONFIRM_ALL_LEFT 132
#define IDS_STATUS_COPYR2L 198
#define IDS_STATUS_COPYALL2L 199
#define IDS_STATUS_COPYALL2R 200
+#define IDS_PROGRAMFILES 201
#define IDB_EQUAL 213
#define IDB_NOTEQUAL 214
#define IDB_RFOLDER 215
#define IDC_EDIT1 1033
#define IDC_PROP_INSERT_TABS 1034
#define IDC_PROP_INSERT_SPACES 1035
-#define IDC_ASSOC_DIRECTORY 1036
#define IDC_LANGUAGE_LIST 1037
#define IDC_AUTOMRESCAN_CHECK 1038
#define IDC_FILE_FILTER 1039
#define IDC_WINMERGE_PATH_BROWSE 1045
#define IDC_WINMERGE_PATH 1046
#define IDC_WINMERGE_PATH_SAVE 1047
+#define IDC_STATIC_TITLE_LEFT 1048
+#define IDC_STATIC_TITLE_RIGHT 1049
#define IDS_NUM_REPLACED 8501
#define IDS_EDIT_TEXT_NOT_FOUND 8502
#define IDS_LINE_STATUS_INFO 8503
#define ID_REFRESH 32819
#define ID_EDIT_FIND_PREVIOUS 32820
#define ID_SHOWLINEDIFF 32821
+#define ID_EDITOR_COPY_PATH 32822
+#define ID_EDITOR_COPY_FILENAME 32823
// Next default values for new objects
-//
+//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
-#define _APS_NEXT_RESOURCE_VALUE 114
+#define _APS_NEXT_RESOURCE_VALUE 116
#define _APS_NEXT_COMMAND_VALUE 32822
-#define _APS_NEXT_CONTROL_VALUE 1048
+#define _APS_NEXT_CONTROL_VALUE 1050
#define _APS_NEXT_SYMED_VALUE 108
#endif
#endif
END
END
+IDR_POPUP_EDITOR_HEADERBAR MENU DISCARDABLE
+BEGIN
+ POPUP "_POPUP_"
+ BEGIN
+ MENUITEM "Copy full Path", ID_EDITOR_COPY_PATH
+ MENUITEM "Copy Filename", ID_EDITOR_COPY_FILENAME
+ END
+END
+
/////////////////////////////////////////////////////////////////////////////
//
CAPTION "Registry"
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
- CONTROL "Associated with directories",IDC_ASSOC_DIRECTORY,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,221,15
- CONTROL "Add to explorer context menu",IDC_EXPLORER_CONTEXT,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,108,10
- EDITTEXT IDC_WINMERGE_PATH,7,34,167,14,ES_AUTOHSCROLL
- PUSHBUTTON "Browse...",IDC_WINMERGE_PATH_BROWSE,180,34,50,14
- PUSHBUTTON "Save path",IDC_WINMERGE_PATH_SAVE,8,51,50,14
+ CONTROL "&Add to explorer context menu",IDC_EXPLORER_CONTEXT,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,108,10
+ EDITTEXT IDC_WINMERGE_PATH,7,19,167,14,ES_AUTOHSCROLL
+ PUSHBUTTON "&Browse...",IDC_WINMERGE_PATH_BROWSE,180,19,50,14
+ PUSHBUTTON "&Save path",IDC_WINMERGE_PATH_SAVE,7,36,50,14
+END
+
+IDD_EDITOR_HEADERBAR DIALOGEX 0, 0, 373, 12
+STYLE WS_CHILD
+FONT 8, "MS Sans Serif", 0, 0, 0x1
+BEGIN
+ EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL |
+ ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT
+ WS_TABSTOP,WS_EX_STATICEDGE
+ EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL |
+ ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT
+ WS_TABSTOP,WS_EX_STATICEDGE
END
ID_OPTIONS_SHOWBINARIES "Displays binary files"
ID_VIEW_WHITESPACE "Shows whitespace characters"
ID_REFRESH "Refresh display\nRefresh (F5)"
+ ID_SHOWLINEDIFF "Highlight difference in current line"
+ ID_EDITOR_COPY_PATH "Copy full Path"
+ ID_EDITOR_COPY_FILENAME "Copy Filename"
END
STRINGTABLE DISCARDABLE
IDS_STATUS_COPYR2L "Copying Right to Left"
IDS_STATUS_COPYALL2L "Copying All to Left"
IDS_STATUS_COPYALL2R "Copying All to Right"
+ IDS_PROGRAMFILES "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
END
STRINGTABLE DISCARDABLE
IDS_EMPTY_LINE_STATUS_INFO "Line: %s"
END
+STRINGTABLE DISCARDABLE
+BEGIN
+ IDC_STATIC_TITLE_LEFT "Right click on the path to copy"
+ IDC_STATIC_TITLE_RIGHT "Right click on the path to copy"
+END
+
#endif // Czech resources
/////////////////////////////////////////////////////////////////////////////
#define IDD_PROPPAGE_FILTER 111
#define IDD_OUTPUT 112
#define IDD_PROPPAGE_REGISTRY 113
+#define IDD_EDITOR_HEADERBAR 114
+#define IDR_POPUP_EDITOR_HEADERBAR 115
#define IDS_VERSION_FMT 130
#define IDS_ALLFILES 131
#define IDS_CONFIRM_ALL_LEFT 132
#define IDS_STATUS_COPYR2L 198
#define IDS_STATUS_COPYALL2L 199
#define IDS_STATUS_COPYALL2R 200
+#define IDS_PROGRAMFILES 201
#define IDB_EQUAL 213
#define IDB_NOTEQUAL 214
#define IDB_RFOLDER 215
#define IDC_EDIT1 1033
#define IDC_PROP_INSERT_TABS 1034
#define IDC_PROP_INSERT_SPACES 1035
-#define IDC_ASSOC_DIRECTORY 1036
#define IDC_LANGUAGE_LIST 1037
#define IDC_AUTOMRESCAN_CHECK 1038
#define IDC_FILE_FILTER 1039
#define IDC_WINMERGE_PATH_BROWSE 1045
#define IDC_WINMERGE_PATH 1046
#define IDC_WINMERGE_PATH_SAVE 1047
+#define IDC_STATIC_TITLE_LEFT 1048
+#define IDC_STATIC_TITLE_RIGHT 1049
#define IDS_NUM_REPLACED 8501
#define IDS_EDIT_TEXT_NOT_FOUND 8502
#define IDS_LINE_STATUS_INFO 8503
#define ID_REFRESH 32819
#define ID_EDIT_FIND_PREVIOUS 32820
#define ID_SHOWLINEDIFF 32821
+#define ID_EDITOR_COPY_PATH 32822
+#define ID_EDITOR_COPY_FILENAME 32823
// Next default values for new objects
-//
+//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
-#define _APS_NEXT_RESOURCE_VALUE 114
+#define _APS_NEXT_RESOURCE_VALUE 116
#define _APS_NEXT_COMMAND_VALUE 32822
-#define _APS_NEXT_CONTROL_VALUE 1048
+#define _APS_NEXT_CONTROL_VALUE 1050
#define _APS_NEXT_SYMED_VALUE 108
#endif
#endif
END
END
+IDR_POPUP_EDITOR_HEADERBAR MENU DISCARDABLE
+BEGIN
+ POPUP "_POPUP_"
+ BEGIN
+ MENUITEM "Copy full Path", ID_EDITOR_COPY_PATH
+ MENUITEM "Copy Filename", ID_EDITOR_COPY_FILENAME
+ END
+END
+
/////////////////////////////////////////////////////////////////////////////
//
CAPTION "Registreringer"
FONT 8, "MS Sans Serif"
BEGIN
- CONTROL "Associeret med mapper",IDC_ASSOC_DIRECTORY,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,221,15
- CONTROL "Add to explorer context menu",IDC_EXPLORER_CONTEXT,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,108,10
- EDITTEXT IDC_WINMERGE_PATH,7,34,167,14,ES_AUTOHSCROLL
- PUSHBUTTON "Browse...",IDC_WINMERGE_PATH_BROWSE,180,34,50,14
- PUSHBUTTON "Save path",IDC_WINMERGE_PATH_SAVE,8,51,50,14
+ CONTROL "&Add to explorer context menu",IDC_EXPLORER_CONTEXT,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,108,10
+ EDITTEXT IDC_WINMERGE_PATH,7,19,167,14,ES_AUTOHSCROLL
+ PUSHBUTTON "&Browse...",IDC_WINMERGE_PATH_BROWSE,180,19,50,14
+ PUSHBUTTON "&Save path",IDC_WINMERGE_PATH_SAVE,7,36,50,14
+END
+
+IDD_EDITOR_HEADERBAR DIALOGEX 0, 0, 373, 12
+STYLE WS_CHILD
+FONT 8, "MS Sans Serif", 0, 0, 0x1
+BEGIN
+ EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL |
+ ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT
+ WS_TABSTOP,WS_EX_STATICEDGE
+ EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL |
+ ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT
+ WS_TABSTOP,WS_EX_STATICEDGE
END
IDS_STATUS_COPYR2L "Kopierer højre til venstre"
IDS_STATUS_COPYALL2L "Kopierer alt til venstre"
IDS_STATUS_COPYALL2R "Kopierer alt til højre"
+ IDS_PROGRAMFILES "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
END
STRINGTABLE DISCARDABLE
IDS_EMPTY_LINE_STATUS_INFO "Line: %s"
END
+STRINGTABLE DISCARDABLE
+BEGIN
+ IDC_STATIC_TITLE_LEFT "Right click on the path to copy"
+ IDC_STATIC_TITLE_RIGHT "Right click on the path to copy"
+END
+
#endif // Danish resources
/////////////////////////////////////////////////////////////////////////////
#define IDD_PROPPAGE_FILTER 111
#define IDD_OUTPUT 112
#define IDD_PROPPAGE_REGISTRY 113
+#define IDD_EDITOR_HEADERBAR 114
+#define IDR_POPUP_EDITOR_HEADERBAR 115
#define IDS_VERSION_FMT 130
#define IDS_ALLFILES 131
#define IDS_CONFIRM_ALL_LEFT 132
#define IDS_STATUS_COPYR2L 198
#define IDS_STATUS_COPYALL2L 199
#define IDS_STATUS_COPYALL2R 200
+#define IDS_PROGRAMFILES 201
#define IDB_EQUAL 213
#define IDB_NOTEQUAL 214
#define IDB_RFOLDER 215
#define IDC_EDIT1 1033
#define IDC_PROP_INSERT_TABS 1034
#define IDC_PROP_INSERT_SPACES 1035
-#define IDC_ASSOC_DIRECTORY 1036
#define IDC_LANGUAGE_LIST 1037
#define IDC_AUTOMRESCAN_CHECK 1038
#define IDC_FILE_FILTER 1039
#define IDC_WINMERGE_PATH_BROWSE 1045
#define IDC_WINMERGE_PATH 1046
#define IDC_WINMERGE_PATH_SAVE 1047
+#define IDC_STATIC_TITLE_LEFT 1048
+#define IDC_STATIC_TITLE_RIGHT 1049
#define IDS_NUM_REPLACED 8501
#define IDS_EDIT_TEXT_NOT_FOUND 8502
#define IDS_LINE_STATUS_INFO 8503
#define ID_REFRESH 32819
#define ID_EDIT_FIND_PREVIOUS 32820
#define ID_SHOWLINEDIFF 32821
+#define ID_EDITOR_COPY_PATH 32822
+#define ID_EDITOR_COPY_FILENAME 32823
// Next default values for new objects
-//
+//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
-#define _APS_NEXT_RESOURCE_VALUE 114
+#define _APS_NEXT_RESOURCE_VALUE 116
#define _APS_NEXT_COMMAND_VALUE 32822
-#define _APS_NEXT_CONTROL_VALUE 1048
+#define _APS_NEXT_CONTROL_VALUE 1050
#define _APS_NEXT_SYMED_VALUE 108
#endif
#endif
END
END
+IDR_POPUP_EDITOR_HEADERBAR MENU DISCARDABLE
+BEGIN
+ POPUP "_POPUP_"
+ BEGIN
+ MENUITEM "Copy full Path", ID_EDITOR_COPY_PATH
+ MENUITEM "Copy Filename", ID_EDITOR_COPY_FILENAME
+ END
+END
+
/////////////////////////////////////////////////////////////////////////////
//
CAPTION "Registry"
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
- CONTROL "Associated with directories",IDC_ASSOC_DIRECTORY,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,221,15
- CONTROL "Add to explorer context menu",IDC_EXPLORER_CONTEXT,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,108,10
- EDITTEXT IDC_WINMERGE_PATH,7,34,167,14,ES_AUTOHSCROLL
- PUSHBUTTON "Browse...",IDC_WINMERGE_PATH_BROWSE,180,34,50,14
- PUSHBUTTON "Save path",IDC_WINMERGE_PATH_SAVE,8,51,50,14
+ CONTROL "&Add to explorer context menu",IDC_EXPLORER_CONTEXT,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,108,10
+ EDITTEXT IDC_WINMERGE_PATH,7,19,167,14,ES_AUTOHSCROLL
+ PUSHBUTTON "&Browse...",IDC_WINMERGE_PATH_BROWSE,180,19,50,14
+ PUSHBUTTON "&Save path",IDC_WINMERGE_PATH_SAVE,7,36,50,14
+END
+
+IDD_EDITOR_HEADERBAR DIALOGEX 0, 0, 373, 12
+STYLE WS_CHILD
+FONT 8, "MS Sans Serif", 0, 0, 0x1
+BEGIN
+ EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL |
+ ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT
+ WS_TABSTOP,WS_EX_STATICEDGE
+ EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL |
+ ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT
+ WS_TABSTOP,WS_EX_STATICEDGE
END
ID_OPTIONS_SHOWBINARIES "Displays binary files"
ID_VIEW_WHITESPACE "Shows whitespace characters"
ID_REFRESH "Refresh display\nRefresh (F5)"
+ ID_SHOWLINEDIFF "Highlight difference in current line"
+ ID_EDITOR_COPY_PATH "Copy full Path"
+ ID_EDITOR_COPY_FILENAME "Copy Filename"
END
STRINGTABLE DISCARDABLE
IDS_STATUS_COPYR2L "Copying Right to Left"
IDS_STATUS_COPYALL2L "Copying All to Left"
IDS_STATUS_COPYALL2R "Copying All to Right"
+ IDS_PROGRAMFILES "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
END
STRINGTABLE DISCARDABLE
IDS_EMPTY_LINE_STATUS_INFO "Line: %s"
END
+STRINGTABLE DISCARDABLE
+BEGIN
+ IDC_STATIC_TITLE_LEFT "Right click on the path to copy"
+ IDC_STATIC_TITLE_RIGHT "Right click on the path to copy"
+END
+
#endif // Dutch (Netherlands) resources
/////////////////////////////////////////////////////////////////////////////
#define IDD_PROPPAGE_FILTER 111
#define IDD_OUTPUT 112
#define IDD_PROPPAGE_REGISTRY 113
+#define IDD_EDITOR_HEADERBAR 114
+#define IDR_POPUP_EDITOR_HEADERBAR 115
#define IDS_VERSION_FMT 130
#define IDS_ALLFILES 131
#define IDS_CONFIRM_ALL_LEFT 132
#define IDS_STATUS_COPYR2L 198
#define IDS_STATUS_COPYALL2L 199
#define IDS_STATUS_COPYALL2R 200
+#define IDS_PROGRAMFILES 201
#define IDB_EQUAL 213
#define IDB_NOTEQUAL 214
#define IDB_RFOLDER 215
#define IDC_EDIT1 1033
#define IDC_PROP_INSERT_TABS 1034
#define IDC_PROP_INSERT_SPACES 1035
-#define IDC_ASSOC_DIRECTORY 1036
#define IDC_LANGUAGE_LIST 1037
#define IDC_AUTOMRESCAN_CHECK 1038
#define IDC_FILE_FILTER 1039
#define IDC_WINMERGE_PATH_BROWSE 1045
#define IDC_WINMERGE_PATH 1046
#define IDC_WINMERGE_PATH_SAVE 1047
+#define IDC_STATIC_TITLE_LEFT 1048
+#define IDC_STATIC_TITLE_RIGHT 1049
#define IDS_NUM_REPLACED 8501
#define IDS_EDIT_TEXT_NOT_FOUND 8502
#define IDS_LINE_STATUS_INFO 8503
#define ID_REFRESH 32819
#define ID_EDIT_FIND_PREVIOUS 32820
#define ID_SHOWLINEDIFF 32821
+#define ID_EDITOR_COPY_PATH 32822
+#define ID_EDITOR_COPY_FILENAME 32823
// Next default values for new objects
-//
+//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
-#define _APS_NEXT_RESOURCE_VALUE 114
+#define _APS_NEXT_RESOURCE_VALUE 116
#define _APS_NEXT_COMMAND_VALUE 32822
-#define _APS_NEXT_CONTROL_VALUE 1048
+#define _APS_NEXT_CONTROL_VALUE 1050
#define _APS_NEXT_SYMED_VALUE 108
#endif
#endif
END
END
+IDR_POPUP_EDITOR_HEADERBAR MENU DISCARDABLE
+BEGIN
+ POPUP "_POPUP_"
+ BEGIN
+ MENUITEM "Copy full Path", ID_EDITOR_COPY_PATH
+ MENUITEM "Copy Filename", ID_EDITOR_COPY_FILENAME
+ END
+END
+
/////////////////////////////////////////////////////////////////////////////
//
CAPTION "Base de registre"
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
- CONTROL "Associer avec les répertoires",IDC_ASSOC_DIRECTORY,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,221,15
- CONTROL "Intégrer à l'explorateur Windows",IDC_EXPLORER_CONTEXT,
+ CONTROL "&Intégrer à l'explorateur Windows",IDC_EXPLORER_CONTEXT,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,130,10
EDITTEXT IDC_WINMERGE_PATH,7,34,167,14,ES_AUTOHSCROLL
- PUSHBUTTON "Parcourir...",IDC_WINMERGE_PATH_BROWSE,180,34,50,14
- PUSHBUTTON "Enregistrer le chemin",IDC_WINMERGE_PATH_SAVE,8,51,80,14
+ PUSHBUTTON "&Parcourir...",IDC_WINMERGE_PATH_BROWSE,180,34,50,14
+ PUSHBUTTON "&Enregistrer le chemin",IDC_WINMERGE_PATH_SAVE,8,51,80,14
+END
+
+IDD_EDITOR_HEADERBAR DIALOGEX 0, 0, 373, 12
+STYLE WS_CHILD
+FONT 8, "MS Sans Serif", 0, 0, 0x1
+BEGIN
+ EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL |
+ ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT
+ WS_TABSTOP,WS_EX_STATICEDGE
+ EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL |
+ ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT
+ WS_TABSTOP,WS_EX_STATICEDGE
END
#define IDD_PROPPAGE_FILTER 111
#define IDD_OUTPUT 112
#define IDD_PROPPAGE_REGISTRY 113
+#define IDD_EDITOR_HEADERBAR 114
+#define IDR_POPUP_EDITOR_HEADERBAR 115
#define IDS_VERSION_FMT 130
#define IDS_ALLFILES 131
#define IDS_CONFIRM_ALL_LEFT 132
#define IDS_STATUS_COPYR2L 198
#define IDS_STATUS_COPYALL2L 199
#define IDS_STATUS_COPYALL2R 200
+#define IDS_PROGRAMFILES 201
#define IDB_EQUAL 213
#define IDB_NOTEQUAL 214
#define IDB_RFOLDER 215
#define IDC_EDIT1 1033
#define IDC_PROP_INSERT_TABS 1034
#define IDC_PROP_INSERT_SPACES 1035
-#define IDC_ASSOC_DIRECTORY 1036
#define IDC_LANGUAGE_LIST 1037
#define IDC_AUTOMRESCAN_CHECK 1038
#define IDC_FILE_FILTER 1039
#define IDC_WINMERGE_PATH_BROWSE 1045
#define IDC_WINMERGE_PATH 1046
#define IDC_WINMERGE_PATH_SAVE 1047
+#define IDC_STATIC_TITLE_LEFT 1048
+#define IDC_STATIC_TITLE_RIGHT 1049
#define IDS_NUM_REPLACED 8501
#define IDS_EDIT_TEXT_NOT_FOUND 8502
#define IDS_LINE_STATUS_INFO 8503
#define ID_REFRESH 32819
#define ID_EDIT_FIND_PREVIOUS 32820
#define ID_SHOWLINEDIFF 32821
+#define ID_EDITOR_COPY_PATH 32822
+#define ID_EDITOR_COPY_FILENAME 32823
// Next default values for new objects
-//
+//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
-#define _APS_NEXT_RESOURCE_VALUE 114
+#define _APS_NEXT_RESOURCE_VALUE 116
#define _APS_NEXT_COMMAND_VALUE 32822
-#define _APS_NEXT_CONTROL_VALUE 1048
+#define _APS_NEXT_CONTROL_VALUE 1050
#define _APS_NEXT_SYMED_VALUE 108
#endif
#endif
END
END
+IDR_POPUP_EDITOR_HEADERBAR MENU DISCARDABLE
+BEGIN
+ POPUP "_POPUP_"
+ BEGIN
+ MENUITEM "Copy full Path", ID_EDITOR_COPY_PATH
+ MENUITEM "Copy Filename", ID_EDITOR_COPY_FILENAME
+ END
+END
+
/////////////////////////////////////////////////////////////////////////////
//
CAPTION "Registry"
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
- CONTROL "mit Verzeichnissen verknüpfen (Explorer-Kontextmenü)",
- IDC_ASSOC_DIRECTORY,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,7,221,15
- CONTROL "Add to explorer context menu",IDC_EXPLORER_CONTEXT,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,108,10
- EDITTEXT IDC_WINMERGE_PATH,7,34,167,14,ES_AUTOHSCROLL
- PUSHBUTTON "Browse...",IDC_WINMERGE_PATH_BROWSE,180,34,50,14
- PUSHBUTTON "Save path",IDC_WINMERGE_PATH_SAVE,8,51,50,14
+ CONTROL "&Add to explorer context menu",IDC_EXPLORER_CONTEXT,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,108,10
+ EDITTEXT IDC_WINMERGE_PATH,7,19,167,14,ES_AUTOHSCROLL
+ PUSHBUTTON "&Browse...",IDC_WINMERGE_PATH_BROWSE,180,19,50,14
+ PUSHBUTTON "&Save path",IDC_WINMERGE_PATH_SAVE,7,36,50,14
+END
+
+IDD_EDITOR_HEADERBAR DIALOGEX 0, 0, 373, 12
+STYLE WS_CHILD
+FONT 8, "MS Sans Serif", 0, 0, 0x1
+BEGIN
+ EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL |
+ ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT
+ WS_TABSTOP,WS_EX_STATICEDGE
+ EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL |
+ ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT
+ WS_TABSTOP,WS_EX_STATICEDGE
END
ID_OPTIONS_SHOWBINARIES "Zeigt Binärdateien an"
ID_VIEW_WHITESPACE "Zeigt Leerzeichen An"
ID_REFRESH "Aktualisiert die Anzeige\nAktualisieren (F5)"
+ ID_SHOWLINEDIFF "Highlight difference in current line"
+ ID_EDITOR_COPY_PATH "Copy full Path"
+ ID_EDITOR_COPY_FILENAME "Copy Filename"
END
STRINGTABLE DISCARDABLE
IDS_STATUS_COPYR2L "Kopiere rechts nach links"
IDS_STATUS_COPYALL2L "Kopiere alles nach links"
IDS_STATUS_COPYALL2R "Kopiere alles nach rechts"
+ IDS_PROGRAMFILES "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
END
STRINGTABLE DISCARDABLE
IDS_EMPTY_LINE_STATUS_INFO "Line: %s"
END
+STRINGTABLE DISCARDABLE
+BEGIN
+ IDC_STATIC_TITLE_LEFT "Right click on the path to copy"
+ IDC_STATIC_TITLE_RIGHT "Right click on the path to copy"
+END
+
#endif // German (Germany) resources
/////////////////////////////////////////////////////////////////////////////
#define IDD_PROPPAGE_FILTER 111
#define IDD_OUTPUT 112
#define IDD_PROPPAGE_REGISTRY 113
+#define IDD_EDITOR_HEADERBAR 114
+#define IDR_POPUP_EDITOR_HEADERBAR 115
#define IDS_VERSION_FMT 130
#define IDS_ALLFILES 131
#define IDS_CONFIRM_ALL_LEFT 132
#define IDS_STATUS_COPYR2L 198
#define IDS_STATUS_COPYALL2L 199
#define IDS_STATUS_COPYALL2R 200
+#define IDS_PROGRAMFILES 201
#define IDB_EQUAL 213
#define IDB_NOTEQUAL 214
#define IDB_RFOLDER 215
#define IDC_EDIT1 1033
#define IDC_PROP_INSERT_TABS 1034
#define IDC_PROP_INSERT_SPACES 1035
-#define IDC_ASSOC_DIRECTORY 1036
#define IDC_LANGUAGE_LIST 1037
#define IDC_AUTOMRESCAN_CHECK 1038
#define IDC_FILE_FILTER 1039
#define IDC_WINMERGE_PATH_BROWSE 1045
#define IDC_WINMERGE_PATH 1046
#define IDC_WINMERGE_PATH_SAVE 1047
+#define IDC_STATIC_TITLE_LEFT 1048
+#define IDC_STATIC_TITLE_RIGHT 1049
#define IDS_NUM_REPLACED 8501
#define IDS_EDIT_TEXT_NOT_FOUND 8502
#define IDS_LINE_STATUS_INFO 8503
#define ID_REFRESH 32819
#define ID_EDIT_FIND_PREVIOUS 32820
#define ID_SHOWLINEDIFF 32821
+#define ID_EDITOR_COPY_PATH 32822
+#define ID_EDITOR_COPY_FILENAME 32823
// Next default values for new objects
-//
+//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
-#define _APS_NEXT_RESOURCE_VALUE 114
+#define _APS_NEXT_RESOURCE_VALUE 116
#define _APS_NEXT_COMMAND_VALUE 32822
-#define _APS_NEXT_CONTROL_VALUE 1048
+#define _APS_NEXT_CONTROL_VALUE 1050
#define _APS_NEXT_SYMED_VALUE 108
#endif
#endif
END
END
+IDR_POPUP_EDITOR_HEADERBAR MENU DISCARDABLE
+BEGIN
+ POPUP "_POPUP_"
+ BEGIN
+ MENUITEM "Copy full Path", ID_EDITOR_COPY_PATH
+ MENUITEM "Copy Filename", ID_EDITOR_COPY_FILENAME
+ END
+END
+
/////////////////////////////////////////////////////////////////////////////
//
CAPTION "Registry"
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
- CONTROL "Associated with directories",IDC_ASSOC_DIRECTORY,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,221,15
- CONTROL "Add to explorer context menu",IDC_EXPLORER_CONTEXT,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,108,10
- EDITTEXT IDC_WINMERGE_PATH,7,34,167,14,ES_AUTOHSCROLL
- PUSHBUTTON "Browse...",IDC_WINMERGE_PATH_BROWSE,180,34,50,14
- PUSHBUTTON "Save path",IDC_WINMERGE_PATH_SAVE,8,51,50,14
+ CONTROL "&Add to explorer context menu",IDC_EXPLORER_CONTEXT,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,108,10
+ EDITTEXT IDC_WINMERGE_PATH,7,19,167,14,ES_AUTOHSCROLL
+ PUSHBUTTON "&Browse...",IDC_WINMERGE_PATH_BROWSE,180,19,50,14
+ PUSHBUTTON "&Save path",IDC_WINMERGE_PATH_SAVE,7,36,50,14
+END
+
+IDD_EDITOR_HEADERBAR DIALOGEX 0, 0, 373, 12
+STYLE WS_CHILD
+FONT 8, "MS Sans Serif", 0, 0, 0x1
+BEGIN
+ EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL |
+ ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT
+ WS_TABSTOP,WS_EX_STATICEDGE
+ EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL |
+ ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT
+ WS_TABSTOP,WS_EX_STATICEDGE
END
ID_OPTIONS_SHOWBINARIES "Displays binary files"
ID_VIEW_WHITESPACE "Shows whitespace characters"
ID_REFRESH "Refresh display\nRefresh (F5)"
+ ID_SHOWLINEDIFF "Highlight difference in current line"
+ ID_EDITOR_COPY_PATH "Copy full Path"
+ ID_EDITOR_COPY_FILENAME "Copy Filename"
END
STRINGTABLE DISCARDABLE
IDS_STATUS_COPYR2L "Copying Right to Left"
IDS_STATUS_COPYALL2L "Copying All to Left"
IDS_STATUS_COPYALL2R "Copying All to Right"
+ IDS_PROGRAMFILES "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
END
STRINGTABLE DISCARDABLE
IDS_EMPTY_LINE_STATUS_INFO "Line: %s"
END
+STRINGTABLE DISCARDABLE
+BEGIN
+ IDC_STATIC_TITLE_LEFT "Right click on the path to copy"
+ IDC_STATIC_TITLE_RIGHT "Right click on the path to copy"
+END
+
#endif // Italian (Italy) resources
/////////////////////////////////////////////////////////////////////////////
#define IDD_PROPPAGE_FILTER 111
#define IDD_OUTPUT 112
#define IDD_PROPPAGE_REGISTRY 113
+#define IDD_EDITOR_HEADERBAR 114
+#define IDR_POPUP_EDITOR_HEADERBAR 115
#define IDS_VERSION_FMT 130
#define IDS_ALLFILES 131
#define IDS_CONFIRM_ALL_LEFT 132
#define IDS_STATUS_COPYR2L 198
#define IDS_STATUS_COPYALL2L 199
#define IDS_STATUS_COPYALL2R 200
+#define IDS_PROGRAMFILES 201
#define IDB_EQUAL 213
#define IDB_NOTEQUAL 214
#define IDB_RFOLDER 215
#define IDC_EDIT1 1033
#define IDC_PROP_INSERT_TABS 1034
#define IDC_PROP_INSERT_SPACES 1035
-#define IDC_ASSOC_DIRECTORY 1036
#define IDC_LANGUAGE_LIST 1037
#define IDC_AUTOMRESCAN_CHECK 1038
#define IDC_FILE_FILTER 1039
#define IDC_WINMERGE_PATH_BROWSE 1045
#define IDC_WINMERGE_PATH 1046
#define IDC_WINMERGE_PATH_SAVE 1047
+#define IDC_STATIC_TITLE_LEFT 1048
+#define IDC_STATIC_TITLE_RIGHT 1049
#define IDS_NUM_REPLACED 8501
#define IDS_EDIT_TEXT_NOT_FOUND 8502
#define IDS_LINE_STATUS_INFO 8503
#define ID_REFRESH 32819
#define ID_EDIT_FIND_PREVIOUS 32820
#define ID_SHOWLINEDIFF 32821
+#define ID_EDITOR_COPY_PATH 32822
+#define ID_EDITOR_COPY_FILENAME 32823
// Next default values for new objects
-//
+//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
-#define _APS_NEXT_RESOURCE_VALUE 114
+#define _APS_NEXT_RESOURCE_VALUE 116
#define _APS_NEXT_COMMAND_VALUE 32822
-#define _APS_NEXT_CONTROL_VALUE 1048
+#define _APS_NEXT_CONTROL_VALUE 1050
#define _APS_NEXT_SYMED_VALUE 108
#endif
#endif
END
END
+IDR_POPUP_EDITOR_HEADERBAR MENU DISCARDABLE
+BEGIN
+ POPUP "_POPUP_"
+ BEGIN
+ MENUITEM "Copy full Path", ID_EDITOR_COPY_PATH
+ MENUITEM "Copy Filename", ID_EDITOR_COPY_FILENAME
+ END
+END
/////////////////////////////////////////////////////////////////////////////
//
CAPTION "·¹Áö½ºÆ®¸®"
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
- CONTROL "µð·ºÅ丮¿Í ¿¬°è",IDC_ASSOC_DIRECTORY,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,221,15
- CONTROL "Add to explorer context menu",IDC_EXPLORER_CONTEXT,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,108,10
- EDITTEXT IDC_WINMERGE_PATH,7,34,167,14,ES_AUTOHSCROLL
- PUSHBUTTON "Browse...",IDC_WINMERGE_PATH_BROWSE,180,34,50,14
- PUSHBUTTON "Save path",IDC_WINMERGE_PATH_SAVE,8,51,50,14
+ CONTROL "&Add to explorer context menu",IDC_EXPLORER_CONTEXT,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,108,10
+ EDITTEXT IDC_WINMERGE_PATH,7,19,167,14,ES_AUTOHSCROLL
+ PUSHBUTTON "&Browse...",IDC_WINMERGE_PATH_BROWSE,180,19,50,14
+ PUSHBUTTON "&Save path",IDC_WINMERGE_PATH_SAVE,7,36,50,14
+END
+
+IDD_EDITOR_HEADERBAR DIALOGEX 0, 0, 373, 12
+STYLE WS_CHILD
+FONT 8, "MS Sans Serif", 0, 0, 0x1
+BEGIN
+ EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL |
+ ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT
+ WS_TABSTOP,WS_EX_STATICEDGE
+ EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL |
+ ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT
+ WS_TABSTOP,WS_EX_STATICEDGE
END
#define IDD_PROPPAGE_FILTER 111
#define IDD_OUTPUT 112
#define IDD_PROPPAGE_REGISTRY 113
+#define IDD_EDITOR_HEADERBAR 114
+#define IDR_POPUP_EDITOR_HEADERBAR 115
#define IDS_VERSION_FMT 130
#define IDS_ALLFILES 131
#define IDS_CONFIRM_ALL_LEFT 132
#define IDS_STATUS_COPYR2L 198
#define IDS_STATUS_COPYALL2L 199
#define IDS_STATUS_COPYALL2R 200
+#define IDS_PROGRAMFILES 201
#define IDB_EQUAL 213
#define IDB_NOTEQUAL 214
#define IDB_RFOLDER 215
#define IDC_EDIT1 1033
#define IDC_PROP_INSERT_TABS 1034
#define IDC_PROP_INSERT_SPACES 1035
-#define IDC_ASSOC_DIRECTORY 1036
#define IDC_LANGUAGE_LIST 1037
#define IDC_AUTOMRESCAN_CHECK 1038
#define IDC_FILE_FILTER 1039
#define IDC_WINMERGE_PATH_BROWSE 1045
#define IDC_WINMERGE_PATH 1046
#define IDC_WINMERGE_PATH_SAVE 1047
+#define IDC_STATIC_TITLE_LEFT 1048
+#define IDC_STATIC_TITLE_RIGHT 1049
#define IDS_NUM_REPLACED 8501
#define IDS_EDIT_TEXT_NOT_FOUND 8502
#define IDS_LINE_STATUS_INFO 8503
#define ID_REFRESH 32819
#define ID_EDIT_FIND_PREVIOUS 32820
#define ID_SHOWLINEDIFF 32821
+#define ID_EDITOR_COPY_PATH 32822
+#define ID_EDITOR_COPY_FILENAME 32823
// Next default values for new objects
-//
+//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
-#define _APS_NEXT_RESOURCE_VALUE 114
+#define _APS_NEXT_RESOURCE_VALUE 116
#define _APS_NEXT_COMMAND_VALUE 32822
-#define _APS_NEXT_CONTROL_VALUE 1048
+#define _APS_NEXT_CONTROL_VALUE 1050
#define _APS_NEXT_SYMED_VALUE 108
#endif
#endif
END
END
+IDR_POPUP_EDITOR_HEADERBAR MENU DISCARDABLE
+BEGIN
+ POPUP "_POPUP_"
+ BEGIN
+ MENUITEM "Copy full Path", ID_EDITOR_COPY_PATH
+ MENUITEM "Copy Filename", ID_EDITOR_COPY_FILENAME
+ END
+END
/////////////////////////////////////////////////////////////////////////////
//
CAPTION "Registre"
FONT 8, "MS Sans Serif"
BEGIN
- CONTROL "Priraï k adresárom",IDC_ASSOC_DIRECTORY,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,221,15
- CONTROL "Add to explorer context menu",IDC_EXPLORER_CONTEXT,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,108,10
- EDITTEXT IDC_WINMERGE_PATH,7,34,167,14,ES_AUTOHSCROLL
- PUSHBUTTON "Browse...",IDC_WINMERGE_PATH_BROWSE,180,34,50,14
- PUSHBUTTON "Save path",IDC_WINMERGE_PATH_SAVE,8,51,50,14
+ CONTROL "&Add to explorer context menu",IDC_EXPLORER_CONTEXT,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,108,10
+ EDITTEXT IDC_WINMERGE_PATH,7,19,167,14,ES_AUTOHSCROLL
+ PUSHBUTTON "&Browse...",IDC_WINMERGE_PATH_BROWSE,180,19,50,14
+ PUSHBUTTON "&Save path",IDC_WINMERGE_PATH_SAVE,7,36,50,14
+END
+
+IDD_EDITOR_HEADERBAR DIALOGEX 0, 0, 373, 12
+STYLE WS_CHILD
+FONT 8, "MS Sans Serif", 0, 0, 0x1
+BEGIN
+ EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL |
+ ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT
+ WS_TABSTOP,WS_EX_STATICEDGE
+ EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL |
+ ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT
+ WS_TABSTOP,WS_EX_STATICEDGE
END
ID_OPTIONS_SHOWBINARIES "Zobrazuje binárne súbory"
ID_VIEW_WHITESPACE "Zobrazuje prázdne znaky"
ID_REFRESH "Refresh display\nRefresh (F5)"
+ ID_SHOWLINEDIFF "Highlight difference in current line"
+ ID_EDITOR_COPY_PATH "Copy full Path"
+ ID_EDITOR_COPY_FILENAME "Copy Filename"
END
STRINGTABLE DISCARDABLE
BEGIN
IDS_NUM_REPLACED "Nahradených %1 re\9dazcov (strings)."
IDS_EDIT_TEXT_NOT_FOUND "Nemô\9eem nájs\9d re\9dazec ""%s"""
+ IDS_LINE_STATUS_INFO "Line: %s Characters: %d EOL: %s"
+ IDS_EMPTY_LINE_STATUS_INFO "Line: %s"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+ IDC_STATIC_TITLE_LEFT "Right click on the path to copy"
+ IDC_STATIC_TITLE_RIGHT "Right click on the path to copy"
END
#endif // Slovak resources
#define IDD_PROPPAGE_FILTER 111
#define IDD_OUTPUT 112
#define IDD_PROPPAGE_REGISTRY 113
+#define IDD_EDITOR_HEADERBAR 114
+#define IDR_POPUP_EDITOR_HEADERBAR 115
#define IDS_VERSION_FMT 130
#define IDS_ALLFILES 131
#define IDS_CONFIRM_ALL_LEFT 132
#define IDS_STATUS_COPYR2L 198
#define IDS_STATUS_COPYALL2L 199
#define IDS_STATUS_COPYALL2R 200
+#define IDS_PROGRAMFILES 201
#define IDB_EQUAL 213
#define IDB_NOTEQUAL 214
#define IDB_RFOLDER 215
#define IDC_EDIT1 1033
#define IDC_PROP_INSERT_TABS 1034
#define IDC_PROP_INSERT_SPACES 1035
-#define IDC_ASSOC_DIRECTORY 1036
#define IDC_LANGUAGE_LIST 1037
#define IDC_AUTOMRESCAN_CHECK 1038
#define IDC_FILE_FILTER 1039
#define IDC_WINMERGE_PATH_BROWSE 1045
#define IDC_WINMERGE_PATH 1046
#define IDC_WINMERGE_PATH_SAVE 1047
+#define IDC_STATIC_TITLE_LEFT 1048
+#define IDC_STATIC_TITLE_RIGHT 1049
#define IDS_NUM_REPLACED 8501
#define IDS_EDIT_TEXT_NOT_FOUND 8502
#define IDS_LINE_STATUS_INFO 8503
#define ID_REFRESH 32819
#define ID_EDIT_FIND_PREVIOUS 32820
#define ID_SHOWLINEDIFF 32821
+#define ID_EDITOR_COPY_PATH 32822
+#define ID_EDITOR_COPY_FILENAME 32823
// Next default values for new objects
-//
+//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
-#define _APS_NEXT_RESOURCE_VALUE 114
+#define _APS_NEXT_RESOURCE_VALUE 116
#define _APS_NEXT_COMMAND_VALUE 32822
-#define _APS_NEXT_CONTROL_VALUE 1048
+#define _APS_NEXT_CONTROL_VALUE 1050
#define _APS_NEXT_SYMED_VALUE 108
#endif
#endif
END
END
+IDR_POPUP_EDITOR_HEADERBAR MENU DISCARDABLE
+BEGIN
+ POPUP "_POPUP_"
+ BEGIN
+ MENUITEM "Copy full Path", ID_EDITOR_COPY_PATH
+ MENUITEM "Copy Filename", ID_EDITOR_COPY_FILENAME
+ END
+END
+
/////////////////////////////////////////////////////////////////////////////
//
CAPTION "Registry"
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
- CONTROL "Associated with directories",IDC_ASSOC_DIRECTORY,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,221,15
- CONTROL "Add to explorer context menu",IDC_EXPLORER_CONTEXT,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,108,10
- EDITTEXT IDC_WINMERGE_PATH,7,34,167,14,ES_AUTOHSCROLL
- PUSHBUTTON "Browse...",IDC_WINMERGE_PATH_BROWSE,180,34,50,14
- PUSHBUTTON "Save path",IDC_WINMERGE_PATH_SAVE,8,51,50,14
+ CONTROL "&Add to explorer context menu",IDC_EXPLORER_CONTEXT,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,108,10
+ EDITTEXT IDC_WINMERGE_PATH,7,19,167,14,ES_AUTOHSCROLL
+ PUSHBUTTON "&Browse...",IDC_WINMERGE_PATH_BROWSE,180,19,50,14
+ PUSHBUTTON "&Save path",IDC_WINMERGE_PATH_SAVE,7,36,50,14
+END
+
+IDD_EDITOR_HEADERBAR DIALOGEX 0, 0, 373, 12
+STYLE WS_CHILD
+FONT 8, "MS Sans Serif", 0, 0, 0x1
+BEGIN
+ EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL |
+ ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT
+ WS_TABSTOP,WS_EX_STATICEDGE
+ EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL |
+ ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT
+ WS_TABSTOP,WS_EX_STATICEDGE
END
ID_OPTIONS_SHOWBINARIES "Displays binary files"
ID_VIEW_WHITESPACE "Shows whitespace characters"
ID_REFRESH "Refresh display\nRefresh (F5)"
+ ID_SHOWLINEDIFF "Highlight difference in current line"
+ ID_EDITOR_COPY_PATH "Copy full Path"
+ ID_EDITOR_COPY_FILENAME "Copy Filename"
END
STRINGTABLE DISCARDABLE
IDS_STATUS_COPYR2L "Copying Right to Left"
IDS_STATUS_COPYALL2L "Copying All to Left"
IDS_STATUS_COPYALL2R "Copying All to Right"
+ IDS_PROGRAMFILES "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
END
STRINGTABLE DISCARDABLE
IDS_EMPTY_LINE_STATUS_INFO "Line: %s"
END
+STRINGTABLE DISCARDABLE
+BEGIN
+ IDC_STATIC_TITLE_LEFT "Right click on the path to copy"
+ IDC_STATIC_TITLE_RIGHT "Right click on the path to copy"
+END
+
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
#define IDD_PROPPAGE_FILTER 111
#define IDD_OUTPUT 112
#define IDD_PROPPAGE_REGISTRY 113
+#define IDD_EDITOR_HEADERBAR 114
+#define IDR_POPUP_EDITOR_HEADERBAR 115
#define IDS_VERSION_FMT 130
#define IDS_ALLFILES 131
#define IDS_CONFIRM_ALL_LEFT 132
#define IDS_STATUS_COPYR2L 198
#define IDS_STATUS_COPYALL2L 199
#define IDS_STATUS_COPYALL2R 200
+#define IDS_PROGRAMFILES 201
#define IDB_EQUAL 213
#define IDB_NOTEQUAL 214
#define IDB_RFOLDER 215
#define IDC_EDIT1 1033
#define IDC_PROP_INSERT_TABS 1034
#define IDC_PROP_INSERT_SPACES 1035
-#define IDC_ASSOC_DIRECTORY 1036
#define IDC_LANGUAGE_LIST 1037
#define IDC_AUTOMRESCAN_CHECK 1038
#define IDC_FILE_FILTER 1039
#define IDC_WINMERGE_PATH_BROWSE 1045
#define IDC_WINMERGE_PATH 1046
#define IDC_WINMERGE_PATH_SAVE 1047
+#define IDC_STATIC_TITLE_LEFT 1048
+#define IDC_STATIC_TITLE_RIGHT 1049
#define IDS_NUM_REPLACED 8501
#define IDS_EDIT_TEXT_NOT_FOUND 8502
#define IDS_LINE_STATUS_INFO 8503
#define ID_REFRESH 32819
#define ID_EDIT_FIND_PREVIOUS 32820
#define ID_SHOWLINEDIFF 32821
+#define ID_EDITOR_COPY_PATH 32822
+#define ID_EDITOR_COPY_FILENAME 32823
// Next default values for new objects
-//
+//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
-#define _APS_NEXT_RESOURCE_VALUE 114
+#define _APS_NEXT_RESOURCE_VALUE 116
#define _APS_NEXT_COMMAND_VALUE 32822
-#define _APS_NEXT_CONTROL_VALUE 1048
+#define _APS_NEXT_CONTROL_VALUE 1050
#define _APS_NEXT_SYMED_VALUE 108
#endif
#endif
// TEXTINCLUDE
//
-1 TEXTINCLUDE DISCARDABLE
+1 TEXTINCLUDE DISCARDABLE
BEGIN
"resource.h\0"
END
-2 TEXTINCLUDE DISCARDABLE
+2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
-3 TEXTINCLUDE DISCARDABLE
+3 TEXTINCLUDE DISCARDABLE
BEGIN
"#define _AFX_NO_OLE_RESOURCES\r\n"
"#define _AFX_NO_TRACKER_RESOURCES\r\n"
// Menu
//
-IDR_POPUP_DIFFVIEW MENU DISCARDABLE
+IDR_POPUP_DIFFVIEW MENU DISCARDABLE
BEGIN
POPUP "_POPUP_"
BEGIN
END
END
-IDR_MAINFRAME MENU PRELOAD DISCARDABLE
+IDR_MAINFRAME MENU PRELOAD DISCARDABLE
BEGIN
POPUP "&File"
BEGIN
END
END
-IDR_POPUP_DIRVIEW MENU DISCARDABLE
+IDR_POPUP_DIRVIEW MENU DISCARDABLE
BEGIN
POPUP "_POPUP_"
BEGIN
END
END
-IDR_POPUP_EDITOR_HEADERBAR MENU DISCARDABLE
+IDR_POPUP_EDITOR_HEADERBAR MENU DISCARDABLE
BEGIN
POPUP "_POPUP_"
BEGIN
// Accelerator
//
-IDR_MAINFRAME ACCELERATORS PRELOAD MOVEABLE PURE
+IDR_MAINFRAME ACCELERATORS PRELOAD MOVEABLE PURE
BEGIN
"A", ID_EDIT_SELECT_ALL, VIRTKEY, CONTROL, NOINVERT
"C", ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT
CAPTION "Registry"
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
- CONTROL "Associated with directories",IDC_ASSOC_DIRECTORY,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,221,15
- CONTROL "Add to explorer context menu",IDC_EXPLORER_CONTEXT,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,108,10
- EDITTEXT IDC_WINMERGE_PATH,7,34,167,14,ES_AUTOHSCROLL
- PUSHBUTTON "Browse...",IDC_WINMERGE_PATH_BROWSE,180,34,50,14
- PUSHBUTTON "Save path",IDC_WINMERGE_PATH_SAVE,8,51,50,14
+ CONTROL "&Add to explorer context menu",IDC_EXPLORER_CONTEXT,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,108,10
+ EDITTEXT IDC_WINMERGE_PATH,7,19,167,14,ES_AUTOHSCROLL
+ PUSHBUTTON "&Browse...",IDC_WINMERGE_PATH_BROWSE,180,19,50,14
+ PUSHBUTTON "&Save path",IDC_WINMERGE_PATH_SAVE,7,36,50,14
END
IDD_EDITOR_HEADERBAR DIALOGEX 0, 0, 373, 12
// String Table
//
-STRINGTABLE PRELOAD DISCARDABLE
+STRINGTABLE PRELOAD DISCARDABLE
BEGIN
IDR_MAINFRAME "WinMerge"
IDR_MERGETYPE "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
IDS_WINMERGE_THIS_DIRECTORY "WinMerge this directory"
END
-STRINGTABLE PRELOAD DISCARDABLE
+STRINGTABLE PRELOAD DISCARDABLE
BEGIN
IDS_VERSION_FMT "Version %1"
IDS_ALLFILES "All Files (*.*)|*.*||"
IDS_CANT_COMPARE_FILES "Unable to compare files"
END
-STRINGTABLE PRELOAD DISCARDABLE
+STRINGTABLE PRELOAD DISCARDABLE
BEGIN
AFX_IDS_APP_TITLE "WinMerge"
AFX_IDS_IDLEMESSAGE "Ready"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
ID_INDICATOR_EXT "EXT"
ID_INDICATOR_CAPS "CAP"
ID_INDICATOR_REC "REC"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
ID_FILE_NEW "Create a new document\nNew"
ID_FILE_OPEN "Open an existing document\nOpen (Ctrl+O)"
ID_FILE_PRINT_PREVIEW "Display full pages\nPrint Preview"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
ID_APP_ABOUT "Display program information, version number and copyright\nAbout"
ID_APP_EXIT "Quit the application; prompts to save documents\nExit"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
ID_FILE_MRU_FILE1 "Open this document"
ID_FILE_MRU_FILE2 "Open this document"
ID_FILE_MRU_FILE16 "Open this document"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
ID_NEXT_PANE "Switch to the next window pane\nNext Pane"
ID_PREV_PANE "Switch back to the previous window pane\nPrevious Pane"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
ID_WINDOW_NEW "Open another window for the active document\nNew Window"
ID_WINDOW_ARRANGE "Arrange icons at the bottom of the window\nArrange Icons"
ID_WINDOW_SPLIT "Split the active window into panes\nSplit"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
ID_EDIT_CLEAR "Erase the selection\nErase"
ID_EDIT_CLEAR_ALL "Erase everything\nErase All"
ID_EDIT_REDO "Redo the previously undone action\nRedo"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
ID_VIEW_TOOLBAR "Show or hide the toolbar\nToggle ToolBar"
ID_VIEW_STATUS_BAR "Show or hide the status bar\nToggle StatusBar"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
AFX_IDS_SCSIZE "Change the window size"
AFX_IDS_SCMOVE "Change the window position"
AFX_IDS_SCCLOSE "Close the active window and prompts to save the documents"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
AFX_IDS_SCRESTORE "Restore the window to normal size"
AFX_IDS_SCTASKLIST "Activate Task List"
AFX_IDS_MDICHILD "Activate this window"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
AFX_IDS_PREVIEW_CLOSE "Close print preview mode\nCancel Preview"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
ID_L2R "Copy the selected text to the right file\nCopy Right (Alt Right)"
ID_R2L "Copy the selected text to the left file\nCopy Left (Alt Left)"
ID_OPTIONS_SHOWDIFFERENT "Displays files that have differences"
ID_PREVDIFF "Scroll to the previous difference\nPrev Diff (Alt Up)"
ID_NEXTDIFF "Scroll to the next difference\nNext Diff (Alt Down)"
- ID_OPTIONS_BACKUPORIGINALFILE
+ ID_OPTIONS_BACKUPORIGINALFILE
"Save a copy of the original as *.bak\nBackup"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
- ID_OPTIONS_SCROLLTOFIRSTDIFFERENCE
+ ID_OPTIONS_SCROLLTOFIRSTDIFFERENCE
"Automatically scrolls to the first difference\nScroll First"
ID_OPTIONS_IGNOREWHITESPACE "Disregards whitespace when comparing files"
ID_HIDE_BACKUP_FILES "Hides files with extension BAK"
ID_DIR_COPY_FILE_TO_LEFT "Copy selected file to named directory"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
ID_DIR_COPY_FILE_TO_RIGHT "Copy selected file to named directory"
ID_VIEW_LANGUAGE "Select the current user interfacce language\nLanguage"
ID_DIR_DEL_RIGHT "Delete selected item on right"
ID_DIFFSTATUS "placeholder for status count"
ID_OPTIONS_SHOWUNIQUELEFT "Displays files that exist in only on left side"
- ID_OPTIONS_SHOWUNIQUERIGHT
+ ID_OPTIONS_SHOWUNIQUERIGHT
"Displays files that exist in only on right side"
ID_DIR_DEL_BOTH "Delete selected item(s) on both sides"
ID_DIR_OPEN_LEFT "Open left file"
ID_DIR_OPEN_RIGHT "Open right file"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_SAVE_AS_TITLE "Save As"
- IDS_SELECT_FILES_OR_FOLDERS
+ IDS_SELECT_FILES_OR_FOLDERS
"Your selections must be either both files or both folders"
- IDS_BACKUP_FAILED_PROMPT
+ IDS_BACKUP_FAILED_PROMPT
"Unable to backup original file.\nContinue anyway?"
IDS_OPTIONS_TITLE "Options"
IDS_OPEN_TITLE "Open"
IDS_NOPROJECT "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_AFRIKAANS "Afrikaans"
IDS_ALBANIAN "Albanian"
IDS_CC_CMD "&Path to cleartool.exe :"
IDS_VSS_CMD "&Path to SS.EXE :"
IDS_VSS_RUN_ERROR "Error executing versioning system command."
- IDS_DIFF_OPEN_NO_SET_PROPS
+ IDS_DIFF_OPEN_NO_SET_PROPS
"Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted."
IDS_LTIME_HEADER "Left Date"
IDS_RTIME_HEADER "Right Date"
IDS_EXTENSION_HEADER "Extension"
- IDS_CONFIRM_DELETE_ITEMS
+ IDS_CONFIRM_DELETE_ITEMS
"Are you sure you want to delete %1 of %2 selected item(s) ?"
IDS_DEL_LEFT_FMT "Delete left side %1 of %2 selected item(s)"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_DEL_RIGHT_FMT "Delete right side %1 of %2 selected item(s)"
IDS_DELETE_FILE_FAILED "Delete file %1 failed: %2"
IDS_BIN_FILES_SAME "Binary files are identical"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
ID_DIR_OPEN_RIGHT_WITH "Open right file with..."
ID_OPTIONS_SHOWBINARIES "Displays binary files"
ID_EDITOR_COPY_FILENAME "Copy Filename"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_FILESAVE_FAILED "Saving %1 failed. Would you like to save the file under a different name?"
IDS_ERROR_FILE_NOT_FOUND "File not found: %1"
IDS_STATUS_COPYR2L "Copying Right to Left"
IDS_STATUS_COPYALL2L "Copying All to Left"
IDS_STATUS_COPYALL2R "Copying All to Right"
+ IDS_PROGRAMFILES "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDS_NUM_REPLACED "Replaced %1 string(s)."
IDS_EDIT_TEXT_NOT_FOUND "Cannot find string""%s"""
IDS_EMPTY_LINE_STATUS_INFO "Line: %s"
END
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE
BEGIN
IDC_STATIC_TITLE_LEFT "Right click on the path to copy"
IDC_STATIC_TITLE_RIGHT "Right click on the path to copy"
// PropRegistry.cpp : implementation file
//
+// $Id$
#include "stdafx.h"
#include "resource.h"
BEGIN_MESSAGE_MAP(CPropRegistry, CDialog)
//{{AFX_MSG_MAP(CPropRegistry)
- ON_BN_CLICKED(IDC_ASSOC_DIRECTORY, OnAssocDirectory)
ON_BN_CLICKED(IDC_EXPLORER_CONTEXT, OnAddToExplorer)
ON_BN_CLICKED(IDC_WINMERGE_PATH_SAVE, OnSavePath)
ON_BN_CLICKED(IDC_WINMERGE_PATH_BROWSE, OnBrowsePath)
{
CPropertyPage::OnInitDialog();
- UpdateButton();
+ // Check if old keys exists and delete those
+ // Those keys are NOT used by new ShellExtension
+ if (IsRegisteredForDirectory())
+ EnableContextHandler(false);
+
GetContextRegValues();
UpdateData(FALSE);
// EXCEPTION: OCX Property Pages should return FALSE
}
-// Are we registered as a Directory context handler ?
+/// Determines if WinMerge is registered as a (OLD) Directory context handler ?
bool CPropRegistry::IsRegisteredForDirectory() const
{
CRegKeyEx reg;
return true;
}
-// check registry and set button & member accordingly
-void CPropRegistry::UpdateButton()
-{
- m_enabled = IsRegisteredForDirectory();
- WPARAM wcheck = m_enabled ? BST_CHECKED : BST_UNCHECKED;
- SendDlgItemMessage(IDC_ASSOC_DIRECTORY, BM_SETCHECK, wcheck, 0);
-}
-
-// Set or clear our entries in registry for Directory context
+/// Set or clear our entries in registry for (OLD) Directory context
void CPropRegistry::EnableContextHandler(bool enabling)
{
if (enabling)
}
}
-void CPropRegistry::OnAssocDirectory()
-{
- bool enabling = (SendDlgItemMessage(IDC_ASSOC_DIRECTORY, BM_GETCHECK, 0, 0) == BST_CHECKED);
- EnableContextHandler(enabling);
- UpdateButton();
-}
-
+/// Get registry values for ShellExtension
void CPropRegistry::GetContextRegValues()
{
CRegKeyEx reg;
m_strPath = reg.ReadString(f_RegValuePath, _T(""));
}
+/// Set registry values for ShellExtension
void CPropRegistry::OnAddToExplorer()
{
UpdateData();
reg.WriteDword(f_RegValueEnabled, dwContextEnabled);
}
+/// Saves given path to registry for ShellExtension
void CPropRegistry::OnSavePath()
{
UpdateData();
reg.WriteString(f_RegValuePath, m_strPath);
}
+/// Open file browse dialog to locate WinMerge.exe or bat file
void CPropRegistry::OnBrowsePath()
{
CString s;
- VERIFY(s.LoadString(IDS_ALLFILES) );
+ VERIFY(s.LoadString(IDS_PROGRAMFILES));
DWORD flags = OFN_NOTESTFILECREATE | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST;
- CFileDialog pdlg(TRUE, NULL, _T("WinMerge.exe"), flags, s);
+ CFileDialog pdlg(TRUE, NULL, _T(""), flags, s);
CString title;
VERIFY(title.LoadString(IDS_OPEN_TITLE));
pdlg.m_ofn.lpstrTitle = (LPCTSTR)title;
-// pdlg.m_ofn.lpstrInitialDir = (LPSTR)pszFolder;
- if (pdlg.DoModal()==IDOK)
- {
+ if (pdlg.DoModal() == IDOK)
m_strPath = pdlg.GetPathName();
- }
UpdateData(FALSE);
}
\ No newline at end of file
#endif // _MSC_VER > 1000
// PropRegistry.h : header file
//
-
+// $Id$
/////////////////////////////////////////////////////////////////////////////
// CPropRegistry dialog
// Generated message map functions
//{{AFX_MSG(CPropRegistry)
virtual BOOL OnInitDialog();
- afx_msg void OnAssocDirectory();
afx_msg void OnAddToExplorer();
afx_msg void OnSavePath();
afx_msg void OnBrowsePath();
2003-08-16 Kimmo
PATCH: [ 789204 ] Color dir compare based on left/right newer
WinMerge: DirView.h DirView.cpp
+ PATCH: [ 789504 ] Remove unneeded old dir shell assoc
+ WinMerge: Merge.rc PropRegistry.h PropRegistry.cpp resource.h
+ Languages: resource.h *.rc
2003-08-12 Christian
PATCH: [ 786618 ] Brazilian Portuguese translation
#define IDS_STATUS_COPYR2L 198
#define IDS_STATUS_COPYALL2L 199
#define IDS_STATUS_COPYALL2R 200
+#define IDS_PROGRAMFILES 201
#define IDB_EQUAL 213
#define IDB_NOTEQUAL 214
#define IDB_RFOLDER 215
#define IDC_EDIT1 1033
#define IDC_PROP_INSERT_TABS 1034
#define IDC_PROP_INSERT_SPACES 1035
-#define IDC_ASSOC_DIRECTORY 1036
#define IDC_LANGUAGE_LIST 1037
#define IDC_AUTOMRESCAN_CHECK 1038
#define IDC_FILE_FILTER 1039
#define ID_EDITOR_COPY_FILENAME 32823
// Next default values for new objects
-//
+//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
OSDN Git Service
