Ros-diffs

ros-diffs@reactos.org

81390 discussions

[winesync] 29063: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 15 Sep '07

15 Sep '07

Author: winesync Date: Sat Sep 15 21:06:51 2007 New Revision: 29063 URL: http://svn.reactos.org/svn/reactos?rev=29063&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/comdlg32/cdlg_No.rc trunk/reactos/dll/win32/comdlg32/cdlg_Pt.rc trunk/reactos/dll/win32/comdlg32/cdlg_Uk.rc trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild trunk/reactos/dll/win32/comdlg32/comdlg32_ros.diff trunk/reactos/dll/win32/comdlg32/fontdlg.c trunk/reactos/dll/win32/comdlg32/printdlg.c trunk/reactos/dll/win32/comdlg32/printdlg16.c Modified: trunk/reactos/dll/win32/comdlg32/cdlg_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_No… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/cdlg_No.rc (original) +++ trunk/reactos/dll/win32/comdlg32/cdlg_No.rc Sat Sep 15 21:06:51 2007 @@ -1,5 +1,5 @@ /* - * Copyright 2005 Alexander N. Sørnes + * Copyright 2005-2007 Alexander N. Sørnes * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -134,8 +134,8 @@ PUSHBUTTON "&Bruk", psh3,218,40,40,14,WS_GROUP | WS_TABSTOP PUSHBUTTON "&Hjelp" , pshHelp,218,57,40,14,WS_GROUP | WS_TABSTOP GROUPBOX "Effekter",grp1,6,72,84,34,WS_GROUP - CHECKBOX "Gjennomstre&ket", chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Understreket", chx2, 10,94,50,10, BS_AUTOCHECKBOX + CHECKBOX "Gjennomstre&ket", chx1, 10,82,70,10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "&Understreket", chx2, 10,94,70,10, BS_AUTOCHECKBOX LTEXT "&Farge:", stc4 ,6,110,30,9 COMBOBOX cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP @@ -189,10 +189,10 @@ LTEXT "Fi&nn:", -1, 4, 8, 42, 8 EDITTEXT edt1, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP CHECKBOX "Finn &kun hele ord", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Skill &mellom store/små bokstaver", chx2, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Retning", grp1, 107, 26, 68, 28 - CONTROL "&Opp", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12 - CONTROL "&Ned", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 + CHECKBOX "Skill &mellom store og små bokstaver", chx2, 4, 42, 125, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Retning", grp1, 137, 23, 40, 36 + CONTROL "&Opp", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 141, 31, 30, 12 + CONTROL "&Ned", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 141, 44, 30, 12 DEFPUSHBUTTON "&Finn neste", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Avbryt", IDCANCEL , 182, 23, 50, 14, WS_GROUP | WS_TABSTOP @@ -210,7 +210,7 @@ LTEXT "&Erstatt med:", -1, 4, 26, 48, 8 EDITTEXT edt2, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP CHECKBOX "Finn kun &hele ord", chx1, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Skill mellom store og små bokstaver", chx2, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Skill mellom store og små bokstaver", chx2, 5, 62, 125, 12, BS_AUTOCHECKBOX | WS_TABSTOP DEFPUSHBUTTON "&Finn neste", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "E&rsatt", psh1 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Pt… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/cdlg_Pt.rc (original) +++ trunk/reactos/dll/win32/comdlg32/cdlg_Pt.rc Sat Sep 15 21:06:51 2007 @@ -1,7 +1,7 @@ /* * Copyright 1997 Ricardo R. Massaro * Copyright 2003 Marcelo Duarte - * Copyright 2006 Américo José Melo + * Copyright 2006-2007 Américo José Melo * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -55,7 +55,7 @@ LTEXT "Nome do &Ficheiro:", 1090, 6, 6, 76, 9 EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "&DirectÃ³rios:", -1, 110, 6, 92, 9 + LTEXT "&Directórios:", -1, 110, 6, 92, 9 LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP LTEXT "Listar Ficheiros do &Tipo:", 1089, 6, 104, 90, 9 @@ -102,7 +102,7 @@ LTEXT "Nome do &Ficheiro:", 1090, 6, 6, 76, 9 EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "&DirectÃ³rios:", -1, 110, 6, 92, 9 + LTEXT "&Directórios:", -1, 110, 6, 92, 9 LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP LTEXT "Listar Ficheiros do &Tipo:", 1089, 6, 104, 90, 9 @@ -149,16 +149,16 @@ { LTEXT "Impressora:", 1088, 6, 6, 40, 9 LTEXT "", 1089, 60, 6, 150, 9 - GROUPBOX "Faixa de ImpressÃ£o", 1072, 6, 30, 160, 65, BS_GROUPBOX + GROUPBOX "Faixa de Impressão", 1072, 6, 30, 160, 65, BS_GROUPBOX RADIOBUTTON "&Tudo", 1056, 16, 45, 60, 12 - RADIOBUTTON "S&elecÃ§Ã£o", 1057, 16, 60, 60, 12 - RADIOBUTTON "&PÃ¡ginas", 1058, 16, 75, 60, 12 + RADIOBUTTON "S&elecção", 1057, 16, 60, 60, 12 + RADIOBUTTON "&Páginas", 1058, 16, 75, 60, 12 DEFPUSHBUTTON "Imprimir", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancelar", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Configurar", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP LTEXT "&De:", 1090, 60, 80, 30, 9 - LTEXT "&AtÃ©:", 1091, 120, 80, 30, 9 - LTEXT "&Qualidade de ImpressÃ£o:", 1092, 6, 100, 76, 9 + LTEXT "&Até:", 1091, 120, 80, 30, 9 + LTEXT "&Qualidade de Impressão:", 1092, 6, 100, 76, 9 COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP CHECKBOX "Imprimir para Ficheiro", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "C&ondensado", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP @@ -196,25 +196,25 @@ PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ConfiguraÃ§Ãµes de ImpressÃ£o" +CAPTION "Configurações de Impressão" FONT 8, "MS Shell Dlg" { GROUPBOX "Impressora", 1072, 6, 10, 180, 65, BS_GROUPBOX - RADIOBUTTON "&Impressora Prdefinida", 1056, 16, 20, 80, 12 + RADIOBUTTON "&Impressora Predefinida", 1056, 16, 20, 80, 12 LTEXT "[none]", 1088, 35, 35, 120, 9 - RADIOBUTTON "Impressora &EspecÃfica", 1057, 16, 50, 80, 12 + RADIOBUTTON "Impressora &Específica", 1057, 16, 50, 80, 12 COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancelar", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Configurar", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP - GROUPBOX "OrientaÃ§Ã£o", 1073, 6, 85, 100, 50, BS_GROUPBOX + GROUPBOX "Orientação", 1073, 6, 85, 100, 50, BS_GROUPBOX RADIOBUTTON "&Retrato", 1058, 50, 100, 40, 12 RADIOBUTTON "&Paisagem", 1059, 50, 115, 40, 12 ICON "LANDSCAP", 1097, 10, 95, 32, 32 ICON "PORTRAIT", 1098, 10, 95, 32, 32 GROUPBOX "Papel", 1074, 120, 85, 180, 50, BS_GROUPBOX LTEXT "&Tamanho", 1089, 130, 95, 30, 9 - LTEXT "&Fonte de AlimentaÃ§Ã£o", 1090, 130, 110, 30, 9 + LTEXT "&Fonte de Alimentação", 1090, 130, 110, 30, 9 COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP } @@ -323,6 +323,40 @@ PUSHBUTTON "&o",713,300,200,4,14 /* just a dummy: 'o' is like &o in "solid&o" */ } +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 185 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Cor" +FONT 8, "MS Shell Dlg" +{ +LTEXT "Cores &Básicas:", 1088, 4, 4, 140, 10 +LTEXT "&Cores do Utilizador:", 1089, 4, 106, 140, 10 +LTEXT "Colorido|Sólid&o", 1090, 150, 151, 48, 10 +LTEXT "Ver&melho:", 726 /*1094*/,249,126,24,10 +EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP +LTEXT "&Verde:",727/*1095*/,249,140,24,10 +EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP +LTEXT "A&zul:",728 /*1096*/,249,154,24,10 +EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP +LTEXT "Mat&iz:" ,723 /*1091*/,202,126,22,10 +EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP +LTEXT "Sa&t:" ,724 /*1092*/,202,140,22,10 +EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP +LTEXT "&Lum:" ,725 /*1093*/,202,154,22,10 +EDITTEXT 705, 226,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 +DEFPUSHBUTTON "OK", IDOK, 4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP +PUSHBUTTON "Cancelar", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP +PUSHBUTTON "Aj&uda", 1038,100,166, 44, 14 +PUSHBUTTON "&Adicionar Cor Personalizada", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP +PUSHBUTTON "&Definir Cores Personalizadas >>", 719/*1025*/, 4, 150, 142, 14, WS_GROUP | WS_TABSTOP +PUSHBUTTON "&o",713,300,200,4,14 /* just a dummy: 'o' is like &o in "solid&o" */ +} LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN @@ -354,12 +388,12 @@ LTEXT "&Procurar:", -1, 4, 8, 42, 8 EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP CHECKBOX "Palavra &Inteira", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "&Maisculas/minusculas", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "DirecÃ§Ã£o", 1072, 107, 26, 68, 28 + CHECKBOX "&Maiúsculas/minúsculas", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Direcção", 1072, 107, 26, 68, 28 CONTROL "A&cima", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12 CONTROL "A&baixo", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 - DEFPUSHBUTTON "&Find Next", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Procurar Próximo", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancelar", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "A&juda", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP } @@ -398,9 +432,9 @@ LTEXT "Substituir Pa&ra:", -1, 4, 26, 48, 8 EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP CHECKBOX "Palavra &inteira", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "&Maisculas/minsculas", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP - - DEFPUSHBUTTON "Procurar PrÃ³xima", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + CHECKBOX "&Maiúsculas/minúsculas", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP + + DEFPUSHBUTTON "Procurar Próxima", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "&Substituir", psh1, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Substituir &Todas", psh2, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancelar", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP @@ -463,7 +497,7 @@ PUSHBUTTON "&Ajuda", pshHelp, 50, 161, 50,14, WS_GROUP GROUPBOX "Impressora", grp4, 8, 4, 272,84, WS_GROUP - CONTROL "Imprimir em &ficheiro", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12 + CONTROL "Imprimir para &ficheiro", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12 PUSHBUTTON "Propri&edades", psh2, 212, 17, 60,14, WS_GROUP LTEXT "&Nome:", stc6, 16, 20, 36,8 COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP @@ -471,25 +505,25 @@ LTEXT "Estado 'Dummy'", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Tipo:", stc7, 16, 48, 36,10, SS_NOPREFIX LTEXT "Tipo 'Dummy'", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Onde:", stc10, 16, 60, 36,10, SS_NOPREFIX - LTEXT "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "ComentÃ¡rio:", stc9, 16, 72, 36,10, SS_NOPREFIX - LTEXT "ComentÃ¡rio 'Dummy'", stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - - GROUPBOX "CÃ³pias", grp2, 160, 92, 120,64, WS_GROUP - LTEXT "Nmero de &cÃ³pias:", stc5, 168,108, 68, 8 + LTEXT "Localizaça:", stc10, 16, 60, 36,10, SS_NOPREFIX + LTEXT "Localizaçao 'Dummy'", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Comentário:", stc9, 16, 72, 36,10, SS_NOPREFIX + LTEXT "Comentário 'Dummy'", stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + + GROUPBOX "Cópias", grp2, 160, 92, 120,64, WS_GROUP + LTEXT "Número de &cópias:", stc5, 168,108, 68, 8 ICON "", ico3, 162,124, 76,24, WS_GROUP | SS_CENTERIMAGE CONTROL "&Agrupar", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,240,130,36,12 EDITTEXT edt3, 240,106, 32,12, WS_GROUP | ES_NUMBER - GROUPBOX "Faixa de impressÃ£o", grp1, 8,92, 144,64, WS_GROUP + GROUPBOX "Faixa de impressão", grp1, 8,92, 144,64, WS_GROUP CONTROL "&Todos", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "PÃ¡ginas", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "SelecÃ§Ã£o", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + CONTROL "Páginas", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 + CONTROL "Selecção", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 EDITTEXT edt1, 74,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 118,122, 26,12, WS_GROUP | ES_NUMBER RTEXT "&de:", stc2, 52,124, 20,8 - RTEXT "&atÃ©", stc3, 100,124, 16,8 + RTEXT "&até", stc3, 100,124, 16,8 } @@ -535,7 +569,7 @@ PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 178 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP | DS_3DLOOK -CAPTION "Print Setup" +CAPTION "Configuração de Impressão" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,180,156,50,14,WS_GROUP @@ -550,10 +584,10 @@ LTEXT "EStado 'Dummy'", stc12, 52, 36, 224, 10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Tipo:", stc7, 16, 48, 36, 10, SS_NOPREFIX LTEXT "Tipo 'Dummy'", stc11, 52, 48, 224, 10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "LocalizaÃ§Ã£o:", stc10, 16, 60, 36, 10, SS_NOPREFIX - LTEXT "LocalizaÃ§Ã£o 'Dummy'", stc14, 52, 60, 224, 10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "ComentÃ¡rio", stc9, 16, 72, 36, 10, SS_NOPREFIX - LTEXT "ComentÃ¡rio 'Dummy'", stc13, 52, 72, 224, 10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Localização:", stc10, 16, 60, 36, 10, SS_NOPREFIX + LTEXT "Localização 'Dummy'", stc14, 52, 60, 224, 10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Comentário", stc9, 16, 72, 36, 10, SS_NOPREFIX + LTEXT "Comentário 'Dummy'", stc13, 52, 72, 224, 10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Papel", grp2, 8, 92, 164, 56, WS_GROUP LTEXT "&Tamanho:", stc2, 16, 108, 36, 8 @@ -561,7 +595,7 @@ LTEXT "&Origem:", stc3, 16, 128, 36, 8 COMBOBOX cmb3, 52, 126, 112, 112, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - GROUPBOX "OrientaÃ§Ã£o", grp1, 180, 92, 100, 56, WS_GROUP + GROUPBOX "Orientação", grp1, 180, 92, 100, 56, WS_GROUP ICON "", ico1, 195, 112, 18, 20, WS_GROUP CONTROL "&Retrato", rad1, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 224, 106, 52, 12 CONTROL "&Paisagem", rad2, "Button", BS_AUTORADIOBUTTON, 224, 126, 52, 12 @@ -604,7 +638,7 @@ PAGESETUPDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 240, 240 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ConfiguraÃ§Ãµes de PÃ¡gina" +CAPTION "Configurações de Página" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80 @@ -615,7 +649,7 @@ COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL LTEXT "&Bandeja:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL - GROUPBOX "OrientaÃ§ao", grp1, 8, 156, 64, 56, BS_GROUPBOX + GROUPBOX "Orientação", grp1, 8, 156, 64, 56, BS_GROUPBOX AUTORADIOBUTTON "&Retrato", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON AUTORADIOBUTTON "&Paisagem", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "Bordas", grp4, 80, 156, 152, 56, BS_GROUPBOX @@ -678,7 +712,7 @@ LTEXT "Ficheiros do &tipo:",IDC_FILETYPESTATIC,5,131,48,16, SS_NOTIFY COMBOBOX IDC_FILETYPE,54,129,155,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Abrir como &apenas- leitura",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,148,74,10 + CONTROL "Abrir como &apenas-leitura",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,148,74,10 DEFPUSHBUTTON "&Abrir", IDOK,222,110,50,14 PUSHBUTTON "Cancelar", IDCANCEL,222,128,50,14 @@ -704,12 +738,12 @@ STRINGTABLE DISCARDABLE { - IDS_ABOUTBOX "&Acerca do FolderPicker Test" + IDS_ABOUTBOX "&Acerca do Teste FolderPicker" IDS_DOCUMENTFOLDERS "Pastas de Documentos" IDS_PERSONAL "Os Meus Documentos" IDS_FAVORITES "Favoritos" - IDS_PATH "LocalizaÃ§Ã£o do Sistema" - IDS_DESKTOP "Ãrea de Trabalho" + IDS_PATH "Localização do Sistema" + IDS_DESKTOP "Ecrã" IDS_FONTS "Tipos de Letra" IDS_MYCOMPUTER "O Meu Computador" } @@ -736,15 +770,15 @@ STRINGTABLE DISCARDABLE { IDS_SYSTEMFOLDERS "Pastas do Sistema" - IDS_LOCALHARDRIVES "Discos RÃgidos Locais" - IDS_FILENOTFOUND "Ficheiro nÃ£o encontrado" + IDS_LOCALHARDRIVES "Discos Rígidos Locais" + IDS_FILENOTFOUND "Ficheiro não encontrado" IDS_VERIFYFILE "Por favor verifique se foi fornecido o nome correcto do ficheiro" - IDS_CREATEFILE "O ficheiro nÃ£o existe\nGostaria de o criar" - IDS_OVERWRITEFILE "O ficheiro jÃ¡ existe.\nGostaria de o substituir?" - IDS_INVALID_FILENAME_TITLE "Caracter(es) invÃ¡lidos na localizaÃ§Ã£o" - IDS_INVALID_FILENAME "Um nome de ficheiro nÃ£o pode conter quaisquer dos seguintes caracteres: \n / : < > |" - IDS_PATHNOTEXISTING "A localizaÃ§Ã£o nÃ£o existe" - IDS_FILENOTEXISTING "O ficheiro nÃ£o existe" + IDS_CREATEFILE "O ficheiro não existe\nGostaria de o criar" + IDS_OVERWRITEFILE "O ficheiro já existe.\nGostaria de o substituir?" + IDS_INVALID_FILENAME_TITLE "Caracter(es) inválidos na localização" + IDS_INVALID_FILENAME "Um nome de ficheiro não pode conter quaisquer dos seguintes caracteres: \n / : < > |" + IDS_PATHNOTEXISTING "A localização não existe" + IDS_FILENOTEXISTING "O ficheiro não existe" } @@ -763,11 +797,11 @@ STRINGTABLE DISCARDABLE { - IDS_UPFOLDER "Um NÃvel Acima" + IDS_UPFOLDER "Um Nível Acima" IDS_NEWFOLDER "Criar Nova Pasta" IDS_LISTVIEW "Lista" IDS_REPORTVIEW "Detalhes" - IDS_TODESKTOP "Ãrea de Trabalho" + IDS_TODESKTOP "Ecrã" } @@ -836,26 +870,26 @@ { PD32_PRINT_TITLE "Imprimir" - PD32_VALUE_UREADABLE "Entrada IlegÃvel" - PD32_INVALID_PAGE_RANGE "Este valor nÃ£o se encaixa na faixa de pÃ¡ginas\n\ -Por favor entre um valor entre %d e %d." - PD32_FROM_NOT_ABOVE_TO "A entrada DE nÃ£o pode exceder ATÃ" - PD32_MARGINS_OVERLAP "As margens estÃ£o fora das medidas \ -do papel.\nPor favor reentre as margens." - PD32_NR_OF_COPIES_EMPTY "O nÃºmero de cÃ³pias nÃ£o pode ter valor vazio." - PD32_TOO_LARGE_COPIES "Esta grande quantidade de cÃ³pias nÃ£o Ã© suportada \ -pela sua impressora.\nPor favor entre um valor entre 1 e %d." - PD32_PRINT_ERROR "Ocorreu um erro de impressÃ£o." - PD32_NO_DEFAULT_PRINTER "NÃ£o existe uma impressora predefinida." - PD32_CANT_FIND_PRINTER "NÃ£o Ã© possÃvel encontrar uma impressora." - PD32_OUT_OF_MEMORY "MemÃ³ria insuficiente." + PD32_VALUE_UREADABLE "Entrada Ilegível" + PD32_INVALID_PAGE_RANGE "Este valor não se encaixa na faixa de páginas\n\ +Por favor indique um valor entre %d e %d." + PD32_FROM_NOT_ABOVE_TO "A entrada DE não pode exceder ATÉ" + PD32_MARGINS_OVERLAP "As margens estão fora das medidas \ +do papel.\nPor favor indique as margens." + PD32_NR_OF_COPIES_EMPTY "O número de cópias não pode ter valor vazio." + PD32_TOO_LARGE_COPIES "Esta grande quantidade de cópias não é suportada \ +pela sua impressora.\nPor favor indique um valor entre 1 e %d." + PD32_PRINT_ERROR "Ocorreu um erro de impressão." + PD32_NO_DEFAULT_PRINTER "Não existe uma impressora predefinida." + PD32_CANT_FIND_PRINTER "Não é possível encontrar uma impressora." + PD32_OUT_OF_MEMORY "Memória insuficiente." PD32_GENERIC_ERROR "Ocorreu algum erro." PD32_DRIVER_UNKNOWN "Controlador de impressora desconhecido." PD32_NO_DEVICES "Antes de realizar tarefas relacionadas com a impressora \ -tais como configuraÃ§Ã£o de pÃ¡ginas ou imprimir um documento, precisa instalar uma impressora. \ +tais como configuração de páginas ou imprimir um documento, precisa instalar uma impressora. \ Por favor instale uma e tente novamente." - PD32_DEFAULT_PRINTER "Impressora Prdefinida; " + PD32_DEFAULT_PRINTER "Impressora Predefinida; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "Existem %d documentos na fila" PD32_MARGINS_IN_INCHES "Margens [polegadas]" PD32_MARGINS_IN_MILIMETERS "Margens [mm]" @@ -864,29 +898,29 @@ PD32_PRINTER_STATUS_READY "Pronto" PD32_PRINTER_STATUS_PAUSED "Pausada; " PD32_PRINTER_STATUS_ERROR "Erro; " - PD32_PRINTER_STATUS_PENDING_DELETION "ExclusÃ£o pendente; " + PD32_PRINTER_STATUS_PENDING_DELETION "Exclusão pendente; " PD32_PRINTER_STATUS_PAPER_JAM "Papel atolado; " PD32_PRINTER_STATUS_PAPER_OUT "Sem papel; " - PD32_PRINTER_STATUS_MANUAL_FEED "AlimentaÃ§Ã£o manual; " + PD32_PRINTER_STATUS_MANUAL_FEED "Alimentação manual; " PD32_PRINTER_STATUS_PAPER_PROBLEM "Problemas com o papel; " PD32_PRINTER_STATUS_OFFLINE "Impressora desligada; " PD32_PRINTER_STATUS_IO_ACTIVE "E/S Activa; " PD32_PRINTER_STATUS_BUSY "Ocupada; " PD32_PRINTER_STATUS_PRINTING "A imprimir; " PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "A bandeja de saida encontra-se cheia; " - PD32_PRINTER_STATUS_NOT_AVAILABLE "NÃ£o disponÃvel; " + PD32_PRINTER_STATUS_NOT_AVAILABLE "Não disponível; " PD32_PRINTER_STATUS_WAITING "A esperar; " PD32_PRINTER_STATUS_PROCESSING "A processar; " PD32_PRINTER_STATUS_INITIALIZING "A inicializar; " PD32_PRINTER_STATUS_WARMING_UP "A aquecer; " PD32_PRINTER_STATUS_TONER_LOW "Pouco toner; " PD32_PRINTER_STATUS_NO_TONER "Sem toner; " - PD32_PRINTER_STATUS_PAGE_PUNT "LanÃ§ar pÃ¡gina; " - PD32_PRINTER_STATUS_USER_INTERVENTION "IntervenÃ§Ã£o do utilizador; " - PD32_PRINTER_STATUS_OUT_OF_MEMORY "MemÃ³ria insuficiente; " - PD32_PRINTER_STATUS_DOOR_OPEN "A impressora estÃ¡ aberta; " - PD32_PRINTER_STATUS_SERVER_UNKNOWN "Servidor de impressÃ£o desconhecido; " - PD32_PRINTER_STATUS_POWER_SAVE "Modo econÃ³mico; " + PD32_PRINTER_STATUS_PAGE_PUNT "Lançar página; " + PD32_PRINTER_STATUS_USER_INTERVENTION "Intervenção do utilizador; " + PD32_PRINTER_STATUS_OUT_OF_MEMORY "Memória insuficiente; " + PD32_PRINTER_STATUS_DOOR_OPEN "A impressora está aberta; " + PD32_PRINTER_STATUS_SERVER_UNKNOWN "Servidor de impressão desconhecido; " + PD32_PRINTER_STATUS_POWER_SAVE "Modo económico; " } @@ -919,10 +953,10 @@ IDS_COLOR_BLACK "Preto" IDS_COLOR_MAROON "Castanho" IDS_COLOR_GREEN "Verde" - IDS_COLOR_OLIVE "Verde-oliva" + IDS_COLOR_OLIVE "Verde-oliveira" IDS_COLOR_NAVY "Azul-marinho" IDS_COLOR_PURPLE "Roxo" - IDS_COLOR_TEAL "Azul-petrÃ³leo" + IDS_COLOR_TEAL "Azul-petróleo" IDS_COLOR_GRAY "Cinza" IDS_COLOR_SILVER "Prateado" IDS_COLOR_RED "Vermelho" @@ -951,7 +985,7 @@ STRINGTABLE DISCARDABLE { - IDS_FONT_SIZE "Selecione o tamanho da fonte entre %d e %d pontos." + IDS_FONT_SIZE "Seleccione o tamanho do tipo de letra entre %d e %d pontos." IDS_SAVE_BUTTON "&Gravar" IDS_SAVE_IN "Gravar &em:" IDS_SAVE "Gravar" Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Uk… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/cdlg_Uk.rc (original) +++ trunk/reactos/dll/win32/comdlg32/cdlg_Uk.rc Sat Sep 15 21:06:51 2007 @@ -1,6 +1,5 @@ /* * Copyright 2004 Ilya Korniyko - * 2007 Artem Reznikov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -31,7 +30,7 @@ LTEXT "&²ì'ÿ ôàéëó:", 1090, 6, 6, 76, 9 EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "&Ïàïêè:", -1, 110, 6, 92, 9 + LTEXT "&Òåêè:", -1, 110, 6, 92, 9 LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP LTEXT "Ïîêàçóâàòè ôàéëè &òèïó:", 1089, 6, 104, 90, 9 @@ -39,7 +38,7 @@ LTEXT "&Äèñêè:", 1091, 110, 104, 92, 9 COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "Â³äêðèòè", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Â³äì³íà", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Äîâ³äêà", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP CHECKBOX "&Ëèøå äëÿ ÷èòàííÿ", 1040, 208, 68, 54, 24, BS_AUTOCHECKBOX | BS_MULTILINE | WS_GROUP | WS_TABSTOP } @@ -53,7 +52,7 @@ LTEXT "&&²ì'ÿ ôàéëó:", 1090, 6, 6, 76, 9 EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "&Ïàïêè:", -1, 110, 6, 92, 9 + LTEXT "&Òåêè:", -1, 110, 6, 92, 9 LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP LTEXT "Ïîêàçóâàòè ôàéëè &òèïó:", 1089, 6, 104, 90, 9 @@ -61,7 +60,7 @@ LTEXT "&Äèñêè:", 1091, 110, 104, 92, 9 COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "Çáåðåãòè ÿê", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Â³äì³íà", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Äîâ³äêà", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP CHECKBOX "&Ëèøå äëÿ ÷èòàííÿ", 1040, 208, 68, 54, 24, BS_AUTOCHECKBOX | BS_MULTILINE | WS_GROUP | WS_TABSTOP } @@ -79,7 +78,7 @@ RADIOBUTTON "Â&èä³ëåííèé ôðàãìåíò", 1057, 16, 60, 60, 12 RADIOBUTTON "&Ñòîð³íêè", 1058, 16, 75, 60, 12 DEFPUSHBUTTON "Äðóê", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Â³äì³íà", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Âëàñòèâîñò³", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP LTEXT "&ç:", 1090, 60, 80, 30, 9 LTEXT "&äî:", 1091, 120, 80, 30, 9 @@ -101,7 +100,7 @@ RADIOBUTTON "&²íøèé ïðèíòåð", 1057, 16, 50, 80, 12 COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Â³äì³íà", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Íàñòðîéêà", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP GROUPBOX "Îð³ºíòàö³ÿ", 1073, 6, 85, 100, 50, BS_GROUPBOX RADIOBUTTON "&Êíèæíà", 1058, 50, 100, 40, 12 @@ -131,7 +130,7 @@ COMBOBOX 1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT DEFPUSHBUTTON "OK",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Ñêàñóâàòè",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP + PUSHBUTTON "Â³äì³íà",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP PUSHBUTTON "&Çàñòîñóâàòè", 1026,218,40,40,14,WS_GROUP | WS_TABSTOP PUSHBUTTON "&Äîâ³äêà" , 1038,218,57,40,14,WS_GROUP | WS_TABSTOP GROUPBOX "Àòðèáóòè",1072,6,72,84,34,WS_GROUP @@ -174,7 +173,7 @@ CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 DEFPUSHBUTTON "OK", IDOK, 4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Â³äì³íà", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Äîâ³äêà", 1038,100,166, 44, 14 PUSHBUTTON "&Äîäàòè äî íàáîðó", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Âèçíà÷èòè êîë³ð >>", 719/*1025*/, 4, 150, 142, 14, WS_GROUP | WS_TABSTOP @@ -196,7 +195,7 @@ CONTROL "Â&íèç", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 152, 38, 30, 12 DEFPUSHBUTTON "Ç&íàéòè äàë³", IDOK, 190, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Ñêàñóâàòè", IDCANCEL , 190, 23, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Â³äì³íà", IDCANCEL , 190, 23, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Äîâ³äêà", pshHelp , 190, 45, 50, 14, WS_GROUP | WS_TABSTOP } @@ -216,7 +215,7 @@ DEFPUSHBUTTON "Ç&íàéòè äàë³", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "&Çàì³íèòè", psh1 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Çàì³íèòè &âñå", psh2 , 174, 38, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Ñêàñóâàòè", IDCANCEL , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Â³äì³íà", IDCANCEL , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Äîâ³äêà", pshHelp , 174, 75, 50, 14, WS_GROUP | WS_TABSTOP } @@ -227,7 +226,7 @@ FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON - PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 232,164, 48,14, WS_GROUP + PUSHBUTTON "Â³äì³íà", IDCANCEL, 232,164, 48,14, WS_GROUP PUSHBUTTON "&Äîâ³äêà", pshHelp, 50, 161, 48,14, WS_GROUP GROUPBOX "Ïðèíòåð", grp4, 8, 4, 272,84, WS_GROUP @@ -267,7 +266,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,180,156,48,14,WS_GROUP - PUSHBUTTON "Ñêàñóâàòè",IDCANCEL,232,156,48,14 + PUSHBUTTON "Â³äì³íà",IDCANCEL,232,156,48,14 /* PUSHBUTTON "Ñ³òêà...", psh5, 284,156,48,14 */ GROUPBOX "Ïðèíòåð", grp4, 8, 4, 272,84, WS_GROUP @@ -315,25 +314,25 @@ CONTROL "Ëèøå äëÿ &÷èòàííÿ",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 DEFPUSHBUTTON "&Â³äêðèòè", IDOK,222,110,50,14 - PUSHBUTTON "Ñêàñóâàòè", IDCANCEL,222,128,50,14 + PUSHBUTTON "Â³äì³íà", IDCANCEL,222,128,50,14 PUSHBUTTON "&Äîâ³äêà", pshHelp,222,145,50,14 } STRINGTABLE DISCARDABLE { - IDS_ABOUTBOX "&Ïðî òåñò Âèá³ðÏàïêè" - IDS_DOCUMENTFOLDERS "Ïàïêè äîêóìåíò³â" + IDS_ABOUTBOX "&Ïðî òåñò Âèá³ðÒåêè" + IDS_DOCUMENTFOLDERS "Òåêè äîêóìåíò³â" IDS_PERSONAL "Ìî¿ äîêóìåíòè" IDS_FAVORITES "Çàêëàäêè" IDS_PATH "Ñèñòåìíèé øëÿõ" - IDS_DESKTOP "Ðîáî÷èé ñò³ë" + IDS_DESKTOP "Ñò³ëüíèöÿ" IDS_FONTS "Øðèôòè" IDS_MYCOMPUTER "Ì³é êîìï'þòåð" } STRINGTABLE DISCARDABLE { - IDS_SYSTEMFOLDERS "Ñèñòåìí³ ïàïêè" + IDS_SYSTEMFOLDERS "Ñèñòåìí³ òåêè" IDS_LOCALHARDRIVES "Ëîêàëüí³ æîðñòê³ äèñêè" IDS_FILENOTFOUND "Ôàéë íå çíàéäåíî" IDS_VERIFYFILE "Ïåðåâ³ðòå, ÷è ïðàâèëüíî âêàçàíî ³ì'ÿ ôàéëó" @@ -348,10 +347,10 @@ STRINGTABLE DISCARDABLE { IDS_UPFOLDER "Âãîðó íà îäèí ð³âåíü" - IDS_NEWFOLDER "Ñòâîðèòè íîâó ïàïêó" + IDS_NEWFOLDER "Ñòâîðèòè íîâó òåêó" IDS_LISTVIEW "Ñïèñîê" IDS_REPORTVIEW "Ïîäðîáèö³" - IDS_TODESKTOP "Ïåðåõ³ä íà ðîáî÷èé ñò³ë" + IDS_TODESKTOP "Ïåðåõ³ä íà ñò³ëüíèöþ" } STRINGTABLE DISCARDABLE @@ -391,7 +390,7 @@ PD32_PRINTER_STATUS_PAPER_JAM "Ïàï³ð çàñòðÿã; " PD32_PRINTER_STATUS_PAPER_OUT "Íå âèñòà÷àº ïàïåðó; " PD32_PRINTER_STATUS_MANUAL_FEED "Ïîñòàâòå ïàï³ð âðó÷íó; " - PD32_PRINTER_STATUS_PAPER_PROBLEM "Ïðîáëåìà ç ïàïåðîì; " + PD32_PRINTER_STATUS_PAPER_PROBLEM "Ïðîáëåìà ñ ïàïåðîì; " PD32_PRINTER_STATUS_OFFLINE "Ïðèíòåð â ðåæèì³ offline; " PD32_PRINTER_STATUS_IO_ACTIVE "Ââ³ä/Âèâ³ä àêòèâíèé; " PD32_PRINTER_STATUS_BUSY "Çàéíÿòèé; " Modified: trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/comdlg3… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild (original) +++ trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild Sat Sep 15 21:06:51 2007 @@ -1,4 +1,6 @@ -<module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32" installname="comdlg32.dll" allowwarnings="true" entrypoint="0"> +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32" installname="comdlg32.dll" allowwarnings="true"> <importlibrary definition="comdlg32.spec.def" /> <include base="comdlg32">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: trunk/reactos/dll/win32/comdlg32/comdlg32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/comdlg3… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/comdlg32_ros.diff (original) +++ trunk/reactos/dll/win32/comdlg32/comdlg32_ros.diff Sat Sep 15 21:06:51 2007 @@ -220,7 +220,7 @@ SendDlgItemMessageW(hDlg, stc10, STM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)PrintStructures->hLandscapeIcon); -@@ -2507,15 +2507,15 @@ +@@ -2513,15 +2513,15 @@ /* Save paper orientation into device context */ if(pda->curdlg.ptPaperSize.x > pda->curdlg.ptPaperSize.y) @@ -239,7 +239,7 @@ else FIXME("could not get dialog text for papersize cmbbox?\n"); -@@ -2523,7 +2523,7 @@ +@@ -2529,7 +2529,7 @@ paperword = SendDlgItemMessageA(hDlg,cmb1,CB_GETITEMDATA, SendDlgItemMessageA(hDlg, cmb1, CB_GETCURSEL, 0, 0), 0); if (paperword != CB_ERR) @@ -248,7 +248,7 @@ else FIXME("could not get dialog text for papersize cmbbox?\n"); -@@ -2574,9 +2574,9 @@ +@@ -2580,9 +2580,9 @@ /* Save orientation */ if (pda->dlga->ptPaperSize.x > pda->dlga->ptPaperSize.y) @@ -260,7 +260,7 @@ GlobalUnlock(pda->pdlg.hDevNames); GlobalUnlock(pda->pdlg.hDevMode); -@@ -2824,7 +2824,7 @@ +@@ -2834,7 +2834,7 @@ case cmb3: if(msg == CBN_SELCHANGE){ DEVMODEA *dm = GlobalLock(pda->pdlg.hDevMode); @@ -269,7 +269,7 @@ SendDlgItemMessageA(hDlg, cmb3, CB_GETCURSEL, 0, 0), 0); GlobalUnlock(pda->pdlg.hDevMode); } -@@ -2847,10 +2847,10 @@ +@@ -2857,10 +2857,10 @@ DM_IN_BUFFER | DM_OUT_BUFFER | DM_IN_PROMPT); ClosePrinter(hPrinter); /* Changing paper */ @@ -282,7 +282,7 @@ DWORD tmp = pda->curdlg.ptPaperSize.x; pda->curdlg.ptPaperSize.x = pda->curdlg.ptPaperSize.y; pda->curdlg.ptPaperSize.y = tmp; -@@ -2864,7 +2864,7 @@ +@@ -2874,7 +2874,7 @@ count = SendDlgItemMessageA(hDlg, cmb2, CB_GETCOUNT, 0, 0); if(count != CB_ERR){ for(i=0; i<count; ++i){ @@ -291,16 +291,16 @@ SendDlgItemMessageA(hDlg, cmb2, CB_SETCURSEL, i, 0); break; } -@@ -3168,7 +3168,7 @@ - } - /* Set orientation radiobutton properly */ - dm = GlobalLock(pda->dlga->hDevMode); -- if (dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE) -+ if (dm->u.s.dmOrientation == DMORIENT_LANDSCAPE) - CheckRadioButton(hDlg, rad1, rad2, rad2); - else /* this is default if papersize is not set */ - CheckRadioButton(hDlg, rad1, rad2, rad1); -@@ -3213,8 +3213,8 @@ +@@ -3180,7 +3180,7 @@ + if(pda->dlga->hDevMode) + { + dm = GlobalLock(pda->dlga->hDevMode); +- if (dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE) ++ if (dm->u.s.dmOrientation == DMORIENT_LANDSCAPE) + CheckRadioButton(hDlg, rad1, rad2, rad2); + else /* this is default if papersize is not set */ + CheckRadioButton(hDlg, rad1, rad2, rad1); +@@ -3226,8 +3226,8 @@ PRINTDLG_PS_ChangePrinterA(hDlg, pda); dm = GlobalLock(pda->pdlg.hDevMode); if(dm){ @@ -311,16 +311,16 @@ GlobalUnlock(pda->pdlg.hDevMode); pda->curdlg.ptPaperSize.x = _c_10mm2size(pda->dlga, pda->curdlg.ptPaperSize.x); pda->curdlg.ptPaperSize.y = _c_10mm2size(pda->dlga, pda->curdlg.ptPaperSize.y); -@@ -3282,7 +3282,7 @@ - - dm = GlobalLock(pda->dlga->hDevMode); - /* Landscape orientation */ -- if (dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE) -+ if (dm->u.s.dmOrientation == DMORIENT_LANDSCAPE) - CheckRadioButton(hDlg, rad1, rad2, rad2); - else /* this is default if papersize is not set */ - CheckRadioButton(hDlg, rad1, rad2, rad1); -@@ -3422,7 +3422,7 @@ +@@ -3297,7 +3297,7 @@ + { + dm = GlobalLock(pda->dlga->hDevMode); + /* Landscape orientation */ +- if (dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE) ++ if (dm->u.s.dmOrientation == DMORIENT_LANDSCAPE) + CheckRadioButton(hDlg, rad1, rad2, rad2); + else /* this is default if papersize is not set */ + CheckRadioButton(hDlg, rad1, rad2, rad1); +@@ -3439,7 +3439,7 @@ setupdlg->hDevMode = pdlg.hDevMode; setupdlg->hDevNames = pdlg.hDevNames; dm = GlobalLock(pdlg.hDevMode); Modified: trunk/reactos/dll/win32/comdlg32/fontdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/fontdlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/fontdlg.c (original) +++ trunk/reactos/dll/win32/comdlg32/fontdlg.c Sat Sep 15 21:06:51 2007 @@ -617,6 +617,15 @@ himlTT = ImageList_LoadImageW( COMDLG32_hInstance, MAKEINTRESOURCEW(38), TTBITMAP_XSIZE, 0, CLR_DEFAULT, IMAGE_BITMAP, 0); + /* Set effect flags */ + if((lpcf->Flags & CF_EFFECTS) && (lpcf->Flags & CF_INITTOLOGFONTSTRUCT)) + { + if(lpxx->lfUnderline) + CheckDlgButton(hDlg, chx2, TRUE); + if(lpxx->lfStrikeOut) + CheckDlgButton(hDlg, chx1, TRUE); + } + if (!(lpcf->Flags & CF_SHOWHELP) || !IsWindow(lpcf->hwndOwner)) ShowWindow(GetDlgItem(hDlg,pshHelp),SW_HIDE); if (!(lpcf->Flags & CF_APPLY)) Modified: trunk/reactos/dll/win32/comdlg32/printdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/printdl… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/printdlg.c (original) +++ trunk/reactos/dll/win32/comdlg32/printdlg.c Sat Sep 15 21:06:51 2007 @@ -2059,7 +2059,10 @@ GetPrinterDriverA(hprn, NULL, 3, NULL, 0, &needed); dbuf = HeapAlloc(GetProcessHeap(),0,needed); if (!GetPrinterDriverA(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed)) { - ERR("GetPrinterDriverA failed, le %d, fix your config for printer %s!\n",GetLastError(),pbuf->pPrinterName); + ERR("GetPrinterDriverA failed, le %d, fix your config for printer %s!\n", + GetLastError(),pbuf->pPrinterName); + HeapFree(GetProcessHeap(), 0, dbuf); + HeapFree(GetProcessHeap(), 0, pbuf); COMDLG32_SetCommDlgExtendedError(PDERR_RETDEFFAILURE); return FALSE; } @@ -2206,7 +2209,10 @@ GetPrinterDriverW(hprn, NULL, 3, NULL, 0, &needed); dbuf = HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*needed); if (!GetPrinterDriverW(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed)) { - ERR("GetPrinterDriverA failed, le %d, fix your config for printer %s!\n",GetLastError(),debugstr_w(pbuf->pPrinterName)); + ERR("GetPrinterDriverA failed, le %d, fix your config for printer %s!\n", + GetLastError(),debugstr_w(pbuf->pPrinterName)); + HeapFree(GetProcessHeap(), 0, dbuf); + HeapFree(GetProcessHeap(), 0, pbuf); COMDLG32_SetCommDlgExtendedError(PDERR_RETDEFFAILURE); return FALSE; } @@ -2615,6 +2621,8 @@ lpDriverInfo = HeapAlloc(GetProcessHeap(), 0, needed); if(!GetPrinterDriverA(hprn, NULL, 3, (LPBYTE)lpDriverInfo, needed, &needed)) { ERR("GetPrinterDriverA failed for %s, fix your config!\n", lpPrinterInfo->pPrinterName); + HeapFree(GetProcessHeap(), 0, lpDriverInfo); + HeapFree(GetProcessHeap(), 0, lpPrinterInfo); return FALSE; } ClosePrinter(hprn); @@ -2622,6 +2630,8 @@ needed = DocumentPropertiesA(0, 0, name, NULL, NULL, 0); if(needed == -1) { ERR("DocumentProperties fails on %s\n", debugstr_a(name)); + HeapFree(GetProcessHeap(), 0, lpDriverInfo); + HeapFree(GetProcessHeap(), 0, lpPrinterInfo); return FALSE; } pDevMode = HeapAlloc(GetProcessHeap(), 0, needed); @@ -3167,12 +3177,15 @@ EnableWindow(GetDlgItem(hDlg, edt7), FALSE); } /* Set orientation radiobutton properly */ - dm = GlobalLock(pda->dlga->hDevMode); - if (dm->u.s.dmOrientation == DMORIENT_LANDSCAPE) - CheckRadioButton(hDlg, rad1, rad2, rad2); - else /* this is default if papersize is not set */ - CheckRadioButton(hDlg, rad1, rad2, rad1); - GlobalUnlock(pda->dlga->hDevMode); + if(pda->dlga->hDevMode) + { + dm = GlobalLock(pda->dlga->hDevMode); + if (dm->u.s.dmOrientation == DMORIENT_LANDSCAPE) + CheckRadioButton(hDlg, rad1, rad2, rad2); + else /* this is default if papersize is not set */ + CheckRadioButton(hDlg, rad1, rad2, rad1); + GlobalUnlock(pda->dlga->hDevMode); + } /* if orientation disabled */ if (pda->dlga->Flags & PSD_DISABLEORIENTATION) { @@ -3280,13 +3293,17 @@ EnableWindow(GetDlgItem(hDlg, edt7), FALSE); } - dm = GlobalLock(pda->dlga->hDevMode); - /* Landscape orientation */ - if (dm->u.s.dmOrientation == DMORIENT_LANDSCAPE) - CheckRadioButton(hDlg, rad1, rad2, rad2); - else /* this is default if papersize is not set */ - CheckRadioButton(hDlg, rad1, rad2, rad1); - GlobalUnlock(pda->dlga->hDevMode); + if(pda->dlga->hDevMode) + { + dm = GlobalLock(pda->dlga->hDevMode); + /* Landscape orientation */ + if (dm->u.s.dmOrientation == DMORIENT_LANDSCAPE) + CheckRadioButton(hDlg, rad1, rad2, rad2); + else /* this is default if papersize is not set */ + CheckRadioButton(hDlg, rad1, rad2, rad1); + GlobalUnlock(pda->dlga->hDevMode); + } + if (pda->dlga->Flags & PSD_DISABLEORIENTATION) { EnableWindow(GetDlgItem(hDlg,rad1),FALSE); EnableWindow(GetDlgItem(hDlg,rad2),FALSE); Modified: trunk/reactos/dll/win32/comdlg32/printdlg16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/printdl… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/printdlg16.c (original) +++ trunk/reactos/dll/win32/comdlg32/printdlg16.c Sat Sep 15 21:06:51 2007 @@ -390,9 +390,10 @@ GetPrinterDriverA(hprn, NULL, 3, NULL, 0, &needed); dbuf = HeapAlloc(GetProcessHeap(),0,needed); if (!GetPrinterDriverA(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed)) { - ERR("GetPrinterDriverA failed for %s, le %d, fix your config!\n", - pbuf->pPrinterName,GetLastError()); - HeapFree(GetProcessHeap(), 0, dbuf); + ERR("GetPrinterDriverA failed for %s, le %d, fix your config!\n", + pbuf->pPrinterName,GetLastError()); + HeapFree(GetProcessHeap(), 0, dbuf); + HeapFree(GetProcessHeap(), 0, pbuf); COMDLG32_SetCommDlgExtendedError(PDERR_RETDEFFAILURE); return FALSE; } @@ -506,7 +507,7 @@ HeapFree(GetProcessHeap(), 0, PrintStructures->lpDevMode); HeapFree(GetProcessHeap(), 0, PrintStructures->lpPrinterInfo); HeapFree(GetProcessHeap(), 0, PrintStructures->lpDriverInfo); - HeapFree(GetProcessHeap(), 0, PrintStructures); + HeapFree(GetProcessHeap(), 0, ptr16); } if(bRet && (lppd->Flags & PD_RETURNDC || lppd->Flags & PD_RETURNIC)) bRet = PRINTDLG_CreateDC16(lppd);

