From 4dd8e09f459953f59e855415f7133b2cb717ff3b Mon Sep 17 00:00:00 2001 From: Laurent Ganier Date: Thu, 9 Oct 2003 22:23:15 +0000 Subject: [PATCH] [ 818198 ] Colors for "ignore blank lines" --- Src/Languages/Brazilian/MergeBrazilian.rc | 9 ++++++++- Src/Languages/Brazilian/resource.h | 4 +++- Src/Languages/ChineseSimplified/MergeChineseSimplified.rc | 7 +++++++ Src/Languages/ChineseSimplified/resource.h | 4 +++- .../ChineseTraditional/MergeChineseTraditional.rc | 9 ++++++++- Src/Languages/ChineseTraditional/resource.h | 4 +++- Src/Languages/Czech/MergeCzech.rc | 7 +++++++ Src/Languages/Czech/resource.h | 4 +++- Src/Languages/Danish/MergeDanish.rc | 7 +++++++ Src/Languages/Danish/resource.h | 4 +++- Src/Languages/Dutch/MergeDutch.rc | 7 +++++++ Src/Languages/Dutch/resource.h | 4 +++- Src/Languages/French/MergeFrench.rc | 15 +++++++++++---- Src/Languages/French/resource.h | 4 +++- Src/Languages/German/MergeGerman.rc | 7 +++++++ Src/Languages/German/resource.h | 4 +++- Src/Languages/Italian/MergeItalian.rc | 7 +++++++ Src/Languages/Italian/resource.h | 4 +++- Src/Languages/Korean/MergeKorean.rc | 9 ++++++++- Src/Languages/Korean/resource.h | 4 +++- Src/Languages/Norwegian/MergeNorwegian.rc | 9 ++++++++- Src/Languages/Norwegian/resource.h | 4 +++- Src/Languages/Slovak/MergeSlovak.rc | 7 +++++++ Src/Languages/Slovak/resource.h | 4 +++- Src/Languages/Spanish/MergeSpanish.rc | 7 +++++++ Src/Languages/Spanish/resource.h | 4 +++- 26 files changed, 138 insertions(+), 21 deletions(-) diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc index f2b4b6f20..577849fd0 100644 --- a/Src/Languages/Brazilian/MergeBrazilian.rc +++ b/Src/Languages/Brazilian/MergeBrazilian.rc @@ -511,7 +511,7 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Cores" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - LTEXT "Diferença:",IDC_STATIC,15,29,34,8 + LTEXT "Diferença:",IDC_STATIC,14,29,34,8 CONTROL "Dif",IDC_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,94,29,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE @@ -534,6 +534,13 @@ BEGIN BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE LTEXT "Text",IDC_STATIC,184,15,15,8 + CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,94,69,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + LTEXT "Ignored Difference:",IDC_STATIC,14,69,62,8 + CONTROL "Dif",IDC_TRIVIAL_DIFF_DELETED_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE END IDD_OUTPUT DIALOG DISCARDABLE 0, 0, 278, 157 diff --git a/Src/Languages/Brazilian/resource.h b/Src/Languages/Brazilian/resource.h index 93080537e..cbbc511d5 100644 --- a/Src/Languages/Brazilian/resource.h +++ b/Src/Languages/Brazilian/resource.h @@ -223,6 +223,8 @@ #define IDC_DIFF_BROWSE_FILE2 1075 #define IDC_DIFF_BROWSE_RESULT 1076 #define IDC_DIFF_APPENDFILE 1077 +#define IDC_TRIVIAL_DIFF_COLOR 1078 +#define IDC_TRIVIAL_DIFF_DELETED_COLOR 1079 #define IDS_NUM_REPLACED 8501 #define IDS_EDIT_TEXT_NOT_FOUND 8502 #define IDS_LINE_STATUS_INFO_EOL 8503 @@ -456,7 +458,7 @@ #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 118 #define _APS_NEXT_COMMAND_VALUE 32848 -#define _APS_NEXT_CONTROL_VALUE 1078 +#define _APS_NEXT_CONTROL_VALUE 1080 #define _APS_NEXT_SYMED_VALUE 108 #endif #endif diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc index a0e4cb656..4dbefaedd 100644 --- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc +++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc @@ -512,6 +512,13 @@ BEGIN BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE LTEXT "Text",IDC_STATIC,184,15,15,8 + CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,83,69,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + LTEXT "Ignored Difference:",IDC_STATIC,17,69,62,8 + CONTROL "Dif",IDC_TRIVIAL_DIFF_DELETED_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE END IDD_OUTPUT DIALOG FIXED IMPURE 0, 0, 278, 157 diff --git a/Src/Languages/ChineseSimplified/resource.h b/Src/Languages/ChineseSimplified/resource.h index 93080537e..cbbc511d5 100644 --- a/Src/Languages/ChineseSimplified/resource.h +++ b/Src/Languages/ChineseSimplified/resource.h @@ -223,6 +223,8 @@ #define IDC_DIFF_BROWSE_FILE2 1075 #define IDC_DIFF_BROWSE_RESULT 1076 #define IDC_DIFF_APPENDFILE 1077 +#define IDC_TRIVIAL_DIFF_COLOR 1078 +#define IDC_TRIVIAL_DIFF_DELETED_COLOR 1079 #define IDS_NUM_REPLACED 8501 #define IDS_EDIT_TEXT_NOT_FOUND 8502 #define IDS_LINE_STATUS_INFO_EOL 8503 @@ -456,7 +458,7 @@ #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 118 #define _APS_NEXT_COMMAND_VALUE 32848 -#define _APS_NEXT_CONTROL_VALUE 1078 +#define _APS_NEXT_CONTROL_VALUE 1080 #define _APS_NEXT_SYMED_VALUE 108 #endif #endif diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc index 24a3040a6..d95f28288 100644 --- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc +++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc @@ -492,7 +492,7 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "¦â±m" FONT 9, "·s²Ó©úÅé", 0, 0, 0x1 BEGIN - LTEXT "¤£¦P:",IDC_STATIC,15,29,36,8 + LTEXT "¤£¦P:",IDC_STATIC,14,29,36,8 CONTROL "¤£¦P",IDC_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,83,29,17, 14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE LTEXT "¿ï¨úªº¤£¦P:",IDC_STATIC,14,49,66,8 @@ -513,6 +513,13 @@ BEGIN BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE LTEXT "Text",IDC_STATIC,184,15,15,8 + CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,83,69,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + LTEXT "Ignored Difference:",IDC_STATIC,14,69,62,8 + CONTROL "Dif",IDC_TRIVIAL_DIFF_DELETED_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE END IDD_OUTPUT DIALOG DISCARDABLE 0, 0, 278, 157 diff --git a/Src/Languages/ChineseTraditional/resource.h b/Src/Languages/ChineseTraditional/resource.h index 93080537e..cbbc511d5 100644 --- a/Src/Languages/ChineseTraditional/resource.h +++ b/Src/Languages/ChineseTraditional/resource.h @@ -223,6 +223,8 @@ #define IDC_DIFF_BROWSE_FILE2 1075 #define IDC_DIFF_BROWSE_RESULT 1076 #define IDC_DIFF_APPENDFILE 1077 +#define IDC_TRIVIAL_DIFF_COLOR 1078 +#define IDC_TRIVIAL_DIFF_DELETED_COLOR 1079 #define IDS_NUM_REPLACED 8501 #define IDS_EDIT_TEXT_NOT_FOUND 8502 #define IDS_LINE_STATUS_INFO_EOL 8503 @@ -456,7 +458,7 @@ #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 118 #define _APS_NEXT_COMMAND_VALUE 32848 -#define _APS_NEXT_CONTROL_VALUE 1078 +#define _APS_NEXT_CONTROL_VALUE 1080 #define _APS_NEXT_SYMED_VALUE 108 #endif #endif diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc index 6e6fcfe6a..5f9edf088 100644 --- a/Src/Languages/Czech/MergeCzech.rc +++ b/Src/Languages/Czech/MergeCzech.rc @@ -529,6 +529,13 @@ BEGIN BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE LTEXT "Text",IDC_STATIC,184,15,15,8 + CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,98,69,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + LTEXT "Ignored Difference:",IDC_STATIC,17,69,62,8 + CONTROL "Dif",IDC_TRIVIAL_DIFF_DELETED_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE END IDD_OUTPUT DIALOG DISCARDABLE 0, 0, 278, 157 diff --git a/Src/Languages/Czech/resource.h b/Src/Languages/Czech/resource.h index 93080537e..cbbc511d5 100644 --- a/Src/Languages/Czech/resource.h +++ b/Src/Languages/Czech/resource.h @@ -223,6 +223,8 @@ #define IDC_DIFF_BROWSE_FILE2 1075 #define IDC_DIFF_BROWSE_RESULT 1076 #define IDC_DIFF_APPENDFILE 1077 +#define IDC_TRIVIAL_DIFF_COLOR 1078 +#define IDC_TRIVIAL_DIFF_DELETED_COLOR 1079 #define IDS_NUM_REPLACED 8501 #define IDS_EDIT_TEXT_NOT_FOUND 8502 #define IDS_LINE_STATUS_INFO_EOL 8503 @@ -456,7 +458,7 @@ #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 118 #define _APS_NEXT_COMMAND_VALUE 32848 -#define _APS_NEXT_CONTROL_VALUE 1078 +#define _APS_NEXT_CONTROL_VALUE 1080 #define _APS_NEXT_SYMED_VALUE 108 #endif #endif diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc index aec609df3..8a9cbb7b0 100644 --- a/Src/Languages/Danish/MergeDanish.rc +++ b/Src/Languages/Danish/MergeDanish.rc @@ -527,6 +527,13 @@ BEGIN BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE LTEXT "Text",IDC_STATIC,184,15,15,8 + CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,98,69,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + LTEXT "Ignored Difference:",IDC_STATIC,17,69,62,8 + CONTROL "Dif",IDC_TRIVIAL_DIFF_DELETED_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE END IDD_OUTPUT DIALOG DISCARDABLE 0, 0, 278, 157 diff --git a/Src/Languages/Danish/resource.h b/Src/Languages/Danish/resource.h index 93080537e..cbbc511d5 100644 --- a/Src/Languages/Danish/resource.h +++ b/Src/Languages/Danish/resource.h @@ -223,6 +223,8 @@ #define IDC_DIFF_BROWSE_FILE2 1075 #define IDC_DIFF_BROWSE_RESULT 1076 #define IDC_DIFF_APPENDFILE 1077 +#define IDC_TRIVIAL_DIFF_COLOR 1078 +#define IDC_TRIVIAL_DIFF_DELETED_COLOR 1079 #define IDS_NUM_REPLACED 8501 #define IDS_EDIT_TEXT_NOT_FOUND 8502 #define IDS_LINE_STATUS_INFO_EOL 8503 @@ -456,7 +458,7 @@ #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 118 #define _APS_NEXT_COMMAND_VALUE 32848 -#define _APS_NEXT_CONTROL_VALUE 1078 +#define _APS_NEXT_CONTROL_VALUE 1080 #define _APS_NEXT_SYMED_VALUE 108 #endif #endif diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc index 0da8fb9fc..96e217b6a 100644 --- a/Src/Languages/Dutch/MergeDutch.rc +++ b/Src/Languages/Dutch/MergeDutch.rc @@ -531,6 +531,13 @@ BEGIN BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE LTEXT "Text",IDC_STATIC,184,15,15,8 + CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,98,69,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + LTEXT "Ignored Difference:",IDC_STATIC,17,69,62,8 + CONTROL "Dif",IDC_TRIVIAL_DIFF_DELETED_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE END IDD_OUTPUT DIALOG DISCARDABLE 0, 0, 278, 157 diff --git a/Src/Languages/Dutch/resource.h b/Src/Languages/Dutch/resource.h index 93080537e..cbbc511d5 100644 --- a/Src/Languages/Dutch/resource.h +++ b/Src/Languages/Dutch/resource.h @@ -223,6 +223,8 @@ #define IDC_DIFF_BROWSE_FILE2 1075 #define IDC_DIFF_BROWSE_RESULT 1076 #define IDC_DIFF_APPENDFILE 1077 +#define IDC_TRIVIAL_DIFF_COLOR 1078 +#define IDC_TRIVIAL_DIFF_DELETED_COLOR 1079 #define IDS_NUM_REPLACED 8501 #define IDS_EDIT_TEXT_NOT_FOUND 8502 #define IDS_LINE_STATUS_INFO_EOL 8503 @@ -456,7 +458,7 @@ #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 118 #define _APS_NEXT_COMMAND_VALUE 32848 -#define _APS_NEXT_CONTROL_VALUE 1078 +#define _APS_NEXT_CONTROL_VALUE 1080 #define _APS_NEXT_SYMED_VALUE 108 #endif #endif diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc index e06eca224..feaf296f4 100644 --- a/Src/Languages/French/MergeFrench.rc +++ b/Src/Languages/French/MergeFrench.rc @@ -509,7 +509,7 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Couleurs" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - LTEXT "Différence:",IDC_STATIC,43,29,36,8 + LTEXT "Différence:",IDC_STATIC,50,29,36,8 CONTROL "Dif",IDC_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,98,29,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE @@ -517,8 +517,8 @@ BEGIN CONTROL "Dif",IDC_SEL_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,98,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - LTEXT "Background",IDC_STATIC,86,15,40,8 - LTEXT "Deleted",IDC_STATIC,137,15,26,8 + LTEXT "Fond",IDC_STATIC,97,15,18,8 + LTEXT "Ligne absente",IDC_STATIC,126,15,47,8 CONTROL "Dif",IDC_DIFFERENCE_DELETED_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,141,29,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE @@ -531,7 +531,14 @@ BEGIN CONTROL "Dif",IDC_SEL_DIFFERENCE_TEXT_COLOR,"Button", BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE - LTEXT "Text",IDC_STATIC,184,15,15,8 + LTEXT "Texte",IDC_STATIC,184,15,19,8 + CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,98,69,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + LTEXT "Différence ignorée:",IDC_STATIC,24,69,62,8 + CONTROL "Dif",IDC_TRIVIAL_DIFF_DELETED_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE END ENDIDD_OUTPUT DIALOG DISCARDABLE 0, 0, 278, 157 diff --git a/Src/Languages/French/resource.h b/Src/Languages/French/resource.h index 93080537e..cbbc511d5 100644 --- a/Src/Languages/French/resource.h +++ b/Src/Languages/French/resource.h @@ -223,6 +223,8 @@ #define IDC_DIFF_BROWSE_FILE2 1075 #define IDC_DIFF_BROWSE_RESULT 1076 #define IDC_DIFF_APPENDFILE 1077 +#define IDC_TRIVIAL_DIFF_COLOR 1078 +#define IDC_TRIVIAL_DIFF_DELETED_COLOR 1079 #define IDS_NUM_REPLACED 8501 #define IDS_EDIT_TEXT_NOT_FOUND 8502 #define IDS_LINE_STATUS_INFO_EOL 8503 @@ -456,7 +458,7 @@ #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 118 #define _APS_NEXT_COMMAND_VALUE 32848 -#define _APS_NEXT_CONTROL_VALUE 1078 +#define _APS_NEXT_CONTROL_VALUE 1080 #define _APS_NEXT_SYMED_VALUE 108 #endif #endif diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc index ab5a01444..aca9d337a 100644 --- a/Src/Languages/German/MergeGerman.rc +++ b/Src/Languages/German/MergeGerman.rc @@ -531,6 +531,13 @@ BEGIN BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE LTEXT "Text",IDC_STATIC,184,15,15,8 + CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,98,69,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + LTEXT "Ignored Difference:",IDC_STATIC,13,69,62,8 + CONTROL "Dif",IDC_TRIVIAL_DIFF_DELETED_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE END IDD_OUTPUT DIALOG DISCARDABLE 0, 0, 278, 157 diff --git a/Src/Languages/German/resource.h b/Src/Languages/German/resource.h index 93080537e..cbbc511d5 100644 --- a/Src/Languages/German/resource.h +++ b/Src/Languages/German/resource.h @@ -223,6 +223,8 @@ #define IDC_DIFF_BROWSE_FILE2 1075 #define IDC_DIFF_BROWSE_RESULT 1076 #define IDC_DIFF_APPENDFILE 1077 +#define IDC_TRIVIAL_DIFF_COLOR 1078 +#define IDC_TRIVIAL_DIFF_DELETED_COLOR 1079 #define IDS_NUM_REPLACED 8501 #define IDS_EDIT_TEXT_NOT_FOUND 8502 #define IDS_LINE_STATUS_INFO_EOL 8503 @@ -456,7 +458,7 @@ #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 118 #define _APS_NEXT_COMMAND_VALUE 32848 -#define _APS_NEXT_CONTROL_VALUE 1078 +#define _APS_NEXT_CONTROL_VALUE 1080 #define _APS_NEXT_SYMED_VALUE 108 #endif #endif diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc index 51c7cda13..7f067501e 100644 --- a/Src/Languages/Italian/MergeItalian.rc +++ b/Src/Languages/Italian/MergeItalian.rc @@ -526,6 +526,13 @@ BEGIN BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE LTEXT "Text",IDC_STATIC,184,15,15,8 + CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,98,69,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + LTEXT "Ignored Difference:",IDC_STATIC,17,69,62,8 + CONTROL "Dif",IDC_TRIVIAL_DIFF_DELETED_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE END IDD_OUTPUT DIALOG DISCARDABLE 0, 0, 278, 157 diff --git a/Src/Languages/Italian/resource.h b/Src/Languages/Italian/resource.h index 93080537e..cbbc511d5 100644 --- a/Src/Languages/Italian/resource.h +++ b/Src/Languages/Italian/resource.h @@ -223,6 +223,8 @@ #define IDC_DIFF_BROWSE_FILE2 1075 #define IDC_DIFF_BROWSE_RESULT 1076 #define IDC_DIFF_APPENDFILE 1077 +#define IDC_TRIVIAL_DIFF_COLOR 1078 +#define IDC_TRIVIAL_DIFF_DELETED_COLOR 1079 #define IDS_NUM_REPLACED 8501 #define IDS_EDIT_TEXT_NOT_FOUND 8502 #define IDS_LINE_STATUS_INFO_EOL 8503 @@ -456,7 +458,7 @@ #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 118 #define _APS_NEXT_COMMAND_VALUE 32848 -#define _APS_NEXT_CONTROL_VALUE 1078 +#define _APS_NEXT_CONTROL_VALUE 1080 #define _APS_NEXT_SYMED_VALUE 108 #endif #endif diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc index 4523eaa09..a60775cc1 100644 --- a/Src/Languages/Korean/MergeKorean.rc +++ b/Src/Languages/Korean/MergeKorean.rc @@ -473,7 +473,7 @@ STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "»ö»ó" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - LTEXT "´Ù¸¥ ºÎºÐ:",IDC_STATIC,15,29,50,8 + LTEXT "´Ù¸¥ ºÎºÐ:",IDC_STATIC,14,29,50,8 CONTROL "Dif",IDC_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,83,29,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE @@ -496,6 +496,13 @@ BEGIN BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE LTEXT "Text",IDC_STATIC,184,15,15,8 + CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,83,69,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + LTEXT "Ignored Difference:",IDC_STATIC,14,69,62,8 + CONTROL "Dif",IDC_TRIVIAL_DIFF_DELETED_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE END IDD_OUTPUT DIALOGEX 0, 0, 278, 157 diff --git a/Src/Languages/Korean/resource.h b/Src/Languages/Korean/resource.h index 93080537e..cbbc511d5 100644 --- a/Src/Languages/Korean/resource.h +++ b/Src/Languages/Korean/resource.h @@ -223,6 +223,8 @@ #define IDC_DIFF_BROWSE_FILE2 1075 #define IDC_DIFF_BROWSE_RESULT 1076 #define IDC_DIFF_APPENDFILE 1077 +#define IDC_TRIVIAL_DIFF_COLOR 1078 +#define IDC_TRIVIAL_DIFF_DELETED_COLOR 1079 #define IDS_NUM_REPLACED 8501 #define IDS_EDIT_TEXT_NOT_FOUND 8502 #define IDS_LINE_STATUS_INFO_EOL 8503 @@ -456,7 +458,7 @@ #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 118 #define _APS_NEXT_COMMAND_VALUE 32848 -#define _APS_NEXT_CONTROL_VALUE 1078 +#define _APS_NEXT_CONTROL_VALUE 1080 #define _APS_NEXT_SYMED_VALUE 108 #endif #endif diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc index 1fb9f8ca3..d5d52ad34 100644 --- a/Src/Languages/Norwegian/MergeNorwegian.rc +++ b/Src/Languages/Norwegian/MergeNorwegian.rc @@ -504,7 +504,7 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Farger" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - LTEXT "Forskjeller:",IDC_STATIC,15,29,36,8 + LTEXT "Forskjeller:",IDC_STATIC,14,29,36,8 CONTROL "Dif",IDC_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,83,29,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE @@ -527,6 +527,13 @@ BEGIN BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE LTEXT "Text",IDC_STATIC,184,15,15,8 + CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,83,69,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + LTEXT "Ignored Difference:",IDC_STATIC,14,69,62,8 + CONTROL "Dif",IDC_TRIVIAL_DIFF_DELETED_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE END IDD_OUTPUT DIALOG DISCARDABLE 0, 0, 278, 157 diff --git a/Src/Languages/Norwegian/resource.h b/Src/Languages/Norwegian/resource.h index 93080537e..cbbc511d5 100644 --- a/Src/Languages/Norwegian/resource.h +++ b/Src/Languages/Norwegian/resource.h @@ -223,6 +223,8 @@ #define IDC_DIFF_BROWSE_FILE2 1075 #define IDC_DIFF_BROWSE_RESULT 1076 #define IDC_DIFF_APPENDFILE 1077 +#define IDC_TRIVIAL_DIFF_COLOR 1078 +#define IDC_TRIVIAL_DIFF_DELETED_COLOR 1079 #define IDS_NUM_REPLACED 8501 #define IDS_EDIT_TEXT_NOT_FOUND 8502 #define IDS_LINE_STATUS_INFO_EOL 8503 @@ -456,7 +458,7 @@ #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 118 #define _APS_NEXT_COMMAND_VALUE 32848 -#define _APS_NEXT_CONTROL_VALUE 1078 +#define _APS_NEXT_CONTROL_VALUE 1080 #define _APS_NEXT_SYMED_VALUE 108 #endif #endif diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc index 77899321c..2e46d4019 100644 --- a/Src/Languages/Slovak/MergeSlovak.rc +++ b/Src/Languages/Slovak/MergeSlovak.rc @@ -530,6 +530,13 @@ BEGIN BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE LTEXT "Text",IDC_STATIC,184,15,15,8 + CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,98,69,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + LTEXT "Ignored Difference:",IDC_STATIC,17,69,62,8 + CONTROL "Dif",IDC_TRIVIAL_DIFF_DELETED_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE END IDD_OUTPUT DIALOG DISCARDABLE 0, 0, 278, 157 diff --git a/Src/Languages/Slovak/resource.h b/Src/Languages/Slovak/resource.h index 93080537e..cbbc511d5 100644 --- a/Src/Languages/Slovak/resource.h +++ b/Src/Languages/Slovak/resource.h @@ -223,6 +223,8 @@ #define IDC_DIFF_BROWSE_FILE2 1075 #define IDC_DIFF_BROWSE_RESULT 1076 #define IDC_DIFF_APPENDFILE 1077 +#define IDC_TRIVIAL_DIFF_COLOR 1078 +#define IDC_TRIVIAL_DIFF_DELETED_COLOR 1079 #define IDS_NUM_REPLACED 8501 #define IDS_EDIT_TEXT_NOT_FOUND 8502 #define IDS_LINE_STATUS_INFO_EOL 8503 @@ -456,7 +458,7 @@ #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 118 #define _APS_NEXT_COMMAND_VALUE 32848 -#define _APS_NEXT_CONTROL_VALUE 1078 +#define _APS_NEXT_CONTROL_VALUE 1080 #define _APS_NEXT_SYMED_VALUE 108 #endif #endif diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc index dbe48c567..d2c6cbd7b 100644 --- a/Src/Languages/Spanish/MergeSpanish.rc +++ b/Src/Languages/Spanish/MergeSpanish.rc @@ -528,6 +528,13 @@ BEGIN BS_OWNERDRAW | WS_TABSTOP,184,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE LTEXT "Text",IDC_STATIC,184,15,15,8 + CONTROL "Dif",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | + WS_TABSTOP,98,69,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE + LTEXT "Ignored Difference:",IDC_STATIC,17,69,62,8 + CONTROL "Dif",IDC_TRIVIAL_DIFF_DELETED_COLOR,"Button", + BS_OWNERDRAW | WS_TABSTOP,141,69,17,14,WS_EX_TRANSPARENT | + WS_EX_CLIENTEDGE END IDD_OUTPUT DIALOG DISCARDABLE 0, 0, 278, 157 diff --git a/Src/Languages/Spanish/resource.h b/Src/Languages/Spanish/resource.h index 93080537e..cbbc511d5 100644 --- a/Src/Languages/Spanish/resource.h +++ b/Src/Languages/Spanish/resource.h @@ -223,6 +223,8 @@ #define IDC_DIFF_BROWSE_FILE2 1075 #define IDC_DIFF_BROWSE_RESULT 1076 #define IDC_DIFF_APPENDFILE 1077 +#define IDC_TRIVIAL_DIFF_COLOR 1078 +#define IDC_TRIVIAL_DIFF_DELETED_COLOR 1079 #define IDS_NUM_REPLACED 8501 #define IDS_EDIT_TEXT_NOT_FOUND 8502 #define IDS_LINE_STATUS_INFO_EOL 8503 @@ -456,7 +458,7 @@ #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 118 #define _APS_NEXT_COMMAND_VALUE 32848 -#define _APS_NEXT_CONTROL_VALUE 1078 +#define _APS_NEXT_CONTROL_VALUE 1080 #define _APS_NEXT_SYMED_VALUE 108 #endif #endif -- 2.11.0