From e054bf54e2862ec74d2ae61d173d89b4f1e5a3d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= Date: Wed, 16 Jun 2004 06:54:39 +0000 Subject: [PATCH] Sync to Wine-20040615: Ivan Leo Puoti - Changed my name, so update copyright info. Ilya Korniyko - Encoding fixes in Ukrainian translation. Wolfgang Schwotzer - Support lpstrCustomFilter and return nFilterIndex in file dialog. Rein Klazes - In FILEDLG_ScanDir do not try to set the current directory to a path that is empty. svn path=/trunk/; revision=9678 --- reactos/lib/comdlg32/cdlg_It.rc | 2 +- reactos/lib/comdlg32/cdlg_Uk.rc | 466 +++++++++++++------------- reactos/lib/comdlg32/filedlg.c | 90 +++-- reactos/lib/comdlg32/filedlg16.c | 2 +- reactos/lib/comdlg32/winehq2ros.patch | 28 +- 5 files changed, 317 insertions(+), 271 deletions(-) diff --git a/reactos/lib/comdlg32/cdlg_It.rc b/reactos/lib/comdlg32/cdlg_It.rc index c98322f5bbd..8dcbc360202 100644 --- a/reactos/lib/comdlg32/cdlg_It.rc +++ b/reactos/lib/comdlg32/cdlg_It.rc @@ -1,6 +1,6 @@ /* * Copyright 1996 Tristan Tarrant - * Copyright 2004 Ivan Leo Murray-Smith + * Copyright 2004 Ivan Leo Puoti * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/reactos/lib/comdlg32/cdlg_Uk.rc b/reactos/lib/comdlg32/cdlg_Uk.rc index 146a7272ff6..76d3b5cec7a 100644 --- a/reactos/lib/comdlg32/cdlg_Uk.rc +++ b/reactos/lib/comdlg32/cdlg_Uk.rc @@ -24,92 +24,92 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "÷іÄËÒÉÔÉ" +CAPTION "³äêðèòè" FONT 8, "Ms Sans Serif" { - LTEXT "&ІÍ'Ñ ÆÁÊÌÕ:", 1090, 6, 6, 76, 9 + 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 + LTEXT "Ïîêàçóâàòè ôàéëè &òèïó:", 1089, 6, 104, 90, 9 COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "&äÉÓËÉ:", 1091, 110, 104, 92, 9 + 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 "&äÏ×іÄËÁ", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "&ìÉÛÅ ÄÌÑ ÞÉÔÁÎÎÑ", 1040, 208, 68, 54, 24, BS_AUTOCHECKBOX | BS_MULTILINE | WS_GROUP | 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 "&Äîâ³äêà", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP + CHECKBOX "&Ëèøå äëÿ ÷èòàííÿ", 1040, 208, 68, 54, 24, BS_AUTOCHECKBOX | BS_MULTILINE | WS_GROUP | WS_TABSTOP } SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "úÂÅÒÅÇÔÉ ÑË ..." +CAPTION "Çáåðåãòè ÿê ..." FONT 8, "Ms Sans Serif" { - LTEXT "&&ІÍ'Ñ ÆÁÊÌÕ:", 1090, 6, 6, 76, 9 + 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 + LTEXT "Ïîêàçóâàòè ôàéëè &òèïó:", 1089, 6, 104, 90, 9 COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "&äÉÓËÉ:", 1091, 110, 104, 92, 9 + 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 "&äÏ×іÄËÁ", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "&ìÉÛÅ ÄÌÑ ÞÉÔÁÎÎÑ", 1040, 208, 68, 54, 24, BS_AUTOCHECKBOX | BS_MULTILINE | WS_GROUP | 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 "&Äîâ³äêà", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP + CHECKBOX "&Ëèøå äëÿ ÷èòàííÿ", 1040, 208, 68, 54, 24, BS_AUTOCHECKBOX | BS_MULTILINE | WS_GROUP | WS_TABSTOP } PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "äÒÕË" +CAPTION "Äðóê" FONT 8, "Ms Sans Serif" { - LTEXT "ðÒÉÎÔÅÒ:", 1088, 6, 6, 40, 9 + LTEXT "Ïðèíòåð:", 1088, 6, 6, 40, 9 LTEXT "", 1089, 60, 6, 150, 9 - GROUPBOX "äÒÕËÕ×ÁÔÉ", 1072, 6, 30, 160, 65, BS_GROUPBOX - RADIOBUTTON "&÷ÓÅ", 1056, 16, 45, 60, 12 - 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 "÷ÌÁÓÔÉ×ÏÓÔі", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP - LTEXT "&Ú:", 1090, 60, 80, 30, 9 - LTEXT "&ÄÏ:", 1091, 120, 80, 30, 9 - LTEXT "&ñËіÓÔØ ÄÒÕËÕ:", 1092, 6, 100, 76, 9 + GROUPBOX "Äðóêóâàòè", 1072, 6, 30, 160, 65, BS_GROUPBOX + RADIOBUTTON "&Âñå", 1056, 16, 45, 60, 12 + 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 "Âëàñòèâîñò³", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP + LTEXT "&ç:", 1090, 60, 80, 30, 9 + LTEXT "&äî:", 1091, 120, 80, 30, 9 + LTEXT "&ßê³ñòü äðóêó:", 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 "äÒÕË ÄÏ ÆÁÊÌÕ", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "óÔÉÓÌÏ", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Äðóê äî ôàéëó", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Ñòèñëî", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "îÁÓÔÒÏÊËÁ ÐÒÉÎÔÅÒÁ" +CAPTION "Íàñòðîéêà ïðèíòåðà" FONT 8, "Ms Sans Serif" { - GROUPBOX "ðÒÉÎÔÅÒ", 1072, 6, 10, 180, 65, BS_GROUPBOX - RADIOBUTTON "ðÒÉÎÔÅÒ ÚÁ &ÏÂÕÍÏ×ÌÅÎÎÑÍ", 1056, 16, 20, 80, 12 - LTEXT "[îÅÍÁ]", 1088, 35, 35, 120, 9 - RADIOBUTTON "&ІÎÛÉÊ ÐÒÉÎÔÅÒ", 1057, 16, 50, 80, 12 + GROUPBOX "Ïðèíòåð", 1072, 6, 10, 180, 65, BS_GROUPBOX + RADIOBUTTON "Ïðèíòåð çà &îáóìîâëåííÿì", 1056, 16, 20, 80, 12 + LTEXT "[Íåìà]", 1088, 35, 35, 120, 9 + 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 "&îÁÓÔÒÏÊËÁ", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP - GROUPBOX "ïÒієÎÔÁÃіÑ", 1073, 6, 85, 100, 50, BS_GROUPBOX - RADIOBUTTON "&ëÎÉÖÎÁ", 1058, 50, 100, 40, 12 - RADIOBUTTON "&áÌØÂÏÍÎÁ", 1059, 50, 115, 40, 12 + 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 + RADIOBUTTON "&Àëüáîìíà", 1059, 50, 115, 40, 12 ICON "LANDSCAP", 1097, 10, 95, 32, 32 ICON "PORTRAIT", 1098, 10, 95, 32, 32 - GROUPBOX "ðÁÐіÒ", 1074, 120, 85, 180, 50, BS_GROUPBOX - LTEXT "òÏ&ÚÍіÒ", 1089, 130, 95, 30, 9 - LTEXT "&äÖÅÒÅÌÏ", 1090, 130, 110, 30, 9 + GROUPBOX "Ïàï³ð", 1074, 120, 85, 180, 50, BS_GROUPBOX + LTEXT "Ðî&çì³ð", 1089, 130, 95, 30, 9 + LTEXT "&Äæåðåëî", 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 } @@ -117,31 +117,31 @@ FONT 8, "Ms Sans Serif" CHOOSE_FONT DIALOG DISCARDABLE 13, 54, 264, 147 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ûÒÉÆÔ" +CAPTION "Øðèôò" FONT 8, "Ms Sans Serif" { - LTEXT "&ûÒÉÆÔ:",1088 ,6,3,40,9 + LTEXT "&Øðèôò:",1088 ,6,3,40,9 COMBOBOX 1136 ,6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "&óÔÉÌØ:",1089 ,108,3,44,9 + LTEXT "&Ñòèëü:",1089 ,108,3,44,9 COMBOBOX 1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "&òÏÚÍіÒ:",1090,179,3,30,9 + LTEXT "&Ðîçì³ð:",1090,179,3,30,9 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 "&úÁÓÔÏÓÕ×ÁÔÉ", 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 - CHECKBOX "&úÁËÒÅÓÌÅÎÉÊ", 1040, 10,82,75,10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&ðіÄËÒÅÓÌÅÎÉÊ", 1041, 10,94,75,10, BS_AUTOCHECKBOX - LTEXT "&ëÏÌіÒ:", 1091 ,6,110,30,9 + 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 + CHECKBOX "&Çàêðåñëåíèé", 1040, 10,82,75,10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "&ϳäêðåñëåíèé", 1041, 10,94,75,10, BS_AUTOCHECKBOX + LTEXT "&Êîë³ð:", 1091 ,6,110,30,9 COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - GROUPBOX "&úÒÁÚÏË",grp2,98,72,120,36,WS_GROUP - CTEXT "áÁâÂAaBb",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE - LTEXT "óËÒÉÐÔ:",stc7 ,98,114,80,9 + GROUPBOX "&Çðàçîê",grp2,98,72,120,36,WS_GROUP + CTEXT "ÀàÁáAaBb",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + LTEXT "Ñêðèïò:",stc7 ,98,114,80,9 COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } @@ -149,23 +149,23 @@ FONT 8, "Ms Sans Serif" CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 310, 185 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "úÍіÎÁ ÐÁÌіÔÒÉ" +CAPTION "Çì³íà ïàë³òðè" FONT 8, "Ms Sans Serif" { - LTEXT "&âÁÚÏ×Á ÐÁÌіÔÒÁ:", 1088, 4, 4, 140, 10 - LTEXT "ä&ÏÄÁÔËÏ×і ËÏÌØÏÒÉ:", 1089, 4, 106, 140, 10 - LTEXT "ëÏÌіÒ|úÁ&ÌÉ×ËÁ", 1090, 150, 151, 48, 10 - LTEXT "&þÅÒ×ÏÎÉÊ:", 726 /*1094*/,254,126,32,10 + LTEXT "&Áàçîâà ïàë³òðà:", 1088, 4, 4, 140, 10 + LTEXT "Ä&îäàòêîâ³ êîëüîðè:", 1089, 4, 106, 140, 10 + LTEXT "Êîë³ð|Çà&ëèâêà", 1090, 150, 151, 48, 10 + LTEXT "&×åðâîíèé:", 726 /*1094*/,254,126,32,10 EDITTEXT 706, 288,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&úÅÌÅÎÉÊ:",727/*1095*/,254,140,32,10 + LTEXT "&Çåëåíèé:",727/*1095*/,254,140,32,10 EDITTEXT 707, 288,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "ó&ÉÎіÊ:",728 /*1096*/,264,154,24,10 + LTEXT "Ñ&èí³é:",728 /*1096*/,264,154,24,10 EDITTEXT 708, 288,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "÷іÄ&ÔіÎÏË:" ,723 /*1091*/,202,126,30,10 + LTEXT "³ä&ò³íîê:" ,723 /*1091*/,202,126,30,10 EDITTEXT 703, 234,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&ëÏÎÔÒÁÓÔ:" ,724 /*1092*/,199,140,34,10 + LTEXT "&Êîíòðàñò:" ,724 /*1092*/,199,140,34,10 EDITTEXT 704, 234,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&ñÓËÒÁ×іÓÔØ:" ,725 /*1093*/,202,154,30,10 + LTEXT "&ßñêðàâ³ñòü:" ,725 /*1093*/,202,154,30,10 EDITTEXT 705, 234,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 @@ -173,258 +173,258 @@ FONT 8, "Ms Sans Serif" 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 "äÏ×іÄËÁ", 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 + 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 PUSHBUTTON "&i",713,300,200,4,14 /* just a dummy: 'i' is like &i in "sol&id" */ } FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 245, 62 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ðÏÛÕË" +CAPTION "Ïîøóê" FONT 8, "Ms Sans Serif" { - LTEXT "&úÒÁÚÏË:", -1, 4, 8, 42, 8 + LTEXT "&Çðàçîê:", -1, 4, 8, 42, 8 EDITTEXT 1152, 47, 7, 138, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "&ìÉÛÅ ÓÌÏ×Ï ÃіÌËÏÍ", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "úÁÌіË &ÒÅґіÓÔÒÕ", 1041, 4, 42, 100, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "îÁÐÒÑÍ", 1072, 107, 26, 78, 28 - CONTROL "&÷ÇÏÒÕ", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 40, 12 - CONTROL "÷&ÎÉÚ", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 152, 38, 30, 12 + CHECKBOX "&Ëèøå ñëîâî ö³ëêîì", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Çàë³ê &ðå´³ñòðó", 1041, 4, 42, 100, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Íàïðÿì", 1072, 107, 26, 78, 28 + CONTROL "&Âãîðó", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 40, 12 + 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 "&äÏ×іÄËÁ", pshHelp , 190, 45, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Ç&íàéòè äàë³", IDOK, 190, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "³äì³íà", IDCANCEL , 190, 23, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Äîâ³äêà", pshHelp , 190, 45, 50, 14, WS_GROUP | WS_TABSTOP } REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "úÁÍіÎÁ" +CAPTION "Çàì³íà" FONT 8, "Ms Sans Serif" { - LTEXT "&úÒÁÚÏË:", -1, 4, 9, 48, 8 + LTEXT "&Çðàçîê:", -1, 4, 9, 48, 8 EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "ú&ÁÍіÎÉÔÉ ÎÁ:", -1, 4, 26, 48, 8 + LTEXT "Ç&àì³íèòè íà:", -1, 4, 26, 48, 8 EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "&ìÉÛÅ ÓÌÏ×Ï ÃіÌËÏÍ", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "úÁÌіË &ÒÅґіÓÔÒÕ", 1041, 5, 62, 104, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "&Ëèøå ñëîâî ö³ëêîì", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Çàë³ê &ðå´³ñòðó", 1041, 5, 62, 104, 12, BS_AUTOCHECKBOX | WS_TABSTOP - 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 "&äÏ×іÄËÁ", pshHelp , 174, 75, 50, 14, WS_GROUP | WS_TABSTOP + 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 "&Äîâ³äêà", pshHelp , 174, 75, 50, 14, WS_GROUP | WS_TABSTOP } PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 186 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP | DS_3DLOOK -CAPTION "äÒÕË" +CAPTION "Äðóê" FONT 8, "Ms Sans Serif" { DEFPUSHBUTTON "OK", IDOK, 180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON - PUSHBUTTON "÷іÄÍіÎÁ", IDCANCEL, 232,164, 48,14, WS_GROUP - PUSHBUTTON "&äÏ×іÄËÁ", pshHelp, 50, 161, 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 - CONTROL "äÒÕË Õ ÆÁÊ&Ì", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12 - PUSHBUTTON "&÷ÌÁÓÔÉ×ÏÓÔі", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "&ІÍ'Ñ:", stc6, 16, 20, 36,8 + GROUPBOX "Ïðèíòåð", grp4, 8, 4, 272,84, WS_GROUP + CONTROL "Äðóê ó ôàé&ë", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12 + PUSHBUTTON "&Âëàñòèâîñò³", psh2, 212, 17, 60,14, WS_GROUP + LTEXT "&²ì'ÿ:", stc6, 16, 20, 36,8 COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "óÔÁÔÕÓ:", stc8, 16, 36, 36,10, SS_NOPREFIX - LTEXT "åÍÕÌØÏ×ÁÎÏ", stc12, 60, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "ôÉÐ:", stc7, 16, 48, 36,10, SS_NOPREFIX - LTEXT "åÍÕÌØÏ×ÁÎÏ", stc11, 60, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "íіÓÃÅ:", stc10, 16, 60, 36,10, SS_NOPREFIX - LTEXT "åÍÕÌØÏ×ÁÎÏ", stc14, 60, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "ðÒÉÍіÔËÁ:", stc13, 16, 72, 36,10, SS_NOPREFIX - LTEXT "åÍÕÌØÏ×ÁÎÏ", stc13, 60, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Ñòàòóñ:", stc8, 16, 36, 36,10, SS_NOPREFIX + LTEXT "Åìóëüîâàíî", stc12, 60, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Òèï:", stc7, 16, 48, 36,10, SS_NOPREFIX + LTEXT "Åìóëüîâàíî", stc11, 60, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "̳ñöå:", stc10, 16, 60, 36,10, SS_NOPREFIX + LTEXT "Åìóëüîâàíî", stc14, 60, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Ïðèì³òêà:", stc13, 16, 72, 36,10, SS_NOPREFIX + LTEXT "Åìóëüîâàíî", stc13, 60, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - GROUPBOX "ëÏÐії", grp2, 160, 92, 120,64, WS_GROUP - LTEXT "þÉÓÌÏ &ËÏÐіÊ:",stc5,168,108,68,8 + GROUPBOX "Êîﳿ", grp2, 160, 92, 120,64, WS_GROUP + LTEXT "×èñëî &êîï³é:",stc5,168,108,68,8 ICON "", ico3, 162,124, 76,24, WS_GROUP | SS_CENTERIMAGE - CONTROL "&òÏÚÂÉÔÉ", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,230,130,40,12 + CONTROL "&Ðîçáèòè", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,230,130,40,12 EDITTEXT edt3, 240,106, 32,12, WS_GROUP | ES_NUMBER - GROUPBOX "äÒÕËÕ×ÁÔÉ", grp1, 8,92, 144,64, WS_GROUP - CONTROL "&÷ÓÅ", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "&óÔÏÒіÎËÉ", rad3,"Button",BS_AUTORADIOBUTTON,16,122,50,12 - CONTROL "&÷ÉÄіÌÅÎÎÑ", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + GROUPBOX "Äðóêóâàòè", grp1, 8,92, 144,64, WS_GROUP + CONTROL "&Âñå", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 + CONTROL "&Ñòîð³íêè", rad3,"Button",BS_AUTORADIOBUTTON,16,122,50,12 + CONTROL "&Âèä³ëåííÿ", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 EDITTEXT edt1, 85,122, 20,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 20,12, WS_GROUP | ES_NUMBER - RTEXT "&×іÄ:", stc2, 70,124, 10,8 - RTEXT "&ÄÏ:", stc3, 106,124, 10,8 + RTEXT "&â³ä:", stc2, 70,124, 10,8 + RTEXT "&äî:", stc3, 106,124, 10,8 } 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 "õÓÔÁÎÏ×ËÉ ÐÒÉÎÔÅÒÁ" +CAPTION "Óñòàíîâêè ïðèíòåðà" FONT 8, "Ms Sans Serif" BEGIN DEFPUSHBUTTON "OK",IDOK,180,156,48,14,WS_GROUP - PUSHBUTTON "÷іÄÍіÎÁ",IDCANCEL,232,156,48,14 -/* PUSHBUTTON "óіÔËÁ...", psh5, 284,156,48,14 */ + PUSHBUTTON "³äì³íà",IDCANCEL,232,156,48,14 +/* PUSHBUTTON "ѳòêà...", psh5, 284,156,48,14 */ - GROUPBOX "ðÒÉÎÔÅÒ", grp4, 8, 4, 272,84, WS_GROUP - PUSHBUTTON "&÷ÌÁÓÔÉ×ÏÓÔі", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "&ІÍ'Ñ:", stc6, 16, 20, 36,8 + GROUPBOX "Ïðèíòåð", grp4, 8, 4, 272,84, WS_GROUP + PUSHBUTTON "&Âëàñòèâîñò³", psh2, 212, 17, 60,14, WS_GROUP + LTEXT "&²ì'ÿ:", stc6, 16, 20, 36,8 COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "óÔÁÔÕÓ:", stc8, 16, 36, 36,10, SS_NOPREFIX - LTEXT "åÍÕÌØÏ×ÁÎÏ", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "ôÉÐ:", stc7, 16, 48, 36,10, SS_NOPREFIX - LTEXT "åÍÕÌØÏ×ÁÎÏ", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "íіÓÃÅ:", stc10, 16, 60, 36,10, SS_NOPREFIX - LTEXT "åÍÕÌØÏ×ÁÎÏ", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "ðÒÉÍіÔËÉ:", stc9, 16, 72, 36,10, SS_NOPREFIX - LTEXT "åÍÕÌØÏ×ÁÎі", stc13, 52, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Ñòàòóñ:", stc8, 16, 36, 36,10, SS_NOPREFIX + LTEXT "Åìóëüîâàíî", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Òèï:", stc7, 16, 48, 36,10, SS_NOPREFIX + LTEXT "Åìóëüîâàíî", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "̳ñöå:", stc10, 16, 60, 36,10, SS_NOPREFIX + LTEXT "Åìóëüîâàíî", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Ïðèì³òêè:", stc9, 16, 72, 36,10, SS_NOPREFIX + LTEXT "Åìóëüîâàí³", stc13, 52, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - GROUPBOX "ðÁÐіÒ", grp2, 8, 92, 164,56, WS_GROUP - LTEXT "òÏÚ&ÍіÒ:", stc2, 16,108, 36, 8 + GROUPBOX "Ïàï³ð", grp2, 8, 92, 164,56, WS_GROUP + LTEXT "Ðîç&ì³ð:", stc2, 16,108, 36, 8 COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "&äÖÅÒÅÌÏ:", stc3, 16,128, 36, 8 + LTEXT "&Äæåðåëî:", stc3, 16,128, 36, 8 COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - GROUPBOX "ïÒієÎÔÁÃіÑ", grp1, 180, 92, 100,56, WS_GROUP + GROUPBOX "Îð³ºíòàö³ÿ", grp1, 180, 92, 100,56, WS_GROUP ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "&ðÏÒÔÒÅÔ", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "ì&ÁÎÄÛÁÆÔ", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 + CONTROL "&Ïîðòðåò", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 + CONTROL "Ë&àíäøàôò", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 END NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN -CAPTION "÷іÄËÒÉÔÉ" +CAPTION "³äêðèòè" FONT 8, "MS Sans Serif" { - LTEXT "ûÕËÁÔÉ &×",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY + LTEXT "Øóêàòè &â",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE LISTBOX IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE - LTEXT "ІÍ'Ñ &ÆÁÊÌÕ:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY + LTEXT "²ì'ÿ &ôàéëó:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY EDITTEXT IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL - LTEXT "æÁÊÌÉ &ÔÉÐÕ",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY - COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Ôàéëè &òèïó",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY + COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - CONTROL "ìÉÛÅ ÄÌÑ &ÞÉÔÁÎÎÑ",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 + 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 "&äÏ×іÄËÁ", pshHelp,222,145,50,14 + DEFPUSHBUTTON "&³äêðèòè", IDOK,222,110,50,14 + PUSHBUTTON "³äì³íà", IDCANCEL,222,128,50,14 + PUSHBUTTON "&Äîâ³äêà", pshHelp,222,145,50,14 } STRINGTABLE DISCARDABLE { - IDS_ABOUTBOX "&ðÒÏ ÔÅÓÔ ÷ÉÂіÒôÅËÉ" - IDS_DOCUMENTFOLDERS "ôÅËÉ ÄÏËÕÍÅÎÔі×" - IDS_PERSONAL "íÏї ÄÏËÕÍÅÎÔÉ" - IDS_FAVORITES "úÁËÌÁÄËÉ" - IDS_PATH "óÉÓÔÅÍÎÉÊ ÛÌÑÈ" - IDS_DESKTOP "óÔіÌØÎÉÃÑ" - IDS_FONTS "ûÒÉÆÔÉ" - IDS_MYCOMPUTER "íіÊ ËÏÍÐ'ÀÔÅÒ" + IDS_ABOUTBOX "&Ïðî òåñò Âèá³ðÒåêè" + IDS_DOCUMENTFOLDERS "Òåêè äîêóìåíò³â" + IDS_PERSONAL "Ìî¿ äîêóìåíòè" + IDS_FAVORITES "Çàêëàäêè" + IDS_PATH "Ñèñòåìíèé øëÿõ" + IDS_DESKTOP "Ñò³ëüíèöÿ" + IDS_FONTS "Øðèôòè" + IDS_MYCOMPUTER "̳é êîìï'þòåð" } STRINGTABLE DISCARDABLE { - IDS_SYSTEMFOLDERS "óÉÓÔÅÍÎі ÔÅËÉ" - IDS_LOCALHARDRIVES "ìÏËÁÌØÎі ÖÏÒÓÔËі ÄÉÓËÉ" - IDS_FILENOTFOUND "æÁÊÌ ÎÅ ÚÎÁÊÄÅÎÏ" - IDS_VERIFYFILE "ðÅÒÅ×іÒÔÅ, ÞÉ ÐÒÁ×ÉÌØÎÏ ×ËÁÚÁÎÏ іÍ'Ñ ÆÁÊÌÕ" - IDS_CREATEFILE "æÁÊÌ ÎÅ іÓÎÕє\nþÉ ÈÏÞÅÔÅ ÷É ÊÏÇÏ ÓÔ×ÏÒÉÔÉ?" - IDS_OVERWRITEFILE "æÁÊÌ ÕÖÅ іÓÎÕє.\núÁÍіÎÉÔÉ ÊÏÇÏ?" - IDS_INVALID_FILENAME_TITLE "îÅ×іÒÎÉÊ ÓÉÍ×ÏÌ × ÚÁÐÉÓÕ ÛÌÑÈÕ" - IDS_INVALID_FILENAME "ІÍ'Ñ ÆÁÊÌÕ ÎÅ ÍÏÖÅ ÍіÓÔÉÔÉ ÎÁÓÔÕÐÎі ÓÉÍ×ÏÌÉ: \n / : < > |" - IDS_PATHNOTEXISTING "ûÌÑÈ ÎÅ іÓÎÕє" - IDS_FILENOTEXISTING "æÁÊÌ ÎÅ іÓÎÕє" + IDS_SYSTEMFOLDERS "Ñèñòåìí³ òåêè" + IDS_LOCALHARDRIVES "Ëîêàëüí³ æîðñòê³ äèñêè" + IDS_FILENOTFOUND "Ôàéë íå çíàéäåíî" + IDS_VERIFYFILE "Ïåðåâ³ðòå, ÷è ïðàâèëüíî âêàçàíî ³ì'ÿ ôàéëó" + IDS_CREATEFILE "Ôàéë íå ³ñíóº\n×è õî÷åòå Âè éîãî ñòâîðèòè?" + IDS_OVERWRITEFILE "Ôàéë óæå ³ñíóº.\nÇàì³íèòè éîãî?" + IDS_INVALID_FILENAME_TITLE "Íåâ³ðíèé ñèìâîë â çàïèñó øëÿõó" + IDS_INVALID_FILENAME "²ì'ÿ ôàéëó íå ìîæå ì³ñòèòè íàñòóïí³ ñèìâîëè: \n / : < > |" + IDS_PATHNOTEXISTING "Øëÿõ íå ³ñíóº" + IDS_FILENOTEXISTING "Ôàéë íå ³ñíóº" } STRINGTABLE DISCARDABLE { - IDS_UPFOLDER "÷ÇÏÒÕ ÎÁ ÏÄÉÎ Òі×ÅÎØ" - IDS_NEWFOLDER "óÔ×ÏÒÉÔÉ ÎÏ×Õ ÔÅËÕ" - IDS_LISTVIEW "óÐÉÓÏË" - IDS_REPORTVIEW "ðÏÄÒÏÂÉÃі" - IDS_TODESKTOP "ðÅÒÅÈіÄ ÎÁ ÓÔіÌØÎÉÃÀ" + IDS_UPFOLDER "Âãîðó íà îäèí ð³âåíü" + IDS_NEWFOLDER "Ñòâîðèòè íîâó òåêó" + IDS_LISTVIEW "Ñïèñîê" + IDS_REPORTVIEW "Ïîäðîáèö³" + IDS_TODESKTOP "Ïåðåõ³ä íà ñò³ëüíèöþ" } STRINGTABLE DISCARDABLE { - PD32_PRINT_TITLE "äÒÕË" + PD32_PRINT_TITLE "Äðóê" - PD32_VALUE_UREADABLE "îÅÞÉÔÁєÍÉÊ ÅÌÅÍÅÎÔ" - PD32_INVALID_PAGE_RANGE "ãÅ ÚÎÁÞÅÎÎÑ ÎÅ ÌÅÖÉÔØ Õ ÄіÁÐÁÚÏÎі ÓÔÏÒіÎÏË\n\ -÷×ÅÄіÔØ ÚÎÁÞÅÎÎÅ ÍіÖ %d ÔÁ %d" - PD32_FROM_NOT_ABOVE_TO "úÎÁÞÅÎÎÑ ÷Іä ÎÅ ÐÏ×ÉÎÎÏ ÐÅÒÅ×ÉÝÕ×ÁÔÉ äï:" - PD32_MARGINS_OVERLAP "íÅÖі ÐÅÒÅËÒÉ×ÁÀÔØ ÞÉ ÐÅÒÅ×ÉÝÕÀÔØ \ -ÒÏÚÍіÒÉ ÐÁÐÅÒÕ.\n÷×ÅÄіÔØ їÈ ÎÁÎÏ×Ï" - PD32_NR_OF_COPIES_EMPTY "úÎÁÞÅÎÎÑ þÉÓÌÁ ëÏÐіÊ ÎÅ ÍÏÖÅ ÂÕÔÉ \ -ÐÕÓÔÉÍ" - PD32_TOO_LARGE_COPIES "ôÁËÁ ×ÅÌÉËÁ ËіÌØËіÓÔØ ËÏÐіÊ ÎÅ \ -ÍÏÖÅ ÂÕÔÉ ÎÁÄÒÕËÏ×ÁÎÁ ÷ÁÛÉÍ ÐÒÉÎÔÅÒÏÍ.\n÷×ÅÄіÔØ ÚÎÁÞÅÎÎÑ ÍіÖ 1 ÔÁ %d" - PD32_PRINT_ERROR "÷ÉÎÉËÌÁ ÐÏÍÉÌËÁ ÐÒÉÎÔÅÒÁ" - PD32_NO_DEFAULT_PRINTER "îÅÍÁє ÐÒÉÎÔÅÒÁ, ÐÏÓÔÁ×ÌÅÎÏÇÏ ÚÁ ÏÂÕÍÏ×ÌÅÎÎÑÍ" - PD32_CANT_FIND_PRINTER "îÅ ×ÄÁÌÏÓØ ÚÎÁÊÔÉ ÐÒÉÎÔÅÒ" - PD32_OUT_OF_MEMORY "íÁÌÏ ÐÁÍ'ÑÔі" - PD32_GENERIC_ERROR "÷ÉÎÉËÌÁ(É) ÐÏÍÉÌËÁ(É)" - PD32_DRIVER_UNKNOWN "îÅ×іÄÏÍÉÊ ÄÒÁÊ×ÅÒ ÐÒÉÎÔÅÒÁ" + PD32_VALUE_UREADABLE "Íå÷èòàºìèé åëåìåíò" + PD32_INVALID_PAGE_RANGE "Öå çíà÷åííÿ íå ëåæèòü ó ä³àïàçîí³ ñòîð³íîê\n\ +Ââåä³òü çíà÷åííå ì³æ %d òà %d" + PD32_FROM_NOT_ABOVE_TO "Çíà÷åííÿ Â²Ä íå ïîâèííî ïåðåâèùóâàòè ÄÎ:" + PD32_MARGINS_OVERLAP "Ìåæ³ ïåðåêðèâàþòü ÷è ïåðåâèùóþòü \ +ðîçì³ðè ïàïåðó.\nÂâåä³òü ¿õ íàíîâî" + PD32_NR_OF_COPIES_EMPTY "Çíà÷åííÿ ×èñëà Êîï³é íå ìîæå áóòè \ +ïóñòèì" + PD32_TOO_LARGE_COPIES "Òàêà âåëèêà ê³ëüê³ñòü êîï³é íå \ +ìîæå áóòè íàäðóêîâàíà Âàøèì ïðèíòåðîì.\nÂâåä³òü çíà÷åííÿ ì³æ 1 òà %d" + PD32_PRINT_ERROR "Âèíèêëà ïîìèëêà ïðèíòåðà" + PD32_NO_DEFAULT_PRINTER "Íåìຠïðèíòåðà, ïîñòàâëåíîãî çà îáóìîâëåííÿì" + PD32_CANT_FIND_PRINTER "Íå âäàëîñü çíàéòè ïðèíòåð" + PD32_OUT_OF_MEMORY "Ìàëî ïàì'ÿò³" + PD32_GENERIC_ERROR "Âèíèêëà(è) ïîìèëêà(è)" + PD32_DRIVER_UNKNOWN "Íåâ³äîìèé äðàéâåð ïðèíòåðà" - PD32_DEFAULT_PRINTER "ðÒÉÎÔÅÒ ÚÁ ÏÂÕÍÏ×ÌÅÎÎÑÍ; " - PD32_NR_OF_DOCUMENTS_IN_QUEUE "%d ÄÏËÕÍÅÎÔі× Õ ÞÅÒÚі" - PD32_PRINT_ALL_X_PAGES "&÷Óі %d ÓÔÏÒіÎÏË" - PD32_MARGINS_IN_INCHES "íÅÖі [ÄÀÊÍÉ]" - PD32_MARGINS_IN_MILIMETERS "íÅÖі [ÍÍ]" - PD32_MILIMETERS "ÍÍ" + PD32_DEFAULT_PRINTER "Ïðèíòåð çà îáóìîâëåííÿì; " + PD32_NR_OF_DOCUMENTS_IN_QUEUE "%d äîêóìåíò³â ó ÷åðç³" + PD32_PRINT_ALL_X_PAGES "&Âñ³ %d ñòîð³íîê" + PD32_MARGINS_IN_INCHES "Ìåæ³ [äþéìè]" + PD32_MARGINS_IN_MILIMETERS "Ìåæ³ [ìì]" + PD32_MILIMETERS "ìì" - PD32_PRINTER_STATUS_READY "çÏÔÏ×Ï" - PD32_PRINTER_STATUS_PAUSED "ðÒÉÚÕÐÉÎÅÎÏ; " - PD32_PRINTER_STATUS_ERROR "ðÏÍÉÌËÁ; " - PD32_PRINTER_STATUS_PENDING_DELETION "þÅËÁÎÎÑ ×ÉÄÁÌÅÎÎÑ; " - PD32_PRINTER_STATUS_PAPER_JAM "ðÁÐіÒ ÚÁÓÔÒÑÇ; " - PD32_PRINTER_STATUS_PAPER_OUT "îÅ ×ÉÓÔÁÞÁє ÐÁÐÅÒÕ; " - PD32_PRINTER_STATUS_MANUAL_FEED "ðÏÓÔÁ×ÔÅ ÐÁÐіÒ ×ÒÕÞÎÕ; " - PD32_PRINTER_STATUS_PAPER_PROBLEM "ðÒÏÂÌÅÍÁ Ó ÐÁÐÅÒÏÍ; " - PD32_PRINTER_STATUS_OFFLINE "ðÒÉÎÔÅÒ × ÒÅÖÉÍі offline; " - PD32_PRINTER_STATUS_IO_ACTIVE "÷×іÄ/÷É×іÄ ÁËÔÉ×ÎÉÊ; " - PD32_PRINTER_STATUS_BUSY "úÁÊÎÑÔÉÊ; " - PD32_PRINTER_STATUS_PRINTING "êÄÅ ÄÒÕË; " - PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "ìÏÔÏË ÐÅÒÅÐÏ×ÎÅÎÉÊ ÐÁÐÅÒÏÍ; " - PD32_PRINTER_STATUS_NOT_AVAILABLE "îÅ ÄÏÓÔÕÐÎÉÊ; " - PD32_PRINTER_STATUS_WAITING "þÅËÁÎÎÑ; " - PD32_PRINTER_STATUS_PROCESSING "ïÂÒÏÂËÁ; " - PD32_PRINTER_STATUS_INITIALIZING "çÏÔÕ×ÁÎÎÑ; " - PD32_PRINTER_STATUS_WARMING_UP "ðÒÏÇÒі×; " - PD32_PRINTER_STATUS_TONER_LOW "ôÏÎÅÒ ÐÒÉ ËіÎÃі; " - PD32_PRINTER_STATUS_NO_TONER "îÅÍÁ ÔÏÎÅÒÁ; " + PD32_PRINTER_STATUS_READY "Ãîòîâî" + PD32_PRINTER_STATUS_PAUSED "Ïðèçóïèíåíî; " + PD32_PRINTER_STATUS_ERROR "Ïîìèëêà; " + PD32_PRINTER_STATUS_PENDING_DELETION "×åêàííÿ âèäàëåííÿ; " + PD32_PRINTER_STATUS_PAPER_JAM "Ïàï³ð çàñòðÿã; " + PD32_PRINTER_STATUS_PAPER_OUT "Íå âèñòà÷ຠïàïåðó; " + PD32_PRINTER_STATUS_MANUAL_FEED "Ïîñòàâòå ïàï³ð âðó÷íó; " + PD32_PRINTER_STATUS_PAPER_PROBLEM "Ïðîáëåìà ñ ïàïåðîì; " + PD32_PRINTER_STATUS_OFFLINE "Ïðèíòåð â ðåæèì³ offline; " + PD32_PRINTER_STATUS_IO_ACTIVE "Ââ³ä/Âèâ³ä àêòèâíèé; " + PD32_PRINTER_STATUS_BUSY "Çàéíÿòèé; " + PD32_PRINTER_STATUS_PRINTING "Éäå äðóê; " + PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "Ëîòîê ïåðåïîâíåíèé ïàïåðîì; " + PD32_PRINTER_STATUS_NOT_AVAILABLE "Íå äîñòóïíèé; " + PD32_PRINTER_STATUS_WAITING "×åêàííÿ; " + PD32_PRINTER_STATUS_PROCESSING "Îáðîáêà; " + PD32_PRINTER_STATUS_INITIALIZING "Ãîòóâàííÿ; " + PD32_PRINTER_STATUS_WARMING_UP "Ïðîãð³â; " + PD32_PRINTER_STATUS_TONER_LOW "Òîíåð ïðè ê³íö³; " + PD32_PRINTER_STATUS_NO_TONER "Íåìà òîíåðà; " PD32_PRINTER_STATUS_PAGE_PUNT "Page punt; " - PD32_PRINTER_STATUS_USER_INTERVENTION "ðÅÒÅÒ×ÁÎÏ ËÏÒÉÓÔÕ×ÁÞÅÍ; " - PD32_PRINTER_STATUS_OUT_OF_MEMORY "íÁÌÏ ÐÁÍ'ÑÔі; " - PD32_PRINTER_STATUS_DOOR_OPEN "ëÒÉÛËÁ ÐÒÉÎÔÅÒÁ ×іÄËÒÉÔÁ; " - PD32_PRINTER_STATUS_SERVER_UNKNOWN "îÅ×іÄÏÍÉÊ ÓÅÒ×ÅÒ ÐÒÉÎÔÅÒÁ; " - PD32_PRINTER_STATUS_POWER_SAVE "öÉ×ÌÅÎÎÑ × ÂÅÚÐÅÞÎÏÍÕ ÒÅÖÉÍі; " + PD32_PRINTER_STATUS_USER_INTERVENTION "Ïåðåðâàíî êîðèñòóâà÷åì; " + PD32_PRINTER_STATUS_OUT_OF_MEMORY "Ìàëî ïàì'ÿò³; " + PD32_PRINTER_STATUS_DOOR_OPEN "Êðèøêà ïðèíòåðà â³äêðèòà; " + PD32_PRINTER_STATUS_SERVER_UNKNOWN "Íåâ³äîìèé ñåðâåð ïðèíòåðà; " + PD32_PRINTER_STATUS_POWER_SAVE "Æèâëåííÿ â áåçïå÷íîìó ðåæèì³; " } STRINGTABLE DISCARDABLE /* Color names */ { - IDS_COLOR_BLACK "þÏÒÎÉÊ" - IDS_COLOR_MAROON "âÒÕÎÁÔÎÉÊ" - IDS_COLOR_GREEN "úÅÌÅÎÉÊ" - IDS_COLOR_OLIVE "ïÌÉ×ËÏ×ÉÊ" - IDS_COLOR_NAVY "óÉÎіÊ" - IDS_COLOR_PURPLE "ðÕÒÐÕÒÎÉÊ" - IDS_COLOR_TEAL "úÅÌÅÎÏ-ÓÉÎіÊ" - IDS_COLOR_GRAY "óіÒÉÊ" - IDS_COLOR_SILVER "óÒіÂÎÉÊ" - IDS_COLOR_RED "þÅÒ×ÏÎÉÊ" - IDS_COLOR_LIME "óÁÌÁÔÏ×ÉÊ" - IDS_COLOR_YELLOW "öÏ×ÔÉÊ" - IDS_COLOR_BLUE "çÏÌÕÂÉÊ" - IDS_COLOR_FUCHSIA "æіÏÌÅÔÏ×ÉÊ" - IDS_COLOR_AQUA "áË×ÁÍÁÒÉÎ" - IDS_COLOR_WHITE "âіÌÉÊ" + IDS_COLOR_BLACK "×îðíèé" + IDS_COLOR_MAROON "Áðóíàòíèé" + IDS_COLOR_GREEN "Çåëåíèé" + IDS_COLOR_OLIVE "Îëèâêîâèé" + IDS_COLOR_NAVY "Ñèí³é" + IDS_COLOR_PURPLE "Ïóðïóðíèé" + IDS_COLOR_TEAL "Çåëåíî-ñèí³é" + IDS_COLOR_GRAY "ѳðèé" + IDS_COLOR_SILVER "Ñð³áíèé" + IDS_COLOR_RED "×åðâîíèé" + IDS_COLOR_LIME "Ñàëàòîâèé" + IDS_COLOR_YELLOW "Æîâòèé" + IDS_COLOR_BLUE "Ãîëóáèé" + IDS_COLOR_FUCHSIA "Ô³îëåòîâèé" + IDS_COLOR_AQUA "Àêâàìàðèí" + IDS_COLOR_WHITE "Á³ëèé" } diff --git a/reactos/lib/comdlg32/filedlg.c b/reactos/lib/comdlg32/filedlg.c index c03dc80f4c8..933fe9be4b2 100644 --- a/reactos/lib/comdlg32/filedlg.c +++ b/reactos/lib/comdlg32/filedlg.c @@ -32,8 +32,6 @@ * * FIXME: old style hook messages are not implemented (except FILEOKSTRING) * - * FIXME: lpstrCustomFilter not handled - * * FIXME: algorithm for selecting the initial directory is too simple * * FIXME: add to recent docs @@ -379,10 +377,10 @@ BOOL WINAPI GetFileDialog95A(LPOPENFILENAMEA ofn,UINT iDlgType) LPCSTR s; int n, len; - /* filter is a list... title\0ext\0......\0\0 */ + /* customfilter contains a pair of strings... title\0ext\0 */ s = ofn->lpstrCustomFilter; - while (*s) s = s+strlen(s)+1; - s++; + if (*s) s = s+strlen(s)+1; + if (*s) s = s+strlen(s)+1; n = s - ofn->lpstrCustomFilter; len = MultiByteToWideChar( CP_ACP, 0, ofn->lpstrCustomFilter, n, NULL, 0 ); customfilter = MemAlloc(len*sizeof(WCHAR)); @@ -438,8 +436,6 @@ BOOL WINAPI GetFileDialog95A(LPOPENFILENAMEA ofn,UINT iDlgType) * Copy the OPENFILENAMEW structure in a FileOpenDlgInfos structure. * Call GetFileName95 with this structure and clean the memory. * - * FIXME: lpstrCustomFilter has to be converted back - * */ BOOL WINAPI GetFileDialog95W(LPOPENFILENAMEW ofn,UINT iDlgType) { @@ -1983,6 +1979,22 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) } } + /* copy currently selected filter to lpstrCustomFilter */ + if (fodInfos->ofnInfos->lpstrCustomFilter) + { + LPOPENFILENAMEA ofn = fodInfos->ofnInfos; + int len = WideCharToMultiByte(CP_ACP, 0, fodInfos->ShellInfos.lpstrCurrentFilter, -1, + NULL, 0, NULL, NULL); + if (len + strlen(ofn->lpstrCustomFilter) + 1 <= ofn->nMaxCustFilter) + { + LPSTR s = ofn->lpstrCustomFilter; + s += strlen(ofn->lpstrCustomFilter)+1; + WideCharToMultiByte(CP_ACP, 0, fodInfos->ShellInfos.lpstrCurrentFilter, -1, + s, len, NULL, NULL); + } + } + + if ( !FILEDLG95_SendFileOK(hwnd, fodInfos) ) goto ret; @@ -2148,13 +2160,34 @@ static void FILEDLG95_SHELL_Clean(HWND hwnd) static HRESULT FILEDLG95_FILETYPE_Init(HWND hwnd) { FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr); + int nFilters = 0; /* number of filters */ + int nFilterIndexCB; TRACE("\n"); + if(fodInfos->customfilter) + { + /* customfilter has one entry... title\0ext\0 + * Set first entry of combo box item with customfilter + */ + LPWSTR lpstrExt; + LPCWSTR lpstrPos = fodInfos->customfilter; + + /* Get the title */ + lpstrPos += strlenW(fodInfos->customfilter) + 1; + + /* Copy the extensions */ + if (! *lpstrPos) return E_FAIL; /* malformed filter */ + if (!(lpstrExt = MemAlloc((strlenW(lpstrPos)+1)*sizeof(WCHAR)))) return E_FAIL; + strcpyW(lpstrExt,lpstrPos); + + /* Add the item at the end of the combo */ + CBAddStringW(fodInfos->DlgInfos.hwndFileTypeCB, fodInfos->customfilter); + CBSetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB, nFilters, lpstrExt); + nFilters++; + } if(fodInfos->filter) { - int nFilters = 0; /* number of filters */ - LPWSTR lpstrFilter; LPCWSTR lpstrPos = fodInfos->filter; for(;;) @@ -2182,26 +2215,36 @@ static HRESULT FILEDLG95_FILETYPE_Init(HWND hwnd) CBSetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB, nFilters, lpstrExt); nFilters++; } - /* - * Set the current filter to the one specified - * in the initialisation structure - * FIXME: lpstrCustomFilter not handled at all - */ + } + + /* + * Set the current filter to the one specified + * in the initialisation structure + */ + if (fodInfos->filter || fodInfos->customfilter) + { + LPWSTR lpstrFilter; + + /* Check to make sure our index isn't out of bounds. */ + if ( fodInfos->ofnInfos->nFilterIndex > + nFilters - (fodInfos->customfilter == NULL ? 0 : 1) ) + fodInfos->ofnInfos->nFilterIndex = (fodInfos->customfilter == NULL ? 1 : 0); /* set default filter index */ if(fodInfos->ofnInfos->nFilterIndex == 0 && fodInfos->customfilter == NULL) fodInfos->ofnInfos->nFilterIndex = 1; - /* First, check to make sure our index isn't out of bounds. */ - if ( fodInfos->ofnInfos->nFilterIndex > nFilters ) - fodInfos->ofnInfos->nFilterIndex = nFilters; + /* calculate index of Combo Box item */ + nFilterIndexCB = fodInfos->ofnInfos->nFilterIndex; + if (fodInfos->customfilter == NULL) + nFilterIndexCB--; /* Set the current index selection. */ - CBSetCurSel(fodInfos->DlgInfos.hwndFileTypeCB, fodInfos->ofnInfos->nFilterIndex-1); + CBSetCurSel(fodInfos->DlgInfos.hwndFileTypeCB, nFilterIndexCB); /* Get the corresponding text string from the combo box. */ lpstrFilter = (LPWSTR) CBGetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB, - fodInfos->ofnInfos->nFilterIndex-1); + nFilterIndexCB); if ((INT)lpstrFilter == CB_ERR) /* control is empty */ lpstrFilter = NULL; @@ -2214,7 +2257,9 @@ static HRESULT FILEDLG95_FILETYPE_Init(HWND hwnd) fodInfos->ShellInfos.lpstrCurrentFilter = MemAlloc( len * sizeof(WCHAR) ); strcpyW(fodInfos->ShellInfos.lpstrCurrentFilter,lpstrFilter); } - } + } else + fodInfos->ofnInfos->nFilterIndex = 0; + return NOERROR; } @@ -2237,8 +2282,9 @@ static BOOL FILEDLG95_FILETYPE_OnCommand(HWND hwnd, WORD wNotifyCode) /* Get the current item of the filetype combo box */ int iItem = CBGetCurSel(fodInfos->DlgInfos.hwndFileTypeCB); - /* set the current filter index - indexed from 1 */ - fodInfos->ofnInfos->nFilterIndex = iItem + 1; + /* set the current filter index */ + fodInfos->ofnInfos->nFilterIndex = iItem + + (fodInfos->customfilter == NULL ? 1 : 0); /* Set the current filter with the current selection */ if(fodInfos->ShellInfos.lpstrCurrentFilter) diff --git a/reactos/lib/comdlg32/filedlg16.c b/reactos/lib/comdlg32/filedlg16.c index 4c3bbdd979a..0227b8f11b9 100644 --- a/reactos/lib/comdlg32/filedlg16.c +++ b/reactos/lib/comdlg32/filedlg16.c @@ -300,7 +300,7 @@ static BOOL FILEDLG_ScanDir(HWND hWnd, LPWSTR newPath) HCURSOR hCursorWait, oldCursor; TRACE("Trying to change to %s\n", debugstr_w(newPath)); - if ( !SetCurrentDirectoryW( newPath )) + if ( newPath[0] && !SetCurrentDirectoryW( newPath )) return FALSE; lstrcpynW(buffer, newPath, sizeof(buffer)/sizeof(WCHAR)); diff --git a/reactos/lib/comdlg32/winehq2ros.patch b/reactos/lib/comdlg32/winehq2ros.patch index 04afdf2914c..fa9408763a0 100644 --- a/reactos/lib/comdlg32/winehq2ros.patch +++ b/reactos/lib/comdlg32/winehq2ros.patch @@ -4,7 +4,7 @@ RCS file: /home/wine/wine/dlls/commdlg/Makefile.in,v retrieving revision 1.39 diff -u -r1.39 Makefile.in --- Makefile.in 12 Apr 2004 22:03:55 -0000 1.39 -+++ Makefile.in 8 May 2004 13:01:07 -0000 ++++ Makefile.in 16 Jun 2004 07:02:56 -0000 @@ -13,7 +13,6 @@ cdlg32.c \ colordlg.c \ @@ -24,11 +24,11 @@ diff -u -r1.39 Makefile.in Index: filedlg.c =================================================================== RCS file: /home/wine/wine/dlls/commdlg/filedlg.c,v -retrieving revision 1.79 -diff -u -r1.79 filedlg.c ---- filedlg.c 5 May 2004 23:49:39 -0000 1.79 -+++ filedlg.c 8 May 2004 13:01:08 -0000 -@@ -3241,6 +3241,7 @@ +retrieving revision 1.80 +diff -u -r1.80 filedlg.c +--- filedlg.c 12 May 2004 00:12:04 -0000 1.80 ++++ filedlg.c 16 Jun 2004 07:02:57 -0000 +@@ -3287,6 +3287,7 @@ BOOL WINAPI GetOpenFileNameA( LPOPENFILENAMEA ofn) /* [in/out] address of init structure */ { @@ -36,7 +36,7 @@ diff -u -r1.79 filedlg.c BOOL win16look = FALSE; if (ofn->Flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE)) -@@ -3249,6 +3250,7 @@ +@@ -3295,6 +3296,7 @@ if (win16look) return GetFileName31A(ofn, OPEN_DIALOG); else @@ -44,7 +44,7 @@ diff -u -r1.79 filedlg.c return GetFileDialog95A(ofn, OPEN_DIALOG); } -@@ -3265,6 +3267,7 @@ +@@ -3311,6 +3313,7 @@ BOOL WINAPI GetOpenFileNameW( LPOPENFILENAMEW ofn) /* [in/out] address of init structure */ { @@ -52,7 +52,7 @@ diff -u -r1.79 filedlg.c BOOL win16look = FALSE; if (ofn->Flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE)) -@@ -3273,6 +3276,7 @@ +@@ -3319,6 +3322,7 @@ if (win16look) return GetFileName31W(ofn, OPEN_DIALOG); else @@ -60,7 +60,7 @@ diff -u -r1.79 filedlg.c return GetFileDialog95W(ofn, OPEN_DIALOG); } -@@ -3290,6 +3294,7 @@ +@@ -3336,6 +3340,7 @@ BOOL WINAPI GetSaveFileNameA( LPOPENFILENAMEA ofn) /* [in/out] address of init structure */ { @@ -68,7 +68,7 @@ diff -u -r1.79 filedlg.c BOOL win16look = FALSE; if (ofn->Flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE)) -@@ -3298,6 +3303,7 @@ +@@ -3344,6 +3349,7 @@ if (win16look) return GetFileName31A(ofn, SAVE_DIALOG); else @@ -76,7 +76,7 @@ diff -u -r1.79 filedlg.c return GetFileDialog95A(ofn, SAVE_DIALOG); } -@@ -3314,6 +3320,7 @@ +@@ -3360,6 +3366,7 @@ BOOL WINAPI GetSaveFileNameW( LPOPENFILENAMEW ofn) /* [in/out] address of init structure */ { @@ -84,7 +84,7 @@ diff -u -r1.79 filedlg.c BOOL win16look = FALSE; if (ofn->Flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE)) -@@ -3322,5 +3329,6 @@ +@@ -3368,5 +3375,6 @@ if (win16look) return GetFileName31W(ofn, SAVE_DIALOG); else @@ -97,7 +97,7 @@ RCS file: /home/wine/wine/dlls/commdlg/printdlg.c,v retrieving revision 1.75 diff -u -r1.75 printdlg.c --- printdlg.c 19 Apr 2004 20:12:15 -0000 1.75 -+++ printdlg.c 8 May 2004 13:01:09 -0000 ++++ printdlg.c 16 Jun 2004 07:02:58 -0000 @@ -341,7 +341,7 @@ lpdm->dmCollate = (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED);