Hi,
Character set selection added.
Changelog:
dlls/commdlg : fontdlg.c
fontdlg.h
fontdlg16.c
cdlg_Ca.rc
cdlg_Cn.rc
cdlg_Da.rc
cdlg_De.rc
cdlg_En.rc
cdlg_Es.rc
cdlg_Fi.rc
cdlg_Fr.rc
cdlg_Hu.rc
cdlg_It.rc
cdlg_Ja.rc
cdlg_Nl.rc
cdlg_Pl.rc
cdlg_Pt.rc
cdlg_Ru.rc
cdlg_Si.rc
cdlg_Sk.rc
cdlg_Sv.rc
cdlg_Wa.rc
cdlg_Zh.rc
Implement combobox to select the font's character set.
Bug fixes: handle WM_MEASUREITEM message; handle the WM_PAINT
message in the 16bit font dialog, so it displays the sample
string too.
Rein.
--
Rein Klazes
rklazes@xxxxxxxxx
--- wine/dlls/commdlg/fontdlg.c 2003-12-02 08:03:55.000000000 +0100
+++ mywine/dlls/commdlg/fontdlg.c 2003-12-02 16:02:51.000000000 +0100
@@ -417,15 +417,16 @@
if (e) e->added++;
- i=SendMessageA(hwnd, CB_ADDSTRING, 0, (LPARAM)lplf->lfFaceName);
- if (i!=CB_ERR)
- {
- w=(lplf->lfCharSet << 8) | lplf->lfPitchAndFamily;
- SendMessageA(hwnd, CB_SETITEMDATA, i, MAKELONG(nFontType,w));
- return 1 ; /* store some important font information */
+ i=SendMessageA(hwnd, CB_FINDSTRINGEXACT, 0, (LPARAM)lplf->lfFaceName);
+ if (i == CB_ERR) {
+ i = SendMessageA(hwnd, CB_ADDSTRING, 0, (LPARAM)lplf->lfFaceName);
+ if( i != CB_ERR) {
+ w=(lplf->lfCharSet << 8) | lplf->lfPitchAndFamily;
+ /* store some important font information */
+ SendMessageA(hwnd, CB_SETITEMDATA, i, MAKELONG(nFontType,w));
+ }
}
- else
- return 0;
+ return 1;
}
/*************************************************************************
@@ -526,10 +527,13 @@
/***********************************************************************
* AddFontStyle [internal]
*/
-INT AddFontStyle(const LOGFONTA *lplf, UINT nFontType,
- LPCHOOSEFONTA lpcf, HWND hcmb2, HWND hcmb3, HWND hDlg)
+INT AddFontStyle( const ENUMLOGFONTEXA *lpElfex, UINT nFontType,
+ LPCHOOSEFONTA lpcf, HWND hcmb2, HWND hcmb3, HWND hDlg,
+ BOOL iswin16)
{
int i;
+ const LOGFONTA *lplf = &(lpElfex->elfLogFont);
+ HWND hcmb5;
TRACE("(nFontType=%d)\n",nFontType);
TRACE(" %s h=%ld w=%ld e=%ld o=%ld wg=%ld i=%d u=%d s=%d"
@@ -553,9 +557,18 @@
if (i)
return 0;
}
+ if( iswin16 || !( hcmb5 = GetDlgItem(hDlg, cmb5))) return 1;
+ i = SendMessageA( hcmb5, CB_FINDSTRINGEXACT, 0,
+ (LPARAM)lpElfex->elfScript);
+ if( i == CB_ERR) {
+ i = SendMessageA( hcmb5, CB_ADDSTRING, 0,
+ (LPARAM)lpElfex->elfScript);
+ if( i != CB_ERR)
+ SendMessageA( hcmb5, CB_SETITEMDATA, i, lplf->lfCharSet);
+ }
return 1 ;
-
}
+
static INT CFn_FitFontSize( HWND hDlg, int points)
{
int i,n;
@@ -598,18 +611,42 @@
return ret;
}
+
+static INT CFn_FitCharSet( HWND hDlg, int charset )
+{
+ int i,n,cs;
+ /* look for fitting har set in combobox5 */
+ n=SendDlgItemMessageA(hDlg, cmb5, CB_GETCOUNT, 0, 0);
+ for (i=0;i<n;i++)
+ {
+ cs =SendDlgItemMessageA(hDlg, cmb5, CB_GETITEMDATA, i, 0);
+ if (charset == cs)
+ {
+ SendDlgItemMessageA(hDlg, cmb5, CB_SETCURSEL, i, 0);
+ SendMessageA(hDlg, WM_COMMAND, MAKEWPARAM(cmb5, CBN_SELCHANGE),
+ (LPARAM)GetDlgItem(hDlg,cmb2));
+ return 1;
+ }
+ }
+ /* no charset fits: select the first one in the list */
+ SendDlgItemMessageA(hDlg, cmb5, CB_SETCURSEL, 0, 0);
+ SendMessageA(hDlg, WM_COMMAND, MAKEWPARAM(cmb5, CBN_SELCHANGE),
+ (LPARAM)GetDlgItem(hDlg,cmb2));
+ return 0;
+}
+
/***********************************************************************
* FontStyleEnumProc32 [internal]
*/
-static INT WINAPI FontStyleEnumProc( const LOGFONTA *lpFont,
+static INT WINAPI FontStyleEnumProc( const ENUMLOGFONTEXA *lpElfex,
const TEXTMETRICA *metrics, DWORD dwFontType, LPARAM lParam )
{
LPCFn_ENUMSTRUCT s=(LPCFn_ENUMSTRUCT)lParam;
HWND hcmb2=s->hWnd1;
HWND hcmb3=s->hWnd2;
HWND hDlg=GetParent(hcmb3);
- return AddFontStyle(lpFont, dwFontType, s->lpcf32a, hcmb2,
- hcmb3, hDlg);
+ return AddFontStyle( lpElfex, dwFontType, s->lpcf32a,
+ hcmb2, hcmb3, hDlg, FALSE);
}
/***********************************************************************
@@ -701,6 +738,7 @@
if (j!=CB_ERR)
{
INT height = (lpcf->iPointSize + 5) / 10;
+ int charset = lpxx->lfCharSet;
pstyle=MAKELONG(lpxx->lfWeight > FW_MEDIUM ? FW_BOLD:FW_NORMAL,lpxx->lfItalic !=0);
SendDlgItemMessageA(hDlg, cmb1, CB_SETCURSEL, j, 0);
SendMessageA(hDlg, WM_COMMAND, MAKEWPARAM(cmb1, CBN_SELCHANGE),
@@ -710,6 +748,7 @@
CFn_FitFontStyle(hDlg, pstyle);
/* look for fitting font size in combobox3 */
CFn_FitFontSize(hDlg, height);
+ CFn_FitCharSet( hDlg, charset );
}
}
if (!init)
@@ -824,6 +863,7 @@
case cmb2:
case cmb3:
/* TRACE(commdlg,"WM_DRAWITEN cmb2,cmb3\n"); */
+ case cmb5:
SendMessageA(lpdi->hwndItem, CB_GETLBTEXT, lpdi->itemID,
(LPARAM)buffer);
TextOutA(lpdi->hDC, lpdi->rcItem.left,
@@ -887,30 +927,38 @@
{
INT pointsize; /* save current pointsize */
LONG pstyle; /* save current style */
- int idx2, idx3;
- idx3 = SendDlgItemMessageA(hDlg, cmb3, CB_GETCURSEL, 0, 0);
+ int charset;
+ int idx;
+ idx = SendDlgItemMessageA(hDlg, cmb3, CB_GETCURSEL, 0, 0);
pointsize = (int)SendDlgItemMessageA( hDlg, cmb3, CB_GETITEMDATA,
- idx3, 0);
- idx2 = SendDlgItemMessageA(hDlg, cmb2, CB_GETCURSEL, 0, 0);
- pstyle = SendDlgItemMessageA(hDlg, cmb2, CB_GETITEMDATA, idx2, 0);
+ idx, 0);
+ idx = SendDlgItemMessageA(hDlg, cmb2, CB_GETCURSEL, 0, 0);
+ pstyle = SendDlgItemMessageA(hDlg, cmb2, CB_GETITEMDATA, idx, 0);
+ idx = SendDlgItemMessageA(hDlg, cmb5, CB_GETCURSEL, 0, 0);
+ charset = SendDlgItemMessageA(hDlg, cmb5, CB_GETITEMDATA, idx, 0);
SendDlgItemMessageA(hDlg, cmb2, CB_RESETCONTENT, 0, 0);
SendDlgItemMessageA(hDlg, cmb3, CB_RESETCONTENT, 0, 0);
+ SendDlgItemMessageA(hDlg, cmb5, CB_RESETCONTENT, 0, 0);
i=SendDlgItemMessageA(hDlg, cmb1, CB_GETCURSEL, 0, 0);
if (i!=CB_ERR)
{
HCURSOR hcursor=SetCursor(LoadCursorA(0,(LPSTR)IDC_WAIT));
CFn_ENUMSTRUCT s;
- char str[256];
+ LOGFONTA enumlf;
SendDlgItemMessageA(hDlg, cmb1, CB_GETLBTEXT, i,
- (LPARAM)str);
- TRACE("WM_COMMAND/cmb1 =>%s\n",str);
+ (LPARAM)enumlf.lfFaceName);
+ TRACE("WM_COMMAND/cmb1 =>%s\n",enumlf.lfFaceName);
s.hWnd1=GetDlgItem(hDlg, cmb2);
s.hWnd2=GetDlgItem(hDlg, cmb3);
s.lpcf32a=lpcf;
- EnumFontFamiliesA(hdc, str, FontStyleEnumProc, (LPARAM)&s);
+ enumlf.lfCharSet = DEFAULT_CHARSET; /* enum all charsets */
+ enumlf.lfPitchAndFamily = 0;
+ EnumFontFamiliesExA(hdc, &enumlf,
+ (FONTENUMPROCA)FontStyleEnumProc, (LPARAM)&s, 0);
CFn_FitFontStyle(hDlg, pstyle);
- CFn_FitFontSize(hDlg, pointsize);
+ if( pointsize != CB_ERR) CFn_FitFontSize(hDlg, pointsize);
+ if( charset != CB_ERR) CFn_FitCharSet( hDlg, charset );
SetCursor(hcursor);
}
if (!((lpcf->Flags & CF_PRINTERFONTS) && lpcf->hDC))
@@ -927,6 +975,7 @@
case chx2:
case cmb2:
case cmb3:
+ case cmb5:
if (HIWORD(wParam)==CBN_SELCHANGE || HIWORD(wParam)== BN_CLICKED )
{
char str[256];
@@ -964,6 +1013,9 @@
lpxx->lfHeight=-LOWORD(SendDlgItemMessageA(hDlg, cmb3, CB_GETITEMDATA, i, 0));
else
lpxx->lfHeight=0;
+ i=SendDlgItemMessageA(hDlg, cmb5, CB_GETCURSEL, 0, 0);
+ if (i!=CB_ERR)
+ lpxx->lfCharSet=SendDlgItemMessageA(hDlg, cmb5, CB_GETITEMDATA, i, 0);
lpxx->lfStrikeOut=IsDlgButtonChecked(hDlg,chx1);
lpxx->lfUnderline=IsDlgButtonChecked(hDlg,chx2);
lpxx->lfWidth=lpxx->lfOrientation=lpxx->lfEscapement=0;
@@ -1033,7 +1085,7 @@
return TRUE;
}
-static LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam,
+LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam,
LPCHOOSEFONTA lpcf )
{
WINDOWINFO info;
@@ -1094,7 +1146,7 @@
if (uMsg!=WM_INITDIALOG)
{
lpcf=(LPCHOOSEFONTA)GetWindowLongA(hDlg, DWL_USER);
- if (!lpcf)
+ if (!lpcf && uMsg != WM_MEASUREITEM)
return FALSE;
if (CFn_HookCallChk32(lpcf))
res=CallWindowProcA((WNDPROC)lpcf->lpfnHook, hDlg, uMsg, wParam, lParam);
--- wine/dlls/commdlg/fontdlg.h 2003-09-06 01:08:42.000000000 +0200
+++ mywine/dlls/commdlg/fontdlg.h 2003-12-02 15:04:36.000000000 +0100
@@ -45,8 +45,9 @@
INT AddFontFamily(const LOGFONTA *lplf, UINT nFontType, LPCHOOSEFONTA lpcf,
HWND hwnd, LPCFn_ENUMSTRUCT e);
-INT AddFontStyle(const LOGFONTA *lplf, UINT nFontType, LPCHOOSEFONTA lpcf,
- HWND hcmb2, HWND hcmb3, HWND hDlg);
+INT AddFontStyle(const ENUMLOGFONTEXA *lpElfex, UINT nFontType,
+ LPCHOOSEFONTA lpcf, HWND hcmb2,
+ HWND hcmb3, HWND hDlg, BOOL iswin16);
void _dump_cf_flags(DWORD cflags);
LRESULT CFn_WMInitDialog(HWND hDlg, WPARAM wParam, LPARAM lParam,
@@ -55,6 +56,8 @@
LRESULT CFn_WMDrawItem(HWND hDlg, WPARAM wParam, LPARAM lParam);
LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam,
LPCHOOSEFONTA lpcf);
+LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam,
+ LPCHOOSEFONTA lpcf);
LRESULT CFn_WMDestroy(HWND hwnd, WPARAM wParam, LPARAM lParam);
#endif /* _WINE_FONTDLG_H */
--- wine/dlls/commdlg/fontdlg16.c 2003-11-18 11:42:21.000000000 +0100
+++ mywine/dlls/commdlg/fontdlg16.c 2003-12-02 15:31:41.000000000 +0100
@@ -117,10 +117,10 @@
HWND hDlg=GetParent(hcmb3);
LPCHOOSEFONT16 lpcf=(LPCHOOSEFONT16)GetWindowLongA(hDlg, DWL_USER);
LOGFONT16 *lplf = MapSL(logfont);
- LOGFONTA lf32a;
- FONT_LogFont16To32A(lplf, &lf32a);
- return AddFontStyle(&lf32a, nFontType, (LPCHOOSEFONTA)lpcf->lpTemplateName,
- hcmb2, hcmb3, hDlg);
+ ENUMLOGFONTEXA elf32a;
+ FONT_LogFont16To32A(lplf, &(elf32a.elfLogFont));
+ return AddFontStyle(&elf32a, nFontType, (LPCHOOSEFONTA)lpcf->lpTemplateName,
+ hcmb2, hcmb3, hDlg, TRUE);
}
/***********************************************************************
@@ -262,7 +262,7 @@
if (message!=WM_INITDIALOG)
{
lpcf=(LPCHOOSEFONT16)GetWindowLongA(hDlg, DWL_USER);
- if (!lpcf)
+ if (!lpcf && message != WM_MEASUREITEM)
return FALSE;
if (CFn_HookCallChk(lpcf))
res=CallWindowProc16((WNDPROC16)lpcf->lpfnHook,hDlg16,message,wParam,lParam);
@@ -281,7 +281,7 @@
if (CFn_HookCallChk(lpcf))
return CallWindowProc16((WNDPROC16)lpcf->lpfnHook,hDlg16,WM_INITDIALOG,wParam,lParam);
}
- lpcf32a=(LPCHOOSEFONTA)lpcf->lpTemplateName;
+ if(lpcf) lpcf32a=(LPCHOOSEFONTA)lpcf->lpTemplateName;
switch (message)
{
case WM_MEASUREITEM:
@@ -325,6 +325,9 @@
TRACE("WM_CHOOSEFONT_GETLOGFONT lParam=%08lX\n", lParam);
FIXME("current logfont back to caller\n");
break;
+ case WM_PAINT:
+ res= CFn_WMPaint(hDlg, wParam, lParam, lpcf32a);
+ break;
}
return res;
}
--- wine/dlls/commdlg/cdlg_Ca.rc 2003-07-28 21:14:24.000000000 +0200
+++ mywine/dlls/commdlg/cdlg_Ca.rc 2003-12-02 16:17:22.000000000 +0100
@@ -139,8 +139,11 @@
LTEXT "&Color:", 1091 ,6,110,30,9
COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Exemple",1073,98,72,160,49,WS_GROUP
- CTEXT "AaBbYyZz",stc5,104,81,149,37,SS_NOPREFIX | NOT WS_VISIBLE
+ GROUPBOX "Exemple",grp2,98,72,120,36,WS_GROUP
+ CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
+ LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9
+ COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+ CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
}
--- wine/dlls/commdlg/cdlg_Cn.rc 2003-07-28 21:14:24.000000000 +0200
+++ mywine/dlls/commdlg/cdlg_Cn.rc 2003-12-02 16:17:57.000000000 +0100
@@ -139,8 +139,11 @@
LTEXT "ÑÕÉ«(&C):", 1091 ,6,110,30,9
COMBOBOX cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- GROUPBOX "ʾÀý",1073,98,72,160,49,WS_GROUP
- CTEXT "ÖÐÎÄ×ÖÌåAaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
+ GROUPBOX "ʾÀý",grp2,98,72,120,36,WS_GROUP
+ CTEXT "ÖÐÎÄ×ÖÌåAaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
+ LTEXT "Scr&ipt (translate):",stc7,98,114,80,9
+ COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+ CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
}
--- wine/dlls/commdlg/cdlg_Da.rc 2003-07-28 21:14:24.000000000 +0200
+++ mywine/dlls/commdlg/cdlg_Da.rc 2003-12-02 16:18:06.000000000 +0100
@@ -139,8 +139,11 @@
LTEXT "&Farve:", 1091 ,6,110,30,9
COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Eksempel",1073,98,72,160,49,WS_GROUP
- CTEXT "AaBbYyZz",stc5,104,81,149,37,SS_NOPREFIX | NOT WS_VISIBLE
+ GROUPBOX "Eksempel",grp2,98,72,120,36,WS_GROUP
+ CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
+ LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9
+ COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+ CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
}
--- wine/dlls/commdlg/cdlg_De.rc 2003-07-28 21:14:24.000000000 +0200
+++ mywine/dlls/commdlg/cdlg_De.rc 2003-12-02 16:18:14.000000000 +0100
@@ -169,8 +169,11 @@
LTEXT "&Farbe:", 1091 ,6,110,30,9
COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Muster",1073,98,72,160,49,WS_GROUP
- CTEXT "AaBbYyZz",stc5,104,81,149,37,SS_NOPREFIX | NOT WS_VISIBLE
+ GROUPBOX "Muster",grp2,98,72,120,36,WS_GROUP
+ CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
+ LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9
+ COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+ CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
}
--- wine/dlls/commdlg/cdlg_En.rc 2003-12-02 08:03:55.000000000 +0100
+++ mywine/dlls/commdlg/cdlg_En.rc 2003-12-02 11:59:02.000000000 +0100
@@ -139,8 +139,11 @@
LTEXT "&Color:", stc4 ,6,110,30,9
COMBOBOX cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Sample",grp2,98,72,160,49,WS_GROUP
- CTEXT "AaBbYyZz",stc5,104,81,149,37,SS_NOPREFIX | NOT WS_VISIBLE
+ GROUPBOX "Sample",grp2,98,72,120,36,WS_GROUP
+ CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
+ LTEXT "Scr&ipt:",stc7 ,98,114,40,9
+ COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+ CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
}
--- wine/dlls/commdlg/cdlg_Es.rc 2003-07-28 21:14:24.000000000 +0200
+++ mywine/dlls/commdlg/cdlg_Es.rc 2003-12-02 16:18:30.000000000 +0100
@@ -139,8 +139,11 @@
LTEXT "&Color:", 1091 ,6,110,30,9
COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Ejemplo",1073,98,72,160,49,WS_GROUP
- CTEXT "AaBbYyZzÑñ",stc5,104,81,149,37,SS_NOPREFIX | NOT WS_VISIBLE
+ GROUPBOX "Ejemplo",grp2,98,72,120,36,WS_GROUP
+ CTEXT "AaBbYyZzÑñ",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
+ LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9
+ COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+ CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
}
--- wine/dlls/commdlg/cdlg_Fi.rc 2003-07-28 21:14:24.000000000 +0200
+++ mywine/dlls/commdlg/cdlg_Fi.rc 2003-12-02 16:18:34.000000000 +0100
@@ -139,8 +139,11 @@
LTEXT "V&äri:", 1091 ,6,110,30,9
COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Näyte",1073,98,72,160,49,WS_GROUP
- CTEXT "AaBbYyZz",stc5,104,81,149,37,SS_NOPREFIX | NOT WS_VISIBLE
+ GROUPBOX "Näyte",grp2,98,72,120,36,WS_GROUP
+ CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
+ LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9
+ COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+ CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
}
--- wine/dlls/commdlg/cdlg_Fr.rc 2003-09-22 23:16:57.000000000 +0200
+++ mywine/dlls/commdlg/cdlg_Fr.rc 2003-12-02 16:18:44.000000000 +0100
@@ -142,8 +142,11 @@
LTEXT "&Couleur:", stc4 ,6,110,30,9
COMBOBOX cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Exemple",grp2,98,72,160,49,WS_GROUP
- CTEXT "AaBbYyZz",stc5,104,81,149,37,SS_NOPREFIX | NOT WS_VISIBLE
+ GROUPBOX "Exemple",grp2,98,72,120,36,WS_GROUP
+ CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
+ LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9
+ COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+ CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
}
--- wine/dlls/commdlg/cdlg_Hu.rc 2003-07-28 21:14:24.000000000 +0200
+++ mywine/dlls/commdlg/cdlg_Hu.rc 2003-12-02 16:18:50.000000000 +0100
@@ -138,8 +138,11 @@
LTEXT "&Szín:", 1091 ,6,110,30,9
COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Minta",1073,98,72,160,49,WS_GROUP
- CTEXT "AaBbYyZzÁáÕõÉé",stc5,104,81,149,37,SS_NOPREFIX | NOT WS_VISIBLE
+ GROUPBOX "Minta",grp2,98,72,120,36,WS_GROUP
+ CTEXT "AaBbYyZzÁáÕõÉé",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
+ LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9
+ COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+ CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
}
--- wine/dlls/commdlg/cdlg_It.rc 2003-11-21 12:07:16.000000000 +0100
+++ mywine/dlls/commdlg/cdlg_It.rc 2003-12-02 16:19:09.000000000 +0100
@@ -138,8 +138,11 @@
LTEXT "&Colore:", 1091 ,6,110,30,9
COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Esempio",1073,98,72,160,49,WS_GROUP
- CTEXT "AaBbYyZz",stc5,104,81,149,37,SS_NOPREFIX | NOT WS_VISIBLE
+ GROUPBOX "Esempio",grp2,98,72,120,36,WS_GROUP
+ CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
+ LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9
+ COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+ CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
}
CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 185
--- wine/dlls/commdlg/cdlg_Ja.rc 2003-07-28 21:14:24.000000000 +0200
+++ mywine/dlls/commdlg/cdlg_Ja.rc 2003-12-02 16:19:21.000000000 +0100
@@ -139,8 +139,11 @@
LTEXT "?F(&C):", 1091 ,6,110,30,9
COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- GROUPBOX "?T???v??",1073,98,72,160,49,WS_GROUP
- CTEXT "AaBbYyZz",stc5,104,81,149,37,SS_NOPREFIX | NOT WS_VISIBLE
+ GROUPBOX "?T???v??",grp2,98,72,120,36,WS_GROUP
+ CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
+ LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9
+ COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+ CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
}
--- wine/dlls/commdlg/cdlg_Nl.rc 2003-07-28 21:14:24.000000000 +0200
+++ mywine/dlls/commdlg/cdlg_Nl.rc 2003-12-02 16:25:11.000000000 +0100
@@ -137,10 +137,13 @@
CHECKBOX "&Doorhalen", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
CHECKBOX "&Onderstrepen", 1041, 10,94,50,10, BS_AUTOCHECKBOX
LTEXT "&Kleur:", 1091 ,6,110,30,9
- COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+ COMBOBOX cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Voorbeeld",1073,98,72,160,49,WS_GROUP
- CTEXT "AaBbYyZz",stc5,104,81,149,37,SS_NOPREFIX | NOT WS_VISIBLE
+ GROUPBOX "Voorbeeld",grp2,98,72,120,36,WS_GROUP
+ CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
+ LTEXT "Schr&ift:",stc7 ,98,114,40,9
+ COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+ CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
}
--- wine/dlls/commdlg/cdlg_Pl.rc 2003-07-28 21:14:24.000000000 +0200
+++ mywine/dlls/commdlg/cdlg_Pl.rc 2003-12-02 16:19:46.000000000 +0100
@@ -136,8 +136,13 @@
LTEXT "&Kolor:", 1091, 6,110,30,9, WS_CHILD | WS_VISIBLE | WS_GROUP
CONTROL "", 1139, "COMBOBOX", CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 6,120,84,100
- CONTROL "Przyk³ad", 1073, "BUTTON", BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 98,72,160,49
- CONTROL "AaBbYyZz\xB3", stc5, "STATIC", SS_NOPREFIX | NOT WS_VISIBLE, 104,81,149,37
+/* CONTROL "Przyk³ad", 1073, "BUTTON", BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 98,72,160,49
+ CONTROL "AaBbYyZz\xB3", stc5, "STATIC", SS_NOPREFIX | NOT WS_VISIBLE, 104,81,149,37 */
+ GROUPBOX "Przyk³ad",grp2,98,72,120,36,WS_GROUP
+ CTEXT "AaBbYyZz\xB3",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
+ LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9
+ COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+ CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
END
/* PUSHBUTTON "&Replace", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
* PUSHBUTTON "Replace &All", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
--- wine/dlls/commdlg/cdlg_Pt.rc 2003-07-28 21:14:24.000000000 +0200
+++ mywine/dlls/commdlg/cdlg_Pt.rc 2003-12-02 16:19:50.000000000 +0100
@@ -140,8 +140,11 @@
LTEXT "&Cor:", 1091 ,6,110,30,9
COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Amostra",1073,98,72,160,49,WS_GROUP
- CTEXT "AaBbYyZz",stc5,104,81,149,37,SS_NOPREFIX | NOT WS_VISIBLE
+ GROUPBOX "Amostra",grp2,98,72,120,36,WS_GROUP
+ CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
+ LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9
+ COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+ CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
}
--- wine/dlls/commdlg/cdlg_Ru.rc 2003-07-28 21:14:24.000000000 +0200
+++ mywine/dlls/commdlg/cdlg_Ru.rc 2003-12-02 16:20:04.000000000 +0100
@@ -139,8 +139,11 @@
LTEXT "Ö&âåò:", 1091 ,6,110,30,9
COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Îáðàçåö",1073,98,72,160,49,WS_GROUP
- CTEXT "ÀàÁáAaBb",stc5,104,81,149,37,SS_NOPREFIX | NOT WS_VISIBLE
+ GROUPBOX "Îáðàçåö",grp2,98,72,120,36,WS_GROUP
+ CTEXT "ÀàÁáAaBb",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
+ LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9
+ COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+ CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
}
--- wine/dlls/commdlg/cdlg_Si.rc 2003-08-30 00:21:44.000000000 +0200
+++ mywine/dlls/commdlg/cdlg_Si.rc 2003-12-02 16:20:20.000000000 +0100
@@ -139,8 +139,11 @@
LTEXT "&Barva:", 1091 ,6,110,30,9
COMBOBOX cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Vzorec",1073,98,72,160,49,WS_GROUP
- CTEXT "AaBbYyZz",stc5,104,81,149,37,SS_NOPREFIX | NOT WS_VISIBLE
+ GROUPBOX "Vzorec",grp2,98,72,120,36,WS_GROUP
+ CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
+ LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9
+ COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+ CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
}
--- wine/dlls/commdlg/cdlg_Sk.rc 2003-07-28 21:14:24.000000000 +0200
+++ mywine/dlls/commdlg/cdlg_Sk.rc 2003-12-02 16:20:29.000000000 +0100
@@ -141,8 +141,11 @@
LTEXT "&Farba:", 1091 ,6,110,30,9
COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Vzorka",1073,98,72,160,49,WS_GROUP
- CTEXT "AaBbYyZz",stc5,104,81,149,37,SS_NOPREFIX | NOT WS_VISIBLE
+ GROUPBOX "Vzorka",grp2,98,72,120,36,WS_GROUP
+ CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
+ LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9
+ COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+ CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
}
CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 185
--- wine/dlls/commdlg/cdlg_Sv.rc 2003-07-28 21:14:24.000000000 +0200
+++ mywine/dlls/commdlg/cdlg_Sv.rc 2003-12-02 16:20:35.000000000 +0100
@@ -137,8 +137,11 @@
LTEXT "&Färg:", 1091 ,6,110,30,9
COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Test",1073,98,72,160,49,WS_GROUP
- CTEXT "AaBbYyZz",stc5,104,81,149,37,SS_NOPREFIX | NOT WS_VISIBLE
+ GROUPBOX "Test",grp2,98,72,120,36,WS_GROUP
+ CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
+ LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9
+ COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+ CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
}
--- wine/dlls/commdlg/cdlg_Wa.rc 2003-07-28 21:14:24.000000000 +0200
+++ mywine/dlls/commdlg/cdlg_Wa.rc 2003-12-02 16:20:43.000000000 +0100
@@ -144,8 +144,11 @@
LTEXT "&Coleur:", 1091 ,6,110,30,9
COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Egzimpe",1073,98,72,160,49,WS_GROUP
- CTEXT "AaBbYyZzÅåÇçÛû",stc5,104,81,149,37,SS_NOPREFIX | NOT WS_VISIBLE
+ GROUPBOX "Egzimpe",grp2,98,72,120,36,WS_GROUP
+ CTEXT "AaBbYyZzÅåÇçÛû",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
+ LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9
+ COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+ CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
}
--- wine/dlls/commdlg/cdlg_Zh.rc 2003-07-28 21:14:24.000000000 +0200
+++ mywine/dlls/commdlg/cdlg_Zh.rc 2003-12-02 16:20:50.000000000 +0100
@@ -90,8 +90,11 @@
LTEXT "É«²Ê(&C):", 1091 ,6,110,30,9
COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- GROUPBOX "¹ Àý",1073,128,72,160,49,WS_GROUP
- CTEXT "AaBbYyZz",stc5,134,81,149,37,SS_NOPREFIX | NOT WS_VISIBLE
+ GROUPBOX "¹ Àý",grp2,98,72,120,36,WS_GROUP
+ CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
+ LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9
+ COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+ CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
}