1 0

[cfinck] 29062: Rename "Properties::" to "Properties" in the context menu (patch by Mario Kacmar, kario AT szm DOT sk)
by cfinck＠svn.reactos.org 15 Sep '07

15 Sep '07

Author: cfinck Date: Sat Sep 15 20:10:10 2007 New Revision: 29062 URL: http://svn.reactos.org/svn/reactos?rev=29062&view=rev Log: Rename "Properties::" to "Properties" in the context menu (patch by Mario Kacmar, kario AT szm DOT sk) Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Sat Sep 15 20:10:10 2007 @@ -262,7 +262,7 @@ } _InsertMenuItem(hmenu, indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); - _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_PROPERTIES, MFT_STRING, "&Properties::", MFS_ENABLED); + _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_PROPERTIES, MFT_STRING, "&Properties", MFS_ENABLED); return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (FCIDM_SHVIEWLAST));

1 0

[cfinck] 29061: Add a slovak translation for "desk.cpl" and fix a small mistake in the translation for "timedate.cpl" Patch by Mario Kacmar (kario AT szm DOT sk)
by cfinck＠svn.reactos.org 15 Sep '07

15 Sep '07

Author: cfinck Date: Sat Sep 15 19:45:24 2007 New Revision: 29061 URL: http://svn.reactos.org/svn/reactos?rev=29061&view=rev Log: Add a slovak translation for "desk.cpl" and fix a small mistake in the translation for "timedate.cpl" Patch by Mario Kacmar (kario AT szm DOT sk) Added: trunk/reactos/dll/cpl/desk/lang/sk-SK.rc Modified: trunk/reactos/dll/cpl/desk/rsrc.rc trunk/reactos/dll/cpl/timedate/lang/sk-SK.rc Added: trunk/reactos/dll/cpl/desk/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sk-SK.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sk-SK.rc (added) +++ trunk/reactos/dll/cpl/desk/lang/sk-SK.rc Sat Sep 15 19:45:24 2007 @@ -1,0 +1,194 @@ +/* + * FILE: dll/cpl/desk/lang/sk-SK.rc + * PURPOSE: Slovak Language File for desk + * TRANSLATOR: Kario <kario(a)szm.sk> + * DATE OF TR.: 15-09-2007 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Pozadie" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, + 70, 10, 105, 70,WS_EX_STATICEDGE + CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | + WS_BORDER | WS_TABSTOP, 8, 114, 174, 78 + LTEXT "Vyberte obrázok, ktorý chcete poui ako pozadie pracovnej plochy:", + IDC_STATIC, 8, 103, 180, 9 + PUSHBUTTON "&Preh¾adáva...", IDC_BROWSE_BUTTON, 188, 114, 50, 15 + PUSHBUTTON "&Farba...", IDC_COLOR_BUTTON, 188, 177, 50, 15 + LTEXT "&Umiestnenie:", IDC_STATIC, 188, 138, 36, 9 + COMBOBOX IDC_PLACEMENT_COMBO, 188, 149, 50, 54, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP +END + + +IDD_SCREENSAVER DIALOGEX 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "etriè obrazovky" +FONT 8, "MS Shell Dlg", 0, 0 +BEGIN + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, + 70, 10, 105, 70, WS_EX_STATICEDGE + GROUPBOX "etriè o&brazovky",IDC_SCREENS_DUMMY, 8, 92, 230, 52 + COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Nastavenie",IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP + PUSHBUTTON "&Ukáka",IDC_SCREENS_TESTSC, 175, 103, 50, 13 + LTEXT "&Poèka",IDC_WAITTEXT, 14, 125, 16, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY, 34, 123, 32, 13, ES_RIGHT | WS_GROUP + CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | + UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | + WS_BORDER | WS_GROUP, 54, 123, 12, 13 + LTEXT "minút", IDC_MINTEXT, 70, 125, 26, 9 + CONTROL "Pri obnovení chráni &heslom.",IDC_SCREENS_USEPASSCHK,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 104, 19 + GROUPBOX "Napájani&e monitora", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 + LTEXT "To adjust the power settings for your monitor, click on Power Settings.", + IDC_STATIC, 14, 166, 146 ,20 + PUSHBUTTON "N&apájanie...", IDC_SCREENS_POWER_BUTTON, 176, 171, 50, 13 +END + + +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Vzh¾ad" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", + WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "&Farebná schéma:", IDC_STATIC, 7, 140, 64, 7 + COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Spresni", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 +END + +IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Spresnenie vzh¾adu" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", + WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + + LTEXT "P&oloka:", 8, 5, 160, 50, 9 + COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP + + LTEXT "&Ve¾kos", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 + EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP + CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 + + LTEXT "&Farba 1:", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 40, 9 + CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR1_B, 184, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP + + LTEXT "Far&ba 2:", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 + CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP + + LTEXT "&Písmo:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8 + COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + LTEXT "V&e¾kos:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 + COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL + + LTEXT "Fa&rba:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9 + CHECKBOX "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE | BS_BITMAP + + AUTOCHECKBOX "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE + AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE + + PUSHBUTTON "Zrui", IDCANCEL, 191, 220, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 +END + +IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Nastavenie" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Display:",1820,3,100,30,8 + LTEXT "<none>",IDC_SETTINGS_DEVICE,9,109,224,8 + GROUPBOX "&Screen area",1818,3,120,115,43 + CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", + TBS_AUTOTICKS | WS_TABSTOP, 30, 130, 58, 17 + LTEXT "Less",1815,9,130,15,8,NOT WS_GROUP + LTEXT "More",1816,93,130,21,8,NOT WS_GROUP + LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER + GROUPBOX "&Colors",1817,125,120,115,43 + COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP + CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, + 131,148,103,9 + PUSHBUTTON "Ad&vanced...",IDC_SETTINGS_ADVANCED,306,165,56,14 +END + +IDR_PREVIEW_MENU MENU +BEGIN + MENUITEM "Normal", ID_MENU_NORMAL + MENUITEM "Disabled", ID_MENU_DISABLED + MENUITEM "Selected", ID_MENU_SELECTED +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "Display" + IDS_CPLDESCRIPTION "Customizes the desktop display and screen saver." + IDS_NONE "(Nie je)" + IDS_CENTER "V strede" + IDS_STRETCH "Roztiahnu" + IDS_TILE "Dladice" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_COLOR_4BIT "16 farieb" + IDS_COLOR_8BIT "256 farieb" + IDS_COLOR_16BIT "High Color (16 bitov)" + IDS_COLOR_24BIT "Pravé farby (24 bitov)" + IDS_COLOR_32BIT "Pravé farby (32 bitov)" + IDS_PIXEL "%lux%lu Pixel" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_BACKGROUND_COMDLG_FILTER "Obrázky (*.bmp;*.dib)\0*.bmp;*.dib\0" + IDS_SUPPORTED_EXT "*.bmp;*.dib" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INACTWIN "Neaktívne okno" + IDS_ACTWIN "Aktívne okno" + IDS_WINTEXT "Text okna" + IDS_MESSBOX "Okno správy" + IDS_MESSTEXT "Text správy" + IDS_BUTTEXT "OK" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ELEMENT_1 "Pracovná plocha" + IDS_ELEMENT_2 "Caption of inactive windows" + IDS_ELEMENT_3 "Border of inactive windows" + IDS_ELEMENT_4 "Caption of active windows" + IDS_ELEMENT_5 "Border of active windows" + IDS_ELEMENT_6 "Menu" + IDS_ELEMENT_7 "Hilited elements" + IDS_ELEMENT_8 "Windows" + IDS_ELEMENT_9 "Scrollbars" + IDS_ELEMENT_10 "3D objects" + IDS_ELEMENT_11 "Palette title" + IDS_ELEMENT_12 "Symbol title" + IDS_ELEMENT_13 "Captionbar" + IDS_ELEMENT_14 "Deactivated menu elements" + IDS_ELEMENT_15 "Dialog" + IDS_ELEMENT_16 "Scrollbar controls" + IDS_ELEMENT_17 "Application background" + IDS_ELEMENT_18 "Small captionbar" + IDS_ELEMENT_19 "Symbol distance (horizontal)" + IDS_ELEMENT_20 "Symbol distance (vertical)" + IDS_ELEMENT_21 "Quickinfo" + IDS_ELEMENT_22 "Symbol" +END Modified: trunk/reactos/dll/cpl/desk/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/rsrc.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/desk/rsrc.rc (original) +++ trunk/reactos/dll/cpl/desk/rsrc.rc Sat Sep 15 19:45:24 2007 @@ -15,5 +15,6 @@ #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" +#include "lang/sk-SK.rc" #include "lang/sv-SE.rc" #include "lang/uk-UA.rc" Modified: trunk/reactos/dll/cpl/timedate/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/sk-S… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/sk-SK.rc (original) +++ trunk/reactos/dll/cpl/timedate/lang/sk-SK.rc Sat Sep 15 19:45:24 2007 @@ -39,7 +39,7 @@ COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE - AUTOCHECKBOX "A&utomaticky posunú hodiny pri prechode na letný èas a spä", + AUTOCHECKBOX "A&utomaticky posunú hodiny pri prechode na letný èas a spä", IDC_AUTODAYLIGHT, 6, 132, 242, 11, WS_VISIBLE | WS_GROUP | WS_TABSTOP END

