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
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"
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
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
#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
#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
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
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"
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
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
#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
#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
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
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"
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
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
#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
#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
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
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"
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
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
#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
#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
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
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"
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
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
#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
#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
MENUITEM "Pou\9eí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
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"
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
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\9eivatelské rozhraní\nLanguage"
+ ID_VIEW_LINEDIFFS "Shows differences inside lines with different color\nShow Line Diff"
END
// MERGE MENU
#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
#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
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
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"
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
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
#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
#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
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
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"
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
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
#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
#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
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
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
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
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
#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
#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
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
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"
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
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
#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
#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
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
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"
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
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
#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
#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
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
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"
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
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
#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
#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
MENUITEM "\83f\83t\83H\83\8b\83g\83t\83H\83\93\83g\82ð\8eg\97p(&O)", ID_VIEW_USEDEFAULTFONT
MENUITEM SEPARATOR
MENUITEM "\8bó\94\92\82ð\95\\8e¦(&V)", ID_VIEW_WHITESPACE
+ MENUITEM "Vie&w Line Differences", ID_VIEW_LINEDIFFS
MENUITEM SEPARATOR
MENUITEM "\83c\81[\83\8b\83o\81[(&T)", ID_VIEW_TOOLBAR
MENUITEM "\83X\83e\81[\83^\83X\83o\81[(&S)", ID_VIEW_STATUS_BAR
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 "\90F"
FONT 8, "MS Shell Dlg"
CONTROL "Dif",IDC_SEL_MOVEDBLOCK_TEXT_COLOR,"Button",
BS_OWNERDRAW | WS_TABSTOP,199,109,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
- PUSHBUTTON "\83f\83t\83H\83\8b\83g",IDC_COLORDEFAULTS_BTN,166,130,50,14
+ RTEXT "\92P\8cê\82Ì\8d·\88Ù:",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 "\91I\91ð\82³\82ê\82½\92P\8cê\82Ì\8d·\88Ù:",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 "\83f\83t\83H\83\8b\83g",IDC_COLORDEFAULTS_BTN,166,170,50,14
END
IDD_OUTPUT DIALOGEX 0, 0, 278, 157
ID_VIEW_LOCATION_BAR "\83\8d\83P\81[\83V\83\87\83\93\83y\83C\83\93\82Í\83t\83@\83C\83\8b\82Ì\93à\97e\91S\91Ì\82ð\83s\83N\83`\83\83\82Æ\82µ\82Ä\95\\8e¦\82µ\82Ü\82·"
ID_VIEW_DIR_STATEPANE "\83f\83B\83\8c\83N\83g\83\8a\94ä\8ar\8fó\91Ô\83y\83C\83\93\82ð\95\\8e¦\82µ\82Ü\82·"
ID_VIEW_LANGUAGE "\8c»\8dÝ\82Ì\83\86\81[\83U\81[\83C\83\93\83^\81[\83t\83F\81[\83X\8c¾\8cê\82ð\91I\91ð\82µ\82Ü\82·\n\8c¾\8cê"
+ ID_VIEW_LINEDIFFS "Shows differences inside lines with different color\nShow Line Diff"
END
// MERGE MENU
#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
#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
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
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"
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
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
#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
#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
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
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"
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
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
#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
#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
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
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"
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
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
#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
#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
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
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"
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
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
#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
#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
MENUITEM "Pou\9ei\9d 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
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"
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
ID_VIEW_LOCATION_BAR "Location pane shows overall picture from files"
ID_VIEW_DIR_STATEPANE "Show directory compare statepane"
ID_VIEW_LANGUAGE "Zvoli\9d jazyk u\9eivate¾ského rozhrania\nJazyk"
+ ID_VIEW_LINEDIFFS "Shows differences inside lines with different color\nShow Line Diff"
END
// MERGE MENU
#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
#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
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
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"
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
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
#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
#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
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
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"
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
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
#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
#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
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);
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(""));
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);
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
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"
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
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
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,
// 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);
#include <vector>
#include "DiffWrapper.h"
#include "DiffList.h"
+#include "stringdiffs.h"
#ifndef _DIFF_FILE_INFO_H_INCLUDED
#include "DiffFileInfo.h"
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
}
}
+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;
+}
+
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);
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()
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()
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)
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);
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);
}
/**
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);
+}
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 */
};
/**
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
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(); };
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()
};
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");
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");
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);
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
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
}
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()
}
/**
+ * @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()
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);
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);
}
/**
CColorButton m_cSelMoved;
CColorButton m_cSelMovedDeleted;
CColorButton m_cSelMovedText;
+ CColorButton m_cSelWordDiffText;
+ CColorButton m_cWordDiffText;
+ CColorButton m_cSelWordDiff;
+ CColorButton m_cWordDiff;
//}}AFX_DATA
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
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()
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 ++;}\
}
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 ++;}\
}
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 ++;}\
}
*/
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)
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)));
}
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)
// 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);
}
}
}
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 )
{
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 ));
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));
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);
}
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)
{
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);
// 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;
// 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;
COLORREF CCrystalTextView::
GetColor (int nColorIndex)
{
- switch (nColorIndex)
+ switch (nColorIndex & ~COLORINDEX_APPLYFORCE)
{
case COLORINDEX_WHITESPACE :
case COLORINDEX_BKGND:
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);
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
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);
{
int m_nCharPos;
int m_nColorIndex;
+ int m_nBgColorIndex;
};
virtual HINSTANCE GetResourceHandle ();
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
enum
{
+ COLORINDEX_NONE,
// Base colors
COLORINDEX_WHITESPACE,
COLORINDEX_BKGND,
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.
};
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 ++;}\
}
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 ++;}\
}
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 ++;}\
}
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 ++;}\
}
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 ++;}\
}
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 ++;}\
}
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 ++;}\
}
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 ++;}\
}
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 ++;}\
}
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 ++;}\
}
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 ++;}\
}
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 ++;}\
}
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 ++;}\
}
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 ++;}\
}
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 ++;}\
}
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 ++;}\
}
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 ++;}\
}
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 ++;}\
}
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 ++;}\
}
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 ++;}\
}
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 ++;}\
}
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 ++;}\
}
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
#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
#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
OSDN Git Service
