From 68c587dd39995c9804a9cd4aca113a5b4abdbbfb Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Tue, 21 Mar 2006 20:02:11 +0000 Subject: [PATCH] PATCH: [ 1454720 ] Fix resizable dialogs missing captionbar close button --- Src/Changes.txt | 3 +++ Src/Languages/Brazilian/MergeBrazilian.rc | 10 ++++++---- Src/Languages/Bulgarian/MergeBulgarian.rc | 10 ++++++---- Src/Languages/Catalan/MergeCatalan.rc | 10 ++++++---- Src/Languages/ChineseSimplified/MergeChineseSimplified.rc | 10 ++++++---- Src/Languages/ChineseTraditional/MergeChineseTraditional.rc | 10 ++++++---- Src/Languages/Czech/MergeCzech.rc | 10 ++++++---- Src/Languages/Danish/MergeDanish.rc | 10 ++++++---- Src/Languages/Dutch/MergeDutch.rc | 12 +++++++----- Src/Languages/French/MergeFrench.rc | 11 ++++++----- Src/Languages/German/MergeGerman.rc | 10 ++++++---- Src/Languages/Hungarian/MergeHungarian.rc | 10 ++++++---- Src/Languages/Italian/MergeItalian.rc | 10 ++++++---- Src/Languages/Japanese/MergeJapanese.rc | 10 ++++++---- Src/Languages/Korean/MergeKorean.rc | 10 ++++++---- Src/Languages/Norwegian/MergeNorwegian.rc | 10 ++++++---- Src/Languages/Polish/MergePolish.rc | 10 ++++++---- Src/Languages/Russian/MergeRussian.rc | 10 ++++++---- Src/Languages/Slovak/MergeSlovak.rc | 10 ++++++---- Src/Languages/Spanish/MergeSpanish.rc | 10 ++++++---- Src/Languages/Swedish/MergeSwedish.rc | 10 ++++++---- Src/Languages/Turkish/MergeTurkish.rc | 12 +++++++----- Src/Merge.rc | 10 ++++++---- 23 files changed, 137 insertions(+), 91 deletions(-) diff --git a/Src/Changes.txt b/Src/Changes.txt index 6e70de0c5..63038cfcb 100644 --- a/Src/Changes.txt +++ b/Src/Changes.txt @@ -9,6 +9,9 @@ Add new items to top. PATCH: [ 1452288 ] Add ASP.NET filefilter By By Jon Galloway and Josh Blair Filters new file: ASPNET.flt + PATCH: [ 1454720 ] Fix resizable dialogs missing captionbar close button + Src: Merge.rc + Src/Languages/*: Merge*.rc 2006-03-19 Kimmo PATCH: [ 1449892 ] Add compare method to configlog diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc index 6d4767400..d08da803f 100644 --- a/Src/Languages/Brazilian/MergeBrazilian.rc +++ b/Src/Languages/Brazilian/MergeBrazilian.rc @@ -638,7 +638,8 @@ BEGIN END IDD_OPEN DIALOGEX 0, 0, 364, 126 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Selecione Arquivos ou Diretórios..." FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -741,8 +742,8 @@ BEGIN END IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142 -STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Idiomas" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -1443,7 +1444,8 @@ BEGIN END IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Codepage" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN diff --git a/Src/Languages/Bulgarian/MergeBulgarian.rc b/Src/Languages/Bulgarian/MergeBulgarian.rc index 4ea31af22..417f5f920 100644 --- a/Src/Languages/Bulgarian/MergeBulgarian.rc +++ b/Src/Languages/Bulgarian/MergeBulgarian.rc @@ -638,7 +638,8 @@ BEGIN END IDD_OPEN DIALOGEX 0, 0, 364, 126 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Èçáåðè Ôàéë èëè äèðåêòîðèÿ..." FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -741,8 +742,8 @@ BEGIN END IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142 -STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Åçèê" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -1443,7 +1444,8 @@ BEGIN END IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Codepage" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN diff --git a/Src/Languages/Catalan/MergeCatalan.rc b/Src/Languages/Catalan/MergeCatalan.rc index 4e1a9bed9..130865637 100644 --- a/Src/Languages/Catalan/MergeCatalan.rc +++ b/Src/Languages/Catalan/MergeCatalan.rc @@ -638,7 +638,8 @@ BEGIN END IDD_OPEN DIALOGEX 0, 0, 376, 126 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Tria de fitxers o directoris..." FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -741,8 +742,8 @@ BEGIN END IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142 -STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Idioma" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -1443,7 +1444,8 @@ BEGIN END IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Codepage" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc index 5aa35e663..fe52a5874 100644 --- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc +++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc @@ -640,7 +640,8 @@ BEGIN END IDD_OPEN DIALOGEX 0, 0, 364, 126 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Ñ¡ÔñÎļþ»òÎļþ¼Ð..." FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -743,8 +744,8 @@ BEGIN END IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142 -STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "ÓïÑÔ" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -1445,7 +1446,8 @@ BEGIN END IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Codepage" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc index 62492143a..cd07c813c 100644 --- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc +++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc @@ -638,7 +638,8 @@ BEGIN END IDD_OPEN DIALOGEX 0, 0, 364, 126 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "¿ï¨úÀɮשθê®Æ§¨..." FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -741,8 +742,8 @@ BEGIN END IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142 -STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "»y¨¥" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -1443,7 +1444,8 @@ BEGIN END IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Codepage" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc index 241644bbb..6e83fb1e7 100644 --- a/Src/Languages/Czech/MergeCzech.rc +++ b/Src/Languages/Czech/MergeCzech.rc @@ -638,7 +638,8 @@ BEGIN END IDD_OPEN DIALOGEX 0, 0, 364, 126 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Vybrat soubory nebo složky..." FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -741,8 +742,8 @@ BEGIN END IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142 -STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Jazyk" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -1443,7 +1444,8 @@ BEGIN END IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Codepage" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc index e4c346d0c..98a2dcc37 100644 --- a/Src/Languages/Danish/MergeDanish.rc +++ b/Src/Languages/Danish/MergeDanish.rc @@ -638,7 +638,8 @@ BEGIN END IDD_OPEN DIALOGEX 0, 0, 364, 126 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Vælg filer eller mapper..." FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -741,8 +742,8 @@ BEGIN END IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142 -STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Sprog" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -1443,7 +1444,8 @@ BEGIN END IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Codepage" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc index 2f6d0d08d..febb12e62 100644 --- a/Src/Languages/Dutch/MergeDutch.rc +++ b/Src/Languages/Dutch/MergeDutch.rc @@ -638,7 +638,8 @@ BEGIN END IDD_OPEN DIALOGEX 0, 0, 364, 126 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Bestanden of mappen selecteren" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -741,9 +742,9 @@ BEGIN END IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142 -STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU -CAPTION "Taalkeuze" +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME +APTION "Taalkeuze" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN PUSHBUTTON "OK",IDOK,30,123,52,14 @@ -1443,7 +1444,8 @@ BEGIN END IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Codepage" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc index fe828d0f8..6fd10932e 100644 --- a/Src/Languages/French/MergeFrench.rc +++ b/Src/Languages/French/MergeFrench.rc @@ -636,8 +636,8 @@ BEGIN END IDD_OPEN DIALOGEX 0, 0, 364, 126 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | - WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Sélection des fichiers ou des répertoires..." FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -741,8 +741,8 @@ END IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU -CAPTION "Langage" + WS_SYSMENU | WS_THICKFRAME +APTION "Langage" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN PUSHBUTTON "OK",IDOK,30,123,52,14 @@ -1439,7 +1439,8 @@ BEGIN END IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Codepage" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc index 6185967bc..9c9f61163 100644 --- a/Src/Languages/German/MergeGerman.rc +++ b/Src/Languages/German/MergeGerman.rc @@ -638,7 +638,8 @@ BEGIN END IDD_OPEN DIALOGEX 0, 0, 368, 126 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Dateien oder Verzeichnisse auswählen..." FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -741,8 +742,8 @@ BEGIN END IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142 -STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Sprache" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -1443,7 +1444,8 @@ BEGIN END IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Codepage" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN diff --git a/Src/Languages/Hungarian/MergeHungarian.rc b/Src/Languages/Hungarian/MergeHungarian.rc index 6111e2530..2892e078d 100644 --- a/Src/Languages/Hungarian/MergeHungarian.rc +++ b/Src/Languages/Hungarian/MergeHungarian.rc @@ -638,7 +638,8 @@ BEGIN END IDD_OPEN DIALOGEX 0, 0, 364, 126 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Válaszd ki a fájlokat vagy könyvtárakat..." FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -741,8 +742,8 @@ BEGIN END IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142 -STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Nyelv" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -1443,7 +1444,8 @@ BEGIN END IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Codepage" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc index 72b6e2fa1..2907176b2 100644 --- a/Src/Languages/Italian/MergeItalian.rc +++ b/Src/Languages/Italian/MergeItalian.rc @@ -638,7 +638,8 @@ BEGIN END IDD_OPEN DIALOGEX 0, 0, 364, 126 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Seleziona i file o le cartelle..." FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -741,8 +742,8 @@ BEGIN END IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142 -STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Lingua" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -1443,7 +1444,8 @@ BEGIN END IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Codepage" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN diff --git a/Src/Languages/Japanese/MergeJapanese.rc b/Src/Languages/Japanese/MergeJapanese.rc index f69979b82..ab8601574 100644 --- a/Src/Languages/Japanese/MergeJapanese.rc +++ b/Src/Languages/Japanese/MergeJapanese.rc @@ -638,7 +638,8 @@ BEGIN END IDD_OPEN DIALOGEX 0, 0, 374, 126 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "ƒtƒ@ƒCƒ‹‚Ü‚½‚̓tƒHƒ‹ƒ_‚Ì‘I‘ð..." FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -741,8 +742,8 @@ BEGIN END IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142 -STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Œ¾Œê" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -1443,7 +1444,8 @@ BEGIN END IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Codepage" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc index e125c72e1..9c3a4349e 100644 --- a/Src/Languages/Korean/MergeKorean.rc +++ b/Src/Languages/Korean/MergeKorean.rc @@ -638,7 +638,8 @@ BEGIN END IDD_OPEN DIALOGEX 0, 0, 364, 126 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "µð·ºÅ丮/ÆÄÀÏ ¼±ÅÃ..." FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -741,8 +742,8 @@ BEGIN END IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142 -STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "¾ð¾î" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -1443,7 +1444,8 @@ BEGIN END IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Codepage" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc index e548ee139..6c5d900a9 100644 --- a/Src/Languages/Norwegian/MergeNorwegian.rc +++ b/Src/Languages/Norwegian/MergeNorwegian.rc @@ -638,7 +638,8 @@ BEGIN END IDD_OPEN DIALOGEX 0, 0, 364, 126 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Velg filer eller mapper..." FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -741,8 +742,8 @@ BEGIN END IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142 -STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Språk" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -1443,7 +1444,8 @@ BEGIN END IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Codepage" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN diff --git a/Src/Languages/Polish/MergePolish.rc b/Src/Languages/Polish/MergePolish.rc index 7ec8239db..011ec5188 100644 --- a/Src/Languages/Polish/MergePolish.rc +++ b/Src/Languages/Polish/MergePolish.rc @@ -638,7 +638,8 @@ BEGIN END IDD_OPEN DIALOGEX 0, 0, 364, 126 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Wybierz pliki lub katalogi..." FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -741,8 +742,8 @@ BEGIN END IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142 -STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Jêzyk" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -1443,7 +1444,8 @@ BEGIN END IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Codepage" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN diff --git a/Src/Languages/Russian/MergeRussian.rc b/Src/Languages/Russian/MergeRussian.rc index 6e1bed51d..8b1462354 100644 --- a/Src/Languages/Russian/MergeRussian.rc +++ b/Src/Languages/Russian/MergeRussian.rc @@ -638,7 +638,8 @@ BEGIN END IDD_OPEN DIALOGEX 0, 0, 370, 126 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Âûáåðèòå ôàéëû èëè êàòàëîãè..." FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -741,8 +742,8 @@ BEGIN END IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142 -STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "ßçûê" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -1443,7 +1444,8 @@ BEGIN END IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Codepage" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc index 1fd1b0197..3a40f41be 100644 --- a/Src/Languages/Slovak/MergeSlovak.rc +++ b/Src/Languages/Slovak/MergeSlovak.rc @@ -638,7 +638,8 @@ BEGIN END IDD_OPEN DIALOGEX 0, 0, 364, 126 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Výber súborov a adresárov..." FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -741,8 +742,8 @@ BEGIN END IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142 -STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Jazyk" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -1443,7 +1444,8 @@ BEGIN END IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Codepage" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc index a8b586788..0564e8ff7 100644 --- a/Src/Languages/Spanish/MergeSpanish.rc +++ b/Src/Languages/Spanish/MergeSpanish.rc @@ -638,7 +638,8 @@ BEGIN END IDD_OPEN DIALOGEX 0, 0, 364, 126 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Seleccione ficheros o directorios..." FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -741,8 +742,8 @@ BEGIN END IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142 -STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Idioma" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -1443,7 +1444,8 @@ BEGIN END IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Codepage" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc index 751846700..25b915af1 100644 --- a/Src/Languages/Swedish/MergeSwedish.rc +++ b/Src/Languages/Swedish/MergeSwedish.rc @@ -638,7 +638,8 @@ BEGIN END IDD_OPEN DIALOGEX 0, 0, 364, 126 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Välj filer eller kataloger..." FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -741,8 +742,8 @@ BEGIN END IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142 -STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Språk" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -1443,7 +1444,8 @@ BEGIN END IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Codepage" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN diff --git a/Src/Languages/Turkish/MergeTurkish.rc b/Src/Languages/Turkish/MergeTurkish.rc index a912cd353..b6f45b3ca 100644 --- a/Src/Languages/Turkish/MergeTurkish.rc +++ b/Src/Languages/Turkish/MergeTurkish.rc @@ -638,8 +638,9 @@ BEGIN END IDD_OPEN DIALOGEX 0, 0, 364, 126 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME -CAPTION "Select Files or Directories..." +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME +CAPTION "Select Files or Folders" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN RTEXT "&Left:",IDC_STATIC,13,24,40,8 @@ -741,8 +742,8 @@ BEGIN END IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142 -STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Language" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -1443,7 +1444,8 @@ BEGIN END IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Codepage" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN diff --git a/Src/Merge.rc b/Src/Merge.rc index f4a2642a4..73bda9c3f 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -638,7 +638,8 @@ BEGIN END IDD_OPEN DIALOGEX 0, 0, 364, 126 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Select Files or Folders" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -741,8 +742,8 @@ BEGIN END IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 213, 142 -STYLE DS_SETFONT | WS_THICKFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Language" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -1443,7 +1444,8 @@ BEGIN END IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME CAPTION "Codepage" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN -- 2.11.0