From 5972c7389f96d93876902431f8db756948c33926 Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Wed, 30 Jun 2004 18:15:05 +0000 Subject: [PATCH] Fix control coordinates in German and French versions of open file dialog. Remove duplicate control ids in Catalan, Russian and Ukrainian dialogs. --- dlls/commdlg/cdlg_Ca.rc | 2 +- dlls/commdlg/cdlg_De.rc | 11 +++++------ dlls/commdlg/cdlg_Fr.rc | 10 +++++----- dlls/commdlg/cdlg_Ru.rc | 2 +- dlls/commdlg/cdlg_Uk.rc | 2 +- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/commdlg/cdlg_Ca.rc b/dlls/commdlg/cdlg_Ca.rc index 4f4da809592..403df1b31b8 100644 --- a/dlls/commdlg/cdlg_Ca.rc +++ b/dlls/commdlg/cdlg_Ca.rc @@ -169,7 +169,7 @@ FONT 8, "Helv" EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 - CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 + CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 DEFPUSHBUTTON "D'acord", IDOK, 4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP diff --git a/dlls/commdlg/cdlg_De.rc b/dlls/commdlg/cdlg_De.rc index 91c5c6840a2..a0caee09245 100644 --- a/dlls/commdlg/cdlg_De.rc +++ b/dlls/commdlg/cdlg_De.rc @@ -255,8 +255,8 @@ FONT 8, "Helv" LTEXT "&Suche in",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - LTEXT "" , IDC_TOOLBARSTATIC, 181, 2, 122, 17, NOT WS_GROUP | NOT WS_VISIBLE - LISTBOX IDC_SHELLSTATIC,4,20,292,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE + LTEXT "" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE + LISTBOX IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "Datei&name:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY EDITTEXT IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL @@ -266,10 +266,9 @@ FONT 8, "Helv" CONTROL "&Schreibgeschьtzt",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 - - DEFPUSHBUTTON "Ц&ffnen", IDOK,242,110,50,14 - PUSHBUTTON "Abbrechen", IDCANCEL,242,128,50,14 - PUSHBUTTON "&Hilfe", pshHelp,242,145,50,14 + DEFPUSHBUTTON "Ц&ffnen", IDOK,222,110,50,14 + PUSHBUTTON "Abbrechen", IDCANCEL,222,128,50,14 + PUSHBUTTON "&Hilfe", pshHelp,222,145,50,14 } PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 186 diff --git a/dlls/commdlg/cdlg_Fr.rc b/dlls/commdlg/cdlg_Fr.rc index 38fce69e6dd..f462bad0260 100644 --- a/dlls/commdlg/cdlg_Fr.rc +++ b/dlls/commdlg/cdlg_Fr.rc @@ -336,8 +336,8 @@ FONT 8, "Helv" LTEXT "&Rechercher dans",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - LTEXT "" , IDC_TOOLBARSTATIC, 181, 2, 122, 17, NOT WS_GROUP | NOT WS_VISIBLE - LISTBOX IDC_SHELLSTATIC,4,20,292,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE + LTEXT "" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE + LISTBOX IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "&Nom du fichier:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY EDITTEXT IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL @@ -347,9 +347,9 @@ FONT 8, "Helv" CONTROL "&Protection йcriture",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 - DEFPUSHBUTTON "Ouvrir", IDOK,242,110,50,14 - PUSHBUTTON "Annuler", IDCANCEL,242,128,50,14 - PUSHBUTTON "&Aide", pshHelp,242,145,50,14 + DEFPUSHBUTTON "Ouvrir", IDOK,222,110,50,14 + PUSHBUTTON "Annuler", IDCANCEL,222,128,50,14 + PUSHBUTTON "&Aide", pshHelp,222,145,50,14 } STRINGTABLE DISCARDABLE diff --git a/dlls/commdlg/cdlg_Ru.rc b/dlls/commdlg/cdlg_Ru.rc index 3a76440baee..798d400884a 100644 --- a/dlls/commdlg/cdlg_Ru.rc +++ b/dlls/commdlg/cdlg_Ru.rc @@ -240,7 +240,7 @@ FONT 8, "Ms Sans Serif" LTEXT "Эмулирован", stc11, 60, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Место:", stc10, 16, 60, 36,10, SS_NOPREFIX LTEXT "Эмулировано", stc14, 60, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Примечание:", stc13, 16, 72, 36,10, SS_NOPREFIX + LTEXT "Примечание:", stc9, 16, 72, 36,10, SS_NOPREFIX LTEXT "Эмулировано", stc13, 60, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Копии", grp2, 160, 92, 120,64, WS_GROUP diff --git a/dlls/commdlg/cdlg_Uk.rc b/dlls/commdlg/cdlg_Uk.rc index 76d3b5cec7a..df82c1f086e 100644 --- a/dlls/commdlg/cdlg_Uk.rc +++ b/dlls/commdlg/cdlg_Uk.rc @@ -240,7 +240,7 @@ FONT 8, "Ms Sans Serif" LTEXT "Емульовано", stc11, 60, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Місце:", stc10, 16, 60, 36,10, SS_NOPREFIX LTEXT "Емульовано", stc14, 60, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Примітка:", stc13, 16, 72, 36,10, SS_NOPREFIX + LTEXT "Примітка:", stc9, 16, 72, 36,10, SS_NOPREFIX LTEXT "Емульовано", stc13, 60, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Копії", grp2, 160, 92, 120,64, WS_GROUP