From bcfb3fe05893c15b034a8ab7dd9b9f89a373944f Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Tue, 16 Mar 2004 14:10:06 +0000 Subject: [PATCH] PATCH: [ 915790 ] Open Contributors.rtf from About dialog --- Src/Languages/Brazilian/MergeBrazilian.rc | 14 +++++------- Src/Languages/Brazilian/resource.h | 3 ++- Src/Languages/Catalan/MergeCatalan.rc | 17 +++++--------- Src/Languages/Catalan/resource.h | 3 ++- .../ChineseSimplified/MergeChineseSimplified.rc | 14 +++++------- Src/Languages/ChineseSimplified/resource.h | 3 ++- .../ChineseTraditional/MergeChineseTraditional.rc | 14 +++++------- Src/Languages/ChineseTraditional/resource.h | 3 ++- Src/Languages/Czech/MergeCzech.rc | 15 +++++-------- Src/Languages/Czech/resource.h | 3 ++- Src/Languages/Danish/MergeDanish.rc | 15 +++++-------- Src/Languages/Danish/resource.h | 3 ++- Src/Languages/Dutch/MergeDutch.rc | 19 ++++++---------- Src/Languages/Dutch/resource.h | 3 ++- Src/Languages/French/MergeFrench.rc | 17 +++++--------- Src/Languages/French/resource.h | 3 ++- Src/Languages/German/MergeGerman.rc | 13 ++++------- Src/Languages/German/resource.h | 3 ++- Src/Languages/Italian/MergeItalian.rc | 15 +++++-------- Src/Languages/Italian/resource.h | 3 ++- Src/Languages/Korean/MergeKorean.rc | 18 +++++---------- Src/Languages/Korean/resource.h | 3 ++- Src/Languages/Norwegian/MergeNorwegian.rc | 15 +++++-------- Src/Languages/Norwegian/resource.h | 3 ++- Src/Languages/Polish/MergePolish.rc | 13 ++++------- Src/Languages/Polish/resource.h | 3 ++- Src/Languages/Russian/MergeRussian.rc | 12 ++++------ Src/Languages/Russian/resource.h | 3 ++- Src/Languages/Slovak/MergeSlovak.rc | 15 +++++-------- Src/Languages/Slovak/resource.h | 3 ++- Src/Languages/Spanish/MergeSpanish.rc | 15 +++++-------- Src/Languages/Spanish/resource.h | 3 ++- Src/Languages/Swedish/MergeSwedish.rc | 15 +++++-------- Src/Languages/Swedish/resource.h | 3 ++- Src/Merge.cpp | 26 ++++++++++++++++++++++ Src/Merge.rc | 13 ++++------- Src/readme.txt | 2 ++ Src/resource.h | 3 ++- 38 files changed, 154 insertions(+), 197 deletions(-) diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc index 72273a42e..f5b2e67e3 100644 --- a/Src/Languages/Brazilian/MergeBrazilian.rc +++ b/Src/Languages/Brazilian/MergeBrazilian.rc @@ -329,7 +329,7 @@ END // Dialog // -IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 223, 135 +IDD_ABOUTBOX DIALOGEX 0, 0, 223, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Sobre o WinMerge" FONT 8, "MS Sans Serif" @@ -342,14 +342,10 @@ BEGIN LTEXT "Todos os direitos reservados.",IDC_STATIC,7,60,170,8 LTEXT "Visite o site do WinMerge!",IDC_WWW,7,119,209,8 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,114,209,1 - LTEXT "© 1996 - 2001 Deam P. Grimm /Thingamahoochie Software", - IDC_COMPANY,7,49,209,8 - LTEXT "Sintaxe Destaques Edição Vizualização por Andrei Stcherbatchenko ", - IDC_STATIC,7,71,145,19 - LTEXT "Várias sintaxes por Ferdinand Prantl",IDC_STATIC,7,90, - 209,10 - LTEXT "Tradução para o português Brasil por Wender Firmino", - IDC_STATIC,8,101,209,10 + LTEXT "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8 + LTEXT "Contributors are listed in",IDC_STATIC,7,81,208,8 + LTEXT "Docs/Contributors.rtf",IDC_STATIC,7,91,153,8 + PUSHBUTTON "Open...",IDC_OPEN_CONTRIBUTORS,165,95,50,14 END IDD_OPEN DIALOGEX 0, 0, 356, 115 diff --git a/Src/Languages/Brazilian/resource.h b/Src/Languages/Brazilian/resource.h index 188885e0e..9bab57ecf 100644 --- a/Src/Languages/Brazilian/resource.h +++ b/Src/Languages/Brazilian/resource.h @@ -312,6 +312,7 @@ #define IDC_COLORDEFAULTS_BTN 1118 #define IDC_COMPARE_DEFAULTS 1119 #define IDC_CMPPANE_AUTOCLOSE 1120 +#define IDC_OPEN_CONTRIBUTORS 1121 #define IDS_NUM_REPLACED 8501 #define IDS_EDIT_TEXT_NOT_FOUND 8502 #define IDS_LINE_STATUS_INFO_EOL 8503 @@ -564,7 +565,7 @@ #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 124 #define _APS_NEXT_COMMAND_VALUE 32865 -#define _APS_NEXT_CONTROL_VALUE 1121 +#define _APS_NEXT_CONTROL_VALUE 1122 #define _APS_NEXT_SYMED_VALUE 108 #endif #endif diff --git a/Src/Languages/Catalan/MergeCatalan.rc b/Src/Languages/Catalan/MergeCatalan.rc index 99749e58a..c07b375d0 100644 --- a/Src/Languages/Catalan/MergeCatalan.rc +++ b/Src/Languages/Catalan/MergeCatalan.rc @@ -329,8 +329,8 @@ END // Dialog // -IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 223, 134 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION +IDD_ABOUTBOX DIALOGEX 0, 0, 223, 134 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Quant al WinMerge" FONT 8, "MS Sans Serif" BEGIN @@ -342,15 +342,10 @@ BEGIN LTEXT "Tots els drets reservats.",IDC_STATIC,7,60,170,8 LTEXT "Visiteu la plana web de WinMerge!",IDC_WWW,7,119,209,8 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,103,209,1 - LTEXT "© 2000 Thingamahoochie Software",IDC_COMPANY,7,49,209,8 - LTEXT "Syntax Highlighting Edit View by Andrei Stcherbatchenko ", - IDC_STATIC,7,71,209,8 - LTEXT "Various Syntaxes by Ferdinand Prantl",IDC_STATIC,7,81, - 209,8 - LTEXT "Other major contributors include:",IDC_STATIC,7,91,209, - 8 - LTEXT "Christian List, Perry Rapp, Kimmo Varis, Laurent Ganier", - IDC_STATIC,7,101,209,8 + LTEXT "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8 + LTEXT "Contributors are listed in",IDC_STATIC,7,81,208,8 + LTEXT "Docs/Contributors.rtf",IDC_STATIC,7,91,153,8 + PUSHBUTTON "Open...",IDC_OPEN_CONTRIBUTORS,165,95,50,14 END IDD_OPEN DIALOGEX 0, 0, 356, 115 diff --git a/Src/Languages/Catalan/resource.h b/Src/Languages/Catalan/resource.h index 188885e0e..9bab57ecf 100644 --- a/Src/Languages/Catalan/resource.h +++ b/Src/Languages/Catalan/resource.h @@ -312,6 +312,7 @@ #define IDC_COLORDEFAULTS_BTN 1118 #define IDC_COMPARE_DEFAULTS 1119 #define IDC_CMPPANE_AUTOCLOSE 1120 +#define IDC_OPEN_CONTRIBUTORS 1121 #define IDS_NUM_REPLACED 8501 #define IDS_EDIT_TEXT_NOT_FOUND 8502 #define IDS_LINE_STATUS_INFO_EOL 8503 @@ -564,7 +565,7 @@ #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 124 #define _APS_NEXT_COMMAND_VALUE 32865 -#define _APS_NEXT_CONTROL_VALUE 1121 +#define _APS_NEXT_CONTROL_VALUE 1122 #define _APS_NEXT_SYMED_VALUE 108 #endif #endif diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc index d24b4ea26..fa183bc19 100644 --- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc +++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc @@ -326,7 +326,7 @@ END // Dialog // -IDD_ABOUTBOX DIALOG FIXED IMPURE 0, 0, 223, 134 +IDD_ABOUTBOX DIALOGEX 0, 0, 223, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "¹ØÓÚ WinMerge" FONT 9, "ËÎÌå" @@ -339,14 +339,10 @@ BEGIN LTEXT "±£ÁôËùÓÐȨÀû¡£",IDC_STATIC,7,60,170,8 LTEXT "°Ý·Ã WinMerge Ê×Ò³£¡",IDC_WWW,7,107,209,8 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,103,209,1 - LTEXT "°æȨ(c) 2000 Thingamahoochie Software",IDC_COMPANY,7,49,209,8 - LTEXT "Ó﷨ǿµ÷±à¼­ÊÓͼÓÉ Andrei Stcherbatchenko ±àд ",IDC_STATIC,7,71, - 209,8 - LTEXT "²»Í¬µÄÓï·¨ÓÉ Ferdinand Prantl ±àд",IDC_STATIC,7,81,209,8 - LTEXT "Other major contributors include:",IDC_STATIC,7,91,209, - 8 - LTEXT "Christian List, Perry Rapp, Kimmo Varis, Laurent Ganier", - IDC_STATIC,7,101,209,8 + LTEXT "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8 + LTEXT "Contributors are listed in",IDC_STATIC,7,81,208,8 + LTEXT "Docs/Contributors.rtf",IDC_STATIC,7,91,153,8 + PUSHBUTTON "Open...",IDC_OPEN_CONTRIBUTORS,165,95,50,14 END IDD_OPEN DIALOGEX 0, 0, 356, 115 diff --git a/Src/Languages/ChineseSimplified/resource.h b/Src/Languages/ChineseSimplified/resource.h index 188885e0e..9bab57ecf 100644 --- a/Src/Languages/ChineseSimplified/resource.h +++ b/Src/Languages/ChineseSimplified/resource.h @@ -312,6 +312,7 @@ #define IDC_COLORDEFAULTS_BTN 1118 #define IDC_COMPARE_DEFAULTS 1119 #define IDC_CMPPANE_AUTOCLOSE 1120 +#define IDC_OPEN_CONTRIBUTORS 1121 #define IDS_NUM_REPLACED 8501 #define IDS_EDIT_TEXT_NOT_FOUND 8502 #define IDS_LINE_STATUS_INFO_EOL 8503 @@ -564,7 +565,7 @@ #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 124 #define _APS_NEXT_COMMAND_VALUE 32865 -#define _APS_NEXT_CONTROL_VALUE 1121 +#define _APS_NEXT_CONTROL_VALUE 1122 #define _APS_NEXT_SYMED_VALUE 108 #endif #endif diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc index ebda0540c..3fa194aeb 100644 --- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc +++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc @@ -327,7 +327,7 @@ END // Dialog // -IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 223, 134 +IDD_ABOUTBOX DIALOGEX 0, 0, 223, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ãö©ó WinMerge" FONT 9, "·s²Ó©úÅé" @@ -340,14 +340,10 @@ BEGIN LTEXT "«O¯d©Ò¦³Åv§Q¡C",IDC_STATIC,7,60,170,8 LTEXT "«ô³X WinMerge ­º­¶¡I",IDC_WWW,7,107,209,8 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,103,209,1 - LTEXT "ª©Åv(c) 2000 Thingamahoochie Software",IDC_COMPANY,7,49,209,8 - LTEXT "»yªk±j½Õ½s¿èÀ˵ø½s¼g¥Ñ Andrei Stcherbatchenko ",-1,7,71, - 209,8 - LTEXT "¤£¦Pªº»yªk½s¼g¥Ñ Ferdinand Prantl",IDC_STATIC,7,81,209,8 - LTEXT "Other major contributors include:",IDC_STATIC,7,91,209, - 8 - LTEXT "Christian List, Perry Rapp, Kimmo Varis, Laurent Ganier", - IDC_STATIC,7,101,209,8 + LTEXT "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8 + LTEXT "Contributors are listed in",IDC_STATIC,7,81,208,8 + LTEXT "Docs/Contributors.rtf",IDC_STATIC,7,91,153,8 + PUSHBUTTON "Open...",IDC_OPEN_CONTRIBUTORS,165,95,50,14 END IDD_OPEN DIALOGEX 0, 0, 369, 115 diff --git a/Src/Languages/ChineseTraditional/resource.h b/Src/Languages/ChineseTraditional/resource.h index 188885e0e..9bab57ecf 100644 --- a/Src/Languages/ChineseTraditional/resource.h +++ b/Src/Languages/ChineseTraditional/resource.h @@ -312,6 +312,7 @@ #define IDC_COLORDEFAULTS_BTN 1118 #define IDC_COMPARE_DEFAULTS 1119 #define IDC_CMPPANE_AUTOCLOSE 1120 +#define IDC_OPEN_CONTRIBUTORS 1121 #define IDS_NUM_REPLACED 8501 #define IDS_EDIT_TEXT_NOT_FOUND 8502 #define IDS_LINE_STATUS_INFO_EOL 8503 @@ -564,7 +565,7 @@ #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 124 #define _APS_NEXT_COMMAND_VALUE 32865 -#define _APS_NEXT_CONTROL_VALUE 1121 +#define _APS_NEXT_CONTROL_VALUE 1122 #define _APS_NEXT_SYMED_VALUE 108 #endif #endif diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc index 973bc9776..94d161d6d 100644 --- a/Src/Languages/Czech/MergeCzech.rc +++ b/Src/Languages/Czech/MergeCzech.rc @@ -330,7 +330,7 @@ END // Dialog // -IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 223, 134 +IDD_ABOUTBOX DIALOGEX 0, 0, 223, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "O programu" FONT 8, "MS Sans Serif" @@ -344,15 +344,10 @@ BEGIN LTEXT "Navštivte www stránku programu WinMerge!",IDC_WWW,7,107, 184,8 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,103,209,1 - LTEXT "© 2000 Thingamahoochie Software",IDC_COMPANY,7,49,209,8 - LTEXT "Syntax Highlighting Edit View by Andrei Stcherbatchenko ", - IDC_STATIC,7,71,209,8 - LTEXT "Various Syntaxes by Ferdinand Prantl",IDC_STATIC,7,81, - 209,8 - LTEXT "Other major contributors include:",IDC_STATIC,7,91,209, - 8 - LTEXT "Christian List, Perry Rapp, Kimmo Varis, Laurent Ganier", - IDC_STATIC,7,101,209,8 + LTEXT "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8 + LTEXT "Contributors are listed in",IDC_STATIC,7,81,208,8 + LTEXT "Docs/Contributors.rtf",IDC_STATIC,7,91,153,8 + PUSHBUTTON "Open...",IDC_OPEN_CONTRIBUTORS,165,95,50,14 END IDD_OPEN DIALOGEX 0, 0, 356, 115 diff --git a/Src/Languages/Czech/resource.h b/Src/Languages/Czech/resource.h index 188885e0e..9bab57ecf 100644 --- a/Src/Languages/Czech/resource.h +++ b/Src/Languages/Czech/resource.h @@ -312,6 +312,7 @@ #define IDC_COLORDEFAULTS_BTN 1118 #define IDC_COMPARE_DEFAULTS 1119 #define IDC_CMPPANE_AUTOCLOSE 1120 +#define IDC_OPEN_CONTRIBUTORS 1121 #define IDS_NUM_REPLACED 8501 #define IDS_EDIT_TEXT_NOT_FOUND 8502 #define IDS_LINE_STATUS_INFO_EOL 8503 @@ -564,7 +565,7 @@ #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 124 #define _APS_NEXT_COMMAND_VALUE 32865 -#define _APS_NEXT_CONTROL_VALUE 1121 +#define _APS_NEXT_CONTROL_VALUE 1122 #define _APS_NEXT_SYMED_VALUE 108 #endif #endif diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc index 1a8391008..c93177a1b 100644 --- a/Src/Languages/Danish/MergeDanish.rc +++ b/Src/Languages/Danish/MergeDanish.rc @@ -329,7 +329,7 @@ END // Dialog // -IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 223, 134 +IDD_ABOUTBOX DIALOGEX 0, 0, 223, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Om WinMerge" FONT 8, "MS Sans Serif" @@ -342,15 +342,10 @@ BEGIN LTEXT "Alle rettigheder forbeholdes",IDC_STATIC,7,60,170,8 LTEXT "Besøg WinMerge hjemmesiden!",IDC_WWW,7,107,209,8 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,103,209,1 - LTEXT "© 2000 Thingamahoochie Software",IDC_COMPANY,7,49,209,8 - LTEXT "Syntax Highlighting Edit View by Andrei Stcherbatchenko ", - IDC_STATIC,7,71,209,8 - LTEXT "Various Syntaxes by Ferdinand Prantl",IDC_STATIC,7,81, - 209,8 - LTEXT "Other major contributors include:",IDC_STATIC,7,91,209, - 8 - LTEXT "Christian List, Perry Rapp, Kimmo Varis, Laurent Ganier", - IDC_STATIC,7,101,209,8 + LTEXT "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8 + LTEXT "Contributors are listed in",IDC_STATIC,7,81,208,8 + LTEXT "Docs/Contributors.rtf",IDC_STATIC,7,91,153,8 + PUSHBUTTON "Open...",IDC_OPEN_CONTRIBUTORS,165,95,50,14 END IDD_OPEN DIALOGEX 0, 0, 356, 115 diff --git a/Src/Languages/Danish/resource.h b/Src/Languages/Danish/resource.h index 188885e0e..9bab57ecf 100644 --- a/Src/Languages/Danish/resource.h +++ b/Src/Languages/Danish/resource.h @@ -312,6 +312,7 @@ #define IDC_COLORDEFAULTS_BTN 1118 #define IDC_COMPARE_DEFAULTS 1119 #define IDC_CMPPANE_AUTOCLOSE 1120 +#define IDC_OPEN_CONTRIBUTORS 1121 #define IDS_NUM_REPLACED 8501 #define IDS_EDIT_TEXT_NOT_FOUND 8502 #define IDS_LINE_STATUS_INFO_EOL 8503 @@ -564,7 +565,7 @@ #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 124 #define _APS_NEXT_COMMAND_VALUE 32865 -#define _APS_NEXT_CONTROL_VALUE 1121 +#define _APS_NEXT_CONTROL_VALUE 1122 #define _APS_NEXT_SYMED_VALUE 108 #endif #endif diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc index 8d6dbebee..ca2370896 100644 --- a/Src/Languages/Dutch/MergeDutch.rc +++ b/Src/Languages/Dutch/MergeDutch.rc @@ -330,28 +330,23 @@ END // Dialog // -IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 223, 134 +IDD_ABOUTBOX DIALOGEX 0, 0, 223, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "About WinMerge" FONT 8, "MS Sans Serif" BEGIN ICON IDR_MAINFRAME,IDC_STATIC,24,14,20,20 LTEXT "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX - DEFPUSHBUTTON "OK",IDOK,159,7,32,14,WS_GROUP - LTEXT "Version 1.0",IDC_VERSION,63,23,127,8,SS_NOPREFIX + DEFPUSHBUTTON "OK",IDOK,184,7,32,14,WS_GROUP + LTEXT "Version 1.0",IDC_VERSION,63,23,84,8,SS_NOPREFIX LTEXT "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8 LTEXT "All rights reserved.",IDC_STATIC,7,60,170,8 LTEXT "Bezoek deWinMerge HomePage!",IDC_WWW,7,98,184,8 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,72,184,1 - LTEXT "© 2000 Thingamahoochie Software",IDC_COMPANY,7,49,209,8 - LTEXT "Syntax Highlighting Edit View by Andrei Stcherbatchenko ", - IDC_STATIC,7,75,209,8 - LTEXT "Various Syntaxes by Ferdinand Prantl",IDC_STATIC,7,87, - 209,8 - LTEXT "Other major contributors include:",IDC_STATIC,7,91,209, - 8 - LTEXT "Christian List, Perry Rapp, Kimmo Varis, Laurent Ganier", - IDC_STATIC,7,101,209,8 + LTEXT "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8 + LTEXT "Contributors are listed in",IDC_STATIC,7,81,208,8 + LTEXT "Docs/Contributors.rtf",IDC_STATIC,7,91,153,8 + PUSHBUTTON "Open...",IDC_OPEN_CONTRIBUTORS,165,95,50,14 END IDD_OPEN DIALOGEX 0, 0, 356, 115 diff --git a/Src/Languages/Dutch/resource.h b/Src/Languages/Dutch/resource.h index 188885e0e..9bab57ecf 100644 --- a/Src/Languages/Dutch/resource.h +++ b/Src/Languages/Dutch/resource.h @@ -312,6 +312,7 @@ #define IDC_COLORDEFAULTS_BTN 1118 #define IDC_COMPARE_DEFAULTS 1119 #define IDC_CMPPANE_AUTOCLOSE 1120 +#define IDC_OPEN_CONTRIBUTORS 1121 #define IDS_NUM_REPLACED 8501 #define IDS_EDIT_TEXT_NOT_FOUND 8502 #define IDS_LINE_STATUS_INFO_EOL 8503 @@ -564,7 +565,7 @@ #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 124 #define _APS_NEXT_COMMAND_VALUE 32865 -#define _APS_NEXT_CONTROL_VALUE 1121 +#define _APS_NEXT_CONTROL_VALUE 1122 #define _APS_NEXT_SYMED_VALUE 108 #endif #endif diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc index 3ccc53918..fc575deb5 100644 --- a/Src/Languages/French/MergeFrench.rc +++ b/Src/Languages/French/MergeFrench.rc @@ -329,13 +329,13 @@ END // Dialog // -IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 223, 134 +IDD_ABOUTBOX DIALOGEX 0, 0, 223, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "A propos de WinMerge" FONT 8, "MS Sans Serif" BEGIN ICON IDR_MAINFRAME,IDC_STATIC,24,14,20,20 - LTEXT "WinMerge",IDC_STATIC,64,13,63,8,SS_NOPREFIX + LTEXT "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX DEFPUSHBUTTON "OK",IDOK,184,7,32,14,WS_GROUP LTEXT "Version 1.0",IDC_VERSION,64,23,127,8,SS_NOPREFIX LTEXT "(Private Build)",IDC_PRIVATEBUILD,64,33,153,8 @@ -343,15 +343,10 @@ BEGIN LTEXT "Découvrez la page d'accueil de WinMerge !",IDC_WWW,7, 107,184,8 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,103,209,1 - LTEXT "© 2000 Thingamahoochie Software",IDC_COMPANY,7,49,209,8 - LTEXT "Syntax Highlighting Edit View by Andrei Stcherbatchenko ", - IDC_STATIC,7,71,209,8 - LTEXT "Various Syntaxes by Ferdinand Prantl",IDC_STATIC,7,81, - 209,8 - LTEXT "Other major contributors include:",IDC_STATIC,7,91,209, - 8 - LTEXT "Christian List, Perry Rapp, Kimmo Varis, Laurent Ganier", - IDC_STATIC,7,101,209,8 + LTEXT "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8 + LTEXT "Contributors are listed in",IDC_STATIC,7,81,208,8 + LTEXT "Docs/Contributors.rtf",IDC_STATIC,7,91,153,8 + PUSHBUTTON "Open...",IDC_OPEN_CONTRIBUTORS,165,95,50,14 END IDD_OPEN DIALOGEX 0, 0, 356, 115 diff --git a/Src/Languages/French/resource.h b/Src/Languages/French/resource.h index 188885e0e..9bab57ecf 100644 --- a/Src/Languages/French/resource.h +++ b/Src/Languages/French/resource.h @@ -312,6 +312,7 @@ #define IDC_COLORDEFAULTS_BTN 1118 #define IDC_COMPARE_DEFAULTS 1119 #define IDC_CMPPANE_AUTOCLOSE 1120 +#define IDC_OPEN_CONTRIBUTORS 1121 #define IDS_NUM_REPLACED 8501 #define IDS_EDIT_TEXT_NOT_FOUND 8502 #define IDS_LINE_STATUS_INFO_EOL 8503 @@ -564,7 +565,7 @@ #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 124 #define _APS_NEXT_COMMAND_VALUE 32865 -#define _APS_NEXT_CONTROL_VALUE 1121 +#define _APS_NEXT_CONTROL_VALUE 1122 #define _APS_NEXT_SYMED_VALUE 108 #endif #endif diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc index 0d2ab73c3..8215aeb56 100644 --- a/Src/Languages/German/MergeGerman.rc +++ b/Src/Languages/German/MergeGerman.rc @@ -336,7 +336,7 @@ END // Dialog // -IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 223, 134 +IDD_ABOUTBOX DIALOGEX 0, 0, 223, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Info über WinMerge" FONT 8, "MS Sans Serif" @@ -351,14 +351,9 @@ BEGIN 8 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,113,209,1 LTEXT "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8 - LTEXT "Syntax Highlighting Edit View by Andrei Stcherbatchenko ", - IDC_STATIC,7,71,209,8 - LTEXT "Various Syntaxes by Ferdinand Prantl",IDC_STATIC,7,81, - 209,8 - LTEXT "Other major contributors include:",IDC_STATIC,7,91,209, - 8 - LTEXT "Christian List, Perry Rapp, Kimmo Varis, Laurent Ganier", - IDC_STATIC,7,101,209,8 + LTEXT "Contributors are listed in",IDC_STATIC,7,81,208,8 + LTEXT "Docs/Contributors.rtf",IDC_STATIC,7,91,153,8 + PUSHBUTTON "Open...",IDC_OPEN_CONTRIBUTORS,165,95,50,14 END IDD_OPEN DIALOGEX 0, 0, 356, 115 diff --git a/Src/Languages/German/resource.h b/Src/Languages/German/resource.h index 188885e0e..9bab57ecf 100644 --- a/Src/Languages/German/resource.h +++ b/Src/Languages/German/resource.h @@ -312,6 +312,7 @@ #define IDC_COLORDEFAULTS_BTN 1118 #define IDC_COMPARE_DEFAULTS 1119 #define IDC_CMPPANE_AUTOCLOSE 1120 +#define IDC_OPEN_CONTRIBUTORS 1121 #define IDS_NUM_REPLACED 8501 #define IDS_EDIT_TEXT_NOT_FOUND 8502 #define IDS_LINE_STATUS_INFO_EOL 8503 @@ -564,7 +565,7 @@ #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 124 #define _APS_NEXT_COMMAND_VALUE 32865 -#define _APS_NEXT_CONTROL_VALUE 1121 +#define _APS_NEXT_CONTROL_VALUE 1122 #define _APS_NEXT_SYMED_VALUE 108 #endif #endif diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc index 31add667c..00cef302e 100644 --- a/Src/Languages/Italian/MergeItalian.rc +++ b/Src/Languages/Italian/MergeItalian.rc @@ -328,7 +328,7 @@ END // Dialog // -IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 223, 134 +IDD_ABOUTBOX DIALOGEX 0, 0, 223, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Informazioni su WinMerge" FONT 8, "MS Sans Serif" @@ -341,15 +341,10 @@ BEGIN LTEXT "Tutti i diritti riservati.",IDC_STATIC,7,60,170,8 LTEXT "Visita la HomePage di WinMerge!",IDC_WWW,7,107,184,8 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,103,184,1 - LTEXT "© 2000 Thingamahoochie Software",IDC_COMPANY,7,49,209,8 - LTEXT "Syntax Highlighting Edit View by Andrei Stcherbatchenko ", - IDC_STATIC,7,71,209,8 - LTEXT "Various Syntaxes by Ferdinand Prantl",IDC_STATIC,7,81, - 209,8 - LTEXT "Other major contributors include:",IDC_STATIC,7,91,209, - 8 - LTEXT "Christian List, Perry Rapp, Kimmo Varis, Laurent Ganier", - IDC_STATIC,7,101,209,8 + LTEXT "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8 + LTEXT "Contributors are listed in",IDC_STATIC,7,81,208,8 + LTEXT "Docs/Contributors.rtf",IDC_STATIC,7,91,153,8 + PUSHBUTTON "Open...",IDC_OPEN_CONTRIBUTORS,165,95,50,14 END IDD_OPEN DIALOGEX 0, 0, 356, 115 diff --git a/Src/Languages/Italian/resource.h b/Src/Languages/Italian/resource.h index 188885e0e..9bab57ecf 100644 --- a/Src/Languages/Italian/resource.h +++ b/Src/Languages/Italian/resource.h @@ -312,6 +312,7 @@ #define IDC_COLORDEFAULTS_BTN 1118 #define IDC_COMPARE_DEFAULTS 1119 #define IDC_CMPPANE_AUTOCLOSE 1120 +#define IDC_OPEN_CONTRIBUTORS 1121 #define IDS_NUM_REPLACED 8501 #define IDS_EDIT_TEXT_NOT_FOUND 8502 #define IDS_LINE_STATUS_INFO_EOL 8503 @@ -564,7 +565,7 @@ #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 124 #define _APS_NEXT_COMMAND_VALUE 32865 -#define _APS_NEXT_CONTROL_VALUE 1121 +#define _APS_NEXT_CONTROL_VALUE 1122 #define _APS_NEXT_SYMED_VALUE 108 #endif #endif diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc index 438811e46..179f6dc84 100644 --- a/Src/Languages/Korean/MergeKorean.rc +++ b/Src/Languages/Korean/MergeKorean.rc @@ -295,7 +295,7 @@ END // IDD_ABOUTBOX DIALOGEX 0, 0, 223, 134 -STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "WinMerge Á¤º¸" FONT 8, "±¼¸²", 400, 0, 0x0 BEGIN @@ -307,18 +307,10 @@ BEGIN LTEXT "All rights reserved.",IDC_STATIC,7,60,170,8 LTEXT "WinMerge ȨÆäÀÌÁö ¹æ¹®!",IDC_WWW,7,107,209,8 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,103,209,1 - LTEXT "¨Ï 2000 Thingamahoochie Software",IDC_COMPANY,7,49,209, - 8 - LTEXT "Syntax Highlighting Edit View by Andrei Stcherbatchenko ", - IDC_STATIC,7,71,209,8 - LTEXT "Various Syntaxes by Ferdinand Prantl",IDC_STATIC,7,81, - 209,8 - LTEXT "Other major contributors include:",IDC_STATIC,7,91,209, - 8 - LTEXT "Christian List, Perry Rapp, Kimmo Varis, Laurent Ganier", - IDC_STATIC,7,101,209,8 - LTEXT "Korean Translation by Sukjoon, Hwang",IDC_STATIC,7,121, - 209,8 + LTEXT "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8 + LTEXT "Contributors are listed in",IDC_STATIC,7,81,208,8 + LTEXT "Docs/Contributors.rtf",IDC_STATIC,7,91,153,8 + PUSHBUTTON "Open...",IDC_OPEN_CONTRIBUTORS,165,95,50,14 END IDD_OPEN DIALOGEX 0, 0, 356, 115 diff --git a/Src/Languages/Korean/resource.h b/Src/Languages/Korean/resource.h index 188885e0e..9bab57ecf 100644 --- a/Src/Languages/Korean/resource.h +++ b/Src/Languages/Korean/resource.h @@ -312,6 +312,7 @@ #define IDC_COLORDEFAULTS_BTN 1118 #define IDC_COMPARE_DEFAULTS 1119 #define IDC_CMPPANE_AUTOCLOSE 1120 +#define IDC_OPEN_CONTRIBUTORS 1121 #define IDS_NUM_REPLACED 8501 #define IDS_EDIT_TEXT_NOT_FOUND 8502 #define IDS_LINE_STATUS_INFO_EOL 8503 @@ -564,7 +565,7 @@ #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 124 #define _APS_NEXT_COMMAND_VALUE 32865 -#define _APS_NEXT_CONTROL_VALUE 1121 +#define _APS_NEXT_CONTROL_VALUE 1122 #define _APS_NEXT_SYMED_VALUE 108 #endif #endif diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc index 89e730aa2..28ce3ce48 100644 --- a/Src/Languages/Norwegian/MergeNorwegian.rc +++ b/Src/Languages/Norwegian/MergeNorwegian.rc @@ -329,7 +329,7 @@ END // Dialog // -IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 223, 134 +IDD_ABOUTBOX DIALOGEX 0, 0, 223, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Om WinMerge" FONT 8, "MS Sans Serif" @@ -342,15 +342,10 @@ BEGIN LTEXT "Alle rettigheter forbeholdes",IDC_STATIC,7,60,170,8 LTEXT "Besøk WinMerge sin hjemmeside!",IDC_WWW,7,107,209,8 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,103,209,1 - LTEXT "© 2000 Thingamahoochie Software",IDC_COMPANY,7,49,209,8 - LTEXT "Syntax Highlighting Edit View by Andrei Stcherbatchenko ", - IDC_STATIC,7,71,209,8 - LTEXT "Various Syntaxes by Ferdinand Prantl",IDC_STATIC,7,81, - 209,8 - LTEXT "Other major contributors include:",IDC_STATIC,7,91,209, - 8 - LTEXT "Christian List, Perry Rapp, Kimmo Varis, Laurent Ganier", - IDC_STATIC,7,101,209,8 + LTEXT "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8 + LTEXT "Contributors are listed in",IDC_STATIC,7,81,208,8 + LTEXT "Docs/Contributors.rtf",IDC_STATIC,7,91,153,8 + PUSHBUTTON "Open...",IDC_OPEN_CONTRIBUTORS,165,95,50,14 END IDD_OPEN DIALOGEX 0, 0, 356, 115 diff --git a/Src/Languages/Norwegian/resource.h b/Src/Languages/Norwegian/resource.h index 188885e0e..9bab57ecf 100644 --- a/Src/Languages/Norwegian/resource.h +++ b/Src/Languages/Norwegian/resource.h @@ -312,6 +312,7 @@ #define IDC_COLORDEFAULTS_BTN 1118 #define IDC_COMPARE_DEFAULTS 1119 #define IDC_CMPPANE_AUTOCLOSE 1120 +#define IDC_OPEN_CONTRIBUTORS 1121 #define IDS_NUM_REPLACED 8501 #define IDS_EDIT_TEXT_NOT_FOUND 8502 #define IDS_LINE_STATUS_INFO_EOL 8503 @@ -564,7 +565,7 @@ #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 124 #define _APS_NEXT_COMMAND_VALUE 32865 -#define _APS_NEXT_CONTROL_VALUE 1121 +#define _APS_NEXT_CONTROL_VALUE 1122 #define _APS_NEXT_SYMED_VALUE 108 #endif #endif diff --git a/Src/Languages/Polish/MergePolish.rc b/Src/Languages/Polish/MergePolish.rc index 8ce77134f..f79381faa 100644 --- a/Src/Languages/Polish/MergePolish.rc +++ b/Src/Languages/Polish/MergePolish.rc @@ -329,7 +329,7 @@ END // Dialog // -IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 223, 134 +IDD_ABOUTBOX DIALOGEX 0, 0, 223, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "O programie WinMerge" FONT 8, "MS Sans Serif" @@ -343,14 +343,9 @@ BEGIN LTEXT "Zajrzyj na strone WinMerge!",IDC_WWW,7,119,184,8 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,113,209,1 LTEXT "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8 - LTEXT "Widok edycji z podswietleniem skladni: Andrei Stcherbatchenko ", - IDC_STATIC,7,71,209,8 - LTEXT "Skladnia róznych jezyków: Ferdinand Prantl",IDC_STATIC,7,81, - 209,8 - LTEXT "Other major contributors include:",IDC_STATIC,7,91,209, - 8 - LTEXT "Christian List, Perry Rapp, Kimmo Varis, Laurent Ganier", - IDC_STATIC,7,101,209,8 + LTEXT "Contributors are listed in",IDC_STATIC,7,81,208,8 + LTEXT "Docs/Contributors.rtf",IDC_STATIC,7,91,153,8 + PUSHBUTTON "Open...",IDC_OPEN_CONTRIBUTORS,165,95,50,14 END IDD_OPEN DIALOGEX 0, 0, 356, 115 diff --git a/Src/Languages/Polish/resource.h b/Src/Languages/Polish/resource.h index 188885e0e..9bab57ecf 100644 --- a/Src/Languages/Polish/resource.h +++ b/Src/Languages/Polish/resource.h @@ -312,6 +312,7 @@ #define IDC_COLORDEFAULTS_BTN 1118 #define IDC_COMPARE_DEFAULTS 1119 #define IDC_CMPPANE_AUTOCLOSE 1120 +#define IDC_OPEN_CONTRIBUTORS 1121 #define IDS_NUM_REPLACED 8501 #define IDS_EDIT_TEXT_NOT_FOUND 8502 #define IDS_LINE_STATUS_INFO_EOL 8503 @@ -564,7 +565,7 @@ #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 124 #define _APS_NEXT_COMMAND_VALUE 32865 -#define _APS_NEXT_CONTROL_VALUE 1121 +#define _APS_NEXT_CONTROL_VALUE 1122 #define _APS_NEXT_SYMED_VALUE 108 #endif #endif diff --git a/Src/Languages/Russian/MergeRussian.rc b/Src/Languages/Russian/MergeRussian.rc index ed9db1fcf..3dbdd65f5 100644 --- a/Src/Languages/Russian/MergeRussian.rc +++ b/Src/Languages/Russian/MergeRussian.rc @@ -334,7 +334,7 @@ END // Dialog // -IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 223, 134 +IDD_ABOUTBOX DIALOGEX 0, 0, 223, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Î ïðîãðàììå WinMerge" FONT 8, "MS Sans Serif" @@ -349,13 +349,9 @@ BEGIN 209,8 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,113,209,1 LTEXT "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8 - LTEXT "Ïîäñâåòêà ñèíòàêñèñà â ðåäàêòîðå: Àíäðåé Ùåðáàò÷åíêî", - IDC_STATIC,7,71,209,8 - LTEXT "Íàáîð ðàçëè÷íûõ ñèíòàêñèñîâ: Ferdinand Prantl", - IDC_STATIC,7,81,209,8 - LTEXT "Äðóãèå âåäóùèå ðàçðàáîò÷èêè:",IDC_STATIC,7,91,209,8 - LTEXT "Christian List, Perry Rapp, Kimmo Varis, Laurent Ganier", - IDC_STATIC,7,101,209,8 + LTEXT "Contributors are listed in",IDC_STATIC,7,81,208,8 + LTEXT "Docs/Contributors.rtf",IDC_STATIC,7,91,153,8 + PUSHBUTTON "Open...",IDC_OPEN_CONTRIBUTORS,165,95,50,14 END IDD_OPEN DIALOGEX 0, 0, 356, 115 diff --git a/Src/Languages/Russian/resource.h b/Src/Languages/Russian/resource.h index 188885e0e..9bab57ecf 100644 --- a/Src/Languages/Russian/resource.h +++ b/Src/Languages/Russian/resource.h @@ -312,6 +312,7 @@ #define IDC_COLORDEFAULTS_BTN 1118 #define IDC_COMPARE_DEFAULTS 1119 #define IDC_CMPPANE_AUTOCLOSE 1120 +#define IDC_OPEN_CONTRIBUTORS 1121 #define IDS_NUM_REPLACED 8501 #define IDS_EDIT_TEXT_NOT_FOUND 8502 #define IDS_LINE_STATUS_INFO_EOL 8503 @@ -564,7 +565,7 @@ #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 124 #define _APS_NEXT_COMMAND_VALUE 32865 -#define _APS_NEXT_CONTROL_VALUE 1121 +#define _APS_NEXT_CONTROL_VALUE 1122 #define _APS_NEXT_SYMED_VALUE 108 #endif #endif diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc index 45af0f9fd..a78191c5d 100644 --- a/Src/Languages/Slovak/MergeSlovak.rc +++ b/Src/Languages/Slovak/MergeSlovak.rc @@ -329,7 +329,7 @@ END // Dialog // -IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 223, 134 +IDD_ABOUTBOX DIALOGEX 0, 0, 223, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "O programe" FONT 8, "MS Sans Serif" @@ -343,15 +343,10 @@ BEGIN LTEXT "Navštívte www stránku programu WinMerge!",IDC_WWW,7,107, 184,8 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,103,209,1 - LTEXT "© 2000 Thingamahoochie Software",IDC_COMPANY,7,49,209,8 - LTEXT "Syntax Highlighting Edit View by Andrei Stcherbatchenko ", - IDC_STATIC,7,71,209,8 - LTEXT "Various Syntaxes by Ferdinand Prantl",IDC_STATIC,7,81, - 209,8 - LTEXT "Other major contributors include:",IDC_STATIC,7,91,209, - 8 - LTEXT "Christian List, Perry Rapp, Kimmo Varis, Laurent Ganier", - IDC_STATIC,7,101,209,8 + LTEXT "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8 + LTEXT "Contributors are listed in",IDC_STATIC,7,81,208,8 + LTEXT "Docs/Contributors.rtf",IDC_STATIC,7,91,153,8 + PUSHBUTTON "Open...",IDC_OPEN_CONTRIBUTORS,165,95,50,14 END IDD_OPEN DIALOGEX 0, 0, 366, 115 diff --git a/Src/Languages/Slovak/resource.h b/Src/Languages/Slovak/resource.h index 188885e0e..9bab57ecf 100644 --- a/Src/Languages/Slovak/resource.h +++ b/Src/Languages/Slovak/resource.h @@ -312,6 +312,7 @@ #define IDC_COLORDEFAULTS_BTN 1118 #define IDC_COMPARE_DEFAULTS 1119 #define IDC_CMPPANE_AUTOCLOSE 1120 +#define IDC_OPEN_CONTRIBUTORS 1121 #define IDS_NUM_REPLACED 8501 #define IDS_EDIT_TEXT_NOT_FOUND 8502 #define IDS_LINE_STATUS_INFO_EOL 8503 @@ -564,7 +565,7 @@ #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 124 #define _APS_NEXT_COMMAND_VALUE 32865 -#define _APS_NEXT_CONTROL_VALUE 1121 +#define _APS_NEXT_CONTROL_VALUE 1122 #define _APS_NEXT_SYMED_VALUE 108 #endif #endif diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc index 63513d509..a8637f9ef 100644 --- a/Src/Languages/Spanish/MergeSpanish.rc +++ b/Src/Languages/Spanish/MergeSpanish.rc @@ -329,7 +329,7 @@ END // Dialog // -IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 223, 134 +IDD_ABOUTBOX DIALOGEX 0, 0, 223, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Sobre WinMerge" FONT 8, "MS Sans Serif" @@ -342,15 +342,10 @@ BEGIN LTEXT "Derechos reservados.",IDC_STATIC,7,60,170,8 LTEXT "¡Visite la página de WinMerge!",IDC_WWW,7,107,209,8 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,103,209,1 - LTEXT "© 2000 Thingamahoochie Software",IDC_COMPANY,7,49,209,8 - LTEXT "Syntax Highlighting Edit View by Andrei Stcherbatchenko ", - IDC_STATIC,7,71,209,8 - LTEXT "Various Syntaxes by Ferdinand Prantl",IDC_STATIC,7,81, - 209,8 - LTEXT "Other major contributors include:",IDC_STATIC,7,91,209, - 8 - LTEXT "Christian List, Perry Rapp, Kimmo Varis, Laurent Ganier", - IDC_STATIC,7,101,209,8 + LTEXT "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8 + LTEXT "Contributors are listed in",IDC_STATIC,7,81,208,8 + LTEXT "Docs/Contributors.rtf",IDC_STATIC,7,91,153,8 + PUSHBUTTON "Open...",IDC_OPEN_CONTRIBUTORS,165,95,50,14 END IDD_OPEN DIALOGEX 0, 0, 356, 115 diff --git a/Src/Languages/Spanish/resource.h b/Src/Languages/Spanish/resource.h index 188885e0e..9bab57ecf 100644 --- a/Src/Languages/Spanish/resource.h +++ b/Src/Languages/Spanish/resource.h @@ -312,6 +312,7 @@ #define IDC_COLORDEFAULTS_BTN 1118 #define IDC_COMPARE_DEFAULTS 1119 #define IDC_CMPPANE_AUTOCLOSE 1120 +#define IDC_OPEN_CONTRIBUTORS 1121 #define IDS_NUM_REPLACED 8501 #define IDS_EDIT_TEXT_NOT_FOUND 8502 #define IDS_LINE_STATUS_INFO_EOL 8503 @@ -564,7 +565,7 @@ #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 124 #define _APS_NEXT_COMMAND_VALUE 32865 -#define _APS_NEXT_CONTROL_VALUE 1121 +#define _APS_NEXT_CONTROL_VALUE 1122 #define _APS_NEXT_SYMED_VALUE 108 #endif #endif diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc index 72dbb15dc..403623708 100644 --- a/Src/Languages/Swedish/MergeSwedish.rc +++ b/Src/Languages/Swedish/MergeSwedish.rc @@ -328,7 +328,7 @@ END // Dialog // -IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 223, 134 +IDD_ABOUTBOX DIALOGEX 0, 0, 223, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Om WinMerge" FONT 8, "MS Sans Serif" @@ -341,15 +341,10 @@ BEGIN LTEXT "Med ensamrätt",IDC_STATIC,7,60,170,8 LTEXT "Besök WinMerges hemsida!",IDC_WWW,7,107,209,8 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,103,209,1 - LTEXT "© 2000 Thingamahoochie Software",IDC_COMPANY,7,49,209,8 - LTEXT "Syntax Highlighting Edit View by Andrei Stcherbatchenko ", - IDC_STATIC,7,71,209,8 - LTEXT "Various Syntaxes by Ferdinand Prantl",IDC_STATIC,7,81, - 209,8 - LTEXT "Other major contributors include:",IDC_STATIC,7,91,209, - 8 - LTEXT "Christian List, Perry Rapp, Kimmo Varis, Laurent Ganier", - IDC_STATIC,7,101,209,8 + LTEXT "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8 + LTEXT "Contributors are listed in",IDC_STATIC,7,81,208,8 + LTEXT "Docs/Contributors.rtf",IDC_STATIC,7,91,153,8 + PUSHBUTTON "Open...",IDC_OPEN_CONTRIBUTORS,165,95,50,14 END IDD_OPEN DIALOGEX 0, 0, 356, 115 diff --git a/Src/Languages/Swedish/resource.h b/Src/Languages/Swedish/resource.h index 188885e0e..9bab57ecf 100644 --- a/Src/Languages/Swedish/resource.h +++ b/Src/Languages/Swedish/resource.h @@ -312,6 +312,7 @@ #define IDC_COLORDEFAULTS_BTN 1118 #define IDC_COMPARE_DEFAULTS 1119 #define IDC_CMPPANE_AUTOCLOSE 1120 +#define IDC_OPEN_CONTRIBUTORS 1121 #define IDS_NUM_REPLACED 8501 #define IDS_EDIT_TEXT_NOT_FOUND 8502 #define IDS_LINE_STATUS_INFO_EOL 8503 @@ -564,7 +565,7 @@ #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 124 #define _APS_NEXT_COMMAND_VALUE 32865 -#define _APS_NEXT_CONTROL_VALUE 1121 +#define _APS_NEXT_CONTROL_VALUE 1122 #define _APS_NEXT_SYMED_VALUE 108 #endif #endif diff --git a/Src/Merge.cpp b/Src/Merge.cpp index 58b102a7c..0f05652d7 100644 --- a/Src/Merge.cpp +++ b/Src/Merge.cpp @@ -367,6 +367,8 @@ protected: virtual BOOL OnInitDialog(); //}}AFX_MSG DECLARE_MESSAGE_MAP() +public: + afx_msg void OnBnClickedOpenContributors(); }; CAboutDlg::CAboutDlg() : CDialog(CAboutDlg::IDD) @@ -391,6 +393,7 @@ void CAboutDlg::DoDataExchange(CDataExchange* pDX) BEGIN_MESSAGE_MAP(CAboutDlg, CDialog) //{{AFX_MSG_MAP(CAboutDlg) //}}AFX_MSG_MAP + ON_BN_CLICKED(IDC_OPEN_CONTRIBUTORS, OnBnClickedOpenContributors) END_MESSAGE_MAP() // App command to run the dialog @@ -728,3 +731,26 @@ BOOL CMergeApp::includeDir(LPCTSTR szDirName) return m_fileFilterMgr->TestDirNameAgainstFilter(m_currentFilter, szDirName); } +/** @brief Open Contributors.rtf */ +void CAboutDlg::OnBnClickedOpenContributors() +{ + CString defPath = GetModulePath(); + // Don't add quotation marks yet, CFile doesn't like them + CString docPath = defPath + _T("\\Docs\\Contributors.rtf"); + + CFileStatus status; + if (CFile::GetStatus(docPath, status)) + { + // Now, add quotation marks so ShellExecute() doesn't fail if path + // includes spaces + docPath.Insert(0, _T("\"")); + docPath.Insert(docPath.GetLength(), _T("\"")); + ShellExecute(m_hWnd, NULL, _T("wordpad"), docPath, defPath, SW_SHOWNORMAL); + } + else + { + CString msg; + AfxFormatString1(msg, IDS_ERROR_FILE_NOT_FOUND, docPath); + AfxMessageBox(msg, MB_OK | MB_ICONSTOP); + } +} diff --git a/Src/Merge.rc b/Src/Merge.rc index 8b0b0d657..0317c5407 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -329,7 +329,7 @@ END // Dialog // -IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 223, 134 +IDD_ABOUTBOX DIALOGEX 0, 0, 223, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "About WinMerge" FONT 8, "MS Sans Serif" @@ -343,14 +343,9 @@ BEGIN LTEXT "Visit the WinMerge HomePage!",IDC_WWW,7,119,209,8 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,113,209,1 LTEXT "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8 - LTEXT "Syntax Highlighting Edit View by Andrei Stcherbatchenko ", - IDC_STATIC,7,71,209,8 - LTEXT "Various Syntaxes by Ferdinand Prantl",IDC_STATIC,7,81, - 209,8 - LTEXT "Other major contributors include:",IDC_STATIC,7,91,209, - 8 - LTEXT "Christian List, Perry Rapp, Kimmo Varis, Laurent Ganier", - IDC_STATIC,7,101,209,8 + LTEXT "Contributors are listed in",IDC_STATIC,7,81,208,8 + LTEXT "Docs/Contributors.rtf",IDC_STATIC,7,91,153,8 + PUSHBUTTON "Open...",IDC_OPEN_CONTRIBUTORS,165,95,50,14 END IDD_OPEN DIALOGEX 0, 0, 356, 115 diff --git a/Src/readme.txt b/Src/readme.txt index 69c44b6bc..f09b8fb80 100644 --- a/Src/readme.txt +++ b/Src/readme.txt @@ -2,6 +2,8 @@ RFE [ 917196 ] Directory Comparison Results baloon annoyance Don't show infotip for filename when whole filename is already shown Src: DirView.cpp + PATCH: [ 915790 ] Open Contributors.rtf from About dialog + Src: Merge.cpp Merge.rc resource.h 2004-03-15 Perry Fix Bulgarian (Cyrillic) spelling of Bulgarian. diff --git a/Src/resource.h b/Src/resource.h index 188885e0e..9bab57ecf 100644 --- a/Src/resource.h +++ b/Src/resource.h @@ -312,6 +312,7 @@ #define IDC_COLORDEFAULTS_BTN 1118 #define IDC_COMPARE_DEFAULTS 1119 #define IDC_CMPPANE_AUTOCLOSE 1120 +#define IDC_OPEN_CONTRIBUTORS 1121 #define IDS_NUM_REPLACED 8501 #define IDS_EDIT_TEXT_NOT_FOUND 8502 #define IDS_LINE_STATUS_INFO_EOL 8503 @@ -564,7 +565,7 @@ #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 124 #define _APS_NEXT_COMMAND_VALUE 32865 -#define _APS_NEXT_CONTROL_VALUE 1121 +#define _APS_NEXT_CONTROL_VALUE 1122 #define _APS_NEXT_SYMED_VALUE 108 #endif #endif -- 2.11.0