Ros-diffs May 2007

ros-diffs@reactos.org

17 participants
322 discussions

[dgorbachev] 26837: - Add Chinese (PRC) and Armenian NLS settings.
by dgorbachev＠svn.reactos.org 19 May '07

19 May '07

Author: dgorbachev Date: Sat May 19 14:11:59 2007 New Revision: 26837 URL: http://svn.reactos.org/svn/reactos?rev=26837&view=rev Log: - Add Chinese (PRC) and Armenian NLS settings. Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Sat May 19 14:11:59 2007 @@ -94,6 +94,8 @@ ; NLS Files +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","0",0x00000000,"unicode.nls" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","1",0x00000000,"unicode.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","37",0x00000000,"c_037.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","424",0x00000000,"c_424.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","437",0x00000000,"c_437.nls" @@ -155,6 +157,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0402",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0403",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0404",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0804",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0405",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0406",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0407",0x00000000,"l_intl.nls" @@ -234,7 +237,7 @@ ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0427",0x00000000,"l_intl.nls" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0429",0x00000000,"l_intl.nls" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","042a",0x00000000,"l_intl.nls" -;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","042b",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","042b",0x00000000,"l_intl.nls" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","042c",0x00000000,"l_intl.nls" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","082c",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","042d",0x00000000,"l_intl.nls" @@ -261,6 +264,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000402",0x00000000,"5" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000403",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000404",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000804",0x00000000,"" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000405",0x00000000,"2" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000406",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000407",0x00000000,"1" @@ -340,7 +344,7 @@ ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000427",0x00000000,"3" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000429",0x00000000,"" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042a",0x00000000,"" -;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042b",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042b",0x00000000,"" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042c",0x00000000,"6" ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000082c",0x00000000,"5" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042d",0x00000000,"1"

1 0

[dgorbachev] 26836: - Handle DBCS codepages. - Add Armenian locale definitions from Wine.
by dgorbachev＠svn.reactos.org 19 May '07

19 May '07

Author: dgorbachev Date: Sat May 19 14:11:48 2007 New Revision: 26836 URL: http://svn.reactos.org/svn/reactos?rev=26836&view=rev Log: - Handle DBCS codepages. - Add Armenian locale definitions from Wine. Added: trunk/reactos/dll/win32/kernel32/nls/hye.nls Modified: trunk/reactos/dll/win32/kernel32/locale_rc.rc trunk/reactos/dll/win32/kernel32/misc/nls.c Modified: trunk/reactos/dll/win32/kernel32/locale_rc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/locale_… ============================================================================== --- trunk/reactos/dll/win32/kernel32/locale_rc.rc (original) +++ trunk/reactos/dll/win32/kernel32/locale_rc.rc Sat May 19 14:11:48 2007 @@ -175,7 +175,7 @@ //#include "nls/vit.nls" /* 0x042a LANG_VIETNAMESE, SUBLANG_NEUTRAL */ -//#include "nls/hye.nls" /* 0x042b LANG_ARMENIAN, SUBLANG_NEUTRAL */ +#include "nls/hye.nls" /* 0x042b LANG_ARMENIAN, SUBLANG_NEUTRAL */ //#include "nls/azl.nls" /* 0x042c LANG_AZERI, SUBLANG_AZERI_LATIN */ //#include "nls/aze.nls" /* 0x082c LANG_AZERI, SUBLANG_AZERI_CYRILLIC */ Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/nl… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/nls.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/nls.c Sat May 19 14:11:48 2007 @@ -399,10 +399,64 @@ /* Different handling for DBCS code pages. */ if (CodePageTable->MaximumCharacterSize > 1) { - /* UNIMPLEMENTED */ - return 0; - } - else + /* FIXME */ + + UCHAR Char; + USHORT DBCSOffset; + LPCSTR MbsEnd = MultiByteString + MultiByteCount; + ULONG Count; + + /* Does caller query for output buffer size? */ + if (WideCharCount == 0) + { + for (; MultiByteString < MbsEnd; WideCharCount++) + { + Char = *MultiByteString++; + + if (Char < 0x80) + continue; + + DBCSOffset = CodePageTable->DBCSOffsets[Char]; + + if (!DBCSOffset) + continue; + + if (MultiByteString < MbsEnd) + MultiByteString++; + } + + return WideCharCount; + } + + for (Count = 0; Count < WideCharCount && MultiByteString < MbsEnd; Count++) + { + Char = *MultiByteString++; + + if (Char < 0x80) + { + *WideCharString++ = Char; + continue; + } + + DBCSOffset = CodePageTable->DBCSOffsets[Char]; + + if (!DBCSOffset) + { + *WideCharString++ = CodePageTable->MultiByteTable[Char]; + continue; + } + + if (MultiByteString < MbsEnd) + *WideCharString++ = + CodePageTable->DBCSOffsets[DBCSOffset + *(PUCHAR)MultiByteString++]; + } + + if (MultiByteString < MbsEnd) + SetLastError(ERROR_INSUFFICIENT_BUFFER); + + return Count; + } + else /* Not DBCS code page */ { /* Check for invalid characters. */ if (Flags & MB_ERR_INVALID_CHARS) @@ -554,10 +608,81 @@ /* Different handling for DBCS code pages. */ if (CodePageTable->MaximumCharacterSize > 1) { - DPRINT1("WideCharToMultiByte for DBCS codepages is not implemented!\n"); - return 0; - } - else + /* FIXME */ + + USHORT WideChar; + USHORT MbChar; + + /* Does caller query for output buffer size? */ + if (MultiByteCount == 0) + { + for (TempLength = 0; WideCharCount; WideCharCount--, TempLength++) + { + WideChar = *WideCharString++; + + if (WideChar < 0x80) + continue; + + MbChar = ((PWCHAR)CodePageTable->WideCharTable)[WideChar]; + + if (!(MbChar & 0xff00)) + continue; + + TempLength++; + } + + return TempLength; + } + + for (TempLength = MultiByteCount; WideCharCount; WideCharCount--) + { + WideChar = *WideCharString++; + + if (WideChar < 0x80) + { + if (!TempLength) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + break; + } + TempLength--; + + *MultiByteString++ = (CHAR)WideChar; + continue; + } + + MbChar = ((PWCHAR)CodePageTable->WideCharTable)[WideChar]; + + if (!(MbChar & 0xff00)) + { + if (!TempLength) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + break; + } + TempLength--; + + *MultiByteString++ = (CHAR)MbChar; + continue;; + } + + if (TempLength >= 2) + { + MultiByteString[1] = (CHAR)MbChar; MbChar >>= 8; + MultiByteString[0] = (CHAR)MbChar; + MultiByteString += 2; + TempLength -= 2; + } + else + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + break; + } + } + + return MultiByteCount - TempLength; + } + else /* Not DBCS code page */ { /* Does caller query for output buffer size? */ if (MultiByteCount == 0) Added: trunk/reactos/dll/win32/kernel32/nls/hye.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/hye… ============================================================================== --- trunk/reactos/dll/win32/kernel32/nls/hye.nls (added) +++ trunk/reactos/dll/win32/kernel32/nls/hye.nls Sat May 19 14:11:48 2007 @@ -1,0 +1,155 @@ +/* + * Locale definitions for Armenian + * + * Copyright 2002 Alexandre Julliard for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(0) /* Unicode only */ + +STRINGTABLE LANGUAGE LANG_ARMENIAN, SUBLANG_DEFAULT +{ + LOCALE_FONTSIGNATURE L"\x042f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x0013\x0000\x0000\xc5d4" + LOCALE_ICALENDARTYPE L"1" + LOCALE_ICENTURY L"1" + LOCALE_ICOUNTRY L"374" + LOCALE_ICURRDIGITS L"2" + LOCALE_ICURRENCY L"3" + LOCALE_IDATE L"1" + LOCALE_IDAYLZERO L"1" + LOCALE_IDEFAULTANSICODEPAGE L"0" + LOCALE_IDEFAULTCODEPAGE L"1" + LOCALE_IDEFAULTCOUNTRY L"374" + LOCALE_IDEFAULTEBCDICCODEPAGE L"500" + LOCALE_IDEFAULTLANGUAGE L"042b" + LOCALE_IDEFAULTMACCODEPAGE L"2" +//FIXME LOCALE_IDEFAULTUNIXCODEPAGE L"65001" + LOCALE_IDIGITS L"2" + LOCALE_IDIGITSUBSTITUTION L"1" + LOCALE_IFIRSTDAYOFWEEK L"0" + LOCALE_IFIRSTWEEKOFYEAR L"0" + LOCALE_IINTLCURRDIGITS L"2" + LOCALE_ILANGUAGE L"042b" + LOCALE_ILDATE L"1" + LOCALE_ILZERO L"1" + LOCALE_IMEASURE L"0" + LOCALE_IMONLZERO L"1" + LOCALE_INEGCURR L"8" + LOCALE_INEGNUMBER L"1" + LOCALE_INEGSEPBYSPACE L"1" + LOCALE_INEGSIGNPOSN L"1" + LOCALE_INEGSYMPRECEDES L"0" + LOCALE_IOPTIONALCALENDAR L"0" + LOCALE_IPAPERSIZE L"9" + LOCALE_IPOSSEPBYSPACE L"1" + LOCALE_IPOSSIGNPOSN L"1" + LOCALE_IPOSSYMPRECEDES L"0" + LOCALE_ITIME L"1" + LOCALE_ITIMEMARKPOSN L"0" + LOCALE_ITLZERO L"0" + LOCALE_S1159 L"" + LOCALE_S2359 L"" + LOCALE_SABBREVCTRYNAME L"ARM" + LOCALE_SABBREVDAYNAME1 L"\x0535\x0580\x056f" + LOCALE_SABBREVDAYNAME2 L"\x0535\x0580\x0584" + LOCALE_SABBREVDAYNAME3 L"\x0549\x0580\x0584" + LOCALE_SABBREVDAYNAME4 L"\x0540\x0576\x0563" + LOCALE_SABBREVDAYNAME5 L"\x0548\x0552\x0580" + LOCALE_SABBREVDAYNAME6 L"\x0547\x0562\x0569" + LOCALE_SABBREVDAYNAME7 L"\x053f\x056b\x0580" + LOCALE_SABBREVLANGNAME L"HYE" + LOCALE_SABBREVMONTHNAME1 L"\x0540\x0546\x054e" + LOCALE_SABBREVMONTHNAME2 L"\x0553\x054f\x054e" + LOCALE_SABBREVMONTHNAME3 L"\x0544\x0550\x054f" + LOCALE_SABBREVMONTHNAME4 L"\x0531\x054a\x0550" + LOCALE_SABBREVMONTHNAME5 L"\x0544\x0545\x054d" + LOCALE_SABBREVMONTHNAME6 L"\x0540\x0546\x054d" + LOCALE_SABBREVMONTHNAME7 L"\x0540\x053c\x054d" + LOCALE_SABBREVMONTHNAME8 L"\x0555\x0533\x054d" + LOCALE_SABBREVMONTHNAME9 L"\x054d\x0535\x054a" + LOCALE_SABBREVMONTHNAME10 L"\x0540\x0548\x053f" + LOCALE_SABBREVMONTHNAME11 L"\x0546\x0548\x0545" + LOCALE_SABBREVMONTHNAME12 L"\x0534\x0535\x053f" + LOCALE_SABBREVMONTHNAME13 L"" + LOCALE_SCOUNTRY L"Armenia" + LOCALE_SCURRENCY L"\x0564\x0580." + LOCALE_SDATE L"." + LOCALE_SDAYNAME1 L"\x0535\x0580\x056f\x0578\x0582\x0577\x0561\x0562\x0569\x056b" + LOCALE_SDAYNAME2 L"\x0535\x0580\x0565\x0584\x0577\x0561\x0562\x0569\x056b" + LOCALE_SDAYNAME3 L"\x0549\x0578\x0580\x0565\x0584\x0577\x0561\x0562\x0569\x056b" + LOCALE_SDAYNAME4 L"\x0540\x056b\x0576\x0563\x0577\x0561\x0562\x0569\x056b" + LOCALE_SDAYNAME5 L"\x0548\x0552\x0580\x0562\x0561\x0569" + LOCALE_SDAYNAME6 L"\x0547\x0561\x0562\x0561\x0569" + LOCALE_SDAYNAME7 L"\x053f\x056b\x0580\x0561\x056f\x056b" + LOCALE_SDECIMAL L"." + LOCALE_SENGCOUNTRY L"Armenia" + LOCALE_SENGCURRNAME L"Armenian Dram" + LOCALE_SENGLANGUAGE L"Armenian" + LOCALE_SGROUPING L"3;0" + LOCALE_SINTLSYMBOL L"AMD" + LOCALE_SISO3166CTRYNAME L"AM" + LOCALE_SISO639LANGNAME L"hy" + LOCALE_SLANGUAGE L"Armenian" + LOCALE_SLIST L"," + LOCALE_SLONGDATE L"d MMMM, yyyy" + LOCALE_SMONDECIMALSEP L"." + LOCALE_SMONGROUPING L"3;0" + LOCALE_SMONTHNAME1 L"\x0540\x0578\x0582\x0576\x057e\x0561\x0580" + LOCALE_SMONTHNAME2 L"\x0553\x0565\x057f\x0580\x057e\x0561\x0580" + LOCALE_SMONTHNAME3 L"\x0544\x0561\x0580\x057f" + LOCALE_SMONTHNAME4 L"\x0531\x057a\x0580\x056b\x056c" + LOCALE_SMONTHNAME5 L"\x0544\x0561\x0575\x056b\x057d" + LOCALE_SMONTHNAME6 L"\x0540\x0578\x0582\x0576\x056b\x057d" + LOCALE_SMONTHNAME7 L"\x0540\x0578\x0582\x056c\x056b\x057d" + LOCALE_SMONTHNAME8 L"\x0555\x0563\x0578\x057d\x057f\x0578\x057d" + LOCALE_SMONTHNAME9 L"\x054d\x0565\x057a\x057f\x0565\x0574\x0562\x0565\x0580" + LOCALE_SMONTHNAME10 L"\x0540\x0578\x056f\x057f\x0565\x0574\x0562\x0565\x0580" + LOCALE_SMONTHNAME11 L"\x0546\x0578\x0575\x0565\x0574\x0562\x0565\x0580" + LOCALE_SMONTHNAME12 L"\x0534\x0565\x056f\x057f\x0565\x0574\x0562\x0565\x0580" + LOCALE_SMONTHNAME13 L"" + LOCALE_SMONTHOUSANDSEP L"," +// LOCALE_SNAME L"hy-AM" + LOCALE_SNATIVECTRYNAME L"\x0540\x0561\x0575\x0561\x057d\x057f\x0561\x0576" + LOCALE_SNATIVECURRNAME L"\x0564\x0580\x0561\x0574" + LOCALE_SNATIVEDIGITS L"0123456789" + LOCALE_SNATIVELANGNAME L"\x0540\x0561\x0575\x0565\x0580\x0565\x0576" + LOCALE_SNEGATIVESIGN L"-" + LOCALE_SPOSITIVESIGN L"" + LOCALE_SSHORTDATE L"dd.MM.yyyy" + LOCALE_SSORTNAME L"Default" + LOCALE_STHOUSAND L"," + LOCALE_STIME L":" + LOCALE_STIMEFORMAT L"H:mm:ss" + LOCALE_SYEARMONTH L"MMMM, yyyy" + + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE L"Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE L"Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE L"Baltic" + LGRPID_GREEK+LGRPID_RES_BASE L"Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE L"Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE L"Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE L"Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE L"Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE L"Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE L"Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE L"Thai" + LGRPID_HEBREW+LGRPID_RES_BASE L"Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE L"Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE L"Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE L"Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE L"Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE L"Armenian" +}

1 0

[dgorbachev] 26835: - Add some code to deal with multibyte code pages.
by dgorbachev＠svn.reactos.org 19 May '07

19 May '07