1 0

[cfinck] 29060: [FORMATTING] - Use TABs instead of spaces in some more .rbuild files - No code changes
by cfinck＠svn.reactos.org 15 Sep '07

15 Sep '07

Author: cfinck Date: Sat Sep 15 19:20:31 2007 New Revision: 29060 URL: http://svn.reactos.org/svn/reactos?rev=29060&view=rev Log: [FORMATTING] - Use TABs instead of spaces in some more .rbuild files - No code changes Modified: trunk/reactos/ReactOS-generic.rbuild trunk/reactos/ReactOS-i386.rbuild trunk/reactos/ReactOS-ppc.rbuild trunk/reactos/base/base.rbuild trunk/reactos/config-ppc.template.rbuild trunk/reactos/config.template.rbuild Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… ============================================================================== --- trunk/reactos/ReactOS-generic.rbuild (original) +++ trunk/reactos/ReactOS-generic.rbuild Sat Sep 15 19:20:31 2007 @@ -1,68 +1,68 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <xi:include href="baseaddress.rbuild" /> + <xi:include href="baseaddress.rbuild" /> - <define name="_REACTOS_" /> - <if property="MP" value="1"> - <define name="CONFIG_SMP" value="1" /> - </if> - <if property="DBG" value="1"> - <define name="DBG" value="1" /> - <define name="_SEH_ENABLE_TRACE" /> - <property name="DBG_OR_KDBG" value="true" /> - </if> - <if property="KDBG" value="1"> - <define name="KDBG" value="1" /> - <property name="DBG_OR_KDBG" value="true" /> - </if> + <define name="_REACTOS_" /> + <if property="MP" value="1"> + <define name="CONFIG_SMP" value="1" /> + </if> + <if property="DBG" value="1"> + <define name="DBG" value="1" /> + <define name="_SEH_ENABLE_TRACE" /> + <property name="DBG_OR_KDBG" value="true" /> + </if> + <if property="KDBG" value="1"> + <define name="KDBG" value="1" /> + <property name="DBG_OR_KDBG" value="true" /> + </if> - <include>.</include> - <include>include</include> - <include root="intermediate">include</include> - <include>include/psdk</include> - <include root="intermediate">include/psdk</include> - <include>include/dxsdk</include> - <include>include/crt</include> - <include>include/ddk</include> - <include>include/GL</include> - <include>include/ndk</include> - <include>include/reactos</include> - <include root="intermediate">include/reactos</include> - <include>include/reactos/libs</include> + <include>.</include> + <include>include</include> + <include root="intermediate">include</include> + <include>include/psdk</include> + <include root="intermediate">include/psdk</include> + <include>include/dxsdk</include> + <include>include/crt</include> + <include>include/ddk</include> + <include>include/GL</include> + <include>include/ndk</include> + <include>include/reactos</include> + <include root="intermediate">include/reactos</include> + <include>include/reactos/libs</include> - <directory name="base"> - <xi:include href="base/base.rbuild" /> - </directory> - <directory name="boot"> - <xi:include href="boot/boot.rbuild" /> - </directory> - <directory name="dll"> - <xi:include href="dll/dll.rbuild" /> - </directory> - <directory name="drivers"> - <xi:include href="drivers/drivers.rbuild" /> - </directory> - <directory name="hal"> - <xi:include href="hal/hal.rbuild" /> - </directory> - <directory name="include"> - <xi:include href="include/directory.rbuild" /> - </directory> - <directory name="lib"> - <xi:include href="lib/lib.rbuild" /> - </directory> - <directory name="media"> - <xi:include href="media/media.rbuild" /> - </directory> - <directory name="modules"> - <xi:include href="modules/directory.rbuild" /> - </directory> - <directory name="ntoskrnl"> - <xi:include href="ntoskrnl/ntoskrnl.rbuild" /> - </directory> - <directory name="subsystems"> - <xi:include href="subsystems/subsystems.rbuild" /> - </directory> + <directory name="base"> + <xi:include href="base/base.rbuild" /> + </directory> + <directory name="boot"> + <xi:include href="boot/boot.rbuild" /> + </directory> + <directory name="dll"> + <xi:include href="dll/dll.rbuild" /> + </directory> + <directory name="drivers"> + <xi:include href="drivers/drivers.rbuild" /> + </directory> + <directory name="hal"> + <xi:include href="hal/hal.rbuild" /> + </directory> + <directory name="include"> + <xi:include href="include/directory.rbuild" /> + </directory> + <directory name="lib"> + <xi:include href="lib/lib.rbuild" /> + </directory> + <directory name="media"> + <xi:include href="media/media.rbuild" /> + </directory> + <directory name="modules"> + <xi:include href="modules/directory.rbuild" /> + </directory> + <directory name="ntoskrnl"> + <xi:include href="ntoskrnl/ntoskrnl.rbuild" /> + </directory> + <directory name="subsystems"> + <xi:include href="subsystems/subsystems.rbuild" /> + </directory> </group> Modified: trunk/reactos/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-i386.rbuild?rev=29… ============================================================================== --- trunk/reactos/ReactOS-i386.rbuild (original) +++ trunk/reactos/ReactOS-i386.rbuild Sat Sep 15 19:20:31 2007 @@ -1,45 +1,45 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> <project name="ReactOS" makefile="makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> - <xi:include href="config.rbuild"> - <xi:fallback> - <xi:include href="config.template.rbuild" /> - </xi:fallback> - </xi:include> + <xi:include href="config.rbuild"> + <xi:fallback> + <xi:include href="config.template.rbuild" /> + </xi:fallback> + </xi:include> - <xi:include href="ReactOS-generic.rbuild" /> + <xi:include href="ReactOS-generic.rbuild" /> - <define name="_M_IX86" /> - <define name="_X86_" /> - <define name="__i386__" /> + <define name="_M_IX86" /> + <define name="_X86_" /> + <define name="__i386__" /> - <if property="GDB" value="0"> - <if property="OPTIMIZE" value="1"> - <compilerflag>-Os</compilerflag> - <compilerflag>-ftracer</compilerflag> - <compilerflag>-momit-leaf-frame-pointer</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - </if> - <if property="OPTIMIZE" value="2"> - <compilerflag>-Os</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - </if> - <if property="OPTIMIZE" value="3"> - <compilerflag>-O1</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - </if> - <if property="OPTIMIZE" value="4"> - <compilerflag>-O2</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - </if> - <if property="OPTIMIZE" value="5"> - <compilerflag>-O3</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - </if> - </if> + <if property="GDB" value="0"> + <if property="OPTIMIZE" value="1"> + <compilerflag>-Os</compilerflag> + <compilerflag>-ftracer</compilerflag> + <compilerflag>-momit-leaf-frame-pointer</compilerflag> + <compilerflag>-mpreferred-stack-boundary=2</compilerflag> + </if> + <if property="OPTIMIZE" value="2"> + <compilerflag>-Os</compilerflag> + <compilerflag>-mpreferred-stack-boundary=2</compilerflag> + </if> + <if property="OPTIMIZE" value="3"> + <compilerflag>-O1</compilerflag> + <compilerflag>-mpreferred-stack-boundary=2</compilerflag> + </if> + <if property="OPTIMIZE" value="4"> + <compilerflag>-O2</compilerflag> + <compilerflag>-mpreferred-stack-boundary=2</compilerflag> + </if> + <if property="OPTIMIZE" value="5"> + <compilerflag>-O3</compilerflag> + <compilerflag>-mpreferred-stack-boundary=2</compilerflag> + </if> + </if> - <compilerflag>-Wno-strict-aliasing</compilerflag> - <compilerflag>-Wpointer-arith</compilerflag> - <linkerflag>-enable-stdcall-fixup</linkerflag> + <compilerflag>-Wno-strict-aliasing</compilerflag> + <compilerflag>-Wpointer-arith</compilerflag> + <linkerflag>-enable-stdcall-fixup</linkerflag> </project> Modified: trunk/reactos/ReactOS-ppc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-ppc.rbuild?rev=290… ============================================================================== --- trunk/reactos/ReactOS-ppc.rbuild (original) +++ trunk/reactos/ReactOS-ppc.rbuild Sat Sep 15 19:20:31 2007 @@ -1,35 +1,35 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> <project name="ReactOS" makefile="makefile.ppc" xmlns:xi="http://www.w3.org/2001/XInclude"> - <xi:include href="config-ppc.rbuild"> - <xi:fallback> - <xi:include href="config-ppc.template.rbuild" /> - </xi:fallback> - </xi:include> + <xi:include href="config-ppc.rbuild"> + <xi:fallback> + <xi:include href="config-ppc.template.rbuild" /> + </xi:fallback> + </xi:include> - <xi:include href="ReactOS-generic.rbuild" /> + <xi:include href="ReactOS-generic.rbuild" /> - <property name="OFWLDR_LINKFORMAT" value="-L$(INTERMEDIATE)/lib/ppcmmu -lppcmmu_code -lppcmmu -nostdlib -nostartfiles"/> + <property name="OFWLDR_LINKFORMAT" value="-L$(INTERMEDIATE)/lib/ppcmmu -lppcmmu_code -lppcmmu -nostdlib -nostartfiles"/> - <define name="_M_PPC" /> - <define name="_PPC_" /> - <define name="__PowerPC__" /> - <define name="_REACTOS_" /> - <define name="stdcall" empty="true" /> - <define name="__stdcall__" empty="true" /> - <define name="fastcall" empty="true" /> - <define name="cdecl" empty="true" /> - <define name="__cdecl__" empty="true" /> - <define name="dllimport" empty="true" /> - <define name="WORDS_BIGENDIAN" empty="true" /> - <define name="MB_CUR_MAX">1</define> - <define name="_BSDTYPES_DEFINED"/> - <compilerflag>-fshort-wchar</compilerflag> - <compilerflag>-fsigned-char</compilerflag> - <compilerflag>-mfull-toc</compilerflag> - <compilerflag>-meabi</compilerflag> - <compilerflag>-O2</compilerflag> - <compilerflag>-Wno-strict-aliasing</compilerflag> - <compilerflag>-Wno-trampolines</compilerflag> + <define name="_M_PPC" /> + <define name="_PPC_" /> + <define name="__PowerPC__" /> + <define name="_REACTOS_" /> + <define name="stdcall" empty="true" /> + <define name="__stdcall__" empty="true" /> + <define name="fastcall" empty="true" /> + <define name="cdecl" empty="true" /> + <define name="__cdecl__" empty="true" /> + <define name="dllimport" empty="true" /> + <define name="WORDS_BIGENDIAN" empty="true" /> + <define name="MB_CUR_MAX">1</define> + <define name="_BSDTYPES_DEFINED"/> + <compilerflag>-fshort-wchar</compilerflag> + <compilerflag>-fsigned-char</compilerflag> + <compilerflag>-mfull-toc</compilerflag> + <compilerflag>-meabi</compilerflag> + <compilerflag>-O2</compilerflag> + <compilerflag>-Wno-strict-aliasing</compilerflag> + <compilerflag>-Wno-trampolines</compilerflag> </project> Modified: trunk/reactos/base/base.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/base.rbuild?rev=29060… ============================================================================== --- trunk/reactos/base/base.rbuild (original) +++ trunk/reactos/base/base.rbuild Sat Sep 15 19:20:31 2007 @@ -1,19 +1,19 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <directory name="applications"> - <xi:include href="applications/applications.rbuild" /> - </directory> - <directory name="services"> - <xi:include href="services/services.rbuild" /> - </directory> - <directory name="setup"> - <xi:include href="setup/setup.rbuild" /> - </directory> - <directory name="shell"> - <xi:include href="shell/shell.rbuild" /> - </directory> - <directory name="system"> - <xi:include href="system/system.rbuild" /> - </directory> + <directory name="applications"> + <xi:include href="applications/applications.rbuild" /> + </directory> + <directory name="services"> + <xi:include href="services/services.rbuild" /> + </directory> + <directory name="setup"> + <xi:include href="setup/setup.rbuild" /> + </directory> + <directory name="shell"> + <xi:include href="shell/shell.rbuild" /> + </directory> + <directory name="system"> + <xi:include href="system/system.rbuild" /> + </directory> </group> Modified: trunk/reactos/config-ppc.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config-ppc.template.rbuild… ============================================================================== --- trunk/reactos/config-ppc.template.rbuild (original) +++ trunk/reactos/config-ppc.template.rbuild Sat Sep 15 19:20:31 2007 @@ -3,57 +3,57 @@ <group>   <property name="SARCH" value="" />  <property name="OARCH" value="" />  <property name="MP" value="0" />  <property name="KDBG" value="0" />  <property name="DBG" value="1" />  <property name="NSWPAT" value="0" /> Modified: trunk/reactos/config.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config.template.rbuild?rev… ============================================================================== --- trunk/reactos/config.template.rbuild (original) +++ trunk/reactos/config.template.rbuild Sat Sep 15 19:20:31 2007 @@ -3,89 +3,89 @@ <group>   <property name="SARCH" value="" />  <property name="OARCH" value="pentium" />  <property name="OPTIMIZE" value="1" />  <property name="MP" value="0" />  <property name="KDBG" value="0" />  <property name="DBG" value="1" />  <property name="GDB" value="0" />  <property name="NSWPAT" value="0" />  <property name="_WINKD_" value="0" />

