Fix open file dialog templates in commdlg
Dmitry Timoshkov
dmitry at baikal.ru
Tue Jun 29 22:26:04 CDT 2004
Hello,
a user has reported that open file dialog looks wrong with LANG=de_DE,
but is ok with LANG=C. I decided to inspect all NEWFILEOPENORD dialog
templates in commdlg, and here is the patch.
Changelog:
Dmitry Timoshkov <dmitry at codeweavers.com>
Fix control coordinates in german and french versions of open file dialog.
Remove duplicate control ids in catalan, russian and ukrainian dialogs.
diff -u cvs/hq/wine/dlls/commdlg/cdlg_Ca.rc wine/dlls/commdlg/cdlg_Ca.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_Ca.rc Thu Dec 04 02:20:18 2003
+++ wine/dlls/commdlg/cdlg_Ca.rc Wed Jun 30 02:49:11 2004
@@ -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 -u cvs/hq/wine/dlls/commdlg/cdlg_De.rc wine/dlls/commdlg/cdlg_De.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_De.rc Tue May 04 01:50:08 2004
+++ wine/dlls/commdlg/cdlg_De.rc Wed Jun 30 02:43:12 2004
@@ -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 -u cvs/hq/wine/dlls/commdlg/cdlg_Fr.rc wine/dlls/commdlg/cdlg_Fr.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_Fr.rc Tue May 04 01:50:08 2004
+++ wine/dlls/commdlg/cdlg_Fr.rc Wed Jun 30 02:58:48 2004
@@ -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 -u cvs/hq/wine/dlls/commdlg/cdlg_Ru.rc wine/dlls/commdlg/cdlg_Ru.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_Ru.rc Tue May 04 01:50:08 2004
+++ wine/dlls/commdlg/cdlg_Ru.rc Wed Jun 30 02:50:41 2004
@@ -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 -u cvs/hq/wine/dlls/commdlg/cdlg_Uk.rc wine/dlls/commdlg/cdlg_Uk.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_Uk.rc Tue May 11 00:03:20 2004
+++ wine/dlls/commdlg/cdlg_Uk.rc Wed Jun 30 02:51:36 2004
@@ -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
More information about the wine-patches
mailing list