From 64e052cb3e7c4ea16d90313d151c2bb0c7a996a2 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 5 Oct 2013 20:43:34 +0000 Subject: [PATCH] [COMDLG32] * Sync with Wine 1.7.1. CORE-7469 svn path=/trunk/; revision=60545 --- reactos/dll/win32/comdlg32/CMakeLists.txt | 17 +- reactos/dll/win32/comdlg32/cdlg.h | 29 +- reactos/dll/win32/comdlg32/cdlg32.c | 16 +- reactos/dll/win32/comdlg32/colordlg.c | 600 +++++++++--------- .../dll/win32/comdlg32/comdlg32_classes.idl | 33 + reactos/dll/win32/comdlg32/filedlg.c | 478 ++++++-------- reactos/dll/win32/comdlg32/filedlg31.c | 237 ++++++- reactos/dll/win32/comdlg32/filedlg31.h | 52 -- reactos/dll/win32/comdlg32/filedlgbrowser.c | 31 +- reactos/dll/win32/comdlg32/finddlg.c | 8 +- reactos/dll/win32/comdlg32/fontdlg.c | 47 +- reactos/dll/win32/comdlg32/itemdlg.c | 38 +- reactos/dll/win32/comdlg32/lang/cdlg_Bg.rc | 61 +- reactos/dll/win32/comdlg32/lang/cdlg_Ca.rc | 53 +- reactos/dll/win32/comdlg32/lang/cdlg_Cs.rc | 63 +- reactos/dll/win32/comdlg32/lang/cdlg_Da.rc | 53 +- reactos/dll/win32/comdlg32/lang/cdlg_De.rc | 53 +- reactos/dll/win32/comdlg32/lang/cdlg_El.rc | 112 ++-- reactos/dll/win32/comdlg32/lang/cdlg_En.rc | 55 +- reactos/dll/win32/comdlg32/lang/cdlg_Eo.rc | 63 +- reactos/dll/win32/comdlg32/lang/cdlg_Es.rc | 55 +- reactos/dll/win32/comdlg32/lang/cdlg_Fi.rc | 55 +- reactos/dll/win32/comdlg32/lang/cdlg_Fr.rc | 51 +- reactos/dll/win32/comdlg32/lang/cdlg_He.rc | 53 +- reactos/dll/win32/comdlg32/lang/cdlg_Hu.rc | 53 +- reactos/dll/win32/comdlg32/lang/cdlg_It.rc | 53 +- reactos/dll/win32/comdlg32/lang/cdlg_Ja.rc | 53 +- reactos/dll/win32/comdlg32/lang/cdlg_Ko.rc | 53 +- reactos/dll/win32/comdlg32/lang/cdlg_Lt.rc | 53 +- reactos/dll/win32/comdlg32/lang/cdlg_Nl.rc | 53 +- reactos/dll/win32/comdlg32/lang/cdlg_No.rc | 53 +- reactos/dll/win32/comdlg32/lang/cdlg_Pl.rc | 53 +- reactos/dll/win32/comdlg32/lang/cdlg_Pt.rc | 53 +- reactos/dll/win32/comdlg32/lang/cdlg_Ro.rc | 53 +- reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc | 49 +- reactos/dll/win32/comdlg32/lang/cdlg_Si.rc | 53 +- reactos/dll/win32/comdlg32/lang/cdlg_Sk.rc | 114 ++-- reactos/dll/win32/comdlg32/lang/cdlg_Sr.rc | 145 ++--- reactos/dll/win32/comdlg32/lang/cdlg_Sv.rc | 57 +- reactos/dll/win32/comdlg32/lang/cdlg_Th.rc | 94 +-- reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc | 73 +-- reactos/dll/win32/comdlg32/lang/cdlg_Tw.rc | 131 ++-- reactos/dll/win32/comdlg32/lang/cdlg_Uk.rc | 51 +- reactos/dll/win32/comdlg32/lang/cdlg_Zh.rc | 53 +- reactos/dll/win32/comdlg32/printdlg.c | 544 ++++++++++++---- reactos/media/doc/README.WINE | 2 +- 46 files changed, 2309 insertions(+), 1900 deletions(-) create mode 100644 reactos/dll/win32/comdlg32/comdlg32_classes.idl delete mode 100644 reactos/dll/win32/comdlg32/filedlg31.h diff --git a/reactos/dll/win32/comdlg32/CMakeLists.txt b/reactos/dll/win32/comdlg32/CMakeLists.txt index 51e2811eae5..0713f936775 100644 --- a/reactos/dll/win32/comdlg32/CMakeLists.txt +++ b/reactos/dll/win32/comdlg32/CMakeLists.txt @@ -16,25 +16,12 @@ list(APPEND SOURCE fontdlg.c itemdlg.c printdlg.c - rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/comdlg32_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/comdlg32.def) -add_library(comdlg32 SHARED ${SOURCE}) +add_library(comdlg32 SHARED ${SOURCE} rsrc.rc) set_module_type(comdlg32 win32dll) target_link_libraries(comdlg32 uuid wine) add_delay_importlibs(comdlg32 ole32) - -add_importlibs(comdlg32 - shell32 - shlwapi - comctl32 - winspool - user32 - gdi32 - advapi32 - msvcrt - kernel32 - ntdll) - +add_importlibs(comdlg32 shell32 shlwapi comctl32 winspool user32 gdi32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET comdlg32 DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/comdlg32/cdlg.h b/reactos/dll/win32/comdlg32/cdlg.h index fd3bf71ecb0..b7e255b0a26 100644 --- a/reactos/dll/win32/comdlg32/cdlg.h +++ b/reactos/dll/win32/comdlg32/cdlg.h @@ -31,9 +31,6 @@ extern HINSTANCE COMDLG32_hInstance DECLSPEC_HIDDEN; void COMDLG32_SetCommDlgExtendedError(DWORD err) DECLSPEC_HIDDEN; LPVOID COMDLG32_AllocMem(int size) __WINE_ALLOC_SIZE(1) DECLSPEC_HIDDEN; -/* handle<-handle16 conversion */ -#define HINSTANCE_32(h16) ((HINSTANCE)(ULONG_PTR)(h16)) - /* Find/Replace local definitions */ #define FR_WINE_UNICODE 0x80000000 @@ -151,6 +148,28 @@ typedef struct { #define IDS_COLOR_AQUA 1054 #define IDS_COLOR_WHITE 1055 +/* Color dialog controls */ +#define IDC_COLOR_LUMBAR 702 +#define IDC_COLOR_EDIT_H 703 +#define IDC_COLOR_EDIT_S 704 +#define IDC_COLOR_EDIT_L 705 +#define IDC_COLOR_EDIT_R 706 +#define IDC_COLOR_EDIT_G 707 +#define IDC_COLOR_EDIT_B 708 +#define IDC_COLOR_RESULT 709 +#define IDC_COLOR_GRAPH 710 +#define IDC_COLOR_ADD 712 +#define IDC_COLOR_RES 713 +#define IDC_COLOR_DEFINE 719 +#define IDC_COLOR_PREDEF 720 +#define IDC_COLOR_USRDEF 721 +#define IDC_COLOR_HL 723 +#define IDC_COLOR_SL 724 +#define IDC_COLOR_LL 725 +#define IDC_COLOR_RL 726 +#define IDC_COLOR_GL 727 +#define IDC_COLOR_BL 728 + #define IDS_FONT_SIZE 1200 #define IDS_SAVE_BUTTON 1201 #define IDS_SAVE_IN 1202 @@ -165,7 +184,6 @@ typedef struct { #include "wingdi.h" #include "winuser.h" #include "winnls.h" -#include "wincon.h" #include "commctrl.h" #include "shlobj.h" #include "shellapi.h" @@ -181,6 +199,9 @@ int FILEDLG95_ValidatePathAction(LPWSTR lpstrPathAndFile, IShellFolder **ppsf, int COMDLG32_SplitFileNames(LPWSTR lpstrEdit, UINT nStrLen, LPWSTR *lpstrFileList, UINT *sizeUsed) DECLSPEC_HIDDEN; void FILEDLG95_OnOpenMessage(HWND hwnd, int idCaption, int idText) DECLSPEC_HIDDEN; +extern BOOL GetFileName31A( OPENFILENAMEA *lpofn, UINT dlgType ) DECLSPEC_HIDDEN; +extern BOOL GetFileName31W( OPENFILENAMEW *lpofn, UINT dlgType ) DECLSPEC_HIDDEN; + /* ITEMIDLIST */ extern LPITEMIDLIST (WINAPI *COMDLG32_PIDL_ILClone) (LPCITEMIDLIST); diff --git a/reactos/dll/win32/comdlg32/cdlg32.c b/reactos/dll/win32/comdlg32/cdlg32.c index 82f7f6b0d2f..118a3e313d7 100644 --- a/reactos/dll/win32/comdlg32/cdlg32.c +++ b/reactos/dll/win32/comdlg32/cdlg32.c @@ -20,19 +20,18 @@ */ #define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H + #include #define COBJMACROS #include -//#include "winbase.h" -#include +#include "winbase.h" #include -//#include "objbase.h" -//#include "rpcproxy.h" +#include +#include +#include "rpcproxy.h" #include #include #include @@ -116,6 +115,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD Reason, LPVOID Reserved) break; case DLL_PROCESS_DETACH: + if (Reserved) break; if (COMDLG32_TlsIndex != TLS_OUT_OF_INDEXES) TlsFree(COMDLG32_TlsIndex); if(SHFOLDER_hInstance) FreeLibrary(SHFOLDER_hInstance); break; @@ -177,7 +177,7 @@ DWORD WINAPI CommDlgExtendedError(void) return 0; /* we never set an error, so there isn't one */ } -#if 0 // Win 7 +#ifndef __REACTOS__ /* Win 7 */ /************************************************************************* * Implement the CommDlg32 class factory @@ -299,4 +299,4 @@ HRESULT WINAPI DllUnregisterServer(void) return E_FAIL; // FIXME: __wine_unregister_resources(COMDLG32_hInstance); } -#endif // Win 7 +#endif /* Win 7 */ diff --git a/reactos/dll/win32/comdlg32/colordlg.c b/reactos/dll/win32/comdlg32/colordlg.c index 041742c08dc..2acabc7e5b5 100644 --- a/reactos/dll/win32/comdlg32/colordlg.c +++ b/reactos/dll/win32/comdlg32/colordlg.c @@ -24,8 +24,6 @@ dialog are loaded at the same time */ #define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H //#include //#include @@ -33,11 +31,11 @@ #include //#include #include -//#include "winbase.h" +#include #include #include #include -//#include "dlgs.h" +#include #include #include #include "cdlg.h" @@ -78,6 +76,7 @@ static const WCHAR szColourDialogProp[] = { typedef struct CCPRIVATE { LPCHOOSECOLORW lpcc; /* points to public known data structure */ + HWND hwndSelf; /* dialog window */ int nextuserdef; /* next free place in user defined color array */ HDC hdcMem; /* color graph used for BitBlt() */ HBITMAP hbmMem; /* color graph bitmap */ @@ -92,23 +91,12 @@ typedef struct CCPRIVATE int capturedGraph; /* control mouse captured */ RECT focusRect; /* rectangle last focused item */ HWND hwndFocus; /* handle last focused item */ -} CCPRIV, *LPCCPRIV; +} CCPRIV; -/*********************************************************************** - * CC_HSLtoRGB [internal] - */ -static int CC_HSLtoRGB(char c, int hue, int sat, int lum) +static int hsl_to_x(int hue, int sat, int lum) { int res = 0, maxrgb; - /* hue */ - switch(c) - { - case 'R': if (hue > 80) hue -= 80; else hue += 160; break; - case 'G': if (hue > 160) hue -= 160; else hue += 80; break; - case 'B': break; - } - /* l below 120 */ maxrgb = (256 * min(120,lum)) / 120; /* 0 .. 256 */ if (hue < 80) @@ -139,13 +127,36 @@ static int CC_HSLtoRGB(char c, int hue, int sat, int lum) return min(res, 255); } +/*********************************************************************** + * CC_HSLtoRGB [internal] + */ +static COLORREF CC_HSLtoRGB(int hue, int sat, int lum) +{ + int h, r, g, b; + + /* r */ + h = hue > 80 ? hue-80 : hue+160; + r = hsl_to_x(h, sat, lum); + /* g */ + h = hue > 160 ? hue-160 : hue+80; + g = hsl_to_x(h, sat, lum); + /* b */ + b = hsl_to_x(hue, sat, lum); + + return RGB(r, g, b); +} + /*********************************************************************** * CC_RGBtoHSL [internal] */ -static int CC_RGBtoHSL(char c, int r, int g, int b) +static int CC_RGBtoHSL(char c, COLORREF rgb) { WORD maxi, mini, mmsum, mmdif, result = 0; - int iresult = 0; + int iresult = 0, r, g, b; + + r = GetRValue(rgb); + g = GetGValue(rgb); + b = GetBValue(rgb); maxi = max(r, b); maxi = max(maxi, g); @@ -223,7 +234,7 @@ static void CC_DrawCurrentFocusRect( const CCPRIV *lpp ) /*********************************************************************** * CC_DrawFocusRect [internal] */ -static void CC_DrawFocusRect( LPCCPRIV lpp, HWND hwnd, int x, int y, int rows, int cols) +static void CC_DrawFocusRect(CCPRIV *lpp, HWND hwnd, int x, int y, int rows, int cols) { RECT rect; int dx, dy; @@ -252,8 +263,7 @@ static void CC_DrawFocusRect( LPCCPRIV lpp, HWND hwnd, int x, int y, int rows, i * CC_MouseCheckPredefColorArray [internal] * returns 1 if one of the predefined colors is clicked */ -static int CC_MouseCheckPredefColorArray( LPCCPRIV lpp, HWND hDlg, int dlgitem, int rows, int cols, - LPARAM lParam ) +static int CC_MouseCheckPredefColorArray(CCPRIV *lpp, int rows, int cols, LPARAM lParam) { HWND hwnd; POINT point; @@ -261,8 +271,8 @@ static int CC_MouseCheckPredefColorArray( LPCCPRIV lpp, HWND hDlg, int dlgitem, int dx, dy, x, y; CONV_LPARAMTOPOINT(lParam, &point); - ClientToScreen(hDlg, &point); - hwnd = GetDlgItem(hDlg, dlgitem); + ClientToScreen(lpp->hwndSelf, &point); + hwnd = GetDlgItem(lpp->hwndSelf, IDC_COLOR_PREDEF); GetWindowRect(hwnd, &rect); if (PtInRect(&rect, point)) { @@ -286,8 +296,7 @@ static int CC_MouseCheckPredefColorArray( LPCCPRIV lpp, HWND hDlg, int dlgitem, * CC_MouseCheckUserColorArray [internal] * return 1 if the user clicked a color */ -static int CC_MouseCheckUserColorArray( LPCCPRIV lpp, HWND hDlg, int dlgitem, int rows, int cols, - LPARAM lParam ) +static int CC_MouseCheckUserColorArray(CCPRIV *lpp, int rows, int cols, LPARAM lParam) { HWND hwnd; POINT point; @@ -296,8 +305,8 @@ static int CC_MouseCheckUserColorArray( LPCCPRIV lpp, HWND hDlg, int dlgitem, in COLORREF *crarr = lpp->lpcc->lpCustColors; CONV_LPARAMTOPOINT(lParam, &point); - ClientToScreen(hDlg, &point); - hwnd = GetDlgItem(hDlg, dlgitem); + ClientToScreen(lpp->hwndSelf, &point); + hwnd = GetDlgItem(lpp->hwndSelf, IDC_COLOR_USRDEF); GetWindowRect(hwnd, &rect); if (PtInRect(&rect, point)) { @@ -377,11 +386,11 @@ static int CC_MouseCheckResultWindow( HWND hDlg, LPARAM lParam ) CONV_LPARAMTOPOINT(lParam, &point); ClientToScreen(hDlg, &point); - hwnd = GetDlgItem(hDlg, 0x2c5); + hwnd = GetDlgItem(hDlg, IDC_COLOR_RESULT); GetWindowRect(hwnd, &rect); if (PtInRect(&rect, point)) { - PostMessageA(hDlg, WM_COMMAND, 0x2c9, 0); + PostMessageA(hDlg, WM_COMMAND, IDC_COLOR_RES, 0); return 1; } return 0; @@ -432,17 +441,18 @@ static int CC_CheckDigitsInEdit( HWND hwnd, int maxval ) /*********************************************************************** * CC_PaintSelectedColor [internal] */ -static void CC_PaintSelectedColor( HWND hDlg, COLORREF cr ) +static void CC_PaintSelectedColor(const CCPRIV *infoPtr) { - RECT rect; - HDC hdc; - HBRUSH hBrush; - HWND hwnd = GetDlgItem(hDlg, 0x2c5); - if (IsWindowVisible( GetDlgItem(hDlg, 0x2c6) )) /* if full size */ + if (IsWindowVisible( GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_GRAPH) )) /* if full size */ { + RECT rect; + HDC hdc; + HBRUSH hBrush; + HWND hwnd = GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_RESULT); + hdc = GetDC(hwnd); GetClientRect(hwnd, &rect) ; - hBrush = CreateSolidBrush(cr); + hBrush = CreateSolidBrush(infoPtr->lpcc->rgbResult); if (hBrush) { FillRect(hdc, &rect, hBrush); @@ -456,7 +466,7 @@ static void CC_PaintSelectedColor( HWND hDlg, COLORREF cr ) /*********************************************************************** * CC_PaintTriangle [internal] */ -static void CC_PaintTriangle( HWND hDlg, int y) +static void CC_PaintTriangle(CCPRIV *infoPtr) { HDC hDC; long temp; @@ -466,21 +476,20 @@ static void CC_PaintTriangle( HWND hDlg, int y) int oben; RECT rect; HBRUSH hbr; - HWND hwnd = GetDlgItem(hDlg, 0x2be); - LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); + HWND hwnd = GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_LUMBAR); - if (IsWindowVisible( GetDlgItem(hDlg, 0x2c6))) /* if full size */ + if (IsWindowVisible( GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_GRAPH))) /* if full size */ { GetClientRect(hwnd, &rect); height = rect.bottom; - hDC = GetDC(hDlg); + hDC = GetDC(infoPtr->hwndSelf); points[0].y = rect.top; - points[0].x = rect.right; /* | /| */ - ClientToScreen(hwnd, points); /* | / | */ - ScreenToClient(hDlg, points); /* |< | */ - oben = points[0].y; /* | \ | */ - /* | \| */ - temp = (long)height * (long)y; + points[0].x = rect.right; /* | /| */ + ClientToScreen(hwnd, points); /* | / | */ + ScreenToClient(infoPtr->hwndSelf, points); /* |< | */ + oben = points[0].y; /* | \ | */ + /* | \| */ + temp = (long)height * (long)infoPtr->l; points[0].x += 1; points[0].y = oben + height - temp / (long)MAXVERT; points[1].y = points[0].y + w; @@ -489,17 +498,17 @@ static void CC_PaintTriangle( HWND hDlg, int y) hbr = (HBRUSH)GetClassLongPtrW( hwnd, GCLP_HBRBACKGROUND); if (!hbr) hbr = GetSysColorBrush(COLOR_BTNFACE); - FillRect(hDC, &lpp->old3angle, hbr); - lpp->old3angle.left = points[0].x; - lpp->old3angle.right = points[1].x + 1; - lpp->old3angle.top = points[2].y - 1; - lpp->old3angle.bottom= points[1].y + 1; + FillRect(hDC, &infoPtr->old3angle, hbr); + infoPtr->old3angle.left = points[0].x; + infoPtr->old3angle.right = points[1].x + 1; + infoPtr->old3angle.top = points[2].y - 1; + infoPtr->old3angle.bottom= points[1].y + 1; hbr = SelectObject(hDC, GetStockObject(BLACK_BRUSH)); Polygon(hDC, points, 3); SelectObject(hDC, hbr); - ReleaseDC(hDlg, hDC); + ReleaseDC(infoPtr->hwndSelf, hDC); } } @@ -507,36 +516,40 @@ static void CC_PaintTriangle( HWND hDlg, int y) /*********************************************************************** * CC_PaintCross [internal] */ -static void CC_PaintCross( HWND hDlg, int x, int y) +static void CC_PaintCross(CCPRIV *infoPtr) { - HDC hDC; - int w = GetDialogBaseUnits() - 1; - int wc = GetDialogBaseUnits() * 3 / 4; - HWND hwnd = GetDlgItem(hDlg, 0x2c6); - LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); - RECT rect; - POINT point, p; - HPEN hPen; + HWND hwnd = GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_GRAPH); - if (IsWindowVisible( GetDlgItem(hDlg, 0x2c6) )) /* if full size */ + if (IsWindowVisible(hwnd)) /* if full size */ { + HDC hDC; + int w = GetDialogBaseUnits() - 1; + int wc = GetDialogBaseUnits() * 3 / 4; + RECT rect; + POINT point, p; + HPEN hPen; + int x, y; + + x = infoPtr->h; + y = infoPtr->s; + GetClientRect(hwnd, &rect); hDC = GetDC(hwnd); SelectClipRgn( hDC, CreateRectRgnIndirect(&rect)); point.x = ((long)rect.right * (long)x) / (long)MAXHORI; point.y = rect.bottom - ((long)rect.bottom * (long)y) / (long)MAXVERT; - if ( lpp->oldcross.left != lpp->oldcross.right ) - BitBlt(hDC, lpp->oldcross.left, lpp->oldcross.top, - lpp->oldcross.right - lpp->oldcross.left, - lpp->oldcross.bottom - lpp->oldcross.top, - lpp->hdcMem, lpp->oldcross.left, lpp->oldcross.top, SRCCOPY); - lpp->oldcross.left = point.x - w - 1; - lpp->oldcross.right = point.x + w + 1; - lpp->oldcross.top = point.y - w - 1; - lpp->oldcross.bottom = point.y + w + 1; + if ( infoPtr->oldcross.left != infoPtr->oldcross.right ) + BitBlt(hDC, infoPtr->oldcross.left, infoPtr->oldcross.top, + infoPtr->oldcross.right - infoPtr->oldcross.left, + infoPtr->oldcross.bottom - infoPtr->oldcross.top, + infoPtr->hdcMem, infoPtr->oldcross.left, infoPtr->oldcross.top, SRCCOPY); + infoPtr->oldcross.left = point.x - w - 1; + infoPtr->oldcross.right = point.x + w + 1; + infoPtr->oldcross.top = point.y - w - 1; + infoPtr->oldcross.bottom = point.y + w + 1; - hPen = CreatePen(PS_SOLID, 3, 0x000000); /* -black- color */ + hPen = CreatePen(PS_SOLID, 3, RGB(0, 0, 0)); /* -black- color */ hPen = SelectObject(hDC, hPen); MoveToEx(hDC, point.x - w, point.y, &p); LineTo(hDC, point.x - wc, point.y); @@ -560,11 +573,10 @@ static void CC_PaintCross( HWND hDlg, int x, int y) /*********************************************************************** * CC_PrepareColorGraph [internal] */ -static void CC_PrepareColorGraph( HWND hDlg ) +static void CC_PrepareColorGraph(CCPRIV *infoPtr) { - int sdif, hdif, xdif, ydif, r, g, b, hue, sat; - HWND hwnd = GetDlgItem(hDlg, 0x2c6); - LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); + int sdif, hdif, xdif, ydif, hue, sat; + HWND hwnd = GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_GRAPH); HBRUSH hbrush; HDC hdc ; RECT rect, client; @@ -572,9 +584,9 @@ static void CC_PrepareColorGraph( HWND hDlg ) GetClientRect(hwnd, &client); hdc = GetDC(hwnd); - lpp->hdcMem = CreateCompatibleDC(hdc); - lpp->hbmMem = CreateCompatibleBitmap(hdc, client.right, client.bottom); - SelectObject(lpp->hdcMem, lpp->hbmMem); + infoPtr->hdcMem = CreateCompatibleDC(hdc); + infoPtr->hbmMem = CreateCompatibleBitmap(hdc, client.right, client.bottom); + SelectObject(infoPtr->hdcMem, infoPtr->hbmMem); xdif = client.right / XSTEPS; ydif = client.bottom / YSTEPS+1; @@ -587,11 +599,8 @@ static void CC_PrepareColorGraph( HWND hDlg ) for(sat = 0; sat < 240 + sdif; sat += sdif) { rect.top = rect.bottom - ydif; - r = CC_HSLtoRGB('R', hue, sat, 120); - g = CC_HSLtoRGB('G', hue, sat, 120); - b = CC_HSLtoRGB('B', hue, sat, 120); - hbrush = CreateSolidBrush( RGB(r, g, b)); - FillRect(lpp->hdcMem, &rect, hbrush); + hbrush = CreateSolidBrush(CC_HSLtoRGB(hue, sat, 120)); + FillRect(infoPtr->hdcMem, &rect, hbrush); DeleteObject(hbrush); rect.bottom = rect.top; } @@ -604,21 +613,21 @@ static void CC_PrepareColorGraph( HWND hDlg ) /*********************************************************************** * CC_PaintColorGraph [internal] */ -static void CC_PaintColorGraph( HWND hDlg ) +static void CC_PaintColorGraph(CCPRIV *infoPtr) { - HWND hwnd = GetDlgItem( hDlg, 0x2c6 ); - LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); + HWND hwnd = GetDlgItem( infoPtr->hwndSelf, IDC_COLOR_GRAPH ); HDC hDC; RECT rect; + if (IsWindowVisible(hwnd)) /* if full size */ { - if (!lpp->hdcMem) - CC_PrepareColorGraph(hDlg); /* should not be necessary */ + if (!infoPtr->hdcMem) + CC_PrepareColorGraph(infoPtr); /* should not be necessary */ hDC = GetDC(hwnd); GetClientRect(hwnd, &rect); - if (lpp->hdcMem) - BitBlt(hDC, 0, 0, rect.right, rect.bottom, lpp->hdcMem, 0, 0, SRCCOPY); + if (infoPtr->hdcMem) + BitBlt(hDC, 0, 0, rect.right, rect.bottom, infoPtr->hdcMem, 0, 0, SRCCOPY); else WARN("choose color: hdcMem is not defined\n"); ReleaseDC(hwnd, hDC); @@ -628,11 +637,11 @@ static void CC_PaintColorGraph( HWND hDlg ) /*********************************************************************** * CC_PaintLumBar [internal] */ -static void CC_PaintLumBar( HWND hDlg, int hue, int sat ) +static void CC_PaintLumBar(const CCPRIV *infoPtr) { - HWND hwnd = GetDlgItem(hDlg, 0x2be); + HWND hwnd = GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_LUMBAR); RECT rect, client; - int lum, ldif, ydif, r, g, b; + int lum, ldif, ydif; HBRUSH hbrush; HDC hDC; @@ -647,10 +656,7 @@ static void CC_PaintLumBar( HWND hDlg, int hue, int sat ) for (lum = 0; lum < 240 + ldif; lum += ldif) { rect.top = max(0, rect.bottom - ydif); - r = CC_HSLtoRGB('R', hue, sat, lum); - g = CC_HSLtoRGB('G', hue, sat, lum); - b = CC_HSLtoRGB('B', hue, sat, lum); - hbrush = CreateSolidBrush( RGB(r, g, b) ); + hbrush = CreateSolidBrush(CC_HSLtoRGB(infoPtr->h, infoPtr->s, lum)); FillRect(hDC, &rect, hbrush); DeleteObject(hbrush); rect.bottom = rect.top; @@ -664,91 +670,89 @@ static void CC_PaintLumBar( HWND hDlg, int hue, int sat ) /*********************************************************************** * CC_EditSetRGB [internal] */ -static void CC_EditSetRGB( HWND hDlg, COLORREF cr ) +static void CC_EditSetRGB( CCPRIV *infoPtr ) { - char buffer[10]; - LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); - int r = GetRValue(cr); - int g = GetGValue(cr); - int b = GetBValue(cr); - if (IsWindowVisible( GetDlgItem(hDlg, 0x2c6) )) /* if full size */ + if (IsWindowVisible( GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_GRAPH) )) /* if full size */ { - lpp->updating = TRUE; + COLORREF cr = infoPtr->lpcc->rgbResult; + int r = GetRValue(cr); + int g = GetGValue(cr); + int b = GetBValue(cr); + char buffer[10]; + + infoPtr->updating = TRUE; sprintf(buffer, "%d", r); - SetWindowTextA( GetDlgItem(hDlg, 0x2c2), buffer); + SetWindowTextA( GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_EDIT_R), buffer); sprintf(buffer, "%d", g); - SetWindowTextA( GetDlgItem(hDlg, 0x2c3), buffer); + SetWindowTextA( GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_EDIT_G), buffer); sprintf( buffer, "%d", b ); - SetWindowTextA( GetDlgItem(hDlg, 0x2c4),buffer); - lpp->updating = FALSE; + SetWindowTextA( GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_EDIT_B), buffer); + infoPtr->updating = FALSE; } } /*********************************************************************** * CC_EditSetHSL [internal] */ -static void CC_EditSetHSL( HWND hDlg, int h, int s, int l ) +static void CC_EditSetHSL( CCPRIV *infoPtr ) { - char buffer[10]; - LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); - - if (IsWindowVisible( GetDlgItem(hDlg, 0x2c6) )) /* if full size */ + if (IsWindowVisible( GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_GRAPH) )) /* if full size */ { - lpp->updating = TRUE; - sprintf(buffer, "%d", h); - SetWindowTextA( GetDlgItem(hDlg, 0x2bf), buffer); - sprintf(buffer, "%d", s); - SetWindowTextA( GetDlgItem(hDlg, 0x2c0), buffer); - sprintf(buffer, "%d", l); - SetWindowTextA( GetDlgItem(hDlg, 0x2c1), buffer); - lpp->updating = FALSE; + char buffer[10]; + + infoPtr->updating = TRUE; + sprintf(buffer, "%d", infoPtr->h); + SetWindowTextA( GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_EDIT_H), buffer); + sprintf(buffer, "%d", infoPtr->s); + SetWindowTextA( GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_EDIT_S), buffer); + sprintf(buffer, "%d", infoPtr->l); + SetWindowTextA( GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_EDIT_L), buffer); + infoPtr->updating = FALSE; } - CC_PaintLumBar(hDlg, h, s); + CC_PaintLumBar(infoPtr); } /*********************************************************************** * CC_SwitchToFullSize [internal] */ -static void CC_SwitchToFullSize( HWND hDlg, COLORREF result, LPCRECT lprect ) +static void CC_SwitchToFullSize( CCPRIV *infoPtr, const RECT *lprect ) { int i; - LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); - EnableWindow( GetDlgItem(hDlg, 0x2cf), FALSE); - CC_PrepareColorGraph(hDlg); - for (i = 0x2bf; i < 0x2c5; i++) - ShowWindow( GetDlgItem(hDlg, i), SW_SHOW); - for (i = 0x2d3; i < 0x2d9; i++) - ShowWindow( GetDlgItem(hDlg, i), SW_SHOW); - ShowWindow( GetDlgItem(hDlg, 0x2c9), SW_SHOW); - ShowWindow( GetDlgItem(hDlg, 0x2c8), SW_SHOW); - ShowWindow( GetDlgItem(hDlg, 1090), SW_SHOW); + EnableWindow( GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_DEFINE), FALSE); + CC_PrepareColorGraph(infoPtr); + for (i = IDC_COLOR_EDIT_H; i <= IDC_COLOR_EDIT_B; i++) + ShowWindow( GetDlgItem(infoPtr->hwndSelf, i), SW_SHOW); + for (i = IDC_COLOR_HL; i <= IDC_COLOR_BL; i++) + ShowWindow( GetDlgItem(infoPtr->hwndSelf, i), SW_SHOW); + ShowWindow( GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_RES), SW_SHOW); + ShowWindow( GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_ADD), SW_SHOW); + ShowWindow( GetDlgItem(infoPtr->hwndSelf, 1090), SW_SHOW); if (lprect) - SetWindowPos(hDlg, 0, 0, 0, lprect->right-lprect->left, + SetWindowPos(infoPtr->hwndSelf, 0, 0, 0, lprect->right-lprect->left, lprect->bottom-lprect->top, SWP_NOMOVE|SWP_NOZORDER); - ShowWindow( GetDlgItem(hDlg, 0x2be), SW_SHOW); - ShowWindow( GetDlgItem(hDlg, 0x2c5), SW_SHOW); + ShowWindow( GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_LUMBAR), SW_SHOW); + ShowWindow( GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_RESULT), SW_SHOW); - CC_EditSetRGB(hDlg, result); - CC_EditSetHSL(hDlg, lpp->h, lpp->s, lpp->l); - ShowWindow( GetDlgItem( hDlg, 0x2c6), SW_SHOW); - UpdateWindow( GetDlgItem(hDlg, 0x2c6) ); + CC_EditSetRGB(infoPtr); + CC_EditSetHSL(infoPtr); + ShowWindow( GetDlgItem( infoPtr->hwndSelf, IDC_COLOR_GRAPH), SW_SHOW); + UpdateWindow( GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_GRAPH) ); } /*********************************************************************** * CC_PaintPredefColorArray [internal] * Paints the default standard 48 colors */ -static void CC_PaintPredefColorArray( HWND hDlg, int rows, int cols) +static void CC_PaintPredefColorArray(const CCPRIV *infoPtr, int rows, int cols) { - HWND hwnd = GetDlgItem(hDlg, 0x2d0); + HWND hwnd = GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_PREDEF); RECT rect, blockrect; HDC hdc; HBRUSH hBrush; int dx, dy, i, j, k; - LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); GetClientRect(hwnd, &rect); dx = rect.right / cols; @@ -781,21 +785,20 @@ static void CC_PaintPredefColorArray( HWND hDlg, int rows, int cols) rect.left = k; } ReleaseDC(hwnd, hdc); - if (lpp->hwndFocus == hwnd) - CC_DrawCurrentFocusRect(lpp); + if (infoPtr->hwndFocus == hwnd) + CC_DrawCurrentFocusRect(infoPtr); } /*********************************************************************** * CC_PaintUserColorArray [internal] * Paint the 16 user-selected colors */ -static void CC_PaintUserColorArray( HWND hDlg, int rows, int cols, const COLORREF *lpcr ) +static void CC_PaintUserColorArray(const CCPRIV *infoPtr, int rows, int cols) { - HWND hwnd = GetDlgItem(hDlg, 0x2d1); + HWND hwnd = GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_USRDEF); RECT rect, blockrect; HDC hdc; HBRUSH hBrush; int dx, dy, i, j, k; - LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); GetClientRect(hwnd, &rect); @@ -813,7 +816,7 @@ static void CC_PaintUserColorArray( HWND hDlg, int rows, int cols, const COLORRE { for (i = 0; i < cols; i++) { - hBrush = CreateSolidBrush(lpcr[i+j*cols]); + hBrush = CreateSolidBrush(infoPtr->lpcc->lpCustColors[i+j*cols]); if (hBrush) { blockrect.left = rect.left; @@ -831,8 +834,8 @@ static void CC_PaintUserColorArray( HWND hDlg, int rows, int cols, const COLORRE } ReleaseDC(hwnd, hdc); } - if (lpp->hwndFocus == hwnd) - CC_DrawCurrentFocusRect(lpp); + if (infoPtr->hwndFocus == hwnd) + CC_DrawCurrentFocusRect(infoPtr); } @@ -853,24 +856,26 @@ static BOOL CC_HookCallChk( const CHOOSECOLORW *lpcc ) */ static LRESULT CC_WMInitDialog( HWND hDlg, WPARAM wParam, LPARAM lParam ) { + CHOOSECOLORW *cc = (CHOOSECOLORW*)lParam; int i, res; int r, g, b; HWND hwnd; RECT rect; POINT point; - LPCCPRIV lpp; + CCPRIV *lpp; TRACE("WM_INITDIALOG lParam=%08lX\n", lParam); - lpp = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct CCPRIVATE) ); - lpp->lpcc = (LPCHOOSECOLORW) lParam; - if (lpp->lpcc->lStructSize != sizeof(CHOOSECOLORW) ) + if (cc->lStructSize != sizeof(CHOOSECOLORW)) { - HeapFree(GetProcessHeap(), 0, lpp); - EndDialog (hDlg, 0) ; + EndDialog(hDlg, 0); return FALSE; } + lpp = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct CCPRIVATE) ); + lpp->lpcc = cc; + lpp->hwndSelf = hDlg; + SetPropW( hDlg, szColourDialogProp, lpp ); if (!(lpp->lpcc->Flags & CC_SHOWHELP)) @@ -896,14 +901,14 @@ static LRESULT CC_WMInitDialog( HWND hDlg, WPARAM wParam, LPARAM lParam ) GetWindowRect(hDlg, &lpp->fullsize); if (lpp->lpcc->Flags & CC_FULLOPEN || lpp->lpcc->Flags & CC_PREVENTFULLOPEN) { - hwnd = GetDlgItem(hDlg, 0x2cf); + hwnd = GetDlgItem(hDlg, IDC_COLOR_DEFINE); EnableWindow(hwnd, FALSE); } if (!(lpp->lpcc->Flags & CC_FULLOPEN ) || lpp->lpcc->Flags & CC_PREVENTFULLOPEN) { rect = lpp->fullsize; res = rect.bottom - rect.top; - hwnd = GetDlgItem(hDlg, 0x2c6); /* cut at left border */ + hwnd = GetDlgItem(hDlg, IDC_COLOR_GRAPH); /* cut at left border */ point.x = point.y = 0; ClientToScreen(hwnd, &point); ScreenToClient(hDlg,&point); @@ -911,20 +916,20 @@ static LRESULT CC_WMInitDialog( HWND hDlg, WPARAM wParam, LPARAM lParam ) point.x += GetSystemMetrics(SM_CXDLGFRAME); SetWindowPos(hDlg, 0, 0, 0, point.x, res, SWP_NOMOVE|SWP_NOZORDER); - for (i = 0x2bf; i < 0x2c5; i++) + for (i = IDC_COLOR_EDIT_H; i <= IDC_COLOR_EDIT_B; i++) ShowWindow( GetDlgItem(hDlg, i), SW_HIDE); - for (i = 0x2d3; i < 0x2d9; i++) + for (i = IDC_COLOR_HL; i <= IDC_COLOR_BL; i++) ShowWindow( GetDlgItem(hDlg, i), SW_HIDE); - ShowWindow( GetDlgItem(hDlg, 0x2c9), SW_HIDE); - ShowWindow( GetDlgItem(hDlg, 0x2c8), SW_HIDE); - ShowWindow( GetDlgItem(hDlg, 0x2c6), SW_HIDE); - ShowWindow( GetDlgItem(hDlg, 0x2c5), SW_HIDE); + ShowWindow( GetDlgItem(hDlg, IDC_COLOR_RES), SW_HIDE); + ShowWindow( GetDlgItem(hDlg, IDC_COLOR_ADD), SW_HIDE); + ShowWindow( GetDlgItem(hDlg, IDC_COLOR_GRAPH), SW_HIDE); + ShowWindow( GetDlgItem(hDlg, IDC_COLOR_RESULT), SW_HIDE); ShowWindow( GetDlgItem(hDlg, 1090 ), SW_HIDE); } else - CC_SwitchToFullSize(hDlg, lpp->lpcc->rgbResult, NULL); + CC_SwitchToFullSize(lpp, NULL); res = TRUE; - for (i = 0x2bf; i < 0x2c5; i++) + for (i = IDC_COLOR_EDIT_H; i <= IDC_COLOR_EDIT_B; i++) SendMessageA( GetDlgItem(hDlg, i), EM_LIMITTEXT, 3, 0); /* max 3 digits: xyz */ if (CC_HookCallChk(lpp->lpcc)) { @@ -936,21 +941,21 @@ static LRESULT CC_WMInitDialog( HWND hDlg, WPARAM wParam, LPARAM lParam ) g = GetGValue(lpp->lpcc->rgbResult); b = GetBValue(lpp->lpcc->rgbResult); - CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult); - lpp->h = CC_RGBtoHSL('H', r, g, b); - lpp->s = CC_RGBtoHSL('S', r, g, b); - lpp->l = CC_RGBtoHSL('L', r, g, b); + CC_PaintSelectedColor(lpp); + lpp->h = CC_RGBtoHSL('H', lpp->lpcc->rgbResult); + lpp->s = CC_RGBtoHSL('S', lpp->lpcc->rgbResult); + lpp->l = CC_RGBtoHSL('L', lpp->lpcc->rgbResult); /* Doing it the long way because CC_EditSetRGB/HSL doesn't seem to work */ - SetDlgItemInt(hDlg, 703, lpp->h, TRUE); - SetDlgItemInt(hDlg, 704, lpp->s, TRUE); - SetDlgItemInt(hDlg, 705, lpp->l, TRUE); - SetDlgItemInt(hDlg, 706, r, TRUE); - SetDlgItemInt(hDlg, 707, g, TRUE); - SetDlgItemInt(hDlg, 708, b, TRUE); + SetDlgItemInt(hDlg, IDC_COLOR_EDIT_H, lpp->h, TRUE); + SetDlgItemInt(hDlg, IDC_COLOR_EDIT_S, lpp->s, TRUE); + SetDlgItemInt(hDlg, IDC_COLOR_EDIT_L, lpp->l, TRUE); + SetDlgItemInt(hDlg, IDC_COLOR_EDIT_R, r, TRUE); + SetDlgItemInt(hDlg, IDC_COLOR_EDIT_G, g, TRUE); + SetDlgItemInt(hDlg, IDC_COLOR_EDIT_B, b, TRUE); - CC_PaintCross(hDlg, lpp->h, lpp->s); - CC_PaintTriangle(hDlg, lpp->l); + CC_PaintCross(lpp); + CC_PaintTriangle(lpp); return res; } @@ -959,20 +964,19 @@ static LRESULT CC_WMInitDialog( HWND hDlg, WPARAM wParam, LPARAM lParam ) /*********************************************************************** * CC_WMCommand [internal] */ -static LRESULT CC_WMCommand( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD notifyCode, HWND hwndCtl ) +static LRESULT CC_WMCommand(CCPRIV *lpp, WPARAM wParam, LPARAM lParam, WORD notifyCode, HWND hwndCtl) { int r, g, b, i, xx; UINT cokmsg; HDC hdc; COLORREF *cr; - LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); TRACE("CC_WMCommand wParam=%lx lParam=%lx\n", wParam, lParam); switch (LOWORD(wParam)) { - case 0x2c2: /* edit notify RGB */ - case 0x2c3: - case 0x2c4: + case IDC_COLOR_EDIT_R: /* edit notify RGB */ + case IDC_COLOR_EDIT_G: + case IDC_COLOR_EDIT_B: if (notifyCode == EN_UPDATE && !lpp->updating) { i = CC_CheckDigitsInEdit(hwndCtl, 255); @@ -982,79 +986,73 @@ static LRESULT CC_WMCommand( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD notif xx = 0; switch (LOWORD(wParam)) { - case 0x2c2: if ((xx = (i != r))) r = i; break; - case 0x2c3: if ((xx = (i != g))) g = i; break; - case 0x2c4: if ((xx = (i != b))) b = i; break; + case IDC_COLOR_EDIT_R: if ((xx = (i != r))) r = i; break; + case IDC_COLOR_EDIT_G: if ((xx = (i != g))) g = i; break; + case IDC_COLOR_EDIT_B: if ((xx = (i != b))) b = i; break; } if (xx) /* something has changed */ { lpp->lpcc->rgbResult = RGB(r, g, b); - CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult); - lpp->h = CC_RGBtoHSL('H', r, g, b); - lpp->s = CC_RGBtoHSL('S', r, g, b); - lpp->l = CC_RGBtoHSL('L', r, g, b); - CC_EditSetHSL(hDlg, lpp->h, lpp->s, lpp->l); - CC_PaintCross(hDlg, lpp->h, lpp->s); - CC_PaintTriangle(hDlg, lpp->l); + CC_PaintSelectedColor(lpp); + lpp->h = CC_RGBtoHSL('H', lpp->lpcc->rgbResult); + lpp->s = CC_RGBtoHSL('S', lpp->lpcc->rgbResult); + lpp->l = CC_RGBtoHSL('L', lpp->lpcc->rgbResult); + CC_EditSetHSL(lpp); + CC_PaintCross(lpp); + CC_PaintTriangle(lpp); } } break; - case 0x2bf: /* edit notify HSL */ - case 0x2c0: - case 0x2c1: + case IDC_COLOR_EDIT_H: /* edit notify HSL */ + case IDC_COLOR_EDIT_S: + case IDC_COLOR_EDIT_L: if (notifyCode == EN_UPDATE && !lpp->updating) { - i = CC_CheckDigitsInEdit(hwndCtl , LOWORD(wParam) == 0x2bf ? 239:240); + i = CC_CheckDigitsInEdit(hwndCtl , LOWORD(wParam) == IDC_COLOR_EDIT_H ? 239 : 240); xx = 0; switch (LOWORD(wParam)) { - case 0x2bf: if ((xx = ( i != lpp->h))) lpp->h = i; break; - case 0x2c0: if ((xx = ( i != lpp->s))) lpp->s = i; break; - case 0x2c1: if ((xx = ( i != lpp->l))) lpp->l = i; break; + case IDC_COLOR_EDIT_H: if ((xx = ( i != lpp->h))) lpp->h = i; break; + case IDC_COLOR_EDIT_S: if ((xx = ( i != lpp->s))) lpp->s = i; break; + case IDC_COLOR_EDIT_L: if ((xx = ( i != lpp->l))) lpp->l = i; break; } if (xx) /* something has changed */ { - r = CC_HSLtoRGB('R', lpp->h, lpp->s, lpp->l); - g = CC_HSLtoRGB('G', lpp->h, lpp->s, lpp->l); - b = CC_HSLtoRGB('B', lpp->h, lpp->s, lpp->l); - lpp->lpcc->rgbResult = RGB(r, g, b); - CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult); - CC_EditSetRGB(hDlg, lpp->lpcc->rgbResult); - CC_PaintCross(hDlg, lpp->h, lpp->s); - CC_PaintTriangle(hDlg, lpp->l); + lpp->lpcc->rgbResult = CC_HSLtoRGB(lpp->h, lpp->s, lpp->l); + CC_PaintSelectedColor(lpp); + CC_EditSetRGB(lpp); + CC_PaintCross(lpp); + CC_PaintTriangle(lpp); } } break; - case 0x2cf: - CC_SwitchToFullSize(hDlg, lpp->lpcc->rgbResult, &lpp->fullsize); - SetFocus( GetDlgItem(hDlg, 0x2bf)); + case IDC_COLOR_DEFINE: + CC_SwitchToFullSize(lpp, &lpp->fullsize); + SetFocus( GetDlgItem(lpp->hwndSelf, IDC_COLOR_EDIT_H)); break; - case 0x2c8: /* add colors ... column by column */ + case IDC_COLOR_ADD: /* add colors ... column by column */ cr = lpp->lpcc->lpCustColors; cr[(lpp->nextuserdef % 2) * 8 + lpp->nextuserdef / 2] = lpp->lpcc->rgbResult; if (++lpp->nextuserdef == 16) lpp->nextuserdef = 0; - CC_PaintUserColorArray(hDlg, 2, 8, lpp->lpcc->lpCustColors); + CC_PaintUserColorArray(lpp, 2, 8); break; - case 0x2c9: /* resulting color */ - hdc = GetDC(hDlg); + case IDC_COLOR_RES: /* resulting color */ + hdc = GetDC(lpp->hwndSelf); lpp->lpcc->rgbResult = GetNearestColor(hdc, lpp->lpcc->rgbResult); - ReleaseDC(hDlg, hdc); - CC_EditSetRGB(hDlg, lpp->lpcc->rgbResult); - CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult); - r = GetRValue(lpp->lpcc->rgbResult); - g = GetGValue(lpp->lpcc->rgbResult); - b = GetBValue(lpp->lpcc->rgbResult); - lpp->h = CC_RGBtoHSL('H', r, g, b); - lpp->s = CC_RGBtoHSL('S', r, g, b); - lpp->l = CC_RGBtoHSL('L', r, g, b); - CC_EditSetHSL(hDlg, lpp->h, lpp->s, lpp->l); - CC_PaintCross(hDlg, lpp->h, lpp->s); - CC_PaintTriangle(hDlg, lpp->l); + ReleaseDC(lpp->hwndSelf, hdc); + CC_EditSetRGB(lpp); + CC_PaintSelectedColor(lpp); + lpp->h = CC_RGBtoHSL('H', lpp->lpcc->rgbResult); + lpp->s = CC_RGBtoHSL('S', lpp->lpcc->rgbResult); + lpp->l = CC_RGBtoHSL('L', lpp->lpcc->rgbResult); + CC_EditSetHSL(lpp); + CC_PaintCross(lpp); + CC_PaintTriangle(lpp); break; case 0x40e: /* Help! */ /* The Beatles, 1965 ;-) */ @@ -1062,7 +1060,7 @@ static LRESULT CC_WMCommand( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD notif if (lpp->lpcc->hwndOwner) SendMessageA(lpp->lpcc->hwndOwner, i, 0, (LPARAM)lpp->lpcc); if ( CC_HookCallChk(lpp->lpcc)) - CallWindowProcA( (WNDPROC) lpp->lpcc->lpfnHook, hDlg, + CallWindowProcA( (WNDPROC) lpp->lpcc->lpfnHook, lpp->hwndSelf, WM_COMMAND, psh15, (LPARAM)lpp->lpcc); break; @@ -1071,11 +1069,11 @@ static LRESULT CC_WMCommand( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD notif if (lpp->lpcc->hwndOwner) if (SendMessageA(lpp->lpcc->hwndOwner, cokmsg, 0, (LPARAM)lpp->lpcc)) break; /* do NOT close */ - EndDialog(hDlg, 1) ; + EndDialog(lpp->hwndSelf, 1) ; return TRUE ; case IDCANCEL : - EndDialog(hDlg, 0) ; + EndDialog(lpp->hwndSelf, 0) ; return TRUE ; } @@ -1085,21 +1083,20 @@ static LRESULT CC_WMCommand( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD notif /*********************************************************************** * CC_WMPaint [internal] */ -static LRESULT CC_WMPaint( HWND hDlg ) +static LRESULT CC_WMPaint( CCPRIV *lpp ) { PAINTSTRUCT ps; - LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); - BeginPaint(hDlg, &ps); + BeginPaint(lpp->hwndSelf, &ps); /* we have to paint dialog children except text and buttons */ - CC_PaintPredefColorArray(hDlg, 6, 8); - CC_PaintUserColorArray(hDlg, 2, 8, lpp->lpcc->lpCustColors); - CC_PaintLumBar(hDlg, lpp->h, lpp->s); - CC_PaintTriangle(hDlg, lpp->l); - CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult); - CC_PaintColorGraph(hDlg); - CC_PaintCross(hDlg, lpp->h, lpp->s); - EndPaint(hDlg, &ps); + CC_PaintPredefColorArray(lpp, 6, 8); + CC_PaintUserColorArray(lpp, 2, 8); + CC_PaintLumBar(lpp); + CC_PaintTriangle(lpp); + CC_PaintSelectedColor(lpp); + CC_PaintColorGraph(lpp); + CC_PaintCross(lpp); + EndPaint(lpp->hwndSelf, &ps); return TRUE; } @@ -1107,15 +1104,13 @@ static LRESULT CC_WMPaint( HWND hDlg ) /*********************************************************************** * CC_WMLButtonUp [internal] */ -static LRESULT CC_WMLButtonUp( HWND hDlg ) +static LRESULT CC_WMLButtonUp( CCPRIV *infoPtr ) { - LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); - - if (lpp->capturedGraph) + if (infoPtr->capturedGraph) { - lpp->capturedGraph = 0; + infoPtr->capturedGraph = 0; ReleaseCapture(); - CC_PaintCross(hDlg, lpp->h, lpp->s); + CC_PaintCross(infoPtr); return 1; } return 0; @@ -1124,35 +1119,29 @@ static LRESULT CC_WMLButtonUp( HWND hDlg ) /*********************************************************************** * CC_WMMouseMove [internal] */ -static LRESULT CC_WMMouseMove( HWND hDlg, LPARAM lParam ) +static LRESULT CC_WMMouseMove( CCPRIV *infoPtr, LPARAM lParam ) { - LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); - int r, g, b; - - if (lpp->capturedGraph) + if (infoPtr->capturedGraph) { - int *ptrh = NULL, *ptrs = &lpp->l; - if (lpp->capturedGraph == 0x2c6) + int *ptrh = NULL, *ptrs = &infoPtr->l; + if (infoPtr->capturedGraph == IDC_COLOR_GRAPH) { - ptrh = &lpp->h; - ptrs = &lpp->s; + ptrh = &infoPtr->h; + ptrs = &infoPtr->s; } - if (CC_MouseCheckColorGraph( hDlg, lpp->capturedGraph, ptrh, ptrs, lParam)) + if (CC_MouseCheckColorGraph( infoPtr->hwndSelf, infoPtr->capturedGraph, ptrh, ptrs, lParam)) { - r = CC_HSLtoRGB('R', lpp->h, lpp->s, lpp->l); - g = CC_HSLtoRGB('G', lpp->h, lpp->s, lpp->l); - b = CC_HSLtoRGB('B', lpp->h, lpp->s, lpp->l); - lpp->lpcc->rgbResult = RGB(r, g, b); - CC_EditSetRGB(hDlg, lpp->lpcc->rgbResult); - CC_EditSetHSL(hDlg,lpp->h, lpp->s, lpp->l); - CC_PaintCross(hDlg, lpp->h, lpp->s); - CC_PaintTriangle(hDlg, lpp->l); - CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult); + infoPtr->lpcc->rgbResult = CC_HSLtoRGB(infoPtr->h, infoPtr->s, infoPtr->l); + CC_EditSetRGB(infoPtr); + CC_EditSetHSL(infoPtr); + CC_PaintCross(infoPtr); + CC_PaintTriangle(infoPtr); + CC_PaintSelectedColor(infoPtr); } else { ReleaseCapture(); - lpp->capturedGraph = 0; + infoPtr->capturedGraph = 0; } return 1; } @@ -1162,53 +1151,45 @@ static LRESULT CC_WMMouseMove( HWND hDlg, LPARAM lParam ) /*********************************************************************** * CC_WMLButtonDown [internal] */ -static LRESULT CC_WMLButtonDown( HWND hDlg, LPARAM lParam ) +static LRESULT CC_WMLButtonDown( CCPRIV *infoPtr, LPARAM lParam ) { - LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); - int r, g, b, i; - i = 0; + int i = 0; - if (CC_MouseCheckPredefColorArray(lpp, hDlg, 0x2d0, 6, 8, lParam)) + if (CC_MouseCheckPredefColorArray(infoPtr, 6, 8, lParam)) i = 1; else - if (CC_MouseCheckUserColorArray(lpp, hDlg, 0x2d1, 2, 8, lParam)) + if (CC_MouseCheckUserColorArray(infoPtr, 2, 8, lParam)) i = 1; else - if (CC_MouseCheckColorGraph(hDlg, 0x2c6, &lpp->h, &lpp->s, lParam)) + if (CC_MouseCheckColorGraph(infoPtr->hwndSelf, IDC_COLOR_GRAPH, &infoPtr->h, &infoPtr->s, lParam)) { i = 2; - lpp->capturedGraph = 0x2c6; + infoPtr->capturedGraph = IDC_COLOR_GRAPH; } else - if (CC_MouseCheckColorGraph(hDlg, 0x2be, NULL, &lpp->l, lParam)) + if (CC_MouseCheckColorGraph(infoPtr->hwndSelf, IDC_COLOR_LUMBAR, NULL, &infoPtr->l, lParam)) { i = 2; - lpp->capturedGraph = 0x2be; + infoPtr->capturedGraph = IDC_COLOR_LUMBAR; } if ( i == 2 ) { - SetCapture(hDlg); - r = CC_HSLtoRGB('R', lpp->h, lpp->s, lpp->l); - g = CC_HSLtoRGB('G', lpp->h, lpp->s, lpp->l); - b = CC_HSLtoRGB('B', lpp->h, lpp->s, lpp->l); - lpp->lpcc->rgbResult = RGB(r, g, b); + SetCapture(infoPtr->hwndSelf); + infoPtr->lpcc->rgbResult = CC_HSLtoRGB(infoPtr->h, infoPtr->s, infoPtr->l); } if ( i == 1 ) { - r = GetRValue(lpp->lpcc->rgbResult); - g = GetGValue(lpp->lpcc->rgbResult); - b = GetBValue(lpp->lpcc->rgbResult); - lpp->h = CC_RGBtoHSL('H', r, g, b); - lpp->s = CC_RGBtoHSL('S', r, g, b); - lpp->l = CC_RGBtoHSL('L', r, g, b); + infoPtr->h = CC_RGBtoHSL('H', infoPtr->lpcc->rgbResult); + infoPtr->s = CC_RGBtoHSL('S', infoPtr->lpcc->rgbResult); + infoPtr->l = CC_RGBtoHSL('L', infoPtr->lpcc->rgbResult); } if (i) { - CC_EditSetRGB(hDlg, lpp->lpcc->rgbResult); - CC_EditSetHSL(hDlg,lpp->h, lpp->s, lpp->l); - CC_PaintCross(hDlg, lpp->h, lpp->s); - CC_PaintTriangle(hDlg, lpp->l); - CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult); + CC_EditSetRGB(infoPtr); + CC_EditSetHSL(infoPtr); + CC_PaintCross(infoPtr); + CC_PaintTriangle(infoPtr); + CC_PaintSelectedColor(infoPtr); return TRUE; } return FALSE; @@ -1223,7 +1204,7 @@ static INT_PTR CALLBACK ColorDlgProc( HWND hDlg, UINT message, { int res; - LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); + CCPRIV *lpp = GetPropW( hDlg, szColourDialogProp ); if (message != WM_INITDIALOG) { @@ -1252,11 +1233,11 @@ static INT_PTR CALLBACK ColorDlgProc( HWND hDlg, UINT message, RemovePropW( hDlg, szColourDialogProp ); break; case WM_COMMAND: - if (CC_WMCommand( hDlg, wParam, lParam, HIWORD(wParam), (HWND) lParam)) + if (CC_WMCommand(lpp, wParam, lParam, HIWORD(wParam), (HWND) lParam)) return TRUE; break; case WM_PAINT: - if (CC_WMPaint(hDlg)) + if (CC_WMPaint(lpp)) return TRUE; break; case WM_LBUTTONDBLCLK: @@ -1264,15 +1245,15 @@ static INT_PTR CALLBACK ColorDlgProc( HWND hDlg, UINT message, return TRUE; break; case WM_MOUSEMOVE: - if (CC_WMMouseMove(hDlg, lParam)) + if (CC_WMMouseMove(lpp, lParam)) return TRUE; break; case WM_LBUTTONUP: /* FIXME: ClipCursor off (if in color graph)*/ - if (CC_WMLButtonUp(hDlg)) + if (CC_WMLButtonUp(lpp)) return TRUE; break; case WM_LBUTTONDOWN:/* FIXME: ClipCursor on (if in color graph)*/ - if (CC_WMLButtonDown(hDlg, lParam)) + if (CC_WMLButtonDown(lpp, lParam)) return TRUE; break; } @@ -1292,13 +1273,13 @@ static INT_PTR CALLBACK ColorDlgProc( HWND hDlg, UINT message, * TRUE: Ok button clicked. * FALSE: Cancel button clicked, or error. */ -BOOL WINAPI ChooseColorW( LPCHOOSECOLORW lpChCol ) +BOOL WINAPI ChooseColorW( CHOOSECOLORW *lpChCol ) { HANDLE hDlgTmpl = 0; - BOOL bRet = FALSE; - LPCVOID template; + const void *template; + + TRACE("(%p)\n", lpChCol); - TRACE("ChooseColor\n"); if (!lpChCol) return FALSE; if (lpChCol->Flags & CC_ENABLETEMPLATEHANDLE) @@ -1344,9 +1325,8 @@ BOOL WINAPI ChooseColorW( LPCHOOSECOLORW lpChCol ) } } - bRet = DialogBoxIndirectParamW(COMDLG32_hInstance, template, lpChCol->hwndOwner, + return DialogBoxIndirectParamW(COMDLG32_hInstance, template, lpChCol->hwndOwner, ColorDlgProc, (LPARAM)lpChCol); - return bRet; } /*********************************************************************** diff --git a/reactos/dll/win32/comdlg32/comdlg32_classes.idl b/reactos/dll/win32/comdlg32/comdlg32_classes.idl new file mode 100644 index 00000000000..b45eeb55cd9 --- /dev/null +++ b/reactos/dll/win32/comdlg32/comdlg32_classes.idl @@ -0,0 +1,33 @@ +/* + * Coclasses for comdlg32 + * + * Copyright 2011 David Hedberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +[ + helpstring("File Open Dialog"), + threading(apartment), + uuid(dc1c5a9c-e88a-4dde-a5a1-60f82a20aef7) +] +coclass FileOpenDialog { interface IFileOpenDialog; } + +[ + helpstring("File Save Dialog"), + threading(apartment), + uuid(c0b4e2f3-ba21-4773-8dba-335ec946eb8b) +] +coclass FileSaveDialog { interface IFileSaveDialog; } diff --git a/reactos/dll/win32/comdlg32/filedlg.c b/reactos/dll/win32/comdlg32/filedlg.c index cb2b07673d7..01a3537de9b 100644 --- a/reactos/dll/win32/comdlg32/filedlg.c +++ b/reactos/dll/win32/comdlg32/filedlg.c @@ -50,8 +50,6 @@ #define _WIN32_WINNT 0x0600 #define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H #include //#include "wine/port.h" @@ -67,16 +65,15 @@ #define NONAMELESSSTRUCT #include -//#include "winbase.h" +#include #include //#include "winnls.h" -#include #include +#include #include #include -//#include "dlgs.h" +#include #include "cdlg.h" -#include "filedlg31.h" #include //#include "shellapi.h" //#include "shlobj.h" @@ -119,7 +116,6 @@ typedef struct tagLookInInfo */ /* Draw item constant */ -#define ICONWIDTH 18 #define XTEXTOFFSET 3 /* AddItem flags*/ @@ -260,12 +256,12 @@ static BOOL GetFileName95(FileOpenDlgInfos *fodInfos) { LRESULT lRes; - LPVOID template; + LPCVOID origTemplate; + DWORD dwSize; + LPDLGTEMPLATEW template; HRSRC hRes; HANDLE hDlgTmpl = 0; HRESULT hr; - DWORD dwSize; - LPDLGTEMPLATE hDialogTemplate; /* test for missing functionality */ if (fodInfos->ofnInfos->Flags & UNIMPLEMENTED_FLAGS) @@ -281,17 +277,19 @@ static BOOL GetFileName95(FileOpenDlgInfos *fodInfos) COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE); return FALSE; } - if (!(hDlgTmpl = LoadResource(COMDLG32_hInstance, hRes )) || - !(dwSize = SizeofResource(COMDLG32_hInstance, hRes )) || - !(hDialogTemplate = malloc(dwSize)) || - !(template = LockResource( hDlgTmpl ))) + if (!(dwSize = SizeofResource(COMDLG32_hInstance, hRes)) || + !(hDlgTmpl = LoadResource(COMDLG32_hInstance, hRes)) || + !(origTemplate = LockResource(hDlgTmpl))) { COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE); return FALSE; } - - /* Copy the read only resource */ - memcpy(hDialogTemplate, template, dwSize); + if (!(template = HeapAlloc(GetProcessHeap(), 0, dwSize))) + { + COMDLG32_SetCommDlgExtendedError(CDERR_MEMALLOCFAILURE); + return FALSE; + } + memcpy(template, origTemplate, dwSize); /* msdn: explorer style dialogs permit sizing by default. * The OFN_ENABLESIZING flag is only needed when a hook or @@ -302,12 +300,12 @@ static BOOL GetFileName95(FileOpenDlgInfos *fodInfos) if (fodInfos->ofnInfos->Flags & OFN_ENABLESIZING) { - hDialogTemplate->style |= WS_SIZEBOX; + template->style |= WS_SIZEBOX; fodInfos->sizedlg.cx = fodInfos->sizedlg.cy = 0; fodInfos->initial_size.x = fodInfos->initial_size.y = 0; } else - hDialogTemplate->style &= ~WS_SIZEBOX; + template->style &= ~WS_SIZEBOX; /* old style hook messages */ @@ -324,20 +322,20 @@ static BOOL GetFileName95(FileOpenDlgInfos *fodInfos) if (fodInfos->unicode) lRes = DialogBoxIndirectParamW(COMDLG32_hInstance, - hDialogTemplate, + template, fodInfos->ofnInfos->hwndOwner, FileOpenDlgProc95, (LPARAM) fodInfos); else lRes = DialogBoxIndirectParamA(COMDLG32_hInstance, - hDialogTemplate, + template, fodInfos->ofnInfos->hwndOwner, FileOpenDlgProc95, (LPARAM) fodInfos); - if (SUCCEEDED(hr)) + if (SUCCEEDED(hr)) OleUninitialize(); - free(hDialogTemplate); + HeapFree(GetProcessHeap(), 0, template); /* Unable to create the dialog */ if( lRes == -1) @@ -363,6 +361,12 @@ static BOOL GetFileDialog95A(LPOPENFILENAMEA ofn,UINT iDlgType) LPWSTR defext = NULL; LPWSTR filter = NULL; LPWSTR customfilter = NULL; + INITCOMMONCONTROLSEX icc; + + /* Initialize ComboBoxEx32 */ + icc.dwSize = sizeof(icc); + icc.dwICC = ICC_USEREX_CLASSES; + InitCommonControlsEx(&icc); /* Initialize CommDlgExtendedError() */ COMDLG32_SetCommDlgExtendedError(0); @@ -496,6 +500,12 @@ static BOOL GetFileDialog95W(LPOPENFILENAMEW ofn,UINT iDlgType) BOOL ret; FileOpenDlgInfos fodInfos; LPWSTR lpstrSavDir = NULL; + INITCOMMONCONTROLSEX icc; + + /* Initialize ComboBoxEx32 */ + icc.dwSize = sizeof(icc); + icc.dwICC = ICC_USEREX_CLASSES; + InitCommonControlsEx(&icc); /* Initialize CommDlgExtendedError() */ COMDLG32_SetCommDlgExtendedError(0); @@ -1158,8 +1168,9 @@ static LRESULT FILEDLG95_OnWMSize(HWND hwnd, WPARAM wParam) * move to bottom */ switch( ctrlid) { - /* file name box and file types combo change also width */ + /* file name (edit or comboboxex) and file types combo change also width */ case edt1: + case cmb13: case cmb1: DeferWindowPos( hdwp, ctrl, NULL, rc.left, rc.top + chgy, rc.right - rc.left + chgx, rc.bottom - rc.top, @@ -1413,6 +1424,12 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l } } +static inline BOOL filename_is_edit( const FileOpenDlgInfos *info ) +{ + return (info->ofnInfos->lStructSize == OPENFILENAME_SIZE_VERSION_400W) && + (info->ofnInfos->Flags & (OFN_ENABLEHOOK | OFN_ENABLETEMPLATE | OFN_ENABLETEMPLATEHANDLE)); +} + /*********************************************************************** * FILEDLG95_InitControls * @@ -1463,8 +1480,20 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) } TRACE("Running on 2000+ %d, 98+ %d\n", win2000plus, win98plus); + + /* Use either the edit or the comboboxex for the filename control */ + if (filename_is_edit( fodInfos )) + { + DestroyWindow( GetDlgItem( hwnd, cmb13 ) ); + fodInfos->DlgInfos.hwndFileName = GetDlgItem( hwnd, edt1 ); + } + else + { + DestroyWindow( GetDlgItem( hwnd, edt1 ) ); + fodInfos->DlgInfos.hwndFileName = GetDlgItem( hwnd, cmb13 ); + } + /* Get the hwnd of the controls */ - fodInfos->DlgInfos.hwndFileName = GetDlgItem(hwnd,IDC_FILENAME); fodInfos->DlgInfos.hwndFileTypeCB = GetDlgItem(hwnd,IDC_FILETYPE); fodInfos->DlgInfos.hwndLookInCB = GetDlgItem(hwnd,IDC_LOOKIN); @@ -1553,10 +1582,10 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) TRACE("Value in Filename includes path, overriding InitialDir: %s, %s\n", debugstr_w(fodInfos->filename), debugstr_w(fodInfos->initdir)); } - SetDlgItemTextW(hwnd, IDC_FILENAME, fodInfos->filename); + SetWindowTextW( fodInfos->DlgInfos.hwndFileName, fodInfos->filename ); } else { - SetDlgItemTextW(hwnd, IDC_FILENAME, fodInfos->filename); + SetWindowTextW( fodInfos->DlgInfos.hwndFileName, fodInfos->filename ); } } @@ -1630,7 +1659,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) TRACE("Value in Filename includes path, overriding initdir: %s, %s\n", debugstr_w(fodInfos->filename), debugstr_w(fodInfos->initdir)); } - SetDlgItemTextW(hwnd, IDC_FILENAME, fodInfos->filename); + SetWindowTextW( fodInfos->DlgInfos.hwndFileName, fodInfos->filename ); } /* 4. Win2000+: Recently used */ @@ -1714,7 +1743,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) TRACE("No initial dir specified, using current dir of %s\n", debugstr_w(fodInfos->initdir)); } } - SetFocus(GetDlgItem(hwnd, IDC_FILENAME)); + SetFocus( fodInfos->DlgInfos.hwndFileName ); TRACE("After manipulation, file = %s, dir = %s\n", debugstr_w(fodInfos->filename), debugstr_w(fodInfos->initdir)); /* Must the open as read only check box be checked ?*/ @@ -1781,8 +1810,8 @@ static LRESULT FILEDLG95_ResizeControls(HWND hwnd, WPARAM wParam, LPARAM lParam) flags |= SWP_NOSIZE; SetRectEmpty(&rc); } - SetWindowPos(fodInfos->DlgInfos.hwndCustomDlg, HWND_BOTTOM, - 0, 0, rc.right, rc.bottom, flags); + SetWindowPos(fodInfos->DlgInfos.hwndCustomDlg, HWND_BOTTOM, + 0, 0, rc.right, rc.bottom, flags); } else { @@ -1910,7 +1939,8 @@ static LRESULT FILEDLG95_OnWMCommand(HWND hwnd, WPARAM wParam) FILEDLG95_SHELL_BrowseToDesktop(hwnd); break; - case IDC_FILENAME: + case edt1: + case cmb13: break; } @@ -2532,7 +2562,8 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) IShellView_Refresh(fodInfos->Shell.FOIShellView); } COMDLG32_SHFree(pidlCurrent); - SendMessageW(fodInfos->DlgInfos.hwndFileName, EM_SETSEL, 0, -1); + if (filename_is_edit( fodInfos )) + SendMessageW(fodInfos->DlgInfos.hwndFileName, EM_SETSEL, 0, -1); } } ret = FALSE; @@ -2550,12 +2581,12 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) /* Attach the file extension with file name*/ ext = PathFindExtensionW(lpstrPathAndFile); - if (! *ext) + if (! *ext && fodInfos->defext) { /* if no extension is specified with file name, then */ /* attach the extension from file filter or default one */ - const WCHAR *filterExt = NULL; + WCHAR *filterExt = NULL; LPWSTR lpstrFilter = NULL; static const WCHAR szwDot[] = {'.',0}; int PathLength = lstrlenW(lpstrPathAndFile); @@ -2565,36 +2596,62 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) fodInfos->ofnInfos->nFilterIndex-1); if (lpstrFilter != (LPWSTR)CB_ERR) /* control is not empty */ - filterExt = PathFindExtensionW(lpstrFilter); + { + WCHAR* filterSearchIndex; + filterExt = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(lpstrFilter) + 1) * sizeof(WCHAR)); + strcpyW(filterExt, lpstrFilter); - if ( filterExt && *filterExt ) /* attach the file extension from file type filter*/ - filterExt = filterExt + 1; - else if ( fodInfos->defext ) /* attach the default file extension*/ - filterExt = fodInfos->defext; + /* if a semicolon-separated list of file extensions was given, do not include the + semicolon or anything after it in the extension. + example: if filterExt was "*.abc;*.def", it will become "*.abc" */ + filterSearchIndex = strchrW(filterExt, ';'); + if (filterSearchIndex) + { + filterSearchIndex[0] = '\0'; + } - /* If extension contains a glob, ignore it */ - if ( filterExt && !strchrW(filterExt, '*') && !strchrW(filterExt, '?') ) + /* strip the * or anything else from the extension, "*.abc" becomes "abc" */ + /* if the extension is invalid or contains a glob, ignore it */ + filterSearchIndex = PathFindExtensionW(filterExt); + if (*filterSearchIndex++ && !strchrW(filterSearchIndex, '*') && !strchrW(filterSearchIndex, '?')) + { + strcpyW(filterExt, filterSearchIndex); + } + else + { + HeapFree(GetProcessHeap(), 0, filterExt); + filterExt = NULL; + } + } + + if (!filterExt) + { + /* use the default file extension */ + filterExt = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(fodInfos->defext) + 1) * sizeof(WCHAR)); + strcpyW(filterExt, fodInfos->defext); + } + + if (*filterExt) /* ignore filterExt="" */ { /* Attach the dot*/ lstrcatW(lpstrPathAndFile, szwDot); /* Attach the extension */ - lstrcatW(lpstrPathAndFile, filterExt ); + lstrcatW(lpstrPathAndFile, filterExt); } + HeapFree(GetProcessHeap(), 0, filterExt); + /* In Open dialog: if file does not exist try without extension */ if (!(fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG) && !PathFileExistsW(lpstrPathAndFile)) lpstrPathAndFile[PathLength] = '\0'; - } - if (fodInfos->defext) /* add default extension */ - { - /* Set/clear the output OFN_EXTENSIONDIFFERENT flag */ - if (*ext) - ext++; - if (!lstrcmpiW(fodInfos->defext, ext)) - fodInfos->ofnInfos->Flags &= ~OFN_EXTENSIONDIFFERENT; - else - fodInfos->ofnInfos->Flags |= OFN_EXTENSIONDIFFERENT; + /* Set/clear the output OFN_EXTENSIONDIFFERENT flag */ + if (*ext) + ext++; + if (!lstrcmpiW(fodInfos->defext, ext)) + fodInfos->ofnInfos->Flags &= ~OFN_EXTENSIONDIFFERENT; + else + fodInfos->ofnInfos->Flags |= OFN_EXTENSIONDIFFERENT; } /* In Save dialog: check if the file already exists */ @@ -2675,16 +2732,20 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) } else { - LPSTR lpszTemp; - LPOPENFILENAMEA ofn = (LPOPENFILENAMEA)fodInfos->ofnInfos; + LPSTR lpszTemp; + CHAR tempFileA[MAX_PATH]; + + /* avoid using fodInfos->ofnInfos->lpstrFile since it can be NULL */ + WideCharToMultiByte(CP_ACP, 0, lpstrPathAndFile, -1, + tempFileA, sizeof(tempFileA), NULL, NULL); /* set filename offset */ - lpszTemp = PathFindFileNameA(ofn->lpstrFile); - fodInfos->ofnInfos->nFileOffset = (lpszTemp - ofn->lpstrFile); + lpszTemp = PathFindFileNameA(tempFileA); + fodInfos->ofnInfos->nFileOffset = (lpszTemp - tempFileA); /* set extension offset */ - lpszTemp = PathFindExtensionA(ofn->lpstrFile); - fodInfos->ofnInfos->nFileExtension = (*lpszTemp) ? (lpszTemp - ofn->lpstrFile) + 1 : 0; + lpszTemp = PathFindExtensionA(tempFileA); + fodInfos->ofnInfos->nFileExtension = (*lpszTemp) ? (lpszTemp - tempFileA) + 1 : 0; } /* set the lpstrFileTitle */ @@ -2737,7 +2798,8 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) if (fodInfos->ofnInfos->Flags & OFN_ALLOWMULTISELECT) size += 1; /* return needed size in first two bytes of lpstrFile */ - *(WORD *)fodInfos->ofnInfos->lpstrFile = size; + if(fodInfos->ofnInfos->lpstrFile) + *(WORD *)fodInfos->ofnInfos->lpstrFile = size; FILEDLG95_Clean(hwnd); ret = EndDialog(hwnd, FALSE); COMDLG32_SetCommDlgExtendedError(FNERR_BUFFERTOOSMALL); @@ -3125,7 +3187,8 @@ static void FILEDLG95_LOOKIN_Init(HWND hwndCombo) IShellFolder *psfRoot, *psfDrives; IEnumIDList *lpeRoot, *lpeDrives; LPITEMIDLIST pidlDrives, pidlTmp, pidlTmp1, pidlAbsTmp; - + HDC hdc; + TEXTMETRICW tm; LookInInfos *liInfos = MemAlloc(sizeof(LookInInfos)); TRACE("\n"); @@ -3134,10 +3197,15 @@ static void FILEDLG95_LOOKIN_Init(HWND hwndCombo) SetPropA(hwndCombo, LookInInfosStr, liInfos); + hdc = GetDC( hwndCombo ); + SelectObject( hdc, (HFONT)SendMessageW( hwndCombo, WM_GETFONT, 0, 0 )); + GetTextMetricsW( hdc, &tm ); + ReleaseDC( hwndCombo, hdc ); + /* set item height for both text field and listbox */ - CBSetItemHeight(hwndCombo,-1,GetSystemMetrics(SM_CYSMICON)); - CBSetItemHeight(hwndCombo,0,GetSystemMetrics(SM_CYSMICON)); - + CBSetItemHeight( hwndCombo, -1, max( tm.tmHeight, GetSystemMetrics(SM_CYSMICON) )); + CBSetItemHeight( hwndCombo, 0, max( tm.tmHeight, GetSystemMetrics(SM_CYSMICON) )); + /* Turn on the extended UI for the combo box like Windows does */ CBSetExtendedUI(hwndCombo, TRUE); @@ -3212,6 +3280,8 @@ static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct) TEXTMETRICW tm; LPSFOLDER tmpFolder; LookInInfos *liInfos = GetPropA(pDIStruct->hwndItem,LookInInfosStr); + UINT shgfi_flags = SHGFI_PIDL | SHGFI_OPENICON | SHGFI_SYSICONINDEX | SHGFI_DISPLAYNAME; + UINT icon_width, icon_height; TRACE("\n"); @@ -3223,25 +3293,24 @@ static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct) return 0; + icon_width = GetSystemMetrics(SM_CXICON); + icon_height = GetSystemMetrics(SM_CYICON); + if (pDIStruct->rcItem.bottom - pDIStruct->rcItem.top < icon_height) + { + icon_width = GetSystemMetrics(SM_CXSMICON); + icon_height = GetSystemMetrics(SM_CYSMICON); + shgfi_flags |= SHGFI_SMALLICON; + } + if(pDIStruct->itemID == liInfos->uSelectedItem) { ilItemImage = (HIMAGELIST) SHGetFileInfoW ((LPCWSTR) tmpFolder->pidlItem, - 0, - &sfi, - sizeof (sfi), - SHGFI_PIDL | SHGFI_SMALLICON | - SHGFI_OPENICON | SHGFI_SYSICONINDEX | - SHGFI_DISPLAYNAME ); + 0, &sfi, sizeof (sfi), shgfi_flags ); } else { ilItemImage = (HIMAGELIST) SHGetFileInfoW ((LPCWSTR) tmpFolder->pidlItem, - 0, - &sfi, - sizeof (sfi), - SHGFI_PIDL | SHGFI_SMALLICON | - SHGFI_SYSICONINDEX | - SHGFI_DISPLAYNAME); + 0, &sfi, sizeof (sfi), shgfi_flags ); } /* Is this item selected ? */ @@ -3263,11 +3332,7 @@ static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct) { iIndentation = 0; ilItemImage = (HIMAGELIST) SHGetFileInfoW ((LPCWSTR) tmpFolder->pidlItem, - 0, - &sfi, - sizeof (sfi), - SHGFI_PIDL | SHGFI_SMALLICON | SHGFI_OPENICON - | SHGFI_SYSICONINDEX | SHGFI_DISPLAYNAME ); + 0, &sfi, sizeof (sfi), shgfi_flags ); } else @@ -3277,17 +3342,17 @@ static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct) /* Draw text and icon */ /* Initialise the icon display area */ - rectIcon.left = pDIStruct->rcItem.left + ICONWIDTH/2 * iIndentation; - rectIcon.top = pDIStruct->rcItem.top; - rectIcon.right = rectIcon.left + ICONWIDTH; - rectIcon.bottom = pDIStruct->rcItem.bottom; + rectIcon.left = pDIStruct->rcItem.left + 1 + icon_width/2 * iIndentation; + rectIcon.top = (pDIStruct->rcItem.top + pDIStruct->rcItem.bottom - icon_height) / 2; + rectIcon.right = rectIcon.left + icon_width + XTEXTOFFSET; + rectIcon.bottom = (pDIStruct->rcItem.top + pDIStruct->rcItem.bottom + icon_height) / 2; /* Initialise the text display area */ GetTextMetricsW(pDIStruct->hDC, &tm); rectText.left = rectIcon.right; rectText.top = (pDIStruct->rcItem.top + pDIStruct->rcItem.bottom - tm.tmHeight) / 2; - rectText.right = pDIStruct->rcItem.right + XTEXTOFFSET; + rectText.right = pDIStruct->rcItem.right; rectText.bottom = (pDIStruct->rcItem.top + pDIStruct->rcItem.bottom + tm.tmHeight) / 2; @@ -3664,8 +3729,9 @@ void FILEDLG95_FILENAME_FillFromSelection (HWND hwnd) } SetWindowTextW( fodInfos->DlgInfos.hwndFileName, lpstrAllFile ); - /* Select the file name like Windows does */ - SendMessageW(fodInfos->DlgInfos.hwndFileName, EM_SETSEL, 0, -1); + /* Select the file name like Windows does */ + if (filename_is_edit( fodInfos )) + SendMessageW(fodInfos->DlgInfos.hwndFileName, EM_SETSEL, 0, -1); } HeapFree(GetProcessHeap(),0, lpstrAllFile ); } @@ -3716,10 +3782,10 @@ static int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, U TRACE("\n"); - /* get the filenames from the edit control */ - nStrLen = SendMessageW(fodInfos->DlgInfos.hwndFileName, WM_GETTEXTLENGTH, 0, 0); + /* get the filenames from the filename control */ + nStrLen = GetWindowTextLengthW( fodInfos->DlgInfos.hwndFileName ); lpstrEdit = MemAlloc( (nStrLen+1)*sizeof(WCHAR) ); - GetDlgItemTextW(hwnd, IDC_FILENAME, lpstrEdit, nStrLen+1); + GetWindowTextW( fodInfos->DlgInfos.hwndFileName, lpstrEdit, nStrLen+1); TRACE("nStrLen=%u str=%s\n", nStrLen, debugstr_w(lpstrEdit)); @@ -4000,186 +4066,16 @@ static void MemFree(void *mem) HeapFree(GetProcessHeap(),0,mem); } -/* - * Old-style (win3.1) dialogs */ - -/*********************************************************************** - * FD32_GetTemplate [internal] - * - * Get a template (or FALSE if failure) when 16 bits dialogs are used - * by a 32 bits application - * - */ -BOOL FD32_GetTemplate(PFD31_DATA lfs) +static inline BOOL valid_struct_size( DWORD size ) { - LPOPENFILENAMEW ofnW = lfs->ofnW; - LPOPENFILENAMEA ofnA = lfs->ofnA; - HANDLE hDlgTmpl; - - if (ofnW->Flags & OFN_ENABLETEMPLATEHANDLE) - { - if (!(lfs->template = LockResource( ofnW->hInstance ))) - { - COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE); - return FALSE; - } - } - else if (ofnW->Flags & OFN_ENABLETEMPLATE) - { - HRSRC hResInfo; - if (ofnA) - hResInfo = FindResourceA(ofnA->hInstance, - ofnA->lpTemplateName, - (LPSTR)RT_DIALOG); - else - hResInfo = FindResourceW(ofnW->hInstance, - ofnW->lpTemplateName, - (LPWSTR)RT_DIALOG); - if (!hResInfo) - { - COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE); - return FALSE; - } - if (!(hDlgTmpl = LoadResource(ofnW->hInstance, - hResInfo)) || - !(lfs->template = LockResource(hDlgTmpl))) - { - COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE); - return FALSE; - } - } else { /* get it from internal Wine resource */ - HRSRC hResInfo; - if (!(hResInfo = FindResourceA(COMDLG32_hInstance, - lfs->open? "OPEN_FILE":"SAVE_FILE", (LPSTR)RT_DIALOG))) - { - COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE); - return FALSE; - } - if (!(hDlgTmpl = LoadResource(COMDLG32_hInstance, hResInfo )) || - !(lfs->template = LockResource( hDlgTmpl ))) - { - COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE); - return FALSE; - } - } - return TRUE; + return (size == OPENFILENAME_SIZE_VERSION_400W) || + (size == sizeof( OPENFILENAMEW )); } - -/*********************************************************************** - * FD32_WMMeasureItem [internal] - */ -static LONG FD32_WMMeasureItem(LPARAM lParam) +static inline BOOL is_win16_looks(DWORD flags) { - LPMEASUREITEMSTRUCT lpmeasure; - - lpmeasure = (LPMEASUREITEMSTRUCT)lParam; - lpmeasure->itemHeight = FD31_GetFldrHeight(); - return TRUE; -} - - -/*********************************************************************** - * FileOpenDlgProc [internal] - * Used for open and save, in fact. - */ -static INT_PTR CALLBACK FD32_FileOpenDlgProc(HWND hWnd, UINT wMsg, - WPARAM wParam, LPARAM lParam) -{ - PFD31_DATA lfs = (PFD31_DATA)GetPropA(hWnd,FD31_OFN_PROP); - - TRACE("msg=%x wparam=%lx lParam=%lx\n", wMsg, wParam, lParam); - if ((wMsg != WM_INITDIALOG) && lfs && lfs->hook) - { - INT_PTR lRet; - lRet = (INT_PTR)FD31_CallWindowProc(lfs, wMsg, wParam, lParam); - if (lRet) - return lRet; /* else continue message processing */ - } - switch (wMsg) - { - case WM_INITDIALOG: - return FD31_WMInitDialog(hWnd, wParam, lParam); - - case WM_MEASUREITEM: - return FD32_WMMeasureItem(lParam); - - case WM_DRAWITEM: - return FD31_WMDrawItem(hWnd, wParam, lParam, !lfs->open, (DRAWITEMSTRUCT *)lParam); - - case WM_COMMAND: - return FD31_WMCommand(hWnd, lParam, HIWORD(wParam), LOWORD(wParam), lfs); -#if 0 - case WM_CTLCOLOR: - SetBkColor((HDC16)wParam, 0x00C0C0C0); - switch (HIWORD(lParam)) - { - case CTLCOLOR_BTN: - SetTextColor((HDC16)wParam, 0x00000000); - return hGRAYBrush; - case CTLCOLOR_STATIC: - SetTextColor((HDC16)wParam, 0x00000000); - return hGRAYBrush; - } - break; -#endif - } - return FALSE; -} - - -/*********************************************************************** - * GetFileName31A [internal] - * - * Creates a win31 style dialog box for the user to select a file to open/save. - */ -static BOOL GetFileName31A(LPOPENFILENAMEA lpofn, /* address of structure with data*/ - UINT dlgType /* type dialogue : open/save */ - ) -{ - BOOL bRet = FALSE; - PFD31_DATA lfs; - - if (!lpofn || !FD31_Init()) return FALSE; - - TRACE("ofn flags %08x\n", lpofn->Flags); - lfs = FD31_AllocPrivate((LPARAM) lpofn, dlgType, FALSE); - if (lfs) - { - bRet = DialogBoxIndirectParamA( COMDLG32_hInstance, lfs->template, lpofn->hwndOwner, - FD32_FileOpenDlgProc, (LPARAM)lfs); - FD31_DestroyPrivate(lfs); - } - - TRACE("return lpstrFile='%s' !\n", lpofn->lpstrFile); - return bRet; -} - -/*********************************************************************** - * GetFileName31W [internal] - * - * Creates a win31 style dialog box for the user to select a file to open/save - */ -static BOOL GetFileName31W(LPOPENFILENAMEW lpofn, /* address of structure with data*/ - UINT dlgType /* type dialogue : open/save */ - ) -{ - BOOL bRet = FALSE; - PFD31_DATA lfs; - - if (!lpofn || !FD31_Init()) return FALSE; - - lfs = FD31_AllocPrivate((LPARAM) lpofn, dlgType, TRUE); - if (lfs) - { - bRet = DialogBoxIndirectParamW( COMDLG32_hInstance, lfs->template, lpofn->hwndOwner, - FD32_FileOpenDlgProc, (LPARAM)lfs); - FD31_DestroyPrivate(lfs); - } - - TRACE("file %s, file offset %d, ext offset %d\n", - debugstr_w(lpofn->lpstrFile), lpofn->nFileOffset, lpofn->nFileExtension); - return bRet; + return (flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE) && + !(flags & OFN_EXPLORER)); } /* ------------------ APIs ---------------------- */ @@ -4197,18 +4093,19 @@ static BOOL GetFileName31W(LPOPENFILENAMEW lpofn, /* address of structure with d BOOL WINAPI GetOpenFileNameA( LPOPENFILENAMEA ofn) /* [in/out] address of init structure */ { - BOOL win16look = FALSE; - TRACE("flags %08x\n", ofn->Flags); + if (!valid_struct_size( ofn->lStructSize )) + { + COMDLG32_SetCommDlgExtendedError( CDERR_STRUCTSIZE ); + return FALSE; + } + /* OFN_FILEMUSTEXIST implies OFN_PATHMUSTEXIST */ if (ofn->Flags & OFN_FILEMUSTEXIST) ofn->Flags |= OFN_PATHMUSTEXIST; - if (ofn->Flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE)) - win16look = (ofn->Flags & OFN_EXPLORER) ? FALSE : TRUE; - - if (win16look) + if (is_win16_looks(ofn->Flags)) return GetFileName31A(ofn, OPEN_DIALOG); else return GetFileDialog95A(ofn, OPEN_DIALOG); @@ -4227,18 +4124,19 @@ BOOL WINAPI GetOpenFileNameA( BOOL WINAPI GetOpenFileNameW( LPOPENFILENAMEW ofn) /* [in/out] address of init structure */ { - BOOL win16look = FALSE; - TRACE("flags %08x\n", ofn->Flags); + if (!valid_struct_size( ofn->lStructSize )) + { + COMDLG32_SetCommDlgExtendedError( CDERR_STRUCTSIZE ); + return FALSE; + } + /* OFN_FILEMUSTEXIST implies OFN_PATHMUSTEXIST */ if (ofn->Flags & OFN_FILEMUSTEXIST) ofn->Flags |= OFN_PATHMUSTEXIST; - if (ofn->Flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE)) - win16look = (ofn->Flags & OFN_EXPLORER) ? FALSE : TRUE; - - if (win16look) + if (is_win16_looks(ofn->Flags)) return GetFileName31W(ofn, OPEN_DIALOG); else return GetFileDialog95W(ofn, OPEN_DIALOG); @@ -4258,12 +4156,13 @@ BOOL WINAPI GetOpenFileNameW( BOOL WINAPI GetSaveFileNameA( LPOPENFILENAMEA ofn) /* [in/out] address of init structure */ { - BOOL win16look = FALSE; + if (!valid_struct_size( ofn->lStructSize )) + { + COMDLG32_SetCommDlgExtendedError( CDERR_STRUCTSIZE ); + return FALSE; + } - if (ofn->Flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE)) - win16look = (ofn->Flags & OFN_EXPLORER) ? FALSE : TRUE; - - if (win16look) + if (is_win16_looks(ofn->Flags)) return GetFileName31A(ofn, SAVE_DIALOG); else return GetFileDialog95A(ofn, SAVE_DIALOG); @@ -4282,12 +4181,13 @@ BOOL WINAPI GetSaveFileNameA( BOOL WINAPI GetSaveFileNameW( LPOPENFILENAMEW ofn) /* [in/out] address of init structure */ { - BOOL win16look = FALSE; + if (!valid_struct_size( ofn->lStructSize )) + { + COMDLG32_SetCommDlgExtendedError( CDERR_STRUCTSIZE ); + return FALSE; + } - if (ofn->Flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE)) - win16look = (ofn->Flags & OFN_EXPLORER) ? FALSE : TRUE; - - if (win16look) + if (is_win16_looks(ofn->Flags)) return GetFileName31W(ofn, SAVE_DIALOG); else return GetFileDialog95W(ofn, SAVE_DIALOG); diff --git a/reactos/dll/win32/comdlg32/filedlg31.c b/reactos/dll/win32/comdlg32/filedlg31.c index 302a432ba1d..6795bca4a8c 100644 --- a/reactos/dll/win32/comdlg32/filedlg31.c +++ b/reactos/dll/win32/comdlg32/filedlg31.c @@ -1,5 +1,5 @@ /* - * COMMDLG - File Dialogs + * Win 3.1 Style File Dialogs * * Copyright 1994 Martin Ayotte * Copyright 1996 Albrecht Kleine @@ -18,10 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - //#include //#include #include @@ -38,11 +34,11 @@ #include #include #include +//#include "cderr.h" WINE_DEFAULT_DEBUG_CHANNEL(commdlg); #include "cdlg.h" -#include "filedlg31.h" #define BUFFILE 512 #define BUFFILEALLOC 512 * sizeof(WCHAR) @@ -60,10 +56,26 @@ static HICON hHDisk = 0; static HICON hCDRom = 0; static HICON hNet = 0; +#define FD31_OFN_PROP "FILEDLG_OFN" + +typedef struct tagFD31_DATA +{ + HWND hwnd; /* file dialog window handle */ + BOOL hook; /* TRUE if the dialog is hooked */ + UINT lbselchstring; /* registered message id */ + UINT fileokstring; /* registered message id */ + LPARAM lParam; /* save original lparam */ + LPCVOID template; /* template for 32 bits resource */ + BOOL open; /* TRUE if open dialog, FALSE if save dialog */ + LPOPENFILENAMEW ofnW; /* pointer either to the original structure or + a W copy for A/16 API */ + LPOPENFILENAMEA ofnA; /* original structure if 32bits ansi dialog */ +} FD31_DATA, *PFD31_DATA; + /*********************************************************************** * FD31_Init [internal] */ -BOOL FD31_Init(void) +static BOOL FD31_Init(void) { static BOOL initialized = 0; @@ -110,8 +122,7 @@ static void FD31_StripEditControl(HWND hwnd) * * Call the appropriate hook */ -BOOL FD31_CallWindowProc(const FD31_DATA *lfs, UINT wMsg, WPARAM wParam, - LPARAM lParam) +static BOOL FD31_CallWindowProc(const FD31_DATA *lfs, UINT wMsg, WPARAM wParam, LPARAM lParam) { BOOL ret; @@ -190,11 +201,11 @@ static BOOL FD31_ScanDir(const OPENFILENAMEW *ofn, HWND hWnd, LPCWSTR newPath) while (filter) { scptr = strchrW(filter, ';'); if (scptr) *scptr = 0; - while (*filter == ' ') filter++; + while (*filter == ' ') filter++; TRACE("Using file spec %s\n", debugstr_w(filter)); SendMessageW(hdlg, LB_DIR, 0, (LPARAM)filter); if (scptr) *scptr = ';'; - filter = (scptr) ? (scptr + 1) : 0; + filter = (scptr) ? (scptr + 1) : 0; } } @@ -211,8 +222,8 @@ static BOOL FD31_ScanDir(const OPENFILENAMEW *ofn, HWND hWnd, LPCWSTR newPath) /*********************************************************************** * FD31_WMDrawItem [internal] */ -LONG FD31_WMDrawItem(HWND hWnd, WPARAM wParam, LPARAM lParam, - int savedlg, const DRAWITEMSTRUCT *lpdis) +static LONG FD31_WMDrawItem(HWND hWnd, WPARAM wParam, LPARAM lParam, + int savedlg, const DRAWITEMSTRUCT *lpdis) { WCHAR *str; HICON hIcon; @@ -496,7 +507,7 @@ static LRESULT FD31_TestPath( const FD31_DATA *lfs, LPWSTR path ) TRACE("path=%s, tmpstr2=%s\n", debugstr_w(path), debugstr_w(tmpstr2)); SetDlgItemTextW( hWnd, edt1, tmpstr2 ); FD31_ScanDir(lfs->ofnW, hWnd, path); - return (lfs->ofnW->Flags & OFN_NOVALIDATE) ? TRUE : FALSE; + return (lfs->ofnW->Flags & OFN_NOVALIDATE) != 0; } /* no wildcards, we might have a directory or a filename */ @@ -545,8 +556,9 @@ static LRESULT FD31_Validate( const FD31_DATA *lfs, LPCWSTR path, UINT control, OPENFILENAMEW ofnsav; LPOPENFILENAMEW ofnW = lfs->ofnW; WCHAR filename[BUFFILE]; + int copied_size = min( ofnW->lStructSize, sizeof(ofnsav) ); - ofnsav = *ofnW; /* for later restoring */ + memcpy( &ofnsav, ofnW, copied_size ); /* for later restoring */ /* get current file name */ if (path) @@ -580,7 +592,7 @@ static LRESULT FD31_Validate( const FD31_DATA *lfs, LPCWSTR path, UINT control, 0, lfs->lParam ); if (lRet) { - *ofnW = ofnsav; /* restore old state */ + memcpy( ofnW, &ofnsav, copied_size ); /* restore old state */ return FALSE; } } @@ -645,8 +657,8 @@ static LRESULT FD31_FileTypeChange( const FD31_DATA *lfs ) /*********************************************************************** * FD31_WMCommand [internal] */ -LRESULT FD31_WMCommand(HWND hWnd, LPARAM lParam, UINT notification, - UINT control, const FD31_DATA *lfs ) +static LRESULT FD31_WMCommand( HWND hWnd, LPARAM lParam, UINT notification, + UINT control, const FD31_DATA *lfs ) { switch (control) { @@ -746,7 +758,6 @@ static void FD31_MapOfnStructA(const OPENFILENAMEA *ofnA, LPOPENFILENAMEW ofnW, { UNICODE_STRING usBuffer; - ofnW->lStructSize = sizeof(OPENFILENAMEW); ofnW->hwndOwner = ofnA->hwndOwner; ofnW->hInstance = ofnA->hInstance; if (ofnA->lpstrFilter) @@ -793,6 +804,12 @@ static void FD31_MapOfnStructA(const OPENFILENAMEA *ofnA, LPOPENFILENAMEW ofnW, else /* numbered resource */ ofnW->lpTemplateName = (LPCWSTR) ofnA->lpTemplateName; } + if (ofnW->lStructSize > OPENFILENAME_SIZE_VERSION_400W) + { + ofnW->pvReserved = ofnA->pvReserved; + ofnW->dwReserved = ofnA->dwReserved; + ofnW->FlagsEx = ofnA->FlagsEx; + } } @@ -816,7 +833,7 @@ static void FD31_FreeOfnW(OPENFILENAMEW *ofnW) * FD31_DestroyPrivate [internal] * destroys the private object */ -void FD31_DestroyPrivate(PFD31_DATA lfs) +static void FD31_DestroyPrivate(PFD31_DATA lfs) { HWND hwnd; if (!lfs) return; @@ -833,6 +850,64 @@ void FD31_DestroyPrivate(PFD31_DATA lfs) RemovePropA(hwnd, FD31_OFN_PROP); } +/*********************************************************************** + * FD31_GetTemplate [internal] + * + * Get a template (or FALSE if failure) when 16 bits dialogs are used + * by a 32 bits application + * + */ +static BOOL FD31_GetTemplate(PFD31_DATA lfs) +{ + LPOPENFILENAMEW ofnW = lfs->ofnW; + LPOPENFILENAMEA ofnA = lfs->ofnA; + HANDLE hDlgTmpl; + + if (ofnW->Flags & OFN_ENABLETEMPLATEHANDLE) + { + if (!(lfs->template = LockResource( ofnW->hInstance ))) + { + COMDLG32_SetCommDlgExtendedError( CDERR_LOADRESFAILURE ); + return FALSE; + } + } + else if (ofnW->Flags & OFN_ENABLETEMPLATE) + { + HRSRC hResInfo; + if (ofnA) + hResInfo = FindResourceA( ofnA->hInstance, ofnA->lpTemplateName, (LPSTR)RT_DIALOG ); + else + hResInfo = FindResourceW( ofnW->hInstance, ofnW->lpTemplateName, (LPWSTR)RT_DIALOG ); + if (!hResInfo) + { + COMDLG32_SetCommDlgExtendedError( CDERR_FINDRESFAILURE ); + return FALSE; + } + if (!(hDlgTmpl = LoadResource( ofnW->hInstance, hResInfo )) || + !(lfs->template = LockResource( hDlgTmpl ))) + { + COMDLG32_SetCommDlgExtendedError( CDERR_LOADRESFAILURE ); + return FALSE; + } + } + else /* get it from internal Wine resource */ + { + HRSRC hResInfo; + if (!(hResInfo = FindResourceA( COMDLG32_hInstance, lfs->open ? "OPEN_FILE" : "SAVE_FILE", (LPSTR)RT_DIALOG ))) + { + COMDLG32_SetCommDlgExtendedError( CDERR_FINDRESFAILURE ); + return FALSE; + } + if (!(hDlgTmpl = LoadResource( COMDLG32_hInstance, hResInfo )) || + !(lfs->template = LockResource( hDlgTmpl ))) + { + COMDLG32_SetCommDlgExtendedError( CDERR_LOADRESFAILURE ); + return FALSE; + } + } + return TRUE; +} + /************************************************************************ * FD31_AllocPrivate [internal] * allocate a private object to hold 32 bits Unicode @@ -841,7 +916,7 @@ void FD31_DestroyPrivate(PFD31_DATA lfs) * On entry : type = dialog procedure type (16,32A,32W) * dlgType = dialog type (open or save) */ -PFD31_DATA FD31_AllocPrivate(LPARAM lParam, UINT dlgType, BOOL IsUnicode) +static PFD31_DATA FD31_AllocPrivate(LPARAM lParam, UINT dlgType, BOOL IsUnicode) { PFD31_DATA lfs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(FD31_DATA)); @@ -865,11 +940,12 @@ PFD31_DATA FD31_AllocPrivate(LPARAM lParam, UINT dlgType, BOOL IsUnicode) if (lfs->ofnA->Flags & OFN_ENABLEHOOK) if (lfs->ofnA->lpfnHook) lfs->hook = TRUE; - lfs->ofnW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*lfs->ofnW)); + lfs->ofnW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, lfs->ofnA->lStructSize); + lfs->ofnW->lStructSize = lfs->ofnA->lStructSize; FD31_MapOfnStructA(lfs->ofnA, lfs->ofnW, lfs->open); } - if (! FD32_GetTemplate(lfs)) + if (! FD31_GetTemplate(lfs)) { FD31_DestroyPrivate(lfs); return NULL; @@ -883,8 +959,7 @@ PFD31_DATA FD31_AllocPrivate(LPARAM lParam, UINT dlgType, BOOL IsUnicode) /*********************************************************************** * FD31_WMInitDialog [internal] */ - -LONG FD31_WMInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam) +static LONG FD31_WMInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam) { int i, n; WCHAR tmpstr[BUFFILE]; @@ -1001,7 +1076,117 @@ LONG FD31_WMInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam) return TRUE; } -int FD31_GetFldrHeight(void) +static int FD31_GetFldrHeight(void) { return fldrHeight; } + +/*********************************************************************** + * FD31_WMMeasureItem [internal] + */ +static LONG FD31_WMMeasureItem(LPARAM lParam) +{ + LPMEASUREITEMSTRUCT lpmeasure; + + lpmeasure = (LPMEASUREITEMSTRUCT)lParam; + lpmeasure->itemHeight = FD31_GetFldrHeight(); + return TRUE; +} + + +/*********************************************************************** + * FileOpenDlgProc [internal] + * Used for open and save, in fact. + */ +static INT_PTR CALLBACK FD31_FileOpenDlgProc(HWND hWnd, UINT wMsg, + WPARAM wParam, LPARAM lParam) +{ + PFD31_DATA lfs = (PFD31_DATA)GetPropA( hWnd, FD31_OFN_PROP ); + + TRACE("msg=%x wparam=%lx lParam=%lx\n", wMsg, wParam, lParam); + if ((wMsg != WM_INITDIALOG) && lfs && lfs->hook) + { + INT_PTR lRet; + lRet = (INT_PTR)FD31_CallWindowProc( lfs, wMsg, wParam, lParam ); + if (lRet) return lRet; /* else continue message processing */ + } + switch (wMsg) + { + case WM_INITDIALOG: + return FD31_WMInitDialog( hWnd, wParam, lParam ); + + case WM_MEASUREITEM: + return FD31_WMMeasureItem( lParam ); + + case WM_DRAWITEM: + return FD31_WMDrawItem( hWnd, wParam, lParam, !lfs->open, (DRAWITEMSTRUCT *)lParam ); + + case WM_COMMAND: + return FD31_WMCommand( hWnd, lParam, HIWORD(wParam), LOWORD(wParam), lfs ); +#if 0 + case WM_CTLCOLOR: + SetBkColor( (HDC16)wParam, 0x00C0C0C0 ); + switch (HIWORD(lParam)) + { + case CTLCOLOR_BTN: + SetTextColor( (HDC16)wParam, 0x00000000 ); + return hGRAYBrush; + case CTLCOLOR_STATIC: + SetTextColor( (HDC16)wParam, 0x00000000 ); + return hGRAYBrush; + } + break; +#endif + } + return FALSE; +} + +/*********************************************************************** + * GetFileName31A [internal] + * + * Creates a win31 style dialog box for the user to select a file to open/save. + */ +BOOL GetFileName31A( OPENFILENAMEA *lpofn, UINT dlgType ) +{ + BOOL bRet = FALSE; + PFD31_DATA lfs; + + if (!lpofn || !FD31_Init()) return FALSE; + + TRACE("ofn flags %08x\n", lpofn->Flags); + lfs = FD31_AllocPrivate((LPARAM) lpofn, dlgType, FALSE); + if (lfs) + { + bRet = DialogBoxIndirectParamA( COMDLG32_hInstance, lfs->template, lpofn->hwndOwner, + FD31_FileOpenDlgProc, (LPARAM)lfs); + FD31_DestroyPrivate(lfs); + } + + TRACE("return lpstrFile='%s' !\n", lpofn->lpstrFile); + return bRet; +} + +/*********************************************************************** + * GetFileName31W [internal] + * + * Creates a win31 style dialog box for the user to select a file to open/save + */ +BOOL GetFileName31W( OPENFILENAMEW *lpofn, UINT dlgType ) +{ + BOOL bRet = FALSE; + PFD31_DATA lfs; + + if (!lpofn || !FD31_Init()) return FALSE; + + lfs = FD31_AllocPrivate((LPARAM) lpofn, dlgType, TRUE); + if (lfs) + { + bRet = DialogBoxIndirectParamW( COMDLG32_hInstance, lfs->template, lpofn->hwndOwner, + FD31_FileOpenDlgProc, (LPARAM)lfs); + FD31_DestroyPrivate(lfs); + } + + TRACE("file %s, file offset %d, ext offset %d\n", + debugstr_w(lpofn->lpstrFile), lpofn->nFileOffset, lpofn->nFileExtension); + return bRet; +} diff --git a/reactos/dll/win32/comdlg32/filedlg31.h b/reactos/dll/win32/comdlg32/filedlg31.h deleted file mode 100644 index 4c5ef9ec99e..00000000000 --- a/reactos/dll/win32/comdlg32/filedlg31.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Win3.1 style File Dialog interface (32 bit) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef _WINE_DLL_FILEDLG31_H -#define _WINE_DLL_FILEDLG31_H - -#define FD31_OFN_PROP "FILEDLG_OFN" - -typedef struct tagFD31_DATA -{ - HWND hwnd; /* file dialog window handle */ - BOOL hook; /* TRUE if the dialog is hooked */ - UINT lbselchstring; /* registered message id */ - UINT fileokstring; /* registered message id */ - LPARAM lParam; /* save original lparam */ - LPCVOID template; /* template for 32 bits resource */ - BOOL open; /* TRUE if open dialog, FALSE if save dialog */ - LPOPENFILENAMEW ofnW; /* pointer either to the original structure or - a W copy for A/16 API */ - LPOPENFILENAMEA ofnA; /* original structure if 32bits ansi dialog */ -} FD31_DATA, *PFD31_DATA; - -extern BOOL FD32_GetTemplate(PFD31_DATA lfs) DECLSPEC_HIDDEN; - -extern BOOL FD31_Init(void) DECLSPEC_HIDDEN; -extern PFD31_DATA FD31_AllocPrivate(LPARAM lParam, UINT dlgType, BOOL IsUnicode) DECLSPEC_HIDDEN; -extern void FD31_DestroyPrivate(PFD31_DATA lfs) DECLSPEC_HIDDEN; -extern BOOL FD31_CallWindowProc(const FD31_DATA *lfs, UINT wMsg, WPARAM wParam, - LPARAM lParam) DECLSPEC_HIDDEN; -extern LONG FD31_WMInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam) DECLSPEC_HIDDEN; -extern LONG FD31_WMDrawItem(HWND hWnd, WPARAM wParam, LPARAM lParam, - int savedlg, const DRAWITEMSTRUCT *lpdis) DECLSPEC_HIDDEN; -extern LRESULT FD31_WMCommand(HWND hWnd, LPARAM lParam, UINT notification, - UINT control, const FD31_DATA *lfs) DECLSPEC_HIDDEN; -extern int FD31_GetFldrHeight(void) DECLSPEC_HIDDEN; - -#endif /* _WINE_DLL_FILEDLG31_H */ diff --git a/reactos/dll/win32/comdlg32/filedlgbrowser.c b/reactos/dll/win32/comdlg32/filedlgbrowser.c index e7a4ed9b171..5aa7e0c080c 100644 --- a/reactos/dll/win32/comdlg32/filedlgbrowser.c +++ b/reactos/dll/win32/comdlg32/filedlgbrowser.c @@ -155,7 +155,7 @@ static void COMDLG32_UpdateCurrentDir(const FileOpenDlgInfos *fodInfos) /* copied from shell32 to avoid linking to it */ static BOOL COMDLG32_StrRetToStrNW (LPVOID dest, DWORD len, LPSTRRET src, LPCITEMIDLIST pidl) { - TRACE("dest=%p len=0x%x strret=%p pidl=%p stub\n",dest,len,src,pidl); + TRACE("dest=%p len=0x%x strret=%p pidl=%p\n", dest , len, src, pidl); switch (src->uType) { @@ -231,26 +231,22 @@ static HRESULT WINAPI IShellBrowserImpl_QueryInterface(IShellBrowser *iface, *ppvObj = NULL; - if(IsEqualIID(riid, &IID_IUnknown)) /*IUnknown*/ - { *ppvObj = This; - } - else if(IsEqualIID(riid, &IID_IOleWindow)) /*IOleWindow*/ - { *ppvObj = This; - } - - else if(IsEqualIID(riid, &IID_IShellBrowser)) /*IShellBrowser*/ - { *ppvObj = This; - } - - else if(IsEqualIID(riid, &IID_ICommDlgBrowser)) /*ICommDlgBrowser*/ + if(IsEqualIID(riid, &IID_IUnknown)) + *ppvObj = &This->IShellBrowser_iface; + else if(IsEqualIID(riid, &IID_IOleWindow)) + *ppvObj = &This->IShellBrowser_iface; + else if(IsEqualIID(riid, &IID_IShellBrowser)) + *ppvObj = &This->IShellBrowser_iface; + else if(IsEqualIID(riid, &IID_ICommDlgBrowser)) *ppvObj = &This->ICommDlgBrowser_iface; - else if(IsEqualIID(riid, &IID_IServiceProvider)) /* IServiceProvider */ + else if(IsEqualIID(riid, &IID_IServiceProvider)) *ppvObj = &This->IServiceProvider_iface; - if(*ppvObj) - { IUnknown_AddRef( (IShellBrowser*) *ppvObj); - return S_OK; + if(*ppvObj) { + IUnknown_AddRef((IUnknown*)*ppvObj); + return S_OK; } + FIXME("Unknown interface requested\n"); return E_NOINTERFACE; } @@ -461,6 +457,7 @@ static HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface, /* Set view window control id to 5002 */ SetWindowLongPtrW(hwndView, GWLP_ID, lst2); + SendMessageW( hwndView, WM_SETFONT, SendMessageW( GetParent(hwndView), WM_GETFONT, 0, 0 ), FALSE ); /* Select the new folder in the Look In combo box of the Open file dialog */ FILEDLG95_LOOKIN_SelectItem(fodInfos->DlgInfos.hwndLookInCB,fodInfos->ShellInfos.pidlAbsCurrent); diff --git a/reactos/dll/win32/comdlg32/finddlg.c b/reactos/dll/win32/comdlg32/finddlg.c index aedaee7311e..18cf3183404 100644 --- a/reactos/dll/win32/comdlg32/finddlg.c +++ b/reactos/dll/win32/comdlg32/finddlg.c @@ -20,19 +20,17 @@ */ #define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H #include //#include #include -//#include "winbase.h" +#include //#include "winnls.h" -#include #include +#include #include #include -//#include "dlgs.h" +#include #include WINE_DEFAULT_DEBUG_CHANNEL(commdlg); diff --git a/reactos/dll/win32/comdlg32/fontdlg.c b/reactos/dll/win32/comdlg32/fontdlg.c index 912ab2dda09..6fc78d95bd5 100644 --- a/reactos/dll/win32/comdlg32/fontdlg.c +++ b/reactos/dll/win32/comdlg32/fontdlg.c @@ -20,8 +20,6 @@ */ #define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H //#include //#include @@ -29,12 +27,12 @@ //#include //#include #include -//#include "winbase.h" +#include "winbase.h" //#include "winnls.h" #include #include #include -//#include "dlgs.h" +#include #include #include #include "cdlg.h" @@ -225,7 +223,7 @@ BOOL WINAPI ChooseFontW(LPCHOOSEFONTW lpChFont) if (TRACE_ON(commdlg)) _dump_cf_flags(lpChFont->Flags); - if (lpChFont->Flags & (CF_SELECTSCRIPT | CF_NOVERTFONTS )) + if (lpChFont->Flags & CF_SELECTSCRIPT) FIXME(": unimplemented flag (ignored)\n"); return DialogBoxIndirectParamW(COMDLG32_hInstance, template, @@ -278,7 +276,7 @@ BOOL WINAPI ChooseFontA(LPCHOOSEFONTA lpChFont) } if (TRACE_ON(commdlg)) _dump_cf_flags(lpChFont->Flags); - if (lpChFont->Flags & (CF_SELECTSCRIPT | CF_NOVERTFONTS )) + if (lpChFont->Flags & CF_SELECTSCRIPT) FIXME(": unimplemented flag (ignored)\n"); return DialogBoxIndirectParamA(COMDLG32_hInstance, template, @@ -329,6 +327,9 @@ static INT AddFontFamily(const ENUMLOGFONTEXW *lpElfex, const NEWTEXTMETRICEXW * if (lpcf->Flags & CF_TTONLY) if (!(nFontType & TRUETYPE_FONTTYPE)) return 1; + if (lpcf->Flags & CF_NOVERTFONTS) + if (lplf->lfFaceName[0] == '@') + return 1; if (e) e->added++; @@ -786,7 +787,7 @@ static LRESULT CFn_WMMeasureItem(HWND hDlg, LPARAM lParam) /* use MAX of bitmap height and tm.tmHeight .*/ hdc=GetDC(hDlg); if(!hdc) return 0; - hfontprev = SelectObject( hdc, GetStockObject( DEFAULT_GUI_FONT ) ); + hfontprev = SelectObject( hdc, (HFONT)SendMessageW( hDlg, WM_GETFONT, 0, 0 )); GetTextMetricsW(hdc, &tm); if( tm.tmHeight > lpmi->itemHeight) lpmi->itemHeight = tm.tmHeight; SelectObject(hdc, hfontprev); @@ -805,7 +806,7 @@ static LRESULT CFn_WMDrawItem(LPARAM lParam) COLORREF cr, oldText=0, oldBk=0; RECT rect; int nFontType; - int idx; + int cx, cy, idx; LPDRAWITEMSTRUCT lpdi = (LPDRAWITEMSTRUCT)lParam; if (lpdi->itemID == (UINT)-1) /* got no items */ @@ -834,9 +835,10 @@ static LRESULT CFn_WMDrawItem(LPARAM lParam) { case cmb1: /* TRACE(commdlg,"WM_Drawitem cmb1\n"); */ + ImageList_GetIconSize( himlTT, &cx, &cy); SendMessageW(lpdi->hwndItem, CB_GETLBTEXT, lpdi->itemID, (LPARAM)buffer); - TextOutW(lpdi->hDC, lpdi->rcItem.left + TTBITMAP_XSIZE + 10, + TextOutW(lpdi->hDC, lpdi->rcItem.left + cx + 4, lpdi->rcItem.top, buffer, lstrlenW(buffer)); nFontType = SendMessageW(lpdi->hwndItem, CB_GETITEMDATA, lpdi->itemID,0L); idx = -1; @@ -852,7 +854,7 @@ static LRESULT CFn_WMDrawItem(LPARAM lParam) idx = 1; /* picture: printer */ if( idx >= 0) ImageList_Draw( himlTT, idx, lpdi->hDC, lpdi->rcItem.left, - lpdi->rcItem.top, ILD_TRANSPARENT); + (lpdi->rcItem.top + lpdi->rcItem.bottom - cy) / 2, ILD_TRANSPARENT); break; case cmb2: case cmb3: @@ -1119,7 +1121,6 @@ static LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam, const CHOOSE { PAINTSTRUCT ps; HDC hdc; - HPEN hOrigPen; HFONT hOrigFont; LOGFONTW lf = *(lpcf->lpLogFont); @@ -1131,22 +1132,9 @@ static LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam, const CHOOSE ps.rcPaint.right, ps.rcPaint.bottom); /* Paint frame */ - MoveToEx( hdc, info.rcWindow.left, info.rcWindow.bottom, NULL ); - hOrigPen=SelectObject( hdc, CreatePen( PS_SOLID, 2, - GetSysColor( COLOR_3DSHADOW ) )); - LineTo( hdc, info.rcWindow.left, info.rcWindow.top ); - LineTo( hdc, info.rcWindow.right, info.rcWindow.top ); - DeleteObject(SelectObject( hdc, CreatePen( PS_SOLID, 2, - GetSysColor( COLOR_3DLIGHT ) ))); - LineTo( hdc, info.rcWindow.right, info.rcWindow.bottom ); - LineTo( hdc, info.rcWindow.left, info.rcWindow.bottom ); - DeleteObject(SelectObject( hdc, hOrigPen )); + DrawEdge( hdc, &info.rcWindow, EDGE_SUNKEN, BF_RECT|BF_ADJUST ); /* Draw the sample text itself */ - info.rcWindow.right--; - info.rcWindow.bottom--; - info.rcWindow.top++; - info.rcWindow.left++; hOrigFont = SelectObject( hdc, CreateFontIndirectW( &lf ) ); SetTextColor( hdc, lpcf->rgbColors ); @@ -1212,9 +1200,14 @@ static INT_PTR CALLBACK FormatCharDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, case WM_DESTROY: return CFn_WMDestroy(hDlg, lpcfw); case WM_CHOOSEFONT_GETLOGFONT: + { + LOGFONTA *logfont = (LOGFONTA *)lParam; TRACE("WM_CHOOSEFONT_GETLOGFONT lParam=%08lX\n", lParam); - FIXME("current logfont back to caller\n"); + memcpy( logfont, lpcfw->lpLogFont, FIELD_OFFSET( LOGFONTA, lfFaceName )); + WideCharToMultiByte( CP_ACP, 0, lpcfw->lpLogFont->lfFaceName, LF_FACESIZE, + logfont->lfFaceName, LF_FACESIZE, NULL, NULL ); break; + } case WM_PAINT: return CFn_WMPaint(hDlg, wParam, lParam, lpcfw); } @@ -1260,7 +1253,7 @@ static INT_PTR CALLBACK FormatCharDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, return TRUE; case WM_CHOOSEFONT_GETLOGFONT: TRACE("WM_CHOOSEFONT_GETLOGFONT lParam=%08lX\n", lParam); - FIXME("current logfont back to caller\n"); + memcpy( (LOGFONTW *)lParam, lpcf->lpLogFont, sizeof(LOGFONTW) ); break; case WM_PAINT: return CFn_WMPaint(hDlg, wParam, lParam, lpcf); diff --git a/reactos/dll/win32/comdlg32/itemdlg.c b/reactos/dll/win32/comdlg32/itemdlg.c index e843223d75a..72c3dfe2925 100644 --- a/reactos/dll/win32/comdlg32/itemdlg.c +++ b/reactos/dll/win32/comdlg32/itemdlg.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#if 0 // Win 7 +#ifndef __REACTOS__ /* Win 7 */ #include @@ -127,6 +127,8 @@ typedef struct FileDialogImpl { HWND cctrls_hwnd; struct list cctrls; UINT_PTR cctrl_next_dlgid; + + GUID client_guid; } FileDialogImpl; /************************************************************************** @@ -409,7 +411,7 @@ static HRESULT on_default_action(FileDialogImpl *This) IShellFolder *psf_parent, *psf_desktop; LPITEMIDLIST *pidla; LPITEMIDLIST current_folder; - LPWSTR fn_iter, files, tmp_files; + LPWSTR fn_iter, files = NULL, tmp_files; UINT file_count = 0, len, i; int open_action; HRESULT hr, ret = E_FAIL; @@ -419,6 +421,7 @@ static HRESULT on_default_action(FileDialogImpl *This) { UINT size_used; file_count = COMDLG32_SplitFileNames(tmp_files, len, &files, &size_used); + CoTaskMemFree(tmp_files); } if(!file_count) return E_FAIL; @@ -426,6 +429,7 @@ static HRESULT on_default_action(FileDialogImpl *This) if(FAILED(hr)) { ERR("Failed to get pidl for current directory.\n"); + HeapFree(GetProcessHeap(), 0, files); return hr; } @@ -508,7 +512,7 @@ static HRESULT on_default_action(FileDialogImpl *This) pidla[i] = COMDLG32_SHSimpleIDListFromPathAW(canon_filename); if(psf_parent && !(open_action == ONOPEN_BROWSE)) - IShellItem_Release(psf_parent); + IShellFolder_Release(psf_parent); fn_iter += (WCHAR)lstrlenW(fn_iter) + 1; } @@ -530,7 +534,7 @@ static HRESULT on_default_action(FileDialogImpl *This) if(FAILED(hr)) ERR("Failed to browse to directory: %08x\n", hr); - IShellItem_Release(psf_parent); + IShellFolder_Release(psf_parent); break; case ONOPEN_OPEN: @@ -1215,17 +1219,17 @@ static SIZE update_layout(FileDialogImpl *This) } /* The custom controls */ - customctrls_rc.left = dialog_rc.left + vspacing; - customctrls_rc.right = dialog_rc.right - vspacing; - customctrls_rc.bottom = filename_rc.top - hspacing; + customctrls_rc.left = dialog_rc.left + hspacing; + customctrls_rc.right = dialog_rc.right - hspacing; + customctrls_rc.bottom = filename_rc.top - vspacing; customctrls_rc.top = customctrls_rc.bottom - ctrl_container_resize(This, customctrls_rc.right - customctrls_rc.left); /* The ExplorerBrowser control. */ - ebrowser_rc.left = dialog_rc.left + vspacing; + ebrowser_rc.left = dialog_rc.left + hspacing; ebrowser_rc.top = toolbar_rc.bottom + vspacing; ebrowser_rc.right = dialog_rc.right - hspacing; - ebrowser_rc.bottom = customctrls_rc.top - hspacing; + ebrowser_rc.bottom = customctrls_rc.top - vspacing; /**** * Move everything to the right place. @@ -2032,8 +2036,9 @@ static HRESULT WINAPI IFileDialog2_fnClose(IFileDialog2 *iface, HRESULT hr) static HRESULT WINAPI IFileDialog2_fnSetClientGuid(IFileDialog2 *iface, REFGUID guid) { FileDialogImpl *This = impl_from_IFileDialog2(iface); - FIXME("stub - %p (%s)\n", This, debugstr_guid(guid)); - return E_NOTIMPL; + TRACE("%p (%s)\n", This, debugstr_guid(guid)); + This->client_guid = *guid; + return S_OK; } static HRESULT WINAPI IFileDialog2_fnClearClientData(IFileDialog2 *iface) @@ -2730,7 +2735,7 @@ static HRESULT WINAPI IServiceProvider_fnQueryService(IServiceProvider *iface, REFIID riid, void **ppv) { FileDialogImpl *This = impl_from_IServiceProvider(iface); - HRESULT hr = E_FAIL; + HRESULT hr = E_NOTIMPL; TRACE("%p (%s, %s, %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); *ppv = NULL; @@ -3043,6 +3048,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnAddMenu(IFileDialogCustomize *iface This->cctrl_def_height, &ctrl); if(SUCCEEDED(hr)) { + SendMessageW(ctrl->hwnd, TB_BUTTONSTRUCTSIZE, sizeof(tbb), 0); ctrl->type = IDLG_CCTRL_MENU; /* Add the actual button with a popup menu. */ @@ -3382,7 +3388,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnRemoveControlItem(IFileDialogCustom return E_FAIL; for(i = 0; i < count; i++) - if(SendMessageW(ctrl->hwnd, CB_GETITEMDATA, 0, 0) == dwIDItem) + if(SendMessageW(ctrl->hwnd, CB_GETITEMDATA, i, 0) == dwIDItem) { if(SendMessageW(ctrl->hwnd, CB_DELETESTRING, i, 0) == CB_ERR) return E_FAIL; @@ -3529,7 +3535,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnSetControlItemText(IFileDialogCusto LPCWSTR pszLabel) { FileDialogImpl *This = impl_from_IFileDialogCustomize(iface); - FIXME("stub - %p (%d, %d, %p)\n", This, dwIDCtl, dwIDItem, debugstr_w(pszLabel)); + FIXME("stub - %p (%d, %d, %s)\n", This, dwIDCtl, dwIDItem, debugstr_w(pszLabel)); return E_NOTIMPL; } @@ -3626,6 +3632,8 @@ static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **p fdimpl->default_ext = NULL; fdimpl->custom_cancelbutton = fdimpl->custom_filenamelabel = NULL; + fdimpl->client_guid = GUID_NULL; + /* FIXME: The default folder setting should be restored for the * application if it was previously set. */ SHGetDesktopFolder(&psf); @@ -3655,4 +3663,4 @@ HRESULT FileSaveDialog_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) return FileDialog_constructor(pUnkOuter, riid, ppv, ITEMDLG_TYPE_SAVE); } -#endif // Win 7 +#endif /* Win 7 */ diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Bg.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Bg.rc index aba07868967..66010ce0ed8 100644 --- a/reactos/dll/win32/comdlg32/lang/cdlg_Bg.rc +++ b/reactos/dll/win32/comdlg32/lang/cdlg_Bg.rc @@ -105,10 +105,10 @@ STRINGTABLE STRINGTABLE /* Font styles */ { - IDS_FONT_REGULAR "" - IDS_FONT_BOLD "" - IDS_FONT_ITALIC "" - IDS_FONT_BOLD_ITALIC "" + IDS_FONT_REGULAR "Regular" + IDS_FONT_BOLD "Bold" + IDS_FONT_ITALIC "Italic" + IDS_FONT_BOLD_ITALIC "Bold Italic" } STRINGTABLE /* Color names */ @@ -263,7 +263,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "Пример",grp2,98,72,120,36,WS_GROUP - CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "&Азбука:",stc7 ,98,114,40,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -278,29 +278,29 @@ FONT 8, "MS Shell Dlg" LTEXT "&Основни цветове:", stc1, 4, 4, 140, 10 LTEXT "&Потребителски цветове:", stc2, 4, 106, 140, 10 LTEXT "Цвят|&Плътен", stc3, 150, 151, 48, 10 - LTEXT "&Червено:", 726 /*1094*/,247,126,27,10 - EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Зелено:",727/*1095*/,247,140,27,10 - EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Синьо:",728 /*1096*/,247,154,27,10 - EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Тон:" ,723 /*1091*/,200,126,24,10 - EDITTEXT 703, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Наситеност:" ,724 /*1092*/,200,140,24,10 - EDITTEXT 704, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Осветеност:" ,725 /*1093*/,200,154,24,10 - EDITTEXT 705, 224,152,21,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 "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + LTEXT "&Червено:", IDC_COLOR_RL /*1094*/,247,126,27,10 + EDITTEXT IDC_COLOR_EDIT_R, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Зелено:", IDC_COLOR_GL/*1095*/,247,140,27,10 + EDITTEXT IDC_COLOR_EDIT_G, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Синьо:", IDC_COLOR_BL /*1096*/,247,154,27,10 + EDITTEXT IDC_COLOR_EDIT_B, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Тон:" , IDC_COLOR_HL /*1091*/,200,126,24,10 + EDITTEXT IDC_COLOR_EDIT_H, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Наситеност:", IDC_COLOR_SL /*1092*/,200,140,24,10 + EDITTEXT IDC_COLOR_EDIT_S, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Осветеност:", IDC_COLOR_LL /*1093*/,200,154,24,10 + EDITTEXT IDC_COLOR_EDIT_L, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + CONTROL "" , IDC_COLOR_PREDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 + CONTROL "" , IDC_COLOR_USRDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 + CONTROL "" , IDC_COLOR_GRAPH, "STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 + CONTROL "" , IDC_COLOR_LUMBAR, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 + CONTROL "" , IDC_COLOR_RESULT, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 DEFPUSHBUTTON "OK", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Отмени", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Помощ", pshHelp,100,166, 44, 14 - PUSHBUTTON "&Добави потребителски цвят", 712/*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Определи цветове >>", 719/*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Цвят|&Плътен",713,300,200,4,14 /* just a dummy */ + PUSHBUTTON "&Добави потребителски цвят", IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Определи цветове >>", IDC_COLOR_DEFINE /*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Цвят|&Плътен", IDC_COLOR_RES, 300,200,4,14 /* just a dummy */ } @@ -311,11 +311,11 @@ FONT 8, "MS Shell Dlg" { LTEXT "Търси &за:", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "&Само цели думи", chx1, 4, 26, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "&Чувствителен регистър", chx2, 4, 42, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Посока", grp1, 127, 26, 78, 28 - CONTROL "На&горе", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 35, 12 - CONTROL "На&долу", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 163, 38, 35, 12 + CHECKBOX "&Само цели думи", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Чувствителен регистър", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Посока", grp1, 147, 21, 58, 38 + CONTROL "На&горе", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 + CONTROL "На&долу", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 DEFPUSHBUTTON "&Намери следващ", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Отмени", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -460,6 +460,7 @@ FONT 8, "MS Shell Dlg" LTEXT "&Име на файл:",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63,110,150,150 LTEXT "&Тип файлове:",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Ca.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Ca.rc index 4453b5244db..945c5148428 100644 --- a/reactos/dll/win32/comdlg32/lang/cdlg_Ca.rc +++ b/reactos/dll/win32/comdlg32/lang/cdlg_Ca.rc @@ -263,7 +263,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "Exemple",grp2,98,72,120,36,WS_GROUP - CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt:",stc7 ,98,114,40,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -278,29 +278,29 @@ FONT 8, "MS Shell Dlg" LTEXT "Colors &Básics:", stc1, 4, 4, 140, 10 LTEXT "Colors &Personalitzats:", stc2, 4, 106, 140, 10 LTEXT "Color | Sòl&id", stc3, 150, 151, 48, 10 - LTEXT "Ver&mell:", 726 /*1094*/,247,126,27,10 - EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "Ver&d:",727/*1095*/,247,140,27,10 - EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Blau:",728 /*1096*/,247,154,27,10 - EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Ton.:" ,723 /*1091*/,200,126,24,10 - EDITTEXT 703, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Sat.:" ,724 /*1092*/,200,140,24,10 - EDITTEXT 704, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Llum.:" ,725 /*1093*/,200,154,24,10 - EDITTEXT 705, 224,152,21,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 "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + LTEXT "Ver&mell:", IDC_COLOR_RL /*1094*/,247,126,27,10 + EDITTEXT IDC_COLOR_EDIT_R, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "Ver&d:", IDC_COLOR_GL /*1095*/,247,140,27,10 + EDITTEXT IDC_COLOR_EDIT_G, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Blau:", IDC_COLOR_BL /*1096*/,247,154,27,10 + EDITTEXT IDC_COLOR_EDIT_B, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Ton.:" , IDC_COLOR_HL /*1091*/,200,126,24,10 + EDITTEXT IDC_COLOR_EDIT_H, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Sat.:", IDC_COLOR_SL /*1092*/,200,140,24,10 + EDITTEXT IDC_COLOR_EDIT_S, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Llum.:", IDC_COLOR_LL /*1093*/,200,154,24,10 + EDITTEXT IDC_COLOR_EDIT_L, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + CONTROL "" , IDC_COLOR_PREDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 + CONTROL "" , IDC_COLOR_USRDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 + CONTROL "" , IDC_COLOR_GRAPH, "STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 + CONTROL "" , IDC_COLOR_LUMBAR, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 + CONTROL "" , IDC_COLOR_RESULT, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 DEFPUSHBUTTON "D'acord", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancel·la", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Ajuda", pshHelp,100,166, 44, 14 - PUSHBUTTON "&Afegeix als Colors Personalitzats", 712/*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Defineix els Colors Personalitzats >>", 719/*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Color | Sòl&id",713,300,200,4,14 /* just a dummy */ + PUSHBUTTON "&Afegeix als Colors Personalitzats", IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Defineix els Colors Personalitzats >>", IDC_COLOR_DEFINE /*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Color | Sòl&id", IDC_COLOR_RES, 300,200,4,14 /* just a dummy */ } @@ -311,11 +311,11 @@ FONT 8, "MS Shell Dlg" { LTEXT "&Cerca Por:", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "Troba només paraules &completes", chx1, 4, 26, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "&Distingir majúscules de minúscules", chx2, 4, 42, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Direcció", grp1, 127, 26, 78, 28 - CONTROL "A&munt", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 35, 12 - CONTROL "A &Baix", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 163, 38, 35, 12 + CHECKBOX "Troba només paraules &completes", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Distingir majúscules de minúscules", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Direcció", grp1, 147, 21, 58, 38 + CONTROL "A&munt", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 + CONTROL "A &Baix", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 DEFPUSHBUTTON "&Continuació", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Cancel·la", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -460,6 +460,7 @@ FONT 8, "MS Shell Dlg" LTEXT "&Nom de fitxer:",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63,110,150,150 LTEXT "Fitxers de &tipus:",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Cs.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Cs.rc index 2c5b45d8108..7e1fd0be332 100644 --- a/reactos/dll/win32/comdlg32/lang/cdlg_Cs.rc +++ b/reactos/dll/win32/comdlg32/lang/cdlg_Cs.rc @@ -67,7 +67,7 @@ Zadejte prosím hodnotu mezi 1 a %d." PD32_OUT_OF_MEMORY "Dostupná paměť byla vyčerpána." PD32_GENERIC_ERROR "Vyskytla se chyba." PD32_DRIVER_UNKNOWN "Neznámý ovladač tiskárny." - PD32_NO_DEVICES "" + PD32_NO_DEVICES "Before you can perform printer-related tasks such as page setup or printing a document, you need to install a printer. Please install one and retry." PD32_DEFAULT_PRINTER "Výchozí tiskárna; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "Ve frontě je %d dokumentů" @@ -105,10 +105,10 @@ Zadejte prosím hodnotu mezi 1 a %d." STRINGTABLE /* Font styles */ { - IDS_FONT_REGULAR "" - IDS_FONT_BOLD "" - IDS_FONT_ITALIC "" - IDS_FONT_BOLD_ITALIC "" + IDS_FONT_REGULAR "Regular" + IDS_FONT_BOLD "Bold" + IDS_FONT_ITALIC "Italic" + IDS_FONT_BOLD_ITALIC "Bold Italic" } STRINGTABLE /* Color names */ @@ -263,7 +263,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "Ukázka",grp2,98,72,120,36,WS_GROUP - CTEXT "Příliš žluťoučký kůň úpěl ďábelské ódy",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Skr&ipt:",stc7 ,98,114,40,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -278,29 +278,29 @@ FONT 8, "MS Shell Dlg" LTEXT "&Základní barvy:", stc1, 4, 4, 140, 10 LTEXT "&Barvy na zakázku:", stc2, 4, 106, 140, 10 LTEXT "Barva|Spoj&itá", stc3, 150, 151, 48, 10 - LTEXT "Če&rvená:", 726 /*1094*/,247,126,27,10 - EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Zelená:",727/*1095*/,247,140,27,10 - EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Modrá:",728 /*1096*/,247,154,27,10 - EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Odstín:" ,723 /*1091*/,200,126,24,10 - EDITTEXT 703, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Sytost:" ,724 /*1092*/,200,140,24,10 - EDITTEXT 704, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Jas:" ,725 /*1093*/,200,154,24,10 - EDITTEXT 705, 224,152,21,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 "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + LTEXT "Če&rvená:", IDC_COLOR_RL /*1094*/,247,126,27,10 + EDITTEXT IDC_COLOR_EDIT_R, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Zelená:", IDC_COLOR_GL /*1095*/,247,140,27,10 + EDITTEXT IDC_COLOR_EDIT_G, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Modrá:", IDC_COLOR_BL /*1096*/,247,154,27,10 + EDITTEXT IDC_COLOR_EDIT_B, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Odstín:" , IDC_COLOR_HL /*1091*/,200,126,24,10 + EDITTEXT IDC_COLOR_EDIT_H, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Sytost:" , IDC_COLOR_SL /*1092*/,200,140,24,10 + EDITTEXT IDC_COLOR_EDIT_S, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Jas:" , IDC_COLOR_LL /*1093*/,200,154,24,10 + EDITTEXT IDC_COLOR_EDIT_L, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + CONTROL "" , IDC_COLOR_PREDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 + CONTROL "" , IDC_COLOR_USRDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 + CONTROL "" , IDC_COLOR_GRAPH, "STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 + CONTROL "" , IDC_COLOR_LUMBAR, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 + CONTROL "" , IDC_COLOR_RESULT, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 DEFPUSHBUTTON "OK", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Storno", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Nápověda", pshHelp,100,166, 44, 14 - PUSHBUTTON "&Přidat k vlastním barvám", 712/*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Definovat vlastní barvu >>", 719/*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Barva|Spoj&itá",713,300,200,4,14 /* just a dummy */ + PUSHBUTTON "&Přidat k vlastním barvám", IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Definovat vlastní barvu >>", IDC_COLOR_DEFINE /*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Barva|Spoj&itá", IDC_COLOR_RES,300,200,4,14 /* just a dummy */ } @@ -311,11 +311,11 @@ FONT 8, "MS Shell Dlg" { LTEXT "&Vyhledat:", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "Pouze &celá slova", chx1, 4, 26, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "&Rozlišovat velikost", chx2, 4, 42, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Směr", grp1, 127, 26, 78, 28 - CONTROL "Nahor&u", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 35, 12 - CONTROL "&Dolů", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 163, 38, 35, 12 + CHECKBOX "Pouze &celá slova", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Rozlišovat velikost", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Směr", grp1, 147, 21, 58, 38 + CONTROL "Nahor&u", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 + CONTROL "&Dolů", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 DEFPUSHBUTTON "Najít d&alší", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Storno", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -460,6 +460,7 @@ FONT 8, "MS Shell Dlg" LTEXT "&Název souboru:",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63,110,150,150 LTEXT "Soubory &typu:",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Da.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Da.rc index 5442c71a442..a8130576e8d 100644 --- a/reactos/dll/win32/comdlg32/lang/cdlg_Da.rc +++ b/reactos/dll/win32/comdlg32/lang/cdlg_Da.rc @@ -263,7 +263,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "Eksempel",grp2,98,72,120,36,WS_GROUP - CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt (translate):",stc7 ,98,114,40,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -278,29 +278,29 @@ FONT 8, "MS Shell Dlg" LTEXT "&Grundlæggende farver:", stc1, 4, 4, 140, 10 LTEXT "&Selvvalgte farver:", stc2, 4, 106, 140, 10 LTEXT "&Ensfarvet", stc3, 150, 151, 48, 10 - LTEXT "&Rød:", 726 /*1094*/,247,126,27,10 - EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Grøn:",727/*1095*/,247,140,27,10 - EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Blå:",728 /*1096*/,247,154,27,10 - EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Intensitet:" ,723 /*1091*/,200,126,24,10 - EDITTEXT 703, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Farvemætning:" ,724 /*1092*/,200,140,24,10 - EDITTEXT 704, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Lysstyrke:" ,725 /*1093*/,200,154,24,10 - EDITTEXT 705, 224,152,21,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 "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + LTEXT "&Rød:", IDC_COLOR_RL /*1094*/,247,126,27,10 + EDITTEXT IDC_COLOR_EDIT_R, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Grøn:", IDC_COLOR_GL /*1095*/,247,140,27,10 + EDITTEXT IDC_COLOR_EDIT_G, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Blå:", IDC_COLOR_BL /*1096*/,247,154,27,10 + EDITTEXT IDC_COLOR_EDIT_B, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Intensitet:" , IDC_COLOR_HL /*1091*/,200,126,24,10 + EDITTEXT IDC_COLOR_EDIT_H, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Farvemætning:", IDC_COLOR_SL /*1092*/,200,140,24,10 + EDITTEXT IDC_COLOR_EDIT_S, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Lysstyrke:", IDC_COLOR_LL /*1093*/,200,154,24,10 + EDITTEXT IDC_COLOR_EDIT_L, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + CONTROL "" , IDC_COLOR_PREDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 + CONTROL "" , IDC_COLOR_USRDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 + CONTROL "" , IDC_COLOR_GRAPH, "STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 + CONTROL "" , IDC_COLOR_LUMBAR, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 + CONTROL "" , IDC_COLOR_RESULT, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 DEFPUSHBUTTON "OK", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Annuller", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Hjælp", pshHelp,100,166, 44, 14 - PUSHBUTTON "&Tilføj til selvvalgte farver", 712/*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Definer selvvalgt farve >>", 719/*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Ensfarvet",713,300,200,4,14 /* just a dummy */ + PUSHBUTTON "&Tilføj til selvvalgte farver", IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Definer selvvalgt farve >>", IDC_COLOR_DEFINE /*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Ensfarvet", IDC_COLOR_RES ,300,200,4,14 /* just a dummy */ } @@ -311,11 +311,11 @@ FONT 8, "MS Shell Dlg" { LTEXT "&Find hvad:", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "&Kun hele ord", chx1, 4, 26, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Forskel på store/små &bogstaver", chx2, 4, 42, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Retning", grp1, 127, 26, 78, 28 - CONTROL "&Op", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 35, 12 - CONTROL "Ne&d", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 163, 38, 35, 12 + CHECKBOX "&Kun hele ord", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Forskel på store/små &bogstaver", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Retning", grp1, 147, 21, 58, 38 + CONTROL "&Op", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 + CONTROL "Ne&d", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 DEFPUSHBUTTON "&Find næste", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Annuller", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -460,6 +460,7 @@ FONT 8, "MS Shell Dlg" LTEXT "&Filnavn:",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63,110,150,150 LTEXT "Fil&type:",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_De.rc b/reactos/dll/win32/comdlg32/lang/cdlg_De.rc index a4ef45b2ed6..03242bd8af2 100644 --- a/reactos/dll/win32/comdlg32/lang/cdlg_De.rc +++ b/reactos/dll/win32/comdlg32/lang/cdlg_De.rc @@ -263,7 +263,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "Muster",grp2,98,72,120,36,WS_GROUP - CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Skr&ipt:",stc7 ,98,114,40,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -278,29 +278,29 @@ FONT 8, "MS Shell Dlg" LTEXT "Gr&undfarben:", stc1, 4, 4, 140, 10 LTEXT "Selbs&t definierte Farben:", stc2, 4, 106, 140, 10 LTEXT "Farbe | B&asis", stc3, 150, 151, 48, 10 - LTEXT "&Rot:", 726 /*1094*/,247,126,27,10 - EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Grün:",727/*1095*/,247,140,27,10 - EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Blau:",728 /*1096*/,247,154,27,10 - EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Farbe:" ,723 /*1091*/,200,126,24,10 - EDITTEXT 703, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Sätt:" ,724 /*1092*/,200,140,24,10 - EDITTEXT 704, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "H&ell:" ,725 /*1093*/,200,154,24,10 - EDITTEXT 705, 224,152,21,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 "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + LTEXT "&Rot:", IDC_COLOR_RL /*1094*/,247,126,27,10 + EDITTEXT IDC_COLOR_EDIT_R, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Grün:", IDC_COLOR_GL /*1095*/,247,140,27,10 + EDITTEXT IDC_COLOR_EDIT_G, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Blau:", IDC_COLOR_BL /*1096*/,247,154,27,10 + EDITTEXT IDC_COLOR_EDIT_B, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Farbe:" , IDC_COLOR_HL /*1091*/,200,126,24,10 + EDITTEXT IDC_COLOR_EDIT_H, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Sätt:", IDC_COLOR_SL /*1092*/,200,140,24,10 + EDITTEXT IDC_COLOR_EDIT_S, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "H&ell:", IDC_COLOR_LL /*1093*/,200,154,24,10 + EDITTEXT IDC_COLOR_EDIT_L, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + CONTROL "" , IDC_COLOR_PREDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 + CONTROL "" , IDC_COLOR_USRDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 + CONTROL "" , IDC_COLOR_GRAPH, "STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 + CONTROL "" , IDC_COLOR_LUMBAR, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 + CONTROL "" , IDC_COLOR_RESULT, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 DEFPUSHBUTTON "OK", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Abbrechen", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Hilfe", pshHelp,100,166, 44, 14 - PUSHBUTTON "Farbe hin&zufügen", 712/*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Farben &definieren >>", 719/*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Farbe | B&asis",713,300,200,4,14 /* just a dummy */ + PUSHBUTTON "Farbe hin&zufügen", IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Farben &definieren >>", IDC_COLOR_DEFINE /*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Farbe | B&asis", IDC_COLOR_RES, 300,200,4,14 /* just a dummy */ } @@ -311,11 +311,11 @@ FONT 8, "MS Shell Dlg" { LTEXT "S&uchen nach:", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "Nu&r ganzes Wort suchen", chx1, 4, 26, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Groß-/Klein&schreibung", chx2, 4, 42, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Suchrichtung", grp1, 127, 26, 78, 28 - CONTROL "&Oben", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 35, 12 - CONTROL "&Unten", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 163, 38, 35, 12 + CHECKBOX "Nu&r ganzes Wort suchen", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Groß-/Klein&schreibung", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Suchrichtung", grp1, 147, 21, 58, 38 + CONTROL "&Oben", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 + CONTROL "&Unten", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 DEFPUSHBUTTON "&Weitersuchen", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Abbrechen", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -460,6 +460,7 @@ FONT 8, "MS Shell Dlg" LTEXT "Datei&name:",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63,110,150,150 LTEXT "Datei&typen:",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_El.rc b/reactos/dll/win32/comdlg32/lang/cdlg_El.rc index 27a9cafd68d..5136c1ba946 100644 --- a/reactos/dll/win32/comdlg32/lang/cdlg_El.rc +++ b/reactos/dll/win32/comdlg32/lang/cdlg_El.rc @@ -45,7 +45,7 @@ STRINGTABLE IDS_NEWFOLDER "Δημιουργία νέου καταλόγου" IDS_LISTVIEW "Λίστα" IDS_REPORTVIEW "Λεπτομέρειες" - IDS_TODESKTOP "" + IDS_TODESKTOP "Browse to Desktop" } STRINGTABLE @@ -53,51 +53,54 @@ STRINGTABLE PD32_PRINT_TITLE "Εκτύπωση" PD32_VALUE_UREADABLE "Μη αναγνώσιμη εγγραφή" - PD32_INVALID_PAGE_RANGE "" - PD32_FROM_NOT_ABOVE_TO "" - PD32_MARGINS_OVERLAP "" - PD32_NR_OF_COPIES_EMPTY "" - PD32_TOO_LARGE_COPIES "" + PD32_INVALID_PAGE_RANGE "This value does not lie within the page range.\n\ +Please enter a value between %1!d! and %2!d!." + PD32_FROM_NOT_ABOVE_TO "The 'from' entry cannot exceed the 'to' entry." + PD32_MARGINS_OVERLAP "Margins overlap or fall outside Paper boundaries.\n\ +Please reenter margins." + PD32_NR_OF_COPIES_EMPTY "The 'Number of copies' field cannot be empty." + PD32_TOO_LARGE_COPIES "This large number of copies is not supported by your printer.\n\ +Please enter a value between 1 and %d." PD32_PRINT_ERROR "Προκλήθηκε σφάλμα εκτυπωτή." PD32_NO_DEFAULT_PRINTER "Δεν έχει οριστεί προεπιλεγμένος εκτυπωτής." PD32_CANT_FIND_PRINTER "Δεν ήταν δυνατή η εύρεση του εκτυπωτή." - PD32_OUT_OF_MEMORY "" + PD32_OUT_OF_MEMORY "Out of memory." PD32_GENERIC_ERROR "Προκλήθηκε σφάλμα." PD32_DRIVER_UNKNOWN "Άγνωστος οδηγός εκτυπωτή." - PD32_NO_DEVICES "" + PD32_NO_DEVICES "Before you can perform printer-related tasks such as page setup or printing a document, you need to install a printer. Please install one and retry." PD32_DEFAULT_PRINTER "Προεπιλεγμένος εκτυπωτής; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "Υπάρχουν %d έγγραφα στην ουρά" - PD32_MARGINS_IN_INCHES "" - PD32_MARGINS_IN_MILLIMETERS "" + PD32_MARGINS_IN_INCHES "Margins [inches]" + PD32_MARGINS_IN_MILLIMETERS "Margins [mm]" PD32_MILLIMETERS "mm" PD32_PRINTER_STATUS_READY "Έτοιμο" PD32_PRINTER_STATUS_PAUSED "Σταματημένος; " PD32_PRINTER_STATUS_ERROR "Σφάλμα; " - PD32_PRINTER_STATUS_PENDING_DELETION "" - PD32_PRINTER_STATUS_PAPER_JAM "" + PD32_PRINTER_STATUS_PENDING_DELETION "Pending deletion; " + PD32_PRINTER_STATUS_PAPER_JAM "Paper jam; " PD32_PRINTER_STATUS_PAPER_OUT "Τέλος χαρτιού; " - PD32_PRINTER_STATUS_MANUAL_FEED "" + PD32_PRINTER_STATUS_MANUAL_FEED "Feed paper manual; " PD32_PRINTER_STATUS_PAPER_PROBLEM "Πρόβλημα χαρτιού; " PD32_PRINTER_STATUS_OFFLINE "Εκτυπωτής αποσυνδεδεμένος; " - PD32_PRINTER_STATUS_IO_ACTIVE "" + PD32_PRINTER_STATUS_IO_ACTIVE "I/O Active; " PD32_PRINTER_STATUS_BUSY "Απασχολημένος; " PD32_PRINTER_STATUS_PRINTING "Γίνεται εκτύπωση; " - PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "" + PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "Output tray is full; " PD32_PRINTER_STATUS_NOT_AVAILABLE "ΜΗ διαθέσιμος; " PD32_PRINTER_STATUS_WAITING "Αναμονή; " - PD32_PRINTER_STATUS_PROCESSING "" + PD32_PRINTER_STATUS_PROCESSING "Processing; " PD32_PRINTER_STATUS_INITIALIZING "Εκκίνηση; " PD32_PRINTER_STATUS_WARMING_UP "Γίνεται προθέρμανση; " PD32_PRINTER_STATUS_TONER_LOW "Τόνερ χαμηλό; " PD32_PRINTER_STATUS_NO_TONER "Δεν υπάρχει τόνερ; " - PD32_PRINTER_STATUS_PAGE_PUNT "" - PD32_PRINTER_STATUS_USER_INTERVENTION "" - PD32_PRINTER_STATUS_OUT_OF_MEMORY "" - PD32_PRINTER_STATUS_DOOR_OPEN "" - PD32_PRINTER_STATUS_SERVER_UNKNOWN "" - PD32_PRINTER_STATUS_POWER_SAVE "" + PD32_PRINTER_STATUS_PAGE_PUNT "Page punt; " + PD32_PRINTER_STATUS_USER_INTERVENTION "Interrupted by user; " + PD32_PRINTER_STATUS_OUT_OF_MEMORY "Out of memory; " + PD32_PRINTER_STATUS_DOOR_OPEN "The printer door is open; " + PD32_PRINTER_STATUS_SERVER_UNKNOWN "Print server unknown; " + PD32_PRINTER_STATUS_POWER_SAVE "Power save mode; " } STRINGTABLE /* Font styles */ @@ -111,20 +114,20 @@ STRINGTABLE /* Font styles */ STRINGTABLE /* Color names */ { IDS_COLOR_BLACK "Μαύρο" - IDS_COLOR_MAROON "" + IDS_COLOR_MAROON "Maroon" IDS_COLOR_GREEN "Πράσινο" - IDS_COLOR_OLIVE "" - IDS_COLOR_NAVY "" + IDS_COLOR_OLIVE "Olive" + IDS_COLOR_NAVY "Navy" IDS_COLOR_PURPLE "Μωβ" - IDS_COLOR_TEAL "" + IDS_COLOR_TEAL "Teal" IDS_COLOR_GRAY "Γκρι" IDS_COLOR_SILVER "Ασημί" IDS_COLOR_RED "Κόκκινο" - IDS_COLOR_LIME "" + IDS_COLOR_LIME "Lime" IDS_COLOR_YELLOW "Κίτρινο" IDS_COLOR_BLUE "Μπλε" - IDS_COLOR_FUCHSIA "" - IDS_COLOR_AQUA "" + IDS_COLOR_FUCHSIA "Fuchsia" + IDS_COLOR_AQUA "Aqua" IDS_COLOR_WHITE "Άσπρο" } @@ -260,7 +263,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "Δείγμα",grp2,98,72,120,36,WS_GROUP - CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Σκρ&ιπτ:",stc7 ,98,114,40,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -276,28 +279,28 @@ FONT 8, "MS Shell Dlg" LTEXT "&Προσαρμοσμένα χρώματα:", stc2, 4, 106, 140, 10 LTEXT "Χρώμα | Sol&id", stc3, 150, 151, 48, 10 LTEXT "&Κόκκινο:", 726 /*1094*/,247,126,27,10 - EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Πράσινο:",727/*1095*/,247,140,27,10 - EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Μπλε:",728 /*1096*/,247,154,27,10 - EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Hue:" ,723 /*1091*/,200,126,24,10 - EDITTEXT 703, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Sat:" ,724 /*1092*/,200,140,24,10 - EDITTEXT 704, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Φωτεινότητα:" ,725 /*1093*/,200,154,24,10 - EDITTEXT 705, 224,152,21,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 "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + EDITTEXT IDC_COLOR_EDIT_R, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Πράσινο:", IDC_COLOR_GL /*1095*/,247,140,27,10 + EDITTEXT IDC_COLOR_EDIT_G, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Μπλε:", IDC_COLOR_BL /*1096*/,247,154,27,10 + EDITTEXT IDC_COLOR_EDIT_B, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Hue:" , IDC_COLOR_HL /*1091*/,200,126,24,10 + EDITTEXT IDC_COLOR_EDIT_H, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Sat:", IDC_COLOR_SL /*1092*/,200,140,24,10 + EDITTEXT IDC_COLOR_EDIT_S, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Φωτεινότητα:", IDC_COLOR_LL /*1093*/,200,154,24,10 + EDITTEXT IDC_COLOR_EDIT_L, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + CONTROL "" , IDC_COLOR_PREDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 + CONTROL "" , IDC_COLOR_USRDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 + CONTROL "" , IDC_COLOR_GRAPH, "STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 + CONTROL "" , IDC_COLOR_LUMBAR, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 + CONTROL "" , IDC_COLOR_RESULT, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 DEFPUSHBUTTON "OK", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Άκυρο", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Βοήθεια", pshHelp,100,166, 44, 14 - PUSHBUTTON "&Προσθήκη στα προσαρμοσμένα χρώματα", 712/*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Ορισμός προσαρμοσμένων χρωμάτων >>", 719/*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Χρώμα | Sol&id",713,300,200,4,14 /* just a dummy */ + PUSHBUTTON "&Προσθήκη στα προσαρμοσμένα χρώματα", IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Ορισμός προσαρμοσμένων χρωμάτων >>", IDC_COLOR_DEFINE /*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Χρώμα | Sol&id", IDC_COLOR_RES, 300,200,4,14 /* just a dummy */ } @@ -308,11 +311,11 @@ FONT 8, "MS Shell Dlg" { LTEXT "Εύ&ρεση του:", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "Ταίριασμα &Ολόκληρης Λέξης Μόνο", chx1, 4, 26, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Ταίριασμα &Κεφαλαίων", chx2, 4, 42, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Κατεύθυνση", grp1, 127, 26, 78, 28 - CONTROL "&Πάνω", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 35, 12 - CONTROL "&Κάτω", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 163, 38, 35, 12 + CHECKBOX "Ταίριασμα &Ολόκληρης Λέξης Μόνο", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Ταίριασμα &Κεφαλαίων", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Κατεύθυνση", grp1, 147, 21, 58, 38 + CONTROL "&Πάνω", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 + CONTROL "&Κάτω", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 DEFPUSHBUTTON "&Εύρεση Επόμενου", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Άκυρο", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -457,6 +460,7 @@ FONT 8, "MS Shell Dlg" LTEXT "Όνομα &αρχείου:",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63,110,150,150 LTEXT "Αρχεία του &τύπου:",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_En.rc b/reactos/dll/win32/comdlg32/lang/cdlg_En.rc index b97a12c0766..2d5e8a073c7 100644 --- a/reactos/dll/win32/comdlg32/lang/cdlg_En.rc +++ b/reactos/dll/win32/comdlg32/lang/cdlg_En.rc @@ -91,7 +91,7 @@ Please enter a value between 1 and %d." PD32_PRINTER_STATUS_NOT_AVAILABLE "Not available; " PD32_PRINTER_STATUS_WAITING "Waiting; " PD32_PRINTER_STATUS_PROCESSING "Processing; " - PD32_PRINTER_STATUS_INITIALIZING "Initialising; " + PD32_PRINTER_STATUS_INITIALIZING "Initializing; " PD32_PRINTER_STATUS_WARMING_UP "Warming up; " PD32_PRINTER_STATUS_TONER_LOW "Toner low; " PD32_PRINTER_STATUS_NO_TONER "No toner; " @@ -263,7 +263,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "Sample",grp2,98,72,120,36,WS_GROUP - CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt:",stc7 ,98,114,40,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -278,29 +278,29 @@ FONT 8, "MS Shell Dlg" LTEXT "&Basic Colors:", stc1, 4, 4, 140, 10 LTEXT "&Custom Colors:", stc2, 4, 106, 140, 10 LTEXT "Color | Sol&id", stc3, 150, 151, 48, 10 - LTEXT "&Red:", 726 /*1094*/,247,126,27,10 - EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Green:",727/*1095*/,247,140,27,10 - EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Blue:",728 /*1096*/,247,154,27,10 - EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Hue:" ,723 /*1091*/,200,126,24,10 - EDITTEXT 703, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Sat:" ,724 /*1092*/,200,140,24,10 - EDITTEXT 704, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Lum:" ,725 /*1093*/,200,154,24,10 - EDITTEXT 705, 224,152,21,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 "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + LTEXT "&Red:", IDC_COLOR_RL /*1094*/,247,126,27,10 + EDITTEXT IDC_COLOR_EDIT_R, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Green:", IDC_COLOR_GL /*1095*/,247,140,27,10 + EDITTEXT IDC_COLOR_EDIT_G, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Blue:", IDC_COLOR_BL /*1096*/,247,154,27,10 + EDITTEXT IDC_COLOR_EDIT_B, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Hue:" , IDC_COLOR_HL /*1091*/,200,126,24,10 + EDITTEXT IDC_COLOR_EDIT_H, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Sat:", IDC_COLOR_SL /*1092*/,200,140,24,10 + EDITTEXT IDC_COLOR_EDIT_S, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Lum:", IDC_COLOR_LL /*1093*/,200,154,24,10 + EDITTEXT IDC_COLOR_EDIT_L, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + CONTROL "" , IDC_COLOR_PREDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 + CONTROL "" , IDC_COLOR_USRDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 + CONTROL "" , IDC_COLOR_GRAPH, "STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 + CONTROL "" , IDC_COLOR_LUMBAR, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 + CONTROL "" , IDC_COLOR_RESULT, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 DEFPUSHBUTTON "OK", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Help", pshHelp,100,166, 44, 14 - PUSHBUTTON "&Add to Custom Colors", 712/*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Define Custom Colors >>", 719/*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Color | Sol&id",713,300,200,4,14 /* just a dummy */ + PUSHBUTTON "&Add to Custom Colors", IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Define Custom Colors >>", IDC_COLOR_DEFINE /*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Color | Sol&id", IDC_COLOR_RES, 300,200,4,14 /* just a dummy */ } @@ -311,11 +311,11 @@ FONT 8, "MS Shell Dlg" { LTEXT "Fi&nd What:", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "Match &Whole Word Only", chx1, 4, 26, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Match &Case", chx2, 4, 42, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Direction", grp1, 127, 26, 78, 28 - CONTROL "&Up", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 35, 12 - CONTROL "&Down", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 163, 38, 35, 12 + CHECKBOX "Match &Whole Word Only", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Match &Case", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Direction", grp1, 147, 21, 58, 38 + CONTROL "&Up", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 + CONTROL "&Down", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 DEFPUSHBUTTON "&Find Next", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Cancel", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -460,6 +460,7 @@ FONT 8, "MS Shell Dlg" LTEXT "File &name:",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63,110,150,150 LTEXT "Files of &type:",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Eo.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Eo.rc index 725e694d261..936759d91e4 100644 --- a/reactos/dll/win32/comdlg32/lang/cdlg_Eo.rc +++ b/reactos/dll/win32/comdlg32/lang/cdlg_Eo.rc @@ -34,7 +34,7 @@ STRINGTABLE Æu vi volas superskribi øin?" IDS_INVALID_FILENAME_TITLE "Nekorekta(j) tipo(j) en vojo" IDS_INVALID_FILENAME "La dosiernomo ne povas enhavi la jenajn tipojn:\n\ - / : < > |" + / : < > |" IDS_PATHNOTEXISTING "Vojo estas neekzistanta" IDS_FILENOTEXISTING "Dosiero estas neekzistanta" } @@ -105,10 +105,10 @@ Enigu valoron inter 1 kaj %d." STRINGTABLE /* Font styles */ { - IDS_FONT_REGULAR "" - IDS_FONT_BOLD "" - IDS_FONT_ITALIC "" - IDS_FONT_BOLD_ITALIC "" + IDS_FONT_REGULAR "Regular" + IDS_FONT_BOLD "Bold" + IDS_FONT_ITALIC "Italic" + IDS_FONT_BOLD_ITALIC "Bold Italic" } STRINGTABLE /* Color names */ @@ -263,7 +263,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "Ekzemplo",grp2,98,72,120,36,WS_GROUP - CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scri&pt:",stc7 ,98,114,40,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -278,29 +278,29 @@ FONT 8, "MS Shell Dlg" LTEXT "&Normala koloraro:", stc1, 4, 4, 140, 10 LTEXT "&Persona koloraro:", stc2, 4, 106, 140, 10 LTEXT "Sol&idkoloro", stc3, 150, 151, 48, 10 - LTEXT "&Ruøo", 726 /*1094*/,247,126,27,10 - EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Verdo",727/*1095*/,247,140,27,10 - EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Bluo",728 /*1096*/,247,154,27,10 - EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Farbo" ,723 /*1091*/,200,126,24,10 - EDITTEXT 703, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Saturo" ,724 /*1092*/,200,140,24,10 - EDITTEXT 704, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Helo" ,725 /*1093*/,200,154,24,10 - EDITTEXT 705, 224,152,21,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 "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + LTEXT "&Ruøo", IDC_COLOR_RL /*1094*/,247,126,27,10 + EDITTEXT IDC_COLOR_EDIT_R, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Verdo", IDC_COLOR_GL /*1095*/,247,140,27,10 + EDITTEXT IDC_COLOR_EDIT_G, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Bluo", IDC_COLOR_BL /*1096*/,247,154,27,10 + EDITTEXT IDC_COLOR_EDIT_B, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Farbo" , IDC_COLOR_HL /*1091*/,200,126,24,10 + EDITTEXT IDC_COLOR_EDIT_H, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Saturo", IDC_COLOR_SL /*1092*/,200,140,24,10 + EDITTEXT IDC_COLOR_EDIT_S, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Helo", IDC_COLOR_LL /*1093*/,200,154,24,10 + EDITTEXT IDC_COLOR_EDIT_L, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + CONTROL "" , IDC_COLOR_PREDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 + CONTROL "" , IDC_COLOR_USRDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 + CONTROL "" , IDC_COLOR_GRAPH, "STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 + CONTROL "" , IDC_COLOR_LUMBAR, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 + CONTROL "" , IDC_COLOR_RESULT, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 DEFPUSHBUTTON "Bone", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Rezigni", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Helpo", pshHelp,100,166, 44, 14 - PUSHBUTTON "&Aldonu al Koloraro", 712/*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Forv&iþu Koloraron >>", 719/*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Sol&idkoloro",713,300,200,4,14 /* just a dummy */ + PUSHBUTTON "&Aldonu al Koloraro", IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Forv&iþu Koloraron >>", IDC_COLOR_DEFINE /*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Sol&idkoloro", IDC_COLOR_RES, 300,200,4,14 /* just a dummy */ } @@ -311,11 +311,11 @@ FONT 8, "MS Shell Dlg" { LTEXT "&Seræu:", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "Nur tutan &vorton", chx1, 4, 26, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Atentu &Usklecon", chx2, 4, 42, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Direkto", grp1, 127, 26, 78, 28 - CONTROL "&Supre", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 35, 12 - CONTROL "&Sube", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 163, 38, 35, 12 + CHECKBOX "Nur tutan &vorton", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Atentu &Usklecon", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Direkto", grp1, 147, 21, 58, 38 + CONTROL "&Supre", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 + CONTROL "&Sube", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 DEFPUSHBUTTON "&Pluseræu", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Rezigni", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -460,6 +460,7 @@ FONT 8, "MS Shell Dlg" LTEXT "Dosier&nomo:",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63,110,150,150 LTEXT "Dosier&speco:",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Es.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Es.rc index d7d669eafbb..d36f65ed58a 100644 --- a/reactos/dll/win32/comdlg32/lang/cdlg_Es.rc +++ b/reactos/dll/win32/comdlg32/lang/cdlg_Es.rc @@ -95,7 +95,7 @@ Por favor, introduzca un valor entre 1 y %d." PD32_PRINTER_STATUS_WARMING_UP "Calentádonse; " PD32_PRINTER_STATUS_TONER_LOW "Tóner bajo; " PD32_PRINTER_STATUS_NO_TONER "Sin tóner; " - PD32_PRINTER_STATUS_PAGE_PUNT "" + PD32_PRINTER_STATUS_PAGE_PUNT "Page punt; " PD32_PRINTER_STATUS_USER_INTERVENTION "Interrumpida por el usuario; " PD32_PRINTER_STATUS_OUT_OF_MEMORY "Sin memoria; " PD32_PRINTER_STATUS_DOOR_OPEN "Puerta de la impresora abierta; " @@ -263,7 +263,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "Ejemplo",grp2,98,72,120,36,WS_GROUP - CTEXT "AaBbYyZzÑñ",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Codificación:",stc7 ,98,114,40,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -278,29 +278,29 @@ FONT 8, "MS Shell Dlg" LTEXT "Colores &básicos:", stc1, 4, 4, 140, 10 LTEXT "Colores person&alizados:", stc2, 4, 106, 140, 10 LTEXT "Color | Sól&ido", stc3, 150, 151, 48, 10 - LTEXT "&Rojo:", 726 /*1094*/,247,126,27,10 - EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Verde:",727/*1095*/,247,140,27,10 - EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "A&zul:",728 /*1096*/,247,154,27,10 - EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Tinte:" ,723 /*1091*/,200,126,24,10 - EDITTEXT 703, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Sat.:" ,724 /*1092*/,200,140,24,10 - EDITTEXT 704, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Lum.:" ,725 /*1093*/,200,154,24,10 - EDITTEXT 705, 224,152,21,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 "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + LTEXT "&Rojo:", IDC_COLOR_RL /*1094*/,247,126,27,10 + EDITTEXT IDC_COLOR_EDIT_R, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Verde:", IDC_COLOR_GL /*1095*/,247,140,27,10 + EDITTEXT IDC_COLOR_EDIT_G, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "A&zul:", IDC_COLOR_BL /*1096*/,247,154,27,10 + EDITTEXT IDC_COLOR_EDIT_B, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Tinte:" , IDC_COLOR_HL /*1091*/,200,126,24,10 + EDITTEXT IDC_COLOR_EDIT_H, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Sat.:", IDC_COLOR_SL /*1092*/,200,140,24,10 + EDITTEXT IDC_COLOR_EDIT_S, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Lum.:", IDC_COLOR_LL /*1093*/,200,154,24,10 + EDITTEXT IDC_COLOR_EDIT_L, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + CONTROL "" , IDC_COLOR_PREDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 + CONTROL "" , IDC_COLOR_USRDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 + CONTROL "" , IDC_COLOR_GRAPH, "STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 + CONTROL "" , IDC_COLOR_LUMBAR, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 + CONTROL "" , IDC_COLOR_RESULT, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 DEFPUSHBUTTON "Aceptar", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancelar", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Ayuda", pshHelp,100,166, 44, 14 - PUSHBUTTON "Añadir a &colores personalizados", 712/*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Definir colores personalizados >>", 719/*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Color | Sól&ido",713,300,200,4,14 /* just a dummy */ + PUSHBUTTON "Añadir a &colores personalizados", IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Definir colores personalizados >>", IDC_COLOR_DEFINE /*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Color | Sól&ido", IDC_COLOR_RES, 300,200,4,14 /* just a dummy */ } @@ -311,11 +311,11 @@ FONT 8, "MS Shell Dlg" { LTEXT "&Buscar:", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "Sólo palabra &entera", chx1, 4, 26, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "&Mayúsculas/minúsculas", chx2, 4, 42, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Dirección", grp1, 127, 26, 78, 28 - CONTROL "&Arriba", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 35, 12 - CONTROL "A&bajo", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 163, 38, 35, 12 + CHECKBOX "Sólo palabra &entera", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Mayúsculas/minúsculas", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Dirección", grp1, 147, 21, 58, 38 + CONTROL "&Arriba", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 + CONTROL "A&bajo", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 DEFPUSHBUTTON "Buscar &siguiente", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Cancelar", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -460,6 +460,7 @@ FONT 8, "MS Shell Dlg" LTEXT "Nombre de &archivo:",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63,110,150,150 LTEXT "Archivos de &tipo:",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Fi.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Fi.rc index 39fe2039778..17a67c58321 100644 --- a/reactos/dll/win32/comdlg32/lang/cdlg_Fi.rc +++ b/reactos/dll/win32/comdlg32/lang/cdlg_Fi.rc @@ -95,7 +95,7 @@ Valitse arvo väliltä 1 ja %d." PD32_PRINTER_STATUS_WARMING_UP "Lämmitetään; " PD32_PRINTER_STATUS_TONER_LOW "Väriaine vähissä; " PD32_PRINTER_STATUS_NO_TONER "Ei väriainetta; " - PD32_PRINTER_STATUS_PAGE_PUNT "" + PD32_PRINTER_STATUS_PAGE_PUNT "Page punt; " PD32_PRINTER_STATUS_USER_INTERVENTION "Käyttäjän keskeyttämä; " PD32_PRINTER_STATUS_OUT_OF_MEMORY "Muisti loppu; " PD32_PRINTER_STATUS_DOOR_OPEN "Tulostimen kansi on auki; " @@ -263,7 +263,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "Näyte",grp2,98,72,120,36,WS_GROUP - CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Merk&istö:",stc7 ,98,114,40,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -278,29 +278,29 @@ FONT 8, "MS Shell Dlg" LTEXT "Pe&rusvärit:", stc1, 4, 4, 140, 10 LTEXT "&Muokatut värit:", stc2, 4, 106, 140, 10 LTEXT "Väri|&Tasainen", stc3, 150, 151, 48, 10 - LTEXT "&Pun:", 726 /*1094*/,247,126,27,10 - EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Vihr:",727/*1095*/,247,140,27,10 - EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "Si&n:",728 /*1096*/,247,154,27,10 - EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Sävy:" ,723 /*1091*/,200,126,24,10 - EDITTEXT 703, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Kyll:" ,724 /*1092*/,200,140,24,10 - EDITTEXT 704, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "K&irkk:" ,725 /*1093*/,200,154,24,10 - EDITTEXT 705, 224,152,21,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 "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + LTEXT "&Pun:", IDC_COLOR_RL /*1094*/,247,126,27,10 + EDITTEXT IDC_COLOR_EDIT_R, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Vihr:", IDC_COLOR_GL /*1095*/,247,140,27,10 + EDITTEXT IDC_COLOR_EDIT_G, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "Si&n:", IDC_COLOR_BL /*1096*/,247,154,27,10 + EDITTEXT IDC_COLOR_EDIT_B, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Sävy:" , IDC_COLOR_HL /*1091*/,200,126,24,10 + EDITTEXT IDC_COLOR_EDIT_H, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Kyll:", IDC_COLOR_SL /*1092*/,200,140,24,10 + EDITTEXT IDC_COLOR_EDIT_S, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "K&irkk:", IDC_COLOR_LL /*1093*/,200,154,24,10 + EDITTEXT IDC_COLOR_EDIT_L, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + CONTROL "" , IDC_COLOR_PREDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 + CONTROL "" , IDC_COLOR_USRDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 + CONTROL "" , IDC_COLOR_GRAPH, "STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 + CONTROL "" , IDC_COLOR_LUMBAR, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 + CONTROL "" , IDC_COLOR_RESULT, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 DEFPUSHBUTTON "OK", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Peruuta", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Ohje", pshHelp,100,166, 44, 14 - PUSHBUTTON "&Lisää väri", 712/*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "M&äärittele väri >>", 719/*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Väri|&Tasainen",713,300,200,4,14 /* just a dummy */ + PUSHBUTTON "&Lisää väri", IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "M&äärittele väri >>", IDC_COLOR_DEFINE /*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Väri|&Tasainen", IDC_COLOR_RES, 300,200,4,14 /* just a dummy */ } @@ -311,11 +311,11 @@ FONT 8, "MS Shell Dlg" { LTEXT "&Etsittävä:", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "&Koko sana", chx1, 4, 26, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Kirjaink&oko", chx2, 4, 42, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Suunta", grp1, 127, 26, 78, 28 - CONTROL "&Ylös", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 35, 12 - CONTROL "&Alas", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 163, 38, 35, 12 + CHECKBOX "&Koko sana", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Kirjaink&oko", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Suunta", grp1, 147, 21, 58, 38 + CONTROL "&Ylös", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 + CONTROL "&Alas", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 DEFPUSHBUTTON "Etsi &seuraava", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Peruuta", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -460,6 +460,7 @@ FONT 8, "MS Shell Dlg" LTEXT "&Nimi:",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63,110,150,150 LTEXT "&Tyyppi:",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Fr.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Fr.rc index 3983c752f51..29242b4f142 100644 --- a/reactos/dll/win32/comdlg32/lang/cdlg_Fr.rc +++ b/reactos/dll/win32/comdlg32/lang/cdlg_Fr.rc @@ -263,7 +263,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "Aperçu",grp2,98,72,120,36,WS_GROUP - CTEXT "ÀàCcÇçEeÉéÈèÊêIiÏïÎîLlUuÙù12",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Sc&ript :",stc7 ,98,114,40,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -279,28 +279,28 @@ FONT 8, "MS Shell Dlg" LTEXT "Couleurs personnalisées :", stc2, 4, 106, 140, 10 LTEXT "Couleur | &Uni", stc3, 150, 151, 48, 10 LTEXT "&Rouge :", 726 /*1094*/,247,126,27,10 - EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Vert :",727/*1095*/,247,140,27,10 - EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "Bl&eu :",728 /*1096*/,247,154,27,10 - EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Teinte :" ,723 /*1091*/,200,126,24,10 - EDITTEXT 703, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Satur. :" ,724 /*1092*/,200,140,24,10 - EDITTEXT 704, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Lum. :" ,725 /*1093*/,200,154,24,10 - EDITTEXT 705, 224,152,21,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 "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + EDITTEXT IDC_COLOR_EDIT_R, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Vert :", IDC_COLOR_GL /*1095*/,247,140,27,10 + EDITTEXT IDC_COLOR_EDIT_G, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "Bl&eu :", IDC_COLOR_BL /*1096*/,247,154,27,10 + EDITTEXT IDC_COLOR_EDIT_B, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Teinte :" , IDC_COLOR_HL /*1091*/,200,126,24,10 + EDITTEXT IDC_COLOR_EDIT_H, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Satur. :", IDC_COLOR_SL /*1092*/,200,140,24,10 + EDITTEXT IDC_COLOR_EDIT_S, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Lum. :", IDC_COLOR_LL /*1093*/,200,154,24,10 + EDITTEXT IDC_COLOR_EDIT_L, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + CONTROL "" , IDC_COLOR_PREDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 + CONTROL "" , IDC_COLOR_USRDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 + CONTROL "" , IDC_COLOR_GRAPH, "STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 + CONTROL "" , IDC_COLOR_LUMBAR, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 + CONTROL "" , IDC_COLOR_RESULT, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 DEFPUSHBUTTON "OK", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Annuler", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Aide", pshHelp,100,166, 44, 14 - PUSHBUTTON "&Ajouter aux couleurs personnalisées", 712/*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Définir les couleurs personnalisées >>", 719/*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Couleur | &Uni",713,300,200,4,14 /* just a dummy */ + PUSHBUTTON "&Ajouter aux couleurs personnalisées", IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Définir les couleurs personnalisées >>", IDC_COLOR_DEFINE /*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Couleur | &Uni", IDC_COLOR_RES, 300,200,4,14 /* just a dummy */ } @@ -311,11 +311,11 @@ FONT 8, "MS Shell Dlg" { LTEXT "&Rechercher :", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "Mots &entiers seulement", chx1, 4, 26, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Respecter la &casse", chx2, 4, 42, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Direction", grp1, 127, 26, 78, 28 - CONTROL "&Haut", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 35, 12 - CONTROL "&Bas", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 163, 38, 35, 12 + CHECKBOX "Mots &entiers seulement", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Respecter la &casse", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Direction", grp1, 147, 21, 58, 38 + CONTROL "&Haut", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 + CONTROL "&Bas", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 DEFPUSHBUTTON "&Suivant", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Annuler", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -460,6 +460,7 @@ FONT 8, "MS Shell Dlg" LTEXT "&Nom du fichier :",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63,110,150,150 LTEXT "Fichiers du &type :",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_He.rc b/reactos/dll/win32/comdlg32/lang/cdlg_He.rc index e0b15dc54f5..a0f9f504668 100644 --- a/reactos/dll/win32/comdlg32/lang/cdlg_He.rc +++ b/reactos/dll/win32/comdlg32/lang/cdlg_He.rc @@ -263,7 +263,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "דוגמה",grp2,98,72,120,36,WS_GROUP - CTEXT "AaBbYyZzנסשת",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "&כתב:",stc7 ,98,114,40,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -278,29 +278,29 @@ FONT 8, "MS Shell Dlg" LTEXT "צבעים &בסיסיים:", stc1, 4, 4, 140, 10 LTEXT "צבעים &מותאמים אישית:", stc2, 4, 106, 140, 10 LTEXT "צבע | א&חיד", stc3, 150, 151, 48, 10 - LTEXT "&אדום:", 726 /*1094*/,247,126,27,10 - EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&ירוק:",727/*1095*/,247,140,27,10 - EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&כחול:",728 /*1096*/,247,154,27,10 - EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&גוון:" ,723 /*1091*/,200,126,24,10 - EDITTEXT 703, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&רוויה:" ,724 /*1092*/,200,140,24,10 - EDITTEXT 704, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "א&ור:" ,725 /*1093*/,200,154,24,10 - EDITTEXT 705, 224,152,21,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 "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + LTEXT "&אדום:", IDC_COLOR_RL /*1094*/,247,126,27,10 + EDITTEXT IDC_COLOR_EDIT_R, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&ירוק:", IDC_COLOR_GL /*1095*/,247,140,27,10 + EDITTEXT IDC_COLOR_EDIT_G, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&כחול:", IDC_COLOR_BL /*1096*/,247,154,27,10 + EDITTEXT IDC_COLOR_EDIT_B, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&גוון:" , IDC_COLOR_HL /*1091*/,200,126,24,10 + EDITTEXT IDC_COLOR_EDIT_H, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&רוויה:", IDC_COLOR_SL /*1092*/,200,140,24,10 + EDITTEXT IDC_COLOR_EDIT_S, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "א&ור:", IDC_COLOR_LL /*1093*/,200,154,24,10 + EDITTEXT IDC_COLOR_EDIT_L, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + CONTROL "" , IDC_COLOR_PREDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 + CONTROL "" , IDC_COLOR_USRDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 + CONTROL "" , IDC_COLOR_GRAPH, "STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 + CONTROL "" , IDC_COLOR_LUMBAR, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 + CONTROL "" , IDC_COLOR_RESULT, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 DEFPUSHBUTTON "אישור", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "ביטול", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "עזרה", pshHelp,100,166, 44, 14 - PUSHBUTTON "הו&ספה לצבעים המותאמים אישית", 712/*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "הגדרת צבעים &מותאמים אישית >>", 719/*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "צבע | א&חיד",713,300,200,4,14 /* just a dummy */ + PUSHBUTTON "הו&ספה לצבעים המותאמים אישית", IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "הגדרת צבעים &מותאמים אישית >>", IDC_COLOR_DEFINE /*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "צבע | א&חיד", IDC_COLOR_RES, 300,200,4,14 /* just a dummy */ } @@ -311,11 +311,11 @@ FONT 8, "MS Shell Dlg" { LTEXT "חיפוש &אחר מה:", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "התאמת מילים &שלמות בלבד", chx1, 4, 26, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "התאמת &רשיות", chx2, 4, 42, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "כיוון", grp1, 127, 26, 78, 28 - CONTROL "למ&עלה", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 35, 12 - CONTROL "למ&טה", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 163, 38, 35, 12 + CHECKBOX "התאמת מילים &שלמות בלבד", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "התאמת &רשיות", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "כיוון", grp1, 147, 21, 58, 38 + CONTROL "למ&עלה", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 + CONTROL "למ&טה", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 DEFPUSHBUTTON "חיפוש ה&בא", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "ביטול", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -460,6 +460,7 @@ FONT 8, "MS Shell Dlg" LTEXT "&שם הקובץ:",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63,110,150,150 LTEXT "קבצים מ&סוג:",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Hu.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Hu.rc index 91ac2a34024..b1401c40815 100644 --- a/reactos/dll/win32/comdlg32/lang/cdlg_Hu.rc +++ b/reactos/dll/win32/comdlg32/lang/cdlg_Hu.rc @@ -263,7 +263,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "Minta",grp2,98,72,120,36,WS_GROUP - CTEXT "AaBbYyZzÁáŐőÉé",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Szkr&ipt:",stc7 ,98,114,40,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -278,29 +278,29 @@ FONT 8, "MS Shell Dlg" LTEXT "&Alap színek:", stc1, 4, 4, 140, 10 LTEXT "&Egyedi színek:", stc2, 4, 106, 140, 10 LTEXT "Szín | &Tömör", stc3, 150, 151, 48, 10 - LTEXT "&Vörös:", 726 /*1094*/,247,126,27,10 - EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Zöld:",727/*1095*/,247,140,27,10 - EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Kék:",728 /*1096*/,247,154,27,10 - EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Hue:" ,723 /*1091*/,200,126,24,10 - EDITTEXT 703, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Sat:" ,724 /*1092*/,200,140,24,10 - EDITTEXT 704, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Lum:" ,725 /*1093*/,200,154,24,10 - EDITTEXT 705, 224,152,21,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 "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + LTEXT "&Vörös:", IDC_COLOR_RL /*1094*/,247,126,27,10 + EDITTEXT IDC_COLOR_EDIT_R, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Zöld:", IDC_COLOR_GL /*1095*/,247,140,27,10 + EDITTEXT IDC_COLOR_EDIT_G, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Kék:", IDC_COLOR_BL /*1096*/,247,154,27,10 + EDITTEXT IDC_COLOR_EDIT_B, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Hue:" , IDC_COLOR_HL /*1091*/,200,126,24,10 + EDITTEXT IDC_COLOR_EDIT_H, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Sat:", IDC_COLOR_SL /*1092*/,200,140,24,10 + EDITTEXT IDC_COLOR_EDIT_S, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Lum:", IDC_COLOR_LL /*1093*/,200,154,24,10 + EDITTEXT IDC_COLOR_EDIT_L, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + CONTROL "" , IDC_COLOR_PREDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 + CONTROL "" , IDC_COLOR_USRDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 + CONTROL "" , IDC_COLOR_GRAPH, "STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 + CONTROL "" , IDC_COLOR_LUMBAR, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 + CONTROL "" , IDC_COLOR_RESULT, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 DEFPUSHBUTTON "OK", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Mégse", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Súgó", pshHelp,100,166, 44, 14 - PUSHBUTTON "&Egyedi színekhez adás", 712/*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "E&gyedi szín definiálás >>", 719/*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Szín | &Tömör",713,300,200,4,14 /* just a dummy */ + PUSHBUTTON "&Egyedi színekhez adás", IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "E&gyedi szín definiálás >>", IDC_COLOR_DEFINE /*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Szín | &Tömör", IDC_COLOR_RES, 300,200,4,14 /* just a dummy */ } @@ -311,11 +311,11 @@ FONT 8, "MS Shell Dlg" { LTEXT "&Mit keressen:", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "Teljes &szavak keresése", chx1, 4, 26, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Kis/&nagybetű különb.", chx2, 4, 42, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Irány", grp1, 127, 26, 78, 28 - CONTROL "&Vissza", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 35, 12 - CONTROL "&Előre", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 163, 38, 35, 12 + CHECKBOX "Teljes &szavak keresése", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Kis/&nagybetű különb.", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Irány", grp1, 147, 21, 58, 38 + CONTROL "&Vissza", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 + CONTROL "&Előre", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 DEFPUSHBUTTON "&Következő", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Mégse", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -460,6 +460,7 @@ FONT 8, "MS Shell Dlg" LTEXT "Fájl&név:",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63,110,150,150 LTEXT "Fájl&típus:",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_It.rc b/reactos/dll/win32/comdlg32/lang/cdlg_It.rc index 995c12bf712..eb52c1619d1 100644 --- a/reactos/dll/win32/comdlg32/lang/cdlg_It.rc +++ b/reactos/dll/win32/comdlg32/lang/cdlg_It.rc @@ -263,7 +263,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "Esempio",grp2,98,72,120,36,WS_GROUP - CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Sc&ript:",stc7 ,98,114,40,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -278,29 +278,29 @@ FONT 8, "MS Shell Dlg" LTEXT "Colori di base:", stc1, 4, 4, 140, 10 LTEXT "&Colori personalizzati:", stc2, 4, 106, 140, 10 LTEXT "Colore | Sol&ido", stc3, 150, 151, 48, 10 - LTEXT "&Rosso:", 726 /*1094*/,247,126,27,10 - EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Verde:",727/*1095*/,247,140,27,10 - EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Blu:",728 /*1096*/,247,154,27,10 - EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Tinta:" ,723 /*1091*/,200,126,24,10 - EDITTEXT 703, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Sat:" ,724 /*1092*/,200,140,24,10 - EDITTEXT 704, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Lum:" ,725 /*1093*/,200,154,24,10 - EDITTEXT 705, 224,152,21,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 "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + LTEXT "&Rosso:", IDC_COLOR_RL /*1094*/,247,126,27,10 + EDITTEXT IDC_COLOR_EDIT_R, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Verde:", IDC_COLOR_GL /*1095*/,247,140,27,10 + EDITTEXT IDC_COLOR_EDIT_G, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Blu:", IDC_COLOR_BL /*1096*/,247,154,27,10 + EDITTEXT IDC_COLOR_EDIT_B, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Tinta:" , IDC_COLOR_HL /*1091*/,200,126,24,10 + EDITTEXT IDC_COLOR_EDIT_H, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Sat:", IDC_COLOR_SL /*1092*/,200,140,24,10 + EDITTEXT IDC_COLOR_EDIT_S, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Lum:", IDC_COLOR_LL /*1093*/,200,154,24,10 + EDITTEXT IDC_COLOR_EDIT_L, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + CONTROL "" , IDC_COLOR_PREDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 + CONTROL "" , IDC_COLOR_USRDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 + CONTROL "" , IDC_COLOR_GRAPH, "STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 + CONTROL "" , IDC_COLOR_LUMBAR, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 + CONTROL "" , IDC_COLOR_RESULT, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 DEFPUSHBUTTON "Ok", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Annulla", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Aiuto", pshHelp,100,166, 44, 14 - PUSHBUTTON "&Aggiungi ai colori personalizzati", 712/*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Definisci i colori personalizzati >>", 719/*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Colore | Sol&ido",713,300,200,4,14 /* just a dummy */ + PUSHBUTTON "&Aggiungi ai colori personalizzati", IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Definisci i colori personalizzati >>", IDC_COLOR_DEFINE /*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Colore | Sol&ido", IDC_COLOR_RES, 300,200,4,14 /* just a dummy */ } @@ -311,11 +311,11 @@ FONT 8, "MS Shell Dlg" { LTEXT "&Trova:", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "Solo parole &intere", chx1, 4, 26, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "&Maiuscole/Minuscole", chx2, 4, 42, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Direzione", grp1, 127, 26, 78, 28 - CONTROL "A<o", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 35, 12 - CONTROL "&Basso", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 163, 38, 35, 12 + CHECKBOX "Solo parole &intere", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Maiuscole/Minuscole", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Direzione", grp1, 147, 21, 58, 38 + CONTROL "A<o", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 + CONTROL "&Basso", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 DEFPUSHBUTTON "Trova &successivo", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Annulla", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -460,6 +460,7 @@ FONT 8, "MS Shell Dlg" LTEXT "&Nome del file:",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63,110,150,150 LTEXT "&Tipo del file:",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Ja.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Ja.rc index 726efb51ba6..8d4be1b4872 100644 --- a/reactos/dll/win32/comdlg32/lang/cdlg_Ja.rc +++ b/reactos/dll/win32/comdlg32/lang/cdlg_Ja.rc @@ -263,7 +263,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "サンプル",grp2,98,72,120,36,WS_GROUP - CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "文字セット(&I):",stc7 ,98,114,40,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -278,29 +278,29 @@ FONT 8, "MS Shell Dlg" LTEXT "基本色(&B):", stc1, 4, 4, 140, 10 LTEXT "作成した色(&C):", stc2, 4, 106, 140, 10 LTEXT "色 | 純色(&I)", stc3, 150, 151, 48, 10 - LTEXT "赤(&R):", 726 /*1094*/,247,126,27,10 - EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "緑(&G):",727/*1095*/,247,140,27,10 - EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "青(&B):",728 /*1096*/,247,154,27,10 - EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "色合い(&H):" ,723 /*1091*/,200,126,24,10 - EDITTEXT 703, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "鮮やかさ(&S):" ,724 /*1092*/,200,140,24,10 - EDITTEXT 704, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "明るさ(&L):" ,725 /*1093*/,200,154,24,10 - EDITTEXT 705, 224,152,21,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 "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + LTEXT "赤(&R):", IDC_COLOR_RL /*1094*/,247,126,27,10 + EDITTEXT IDC_COLOR_EDIT_R, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "緑(&G):", IDC_COLOR_GL /*1095*/,247,140,27,10 + EDITTEXT IDC_COLOR_EDIT_G, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "青(&B):", IDC_COLOR_BL /*1096*/,247,154,27,10 + EDITTEXT IDC_COLOR_EDIT_B, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "色合い(&H):" , IDC_COLOR_HL /*1091*/,200,126,24,10 + EDITTEXT IDC_COLOR_EDIT_H, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "鮮やかさ(&S):", IDC_COLOR_SL /*1092*/,200,140,24,10 + EDITTEXT IDC_COLOR_EDIT_S, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "明るさ(&L):", IDC_COLOR_LL /*1093*/,200,154,24,10 + EDITTEXT IDC_COLOR_EDIT_L, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + CONTROL "" , IDC_COLOR_PREDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 + CONTROL "" , IDC_COLOR_USRDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 + CONTROL "" , IDC_COLOR_GRAPH, "STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 + CONTROL "" , IDC_COLOR_LUMBAR, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 + CONTROL "" , IDC_COLOR_RESULT, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 DEFPUSHBUTTON "OK", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "キャンセル", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "ヘルプ", pshHelp,100,166, 44, 14 - PUSHBUTTON "色の追加(&A)", 712/*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "色の作成(&D) >>", 719/*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "色 | 純色(&I)",713,300,200,4,14 /* just a dummy */ + PUSHBUTTON "色の追加(&A)", IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "色の作成(&D) >>", IDC_COLOR_DEFINE /*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "色 | 純色(&I)", IDC_COLOR_RES, 300,200,4,14 /* just a dummy */ } @@ -311,11 +311,11 @@ FONT 8, "MS Shell Dlg" { LTEXT "検索する文字列(&N):", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "単語単位で検索(&W)", chx1, 4, 26, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "大文字と小文字を区別する(&C)", chx2, 4, 42, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "検索する方向", grp1, 127, 26, 78, 28 - CONTROL "上(&U)", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 35, 12 - CONTROL "下(&D)", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 163, 38, 35, 12 + CHECKBOX "単語単位で検索(&W)", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "大文字と小文字を区別する(&C)", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "検索する方向", grp1, 147, 21, 58, 38 + CONTROL "上(&U)", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 + CONTROL "下(&D)", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 DEFPUSHBUTTON "次を検索(&F)", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "キャンセル", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -460,6 +460,7 @@ FONT 8, "MS Shell Dlg" LTEXT "ファイル名(&N):",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63,110,150,150 LTEXT "ファイルの種類(&T):",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Ko.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Ko.rc index e06c5d04026..5a0381b1f0a 100644 --- a/reactos/dll/win32/comdlg32/lang/cdlg_Ko.rc +++ b/reactos/dll/win32/comdlg32/lang/cdlg_Ko.rc @@ -263,7 +263,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "샘플",grp2,98,72,120,36,WS_GROUP - CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "스크립트(&I):",stc7 ,98,114,40,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -278,29 +278,29 @@ FONT 8, "MS Shell Dlg" LTEXT "기본 색상(&B):", stc1, 4, 4, 140, 10 LTEXT "사용자 정의 색상(&C):", stc2, 4, 106, 140, 10 LTEXT "색상 | 단색(&I)", stc3, 150, 151, 48, 10 - LTEXT "빨강(&R):", 726 /*1094*/,247,126,27,10 - EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "녹색(&G):",727/*1095*/,247,140,27,10 - EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "파랑(&B):",728 /*1096*/,247,154,27,10 - EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "색상(&H):" ,723 /*1091*/,200,126,24,10 - EDITTEXT 703, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "채도(&S):" ,724 /*1092*/,200,140,24,10 - EDITTEXT 704, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "명도(&L):" ,725 /*1093*/,200,154,24,10 - EDITTEXT 705, 224,152,21,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 "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + LTEXT "빨강(&R):", IDC_COLOR_RL /*1094*/,247,126,27,10 + EDITTEXT IDC_COLOR_EDIT_R, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "녹색(&G):", IDC_COLOR_GL /*1095*/,247,140,27,10 + EDITTEXT IDC_COLOR_EDIT_G, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "파랑(&B):", IDC_COLOR_BL /*1096*/,247,154,27,10 + EDITTEXT IDC_COLOR_EDIT_B, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "색상(&H):" , IDC_COLOR_HL /*1091*/,200,126,24,10 + EDITTEXT IDC_COLOR_EDIT_H, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "채도(&S):", IDC_COLOR_SL /*1092*/,200,140,24,10 + EDITTEXT IDC_COLOR_EDIT_S, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "명도(&L):", IDC_COLOR_LL /*1093*/,200,154,24,10 + EDITTEXT IDC_COLOR_EDIT_L, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + CONTROL "" , IDC_COLOR_PREDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 + CONTROL "" , IDC_COLOR_USRDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 + CONTROL "" , IDC_COLOR_GRAPH, "STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 + CONTROL "" , IDC_COLOR_LUMBAR, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 + CONTROL "" , IDC_COLOR_RESULT, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 DEFPUSHBUTTON "확인", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "취소", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "도움말", pshHelp,100,166, 44, 14 - PUSHBUTTON "사용자 정의 색상에 더하기(&A)", 712/*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "사용자 정의 색상 결정(&D) >>", 719/*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "색상 | 단색(&I)",713,300,200,4,14 /* just a dummy */ + PUSHBUTTON "사용자 정의 색상에 더하기(&A)", IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "사용자 정의 색상 결정(&D) >>", IDC_COLOR_DEFINE /*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "색상 | 단색(&I)", IDC_COLOR_RES, 300,200,4,14 /* just a dummy */ } @@ -311,11 +311,11 @@ FONT 8, "MS Shell Dlg" { LTEXT "찾을 내용(&N):", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "단어 단위로(&W)", chx1, 4, 26, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "대/소문자 구분(&C)", chx2, 4, 42, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "방향", grp1, 127, 26, 78, 28 - CONTROL "위(&U)", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 35, 12 - CONTROL "아래(&D)", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 163, 38, 35, 12 + CHECKBOX "단어 단위로(&W)", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "대/소문자 구분(&C)", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "방향", grp1, 147, 21, 58, 38 + CONTROL "위(&U)", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 + CONTROL "아래(&D)", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 DEFPUSHBUTTON "다음 찾기(&F)", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "취소", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -460,6 +460,7 @@ FONT 8, "MS Shell Dlg" LTEXT "파일 이름(&N):",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63,110,150,150 LTEXT "파일 형식(&T):",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Lt.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Lt.rc index 73ad0d0cedb..3942c062c89 100644 --- a/reactos/dll/win32/comdlg32/lang/cdlg_Lt.rc +++ b/reactos/dll/win32/comdlg32/lang/cdlg_Lt.rc @@ -263,7 +263,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "Pavyzdys",grp2,98,72,120,36,WS_GROUP - CTEXT "AaĄąZzŽž",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Si&mbolių rinkinys:",stc7 ,98,114,40,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -278,29 +278,29 @@ FONT 8, "MS Shell Dlg" LTEXT "&Pagrindinės spalvos:", stc1, 4, 4, 140, 10 LTEXT "Pr&itaikytos spalvos:", stc2, 4, 106, 140, 10 LTEXT "Spal. | Vient.", stc3, 150, 151, 48, 10 - LTEXT "&Raudona:", 726 /*1094*/,247,126,27,10 - EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "Ža&lia:",727/*1095*/,247,140,27,10 - EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Mėlyna:",728 /*1096*/,247,154,27,10 - EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Atsp.:" ,723 /*1091*/,200,126,24,10 - EDITTEXT 703, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Sodr.:" ,724 /*1092*/,200,140,24,10 - EDITTEXT 704, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Švies.:" ,725 /*1093*/,200,154,24,10 - EDITTEXT 705, 224,152,21,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 "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + LTEXT "&Raudona:", IDC_COLOR_RL /*1094*/,247,126,27,10 + EDITTEXT IDC_COLOR_EDIT_R, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "Ža&lia:", IDC_COLOR_GL /*1095*/,247,140,27,10 + EDITTEXT IDC_COLOR_EDIT_G, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Mėlyna:", IDC_COLOR_BL /*1096*/,247,154,27,10 + EDITTEXT IDC_COLOR_EDIT_B, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Atsp.:" , IDC_COLOR_HL /*1091*/,200,126,24,10 + EDITTEXT IDC_COLOR_EDIT_H, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Sodr.:", IDC_COLOR_SL /*1092*/,200,140,24,10 + EDITTEXT IDC_COLOR_EDIT_S, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Švies.:", IDC_COLOR_LL /*1093*/,200,154,24,10 + EDITTEXT IDC_COLOR_EDIT_L, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + CONTROL "" , IDC_COLOR_PREDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 + CONTROL "" , IDC_COLOR_USRDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 + CONTROL "" , IDC_COLOR_GRAPH, "STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 + CONTROL "" , IDC_COLOR_LUMBAR, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 + CONTROL "" , IDC_COLOR_RESULT, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 DEFPUSHBUTTON "Gerai", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Atsisakyti", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Žinynas", pshHelp,100,166, 44, 14 - PUSHBUTTON "&Įdėti prie pritaikytų spalvų", 712/*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Api&brėžti pritaikytas spalvas >>", 719/*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Spal. | Vient.",713,300,200,4,14 /* just a dummy */ + PUSHBUTTON "&Įdėti prie pritaikytų spalvų", IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Api&brėžti pritaikytas spalvas >>", IDC_COLOR_DEFINE /*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Spal. | Vient.", IDC_COLOR_RES, 300,200,4,14 /* just a dummy */ } @@ -311,11 +311,11 @@ FONT 8, "MS Shell Dlg" { LTEXT "Ko &ieškoti:", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "Tenkina tik &visas žodis", chx1, 4, 26, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Skirti raidžių &dydį", chx2, 4, 42, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Kryptis", grp1, 127, 26, 78, 28 - CONTROL "&Žemyn", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 35, 12 - CONTROL "&Aukštyn", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 163, 38, 35, 12 + CHECKBOX "Tenkina tik &visas žodis", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Skirti raidžių &dydį", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Kryptis", grp1, 147, 21, 58, 38 + CONTROL "&Žemyn", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 + CONTROL "&Aukštyn", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 DEFPUSHBUTTON "Ieškoti &kito", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Atsisakyti", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -460,6 +460,7 @@ FONT 8, "MS Shell Dlg" LTEXT "&Failo vardas:",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63,110,150,150 LTEXT "Failų &tipai:",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Nl.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Nl.rc index 1e20729c5c6..9348bc63d8e 100644 --- a/reactos/dll/win32/comdlg32/lang/cdlg_Nl.rc +++ b/reactos/dll/win32/comdlg32/lang/cdlg_Nl.rc @@ -262,7 +262,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "Voorbeeld",grp2,98,72,120,36,WS_GROUP - CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Schr&ift:",stc7 ,98,114,40,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -277,29 +277,29 @@ FONT 8, "MS Shell Dlg" LTEXT "&Basiskleuren:", stc1, 4, 4, 140, 10 LTEXT "&Aangepaste kleuren:", stc2, 4, 106, 140, 10 LTEXT "Kleur | &Effen", stc3, 150, 151, 48, 10 - LTEXT "&Rood:", 726 /*1094*/,247,126,27,10 - EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Groen:",727/*1095*/,247,140,27,10 - EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "Blau&w:",728 /*1096*/,247,154,27,10 - EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "Ti&nt:" ,723 /*1091*/,200,126,24,10 - EDITTEXT 703, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Intensiteit:" ,724 /*1092*/,200,140,24,10 - EDITTEXT 704, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Helderheid:" ,725 /*1093*/,200,154,24,10 - EDITTEXT 705, 224,152,21,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 "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + LTEXT "&Rood:", IDC_COLOR_RL /*1094*/,247,126,27,10 + EDITTEXT IDC_COLOR_EDIT_R, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Groen:", IDC_COLOR_GL /*1095*/,247,140,27,10 + EDITTEXT IDC_COLOR_EDIT_G, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "Blau&w:", IDC_COLOR_BL /*1096*/,247,154,27,10 + EDITTEXT IDC_COLOR_EDIT_B, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "Ti&nt:" , IDC_COLOR_HL /*1091*/,200,126,24,10 + EDITTEXT IDC_COLOR_EDIT_H, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Intensiteit:", IDC_COLOR_SL /*1092*/,200,140,24,10 + EDITTEXT IDC_COLOR_EDIT_S, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Helderheid:", IDC_COLOR_LL /*1093*/,200,154,24,10 + EDITTEXT IDC_COLOR_EDIT_L, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + CONTROL "" , IDC_COLOR_PREDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 + CONTROL "" , IDC_COLOR_USRDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 + CONTROL "" , IDC_COLOR_GRAPH, "STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 + CONTROL "" , IDC_COLOR_LUMBAR, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 + CONTROL "" , IDC_COLOR_RESULT, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 DEFPUSHBUTTON "OK", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Annuleren", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Help", pshHelp,100,166, 44, 14 - PUSHBUTTON "&Toevoegen aan Aangepaste kleuren", 712/*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Definieer Aangepaste kleuren >>", 719/*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Kleur | &Effen",713,300,200,4,14 /* just a dummy */ + PUSHBUTTON "&Toevoegen aan Aangepaste kleuren", IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Definieer Aangepaste kleuren >>", IDC_COLOR_DEFINE /*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Kleur | &Effen", IDC_COLOR_RES, 300,200,4,14 /* just a dummy */ } @@ -310,11 +310,11 @@ FONT 8, "MS Shell Dlg" { LTEXT "&Zoek naar:", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "Heel &woord", chx1, 4, 26, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Gelijke &hoofd-/kleine letters", chx2, 4, 42, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Zoekrichting", grp1, 127, 26, 78, 28 - CONTROL "&Omhoog", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 35, 12 - CONTROL "O&mlaag", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 163, 38, 35, 12 + CHECKBOX "Heel &woord", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Gelijke &hoofd-/kleine letters", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Zoekrichting", grp1, 147, 21, 58, 38 + CONTROL "&Omhoog", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 + CONTROL "O&mlaag", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 DEFPUSHBUTTON "&Volgende zoeken", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Annuleren", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -459,6 +459,7 @@ FONT 8, "MS Shell Dlg" LTEXT "Bestands&naam:",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63,110,150,150 LTEXT "Bestands&typen:",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_No.rc b/reactos/dll/win32/comdlg32/lang/cdlg_No.rc index 708e0174f77..4c49b01d547 100644 --- a/reactos/dll/win32/comdlg32/lang/cdlg_No.rc +++ b/reactos/dll/win32/comdlg32/lang/cdlg_No.rc @@ -263,7 +263,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "Forhåndsvisning",grp2,98,72,120,36,WS_GROUP - CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Skr&ipt:",stc7 ,98,114,40,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -278,29 +278,29 @@ FONT 8, "MS Shell Dlg" LTEXT "&Basisfarger:", stc1, 4, 4, 140, 10 LTEXT "&Egendefinerte farger:", stc2, 4, 106, 140, 10 LTEXT "Farge | Sol&id", stc3, 150, 151, 48, 10 - LTEXT "&Rød:", 726 /*1094*/,247,126,27,10 - EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Grønn:",727/*1095*/,247,140,27,10 - EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Blå:",728 /*1096*/,247,154,27,10 - EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Nyanse:" ,723 /*1091*/,200,126,24,10 - EDITTEXT 703, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Metning:" ,724 /*1092*/,200,140,24,10 - EDITTEXT 704, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Lum:" ,725 /*1093*/,200,154,24,10 - EDITTEXT 705, 224,152,21,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 "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + LTEXT "&Rød:", IDC_COLOR_RL /*1094*/,247,126,27,10 + EDITTEXT IDC_COLOR_EDIT_R, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Grønn:", IDC_COLOR_GL /*1095*/,247,140,27,10 + EDITTEXT IDC_COLOR_EDIT_G, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Blå:", IDC_COLOR_BL /*1096*/,247,154,27,10 + EDITTEXT IDC_COLOR_EDIT_B, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Nyanse:" , IDC_COLOR_HL /*1091*/,200,126,24,10 + EDITTEXT IDC_COLOR_EDIT_H, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Metning:", IDC_COLOR_SL /*1092*/,200,140,24,10 + EDITTEXT IDC_COLOR_EDIT_S, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Lum:", IDC_COLOR_LL /*1093*/,200,154,24,10 + EDITTEXT IDC_COLOR_EDIT_L, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + CONTROL "" , IDC_COLOR_PREDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 + CONTROL "" , IDC_COLOR_USRDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 + CONTROL "" , IDC_COLOR_GRAPH, "STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 + CONTROL "" , IDC_COLOR_LUMBAR, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 + CONTROL "" , IDC_COLOR_RESULT, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 DEFPUSHBUTTON "OK", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Avbryt", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Hjelp", pshHelp,100,166, 44, 14 - PUSHBUTTON "Legg til i egendefinerte f&arger", 712/*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Definer egendefinerte farger >>", 719/*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Farge | Sol&id",713,300,200,4,14 /* just a dummy */ + PUSHBUTTON "Legg til i egendefinerte f&arger", IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Definer egendefinerte farger >>", IDC_COLOR_DEFINE /*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Farge | Sol&id", IDC_COLOR_RES, 300,200,4,14 /* just a dummy */ } @@ -311,11 +311,11 @@ FONT 8, "MS Shell Dlg" { LTEXT "Fi&nn:", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "Finn &kun hele ord", chx1, 4, 26, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Skill &mellom store og små bokstaver", chx2, 4, 42, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Retning", grp1, 127, 26, 78, 28 - CONTROL "&Opp", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 35, 12 - CONTROL "Ne&d", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 163, 38, 35, 12 + CHECKBOX "Finn &kun hele ord", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Skill &mellom store og små bokstaver", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Retning", grp1, 147, 21, 58, 38 + CONTROL "&Opp", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 + CONTROL "Ne&d", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 DEFPUSHBUTTON "&Finn neste", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Avbryt", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -460,6 +460,7 @@ FONT 8, "MS Shell Dlg" LTEXT "Fil&navn:",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63,110,150,150 LTEXT "Fil&type:",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Pl.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Pl.rc index e4acfca46db..074dff6e0fe 100644 --- a/reactos/dll/win32/comdlg32/lang/cdlg_Pl.rc +++ b/reactos/dll/win32/comdlg32/lang/cdlg_Pl.rc @@ -263,7 +263,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "Przykład",grp2,98,72,120,36,WS_GROUP - CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Skr&ypt:",stc7 ,98,114,40,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -278,29 +278,29 @@ FONT 8, "MS Shell Dlg" LTEXT "&Podstawowe kolory:", stc1, 4, 4, 140, 10 LTEXT "Dowolne &kolory:", stc2, 4, 106, 140, 10 LTEXT "Kolor", stc3, 150, 151, 48, 10 - LTEXT "&Czerw:", 726 /*1094*/,247,126,27,10 - EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Ziel:",727/*1095*/,247,140,27,10 - EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Nieb:",728 /*1096*/,247,154,27,10 - EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Odcie:" ,723 /*1091*/,200,126,24,10 - EDITTEXT 703, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Nasyc:" ,724 /*1092*/,200,140,24,10 - EDITTEXT 704, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Jaskr:" ,725 /*1093*/,200,154,24,10 - EDITTEXT 705, 224,152,21,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 "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + LTEXT "&Czerw:", IDC_COLOR_RL /*1094*/,247,126,27,10 + EDITTEXT IDC_COLOR_EDIT_R, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Ziel:", IDC_COLOR_GL /*1095*/,247,140,27,10 + EDITTEXT IDC_COLOR_EDIT_G, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Nieb:", IDC_COLOR_BL /*1096*/,247,154,27,10 + EDITTEXT IDC_COLOR_EDIT_B, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Odcie:" , IDC_COLOR_HL /*1091*/,200,126,24,10 + EDITTEXT IDC_COLOR_EDIT_H, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Nasyc:" , IDC_COLOR_SL /*1092*/,200,140,24,10 + EDITTEXT IDC_COLOR_EDIT_S, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Jaskr:", IDC_COLOR_LL /*1093*/,200,154,24,10 + EDITTEXT IDC_COLOR_EDIT_L, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + CONTROL "" , IDC_COLOR_PREDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 + CONTROL "" , IDC_COLOR_USRDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 + CONTROL "" , IDC_COLOR_GRAPH, "STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 + CONTROL "" , IDC_COLOR_LUMBAR, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 + CONTROL "" , IDC_COLOR_RESULT, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 DEFPUSHBUTTON "OK", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Anuluj", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Pomoc", pshHelp,100,166, 44, 14 - PUSHBUTTON "&Dodaj do dowolnych", 712/*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Z&definiuj kolor >>", 719/*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Kolor",713,300,200,4,14 /* just a dummy */ + PUSHBUTTON "&Dodaj do dowolnych", IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Z&definiuj kolor >>", IDC_COLOR_DEFINE /*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Kolor", IDC_COLOR_RES, 300,200,4,14 /* just a dummy */ } @@ -311,11 +311,11 @@ FONT 8, "MS Shell Dlg" { LTEXT "&Znajdź:", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "Uwzględniaj tylko całe wyrazy", chx1, 4, 26, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "&Uwzględniaj wielkość liter", chx2, 4, 42, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Kierunek", grp1, 127, 26, 78, 28 - CONTROL "Przesuń w &górę", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 35, 12 - CONTROL "Przesuń w &dół", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 163, 38, 35, 12 + CHECKBOX "Uwzględniaj tylko całe wyrazy", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Uwzględniaj wielkość liter", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Kierunek", grp1, 147, 21, 58, 38 + CONTROL "Przesuń w &górę", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 + CONTROL "Przesuń w &dół", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 DEFPUSHBUTTON "&Znajdź następny", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Anuluj", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -460,6 +460,7 @@ FONT 8, "MS Shell Dlg" LTEXT "&Nazwa pliku:",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63,110,150,150 LTEXT "&Pliki typu:",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Pt.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Pt.rc index f80aff9fc41..10135822a2d 100644 --- a/reactos/dll/win32/comdlg32/lang/cdlg_Pt.rc +++ b/reactos/dll/win32/comdlg32/lang/cdlg_Pt.rc @@ -263,7 +263,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "Exemplo",grp2,98,72,120,36,WS_GROUP - CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt:",stc7 ,98,114,40,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -278,29 +278,29 @@ FONT 8, "MS Shell Dlg" LTEXT "Cores &Básicas:", stc1, 4, 4, 140, 10 LTEXT "&Cores do Utilizador:", stc2, 4, 106, 140, 10 LTEXT "Colorido|Sólid&o", stc3, 150, 151, 48, 10 - LTEXT "Ver&melho:", 726 /*1094*/,247,126,27,10 - EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Verde:",727/*1095*/,247,140,27,10 - EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "A&zul:",728 /*1096*/,247,154,27,10 - EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "Mat&iz:" ,723 /*1091*/,200,126,24,10 - EDITTEXT 703, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "Sa&t:" ,724 /*1092*/,200,140,24,10 - EDITTEXT 704, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Lum:" ,725 /*1093*/,200,154,24,10 - EDITTEXT 705, 224,152,21,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 "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + LTEXT "Ver&melho:", IDC_COLOR_RL /*1094*/,247,126,27,10 + EDITTEXT IDC_COLOR_EDIT_R, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Verde:", IDC_COLOR_GL /*1095*/,247,140,27,10 + EDITTEXT IDC_COLOR_EDIT_G, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "A&zul:", IDC_COLOR_BL /*1096*/,247,154,27,10 + EDITTEXT IDC_COLOR_EDIT_B, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "Mat&iz:" , IDC_COLOR_HL /*1091*/,200,126,24,10 + EDITTEXT IDC_COLOR_EDIT_H, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "Sa&t:", IDC_COLOR_SL /*1092*/,200,140,24,10 + EDITTEXT IDC_COLOR_EDIT_S, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Lum:", IDC_COLOR_LL /*1093*/,200,154,24,10 + EDITTEXT IDC_COLOR_EDIT_L, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + CONTROL "" , IDC_COLOR_PREDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 + CONTROL "" , IDC_COLOR_USRDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 + CONTROL "" , IDC_COLOR_GRAPH, "STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 + CONTROL "" , IDC_COLOR_LUMBAR, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 + CONTROL "" , IDC_COLOR_RESULT, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 DEFPUSHBUTTON "OK", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancelar", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Ajuda", pshHelp,100,166, 44, 14 - PUSHBUTTON "&Adicionar Cor Personalizada", 712/*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Definir Cores Personalizadas >>", 719/*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Colorido|Sólid&o",713,300,200,4,14 /* just a dummy */ + PUSHBUTTON "&Adicionar Cor Personalizada", IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Definir Cores Personalizadas >>", IDC_COLOR_DEFINE /*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Colorido|Sólid&o", IDC_COLOR_RES, 300,200,4,14 /* just a dummy */ } @@ -311,11 +311,11 @@ FONT 8, "MS Shell Dlg" { LTEXT "&Procurar:", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "Palavra &Inteira", chx1, 4, 26, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "&Maiúsculas/minúsculas", chx2, 4, 42, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Direção", grp1, 127, 26, 78, 28 - CONTROL "&Acima", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 35, 12 - CONTROL "A&baixo", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 163, 38, 35, 12 + CHECKBOX "Palavra &Inteira", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Maiúsculas/minúsculas", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Direção", grp1, 147, 21, 58, 38 + CONTROL "&Acima", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 + CONTROL "A&baixo", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 DEFPUSHBUTTON "&Procurar", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Cancelar", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -460,6 +460,7 @@ FONT 8, "MS Shell Dlg" LTEXT "&Nome do ficheiro:",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63,110,150,150 LTEXT "Ficheiros do &tipo:",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Ro.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Ro.rc index 3ff62546905..4cc52bcc324 100644 --- a/reactos/dll/win32/comdlg32/lang/cdlg_Ro.rc +++ b/reactos/dll/win32/comdlg32/lang/cdlg_Ro.rc @@ -263,7 +263,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "Eșantion",grp2,98,72,120,36,WS_GROUP - CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt:",stc7 ,98,114,40,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -278,29 +278,29 @@ FONT 8, "MS Shell Dlg" LTEXT "Culori de &bază:", stc1, 4, 4, 140, 10 LTEXT "&Culori personalizate:", stc2, 4, 106, 140, 10 LTEXT "Culoare | Sol&id", stc3, 150, 151, 48, 10 - LTEXT "&Roșu:", 726 /*1094*/,247,126,27,10 - EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Verde:",727/*1095*/,247,140,27,10 - EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Albastru:",728 /*1096*/,247,154,27,10 - EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Nuanță:" ,723 /*1091*/,200,126,24,10 - EDITTEXT 703, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Sat:" ,724 /*1092*/,200,140,24,10 - EDITTEXT 704, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Lum:" ,725 /*1093*/,200,154,24,10 - EDITTEXT 705, 224,152,21,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 "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + LTEXT "&Roșu:", IDC_COLOR_RL /*1094*/,247,126,27,10 + EDITTEXT IDC_COLOR_EDIT_R, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Verde:", IDC_COLOR_GL /*1095*/,247,140,27,10 + EDITTEXT IDC_COLOR_EDIT_G, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Albastru:", IDC_COLOR_BL /*1096*/,247,154,27,10 + EDITTEXT IDC_COLOR_EDIT_B, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Nuanță:" , IDC_COLOR_HL /*1091*/,200,126,24,10 + EDITTEXT IDC_COLOR_EDIT_H, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Sat:", IDC_COLOR_SL /*1092*/,200,140,24,10 + EDITTEXT IDC_COLOR_EDIT_S, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Lum:", IDC_COLOR_LL /*1093*/,200,154,24,10 + EDITTEXT IDC_COLOR_EDIT_L, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + CONTROL "" , IDC_COLOR_PREDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 + CONTROL "" , IDC_COLOR_USRDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 + CONTROL "" , IDC_COLOR_GRAPH, "STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 + CONTROL "" , IDC_COLOR_LUMBAR, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 + CONTROL "" , IDC_COLOR_RESULT, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 DEFPUSHBUTTON "OK", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Renunță", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Ajutor", pshHelp,100,166, 44, 14 - PUSHBUTTON "&Adaugă culori personalizate", 712/*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Definește colori personalizate >>", 719/*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Culoare | Sol&id",713,300,200,4,14 /* just a dummy */ + PUSHBUTTON "&Adaugă culori personalizate", IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Definește colori personalizate >>", IDC_COLOR_DEFINE /*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Culoare | Sol&id", IDC_COLOR_RES, 300,200,4,14 /* just a dummy */ } @@ -311,11 +311,11 @@ FONT 8, "MS Shell Dlg" { LTEXT "&Caută:", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "&Numai cuvinte întregi", chx1, 4, 26, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Sensibil la registru", chx2, 4, 42, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Direcție", grp1, 127, 26, 78, 28 - CONTROL "&Sus", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 35, 12 - CONTROL "&Jos", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 163, 38, 35, 12 + CHECKBOX "&Numai cuvinte întregi", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Sensibil la registru", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Direcție", grp1, 147, 21, 58, 38 + CONTROL "&Sus", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 + CONTROL "&Jos", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 DEFPUSHBUTTON "Caută &înainte", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Renunță", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -460,6 +460,7 @@ FONT 8, "MS Shell Dlg" LTEXT "&Nume fișier:",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63,110,150,150 LTEXT "&Tip de fișier:",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc index 936554115ab..9feef5dc40b 100644 --- a/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc +++ b/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc @@ -263,7 +263,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "Образец",grp2,98,72,120,36,WS_GROUP - CTEXT "АаБбAaBb",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "На&бор символов:",stc7 ,98,114,40,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -278,29 +278,29 @@ FONT 8, "MS Shell Dlg" LTEXT "&Базовая палитра:", stc1, 4, 4, 140, 10 LTEXT "До&полнительные цвета:", stc2, 4, 106, 140, 10 LTEXT "Цвет|За&ливка", stc3, 150, 151, 48, 10 - LTEXT "Крас&ный:", 726 /*1094*/,247,126,27,10 - EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Зелёный:",727/*1095*/,247,140,27,10 - EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "С&иний:",728 /*1096*/,247,154,27,10 - EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "О&ттенок:" ,723 /*1091*/,200,126,24,10 - EDITTEXT 703, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Контраст:" ,724 /*1092*/,200,140,24,10 - EDITTEXT 704, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Яркость:" ,725 /*1093*/,200,154,24,10 - EDITTEXT 705, 224,152,21,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 "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + LTEXT "Крас&ный:", IDC_COLOR_RL /*1094*/,247,126,27,10 + EDITTEXT IDC_COLOR_EDIT_R, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Зелёный:", IDC_COLOR_GL /*1095*/,247,140,27,10 + EDITTEXT IDC_COLOR_EDIT_G, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "С&иний:", IDC_COLOR_BL /*1096*/,247,154,27,10 + EDITTEXT IDC_COLOR_EDIT_B, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "О&ттенок:" , IDC_COLOR_HL /*1091*/,200,126,24,10 + EDITTEXT IDC_COLOR_EDIT_H, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Контраст:", IDC_COLOR_SL /*1092*/,200,140,24,10 + EDITTEXT IDC_COLOR_EDIT_S, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Яркость:", IDC_COLOR_LL /*1093*/,200,154,24,10 + EDITTEXT IDC_COLOR_EDIT_L, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + CONTROL "" , IDC_COLOR_PREDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 + CONTROL "" , IDC_COLOR_USRDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 + CONTROL "" , IDC_COLOR_GRAPH, "STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 + CONTROL "" , IDC_COLOR_LUMBAR, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 + CONTROL "" , IDC_COLOR_RESULT, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 DEFPUSHBUTTON "ОК", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Отмена", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Справка", pshHelp,100,166, 44, 14 - PUSHBUTTON "&Добавить в набор", 712/*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Определить цвет >>", 719/*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Цвет|За&ливка",713,300,200,4,14 /* just a dummy */ + PUSHBUTTON "&Добавить в набор", IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Определить цвет >>", IDC_COLOR_DEFINE /*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Цвет|За&ливка", IDC_COLOR_RES, 300,200,4,14 /* just a dummy */ } @@ -311,9 +311,9 @@ FONT 8, "MS Shell Dlg" { LTEXT "&Образец:", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "&Только слово целиком", chx1, 4, 26, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "C &учетом регистра", chx2, 4, 42, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Направление", grp1, 127, 26, 78, 28 + CHECKBOX "&Только слово целиком", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "C &учетом регистра", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Направление", grp1, 147, 21, 58, 38 CONTROL "В&верх", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 35, 12 CONTROL "В&низ", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 163, 38, 35, 12 @@ -460,6 +460,7 @@ FONT 8, "MS Shell Dlg" LTEXT "Имя &файла:",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63,110,150,150 LTEXT "&Тип файлов:",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Si.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Si.rc index c0b5bc9a34e..662627b6623 100644 --- a/reactos/dll/win32/comdlg32/lang/cdlg_Si.rc +++ b/reactos/dll/win32/comdlg32/lang/cdlg_Si.rc @@ -263,7 +263,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "Vzorec",grp2,98,72,120,36,WS_GROUP - CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Sis&tem pisave:",stc7 ,98,114,40,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -278,29 +278,29 @@ FONT 8, "MS Shell Dlg" LTEXT "Osno&vne barve:", stc1, 4, 4, 140, 10 LTEXT "Namešane &barve:", stc2, 4, 106, 140, 10 LTEXT "Barva | T&emelj", stc3, 150, 151, 48, 10 - LTEXT "&Rdeča:", 726 /*1094*/,247,126,27,10 - EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Zelena:",727/*1095*/,247,140,27,10 - EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Modra:",728 /*1096*/,247,154,27,10 - EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "Od&tn.:" ,723 /*1091*/,200,126,24,10 - EDITTEXT 703, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Nasič.:" ,724 /*1092*/,200,140,24,10 - EDITTEXT 704, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Svetl.:" ,725 /*1093*/,200,154,24,10 - EDITTEXT 705, 224,152,21,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 "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + LTEXT "&Rdeča:", IDC_COLOR_RL /*1094*/,247,126,27,10 + EDITTEXT IDC_COLOR_EDIT_R, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Zelena:", IDC_COLOR_GL /*1095*/,247,140,27,10 + EDITTEXT IDC_COLOR_EDIT_G, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Modra:", IDC_COLOR_BL /*1096*/,247,154,27,10 + EDITTEXT IDC_COLOR_EDIT_B, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "Od&tn.:" , IDC_COLOR_HL /*1091*/,200,126,24,10 + EDITTEXT IDC_COLOR_EDIT_H, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Nasič.:", IDC_COLOR_SL /*1092*/,200,140,24,10 + EDITTEXT IDC_COLOR_EDIT_S, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Svetl.:", IDC_COLOR_LL /*1093*/,200,154,24,10 + EDITTEXT IDC_COLOR_EDIT_L, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + CONTROL "" , IDC_COLOR_PREDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 + CONTROL "" , IDC_COLOR_USRDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 + CONTROL "" , IDC_COLOR_GRAPH, "STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 + CONTROL "" , IDC_COLOR_LUMBAR, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 + CONTROL "" , IDC_COLOR_RESULT, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 DEFPUSHBUTTON "V redu", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Prekliči", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Pomoč", pshHelp,100,166, 44, 14 - PUSHBUTTON "&Dodaj med namešane barve", 712/*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "M&ešanje barv >>", 719/*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Barva | T&emelj",713,300,200,4,14 /* just a dummy */ + PUSHBUTTON "&Dodaj med namešane barve", IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "M&ešanje barv >>", IDC_COLOR_DEFINE /*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Barva | T&emelj", IDC_COLOR_RES, 300,200,4,14 /* just a dummy */ } @@ -311,11 +311,11 @@ FONT 8, "MS Shell Dlg" { LTEXT "N&ajdi:", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "&Samo cele besede", chx1, 4, 26, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "&Razlikuj velikost črk", chx2, 4, 42, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Smer iskanja", grp1, 127, 26, 78, 28 - CONTROL "Navz&gor", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 35, 12 - CONTROL "Navz&dol", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 163, 38, 35, 12 + CHECKBOX "&Samo cele besede", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Razlikuj velikost črk", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Smer iskanja", grp1, 147, 21, 58, 38 + CONTROL "Navz&gor", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 + CONTROL "Navz&dol", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 DEFPUSHBUTTON "&Najdi naslednje", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Prekliči", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -460,6 +460,7 @@ FONT 8, "MS Shell Dlg" LTEXT "Ime &datoteke:",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63,110,150,150 LTEXT "Vrsta da&totek:",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Sk.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Sk.rc index 7738ecd5ed8..c8633f3c386 100644 --- a/reactos/dll/win32/comdlg32/lang/cdlg_Sk.rc +++ b/reactos/dll/win32/comdlg32/lang/cdlg_Sk.rc @@ -27,10 +27,12 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT STRINGTABLE { IDS_FILENOTFOUND "Súbor nenájdený" - IDS_VERIFYFILE "" - IDS_CREATEFILE "" - IDS_OVERWRITEFILE "" - IDS_INVALID_FILENAME_TITLE "" + IDS_VERIFYFILE "Please verify that the correct file name was given" + IDS_CREATEFILE "File does not exist.\n\ +Do you want to create file?" + IDS_OVERWRITEFILE "File already exists.\n\ +Do you want to replace it?" + IDS_INVALID_FILENAME_TITLE "Invalid character(s) in path" IDS_INVALID_FILENAME "Názov súboru nemôže obsahovať žiadny z nasledovných znakov:\n\ / : < > |" IDS_PATHNOTEXISTING "Cesta neexistuje" @@ -50,22 +52,25 @@ STRINGTABLE { PD32_PRINT_TITLE "Tlač" - PD32_VALUE_UREADABLE "" - PD32_INVALID_PAGE_RANGE "" - PD32_FROM_NOT_ABOVE_TO "" - PD32_MARGINS_OVERLAP "" - PD32_NR_OF_COPIES_EMPTY "" - PD32_TOO_LARGE_COPIES "" - PD32_PRINT_ERROR "" + PD32_VALUE_UREADABLE "Unreadable Entry" + PD32_INVALID_PAGE_RANGE "This value does not lie within the page range.\n\ +Please enter a value between %1!d! and %2!d!." + PD32_FROM_NOT_ABOVE_TO "The 'from' entry cannot exceed the 'to' entry." + PD32_MARGINS_OVERLAP "Margins overlap or fall outside Paper boundaries.\n\ +Please reenter margins." + PD32_NR_OF_COPIES_EMPTY "The 'Number of copies' field cannot be empty." + PD32_TOO_LARGE_COPIES "This large number of copies is not supported by your printer.\n\ +Please enter a value between 1 and %d." + PD32_PRINT_ERROR "A printer error occurred." PD32_NO_DEFAULT_PRINTER "Nie je nastavená implicitná tlačiareň" PD32_CANT_FIND_PRINTER "Nemožno nájsť tlačiareň" PD32_OUT_OF_MEMORY "Nedostatok pamäte" PD32_GENERIC_ERROR "Vyskytla sa chyba" PD32_DRIVER_UNKNOWN "Neznámy ovládač tlačiarne" - PD32_NO_DEVICES "" + PD32_NO_DEVICES "Before you can perform printer-related tasks such as page setup or printing a document, you need to install a printer. Please install one and retry." PD32_DEFAULT_PRINTER "Implicitná tlačiareň; " - PD32_NR_OF_DOCUMENTS_IN_QUEUE "" + PD32_NR_OF_DOCUMENTS_IN_QUEUE "There are %d documents in the queue" PD32_MARGINS_IN_INCHES "Okraje [palce]" PD32_MARGINS_IN_MILLIMETERS "Okraje [mm]" PD32_MILLIMETERS "mm" @@ -73,16 +78,16 @@ STRINGTABLE PD32_PRINTER_STATUS_READY "Pripravená" PD32_PRINTER_STATUS_PAUSED "Pozastavená; " PD32_PRINTER_STATUS_ERROR "Chyba; " - PD32_PRINTER_STATUS_PENDING_DELETION "" + PD32_PRINTER_STATUS_PENDING_DELETION "Pending deletion; " PD32_PRINTER_STATUS_PAPER_JAM "Uviaznutý papier; " PD32_PRINTER_STATUS_PAPER_OUT "Chýba papier; " - PD32_PRINTER_STATUS_MANUAL_FEED "" + PD32_PRINTER_STATUS_MANUAL_FEED "Feed paper manual; " PD32_PRINTER_STATUS_PAPER_PROBLEM "Problém s papierom; " PD32_PRINTER_STATUS_OFFLINE "Tlačiareň v stave offline; " - PD32_PRINTER_STATUS_IO_ACTIVE "" + PD32_PRINTER_STATUS_IO_ACTIVE "I/O Active; " PD32_PRINTER_STATUS_BUSY "Zaneprázdnená; " PD32_PRINTER_STATUS_PRINTING "Prebieha tlač; " - PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "" + PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "Output tray is full; " PD32_PRINTER_STATUS_NOT_AVAILABLE "Nie je k dispozícii; " PD32_PRINTER_STATUS_WAITING "Čaká sa; " PD32_PRINTER_STATUS_PROCESSING "Prebieha spracovanie; " @@ -90,7 +95,7 @@ STRINGTABLE PD32_PRINTER_STATUS_WARMING_UP "Zahrievanie; " PD32_PRINTER_STATUS_TONER_LOW "Primálo toneru; " PD32_PRINTER_STATUS_NO_TONER "Chýba toner; " - PD32_PRINTER_STATUS_PAGE_PUNT "" + PD32_PRINTER_STATUS_PAGE_PUNT "Page punt; " PD32_PRINTER_STATUS_USER_INTERVENTION "Prerušenie užívateľom; " PD32_PRINTER_STATUS_OUT_OF_MEMORY "Nedostatok pamäte; " PD32_PRINTER_STATUS_DOOR_OPEN "Dvierka tlačiarne sú otvorené; " @@ -100,7 +105,7 @@ STRINGTABLE STRINGTABLE /* Font styles */ { - IDS_FONT_REGULAR "" + IDS_FONT_REGULAR "Regular" IDS_FONT_BOLD "Tučné" IDS_FONT_ITALIC "Kurzíva" IDS_FONT_BOLD_ITALIC "Tučné kurzíva" @@ -111,26 +116,26 @@ STRINGTABLE /* Color names */ IDS_COLOR_BLACK "Čierna" IDS_COLOR_MAROON "Maroon" IDS_COLOR_GREEN "Zelená" - IDS_COLOR_OLIVE "" + IDS_COLOR_OLIVE "Olive" IDS_COLOR_NAVY "Navy" - IDS_COLOR_PURPLE "" + IDS_COLOR_PURPLE "Purple" IDS_COLOR_TEAL "Teal" - IDS_COLOR_GRAY "" - IDS_COLOR_SILVER "" + IDS_COLOR_GRAY "Gray" + IDS_COLOR_SILVER "Silver" IDS_COLOR_RED "Červená" - IDS_COLOR_LIME "" + IDS_COLOR_LIME "Lime" IDS_COLOR_YELLOW "Žltá" IDS_COLOR_BLUE "Modrá" - IDS_COLOR_FUCHSIA "" + IDS_COLOR_FUCHSIA "Fuchsia" IDS_COLOR_AQUA "Aqua" IDS_COLOR_WHITE "Biela" } STRINGTABLE { - IDS_FONT_SIZE "" - IDS_SAVE_BUTTON "" - IDS_SAVE_IN "" + IDS_FONT_SIZE "Select a font size between %1!d! and %2!d! points." + IDS_SAVE_BUTTON "&Save" + IDS_SAVE_IN "Save &in:" IDS_SAVE "Uložiť" IDS_SAVE_AS "Uložiť ako" IDS_OPEN_FILE "Otvoriť súbor" @@ -258,7 +263,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "Vzorka",grp2,98,72,120,36,WS_GROUP - CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt:",stc7 ,98,114,40,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -273,29 +278,29 @@ FONT 8, "MS Shell Dlg" LTEXT "Základné &farby:", stc1, 4, 4, 140, 10 LTEXT "&Vlastné farby:", stc2, 4, 106, 140, 10 LTEXT "Farba | Pl&ná", stc3, 150, 151, 48, 10 - LTEXT "Če&rvená:", 726 /*1094*/,247,126,27,10 - EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Zelená:",727/*1095*/,247,140,27,10 - EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Modrá:",728 /*1096*/,247,154,27,10 - EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "Od&tieň:" ,723 /*1091*/,200,126,24,10 - EDITTEXT 703, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Sýtosť:" ,724 /*1092*/,200,140,24,10 - EDITTEXT 704, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Jas:" ,725 /*1093*/,200,154,24,10 - EDITTEXT 705, 224,152,21,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 "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + LTEXT "Če&rvená:", IDC_COLOR_RL /*1094*/,247,126,27,10 + EDITTEXT IDC_COLOR_EDIT_R, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Zelená:", IDC_COLOR_GL /*1095*/,247,140,27,10 + EDITTEXT IDC_COLOR_EDIT_G, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Modrá:", IDC_COLOR_BL /*1096*/,247,154,27,10 + EDITTEXT IDC_COLOR_EDIT_B, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "Od&tieň:" , IDC_COLOR_HL /*1091*/,200,126,24,10 + EDITTEXT IDC_COLOR_EDIT_H, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Sýtosť:", IDC_COLOR_SL /*1092*/,200,140,24,10 + EDITTEXT IDC_COLOR_EDIT_S, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Jas:", IDC_COLOR_LL /*1093*/,200,154,24,10 + EDITTEXT IDC_COLOR_EDIT_L, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + CONTROL "" , IDC_COLOR_PREDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 + CONTROL "" , IDC_COLOR_USRDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 + CONTROL "" , IDC_COLOR_GRAPH, "STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 + CONTROL "" , IDC_COLOR_LUMBAR, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 + CONTROL "" , IDC_COLOR_RESULT, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 DEFPUSHBUTTON "OK", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Zrušiť", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Pomocník", pshHelp,100,166, 44, 14 - PUSHBUTTON "Prid&ať medzi vlastné farby", 712/*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Definovať vlastné farby >>", 719/*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Farba | Pl&ná",713,300,200,4,14 /* just a dummy */ + PUSHBUTTON "Prid&ať medzi vlastné farby", IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Definovať vlastné farby >>", IDC_COLOR_DEFINE /*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Farba | Pl&ná", IDC_COLOR_RES, 300,200,4,14 /* just a dummy */ } @@ -306,11 +311,11 @@ FONT 8, "MS Shell Dlg" { LTEXT "&Nájsť:", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "Len &celé slová", chx1, 4, 26, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "&Rozlišovať malé a veľké písmená", chx2, 4, 42, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Smer", grp1, 127, 26, 78, 28 - CONTROL "H&ore", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 35, 12 - CONTROL "&Dole", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 163, 38, 35, 12 + CHECKBOX "Len &celé slová", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Rozlišovať malé a veľké písmená", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Smer", grp1, 147, 21, 58, 38 + CONTROL "H&ore", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 + CONTROL "&Dole", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 DEFPUSHBUTTON "Nájsť ď&alšie", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Zrušiť", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -455,6 +460,7 @@ FONT 8, "MS Shell Dlg" LTEXT "&Názov súboru:",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63,110,150,150 LTEXT "&Typ súborov",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Sr.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Sr.rc index f52ab9b725f..9de7de7cad1 100644 --- a/reactos/dll/win32/comdlg32/lang/cdlg_Sr.rc +++ b/reactos/dll/win32/comdlg32/lang/cdlg_Sr.rc @@ -153,12 +153,12 @@ FONT 8, "MS Shell Dlg" LTEXT "&Datoteka", stc3, 6, 6, 76, 9 EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP LISTBOX lst1, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "", -1, 110, 6, 92, 9 + LTEXT "&Directories:", -1, 110, 6, 92, 9 LTEXT "", stc1, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP LISTBOX lst2, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP LTEXT "Po &vrsti", stc2, 6, 104, 90, 9 COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "", stc4, 110, 104, 92, 9 + LTEXT "Dri&ves:", stc4, 110, 104, 92, 9 COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "Otvori", IDOK, 208, 6, 60, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Otkaži", IDCANCEL, 208, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -175,12 +175,12 @@ FONT 8, "MS Shell Dlg" LTEXT "&Datoteka", stc3, 6, 6, 76, 9 EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP LISTBOX lst1, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "", -1, 110, 6, 92, 9 + LTEXT "&Directories:", -1, 110, 6, 92, 9 LTEXT "", stc1, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP LISTBOX lst2, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP LTEXT "Po &vrsti", stc2, 6, 104, 90, 9 COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "", stc4, 110, 104, 92, 9 + LTEXT "Dri&ves:", stc4, 110, 104, 92, 9 COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "Sačuvaj kao", IDOK, 208, 6, 60, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Otkaži", IDCANCEL, 208, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -197,18 +197,18 @@ FONT 8, "MS Shell Dlg" LTEXT "Štampanje", stc1, 6, 6, 40, 9 LTEXT "", stc2, 60, 6, 150, 9 GROUPBOX "&Štampaj objekat", grp1, 6, 30, 160, 65, BS_GROUPBOX - RADIOBUTTON "", rad1, 16, 45, 60, 12 + RADIOBUTTON "&All", rad1, 16, 45, 60, 12 RADIOBUTTON "Odabir teksta", rad2, 16, 60, 60, 12 RADIOBUTTON "Nagore", rad3, 16, 75, 60, 12 DEFPUSHBUTTON "Štampanje", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Otkaži", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Postavke strane", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP - LTEXT "", stc3, 60, 80, 30, 9 - LTEXT "", stc4, 120, 80, 30, 9 + LTEXT "&From:", stc3, 60, 80, 30, 9 + LTEXT "&To:", stc4, 120, 80, 30, 9 LTEXT "&Kvalitet sažimanja:", stc5, 6, 100, 76, 9 COMBOBOX cmb1, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP CHECKBOX "Štampanje na datoteku", chx1, 20, 120, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "", chx2, 160, 120, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Condensed", chx2, 160, 120, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } @@ -219,15 +219,15 @@ FONT 8, "MS Shell Dlg" { GROUPBOX "Štampanje", grp1, 6, 6, 180, 72, BS_GROUPBOX RADIOBUTTON "Podrazumevani štampač; ", rad1, 16, 16, 150, 12 - LTEXT "", stc1, 35, 30, 120, 9 - RADIOBUTTON "", rad2, 16, 44, 150, 12 + LTEXT "[none]", stc1, 35, 30, 120, 9 + RADIOBUTTON "Specific &Printer", rad2, 16, 44, 150, 12 COMBOBOX cmb1, 35, 58, 145, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "U redu", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Otkaži", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Postavke strane", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP GROUPBOX "Beleške...", grp2, 6, 82, 100, 50, BS_GROUPBOX - RADIOBUTTON "", rad3, 50, 95, 50, 12 - RADIOBUTTON "", rad4, 50, 110, 50, 12 + RADIOBUTTON "Po&rtrait", rad3, 50, 95, 50, 12 + RADIOBUTTON "&Landscape", rad4, 50, 110, 50, 12 ICON "LANDSCAP", stc10, 10, 95, 32, 32 ICON "PORTRAIT", stc11, 10, 95, 32, 32 GROUPBOX "Ulaz za papir; ", grp3, 116, 82, 178, 50, BS_GROUPBOX @@ -246,7 +246,7 @@ FONT 8, "MS Shell Dlg" LTEXT "Fontovi",stc1 ,6,3,90,9 COMBOBOX cmb1, 6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "",stc2 ,108,3,60,9 + LTEXT "Font St&yle:",stc2 ,108,3,60,9 COMBOBOX cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE LTEXT "&Veličina:",stc3,179,3,32,9 @@ -256,15 +256,15 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Otkaži",IDCANCEL,218,23,50,14,WS_GROUP | WS_TABSTOP PUSHBUTTON "&Primeni", psh3,218,40,50,14,WS_GROUP | WS_TABSTOP PUSHBUTTON "&Pomoć" , pshHelp,218,57,50,14,WS_GROUP | WS_TABSTOP - GROUPBOX "",grp1,6,72,84,36,WS_GROUP - CHECKBOX "", chx1, 10,82,78,10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "", chx2, 10,94,78,10, BS_AUTOCHECKBOX + GROUPBOX "Effects",grp1,6,72,84,36,WS_GROUP + CHECKBOX "Stri&keout", chx1, 10,82,78,10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "&Underline", chx2, 10,94,78,10, BS_AUTOCHECKBOX LTEXT "&Boja:", stc4 ,6,114,80,9 COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - GROUPBOX "",grp2,98,72,120,36,WS_GROUP - CTEXT "",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE - LTEXT "",stc7 ,98,114,40,9 + GROUPBOX "Sample",grp2,98,72,120,36,WS_GROUP + CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE + LTEXT "Scr&ipt:",stc7 ,98,114,40,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } @@ -277,47 +277,47 @@ FONT 8, "MS Shell Dlg" { LTEXT "&Boja:", stc1, 4, 4, 140, 10 LTEXT "&Boja:", stc2, 4, 106, 140, 10 - LTEXT "", stc3, 150, 151, 48, 10 - LTEXT "", 726 /*1094*/,247,126,27,10 - EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "Zelena",727/*1095*/,247,140,27,10 - EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "Plava",728 /*1096*/,247,154,27,10 - EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "" ,723 /*1091*/,200,126,24,10 - EDITTEXT 703, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "" ,724 /*1092*/,200,140,24,10 - EDITTEXT 704, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "" ,725 /*1093*/,200,154,24,10 - EDITTEXT 705, 224,152,21,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 "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + LTEXT "Color | Sol&id", stc3, 150, 151, 48, 10 + LTEXT "&Red:", IDC_COLOR_RL /*1094*/,247,126,27,10 + EDITTEXT IDC_COLOR_EDIT_R, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "Zelena", IDC_COLOR_GL /*1095*/,247,140,27,10 + EDITTEXT IDC_COLOR_EDIT_G, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "Plava", IDC_COLOR_BL /*1096*/,247,154,27,10 + EDITTEXT IDC_COLOR_EDIT_B, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Hue:" , IDC_COLOR_HL /*1091*/,200,126,24,10 + EDITTEXT IDC_COLOR_EDIT_H, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Sat:", IDC_COLOR_SL /*1092*/,200,140,24,10 + EDITTEXT IDC_COLOR_EDIT_S, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Lum:", IDC_COLOR_LL /*1093*/,200,154,24,10 + EDITTEXT IDC_COLOR_EDIT_L, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + CONTROL "" , IDC_COLOR_PREDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 + CONTROL "" , IDC_COLOR_USRDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 + CONTROL "" , IDC_COLOR_GRAPH, "STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 + CONTROL "" , IDC_COLOR_LUMBAR, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 + CONTROL "" , IDC_COLOR_RESULT, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 DEFPUSHBUTTON "U redu", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Otkaži", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Pomoć", pshHelp,100,166, 44, 14 - PUSHBUTTON "", 712/*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "", 719/*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "",713,300,200,4,14 /* just a dummy */ + PUSHBUTTON "&Add to Custom Colors", IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Define Custom Colors >>", IDC_COLOR_DEFINE /*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Color | Sol&id", IDC_COLOR_RES, 300,200,4,14 /* just a dummy */ } FINDDLGORD DIALOG 36, 24, 276, 62 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "" +CAPTION "Find" FONT 8, "MS Shell Dlg" { - LTEXT "", -1, 4, 8, 52, 8 + LTEXT "Fi&nd What:", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "", chx1, 4, 26, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "", chx2, 4, 42, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Opis", grp1, 127, 26, 78, 28 - CONTROL "", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 35, 12 - CONTROL "", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 163, 38, 35, 12 + CHECKBOX "Match &Whole Word Only", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Match &Case", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Opis", grp1, 147, 21, 58, 38 + CONTROL "&Up", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 + CONTROL "&Down", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 - DEFPUSHBUTTON "", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + DEFPUSHBUTTON "&Find Next", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Otkaži", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Pomoć", pshHelp , 212, 42, 60, 14, WS_GROUP | WS_TABSTOP } @@ -325,17 +325,17 @@ FONT 8, "MS Shell Dlg" REPLACEDLGORD DIALOG 36, 24, 276, 94 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "" +CAPTION "Replace" FONT 8, "MS Shell Dlg" { - LTEXT "", -1, 4, 8, 52, 8 + LTEXT "Fi&nd What:", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "", -1, 4, 26, 52, 8 + LTEXT "Re&place With:", -1, 4, 26, 52, 8 EDITTEXT edt2, 57, 24, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "", chx1, 5, 46, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "", chx2, 5, 62, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Match &Whole Word Only", chx1, 5, 46, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Match &Case", chx2, 5, 62, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - DEFPUSHBUTTON "", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + DEFPUSHBUTTON "&Find Next", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "&Zameni...\tCtrl+H", psh1 , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Izaberi &sve", psh2 , 212, 42, 60, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Otkaži", IDCANCEL , 212, 60, 60, 14, WS_GROUP | WS_TABSTOP @@ -362,25 +362,25 @@ FONT 8, "MS Shell Dlg" LTEXT "", stc12, 65, 36, 120,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "&Ukucaj:", stc7, 16, 48, 47,10, SS_NOPREFIX LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "", stc10, 16, 60, 47,10, SS_NOPREFIX + LTEXT "Where:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Komentari:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - GROUPBOX "", grp2, 160, 92, 120,64, WS_GROUP - LTEXT "",stc5,168,105,68,8 + GROUPBOX "Copies", grp2, 160, 92, 120,64, WS_GROUP + LTEXT "Number of &copies:",stc5,168,105,68,8 ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE - CONTROL "", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 + CONTROL "C&ollate", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER GROUPBOX "&Štampaj objekat", grp1, 8,92, 144,64, WS_GROUP - CONTROL "", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 + CONTROL "&All", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 + CONTROL "Pa&ges", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 CONTROL "&Izaberi", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER - RTEXT "", stc2, 52,124, 20,8 - RTEXT "", stc3, 99,124, 20,8 + RTEXT "&from:", stc2, 52,124, 20,8 + RTEXT "&to:", stc3, 99,124, 20,8 } PRINT32_SETUP DIALOG 32, 32, 288, 178 @@ -400,7 +400,7 @@ BEGIN LTEXT "", stc12, 65, 36, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "&Ukucaj:", stc7, 16, 48, 47,10, SS_NOPREFIX LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "", stc10, 16, 60, 47,10, SS_NOPREFIX + LTEXT "Where:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Komentari:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP @@ -413,13 +413,13 @@ BEGIN GROUPBOX "Beleške...", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + CONTROL "P&ortrait", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 + CONTROL "L&andscape", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "" +CAPTION "Setup Page" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80 @@ -428,17 +428,17 @@ BEGIN GROUPBOX "Ulaz za papir; ", grp2, 8, 96, 224, 56, BS_GROUPBOX LTEXT "&Veličina:", stc2, 16, 112, 36, 8 COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL - LTEXT "", stc3, 16, 132, 36, 8 + LTEXT "&Tray:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "Beleške...", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Portrait", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Landscape", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "granica", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&Levo:", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Desno:", stc16, 159, 172, 30, 8 EDITTEXT edt6, 190, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER - LTEXT "", stc17, 88, 192, 30, 8 + LTEXT "T&op:", stc17, 88, 192, 30, 8 EDITTEXT edt5, 119, 190, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Dno:", stc18, 159, 192, 30, 8 EDITTEXT edt7, 190, 190, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER @@ -452,7 +452,7 @@ STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_S CAPTION "Otvori" FONT 8, "MS Shell Dlg" { - LTEXT "",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY + LTEXT "Look &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, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE @@ -460,11 +460,12 @@ FONT 8, "MS Shell Dlg" LTEXT "&Datoteka",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63,110,150,150 LTEXT "&Fajl",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,63,148,150,10 + CONTROL "Open as &read-only",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,63,148,150,10 DEFPUSHBUTTON "&Otvori", IDOK,222,110,54,14 PUSHBUTTON "Otkaži", IDCANCEL,222,128,54,14 diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Sv.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Sv.rc index ded41f5e89e..237c6ff32d5 100644 --- a/reactos/dll/win32/comdlg32/lang/cdlg_Sv.rc +++ b/reactos/dll/win32/comdlg32/lang/cdlg_Sv.rc @@ -94,7 +94,7 @@ Var god skriv in marginalerna igen." PD32_PRINTER_STATUS_WARMING_UP "Värmer upp; " PD32_PRINTER_STATUS_TONER_LOW "Toner snart slut; " PD32_PRINTER_STATUS_NO_TONER "Ingen toner; " - PD32_PRINTER_STATUS_PAGE_PUNT "" + PD32_PRINTER_STATUS_PAGE_PUNT "Page punt; " PD32_PRINTER_STATUS_USER_INTERVENTION "Avbruten av användaren; " PD32_PRINTER_STATUS_OUT_OF_MEMORY "Slut på minne; " PD32_PRINTER_STATUS_DOOR_OPEN "Skrivardörren är öppen; " @@ -261,8 +261,8 @@ FONT 8, "MS Shell Dlg" LTEXT "&Färg:", stc4 ,6,114,80,9 COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Test",grp2,98,72,120,36,WS_GROUP - CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + GROUPBOX "Sample",grp2,98,72,120,36,WS_GROUP + CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt:",stc7 ,98,114,40,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -277,29 +277,29 @@ FONT 8, "MS Shell Dlg" LTEXT "&Grundläggande färger:", stc1, 4, 4, 140, 10 LTEXT "&Egendefinierade färger:", stc2, 4, 106, 140, 10 LTEXT "Enfärgat", stc3, 150, 151, 48, 10 - LTEXT "&Röd:", 726 /*1094*/,247,126,27,10 - EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Grön:",727/*1095*/,247,140,27,10 - EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Blå:",728 /*1096*/,247,154,27,10 - EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Int:" ,723 /*1091*/,200,126,24,10 - EDITTEXT 703, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Met:" ,724 /*1092*/,200,140,24,10 - EDITTEXT 704, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Lum:" ,725 /*1093*/,200,154,24,10 - EDITTEXT 705, 224,152,21,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 "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + LTEXT "&Röd:", IDC_COLOR_RL /*1094*/,247,126,27,10 + EDITTEXT IDC_COLOR_EDIT_R, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Grön:", IDC_COLOR_GL /*1095*/,247,140,27,10 + EDITTEXT IDC_COLOR_EDIT_G, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Blå:", IDC_COLOR_BL /*1096*/,247,154,27,10 + EDITTEXT IDC_COLOR_EDIT_B, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Int:" , IDC_COLOR_HL /*1091*/,200,126,24,10 + EDITTEXT IDC_COLOR_EDIT_H, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Met:", IDC_COLOR_SL /*1092*/,200,140,24,10 + EDITTEXT IDC_COLOR_EDIT_S, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Lum:", IDC_COLOR_LL /*1093*/,200,154,24,10 + EDITTEXT IDC_COLOR_EDIT_L, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + CONTROL "" , IDC_COLOR_PREDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 + CONTROL "" , IDC_COLOR_USRDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 + CONTROL "" , IDC_COLOR_GRAPH, "STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 + CONTROL "" , IDC_COLOR_LUMBAR, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 + CONTROL "" , IDC_COLOR_RESULT, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 DEFPUSHBUTTON "OK", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Avbryt", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Hjälp", pshHelp,100,166, 44, 14 - PUSHBUTTON "&Lägg till egendefinierad färg", 712/*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Definiera egen färg >>", 719/*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Enfärgat",713,300,200,4,14 /* just a dummy */ + PUSHBUTTON "&Lägg till egendefinierad färg", IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Definiera egen färg >>", IDC_COLOR_DEFINE /*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Enfärgat", IDC_COLOR_RES, 300,200,4,14 /* just a dummy */ } @@ -310,11 +310,11 @@ FONT 8, "MS Shell Dlg" { LTEXT "&Sök efter:", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "&Bara hela ord", chx1, 4, 26, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "&Skillnad på stora/små bokstäver", chx2, 4, 42, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Riktning", grp1, 127, 26, 78, 28 - CONTROL "&Upp", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 35, 12 - CONTROL "&Ner", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 163, 38, 35, 12 + CHECKBOX "&Bara hela ord", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Skillnad på stora/små bokstäver", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Riktning", grp1, 147, 21, 58, 38 + CONTROL "&Upp", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 + CONTROL "&Ner", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 DEFPUSHBUTTON "&Sök efter nästa", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Avbryt", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -459,6 +459,7 @@ FONT 8, "MS Shell Dlg" LTEXT "Fil&namn:",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63,110,150,150 LTEXT "&Filformat",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Th.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Th.rc index 93b9d4580bc..b4bc56563e2 100644 --- a/reactos/dll/win32/comdlg32/lang/cdlg_Th.rc +++ b/reactos/dll/win32/comdlg32/lang/cdlg_Th.rc @@ -27,10 +27,12 @@ LANGUAGE LANG_THAI, SUBLANG_DEFAULT STRINGTABLE { IDS_FILENOTFOUND "ไม่พบแฟ้ม" - IDS_VERIFYFILE "" - IDS_CREATEFILE "" - IDS_OVERWRITEFILE "" - IDS_INVALID_FILENAME_TITLE "" + IDS_VERIFYFILE "Please verify that the correct file name was given" + IDS_CREATEFILE "File does not exist.\n\ +Do you want to create file?" + IDS_OVERWRITEFILE "File already exists.\n\ +Do you want to replace it?" + IDS_INVALID_FILENAME_TITLE "Invalid character(s) in path" IDS_INVALID_FILENAME "ในชื่อแฟ้มใช้ไมได้ต้วนี้:\n\ / : < > |" IDS_PATHNOTEXISTING "ไม่พบไดเรกทอรี" @@ -55,15 +57,16 @@ STRINGTABLE PD32_FROM_NOT_ABOVE_TO "'จาก' ต่องเป็นน้อยก่วะ 'ส่งถึง'" PD32_MARGINS_OVERLAP "ขอบกระดาษใหญ่เกินไป\n\ กรุณาเลื่อกใหม่" - PD32_NR_OF_COPIES_EMPTY "" - PD32_TOO_LARGE_COPIES "" + PD32_NR_OF_COPIES_EMPTY "The 'Number of copies' field cannot be empty." + PD32_TOO_LARGE_COPIES "This large number of copies is not supported by your printer.\n\ +Please enter a value between 1 and %d." PD32_PRINT_ERROR "ความปิดเครื่องพิมพ์" PD32_NO_DEFAULT_PRINTER "ไมมีเครื่องพิมพ์ปกติ" PD32_CANT_FIND_PRINTER "ไม่พบเครื่องพิมพ์" PD32_OUT_OF_MEMORY "ความจํา์หมด" PD32_GENERIC_ERROR "เกิดความปิดพลาด" PD32_DRIVER_UNKNOWN "ไม่รู้จักดไร์เวอร์์เครื่องพิมพ์" - PD32_NO_DEVICES "" + PD32_NO_DEVICES "Before you can perform printer-related tasks such as page setup or printing a document, you need to install a printer. Please install one and retry." PD32_DEFAULT_PRINTER "เครื่องพิมพ์ปกติ; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "มี %d แฟ้มรออยู่" @@ -77,10 +80,10 @@ STRINGTABLE PD32_PRINTER_STATUS_PENDING_DELETION "กําลังจะลบ; " PD32_PRINTER_STATUS_PAPER_JAM "กระดาษติด; " PD32_PRINTER_STATUS_PAPER_OUT "กระดาษหมด; " - PD32_PRINTER_STATUS_MANUAL_FEED "" - PD32_PRINTER_STATUS_PAPER_PROBLEM "" + PD32_PRINTER_STATUS_MANUAL_FEED "Feed paper manual; " + PD32_PRINTER_STATUS_PAPER_PROBLEM "Paper problem; " PD32_PRINTER_STATUS_OFFLINE "เครื่องพิมพ์ปิด; " - PD32_PRINTER_STATUS_IO_ACTIVE "" + PD32_PRINTER_STATUS_IO_ACTIVE "I/O Active; " PD32_PRINTER_STATUS_BUSY "ยุ่ง; " PD32_PRINTER_STATUS_PRINTING "กํมลังพิมพ์; " PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "ถาดเต็ม; " @@ -91,7 +94,7 @@ STRINGTABLE PD32_PRINTER_STATUS_WARMING_UP "กํมลังะพรอม; " PD32_PRINTER_STATUS_TONER_LOW "หมึกจะหมด; " PD32_PRINTER_STATUS_NO_TONER "หมึกหมดแล้ว; " - PD32_PRINTER_STATUS_PAGE_PUNT "" + PD32_PRINTER_STATUS_PAGE_PUNT "Page punt; " PD32_PRINTER_STATUS_USER_INTERVENTION "ผู้ใช้ยกเลิก; " PD32_PRINTER_STATUS_OUT_OF_MEMORY "ความจําเครื่องพิมพ์หมด; " PD32_PRINTER_STATUS_DOOR_OPEN "ประตูเครื่องพิมพ์เปิด; " @@ -101,10 +104,10 @@ STRINGTABLE STRINGTABLE /* Font styles */ { - IDS_FONT_REGULAR "" - IDS_FONT_BOLD "" - IDS_FONT_ITALIC "" - IDS_FONT_BOLD_ITALIC "" + IDS_FONT_REGULAR "Regular" + IDS_FONT_BOLD "Bold" + IDS_FONT_ITALIC "Italic" + IDS_FONT_BOLD_ITALIC "Bold Italic" } STRINGTABLE /* Color names */ @@ -122,17 +125,17 @@ STRINGTABLE /* Color names */ IDS_COLOR_LIME "สีเขียวออ่น" IDS_COLOR_YELLOW "สีเหลือง" IDS_COLOR_BLUE "สีฟ้า" - IDS_COLOR_FUCHSIA "" + IDS_COLOR_FUCHSIA "Fuchsia" IDS_COLOR_AQUA "สีฟ้าออ่น" IDS_COLOR_WHITE "สีขาว" } STRINGTABLE { - IDS_FONT_SIZE "" - IDS_SAVE_BUTTON "" + IDS_FONT_SIZE "Select a font size between %1!d! and %2!d! points." + IDS_SAVE_BUTTON "&Save" IDS_SAVE_IN "บันทืกเป็น..." - IDS_SAVE "" + IDS_SAVE "Save" IDS_SAVE_AS "บันทืก" IDS_OPEN_FILE "แฟ้ม" } @@ -259,7 +262,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "ตัวอย่าง",grp2,98,72,120,36,WS_GROUP - CTEXT "AฺBCกขฃ",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Scr&ipt:",stc7 ,98,114,40,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -274,29 +277,29 @@ FONT 8, "MS Shell Dlg" LTEXT "&Basic Colors:", stc1, 4, 4, 140, 10 LTEXT "'สีที่กําหนดเอง':", stc2, 4, 106, 140, 10 LTEXT "สี | มั่นคง", stc3, 150, 151, 48, 10 - LTEXT "สีแดง:", 726 /*1094*/,247,126,27,10 - EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "สีเขียว:",727/*1095*/,247,140,27,10 - EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "สีฟ้า:",728 /*1096*/,247,154,27,10 - EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&H:" ,723 /*1091*/,200,126,24,10 - EDITTEXT 703, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&S:" ,724 /*1092*/,200,140,24,10 - EDITTEXT 704, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&L:" ,725 /*1093*/,200,154,24,10 - EDITTEXT 705, 224,152,21,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 "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + LTEXT "สีแดง:", IDC_COLOR_RL /*1094*/,247,126,27,10 + EDITTEXT IDC_COLOR_EDIT_R, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "สีเขียว:", IDC_COLOR_GL /*1095*/,247,140,27,10 + EDITTEXT IDC_COLOR_EDIT_G, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "สีฟ้า:", IDC_COLOR_BL /*1096*/,247,154,27,10 + EDITTEXT IDC_COLOR_EDIT_B, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Hue:" , IDC_COLOR_HL /*1091*/,200,126,24,10 + EDITTEXT IDC_COLOR_EDIT_H, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Sat:", IDC_COLOR_SL /*1092*/,200,140,24,10 + EDITTEXT IDC_COLOR_EDIT_S, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Lum:", IDC_COLOR_LL /*1093*/,200,154,24,10 + EDITTEXT IDC_COLOR_EDIT_L, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + CONTROL "" , IDC_COLOR_PREDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 + CONTROL "" , IDC_COLOR_USRDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 + CONTROL "" , IDC_COLOR_GRAPH, "STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 + CONTROL "" , IDC_COLOR_LUMBAR, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 + CONTROL "" , IDC_COLOR_RESULT, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 DEFPUSHBUTTON "ตกลง", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "ยกเลิก", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "ช่วยเหลีอ", pshHelp,100,166, 44, 14 - PUSHBUTTON "เพิ่มเข้าไป 'สีที่กําหนดเอง'", 712/*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "ปรับแต่ง 'สีที่กําหนดเอง' >>", 719/*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "สี | มั่นคง",713,300,200,4,14 /* just a dummy */ + PUSHBUTTON "เพิ่มเข้าไป 'สีที่กําหนดเอง'", IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "ปรับแต่ง 'สีที่กําหนดเอง' >>", IDC_COLOR_DEFINE /*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "สี | มั่นคง", IDC_COLOR_RES, 300,200,4,14 /* just a dummy */ } @@ -307,11 +310,11 @@ FONT 8, "MS Shell Dlg" { LTEXT "ข้อความทีค้นหา:", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "ตรงกันทุกตัวอักษร", chx1, 4, 26, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "พิจารณาตัวเล็ก-ใหญ่", chx2, 4, 42, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "ทาง", grp1, 127, 26, 78, 28 - CONTROL "ขึ้น", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 35, 12 - CONTROL "ลง", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 163, 38, 35, 12 + CHECKBOX "ตรงกันทุกตัวอักษร", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "พิจารณาตัวเล็ก-ใหญ่", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "ทาง", grp1, 147, 21, 58, 38 + CONTROL "ขึ้น", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 + CONTROL "ลง", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 DEFPUSHBUTTON "ค้นหาต่อไป", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "ยกเลิก", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -456,6 +459,7 @@ FONT 8, "MS Shell Dlg" LTEXT "ชื่อแฟ้ม:",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63,110,150,150 LTEXT "ตัวกรอง:",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc index a885443deab..a98aa2c89ce 100644 --- a/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc +++ b/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc @@ -79,9 +79,9 @@ Lütffen 1 ile %d arasında bir değer girin." PD32_PRINTER_STATUS_PAUSED "Durakladı; " PD32_PRINTER_STATUS_ERROR "Hata; " PD32_PRINTER_STATUS_PENDING_DELETION "Silme bekleniyor; " - PD32_PRINTER_STATUS_PAPER_JAM "" + PD32_PRINTER_STATUS_PAPER_JAM "Paper jam; " PD32_PRINTER_STATUS_PAPER_OUT "Kağıt yok; " - PD32_PRINTER_STATUS_MANUAL_FEED "" + PD32_PRINTER_STATUS_MANUAL_FEED "Feed paper manual; " PD32_PRINTER_STATUS_PAPER_PROBLEM "Kağıt sorunu; " PD32_PRINTER_STATUS_OFFLINE "Yazıcı çevrimdışı; " PD32_PRINTER_STATUS_IO_ACTIVE "G/Ç Etkin; " @@ -92,10 +92,10 @@ Lütffen 1 ile %d arasında bir değer girin." PD32_PRINTER_STATUS_WAITING "Bekliyor; " PD32_PRINTER_STATUS_PROCESSING "İlerliyor; " PD32_PRINTER_STATUS_INITIALIZING "Hazırlanıyor; " - PD32_PRINTER_STATUS_WARMING_UP "" - PD32_PRINTER_STATUS_TONER_LOW "" - PD32_PRINTER_STATUS_NO_TONER "" - PD32_PRINTER_STATUS_PAGE_PUNT "" + PD32_PRINTER_STATUS_WARMING_UP "Warming up; " + PD32_PRINTER_STATUS_TONER_LOW "Toner low; " + PD32_PRINTER_STATUS_NO_TONER "No toner; " + PD32_PRINTER_STATUS_PAGE_PUNT "Page punt; " PD32_PRINTER_STATUS_USER_INTERVENTION "Kullanıcı tarafından iptal edildi; " PD32_PRINTER_STATUS_OUT_OF_MEMORY "Bellek dolu; " PD32_PRINTER_STATUS_DOOR_OPEN "Yazıcı kapısı açık; " @@ -105,10 +105,10 @@ Lütffen 1 ile %d arasında bir değer girin." STRINGTABLE /* Font styles */ { - IDS_FONT_REGULAR "" - IDS_FONT_BOLD "" - IDS_FONT_ITALIC "" - IDS_FONT_BOLD_ITALIC "" + IDS_FONT_REGULAR "Regular" + IDS_FONT_BOLD "Bold" + IDS_FONT_ITALIC "Italic" + IDS_FONT_BOLD_ITALIC "Bold Italic" } STRINGTABLE /* Color names */ @@ -263,7 +263,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "Örnek",grp2,98,72,120,36,WS_GROUP - CTEXT "AaBbĞğŞş",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Bet&ik:",stc7 ,98,114,40,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -278,29 +278,29 @@ FONT 8, "MS Shell Dlg" LTEXT "&Temel Renkler:", stc1, 4, 4, 140, 10 LTEXT "&Özel Renkler:", stc2, 4, 106, 140, 10 LTEXT "Renk | Kat&ı", stc3, 150, 151, 48, 10 - LTEXT "&Kırmızı:", 726 /*1094*/,247,126,27,10 - EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Yeşil:",727/*1095*/,247,140,27,10 - EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Mavi:",728 /*1096*/,247,154,27,10 - EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Hue:" ,723 /*1091*/,200,126,24,10 - EDITTEXT 703, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Sat:" ,724 /*1092*/,200,140,24,10 - EDITTEXT 704, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Lum:" ,725 /*1093*/,200,154,24,10 - EDITTEXT 705, 224,152,21,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 "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + LTEXT "&Kırmızı:", IDC_COLOR_RL /*1094*/,247,126,27,10 + EDITTEXT IDC_COLOR_EDIT_R, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Yeşil:", IDC_COLOR_GL /*1095*/,247,140,27,10 + EDITTEXT IDC_COLOR_EDIT_G, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Mavi:", IDC_COLOR_BL /*1096*/,247,154,27,10 + EDITTEXT IDC_COLOR_EDIT_B, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Hue:" , IDC_COLOR_HL /*1091*/,200,126,24,10 + EDITTEXT IDC_COLOR_EDIT_H, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Sat:", IDC_COLOR_SL /*1092*/,200,140,24,10 + EDITTEXT IDC_COLOR_EDIT_S, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Lum:", IDC_COLOR_LL /*1093*/,200,154,24,10 + EDITTEXT IDC_COLOR_EDIT_L, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + CONTROL "" , IDC_COLOR_PREDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 + CONTROL "" , IDC_COLOR_USRDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 + CONTROL "" , IDC_COLOR_GRAPH, "STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 + CONTROL "" , IDC_COLOR_LUMBAR, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 + CONTROL "" , IDC_COLOR_RESULT, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 DEFPUSHBUTTON "Tamam", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "İptal", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Yardım", pshHelp,100,166, 44, 14 - PUSHBUTTON "&Özel Renklere Ekle", 712/*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Özel Renkleri Tanımla >>", 719/*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Renk | Kat&ı",713,300,200,4,14 /* just a dummy */ + PUSHBUTTON "&Özel Renklere Ekle", IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Özel Renkleri Tanımla >>", IDC_COLOR_DEFINE /*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Renk | Kat&ı", IDC_COLOR_RES, 300,200,4,14 /* just a dummy */ } @@ -311,11 +311,11 @@ FONT 8, "MS Shell Dlg" { LTEXT "Ara&nan:", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "Yalnızca &Tam Sözcükleri Bul", chx1, 4, 26, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "BÜYÜK/küçük Harf &Duyarlı", chx2, 4, 42, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Yön", grp1, 127, 26, 78, 28 - CONTROL "&Yukarı", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 35, 12 - CONTROL "A&şağı", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 163, 38, 35, 12 + CHECKBOX "Yalnızca &Tam Sözcükleri Bul", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "BÜYÜK/küçük Harf &Duyarlı", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Yön", grp1, 147, 21, 58, 38 + CONTROL "&Yukarı", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 + CONTROL "A&şağı", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 DEFPUSHBUTTON "&Sonrakini Bul", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "İptal", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -460,6 +460,7 @@ FONT 8, "MS Shell Dlg" LTEXT "D&osya adı:",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63,110,150,150 LTEXT "Dosya &türü:",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Tw.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Tw.rc index ff5faec0cec..7911ef84495 100644 --- a/reactos/dll/win32/comdlg32/lang/cdlg_Tw.rc +++ b/reactos/dll/win32/comdlg32/lang/cdlg_Tw.rc @@ -105,40 +105,40 @@ STRINGTABLE STRINGTABLE /* Font styles */ { - IDS_FONT_REGULAR "" - IDS_FONT_BOLD "" - IDS_FONT_ITALIC "" - IDS_FONT_BOLD_ITALIC "" + IDS_FONT_REGULAR "Regular" + IDS_FONT_BOLD "Bold" + IDS_FONT_ITALIC "Italic" + IDS_FONT_BOLD_ITALIC "Bold Italic" } STRINGTABLE /* Color names */ { - IDS_COLOR_BLACK "" - IDS_COLOR_MAROON "" - IDS_COLOR_GREEN "" - IDS_COLOR_OLIVE "" - IDS_COLOR_NAVY "" - IDS_COLOR_PURPLE "" - IDS_COLOR_TEAL "" - IDS_COLOR_GRAY "" - IDS_COLOR_SILVER "" + IDS_COLOR_BLACK "Black" + IDS_COLOR_MAROON "Maroon" + IDS_COLOR_GREEN "Green" + IDS_COLOR_OLIVE "Olive" + IDS_COLOR_NAVY "Navy" + IDS_COLOR_PURPLE "Purple" + IDS_COLOR_TEAL "Teal" + IDS_COLOR_GRAY "Gray" + IDS_COLOR_SILVER "Silver" IDS_COLOR_RED "倒回" - IDS_COLOR_LIME "" - IDS_COLOR_YELLOW "" - IDS_COLOR_BLUE "" - IDS_COLOR_FUCHSIA "" - IDS_COLOR_AQUA "" - IDS_COLOR_WHITE "" + IDS_COLOR_LIME "Lime" + IDS_COLOR_YELLOW "Yellow" + IDS_COLOR_BLUE "Blue" + IDS_COLOR_FUCHSIA "Fuchsia" + IDS_COLOR_AQUA "Aqua" + IDS_COLOR_WHITE "White" } STRINGTABLE { - IDS_FONT_SIZE "" - IDS_SAVE_BUTTON "" + IDS_FONT_SIZE "Select a font size between %1!d! and %2!d! points." + IDS_SAVE_BUTTON "&Save" IDS_SAVE_IN "另存為(&A)..." - IDS_SAVE "儲存 HTML" + IDS_SAVE "Save" IDS_SAVE_AS "另存新檔" - IDS_OPEN_FILE "Wine地雷" + IDS_OPEN_FILE "Open File" } /* @@ -203,12 +203,12 @@ FONT 8, "MS Shell Dlg" DEFPUSHBUTTON "列印", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "取消", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "版面設定", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP - LTEXT "", stc3, 60, 80, 30, 9 - LTEXT "", stc4, 120, 80, 30, 9 + LTEXT "&From:", stc3, 60, 80, 30, 9 + LTEXT "&To:", stc4, 120, 80, 30, 9 LTEXT "壓縮質量(&Q):", stc5, 6, 100, 76, 9 COMBOBOX cmb1, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP CHECKBOX "列印到檔案", chx1, 20, 120, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "", chx2, 160, 120, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Condensed", chx2, 160, 120, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } @@ -219,8 +219,8 @@ FONT 8, "MS Shell Dlg" { GROUPBOX "列印", grp1, 6, 6, 180, 72, BS_GROUPBOX RADIOBUTTON "默認印表機; ", rad1, 16, 16, 150, 12 - LTEXT "", stc1, 35, 30, 120, 9 - RADIOBUTTON "", rad2, 16, 44, 150, 12 + LTEXT "[none]", stc1, 35, 30, 120, 9 + RADIOBUTTON "Specific &Printer", rad2, 16, 44, 150, 12 COMBOBOX cmb1, 35, 58, 145, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "確定", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "取消", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP @@ -263,7 +263,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "範例",grp2,98,72,120,36,WS_GROUP - CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "语言:",stc7 ,98,114,40,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -278,29 +278,29 @@ FONT 8, "MS Shell Dlg" LTEXT "基本色彩(&B):", stc1, 4, 4, 140, 10 LTEXT "自定色彩(&C):", stc2, 4, 106, 140, 10 LTEXT "色彩 | 實心(&I)", stc3, 150, 151, 48, 10 - LTEXT "紅(&R):", 726 /*1094*/,247,126,27,10 - EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "綠(&G):",727/*1095*/,247,140,27,10 - EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "藍(&B):",728 /*1096*/,247,154,27,10 - EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "色調(&H):" ,723 /*1091*/,200,126,24,10 - EDITTEXT 703, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "濃度(&S):" ,724 /*1092*/,200,140,24,10 - EDITTEXT 704, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "亮度(&L):" ,725 /*1093*/,200,154,24,10 - EDITTEXT 705, 224,152,21,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 "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + LTEXT "紅(&R):", IDC_COLOR_RL /*1094*/,247,126,27,10 + EDITTEXT IDC_COLOR_EDIT_R, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "綠(&G):", IDC_COLOR_GL /*1095*/,247,140,27,10 + EDITTEXT IDC_COLOR_EDIT_G, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "藍(&B):", IDC_COLOR_BL /*1096*/,247,154,27,10 + EDITTEXT IDC_COLOR_EDIT_B, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "色調(&H):" , IDC_COLOR_HL /*1091*/,200,126,24,10 + EDITTEXT IDC_COLOR_EDIT_H, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "濃度(&S):", IDC_COLOR_SL /*1092*/,200,140,24,10 + EDITTEXT IDC_COLOR_EDIT_S, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "亮度(&L):", IDC_COLOR_LL /*1093*/,200,154,24,10 + EDITTEXT IDC_COLOR_EDIT_L, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + CONTROL "" , IDC_COLOR_PREDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 + CONTROL "" , IDC_COLOR_USRDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 + CONTROL "" , IDC_COLOR_GRAPH, "STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 + CONTROL "" , IDC_COLOR_LUMBAR, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 + CONTROL "" , IDC_COLOR_RESULT, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 DEFPUSHBUTTON "確定", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "取消", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "幫助", pshHelp,100,166, 44, 14 - PUSHBUTTON "新增自定色彩(&A)", 712/*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "定義自定色彩(&D) >>", 719/*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "色彩 | 實心(&I)",713,300,200,4,14 /* just a dummy */ + PUSHBUTTON "新增自定色彩(&A)", IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "定義自定色彩(&D) >>", IDC_COLOR_DEFINE /*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "色彩 | 實心(&I)", IDC_COLOR_RES, 300,200,4,14 /* just a dummy */ } @@ -311,11 +311,11 @@ FONT 8, "MS Shell Dlg" { LTEXT "搜尋目標(&N):", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "全字拼寫須符合(&W)", chx1, 4, 26, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "大小寫視為相異(&C)", chx2, 4, 42, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "方向", grp1, 127, 26, 78, 28 - CONTROL "上(&U)", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 35, 12 - CONTROL "下(&D)", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 163, 38, 35, 12 + CHECKBOX "全字拼寫須符合(&W)", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "大小寫視為相異(&C)", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "方向", grp1, 147, 21, 58, 38 + CONTROL "上(&U)", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 + CONTROL "下(&D)", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 DEFPUSHBUTTON "找下一個(&F)", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "取消", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -362,25 +362,25 @@ FONT 8, "MS Shell Dlg" LTEXT "", stc12, 65, 36, 120,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "類型(&T)：", stc7, 16, 48, 47,10, SS_NOPREFIX LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "", stc10, 16, 60, 47,10, SS_NOPREFIX + LTEXT "Where:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "備註:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - GROUPBOX "", grp2, 160, 92, 120,64, WS_GROUP - LTEXT "",stc5,168,105,68,8 + GROUPBOX "Copies", grp2, 160, 92, 120,64, WS_GROUP + LTEXT "Number of &copies:",stc5,168,105,68,8 ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE - CONTROL "", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 + CONTROL "C&ollate", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER GROUPBOX "列印目標(&P)", grp1, 8,92, 144,64, WS_GROUP CONTROL "全部(&A)", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 + CONTROL "Pa&ges", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 CONTROL "選擇(&S)", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER - RTEXT "", stc2, 52,124, 20,8 - RTEXT "", stc3, 99,124, 20,8 + RTEXT "&from:", stc2, 52,124, 20,8 + RTEXT "&to:", stc3, 99,124, 20,8 } PRINT32_SETUP DIALOG 32, 32, 288, 178 @@ -400,7 +400,7 @@ BEGIN LTEXT "", stc12, 65, 36, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "類型(&T)：", stc7, 16, 48, 47,10, SS_NOPREFIX LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "", stc10, 16, 60, 47,10, SS_NOPREFIX + LTEXT "Where:", stc10, 16, 60, 47,10, SS_NOPREFIX LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "備註:", stc9, 16, 72, 47,10, SS_NOPREFIX LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP @@ -419,7 +419,7 @@ END PAGESETUPDLGORD DIALOG 32, 32, 240, 240 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "" +CAPTION "Setup Page" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80 @@ -428,7 +428,7 @@ BEGIN GROUPBOX "紙張", grp2, 8, 96, 224, 56, BS_GROUPBOX LTEXT "大小(&S)：", stc2, 16, 112, 36, 8 COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL - LTEXT "", stc3, 16, 132, 36, 8 + LTEXT "&Tray:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "方向", grp1, 8, 156, 64, 56, BS_GROUPBOX AUTORADIOBUTTON "縱向(&P)", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON @@ -438,7 +438,7 @@ BEGIN EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "右(&R):", stc16, 159, 172, 30, 8 EDITTEXT edt6, 190, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER - LTEXT "", stc17, 88, 192, 30, 8 + LTEXT "T&op:", stc17, 88, 192, 30, 8 EDITTEXT edt5, 119, 190, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "下(&B):", stc18, 159, 192, 30, 8 EDITTEXT edt7, 190, 190, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER @@ -460,6 +460,7 @@ FONT 8, "MS Shell Dlg" LTEXT "檔案名稱(&N):",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63,110,150,150 LTEXT "檔案類型(&T):",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Uk.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Uk.rc index 0069f7db43d..c3e943372b5 100644 --- a/reactos/dll/win32/comdlg32/lang/cdlg_Uk.rc +++ b/reactos/dll/win32/comdlg32/lang/cdlg_Uk.rc @@ -95,7 +95,7 @@ STRINGTABLE PD32_PRINTER_STATUS_WARMING_UP "Прогрів; " PD32_PRINTER_STATUS_TONER_LOW "Тонер при кінці; " PD32_PRINTER_STATUS_NO_TONER "Нема тонера; " - PD32_PRINTER_STATUS_PAGE_PUNT "" + PD32_PRINTER_STATUS_PAGE_PUNT "Page punt; " PD32_PRINTER_STATUS_USER_INTERVENTION "Перервано користувачем; " PD32_PRINTER_STATUS_OUT_OF_MEMORY "Мало пам'яті; " PD32_PRINTER_STATUS_DOOR_OPEN "Кришка принтера відкрита; " @@ -263,7 +263,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "&Зразок",grp2,98,72,120,36,WS_GROUP - CTEXT "АаБбAaBb",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "Група символ&ів:",stc7 ,98,114,40,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -278,29 +278,29 @@ FONT 8, "MS Shell Dlg" LTEXT "&Базова палітра:", stc1, 4, 4, 140, 10 LTEXT "Д&одаткові кольори:", stc2, 4, 106, 140, 10 LTEXT "Колір|За&ливка", stc3, 150, 151, 48, 10 - LTEXT "&Черв:", 726 /*1094*/,247,126,27,10 - EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Зелен:",727/*1095*/,247,140,27,10 - EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "С&иній:",728 /*1096*/,247,154,27,10 - EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "Від&тінок:" ,723 /*1091*/,200,126,24,10 - EDITTEXT 703, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Контраст:" ,724 /*1092*/,200,140,24,10 - EDITTEXT 704, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Яскравість:" ,725 /*1093*/,200,154,24,10 - EDITTEXT 705, 224,152,21,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 "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + LTEXT "&Черв:", IDC_COLOR_RL /*1094*/,247,126,27,10 + EDITTEXT IDC_COLOR_EDIT_R, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Зелен:", IDC_COLOR_GL /*1095*/,247,140,27,10 + EDITTEXT IDC_COLOR_EDIT_G, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "С&иній:", IDC_COLOR_BL /*1096*/,247,154,27,10 + EDITTEXT IDC_COLOR_EDIT_B, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "Від&тінок:" , IDC_COLOR_HL /*1091*/,200,126,24,10 + EDITTEXT IDC_COLOR_EDIT_H, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Контраст:", IDC_COLOR_SL /*1092*/,200,140,24,10 + EDITTEXT IDC_COLOR_EDIT_S, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Яскравість:", IDC_COLOR_LL /*1093*/,200,154,24,10 + EDITTEXT IDC_COLOR_EDIT_L, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + CONTROL "" , IDC_COLOR_PREDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 + CONTROL "" , IDC_COLOR_USRDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 + CONTROL "" , IDC_COLOR_GRAPH, "STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 + CONTROL "" , IDC_COLOR_LUMBAR, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 + CONTROL "" , IDC_COLOR_RESULT, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 DEFPUSHBUTTON "OK", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Скасувати", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Довідка", pshHelp,100,166, 44, 14 - PUSHBUTTON "&Додати до набору", 712/*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Визначити колір >>", 719/*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Колір|За&ливка",713,300,200,4,14 /* just a dummy */ + PUSHBUTTON "&Додати до набору", IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Визначити колір >>", IDC_COLOR_DEFINE /*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Колір|За&ливка", IDC_COLOR_RES, 300,200,4,14 /* just a dummy */ } @@ -311,9 +311,9 @@ FONT 8, "MS Shell Dlg" { LTEXT "&Зразок:", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "&Лише слово цілком", chx1, 4, 26, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Враховувати &реґістр", chx2, 4, 42, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Напрям", grp1, 127, 26, 78, 28 + CHECKBOX "&Лише слово цілком", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Враховувати &реґістр", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Напрям", grp1, 147, 21, 58, 38 CONTROL "В&верх", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 35, 12 CONTROL "В&низ", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 163, 38, 35, 12 @@ -460,6 +460,7 @@ FONT 8, "MS Shell Dlg" LTEXT "Ім'я &файлу:",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63,110,150,150 LTEXT "Файли &типу",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Zh.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Zh.rc index f22a3a7e939..41151a41789 100644 --- a/reactos/dll/win32/comdlg32/lang/cdlg_Zh.rc +++ b/reactos/dll/win32/comdlg32/lang/cdlg_Zh.rc @@ -263,7 +263,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "示例",grp2,98,72,120,36,WS_GROUP - CTEXT "中文字体 AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "书写系统(&I):",stc7 ,98,114,40,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -278,29 +278,29 @@ FONT 8, "MS Shell Dlg" LTEXT "基本颜色(&B)：", stc1, 4, 4, 140, 10 LTEXT "自定义颜色(&C)：", stc2, 4, 106, 140, 10 LTEXT "颜色|纯色(&O)", stc3, 150, 151, 48, 10 - LTEXT "红(&R)：", 726 /*1094*/,247,126,27,10 - EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "绿(&G)：",727/*1095*/,247,140,27,10 - EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "蓝(&B)：",728 /*1096*/,247,154,27,10 - EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "色调(&E)：" ,723 /*1091*/,200,126,24,10 - EDITTEXT 703, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "饱和度(&S)：" ,724 /*1092*/,200,140,24,10 - EDITTEXT 704, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "亮度(&L)：" ,725 /*1093*/,200,154,24,10 - EDITTEXT 705, 224,152,21,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 "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + LTEXT "红(&R)：", IDC_COLOR_RL /*1094*/,247,126,27,10 + EDITTEXT IDC_COLOR_EDIT_R, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "绿(&G)：", IDC_COLOR_GL /*1095*/,247,140,27,10 + EDITTEXT IDC_COLOR_EDIT_G, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "蓝(&B)：", IDC_COLOR_BL /*1096*/,247,154,27,10 + EDITTEXT IDC_COLOR_EDIT_B, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "色调(&E)：" , IDC_COLOR_HL /*1091*/,200,126,24,10 + EDITTEXT IDC_COLOR_EDIT_H, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "饱和度(&S)：", IDC_COLOR_SL /*1092*/,200,140,24,10 + EDITTEXT IDC_COLOR_EDIT_S, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "亮度(&L)：", IDC_COLOR_LL /*1093*/,200,154,24,10 + EDITTEXT IDC_COLOR_EDIT_L, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + CONTROL "" , IDC_COLOR_PREDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 + CONTROL "" , IDC_COLOR_USRDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 + CONTROL "" , IDC_COLOR_GRAPH, "STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 + CONTROL "" , IDC_COLOR_LUMBAR, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 + CONTROL "" , IDC_COLOR_RESULT, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 DEFPUSHBUTTON "确定", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "取消", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "帮助", pshHelp,100,166, 44, 14 - PUSHBUTTON "添加到自定义颜色(&A)", 712/*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "定义自定义颜色(&D) >>", 719/*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "颜色|纯色(&O)",713,300,200,4,14 /* just a dummy */ + PUSHBUTTON "添加到自定义颜色(&A)", IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "定义自定义颜色(&D) >>", IDC_COLOR_DEFINE /*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "颜色|纯色(&O)", IDC_COLOR_RES, 300,200,4,14 /* just a dummy */ } @@ -311,11 +311,11 @@ FONT 8, "MS Shell Dlg" { LTEXT "查找(&N)：", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "全字匹配(&W)", chx1, 4, 26, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "区分大小写(&C)", chx2, 4, 42, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "方向", grp1, 127, 26, 78, 28 - CONTROL "上(&U)", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 35, 12 - CONTROL "下(&D)", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 163, 38, 35, 12 + CHECKBOX "全字匹配(&W)", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "区分大小写(&C)", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "方向", grp1, 147, 21, 58, 38 + CONTROL "上(&U)", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 + CONTROL "下(&D)", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 DEFPUSHBUTTON "找下一个(&F)", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "取消", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP @@ -460,6 +460,7 @@ FONT 8, "MS Shell Dlg" LTEXT "文件名(&N):",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63,110,150,150 LTEXT "文件类型(&T)",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/reactos/dll/win32/comdlg32/printdlg.c b/reactos/dll/win32/comdlg32/printdlg.c index 6e6802a5023..c4be31f74d1 100644 --- a/reactos/dll/win32/comdlg32/printdlg.c +++ b/reactos/dll/win32/comdlg32/printdlg.c @@ -22,8 +22,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H //#include //#include @@ -32,19 +30,21 @@ //#include #include +#define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT #include #include -#include #include +#include #include //#include "winerror.h" +#include +#include #include #include -#include //#include "dlgs.h" #include #include "cdlg.h" @@ -165,6 +165,161 @@ static LPWSTR strdupW(LPCWSTR p) return ret; } +/*********************************************************************** + * get_driver_info [internal] + * + * get DRIVER_INFO_3W for the current printer handle, + * alloc the buffer, when needed + */ +static DRIVER_INFO_3W * get_driver_infoW(HANDLE hprn) +{ + DRIVER_INFO_3W *di3 = NULL; + DWORD needed = 0; + BOOL res; + + res = GetPrinterDriverW(hprn, NULL, 3, NULL, 0, &needed); + if (!res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { + di3 = HeapAlloc(GetProcessHeap(), 0, needed); + res = GetPrinterDriverW(hprn, NULL, 3, (LPBYTE)di3, needed, &needed); + } + + if (res) + return di3; + + TRACE("GetPrinterDriverW failed with %u\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, di3); + return NULL; +} + +static DRIVER_INFO_3A * get_driver_infoA(HANDLE hprn) +{ + DRIVER_INFO_3A *di3 = NULL; + DWORD needed = 0; + BOOL res; + + res = GetPrinterDriverA(hprn, NULL, 3, NULL, 0, &needed); + if (!res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { + di3 = HeapAlloc(GetProcessHeap(), 0, needed); + res = GetPrinterDriverA(hprn, NULL, 3, (LPBYTE)di3, needed, &needed); + } + + if (res) + return di3; + + TRACE("GetPrinterDriverA failed with %u\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, di3); + return NULL; +} + + +/*********************************************************************** + * get_printer_info [internal] + * + * get PRINTER_INFO_2W for the current printer handle, + * alloc the buffer, when needed + */ +static PRINTER_INFO_2W * get_printer_infoW(HANDLE hprn) +{ + PRINTER_INFO_2W *pi2 = NULL; + DWORD needed = 0; + BOOL res; + + res = GetPrinterW(hprn, 2, NULL, 0, &needed); + if (!res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { + pi2 = HeapAlloc(GetProcessHeap(), 0, needed); + res = GetPrinterW(hprn, 2, (LPBYTE)pi2, needed, &needed); + } + + if (res) + return pi2; + + TRACE("GetPrinterW failed with %u\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, pi2); + return NULL; +} + +static PRINTER_INFO_2A * get_printer_infoA(HANDLE hprn) +{ + PRINTER_INFO_2A *pi2 = NULL; + DWORD needed = 0; + BOOL res; + + res = GetPrinterA(hprn, 2, NULL, 0, &needed); + if (!res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { + pi2 = HeapAlloc(GetProcessHeap(), 0, needed); + res = GetPrinterA(hprn, 2, (LPBYTE)pi2, needed, &needed); + } + + if (res) + return pi2; + + TRACE("GetPrinterA failed with %u\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, pi2); + return NULL; +} + + +/*********************************************************************** + * update_devmode_handle [internal] + * + * update a devmode handle for the given DEVMODE, alloc the buffer, when needed + */ +static HGLOBAL update_devmode_handleW(HGLOBAL hdm, DEVMODEW *dm) +{ + SIZE_T size = GlobalSize(hdm); + LPVOID ptr; + + /* Increase / alloc the global memory block, when needed */ + if ((dm->dmSize + dm->dmDriverExtra) > size) { + if (hdm) + hdm = GlobalReAlloc(hdm, dm->dmSize + dm->dmDriverExtra, 0); + else + hdm = GlobalAlloc(GMEM_MOVEABLE, dm->dmSize + dm->dmDriverExtra); + } + + if (hdm) { + ptr = GlobalLock(hdm); + if (ptr) { + memcpy(ptr, dm, dm->dmSize + dm->dmDriverExtra); + GlobalUnlock(hdm); + } + else + { + GlobalFree(hdm); + hdm = NULL; + } + } + return hdm; +} + +static HGLOBAL update_devmode_handleA(HGLOBAL hdm, DEVMODEA *dm) +{ + SIZE_T size = GlobalSize(hdm); + LPVOID ptr; + + /* Increase / alloc the global memory block, when needed */ + if ((dm->dmSize + dm->dmDriverExtra) > size) { + if (hdm) + hdm = GlobalReAlloc(hdm, dm->dmSize + dm->dmDriverExtra, 0); + else + hdm = GlobalAlloc(GMEM_MOVEABLE, dm->dmSize + dm->dmDriverExtra); + } + + if (hdm) { + ptr = GlobalLock(hdm); + if (ptr) { + memcpy(ptr, dm, dm->dmSize + dm->dmDriverExtra); + GlobalUnlock(hdm); + } + else + { + GlobalFree(hdm); + hdm = NULL; + } + } + return hdm; +} + /*********************************************************** * convert_to_devmodeA * @@ -325,6 +480,10 @@ static BOOL PRINTDLG_CreateDevNames(HGLOBAL *hmem, const char* DeviceDriverName, LPDEVNAMES lpDevNames; char buf[260]; DWORD dwBufLen = sizeof(buf); + const char *p; + + p = strrchr( DeviceDriverName, '\\' ); + if (p) DeviceDriverName = p + 1; size = strlen(DeviceDriverName) + 1 + strlen(DeviceName) + 1 @@ -368,6 +527,10 @@ static BOOL PRINTDLG_CreateDevNamesW(HGLOBAL *hmem, LPCWSTR DeviceDriverName, LPDEVNAMES lpDevNames; WCHAR bufW[260]; DWORD dwBufLen = sizeof(bufW) / sizeof(WCHAR); + const WCHAR *p; + + p = strrchrW( DeviceDriverName, '\\' ); + if (p) DeviceDriverName = p + 1; size = sizeof(WCHAR)*lstrlenW(DeviceDriverName) + 2 + sizeof(WCHAR)*lstrlenW(DeviceName) + 2 @@ -1362,7 +1525,7 @@ static LRESULT PRINTDLG_WMInitDialog(HWND hDlg, } /* FIXME: I allow more freedom than either Win95 or WinNT, - * which do not agree to what errors should be thrown or not + * which do not agree on what errors should be thrown or not * in case nToPage or nFromPage is out-of-range. */ if (lppd->nMaxPage < lppd->nMinPage) @@ -1624,9 +1787,13 @@ static LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam, /* FALLTHROUGH */ case cmb4: /* Printer combobox */ if (HIWORD(wParam)==CBN_SELCHANGE) { - char PrinterName[256]; - GetDlgItemTextA(hDlg, LOWORD(wParam), PrinterName, 255); + char *PrinterName; + INT index = SendDlgItemMessageW(hDlg, LOWORD(wParam), CB_GETCURSEL, 0, 0); + INT length = SendDlgItemMessageW(hDlg, LOWORD(wParam), CB_GETLBTEXTLEN, index, 0); + PrinterName = HeapAlloc(GetProcessHeap(),0,length+1); + SendDlgItemMessageA(hDlg, LOWORD(wParam), CB_GETLBTEXT, index, (LPARAM)PrinterName); PRINTDLG_ChangePrinterA(hDlg, PrinterName, PrintStructures); + HeapFree(GetProcessHeap(),0,PrinterName); } break; @@ -1775,9 +1942,14 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam, /* FALLTHROUGH */ case cmb4: /* Printer combobox */ if (HIWORD(wParam)==CBN_SELCHANGE) { - WCHAR PrinterName[256]; - GetDlgItemTextW(hDlg, LOWORD(wParam), PrinterName, 255); + WCHAR *PrinterName; + INT index = SendDlgItemMessageW(hDlg, LOWORD(wParam), CB_GETCURSEL, 0, 0); + INT length = SendDlgItemMessageW(hDlg, LOWORD(wParam), CB_GETLBTEXTLEN, index, 0); + + PrinterName = HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*(length+1)); + SendDlgItemMessageW(hDlg, LOWORD(wParam), CB_GETLBTEXT, index, (LPARAM)PrinterName); PRINTDLG_ChangePrinterW(hDlg, PrinterName, PrintStructures); + HeapFree(GetProcessHeap(),0,PrinterName); } break; @@ -2022,7 +2194,7 @@ static BOOL PRINTDLG_CreateDCA(LPPRINTDLGA lppd) } GlobalUnlock(lppd->hDevNames); GlobalUnlock(lppd->hDevMode); - return lppd->hDC ? TRUE : FALSE; + return lppd->hDC != NULL; } static BOOL PRINTDLG_CreateDCW(LPPRINTDLGW lppd) @@ -2043,7 +2215,7 @@ static BOOL PRINTDLG_CreateDCW(LPPRINTDLGW lppd) } GlobalUnlock(lppd->hDevNames); GlobalUnlock(lppd->hDevMode); - return lppd->hDC ? TRUE : FALSE; + return lppd->hDC != NULL; } /*********************************************************************** @@ -3219,10 +3391,14 @@ static BOOL pagesetup_wm_command(HWND hDlg, WPARAM wParam, LPARAM lParam, pagese case cmb1: /* Printer combo */ if(msg == CBN_SELCHANGE) { - WCHAR name[256]; - GetDlgItemTextW(hDlg, id, name, sizeof(name) / sizeof(name[0])); + WCHAR *name; + INT index = SendDlgItemMessageW(hDlg, id, CB_GETCURSEL, 0, 0); + INT length = SendDlgItemMessageW(hDlg, id, CB_GETLBTEXTLEN, index, 0); + name = HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*(length+1)); + SendDlgItemMessageW(hDlg, id, CB_GETLBTEXT, index, (LPARAM)name); pagesetup_change_printer(name, data); pagesetup_init_combos(hDlg, data); + HeapFree(GetProcessHeap(),0,name); } break; case cmb2: /* Paper combo */ @@ -3760,6 +3936,83 @@ BOOL WINAPI PageSetupDlgW(LPPAGESETUPDLGW setupdlg) return pagesetup_common(&data); } +static void pdlgex_to_pdlg(const PRINTDLGEXW *pdlgex, PRINTDLGW *pdlg) +{ + pdlg->lStructSize = sizeof(*pdlg); + pdlg->hwndOwner = pdlgex->hwndOwner; + pdlg->hDevMode = pdlgex->hDevMode; + pdlg->hDevNames = pdlgex->hDevNames; + pdlg->hDC = pdlgex->hDC; + pdlg->Flags = pdlgex->Flags; + if ((pdlgex->Flags & PD_NOPAGENUMS) || !pdlgex->nPageRanges || !pdlgex->lpPageRanges) + { + pdlg->nFromPage = 0; + pdlg->nToPage = 65534; + } + else + { + pdlg->nFromPage = pdlgex->lpPageRanges[0].nFromPage; + pdlg->nToPage = pdlgex->lpPageRanges[0].nToPage; + } + pdlg->nMinPage = pdlgex->nMinPage; + pdlg->nMaxPage = pdlgex->nMaxPage; + pdlg->nCopies = pdlgex->nCopies; + pdlg->hInstance = pdlgex->hInstance; + pdlg->lCustData = 0; + pdlg->lpfnPrintHook = NULL; + pdlg->lpfnSetupHook = NULL; + pdlg->lpPrintTemplateName = pdlgex->lpPrintTemplateName; + pdlg->lpSetupTemplateName = NULL; + pdlg->hPrintTemplate = NULL; + pdlg->hSetupTemplate = NULL; +} + +/* Only copy fields that are supposed to be changed. */ +static void pdlg_to_pdlgex(const PRINTDLGW *pdlg, PRINTDLGEXW *pdlgex) +{ + pdlgex->hDevMode = pdlg->hDevMode; + pdlgex->hDevNames = pdlg->hDevNames; + pdlgex->hDC = pdlg->hDC; + if (!(pdlgex->Flags & PD_NOPAGENUMS) && pdlgex->nPageRanges && pdlgex->lpPageRanges) + { + pdlgex->lpPageRanges[0].nFromPage = pdlg->nFromPage; + pdlgex->lpPageRanges[0].nToPage = pdlg->nToPage; + } + pdlgex->nMinPage = pdlg->nMinPage; + pdlgex->nMaxPage = pdlg->nMaxPage; + pdlgex->nCopies = pdlg->nCopies; +} + +struct callback_data +{ + IPrintDialogCallback *callback; + IObjectWithSite *object; +}; + +static UINT_PTR CALLBACK pdlgex_hook_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + if (msg == WM_INITDIALOG) + { + PRINTDLGW *pd = (PRINTDLGW *)lp; + struct callback_data *cb = (struct callback_data *)pd->lCustData; + + if (cb->callback) + { + cb->callback->lpVtbl->SelectionChange(cb->callback); + cb->callback->lpVtbl->InitDone(cb->callback); + } + } + else + { +/* FIXME: store interface pointer somewhere in window properties and call it + HRESULT hres; + cb->callback->lpVtbl->HandleMessage(cb->callback, hwnd, msg, wp, lp, &hres); +*/ + } + + return 0; +} + /*********************************************************************** * PrintDlgExA (COMDLG32.@) * @@ -3771,24 +4024,34 @@ BOOL WINAPI PageSetupDlgW(LPPAGESETUPDLGW setupdlg) */ HRESULT WINAPI PrintDlgExA(LPPRINTDLGEXA lppd) { - DWORD ret = E_FAIL; - LPVOID ptr; + PRINTER_INFO_2A *pbuf; + DRIVER_INFO_3A *dbuf; + DEVMODEA *dm; + HRESULT hr = S_OK; + HANDLE hprn; - FIXME("(%p) not fully implemented\n", lppd); if ((lppd == NULL) || (lppd->lStructSize != sizeof(PRINTDLGEXA))) return E_INVALIDARG; if (!IsWindow(lppd->hwndOwner)) return E_HANDLE; + if (lppd->nStartPage != START_PAGE_GENERAL) + { + if (!lppd->nPropertyPages) + return E_INVALIDARG; + + FIXME("custom property sheets (%d at %p) not supported\n", lppd->nPropertyPages, lppd->lphPropertyPages); + } + + /* Use PD_NOPAGENUMS or set nMaxPageRanges and lpPageRanges */ + if (!(lppd->Flags & PD_NOPAGENUMS) && (!lppd->nMaxPageRanges || !lppd->lpPageRanges)) + { + return E_INVALIDARG; + } + if (lppd->Flags & PD_RETURNDEFAULT) { - PRINTER_INFO_2A *pbuf; - DRIVER_INFO_2A *dbuf; - HANDLE hprn; - DWORD needed = 1024; - BOOL bRet; - if (lppd->hDevMode || lppd->hDevNames) { WARN("hDevMode or hDevNames non-zero for PD_RETURNDEFAULT\n"); @@ -3802,66 +4065,86 @@ HRESULT WINAPI PrintDlgExA(LPPRINTDLGEXA lppd) return E_FAIL; } - pbuf = HeapAlloc(GetProcessHeap(), 0, needed); - bRet = GetPrinterA(hprn, 2, (LPBYTE)pbuf, needed, &needed); - if (!bRet && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) + pbuf = get_printer_infoA(hprn); + if (!pbuf) { - HeapFree(GetProcessHeap(), 0, pbuf); - pbuf = HeapAlloc(GetProcessHeap(), 0, needed); - bRet = GetPrinterA(hprn, 2, (LPBYTE)pbuf, needed, &needed); - } - if (!bRet) - { - HeapFree(GetProcessHeap(), 0, pbuf); ClosePrinter(hprn); return E_FAIL; } - needed = 1024; - dbuf = HeapAlloc(GetProcessHeap(), 0, needed); - bRet = GetPrinterDriverA(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed); - if (!bRet && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) + dbuf = get_driver_infoA(hprn); + if (!dbuf) { - HeapFree(GetProcessHeap(), 0, dbuf); - dbuf = HeapAlloc(GetProcessHeap(), 0, needed); - bRet = GetPrinterDriverA(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed); - } - if (!bRet) - { - ERR("GetPrinterDriverА failed, last error %d, fix your config for printer %s!\n", - GetLastError(), pbuf->pPrinterName); - HeapFree(GetProcessHeap(), 0, dbuf); HeapFree(GetProcessHeap(), 0, pbuf); COMDLG32_SetCommDlgExtendedError(PDERR_RETDEFFAILURE); ClosePrinter(hprn); return E_FAIL; } - ClosePrinter(hprn); + dm = pbuf->pDevMode; + } + else + { + PRINTDLGA pdlg; + struct callback_data cb_data = { 0 }; - PRINTDLG_CreateDevNames(&(lppd->hDevNames), - dbuf->pDriverPath, - pbuf->pPrinterName, - pbuf->pPortName); - lppd->hDevMode = GlobalAlloc(GMEM_MOVEABLE, pbuf->pDevMode->dmSize + - pbuf->pDevMode->dmDriverExtra); - if (lppd->hDevMode) + FIXME("(%p) semi-stub\n", lppd); + + if (lppd->lpCallback) { - ptr = GlobalLock(lppd->hDevMode); - if (ptr) - { - memcpy(ptr, pbuf->pDevMode, pbuf->pDevMode->dmSize + - pbuf->pDevMode->dmDriverExtra); - GlobalUnlock(lppd->hDevMode); - ret = S_OK; - } + IUnknown_QueryInterface((IUnknown *)lppd->lpCallback, &IID_IPrintDialogCallback, (void **)&cb_data.callback); + IUnknown_QueryInterface((IUnknown *)lppd->lpCallback, &IID_IObjectWithSite, (void **)&cb_data.object); } - HeapFree(GetProcessHeap(), 0, pbuf); - HeapFree(GetProcessHeap(), 0, dbuf); - return ret; + /* + * PRINTDLGEXA/W and PRINTDLGA/W layout is the same for A and W variants. + */ + pdlgex_to_pdlg((const PRINTDLGEXW *)lppd, (PRINTDLGW *)&pdlg); + pdlg.Flags |= PD_ENABLEPRINTHOOK; + pdlg.lpfnPrintHook = pdlgex_hook_proc; + pdlg.lCustData = (LPARAM)&cb_data; + + if (PrintDlgA(&pdlg)) + { + pdlg_to_pdlgex((const PRINTDLGW *)&pdlg, (PRINTDLGEXW *)lppd); + lppd->dwResultAction = PD_RESULT_PRINT; + } + else + lppd->dwResultAction = PD_RESULT_CANCEL; + + if (cb_data.callback) + cb_data.callback->lpVtbl->Release(cb_data.callback); + if (cb_data.object) + cb_data.object->lpVtbl->Release(cb_data.object); + + return S_OK; } - return E_NOTIMPL; + ClosePrinter(hprn); + + PRINTDLG_CreateDevNames(&(lppd->hDevNames), dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName); + if (!lppd->hDevNames) + hr = E_FAIL; + + lppd->hDevMode = update_devmode_handleA(lppd->hDevMode, dm); + if (!hr && lppd->hDevMode) { + if (lppd->Flags & PD_RETURNDC) { + lppd->hDC = CreateDCA(dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName, dm); + if (!lppd->hDC) + hr = E_FAIL; + } + else if (lppd->Flags & PD_RETURNIC) { + lppd->hDC = CreateICA(dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName, dm); + if (!lppd->hDC) + hr = E_FAIL; + } + } + else + hr = E_FAIL; + + HeapFree(GetProcessHeap(), 0, pbuf); + HeapFree(GetProcessHeap(), 0, dbuf); + + return hr; } /*********************************************************************** @@ -3892,10 +4175,11 @@ HRESULT WINAPI PrintDlgExA(LPPRINTDLGEXA lppd) */ HRESULT WINAPI PrintDlgExW(LPPRINTDLGEXW lppd) { - DWORD ret = E_FAIL; - LPVOID ptr; - - FIXME("(%p) not fully implemented\n", lppd); + PRINTER_INFO_2W *pbuf; + DRIVER_INFO_3W *dbuf; + DEVMODEW *dm; + HRESULT hr = S_OK; + HANDLE hprn; if ((lppd == NULL) || (lppd->lStructSize != sizeof(PRINTDLGEXW))) { return E_INVALIDARG; @@ -3905,12 +4189,21 @@ HRESULT WINAPI PrintDlgExW(LPPRINTDLGEXW lppd) return E_HANDLE; } + if (lppd->nStartPage != START_PAGE_GENERAL) + { + if (!lppd->nPropertyPages) + return E_INVALIDARG; + + FIXME("custom property sheets (%d at %p) not supported\n", lppd->nPropertyPages, lppd->lphPropertyPages); + } + + /* Use PD_NOPAGENUMS or set nMaxPageRanges and lpPageRanges */ + if (!(lppd->Flags & PD_NOPAGENUMS) && (!lppd->nMaxPageRanges || !lppd->lpPageRanges)) + { + return E_INVALIDARG; + } + if (lppd->Flags & PD_RETURNDEFAULT) { - PRINTER_INFO_2W *pbuf; - DRIVER_INFO_2W *dbuf; - HANDLE hprn; - DWORD needed = 1024; - BOOL bRet; if (lppd->hDevMode || lppd->hDevNames) { WARN("hDevMode or hDevNames non-zero for PD_RETURNDEFAULT\n"); @@ -3923,58 +4216,81 @@ HRESULT WINAPI PrintDlgExW(LPPRINTDLGEXW lppd) return E_FAIL; } - pbuf = HeapAlloc(GetProcessHeap(), 0, needed); - bRet = GetPrinterW(hprn, 2, (LPBYTE)pbuf, needed, &needed); - if (!bRet && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { - HeapFree(GetProcessHeap(), 0, pbuf); - pbuf = HeapAlloc(GetProcessHeap(), 0, needed); - bRet = GetPrinterW(hprn, 2, (LPBYTE)pbuf, needed, &needed); - } - if (!bRet) { - HeapFree(GetProcessHeap(), 0, pbuf); + pbuf = get_printer_infoW(hprn); + if (!pbuf) + { ClosePrinter(hprn); return E_FAIL; } - needed = 1024; - dbuf = HeapAlloc(GetProcessHeap(), 0, needed); - bRet = GetPrinterDriverW(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed); - if (!bRet && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { - HeapFree(GetProcessHeap(), 0, dbuf); - dbuf = HeapAlloc(GetProcessHeap(), 0, needed); - bRet = GetPrinterDriverW(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed); - } - if (!bRet) { - ERR("GetPrinterDriverW failed, last error %d, fix your config for printer %s!\n", - GetLastError(), debugstr_w(pbuf->pPrinterName)); - HeapFree(GetProcessHeap(), 0, dbuf); + dbuf = get_driver_infoW(hprn); + if (!dbuf) + { HeapFree(GetProcessHeap(), 0, pbuf); COMDLG32_SetCommDlgExtendedError(PDERR_RETDEFFAILURE); ClosePrinter(hprn); return E_FAIL; } - ClosePrinter(hprn); + dm = pbuf->pDevMode; + } + else + { + PRINTDLGW pdlg; + struct callback_data cb_data = { 0 }; - PRINTDLG_CreateDevNamesW(&(lppd->hDevNames), - dbuf->pDriverPath, - pbuf->pPrinterName, - pbuf->pPortName); - lppd->hDevMode = GlobalAlloc(GMEM_MOVEABLE, pbuf->pDevMode->dmSize + - pbuf->pDevMode->dmDriverExtra); - if (lppd->hDevMode) { - ptr = GlobalLock(lppd->hDevMode); - if (ptr) { - memcpy(ptr, pbuf->pDevMode, pbuf->pDevMode->dmSize + - pbuf->pDevMode->dmDriverExtra); - GlobalUnlock(lppd->hDevMode); - ret = S_OK; - } + FIXME("(%p) semi-stub\n", lppd); + + if (lppd->lpCallback) + { + IUnknown_QueryInterface((IUnknown *)lppd->lpCallback, &IID_IPrintDialogCallback, (void **)&cb_data.callback); + IUnknown_QueryInterface((IUnknown *)lppd->lpCallback, &IID_IObjectWithSite, (void **)&cb_data.object); } - HeapFree(GetProcessHeap(), 0, pbuf); - HeapFree(GetProcessHeap(), 0, dbuf); - return ret; + pdlgex_to_pdlg(lppd, &pdlg); + pdlg.Flags |= PD_ENABLEPRINTHOOK; + pdlg.lpfnPrintHook = pdlgex_hook_proc; + pdlg.lCustData = (LPARAM)&cb_data; + + if (PrintDlgW(&pdlg)) + { + pdlg_to_pdlgex(&pdlg, lppd); + lppd->dwResultAction = PD_RESULT_PRINT; + } + else + lppd->dwResultAction = PD_RESULT_CANCEL; + + if (cb_data.callback) + cb_data.callback->lpVtbl->Release(cb_data.callback); + if (cb_data.object) + cb_data.object->lpVtbl->Release(cb_data.object); + + return S_OK; } - return E_NOTIMPL; + ClosePrinter(hprn); + + PRINTDLG_CreateDevNamesW(&(lppd->hDevNames), dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName); + if (!lppd->hDevNames) + hr = E_FAIL; + + lppd->hDevMode = update_devmode_handleW(lppd->hDevMode, dm); + if (!hr && lppd->hDevMode) { + if (lppd->Flags & PD_RETURNDC) { + lppd->hDC = CreateDCW(dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName, dm); + if (!lppd->hDC) + hr = E_FAIL; + } + else if (lppd->Flags & PD_RETURNIC) { + lppd->hDC = CreateICW(dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName, dm); + if (!lppd->hDC) + hr = E_FAIL; + } + } + else + hr = E_FAIL; + + HeapFree(GetProcessHeap(), 0, pbuf); + HeapFree(GetProcessHeap(), 0, dbuf); + + return hr; } diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 7bbf79d4e98..9a71c4653c1 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -61,7 +61,7 @@ reactos/dll/win32/cabinet # Synced to Wine-1.5.26 reactos/dll/win32/clusapi # Synced to Wine-1.7.1 reactos/dll/win32/comcat # Synced to Wine-1.7.1 reactos/dll/win32/comctl32 # Synced to Wine 1.7.1 -reactos/dll/win32/comdlg32 # Synced to Wine 1.3.37 +reactos/dll/win32/comdlg32 # Synced to Wine 1.7.1 reactos/dll/win32/compstui # Synced to Wine-1.5.19 reactos/dll/win32/credui # Synced to Wine-1.7.1 reactos/dll/win32/crypt32 # Synced to Wine-1.7.1