1 0

[ekohl] 29059: Use the unicode="yes" attribute in the module element instead of defining UNICODE and _UNICODE.
by ekohl＠svn.reactos.org 15 Sep '07

15 Sep '07

Author: ekohl Date: Sat Sep 15 19:12:26 2007 New Revision: 29059 URL: http://svn.reactos.org/svn/reactos?rev=29059&view=rev Log: Use the unicode="yes" attribute in the module element instead of defining UNICODE and _UNICODE. Modified: trunk/reactos/dll/cpl/appwiz/appwiz.rbuild trunk/reactos/dll/cpl/desk/desk.rbuild trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild trunk/reactos/dll/cpl/main/main.rbuild trunk/reactos/dll/cpl/mmsys/mmsys.rbuild trunk/reactos/dll/cpl/ncpa/ncpa.rbuild trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild trunk/reactos/dll/cpl/powercfg/powercfg.rbuild trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild Modified: trunk/reactos/dll/cpl/appwiz/appwiz.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.rbui… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.rbuild (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.rbuild Sat Sep 15 19:12:26 2007 @@ -1,10 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="appwiz" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_APPWIZ}" installbase="system32" installname="appwiz.cpl"> +<module name="appwiz" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_APPWIZ}" installbase="system32" installname="appwiz.cpl" unicode="yes"> <importlibrary definition="appwiz.def" /> <include base="appwiz">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> Modified: trunk/reactos/dll/cpl/desk/desk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.rbuild?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.rbuild (original) +++ trunk/reactos/dll/cpl/desk/desk.rbuild Sat Sep 15 19:12:26 2007 @@ -1,10 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="desk" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_DESK}" installbase="system32" installname="desk.cpl"> +<module name="desk" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_DESK}" installbase="system32" installname="desk.cpl" unicode="yes"> <importlibrary definition="desk.def" /> <include base="desk">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbui… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild Sat Sep 15 19:12:26 2007 @@ -1,10 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="hdwwiz" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_HDWWIZ}" installbase="system32" installname="hdwwiz.cpl"> +<module name="hdwwiz" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_HDWWIZ}" installbase="system32" installname="hdwwiz.cpl" unicode="yes"> <importlibrary definition="hdwwiz.def" /> <include base="hdwwiz">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> Modified: trunk/reactos/dll/cpl/main/main.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/main.rbuild?r… ============================================================================== --- trunk/reactos/dll/cpl/main/main.rbuild (original) +++ trunk/reactos/dll/cpl/main/main.rbuild Sat Sep 15 19:12:26 2007 @@ -1,10 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="main" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MAIN}" installbase="system32" installname="main.cpl"> +<module name="main" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MAIN}" installbase="system32" installname="main.cpl" unicode="yes"> <importlibrary definition="main.def" /> <include base="main">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rbuild… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.rbuild (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.rbuild Sat Sep 15 19:12:26 2007 @@ -1,10 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="mmsys" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MMSYS}" installbase="system32" installname="mmsys.cpl"> +<module name="mmsys" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MMSYS}" installbase="system32" installname="mmsys.cpl" unicode="yes"> <importlibrary definition="mmsys.def" /> <include base="mmsys">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> Modified: trunk/reactos/dll/cpl/ncpa/ncpa.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/ncpa.rbuild?r… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/ncpa.rbuild (original) +++ trunk/reactos/dll/cpl/ncpa/ncpa.rbuild Sat Sep 15 19:12:26 2007 @@ -1,10 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="ncpa" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_NCPA}" installbase="system32" installname="ncpa.cpl"> +<module name="ncpa" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_NCPA}" installbase="system32" installname="ncpa.cpl" unicode="yes"> <importlibrary definition="ncpa.def" /> <include base="ncpa">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> Modified: trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/odbccp32.… ============================================================================== --- trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild (original) +++ trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild Sat Sep 15 19:12:26 2007 @@ -1,10 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="odbccp32i" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_ODBCCP32}" installbase="system32" installname="odbccp32.cpl" > +<module name="odbccp32i" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_ODBCCP32}" installbase="system32" installname="odbccp32.cpl" unicode="yes"> <importlibrary definition="odbccp32.def" /> <include base="odbccp32">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> Modified: trunk/reactos/dll/cpl/powercfg/powercfg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powercfg.rbuild (original) +++ trunk/reactos/dll/cpl/powercfg/powercfg.rbuild Sat Sep 15 19:12:26 2007 @@ -1,11 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="powercfg" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_PWRCFG}" installbase="system32" installname="powercfg.cpl" allowwarnings="true"> +<module name="powercfg" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_PWRCFG}" installbase="system32" installname="powercfg.cpl" unicode="yes"> <importlibrary definition="powercfg.def" /> <include base="powercfg">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> Modified: trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/usrmgr.rbui… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild (original) +++ trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild Sat Sep 15 19:12:26 2007 @@ -1,10 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="usrmgr" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_USRMGR}" installbase="system32" installname="usrmgr.cpl"> +<module name="usrmgr" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_USRMGR}" installbase="system32" installname="usrmgr.cpl" unicode="yes"> <importlibrary definition="usrmgr.def" /> <include base="usrmgr">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define>

