From 8d2218c9e61b9fac95f12b86ae38a76609034f98 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Sat, 16 Aug 2003 18:01:07 +0000 Subject: [PATCH] PATCH: [ 789504 ] Remove unneeded old dir shell assoc --- Src/Languages/Brazilian/MergeBrazilian.rc | 59 ++++++++++---- Src/Languages/Brazilian/resource.h | 23 ++++-- .../ChineseSimplified/MergeChineseSimplified.rc | 33 ++++++-- Src/Languages/ChineseSimplified/resource.h | 14 +++- .../ChineseTraditional/MergeChineseTraditional.rc | 33 ++++++-- Src/Languages/ChineseTraditional/resource.h | 14 +++- Src/Languages/Czech/MergeCzech.rc | 43 ++++++++-- Src/Languages/Czech/resource.h | 14 +++- Src/Languages/Danish/MergeDanish.rc | 40 ++++++++-- Src/Languages/Danish/resource.h | 14 +++- Src/Languages/Dutch/MergeDutch.rc | 43 ++++++++-- Src/Languages/Dutch/resource.h | 14 +++- Src/Languages/French/MergeFrench.rc | 29 +++++-- Src/Languages/French/resource.h | 14 +++- Src/Languages/German/MergeGerman.rc | 44 +++++++++-- Src/Languages/German/resource.h | 14 +++- Src/Languages/Italian/MergeItalian.rc | 43 ++++++++-- Src/Languages/Italian/resource.h | 14 +++- Src/Languages/Korean/MergeKorean.rc | 32 ++++++-- Src/Languages/Korean/resource.h | 14 +++- Src/Languages/Slovak/MergeSlovak.rc | 43 ++++++++-- Src/Languages/Slovak/resource.h | 14 +++- Src/Languages/Spanish/MergeSpanish.rc | 43 ++++++++-- Src/Languages/Spanish/resource.h | 14 +++- Src/Merge.rc | 91 +++++++++++----------- Src/PropRegistry.cpp | 40 ++++------ Src/PropRegistry.h | 3 +- Src/readme.txt | 3 + Src/resource.h | 4 +- 29 files changed, 588 insertions(+), 215 deletions(-) diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc index b2838c84e..f5bdc5c1a 100644 --- a/Src/Languages/Brazilian/MergeBrazilian.rc +++ b/Src/Languages/Brazilian/MergeBrazilian.rc @@ -1,5 +1,7 @@ //Microsoft Developer Studio generated resource script. // +// $Id$ + #include "resource.h" #define APSTUDIO_READONLY_SYMBOLS @@ -111,18 +113,7 @@ BEGIN 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 @@ -150,6 +141,21 @@ BEGIN 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 @@ -184,6 +190,15 @@ BEGIN 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 + ///////////////////////////////////////////////////////////////////////////// // @@ -210,6 +225,7 @@ BEGIN 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 @@ -481,8 +497,23 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION 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 diff --git a/Src/Languages/Brazilian/resource.h b/Src/Languages/Brazilian/resource.h index 981b2f507..a7810b726 100644 --- a/Src/Languages/Brazilian/resource.h +++ b/Src/Languages/Brazilian/resource.h @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. -// Used by MergeBrazilian.rc +// Used by Merge.rc // #define IDC_CUT 3 #define IDC_COPY 4 @@ -22,6 +22,8 @@ #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 @@ -97,6 +99,7 @@ #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 @@ -151,7 +154,6 @@ #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 @@ -159,6 +161,12 @@ #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 @@ -356,15 +364,18 @@ #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 diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc index 969355607..c7978be4a 100644 --- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc +++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc @@ -185,6 +185,15 @@ BEGIN 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 + ///////////////////////////////////////////////////////////////////////////// // @@ -464,13 +473,23 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION 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 diff --git a/Src/Languages/ChineseSimplified/resource.h b/Src/Languages/ChineseSimplified/resource.h index be308006c..a7810b726 100644 --- a/Src/Languages/ChineseSimplified/resource.h +++ b/Src/Languages/ChineseSimplified/resource.h @@ -22,6 +22,8 @@ #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 @@ -97,6 +99,7 @@ #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 @@ -151,7 +154,6 @@ #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 @@ -163,6 +165,8 @@ #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 @@ -361,15 +365,17 @@ #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 diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc index 8e37c3f58..88d9e4740 100644 --- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc +++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc @@ -186,6 +186,15 @@ BEGIN 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 + ///////////////////////////////////////////////////////////////////////////// // @@ -465,13 +474,23 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION 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 diff --git a/Src/Languages/ChineseTraditional/resource.h b/Src/Languages/ChineseTraditional/resource.h index be308006c..a7810b726 100644 --- a/Src/Languages/ChineseTraditional/resource.h +++ b/Src/Languages/ChineseTraditional/resource.h @@ -22,6 +22,8 @@ #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 @@ -97,6 +99,7 @@ #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 @@ -151,7 +154,6 @@ #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 @@ -163,6 +165,8 @@ #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 @@ -361,15 +365,17 @@ #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 diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc index f728d6dcb..6adf0f8cc 100644 --- a/Src/Languages/Czech/MergeCzech.rc +++ b/Src/Languages/Czech/MergeCzech.rc @@ -190,6 +190,15 @@ BEGIN 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 + ///////////////////////////////////////////////////////////////////////////// // @@ -497,13 +506,23 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION 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 @@ -981,6 +1000,9 @@ BEGIN 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 @@ -994,6 +1016,7 @@ BEGIN 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 @@ -1004,6 +1027,12 @@ BEGIN 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 ///////////////////////////////////////////////////////////////////////////// diff --git a/Src/Languages/Czech/resource.h b/Src/Languages/Czech/resource.h index be308006c..a7810b726 100644 --- a/Src/Languages/Czech/resource.h +++ b/Src/Languages/Czech/resource.h @@ -22,6 +22,8 @@ #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 @@ -97,6 +99,7 @@ #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 @@ -151,7 +154,6 @@ #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 @@ -163,6 +165,8 @@ #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 @@ -361,15 +365,17 @@ #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 diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc index ac4500eed..6c7feb761 100644 --- a/Src/Languages/Danish/MergeDanish.rc +++ b/Src/Languages/Danish/MergeDanish.rc @@ -190,6 +190,15 @@ BEGIN 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 + ///////////////////////////////////////////////////////////////////////////// // @@ -495,13 +504,23 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION 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 @@ -993,6 +1012,7 @@ BEGIN 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 @@ -1003,6 +1023,12 @@ BEGIN 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 ///////////////////////////////////////////////////////////////////////////// diff --git a/Src/Languages/Danish/resource.h b/Src/Languages/Danish/resource.h index be308006c..a7810b726 100644 --- a/Src/Languages/Danish/resource.h +++ b/Src/Languages/Danish/resource.h @@ -22,6 +22,8 @@ #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 @@ -97,6 +99,7 @@ #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 @@ -151,7 +154,6 @@ #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 @@ -163,6 +165,8 @@ #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 @@ -361,15 +365,17 @@ #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 diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc index e7baed28b..103786b5b 100644 --- a/Src/Languages/Dutch/MergeDutch.rc +++ b/Src/Languages/Dutch/MergeDutch.rc @@ -191,6 +191,15 @@ BEGIN 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 + ///////////////////////////////////////////////////////////////////////////// // @@ -499,13 +508,23 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION 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 @@ -987,6 +1006,9 @@ BEGIN 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 @@ -1000,6 +1022,7 @@ BEGIN 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 @@ -1010,6 +1033,12 @@ BEGIN 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 ///////////////////////////////////////////////////////////////////////////// diff --git a/Src/Languages/Dutch/resource.h b/Src/Languages/Dutch/resource.h index be308006c..a7810b726 100644 --- a/Src/Languages/Dutch/resource.h +++ b/Src/Languages/Dutch/resource.h @@ -22,6 +22,8 @@ #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 @@ -97,6 +99,7 @@ #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 @@ -151,7 +154,6 @@ #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 @@ -163,6 +165,8 @@ #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 @@ -361,15 +365,17 @@ #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 diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc index 2dfbd2a76..b1878eb4a 100644 --- a/Src/Languages/French/MergeFrench.rc +++ b/Src/Languages/French/MergeFrench.rc @@ -192,6 +192,15 @@ BEGIN 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 + ///////////////////////////////////////////////////////////////////////////// // @@ -499,13 +508,23 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION 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 diff --git a/Src/Languages/French/resource.h b/Src/Languages/French/resource.h index be308006c..a7810b726 100644 --- a/Src/Languages/French/resource.h +++ b/Src/Languages/French/resource.h @@ -22,6 +22,8 @@ #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 @@ -97,6 +99,7 @@ #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 @@ -151,7 +154,6 @@ #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 @@ -163,6 +165,8 @@ #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 @@ -361,15 +365,17 @@ #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 diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc index 3c2cba64d..08e0749fe 100644 --- a/Src/Languages/German/MergeGerman.rc +++ b/Src/Languages/German/MergeGerman.rc @@ -194,6 +194,15 @@ BEGIN 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 + ///////////////////////////////////////////////////////////////////////////// // @@ -502,14 +511,23 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION 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 @@ -999,6 +1017,9 @@ BEGIN 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 @@ -1012,6 +1033,7 @@ BEGIN 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 @@ -1022,6 +1044,12 @@ BEGIN 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 ///////////////////////////////////////////////////////////////////////////// diff --git a/Src/Languages/German/resource.h b/Src/Languages/German/resource.h index be308006c..a7810b726 100644 --- a/Src/Languages/German/resource.h +++ b/Src/Languages/German/resource.h @@ -22,6 +22,8 @@ #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 @@ -97,6 +99,7 @@ #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 @@ -151,7 +154,6 @@ #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 @@ -163,6 +165,8 @@ #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 @@ -361,15 +365,17 @@ #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 diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc index 259c08e7e..d3ed3a552 100644 --- a/Src/Languages/Italian/MergeItalian.rc +++ b/Src/Languages/Italian/MergeItalian.rc @@ -189,6 +189,15 @@ BEGIN 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 + ///////////////////////////////////////////////////////////////////////////// // @@ -496,13 +505,23 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION 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 @@ -981,6 +1000,9 @@ BEGIN 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 @@ -994,6 +1016,7 @@ BEGIN 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 @@ -1004,6 +1027,12 @@ BEGIN 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 ///////////////////////////////////////////////////////////////////////////// diff --git a/Src/Languages/Italian/resource.h b/Src/Languages/Italian/resource.h index be308006c..a7810b726 100644 --- a/Src/Languages/Italian/resource.h +++ b/Src/Languages/Italian/resource.h @@ -22,6 +22,8 @@ #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 @@ -97,6 +99,7 @@ #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 @@ -151,7 +154,6 @@ #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 @@ -163,6 +165,8 @@ #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 @@ -361,15 +365,17 @@ #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 diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc index 54e658718..d91a2936b 100644 --- a/Src/Languages/Korean/MergeKorean.rc +++ b/Src/Languages/Korean/MergeKorean.rc @@ -157,6 +157,14 @@ BEGIN 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 ///////////////////////////////////////////////////////////////////////////// // @@ -450,13 +458,23 @@ STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION 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 diff --git a/Src/Languages/Korean/resource.h b/Src/Languages/Korean/resource.h index be308006c..a7810b726 100644 --- a/Src/Languages/Korean/resource.h +++ b/Src/Languages/Korean/resource.h @@ -22,6 +22,8 @@ #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 @@ -97,6 +99,7 @@ #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 @@ -151,7 +154,6 @@ #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 @@ -163,6 +165,8 @@ #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 @@ -361,15 +365,17 @@ #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 diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc index 62ec9e014..80c2da4d5 100644 --- a/Src/Languages/Slovak/MergeSlovak.rc +++ b/Src/Languages/Slovak/MergeSlovak.rc @@ -190,6 +190,14 @@ BEGIN 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 ///////////////////////////////////////////////////////////////////////////// // @@ -499,13 +507,23 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION 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 @@ -983,6 +1001,9 @@ BEGIN 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 @@ -1002,6 +1023,14 @@ STRINGTABLE DISCARDABLE BEGIN IDS_NUM_REPLACED "Nahradených %1 reazcov (strings)." IDS_EDIT_TEXT_NOT_FOUND "Nemôžem nájs reazec ""%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 diff --git a/Src/Languages/Slovak/resource.h b/Src/Languages/Slovak/resource.h index be308006c..a7810b726 100644 --- a/Src/Languages/Slovak/resource.h +++ b/Src/Languages/Slovak/resource.h @@ -22,6 +22,8 @@ #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 @@ -97,6 +99,7 @@ #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 @@ -151,7 +154,6 @@ #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 @@ -163,6 +165,8 @@ #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 @@ -361,15 +365,17 @@ #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 diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc index 1b4a42c73..21b6f3da8 100644 --- a/Src/Languages/Spanish/MergeSpanish.rc +++ b/Src/Languages/Spanish/MergeSpanish.rc @@ -190,6 +190,15 @@ BEGIN 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 + ///////////////////////////////////////////////////////////////////////////// // @@ -496,13 +505,23 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION 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 @@ -983,6 +1002,9 @@ BEGIN 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 @@ -996,6 +1018,7 @@ BEGIN 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 @@ -1006,6 +1029,12 @@ BEGIN 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 ///////////////////////////////////////////////////////////////////////////// diff --git a/Src/Languages/Spanish/resource.h b/Src/Languages/Spanish/resource.h index be308006c..a7810b726 100644 --- a/Src/Languages/Spanish/resource.h +++ b/Src/Languages/Spanish/resource.h @@ -22,6 +22,8 @@ #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 @@ -97,6 +99,7 @@ #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 @@ -151,7 +154,6 @@ #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 @@ -163,6 +165,8 @@ #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 @@ -361,15 +365,17 @@ #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 diff --git a/Src/Merge.rc b/Src/Merge.rc index 2daa922d5..212c36afa 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -29,18 +29,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // 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" @@ -75,7 +75,7 @@ IDR_MERGETYPE ICON DISCARDABLE "res\\MergeDoc.ico" // Menu // -IDR_POPUP_DIFFVIEW MENU DISCARDABLE +IDR_POPUP_DIFFVIEW MENU DISCARDABLE BEGIN POPUP "_POPUP_" BEGIN @@ -95,7 +95,7 @@ BEGIN END END -IDR_MAINFRAME MENU PRELOAD DISCARDABLE +IDR_MAINFRAME MENU PRELOAD DISCARDABLE BEGIN POPUP "&File" BEGIN @@ -173,7 +173,7 @@ BEGIN END END -IDR_POPUP_DIRVIEW MENU DISCARDABLE +IDR_POPUP_DIRVIEW MENU DISCARDABLE BEGIN POPUP "_POPUP_" BEGIN @@ -190,7 +190,7 @@ BEGIN END END -IDR_POPUP_EDITOR_HEADERBAR MENU DISCARDABLE +IDR_POPUP_EDITOR_HEADERBAR MENU DISCARDABLE BEGIN POPUP "_POPUP_" BEGIN @@ -205,7 +205,7 @@ END // 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 @@ -505,13 +505,11 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION 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 @@ -752,14 +750,14 @@ IDR_MARGIN_CURSOR CURSOR DISCARDABLE "res\\mg_cur.cur" // 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 (*.*)|*.*||" @@ -777,13 +775,13 @@ BEGIN 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" @@ -793,7 +791,7 @@ BEGIN 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)" @@ -806,13 +804,13 @@ BEGIN 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" @@ -832,13 +830,13 @@ BEGIN 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" @@ -848,7 +846,7 @@ BEGIN 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" @@ -863,13 +861,13 @@ BEGIN 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" @@ -880,19 +878,19 @@ BEGIN 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)" @@ -900,13 +898,13 @@ BEGIN 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" @@ -920,7 +918,7 @@ BEGIN 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" @@ -933,7 +931,7 @@ BEGIN 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" @@ -941,12 +939,12 @@ BEGIN 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" @@ -963,7 +961,7 @@ BEGIN 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" @@ -1139,17 +1137,17 @@ BEGIN 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" @@ -1168,7 +1166,7 @@ BEGIN 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" @@ -1179,7 +1177,7 @@ BEGIN 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" @@ -1190,9 +1188,10 @@ BEGIN 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""" @@ -1200,7 +1199,7 @@ BEGIN 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" diff --git a/Src/PropRegistry.cpp b/Src/PropRegistry.cpp index 88126e491..c14e432bc 100644 --- a/Src/PropRegistry.cpp +++ b/Src/PropRegistry.cpp @@ -1,5 +1,6 @@ // PropRegistry.cpp : implementation file // +// $Id$ #include "stdafx.h" #include "resource.h" @@ -47,7 +48,6 @@ void CPropRegistry::DoDataExchange(CDataExchange* pDX) 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) @@ -61,7 +61,11 @@ BOOL CPropRegistry::OnInitDialog() { 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); @@ -69,7 +73,7 @@ BOOL CPropRegistry::OnInitDialog() // 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; @@ -82,15 +86,7 @@ bool CPropRegistry::IsRegisteredForDirectory() const 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) @@ -117,13 +113,7 @@ void CPropRegistry::EnableContextHandler(bool 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; @@ -139,6 +129,7 @@ void CPropRegistry::GetContextRegValues() m_strPath = reg.ReadString(f_RegValuePath, _T("")); } +/// Set registry values for ShellExtension void CPropRegistry::OnAddToExplorer() { UpdateData(); @@ -158,6 +149,7 @@ void CPropRegistry::OnAddToExplorer() reg.WriteDword(f_RegValueEnabled, dwContextEnabled); } +/// Saves given path to registry for ShellExtension void CPropRegistry::OnSavePath() { UpdateData(); @@ -169,22 +161,20 @@ void CPropRegistry::OnSavePath() 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 diff --git a/Src/PropRegistry.h b/Src/PropRegistry.h index 07047be42..a1c02662d 100644 --- a/Src/PropRegistry.h +++ b/Src/PropRegistry.h @@ -6,7 +6,7 @@ #endif // _MSC_VER > 1000 // PropRegistry.h : header file // - +// $Id$ ///////////////////////////////////////////////////////////////////////////// // CPropRegistry dialog @@ -42,7 +42,6 @@ protected: // 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(); diff --git a/Src/readme.txt b/Src/readme.txt index 3d310ed76..8edf3dce7 100644 --- a/Src/readme.txt +++ b/Src/readme.txt @@ -1,6 +1,9 @@ 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 diff --git a/Src/resource.h b/Src/resource.h index ecc6a18b9..a7810b726 100644 --- a/Src/resource.h +++ b/Src/resource.h @@ -99,6 +99,7 @@ #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 @@ -153,7 +154,6 @@ #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 @@ -369,7 +369,7 @@ #define ID_EDITOR_COPY_FILENAME 32823 // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 -- 2.11.0