Author: dgorbachev Date: Sat May 19 14:11:22 2007 New Revision: 26835 URL: http://svn.reactos.org/svn/reactos?rev=26835&view=rev Log: - Add some code to deal with multibyte code pages. Modified: trunk/reactos/lib/rtl/nls.c Modified: trunk/reactos/lib/rtl/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/nls.c?rev=26835&r1… ============================================================================== --- trunk/reactos/lib/rtl/nls.c (original) +++ trunk/reactos/lib/rtl/nls.c Sat May 19 14:11:22 2007 @@ -254,7 +254,35 @@ { /* multi-byte code page */ /* FIXME */ - ASSERT(FALSE); + + UCHAR Char; + USHORT LeadByteInfo; + PCSTR MbEnd = MbString + MbSize; + + for (i = 0; i < UnicodeSize / sizeof(WCHAR) && MbString < MbEnd; i++) + { + Char = *(PUCHAR)MbString++; + + if (Char < 0x80) + { + *UnicodeString++ = Char; + continue; + } + + LeadByteInfo = NlsLeadByteInfo[Char]; + + if (!LeadByteInfo) + { + *UnicodeString++ = NlsAnsiToUnicodeTable[Char]; + continue; + } + + if (MbString < MbEnd) + *UnicodeString++ = NlsLeadByteInfo[LeadByteInfo + *(PUCHAR)MbString++]; + } + + if (ResultSize != NULL) + *ResultSize = i * sizeof(WCHAR); } return(STATUS_SUCCESS); @@ -281,12 +309,16 @@ else { /* multi-byte code page */ + /* FIXME */ + while (MbSize--) { - if (NlsLeadByteInfo[*(PUCHAR)MbString++]) + UCHAR Char = *(PUCHAR)MbString++; + + if (Char >= 0x80 && NlsLeadByteInfo[Char]) { - if (MbSize) - { + if (MbSize) + { /* Move on */ MbSize--; MbString++; @@ -342,7 +374,36 @@ { /* multi-byte code page */ /* FIXME */ - ASSERT(FALSE); + + UCHAR Char; + USHORT OemLeadByteInfo; + PCHAR OemEnd = OemString + OemSize; + + for (i = 0; i < UnicodeSize / sizeof(WCHAR) && OemString < OemEnd; i++) + { + Char = *(PUCHAR)OemString++; + + if (Char < 0x80) + { + *UnicodeString++ = Char; + continue; + } + + OemLeadByteInfo = NlsOemLeadByteInfo[Char]; + + if (!OemLeadByteInfo) + { + *UnicodeString++ = NlsOemToUnicodeTable[Char]; + continue; + } + + if (OemString < OemEnd) + *UnicodeString++ = + NlsOemLeadByteInfo[OemLeadByteInfo + *(PUCHAR)OemString++]; + } + + if (ResultSize != NULL) + *ResultSize = i * sizeof(WCHAR); } return STATUS_SUCCESS; @@ -461,7 +522,39 @@ { /* multi-byte code page */ /* FIXME */ - ASSERT(FALSE); + + USHORT WideChar; + USHORT MbChar; + + for (i = MbSize, Size = UnicodeSize / sizeof(WCHAR); i && Size; i--, Size--) + { + WideChar = *UnicodeString++; + + if (WideChar < 0x80) + { + *MbString++ = LOBYTE(WideChar); + continue; + } + + MbChar = NlsDbcsUnicodeToAnsiTable[WideChar]; + + if (!HIBYTE(MbChar)) + { + *MbString++ = LOBYTE(MbChar); + continue; + } + + if (i >= 2) + { + *MbString++ = HIBYTE(MbChar); + *MbString++ = LOBYTE(MbChar); + i--; + } + else break; + } + + if (ResultSize != NULL) + *ResultSize = MbSize - i; } return STATUS_SUCCESS; @@ -487,9 +580,13 @@ else { /* multi-byte code page */ + /* FIXME */ + while (UnicodeLength--) { - if (HIBYTE(NlsUnicodeToAnsiTable[*UnicodeString++])) + USHORT WideChar = *UnicodeString++; + + if (WideChar >= 0x80 && HIBYTE(NlsDbcsUnicodeToAnsiTable[WideChar])) { MbLength += sizeof(WCHAR); } @@ -498,7 +595,7 @@ MbLength++; } } - + *MbSize = MbLength; } @@ -541,7 +638,39 @@ { /* multi-byte code page */ /* FIXME */ - ASSERT(FALSE); + + USHORT WideChar; + USHORT OemChar; + + for (i = OemSize, Size = UnicodeSize / sizeof(WCHAR); i && Size; i--, Size--) + { + WideChar = *UnicodeString++; + + if (WideChar < 0x80) + { + *OemString++ = LOBYTE(WideChar); + continue; + } + + OemChar = NlsDbcsUnicodeToOemTable[WideChar]; + + if (!HIBYTE(OemChar)) + { + *OemString++ = LOBYTE(OemChar); + continue; + } + + if (i >= 2) + { + *OemString++ = HIBYTE(OemChar); + *OemString++ = LOBYTE(OemChar); + i--; + } + else break; + } + + if (ResultSize != NULL) + *ResultSize = OemSize - i; } return STATUS_SUCCESS; @@ -704,7 +833,39 @@ { /* multi-byte code page */ /* FIXME */ - ASSERT(FALSE); + + USHORT WideChar; + USHORT OemChar; + + for (i = OemSize, Size = UnicodeSize / sizeof(WCHAR); i && Size; i--, Size--) + { + WideChar = RtlUpcaseUnicodeChar(*UnicodeString++); + + if (WideChar < 0x80) + { + *OemString++ = LOBYTE(WideChar); + continue; + } + + OemChar = NlsDbcsUnicodeToOemTable[WideChar]; + + if (!HIBYTE(OemChar)) + { + *OemString++ = LOBYTE(OemChar); + continue; + } + + if (i >= 2) + { + *OemString++ = HIBYTE(OemChar); + *OemString++ = LOBYTE(OemChar); + i--; + } + else break; + } + + if (ResultSize != NULL) + *ResultSize = OemSize - i; } return STATUS_SUCCESS;

1 0

[tkreuzer] 26834: implement a basic fontview.exe. It doesn't work on ROS atm due to missing implementation of GetFontResourceInfoW(), but works on XP.
by tkreuzer＠svn.reactos.org 19 May '07

19 May '07

Author: tkreuzer Date: Sat May 19 05:33:27 2007 New Revision: 26834 URL: http://svn.reactos.org/svn/reactos?rev=26834&view=rev Log: implement a basic fontview.exe. It doesn't work on ROS atm due to missing implementation of GetFontResourceInfoW(), but works on XP. Added: trunk/rosapps/fontview/ trunk/rosapps/fontview/display.c trunk/rosapps/fontview/display.h trunk/rosapps/fontview/fontview.c trunk/rosapps/fontview/fontview.h trunk/rosapps/fontview/fontview.rbuild trunk/rosapps/fontview/fontview.rc trunk/rosapps/fontview/lang/ trunk/rosapps/fontview/lang/de-DE.rc trunk/rosapps/fontview/lang/en-US.rc trunk/rosapps/fontview/resource.h Modified: trunk/rosapps/directory.rbuild Modified: trunk/rosapps/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/directory.rbuild?rev=26834… ============================================================================== --- trunk/rosapps/directory.rbuild (original) +++ trunk/rosapps/directory.rbuild Sat May 19 05:33:27 2007 @@ -20,6 +20,10 @@ <directory name="downloader"> <xi:include href="downloader/downloader.rbuild" /> +</directory> + +<directory name="fontview"> + <xi:include href="fontview/fontview.rbuild" /> </directory> <directory name="gettype"> Added: trunk/rosapps/fontview/display.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/display.c?rev=268… ============================================================================== --- trunk/rosapps/fontview/display.c (added) +++ trunk/rosapps/fontview/display.c Sat May 19 05:33:27 2007 @@ -1,0 +1,344 @@ +/* + * fontview display class + * + * display.c + * + * Copyright (C) 2007 Timo Kreuzer <timo <dot> kreuzer <at> reactos <dot> org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include <windows.h> +#include <stdio.h> + +#include "display.h" + +#define SPACING1 8 +#define SPACING2 5 + +const WCHAR g_szFontDisplayClassName[] = L"FontDisplayClass"; +LRESULT CALLBACK DisplayProc(HWND, UINT, WPARAM, LPARAM); + +/* Internal data storage type */ +typedef struct +{ + int nHeight; + WCHAR szTypeFaceName[MAX_TYPEFACENAME]; + WCHAR szFormat[MAX_FORMAT]; + WCHAR szString[MAX_STRING]; +} DISPLAYDATA; + +/* This is the only public function, it registers the class */ +BOOL +Display_InitClass(HINSTANCE hInstance) +{ + WNDCLASSEXW wincl; + + /* Set the fontdisplay window class structure */ + wincl.cbSize = sizeof(WNDCLASSEX); + wincl.style = CS_DBLCLKS; + wincl.lpfnWndProc = DisplayProc; + wincl.cbClsExtra = 0; + wincl.cbWndExtra = 0; + wincl.hInstance = hInstance; + wincl.hIcon = NULL; + wincl.hCursor = LoadCursor (NULL, IDC_ARROW); + wincl.hbrBackground = GetStockObject(WHITE_BRUSH); + wincl.lpszMenuName = NULL; + wincl.lpszClassName = g_szFontDisplayClassName; + wincl.hIconSm = NULL; + + /* Register the window class, and if it fails return FALSE */ + if (!RegisterClassExW (&wincl)) + { + return FALSE; + } + return TRUE; +} + +static int +Display_DrawText(HDC hDC, DISPLAYDATA* pData, int nYPos, BOOL bDraw) +{ + HFONT hOldFont, hFont, hFontNums; + TEXTMETRIC tm; + int i, y; + const int nSizes[7] = {12, 18, 24, 36, 48, 60, 72}; + WCHAR szSize[5]; + WCHAR szCaption[MAX_TYPEFACENAME + 20]; + + /* This is the location on the DC where we draw */ + y = -nYPos; + + /* Draw font name */ + hFont = CreateFontW(50, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, + ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, PROOF_QUALITY, + DEFAULT_PITCH , L"Ms Shell Dlg"); + hOldFont = SelectObject(hDC, hFont); + if (bDraw) + { + swprintf(szCaption, L"%s (%s)", pData->szTypeFaceName, pData->szFormat); + TextOutW(hDC, 0, y, szCaption, wcslen(szCaption)); + } + GetTextMetrics(hDC, &tm); + y += tm.tmHeight + SPACING1; + SelectObject(hDC, hOldFont); + DeleteObject(hFont); + + /* Draw a seperation Line */ + if (bDraw) + { + SelectObject(hDC, GetStockObject(BLACK_PEN)); + MoveToEx(hDC, 0, y, NULL); + LineTo(hDC, 10000, y); + } + y += SPACING2; + + /* Output font info */ + hFont = CreateFontW(12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, + ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, PROOF_QUALITY, + DEFAULT_PITCH , pData->szTypeFaceName); + hOldFont = SelectObject(hDC, hFont); + SelectObject(hDC, hOldFont); + DeleteObject(hFont); + + /* Outout the lines for different sizes */ + hFontNums = CreateFontW(12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, + ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, PROOF_QUALITY, + DEFAULT_PITCH , L"Ms Shell Dlg"); + + for (i = 0; i < 7; i++) + { + hOldFont = SelectObject(hDC, hFontNums); + if (bDraw) + { + swprintf(szSize, L"%d", nSizes[i]); + TextOutW(hDC, 0, y, szSize, wcslen(szSize)); + } + hFont = CreateFontW(nSizes[i], 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, + ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, PROOF_QUALITY, + DEFAULT_PITCH , pData->szTypeFaceName); + SelectObject(hDC, hFont); + if (bDraw) + { + TextOutW(hDC, 20, y, pData->szString, wcslen(pData->szString)); + } + GetTextMetrics(hDC, &tm); + y += tm.tmHeight + 2; + SelectObject(hDC, hOldFont); + DeleteObject(hFont); + } + DeleteObject(hFontNums); + + return y; +} + +static LRESULT +Display_OnCreate(HWND hwnd) +{ + DISPLAYDATA* pData; + + /* Initialize data structure */ + pData = malloc(sizeof(DISPLAYDATA)); + pData->nHeight = 0; + swprintf(pData->szTypeFaceName, L""); + swprintf(pData->szFormat, L""); + swprintf(pData->szString, L""); + + /* Set the window's GWLP_USERDATA to our data structure */ + SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)pData); + + return 0; +} + +static LRESULT +Display_OnPaint(HWND hwnd) +{ + DISPLAYDATA* pData; + PAINTSTRUCT ps; + SCROLLINFO si; + + pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); + + /* Get the Scroll position */ + si.cbSize = sizeof(si); + si.fMask = SIF_POS; + GetScrollInfo(hwnd, SB_VERT, &si); + + BeginPaint(hwnd, &ps); + + /* fill with white */ + FillRect(ps.hdc, &ps.rcPaint, GetStockObject(WHITE_BRUSH)); + + /* Draw the text */ + Display_DrawText(ps.hdc, pData, si.nPos, TRUE); + + EndPaint(hwnd, &ps); + + return 0; +} + +static LRESULT +Display_OnSize(HWND hwnd) +{ + RECT rect; + SCROLLINFO si; + + GetClientRect(hwnd, &rect); + + /* Set the new page size */ + si.cbSize = sizeof(si); + si.fMask = SIF_PAGE; + si.nPage = rect.bottom; + SetScrollInfo(hwnd, SB_VERT, &si, TRUE); +// FIXME: handle exceeding of current pos -> redraw entire window +// if new page size is < curent pos: current pos = maximum whatever and then redraw + return 0; +} + +static LRESULT +Display_OnVScroll(HWND hwnd, WPARAM wParam) +{ + SCROLLINFO si; + int nPos; + + si.cbSize = sizeof(si); + si.fMask = SIF_POS | SIF_RANGE | SIF_TRACKPOS; + GetScrollInfo(hwnd, SB_VERT, &si); + + switch(LOWORD(wParam)) + { + case SB_PAGEUP: + nPos = si.nPos - 50; + break; + case SB_PAGEDOWN: + nPos = si.nPos + 50; + break; + case SB_LINEUP: + nPos = si.nPos - 10; + break; + case SB_LINEDOWN: + nPos = si.nPos + 10; + break; +// case SB_THUMBTRACK: + case SB_THUMBPOSITION: + nPos = si.nTrackPos; + break; + default: + nPos = si.nPos; + } + + nPos = max(nPos, si.nMin); + nPos = min(nPos, si.nMax); + if (nPos != si.nPos) + { + ScrollWindowEx(hwnd, 0, -(nPos - si.nPos), NULL, NULL, NULL, NULL, SW_INVALIDATE); + si.cbSize = sizeof(si); + si.nPos = nPos; + si.fMask = SIF_POS; + SetScrollInfo(hwnd, SB_VERT, &si, TRUE); + UpdateWindow(hwnd); + } + return 0; +} + +static LRESULT +Display_SetTypeFace(HWND hwnd, LPARAM lParam) +{ + DISPLAYDATA* pData; + HDC hDC; + RECT rect; + SCROLLINFO si; + + /* Set the new type face name */ + pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); + snwprintf(pData->szTypeFaceName, MAX_TYPEFACENAME, (WCHAR*)lParam); + + /* Calculate new page dimensions */ + hDC = GetDC(hwnd); + pData->nHeight = Display_DrawText(hDC, pData, 0, FALSE); + ReleaseDC(hwnd, hDC); + + /* Set the vertical scrolling range and page size */ + GetClientRect(hwnd, &rect); + si.cbSize = sizeof(si); + si.fMask = SIF_RANGE | SIF_PAGE | SIF_POS | SIF_TRACKPOS; + si.nMin = 0; + si.nMax = pData->nHeight; + si.nPage = rect.bottom; + si.nPos = 0; + si.nTrackPos = 0; + SetScrollInfo(hwnd, SB_VERT, &si, TRUE); + + return 0; +} + +static LRESULT +Display_SetString(HWND hwnd, LPARAM lParam) +{ + DISPLAYDATA* pData; + + pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); + snwprintf(pData->szString, MAX_STRING, (WCHAR*)lParam); + + // FIXME: redraw the window + + return 0; +} + +static LRESULT +Display_OnDestroy(HWND hwnd) +{ + DISPLAYDATA* pData; + + /* Free the data structure */ + pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); + free(pData); + + return 0; +} + +LRESULT CALLBACK +DisplayProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + switch (message) + { + case WM_CREATE: + return Display_OnCreate(hwnd); + + case WM_PAINT: + return Display_OnPaint(hwnd); + + case WM_SIZE: + return Display_OnSize(hwnd); + + case WM_VSCROLL: + return Display_OnVScroll(hwnd, wParam); + + case FVM_SETTYPEFACE: + return Display_SetTypeFace(hwnd, lParam); + + case FVM_SETSTRING: + return Display_SetString(hwnd, lParam); + + case WM_DESTROY: + return Display_OnDestroy(hwnd); + + default: + return DefWindowProc (hwnd, message, wParam, lParam); + } + + return 0; +} + Added: trunk/rosapps/fontview/display.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/display.h?rev=268… ============================================================================== --- trunk/rosapps/fontview/display.h (added) +++ trunk/rosapps/fontview/display.h Sat May 19 05:33:27 2007 @@ -1,0 +1,18 @@ +#ifndef _DISPLAY_H +#define _DISPLAY_H + +/* Messages for the display class */ +#define FVM_SETTYPEFACE WM_USER +#define FVM_SETSTRING (WM_USER + 1) + +/* Size restrictions */ +#define MAX_STRING 100 +#define MAX_TYPEFACENAME 32 +#define MAX_FORMAT 20 + +extern const WCHAR g_szFontDisplayClassName[]; + +/* Public function */ +BOOL Display_InitClass(HINSTANCE hInstance); + +#endif // _DISPLAY_H Added: trunk/rosapps/fontview/fontview.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/fontview.c?rev=26… ============================================================================== --- trunk/rosapps/fontview/fontview.c (added) +++ trunk/rosapps/fontview/fontview.c Sat May 19 05:33:27 2007 @@ -1,0 +1,316 @@ +/* + * fontview + * + * fontview.c + * + * Copyright (C) 2007 Timo Kreuzer <timo <dot> kreuzer <at> reactos <dot> org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include "fontview.h" + +HINSTANCE g_hInstance; +WCHAR g_szTitle[MAX_LOADSTRING]; +WCHAR g_szTypeFaceName[MAX_TYPEFACENAME]; +static const WCHAR g_szFontViewClassName[] = L"FontViewWClass"; + +/* Tye definition for the GetFontResourceInfo function */ +typedef BOOL (WINAPI *PGFRI)(LPCWSTR, DWORD *, LPWSTR, DWORD); + +DWORD +FormatString( + DWORD dwFlags, + HINSTANCE hInstance, + DWORD dwStringId, + DWORD dwLanguageId, + LPWSTR lpBuffer, + DWORD nSize, + va_list* Arguments +) +{ + DWORD dwRet; + int len; + WCHAR Buffer[1000]; + + len = LoadStringW(hInstance, dwStringId, (LPWSTR)Buffer, 1000); + + if (len) + { + dwFlags |= FORMAT_MESSAGE_FROM_STRING; + dwFlags &= ~(FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_FROM_SYSTEM); + dwRet = FormatMessageW(dwFlags, Buffer, 0, dwLanguageId, lpBuffer, nSize, Arguments); + return dwRet; + } + return 0; +} + +static void +ErrorMsgBox(HWND hParent, DWORD dwCaptionID, DWORD dwMessageId, ...) +{ + HMODULE hModule; + HLOCAL hMemCaption = NULL; + HLOCAL hMemText = NULL; + va_list args; + + hModule = GetModuleHandle(NULL); + + va_start(args, dwMessageId); + FormatString(FORMAT_MESSAGE_ALLOCATE_BUFFER, + NULL, dwMessageId, 0, (LPWSTR)&hMemText, 0, &args); + va_end(args); + + FormatString(FORMAT_MESSAGE_ALLOCATE_BUFFER, + NULL, dwCaptionID, 0, (LPWSTR)&hMemCaption, 0, NULL); + + MessageBoxW(hParent, hMemText, hMemCaption, MB_ICONERROR); + + LocalFree(hMemCaption); + LocalFree(hMemText); +} + +int WINAPI +WinMain (HINSTANCE hThisInstance, + HINSTANCE hPrevInstance, + LPSTR lpCmdLine, + int nCmdShow) +{ + int argc; + WCHAR** argv; + DWORD dwSize; + HWND hMainWnd; + MSG msg; + WNDCLASSEXW wincl; + + g_hInstance = hThisInstance; + + /* Get unicode command line */ + argv = CommandLineToArgvW(GetCommandLineW(), &argc); + if (argc < 2) + { + ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_BADCMD, argv[1]); + return -1; + } + + /* Try to add the font resource */ + if (!AddFontResourceW(argv[1])) + { + ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOFONT, argv[1]); + return -1; + } + + /* Load the GetFontResourceInfo function from gdi32.dll */ + HINSTANCE hDLL = LoadLibraryW(L"GDI32.DLL"); + PGFRI GetFontResourceInfoW = (PGFRI)GetProcAddress(hDLL, "GetFontResourceInfoW"); + + /* Get the font name */ + dwSize = sizeof(g_szTypeFaceName); + if (!GetFontResourceInfoW(argv[1], &dwSize, g_szTypeFaceName, 1)) + { + ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOFONT, argv[1]); + return -1; + } + + if (!Display_InitClass(hThisInstance)) + { + ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOCLASS); + return -1; + } + + /* The main window class */ + wincl.cbSize = sizeof (WNDCLASSEX); + wincl.style = CS_DBLCLKS; + wincl.lpfnWndProc = MainWndProc; + wincl.cbClsExtra = 0; + wincl.cbWndExtra = 0; + wincl.hInstance = hThisInstance; + wincl.hIcon = LoadIcon (NULL, IDI_APPLICATION); + wincl.hCursor = LoadCursor (NULL, IDC_ARROW); + wincl.hbrBackground = (HBRUSH)COLOR_BACKGROUND; + wincl.lpszMenuName = NULL; + wincl.lpszClassName = g_szFontViewClassName; + wincl.hIconSm = LoadIcon (NULL, IDI_APPLICATION); + + /* Register the window class, and if it fails quit the program */ + if (!RegisterClassExW (&wincl)) + { + ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOCLASS); + return 0; + } + + /* The class is registered, let's create the main window */ + hMainWnd = CreateWindowExW( + 0, /* Extended possibilites for variation */ + g_szFontViewClassName, /* Classname */ + g_szTitle, /* Title Text */ + WS_OVERLAPPEDWINDOW, /* default window */ + CW_USEDEFAULT, /* Windows decides the position */ + CW_USEDEFAULT, /* where the window ends up on the screen */ + 544, /* The programs width */ + 375, /* and height in pixels */ + HWND_DESKTOP, /* The window is a child-window to desktop */ + NULL, /* No menu */ + hThisInstance, /* Program Instance handler */ + NULL /* No Window Creation data */ + ); + ShowWindow (hMainWnd, nCmdShow); + + /* Main message loop */ + while (GetMessage (&msg, NULL, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + + RemoveFontResourceW(argv[1]); + + return msg.wParam; +} + +static LRESULT +MainWnd_OnCreate(HWND hwnd) +{ + WCHAR szQuit[MAX_BUTTONNAME]; + WCHAR szPrint[MAX_BUTTONNAME]; + WCHAR szString[MAX_STRING]; + HWND hDisplay, hButtonQuit, hButtonPrint; + + /* create the display window */ + hDisplay = CreateWindowExW( + 0, /* Extended style */ + g_szFontDisplayClassName, /* Classname */ + L"", /* Title text */ + WS_CHILD | WS_VSCROLL| WS_VISIBLE, /* Window style */ + 0, /* X-pos */ + HEADER_SIZE, /* Y-Pos */ + 550, /* Width */ + 370-HEADER_SIZE, /* Height */ + hwnd, /* Parent */ + (HMENU)IDC_DISPLAY, /* Identifier */ + g_hInstance, /* Program Instance handler */ + NULL /* Window Creation data */ + ); + + /* Init the display window wit the font name */ + LoadStringW(g_hInstance, IDS_STRING, szString, MAX_STRING); + + SendMessage(hDisplay, FVM_SETSTRING, 0, (LPARAM)szString); + SendMessage(hDisplay, FVM_SETTYPEFACE, 0, (LPARAM)g_szTypeFaceName); + /* Create the quit button */ + LoadStringW(g_hInstance, IDS_QUIT, szQuit, MAX_BUTTONNAME); + hButtonQuit = CreateWindowExW( + 0, /* Extended style */ + L"button", /* Classname */ + szQuit, /* Title text */ + WS_CHILD | WS_VISIBLE, /* Window style */ + BUTTON_POS_X, /* X-pos */ + BUTTON_POS_Y, /* Y-Pos */ + BUTTON_WIDTH, /* Width */ + BUTTON_HEIGHT, /* Height */ + hwnd, /* Parent */ + (HMENU)IDC_QUIT, /* Identifier */ + g_hInstance, /* Program Instance handler */ + NULL /* Window Creation data */ + ); + SendMessage(hButtonQuit, WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT), (LPARAM)TRUE); + + /* Create the print button */ + LoadStringW(g_hInstance, IDS_PRINT, szPrint, MAX_BUTTONNAME); + hButtonPrint = CreateWindowExW( + 0, /* Extended style */ + L"button", /* Classname */ + szPrint, /* Title text */ + WS_CHILD | WS_VISIBLE, /* Window style */ + 450, /* X-pos */ + BUTTON_POS_Y, /* Y-Pos */ + BUTTON_WIDTH, /* Width */ + BUTTON_HEIGHT, /* Height */ + hwnd, /* Parent */ + (HMENU)IDC_PRINT, /* Identifier */ + g_hInstance, /* Program Instance handler */ + NULL /* Window Creation data */ + ); + SendMessage(hButtonPrint, WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT), (LPARAM)TRUE); + + return 0; +} + +static LRESULT +MainWnd_OnSize(HWND hwnd) +{ + RECT rc; + + GetClientRect(hwnd, &rc); + MoveWindow(GetDlgItem(hwnd, IDC_PRINT), rc.right - BUTTON_WIDTH - BUTTON_POS_X, BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, TRUE); + MoveWindow(GetDlgItem(hwnd, IDC_DISPLAY), 0, HEADER_SIZE, rc.right, rc.bottom - HEADER_SIZE, TRUE); + + return 0; +} + +static LRESULT +MainWnd_OnPaint(HWND hwnd) +{ + HDC hDC; + PAINTSTRUCT ps; + RECT rc; + + hDC = BeginPaint(hwnd, &ps); + GetClientRect(hwnd, &rc); + rc.top = HEADER_SIZE - 2; + rc.bottom = HEADER_SIZE; + FillRect(hDC, &rc, GetStockObject(GRAY_BRUSH)); + EndPaint(hwnd, &ps); + return 0; +} + +LRESULT CALLBACK +MainWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + switch (message) + { + case WM_CREATE: + return MainWnd_OnCreate(hwnd); + + case WM_PAINT: + return MainWnd_OnPaint(hwnd); + + case WM_SIZE: + return MainWnd_OnSize(hwnd); + + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case IDC_QUIT: + PostQuitMessage (0); /* send a WM_QUIT to the message queue */ + break; + + case IDC_PRINT: + MessageBox(hwnd, TEXT("This function is unimplemented"), TEXT("Unimplemented"), MB_OK); + break; + } + break; + + case WM_DESTROY: + PostQuitMessage (0); /* send a WM_QUIT to the message queue */ + break; + + default: /* for messages that we don't deal with */ + return DefWindowProc (hwnd, message, wParam, lParam); + } + + return 0; +} + +/* EOF */ Added: trunk/rosapps/fontview/fontview.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/fontview.h?rev=26… ============================================================================== --- trunk/rosapps/fontview/fontview.h (added) +++ trunk/rosapps/fontview/fontview.h Sat May 19 05:33:27 2007 @@ -1,0 +1,21 @@ +#include <windows.h> + +#include "resource.h" +#include "display.h" + +#define MAX_LOADSTRING 50 +#define MAX_BUTTONNAME 30 + +#define HEADER_SIZE 37 +#define BUTTON_POS_X 6 +#define BUTTON_POS_Y 8 +#define BUTTON_WIDTH 72 +#define BUTTON_HEIGHT 21 + +#define IDC_QUIT 1001 +#define IDC_PRINT 1002 +#define IDC_DISPLAY 1003 + +LRESULT CALLBACK MainWndProc(HWND, UINT, WPARAM, LPARAM); + +BOOL LoadFont(LPWSTR lpCmdLine); Added: trunk/rosapps/fontview/fontview.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/fontview.rbuild?r… ============================================================================== --- trunk/rosapps/fontview/fontview.rbuild (added) +++ trunk/rosapps/fontview/fontview.rbuild Sat May 19 05:33:27 2007 @@ -1,0 +1,11 @@ +<module name="fontview" type="win32gui" installbase="system32" installname="fontview.exe"> + <include base="fontview">.</include> + <define name="__USE_W32API" /> + <library>gdi32</library> + <library>user32</library> + <library>shell32</library> + <library>kernel32</library> + <file>fontview.c</file> + <file>display.c</file> + <file>fontview.rc</file> +</module> Added: trunk/rosapps/fontview/fontview.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/fontview.rc?rev=2… ============================================================================== --- trunk/rosapps/fontview/fontview.rc (added) +++ trunk/rosapps/fontview/fontview.rc Sat May 19 05:33:27 2007 @@ -1,0 +1,10 @@ + + +#include "lang/de-DE.rc" + +STRINGTABLE DISCARDABLE +{ + IDS_CHARSLOWER, "abcdefghijklmnopqrstuvmxyz" + IDS_CHARSUPPER, "ABCDEFGHIJKLMNOPQRSTUVMXYZ" + IDS_SPECIALCHARS, "0123456789.:,;(*!?')" +} Added: trunk/rosapps/fontview/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/lang/de-DE.rc?rev… ============================================================================== --- trunk/rosapps/fontview/lang/de-DE.rc (added) +++ trunk/rosapps/fontview/lang/de-DE.rc Sat May 19 05:33:27 2007 @@ -1,0 +1,18 @@ + +#include "windows.h" +#include "../resource.h" + +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN + +STRINGTABLE DISCARDABLE +{ + IDS_QUIT, "Fertig" + IDS_PRINT, "Drucken" + IDS_STRING, "Franz jagt im komplett verwahrlosten Taxi quer durch Bayern. 1234567890" + IDS_ERROR, "Fehler" + IDS_ERROR_NOMEM, "Es steht nicht genügend Speicher zur Verfügung." + IDS_ERROR_NOFONT, "Die angegebene Datei %1 ist keine gültige Schriftartendatei." + IDS_ERROR_NOCLASS, "Fehler beim initialisieren der Fensterklasse." + IDS_ERROR_BADCMD, "Keine Schriftartendatei angegeben.\nSyntax:\n fontview.exe <Schriftdatei>" +} + Added: trunk/rosapps/fontview/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/lang/en-US.rc?rev… ============================================================================== --- trunk/rosapps/fontview/lang/en-US.rc (added) +++ trunk/rosapps/fontview/lang/en-US.rc Sat May 19 05:33:27 2007 @@ -1,0 +1,18 @@ + +#include "windows.h" +#include "../resource.h" + +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN + +STRINGTABLE DISCARDABLE +{ + IDS_QUIT, "Quit" + IDS_PRINT, "Print" + IDS_STRING, "Jackdaws love my big sphinx of quartz. 123456890" + IDS_ERROR, "Error" + IDS_ERROR_NOMEM, "There's not enough memory to complete the operation." + IDS_ERROR_NOFONT, "The file %1 ist not a valid font file." + IDS_ERROR_NOCLASS, "Could not initialize window class." + IDS_ERROR_BADCMD, "No font file given.\nSyntax:\n fontview.exe <font file>" +} + Added: trunk/rosapps/fontview/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/resource.h?rev=26… ============================================================================== --- trunk/rosapps/fontview/resource.h (added) +++ trunk/rosapps/fontview/resource.h Sat May 19 05:33:27 2007 @@ -1,0 +1,15 @@ + +#define IDS_ERROR 100 +#define IDS_ERROR_NOMEM 101 +#define IDS_ERROR_NOFONT 102 +#define IDS_ERROR_NOCLASS 103 +#define IDS_ERROR_BADCMD 104 + +#define IDS_QUIT 500 +#define IDS_PRINT 501 +#define IDS_STRING 502 + +#define IDS_CHARSLOWER 700 +#define IDS_CHARSUPPER 701 +#define IDS_SPECIALCHARS 702 +