1 0

[janderwald] 29058: - move VolumeDlgProc function to own file volume.c - read default waveout device (thanks to Silverbade) - improve volume dialog proc - update all languages resources which current code changes
by janderwald＠svn.reactos.org 15 Sep '07

15 Sep '07

Author: janderwald Date: Sat Sep 15 18:54:01 2007 New Revision: 29058 URL: http://svn.reactos.org/svn/reactos?rev=29058&view=rev Log: - move VolumeDlgProc function to own file volume.c - read default waveout device (thanks to Silverbade) - improve volume dialog proc - update all languages resources which current code changes Added: trunk/reactos/dll/cpl/mmsys/volume.c (with props) Modified: trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.rc trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc trunk/reactos/dll/cpl/mmsys/lang/el-GR.rc trunk/reactos/dll/cpl/mmsys/lang/en-US.rc trunk/reactos/dll/cpl/mmsys/lang/es-ES.rc trunk/reactos/dll/cpl/mmsys/lang/fr-FR.rc trunk/reactos/dll/cpl/mmsys/lang/id-ID.rc trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc trunk/reactos/dll/cpl/mmsys/lang/nl-NL.rc trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc trunk/reactos/dll/cpl/mmsys/lang/pt-BR.rc trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc trunk/reactos/dll/cpl/mmsys/mmsys.c trunk/reactos/dll/cpl/mmsys/mmsys.h trunk/reactos/dll/cpl/mmsys/mmsys.rbuild trunk/reactos/dll/cpl/mmsys/resource.h trunk/reactos/dll/cpl/mmsys/sounds.c (props changed) Modified: trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.rc Sat Sep 15 18:54:01 2007 @@ -6,10 +6,10 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 - LTEXT "",-1,40,10,194,36 + LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Device volume", -1, 7,30,230,100 ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 - CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Low",-1,62,66,30,17 LTEXT "High",-1,195,66,30,17 CHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 @@ -29,16 +29,16 @@ BEGIN LTEXT "A sound scheme is a set of sounds applied to events to in ReactOS and programs. You can select an existing scheme or save one you have modified.",-1,8,7,230,40 LTEXT "Sound s&cheme:",-1,8,42,150,17 - COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Sav&e As...", -1, 134,70,50,15 PUSHBUTTON "&Delete", -1, 188,70,50,15 LTEXT "To change sounds, click a program event in the following list and then select a sound to apply. You can save the changes as a new sound scheme.",-1,8,90,230,40 LTEXT "&Pogram events:",-1,8,118,150,17 CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE - LTEXT "&Sounds:",-1,8,194,80,17 - COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 46, CBS_DROPDOWNLIST - PUSHBUTTON "", -1, 168,205,15,15 - PUSHBUTTON "&Brouse...", -1, 188,205,50,15 + LTEXT "&Sounds:", IDC_TEXT_SOUND,8,194,80,17, WS_DISABLED + COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "", IDC_PLAY_SOUND, 168,205,15,15, WS_DISABLED + PUSHBUTTON "&Brouse...", IDC_BROWSE_SOUND, 188,205,50,15, WS_DISABLED END IDD_AUDIO DIALOGEX 0, 0, 246, 228 @@ -99,6 +99,7 @@ BEGIN IDS_CPLNAME "Zvuky a zvuková zaøízení" IDS_CPLDESCRIPTION "Upraví zvukové schéma Vaeho poèítaèe, nebo nastaví reproduktory a nahrávací zaøízení." + IDS_NO_SOUND "(None)" END Modified: trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc Sat Sep 15 18:54:01 2007 @@ -6,14 +6,14 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 - LTEXT "",-1,40,10,194,36 + LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Gerätelautstärke", -1, 7,30,230,100 ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 - CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Niedrig",-1,62,66,30,17 LTEXT "Hoch",-1,195,66,30,17 CHECKBOX "Stu&mmschalten", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 - CHECKBOX "Lautstärkeregelungs-&Icon in der Taskleiste zeigen", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 + CHECKBOX "Lautstärkeregelungs-&Icon in der Taskleiste zeigen", IDC_ICON_IN_TASKBAR, 50, 92, 170, 10 PUSHBUTTON "Er&weitert", -1, 150,105,75,15 GROUPBOX "Lautsprechereintellungen", -1, 7,140,230,80 CONTROL "", IDC_SPEAKIMG, "Static", SS_OWNERDRAW, 4, 160, 70, 70 @@ -29,16 +29,16 @@ BEGIN LTEXT "Ein Soundschema ist eine Kollektion von Sounds, die bestimmtem Ereignissen in Programmen in ReactOS zugordnet sind. Sie können ein existierendes Schema anwählen oder ein modifiziertes speichern.",-1,8,7,230,40 LTEXT "Sounds&chema:",-1,8,42,150,17 - COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Sp&eichern unter...", -1, 134,70,50,15 PUSHBUTTON "&Löschen", -1, 188,70,50,15 LTEXT "Um Sounds zu ändern, klicken Sie auf ein Programmereignis in der folgenden Liste und wählen Sie einen Sound. Sie können Änderungen als neue Soundschemata speichern.",-1,8,90,230,40 LTEXT "&Pogrammereignisse:",-1,8,118,150,17 CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE - LTEXT "&Sounds:",-1,8,194,80,17 - COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 46, CBS_DROPDOWNLIST - PUSHBUTTON "", -1, 168,205,15,15 - PUSHBUTTON "&Durchsuchen...", -1, 188,205,50,15 + LTEXT "&Sounds:", IDC_TEXT_SOUND,8,194,80,17, WS_DISABLED + COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "", IDC_PLAY_SOUND, 168,205,15,15, WS_DISABLED + PUSHBUTTON "&Durchsuchen...", IDC_BROWSE_SOUND, 188,205,81,15, WS_DISABLED END IDD_AUDIO DIALOGEX 0, 0, 246, 228 @@ -99,6 +99,7 @@ BEGIN IDS_CPLNAME "Sound und Audio Geräte" IDS_CPLDESCRIPTION "Ändert das Sound-Schema Ihres Computers, oder konfiguriert die Einstellungen für Ihre Lautsprecher und Aufnahmegeräte." + IDS_NO_SOUND "(Kein)" END Modified: trunk/reactos/dll/cpl/mmsys/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/el-GR.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/el-GR.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/el-GR.rc Sat Sep 15 18:54:01 2007 @@ -6,10 +6,10 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 - LTEXT "",-1,40,10,194,36 + LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Device volume", -1, 7,30,230,100 ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 - CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Low",-1,62,66,30,17 LTEXT "High",-1,195,66,30,17 CHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 @@ -29,16 +29,16 @@ BEGIN LTEXT "A sound scheme is a set of sounds applied to events to in ReactOS and programs. You can select an existing scheme or save one you have modified.",-1,8,7,230,40 LTEXT "Sound s&cheme:",-1,8,42,150,17 - COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Sav&e As...", -1, 134,70,50,15 PUSHBUTTON "&Delete", -1, 188,70,50,15 LTEXT "To change sounds, click a program event in the following list and then select a sound to apply. You can save the changes as a new sound scheme.",-1,8,90,230,40 LTEXT "&Pogram events:",-1,8,118,150,17 CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE - LTEXT "&Sounds:",-1,8,194,80,17 - COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 46, CBS_DROPDOWNLIST - PUSHBUTTON "", -1, 168,205,15,15 - PUSHBUTTON "&Brouse...", -1, 188,205,50,15 + LTEXT "&Sounds:",IDC_TEXT_SOUND,8,194,80,17, WS_DISABLED + COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "", IDC_PLAY_SOUND, 168,205,15,15, WS_DISABLED + PUSHBUTTON "&Browse...", IDC_BROWSE_SOUND, 188,205,50,15, WS_DISABLED END IDD_AUDIO DIALOGEX 0, 0, 246, 228 @@ -99,6 +99,7 @@ BEGIN IDS_CPLNAME "ÓõóêåõÝò Þ÷ïõ" IDS_CPLDESCRIPTION "ÁëëÜæåé ôï ó÷Þìá Þ÷ïõ ôïõ õðïëïãéóôÞ Þ ôñïðïðïéåß ôéò ñõèìßóåéò ãéá ôá ç÷åßá êáé ôéò óõóêåõÝò åããñáöÞò Þ÷ïõ." + IDS_NO_SOUND "(None)" END Modified: trunk/reactos/dll/cpl/mmsys/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/en-US.rc Sat Sep 15 18:54:01 2007 @@ -6,10 +6,10 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 - LTEXT "",-1,40,10,194,36 + LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Device volume", -1, 7,30,230,100 ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 - CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Low",-1,62,66,30,17 LTEXT "High",-1,195,66,30,17 CHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 @@ -29,16 +29,16 @@ BEGIN LTEXT "A sound scheme is a set of sounds applied to events to in ReactOS and programs. You can select an existing scheme or save one you have modified.",-1,8,7,230,40 LTEXT "Sound s&cheme:",-1,8,42,150,17 - COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Sav&e As...", -1, 134,70,50,15 PUSHBUTTON "&Delete", -1, 188,70,50,15 LTEXT "To change sounds, click a program event in the following list and then select a sound to apply. You can save the changes as a new sound scheme.",-1,8,90,230,40 LTEXT "&Program events:",-1,8,118,150,17 CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE - LTEXT "&Sounds:",-1,8,194,80,17 - COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 46, CBS_DROPDOWNLIST - PUSHBUTTON "", -1, 168,205,15,15 - PUSHBUTTON "&Browse...", -1, 188,205,50,15 + LTEXT "&Sounds:",IDC_TEXT_SOUND,8,194,80,17, WS_DISABLED + COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "", IDC_PLAY_SOUND, 168,205,15,15, WS_DISABLED + PUSHBUTTON "&Browse...", IDC_BROWSE_SOUND, 188,205,50,15, WS_DISABLED END IDD_AUDIO DIALOGEX 0, 0, 246, 228 @@ -100,6 +100,7 @@ BEGIN IDS_CPLNAME "Sound and Audio Devices" IDS_CPLDESCRIPTION "Changes the sound scheme for your computer, or configure the settings for your speakers and recording devices." + IDS_NO_SOUND "(None)" END Modified: trunk/reactos/dll/cpl/mmsys/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/es-ES.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/es-ES.rc Sat Sep 15 18:54:01 2007 @@ -6,10 +6,10 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 - LTEXT "",-1,40,10,194,36 + LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Device volume", -1, 7,30,230,100 ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 - CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Low",-1,62,66,30,17 LTEXT "High",-1,195,66,30,17 CHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 @@ -29,16 +29,16 @@ BEGIN LTEXT "A sound scheme is a set of sounds applied to events to in ReactOS and programs. You can select an existing scheme or save one you have modified.",-1,8,7,230,40 LTEXT "Sound s&cheme:",-1,8,42,150,17 - COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Sav&e As...", -1, 134,70,50,15 PUSHBUTTON "&Delete", -1, 188,70,50,15 LTEXT "To change sounds, click a program event in the following list and then select a sound to apply. You can save the changes as a new sound scheme.",-1,8,90,230,40 LTEXT "&Pogram events:",-1,8,118,150,17 CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE - LTEXT "&Sounds:",-1,8,194,80,17 - COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 46, CBS_DROPDOWNLIST - PUSHBUTTON "", -1, 168,205,15,15 - PUSHBUTTON "&Brouse...", -1, 188,205,50,15 + LTEXT "&Sounds:",IDC_TEXT_SOUND,8,194,80,17, WS_DISABLED + COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "", IDC_PLAY_SOUND, 168,205,15,15, WS_DISABLED + PUSHBUTTON "&Brouse...", IDC_BROWSE_SOUND, 188,205,50,15, WS_DISABLED END IDD_AUDIO DIALOGEX 0, 0, 246, 228 @@ -99,6 +99,7 @@ BEGIN IDS_CPLNAME "Dispositivos de Audio y Sonido" IDS_CPLDESCRIPTION "Cambia el esquema de sonidos de su computadora, o configura las propiedades de sus bocinas y dispositivos de grabación." + IDS_NO_SOUND "(None)" END Modified: trunk/reactos/dll/cpl/mmsys/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/fr-FR.rc Sat Sep 15 18:54:01 2007 @@ -6,10 +6,10 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 - LTEXT "",-1,40,10,194,36 + LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Volume du périphérique", -1, 7,30,230,100 ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 - CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Faible",-1,62,66,30,17 LTEXT "Élevé",-1,195,66,30,17 CHECKBOX "&Muet", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 @@ -29,16 +29,16 @@ BEGIN LTEXT "Un schéma sons est un ensemble de sons appliqués aux évènements de ReactOS et aux programmes. Vous pouvez sélectionner un schéma existant ou en enregistrer que vous avez modifié.",-1,8,7,230,40 LTEXT "S&chéma son:",-1,8,42,150,17 - COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Enregistrer sous...", -1, 134,70,50,15 PUSHBUTTON "Supprimer", -1, 188,70,50,15 LTEXT "Pour changer les sons, cliquez sur un évènement de programme dans la liste suivante, puis sélectionnez un son à appliquer. Vous pouvez enregistrer les changements en tant que nouveau schéma son.",-1,8,90,230,40 LTEXT "Évènements des programmes:",-1,8,118,150,17 CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE - LTEXT "&Sons:",-1,8,194,80,17 - COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 46, CBS_DROPDOWNLIST - PUSHBUTTON "", -1, 168,205,15,15 - PUSHBUTTON "Parcourir...", -1, 188,205,50,15 + LTEXT "&Sons:",IDC_TEXT_SOUND,8,194,80,17, WS_DISABLED + COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "", IDC_PLAY_SOUND, 168,205,15,15, WS_DISABLED + PUSHBUTTON "Parcourir...", IDC_BROWSE_SOUND, 188,205,50,15, WS_DISABLED END IDD_AUDIO DIALOGEX 0, 0, 246, 228 @@ -99,6 +99,7 @@ BEGIN IDS_CPLNAME "Son et périphériques audio" IDS_CPLDESCRIPTION "Change le modèle de sons de votre ordinateur, ou configure les paramètres de vos hauts-parleurs et de vos périphériques d'enregistrement." + IDS_NO_SOUND "(None)" END Modified: trunk/reactos/dll/cpl/mmsys/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/id-ID.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/id-ID.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/id-ID.rc Sat Sep 15 18:54:01 2007 @@ -6,10 +6,10 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 - LTEXT "",-1,40,10,194,36 + LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Device volume", -1, 7,30,230,100 ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 - CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Low",-1,62,66,30,17 LTEXT "High",-1,195,66,30,17 CHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 @@ -29,16 +29,16 @@ BEGIN LTEXT "A sound scheme is a set of sounds applied to events to in ReactOS and programs. You can select an existing scheme or save one you have modified.",-1,8,7,230,40 LTEXT "Sound s&cheme:",-1,8,42,150,17 - COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Sav&e As...", -1, 134,70,50,15 PUSHBUTTON "&Delete", -1, 188,70,50,15 LTEXT "To change sounds, click a program event in the following list and then select a sound to apply. You can save the changes as a new sound scheme.",-1,8,90,230,40 LTEXT "&Pogram events:",-1,8,118,150,17 CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE - LTEXT "&Sounds:",-1,8,194,80,17 - COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 46, CBS_DROPDOWNLIST - PUSHBUTTON "", -1, 168,205,15,15 - PUSHBUTTON "&Brouse...", -1, 188,205,50,15 + LTEXT "&Sounds:",IDC_TEXT_SOUND,8,194,80,17, WS_DISABLED + COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "", IDC_PLAY_SOUND, 168,205,15,15, WS_DISABLED + PUSHBUTTON "&Brouse...", IDC_BROWSE_SOUND, 188,205,50,15, WS_DISABLED END IDD_AUDIO DIALOGEX 0, 0, 246, 228 @@ -99,6 +99,5 @@ BEGIN IDS_CPLNAME "Suara dan Audio Devices" IDS_CPLDESCRIPTION "Mengubah skema suara untuk komputer anda, atau mengkonfigurasi setelan untuk speaker dan device perekaman anda." + IDS_NO_SOUND "(None)" END - - Modified: trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc Sat Sep 15 18:54:01 2007 @@ -6,10 +6,10 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 - LTEXT "",-1,40,10,194,36 + LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Volume del dispositivo", -1, 7,30,230,100 ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 - CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Basso",-1,62,66,30,17 LTEXT "Alto",-1,195,66,30,17 CHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 @@ -29,16 +29,16 @@ BEGIN LTEXT "Uno schema dei suoni è un insieme di suoni legati agli eventi in Reactos e nei programmi. Potete selezionare uno schema esistente o salvarne uno che avete modificato.",-1,8,7,230,40 LTEXT "S&chema dei suoni:",-1,8,42,150,17 - COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Salva come...", -1, 134,70,50,15 PUSHBUTTON "&Cancella", -1, 188,70,50,15 LTEXT "Per cambiare i suoni, cliccare un evento nella lista seguente e poi scegliere il suono da usare. Potete salvare le modifiche in un nuovo schema di suoni.",-1,8,90,230,40 LTEXT "&Eventi:",-1,8,118,150,17 CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE - LTEXT "&Suoni:",-1,8,194,80,17 - COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 46, CBS_DROPDOWNLIST - PUSHBUTTON "", -1, 168,205,15,15 - PUSHBUTTON "&Sfoglia...", -1, 188,205,50,15 + LTEXT "&Suoni:",IDC_TEXT_SOUND,8,194,80,17, WS_DISABLED + COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "", IDC_PLAY_SOUND, 168,205,15,15, WS_DISABLED + PUSHBUTTON "&Sfoglia...", IDC_BROWSE_SOUND, 188,205,50,15, WS_DISABLED END IDD_AUDIO DIALOGEX 0, 0, 246, 228 @@ -99,6 +99,7 @@ BEGIN IDS_CPLNAME "Suoni e Dispositivi audio" IDS_CPLDESCRIPTION "Cambia lo schema dei suoni per il tuo computer o configura le impostazioni per gli altoparlanti e i dispositivi di registrazione." + IDS_NO_SOUND "(None)" END Modified: trunk/reactos/dll/cpl/mmsys/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/nl-NL.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/nl-NL.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/nl-NL.rc Sat Sep 15 18:54:01 2007 @@ -6,10 +6,10 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 - LTEXT "",-1,40,10,194,36 + LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Device volume", -1, 7,30,230,100 ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 - CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Low",-1,62,66,30,17 LTEXT "High",-1,195,66,30,17 CHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 @@ -29,16 +29,16 @@ BEGIN LTEXT "A sound scheme is a set of sounds applied to events to in ReactOS and programs. You can select an existing scheme or save one you have modified.",-1,8,7,230,40 LTEXT "Sound s&cheme:",-1,8,42,150,17 - COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Sav&e As...", -1, 134,70,50,15 PUSHBUTTON "&Delete", -1, 188,70,50,15 LTEXT "To change sounds, click a program event in the following list and then select a sound to apply. You can save the changes as a new sound scheme.",-1,8,90,230,40 LTEXT "&Pogram events:",-1,8,118,150,17 CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE - LTEXT "&Sounds:",-1,8,194,80,17 - COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 46, CBS_DROPDOWNLIST - PUSHBUTTON "", -1, 168,205,15,15 - PUSHBUTTON "&Brouse...", -1, 188,205,50,15 + LTEXT "&Sounds:",IDC_TEXT_SOUND,8,194,80,17, WS_DISABLED + COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "", IDC_PLAY_SOUND, 168,205,15,15, WS_DISABLED + PUSHBUTTON "&Brouse...", IDC_BROWSE_SOUND, 188,205,50,15, WS_DISABLED END IDD_AUDIO DIALOGEX 0, 0, 246, 228 @@ -99,5 +99,6 @@ BEGIN IDS_CPLNAME "Geluid en Audio apparaten" IDS_CPLDESCRIPTION "Verander het geluidsschema van uw computer of configureer de aanwezige geluidsapparatuur." + IDS_NO_SOUND "(None)" END Modified: trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/pl-PL.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc Sat Sep 15 18:54:01 2007 @@ -11,10 +11,10 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 - LTEXT "",-1,40,10,194,36 + LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Device volume", -1, 7,30,230,100 ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 - CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Low",-1,62,66,30,17 LTEXT "High",-1,195,66,30,17 CHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 @@ -34,16 +34,16 @@ BEGIN LTEXT "A sound scheme is a set of sounds applied to events to in ReactOS and programs. You can select an existing scheme or save one you have modified.",-1,8,7,230,40 LTEXT "Sound s&cheme:",-1,8,42,150,17 - COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Sav&e As...", -1, 134,70,50,15 PUSHBUTTON "&Delete", -1, 188,70,50,15 LTEXT "To change sounds, click a program event in the following list and then select a sound to apply. You can save the changes as a new sound scheme.",-1,8,90,230,40 LTEXT "&Pogram events:",-1,8,118,150,17 CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE - LTEXT "&Sounds:",-1,8,194,80,17 - COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 46, CBS_DROPDOWNLIST - PUSHBUTTON "", -1, 168,205,15,15 - PUSHBUTTON "&Brouse...", -1, 188,205,50,15 + LTEXT "&Sounds:", IDC_TEXT_SOUND,8,194,80,17, WS_DISABLED + COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "", IDC_PLAY_SOUND, 168,205,15,15, WS_DISABLED + PUSHBUTTON "&Brouse...", IDC_BROWSE_SOUND, 188,205,50,15, WS_DISABLED END IDD_AUDIO DIALOGEX 0, 0, 246, 228 @@ -104,6 +104,5 @@ BEGIN IDS_CPLNAME "Dwiêk i urz¹dzenia audio" IDS_CPLDESCRIPTION "Zmieñ schemat dwiêkowy dla tego komputera lub skonfiguruj ustawienia g³oników i urz¹dzeñ nagrywaj¹cych." + IDS_NO_SOUND "(None)" END - - Modified: trunk/reactos/dll/cpl/mmsys/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/pt-BR.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/pt-BR.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/pt-BR.rc Sat Sep 15 18:54:01 2007 @@ -6,10 +6,10 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 - LTEXT "",-1,40,10,194,36 + LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Device volume", -1, 7,30,230,100 ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 - CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "Low",-1,62,66,30,17 LTEXT "High",-1,195,66,30,17 CHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 @@ -29,16 +29,16 @@ BEGIN LTEXT "A sound scheme is a set of sounds applied to events to in ReactOS and programs. You can select an existing scheme or save one you have modified.",-1,8,7,230,40 LTEXT "Sound s&cheme:",-1,8,42,150,17 - COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Sav&e As...", -1, 134,70,50,15 PUSHBUTTON "&Delete", -1, 188,70,50,15 LTEXT "To change sounds, click a program event in the following list and then select a sound to apply. You can save the changes as a new sound scheme.",-1,8,90,230,40 LTEXT "&Pogram events:",-1,8,118,150,17 CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE - LTEXT "&Sounds:",-1,8,194,80,17 - COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 46, CBS_DROPDOWNLIST - PUSHBUTTON "", -1, 168,205,15,15 - PUSHBUTTON "&Brouse...", -1, 188,205,50,15 + LTEXT "&Sounds:",IDC_TEXT_SOUND,8,194,80,17 + COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "", IDC_PLAY_SOUND, 168,205,15,15 + PUSHBUTTON "&Brouse...", IDC_BROWSE_SOUND, 188,205,50,15 END IDD_AUDIO DIALOGEX 0, 0, 246, 228 @@ -99,6 +99,7 @@ BEGIN IDS_CPLNAME "Sons e dispositivos de audio" IDS_CPLDESCRIPTION "Altera o esquema de som para o seu computador ou define as configurações para os auto-falantes e dispositivos de gravação." + IDS_NO_SOUND "(None)" END Modified: trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc Sat Sep 15 18:54:01 2007 @@ -6,10 +6,10 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 - LTEXT "",-1,40,10,194,36 + LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Ãðîìêîñòü ìèêøåðà", -1, 7,30,230,100 ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 - CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "íèæå",-1,62,66,30,17 LTEXT "âûøå",-1,195,66,30,17 CHECKBOX "Â&ûêëþ÷èòü çâóê", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 @@ -29,16 +29,16 @@ BEGIN LTEXT "Çâóêîâàÿ ñõåìà çàäàåò çâóêè, ñîïðîâîæäàþùèå ñîáûòèÿ â îïåðàöèîííîé ñèñòåìå ReactOS è ïðîãðàììàõ. Ìîæíî âûáðàòü îäíó èç ñóùåñòâóþùèõ ñõåì èëè ñîçäàòü íîâóþ.",-1,8,7,230,40 LTEXT "Çâóêîâàÿ ñ&õåìà:",-1,8,42,150,17 - COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Ñîõðàíèòü &êàê...", -1, 119,70,65,15 PUSHBUTTON "&Óäàëèòü", -1, 188,70,50,15 LTEXT "×òîáû èçìåíèòü çâóêîâîå ñîïðîâîæäåíèå, ùåëêíèòå íà ñîáûòèè â ñïèñêå è âûáåðèòå íóæíûé çâóê. Èçìåíåíèÿ ìîæíî ñîõðàíèòü êàê íîâóþ çâóêîâóþ ñõåìó.",-1,8,90,230,40 LTEXT "Ïðîãðàììíûå &ñîáûòèÿ:",-1,8,118,150,17 CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE - LTEXT "&Çâóêè:",-1,8,194,80,17 - COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 46, CBS_DROPDOWNLIST - PUSHBUTTON "", -1, 168,205,15,15 - PUSHBUTTON "&Îáçîð...", -1, 188,205,50,15 + LTEXT "&Çâóêè:",IDC_TEXT_SOUND,8,194,80,17, WS_DISABLED + COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "", IDC_PLAY_SOUND, 168,205,15,15, WS_DISABLED + PUSHBUTTON "&Îáçîð...", IDC_BROWSE_SOUND, 188,205,50,15, WS_DISABLED END IDD_AUDIO DIALOGEX 0, 0, 246, 228 @@ -99,6 +99,7 @@ BEGIN IDS_CPLNAME "Çâóê è àóäèîóñòðîéñòâà" IDS_CPLDESCRIPTION "Èçìåíåíèå çâóêîâûõ ñõåì âàøåãî êîìïüþòåðà, íàñòðîéêà êîëîíîê è çàïèñûâàþùèõ óñòðîéñòâ." + IDS_NO_SOUND "(None)" END Modified: trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc Sat Sep 15 18:54:01 2007 @@ -14,10 +14,10 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 - LTEXT "",-1,40,10,194,36 + LTEXT "",IDC_DEVICE_NAME,40,10,194,36 GROUPBOX "Ãó÷í³ñòü ì³êøåðà", -1, 7,30,230,100 ICON IDI_CPLICON, IDI_CPLICON, 17,45,32,32 - CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 45, 140, 14 + CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 LTEXT "íèæ÷å",-1,62,66,30,17 LTEXT "âèùå",-1,195,66,30,17 CHECKBOX "&Âèìêíóòè çâóê", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 @@ -37,16 +37,16 @@ BEGIN LTEXT "Çâóêîâà ñõåìà âèçíà÷àº çâóêè, ÿê³ ñóïðîâîäæóþòü ïîä³¿ â ñèñòåì³ ReactOS ³ ó ïðîãðàìàõ. Ìîæíà âèáðàòè îäíó ç íàÿâíèõ ñõåì àáî ñòâîðèòè íîâó.",-1,8,7,230,40 LTEXT "Çâóêîâà ñ&õåìà:",-1,8,42,150,17 - COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST + COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Çáåðåãòè &ÿê...", -1, 134,70,50,15 PUSHBUTTON "Â&èäàëèòè", -1, 188,70,50,15 LTEXT "Ùîá çì³íèòè çâóêîâèé ñóïðîâ³ä, êëàöí³òü ïîä³þ ó ñïèñêó òà âèáåð³òü ïîòð³áíèé çâóê. Çì³íè ìîæíà çáåðåãòè ÿê íîâó çâóêîâó ñõåìó.",-1,8,90,230,40 LTEXT "&Ïðîãðàìí³ ïîä³¿:",-1,8,118,150,17 CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE - LTEXT "&Çâóêè:",-1,8,194,80,17 - COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 46, CBS_DROPDOWNLIST - PUSHBUTTON "", -1, 168,205,15,15 - PUSHBUTTON "Î&ãëÿä...", -1, 188,205,50,15 + LTEXT "&Çâóêè:", IDC_TEXT_SOUND,8,194,80,17, WS_DISABLED + COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "", IDC_PLAY_SOUND, 168,205,15,15, WS_DISABLED + PUSHBUTTON "Î&ãëÿä...", IDC_BROWSE_SOUND, 188,205,50,15, WS_DISABLED END IDD_AUDIO DIALOGEX 0, 0, 246, 228 @@ -107,6 +107,7 @@ BEGIN IDS_CPLNAME "Çâóêîâ³ ³ àóä³î ïðèñòðî¿" IDS_CPLDESCRIPTION "Çì³íà çâóêîâèõ ñõåì âàøîãî êîìï'þòåðà, íàñòðîþâàííÿ êîëîíîê ³ çàïèñóþ÷èõ ïðèñòðî¿â." + IDS_NO_SOUND "(None)" END Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.c (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.c Sat Sep 15 18:54:01 2007 @@ -43,13 +43,6 @@ HWPD_MAX = HWPD_LARGELIST } HWPAGE_DISPLAYMODE, *PHWPAGE_DISPLAYMODE; -typedef struct _IMGINFO -{ - HBITMAP hBitmap; - INT cxSource; - INT cySource; -} IMGINFO, *PIMGINFO; - HWND WINAPI DeviceCreateHardwarePageEx(HWND hWndParent, LPGUID lpGuids, @@ -66,85 +59,6 @@ { {IDI_CPLICON, IDS_CPLNAME, IDS_CPLDESCRIPTION, MmSysApplet}, }; - -static VOID -InitImageInfo(PIMGINFO ImgInfo) -{ - BITMAP bitmap; - - ZeroMemory(ImgInfo, sizeof(*ImgInfo)); - - ImgInfo->hBitmap = LoadImage(hApplet, - MAKEINTRESOURCE(IDB_SPEAKIMG), - IMAGE_BITMAP, - 0, - 0, - LR_DEFAULTCOLOR); - - if (ImgInfo->hBitmap != NULL) - { - GetObject(ImgInfo->hBitmap, sizeof(BITMAP), &bitmap); - - ImgInfo->cxSource = bitmap.bmWidth; - ImgInfo->cySource = bitmap.bmHeight; - } -} - -/* Volume property page dialog callback */ -//static INT_PTR CALLBACK -INT_PTR CALLBACK -VolumeDlgProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) -{ - static IMGINFO ImgInfo; - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - - switch(uMsg) - { - case WM_INITDIALOG: - { - InitImageInfo(&ImgInfo); - break; - } - case WM_DRAWITEM: - { - LPDRAWITEMSTRUCT lpDrawItem; - lpDrawItem = (LPDRAWITEMSTRUCT) lParam; - if(lpDrawItem->CtlID == IDC_SPEAKIMG) - { - HDC hdcMem; - LONG left; - - /* position image in centre of dialog */ - left = (lpDrawItem->rcItem.right - ImgInfo.cxSource) / 2; - - hdcMem = CreateCompatibleDC(lpDrawItem->hDC); - if (hdcMem != NULL) - { - SelectObject(hdcMem, ImgInfo.hBitmap); - BitBlt(lpDrawItem->hDC, - left, - lpDrawItem->rcItem.top, - lpDrawItem->rcItem.right - lpDrawItem->rcItem.left, - lpDrawItem->rcItem.bottom - lpDrawItem->rcItem.top, - hdcMem, - 0, - 0, - SRCCOPY); - DeleteDC(hdcMem); - } - } - return TRUE; - } - } - - return FALSE; -} - - /* Audio property page dialog callback */ static INT_PTR CALLBACK Modified: trunk/reactos/dll/cpl/mmsys/mmsys.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.h?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.h (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.h Sat Sep 15 18:54:01 2007 @@ -13,6 +13,10 @@ extern HINSTANCE hApplet; + +#define DRVM_MAPPER 0x2000 +#define DRVM_MAPPER_PREFERRED_GET (DRVM_MAPPER+21) +#define DRVM_MAPPER_PREFERRED_SET (DRVM_MAPPER+22) /* main.c */ @@ -36,6 +40,14 @@ WPARAM wParam, LPARAM lParam); +/* volume.c */ + +INT_PTR CALLBACK +VolumeDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam); + #endif /* __CPL_MMSYS_H */ Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rbuild… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.rbuild (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.rbuild Sat Sep 15 18:54:01 2007 @@ -19,5 +19,6 @@ <library>advapi32</library> <file>mmsys.c</file> <file>sounds.c</file> + <file>volume.c</file> <file>mmsys.rc</file> </module> Modified: trunk/reactos/dll/cpl/mmsys/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/resource.h (original) +++ trunk/reactos/dll/cpl/mmsys/resource.h Sat Sep 15 18:54:01 2007 @@ -26,7 +26,7 @@ #define IDC_TEXT_SOUND 117 #define IDC_PLAY_SOUND 118 #define IDC_BROWSE_SOUND 119 - +#define IDC_DEVICE_NAME 120 #define IDB_SPEAKIMG 4624 #define IDC_SPEAKIMG 4625 Propchange: trunk/reactos/dll/cpl/mmsys/sounds.c ------------------------------------------------------------------------------ svn:keywords = author date revision Added: trunk/reactos/dll/cpl/mmsys/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/volume.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/volume.c (added) +++ trunk/reactos/dll/cpl/mmsys/volume.c Sat Sep 15 18:54:01 2007 @@ -1,0 +1,150 @@ +/* $Id: main.c 12852 2005-01-06 13:58:04Z mf $ + * + * PROJECT: ReactOS Multimedia Control Panel + * FILE: lib/cpl/mmsys/mmsys.c + * PURPOSE: ReactOS Multimedia Control Panel + * PROGRAMMER: Thomas Weidenmueller <w3seek(a)reactos.com> + * Johannes Anderwald <janderwald(a)reactos.com> + */ + +#include <windows.h> +#include <commctrl.h> +#include <setupapi.h> +#include <cpl.h> +#include <tchar.h> +#include <stdio.h> +#include "mmsys.h" +#include "resource.h" + +typedef struct _IMGINFO +{ + HBITMAP hBitmap; + INT cxSource; + INT cySource; +} IMGINFO, *PIMGINFO; + + +static VOID +InitImageInfo(PIMGINFO ImgInfo) +{ + BITMAP bitmap; + + ZeroMemory(ImgInfo, sizeof(*ImgInfo)); + + ImgInfo->hBitmap = LoadImage(hApplet, + MAKEINTRESOURCE(IDB_SPEAKIMG), + IMAGE_BITMAP, + 0, + 0, + LR_DEFAULTCOLOR); + + if (ImgInfo->hBitmap != NULL) + { + GetObject(ImgInfo->hBitmap, sizeof(BITMAP), &bitmap); + + ImgInfo->cxSource = bitmap.bmWidth; + ImgInfo->cySource = bitmap.bmHeight; + } +} + +void +InitVolumeControls(HWND hwndDlg) +{ + UINT NumWavOut; + WAVEOUTCAPS woc; + MMRESULT errcode; + DWORD dwDeviceID; + DWORD dwStatus; + + NumWavOut = waveOutGetNumDevs(); + if (!NumWavOut) + { + //FIXME + // deactivate all controls + return; + } + + errcode = waveOutMessage((HWAVEOUT)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, (DWORD_PTR)&dwDeviceID, (DWORD_PTR)&dwStatus); + if (errcode != MMSYSERR_NOERROR) + { + MessageBox(hwndDlg, _T("Failed to enumerate default device"), NULL, MB_OK); + return; + } + + if (waveOutGetDevCaps(dwDeviceID, &woc, sizeof(WAVEOUTCAPS)) != MMSYSERR_NOERROR) + { + MessageBox(hwndDlg, _T("waveOutGetDevCaps failed"), NULL, MB_OK); + return; + } + + SendDlgItemMessage(hwndDlg, IDC_DEVICE_NAME, WM_SETTEXT, (WPARAM)0, (LPARAM)woc.szPname); + + if (!(woc.dwSupport & WAVECAPS_VOLUME)) + { + /// the device does not support volume changes + /// disable volume control + EnableWindow(GetDlgItem(hwndDlg, IDC_VOLUME_TRACKBAR), FALSE); + } + else + { + SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(0, 10)); + SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETPAGESIZE, (WPARAM)FALSE, (LPARAM)1); + SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETSEL, (WPARAM)FALSE, (LPARAM)MAKELONG(0, 10)); + SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)4); + } +} + +/* Volume property page dialog callback */ +//static INT_PTR CALLBACK +INT_PTR CALLBACK +VolumeDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + static IMGINFO ImgInfo; + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + + switch(uMsg) + { + case WM_INITDIALOG: + { + InitImageInfo(&ImgInfo); + InitVolumeControls(hwndDlg); + break; + } + case WM_DRAWITEM: + { + LPDRAWITEMSTRUCT lpDrawItem; + lpDrawItem = (LPDRAWITEMSTRUCT) lParam; + if(lpDrawItem->CtlID == IDC_SPEAKIMG) + { + HDC hdcMem; + LONG left; + + /* position image in centre of dialog */ + left = (lpDrawItem->rcItem.right - ImgInfo.cxSource) / 2; + + hdcMem = CreateCompatibleDC(lpDrawItem->hDC); + if (hdcMem != NULL) + { + SelectObject(hdcMem, ImgInfo.hBitmap); + BitBlt(lpDrawItem->hDC, + left, + lpDrawItem->rcItem.top, + lpDrawItem->rcItem.right - lpDrawItem->rcItem.left, + lpDrawItem->rcItem.bottom - lpDrawItem->rcItem.top, + hdcMem, + 0, + 0, + SRCCOPY); + DeleteDC(hdcMem); + } + } + return TRUE; + } + } + + return FALSE; +} Propchange: trunk/reactos/dll/cpl/mmsys/volume.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/cpl/mmsys/volume.c ------------------------------------------------------------------------------ svn:keywords = author date revision

