From 39c3356d93dd5bb4343d750f24921de332d5a7f1 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Fri, 4 Mar 2005 13:39:42 +0000 Subject: [PATCH] PATCH: [ 1147039 ] experimental patch for colored word diff - submitted by Takashi Sawanaka --- Src/Languages/Brazilian/MergeBrazilian.rc | 20 +++- Src/Languages/Brazilian/resource.h | 5 + Src/Languages/Bulgarian/MergeBulgarian.rc | 20 +++- Src/Languages/Bulgarian/resource.h | 5 + Src/Languages/Catalan/MergeCatalan.rc | 20 +++- Src/Languages/Catalan/resource.h | 5 + .../ChineseSimplified/MergeChineseSimplified.rc | 20 +++- Src/Languages/ChineseSimplified/resource.h | 5 + .../ChineseTraditional/MergeChineseTraditional.rc | 20 +++- Src/Languages/ChineseTraditional/resource.h | 5 + Src/Languages/Czech/MergeCzech.rc | 20 +++- Src/Languages/Czech/resource.h | 5 + Src/Languages/Danish/MergeDanish.rc | 20 +++- Src/Languages/Danish/resource.h | 5 + Src/Languages/Dutch/MergeDutch.rc | 20 +++- Src/Languages/Dutch/resource.h | 5 + Src/Languages/French/MergeFrench.rc | 20 +++- Src/Languages/French/resource.h | 5 + Src/Languages/German/MergeGerman.rc | 20 +++- Src/Languages/German/resource.h | 5 + Src/Languages/Hungarian/MergeHungarian.rc | 20 +++- Src/Languages/Hungarian/resource.h | 5 + Src/Languages/Italian/MergeItalian.rc | 22 +++- Src/Languages/Italian/resource.h | 5 + Src/Languages/Japanese/MergeJapanese.rc | 20 +++- Src/Languages/Japanese/resource.h | 5 + Src/Languages/Korean/MergeKorean.rc | 20 +++- Src/Languages/Korean/resource.h | 5 + Src/Languages/Norwegian/MergeNorwegian.rc | 20 +++- Src/Languages/Norwegian/resource.h | 5 + Src/Languages/Polish/MergePolish.rc | 20 +++- Src/Languages/Polish/resource.h | 5 + Src/Languages/Russian/MergeRussian.rc | 20 +++- Src/Languages/Russian/resource.h | 5 + Src/Languages/Slovak/MergeSlovak.rc | 20 +++- Src/Languages/Slovak/resource.h | 5 + Src/Languages/Spanish/MergeSpanish.rc | 20 +++- Src/Languages/Spanish/resource.h | 5 + Src/Languages/Swedish/MergeSwedish.rc | 20 +++- Src/Languages/Swedish/resource.h | 5 + Src/MainFrm.cpp | 9 ++ Src/Merge.rc | 20 +++- Src/MergeDiffDetailView.cpp | 59 ++++++++++ Src/MergeDiffDetailView.h | 2 + Src/MergeDoc.h | 2 + Src/MergeDocLineDiffs.cpp | 46 ++++++++ Src/MergeEditView.cpp | 97 +++++++++++++++++ Src/MergeEditView.h | 9 ++ Src/OptionsDef.h | 9 ++ Src/PropColors.cpp | 92 ++++++++++++++++ Src/PropColors.h | 12 +++ Src/editlib/asp.cpp | 1 + Src/editlib/basic.cpp | 1 + Src/editlib/batch.cpp | 1 + Src/editlib/ccrystaltextview.cpp | 119 ++++++++++++++++++--- Src/editlib/ccrystaltextview.h | 17 ++- Src/editlib/cplusplus.cpp | 1 + Src/editlib/csharp.cpp | 1 + Src/editlib/dcl.cpp | 1 + Src/editlib/fortran.cpp | 1 + Src/editlib/html.cpp | 1 + Src/editlib/ini.cpp | 1 + Src/editlib/is.cpp | 1 + Src/editlib/java.cpp | 1 + Src/editlib/lisp.cpp | 1 + Src/editlib/pascal.cpp | 1 + Src/editlib/perl.cpp | 1 + Src/editlib/php.cpp | 1 + Src/editlib/python.cpp | 1 + Src/editlib/rexx.cpp | 1 + Src/editlib/rsrc.cpp | 1 + Src/editlib/sgml.cpp | 1 + Src/editlib/sh.cpp | 1 + Src/editlib/siod.cpp | 1 + Src/editlib/sql.cpp | 1 + Src/editlib/tcl.cpp | 1 + Src/editlib/tex.cpp | 1 + Src/editlib/xml.cpp | 1 + Src/readme.txt | 10 ++ Src/resource.h | 5 + 80 files changed, 974 insertions(+), 61 deletions(-) diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc index c371ddccb..27d8af0c7 100644 --- a/Src/Languages/Brazilian/MergeBrazilian.rc +++ b/Src/Languages/Brazilian/MergeBrazilian.rc @@ -176,6 +176,7 @@ BEGIN MENUITEM "Usar F&onte Padrão", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR MENUITEM "E&xibir Espaços", ID_VIEW_WHITESPACE + MENUITEM "Vie&w Line Differences", ID_VIEW_LINEDIFFS MENUITEM SEPARATOR MENUITEM "Barra de &Ferramentas", ID_VIEW_TOOLBAR MENUITEM "Barra de &Status", ID_VIEW_STATUS_BAR @@ -610,7 +611,7 @@ BEGIN ES_AUTOHSCROLL | ES_WANTRETURN END -IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 196 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Cores" FONT 8, "MS Shell Dlg" @@ -668,7 +669,21 @@ BEGIN CONTROL "Dif",IDC_SEL_MOVEDBLOCK_TEXT_COLOR,"Button", BS_OWNERDRAW | WS_TABSTOP,199,109,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - PUSHBUTTON "Defaults",IDC_COLORDEFAULTS_BTN,166,130,50,14 + RTEXT "Word Difference:",IDC_STATIC,7,129,90,8 + CONTROL "Dif",IDC_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + RTEXT "Selected Word Diff:",IDC_STATIC,7,149,90,8 + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + PUSHBUTTON "Defaults",IDC_COLORDEFAULTS_BTN,166,170,50,14 END IDD_OUTPUT DIALOGEX 0, 0, 278, 157 @@ -2207,6 +2222,7 @@ BEGIN ID_VIEW_LOCATION_BAR "Location pane shows overall picture from files" ID_VIEW_DIR_STATEPANE "Show directory compare statepane" ID_VIEW_LANGUAGE "Seleciona o Idioma usado na interface\nLíngua" + ID_VIEW_LINEDIFFS "Shows differences inside lines with different color\nShow Line Diff" END // MERGE MENU diff --git a/Src/Languages/Brazilian/resource.h b/Src/Languages/Brazilian/resource.h index 3dd2d5683..c0eb7f686 100644 --- a/Src/Languages/Brazilian/resource.h +++ b/Src/Languages/Brazilian/resource.h @@ -233,6 +233,10 @@ #define IDC_SAVEPROJECT 1151 #define IDC_FILTERFILE_NEWBTN 1152 #define IDC_FILTERFILE_DELETEBTN 1153 +#define IDC_WORDDIFFERENCE_COLOR 1154 +#define IDC_SEL_WORDDIFFERENCE_COLOR 1155 +#define IDC_WORDDIFFERENCE_TEXT_COLOR 1156 +#define IDC_SEL_WORDDIFFERENCE_TEXT_COLOR 1157 #define IDC_EDIT_WHOLE_WORD 8603 @@ -769,6 +773,7 @@ #define ID_VIEW_LOCATION_BAR 32820 #define ID_VIEW_DIR_STATEPANE 32821 #define ID_VIEW_LANGUAGE 32822 +#define ID_VIEW_LINEDIFFS 32823 #define ID_PREVDIFF 32832 #define ID_NEXTDIFF 32833 diff --git a/Src/Languages/Bulgarian/MergeBulgarian.rc b/Src/Languages/Bulgarian/MergeBulgarian.rc index e281a2f2e..7f84e598c 100644 --- a/Src/Languages/Bulgarian/MergeBulgarian.rc +++ b/Src/Languages/Bulgarian/MergeBulgarian.rc @@ -176,6 +176,7 @@ BEGIN MENUITEM "Èçïîëçâàé ô&îíò ïî ïîäðàçáèðàíå", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR MENUITEM "&Âèæäàé ïðàçíèòå ìåñòà", ID_VIEW_WHITESPACE + MENUITEM "Vie&w Line Differences", ID_VIEW_LINEDIFFS MENUITEM SEPARATOR MENUITEM "&Èíñòðóìåíòè", ID_VIEW_TOOLBAR MENUITEM "&Status Bar", ID_VIEW_STATUS_BAR @@ -608,7 +609,7 @@ BEGIN ES_AUTOHSCROLL | ES_WANTRETURN END -IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 196 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Öâåòîâå" FONT 8, "MS Shell Dlg" @@ -666,7 +667,21 @@ BEGIN CONTROL "Dif",IDC_SEL_MOVEDBLOCK_TEXT_COLOR,"Button", BS_OWNERDRAW | WS_TABSTOP,199,109,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - PUSHBUTTON "Ïúðâîíà÷àëíè",IDC_COLORDEFAULTS_BTN,166,130,50,14 + RTEXT "Word Difference:",IDC_STATIC,7,129,90,8 + CONTROL "Dif",IDC_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + RTEXT "Selected Word Diff:",IDC_STATIC,7,149,90,8 + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + PUSHBUTTON "Ïúðâîíà÷àëíè",IDC_COLORDEFAULTS_BTN,166,170,50,14 END IDD_OUTPUT DIALOGEX 0, 0, 278, 157 @@ -2091,6 +2106,7 @@ BEGIN ID_VIEW_LOCATION_BAR "Location pane shows overall picture from files" ID_VIEW_DIR_STATEPANE "Show directory compare statepane" ID_VIEW_LANGUAGE "Èçáåðåòå åçèêà íà êîèòî äà å ïðîãðàìàòà\nÅçèê" + ID_VIEW_LINEDIFFS "Shows differences inside lines with different color\nShow Line Diff" END // MERGE MENU diff --git a/Src/Languages/Bulgarian/resource.h b/Src/Languages/Bulgarian/resource.h index 3dd2d5683..c0eb7f686 100644 --- a/Src/Languages/Bulgarian/resource.h +++ b/Src/Languages/Bulgarian/resource.h @@ -233,6 +233,10 @@ #define IDC_SAVEPROJECT 1151 #define IDC_FILTERFILE_NEWBTN 1152 #define IDC_FILTERFILE_DELETEBTN 1153 +#define IDC_WORDDIFFERENCE_COLOR 1154 +#define IDC_SEL_WORDDIFFERENCE_COLOR 1155 +#define IDC_WORDDIFFERENCE_TEXT_COLOR 1156 +#define IDC_SEL_WORDDIFFERENCE_TEXT_COLOR 1157 #define IDC_EDIT_WHOLE_WORD 8603 @@ -769,6 +773,7 @@ #define ID_VIEW_LOCATION_BAR 32820 #define ID_VIEW_DIR_STATEPANE 32821 #define ID_VIEW_LANGUAGE 32822 +#define ID_VIEW_LINEDIFFS 32823 #define ID_PREVDIFF 32832 #define ID_NEXTDIFF 32833 diff --git a/Src/Languages/Catalan/MergeCatalan.rc b/Src/Languages/Catalan/MergeCatalan.rc index ce9839d64..36ae3e389 100644 --- a/Src/Languages/Catalan/MergeCatalan.rc +++ b/Src/Languages/Catalan/MergeCatalan.rc @@ -176,6 +176,7 @@ BEGIN MENUITEM "Empra el tipus de lletra del &sistema", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR MENUITEM "Mostra els es&pais", ID_VIEW_WHITESPACE + MENUITEM "Vie&w Line Differences", ID_VIEW_LINEDIFFS MENUITEM SEPARATOR MENUITEM "Barra d'ei&nes", ID_VIEW_TOOLBAR MENUITEM "Barra d'est&at", ID_VIEW_STATUS_BAR @@ -608,7 +609,7 @@ BEGIN ES_AUTOHSCROLL | ES_WANTRETURN END -IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 196 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Colors" FONT 8, "MS Shell Dlg" @@ -666,7 +667,21 @@ BEGIN CONTROL "Dif",IDC_SEL_MOVEDBLOCK_TEXT_COLOR,"Button", BS_OWNERDRAW | WS_TABSTOP,199,109,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - PUSHBUTTON "Predeterminats",IDC_COLORDEFAULTS_BTN,166,130,59,14 + RTEXT "Word Difference:",IDC_STATIC,7,129,90,8 + CONTROL "Dif",IDC_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + RTEXT "Selected Word Diff:",IDC_STATIC,7,149,90,8 + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + PUSHBUTTON "Predeterminats",IDC_COLORDEFAULTS_BTN,166,170,59,14 END IDD_OUTPUT DIALOGEX 0, 0, 278, 157 @@ -2107,6 +2122,7 @@ BEGIN ID_VIEW_LOCATION_BAR "Mostra la subfinestra d'ubicació amb una image general dels fitxers" ID_VIEW_DIR_STATEPANE "Mostra la subfinestra d'estat de comparació de directori" ID_VIEW_LANGUAGE "Selecciona l'idioma de la interfície d'usuari\nIdioma" + ID_VIEW_LINEDIFFS "Shows differences inside lines with different color\nShow Line Diff" END // MERGE MENU diff --git a/Src/Languages/Catalan/resource.h b/Src/Languages/Catalan/resource.h index 3dd2d5683..c0eb7f686 100644 --- a/Src/Languages/Catalan/resource.h +++ b/Src/Languages/Catalan/resource.h @@ -233,6 +233,10 @@ #define IDC_SAVEPROJECT 1151 #define IDC_FILTERFILE_NEWBTN 1152 #define IDC_FILTERFILE_DELETEBTN 1153 +#define IDC_WORDDIFFERENCE_COLOR 1154 +#define IDC_SEL_WORDDIFFERENCE_COLOR 1155 +#define IDC_WORDDIFFERENCE_TEXT_COLOR 1156 +#define IDC_SEL_WORDDIFFERENCE_TEXT_COLOR 1157 #define IDC_EDIT_WHOLE_WORD 8603 @@ -769,6 +773,7 @@ #define ID_VIEW_LOCATION_BAR 32820 #define ID_VIEW_DIR_STATEPANE 32821 #define ID_VIEW_LANGUAGE 32822 +#define ID_VIEW_LINEDIFFS 32823 #define ID_PREVDIFF 32832 #define ID_NEXTDIFF 32833 diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc index 054c5be52..405135874 100644 --- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc +++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc @@ -175,6 +175,7 @@ BEGIN MENUITEM "ʹÓÃĬÈÏ×ÖÐÍ(&O)", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR MENUITEM "ÏÔʾ¿Õ°×ºÍÖƱí·û(&V)", ID_VIEW_WHITESPACE + MENUITEM "Vie&w Line Differences", ID_VIEW_LINEDIFFS MENUITEM SEPARATOR MENUITEM "¹¤¾ßÀ¸(&T)", ID_VIEW_TOOLBAR MENUITEM "״̬À¸(&S)", ID_VIEW_STATUS_BAR @@ -600,7 +601,7 @@ BEGIN ES_WANTRETURN END -IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 196 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "ÑÕÉ«" FONT 8, "MS Shell Dlg" @@ -656,7 +657,21 @@ BEGIN CONTROL "Dif",IDC_SEL_MOVEDBLOCK_TEXT_COLOR,"Button", BS_OWNERDRAW | WS_TABSTOP,199,109,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - PUSHBUTTON "Defaults",IDC_COLORDEFAULTS_BTN,166,130,50,14 + RTEXT "Word Difference:",IDC_STATIC,7,129,90,8 + CONTROL "Dif",IDC_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + RTEXT "Selected Word Diff:",IDC_STATIC,7,149,90,8 + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + PUSHBUTTON "Defaults",IDC_COLORDEFAULTS_BTN,166,170,50,14 END IDD_OUTPUT DIALOGEX 0, 0, 278, 157 @@ -2077,6 +2092,7 @@ BEGIN ID_VIEW_LOCATION_BAR "Location pane shows overall picture from files" ID_VIEW_DIR_STATEPANE "Show directory compare statepane" ID_VIEW_LANGUAGE "Ñ¡ÔñÄ¿Ç°Óû§½Ó¿ÚÓïÑÔ\nÓïÑÔ" + ID_VIEW_LINEDIFFS "Shows differences inside lines with different color\nShow Line Diff" END // MERGE MENU diff --git a/Src/Languages/ChineseSimplified/resource.h b/Src/Languages/ChineseSimplified/resource.h index 3dd2d5683..c0eb7f686 100644 --- a/Src/Languages/ChineseSimplified/resource.h +++ b/Src/Languages/ChineseSimplified/resource.h @@ -233,6 +233,10 @@ #define IDC_SAVEPROJECT 1151 #define IDC_FILTERFILE_NEWBTN 1152 #define IDC_FILTERFILE_DELETEBTN 1153 +#define IDC_WORDDIFFERENCE_COLOR 1154 +#define IDC_SEL_WORDDIFFERENCE_COLOR 1155 +#define IDC_WORDDIFFERENCE_TEXT_COLOR 1156 +#define IDC_SEL_WORDDIFFERENCE_TEXT_COLOR 1157 #define IDC_EDIT_WHOLE_WORD 8603 @@ -769,6 +773,7 @@ #define ID_VIEW_LOCATION_BAR 32820 #define ID_VIEW_DIR_STATEPANE 32821 #define ID_VIEW_LANGUAGE 32822 +#define ID_VIEW_LINEDIFFS 32823 #define ID_PREVDIFF 32832 #define ID_NEXTDIFF 32833 diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc index 67ae6a6f8..2c08d82f8 100644 --- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc +++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc @@ -176,6 +176,7 @@ BEGIN MENUITEM "¨Ï¥Î¹w³]ªº¦r«¬(&O)", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR MENUITEM "À˵øªÅ¥Õ©M¸õ®æ(&V)", ID_VIEW_WHITESPACE + MENUITEM "Vie&w Line Differences", ID_VIEW_LINEDIFFS MENUITEM SEPARATOR MENUITEM "¤u¨ã¦C(&T)", ID_VIEW_TOOLBAR MENUITEM "ª¬ºA¦C(&S)", ID_VIEW_STATUS_BAR @@ -600,7 +601,7 @@ BEGIN ES_WANTRETURN END -IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 196 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "¦â±m" FONT 8, "MS Shell Dlg" @@ -656,7 +657,21 @@ BEGIN CONTROL "Dif",IDC_SEL_MOVEDBLOCK_TEXT_COLOR,"Button", BS_OWNERDRAW | WS_TABSTOP,199,109,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - PUSHBUTTON "Defaults",IDC_COLORDEFAULTS_BTN,166,130,50,14 + RTEXT "Word Difference:",IDC_STATIC,7,129,90,8 + CONTROL "Dif",IDC_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + RTEXT "Selected Word Diff:",IDC_STATIC,7,149,90,8 + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + PUSHBUTTON "Defaults",IDC_COLORDEFAULTS_BTN,166,170,50,14 END IDD_OUTPUT DIALOGEX 0, 0, 278, 157 @@ -2190,6 +2205,7 @@ BEGIN ID_VIEW_LOCATION_BAR "Location pane shows overall picture from files" ID_VIEW_DIR_STATEPANE "Show directory compare statepane" ID_VIEW_LANGUAGE "¿ï¨ú¥Ø«e¥Î¤á¤¶­±»y¨¥\n»y¨¥" + ID_VIEW_LINEDIFFS "Shows differences inside lines with different color\nShow Line Diff" END // MERGE MENU diff --git a/Src/Languages/ChineseTraditional/resource.h b/Src/Languages/ChineseTraditional/resource.h index 3dd2d5683..c0eb7f686 100644 --- a/Src/Languages/ChineseTraditional/resource.h +++ b/Src/Languages/ChineseTraditional/resource.h @@ -233,6 +233,10 @@ #define IDC_SAVEPROJECT 1151 #define IDC_FILTERFILE_NEWBTN 1152 #define IDC_FILTERFILE_DELETEBTN 1153 +#define IDC_WORDDIFFERENCE_COLOR 1154 +#define IDC_SEL_WORDDIFFERENCE_COLOR 1155 +#define IDC_WORDDIFFERENCE_TEXT_COLOR 1156 +#define IDC_SEL_WORDDIFFERENCE_TEXT_COLOR 1157 #define IDC_EDIT_WHOLE_WORD 8603 @@ -769,6 +773,7 @@ #define ID_VIEW_LOCATION_BAR 32820 #define ID_VIEW_DIR_STATEPANE 32821 #define ID_VIEW_LANGUAGE 32822 +#define ID_VIEW_LINEDIFFS 32823 #define ID_PREVDIFF 32832 #define ID_NEXTDIFF 32833 diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc index 4f003429b..34641dc1c 100644 --- a/Src/Languages/Czech/MergeCzech.rc +++ b/Src/Languages/Czech/MergeCzech.rc @@ -176,6 +176,7 @@ BEGIN MENUITEM "Použít základní písm&o", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR MENUITEM "&View Whitespace", ID_VIEW_WHITESPACE + MENUITEM "Vie&w Line Differences", ID_VIEW_LINEDIFFS MENUITEM SEPARATOR MENUITEM "&Panel nástroju", ID_VIEW_TOOLBAR MENUITEM "&Stavový rádek", ID_VIEW_STATUS_BAR @@ -608,7 +609,7 @@ BEGIN ES_AUTOHSCROLL | ES_WANTRETURN END -IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 196 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Colors" FONT 8, "MS Shell Dlg" @@ -666,7 +667,21 @@ BEGIN CONTROL "Dif",IDC_SEL_MOVEDBLOCK_TEXT_COLOR,"Button", BS_OWNERDRAW | WS_TABSTOP,199,109,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - PUSHBUTTON "Defaults",IDC_COLORDEFAULTS_BTN,166,130,50,14 + RTEXT "Word Difference:",IDC_STATIC,7,129,90,8 + CONTROL "Dif",IDC_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + RTEXT "Selected Word Diff:",IDC_STATIC,7,149,90,8 + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + PUSHBUTTON "Defaults",IDC_COLORDEFAULTS_BTN,166,170,50,14 END IDD_OUTPUT DIALOGEX 0, 0, 278, 157 @@ -2204,6 +2219,7 @@ BEGIN ID_VIEW_LOCATION_BAR "Location pane shows overall picture from files" ID_VIEW_DIR_STATEPANE "Show directory compare statepane" ID_VIEW_LANGUAGE "Zvolit jazyk pro uživatelské rozhraní\nLanguage" + ID_VIEW_LINEDIFFS "Shows differences inside lines with different color\nShow Line Diff" END // MERGE MENU diff --git a/Src/Languages/Czech/resource.h b/Src/Languages/Czech/resource.h index 3dd2d5683..c0eb7f686 100644 --- a/Src/Languages/Czech/resource.h +++ b/Src/Languages/Czech/resource.h @@ -233,6 +233,10 @@ #define IDC_SAVEPROJECT 1151 #define IDC_FILTERFILE_NEWBTN 1152 #define IDC_FILTERFILE_DELETEBTN 1153 +#define IDC_WORDDIFFERENCE_COLOR 1154 +#define IDC_SEL_WORDDIFFERENCE_COLOR 1155 +#define IDC_WORDDIFFERENCE_TEXT_COLOR 1156 +#define IDC_SEL_WORDDIFFERENCE_TEXT_COLOR 1157 #define IDC_EDIT_WHOLE_WORD 8603 @@ -769,6 +773,7 @@ #define ID_VIEW_LOCATION_BAR 32820 #define ID_VIEW_DIR_STATEPANE 32821 #define ID_VIEW_LANGUAGE 32822 +#define ID_VIEW_LINEDIFFS 32823 #define ID_PREVDIFF 32832 #define ID_NEXTDIFF 32833 diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc index 4ceefc0ab..4a2473fae 100644 --- a/Src/Languages/Danish/MergeDanish.rc +++ b/Src/Languages/Danish/MergeDanish.rc @@ -176,6 +176,7 @@ BEGIN MENUITEM "Brug standard s&krifttype", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR MENUITEM "Vis &mellemrum", ID_VIEW_WHITESPACE + MENUITEM "Vie&w Line Differences", ID_VIEW_LINEDIFFS MENUITEM SEPARATOR MENUITEM "V&ærktøjslinje", ID_VIEW_TOOLBAR MENUITEM "S&tatuslinje", ID_VIEW_STATUS_BAR @@ -608,7 +609,7 @@ BEGIN ES_AUTOHSCROLL | ES_WANTRETURN END -IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 196 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Farver" FONT 8, "MS Shell Dlg" @@ -666,7 +667,21 @@ BEGIN CONTROL "Dif",IDC_SEL_MOVEDBLOCK_TEXT_COLOR,"Button", BS_OWNERDRAW | WS_TABSTOP,199,109,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - PUSHBUTTON "Standard",IDC_COLORDEFAULTS_BTN,166,130,50,14 + RTEXT "Word Difference:",IDC_STATIC,7,129,90,8 + CONTROL "Dif",IDC_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + RTEXT "Selected Word Diff:",IDC_STATIC,7,149,90,8 + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + PUSHBUTTON "Standard",IDC_COLORDEFAULTS_BTN,166,170,50,14 END IDD_OUTPUT DIALOGEX 0, 0, 278, 157 @@ -2089,6 +2104,7 @@ BEGIN ID_VIEW_LOCATION_BAR "Vis eller gem vertikalt panel" ID_VIEW_DIR_STATEPANE "Vis eller gem status på sammeligning af mapper" ID_VIEW_LANGUAGE "Vælg sprog til brugerfladen\nSprog" + ID_VIEW_LINEDIFFS "Shows differences inside lines with different color\nShow Line Diff" END // MERGE MENU diff --git a/Src/Languages/Danish/resource.h b/Src/Languages/Danish/resource.h index 3dd2d5683..c0eb7f686 100644 --- a/Src/Languages/Danish/resource.h +++ b/Src/Languages/Danish/resource.h @@ -233,6 +233,10 @@ #define IDC_SAVEPROJECT 1151 #define IDC_FILTERFILE_NEWBTN 1152 #define IDC_FILTERFILE_DELETEBTN 1153 +#define IDC_WORDDIFFERENCE_COLOR 1154 +#define IDC_SEL_WORDDIFFERENCE_COLOR 1155 +#define IDC_WORDDIFFERENCE_TEXT_COLOR 1156 +#define IDC_SEL_WORDDIFFERENCE_TEXT_COLOR 1157 #define IDC_EDIT_WHOLE_WORD 8603 @@ -769,6 +773,7 @@ #define ID_VIEW_LOCATION_BAR 32820 #define ID_VIEW_DIR_STATEPANE 32821 #define ID_VIEW_LANGUAGE 32822 +#define ID_VIEW_LINEDIFFS 32823 #define ID_PREVDIFF 32832 #define ID_NEXTDIFF 32833 diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc index 7d1b2d267..64d1b64f9 100644 --- a/Src/Languages/Dutch/MergeDutch.rc +++ b/Src/Languages/Dutch/MergeDutch.rc @@ -177,6 +177,7 @@ BEGIN MENUITEM "Gebruik standaard F&ont", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR MENUITEM "&View Whitespace", ID_VIEW_WHITESPACE + MENUITEM "Vie&w Line Differences", ID_VIEW_LINEDIFFS MENUITEM SEPARATOR MENUITEM "&Werkbalk", ID_VIEW_TOOLBAR MENUITEM "&Status Balk", ID_VIEW_STATUS_BAR @@ -609,7 +610,7 @@ BEGIN ES_AUTOHSCROLL | ES_WANTRETURN END -IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 196 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Colors" FONT 8, "MS Shell Dlg" @@ -667,7 +668,21 @@ BEGIN CONTROL "Dif",IDC_SEL_MOVEDBLOCK_TEXT_COLOR,"Button", BS_OWNERDRAW | WS_TABSTOP,199,109,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - PUSHBUTTON "Defaults",IDC_COLORDEFAULTS_BTN,166,130,50,14 + RTEXT "Word Difference:",IDC_STATIC,7,129,90,8 + CONTROL "Dif",IDC_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + RTEXT "Selected Word Diff:",IDC_STATIC,7,149,90,8 + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + PUSHBUTTON "Defaults",IDC_COLORDEFAULTS_BTN,166,170,50,14 END IDD_OUTPUT DIALOGEX 0, 0, 278, 157 @@ -2206,6 +2221,7 @@ BEGIN ID_VIEW_LOCATION_BAR "Location pane shows overall picture from files" ID_VIEW_DIR_STATEPANE "Show directory compare statepane" ID_VIEW_LANGUAGE "Selecteer de gewenste taal. \nTaal" + ID_VIEW_LINEDIFFS "Shows differences inside lines with different color\nShow Line Diff" END // MERGE MENU diff --git a/Src/Languages/Dutch/resource.h b/Src/Languages/Dutch/resource.h index 3dd2d5683..c0eb7f686 100644 --- a/Src/Languages/Dutch/resource.h +++ b/Src/Languages/Dutch/resource.h @@ -233,6 +233,10 @@ #define IDC_SAVEPROJECT 1151 #define IDC_FILTERFILE_NEWBTN 1152 #define IDC_FILTERFILE_DELETEBTN 1153 +#define IDC_WORDDIFFERENCE_COLOR 1154 +#define IDC_SEL_WORDDIFFERENCE_COLOR 1155 +#define IDC_WORDDIFFERENCE_TEXT_COLOR 1156 +#define IDC_SEL_WORDDIFFERENCE_TEXT_COLOR 1157 #define IDC_EDIT_WHOLE_WORD 8603 @@ -769,6 +773,7 @@ #define ID_VIEW_LOCATION_BAR 32820 #define ID_VIEW_DIR_STATEPANE 32821 #define ID_VIEW_LANGUAGE 32822 +#define ID_VIEW_LINEDIFFS 32823 #define ID_PREVDIFF 32832 #define ID_NEXTDIFF 32833 diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc index 4c13557f0..63a131d39 100644 --- a/Src/Languages/French/MergeFrench.rc +++ b/Src/Languages/French/MergeFrench.rc @@ -176,6 +176,7 @@ BEGIN MENUITEM "Utiliser la police par dé&faut", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR MENUITEM "&Afficher les espaces", ID_VIEW_WHITESPACE + MENUITEM "Vie&w Line Differences", ID_VIEW_LINEDIFFS MENUITEM SEPARATOR MENUITEM "Barre d'&outils", ID_VIEW_TOOLBAR MENUITEM "&Barre d'état", ID_VIEW_STATUS_BAR @@ -609,7 +610,7 @@ BEGIN ES_AUTOHSCROLL | ES_WANTRETURN END -IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 196 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Couleurs" FONT 8, "MS Shell Dlg", 0, 0, 0x1 @@ -667,7 +668,21 @@ BEGIN CONTROL "Dif",IDC_SEL_MOVEDBLOCK_TEXT_COLOR,"Button", BS_OWNERDRAW | WS_TABSTOP,199,109,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - PUSHBUTTON "Defaults",IDC_COLORDEFAULTS_BTN,166,130,50,14 + RTEXT "Word Difference:",IDC_STATIC,7,129,90,8 + CONTROL "Dif",IDC_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + RTEXT "Selected Word Diff:",IDC_STATIC,7,149,90,8 + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + PUSHBUTTON "Defaults",IDC_COLORDEFAULTS_BTN,166,170,50,14 END IDD_OUTPUT DIALOGEX 0, 0, 278, 157 @@ -2092,6 +2107,7 @@ BEGIN ID_VIEW_LOCATION_BAR "Location pane shows overall picture from files" ID_VIEW_DIR_STATEPANE "Show directory compare statepane" ID_VIEW_LANGUAGE "Sélectionner la langue de l'interface\nLangue" + ID_VIEW_LINEDIFFS "Shows differences inside lines with different color\nShow Line Diff" END // MERGE MENU diff --git a/Src/Languages/French/resource.h b/Src/Languages/French/resource.h index 3dd2d5683..c0eb7f686 100644 --- a/Src/Languages/French/resource.h +++ b/Src/Languages/French/resource.h @@ -233,6 +233,10 @@ #define IDC_SAVEPROJECT 1151 #define IDC_FILTERFILE_NEWBTN 1152 #define IDC_FILTERFILE_DELETEBTN 1153 +#define IDC_WORDDIFFERENCE_COLOR 1154 +#define IDC_SEL_WORDDIFFERENCE_COLOR 1155 +#define IDC_WORDDIFFERENCE_TEXT_COLOR 1156 +#define IDC_SEL_WORDDIFFERENCE_TEXT_COLOR 1157 #define IDC_EDIT_WHOLE_WORD 8603 @@ -769,6 +773,7 @@ #define ID_VIEW_LOCATION_BAR 32820 #define ID_VIEW_DIR_STATEPANE 32821 #define ID_VIEW_LANGUAGE 32822 +#define ID_VIEW_LINEDIFFS 32823 #define ID_PREVDIFF 32832 #define ID_NEXTDIFF 32833 diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc index 279d231f0..da6a5c40f 100644 --- a/Src/Languages/German/MergeGerman.rc +++ b/Src/Languages/German/MergeGerman.rc @@ -180,6 +180,7 @@ BEGIN MENUITEM "Standard-Schrift &verwenden", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR MENUITEM "Leer&zeichen anzeigen", ID_VIEW_WHITESPACE + MENUITEM "Vie&w Line Differences", ID_VIEW_LINEDIFFS MENUITEM SEPARATOR MENUITEM "&Symbolleiste", ID_VIEW_TOOLBAR MENUITEM "S&tatusleiste", ID_VIEW_STATUS_BAR @@ -616,7 +617,7 @@ BEGIN ES_AUTOHSCROLL | ES_WANTRETURN END -IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 196 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Farben" FONT 8, "MS Shell Dlg" @@ -674,7 +675,21 @@ BEGIN CONTROL "Dif",IDC_SEL_MOVEDBLOCK_TEXT_COLOR,"Button", BS_OWNERDRAW | WS_TABSTOP,199,109,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - PUSHBUTTON "Vorgaben",IDC_COLORDEFAULTS_BTN,166,130,50,14 + RTEXT "Word Difference:",IDC_STATIC,7,129,90,8 + CONTROL "Dif",IDC_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + RTEXT "Selected Word Diff:",IDC_STATIC,7,149,90,8 + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + PUSHBUTTON "Vorgaben",IDC_COLORDEFAULTS_BTN,166,170,50,14 END IDD_OUTPUT DIALOGEX 0, 0, 278, 157 @@ -2209,6 +2224,7 @@ BEGIN ID_VIEW_LOCATION_BAR "Die Positionsleiste zeigt gesamte Abbildungen von den Dateien." ID_VIEW_DIR_STATEPANE "Blendet den Vergleichszustand ein oder aus." ID_VIEW_LANGUAGE "Wählt die Sprache der Benutzeroberfläche.\nSprache" + ID_VIEW_LINEDIFFS "Shows differences inside lines with different color\nShow Line Diff" END // MERGE MENU diff --git a/Src/Languages/German/resource.h b/Src/Languages/German/resource.h index 3dd2d5683..c0eb7f686 100644 --- a/Src/Languages/German/resource.h +++ b/Src/Languages/German/resource.h @@ -233,6 +233,10 @@ #define IDC_SAVEPROJECT 1151 #define IDC_FILTERFILE_NEWBTN 1152 #define IDC_FILTERFILE_DELETEBTN 1153 +#define IDC_WORDDIFFERENCE_COLOR 1154 +#define IDC_SEL_WORDDIFFERENCE_COLOR 1155 +#define IDC_WORDDIFFERENCE_TEXT_COLOR 1156 +#define IDC_SEL_WORDDIFFERENCE_TEXT_COLOR 1157 #define IDC_EDIT_WHOLE_WORD 8603 @@ -769,6 +773,7 @@ #define ID_VIEW_LOCATION_BAR 32820 #define ID_VIEW_DIR_STATEPANE 32821 #define ID_VIEW_LANGUAGE 32822 +#define ID_VIEW_LINEDIFFS 32823 #define ID_PREVDIFF 32832 #define ID_NEXTDIFF 32833 diff --git a/Src/Languages/Hungarian/MergeHungarian.rc b/Src/Languages/Hungarian/MergeHungarian.rc index 4988fdebe..7d46214d5 100644 --- a/Src/Languages/Hungarian/MergeHungarian.rc +++ b/Src/Languages/Hungarian/MergeHungarian.rc @@ -176,6 +176,7 @@ BEGIN MENUITEM "Alapértelmezett betûtípus használata", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR MENUITEM "&Szóközök mutatása", ID_VIEW_WHITESPACE + MENUITEM "Vie&w Line Differences", ID_VIEW_LINEDIFFS MENUITEM SEPARATOR MENUITEM "&Eszköztár", ID_VIEW_TOOLBAR MENUITEM "&Álapotsor", ID_VIEW_STATUS_BAR @@ -609,7 +610,7 @@ BEGIN ES_AUTOHSCROLL | ES_WANTRETURN END -IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 196 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Színek" FONT 8, "MS Shell Dlg" @@ -667,7 +668,21 @@ BEGIN CONTROL "Dif",IDC_SEL_MOVEDBLOCK_TEXT_COLOR,"Button", BS_OWNERDRAW | WS_TABSTOP,199,109,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - PUSHBUTTON "Alapértékek",IDC_COLORDEFAULTS_BTN,166,130,50,14 + RTEXT "Word Difference:",IDC_STATIC,7,129,90,8 + CONTROL "Dif",IDC_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + RTEXT "Selected Word Diff:",IDC_STATIC,7,149,90,8 + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + PUSHBUTTON "Alapértékek",IDC_COLORDEFAULTS_BTN,166,170,50,14 END IDD_OUTPUT DIALOGEX 0, 0, 278, 157 @@ -2090,6 +2105,7 @@ BEGIN ID_VIEW_LOCATION_BAR "A Pozíció panel vizuális képet ad az összehasonlított fájlokról" ID_VIEW_DIR_STATEPANE "Könyvtár összehasonlítási állapot panel mutatása" ID_VIEW_LANGUAGE "Add meg a használni kívánt nyelvet\nNyelv" + ID_VIEW_LINEDIFFS "Shows differences inside lines with different color\nShow Line Diff" END // MERGE MENU diff --git a/Src/Languages/Hungarian/resource.h b/Src/Languages/Hungarian/resource.h index 3dd2d5683..c0eb7f686 100644 --- a/Src/Languages/Hungarian/resource.h +++ b/Src/Languages/Hungarian/resource.h @@ -233,6 +233,10 @@ #define IDC_SAVEPROJECT 1151 #define IDC_FILTERFILE_NEWBTN 1152 #define IDC_FILTERFILE_DELETEBTN 1153 +#define IDC_WORDDIFFERENCE_COLOR 1154 +#define IDC_SEL_WORDDIFFERENCE_COLOR 1155 +#define IDC_WORDDIFFERENCE_TEXT_COLOR 1156 +#define IDC_SEL_WORDDIFFERENCE_TEXT_COLOR 1157 #define IDC_EDIT_WHOLE_WORD 8603 @@ -769,6 +773,7 @@ #define ID_VIEW_LOCATION_BAR 32820 #define ID_VIEW_DIR_STATEPANE 32821 #define ID_VIEW_LANGUAGE 32822 +#define ID_VIEW_LINEDIFFS 32823 #define ID_PREVDIFF 32832 #define ID_NEXTDIFF 32833 diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc index 2af468699..5aca62c6f 100644 --- a/Src/Languages/Italian/MergeItalian.rc +++ b/Src/Languages/Italian/MergeItalian.rc @@ -175,7 +175,8 @@ BEGIN MENUITEM "&Carattere...", ID_VIEW_SELECTFONT MENUITEM "&Utilizza carattere predefinito", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR - MENUITEM "&Visualizza spazi bianchi", ID_VIEW_WHITESPACE + MENUITEM "&Visualizza spazi bianchi", ID_VIEW_WHITESPACE + MENUITEM "Vie&w Line Differences", ID_VIEW_LINEDIFFS MENUITEM SEPARATOR MENUITEM "Barra degli &strumenti", ID_VIEW_TOOLBAR MENUITEM "&Barra di stato", ID_VIEW_STATUS_BAR @@ -609,7 +610,7 @@ BEGIN ES_AUTOHSCROLL | ES_WANTRETURN END -IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 196 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Colori" FONT 8, "MS Shell Dlg" @@ -667,7 +668,21 @@ BEGIN CONTROL "Dif",IDC_SEL_MOVEDBLOCK_TEXT_COLOR,"Button", BS_OWNERDRAW | WS_TABSTOP,199,109,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - PUSHBUTTON "Predefinito",IDC_COLORDEFAULTS_BTN,166,130,50,14 + RTEXT "Word Difference:",IDC_STATIC,7,129,90,8 + CONTROL "Dif",IDC_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + RTEXT "Selected Word Diff:",IDC_STATIC,7,149,90,8 + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + PUSHBUTTON "Predefinito",IDC_COLORDEFAULTS_BTN,166,170,50,14 END IDD_OUTPUT DIALOGEX 0, 0, 278, 157 @@ -2205,6 +2220,7 @@ BEGIN ID_VIEW_LOCATION_BAR "Il pannello della locazione mostra un'immagine complessiva dei file" ID_VIEW_DIR_STATEPANE "Mostra pannello di riepilogo rapido del confronto tra cartelle" ID_VIEW_LANGUAGE "Seleziona la lingua dell'interfaccia utente\nLingua" + ID_VIEW_LINEDIFFS "Shows differences inside lines with different color\nShow Line Diff" END // MERGE MENU diff --git a/Src/Languages/Italian/resource.h b/Src/Languages/Italian/resource.h index 3dd2d5683..c0eb7f686 100644 --- a/Src/Languages/Italian/resource.h +++ b/Src/Languages/Italian/resource.h @@ -233,6 +233,10 @@ #define IDC_SAVEPROJECT 1151 #define IDC_FILTERFILE_NEWBTN 1152 #define IDC_FILTERFILE_DELETEBTN 1153 +#define IDC_WORDDIFFERENCE_COLOR 1154 +#define IDC_SEL_WORDDIFFERENCE_COLOR 1155 +#define IDC_WORDDIFFERENCE_TEXT_COLOR 1156 +#define IDC_SEL_WORDDIFFERENCE_TEXT_COLOR 1157 #define IDC_EDIT_WHOLE_WORD 8603 @@ -769,6 +773,7 @@ #define ID_VIEW_LOCATION_BAR 32820 #define ID_VIEW_DIR_STATEPANE 32821 #define ID_VIEW_LANGUAGE 32822 +#define ID_VIEW_LINEDIFFS 32823 #define ID_PREVDIFF 32832 #define ID_NEXTDIFF 32833 diff --git a/Src/Languages/Japanese/MergeJapanese.rc b/Src/Languages/Japanese/MergeJapanese.rc index 91b936c3b..8b7b2ffc6 100644 --- a/Src/Languages/Japanese/MergeJapanese.rc +++ b/Src/Languages/Japanese/MergeJapanese.rc @@ -176,6 +176,7 @@ BEGIN MENUITEM "ƒfƒtƒHƒ‹ƒgƒtƒHƒ“ƒg‚ðŽg—p(&O)", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR MENUITEM "‹ó”’‚ð•\Ž¦(&V)", ID_VIEW_WHITESPACE + MENUITEM "Vie&w Line Differences", ID_VIEW_LINEDIFFS MENUITEM SEPARATOR MENUITEM "ƒc[ƒ‹ƒo[(&T)", ID_VIEW_TOOLBAR MENUITEM "ƒXƒe[ƒ^ƒXƒo[(&S)", ID_VIEW_STATUS_BAR @@ -610,7 +611,7 @@ BEGIN ES_AUTOHSCROLL | ES_WANTRETURN END -IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 196 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "F" FONT 8, "MS Shell Dlg" @@ -668,7 +669,21 @@ BEGIN CONTROL "Dif",IDC_SEL_MOVEDBLOCK_TEXT_COLOR,"Button", BS_OWNERDRAW | WS_TABSTOP,199,109,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - PUSHBUTTON "ƒfƒtƒHƒ‹ƒg",IDC_COLORDEFAULTS_BTN,166,130,50,14 + RTEXT "’PŒê‚̍·ˆÙ:",IDC_STATIC,7,129,90,8 + CONTROL "Dif",IDC_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + RTEXT "‘I‘ð‚³‚ê‚½’PŒê‚̍·ˆÙ:",IDC_STATIC,7,149,90,8 + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + PUSHBUTTON "ƒfƒtƒHƒ‹ƒg",IDC_COLORDEFAULTS_BTN,166,170,50,14 END IDD_OUTPUT DIALOGEX 0, 0, 278, 157 @@ -2094,6 +2109,7 @@ BEGIN ID_VIEW_LOCATION_BAR "ƒƒP[ƒVƒ‡ƒ“ƒyƒCƒ“‚̓tƒ@ƒCƒ‹‚Ì“à—e‘S‘Ì‚ðƒsƒNƒ`ƒƒ‚Æ‚µ‚Ä•\Ž¦‚µ‚Ü‚·" ID_VIEW_DIR_STATEPANE "ƒfƒBƒŒƒNƒgƒŠ”äŠró‘ÔƒyƒCƒ“‚ð•\Ž¦‚µ‚Ü‚·" ID_VIEW_LANGUAGE "Œ»Ý‚̃†[ƒU[ƒCƒ“ƒ^[ƒtƒF[ƒXŒ¾Œê‚ð‘I‘ð‚µ‚Ü‚·\nŒ¾Œê" + ID_VIEW_LINEDIFFS "Shows differences inside lines with different color\nShow Line Diff" END // MERGE MENU diff --git a/Src/Languages/Japanese/resource.h b/Src/Languages/Japanese/resource.h index 3dd2d5683..c0eb7f686 100644 --- a/Src/Languages/Japanese/resource.h +++ b/Src/Languages/Japanese/resource.h @@ -233,6 +233,10 @@ #define IDC_SAVEPROJECT 1151 #define IDC_FILTERFILE_NEWBTN 1152 #define IDC_FILTERFILE_DELETEBTN 1153 +#define IDC_WORDDIFFERENCE_COLOR 1154 +#define IDC_SEL_WORDDIFFERENCE_COLOR 1155 +#define IDC_WORDDIFFERENCE_TEXT_COLOR 1156 +#define IDC_SEL_WORDDIFFERENCE_TEXT_COLOR 1157 #define IDC_EDIT_WHOLE_WORD 8603 @@ -769,6 +773,7 @@ #define ID_VIEW_LOCATION_BAR 32820 #define ID_VIEW_DIR_STATEPANE 32821 #define ID_VIEW_LANGUAGE 32822 +#define ID_VIEW_LINEDIFFS 32823 #define ID_PREVDIFF 32832 #define ID_NEXTDIFF 32833 diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc index 2de38b5d2..9b2b79885 100644 --- a/Src/Languages/Korean/MergeKorean.rc +++ b/Src/Languages/Korean/MergeKorean.rc @@ -176,6 +176,7 @@ BEGIN MENUITEM "±âº» ÆùÆ® »ç¿ë(&O)", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR MENUITEM "°ø¹é º¸±â(&V)", ID_VIEW_WHITESPACE + MENUITEM "Vie&w Line Differences", ID_VIEW_LINEDIFFS MENUITEM SEPARATOR MENUITEM "Åø¹Ù(&T)", ID_VIEW_TOOLBAR MENUITEM "»óÅ ǥ½ÃÁÙ(&S)", ID_VIEW_STATUS_BAR @@ -607,7 +608,7 @@ BEGIN ES_AUTOHSCROLL | ES_WANTRETURN END -IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 196 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "»ö»ó" FONT 8, "MS Shell Dlg" @@ -665,7 +666,21 @@ BEGIN CONTROL "Dif",IDC_SEL_MOVEDBLOCK_TEXT_COLOR,"Button", BS_OWNERDRAW | WS_TABSTOP,199,109,17,14, WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - PUSHBUTTON "±âº»°ª",IDC_COLORDEFAULTS_BTN,166,130,50,14 + RTEXT "Word Difference:",IDC_STATIC,7,129,90,8 + CONTROL "Dif",IDC_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + RTEXT "Selected Word Diff:",IDC_STATIC,7,149,90,8 + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + PUSHBUTTON "±âº»°ª",IDC_COLORDEFAULTS_BTN,166,170,50,14 END IDD_OUTPUT DIALOGEX 0, 0, 278, 157 @@ -2088,6 +2103,7 @@ BEGIN ID_VIEW_LOCATION_BAR "À§Ä¡ Ç¥½ÃâÀº Àüü ºñ±³ »óȲÀ» À̹ÌÁö·Î º¸¿©ÁÝ´Ï´Ù." ID_VIEW_DIR_STATEPANE "µð·ºÅ丮 ºñ±³ »óȲÀ» ¿ä¾àÇؼ­ º¾´Ï´Ù." ID_VIEW_LANGUAGE "¾ð¾î¸¦ ¼±ÅÃÇÕ´Ï´Ù.\n¾ð¾î" + ID_VIEW_LINEDIFFS "Shows differences inside lines with different color\nShow Line Diff" END // MERGE MENU diff --git a/Src/Languages/Korean/resource.h b/Src/Languages/Korean/resource.h index 3dd2d5683..c0eb7f686 100644 --- a/Src/Languages/Korean/resource.h +++ b/Src/Languages/Korean/resource.h @@ -233,6 +233,10 @@ #define IDC_SAVEPROJECT 1151 #define IDC_FILTERFILE_NEWBTN 1152 #define IDC_FILTERFILE_DELETEBTN 1153 +#define IDC_WORDDIFFERENCE_COLOR 1154 +#define IDC_SEL_WORDDIFFERENCE_COLOR 1155 +#define IDC_WORDDIFFERENCE_TEXT_COLOR 1156 +#define IDC_SEL_WORDDIFFERENCE_TEXT_COLOR 1157 #define IDC_EDIT_WHOLE_WORD 8603 @@ -769,6 +773,7 @@ #define ID_VIEW_LOCATION_BAR 32820 #define ID_VIEW_DIR_STATEPANE 32821 #define ID_VIEW_LANGUAGE 32822 +#define ID_VIEW_LINEDIFFS 32823 #define ID_PREVDIFF 32832 #define ID_NEXTDIFF 32833 diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc index 9f623a24d..3b1dce2ba 100644 --- a/Src/Languages/Norwegian/MergeNorwegian.rc +++ b/Src/Languages/Norwegian/MergeNorwegian.rc @@ -176,6 +176,7 @@ BEGIN MENUITEM "Bruk standard s&krifttype", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR MENUITEM "&Vis mellomrom", ID_VIEW_WHITESPACE + MENUITEM "Vie&w Line Differences", ID_VIEW_LINEDIFFS MENUITEM SEPARATOR MENUITEM "&verktøylinje", ID_VIEW_TOOLBAR MENUITEM "S&tatuslinje", ID_VIEW_STATUS_BAR @@ -607,7 +608,7 @@ BEGIN ES_AUTOHSCROLL | ES_WANTRETURN END -IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 196 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Farger" FONT 8, "MS Shell Dlg" @@ -665,7 +666,21 @@ BEGIN CONTROL "Dif",IDC_SEL_MOVEDBLOCK_TEXT_COLOR,"Button", BS_OWNERDRAW | WS_TABSTOP,199,109,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - PUSHBUTTON "Standardverdier",IDC_COLORDEFAULTS_BTN,166,130,70,14 + RTEXT "Word Difference:",IDC_STATIC,7,129,90,8 + CONTROL "Dif",IDC_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + RTEXT "Selected Word Diff:",IDC_STATIC,7,149,90,8 + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + PUSHBUTTON "Standardverdier",IDC_COLORDEFAULTS_BTN,166,170,70,14 END IDD_OUTPUT DIALOGEX 0, 0, 278, 157 @@ -2203,6 +2218,7 @@ BEGIN ID_VIEW_LOCATION_BAR "Plasseringsvindu viser oversiktbilde av filene" ID_VIEW_DIR_STATEPANE "Vis mappesammenligningsvindu" ID_VIEW_LANGUAGE "Velg språk til brukergrensesnittet\nSpråk" + ID_VIEW_LINEDIFFS "Shows differences inside lines with different color\nShow Line Diff" END // MERGE MENU diff --git a/Src/Languages/Norwegian/resource.h b/Src/Languages/Norwegian/resource.h index 3dd2d5683..c0eb7f686 100644 --- a/Src/Languages/Norwegian/resource.h +++ b/Src/Languages/Norwegian/resource.h @@ -233,6 +233,10 @@ #define IDC_SAVEPROJECT 1151 #define IDC_FILTERFILE_NEWBTN 1152 #define IDC_FILTERFILE_DELETEBTN 1153 +#define IDC_WORDDIFFERENCE_COLOR 1154 +#define IDC_SEL_WORDDIFFERENCE_COLOR 1155 +#define IDC_WORDDIFFERENCE_TEXT_COLOR 1156 +#define IDC_SEL_WORDDIFFERENCE_TEXT_COLOR 1157 #define IDC_EDIT_WHOLE_WORD 8603 @@ -769,6 +773,7 @@ #define ID_VIEW_LOCATION_BAR 32820 #define ID_VIEW_DIR_STATEPANE 32821 #define ID_VIEW_LANGUAGE 32822 +#define ID_VIEW_LINEDIFFS 32823 #define ID_PREVDIFF 32832 #define ID_NEXTDIFF 32833 diff --git a/Src/Languages/Polish/MergePolish.rc b/Src/Languages/Polish/MergePolish.rc index 0fe0cf54d..5a6f15f8a 100644 --- a/Src/Languages/Polish/MergePolish.rc +++ b/Src/Languages/Polish/MergePolish.rc @@ -176,6 +176,7 @@ BEGIN MENUITEM "Czcionka &domyslna", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR MENUITEM "&Pokaz biale znaki", ID_VIEW_WHITESPACE + MENUITEM "Vie&w Line Differences", ID_VIEW_LINEDIFFS MENUITEM SEPARATOR MENUITEM "Pasek &narzedzi", ID_VIEW_TOOLBAR MENUITEM "Pasek s&tanu", ID_VIEW_STATUS_BAR @@ -608,7 +609,7 @@ BEGIN ES_AUTOHSCROLL | ES_WANTRETURN END -IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 196 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Kolory" FONT 8, "MS Shell Dlg" @@ -666,7 +667,21 @@ BEGIN CONTROL "Dif",IDC_SEL_MOVEDBLOCK_TEXT_COLOR,"Button", BS_OWNERDRAW | WS_TABSTOP,199,109,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - PUSHBUTTON "Defaults",IDC_COLORDEFAULTS_BTN,166,130,50,14 + RTEXT "Word Difference:",IDC_STATIC,7,129,90,8 + CONTROL "Dif",IDC_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + RTEXT "Selected Word Diff:",IDC_STATIC,7,149,90,8 + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + PUSHBUTTON "Defaults",IDC_COLORDEFAULTS_BTN,166,170,50,14 END IDD_OUTPUT DIALOGEX 0, 0, 278, 157 @@ -2204,6 +2219,7 @@ BEGIN ID_VIEW_LOCATION_BAR "Location pane shows overall picture from files" ID_VIEW_DIR_STATEPANE "Show directory compare statepane" ID_VIEW_LANGUAGE "Wybierz jezyk interfejsu uzytkownika\nJezyk" + ID_VIEW_LINEDIFFS "Shows differences inside lines with different color\nShow Line Diff" END // MERGE MENU diff --git a/Src/Languages/Polish/resource.h b/Src/Languages/Polish/resource.h index 3dd2d5683..c0eb7f686 100644 --- a/Src/Languages/Polish/resource.h +++ b/Src/Languages/Polish/resource.h @@ -233,6 +233,10 @@ #define IDC_SAVEPROJECT 1151 #define IDC_FILTERFILE_NEWBTN 1152 #define IDC_FILTERFILE_DELETEBTN 1153 +#define IDC_WORDDIFFERENCE_COLOR 1154 +#define IDC_SEL_WORDDIFFERENCE_COLOR 1155 +#define IDC_WORDDIFFERENCE_TEXT_COLOR 1156 +#define IDC_SEL_WORDDIFFERENCE_TEXT_COLOR 1157 #define IDC_EDIT_WHOLE_WORD 8603 @@ -769,6 +773,7 @@ #define ID_VIEW_LOCATION_BAR 32820 #define ID_VIEW_DIR_STATEPANE 32821 #define ID_VIEW_LANGUAGE 32822 +#define ID_VIEW_LINEDIFFS 32823 #define ID_PREVDIFF 32832 #define ID_NEXTDIFF 32833 diff --git a/Src/Languages/Russian/MergeRussian.rc b/Src/Languages/Russian/MergeRussian.rc index ac525811f..59269f762 100644 --- a/Src/Languages/Russian/MergeRussian.rc +++ b/Src/Languages/Russian/MergeRussian.rc @@ -176,6 +176,7 @@ BEGIN MENUITEM "Èñïîëüçîâàòü øðèôò ïî &óìîë÷àíèþ", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR MENUITEM "Ïîêàçû&âàòü íåâèäèìûå", ID_VIEW_WHITESPACE + MENUITEM "Vie&w Line Differences", ID_VIEW_LINEDIFFS MENUITEM SEPARATOR MENUITEM "Ïà&íåëü èíñòðóìåíòîâ", ID_VIEW_TOOLBAR MENUITEM "&Ñòðîêà ñîñòîÿíèÿ", ID_VIEW_STATUS_BAR @@ -616,7 +617,7 @@ BEGIN ES_AUTOHSCROLL | ES_WANTRETURN END -IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 196 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Öâåòà" FONT 8, "MS Shell Dlg" @@ -674,7 +675,21 @@ BEGIN CONTROL "Dif",IDC_SEL_MOVEDBLOCK_TEXT_COLOR,"Button", BS_OWNERDRAW | WS_TABSTOP,199,109,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - PUSHBUTTON "Ïî óìîë÷àíèþ",IDC_COLORDEFAULTS_BTN,166,130,54,14 + RTEXT "Word Difference:",IDC_STATIC,7,129,90,8 + CONTROL "Dif",IDC_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + RTEXT "Selected Word Diff:",IDC_STATIC,7,149,90,8 + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + PUSHBUTTON "Ïî óìîë÷àíèþ",IDC_COLORDEFAULTS_BTN,166,170,54,14 END IDD_OUTPUT DIALOGEX 0, 0, 278, 157 @@ -2101,6 +2116,7 @@ BEGIN ID_VIEW_LOCATION_BAR "Location pane shows overall picture from files" ID_VIEW_DIR_STATEPANE "Show directory compare statepane" ID_VIEW_LANGUAGE "Âûáîð ÿçûêà ïîëüçîâàòåëÿ\nLanguage" + ID_VIEW_LINEDIFFS "Shows differences inside lines with different color\nShow Line Diff" END // MERGE MENU diff --git a/Src/Languages/Russian/resource.h b/Src/Languages/Russian/resource.h index 3dd2d5683..c0eb7f686 100644 --- a/Src/Languages/Russian/resource.h +++ b/Src/Languages/Russian/resource.h @@ -233,6 +233,10 @@ #define IDC_SAVEPROJECT 1151 #define IDC_FILTERFILE_NEWBTN 1152 #define IDC_FILTERFILE_DELETEBTN 1153 +#define IDC_WORDDIFFERENCE_COLOR 1154 +#define IDC_SEL_WORDDIFFERENCE_COLOR 1155 +#define IDC_WORDDIFFERENCE_TEXT_COLOR 1156 +#define IDC_SEL_WORDDIFFERENCE_TEXT_COLOR 1157 #define IDC_EDIT_WHOLE_WORD 8603 @@ -769,6 +773,7 @@ #define ID_VIEW_LOCATION_BAR 32820 #define ID_VIEW_DIR_STATEPANE 32821 #define ID_VIEW_LANGUAGE 32822 +#define ID_VIEW_LINEDIFFS 32823 #define ID_PREVDIFF 32832 #define ID_NEXTDIFF 32833 diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc index 10c752b1b..050476969 100644 --- a/Src/Languages/Slovak/MergeSlovak.rc +++ b/Src/Languages/Slovak/MergeSlovak.rc @@ -176,6 +176,7 @@ BEGIN MENUITEM "Použi základné písm&o", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR MENUITEM "&Zobraz prázdne miesto", ID_VIEW_WHITESPACE + MENUITEM "Vie&w Line Differences", ID_VIEW_LINEDIFFS MENUITEM SEPARATOR MENUITEM "&Panel nástrojov", ID_VIEW_TOOLBAR MENUITEM "&Stavový riadok", ID_VIEW_STATUS_BAR @@ -608,7 +609,7 @@ BEGIN ES_AUTOHSCROLL | ES_WANTRETURN END -IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 196 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Farby" FONT 8, "MS Shell Dlg" @@ -666,7 +667,21 @@ BEGIN CONTROL "Dif",IDC_SEL_MOVEDBLOCK_TEXT_COLOR,"Button", BS_OWNERDRAW | WS_TABSTOP,199,109,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - PUSHBUTTON "Defaults",IDC_COLORDEFAULTS_BTN,166,130,50,14 + RTEXT "Word Difference:",IDC_STATIC,7,129,90,8 + CONTROL "Dif",IDC_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + RTEXT "Selected Word Diff:",IDC_STATIC,7,149,90,8 + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + PUSHBUTTON "Defaults",IDC_COLORDEFAULTS_BTN,166,170,50,14 END IDD_OUTPUT DIALOGEX 0, 0, 278, 157 @@ -2204,6 +2219,7 @@ BEGIN ID_VIEW_LOCATION_BAR "Location pane shows overall picture from files" ID_VIEW_DIR_STATEPANE "Show directory compare statepane" ID_VIEW_LANGUAGE "Zvoli jazyk uživate¾ského rozhrania\nJazyk" + ID_VIEW_LINEDIFFS "Shows differences inside lines with different color\nShow Line Diff" END // MERGE MENU diff --git a/Src/Languages/Slovak/resource.h b/Src/Languages/Slovak/resource.h index 3dd2d5683..c0eb7f686 100644 --- a/Src/Languages/Slovak/resource.h +++ b/Src/Languages/Slovak/resource.h @@ -233,6 +233,10 @@ #define IDC_SAVEPROJECT 1151 #define IDC_FILTERFILE_NEWBTN 1152 #define IDC_FILTERFILE_DELETEBTN 1153 +#define IDC_WORDDIFFERENCE_COLOR 1154 +#define IDC_SEL_WORDDIFFERENCE_COLOR 1155 +#define IDC_WORDDIFFERENCE_TEXT_COLOR 1156 +#define IDC_SEL_WORDDIFFERENCE_TEXT_COLOR 1157 #define IDC_EDIT_WHOLE_WORD 8603 @@ -769,6 +773,7 @@ #define ID_VIEW_LOCATION_BAR 32820 #define ID_VIEW_DIR_STATEPANE 32821 #define ID_VIEW_LANGUAGE 32822 +#define ID_VIEW_LINEDIFFS 32823 #define ID_PREVDIFF 32832 #define ID_NEXTDIFF 32833 diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc index 77b44da59..6af429156 100644 --- a/Src/Languages/Spanish/MergeSpanish.rc +++ b/Src/Languages/Spanish/MergeSpanish.rc @@ -176,6 +176,7 @@ BEGIN MENUITEM "Usar Fuente de Sistema", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR MENUITEM "&View Whitespace", ID_VIEW_WHITESPACE + MENUITEM "Vie&w Line Differences", ID_VIEW_LINEDIFFS MENUITEM SEPARATOR MENUITEM "&Barra de Herramientas", ID_VIEW_TOOLBAR MENUITEM "&Barra de Estado", ID_VIEW_STATUS_BAR @@ -607,7 +608,7 @@ BEGIN ES_AUTOHSCROLL | ES_WANTRETURN END -IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 196 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Colors" FONT 8, "MS Shell Dlg" @@ -665,7 +666,21 @@ BEGIN CONTROL "Dif",IDC_SEL_MOVEDBLOCK_TEXT_COLOR,"Button", BS_OWNERDRAW | WS_TABSTOP,199,109,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - PUSHBUTTON "Defaults",IDC_COLORDEFAULTS_BTN,166,130,50,14 + RTEXT "Word Difference:",IDC_STATIC,7,129,90,8 + CONTROL "Dif",IDC_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + RTEXT "Selected Word Diff:",IDC_STATIC,7,149,90,8 + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + PUSHBUTTON "Defaults",IDC_COLORDEFAULTS_BTN,166,170,50,14 END IDD_OUTPUT DIALOGEX 0, 0, 278, 157 @@ -2204,6 +2219,7 @@ BEGIN ID_VIEW_LOCATION_BAR "Location pane shows overall picture from files" ID_VIEW_DIR_STATEPANE "Show directory compare statepane" ID_VIEW_LANGUAGE "Especifice a la idioma\nIdioma" + ID_VIEW_LINEDIFFS "Shows differences inside lines with different color\nShow Line Diff" END // MERGE MENU diff --git a/Src/Languages/Spanish/resource.h b/Src/Languages/Spanish/resource.h index 3dd2d5683..c0eb7f686 100644 --- a/Src/Languages/Spanish/resource.h +++ b/Src/Languages/Spanish/resource.h @@ -233,6 +233,10 @@ #define IDC_SAVEPROJECT 1151 #define IDC_FILTERFILE_NEWBTN 1152 #define IDC_FILTERFILE_DELETEBTN 1153 +#define IDC_WORDDIFFERENCE_COLOR 1154 +#define IDC_SEL_WORDDIFFERENCE_COLOR 1155 +#define IDC_WORDDIFFERENCE_TEXT_COLOR 1156 +#define IDC_SEL_WORDDIFFERENCE_TEXT_COLOR 1157 #define IDC_EDIT_WHOLE_WORD 8603 @@ -769,6 +773,7 @@ #define ID_VIEW_LOCATION_BAR 32820 #define ID_VIEW_DIR_STATEPANE 32821 #define ID_VIEW_LANGUAGE 32822 +#define ID_VIEW_LINEDIFFS 32823 #define ID_PREVDIFF 32832 #define ID_NEXTDIFF 32833 diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc index cabac7b0f..491ac57c9 100644 --- a/Src/Languages/Swedish/MergeSwedish.rc +++ b/Src/Languages/Swedish/MergeSwedish.rc @@ -175,6 +175,7 @@ BEGIN MENUITEM "Använd standardtec&kensnitt", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR MENUITEM "Visa &mellanslag", ID_VIEW_WHITESPACE + MENUITEM "Vie&w Line Differences", ID_VIEW_LINEDIFFS MENUITEM SEPARATOR MENUITEM "V&erktygsfält", ID_VIEW_TOOLBAR MENUITEM "S&tatusfält", ID_VIEW_STATUS_BAR @@ -606,7 +607,7 @@ BEGIN ES_AUTOHSCROLL | ES_WANTRETURN END -IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 196 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Färger" FONT 8, "MS Shell Dlg" @@ -664,7 +665,21 @@ BEGIN CONTROL "Dif",IDC_SEL_MOVEDBLOCK_TEXT_COLOR,"Button", BS_OWNERDRAW | WS_TABSTOP,199,109,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - PUSHBUTTON "Standard",IDC_COLORDEFAULTS_BTN,166,130,50,14 + RTEXT "Word Difference:",IDC_STATIC,7,129,90,8 + CONTROL "Dif",IDC_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + RTEXT "Selected Word Diff:",IDC_STATIC,7,149,90,8 + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + PUSHBUTTON "Standard",IDC_COLORDEFAULTS_BTN,166,170,50,14 END IDD_OUTPUT DIALOGEX 0, 0, 278, 157 @@ -2203,6 +2218,7 @@ BEGIN ID_VIEW_LOCATION_BAR "Skillnadsbilden visar en övergripande bild av filerna" ID_VIEW_DIR_STATEPANE "Visar jämför katalogs Statuspanel" ID_VIEW_LANGUAGE "Väljer språk för användargränssnittet\nSpråk" + ID_VIEW_LINEDIFFS "Shows differences inside lines with different color\nShow Line Diff" END // MERGE MENU diff --git a/Src/Languages/Swedish/resource.h b/Src/Languages/Swedish/resource.h index 3dd2d5683..c0eb7f686 100644 --- a/Src/Languages/Swedish/resource.h +++ b/Src/Languages/Swedish/resource.h @@ -233,6 +233,10 @@ #define IDC_SAVEPROJECT 1151 #define IDC_FILTERFILE_NEWBTN 1152 #define IDC_FILTERFILE_DELETEBTN 1153 +#define IDC_WORDDIFFERENCE_COLOR 1154 +#define IDC_SEL_WORDDIFFERENCE_COLOR 1155 +#define IDC_WORDDIFFERENCE_TEXT_COLOR 1156 +#define IDC_SEL_WORDDIFFERENCE_TEXT_COLOR 1157 #define IDC_EDIT_WHOLE_WORD 8603 @@ -769,6 +773,7 @@ #define ID_VIEW_LOCATION_BAR 32820 #define ID_VIEW_DIR_STATEPANE 32821 #define ID_VIEW_LANGUAGE 32822 +#define ID_VIEW_LINEDIFFS 32823 #define ID_PREVDIFF 32832 #define ID_NEXTDIFF 32833 diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp index 516e817b0..57a25bcff 100644 --- a/Src/MainFrm.cpp +++ b/Src/MainFrm.cpp @@ -182,6 +182,7 @@ CMainFrame::CMainFrame() m_options.InitOption(OPT_SHOW_STATUSBAR, true); m_options.InitOption(OPT_SYNTAX_HIGHLIGHT, true); + m_options.InitOption(OPT_WORDDIFF_HIGHLIGHT, true); m_options.InitOption(OPT_DISABLE_SPLASH, false); m_options.InitOption(OPT_CREATE_BACKUPS, true); m_options.InitOption(OPT_VIEW_WHITESPACE, false); @@ -226,6 +227,10 @@ CMainFrame::CMainFrame() m_options.InitOption(OPT_CLR_SELECTED_MOVEDBLOCK, (int)RGB(248,112,78)); m_options.InitOption(OPT_CLR_SELECTED_MOVEDBLOCK_DELETED, (int)RGB(252, 181, 163)); m_options.InitOption(OPT_CLR_SELECTED_MOVEDBLOCK_TEXT, (int)RGB(0,0,0)); + m_options.InitOption(OPT_CLR_WORDDIFF, (int)RGB(255,255,0)); + m_options.InitOption(OPT_CLR_SELECTED_WORDDIFF, (int)RGB(255,160,160)); + m_options.InitOption(OPT_CLR_WORDDIFF_TEXT, (int)RGB(0,0,0)); + m_options.InitOption(OPT_CLR_SELECTED_WORDDIFF_TEXT, (int)RGB(0,0,0)); m_options.InitOption(OPT_PROJECTS_PATH,_T("")); @@ -1251,6 +1256,10 @@ void CMainFrame::OnOptions() m_options.SaveOption(OPT_CLR_SELECTED_MOVEDBLOCK, (int)colors.m_clrSelMoved); m_options.SaveOption(OPT_CLR_SELECTED_MOVEDBLOCK_DELETED, (int)colors.m_clrSelMovedDeleted); m_options.SaveOption(OPT_CLR_SELECTED_MOVEDBLOCK_TEXT, (int)colors.m_clrSelMovedText); + m_options.SaveOption(OPT_CLR_WORDDIFF, (int)colors.m_clrWordDiff); + m_options.SaveOption(OPT_CLR_SELECTED_WORDDIFF, (int)colors.m_clrSelWordDiff); + m_options.SaveOption(OPT_CLR_WORDDIFF_TEXT, (int)colors.m_clrWordDiffText); + m_options.SaveOption(OPT_CLR_SELECTED_WORDDIFF_TEXT, (int)colors.m_clrSelWordDiffText); m_options.SaveOption(OPT_CP_DEFAULT_MODE, (int)codepage.m_nCodepageSystem); m_options.SaveOption(OPT_CP_DEFAULT_CUSTOM, (int)codepage.m_nCustomCodepageValue); m_options.SaveOption(OPT_CP_DETECT, codepage.m_bDetectCodepage == TRUE); diff --git a/Src/Merge.rc b/Src/Merge.rc index fabb0d0ee..dfcf97b0d 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -176,6 +176,7 @@ BEGIN MENUITEM "Use Default F&ont", ID_VIEW_USEDEFAULTFONT MENUITEM SEPARATOR MENUITEM "&View Whitespace", ID_VIEW_WHITESPACE + MENUITEM "Vie&w Line Differences", ID_VIEW_LINEDIFFS MENUITEM SEPARATOR MENUITEM "&Toolbar", ID_VIEW_TOOLBAR MENUITEM "&Status Bar", ID_VIEW_STATUS_BAR @@ -609,7 +610,7 @@ BEGIN ES_AUTOHSCROLL | ES_WANTRETURN END -IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 196 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Colors" FONT 8, "MS Shell Dlg" @@ -667,7 +668,21 @@ BEGIN CONTROL "Dif",IDC_SEL_MOVEDBLOCK_TEXT_COLOR,"Button", BS_OWNERDRAW | WS_TABSTOP,199,109,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - PUSHBUTTON "Defaults",IDC_COLORDEFAULTS_BTN,166,130,50,14 + RTEXT "Word Difference:",IDC_STATIC,7,129,90,8 + CONTROL "Dif",IDC_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,129,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + RTEXT "Selected Word Diff:",IDC_STATIC,7,149,90,8 + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,113,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_TEXT_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,199,149,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + PUSHBUTTON "Defaults",IDC_COLORDEFAULTS_BTN,166,170,50,14 END IDD_OUTPUT DIALOGEX 0, 0, 278, 157 @@ -2099,6 +2114,7 @@ BEGIN ID_VIEW_LOCATION_BAR "Location pane shows overall picture from files" ID_VIEW_DIR_STATEPANE "Show directory compare statepane" ID_VIEW_LANGUAGE "Select the current user interfacce language\nLanguage" + ID_VIEW_LINEDIFFS "Shows differences inside lines with different color\nShow Line Diff" END // MERGE MENU diff --git a/Src/MergeDiffDetailView.cpp b/Src/MergeDiffDetailView.cpp index 49e5a270d..8ac08303a 100644 --- a/Src/MergeDiffDetailView.cpp +++ b/Src/MergeDiffDetailView.cpp @@ -163,6 +163,65 @@ void CMergeDiffDetailView::OnInitialUpdate() displayLength = NROWS_INIT; } +int CMergeDiffDetailView::GetAdditionalTextBlocks (int nLineIndex, TEXTBLOCK *pBuf) +{ + if (nLineIndex < lineBegin || nLineIndex > lineEnd) + return 0; + + DWORD dwLineFlags = GetLineFlags(nLineIndex); + if ((dwLineFlags & LF_DIFF) != LF_DIFF || (dwLineFlags & LF_MOVED) == LF_MOVED) + return 0; + + if (!mf->m_options.GetBool(OPT_WORDDIFF_HIGHLIGHT)) + return 0; + + int nLineLength = GetLineLength(nLineIndex); + wdiffarray worddiffs; + GetDocument()->GetWordDiffArray(nLineIndex, &worddiffs); + if (worddiffs.GetSize() == 0 || (worddiffs[0].end[0] == -1 && worddiffs[0].end[1] + 1 == nLineLength) || (worddiffs[0].end[1] == -1 && worddiffs[0].end[0] + 1 == nLineLength)) + return 0; + + int nWordDiffs = worddiffs.GetSize(); + + pBuf[0].m_nCharPos = 0; + pBuf[0].m_nColorIndex = COLORINDEX_NONE; + pBuf[0].m_nBgColorIndex = COLORINDEX_NONE; + for (int i = 0; i < nWordDiffs; i++) + { + if (m_bIsLeft) + { + pBuf[1 + i * 2].m_nCharPos = worddiffs[i].start[0]; + pBuf[2 + i * 2].m_nCharPos = worddiffs[i].end[0] + 1; + } + else + { + pBuf[1 + i * 2].m_nCharPos = worddiffs[i].start[1]; + pBuf[2 + i * 2].m_nCharPos = worddiffs[i].end[1] + 1; + } + pBuf[1 + i * 2].m_nColorIndex = COLORINDEX_HIGHLIGHTTEXT1 | COLORINDEX_APPLYFORCE; + pBuf[1 + i * 2].m_nBgColorIndex = COLORINDEX_HIGHLIGHTBKGND1 | COLORINDEX_APPLYFORCE; + pBuf[2 + i * 2].m_nColorIndex = COLORINDEX_NONE; + pBuf[2 + i * 2].m_nBgColorIndex = COLORINDEX_NONE; + } + return nWordDiffs * 2 + 1; +} + +COLORREF CMergeDiffDetailView::GetColor(int nColorIndex) +{ + switch (nColorIndex & ~COLORINDEX_APPLYFORCE) + { + case COLORINDEX_HIGHLIGHTBKGND1: + return mf->m_options.GetInt(OPT_CLR_SELECTED_WORDDIFF); + case COLORINDEX_HIGHLIGHTTEXT1: + return mf->m_options.GetInt(OPT_CLR_SELECTED_WORDDIFF_TEXT); + case COLORINDEX_HIGHLIGHTBKGND2: + return mf->m_options.GetInt(OPT_CLR_WORDDIFF); + case COLORINDEX_HIGHLIGHTTEXT2: + return mf->m_options.GetInt(OPT_CLR_WORDDIFF_TEXT); + default: + return CCrystalTextView::GetColor(nColorIndex); + } +} /// virtual, avoid coloring the whole diff with diff color void CMergeDiffDetailView::GetLineColors(int nLineIndex, COLORREF & crBkgnd, diff --git a/Src/MergeDiffDetailView.h b/Src/MergeDiffDetailView.h index 60459a810..f37845dc3 100644 --- a/Src/MergeDiffDetailView.h +++ b/Src/MergeDiffDetailView.h @@ -107,6 +107,8 @@ protected: // Implementation protected: virtual ~CMergeDiffDetailView(); + virtual int GetAdditionalTextBlocks (int nLineIndex, TEXTBLOCK *pBuf); + virtual COLORREF GetColor(int nColorIndex); virtual void GetLineColors (int nLineIndex, COLORREF & crBkgnd, COLORREF & crText, BOOL & bDrawWhitespace); virtual void OnUpdateSibling (CCrystalTextView * pUpdateSource, BOOL bHorz); diff --git a/Src/MergeDoc.h b/Src/MergeDoc.h index 9dbcf6561..33db85f7b 100644 --- a/Src/MergeDoc.h +++ b/Src/MergeDoc.h @@ -32,6 +32,7 @@ #include #include "DiffWrapper.h" #include "DiffList.h" +#include "stringdiffs.h" #ifndef _DIFF_FILE_INFO_H_INCLUDED #include "DiffFileInfo.h" @@ -254,6 +255,7 @@ public: typedef enum { BYTEDIFF, WORDDIFF } DIFFLEVEL; void Showlinediff(CMergeEditView * pView, DIFFLEVEL difflvl); void Showlinediff(CMergeDiffDetailView * pView, DIFFLEVEL difflvl); + void GetWordDiffArray(int nLineIndex, wdiffarray *pworddiffs); private: void Computelinediff(CCrystalTextView * pView, CCrystalTextView * pOther, int line, CRect * rc1, CRect * rc2, DIFFLEVEL difflvl); // End MergeDocLineDiffs.cpp diff --git a/Src/MergeDocLineDiffs.cpp b/Src/MergeDocLineDiffs.cpp index 61fc9cc08..3805f438a 100644 --- a/Src/MergeDocLineDiffs.cpp +++ b/Src/MergeDocLineDiffs.cpp @@ -304,3 +304,49 @@ void CMergeDoc::Computelinediff(CCrystalTextView * pView1, CCrystalTextView * pV } } +void CMergeDoc::GetWordDiffArray(int nLineIndex, wdiffarray *pworddiffs) +{ + if (nLineIndex >= m_pLeftView->GetLineCount()) return; + if (nLineIndex >= m_pRightView->GetLineCount()) return; + + DIFFOPTIONS diffOptions = {0}; + m_diffWrapper.GetOptions(&diffOptions); + + CString str1 = m_pLeftView->GetLineChars(nLineIndex); + CString str2 = m_pRightView->GetLineChars(nLineIndex); + + if (!diffOptions.bEolSensitive) + { + /* Commented out code because GetLineActualLength is buggy + // Chop of eol (end of line) characters + int len1 = pView1->GetLineActualLength(line); + str1 = str1.Left(len1); + int len2 = pView2->GetLineActualLength(line); + str2 = str2.Left(len2); + */ + int i = str1.GetLength()-1; + while (i>=0 && (str1[i]=='\r' || str1[i]=='\n')) + --i; + if (i+1 < str1.GetLength()) + str1 = str1.Left(i+1); + i = str2.GetLength()-1; + while (i>=0 && (str2[i]=='\r' || str2[i]=='\n')) + --i; + if (i+1 < str2.GetLength()) + str2 = str2.Left(i+1); + } + + // We truncate diffs to remain inside line (ie, to not flag eol characters) + int width1 = m_pLeftView->GetLineLength(nLineIndex); + int width2 = m_pRightView->GetLineLength(nLineIndex); + + // Options that affect comparison + bool casitive = !diffOptions.bIgnoreCase; + int xwhite = diffOptions.nIgnoreWhitespace; + + // Make the call to stringdiffs, which does all the hard & tedious computations + stringdiffs_Get(str1, str2, casitive, xwhite, pworddiffs); + + return; +} + diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp index f518d9154..07ea5408d 100644 --- a/Src/MergeEditView.cpp +++ b/Src/MergeEditView.cpp @@ -70,6 +70,7 @@ CMergeEditView::CMergeEditView() m_bCloseWithEsc = mf->m_options.GetBool(OPT_CLOSE_WITH_ESC); m_bSyntaxHighlight = mf->m_options.GetBool(OPT_SYNTAX_HIGHLIGHT); + m_bWordDiffHighlight = mf->m_options.GetBool(OPT_WORDDIFF_HIGHLIGHT); m_cachedColors.clrDiff = mf->m_options.GetInt(OPT_CLR_DIFF); m_cachedColors.clrSelDiff = mf->m_options.GetInt(OPT_CLR_SELECTED_DIFF); m_cachedColors.clrDiffDeleted = mf->m_options.GetInt(OPT_CLR_DIFF_DELETED); @@ -85,6 +86,10 @@ CMergeEditView::CMergeEditView() m_cachedColors.clrSelMoved = mf->m_options.GetInt(OPT_CLR_SELECTED_MOVEDBLOCK); m_cachedColors.clrSelMovedDeleted = mf->m_options.GetInt(OPT_CLR_SELECTED_MOVEDBLOCK_DELETED); m_cachedColors.clrSelMovedText = mf->m_options.GetInt(OPT_CLR_SELECTED_MOVEDBLOCK_TEXT); + m_cachedColors.clrWordDiff = mf->m_options.GetInt(OPT_CLR_WORDDIFF); + m_cachedColors.clrSelWordDiff = mf->m_options.GetInt(OPT_CLR_SELECTED_WORDDIFF); + m_cachedColors.clrWordDiffText = mf->m_options.GetInt(OPT_CLR_WORDDIFF_TEXT); + m_cachedColors.clrSelWordDiffText = mf->m_options.GetInt(OPT_CLR_SELECTED_WORDDIFF_TEXT); } CMergeEditView::~CMergeEditView() @@ -170,6 +175,8 @@ BEGIN_MESSAGE_MAP(CMergeEditView, CCrystalEditViewEx) ON_WM_VSCROLL () ON_COMMAND(ID_EDIT_COPY_LINENUMBERS, OnEditCopyLineNumbers) ON_UPDATE_COMMAND_UI(ID_EDIT_COPY_LINENUMBERS, OnUpdateEditCopyLinenumbers) + ON_COMMAND(ID_VIEW_LINEDIFFS, OnViewLineDiffs) + ON_UPDATE_COMMAND_UI(ID_VIEW_LINEDIFFS, OnUpdateViewLineDiffs) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -322,6 +329,72 @@ void CMergeEditView::OnActivateView(BOOL bActivate, CView* pActivateView, CView* mf->UpdatePrediffersMenu(); } +int CMergeEditView::GetAdditionalTextBlocks (int nLineIndex, TEXTBLOCK *pBuf) +{ + DWORD dwLineFlags = GetLineFlags(nLineIndex); + if ((dwLineFlags & LF_DIFF) != LF_DIFF || (dwLineFlags & LF_MOVED) == LF_MOVED) + return 0; + + if (!m_bWordDiffHighlight) + return 0; + + int nLineLength = GetLineLength(nLineIndex); + wdiffarray worddiffs; + GetDocument()->GetWordDiffArray(nLineIndex, &worddiffs); + if (worddiffs.GetSize() == 0 || (worddiffs[0].end[0] == -1 && worddiffs[0].end[1] + 1 == nLineLength) || (worddiffs[0].end[1] == -1 && worddiffs[0].end[0] + 1 == nLineLength)) + return 0; + + BOOL lineInCurrentDiff = IsLineInCurrentDiff(nLineIndex); + int nWordDiffs = worddiffs.GetSize(); + + pBuf[0].m_nCharPos = 0; + pBuf[0].m_nColorIndex = COLORINDEX_NONE; + pBuf[0].m_nBgColorIndex = COLORINDEX_NONE; + for (int i = 0; i < nWordDiffs; i++) + { + if (m_bIsLeft) + { + pBuf[1 + i * 2].m_nCharPos = worddiffs[i].start[0]; + pBuf[2 + i * 2].m_nCharPos = worddiffs[i].end[0] + 1; + } + else + { + pBuf[1 + i * 2].m_nCharPos = worddiffs[i].start[1]; + pBuf[2 + i * 2].m_nCharPos = worddiffs[i].end[1] + 1; + } + if (lineInCurrentDiff) + { + pBuf[1 + i * 2].m_nColorIndex = COLORINDEX_HIGHLIGHTTEXT1 | COLORINDEX_APPLYFORCE; + pBuf[1 + i * 2].m_nBgColorIndex = COLORINDEX_HIGHLIGHTBKGND1 | COLORINDEX_APPLYFORCE; + } + else + { + pBuf[1 + i * 2].m_nColorIndex = COLORINDEX_HIGHLIGHTTEXT2 | COLORINDEX_APPLYFORCE; + pBuf[1 + i * 2].m_nBgColorIndex = COLORINDEX_HIGHLIGHTBKGND2 | COLORINDEX_APPLYFORCE; + } + pBuf[2 + i * 2].m_nColorIndex = COLORINDEX_NONE; + pBuf[2 + i * 2].m_nBgColorIndex = COLORINDEX_NONE; + } + return nWordDiffs * 2 + 1; +} + +COLORREF CMergeEditView::GetColor(int nColorIndex) +{ + switch (nColorIndex & ~COLORINDEX_APPLYFORCE) + { + case COLORINDEX_HIGHLIGHTBKGND1: + return m_cachedColors.clrSelWordDiff; + case COLORINDEX_HIGHLIGHTTEXT1: + return m_cachedColors.clrSelWordDiffText; + case COLORINDEX_HIGHLIGHTBKGND2: + return m_cachedColors.clrWordDiff; + case COLORINDEX_HIGHLIGHTTEXT2: + return m_cachedColors.clrWordDiffText; + default: + return CCrystalTextView::GetColor(nColorIndex); + } +} + /** * @brief Determine text and background color for line * @param [in] nLineIndex Index of line in view (NOT line in file) @@ -2115,6 +2188,7 @@ void CMergeEditView::RefreshOptions() m_bCloseWithEsc = mf->m_options.GetBool(OPT_CLOSE_WITH_ESC); m_bSyntaxHighlight = mf->m_options.GetBool(OPT_SYNTAX_HIGHLIGHT); + m_bWordDiffHighlight = mf->m_options.GetBool(OPT_WORDDIFF_HIGHLIGHT); m_cachedColors.clrDiff = mf->m_options.GetInt(OPT_CLR_DIFF); m_cachedColors.clrSelDiff = mf->m_options.GetInt(OPT_CLR_SELECTED_DIFF); m_cachedColors.clrDiffDeleted = mf->m_options.GetInt(OPT_CLR_DIFF_DELETED); @@ -2130,6 +2204,10 @@ void CMergeEditView::RefreshOptions() m_cachedColors.clrSelMoved = mf->m_options.GetInt(OPT_CLR_SELECTED_MOVEDBLOCK); m_cachedColors.clrSelMovedDeleted = mf->m_options.GetInt(OPT_CLR_SELECTED_MOVEDBLOCK_DELETED); m_cachedColors.clrSelMovedText = mf->m_options.GetInt(OPT_CLR_SELECTED_MOVEDBLOCK_TEXT); + m_cachedColors.clrWordDiff = mf->m_options.GetInt(OPT_CLR_WORDDIFF); + m_cachedColors.clrSelWordDiff = mf->m_options.GetInt(OPT_CLR_SELECTED_WORDDIFF); + m_cachedColors.clrWordDiffText = mf->m_options.GetInt(OPT_CLR_WORDDIFF_TEXT); + m_cachedColors.clrSelWordDiffText = mf->m_options.GetInt(OPT_CLR_SELECTED_WORDDIFF_TEXT); } /** @@ -2453,3 +2531,22 @@ void CMergeEditView::RepaintLocationPane() if (m_pLocationView) m_pLocationView->Invalidate(); } + +/** + * @brief Enables/disables linediff (different color for diffs) + */ +void CMergeEditView::OnViewLineDiffs() +{ + mf->m_options.SaveOption(OPT_WORDDIFF_HIGHLIGHT, !m_bWordDiffHighlight); + + // Call CMergeDoc RefreshOptions() to refresh *both* views + CMergeDoc *pDoc = GetDocument(); + pDoc->RefreshOptions(); + pDoc->FlushAndRescan(TRUE); +} + +void CMergeEditView::OnUpdateViewLineDiffs(CCmdUI* pCmdUI) +{ + pCmdUI->Enable(TRUE); + pCmdUI->SetCheck(m_bWordDiffHighlight); +} diff --git a/Src/MergeEditView.h b/Src/MergeEditView.h index 60a249140..644a3fa1b 100644 --- a/Src/MergeEditView.h +++ b/Src/MergeEditView.h @@ -49,6 +49,10 @@ struct COLORSETTINGS COLORREF clrSelMoved; /**< Selected moved block color */ COLORREF clrSelMovedDeleted; /**< Selected moved block deleted color */ COLORREF clrSelMovedText; /**< Selected moved block text color */ + COLORREF clrWordDiff; /**< Word difference color */ + COLORREF clrWordDiffText; /**< Word difference text color */ + COLORREF clrSelWordDiff; /**< Selected word difference color */ + COLORREF clrSelWordDiffText; /**< Selected word difference text color */ }; /** @@ -135,6 +139,7 @@ private: BOOL fTimerWaitingForIdle; COLORSETTINGS m_cachedColors; /**< Cached color settings */ BOOL m_bSyntaxHighlight; /**< Cached setting for syntax highlight */ + BOOL m_bWordDiffHighlight; /**< Cached setting for word diff highlight */ BOOL m_bCloseWithEsc; /**< Cached setting for closing windows with ESC */ /// active prediffer ID : helper to check the radio button @@ -165,6 +170,8 @@ public: void SetStatusInterface(IMergeEditStatus * piMergeEditStatus); void SelectArea(const CPoint & ptStart, const CPoint & ptEnd) { SetSelection(ptStart, ptEnd); } // make public virtual void UpdateSiblingScrollPos (BOOL bHorz); + virtual int GetAdditionalTextBlocks (int nLineIndex, TEXTBLOCK *pBuf); + virtual COLORREF GetColor(int nColorIndex); virtual void GetLineColors (int nLineIndex, COLORREF & crBkgnd, COLORREF & crText, BOOL & bDrawWhitespace); void WMGoto() { OnWMGoto(); }; @@ -273,6 +280,8 @@ protected: afx_msg void OnVScroll (UINT nSBCode, UINT nPos, CScrollBar * pScrollBar); afx_msg void OnEditCopyLineNumbers(); afx_msg void OnUpdateEditCopyLinenumbers(CCmdUI* pCmdUI); + afx_msg void OnViewLineDiffs(); + afx_msg void OnUpdateViewLineDiffs(CCmdUI* pCmdUI); //}}AFX_MSG DECLARE_MESSAGE_MAP() }; diff --git a/Src/OptionsDef.h b/Src/OptionsDef.h index 1fa79896a..cf02f8aff 100644 --- a/Src/OptionsDef.h +++ b/Src/OptionsDef.h @@ -23,6 +23,7 @@ const TCHAR OPT_SHOW_TOOLBAR[] = _T("Settings/ShowToolbar"); const TCHAR OPT_SHOW_STATUSBAR[] = _T("Settings/ShowStatusbar"); const TCHAR OPT_SYNTAX_HIGHLIGHT[] = _T("Settings/HiliteSyntax"); +const TCHAR OPT_WORDDIFF_HIGHLIGHT[] = _T("Settings/HiliteWordDiff"); const TCHAR OPT_DISABLE_SPLASH[] = _T("Settings/DisableSplash"); const TCHAR OPT_CREATE_BACKUPS[] = _T("Settings/BackupFile"); const TCHAR OPT_VIEW_WHITESPACE[] = _T("Settings/ViewWhitespace"); @@ -80,6 +81,14 @@ const TCHAR OPT_CLR_SELECTED_MOVEDBLOCK[] = _T("Settings/SelectedMovedBlockColor const TCHAR OPT_CLR_SELECTED_MOVEDBLOCK_DELETED[] = _T("Settings/SelectedMovedBlockDeletedColor"); // The selected moved block text color const TCHAR OPT_CLR_SELECTED_MOVEDBLOCK_TEXT[] = _T("Settings/SelectedMovedBlockTextColor"); +// The word difference color +const TCHAR OPT_CLR_WORDDIFF[] = _T("Settings/WordDifferenceColor"); +// The selected word difference color +const TCHAR OPT_CLR_SELECTED_WORDDIFF[] = _T("Settings/SelectedWordDifferenceColor"); +// The word difference text color +const TCHAR OPT_CLR_WORDDIFF_TEXT[] = _T("Settings/WordDifferenceTextColor"); +// The selected word difference text color +const TCHAR OPT_CLR_SELECTED_WORDDIFF_TEXT[] = _T("Settings/SelectedWordDifferenceTextColor"); // Compare options const TCHAR OPT_CMP_IGNORE_WHITESPACE[] = _T("Settings/IgnoreSpace"); diff --git a/Src/PropColors.cpp b/Src/PropColors.cpp index b6f455121..18abb4be3 100644 --- a/Src/PropColors.cpp +++ b/Src/PropColors.cpp @@ -41,6 +41,10 @@ CPropColors::CPropColors(COptionsMgr *optionsMgr) : CPropertyPage(CPropColors::I m_clrSelMoved = optionsMgr->GetInt(OPT_CLR_SELECTED_MOVEDBLOCK); m_clrSelMovedDeleted = optionsMgr->GetInt(OPT_CLR_SELECTED_MOVEDBLOCK_DELETED); m_clrSelMovedText = optionsMgr->GetInt(OPT_CLR_SELECTED_MOVEDBLOCK_TEXT); + m_clrWordDiff = optionsMgr->GetInt(OPT_CLR_WORDDIFF); + m_clrSelWordDiff = optionsMgr->GetInt(OPT_CLR_SELECTED_WORDDIFF); + m_clrWordDiffText = optionsMgr->GetInt(OPT_CLR_WORDDIFF_TEXT); + m_clrSelWordDiffText = optionsMgr->GetInt(OPT_CLR_SELECTED_WORDDIFF_TEXT); // Set colors for buttons, do NOT invalidate m_cDiff.SetColor(m_clrDiff, FALSE); @@ -58,6 +62,10 @@ CPropColors::CPropColors(COptionsMgr *optionsMgr) : CPropertyPage(CPropColors::I m_cSelMoved.SetColor(m_clrSelMoved, FALSE); m_cSelMovedDeleted.SetColor(m_clrSelMovedDeleted, FALSE); m_cSelMovedText.SetColor(m_clrSelMovedText, FALSE); + m_cWordDiff.SetColor(m_clrWordDiff, FALSE); + m_cSelWordDiff.SetColor(m_clrSelWordDiff, FALSE); + m_cWordDiffText.SetColor(m_clrWordDiffText, FALSE); + m_cSelWordDiffText.SetColor(m_clrSelWordDiffText, FALSE); m_pOptionsMgr = optionsMgr; //}}AFX_DATA_INIT @@ -82,6 +90,10 @@ void CPropColors::DoDataExchange(CDataExchange* pDX) DDX_Control(pDX, IDC_SEL_MOVEDBLOCK_COLOR, m_cSelMoved); DDX_Control(pDX, IDC_SEL_MOVEDBLOCK_DELETED_COLOR, m_cSelMovedDeleted); DDX_Control(pDX, IDC_SEL_MOVEDBLOCK_TEXT_COLOR, m_cSelMovedText); + DDX_Control(pDX, IDC_SEL_WORDDIFFERENCE_TEXT_COLOR, m_cSelWordDiffText); + DDX_Control(pDX, IDC_WORDDIFFERENCE_TEXT_COLOR, m_cWordDiffText); + DDX_Control(pDX, IDC_SEL_WORDDIFFERENCE_COLOR, m_cSelWordDiff); + DDX_Control(pDX, IDC_WORDDIFFERENCE_COLOR, m_cWordDiff); //}}AFX_DATA_MAP } @@ -104,6 +116,10 @@ BEGIN_MESSAGE_MAP(CPropColors, CDialog) ON_BN_CLICKED(IDC_SEL_MOVEDBLOCK_COLOR, OnSelMovedColor) ON_BN_CLICKED(IDC_SEL_MOVEDBLOCK_DELETED_COLOR, OnSelMovedDeletedColor) ON_BN_CLICKED(IDC_SEL_MOVEDBLOCK_TEXT_COLOR, OnSelMovedTextColor) + ON_BN_CLICKED(IDC_WORDDIFFERENCE_COLOR, OnWordDifferenceColor) + ON_BN_CLICKED(IDC_SEL_WORDDIFFERENCE_COLOR, OnSelWordDifferenceColor) + ON_BN_CLICKED(IDC_WORDDIFFERENCE_TEXT_COLOR, OnWordDifferenceTextColor) + ON_BN_CLICKED(IDC_SEL_WORDDIFFERENCE_TEXT_COLOR, OnSelWordDifferenceTextColor) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -342,6 +358,74 @@ void CPropColors::OnSelMovedTextColor() } /** + * @brief User wants to change word difference color + */ +void CPropColors::OnWordDifferenceColor() +{ + CColorDialog dialog(m_clrWordDiff); + LoadCustomColors(); + dialog.m_cc.lpCustColors = m_cCustColors; + + if (dialog.DoModal() == IDOK) + { + m_clrWordDiff = dialog.GetColor(); + m_cWordDiff.SetColor(m_clrWordDiff); + } + SaveCustomColors(); +} + +/** + * @brief User wants to change selected word difference color + */ +void CPropColors::OnSelWordDifferenceColor() +{ + CColorDialog dialog(m_clrSelWordDiff); + LoadCustomColors(); + dialog.m_cc.lpCustColors = m_cCustColors; + + if (dialog.DoModal() == IDOK) + { + m_clrSelWordDiff = dialog.GetColor(); + m_cSelWordDiff.SetColor(m_clrSelWordDiff); + } + SaveCustomColors(); +} + +/** + * @brief User wants to change word difference text color + */ +void CPropColors::OnWordDifferenceTextColor() +{ + CColorDialog dialog(m_clrWordDiffText); + LoadCustomColors(); + dialog.m_cc.lpCustColors = m_cCustColors; + + if (dialog.DoModal() == IDOK) + { + m_clrWordDiffText = dialog.GetColor(); + m_cWordDiffText.SetColor(m_clrWordDiffText); + } + SaveCustomColors(); +} + +/** + * @brief User wants to change selected word difference text color + */ +void CPropColors::OnSelWordDifferenceTextColor() +{ + CColorDialog dialog(m_clrSelWordDiffText); + LoadCustomColors(); + dialog.m_cc.lpCustColors = m_cCustColors; + + if (dialog.DoModal() == IDOK) + { + m_clrSelWordDiffText = dialog.GetColor(); + m_cSelWordDiffText.SetColor(m_clrSelWordDiffText); + } + SaveCustomColors(); +} + +/** * @brief Resets colors to defaults */ void CPropColors::OnDefaults() @@ -361,6 +445,10 @@ void CPropColors::OnDefaults() m_pOptionsMgr->GetDefault(OPT_CLR_SELECTED_MOVEDBLOCK, m_clrSelMoved); m_pOptionsMgr->GetDefault(OPT_CLR_SELECTED_MOVEDBLOCK_DELETED, m_clrSelMovedDeleted); m_pOptionsMgr->GetDefault(OPT_CLR_SELECTED_MOVEDBLOCK_TEXT, m_clrSelMovedText); + m_pOptionsMgr->GetDefault(OPT_CLR_WORDDIFF, m_clrWordDiff); + m_pOptionsMgr->GetDefault(OPT_CLR_SELECTED_WORDDIFF, m_clrSelWordDiff); + m_pOptionsMgr->GetDefault(OPT_CLR_WORDDIFF_TEXT, m_clrWordDiffText); + m_pOptionsMgr->GetDefault(OPT_CLR_SELECTED_WORDDIFF_TEXT, m_clrSelWordDiffText); m_cDiff.SetColor(m_clrDiff); m_cSelDiff.SetColor(m_clrSelDiff); @@ -377,6 +465,10 @@ void CPropColors::OnDefaults() m_cSelMoved.SetColor(m_clrSelMoved); m_cSelMovedDeleted.SetColor(m_clrSelMovedDeleted); m_cSelMovedText.SetColor(m_clrSelMovedText); + m_cWordDiff.SetColor(m_clrWordDiff); + m_cSelWordDiff.SetColor(m_clrSelWordDiff); + m_cWordDiffText.SetColor(m_clrWordDiffText); + m_cSelWordDiffText.SetColor(m_clrSelWordDiffText); } /** diff --git a/Src/PropColors.h b/Src/PropColors.h index ee3a7082f..d595894ae 100644 --- a/Src/PropColors.h +++ b/Src/PropColors.h @@ -45,6 +45,10 @@ public: CColorButton m_cSelMoved; CColorButton m_cSelMovedDeleted; CColorButton m_cSelMovedText; + CColorButton m_cSelWordDiffText; + CColorButton m_cWordDiffText; + CColorButton m_cSelWordDiff; + CColorButton m_cWordDiff; //}}AFX_DATA @@ -63,6 +67,10 @@ public: COLORREF m_clrSelMoved; COLORREF m_clrSelMovedDeleted; COLORREF m_clrSelMovedText; + COLORREF m_clrWordDiff; + COLORREF m_clrWordDiffText; + COLORREF m_clrSelWordDiff; + COLORREF m_clrSelWordDiffText; // Overrides // ClassWizard generated virtual function overrides @@ -96,6 +104,10 @@ protected: afx_msg void OnSelMovedColor(); afx_msg void OnSelMovedDeletedColor(); afx_msg void OnSelMovedTextColor(); + afx_msg void OnWordDifferenceColor(); + afx_msg void OnSelWordDifferenceColor(); + afx_msg void OnWordDifferenceTextColor(); + afx_msg void OnSelWordDifferenceTextColor(); afx_msg void OnDefaults(); //}}AFX_MSG DECLARE_MESSAGE_MAP() diff --git a/Src/editlib/asp.cpp b/Src/editlib/asp.cpp index be4d64598..d25751e32 100644 --- a/Src/editlib/asp.cpp +++ b/Src/editlib/asp.cpp @@ -519,6 +519,7 @@ if (pBuf != NULL)\ if (nActualItems == 0 || pBuf[nActualItems - 1].m_nCharPos <= (pos)){\ pBuf[nActualItems].m_nCharPos = (pos);\ pBuf[nActualItems].m_nColorIndex = (colorindex);\ + pBuf[nActualItems].m_nBgColorIndex = COLORINDEX_BKGND;\ nActualItems ++;}\ } diff --git a/Src/editlib/basic.cpp b/Src/editlib/basic.cpp index 16b047379..a1e533182 100644 --- a/Src/editlib/basic.cpp +++ b/Src/editlib/basic.cpp @@ -259,6 +259,7 @@ if (pBuf != NULL)\ if (nActualItems == 0 || pBuf[nActualItems - 1].m_nCharPos <= (pos)){\ pBuf[nActualItems].m_nCharPos = (pos);\ pBuf[nActualItems].m_nColorIndex = (colorindex);\ + pBuf[nActualItems].m_nBgColorIndex = COLORINDEX_BKGND;\ nActualItems ++;}\ } diff --git a/Src/editlib/batch.cpp b/Src/editlib/batch.cpp index ac73ee4f5..b6a585cf9 100644 --- a/Src/editlib/batch.cpp +++ b/Src/editlib/batch.cpp @@ -637,6 +637,7 @@ if (pBuf != NULL)\ if (nActualItems == 0 || pBuf[nActualItems - 1].m_nCharPos <= (pos)){\ pBuf[nActualItems].m_nCharPos = (pos);\ pBuf[nActualItems].m_nColorIndex = (colorindex);\ + pBuf[nActualItems].m_nBgColorIndex = COLORINDEX_BKGND;\ nActualItems ++;}\ } diff --git a/Src/editlib/ccrystaltextview.cpp b/Src/editlib/ccrystaltextview.cpp index 32544dd9e..880fe0871 100644 --- a/Src/editlib/ccrystaltextview.cpp +++ b/Src/editlib/ccrystaltextview.cpp @@ -945,7 +945,7 @@ int CCrystalTextView::GetCharWidthFromDisplayableChar(const ViewableWhitespaceCh */ void CCrystalTextView:: DrawLineHelperImpl (CDC * pdc, CPoint & ptOrigin, const CRect & rcClip, - int nColorIndex, COLORREF crText, COLORREF crBkgnd, LPCTSTR pszChars, int nOffset, int nCount, int &nActualOffset) + int nColorIndex, int nBgColorIndex, COLORREF crText, COLORREF crBkgnd, LPCTSTR pszChars, int nOffset, int nCount, int &nActualOffset) { ASSERT (nCount >= 0); if (nCount > 0) @@ -1024,11 +1024,14 @@ DrawLineHelperImpl (CDC * pdc, CPoint & ptOrigin, const CRect & rcClip, if (ptOrigin.x + nSumWidth > rcClip.left) { - if (crText == CLR_NONE) + if (crText == CLR_NONE || nColorIndex & COLORINDEX_APPLYFORCE) pdc->SetTextColor(GetColor(nColorIndex)); else pdc->SetTextColor(crText); - pdc->SetBkColor(crBkgnd); + if (crBkgnd == CLR_NONE || nBgColorIndex & COLORINDEX_APPLYFORCE) + pdc->SetBkColor(GetColor(nBgColorIndex)); + else + pdc->SetBkColor(crBkgnd); pdc->SelectObject(GetFont(GetItalic(nColorIndex), GetBold(nColorIndex))); @@ -1053,7 +1056,7 @@ DrawLineHelperImpl (CDC * pdc, CPoint & ptOrigin, const CRect & rcClip, } void CCrystalTextView:: -DrawLineHelper (CDC * pdc, CPoint & ptOrigin, const CRect & rcClip, int nColorIndex, +DrawLineHelper (CDC * pdc, CPoint & ptOrigin, const CRect & rcClip, int nColorIndex, int nBgColorIndex, COLORREF crText, COLORREF crBkgnd, LPCTSTR pszChars, int nOffset, int nCount, int &nActualOffset, CPoint ptTextPos) { if (nCount > 0) @@ -1093,23 +1096,24 @@ DrawLineHelper (CDC * pdc, CPoint & ptOrigin, const CRect & rcClip, int nColorIn // Draw part of the text before selection if (nSelBegin > 0) { - DrawLineHelperImpl (pdc, ptOrigin, rcClip, nColorIndex, crText, crBkgnd, pszChars, nOffset, nSelBegin, nActualOffset); + DrawLineHelperImpl (pdc, ptOrigin, rcClip, nColorIndex, nBgColorIndex, crText, crBkgnd, pszChars, nOffset, nSelBegin, nActualOffset); } if (nSelBegin < nSelEnd) { - DrawLineHelperImpl (pdc, ptOrigin, rcClip, nColorIndex, + DrawLineHelperImpl (pdc, ptOrigin, rcClip, + nColorIndex & ~COLORINDEX_APPLYFORCE, nBgColorIndex & ~COLORINDEX_APPLYFORCE, GetColor (COLORINDEX_SELTEXT), GetColor (COLORINDEX_SELBKGND), pszChars, nOffset + nSelBegin, nSelEnd - nSelBegin, nActualOffset); } if (nSelEnd < nCount) { - DrawLineHelperImpl (pdc, ptOrigin, rcClip, nColorIndex, crText, crBkgnd, pszChars, nOffset + nSelEnd, nCount - nSelEnd, nActualOffset); + DrawLineHelperImpl (pdc, ptOrigin, rcClip, nColorIndex, nBgColorIndex, crText, crBkgnd, pszChars, nOffset + nSelEnd, nCount - nSelEnd, nActualOffset); } } else { - DrawLineHelperImpl (pdc, ptOrigin, rcClip, nColorIndex, crText, crBkgnd, pszChars, nOffset, nCount, nActualOffset); + DrawLineHelperImpl (pdc, ptOrigin, rcClip, nColorIndex, nBgColorIndex, crText, crBkgnd, pszChars, nOffset, nCount, nActualOffset); } } } @@ -1178,6 +1182,12 @@ GetParseCookie (int nLineIndex) return m_ParseCookies->GetAt(nLineIndex); } +int CCrystalTextView:: +GetAdditionalTextBlocks (int nLineIndex, TEXTBLOCK *pBuf) +{ + return 0; +} + //BEGIN SW void CCrystalTextView::WrapLine( int nLineIndex, int nMaxLineWidth, int *anBreaks, int &nBreaks ) { @@ -1282,7 +1292,7 @@ void CCrystalTextView::DrawScreenLine( CDC *pdc, CPoint &ptOrigin, const CRect & int nOffsetToUse = (nOffset > pBuf[I].m_nCharPos) ? nOffset : pBuf[I].m_nCharPos; - DrawLineHelper(pdc, ptOrigin, rcClip, pBuf[I].m_nColorIndex, crText, crBkgnd, pszChars, + DrawLineHelper(pdc, ptOrigin, rcClip, pBuf[I].m_nColorIndex, pBuf[I].m_nBgColorIndex, crText, crBkgnd, pszChars, (nOffset > pBuf[I].m_nCharPos)? nOffset : pBuf[I].m_nCharPos, pBuf[I + 1].m_nCharPos - nOffsetToUse, nActualOffset, CPoint( nOffsetToUse, ptTextPos.y )); @@ -1295,7 +1305,7 @@ void CCrystalTextView::DrawScreenLine( CDC *pdc, CPoint &ptOrigin, const CRect & ASSERT(pBuf[nActualItem].m_nCharPos >= 0 && pBuf[nActualItem].m_nCharPos <= nLineLength); - DrawLineHelper(pdc, ptOrigin, rcClip, pBuf[nActualItem].m_nColorIndex, + DrawLineHelper(pdc, ptOrigin, rcClip, pBuf[nActualItem].m_nColorIndex, pBuf[nActualItem].m_nBgColorIndex, crText, crBkgnd, pszChars, pBuf[nActualItem].m_nCharPos, nOffset + nCount - pBuf[nActualItem].m_nCharPos, nActualOffset, CPoint(pBuf[nActualItem].m_nCharPos, ptTextPos.y)); @@ -1303,7 +1313,7 @@ void CCrystalTextView::DrawScreenLine( CDC *pdc, CPoint &ptOrigin, const CRect & else { DrawLineHelper( - pdc, ptOrigin, rcClip, pBuf[nActualItem].m_nColorIndex, + pdc, ptOrigin, rcClip, pBuf[nActualItem].m_nColorIndex, pBuf[nActualItem].m_nBgColorIndex, crText, crBkgnd, pszChars, nOffset, nCount, nActualOffset, ptTextPos); } @@ -1342,6 +1352,63 @@ public: explicit IntArray(int len) { SetSize(len); } }; +int CCrystalTextView:: +MergeTextBlocks (TEXTBLOCK *pBuf1, int nBlocks1, TEXTBLOCK *pBuf2, int nBlocks2, TEXTBLOCK *&pMergedBuf) +{ + int i, j, k; + + pMergedBuf = new TEXTBLOCK[nBlocks1 + nBlocks2]; + + for (i = 0, j = 0, k = 0; ; k++) + { + if (i >= nBlocks1 && j >= nBlocks2) + { + break; + } + else if ((i < nBlocks1 && j < nBlocks2) && (pBuf1[i].m_nCharPos == pBuf2[j].m_nCharPos)) + { + pMergedBuf[k].m_nCharPos = pBuf2[j].m_nCharPos; + if (pBuf2[j].m_nColorIndex == COLORINDEX_NONE) + pMergedBuf[k].m_nColorIndex = pBuf1[i].m_nColorIndex; + else + pMergedBuf[k].m_nColorIndex = pBuf2[j].m_nColorIndex; + if (pBuf2[j].m_nBgColorIndex == COLORINDEX_NONE) + pMergedBuf[k].m_nBgColorIndex = pBuf1[i].m_nBgColorIndex; + else + pMergedBuf[k].m_nBgColorIndex = pBuf2[j].m_nBgColorIndex; + i++; + j++; + } + else if (j >= nBlocks2 || (i < nBlocks1 && pBuf1[i].m_nCharPos < pBuf2[j].m_nCharPos)) + { + pMergedBuf[k].m_nCharPos = pBuf1[i].m_nCharPos; + if (nBlocks2 == 0 || pBuf2[j - 1].m_nColorIndex == COLORINDEX_NONE) + pMergedBuf[k].m_nColorIndex = pBuf1[i].m_nColorIndex; + else + pMergedBuf[k].m_nColorIndex = pBuf2[j - 1].m_nColorIndex; + if (nBlocks2 == 0 || pBuf2[j - 1].m_nBgColorIndex == COLORINDEX_NONE) + pMergedBuf[k].m_nBgColorIndex = pBuf1[i].m_nBgColorIndex; + else + pMergedBuf[k].m_nBgColorIndex = pBuf2[j - 1].m_nBgColorIndex; + i++; + } + else if (i >= nBlocks1 || (j < nBlocks2 && pBuf1[i].m_nCharPos > pBuf2[j].m_nCharPos)) + { + pMergedBuf[k].m_nCharPos = pBuf2[j].m_nCharPos; + if (i > 0 && pBuf2[j].m_nColorIndex == COLORINDEX_NONE) + pMergedBuf[k].m_nColorIndex = pBuf1[i - 1].m_nColorIndex; + else + pMergedBuf[k].m_nColorIndex = pBuf2[j].m_nColorIndex; + if (i > 0 && pBuf2[j].m_nBgColorIndex == COLORINDEX_NONE) + pMergedBuf[k].m_nBgColorIndex = pBuf1[i - 1].m_nBgColorIndex; + else + pMergedBuf[k].m_nBgColorIndex = pBuf2[j].m_nBgColorIndex; + j++; + } + } + return k; +} + void CCrystalTextView:: DrawSingleLine (CDC * pdc, const CRect & rc, int nLineIndex) { @@ -1359,8 +1426,6 @@ DrawSingleLine (CDC * pdc, const CRect & rc, int nLineIndex) BOOL bDrawWhitespace = FALSE; COLORREF crBkgnd, crText; GetLineColors (nLineIndex, crBkgnd, crText, bDrawWhitespace); - if (crBkgnd == CLR_NONE) - crBkgnd = GetColor (COLORINDEX_BKGND); int nLength = GetLineLength (nLineIndex); LPCTSTR pszChars = GetLineChars (nLineIndex); @@ -1377,11 +1442,26 @@ DrawSingleLine (CDC * pdc, const CRect & rc, int nLineIndex) // insert at least one textblock of normal color at the beginning pBuf[0].m_nCharPos = 0; pBuf[0].m_nColorIndex = COLORINDEX_NORMALTEXT; + pBuf[0].m_nBgColorIndex = COLORINDEX_BKGND; nBlocks++; //END SW m_ParseCookies->SetAt(nLineIndex, ParseLine (dwCookie, nLineIndex, pBuf, nBlocks)); ASSERT (m_ParseCookies->GetAt(nLineIndex) != - 1); +//////// + TEXTBLOCK *pAddedBuf = new TEXTBLOCK[(nLength+1) * 3]; + int nAddedBlocks = GetAdditionalTextBlocks(nLineIndex, pAddedBuf); + + TEXTBLOCK *pMergedBuf; + int nMergedBlocks = MergeTextBlocks(pBuf, nBlocks, pAddedBuf, nAddedBlocks, pMergedBuf); + + delete[] pBuf; + delete[] pAddedBuf; + + pBuf = pMergedBuf; + nBlocks = nMergedBlocks; +/////// + //BEGIN SW int nActualItem = 0; int nActualOffset = 0; @@ -1394,7 +1474,8 @@ DrawSingleLine (CDC * pdc, const CRect & rc, int nLineIndex) // Draw the line text CPoint origin (rc.left - m_nOffsetChar * nCharWidth, rc.top); - pdc->SetBkColor (crBkgnd); + if (crBkgnd != CLR_NONE) + pdc->SetBkColor (crBkgnd); if (crText != CLR_NONE) pdc->SetTextColor (crText); // BOOL bColorSet = FALSE; @@ -1497,7 +1578,7 @@ DrawSingleLine (CDC * pdc, const CRect & rc, int nLineIndex) COLORREF CCrystalTextView:: GetColor (int nColorIndex) { - switch (nColorIndex) + switch (nColorIndex & ~COLORINDEX_APPLYFORCE) { case COLORINDEX_WHITESPACE : case COLORINDEX_BKGND: @@ -1531,6 +1612,14 @@ GetColor (int nColorIndex) return RGB (0, 0, 0); case COLORINDEX_SELTEXT: return RGB (255, 255, 255); + case COLORINDEX_HIGHLIGHTBKGND1: + return RGB (255, 160, 160); + case COLORINDEX_HIGHLIGHTTEXT1: + return RGB (0, 0, 0); + case COLORINDEX_HIGHLIGHTBKGND2: + return RGB (255, 255, 0); + case COLORINDEX_HIGHLIGHTTEXT2: + return RGB (0, 0, 0); } // return RGB(255, 0, 0); return RGB (128, 0, 0); diff --git a/Src/editlib/ccrystaltextview.h b/Src/editlib/ccrystaltextview.h index 936bcb902..a1cf3d0f7 100644 --- a/Src/editlib/ccrystaltextview.h +++ b/Src/editlib/ccrystaltextview.h @@ -167,7 +167,7 @@ protected: int ApproxActualOffset (int nLineIndex, int nOffset); void AdjustTextPoint (CPoint & point); void DrawLineHelperImpl (CDC * pdc, CPoint & ptOrigin, const CRect & rcClip, - int nColorIndex, COLORREF crText, COLORREF crBkgnd, LPCTSTR pszChars, int nOffset, int nCount, int &nActualOffset); + int nColorIndex, int nBgColorIndex, COLORREF crText, COLORREF crBkgnd, LPCTSTR pszChars, int nOffset, int nCount, int &nActualOffset); BOOL IsInsideSelBlock (CPoint ptTextPos); BOOL m_bBookmarkExist; // More bookmarks @@ -431,7 +431,7 @@ protected: virtual BOOL GetItalic (int nColorIndex); virtual BOOL GetBold (int nColorIndex); - void DrawLineHelper (CDC * pdc, CPoint & ptOrigin, const CRect & rcClip, int nColorIndex, + void DrawLineHelper (CDC * pdc, CPoint & ptOrigin, const CRect & rcClip, int nColorIndex, int nBgColorIndex, COLORREF crText, COLORREF crBkgnd, LPCTSTR pszChars, int nOffset, int nCount, int &nActualOffset, CPoint ptTextPos); virtual void DrawSingleLine (CDC * pdc, const CRect & rect, int nLineIndex); virtual void DrawMargin (CDC * pdc, const CRect & rect, int nLineIndex); @@ -524,6 +524,7 @@ protected: { int m_nCharPos; int m_nColorIndex; + int m_nBgColorIndex; }; virtual HINSTANCE GetResourceHandle (); @@ -538,6 +539,8 @@ protected: int nOffset, int nCount, int &nActualOffset, CPoint ptTextPos ); //END SW + int MergeTextBlocks(TEXTBLOCK *pBuf1, int nBlocks1, TEXTBLOCK *pBuf2, int nBlocks2, TEXTBLOCK *&pBufMerged); + virtual int GetAdditionalTextBlocks (int nLineIndex, TEXTBLOCK *pBuf); //BEGIN SW // helpers for incremental search @@ -740,6 +743,7 @@ public : enum { + COLORINDEX_NONE, // Base colors COLORINDEX_WHITESPACE, COLORINDEX_BKGND, @@ -763,7 +767,14 @@ public : COLORINDEX_EXECUTIONBKGND, COLORINDEX_EXECUTIONTEXT, COLORINDEX_BREAKPOINTBKGND, - COLORINDEX_BREAKPOINTTEXT + COLORINDEX_BREAKPOINTTEXT, + // + COLORINDEX_HIGHLIGHTBKGND1, + COLORINDEX_HIGHLIGHTTEXT1, + COLORINDEX_HIGHLIGHTBKGND2, + COLORINDEX_HIGHLIGHTTEXT2, + // + COLORINDEX_APPLYFORCE = 0x80000000 // ... // Expandable: custom elements are allowed. }; diff --git a/Src/editlib/cplusplus.cpp b/Src/editlib/cplusplus.cpp index 7ab3303b9..b2dc663d0 100644 --- a/Src/editlib/cplusplus.cpp +++ b/Src/editlib/cplusplus.cpp @@ -244,6 +244,7 @@ if (pBuf != NULL)\ if (nActualItems == 0 || pBuf[nActualItems - 1].m_nCharPos <= (pos)){\ pBuf[nActualItems].m_nCharPos = (pos);\ pBuf[nActualItems].m_nColorIndex = (colorindex);\ + pBuf[nActualItems].m_nBgColorIndex = COLORINDEX_BKGND;\ nActualItems ++;}\ } diff --git a/Src/editlib/csharp.cpp b/Src/editlib/csharp.cpp index 411ff6102..9642c70a0 100644 --- a/Src/editlib/csharp.cpp +++ b/Src/editlib/csharp.cpp @@ -168,6 +168,7 @@ if (pBuf != NULL)\ if (nActualItems == 0 || pBuf[nActualItems - 1].m_nCharPos <= (pos)){\ pBuf[nActualItems].m_nCharPos = (pos);\ pBuf[nActualItems].m_nColorIndex = (colorindex);\ + pBuf[nActualItems].m_nBgColorIndex = COLORINDEX_BKGND;\ nActualItems ++;}\ } diff --git a/Src/editlib/dcl.cpp b/Src/editlib/dcl.cpp index 5e0b7655c..96227af77 100644 --- a/Src/editlib/dcl.cpp +++ b/Src/editlib/dcl.cpp @@ -171,6 +171,7 @@ if (pBuf != NULL)\ if (nActualItems == 0 || pBuf[nActualItems - 1].m_nCharPos <= (pos)){\ pBuf[nActualItems].m_nCharPos = (pos);\ pBuf[nActualItems].m_nColorIndex = (colorindex);\ + pBuf[nActualItems].m_nBgColorIndex = COLORINDEX_BKGND;\ nActualItems ++;}\ } diff --git a/Src/editlib/fortran.cpp b/Src/editlib/fortran.cpp index fd985b6c9..8ec544a59 100644 --- a/Src/editlib/fortran.cpp +++ b/Src/editlib/fortran.cpp @@ -285,6 +285,7 @@ if (pBuf != NULL)\ if (nActualItems == 0 || pBuf[nActualItems - 1].m_nCharPos <= (pos)){\ pBuf[nActualItems].m_nCharPos = (pos);\ pBuf[nActualItems].m_nColorIndex = (colorindex);\ + pBuf[nActualItems].m_nBgColorIndex = COLORINDEX_BKGND;\ nActualItems ++;}\ } diff --git a/Src/editlib/html.cpp b/Src/editlib/html.cpp index df82ab9b5..e91326b0a 100644 --- a/Src/editlib/html.cpp +++ b/Src/editlib/html.cpp @@ -430,6 +430,7 @@ if (pBuf != NULL)\ if (nActualItems == 0 || pBuf[nActualItems - 1].m_nCharPos <= (pos)){\ pBuf[nActualItems].m_nCharPos = (pos);\ pBuf[nActualItems].m_nColorIndex = (colorindex);\ + pBuf[nActualItems].m_nBgColorIndex = COLORINDEX_BKGND;\ nActualItems ++;}\ } diff --git a/Src/editlib/ini.cpp b/Src/editlib/ini.cpp index 8e5fae65d..e12911c62 100644 --- a/Src/editlib/ini.cpp +++ b/Src/editlib/ini.cpp @@ -57,6 +57,7 @@ if (pBuf != NULL)\ if (nActualItems == 0 || pBuf[nActualItems - 1].m_nCharPos <= (pos)){\ pBuf[nActualItems].m_nCharPos = (pos);\ pBuf[nActualItems].m_nColorIndex = (colorindex);\ + pBuf[nActualItems].m_nBgColorIndex = COLORINDEX_BKGND;\ nActualItems ++;}\ } diff --git a/Src/editlib/is.cpp b/Src/editlib/is.cpp index de706d118..197d84f14 100644 --- a/Src/editlib/is.cpp +++ b/Src/editlib/is.cpp @@ -477,6 +477,7 @@ if (pBuf != NULL)\ if (nActualItems == 0 || pBuf[nActualItems - 1].m_nCharPos <= (pos)){\ pBuf[nActualItems].m_nCharPos = (pos);\ pBuf[nActualItems].m_nColorIndex = (colorindex);\ + pBuf[nActualItems].m_nBgColorIndex = COLORINDEX_BKGND;\ nActualItems ++;}\ } diff --git a/Src/editlib/java.cpp b/Src/editlib/java.cpp index 35d5f4e68..1610889bb 100644 --- a/Src/editlib/java.cpp +++ b/Src/editlib/java.cpp @@ -130,6 +130,7 @@ if (pBuf != NULL)\ if (nActualItems == 0 || pBuf[nActualItems - 1].m_nCharPos <= (pos)){\ pBuf[nActualItems].m_nCharPos = (pos);\ pBuf[nActualItems].m_nColorIndex = (colorindex);\ + pBuf[nActualItems].m_nBgColorIndex = COLORINDEX_BKGND;\ nActualItems ++;}\ } diff --git a/Src/editlib/lisp.cpp b/Src/editlib/lisp.cpp index b072f2a63..c5f51a4ff 100644 --- a/Src/editlib/lisp.cpp +++ b/Src/editlib/lisp.cpp @@ -306,6 +306,7 @@ if (pBuf != NULL)\ if (nActualItems == 0 || pBuf[nActualItems - 1].m_nCharPos <= (pos)){\ pBuf[nActualItems].m_nCharPos = (pos);\ pBuf[nActualItems].m_nColorIndex = (colorindex);\ + pBuf[nActualItems].m_nBgColorIndex = COLORINDEX_BKGND;\ nActualItems ++;}\ } diff --git a/Src/editlib/pascal.cpp b/Src/editlib/pascal.cpp index 00e90464b..e83588b68 100644 --- a/Src/editlib/pascal.cpp +++ b/Src/editlib/pascal.cpp @@ -131,6 +131,7 @@ if (pBuf != NULL)\ if (nActualItems == 0 || pBuf[nActualItems - 1].m_nCharPos <= (pos)){\ pBuf[nActualItems].m_nCharPos = (pos);\ pBuf[nActualItems].m_nColorIndex = (colorindex);\ + pBuf[nActualItems].m_nBgColorIndex = COLORINDEX_BKGND;\ nActualItems ++;}\ } diff --git a/Src/editlib/perl.cpp b/Src/editlib/perl.cpp index 3db474c2a..a412e8ce9 100644 --- a/Src/editlib/perl.cpp +++ b/Src/editlib/perl.cpp @@ -302,6 +302,7 @@ if (pBuf != NULL)\ if (nActualItems == 0 || pBuf[nActualItems - 1].m_nCharPos <= (pos)){\ pBuf[nActualItems].m_nCharPos = (pos);\ pBuf[nActualItems].m_nColorIndex = (colorindex);\ + pBuf[nActualItems].m_nBgColorIndex = COLORINDEX_BKGND;\ nActualItems ++;}\ } diff --git a/Src/editlib/php.cpp b/Src/editlib/php.cpp index a42cae523..3a949d2d0 100644 --- a/Src/editlib/php.cpp +++ b/Src/editlib/php.cpp @@ -519,6 +519,7 @@ if (pBuf != NULL)\ if (nActualItems == 0 || pBuf[nActualItems - 1].m_nCharPos <= (pos)){\ pBuf[nActualItems].m_nCharPos = (pos);\ pBuf[nActualItems].m_nColorIndex = (colorindex);\ + pBuf[nActualItems].m_nBgColorIndex = COLORINDEX_BKGND;\ nActualItems ++;}\ } diff --git a/Src/editlib/python.cpp b/Src/editlib/python.cpp index af7d673e4..99b119c15 100644 --- a/Src/editlib/python.cpp +++ b/Src/editlib/python.cpp @@ -220,6 +220,7 @@ if (pBuf != NULL)\ if (nActualItems == 0 || pBuf[nActualItems - 1].m_nCharPos <= (pos)){\ pBuf[nActualItems].m_nCharPos = (pos);\ pBuf[nActualItems].m_nColorIndex = (colorindex);\ + pBuf[nActualItems].m_nBgColorIndex = COLORINDEX_BKGND;\ nActualItems ++;}\ } diff --git a/Src/editlib/rexx.cpp b/Src/editlib/rexx.cpp index 624940f41..649476209 100644 --- a/Src/editlib/rexx.cpp +++ b/Src/editlib/rexx.cpp @@ -158,6 +158,7 @@ if (pBuf != NULL)\ if (nActualItems == 0 || pBuf[nActualItems - 1].m_nCharPos <= (pos)){\ pBuf[nActualItems].m_nCharPos = (pos);\ pBuf[nActualItems].m_nColorIndex = (colorindex);\ + pBuf[nActualItems].m_nBgColorIndex = COLORINDEX_BKGND;\ nActualItems ++;}\ } diff --git a/Src/editlib/rsrc.cpp b/Src/editlib/rsrc.cpp index 3d4f2741f..3548d4ddd 100644 --- a/Src/editlib/rsrc.cpp +++ b/Src/editlib/rsrc.cpp @@ -222,6 +222,7 @@ if (pBuf != NULL)\ if (nActualItems == 0 || pBuf[nActualItems - 1].m_nCharPos <= (pos)){\ pBuf[nActualItems].m_nCharPos = (pos);\ pBuf[nActualItems].m_nColorIndex = (colorindex);\ + pBuf[nActualItems].m_nBgColorIndex = COLORINDEX_BKGND;\ nActualItems ++;}\ } diff --git a/Src/editlib/sgml.cpp b/Src/editlib/sgml.cpp index 8a8b382eb..f21ffffe5 100644 --- a/Src/editlib/sgml.cpp +++ b/Src/editlib/sgml.cpp @@ -262,6 +262,7 @@ if (pBuf != NULL)\ if (nActualItems == 0 || pBuf[nActualItems - 1].m_nCharPos <= (pos)){\ pBuf[nActualItems].m_nCharPos = (pos);\ pBuf[nActualItems].m_nColorIndex = (colorindex);\ + pBuf[nActualItems].m_nBgColorIndex = COLORINDEX_BKGND;\ nActualItems ++;}\ } diff --git a/Src/editlib/sh.cpp b/Src/editlib/sh.cpp index 55e16eb52..70d8cb471 100644 --- a/Src/editlib/sh.cpp +++ b/Src/editlib/sh.cpp @@ -127,6 +127,7 @@ if (pBuf != NULL)\ if (nActualItems == 0 || pBuf[nActualItems - 1].m_nCharPos <= (pos)){\ pBuf[nActualItems].m_nCharPos = (pos);\ pBuf[nActualItems].m_nColorIndex = (colorindex);\ + pBuf[nActualItems].m_nBgColorIndex = COLORINDEX_BKGND;\ nActualItems ++;}\ } diff --git a/Src/editlib/siod.cpp b/Src/editlib/siod.cpp index 91d376b98..68d5cc20d 100644 --- a/Src/editlib/siod.cpp +++ b/Src/editlib/siod.cpp @@ -384,6 +384,7 @@ if (pBuf != NULL)\ if (nActualItems == 0 || pBuf[nActualItems - 1].m_nCharPos <= (pos)){\ pBuf[nActualItems].m_nCharPos = (pos);\ pBuf[nActualItems].m_nColorIndex = (colorindex);\ + pBuf[nActualItems].m_nBgColorIndex = COLORINDEX_BKGND;\ nActualItems ++;}\ } diff --git a/Src/editlib/sql.cpp b/Src/editlib/sql.cpp index 30d767540..18bc3609b 100644 --- a/Src/editlib/sql.cpp +++ b/Src/editlib/sql.cpp @@ -118,6 +118,7 @@ if (pBuf != NULL)\ if (nActualItems == 0 || pBuf[nActualItems - 1].m_nCharPos <= (pos)){\ pBuf[nActualItems].m_nCharPos = (pos);\ pBuf[nActualItems].m_nColorIndex = (colorindex);\ + pBuf[nActualItems].m_nBgColorIndex = COLORINDEX_BKGND;\ nActualItems ++;}\ } diff --git a/Src/editlib/tcl.cpp b/Src/editlib/tcl.cpp index 663dd2e8c..308c9449e 100644 --- a/Src/editlib/tcl.cpp +++ b/Src/editlib/tcl.cpp @@ -94,6 +94,7 @@ if (pBuf != NULL)\ if (nActualItems == 0 || pBuf[nActualItems - 1].m_nCharPos <= (pos)){\ pBuf[nActualItems].m_nCharPos = (pos);\ pBuf[nActualItems].m_nColorIndex = (colorindex);\ + pBuf[nActualItems].m_nBgColorIndex = COLORINDEX_BKGND;\ nActualItems ++;}\ } diff --git a/Src/editlib/tex.cpp b/Src/editlib/tex.cpp index c002c0500..e72521b90 100644 --- a/Src/editlib/tex.cpp +++ b/Src/editlib/tex.cpp @@ -915,6 +915,7 @@ if (pBuf != NULL)\ if (nActualItems == 0 || pBuf[nActualItems - 1].m_nCharPos <= (pos)){\ pBuf[nActualItems].m_nCharPos = (pos);\ pBuf[nActualItems].m_nColorIndex = (colorindex);\ + pBuf[nActualItems].m_nBgColorIndex = COLORINDEX_BKGND;\ nActualItems ++;}\ } diff --git a/Src/editlib/xml.cpp b/Src/editlib/xml.cpp index 951ef20c7..783d491be 100644 --- a/Src/editlib/xml.cpp +++ b/Src/editlib/xml.cpp @@ -231,6 +231,7 @@ if (pBuf != NULL)\ if (nActualItems == 0 || pBuf[nActualItems - 1].m_nCharPos <= (pos)){\ pBuf[nActualItems].m_nCharPos = (pos);\ pBuf[nActualItems].m_nColorIndex = (colorindex);\ + pBuf[nActualItems].m_nBgColorIndex = COLORINDEX_BKGND;\ nActualItems ++;}\ } diff --git a/Src/readme.txt b/Src/readme.txt index 16f70da7a..158e3b63d 100644 --- a/Src/readme.txt +++ b/Src/readme.txt @@ -6,6 +6,16 @@ Src: DiffContext.cpp DiffContext.h DirDoc.cpp DirView.h DirViewColHandler.cpp PATCH: [ 1156188 ] Updated readme-innosetup Docs/Developers: readme-developers-InnoSetup.html + PATCH: [ 1147039 ] experimental patch for colored word diff + Submitted by Takashi Sawanaka + Src: MainFrm.cpp Merge.rc MergeDiffDetailView.cpp MergeDiffDetailView.h MergeDoc.h + MergeDocLineDiffs.cpp MergeEditView.cpp MergeEditView.h OptionsDef.h + PropColors.cpp PropColors.h resource.h + Src/editlib: asp.cpp basic.cpp batch.cpp ccrystaltextview.cpp ccrystaltextview.h + cplusplus.cpp csharp.cpp dcl.cpp fortran.cpp html.cpp ini.cpp is.cpp java.cpp + lisp.cpp pascal.cpp perl.cpp php.cpp python.cpp rexx.cpp rsrc.cpp sgml.cpp sh.cpp + siod.cpp sql.cpp tcl.cpp tex.cpp xml.cpp + Src/Languages: *.rc resource.h 2005-03-04 Perry PATCH: [ 1156253 ] Fix filter helper handling of new filters diff --git a/Src/resource.h b/Src/resource.h index 3dd2d5683..c0eb7f686 100644 --- a/Src/resource.h +++ b/Src/resource.h @@ -233,6 +233,10 @@ #define IDC_SAVEPROJECT 1151 #define IDC_FILTERFILE_NEWBTN 1152 #define IDC_FILTERFILE_DELETEBTN 1153 +#define IDC_WORDDIFFERENCE_COLOR 1154 +#define IDC_SEL_WORDDIFFERENCE_COLOR 1155 +#define IDC_WORDDIFFERENCE_TEXT_COLOR 1156 +#define IDC_SEL_WORDDIFFERENCE_TEXT_COLOR 1157 #define IDC_EDIT_WHOLE_WORD 8603 @@ -769,6 +773,7 @@ #define ID_VIEW_LOCATION_BAR 32820 #define ID_VIEW_DIR_STATEPANE 32821 #define ID_VIEW_LANGUAGE 32822 +#define ID_VIEW_LINEDIFFS 32823 #define ID_PREVDIFF 32832 #define ID_NEXTDIFF 32833 -- 2.11.0