1 0

[dgorbachev] 26833: Fix German translation. Bug #2258.
by dgorbachev＠svn.reactos.org 18 May '07

18 May '07

Author: dgorbachev Date: Sat May 19 02:01:13 2007 New Revision: 26833 URL: http://svn.reactos.org/svn/reactos?rev=26833&view=rev Log: Fix German translation. Bug #2258. Modified: trunk/reactos/dll/cpl/ncpa/lang/de-DE.rc Modified: trunk/reactos/dll/cpl/ncpa/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/ncpa/lang/de-DE.rc Sat May 19 02:01:13 2007 @@ -2,14 +2,14 @@ IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Netzwerk Einstellungen" +CAPTION "Netzwerkeinstellungen" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Netzwerkkarten",-1,9,9,217,8 - LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Hinzufügen",IDC_ADD,9,100,60,14 - PUSHBUTTON "&Entfernen",IDC_REMOVE,72,100,60,14 - PUSHBUTTON "&Eigenschaften",IDC_PROPERTIES,179,100,60,14 + LTEXT "Netzwerkkarten",-1,9,9,217,8 + LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Hinzufügen",IDC_ADD,9,100,60,14 + PUSHBUTTON "&Entfernen",IDC_REMOVE,72,100,60,14 + PUSHBUTTON "&Eigenschaften",IDC_PROPERTIES,179,100,60,14 END IDD_NETPROPERTIES DIALOG DISCARDABLE 0, 0, 246, 228 @@ -17,17 +17,17 @@ CAPTION "Allgemein" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Verbindung herstellen über:", -1, 9,9,217,8 - EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP - PUSHBUTTON "&Konfigurieren", IDC_CONFIGURE, 189, 38, 50, 14 - LTEXT "Diese &Verbindung verwendet folgende Elemente:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT - PUSHBUTTON "&Installieren", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP - PUSHBUTTON "&Deinstallieren", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP - PUSHBUTTON "&Eigenschaften", IDC_PROPERTIES, 174, 130, 65, 14 - GROUPBOX "Beschreibung", -1, 9, 153, 230, 46, BS_GROUPBOX - LTEXT "Hier wird die Beschreibung des Elementes stehen....", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - CHECKBOX "&Symbol bei Verbindung im Infobereich anzeigen", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP + LTEXT "Verbindung herstellen über:", -1, 9,9,217,8 + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP + PUSHBUTTON "&Konfigurieren", IDC_CONFIGURE, 189, 38, 50, 14 + LTEXT "Diese &Verbindung verwendet folgende Elemente:", -1, 9, 59, 217, 8 + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT + PUSHBUTTON "&Installieren", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Deinstallieren", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Eigenschaften", IDC_PROPERTIES, 174, 130, 65, 14 + GROUPBOX "Beschreibung", -1, 9, 153, 230, 46, BS_GROUPBOX + LTEXT "Hier wird die Beschreibung des Elementes stehen....", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP + CHECKBOX "&Symbol bei Verbindung im Infobereich anzeigen", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP END @@ -36,82 +36,81 @@ CAPTION "Allgemein" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Allgemein", -1, 9, 8, 182, 58, BS_GROUPBOX - LTEXT "Status:", -1, 19, 20, 60, 8 - LTEXT "Dauer:", -1, 19, 34, 60, 8 - LTEXT "Übertragungsrate:", -1, 19, 48, 60, 8 - GROUPBOX "Aktivität", -1, 9, 74, 182, 70, BS_GROUPBOX - RTEXT "Gesendet", -1, 26, 90, 60, 8 - ICON IDI_HORIZONTAL, -1, 90, 85, 18, 20 - ICON IDI_NETSTAT, -1, 110, 85, 18, 20 - ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 - LTEXT "Empfangen", -1, 149, 90, 37, 8 - LTEXT "Pakete:", -1, 17, 115, 32, 8 - RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 - ICON IDI_VERTICAL, -1, 110, 108, 18, 20 - RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 - PUSHBUTTON "E&igenschaften", IDC_PROPERTIES, 10, 150, 50, 14 - PUSHBUTTON "&Deaktivieren", IDC_ENDISABLE, 66, 150, 50, 14 + GROUPBOX "Allgemein", -1, 9, 8, 182, 58, BS_GROUPBOX + LTEXT "Status:", -1, 19, 20, 60, 8 + LTEXT "Dauer:", -1, 19, 34, 60, 8 + LTEXT "Übertragungsrate:", -1, 19, 48, 60, 8 + GROUPBOX "Aktivität", -1, 9, 74, 182, 70, BS_GROUPBOX + RTEXT "Gesendet", -1, 26, 90, 60, 8 + ICON IDI_HORIZONTAL, -1, 90, 85, 18, 20 + ICON IDI_NETSTAT, -1, 110, 85, 18, 20 + ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 + LTEXT "Empfangen", -1, 149, 90, 37, 8 + LTEXT "Pakete:", -1, 17, 115, 32, 8 + RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 + ICON IDI_VERTICAL, -1, 110, 108, 18, 20 + RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 + PUSHBUTTON "E&igenschaften", IDC_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "&Deaktivieren", IDC_ENDISABLE, 66, 150, 50, 14 END IDD_CARDSUPPORT DIALOG DISCARDABLE 0, 0, 200,180 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Support" +CAPTION "Netzwerkunterstützung" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Connection Status", -1, 9, 8, 200, 88, BS_GROUPBOX - LTEXT "Address type:", -1, 22, 20, 80, 8 - LTEXT "IP address:", -1, 22, 34, 80, 8 - LTEXT "SubNet mask:", -1, 22, 48, 80, 8 - LTEXT "Default gateway:", -1, 22, 62, 80, 8 + GROUPBOX "Verbindungsstatus", -1, 9, 8, 200, 88, BS_GROUPBOX + LTEXT "Adresstyp:", -1, 22, 20, 80, 8 + LTEXT "IP-Adresse:", -1, 22, 34, 80, 8 + LTEXT "Subnetzmaske:", -1, 22, 48, 80, 8 + LTEXT "Standardgateway:", -1, 22, 62, 80, 8 + + RTEXT "Nicht verfügbar", IDC_DETAILSTYPE, 122, 20, 80, 8 + RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8 + RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8 + RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8 - RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8 - RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8 - RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8 - RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8 - - PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14 + PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14 END IDD_TCPIPPROPERTIES DIALOG DISCARDABLE 0, 0, 246, 228 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" +CAPTION "Allgemein" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "IP-Einstellungen können automatisch zugewiesen werden, wenn das Netzwerk diese Funktion unterstützt. Wenden Sie sich andernfalls an den Netzwerkadministrator, um die geeigneten IP-Einstellungen zu beziehen.", -1, 9, 9, 228, 32 - CONTROL "I&P-Adresse automatisch beziehen", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 - GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX - CONTROL "Folgende IP-&Adresse verwenden:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 - LTEXT "&IP-Addresse:", -1, 14, 75, 135, 8 - CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP,0,150,75-2,80,12 - LTEXT "S&ubnetzmaske:", -1, 14, 90, 135, 8 - CONTROL "",IDC_SUBNETMASK,"SysIPAddress32",WS_TABSTOP,0,150,90-2,80,12 - LTEXT "&Standardgateway:", -1, 14, 105, 135, 8 - CONTROL "",IDC_DEFGATEWAY,"SysIPAddress32",WS_TABSTOP,0,150,105-2,80,12 - CONTROL "D&NS-Serveradresse automatisch beziehen", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12 - GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX - CONTROL "Folgende DNS-Serveradressen &verwenden:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 142, 12 - LTEXT "&Bevorzugter DNS-Server:", -1, 14, 171, 135, 8 - CONTROL "",IDC_DNS1,"SysIPAddress32",WS_TABSTOP,0,150,171-2,80,12 - LTEXT "A&lternativer DNS-Server:", -1, 14, 186, 135, 8 - CONTROL "",IDC_DNS2,"SysIPAddress32",WS_TABSTOP,0,150,186-2,80,12 - PUSHBUTTON "&Erweitert...", IDC_ADVANCED, 186, 209, 50, 14, WS_DISABLED | WS_TABSTOP -} - + LTEXT "IP-Einstellungen können automatisch zugewiesen werden, wenn das Netzwerk diese Funktion unterstützt. Wenden Sie sich andernfalls an den Netzwerkadministrator, um die geeigneten IP-Einstellungen zu beziehen.", -1, 9, 9, 235, 27 + CONTROL "I&P-Adresse automatisch beziehen", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 + GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX + CONTROL "Folgende IP-&Adresse verwenden:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 + LTEXT "&IP-Adresse:", -1, 14, 75, 135, 8 + CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP,150,75-2,80,12 + LTEXT "S&ubnetzmaske:", -1, 14, 90, 135, 8 + CONTROL "",IDC_SUBNETMASK,"SysIPAddress32",WS_TABSTOP,150,90-2,80,12 + LTEXT "&Standardgateway:", -1, 14, 105, 135, 8 + CONTROL "",IDC_DEFGATEWAY,"SysIPAddress32",WS_TABSTOP,150,105-2,80,12 + CONTROL "D&NS-Serveradresse automatisch beziehen", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12 + GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX + CONTROL "Folgende DNS-Serveradressen &verwenden:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12 + LTEXT "&Bevorzugter DNS-Server:", -1, 14, 171, 135, 8 + CONTROL "",IDC_DNS1,"SysIPAddress32",WS_TABSTOP,150,171-2,80,12 + LTEXT "A&lternativer DNS-Server:", -1, 14, 186, 135, 8 + CONTROL "",IDC_DNS2,"SysIPAddress32",WS_TABSTOP,150,186-2,80,12 + PUSHBUTTON "&Erweitert...", IDC_ADVANCED, 186, 209, 50, 14, WS_DISABLED | WS_TABSTOP +END STRINGTABLE BEGIN - IDS_CPLSYSTEMNAME "Netzwerk Einstellungen" - IDS_CPLSYSTEMDESCRIPTION "Bearbeite Netzwerkeinstellungen." + IDS_CPLSYSTEMNAME "Netzwerkeinstellungen" + IDS_CPLSYSTEMDESCRIPTION "Netzwerkeinstellungen bearbeiten" END STRINGTABLE BEGIN - IDS_ERROR "Fehler" - IDS_ENTER_VALID_IPADDRESS "Sie müssen eine gültige IP-Adresse angeben" - IDS_ENTER_VALID_SUBNET "Sie müssen eine gültige Subnetzmaske angeben" - IDS_CANNOT_LOAD_CONFIG "Einstellungen können nicht geladen werden" - IDS_CANNOT_CREATE_PROPSHEET "Property sheet kann nicht erstellt werden" - IDS_OUT_OF_MEMORY "Nicht genug Arbeitsspeicher" - IDS_CANNOT_SAVE_CHANGES "Änderungen können nicht gespeichert werden" + IDS_ERROR "Fehler" + IDS_ENTER_VALID_IPADDRESS "Sie müssen eine gültige IP-Adresse angeben" + IDS_ENTER_VALID_SUBNET "Sie müssen eine gültige Subnetzmaske angeben" + IDS_CANNOT_LOAD_CONFIG "Einstellungen können nicht geladen werden" + IDS_CANNOT_CREATE_PROPSHEET "Property sheet kann nicht erstellt werden" + IDS_OUT_OF_MEMORY "Nicht genug Arbeitsspeicher" + IDS_CANNOT_SAVE_CHANGES "Änderungen können nicht gespeichert werden" END

1 0

[gedmurphy] 26832: add some settings dialog detail
by gedmurphy＠svn.reactos.org 18 May '07

18 May '07

Author: gedmurphy Date: Fri May 18 23:39:03 2007 New Revision: 26832 URL: http://svn.reactos.org/svn/reactos?rev=26832&view=rev Log: add some settings dialog detail Modified: trunk/tools/RosTE/GUI/SettingsForm.Designer.cs trunk/tools/RosTE/GUI/SettingsForm.cs trunk/tools/RosTE/GUI/SettingsForm.resx Modified: trunk/tools/RosTE/GUI/SettingsForm.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.Desig… ============================================================================== --- trunk/tools/RosTE/GUI/SettingsForm.Designer.cs (original) +++ trunk/tools/RosTE/GUI/SettingsForm.Designer.cs Fri May 18 23:39:03 2007 @@ -34,6 +34,8 @@ this.tabPage1 = new System.Windows.Forms.TabPage(); this.memoryPanel = new System.Windows.Forms.Panel(); this.memoryGrpBox = new System.Windows.Forms.GroupBox(); + this.memoryUpDwn = new System.Windows.Forms.NumericUpDown(); + this.memoryTrkBar = new System.Windows.Forms.TrackBar(); this.tabPage2 = new System.Windows.Forms.TabPage(); this.cdromPanel = new System.Windows.Forms.Panel(); this.cdromGrpBox = new System.Windows.Forms.GroupBox(); @@ -47,8 +49,8 @@ this.ethernetPanel = new System.Windows.Forms.Panel(); this.ethernetGrpBox = new System.Windows.Forms.GroupBox(); this.tabPage6 = new System.Windows.Forms.TabPage(); - this.soundPanel = new System.Windows.Forms.Panel(); - this.soundGrpBox = new System.Windows.Forms.GroupBox(); + this.audioPanel = new System.Windows.Forms.Panel(); + this.audioGrpBox = new System.Windows.Forms.GroupBox(); this.tabPage7 = new System.Windows.Forms.TabPage(); this.displayPanel = new System.Windows.Forms.Panel(); this.displayGrpBox = new System.Windows.Forms.GroupBox(); @@ -59,6 +61,7 @@ this.settingsTab = new System.Windows.Forms.TabControl(); this.settingsHardwareTab = new System.Windows.Forms.TabPage(); this.settingsOptionsTab = new System.Windows.Forms.TabPage(); + this.optionsContainerPanel = new System.Windows.Forms.Panel(); this.optionsTempDesignSheetTab = new System.Windows.Forms.TabControl(); this.tabPage8 = new System.Windows.Forms.TabPage(); this.generalPanel = new System.Windows.Forms.Panel(); @@ -73,26 +76,63 @@ this.advancedPanel = new System.Windows.Forms.Panel(); this.advancedGrpBox = new System.Windows.Forms.GroupBox(); this.optionsSelLstBox = new System.Windows.Forms.ListBox(); - this.optionsContainerPanel = new System.Windows.Forms.Panel(); + this.memoryLabel = new System.Windows.Forms.Label(); + this.cdromEnableChkBox = new System.Windows.Forms.CheckBox(); + this.cdromLabel = new System.Windows.Forms.Label(); + this.cdromConStatusLbl = new System.Windows.Forms.Label(); + this.cdromConGrpBox = new System.Windows.Forms.GroupBox(); + this.cdromPhyDrvRadio = new System.Windows.Forms.RadioButton(); + this.cdromIsoRadio = new System.Windows.Forms.RadioButton(); + this.cdromPhyDrvCombo = new System.Windows.Forms.ComboBox(); + this.browseDlg = new System.Windows.Forms.FolderBrowserDialog(); + this.cdromIsoTxtBox = new System.Windows.Forms.TextBox(); + this.cdromIsoBrwse = new System.Windows.Forms.Button(); + this.harddiskLstBox = new System.Windows.Forms.ListBox(); + this.harddiskAddBtn = new System.Windows.Forms.Button(); + this.harddiskRemoveBtn = new System.Windows.Forms.Button(); + this.harddiskLabel1 = new System.Windows.Forms.Label(); + this.harddiskDetailsGrpBox = new System.Windows.Forms.GroupBox(); + this.harddiskFileNameTxtBox = new System.Windows.Forms.TextBox(); + this.harddiskLabel2 = new System.Windows.Forms.Label(); + this.harddiskLabel3 = new System.Windows.Forms.Label(); + this.harddiskSizeLbl = new System.Windows.Forms.Label(); + this.harddiskLabel4 = new System.Windows.Forms.Label(); + this.harddiskFreeSpcLbl = new System.Windows.Forms.Label(); + this.floppyConnGrpBox = new System.Windows.Forms.GroupBox(); + this.floppyImgBrwse = new System.Windows.Forms.Button(); + this.floppyImgTxtBox = new System.Windows.Forms.TextBox(); + this.floppyPhyDrvCombo = new System.Windows.Forms.ComboBox(); + this.floppyImgRadio = new System.Windows.Forms.RadioButton(); + this.floppyPhyDrvRadio = new System.Windows.Forms.RadioButton(); + this.floppyConnLbl = new System.Windows.Forms.Label(); + this.floppyLabel = new System.Windows.Forms.Label(); + this.floppyEnableChkBox = new System.Windows.Forms.CheckBox(); this.hardwareContainerPanel.SuspendLayout(); this.hardwareTempDesignSheetTab.SuspendLayout(); this.tabPage1.SuspendLayout(); this.memoryPanel.SuspendLayout(); + this.memoryGrpBox.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.memoryUpDwn)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.memoryTrkBar)).BeginInit(); this.tabPage2.SuspendLayout(); this.cdromPanel.SuspendLayout(); + this.cdromGrpBox.SuspendLayout(); this.tabPage3.SuspendLayout(); this.harddiskPanel.SuspendLayout(); + this.harddiskGrpBox.SuspendLayout(); this.tabPage4.SuspendLayout(); this.networkPanel.SuspendLayout(); + this.floppyGrpBox.SuspendLayout(); this.tabPage5.SuspendLayout(); this.ethernetPanel.SuspendLayout(); this.tabPage6.SuspendLayout(); - this.soundPanel.SuspendLayout(); + this.audioPanel.SuspendLayout(); this.tabPage7.SuspendLayout(); this.displayPanel.SuspendLayout(); this.settingsTab.SuspendLayout(); this.settingsHardwareTab.SuspendLayout(); this.settingsOptionsTab.SuspendLayout(); + this.optionsContainerPanel.SuspendLayout(); this.optionsTempDesignSheetTab.SuspendLayout(); this.tabPage8.SuspendLayout(); this.generalPanel.SuspendLayout(); @@ -102,7 +142,9 @@ this.snapshotsPanel.SuspendLayout(); this.tabPage11.SuspendLayout(); this.advancedPanel.SuspendLayout(); - this.optionsContainerPanel.SuspendLayout(); + this.cdromConGrpBox.SuspendLayout(); + this.harddiskDetailsGrpBox.SuspendLayout(); + this.floppyConnGrpBox.SuspendLayout(); this.SuspendLayout(); // // hardwareSelLstBox @@ -172,12 +214,29 @@ // // memoryGrpBox // + this.memoryGrpBox.Controls.Add(this.memoryLabel); + this.memoryGrpBox.Controls.Add(this.memoryUpDwn); + this.memoryGrpBox.Controls.Add(this.memoryTrkBar); this.memoryGrpBox.Location = new System.Drawing.Point(3, 3); this.memoryGrpBox.Name = "memoryGrpBox"; this.memoryGrpBox.Size = new System.Drawing.Size(283, 364); this.memoryGrpBox.TabIndex = 0; this.memoryGrpBox.TabStop = false; this.memoryGrpBox.Text = "Memory"; + // + // memoryUpDwn + // + this.memoryUpDwn.Location = new System.Drawing.Point(216, 85); + this.memoryUpDwn.Name = "memoryUpDwn"; + this.memoryUpDwn.Size = new System.Drawing.Size(58, 20); + this.memoryUpDwn.TabIndex = 1; + // + // memoryTrkBar + // + this.memoryTrkBar.Location = new System.Drawing.Point(6, 85); + this.memoryTrkBar.Name = "memoryTrkBar"; + this.memoryTrkBar.Size = new System.Drawing.Size(204, 45); + this.memoryTrkBar.TabIndex = 0; // // tabPage2 // @@ -201,6 +260,10 @@ // // cdromGrpBox // + this.cdromGrpBox.Controls.Add(this.cdromConGrpBox); + this.cdromGrpBox.Controls.Add(this.cdromConStatusLbl); + this.cdromGrpBox.Controls.Add(this.cdromLabel); + this.cdromGrpBox.Controls.Add(this.cdromEnableChkBox); this.cdromGrpBox.Location = new System.Drawing.Point(3, 3); this.cdromGrpBox.Name = "cdromGrpBox"; this.cdromGrpBox.Size = new System.Drawing.Size(283, 364); @@ -230,6 +293,13 @@ // // harddiskGrpBox // + this.harddiskGrpBox.Controls.Add(this.harddiskFreeSpcLbl); + this.harddiskGrpBox.Controls.Add(this.harddiskLabel4); + this.harddiskGrpBox.Controls.Add(this.harddiskDetailsGrpBox); + this.harddiskGrpBox.Controls.Add(this.harddiskLabel1); + this.harddiskGrpBox.Controls.Add(this.harddiskRemoveBtn); + this.harddiskGrpBox.Controls.Add(this.harddiskAddBtn); + this.harddiskGrpBox.Controls.Add(this.harddiskLstBox); this.harddiskGrpBox.Location = new System.Drawing.Point(3, 3); this.harddiskGrpBox.Name = "harddiskGrpBox"; this.harddiskGrpBox.Size = new System.Drawing.Size(283, 364); @@ -259,6 +329,10 @@ // // floppyGrpBox // + this.floppyGrpBox.Controls.Add(this.floppyConnGrpBox); + this.floppyGrpBox.Controls.Add(this.floppyConnLbl); + this.floppyGrpBox.Controls.Add(this.floppyLabel); + this.floppyGrpBox.Controls.Add(this.floppyEnableChkBox); this.floppyGrpBox.Location = new System.Drawing.Point(3, 3); this.floppyGrpBox.Name = "floppyGrpBox"; this.floppyGrpBox.Size = new System.Drawing.Size(283, 364); @@ -297,32 +371,32 @@ // // tabPage6 // - this.tabPage6.Controls.Add(this.soundPanel); + this.tabPage6.Controls.Add(this.audioPanel); this.tabPage6.Location = new System.Drawing.Point(4, 22); this.tabPage6.Name = "tabPage6"; this.tabPage6.Padding = new System.Windows.Forms.Padding(3); this.tabPage6.Size = new System.Drawing.Size(286, 367); this.tabPage6.TabIndex = 5; - this.tabPage6.Text = "Sound"; + this.tabPage6.Text = "Audio"; this.tabPage6.UseVisualStyleBackColor = true; // - // soundPanel - // - this.soundPanel.Controls.Add(this.soundGrpBox); - this.soundPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.soundPanel.Location = new System.Drawing.Point(3, 3); - this.soundPanel.Name = "soundPanel"; - this.soundPanel.Size = new System.Drawing.Size(280, 361); - this.soundPanel.TabIndex = 0; - // - // soundGrpBox - // - this.soundGrpBox.Location = new System.Drawing.Point(3, 3); - this.soundGrpBox.Name = "soundGrpBox"; - this.soundGrpBox.Size = new System.Drawing.Size(283, 364); - this.soundGrpBox.TabIndex = 0; - this.soundGrpBox.TabStop = false; - this.soundGrpBox.Text = "Sound"; + // audioPanel + // + this.audioPanel.Controls.Add(this.audioGrpBox); + this.audioPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.audioPanel.Location = new System.Drawing.Point(3, 3); + this.audioPanel.Name = "audioPanel"; + this.audioPanel.Size = new System.Drawing.Size(280, 361); + this.audioPanel.TabIndex = 0; + // + // audioGrpBox + // + this.audioGrpBox.Location = new System.Drawing.Point(3, 3); + this.audioGrpBox.Name = "audioGrpBox"; + this.audioGrpBox.Size = new System.Drawing.Size(283, 364); + this.audioGrpBox.TabIndex = 0; + this.audioGrpBox.TabStop = false; + this.audioGrpBox.Text = "Audio"; // // tabPage7 // @@ -370,6 +444,7 @@ this.settingsCancelBtn.TabIndex = 4; this.settingsCancelBtn.Text = "Cancel"; this.settingsCancelBtn.UseVisualStyleBackColor = true; + this.settingsCancelBtn.Click += new System.EventHandler(this.settingsCancelBtn_Click); // // settingsApplyBtn // @@ -422,6 +497,14 @@ this.settingsOptionsTab.TabIndex = 1; this.settingsOptionsTab.Text = "Options"; this.settingsOptionsTab.UseVisualStyleBackColor = true; + // + // optionsContainerPanel + // + this.optionsContainerPanel.Controls.Add(this.optionsTempDesignSheetTab); + this.optionsContainerPanel.Location = new System.Drawing.Point(83, 0); + this.optionsContainerPanel.Name = "optionsContainerPanel"; + this.optionsContainerPanel.Size = new System.Drawing.Size(297, 396); + this.optionsContainerPanel.TabIndex = 8; // // optionsTempDesignSheetTab // @@ -570,13 +653,292 @@ this.optionsSelLstBox.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.listboxSelection_DrawItem); this.optionsSelLstBox.SelectedIndexChanged += new System.EventHandler(this.listboxSelection_SelectedIndexChanged); // - // optionsContainerPanel - // - this.optionsContainerPanel.Controls.Add(this.optionsTempDesignSheetTab); - this.optionsContainerPanel.Location = new System.Drawing.Point(83, 0); - this.optionsContainerPanel.Name = "optionsContainerPanel"; - this.optionsContainerPanel.Size = new System.Drawing.Size(297, 396); - this.optionsContainerPanel.TabIndex = 8; + // memoryLabel + // + this.memoryLabel.AutoSize = true; + this.memoryLabel.Location = new System.Drawing.Point(6, 32); + this.memoryLabel.Name = "memoryLabel"; + this.memoryLabel.Size = new System.Drawing.Size(229, 26); + this.memoryLabel.TabIndex = 2; + this.memoryLabel.Text = "Select how much virtual memory you would like\r\nto make available for this virtual" + + " machine"; + // + // cdromEnableChkBox + // + this.cdromEnableChkBox.AutoSize = true; + this.cdromEnableChkBox.Location = new System.Drawing.Point(15, 51); + this.cdromEnableChkBox.Name = "cdromEnableChkBox"; + this.cdromEnableChkBox.Size = new System.Drawing.Size(105, 17); + this.cdromEnableChkBox.TabIndex = 0; + this.cdromEnableChkBox.Text = "Enable CD-ROM"; + this.cdromEnableChkBox.UseVisualStyleBackColor = true; + // + // cdromLabel + // + this.cdromLabel.AutoSize = true; + this.cdromLabel.Location = new System.Drawing.Point(7, 26); + this.cdromLabel.Name = "cdromLabel"; + this.cdromLabel.Size = new System.Drawing.Size(43, 13); + this.cdromLabel.TabIndex = 1; + this.cdromLabel.Text = "Status :"; + // + // cdromConStatusLbl + // + this.cdromConStatusLbl.AutoSize = true; + this.cdromConStatusLbl.Location = new System.Drawing.Point(56, 26); + this.cdromConStatusLbl.Name = "cdromConStatusLbl"; + this.cdromConStatusLbl.Size = new System.Drawing.Size(79, 13); + this.cdromConStatusLbl.TabIndex = 2; + this.cdromConStatusLbl.Text = "Not Connected"; + // + // cdromConGrpBox + // + this.cdromConGrpBox.Controls.Add(this.cdromIsoBrwse); + this.cdromConGrpBox.Controls.Add(this.cdromIsoTxtBox); + this.cdromConGrpBox.Controls.Add(this.cdromPhyDrvCombo); + this.cdromConGrpBox.Controls.Add(this.cdromIsoRadio); + this.cdromConGrpBox.Controls.Add(this.cdromPhyDrvRadio); + this.cdromConGrpBox.Location = new System.Drawing.Point(6, 96); + this.cdromConGrpBox.Name = "cdromConGrpBox"; + this.cdromConGrpBox.Size = new System.Drawing.Size(268, 192); + this.cdromConGrpBox.TabIndex = 3; + this.cdromConGrpBox.TabStop = false; + this.cdromConGrpBox.Text = "Connection"; + // + // cdromPhyDrvRadio + // + this.cdromPhyDrvRadio.AutoSize = true; + this.cdromPhyDrvRadio.Location = new System.Drawing.Point(6, 28); + this.cdromPhyDrvRadio.Name = "cdromPhyDrvRadio"; + this.cdromPhyDrvRadio.Size = new System.Drawing.Size(111, 17); + this.cdromPhyDrvRadio.TabIndex = 0; + this.cdromPhyDrvRadio.TabStop = true; + this.cdromPhyDrvRadio.Text = "Use physical drive"; + this.cdromPhyDrvRadio.UseVisualStyleBackColor = true; + // + // cdromIsoRadio + // + this.cdromIsoRadio.AutoSize = true; + this.cdromIsoRadio.Location = new System.Drawing.Point(6, 107); + this.cdromIsoRadio.Name = "cdromIsoRadio"; + this.cdromIsoRadio.Size = new System.Drawing.Size(96, 17); + this.cdromIsoRadio.TabIndex = 1; + this.cdromIsoRadio.TabStop = true; + this.cdromIsoRadio.Text = "Use ISO image"; + this.cdromIsoRadio.UseVisualStyleBackColor = true; + // + // cdromPhyDrvCombo + // + this.cdromPhyDrvCombo.FormattingEnabled = true; + this.cdromPhyDrvCombo.Location = new System.Drawing.Point(26, 51); + this.cdromPhyDrvCombo.Name = "cdromPhyDrvCombo"; + this.cdromPhyDrvCombo.Size = new System.Drawing.Size(121, 21); + this.cdromPhyDrvCombo.TabIndex = 2; + // + // cdromIsoTxtBox + // + this.cdromIsoTxtBox.Location = new System.Drawing.Point(26, 130); + this.cdromIsoTxtBox.Name = "cdromIsoTxtBox"; + this.cdromIsoTxtBox.Size = new System.Drawing.Size(162, 20); + this.cdromIsoTxtBox.TabIndex = 3; + // + // cdromIsoBrwse + // + this.cdromIsoBrwse.Location = new System.Drawing.Point(194, 128); + this.cdromIsoBrwse.Name = "cdromIsoBrwse"; + this.cdromIsoBrwse.Size = new System.Drawing.Size(68, 23); + this.cdromIsoBrwse.TabIndex = 4; + this.cdromIsoBrwse.Text = "Browse..."; + this.cdromIsoBrwse.UseVisualStyleBackColor = true; + // + // harddiskLstBox + // + this.harddiskLstBox.FormattingEnabled = true; + this.harddiskLstBox.Location = new System.Drawing.Point(13, 37); + this.harddiskLstBox.Name = "harddiskLstBox"; + this.harddiskLstBox.Size = new System.Drawing.Size(202, 56); + this.harddiskLstBox.TabIndex = 0; + // + // harddiskAddBtn + // + this.harddiskAddBtn.Location = new System.Drawing.Point(13, 99); + this.harddiskAddBtn.Name = "harddiskAddBtn"; + this.harddiskAddBtn.Size = new System.Drawing.Size(75, 23); + this.harddiskAddBtn.TabIndex = 1; + this.harddiskAddBtn.Text = "Add"; + this.harddiskAddBtn.UseVisualStyleBackColor = true; + // + // harddiskRemoveBtn + // + this.harddiskRemoveBtn.Location = new System.Drawing.Point(94, 99); + this.harddiskRemoveBtn.Name = "harddiskRemoveBtn"; + this.harddiskRemoveBtn.Size = new System.Drawing.Size(75, 23); + this.harddiskRemoveBtn.TabIndex = 2; + this.harddiskRemoveBtn.Text = "Remove"; + this.harddiskRemoveBtn.UseVisualStyleBackColor = true; + // + // harddiskLabel1 + // + this.harddiskLabel1.AutoSize = true; + this.harddiskLabel1.Location = new System.Drawing.Point(10, 21); + this.harddiskLabel1.Name = "harddiskLabel1"; + this.harddiskLabel1.Size = new System.Drawing.Size(101, 13); + this.harddiskLabel1.TabIndex = 3; + this.harddiskLabel1.Text = "Available hard disks"; + // + // harddiskDetailsGrpBox + // + this.harddiskDetailsGrpBox.Controls.Add(this.harddiskSizeLbl); + this.harddiskDetailsGrpBox.Controls.Add(this.harddiskLabel3); + this.harddiskDetailsGrpBox.Controls.Add(this.harddiskLabel2); + this.harddiskDetailsGrpBox.Controls.Add(this.harddiskFileNameTxtBox); + this.harddiskDetailsGrpBox.Location = new System.Drawing.Point(13, 147); + this.harddiskDetailsGrpBox.Name = "harddiskDetailsGrpBox"; + this.harddiskDetailsGrpBox.Size = new System.Drawing.Size(261, 96); + this.harddiskDetailsGrpBox.TabIndex = 4; + this.harddiskDetailsGrpBox.TabStop = false; + this.harddiskDetailsGrpBox.Text = "Details"; + // + // harddiskFileNameTxtBox + // + this.harddiskFileNameTxtBox.Location = new System.Drawing.Point(56, 26); + this.harddiskFileNameTxtBox.Name = "harddiskFileNameTxtBox"; + this.harddiskFileNameTxtBox.ReadOnly = true; + this.harddiskFileNameTxtBox.Size = new System.Drawing.Size(199, 20); + this.harddiskFileNameTxtBox.TabIndex = 0; + // + // harddiskLabel2 + // + this.harddiskLabel2.AutoSize = true; + this.harddiskLabel2.Location = new System.Drawing.Point(6, 29); + this.harddiskLabel2.Name = "harddiskLabel2"; + this.harddiskLabel2.Size = new System.Drawing.Size(44, 13); + this.harddiskLabel2.TabIndex = 1; + this.harddiskLabel2.Text = "Disk file"; + // + // harddiskLabel3 + // + this.harddiskLabel3.AutoSize = true; + this.harddiskLabel3.Location = new System.Drawing.Point(6, 66); + this.harddiskLabel3.Name = "harddiskLabel3"; + this.harddiskLabel3.Size = new System.Drawing.Size(27, 13); + this.harddiskLabel3.TabIndex = 2; + this.harddiskLabel3.Text = "Size"; + // + // harddiskSizeLbl + // + this.harddiskSizeLbl.AutoSize = true; + this.harddiskSizeLbl.Location = new System.Drawing.Point(53, 66); + this.harddiskSizeLbl.Name = "harddiskSizeLbl"; + this.harddiskSizeLbl.Size = new System.Drawing.Size(37, 13); + this.harddiskSizeLbl.TabIndex = 3; + this.harddiskSizeLbl.Text = "<size>"; + // + // harddiskLabel4 + // + this.harddiskLabel4.AutoSize = true; + this.harddiskLabel4.Location = new System.Drawing.Point(18, 275); + this.harddiskLabel4.Name = "harddiskLabel4"; + this.harddiskLabel4.Size = new System.Drawing.Size(105, 13); + this.harddiskLabel4.TabIndex = 5; + this.harddiskLabel4.Text = "Free space available"; + // + // harddiskFreeSpcLbl + // + this.harddiskFreeSpcLbl.AutoSize = true; + this.harddiskFreeSpcLbl.Location = new System.Drawing.Point(129, 275); + this.harddiskFreeSpcLbl.Name = "harddiskFreeSpcLbl"; + this.harddiskFreeSpcLbl.Size = new System.Drawing.Size(69, 13); + this.harddiskFreeSpcLbl.TabIndex = 6; + this.harddiskFreeSpcLbl.Text = "<free space>"; + // + // floppyConnGrpBox + // + this.floppyConnGrpBox.Controls.Add(this.floppyImgBrwse); + this.floppyConnGrpBox.Controls.Add(this.floppyImgTxtBox); + this.floppyConnGrpBox.Controls.Add(this.floppyPhyDrvCombo); + this.floppyConnGrpBox.Controls.Add(this.floppyImgRadio); + this.floppyConnGrpBox.Controls.Add(this.floppyPhyDrvRadio); + this.floppyConnGrpBox.Location = new System.Drawing.Point(6, 96); + this.floppyConnGrpBox.Name = "floppyConnGrpBox"; + this.floppyConnGrpBox.Size = new System.Drawing.Size(268, 192); + this.floppyConnGrpBox.TabIndex = 7; + this.floppyConnGrpBox.TabStop = false; + this.floppyConnGrpBox.Text = "Connection"; + // + // floppyImgBrwse + // + this.floppyImgBrwse.Location = new System.Drawing.Point(194, 128); + this.floppyImgBrwse.Name = "floppyImgBrwse"; + this.floppyImgBrwse.Size = new System.Drawing.Size(68, 23); + this.floppyImgBrwse.TabIndex = 4; + this.floppyImgBrwse.Text = "Browse..."; + this.floppyImgBrwse.UseVisualStyleBackColor = true; + // + // floppyImgTxtBox + // + this.floppyImgTxtBox.Location = new System.Drawing.Point(26, 130); + this.floppyImgTxtBox.Name = "floppyImgTxtBox"; + this.floppyImgTxtBox.Size = new System.Drawing.Size(162, 20); + this.floppyImgTxtBox.TabIndex = 3; + // + // floppyPhyDrvCombo + // + this.floppyPhyDrvCombo.FormattingEnabled = true; + this.floppyPhyDrvCombo.Location = new System.Drawing.Point(26, 51); + this.floppyPhyDrvCombo.Name = "floppyPhyDrvCombo"; + this.floppyPhyDrvCombo.Size = new System.Drawing.Size(121, 21); + this.floppyPhyDrvCombo.TabIndex = 2; + // + // floppyImgRadio + // + this.floppyImgRadio.AutoSize = true; + this.floppyImgRadio.Location = new System.Drawing.Point(6, 107); + this.floppyImgRadio.Name = "floppyImgRadio"; + this.floppyImgRadio.Size = new System.Drawing.Size(106, 17); + this.floppyImgRadio.TabIndex = 1; + this.floppyImgRadio.TabStop = true; + this.floppyImgRadio.Text = "Use floppy image"; + this.floppyImgRadio.UseVisualStyleBackColor = true; + // + // floppyPhyDrvRadio + // + this.floppyPhyDrvRadio.AutoSize = true; + this.floppyPhyDrvRadio.Location = new System.Drawing.Point(6, 28); + this.floppyPhyDrvRadio.Name = "floppyPhyDrvRadio"; + this.floppyPhyDrvRadio.Size = new System.Drawing.Size(111, 17); + this.floppyPhyDrvRadio.TabIndex = 0; + this.floppyPhyDrvRadio.TabStop = true; + this.floppyPhyDrvRadio.Text = "Use physical drive"; + this.floppyPhyDrvRadio.UseVisualStyleBackColor = true; + // + // floppyConnLbl + // + this.floppyConnLbl.AutoSize = true; + this.floppyConnLbl.Location = new System.Drawing.Point(56, 26); + this.floppyConnLbl.Name = "floppyConnLbl"; + this.floppyConnLbl.Size = new System.Drawing.Size(70, 13); + this.floppyConnLbl.TabIndex = 6; + this.floppyConnLbl.Text = "<connected>"; + // + // floppyLabel + // + this.floppyLabel.AutoSize = true; + this.floppyLabel.Location = new System.Drawing.Point(7, 26); + this.floppyLabel.Name = "floppyLabel"; + this.floppyLabel.Size = new System.Drawing.Size(43, 13); + this.floppyLabel.TabIndex = 5; + this.floppyLabel.Text = "Status :"; + // + // floppyEnableChkBox + // + this.floppyEnableChkBox.AutoSize = true; + this.floppyEnableChkBox.Location = new System.Drawing.Point(15, 51); + this.floppyEnableChkBox.Name = "floppyEnableChkBox"; + this.floppyEnableChkBox.Size = new System.Drawing.Size(90, 17); + this.floppyEnableChkBox.TabIndex = 4; + this.floppyEnableChkBox.Text = "Enable floppy"; + this.floppyEnableChkBox.UseVisualStyleBackColor = true; // // SettingsForm // @@ -596,21 +958,32 @@ this.hardwareTempDesignSheetTab.ResumeLayout(false); this.tabPage1.ResumeLayout(false); this.memoryPanel.ResumeLayout(false); + this.memoryGrpBox.ResumeLayout(false); + this.memoryGrpBox.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.memoryUpDwn)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.memoryTrkBar)).EndInit(); this.tabPage2.ResumeLayout(false); this.cdromPanel.ResumeLayout(false); + this.cdromGrpBox.ResumeLayout(false); + this.cdromGrpBox.PerformLayout(); this.tabPage3.ResumeLayout(false); this.harddiskPanel.ResumeLayout(false); + this.harddiskGrpBox.ResumeLayout(false); + this.harddiskGrpBox.PerformLayout(); this.tabPage4.ResumeLayout(false); this.networkPanel.ResumeLayout(false); + this.floppyGrpBox.ResumeLayout(false); + this.floppyGrpBox.PerformLayout(); this.tabPage5.ResumeLayout(false); this.ethernetPanel.ResumeLayout(false); this.tabPage6.ResumeLayout(false); - this.soundPanel.ResumeLayout(false); + this.audioPanel.ResumeLayout(false); this.tabPage7.ResumeLayout(false); this.displayPanel.ResumeLayout(false); this.settingsTab.ResumeLayout(false); this.settingsHardwareTab.ResumeLayout(false); this.settingsOptionsTab.ResumeLayout(false); + this.optionsContainerPanel.ResumeLayout(false); this.optionsTempDesignSheetTab.ResumeLayout(false); this.tabPage8.ResumeLayout(false); this.generalPanel.ResumeLayout(false); @@ -620,7 +993,12 @@ this.snapshotsPanel.ResumeLayout(false); this.tabPage11.ResumeLayout(false); this.advancedPanel.ResumeLayout(false); - this.optionsContainerPanel.ResumeLayout(false); + this.cdromConGrpBox.ResumeLayout(false); + this.cdromConGrpBox.PerformLayout(); + this.harddiskDetailsGrpBox.ResumeLayout(false); + this.harddiskDetailsGrpBox.PerformLayout(); + this.floppyConnGrpBox.ResumeLayout(false); + this.floppyConnGrpBox.PerformLayout(); this.ResumeLayout(false); } @@ -648,12 +1026,12 @@ private System.Windows.Forms.TabPage tabPage5; private System.Windows.Forms.Panel ethernetPanel; private System.Windows.Forms.TabPage tabPage6; - private System.Windows.Forms.Panel soundPanel; + private System.Windows.Forms.Panel audioPanel; private System.Windows.Forms.TabPage tabPage7; private System.Windows.Forms.Panel displayPanel; private System.Windows.Forms.GroupBox floppyGrpBox; private System.Windows.Forms.GroupBox ethernetGrpBox; - private System.Windows.Forms.GroupBox soundGrpBox; + private System.Windows.Forms.GroupBox audioGrpBox; private System.Windows.Forms.GroupBox displayGrpBox; private System.Windows.Forms.TabControl settingsTab; private System.Windows.Forms.TabPage settingsHardwareTab; @@ -673,5 +1051,38 @@ private System.Windows.Forms.Panel advancedPanel; private System.Windows.Forms.GroupBox advancedGrpBox; private System.Windows.Forms.Panel optionsContainerPanel; + private System.Windows.Forms.NumericUpDown memoryUpDwn; + private System.Windows.Forms.TrackBar memoryTrkBar; + private System.Windows.Forms.Label memoryLabel; + private System.Windows.Forms.Label cdromLabel; + private System.Windows.Forms.CheckBox cdromEnableChkBox; + private System.Windows.Forms.GroupBox cdromConGrpBox; + private System.Windows.Forms.Label cdromConStatusLbl; + private System.Windows.Forms.RadioButton cdromIsoRadio; + private System.Windows.Forms.RadioButton cdromPhyDrvRadio; + private System.Windows.Forms.ComboBox cdromPhyDrvCombo; + private System.Windows.Forms.FolderBrowserDialog browseDlg; + private System.Windows.Forms.Button cdromIsoBrwse; + private System.Windows.Forms.TextBox cdromIsoTxtBox; + private System.Windows.Forms.Label harddiskLabel1; + private System.Windows.Forms.Button harddiskRemoveBtn; + private System.Windows.Forms.Button harddiskAddBtn; + private System.Windows.Forms.ListBox harddiskLstBox; + private System.Windows.Forms.Label harddiskLabel4; + private System.Windows.Forms.GroupBox harddiskDetailsGrpBox; + private System.Windows.Forms.Label harddiskSizeLbl; + private System.Windows.Forms.Label harddiskLabel3; + private System.Windows.Forms.Label harddiskLabel2; + private System.Windows.Forms.TextBox harddiskFileNameTxtBox; + private System.Windows.Forms.Label harddiskFreeSpcLbl; + private System.Windows.Forms.GroupBox floppyConnGrpBox; + private System.Windows.Forms.Button floppyImgBrwse; + private System.Windows.Forms.TextBox floppyImgTxtBox; + private System.Windows.Forms.ComboBox floppyPhyDrvCombo; + private System.Windows.Forms.RadioButton floppyImgRadio; + private System.Windows.Forms.RadioButton floppyPhyDrvRadio; + private System.Windows.Forms.Label floppyConnLbl; + private System.Windows.Forms.Label floppyLabel; + private System.Windows.Forms.CheckBox floppyEnableChkBox; } } Modified: trunk/tools/RosTE/GUI/SettingsForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.cs?re… ============================================================================== --- trunk/tools/RosTE/GUI/SettingsForm.cs (original) +++ trunk/tools/RosTE/GUI/SettingsForm.cs Fri May 18 23:39:03 2007 @@ -28,7 +28,7 @@ optionsSelLstBox.ItemHeight = optionsSelLstBox.Height / optionsSelLstBox.Items.Count; - hardwarePanels = new Panel[] { memoryPanel, cdromPanel, harddiskPanel, networkPanel, ethernetPanel, soundPanel, displayPanel }; + hardwarePanels = new Panel[] { memoryPanel, cdromPanel, harddiskPanel, networkPanel, ethernetPanel, audioPanel, displayPanel }; optionsPanels = new Panel[] { generalPanel, powerPanel, snapshotsPanel, advancedPanel}; foreach (Panel pan in hardwarePanels) @@ -102,5 +102,10 @@ optionsPanels[(int)listbox.SelectedIndex].Visible = true; } } + + private void settingsCancelBtn_Click(object sender, EventArgs e) + { + Close(); + } } } Modified: trunk/tools/RosTE/GUI/SettingsForm.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.resx?… ============================================================================== --- trunk/tools/RosTE/GUI/SettingsForm.resx (original) +++ trunk/tools/RosTE/GUI/SettingsForm.resx Fri May 18 23:39:03 2007 @@ -117,4 +117,7 @@ <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> + <metadata name="browseDlg.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>17, 17</value> + </metadata> </root>

1 0

[gedmurphy] 26831: After chatting with Christoph, we decided it was better to go with a more VMware style of configuration
by gedmurphy＠svn.reactos.org 18 May '07

18 May '07

Author: gedmurphy Date: Fri May 18 19:36:04 2007 New Revision: 26831 URL: http://svn.reactos.org/svn/reactos?rev=26831&view=rev Log: After chatting with Christoph, we decided it was better to go with a more VMware style of configuration Modified: trunk/tools/RosTE/GUI/SettingsForm.Designer.cs trunk/tools/RosTE/GUI/SettingsForm.cs Modified: trunk/tools/RosTE/GUI/SettingsForm.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.Desig… ============================================================================== --- trunk/tools/RosTE/GUI/SettingsForm.Designer.cs (original) +++ trunk/tools/RosTE/GUI/SettingsForm.Designer.cs Fri May 18 19:36:04 2007 @@ -28,107 +28,423 @@ /// </summary> private void InitializeComponent() { - this.selectionLstBox = new System.Windows.Forms.ListBox(); - this.baseContainerPanel = new System.Windows.Forms.Panel(); - this.tempDesignSheetTab = new System.Windows.Forms.TabControl(); + this.hardwareSelLstBox = new System.Windows.Forms.ListBox(); + this.hardwareContainerPanel = new System.Windows.Forms.Panel(); + this.hardwareTempDesignSheetTab = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); - this.generalPanel = new System.Windows.Forms.Panel(); - this.generalGrpBox = new System.Windows.Forms.GroupBox(); + this.memoryPanel = new System.Windows.Forms.Panel(); + this.memoryGrpBox = new System.Windows.Forms.GroupBox(); this.tabPage2 = new System.Windows.Forms.TabPage(); - this.pathsPanel = new System.Windows.Forms.Panel(); - this.pathsGrpBox = new System.Windows.Forms.GroupBox(); + this.cdromPanel = new System.Windows.Forms.Panel(); + this.cdromGrpBox = new System.Windows.Forms.GroupBox(); this.tabPage3 = new System.Windows.Forms.TabPage(); - this.drivesPanel = new System.Windows.Forms.Panel(); - this.drivesGrpBox = new System.Windows.Forms.GroupBox(); + this.harddiskPanel = new System.Windows.Forms.Panel(); + this.harddiskGrpBox = new System.Windows.Forms.GroupBox(); this.tabPage4 = new System.Windows.Forms.TabPage(); this.networkPanel = new System.Windows.Forms.Panel(); - this.networkGrpBox = new System.Windows.Forms.GroupBox(); + this.floppyGrpBox = new System.Windows.Forms.GroupBox(); this.tabPage5 = new System.Windows.Forms.TabPage(); - this.ioPanel = new System.Windows.Forms.Panel(); - this.ioGrpBox = new System.Windows.Forms.GroupBox(); + this.ethernetPanel = new System.Windows.Forms.Panel(); + this.ethernetGrpBox = new System.Windows.Forms.GroupBox(); this.tabPage6 = new System.Windows.Forms.TabPage(); - this.mountPanel = new System.Windows.Forms.Panel(); - this.mountGrpBox = new System.Windows.Forms.GroupBox(); + this.soundPanel = new System.Windows.Forms.Panel(); + this.soundGrpBox = new System.Windows.Forms.GroupBox(); this.tabPage7 = new System.Windows.Forms.TabPage(); - this.debugPanel = new System.Windows.Forms.Panel(); - this.debugGrpBox = new System.Windows.Forms.GroupBox(); + this.displayPanel = new System.Windows.Forms.Panel(); + this.displayGrpBox = new System.Windows.Forms.GroupBox(); this.settingsOKBtn = new System.Windows.Forms.Button(); this.settingsCancelBtn = new System.Windows.Forms.Button(); this.settingsApplyBtn = new System.Windows.Forms.Button(); this.settingsHelpBtn = new System.Windows.Forms.Button(); - this.baseContainerPanel.SuspendLayout(); - this.tempDesignSheetTab.SuspendLayout(); + this.settingsTab = new System.Windows.Forms.TabControl(); + this.settingsHardwareTab = new System.Windows.Forms.TabPage(); + this.settingsOptionsTab = new System.Windows.Forms.TabPage(); + this.optionsTempDesignSheetTab = new System.Windows.Forms.TabControl(); + this.tabPage8 = new System.Windows.Forms.TabPage(); + this.generalPanel = new System.Windows.Forms.Panel(); + this.generalGrpBox = new System.Windows.Forms.GroupBox(); + this.tabPage9 = new System.Windows.Forms.TabPage(); + this.powerPanel = new System.Windows.Forms.Panel(); + this.powerGrpBox = new System.Windows.Forms.GroupBox(); + this.tabPage10 = new System.Windows.Forms.TabPage(); + this.snapshotsPanel = new System.Windows.Forms.Panel(); + this.snapshotsGrpBox = new System.Windows.Forms.GroupBox(); + this.tabPage11 = new System.Windows.Forms.TabPage(); + this.advancedPanel = new System.Windows.Forms.Panel(); + this.advancedGrpBox = new System.Windows.Forms.GroupBox(); + this.optionsSelLstBox = new System.Windows.Forms.ListBox(); + this.optionsContainerPanel = new System.Windows.Forms.Panel(); + this.hardwareContainerPanel.SuspendLayout(); + this.hardwareTempDesignSheetTab.SuspendLayout(); this.tabPage1.SuspendLayout(); - this.generalPanel.SuspendLayout(); + this.memoryPanel.SuspendLayout(); this.tabPage2.SuspendLayout(); - this.pathsPanel.SuspendLayout(); + this.cdromPanel.SuspendLayout(); this.tabPage3.SuspendLayout(); - this.drivesPanel.SuspendLayout(); + this.harddiskPanel.SuspendLayout(); this.tabPage4.SuspendLayout(); this.networkPanel.SuspendLayout(); this.tabPage5.SuspendLayout(); - this.ioPanel.SuspendLayout(); + this.ethernetPanel.SuspendLayout(); this.tabPage6.SuspendLayout(); - this.mountPanel.SuspendLayout(); + this.soundPanel.SuspendLayout(); this.tabPage7.SuspendLayout(); - this.debugPanel.SuspendLayout(); + this.displayPanel.SuspendLayout(); + this.settingsTab.SuspendLayout(); + this.settingsHardwareTab.SuspendLayout(); + this.settingsOptionsTab.SuspendLayout(); + this.optionsTempDesignSheetTab.SuspendLayout(); + this.tabPage8.SuspendLayout(); + this.generalPanel.SuspendLayout(); + this.tabPage9.SuspendLayout(); + this.powerPanel.SuspendLayout(); + this.tabPage10.SuspendLayout(); + this.snapshotsPanel.SuspendLayout(); + this.tabPage11.SuspendLayout(); + this.advancedPanel.SuspendLayout(); + this.optionsContainerPanel.SuspendLayout(); this.SuspendLayout(); // - // selectionLstBox - // - this.selectionLstBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.selectionLstBox.Cursor = System.Windows.Forms.Cursors.Hand; - this.selectionLstBox.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.selectionLstBox.FormattingEnabled = true; - this.selectionLstBox.ItemHeight = 45; - this.selectionLstBox.Items.AddRange(new object[] { - "General", - "Paths", - "Drives", - "Network", - "I/O", - "Mount", - "Debug"}); - this.selectionLstBox.Location = new System.Drawing.Point(12, 12); - this.selectionLstBox.Name = "selectionLstBox"; - this.selectionLstBox.Size = new System.Drawing.Size(74, 362); - this.selectionLstBox.TabIndex = 0; - this.selectionLstBox.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.listboxSelection_DrawItem); - this.selectionLstBox.SelectedIndexChanged += new System.EventHandler(this.listboxSelection_SelectedIndexChanged); - // - // baseContainerPanel - // - this.baseContainerPanel.Controls.Add(this.tempDesignSheetTab); - this.baseContainerPanel.Location = new System.Drawing.Point(92, 6); - this.baseContainerPanel.Name = "baseContainerPanel"; - this.baseContainerPanel.Size = new System.Drawing.Size(297, 396); - this.baseContainerPanel.TabIndex = 2; - // - // tempDesignSheetTab - // - this.tempDesignSheetTab.Controls.Add(this.tabPage1); - this.tempDesignSheetTab.Controls.Add(this.tabPage2); - this.tempDesignSheetTab.Controls.Add(this.tabPage3); - this.tempDesignSheetTab.Controls.Add(this.tabPage4); - this.tempDesignSheetTab.Controls.Add(this.tabPage5); - this.tempDesignSheetTab.Controls.Add(this.tabPage6); - this.tempDesignSheetTab.Controls.Add(this.tabPage7); - this.tempDesignSheetTab.Location = new System.Drawing.Point(0, 0); - this.tempDesignSheetTab.Name = "tempDesignSheetTab"; - this.tempDesignSheetTab.SelectedIndex = 0; - this.tempDesignSheetTab.Size = new System.Drawing.Size(294, 393); - this.tempDesignSheetTab.TabIndex = 1; + // hardwareSelLstBox + // + this.hardwareSelLstBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.hardwareSelLstBox.Cursor = System.Windows.Forms.Cursors.Hand; + this.hardwareSelLstBox.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.hardwareSelLstBox.FormattingEnabled = true; + this.hardwareSelLstBox.ItemHeight = 45; + this.hardwareSelLstBox.Items.AddRange(new object[] { + "Memory", + "CD-ROM", + "Hard Disk", + "Floppy", + "Ethernet", + "Sound", + "Display"}); + this.hardwareSelLstBox.Location = new System.Drawing.Point(3, 6); + this.hardwareSelLstBox.Name = "hardwareSelLstBox"; + this.hardwareSelLstBox.Size = new System.Drawing.Size(74, 362); + this.hardwareSelLstBox.TabIndex = 0; + this.hardwareSelLstBox.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.listboxSelection_DrawItem); + this.hardwareSelLstBox.SelectedIndexChanged += new System.EventHandler(this.listboxSelection_SelectedIndexChanged); + // + // hardwareContainerPanel + // + this.hardwareContainerPanel.Controls.Add(this.hardwareTempDesignSheetTab); + this.hardwareContainerPanel.Location = new System.Drawing.Point(83, 0); + this.hardwareContainerPanel.Name = "hardwareContainerPanel"; + this.hardwareContainerPanel.Size = new System.Drawing.Size(297, 396); + this.hardwareContainerPanel.TabIndex = 2; + // + // hardwareTempDesignSheetTab + // + this.hardwareTempDesignSheetTab.Controls.Add(this.tabPage1); + this.hardwareTempDesignSheetTab.Controls.Add(this.tabPage2); + this.hardwareTempDesignSheetTab.Controls.Add(this.tabPage3); + this.hardwareTempDesignSheetTab.Controls.Add(this.tabPage4); + this.hardwareTempDesignSheetTab.Controls.Add(this.tabPage5); + this.hardwareTempDesignSheetTab.Controls.Add(this.tabPage6); + this.hardwareTempDesignSheetTab.Controls.Add(this.tabPage7); + this.hardwareTempDesignSheetTab.Location = new System.Drawing.Point(0, 0); + this.hardwareTempDesignSheetTab.Name = "hardwareTempDesignSheetTab"; + this.hardwareTempDesignSheetTab.SelectedIndex = 0; + this.hardwareTempDesignSheetTab.Size = new System.Drawing.Size(294, 393); + this.hardwareTempDesignSheetTab.TabIndex = 1; // // tabPage1 // - this.tabPage1.Controls.Add(this.generalPanel); + this.tabPage1.Controls.Add(this.memoryPanel); this.tabPage1.Location = new System.Drawing.Point(4, 22); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(3); this.tabPage1.Size = new System.Drawing.Size(286, 367); this.tabPage1.TabIndex = 0; - this.tabPage1.Text = "General"; + this.tabPage1.Text = "Memory"; this.tabPage1.UseVisualStyleBackColor = true; + // + // memoryPanel + // + this.memoryPanel.Controls.Add(this.memoryGrpBox); + this.memoryPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.memoryPanel.Location = new System.Drawing.Point(3, 3); + this.memoryPanel.Name = "memoryPanel"; + this.memoryPanel.Size = new System.Drawing.Size(280, 361); + this.memoryPanel.TabIndex = 0; + // + // memoryGrpBox + // + this.memoryGrpBox.Location = new System.Drawing.Point(3, 3); + this.memoryGrpBox.Name = "memoryGrpBox"; + this.memoryGrpBox.Size = new System.Drawing.Size(283, 364); + this.memoryGrpBox.TabIndex = 0; + this.memoryGrpBox.TabStop = false; + this.memoryGrpBox.Text = "Memory"; + // + // tabPage2 + // + this.tabPage2.Controls.Add(this.cdromPanel); + this.tabPage2.Location = new System.Drawing.Point(4, 22); + this.tabPage2.Name = "tabPage2"; + this.tabPage2.Padding = new System.Windows.Forms.Padding(3); + this.tabPage2.Size = new System.Drawing.Size(286, 367); + this.tabPage2.TabIndex = 1; + this.tabPage2.Text = "CD-ROM"; + this.tabPage2.UseVisualStyleBackColor = true; + // + // cdromPanel + // + this.cdromPanel.Controls.Add(this.cdromGrpBox); + this.cdromPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.cdromPanel.Location = new System.Drawing.Point(3, 3); + this.cdromPanel.Name = "cdromPanel"; + this.cdromPanel.Size = new System.Drawing.Size(280, 361); + this.cdromPanel.TabIndex = 0; + // + // cdromGrpBox + // + this.cdromGrpBox.Location = new System.Drawing.Point(3, 3); + this.cdromGrpBox.Name = "cdromGrpBox"; + this.cdromGrpBox.Size = new System.Drawing.Size(283, 364); + this.cdromGrpBox.TabIndex = 0; + this.cdromGrpBox.TabStop = false; + this.cdromGrpBox.Text = "CD-ROM"; + // + // tabPage3 + // + this.tabPage3.Controls.Add(this.harddiskPanel); + this.tabPage3.Location = new System.Drawing.Point(4, 22); + this.tabPage3.Name = "tabPage3"; + this.tabPage3.Padding = new System.Windows.Forms.Padding(3); + this.tabPage3.Size = new System.Drawing.Size(286, 367); + this.tabPage3.TabIndex = 2; + this.tabPage3.Text = "Hard Disk"; + this.tabPage3.UseVisualStyleBackColor = true; + // + // harddiskPanel + // + this.harddiskPanel.Controls.Add(this.harddiskGrpBox); + this.harddiskPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.harddiskPanel.Location = new System.Drawing.Point(3, 3); + this.harddiskPanel.Name = "harddiskPanel"; + this.harddiskPanel.Size = new System.Drawing.Size(280, 361); + this.harddiskPanel.TabIndex = 0; + // + // harddiskGrpBox + // + this.harddiskGrpBox.Location = new System.Drawing.Point(3, 3); + this.harddiskGrpBox.Name = "harddiskGrpBox"; + this.harddiskGrpBox.Size = new System.Drawing.Size(283, 364); + this.harddiskGrpBox.TabIndex = 0; + this.harddiskGrpBox.TabStop = false; + this.harddiskGrpBox.Text = "Hard Disk"; + // + // tabPage4 + // + this.tabPage4.Controls.Add(this.networkPanel); + this.tabPage4.Location = new System.Drawing.Point(4, 22); + this.tabPage4.Name = "tabPage4"; + this.tabPage4.Padding = new System.Windows.Forms.Padding(3); + this.tabPage4.Size = new System.Drawing.Size(286, 367); + this.tabPage4.TabIndex = 3; + this.tabPage4.Text = "Floppy"; + this.tabPage4.UseVisualStyleBackColor = true; + // + // networkPanel + // + this.networkPanel.Controls.Add(this.floppyGrpBox); + this.networkPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.networkPanel.Location = new System.Drawing.Point(3, 3); + this.networkPanel.Name = "networkPanel"; + this.networkPanel.Size = new System.Drawing.Size(280, 361); + this.networkPanel.TabIndex = 0; + // + // floppyGrpBox + // + this.floppyGrpBox.Location = new System.Drawing.Point(3, 3); + this.floppyGrpBox.Name = "floppyGrpBox"; + this.floppyGrpBox.Size = new System.Drawing.Size(283, 364); + this.floppyGrpBox.TabIndex = 0; + this.floppyGrpBox.TabStop = false; + this.floppyGrpBox.Text = "Floppy"; + // + // tabPage5 + // + this.tabPage5.Controls.Add(this.ethernetPanel); + this.tabPage5.Location = new System.Drawing.Point(4, 22); + this.tabPage5.Name = "tabPage5"; + this.tabPage5.Padding = new System.Windows.Forms.Padding(3); + this.tabPage5.Size = new System.Drawing.Size(286, 367); + this.tabPage5.TabIndex = 4; + this.tabPage5.Text = "Ethernet"; + this.tabPage5.UseVisualStyleBackColor = true; + // + // ethernetPanel + // + this.ethernetPanel.Controls.Add(this.ethernetGrpBox); + this.ethernetPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.ethernetPanel.Location = new System.Drawing.Point(3, 3); + this.ethernetPanel.Name = "ethernetPanel"; + this.ethernetPanel.Size = new System.Drawing.Size(280, 361); + this.ethernetPanel.TabIndex = 0; + // + // ethernetGrpBox + // + this.ethernetGrpBox.Location = new System.Drawing.Point(3, 3); + this.ethernetGrpBox.Name = "ethernetGrpBox"; + this.ethernetGrpBox.Size = new System.Drawing.Size(283, 364); + this.ethernetGrpBox.TabIndex = 0; + this.ethernetGrpBox.TabStop = false; + this.ethernetGrpBox.Text = "Ethernet"; + // + // tabPage6 + // + this.tabPage6.Controls.Add(this.soundPanel); + this.tabPage6.Location = new System.Drawing.Point(4, 22); + this.tabPage6.Name = "tabPage6"; + this.tabPage6.Padding = new System.Windows.Forms.Padding(3); + this.tabPage6.Size = new System.Drawing.Size(286, 367); + this.tabPage6.TabIndex = 5; + this.tabPage6.Text = "Sound"; + this.tabPage6.UseVisualStyleBackColor = true; + // + // soundPanel + // + this.soundPanel.Controls.Add(this.soundGrpBox); + this.soundPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.soundPanel.Location = new System.Drawing.Point(3, 3); + this.soundPanel.Name = "soundPanel"; + this.soundPanel.Size = new System.Drawing.Size(280, 361); + this.soundPanel.TabIndex = 0; + // + // soundGrpBox + // + this.soundGrpBox.Location = new System.Drawing.Point(3, 3); + this.soundGrpBox.Name = "soundGrpBox"; + this.soundGrpBox.Size = new System.Drawing.Size(283, 364); + this.soundGrpBox.TabIndex = 0; + this.soundGrpBox.TabStop = false; + this.soundGrpBox.Text = "Sound"; + // + // tabPage7 + // + this.tabPage7.Controls.Add(this.displayPanel); + this.tabPage7.Location = new System.Drawing.Point(4, 22); + this.tabPage7.Name = "tabPage7"; + this.tabPage7.Padding = new System.Windows.Forms.Padding(3); + this.tabPage7.Size = new System.Drawing.Size(286, 367); + this.tabPage7.TabIndex = 6; + this.tabPage7.Text = "Display"; + this.tabPage7.UseVisualStyleBackColor = true; + // + // displayPanel + // + this.displayPanel.Controls.Add(this.displayGrpBox); + this.displayPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.displayPanel.Location = new System.Drawing.Point(3, 3); + this.displayPanel.Name = "displayPanel"; + this.displayPanel.Size = new System.Drawing.Size(280, 361); + this.displayPanel.TabIndex = 0; + // + // displayGrpBox + // + this.displayGrpBox.Location = new System.Drawing.Point(3, 3); + this.displayGrpBox.Name = "displayGrpBox"; + this.displayGrpBox.Size = new System.Drawing.Size(283, 364); + this.displayGrpBox.TabIndex = 0; + this.displayGrpBox.TabStop = false; + this.displayGrpBox.Text = "Display"; + // + // settingsOKBtn + // + this.settingsOKBtn.Location = new System.Drawing.Point(87, 444); + this.settingsOKBtn.Name = "settingsOKBtn"; + this.settingsOKBtn.Size = new System.Drawing.Size(75, 23); + this.settingsOKBtn.TabIndex = 3; + this.settingsOKBtn.Text = "OK"; + this.settingsOKBtn.UseVisualStyleBackColor = true; + // + // settingsCancelBtn + // + this.settingsCancelBtn.Location = new System.Drawing.Point(168, 444); + this.settingsCancelBtn.Name = "settingsCancelBtn"; + this.settingsCancelBtn.Size = new System.Drawing.Size(75, 23); + this.settingsCancelBtn.TabIndex = 4; + this.settingsCancelBtn.Text = "Cancel"; + this.settingsCancelBtn.UseVisualStyleBackColor = true; + // + // settingsApplyBtn + // + this.settingsApplyBtn.Location = new System.Drawing.Point(249, 444); + this.settingsApplyBtn.Name = "settingsApplyBtn"; + this.settingsApplyBtn.Size = new System.Drawing.Size(75, 23); + this.settingsApplyBtn.TabIndex = 5; + this.settingsApplyBtn.Text = "Apply"; + this.settingsApplyBtn.UseVisualStyleBackColor = true; + // + // settingsHelpBtn + // + this.settingsHelpBtn.Location = new System.Drawing.Point(330, 444); + this.settingsHelpBtn.Name = "settingsHelpBtn"; + this.settingsHelpBtn.Size = new System.Drawing.Size(75, 23); + this.settingsHelpBtn.TabIndex = 6; + this.settingsHelpBtn.Text = "Help"; + this.settingsHelpBtn.UseVisualStyleBackColor = true; + // + // settingsTab + // + this.settingsTab.Controls.Add(this.settingsHardwareTab); + this.settingsTab.Controls.Add(this.settingsOptionsTab); + this.settingsTab.Location = new System.Drawing.Point(12, 12); + this.settingsTab.Name = "settingsTab"; + this.settingsTab.SelectedIndex = 0; + this.settingsTab.Size = new System.Drawing.Size(393, 426); + this.settingsTab.TabIndex = 7; + // + // settingsHardwareTab + // + this.settingsHardwareTab.Controls.Add(this.hardwareSelLstBox); + this.settingsHardwareTab.Controls.Add(this.hardwareContainerPanel); + this.settingsHardwareTab.Location = new System.Drawing.Point(4, 22); + this.settingsHardwareTab.Name = "settingsHardwareTab"; + this.settingsHardwareTab.Padding = new System.Windows.Forms.Padding(3); + this.settingsHardwareTab.Size = new System.Drawing.Size(385, 400); + this.settingsHardwareTab.TabIndex = 0; + this.settingsHardwareTab.Text = "Hardware"; + this.settingsHardwareTab.UseVisualStyleBackColor = true; + // + // settingsOptionsTab + // + this.settingsOptionsTab.Controls.Add(this.optionsContainerPanel); + this.settingsOptionsTab.Controls.Add(this.optionsSelLstBox); + this.settingsOptionsTab.Location = new System.Drawing.Point(4, 22); + this.settingsOptionsTab.Name = "settingsOptionsTab"; + this.settingsOptionsTab.Padding = new System.Windows.Forms.Padding(3); + this.settingsOptionsTab.Size = new System.Drawing.Size(385, 400); + this.settingsOptionsTab.TabIndex = 1; + this.settingsOptionsTab.Text = "Options"; + this.settingsOptionsTab.UseVisualStyleBackColor = true; + // + // optionsTempDesignSheetTab + // + this.optionsTempDesignSheetTab.Controls.Add(this.tabPage8); + this.optionsTempDesignSheetTab.Controls.Add(this.tabPage9); + this.optionsTempDesignSheetTab.Controls.Add(this.tabPage10); + this.optionsTempDesignSheetTab.Controls.Add(this.tabPage11); + this.optionsTempDesignSheetTab.Location = new System.Drawing.Point(0, 0); + this.optionsTempDesignSheetTab.Name = "optionsTempDesignSheetTab"; + this.optionsTempDesignSheetTab.SelectedIndex = 0; + this.optionsTempDesignSheetTab.Size = new System.Drawing.Size(294, 393); + this.optionsTempDesignSheetTab.TabIndex = 2; + // + // tabPage8 + // + this.tabPage8.Controls.Add(this.generalPanel); + this.tabPage8.Location = new System.Drawing.Point(4, 22); + this.tabPage8.Name = "tabPage8"; + this.tabPage8.Padding = new System.Windows.Forms.Padding(3); + this.tabPage8.Size = new System.Drawing.Size(286, 367); + this.tabPage8.TabIndex = 0; + this.tabPage8.Text = "General"; + this.tabPage8.UseVisualStyleBackColor = true; // // generalPanel // @@ -148,279 +464,214 @@ this.generalGrpBox.TabStop = false; this.generalGrpBox.Text = "General"; // - // tabPage2 - // - this.tabPage2.Controls.Add(this.pathsPanel); - this.tabPage2.Location = new System.Drawing.Point(4, 22); - this.tabPage2.Name = "tabPage2"; - this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(286, 367); - this.tabPage2.TabIndex = 1; - this.tabPage2.Text = "Paths"; - this.tabPage2.UseVisualStyleBackColor = true; - // - // pathsPanel - // - this.pathsPanel.Controls.Add(this.pathsGrpBox); - this.pathsPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.pathsPanel.Location = new System.Drawing.Point(3, 3); - this.pathsPanel.Name = "pathsPanel"; - this.pathsPanel.Size = new System.Drawing.Size(280, 361); - this.pathsPanel.TabIndex = 0; - // - // pathsGrpBox - // - this.pathsGrpBox.Location = new System.Drawing.Point(3, 3); - this.pathsGrpBox.Name = "pathsGrpBox"; - this.pathsGrpBox.Size = new System.Drawing.Size(283, 364); - this.pathsGrpBox.TabIndex = 0; - this.pathsGrpBox.TabStop = false; - this.pathsGrpBox.Text = "Paths"; - // - // tabPage3 - // - this.tabPage3.Controls.Add(this.drivesPanel); - this.tabPage3.Location = new System.Drawing.Point(4, 22); - this.tabPage3.Name = "tabPage3"; - this.tabPage3.Padding = new System.Windows.Forms.Padding(3); - this.tabPage3.Size = new System.Drawing.Size(286, 367); - this.tabPage3.TabIndex = 2; - this.tabPage3.Text = "Drives"; - this.tabPage3.UseVisualStyleBackColor = true; - // - // drivesPanel - // - this.drivesPanel.Controls.Add(this.drivesGrpBox); - this.drivesPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.drivesPanel.Location = new System.Drawing.Point(3, 3); - this.drivesPanel.Name = "drivesPanel"; - this.drivesPanel.Size = new System.Drawing.Size(280, 361); - this.drivesPanel.TabIndex = 0; - // - // drivesGrpBox - // - this.drivesGrpBox.Location = new System.Drawing.Point(3, 3); - this.drivesGrpBox.Name = "drivesGrpBox"; - this.drivesGrpBox.Size = new System.Drawing.Size(283, 364); - this.drivesGrpBox.TabIndex = 0; - this.drivesGrpBox.TabStop = false; - this.drivesGrpBox.Text = "Drives"; - // - // tabPage4 - // - this.tabPage4.Controls.Add(this.networkPanel); - this.tabPage4.Location = new System.Drawing.Point(4, 22); - this.tabPage4.Name = "tabPage4"; - this.tabPage4.Padding = new System.Windows.Forms.Padding(3); - this.tabPage4.Size = new System.Drawing.Size(286, 367); - this.tabPage4.TabIndex = 3; - this.tabPage4.Text = "Network"; - this.tabPage4.UseVisualStyleBackColor = true; - // - // networkPanel - // - this.networkPanel.Controls.Add(this.networkGrpBox); - this.networkPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.networkPanel.Location = new System.Drawing.Point(3, 3); - this.networkPanel.Name = "networkPanel"; - this.networkPanel.Size = new System.Drawing.Size(280, 361); - this.networkPanel.TabIndex = 0; - // - // networkGrpBox - // - this.networkGrpBox.Location = new System.Drawing.Point(3, 3); - this.networkGrpBox.Name = "networkGrpBox"; - this.networkGrpBox.Size = new System.Drawing.Size(283, 364); - this.networkGrpBox.TabIndex = 0; - this.networkGrpBox.TabStop = false; - this.networkGrpBox.Text = "Network"; - // - // tabPage5 - // - this.tabPage5.Controls.Add(this.ioPanel); - this.tabPage5.Location = new System.Drawing.Point(4, 22); - this.tabPage5.Name = "tabPage5"; - this.tabPage5.Padding = new System.Windows.Forms.Padding(3); - this.tabPage5.Size = new System.Drawing.Size(286, 367); - this.tabPage5.TabIndex = 4; - this.tabPage5.Text = "I/O"; - this.tabPage5.UseVisualStyleBackColor = true; - // - // ioPanel - // - this.ioPanel.Controls.Add(this.ioGrpBox); - this.ioPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.ioPanel.Location = new System.Drawing.Point(3, 3); - this.ioPanel.Name = "ioPanel"; - this.ioPanel.Size = new System.Drawing.Size(280, 361); - this.ioPanel.TabIndex = 0; - // - // ioGrpBox - // - this.ioGrpBox.Location = new System.Drawing.Point(3, 3); - this.ioGrpBox.Name = "ioGrpBox"; - this.ioGrpBox.Size = new System.Drawing.Size(283, 364); - this.ioGrpBox.TabIndex = 0; - this.ioGrpBox.TabStop = false; - this.ioGrpBox.Text = "I/O"; - // - // tabPage6 - // - this.tabPage6.Controls.Add(this.mountPanel); - this.tabPage6.Location = new System.Drawing.Point(4, 22); - this.tabPage6.Name = "tabPage6"; - this.tabPage6.Padding = new System.Windows.Forms.Padding(3); - this.tabPage6.Size = new System.Drawing.Size(286, 367); - this.tabPage6.TabIndex = 5; - this.tabPage6.Text = "Mount"; - this.tabPage6.UseVisualStyleBackColor = true; - // - // mountPanel - // - this.mountPanel.Controls.Add(this.mountGrpBox); - this.mountPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.mountPanel.Location = new System.Drawing.Point(3, 3); - this.mountPanel.Name = "mountPanel"; - this.mountPanel.Size = new System.Drawing.Size(280, 361); - this.mountPanel.TabIndex = 0; - // - // mountGrpBox - // - this.mountGrpBox.Location = new System.Drawing.Point(3, 3); - this.mountGrpBox.Name = "mountGrpBox"; - this.mountGrpBox.Size = new System.Drawing.Size(283, 364); - this.mountGrpBox.TabIndex = 0; - this.mountGrpBox.TabStop = false; - this.mountGrpBox.Text = "Mount"; - // - // tabPage7 - // - this.tabPage7.Controls.Add(this.debugPanel); - this.tabPage7.Location = new System.Drawing.Point(4, 22); - this.tabPage7.Name = "tabPage7"; - this.tabPage7.Padding = new System.Windows.Forms.Padding(3); - this.tabPage7.Size = new System.Drawing.Size(286, 367); - this.tabPage7.TabIndex = 6; - this.tabPage7.Text = "Debug"; - this.tabPage7.UseVisualStyleBackColor = true; - // - // debugPanel - // - this.debugPanel.Controls.Add(this.debugGrpBox); - this.debugPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.debugPanel.Location = new System.Drawing.Point(3, 3); - this.debugPanel.Name = "debugPanel"; - this.debugPanel.Size = new System.Drawing.Size(280, 361); - this.debugPanel.TabIndex = 0; - // - // debugGrpBox - // - this.debugGrpBox.Location = new System.Drawing.Point(3, 3); - this.debugGrpBox.Name = "debugGrpBox"; - this.debugGrpBox.Size = new System.Drawing.Size(283, 364); - this.debugGrpBox.TabIndex = 0; - this.debugGrpBox.TabStop = false; - this.debugGrpBox.Text = "Debug"; - // - // settingsOKBtn - // - this.settingsOKBtn.Location = new System.Drawing.Point(59, 400); - this.settingsOKBtn.Name = "settingsOKBtn"; - this.settingsOKBtn.Size = new System.Drawing.Size(75, 23); - this.settingsOKBtn.TabIndex = 3; - this.settingsOKBtn.Text = "OK"; - this.settingsOKBtn.UseVisualStyleBackColor = true; - // - // settingsCancelBtn - // - this.settingsCancelBtn.Location = new System.Drawing.Point(140, 400); - this.settingsCancelBtn.Name = "settingsCancelBtn"; - this.settingsCancelBtn.Size = new System.Drawing.Size(75, 23); - this.settingsCancelBtn.TabIndex = 4; - this.settingsCancelBtn.Text = "Cancel"; - this.settingsCancelBtn.UseVisualStyleBackColor = true; - // - // settingsApplyBtn - // - this.settingsApplyBtn.Location = new System.Drawing.Point(221, 400); - this.settingsApplyBtn.Name = "settingsApplyBtn"; - this.settingsApplyBtn.Size = new System.Drawing.Size(75, 23); - this.settingsApplyBtn.TabIndex = 5; - this.settingsApplyBtn.Text = "Apply"; - this.settingsApplyBtn.UseVisualStyleBackColor = true; - // - // settingsHelpBtn - // - this.settingsHelpBtn.Location = new System.Drawing.Point(302, 400); - this.settingsHelpBtn.Name = "settingsHelpBtn"; - this.settingsHelpBtn.Size = new System.Drawing.Size(75, 23); - this.settingsHelpBtn.TabIndex = 6; - this.settingsHelpBtn.Text = "Help"; - this.settingsHelpBtn.UseVisualStyleBackColor = true; - // - // settingsForm + // tabPage9 + // + this.tabPage9.Controls.Add(this.powerPanel); + this.tabPage9.Location = new System.Drawing.Point(4, 22); + this.tabPage9.Name = "tabPage9"; + this.tabPage9.Padding = new System.Windows.Forms.Padding(3); + this.tabPage9.Size = new System.Drawing.Size(286, 367); + this.tabPage9.TabIndex = 1; + this.tabPage9.Text = "Power"; + this.tabPage9.UseVisualStyleBackColor = true; + // + // powerPanel + // + this.powerPanel.Controls.Add(this.powerGrpBox); + this.powerPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.powerPanel.Location = new System.Drawing.Point(3, 3); + this.powerPanel.Name = "powerPanel"; + this.powerPanel.Size = new System.Drawing.Size(280, 361); + this.powerPanel.TabIndex = 0; + // + // powerGrpBox + // + this.powerGrpBox.Location = new System.Drawing.Point(3, 3); + this.powerGrpBox.Name = "powerGrpBox"; + this.powerGrpBox.Size = new System.Drawing.Size(283, 364); + this.powerGrpBox.TabIndex = 0; + this.powerGrpBox.TabStop = false; + this.powerGrpBox.Text = "Power"; + // + // tabPage10 + // + this.tabPage10.Controls.Add(this.snapshotsPanel); + this.tabPage10.Location = new System.Drawing.Point(4, 22); + this.tabPage10.Name = "tabPage10"; + this.tabPage10.Padding = new System.Windows.Forms.Padding(3); + this.tabPage10.Size = new System.Drawing.Size(286, 367); + this.tabPage10.TabIndex = 2; + this.tabPage10.Text = "Snapshots"; + this.tabPage10.UseVisualStyleBackColor = true; + // + // snapshotsPanel + // + this.snapshotsPanel.Controls.Add(this.snapshotsGrpBox); + this.snapshotsPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.snapshotsPanel.Location = new System.Drawing.Point(3, 3); + this.snapshotsPanel.Name = "snapshotsPanel"; + this.snapshotsPanel.Size = new System.Drawing.Size(280, 361); + this.snapshotsPanel.TabIndex = 0; + // + // snapshotsGrpBox + // + this.snapshotsGrpBox.Location = new System.Drawing.Point(3, 3); + this.snapshotsGrpBox.Name = "snapshotsGrpBox"; + this.snapshotsGrpBox.Size = new System.Drawing.Size(283, 364); + this.snapshotsGrpBox.TabIndex = 0; + this.snapshotsGrpBox.TabStop = false; + this.snapshotsGrpBox.Text = "Snapshots"; + // + // tabPage11 + // + this.tabPage11.Controls.Add(this.advancedPanel); + this.tabPage11.Location = new System.Drawing.Point(4, 22); + this.tabPage11.Name = "tabPage11"; + this.tabPage11.Padding = new System.Windows.Forms.Padding(3); + this.tabPage11.Size = new System.Drawing.Size(286, 367); + this.tabPage11.TabIndex = 3; + this.tabPage11.Text = "Advanced"; + this.tabPage11.UseVisualStyleBackColor = true; + // + // advancedPanel + // + this.advancedPanel.Controls.Add(this.advancedGrpBox); + this.advancedPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.advancedPanel.Location = new System.Drawing.Point(3, 3); + this.advancedPanel.Name = "advancedPanel"; + this.advancedPanel.Size = new System.Drawing.Size(280, 361); + this.advancedPanel.TabIndex = 0; + // + // advancedGrpBox + // + this.advancedGrpBox.Location = new System.Drawing.Point(3, 3); + this.advancedGrpBox.Name = "advancedGrpBox"; + this.advancedGrpBox.Size = new System.Drawing.Size(283, 364); + this.advancedGrpBox.TabIndex = 0; + this.advancedGrpBox.TabStop = false; + this.advancedGrpBox.Text = "Advanced"; + // + // optionsSelLstBox + // + this.optionsSelLstBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.optionsSelLstBox.Cursor = System.Windows.Forms.Cursors.Hand; + this.optionsSelLstBox.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.optionsSelLstBox.FormattingEnabled = true; + this.optionsSelLstBox.ItemHeight = 45; + this.optionsSelLstBox.Items.AddRange(new object[] { + "General", + "Power", + "Snapshots", + "Advanced"}); + this.optionsSelLstBox.Location = new System.Drawing.Point(3, 6); + this.optionsSelLstBox.Name = "optionsSelLstBox"; + this.optionsSelLstBox.Size = new System.Drawing.Size(74, 362); + this.optionsSelLstBox.TabIndex = 1; + this.optionsSelLstBox.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.listboxSelection_DrawItem); + this.optionsSelLstBox.SelectedIndexChanged += new System.EventHandler(this.listboxSelection_SelectedIndexChanged); + // + // optionsContainerPanel + // + this.optionsContainerPanel.Controls.Add(this.optionsTempDesignSheetTab); + this.optionsContainerPanel.Location = new System.Drawing.Point(83, 0); + this.optionsContainerPanel.Name = "optionsContainerPanel"; + this.optionsContainerPanel.Size = new System.Drawing.Size(297, 396); + this.optionsContainerPanel.TabIndex = 8; + // + // SettingsForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(389, 435); + this.ClientSize = new System.Drawing.Size(417, 475); + this.Controls.Add(this.settingsTab); this.Controls.Add(this.settingsHelpBtn); this.Controls.Add(this.settingsApplyBtn); this.Controls.Add(this.settingsCancelBtn); this.Controls.Add(this.settingsOKBtn); - this.Controls.Add(this.baseContainerPanel); - this.Controls.Add(this.selectionLstBox); - this.Name = "settingsForm"; - this.Text = "SettingsForm"; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Name = "SettingsForm"; + this.Text = "Virtual Machine Settings"; this.Load += new System.EventHandler(this.SettingsForm_Load); - this.baseContainerPanel.ResumeLayout(false); - this.tempDesignSheetTab.ResumeLayout(false); + this.hardwareContainerPanel.ResumeLayout(false); + this.hardwareTempDesignSheetTab.ResumeLayout(false); this.tabPage1.ResumeLayout(false); - this.generalPanel.ResumeLayout(false); + this.memoryPanel.ResumeLayout(false); this.tabPage2.ResumeLayout(false); - this.pathsPanel.ResumeLayout(false); + this.cdromPanel.ResumeLayout(false); this.tabPage3.ResumeLayout(false); - this.drivesPanel.ResumeLayout(false); + this.harddiskPanel.ResumeLayout(false); this.tabPage4.ResumeLayout(false); this.networkPanel.ResumeLayout(false); this.tabPage5.ResumeLayout(false); - this.ioPanel.ResumeLayout(false); + this.ethernetPanel.ResumeLayout(false); this.tabPage6.ResumeLayout(false); - this.mountPanel.ResumeLayout(false); + this.soundPanel.ResumeLayout(false); this.tabPage7.ResumeLayout(false); - this.debugPanel.ResumeLayout(false); + this.displayPanel.ResumeLayout(false); + this.settingsTab.ResumeLayout(false); + this.settingsHardwareTab.ResumeLayout(false); + this.settingsOptionsTab.ResumeLayout(false); + this.optionsTempDesignSheetTab.ResumeLayout(false); + this.tabPage8.ResumeLayout(false); + this.generalPanel.ResumeLayout(false); + this.tabPage9.ResumeLayout(false); + this.powerPanel.ResumeLayout(false); + this.tabPage10.ResumeLayout(false); + this.snapshotsPanel.ResumeLayout(false); + this.tabPage11.ResumeLayout(false); + this.advancedPanel.ResumeLayout(false); + this.optionsContainerPanel.ResumeLayout(false); this.ResumeLayout(false); } #endregion - private System.Windows.Forms.ListBox selectionLstBox; - private System.Windows.Forms.Panel baseContainerPanel; + private System.Windows.Forms.ListBox hardwareSelLstBox; + private System.Windows.Forms.Panel hardwareContainerPanel; private System.Windows.Forms.Button settingsOKBtn; private System.Windows.Forms.Button settingsCancelBtn; private System.Windows.Forms.Button settingsApplyBtn; private System.Windows.Forms.Button settingsHelpBtn; - private System.Windows.Forms.TabControl tempDesignSheetTab; + private System.Windows.Forms.TabControl hardwareTempDesignSheetTab; private System.Windows.Forms.TabPage tabPage1; - private System.Windows.Forms.Panel generalPanel; - private System.Windows.Forms.GroupBox generalGrpBox; + private System.Windows.Forms.Panel memoryPanel; + private System.Windows.Forms.GroupBox memoryGrpBox; private System.Windows.Forms.TabPage tabPage2; - private System.Windows.Forms.Panel pathsPanel; - private System.Windows.Forms.GroupBox pathsGrpBox; + private System.Windows.Forms.Panel cdromPanel; + private System.Windows.Forms.GroupBox cdromGrpBox; private System.Windows.Forms.TabPage tabPage3; - private System.Windows.Forms.Panel drivesPanel; - private System.Windows.Forms.GroupBox drivesGrpBox; + private System.Windows.Forms.Panel harddiskPanel; + private System.Windows.Forms.GroupBox harddiskGrpBox; private System.Windows.Forms.TabPage tabPage4; private System.Windows.Forms.Panel networkPanel; private System.Windows.Forms.TabPage tabPage5; - private System.Windows.Forms.Panel ioPanel; + private System.Windows.Forms.Panel ethernetPanel; private System.Windows.Forms.TabPage tabPage6; - private System.Windows.Forms.Panel mountPanel; + private System.Windows.Forms.Panel soundPanel; private System.Windows.Forms.TabPage tabPage7; - private System.Windows.Forms.Panel debugPanel; - private System.Windows.Forms.GroupBox networkGrpBox; - private System.Windows.Forms.GroupBox ioGrpBox; - private System.Windows.Forms.GroupBox mountGrpBox; - private System.Windows.Forms.GroupBox debugGrpBox; + private System.Windows.Forms.Panel displayPanel; + private System.Windows.Forms.GroupBox floppyGrpBox; + private System.Windows.Forms.GroupBox ethernetGrpBox; + private System.Windows.Forms.GroupBox soundGrpBox; + private System.Windows.Forms.GroupBox displayGrpBox; + private System.Windows.Forms.TabControl settingsTab; + private System.Windows.Forms.TabPage settingsHardwareTab; + private System.Windows.Forms.TabPage settingsOptionsTab; + private System.Windows.Forms.ListBox optionsSelLstBox; + private System.Windows.Forms.TabControl optionsTempDesignSheetTab; + private System.Windows.Forms.TabPage tabPage8; + private System.Windows.Forms.Panel generalPanel; + private System.Windows.Forms.GroupBox generalGrpBox; + private System.Windows.Forms.TabPage tabPage9; + private System.Windows.Forms.Panel powerPanel; + private System.Windows.Forms.GroupBox powerGrpBox; + private System.Windows.Forms.TabPage tabPage10; + private System.Windows.Forms.Panel snapshotsPanel; + private System.Windows.Forms.GroupBox snapshotsGrpBox; + private System.Windows.Forms.TabPage tabPage11; + private System.Windows.Forms.Panel advancedPanel; + private System.Windows.Forms.GroupBox advancedGrpBox; + private System.Windows.Forms.Panel optionsContainerPanel; } } Modified: trunk/tools/RosTE/GUI/SettingsForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.cs?re… ============================================================================== --- trunk/tools/RosTE/GUI/SettingsForm.cs (original) +++ trunk/tools/RosTE/GUI/SettingsForm.cs Fri May 18 19:36:04 2007 @@ -10,8 +10,10 @@ { public partial class SettingsForm : Form { - private Panel[] panels; - private int PrevSel = 0; + private Panel[] hardwarePanels; + private Panel[] optionsPanels; + private int hardwarePrevSel = 0; + private int optionsPrevSel = 0; public SettingsForm() { @@ -20,20 +22,32 @@ private void SettingsForm_Load(object sender, EventArgs e) { - selectionLstBox.ItemHeight = selectionLstBox.Height / selectionLstBox.Items.Count; - selectionLstBox.SelectedItem = 0; - selectionLstBox.SelectedValue = 0; + hardwareSelLstBox.ItemHeight = hardwareSelLstBox.Height / hardwareSelLstBox.Items.Count; + hardwareSelLstBox.SelectedItem = 0; + hardwareSelLstBox.SelectedValue = 0; - panels = new Panel[] { generalPanel, pathsPanel, drivesPanel, networkPanel, ioPanel, mountPanel, debugPanel }; + optionsSelLstBox.ItemHeight = optionsSelLstBox.Height / optionsSelLstBox.Items.Count; - foreach (Panel pan in panels) + hardwarePanels = new Panel[] { memoryPanel, cdromPanel, harddiskPanel, networkPanel, ethernetPanel, soundPanel, displayPanel }; + optionsPanels = new Panel[] { generalPanel, powerPanel, snapshotsPanel, advancedPanel}; + + foreach (Panel pan in hardwarePanels) { - pan.Parent = tempDesignSheetTab.Parent; + pan.Parent = hardwareTempDesignSheetTab.Parent; pan.Visible = false; } - tempDesignSheetTab.Visible = false; - panels[0].Visible = true; + foreach (Panel pan in optionsPanels) + { + pan.Parent = optionsTempDesignSheetTab.Parent; + pan.Visible = false; + } + + hardwareTempDesignSheetTab.Visible = false; + optionsTempDesignSheetTab.Visible = false; + hardwarePanels[0].Visible = true; + optionsPanels[0].Visible = true; + } private void listboxSelection_DrawItem(object sender, DrawItemEventArgs e) @@ -47,14 +61,23 @@ e.Graphics.FillRectangle(Brushes.White, e.Bounds); } + string buttStr = null; + if (settingsTab.SelectedIndex == 0) + { + buttStr = hardwareSelLstBox.Items[e.Index].ToString(); + } + else if (settingsTab.SelectedIndex == 1) + { + buttStr = optionsSelLstBox.Items[e.Index].ToString(); + } + StringFormat strfmt = new StringFormat(); - strfmt.Alignment = StringAlignment.Center; strfmt.LineAlignment = StringAlignment.Center; - e.Graphics.DrawString(selectionLstBox.Items[e.Index].ToString(), - this.Font, - Brushes.Black, + e.Graphics.DrawString(buttStr, + this.Font, + Brushes.Black, e.Bounds.X + e.Bounds.Width / 2, e.Bounds.Y + e.Bounds.Height / 2, strfmt); @@ -66,9 +89,18 @@ { ListBox listbox = (ListBox)sender; - panels[PrevSel].Visible = false; - PrevSel = listbox.SelectedIndex; - panels[(int)listbox.SelectedIndex].Visible = true; + if (settingsTab.SelectedIndex == 0) + { + hardwarePanels[hardwarePrevSel].Visible = false; + hardwarePrevSel = listbox.SelectedIndex; + hardwarePanels[(int)listbox.SelectedIndex].Visible = true; + } + else if (settingsTab.SelectedIndex == 1) + { + optionsPanels[optionsPrevSel].Visible = false; + optionsPrevSel = listbox.SelectedIndex; + optionsPanels[(int)listbox.SelectedIndex].Visible = true; + } } } }

1 0

[hpoussin] 26830: Check that we retrieved a value data before marking it as dirty This is related to bug 1998
by hpoussin＠svn.reactos.org 18 May '07

18 May '07

Author: hpoussin Date: Fri May 18 16:41:16 2007 New Revision: 26830 URL: http://svn.reactos.org/svn/reactos?rev=26830&view=rev Log: Check that we retrieved a value data before marking it as dirty This is related to bug 1998 Modified: trunk/reactos/ntoskrnl/config/cmkeydel.c Modified: trunk/reactos/ntoskrnl/config/cmkeydel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmkeydel.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmkeydel.c (original) +++ trunk/reactos/ntoskrnl/config/cmkeydel.c Fri May 18 16:41:16 2007 @@ -90,7 +90,7 @@ /* Get the value data and release it */ ValueData = HvGetCell(Hive, ListData->u.KeyList[i]); - if (ValueData) ASSERT(FALSE); + ASSERT(ValueData); HvReleaseCell(Hive,ListData->u.KeyList[i]); /* Mark the value data dirty too */

1 0

[greatlrd] 26829: fix a comment in it for swedish langues
by greatlrd＠svn.reactos.org 17 May '07

17 May '07

Author: greatlrd Date: Fri May 18 00:14:21 2007 New Revision: 26829 URL: http://svn.reactos.org/svn/reactos?rev=26829&view=rev Log: fix a comment in it for swedish langues Modified: trunk/reactos/dll/win32/kernel32/locale_rc.rc Modified: trunk/reactos/dll/win32/kernel32/locale_rc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/locale_… ============================================================================== --- trunk/reactos/dll/win32/kernel32/locale_rc.rc (original) +++ trunk/reactos/dll/win32/kernel32/locale_rc.rc Fri May 18 00:14:21 2007 @@ -148,7 +148,7 @@ #include "nls/sqi.nls" /* 0x041c LANG_ALBANIAN, SUBLANG_NEUTRAL */ -#include "nls/sve.nls" /* 0x041d LANG_SWEDISH, SUBLANG_SWEDISH */ +#include "nls/sve.nls" /* 0x041d LANG_SWEDISH, SUBLANG_NEUTRAL */ #include "nls/svf.nls" /* 0x081d LANG_SWEDISH, SUBLANG_SWEDISH_FINLAND */ #include "nls/tha.nls" /* 0x041e LANG_THAI, SUBLANG_NEUTRAL */

1 0

[greatlrd] 26828: Audlt locale_rc.rc clean it is from wine see the comment in the file
by greatlrd＠svn.reactos.org 17 May '07

17 May '07

Author: greatlrd Date: Fri May 18 00:13:30 2007 New Revision: 26828 URL: http://svn.reactos.org/svn/reactos?rev=26828&view=rev Log: Audlt locale_rc.rc clean it is from wine see the comment in the file Modified: trunk/reactos/dll/win32/kernel32/locale_rc.rc (props changed) Propchange: trunk/reactos/dll/win32/kernel32/locale_rc.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
33
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2007