1 0

[ekohl] 29057: Use the currently selected locale id instead of LOCALE_USER_DEFAULT to display and modify currency settings.
by ekohl＠svn.reactos.org 15 Sep '07

15 Sep '07

Author: ekohl Date: Sat Sep 15 18:48:40 2007 New Revision: 29057 URL: http://svn.reactos.org/svn/reactos?rev=29057&view=rev Log: Use the currently selected locale id instead of LOCALE_USER_DEFAULT to display and modify currency settings. Modified: trunk/reactos/dll/cpl/intl/currency.c Modified: trunk/reactos/dll/cpl/intl/currency.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/currency.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/currency.c (original) +++ trunk/reactos/dll/cpl/intl/currency.c Sat Sep 15 18:48:40 2007 @@ -37,140 +37,111 @@ #define MAX_FIELD_DIG_SAMPLES 3 -typedef struct _GLOBAL_DATA -{ - TCHAR szCurrencySymbol[6]; - TCHAR szDecimalSep[4]; - TCHAR szThousandSep[4]; - TCHAR szGrouping[10]; - - int PositiveOrder; - int NegativeOrder; - int NumDigits; - -} GLOBAL_DATA, *PGLOBAL_DATA; - - -static VOID -GetInitialCurrencyValues(PGLOBAL_DATA pGlobalData) -{ - TCHAR szBuffer[MAX_FMT_SIZE]; - int ret; - - /* Get currency symbol */ - ret = GetLocaleInfo(LOCALE_USER_DEFAULT, - LOCALE_SCURRENCY, - pGlobalData->szCurrencySymbol, 6); - - /* Get positive format */ - ret = GetLocaleInfo(LOCALE_USER_DEFAULT, - LOCALE_ICURRENCY, - szBuffer, MAX_FMT_SIZE); - if (ret != 0) - { - pGlobalData->PositiveOrder = _ttoi(szBuffer); - } - - /* Get negative format */ - ret = GetLocaleInfo(LOCALE_USER_DEFAULT, - LOCALE_INEGCURR, - szBuffer, MAX_FMT_SIZE); - if (ret != 0) - { - pGlobalData->NegativeOrder = _ttoi(szBuffer); - } - - /* Get number of fractional digits */ - ret = GetLocaleInfo(LOCALE_USER_DEFAULT, - LOCALE_ICURRDIGITS, - szBuffer, MAX_FMT_SIZE); - if (ret != 0) - { - pGlobalData->NumDigits = _ttoi(szBuffer); - } - - /* Get decimal separator */ - ret = GetLocaleInfo(LOCALE_USER_DEFAULT, - LOCALE_SMONDECIMALSEP, - pGlobalData->szDecimalSep, 4); - - /* Get group separator */ - ret = GetLocaleInfo(LOCALE_USER_DEFAULT, - LOCALE_SMONTHOUSANDSEP, - pGlobalData->szThousandSep, 4); - - /* Get grouping */ - ret = GetLocaleInfo(LOCALE_USER_DEFAULT, - LOCALE_SMONGROUPING, - pGlobalData->szGrouping, 10); -} - - -static VOID -UpdateExamples(HWND hwndDlg, PGLOBAL_DATA pGlobalData) -{ - TCHAR szBuffer[MAX_FMT_SIZE]; - CURRENCYFMT cyFmt; - - cyFmt.NumDigits = pGlobalData->NumDigits; - cyFmt.LeadingZero = 0; - cyFmt.Grouping = 3; - cyFmt.lpDecimalSep = pGlobalData->szDecimalSep; - cyFmt.lpThousandSep = pGlobalData->szThousandSep; - cyFmt.PositiveOrder = pGlobalData->PositiveOrder; - cyFmt.NegativeOrder = pGlobalData->NegativeOrder; - cyFmt.lpCurrencySymbol = pGlobalData->szCurrencySymbol; +static VOID +UpdateExamples(HWND hwndDlg, PGLOBALDATA pGlobalData) +{ + TCHAR szBuffer[MAX_FMT_SIZE]; /* positive example */ - GetCurrencyFormat(LOCALE_USER_DEFAULT, 0, + GetCurrencyFormat(pGlobalData->lcid, 0, POSITIVE_EXAMPLE, - &cyFmt, szBuffer, MAX_FMT_SIZE); + NULL, szBuffer, MAX_FMT_SIZE); SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYPOSSAMPLE), WM_SETTEXT, 0, (LPARAM)szBuffer); /* negative example */ - GetCurrencyFormat(LOCALE_USER_DEFAULT, 0, + GetCurrencyFormat(pGlobalData->lcid, 0, NEGATIVE_EXAMPLE, - &cyFmt, szBuffer, MAX_FMT_SIZE); + NULL, szBuffer, MAX_FMT_SIZE); SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYNEGSAMPLE), WM_SETTEXT, 0, (LPARAM)szBuffer); } static VOID -OnInitDialog(HWND hwndDlg, PGLOBAL_DATA pGlobalData) -{ - TCHAR szBuffer[MAX_FMT_SIZE]; - CURRENCYFMT cyFmt; - int i; - - GetInitialCurrencyValues(pGlobalData); - - /* Set currency symbol */ +InitCurrencySymbols(HWND hwndDlg, PGLOBALDATA pGlobalData) +{ + TCHAR szBuffer[MAX_FMT_SIZE]; + + /* Set currency symbols */ + GetLocaleInfo(pGlobalData->lcid, + LOCALE_SCURRENCY, + szBuffer, MAX_FMT_SIZE); + SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYSYMBOL), CB_ADDSTRING, 0, - (LPARAM)pGlobalData->szCurrencySymbol); + (LPARAM)szBuffer); SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYSYMBOL), CB_SETCURSEL, 0, /* index */ 0); - +} + + +static VOID +InitCurrencyPositiveFormats(HWND hwndDlg, PGLOBALDATA pGlobalData) +{ + TCHAR szDecimalSep[MAX_FMT_SIZE]; + TCHAR szThousandSep[MAX_FMT_SIZE]; + TCHAR szCurrencySymbol[MAX_FMT_SIZE]; + TCHAR szBuffer[MAX_FMT_SIZE]; + CURRENCYFMT cyFmt; + INT nPositiveOrder = 0; + INT ret; + INT i; + + + /* Get positive format */ + ret = GetLocaleInfo(pGlobalData->lcid, + LOCALE_ICURRENCY, + szBuffer, MAX_FMT_SIZE); + if (ret != 0) + { + nPositiveOrder = _ttoi(szBuffer); + } + + /* Get number of fractional digits */ + ret = GetLocaleInfo(pGlobalData->lcid, + LOCALE_ICURRDIGITS, + szBuffer, MAX_FMT_SIZE); + if (ret != 0) + { + cyFmt.NumDigits = _ttoi(szBuffer); + } + else + { + cyFmt.NumDigits = 0; + } + + /* Get decimal separator */ + ret = GetLocaleInfo(pGlobalData->lcid, + LOCALE_SMONDECIMALSEP, + szDecimalSep, MAX_FMT_SIZE); + + /* Get group separator */ + ret = GetLocaleInfo(pGlobalData->lcid, + LOCALE_SMONTHOUSANDSEP, + szThousandSep, MAX_FMT_SIZE); + + /* Get currency symbol */ + ret = GetLocaleInfo(pGlobalData->lcid, + LOCALE_SCURRENCY, + szCurrencySymbol, MAX_FMT_SIZE); /* positive currency values */ - cyFmt.NumDigits = pGlobalData->NumDigits; cyFmt.LeadingZero = 0; cyFmt.Grouping = 3; - cyFmt.lpDecimalSep = pGlobalData->szDecimalSep; - cyFmt.lpThousandSep = pGlobalData->szThousandSep; + cyFmt.lpDecimalSep = szDecimalSep; + cyFmt.lpThousandSep = szThousandSep; + cyFmt.lpCurrencySymbol = szCurrencySymbol; cyFmt.NegativeOrder = 0; - cyFmt.lpCurrencySymbol = pGlobalData->szCurrencySymbol; for (i = 0; i < 4; i++) { cyFmt.PositiveOrder = i; - GetCurrencyFormat(LOCALE_USER_DEFAULT, 0, + GetCurrencyFormat(pGlobalData->lcid, 0, _T("1.1"), &cyFmt, szBuffer, MAX_FMT_SIZE); @@ -182,15 +153,72 @@ SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYPOSVALUE), CB_SETCURSEL, - pGlobalData->PositiveOrder, + nPositiveOrder, 0); +} + + +static VOID +InitCurrencyNegativeFormats(HWND hwndDlg, PGLOBALDATA pGlobalData) +{ + TCHAR szDecimalSep[MAX_FMT_SIZE]; + TCHAR szThousandSep[MAX_FMT_SIZE]; + TCHAR szCurrencySymbol[MAX_FMT_SIZE]; + TCHAR szBuffer[MAX_FMT_SIZE]; + CURRENCYFMT cyFmt; + INT nNegativeOrder = 0; + INT ret; + int i; + + /* Get negative format */ + ret = GetLocaleInfo(pGlobalData->lcid, + LOCALE_INEGCURR, + szBuffer, MAX_FMT_SIZE); + if (ret != 0) + { + nNegativeOrder = _ttoi(szBuffer); + } + + /* Get number of fractional digits */ + ret = GetLocaleInfo(pGlobalData->lcid, + LOCALE_ICURRDIGITS, + szBuffer, MAX_FMT_SIZE); + if (ret != 0) + { + cyFmt.NumDigits = _ttoi(szBuffer); + } + else + { + cyFmt.NumDigits = 0; + } + + /* Get decimal separator */ + ret = GetLocaleInfo(pGlobalData->lcid, + LOCALE_SMONDECIMALSEP, + szDecimalSep, MAX_FMT_SIZE); + + /* Get group separator */ + ret = GetLocaleInfo(pGlobalData->lcid, + LOCALE_SMONTHOUSANDSEP, + szThousandSep, MAX_FMT_SIZE); + + /* Get currency symbol */ + ret = GetLocaleInfo(pGlobalData->lcid, + LOCALE_SCURRENCY, + szCurrencySymbol, MAX_FMT_SIZE); /* negative currency values */ + cyFmt.LeadingZero = 0; + cyFmt.Grouping = 3; + cyFmt.lpDecimalSep = szDecimalSep; + cyFmt.lpThousandSep = szThousandSep; + cyFmt.lpCurrencySymbol = szCurrencySymbol; cyFmt.PositiveOrder = 0; + for (i = 0; i < 16; i++) { cyFmt.NegativeOrder = i; - GetCurrencyFormat(LOCALE_USER_DEFAULT, 0, + GetCurrencyFormat(pGlobalData->lcid, 0, _T("-1.1"), &cyFmt, szBuffer, MAX_FMT_SIZE); @@ -202,19 +230,41 @@ SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYNEGVALUE), CB_SETCURSEL, - pGlobalData->NegativeOrder, /* index */ + nNegativeOrder, 0); +} + + +static VOID +InitCurrencyDecimalSeparators(HWND hwndDlg, PGLOBALDATA pGlobalData) +{ + TCHAR szBuffer[MAX_FMT_SIZE]; + + /* Get decimal separator */ + GetLocaleInfo(pGlobalData->lcid, + LOCALE_SMONDECIMALSEP, + szBuffer, MAX_FMT_SIZE); /* decimal separator */ SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYDECSEP), CB_ADDSTRING, 0, - (LPARAM)pGlobalData->szDecimalSep); + (LPARAM)szBuffer); SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYDECSEP), CB_SETCURSEL, 0, /* index */ 0); +} + + +/* Initialize the number of fractional digits */ +static VOID +InitCurrencyNumFracDigits(HWND hwndDlg, PGLOBALDATA pGlobalData) +{ + TCHAR szBuffer[MAX_FMT_SIZE]; + int ret; + int i; /* */ for (i = 0; i < 10; i++) @@ -227,32 +277,80 @@ (LPARAM)szBuffer); } - SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYDECNUM), - CB_SETCURSEL, - pGlobalData->NumDigits, /* index */ - 0); - + /* Get number of fractional digits */ + ret = GetLocaleInfo(pGlobalData->lcid, + LOCALE_ICURRDIGITS, + szBuffer, MAX_FMT_SIZE); + if (ret != 0) + { + SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYDECNUM), + CB_SETCURSEL, + _ttoi(szBuffer), + 0); + } + else + { + SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYDECNUM), + CB_SETCURSEL, + 0, + 0); + } +} + + +/* Initialize the list of group separators */ +static VOID +InitCurrencyGroupSeparators(HWND hwndDlg, PGLOBALDATA pGlobalData) +{ + TCHAR szBuffer[MAX_FMT_SIZE]; + + /* Get group separator */ + GetLocaleInfo(pGlobalData->lcid, + LOCALE_SMONTHOUSANDSEP, + szBuffer, MAX_FMT_SIZE); /* digit group separator */ SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYGRPSEP), CB_ADDSTRING, 0, - (LPARAM)pGlobalData->szThousandSep); + (LPARAM)szBuffer); SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYGRPSEP), CB_SETCURSEL, 0, /* index */ 0); +} + + +static VOID +InitDigitGroupCB(HWND hwndDlg, PGLOBALDATA pGlobalData) +{ + TCHAR szThousandSep[MAX_FMT_SIZE]; + TCHAR szGrouping[MAX_FMT_SIZE]; + TCHAR szBuffer[MAX_FMT_SIZE]; + CURRENCYFMT cyFmt; + INT ret; + INT i; + + /* Get group separator */ + ret = GetLocaleInfo(pGlobalData->lcid, + LOCALE_SMONTHOUSANDSEP, + szThousandSep, MAX_FMT_SIZE); + + /* Get grouping */ + ret = GetLocaleInfo(pGlobalData->lcid, + LOCALE_SMONGROUPING, + szGrouping, MAX_FMT_SIZE); /* digit grouping */ cyFmt.NumDigits = 0; cyFmt.LeadingZero = 0; cyFmt.lpDecimalSep = _T(""); - cyFmt.lpThousandSep = pGlobalData->szThousandSep; + cyFmt.lpThousandSep = szThousandSep; cyFmt.NegativeOrder = 0; cyFmt.lpCurrencySymbol = _T(""); cyFmt.Grouping = 0; - GetCurrencyFormat(LOCALE_USER_DEFAULT, 0, + GetCurrencyFormat(pGlobalData->lcid, 0, _T("123456789"), &cyFmt, szBuffer, MAX_FMT_SIZE); SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYGRPNUM), @@ -261,7 +359,7 @@ (LPARAM)szBuffer); cyFmt.Grouping = 3; - GetCurrencyFormat(LOCALE_USER_DEFAULT, 0, + GetCurrencyFormat(pGlobalData->lcid, 0, _T("123456789"), &cyFmt, szBuffer, MAX_FMT_SIZE); SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYGRPNUM), @@ -270,7 +368,7 @@ (LPARAM)szBuffer); cyFmt.Grouping = 32; - GetCurrencyFormat(LOCALE_USER_DEFAULT, 0, + GetCurrencyFormat(pGlobalData->lcid, 0, _T("123456789"), &cyFmt, szBuffer, MAX_FMT_SIZE); SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYGRPNUM), @@ -279,10 +377,10 @@ (LPARAM)szBuffer); i = 0; - if (pGlobalData->szGrouping[0] == _T('3')) - { - if ((pGlobalData->szGrouping[1] == _T(';')) && - (pGlobalData->szGrouping[2] == _T('2'))) + if (szGrouping[0] == _T('3')) + { + if ((szGrouping[1] == _T(';')) && + (szGrouping[2] == _T('2'))) i = 2; else i = 1; @@ -292,14 +390,12 @@ CB_SETCURSEL, i, /* index */ 0); - - /* Show the examples */ - UpdateExamples(hwndDlg, pGlobalData); -} +} + /* Set number of digidts in field */ static BOOL -SetCurrencyDigNum(HWND hwndDlg) +SetCurrencyDigNum(HWND hwndDlg, LCID lcid) { LPTSTR szFieldDigNumSamples[MAX_FIELD_DIG_SAMPLES]= { @@ -317,14 +413,14 @@ (LPARAM)0); /* Save number of digidts in field */ - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SMONGROUPING, szFieldDigNumSamples[nCurrSel]); + SetLocaleInfo(lcid, LOCALE_SMONGROUPING, szFieldDigNumSamples[nCurrSel]); return TRUE; } /* Set currency field separator */ static BOOL -SetCurrencyFieldSep(HWND hwndDlg) +SetCurrencyFieldSep(HWND hwndDlg, LCID lcid) { TCHAR szCurrencyFieldSep[MAX_SAMPLES_STR_SIZE]; @@ -335,14 +431,14 @@ (LPARAM)szCurrencyFieldSep); /* Save currency field separator */ - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SMONTHOUSANDSEP, szCurrencyFieldSep); + SetLocaleInfo(lcid, LOCALE_SMONTHOUSANDSEP, szCurrencyFieldSep); return TRUE; } /* Set number of fractional symbols */ static BOOL -SetCurrencyFracSymNum(HWND hwndDlg) +SetCurrencyFracSymNum(HWND hwndDlg, LCID lcid) { TCHAR szCurrencyFracSymNum[MAX_SAMPLES_STR_SIZE]; INT nCurrSel; @@ -357,14 +453,14 @@ _itot(nCurrSel, szCurrencyFracSymNum, DECIMAL_RADIX); /* Save number of fractional symbols */ - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_ICURRDIGITS, szCurrencyFracSymNum); + SetLocaleInfo(lcid, LOCALE_ICURRDIGITS, szCurrencyFracSymNum); return TRUE; } /* Set currency separator */ static BOOL -SetCurrencySep(HWND hwndDlg) +SetCurrencySep(HWND hwndDlg, LCID lcid) { TCHAR szCurrencySep[MAX_SAMPLES_STR_SIZE]; @@ -377,14 +473,14 @@ /* TODO: Add check for correctly input */ /* Save currency separator */ - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SMONDECIMALSEP, szCurrencySep); + SetLocaleInfo(lcid, LOCALE_SMONDECIMALSEP, szCurrencySep); return TRUE; } /* Set negative currency sum format */ static BOOL -SetNegCurrencySumFmt(HWND hwndDlg) +SetNegCurrencySumFmt(HWND hwndDlg, LCID lcid) { TCHAR szNegCurrencySumFmt[MAX_SAMPLES_STR_SIZE]; INT nCurrSel; @@ -399,14 +495,14 @@ _itot(nCurrSel, szNegCurrencySumFmt, DECIMAL_RADIX); /* Save currency sum format */ - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_INEGCURR, szNegCurrencySumFmt); + SetLocaleInfo(lcid, LOCALE_INEGCURR, szNegCurrencySumFmt); return TRUE; } /* Set positive currency sum format */ static BOOL -SetPosCurrencySumFmt(HWND hwndDlg) +SetPosCurrencySumFmt(HWND hwndDlg, LCID lcid) { TCHAR szPosCurrencySumFmt[MAX_SAMPLES_STR_SIZE]; INT nCurrSel; @@ -421,14 +517,14 @@ _itot(nCurrSel, szPosCurrencySumFmt, DECIMAL_RADIX); /* Save currency sum format */ - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_ICURRENCY, szPosCurrencySumFmt); + SetLocaleInfo(lcid, LOCALE_ICURRENCY, szPosCurrencySumFmt); return TRUE; } /* Set currency unit */ static BOOL -SetCurrencyUnit(HWND hwndDlg) +SetCurrencyUnit(HWND hwndDlg, LCID lcid) { TCHAR szCurrencyUnit[MAX_SAMPLES_STR_SIZE]; @@ -439,7 +535,7 @@ (LPARAM)(LPCSTR)szCurrencyUnit); /* Save currency unit */ - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SCURRENCY, szCurrencyUnit); + SetLocaleInfo(lcid, LOCALE_SCURRENCY, szCurrencyUnit); return TRUE; } @@ -451,16 +547,24 @@ WPARAM wParam, LPARAM lParam) { - PGLOBAL_DATA pGlobalData; - - pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + PGLOBALDATA pGlobalData; + + pGlobalData = (PGLOBALDATA)GetWindowLongPtr(hwndDlg, DWLP_USER); switch (uMsg) { case WM_INITDIALOG: - pGlobalData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLOBAL_DATA)); + pGlobalData = (PGLOBALDATA)((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); - OnInitDialog(hwndDlg, pGlobalData); + + InitCurrencySymbols(hwndDlg, pGlobalData); + InitCurrencyPositiveFormats(hwndDlg, pGlobalData); + InitCurrencyNegativeFormats(hwndDlg, pGlobalData); + InitCurrencyDecimalSeparators(hwndDlg, pGlobalData); + InitCurrencyNumFracDigits(hwndDlg, pGlobalData); + InitCurrencyGroupSeparators(hwndDlg, pGlobalData); + InitDigitGroupCB(hwndDlg, pGlobalData); + UpdateExamples(hwndDlg, pGlobalData); break; case WM_COMMAND: @@ -487,35 +591,31 @@ /* If push apply button */ if (lpnm->code == (UINT)PSN_APPLY) { - if (!SetCurrencyDigNum(hwndDlg)) + if (!SetCurrencyDigNum(hwndDlg, pGlobalData->lcid)) break; - if (!SetCurrencyUnit(hwndDlg)) + if (!SetCurrencyUnit(hwndDlg, pGlobalData->lcid)) break; - if (!SetPosCurrencySumFmt(hwndDlg)) + if (!SetPosCurrencySumFmt(hwndDlg, pGlobalData->lcid)) break; - if (!SetNegCurrencySumFmt(hwndDlg)) + if (!SetNegCurrencySumFmt(hwndDlg, pGlobalData->lcid)) break; - if (!SetCurrencySep(hwndDlg)) + if (!SetCurrencySep(hwndDlg, pGlobalData->lcid)) break; - if (!SetCurrencyFracSymNum(hwndDlg)) + if (!SetCurrencyFracSymNum(hwndDlg, pGlobalData->lcid)) break; - if (!SetCurrencyFieldSep(hwndDlg)) + if (!SetCurrencyFieldSep(hwndDlg, pGlobalData->lcid)) break; UpdateExamples(hwndDlg, pGlobalData); } } break; - - case WM_DESTROY: - HeapFree(GetProcessHeap(), 0, pGlobalData); - break; } return FALSE;

1 0

[cfinck] 29055: Tag ReactOS 0.3.3 release
by cfinck＠svn.reactos.org 15 Sep '07

15 Sep '07

Author: cfinck Date: Sat Sep 15 15:08:32 2007 New Revision: 29055 URL: http://svn.reactos.org/svn/reactos?rev=29055&view=rev Log: Tag ReactOS 0.3.3 release Added: tags/ReactOS-0.3.3/ - copied from r29054, branches/ros-branch-0_3_3-new/ Removed: branches/ros-branch-0_3_3-new/

1 0

[winesync] 29054: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 15 Sep '07

15 Sep '07

Author: winesync Date: Sat Sep 15 14:52:08 2007 New Revision: 29054 URL: http://svn.reactos.org/svn/reactos?rev=29054&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/comctl32/comctl32.rbuild trunk/reactos/dll/win32/comctl32/comctl32_ros.diff trunk/reactos/dll/win32/comctl32/propsheet.c trunk/reactos/dll/win32/comctl32/treeview.c Modified: trunk/reactos/dll/win32/comctl32/comctl32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32.rbuild (original) +++ trunk/reactos/dll/win32/comctl32/comctl32.rbuild Sat Sep 15 14:52:08 2007 @@ -1,4 +1,6 @@ -<module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll" allowwarnings="true" entrypoint="0"> +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll" allowwarnings="true"> <autoregister infsection="OleControlDlls" type="DllInstall" /> <importlibrary definition="comctl32.spec.def" /> <include base="comctl32">.</include> Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff (original) +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff Sat Sep 15 14:52:08 2007 @@ -31,7 +31,7 @@ =================================================================== --- propsheet.c (revision 25766) +++ propsheet.c (working copy) -@@ -2431,6 +2431,28 @@ +@@ -2434,6 +2434,28 @@ return FALSE; } @@ -60,7 +60,7 @@ /****************************************************************************** * PROPSHEET_SetWizButtons * -@@ -2453,17 +2475,6 @@ +@@ -2456,17 +2478,6 @@ EnableWindow(hwndNext, FALSE); EnableWindow(hwndFinish, FALSE); @@ -78,7 +78,7 @@ if (dwFlags & PSWIZB_BACK) EnableWindow(hwndBack, TRUE); -@@ -2493,6 +2504,32 @@ +@@ -2496,6 +2507,32 @@ } else if (!(dwFlags & PSWIZB_DISABLEDFINISH)) EnableWindow(hwndFinish, TRUE); Modified: trunk/reactos/dll/win32/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/propshe… ============================================================================== --- trunk/reactos/dll/win32/comctl32/propsheet.c (original) +++ trunk/reactos/dll/win32/comctl32/propsheet.c Sat Sep 15 14:52:08 2007 @@ -402,7 +402,7 @@ */ static BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp, PropSheetInfo * psInfo, - int index) + int index, BOOL resize) { const DLGTEMPLATE* pTemplate; const WORD* p; @@ -503,11 +503,14 @@ } /* remember the largest width and height */ - if (width > psInfo->width) - psInfo->width = width; - - if (height > psInfo->height) - psInfo->height = height; + if (resize) + { + if (width > psInfo->width) + psInfo->width = width; + + if (height > psInfo->height) + psInfo->height = height; + } /* menu */ switch ((WORD)*p) @@ -2284,7 +2287,7 @@ return FALSE; psInfo->proppage = ppi; - if (!PROPSHEET_CollectPageInfo(ppsp, psInfo, psInfo->nPages)) + if (!PROPSHEET_CollectPageInfo(ppsp, psInfo, psInfo->nPages, FALSE)) return FALSE; psInfo->proppage[psInfo->nPages].hpage = hpage; @@ -2877,7 +2880,7 @@ } if (!PROPSHEET_CollectPageInfo((LPCPROPSHEETPAGEW)psInfo->proppage[n].hpage, - psInfo, n)) + psInfo, n, TRUE)) { if (psInfo->usePropPage) DestroyPropertySheetPage(psInfo->proppage[n].hpage); @@ -2920,7 +2923,7 @@ } if (!PROPSHEET_CollectPageInfo((LPCPROPSHEETPAGEW)psInfo->proppage[n].hpage, - psInfo, n)) + psInfo, n, TRUE)) { if (psInfo->usePropPage) DestroyPropertySheetPage(psInfo->proppage[n].hpage); Modified: trunk/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treevie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/treeview.c (original) +++ trunk/reactos/dll/win32/comctl32/treeview.c Sat Sep 15 14:52:08 2007 @@ -3801,6 +3801,7 @@ if (ptr == NULL) { ERR("OutOfMemory, cannot allocate space for label\n"); + if(newText != tmpText) Free(newText); DestroyWindow(infoPtr->hwndEdit); infoPtr->hwndEdit = 0; return FALSE;

1 0

[hpoussin] 29053: Fix typo
by hpoussin＠svn.reactos.org 15 Sep '07

15 Sep '07

Author: hpoussin Date: Sat Sep 15 13:03:01 2007 New Revision: 29053 URL: http://svn.reactos.org/svn/reactos?rev=29053&view=rev Log: Fix typo Modified: trunk/reactos/tools/rbuild/directory.cpp Modified: trunk/reactos/tools/rbuild/directory.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/directory.cpp… ============================================================================== --- trunk/reactos/tools/rbuild/directory.cpp (original) +++ trunk/reactos/tools/rbuild/directory.cpp Sat Sep 15 13:03:01 2007 @@ -167,13 +167,12 @@ if ( parent.size () > 0 ) { - char buf[256]; if ( name.size () > 0 ) path = parent + sSep + name; else path = parent; - if ( CreateDirectory ( buf ) && verbose ) - printf ( "Created %s\n", buf ); + if ( CreateDirectory ( path ) && verbose ) + printf ( "Created %s\n", path.c_str () ); } else path = name;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs