diff --git a/checkin_notes b/checkin_notes index 93f41e034c..a9491b4be9 100755 --- a/checkin_notes +++ b/checkin_notes @@ -10997,3 +10997,10 @@ David 25 Aug 2005 sah_check_lib.m4 sched/ file_deleter.C + +Rom 25 Aug 2005 + - Fixup a few more CRLF issues in the wizard. + + clientgui/ + BOINCGUI.pjd + WizAttachProject.cpp diff --git a/clientgui/BOINCGUI.pjd b/clientgui/BOINCGUI.pjd index f310e6a2f4..48d177fc88 100644 --- a/clientgui/BOINCGUI.pjd +++ b/clientgui/BOINCGUI.pjd @@ -12,7 +12,7 @@ - 353 + 356 TRUE FALSE @@ -187,7 +187,7 @@ <None> - 14628448 + 14628704 data-document @@ -198,14 +198,14 @@ 0 Configurations - 15204160 + 15138656 config-data-document 0 1 0 - 14628448 + 14628704 0 TRUE @@ -253,7 +253,7 @@ Projects - 14628560 + 14628816 root-document project @@ -264,25 +264,25 @@ 0 Windows - 15191600 + 15121968 html-document dialogsfolder 1 1 0 - 14628560 + 14628816 1 Options - 15188128 + 15118528 dialog-document dialog 0 1 0 - 15191600 + 15121968 0 8/3/2004 wbDialogProxy @@ -341,14 +341,14 @@ wxBoxSizer V - 14637776 + 14635856 dialog-control-document sizer 0 1 0 - 15188128 + 15118528 0 wbBoxSizerProxy Vertical @@ -367,14 +367,14 @@ <Any platform> wxNotebook: ID_NOTEBOOK - 14669536 + 14668960 dialog-control-document notebook 0 1 0 - 14637776 + 14635856 0 wbNotebookProxy wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED|OnNotebookPageChanged @@ -437,7 +437,7 @@ 0 1 0 - 14669536 + 14668960 0 wbPanelProxy ID_GENERAL @@ -490,7 +490,7 @@ wxBoxSizer V - 14696528 + 14688336 dialog-control-document sizer @@ -524,7 +524,7 @@ 0 1 0 - 14696528 + 14688336 0 22/5/2005 wbFlexGridSizerProxy @@ -549,7 +549,7 @@ FALSE wxStaticText: wxID_STATIC - 14764608 + 14760480 dialog-control-document statictext @@ -606,7 +606,7 @@ wxComboBox: ID_LANGUAGESELECTION - 14766768 + 14771856 dialog-control-document combobox @@ -658,7 +658,7 @@ wxStaticText: wxID_STATIC - 14791776 + 14890080 dialog-control-document statictext @@ -715,7 +715,7 @@ wxSlider: ID_REMINDERFREQUENCY - 14836464 + 14934880 dialog-control-document slider @@ -782,14 +782,14 @@ wxPanel: ID_CONNECTONS - 14840736 + 14939056 dialog-control-document panel 0 1 0 - 14669536 + 14668960 0 27/5/2005 wbPanelProxy @@ -843,14 +843,14 @@ wxBoxSizer V - 14906944 + 14972448 dialog-control-document sizer 0 1 0 - 14840736 + 14939056 0 27/5/2005 wbBoxSizerProxy @@ -870,14 +870,14 @@ <Any platform> wxRadioButton: ID_NETWORKAUTODETECT - 14896048 + 14961520 dialog-control-document radiobutton 0 1 0 - 14906944 + 14972448 0 27/5/2005 wbRadioButtonProxy @@ -922,14 +922,14 @@ wxRadioButton: ID_NETWORKLAN - 14880240 + 14954016 dialog-control-document radiobutton 0 1 0 - 14906944 + 14972448 0 27/5/2005 wbRadioButtonProxy @@ -974,14 +974,14 @@ wxRadioButton: ID_NETWORKDIALUP - 14926048 + 15057120 dialog-control-document radiobutton 0 1 0 - 14906944 + 14972448 0 27/5/2005 wbRadioButtonProxy @@ -1026,14 +1026,14 @@ wxStaticBoxSizer V - 14927616 + 15058720 dialog-control-document sizer 0 1 0 - 14906944 + 14972448 0 27/5/2005 wbStaticBoxSizerProxy @@ -1057,14 +1057,14 @@ <Any platform> wxFlexGridSizer - 15001856 + 15198464 dialog-control-document sizer 0 1 0 - 14927616 + 15058720 0 27/5/2005 wbFlexGridSizerProxy @@ -1089,14 +1089,14 @@ FALSE wxListBox: ID_DIALUPCONNECTIONS - 14988992 + 15185600 dialog-control-document listbox 0 1 0 - 15001856 + 15198464 0 27/5/2005 wbListBoxProxy @@ -1150,14 +1150,14 @@ wxBoxSizer V - 15065552 + 46163280 dialog-control-document sizer 0 1 0 - 15001856 + 15198464 0 27/5/2005 wbBoxSizerProxy @@ -1177,14 +1177,14 @@ <Any platform> wxButton: ID_DIALUPSETDEFAULT - 15054608 + 46152432 dialog-control-document dialogcontrol 0 1 0 - 15065552 + 46163280 0 27/5/2005 wbButtonProxy @@ -1230,14 +1230,14 @@ wxButton: ID_DIALUPCLEARDEFAULT - 15057808 + 45348160 dialog-control-document dialogcontrol 0 1 0 - 15065552 + 46163280 0 27/5/2005 wbButtonProxy @@ -1285,14 +1285,14 @@ wxFlexGridSizer - 15132608 + 45349728 dialog-control-document sizer 0 1 0 - 14927616 + 15058720 0 27/5/2005 wbFlexGridSizerProxy @@ -1317,14 +1317,14 @@ FALSE wxStaticText: ID_DIALUPDEFAULTCONNECTIONTEXT - 15111648 + 45382272 dialog-control-document statictext 0 1 0 - 15132608 + 45349728 0 27/5/2005 wbStaticTextProxy @@ -1374,14 +1374,14 @@ wxStaticText: ID_DIALUPDEFAULTCONNECTION - 45505536 + 45360800 dialog-control-document statictext 0 1 0 - 15132608 + 45349728 0 27/5/2005 wbStaticTextProxy @@ -1432,14 +1432,14 @@ wxFlexGridSizer - 45508992 + 45399024 dialog-control-document sizer 0 1 0 - 14927616 + 15058720 0 28/5/2005 wbFlexGridSizerProxy @@ -1464,14 +1464,14 @@ FALSE wxCheckBox: ID_DIALUPPROMPTUSERNAMEPASSWORD - 44558352 + 45395152 dialog-control-document checkbox 0 1 0 - 45508992 + 45399024 0 28/5/2005 wbCheckBoxProxy @@ -1520,14 +1520,14 @@ wxPanel: ID_HTTPPROXY - 44541696 + 45399488 dialog-control-document panel 0 1 0 - 14669536 + 14668960 0 wbPanelProxy ID_HTTPPROXY @@ -1580,14 +1580,14 @@ wxBoxSizer V - 44682448 + 45464064 dialog-control-document sizer 0 1 0 - 44541696 + 45399488 0 wbBoxSizerProxy Vertical @@ -1606,14 +1606,14 @@ <Any platform> wxCheckBox: ID_ENABLEHTTPPROXYCTRL - 44671616 + 45453072 dialog-control-document checkbox 0 1 0 - 44682448 + 45464064 0 wbCheckBoxProxy wxEVT_COMMAND_CHECKBOX_CLICKED|OnEnableHTTPProxyCtrlClick @@ -1659,14 +1659,14 @@ wxStaticBoxSizer V - 44750672 + 45528752 dialog-control-document sizer 0 1 0 - 44682448 + 45464064 0 wbStaticBoxSizerProxy wxID_ANY @@ -1689,14 +1689,14 @@ <Any platform> wxGridSizer - 44740016 + 45522192 dialog-control-document sizer 0 1 0 - 44750672 + 45528752 0 wbGridSizerProxy 1 @@ -1718,14 +1718,14 @@ FALSE wxFlexGridSizer - 44729792 + 45454048 dialog-control-document sizer 0 1 0 - 44740016 + 45522192 0 wbFlexGridSizerProxy @@ -1749,14 +1749,14 @@ FALSE wxStaticText: wxID_STATIC - 44786848 + 45601440 dialog-control-document statictext 0 1 0 - 44729792 + 45454048 0 wbStaticTextProxy wxID_STATIC @@ -1805,14 +1805,14 @@ wxTextCtrl: ID_HTTPADDRESSCTRL - 44771904 + 45582352 dialog-control-document textctrl 0 1 0 - 44729792 + 45454048 0 wbTextCtrlProxy ID_HTTPADDRESSCTRL @@ -1872,14 +1872,14 @@ wxStaticText: wxID_STATIC - 44805904 + 45616816 dialog-control-document statictext 0 1 0 - 44729792 + 45454048 0 wbStaticTextProxy wxID_STATIC @@ -1928,14 +1928,14 @@ wxTextCtrl: ID_HTTPPORTCTRL - 44917408 + 45699408 dialog-control-document textctrl 0 1 0 - 44729792 + 45454048 0 wbTextCtrlProxy ID_HTTPPORTCTRL @@ -1997,14 +1997,14 @@ wxStaticBoxSizer V - 44918608 + 45703888 dialog-control-document sizer 0 1 0 - 44750672 + 45528752 0 wbStaticBoxSizerProxy wxID_ANY @@ -2027,14 +2027,14 @@ <Any platform> wxFlexGridSizer - 44809552 + 45776176 dialog-control-document sizer 0 1 0 - 44918608 + 45703888 0 wbFlexGridSizerProxy @@ -2058,14 +2058,14 @@ FALSE wxStaticText: wxID_STATIC - 44949776 + 45759104 dialog-control-document statictext 0 1 0 - 44809552 + 45776176 0 wbStaticTextProxy wxID_STATIC @@ -2116,14 +2116,14 @@ wxTextCtrl: ID_HTTPUSERNAMECTRL - 44934720 + 45765072 dialog-control-document textctrl 0 1 0 - 44809552 + 45776176 0 wbTextCtrlProxy ID_HTTPUSERNAMECTRL @@ -2183,14 +2183,14 @@ wxStaticText: wxID_STATIC - 44968800 + 45782592 dialog-control-document statictext 0 1 0 - 44809552 + 45776176 0 wbStaticTextProxy wxID_STATIC @@ -2241,14 +2241,14 @@ wxTextCtrl: ID_HTTPPASSWORDCTRL - 45014240 + 45828896 dialog-control-document textctrl 0 1 0 - 44809552 + 45776176 0 wbTextCtrlProxy ID_HTTPPASSWORDCTRL @@ -2313,14 +2313,14 @@ wxPanel: ID_SOCKSPROXY - 45015216 + 45832240 dialog-control-document panel 0 1 0 - 14669536 + 14668960 0 wbPanelProxy ID_SOCKSPROXY @@ -2375,14 +2375,14 @@ FALSE wxBoxSizer V - 45050080 + 45861984 dialog-control-document sizer 0 1 0 - 45015216 + 45832240 0 wbBoxSizerProxy Vertical @@ -2401,14 +2401,14 @@ <Any platform> wxCheckBox: ID_ENABLESOCKSPROXYCTRL - 45043344 + 45851168 dialog-control-document checkbox 0 1 0 - 45050080 + 45861984 0 wbCheckBoxProxy wxEVT_COMMAND_CHECKBOX_CLICKED|OnEnableSOCKSProxyCtrlClick @@ -2454,14 +2454,14 @@ wxStaticBoxSizer V - 45046608 + 45963088 dialog-control-document sizer 0 1 0 - 45050080 + 45861984 0 wbStaticBoxSizerProxy wxID_ANY @@ -2484,14 +2484,14 @@ <Any platform> wxGridSizer - 45082336 + 45952432 dialog-control-document sizer 0 1 0 - 45046608 + 45963088 0 wbGridSizerProxy 1 @@ -2513,14 +2513,14 @@ FALSE wxFlexGridSizer - 45072080 + 45942208 dialog-control-document sizer 0 1 0 - 45082336 + 45952432 0 wbFlexGridSizerProxy @@ -2544,14 +2544,14 @@ FALSE wxStaticText: wxID_STATIC - 45059328 + 46031664 dialog-control-document statictext 0 1 0 - 45072080 + 45942208 0 wbStaticTextProxy wxID_STATIC @@ -2602,14 +2602,14 @@ wxTextCtrl: ID_SOCKSADDRESSCTRL - 45096592 + 46012416 dialog-control-document textctrl 0 1 0 - 45072080 + 45942208 0 wbTextCtrlProxy ID_SOCKSADDRESSCTRL @@ -2671,14 +2671,14 @@ wxStaticText: wxID_STATIC - 45174912 + 46049760 dialog-control-document statictext 0 1 0 - 45072080 + 45942208 0 wbStaticTextProxy wxID_STATIC @@ -2729,14 +2729,14 @@ wxTextCtrl: ID_SOCKSPORTCTRL - 45155760 + 46095264 dialog-control-document textctrl 0 1 0 - 45072080 + 45942208 0 wbTextCtrlProxy ID_SOCKSPORTCTRL @@ -2800,14 +2800,14 @@ wxStaticBoxSizer V - 45233552 + 46099248 dialog-control-document sizer 0 1 0 - 45046608 + 45963088 0 wbStaticBoxSizerProxy wxID_ANY @@ -2830,14 +2830,14 @@ <Any platform> wxFlexGridSizer - 45222752 + 46052192 dialog-control-document sizer 0 1 0 - 45233552 + 46099248 0 wbFlexGridSizerProxy @@ -2861,14 +2861,14 @@ FALSE wxStaticText: wxID_STATIC - 45175728 + 46126112 dialog-control-document statictext 0 1 0 - 45222752 + 46052192 0 wbStaticTextProxy wxID_STATIC @@ -2919,14 +2919,14 @@ wxTextCtrl: ID_SOCKSUSERNAMECTRL - 45266976 + 46106880 dialog-control-document textctrl 0 1 0 - 45222752 + 46052192 0 wbTextCtrlProxy ID_SOCKSUSERNAMECTRL @@ -2988,14 +2988,14 @@ wxStaticText: wxID_STATIC - 45340224 + 46184800 dialog-control-document statictext 0 1 0 - 45222752 + 46052192 0 wbStaticTextProxy wxID_STATIC @@ -3046,14 +3046,14 @@ wxTextCtrl: ID_SOCKSPASSWORDCTRL - 45342144 + 46187136 dialog-control-document textctrl 0 1 0 - 45222752 + 46052192 0 wbTextCtrlProxy ID_SOCKSPASSWORDCTRL @@ -3121,14 +3121,14 @@ wxBoxSizer H - 45395472 + 46211152 dialog-control-document sizer 0 1 0 - 14637776 + 14635856 0 wbBoxSizerProxy Horizontal @@ -3147,14 +3147,14 @@ <Any platform> wxButton: wxID_OK - 45384800 + 45829808 dialog-control-document dialogcontrol 0 1 0 - 45395472 + 46211152 0 wbButtonProxy wxID_OK @@ -3198,14 +3198,14 @@ wxButton: wxID_CANCEL - 45386704 + 46268176 dialog-control-document dialogcontrol 0 1 0 - 45395472 + 46211152 0 wbButtonProxy wxID_CANCEL @@ -3252,14 +3252,14 @@ About BOINC - 45430656 + 46247600 dialog-document dialog 0 1 0 - 15191600 + 15121968 0 9/3/2004 wbDialogProxy @@ -3319,14 +3319,14 @@ wxBoxSizer V - 45546464 + 46281424 dialog-control-document sizer 0 1 0 - 45430656 + 46247600 0 wbBoxSizerProxy Vertical @@ -3345,14 +3345,14 @@ <Any platform> wxStaticText: wxID_STATIC - 45535408 + 46270352 dialog-control-document statictext 0 1 0 - 45546464 + 46281424 0 wbStaticTextProxy wxID_STATIC @@ -3401,14 +3401,14 @@ wxBoxSizer H - 45537440 + 14972896 dialog-control-document sizer 0 1 0 - 45546464 + 46281424 0 wbBoxSizerProxy Horizontal @@ -3427,14 +3427,14 @@ <Any platform> wxBoxSizer V - 45563664 + 15186800 dialog-control-document sizer 0 1 0 - 45537440 + 14972896 0 wbBoxSizerProxy Vertical @@ -3453,14 +3453,14 @@ <Any platform> wxStaticBitmap: wxID_STATIC - 45553184 + 58328640 dialog-control-document staticbitmap 0 1 0 - 45563664 + 15186800 0 wbStaticBitmapProxy wxID_STATIC @@ -3504,14 +3504,14 @@ wxFlexGridSizer - 14673168 + 58345680 dialog-control-document sizer 0 1 0 - 45537440 + 14972896 0 wbFlexGridSizerProxy @@ -3535,14 +3535,14 @@ FALSE wxStaticText: wxID_STATIC - 15113584 + 58358032 dialog-control-document statictext 0 1 0 - 14673168 + 58345680 0 wbStaticTextProxy wxID_STATIC @@ -3591,14 +3591,14 @@ wxStaticText: wxID_STATIC - 44507552 + 14725856 dialog-control-document statictext 0 1 0 - 14673168 + 58345680 0 wbStaticTextProxy wxID_STATIC @@ -3647,14 +3647,14 @@ wxStaticText: wxID_STATIC - 44530096 + 14728912 dialog-control-document statictext 0 1 0 - 14673168 + 58345680 0 wbStaticTextProxy wxID_STATIC @@ -3703,14 +3703,14 @@ wxStaticText: wxID_STATIC - 14725440 + 58376896 dialog-control-document statictext 0 1 0 - 14673168 + 58345680 0 wbStaticTextProxy wxID_STATIC @@ -3769,14 +3769,14 @@ All Rights Reserved. wxStaticText: wxID_STATIC - 14727040 + 14790048 dialog-control-document statictext 0 1 0 - 45546464 + 46281424 0 wbStaticTextProxy wxID_STATIC @@ -3827,14 +3827,14 @@ All Rights Reserved. wxStaticText: wxID_STATIC - 14863168 + 14804064 dialog-control-document statictext 0 1 0 - 45546464 + 46281424 0 wbStaticTextProxy wxID_STATIC @@ -3885,14 +3885,14 @@ All Rights Reserved. wxHyperLink: ID_ABOUTBOINCLINK - 14858096 + 58403392 dialog-control-document foreign 0 1 0 - 45546464 + 46281424 0 21/6/2005 wbCustomCtrlProxy:wxHyperLink @@ -3945,14 +3945,14 @@ All Rights Reserved. wxStaticLine: wxID_STATIC - 44588048 + 58397808 dialog-control-document staticline 0 1 0 - 45546464 + 46281424 0 wbStaticLineProxy wxID_STATIC @@ -3992,14 +3992,14 @@ All Rights Reserved. wxButton: wxID_OK - 44582768 + 14822192 dialog-control-document dialogcontrol 0 1 0 - 45546464 + 46281424 0 wbButtonProxy wxID_OK @@ -4047,14 +4047,14 @@ All Rights Reserved. Attach to Project - 14959936 + 14837712 dialog-document dialog 0 1 0 - 15191600 + 15121968 0 9/3/2004 wbDialogProxy @@ -4115,14 +4115,14 @@ All Rights Reserved. wxBoxSizer V - 44600288 + 58430560 dialog-control-document sizer 0 1 0 - 14959936 + 14837712 0 wbBoxSizerProxy Vertical @@ -4141,14 +4141,14 @@ All Rights Reserved. <Any platform> wxFlexGridSizer - 44607152 + 58445584 dialog-control-document sizer 0 1 0 - 44600288 + 58430560 0 29/2/2005 wbFlexGridSizerProxy @@ -4173,14 +4173,14 @@ All Rights Reserved. FALSE wxBoxSizer V - 44621264 + 58451504 dialog-control-document sizer 0 1 0 - 44607152 + 58445584 0 29/2/2005 wbBoxSizerProxy @@ -4200,14 +4200,14 @@ All Rights Reserved. <Any platform> wxFlexGridSizer - 44628144 + 58465936 dialog-control-document sizer 0 1 0 - 44621264 + 58451504 0 29/2/2005 wbFlexGridSizerProxy @@ -4232,14 +4232,14 @@ All Rights Reserved. FALSE wxStaticText: wxID_STATIC - 44639392 + 58477792 dialog-control-document statictext 0 1 0 - 44628144 + 58465936 0 29/2/2005 wbStaticTextProxy @@ -4291,14 +4291,14 @@ All Rights Reserved. wxTextCtrl: ID_PROJECTADDRESS - 44661264 + 58501568 dialog-control-document textctrl 0 1 0 - 44628144 + 58465936 0 29/2/2005 wbTextCtrlProxy @@ -4359,14 +4359,14 @@ All Rights Reserved. wxStaticText: wxID_STATIC - 15028752 + 58495808 dialog-control-document statictext 0 1 0 - 44628144 + 58465936 0 29/2/2005 wbStaticTextProxy @@ -4418,14 +4418,14 @@ All Rights Reserved. wxTextCtrl: ID_PROJECTACCOUNTKEY - 44705344 + 58543568 dialog-control-document textctrl 0 1 0 - 44628144 + 58465936 0 29/2/2005 wbTextCtrlProxy @@ -4487,14 +4487,14 @@ All Rights Reserved. wxStaticText: wxID_STATIC - 44628688 + 14855040 dialog-control-document statictext 0 1 0 - 44621264 + 58451504 0 29/2/2005 wbStaticTextProxy @@ -4561,14 +4561,14 @@ Visit http://boinc.berkeley.edu for a list of projects. wxBoxSizer V - 15089136 + 14850608 dialog-control-document sizer 0 1 0 - 44607152 + 58445584 0 29/2/2005 wbBoxSizerProxy @@ -4588,14 +4588,14 @@ Visit http://boinc.berkeley.edu for a list of projects. <Any platform> wxButton: wxID_OK - 15094592 + 58459872 dialog-control-document dialogcontrol 0 1 0 - 15089136 + 14850608 0 29/2/2005 wbButtonProxy @@ -4642,14 +4642,14 @@ Visit http://boinc.berkeley.edu for a list of projects. wxButton: wxID_CANCEL - 15143872 + 14984512 dialog-control-document dialogcontrol 0 1 0 - 15089136 + 14850608 0 29/2/2005 wbButtonProxy @@ -4700,14 +4700,14 @@ Visit http://boinc.berkeley.edu for a list of projects. Account Manager Signup - 15159376 + 15000000 dialog-document dialog 0 1 0 - 15191600 + 15121968 0 10/2/2005 wbDialogProxy @@ -4769,14 +4769,14 @@ Visit http://boinc.berkeley.edu for a list of projects. wxFlexGridSizer - 44600912 + 58561840 dialog-control-document sizer 0 1 0 - 15159376 + 15000000 0 28/5/2005 wbFlexGridSizerProxy @@ -4801,14 +4801,14 @@ Visit http://boinc.berkeley.edu for a list of projects. FALSE wxBoxSizer V - 44838512 + 58575904 dialog-control-document sizer 0 1 0 - 44600912 + 58561840 0 28/5/2005 wbBoxSizerProxy @@ -4828,14 +4828,14 @@ Visit http://boinc.berkeley.edu for a list of projects. <Any platform> wxStaticText: ID_ACCTMANAGERTEXT - 44843504 + 58588944 dialog-control-document statictext 0 1 0 - 44838512 + 58575904 0 28/5/2005 wbStaticTextProxy @@ -4893,14 +4893,14 @@ For more information, click on the link below. wxHyperLink: ID_ACCTMANAGERDOCLINK - 44868960 + 58607104 dialog-control-document foreign 0 1 0 - 44838512 + 58575904 0 30/5/2005 wbCustomCtrlProxy:wxHyperLink @@ -4953,14 +4953,14 @@ For more information, click on the link below. wxFlexGridSizer - 44870672 + 58628864 dialog-control-document sizer 0 1 0 - 44838512 + 58575904 0 28/5/2005 wbFlexGridSizerProxy @@ -4985,14 +4985,14 @@ For more information, click on the link below. FALSE wxStaticText: wxID_STATIC - 45122880 + 58640736 dialog-control-document statictext 0 1 0 - 44870672 + 58628864 0 28/5/2005 wbStaticTextProxy @@ -5042,14 +5042,14 @@ For more information, click on the link below. wxTextCtrl: ID_ACCTMANAGERURL - 45143344 + 58636160 dialog-control-document textctrl 0 1 0 - 44870672 + 58628864 0 28/5/2005 wbTextCtrlProxy @@ -5110,14 +5110,14 @@ For more information, click on the link below. wxStaticText: wxID_STATIC - 45206976 + 15028272 dialog-control-document statictext 0 1 0 - 44870672 + 58628864 0 28/5/2005 wbStaticTextProxy @@ -5167,14 +5167,14 @@ For more information, click on the link below. wxTextCtrl: ID_ACCTMANAGERUSERNAME - 45199488 + 58663408 dialog-control-document textctrl 0 1 0 - 44870672 + 58628864 0 28/5/2005 wbTextCtrlProxy @@ -5235,14 +5235,14 @@ For more information, click on the link below. wxStaticText: wxID_STATIC - 45305904 + 58666704 dialog-control-document statictext 0 1 0 - 44870672 + 58628864 0 28/5/2005 wbStaticTextProxy @@ -5292,14 +5292,14 @@ For more information, click on the link below. wxTextCtrl: ID_ACCTMANAGERPASSWORD - 45367056 + 58704640 dialog-control-document textctrl 0 1 0 - 44870672 + 58628864 0 28/5/2005 wbTextCtrlProxy @@ -5362,14 +5362,14 @@ For more information, click on the link below. wxFlexGridSizer - 45362960 + 58729840 dialog-control-document sizer 0 1 0 - 44600912 + 58561840 0 28/5/2005 wbFlexGridSizerProxy @@ -5394,14 +5394,14 @@ For more information, click on the link below. FALSE wxButton: wxID_OK - 45450688 + 58742368 dialog-control-document dialogcontrol 0 1 0 - 45362960 + 58729840 0 28/5/2005 wbButtonProxy @@ -5446,14 +5446,14 @@ For more information, click on the link below. wxButton: wxID_CANCEL - 45466496 + 58700128 dialog-control-document dialogcontrol 0 1 0 - 45362960 + 58729840 0 28/5/2005 wbButtonProxy @@ -5501,14 +5501,14 @@ For more information, click on the link below. Account Manager Status - 57617536 + 58766368 dialog-document dialog 0 1 0 - 15191600 + 15121968 0 16/5/2005 wbDialogProxy @@ -5569,14 +5569,14 @@ For more information, click on the link below. wxBoxSizer V - 57636112 + 58731696 dialog-control-document sizer 0 1 0 - 57617536 + 58766368 0 16/5/2005 wbBoxSizerProxy @@ -5596,14 +5596,14 @@ For more information, click on the link below. <Any platform> wxBoxSizer H - 45467520 + 15075120 dialog-control-document sizer 0 1 0 - 57636112 + 58731696 0 16/5/2005 wbBoxSizerProxy @@ -5623,14 +5623,14 @@ For more information, click on the link below. <Any platform> wxBoxSizer V - 57646544 + 15082320 dialog-control-document sizer 0 1 0 - 45467520 + 15075120 0 8/6/2005 wbBoxSizerProxy @@ -5650,14 +5650,14 @@ For more information, click on the link below. <Any platform> wxStaticText: wxID_STATIC - 57651504 + 15095424 dialog-control-document statictext 0 1 0 - 57646544 + 15082320 0 8/6/2005 wbStaticTextProxy @@ -5707,14 +5707,14 @@ For more information, click on the link below. wxFlexGridSizer - 57677760 + 15147872 dialog-control-document sizer 0 1 0 - 57646544 + 15082320 0 8/6/2005 wbFlexGridSizerProxy @@ -5739,14 +5739,14 @@ For more information, click on the link below. FALSE wxStaticText: wxID_STATIC - 57689600 + 15159696 dialog-control-document statictext 0 1 0 - 57677760 + 15147872 0 8/6/2005 wbStaticTextProxy @@ -5796,14 +5796,14 @@ For more information, click on the link below. wxStaticText: ID_ACCTMANAGERNAME - 57691472 + 58797024 dialog-control-document statictext 0 1 0 - 57677760 + 15147872 0 8/6/2005 wbStaticTextProxy @@ -5853,14 +5853,14 @@ For more information, click on the link below. wxStaticText: wxID_STATIC - 57721584 + 58790672 dialog-control-document statictext 0 1 0 - 57677760 + 15147872 0 8/6/2005 wbStaticTextProxy @@ -5910,14 +5910,14 @@ For more information, click on the link below. wxHyperLink: ID_ACCTMANAGERLINK - 57748864 + 45235648 dialog-control-document foreign 0 1 0 - 57677760 + 15147872 0 8/6/2005 wbCustomCtrlProxy:wxHyperLink @@ -5972,14 +5972,14 @@ For more information, click on the link below. wxBoxSizer V - 57744896 + 45228160 dialog-control-document sizer 0 1 0 - 45467520 + 15075120 0 16/5/2005 wbBoxSizerProxy @@ -5999,14 +5999,14 @@ For more information, click on the link below. <Any platform> wxButton: ID_UPDATE - 57679280 + 15083984 dialog-control-document dialogcontrol 0 1 0 - 57744896 + 45228160 0 16/5/2005 wbButtonProxy @@ -6052,14 +6052,14 @@ For more information, click on the link below. wxButton: ID_CHANGE - 57786032 + 45270832 dialog-control-document dialogcontrol 0 1 0 - 57744896 + 45228160 0 16/5/2005 wbButtonProxy @@ -6105,14 +6105,14 @@ For more information, click on the link below. wxButton: wxID_CANCEL - 57778512 + 45272320 dialog-control-document dialogcontrol 0 1 0 - 57744896 + 45228160 0 16/5/2005 wbButtonProxy @@ -6161,14 +6161,14 @@ For more information, click on the link below. Select Computer - 57817792 + 45304352 dialog-document dialog 0 1 0 - 15191600 + 15121968 0 29/2/2005 wbDialogProxy @@ -6229,14 +6229,14 @@ For more information, click on the link below. wxBoxSizer V - 57610544 + 15082736 dialog-control-document sizer 0 1 0 - 57817792 + 45304352 0 29/2/2005 wbBoxSizerProxy @@ -6256,14 +6256,14 @@ For more information, click on the link below. <Any platform> wxFlexGridSizer - 57839376 + 45423104 dialog-control-document sizer 0 1 0 - 57610544 + 15082736 0 29/2/2005 wbFlexGridSizerProxy @@ -6288,14 +6288,14 @@ For more information, click on the link below. FALSE wxBoxSizer V - 57845168 + 45429024 dialog-control-document sizer 0 1 0 - 57839376 + 45423104 0 29/2/2005 wbBoxSizerProxy @@ -6315,14 +6315,14 @@ For more information, click on the link below. <Any platform> wxFlexGridSizer - 57852032 + 45444112 dialog-control-document sizer 0 1 0 - 57845168 + 45429024 0 29/2/2005 wbFlexGridSizerProxy @@ -6347,14 +6347,14 @@ For more information, click on the link below. FALSE wxStaticText: wxID_STATIC - 57871808 + 45487680 dialog-control-document statictext 0 1 0 - 57852032 + 45444112 0 29/2/2005 wbStaticTextProxy @@ -6404,14 +6404,14 @@ For more information, click on the link below. wxComboBox: ID_SELECTCOMPUTERNAME - 57891248 + 45482448 dialog-control-document combobox 0 1 0 - 57852032 + 45444112 0 29/2/2005 wbComboBoxProxy @@ -6456,14 +6456,14 @@ For more information, click on the link below. wxStaticText: wxID_STATIC - 57906496 + 45563040 dialog-control-document statictext 0 1 0 - 57852032 + 45444112 0 29/2/2005 wbStaticTextProxy @@ -6513,14 +6513,14 @@ For more information, click on the link below. wxTextCtrl: ID_SELECTCOMPUTERPASSWORD - 57928752 + 45577088 dialog-control-document textctrl 0 1 0 - 57852032 + 45444112 0 29/2/2005 wbTextCtrlProxy @@ -6583,14 +6583,14 @@ For more information, click on the link below. wxBoxSizer V - 57942112 + 45663968 dialog-control-document sizer 0 1 0 - 57839376 + 45423104 0 29/2/2005 wbBoxSizerProxy @@ -6610,14 +6610,14 @@ For more information, click on the link below. <Any platform> wxButton: wxID_OK - 57955776 + 45677648 dialog-control-document dialogcontrol 0 1 0 - 57942112 + 45663968 0 29/2/2005 wbButtonProxy @@ -6664,14 +6664,14 @@ For more information, click on the link below. wxButton: wxID_CANCEL - 57957616 + 58830576 dialog-control-document dialogcontrol 0 1 0 - 57942112 + 45663968 0 29/2/2005 wbButtonProxy @@ -6722,14 +6722,14 @@ For more information, click on the link below. Dialup Logon - 57985088 + 58846176 dialog-document dialog 0 1 0 - 15191600 + 15121968 0 28/5/2005 wbDialogProxy @@ -6790,14 +6790,14 @@ For more information, click on the link below. wxFlexGridSizer - 57958000 + 45714640 dialog-control-document sizer 0 1 0 - 57985088 + 58846176 0 28/5/2005 wbFlexGridSizerProxy @@ -6822,14 +6822,14 @@ For more information, click on the link below. FALSE wxBoxSizer V - 58005600 + 45720416 dialog-control-document sizer 0 1 0 - 57958000 + 45714640 0 28/5/2005 wbBoxSizerProxy @@ -6849,14 +6849,14 @@ For more information, click on the link below. <Any platform> wxFlexGridSizer - 58012576 + 45735504 dialog-control-document sizer 0 1 0 - 58005600 + 45720416 0 28/5/2005 wbFlexGridSizerProxy @@ -6881,14 +6881,14 @@ For more information, click on the link below. FALSE wxStaticText: wxID_STATIC - 58024432 + 45878720 dialog-control-document statictext 0 1 0 - 58012576 + 45735504 0 28/5/2005 wbStaticTextProxy @@ -6938,14 +6938,14 @@ For more information, click on the link below. wxTextCtrl: ID_USERNAME - 58050912 + 45897024 dialog-control-document textctrl 0 1 0 - 58012576 + 45735504 0 28/5/2005 wbTextCtrlProxy @@ -7006,14 +7006,14 @@ For more information, click on the link below. wxStaticText: wxID_STATIC - 58075008 + 45921072 dialog-control-document statictext 0 1 0 - 58012576 + 45735504 0 28/5/2005 wbStaticTextProxy @@ -7063,14 +7063,14 @@ For more information, click on the link below. wxTextCtrl: ID_PASSWORD - 58097232 + 45922400 dialog-control-document textctrl 0 1 0 - 58012576 + 45735504 0 28/5/2005 wbTextCtrlProxy @@ -7133,14 +7133,14 @@ For more information, click on the link below. wxFlexGridSizer - 58109968 + 45991344 dialog-control-document sizer 0 1 0 - 57958000 + 45714640 0 28/5/2005 wbFlexGridSizerProxy @@ -7165,14 +7165,14 @@ For more information, click on the link below. FALSE wxButton: wxID_OK - 58122480 + 46003840 dialog-control-document dialogcontrol 0 1 0 - 58109968 + 45991344 0 28/5/2005 wbButtonProxy @@ -7217,14 +7217,14 @@ For more information, click on the link below. wxButton: wxID_CANCEL - 58135968 + 58860576 dialog-control-document dialogcontrol 0 1 0 - 58109968 + 45991344 0 28/5/2005 wbButtonProxy @@ -7272,14 +7272,14 @@ For more information, click on the link below. Attach to Project Wizard - 58136496 + 58861088 dialog-document wizarddialog 0 1 0 - 15191600 + 15121968 0 21/6/2005 wbWizardProxy @@ -7320,14 +7320,14 @@ For more information, click on the link below. FALSE wxWizardPage: ID_WELCOMEPAGE - 57978912 + 58824720 dialog-control-document panel 0 1 0 - 58136496 + 58861088 0 21/6/2005 wbWizardPageProxy @@ -7365,14 +7365,14 @@ For more information, click on the link below. wxBoxSizer V - 58168080 + 58899952 dialog-control-document sizer 0 1 0 - 57978912 + 58824720 0 21/6/2005 wbBoxSizerProxy @@ -7392,14 +7392,14 @@ For more information, click on the link below. <Any platform> wxStaticText: wxID_STATIC - 58181248 + 58904944 dialog-control-document statictext 0 1 0 - 58168080 + 58899952 0 21/6/2005 wbStaticTextProxy @@ -7449,14 +7449,14 @@ For more information, click on the link below. wxStaticText: wxID_STATIC - 58206944 + 58931872 dialog-control-document statictext 0 1 0 - 58168080 + 58899952 0 21/6/2005 wbStaticTextProxy @@ -7506,14 +7506,14 @@ For more information, click on the link below. Spacer - 58202464 + 58927408 dialog-control-document spacer 0 1 0 - 58168080 + 58899952 0 21/6/2005 wbSpacerProxy @@ -7534,14 +7534,14 @@ For more information, click on the link below. wxStaticBoxSizer V - 58181616 + 58932240 dialog-control-document sizer 0 1 0 - 58168080 + 58899952 0 27/6/2005 wbStaticBoxSizerProxy @@ -7565,14 +7565,14 @@ For more information, click on the link below. __WXDEBUG__ wxFlexGridSizer - 58234992 + 58960128 dialog-control-document sizer 0 1 0 - 58181616 + 58932240 0 27/6/2005 wbFlexGridSizerProxy @@ -7597,14 +7597,14 @@ For more information, click on the link below. FALSE wxCheckBox: ID_ERRPROJECTPROPERTIES - 58247472 + 58972656 dialog-control-document checkbox 0 1 0 - 58234992 + 58960128 0 27/6/2005 wbCheckBoxProxy @@ -7649,14 +7649,14 @@ For more information, click on the link below. wxCheckBox: ID_ERRPROJECTCOMM - 58266576 + 58992752 dialog-control-document checkbox 0 1 0 - 58234992 + 58960128 0 27/6/2005 wbCheckBoxProxy @@ -7701,14 +7701,14 @@ For more information, click on the link below. wxCheckBox: ID_ERRPROJECTPROPERTIESURL - 58283200 + 59009376 dialog-control-document checkbox 0 1 0 - 58234992 + 58960128 0 29/6/2005 wbCheckBoxProxy @@ -7753,14 +7753,14 @@ For more information, click on the link below. wxCheckBox: ID_ERRACCOUNTCREATIONDISABLED - 58300336 + 59025808 dialog-control-document checkbox 0 1 0 - 58234992 + 58960128 0 29/6/2005 wbCheckBoxProxy @@ -7805,14 +7805,14 @@ For more information, click on the link below. wxCheckBox: ID_ERRCLIENTACCOUNTCREATIONDISABLED - 58316976 + 59042464 dialog-control-document checkbox 0 1 0 - 58234992 + 58960128 0 9/7/2005 wbCheckBoxProxy @@ -7857,14 +7857,14 @@ For more information, click on the link below. wxCheckBox: ID_ERRACCOUNTALREADYEXISTS - 58301680 + 59059280 dialog-control-document checkbox 0 1 0 - 58234992 + 58960128 0 29/6/2005 wbCheckBoxProxy @@ -7909,14 +7909,14 @@ For more information, click on the link below. wxCheckBox: ID_ERRGOOGLECOMM - 58345136 + 59075872 dialog-control-document checkbox 0 1 0 - 58234992 + 58960128 0 27/6/2005 wbCheckBoxProxy @@ -7961,14 +7961,14 @@ For more information, click on the link below. Spacer - 58347120 + 59085696 dialog-control-document spacer 0 1 0 - 58234992 + 58960128 0 9/7/2005 wbSpacerProxy @@ -7989,14 +7989,14 @@ For more information, click on the link below. wxCheckBox: ID_ERRYAHOOCOMM - 58364480 + 59093376 dialog-control-document checkbox 0 1 0 - 58234992 + 58960128 0 27/6/2005 wbCheckBoxProxy @@ -8041,14 +8041,14 @@ For more information, click on the link below. Spacer - 58366304 + 59094752 dialog-control-document spacer 0 1 0 - 58234992 + 58960128 0 9/7/2005 wbSpacerProxy @@ -8069,14 +8069,14 @@ For more information, click on the link below. wxCheckBox: ID_ERRNETDETECTION - 58390544 + 59116240 dialog-control-document checkbox 0 1 0 - 58234992 + 58960128 0 27/6/2005 wbCheckBoxProxy @@ -8123,14 +8123,14 @@ For more information, click on the link below. wxStaticText: wxID_STATIC - 58411872 + 59129904 dialog-control-document statictext 0 1 0 - 58168080 + 58899952 0 21/6/2005 wbStaticTextProxy @@ -8182,14 +8182,14 @@ For more information, click on the link below. wxWizardPage: ID_PROJECTINFOPAGE - 58391248 + 59117040 dialog-control-document panel 0 1 0 - 58136496 + 58861088 0 21/6/2005 wbWizardPageProxy @@ -8228,14 +8228,14 @@ For more information, click on the link below. wxBoxSizer V - 58432784 + 59158128 dialog-control-document sizer 0 1 0 - 58391248 + 59117040 0 21/6/2005 wbBoxSizerProxy @@ -8255,14 +8255,14 @@ For more information, click on the link below. <Any platform> wxStaticText: wxID_STATIC - 58437744 + 59163184 dialog-control-document statictext 0 1 0 - 58432784 + 59158128 0 21/6/2005 wbStaticTextProxy @@ -8312,14 +8312,14 @@ For more information, click on the link below. wxStaticText: wxID_STATIC - 58462352 + 59188768 dialog-control-document statictext 0 1 0 - 58432784 + 59158128 0 21/6/2005 wbStaticTextProxy @@ -8369,14 +8369,14 @@ For more information, click on the link below. Spacer - 58466064 + 59189472 dialog-control-document spacer 0 1 0 - 58432784 + 59158128 0 21/6/2005 wbSpacerProxy @@ -8397,14 +8397,14 @@ For more information, click on the link below. wxStaticText: wxID_STATIC - 58439072 + 59165248 dialog-control-document statictext 0 1 0 - 58432784 + 59158128 0 10/7/2005 wbStaticTextProxy @@ -8454,14 +8454,14 @@ For more information, click on the link below. Spacer - 58505360 + 59231136 dialog-control-document spacer 0 1 0 - 58432784 + 59158128 0 10/7/2005 wbSpacerProxy @@ -8482,14 +8482,14 @@ For more information, click on the link below. wxFlexGridSizer - 58514336 + 59240144 dialog-control-document sizer 0 1 0 - 58432784 + 59158128 0 21/6/2005 wbFlexGridSizerProxy @@ -8514,14 +8514,14 @@ For more information, click on the link below. FALSE wxStaticText: ID_PROJECTURLSTATICCTRL - 58462720 + 59248064 dialog-control-document statictext 0 1 0 - 58514336 + 59240144 0 21/6/2005 wbStaticTextProxy @@ -8571,14 +8571,14 @@ For more information, click on the link below. wxTextCtrl: ID_PROJECTURLCTRL - 58540304 + 59266432 dialog-control-document textctrl 0 1 0 - 58514336 + 59240144 0 21/6/2005 wbTextCtrlProxy @@ -8640,14 +8640,14 @@ For more information, click on the link below. Spacer - 58566560 + 59292640 dialog-control-document spacer 0 1 0 - 58432784 + 59158128 0 21/6/2005 wbSpacerProxy @@ -8668,14 +8668,14 @@ For more information, click on the link below. wxStaticText: wxID_STATIC - 58573648 + 59299680 dialog-control-document statictext 0 1 0 - 58432784 + 59158128 0 21/6/2005 wbStaticTextProxy @@ -8725,14 +8725,14 @@ For more information, click on the link below. wxHyperLink: ID_PROJECRINFOBOINCLINK - 58575440 + 59286032 dialog-control-document foreign 0 1 0 - 58432784 + 59158128 0 21/6/2005 wbCustomCtrlProxy:wxHyperLink @@ -8787,14 +8787,14 @@ For more information, click on the link below. wxWizardPage: ID_PROJECTPROPERTIESPAGE - 58606784 + 59333392 dialog-control-document panel 0 1 0 - 58136496 + 58861088 0 27/6/2005 wbWizardPageProxy @@ -8831,14 +8831,14 @@ For more information, click on the link below. wxBoxSizer V - 58366752 + 59151376 dialog-control-document sizer 0 1 0 - 58606784 + 59333392 0 27/6/2005 wbBoxSizerProxy @@ -8858,14 +8858,14 @@ For more information, click on the link below. <Any platform> wxStaticText: wxID_STATIC - 58623296 + 59347568 dialog-control-document statictext 0 1 0 - 58366752 + 59151376 0 27/6/2005 wbStaticTextProxy @@ -8915,14 +8915,14 @@ For more information, click on the link below. Spacer - 58625328 + 59343168 dialog-control-document spacer 0 1 0 - 58366752 + 59151376 0 27/6/2005 wbSpacerProxy @@ -8943,14 +8943,14 @@ For more information, click on the link below. wxFlexGridSizer - 58647296 + 59373296 dialog-control-document sizer 0 1 0 - 58366752 + 59151376 0 15/7/2005 wbFlexGridSizerProxy @@ -8975,14 +8975,14 @@ For more information, click on the link below. FALSE Spacer - 58662160 + 59387504 dialog-control-document spacer 0 1 0 - 58647296 + 59373296 0 15/7/2005 wbSpacerProxy @@ -9003,14 +9003,14 @@ For more information, click on the link below. wxStaticBitmap: ID_PROJECTPROPERTIESPROGRESS - 58669968 + 59395344 dialog-control-document staticbitmap 0 1 0 - 58647296 + 59373296 0 15/7/2005 wbStaticBitmapProxy @@ -9054,14 +9054,14 @@ For more information, click on the link below. Spacer - 58670416 + 59388368 dialog-control-document spacer 0 1 0 - 58647296 + 59373296 0 15/7/2005 wbSpacerProxy @@ -9085,14 +9085,14 @@ For more information, click on the link below. wxWizardPage: ID_ACCOUNTKEYPAGE - 58693968 + 59420432 dialog-control-document panel 0 1 0 - 58136496 + 58861088 0 29/6/2005 wbWizardPageProxy @@ -9130,14 +9130,14 @@ For more information, click on the link below. wxBoxSizer V - 58704064 + 59430544 dialog-control-document sizer 0 1 0 - 58693968 + 59420432 0 29/6/2005 wbBoxSizerProxy @@ -9157,14 +9157,14 @@ For more information, click on the link below. <Any platform> wxStaticText: wxID_STATIC - 58717248 + 59334416 dialog-control-document statictext 0 1 0 - 58704064 + 59430544 0 29/6/2005 wbStaticTextProxy @@ -9214,14 +9214,14 @@ For more information, click on the link below. Spacer - 58730608 + 59450512 dialog-control-document spacer 0 1 0 - 58704064 + 59430544 0 29/6/2005 wbSpacerProxy @@ -9242,14 +9242,14 @@ For more information, click on the link below. wxStaticText: wxID_STATIC - 58737680 + 59457552 dialog-control-document statictext 0 1 0 - 58704064 + 59430544 0 29/6/2005 wbStaticTextProxy @@ -9299,14 +9299,14 @@ For more information, click on the link below. wxStaticText: wxID_STATIC - 58758208 + 59485968 dialog-control-document statictext 0 1 0 - 58704064 + 59430544 0 30/6/2005 wbStaticTextProxy @@ -9314,11 +9314,8 @@ For more information, click on the link below. 5105 wxStaticText - Go to the project's web site to create an account. - - - -Your account key will be emailed to you. + Go to the project's web site to create an account. Your account +key will be emailed to you. @@ -9360,14 +9357,14 @@ Your account key will be emailed to you. wxStaticText: wxID_STATIC - 58760080 + 59479792 dialog-control-document statictext 0 1 0 - 58704064 + 59430544 0 30/6/2005 wbStaticTextProxy @@ -9417,14 +9414,14 @@ Your account key will be emailed to you. wxStaticText: wxID_STATIC - 58795616 + 59515760 dialog-control-document statictext 0 1 0 - 58704064 + 59430544 0 30/6/2005 wbStaticTextProxy @@ -9474,14 +9471,14 @@ Your account key will be emailed to you. Spacer - 58796320 + 59511328 dialog-control-document spacer 0 1 0 - 58704064 + 59430544 0 10/7/2005 wbSpacerProxy @@ -9502,14 +9499,14 @@ Your account key will be emailed to you. wxFlexGridSizer - 58760720 + 59478672 dialog-control-document sizer 0 1 0 - 58704064 + 59430544 0 15/7/2005 wbFlexGridSizerProxy @@ -9534,14 +9531,14 @@ Your account key will be emailed to you. FALSE wxStaticText: ID_ACCOUNTKEYSTATICCTRL - 58822768 + 59550400 dialog-control-document statictext 0 1 0 - 58760720 + 59478672 0 15/7/2005 wbStaticTextProxy @@ -9591,14 +9588,14 @@ Your account key will be emailed to you. wxTextCtrl: ID_ACCOUNTKEYCTRL - 58845088 + 59564496 dialog-control-document textctrl 0 1 0 - 58760720 + 59478672 0 15/7/2005 wbTextCtrlProxy @@ -9662,14 +9659,14 @@ Your account key will be emailed to you. wxWizardPage: ID_ACCOUNTINFOPAGE - 58875664 + 59594864 dialog-control-document panel 0 1 0 - 58136496 + 58861088 0 21/6/2005 wbWizardPageProxy @@ -9710,14 +9707,14 @@ Your account key will be emailed to you. wxBoxSizer V - 58688112 + 59479088 dialog-control-document sizer 0 1 0 - 58875664 + 59594864 0 21/6/2005 wbBoxSizerProxy @@ -9737,14 +9734,14 @@ Your account key will be emailed to you. <Any platform> wxStaticText: wxID_STATIC - 58886208 + 59607104 dialog-control-document statictext 0 1 0 - 58688112 + 59479088 0 21/6/2005 wbStaticTextProxy @@ -9794,14 +9791,14 @@ Your account key will be emailed to you. wxStaticText: wxID_STATIC - 58906432 + 59627328 dialog-control-document statictext 0 1 0 - 58688112 + 59479088 0 21/6/2005 wbStaticTextProxy @@ -9851,14 +9848,14 @@ Your account key will be emailed to you. Spacer - 58926832 + 59647728 dialog-control-document spacer 0 1 0 - 58688112 + 59479088 0 21/6/2005 wbSpacerProxy @@ -9879,14 +9876,14 @@ Your account key will be emailed to you. wxFlexGridSizer - 58935856 + 59656720 dialog-control-document sizer 0 1 0 - 58688112 + 59479088 0 21/6/2005 wbFlexGridSizerProxy @@ -9911,14 +9908,14 @@ Your account key will be emailed to you. FALSE wxRadioButton: ID_ACCOUNTCREATECTRL - 58948400 + 59669264 dialog-control-document radiobutton 0 1 0 - 58935856 + 59656720 0 21/6/2005 wbRadioButtonProxy @@ -9962,14 +9959,14 @@ Your account key will be emailed to you. wxRadioButton: ID_ACCOUNTUSEEXISTINGCTRL - 58959072 + 59679456 dialog-control-document radiobutton 0 1 0 - 58935856 + 59656720 0 21/6/2005 wbRadioButtonProxy @@ -10014,14 +10011,14 @@ Your account key will be emailed to you. wxFlexGridSizer - 58960544 + 59680992 dialog-control-document sizer 0 1 0 - 58688112 + 59479088 0 21/6/2005 wbFlexGridSizerProxy @@ -10046,14 +10043,14 @@ Your account key will be emailed to you. FALSE wxStaticText: ID_ACCOUNTEMAILADDRESSSTATICCTRL - 58986256 + 59706816 dialog-control-document statictext 0 1 0 - 58960544 + 59680992 0 21/6/2005 wbStaticTextProxy @@ -10103,14 +10100,14 @@ Your account key will be emailed to you. wxTextCtrl: ID_ACCOUNTEMAILADDRESSCTRL - 59004256 + 59725120 dialog-control-document textctrl 0 1 0 - 58960544 + 59680992 0 21/6/2005 wbTextCtrlProxy @@ -10171,14 +10168,14 @@ Your account key will be emailed to you. wxStaticText: ID_ACCOUNTPASSWORDSTATICCTRL - 59029920 + 59750016 dialog-control-document statictext 0 1 0 - 58960544 + 59680992 0 21/6/2005 wbStaticTextProxy @@ -10228,14 +10225,14 @@ Your account key will be emailed to you. wxTextCtrl: ID_ACCOUNTPASSWORDCTRL - 59023520 + 59707152 dialog-control-document textctrl 0 1 0 - 58960544 + 59680992 0 21/6/2005 wbTextCtrlProxy @@ -10296,14 +10293,14 @@ Your account key will be emailed to you. wxStaticText: ID_ACCOUNTCONFIRMPASSWORDSTATICCTRL - 59071392 + 59792064 dialog-control-document statictext 0 1 0 - 58960544 + 59680992 0 21/6/2005 wbStaticTextProxy @@ -10353,14 +10350,14 @@ Your account key will be emailed to you. wxTextCtrl: ID_ACCOUNTCONFIRMPASSWORDCTRL - 59091840 + 59812352 dialog-control-document textctrl 0 1 0 - 58960544 + 59680992 0 21/6/2005 wbTextCtrlProxy @@ -10424,14 +10421,14 @@ Your account key will be emailed to you. wxWizardPage: ID_ATTACHPROJECTPAGE - 59087200 + 59807664 dialog-control-document panel 0 1 0 - 58136496 + 58861088 0 27/6/2005 wbWizardPageProxy @@ -10468,14 +10465,14 @@ Your account key will be emailed to you. wxBoxSizer V - 59066352 + 59786224 dialog-control-document sizer 0 1 0 - 59087200 + 59807664 0 27/6/2005 wbBoxSizerProxy @@ -10495,14 +10492,14 @@ Your account key will be emailed to you. <Any platform> wxStaticText: wxID_STATIC - 59124320 + 59844000 dialog-control-document statictext 0 1 0 - 59066352 + 59786224 0 27/6/2005 wbStaticTextProxy @@ -10552,14 +10549,14 @@ Your account key will be emailed to you. Spacer - 59119904 + 59844912 dialog-control-document spacer 0 1 0 - 59066352 + 59786224 0 15/7/2005 wbSpacerProxy @@ -10580,14 +10577,14 @@ Your account key will be emailed to you. wxFlexGridSizer - 59150096 + 59874992 dialog-control-document sizer 0 1 0 - 59066352 + 59786224 0 15/7/2005 wbFlexGridSizerProxy @@ -10612,14 +10609,14 @@ Your account key will be emailed to you. FALSE Spacer - 59155840 + 59880928 dialog-control-document spacer 0 1 0 - 59150096 + 59874992 0 15/7/2005 wbSpacerProxy @@ -10640,14 +10637,14 @@ Your account key will be emailed to you. wxStaticBitmap: ID_ATTACHPROJECTPROGRESS - 59163600 + 59888704 dialog-control-document staticbitmap 0 1 0 - 59150096 + 59874992 0 15/7/2005 wbStaticBitmapProxy @@ -10691,14 +10688,14 @@ Your account key will be emailed to you. Spacer - 59185024 + 59905744 dialog-control-document spacer 0 1 0 - 59150096 + 59874992 0 15/7/2005 wbSpacerProxy @@ -10722,14 +10719,14 @@ Your account key will be emailed to you. wxWizardPage: ID_COMPLETIONPAGE - 59193168 + 59913856 dialog-control-document panel 0 1 0 - 58136496 + 58861088 0 24/6/2005 wbWizardPageProxy @@ -10767,14 +10764,14 @@ Your account key will be emailed to you. wxBoxSizer V - 59211376 + 59932208 dialog-control-document sizer 0 1 0 - 59193168 + 59913856 0 27/6/2005 wbBoxSizerProxy @@ -10794,14 +10791,14 @@ Your account key will be emailed to you. <Any platform> wxStaticText: wxID_STATIC - 59156112 + 59881280 dialog-control-document statictext 0 1 0 - 59211376 + 59932208 0 27/6/2005 wbStaticTextProxy @@ -10851,14 +10848,14 @@ Your account key will be emailed to you. wxStaticText: wxID_STATIC - 59231680 + 59949808 dialog-control-document statictext 0 1 0 - 59211376 + 59932208 0 27/6/2005 wbStaticTextProxy @@ -10908,14 +10905,14 @@ Your account key will be emailed to you. Spacer - 59225024 + 59951136 dialog-control-document spacer 0 1 0 - 59211376 + 59932208 0 27/6/2005 wbSpacerProxy @@ -10936,14 +10933,14 @@ Your account key will be emailed to you. wxStaticText: wxID_STATIC - 59250016 + 59969968 dialog-control-document statictext 0 1 0 - 59211376 + 59932208 0 10/7/2005 wbStaticTextProxy @@ -10951,11 +10948,8 @@ Your account key will be emailed to you. 5105 wxStaticText - When you click Finish, your web browser will go to a page - - - -where you can set your account name and preferences. + When you click Finish, your web browser will go to a page where +you can set your account name and preferences. @@ -10999,14 +10993,14 @@ where you can set your account name and preferences. wxWizardPage: ID_COMPLETIONERRORPAGE - 59245472 + 59972624 dialog-control-document panel 0 1 0 - 58136496 + 58861088 0 10/7/2005 wbWizardPageProxy @@ -11043,14 +11037,14 @@ where you can set your account name and preferences. wxBoxSizer V - 59156448 + 60001808 dialog-control-document sizer 0 1 0 - 59245472 + 59972624 0 10/7/2005 wbBoxSizerProxy @@ -11070,14 +11064,14 @@ where you can set your account name and preferences. <Any platform> wxStaticText: wxID_STATIC - 59286192 + 60006640 dialog-control-document statictext 0 1 0 - 59156448 + 60001808 0 10/7/2005 wbStaticTextProxy @@ -11127,14 +11121,14 @@ where you can set your account name and preferences. Spacer - 59287232 + 60010256 dialog-control-document spacer 0 1 0 - 59156448 + 60001808 0 10/7/2005 wbSpacerProxy @@ -11155,14 +11149,14 @@ where you can set your account name and preferences. wxStaticText: wxID_STATIC - 59315552 + 60035728 dialog-control-document statictext 0 1 0 - 59156448 + 60001808 0 10/7/2005 wbStaticTextProxy @@ -11214,14 +11208,14 @@ where you can set your account name and preferences. wxWizardPage: ID_ERRPROJECTNOTDETECTEDPAGE - 59311008 + 60038384 dialog-control-document panel 0 1 0 - 58136496 + 58861088 0 9/7/2005 wbWizardPageProxy @@ -11258,14 +11252,14 @@ where you can set your account name and preferences. wxBoxSizer V - 59282080 + 60002368 dialog-control-document sizer 0 1 0 - 59311008 + 60038384 0 9/7/2005 wbBoxSizerProxy @@ -11285,14 +11279,14 @@ where you can set your account name and preferences. <Any platform> wxStaticText: wxID_STATIC - 59352992 + 60073376 dialog-control-document statictext 0 1 0 - 59282080 + 60002368 0 9/7/2005 wbStaticTextProxy @@ -11342,14 +11336,14 @@ where you can set your account name and preferences. Spacer - 59353744 + 60074288 dialog-control-document spacer 0 1 0 - 59282080 + 60002368 0 9/7/2005 wbSpacerProxy @@ -11370,14 +11364,14 @@ where you can set your account name and preferences. wxStaticText: wxID_STATIC - 59377728 + 60102432 dialog-control-document statictext 0 1 0 - 59282080 + 60002368 0 9/7/2005 wbStaticTextProxy @@ -11427,14 +11421,14 @@ where you can set your account name and preferences. wxStaticText: wxID_STATIC - 59397920 + 60096528 dialog-control-document statictext 0 1 0 - 59282080 + 60002368 0 9/7/2005 wbStaticTextProxy @@ -11486,14 +11480,14 @@ where you can set your account name and preferences. wxWizardPage: ID_ERRPROJECTUNAVAILABLEPAGE - 59418592 + 60138368 dialog-control-document panel 0 1 0 - 58136496 + 58861088 0 24/6/2005 wbWizardPageProxy @@ -11530,14 +11524,14 @@ where you can set your account name and preferences. wxBoxSizer V - 59436816 + 60156672 dialog-control-document sizer 0 1 0 - 59418592 + 60138368 0 27/6/2005 wbBoxSizerProxy @@ -11557,14 +11551,14 @@ where you can set your account name and preferences. <Any platform> wxStaticText: wxID_STATIC - 59311584 + 60031760 dialog-control-document statictext 0 1 0 - 59436816 + 60156672 0 27/6/2005 wbStaticTextProxy @@ -11614,14 +11608,14 @@ where you can set your account name and preferences. Spacer - 59457040 + 60176832 dialog-control-document spacer 0 1 0 - 59436816 + 60156672 0 27/6/2005 wbSpacerProxy @@ -11642,14 +11636,14 @@ where you can set your account name and preferences. wxStaticText: wxID_STATIC - 59464064 + 60183888 dialog-control-document statictext 0 1 0 - 59436816 + 60156672 0 1/7/2005 wbStaticTextProxy @@ -11659,8 +11653,6 @@ where you can set your account name and preferences. The project is currently unavailable. - - Please try again later. @@ -11705,14 +11697,14 @@ Please try again later. wxWizardPage: ID_ERRNOINTERNETCONNECTIONPAGE - 59484656 + 60206640 dialog-control-document panel 0 1 0 - 58136496 + 58861088 0 24/6/2005 wbWizardPageProxy @@ -11749,14 +11741,14 @@ Please try again later. wxBoxSizer V - 59494800 + 60216784 dialog-control-document sizer 0 1 0 - 59484656 + 60206640 0 27/6/2005 wbBoxSizerProxy @@ -11776,14 +11768,14 @@ Please try again later. <Any platform> wxStaticText: wxID_STATIC - 59420096 + 60156928 dialog-control-document statictext 0 1 0 - 59494800 + 60216784 0 27/6/2005 wbStaticTextProxy @@ -11833,14 +11825,14 @@ Please try again later. Spacer - 59522384 + 60236144 dialog-control-document spacer 0 1 0 - 59494800 + 60216784 0 11/7/2005 wbSpacerProxy @@ -11861,14 +11853,14 @@ Please try again later. wxStaticText: wxID_STATIC - 59529376 + 60251328 dialog-control-document statictext 0 1 0 - 59494800 + 60216784 0 27/6/2005 wbStaticTextProxy @@ -11920,14 +11912,14 @@ Please try again later. wxWizardPage: ID_ERRACCOUNTNOTFOUNDPAGE - 59551504 + 60264976 dialog-control-document panel 0 1 0 - 58136496 + 58861088 0 16/7/2005 wbWizardPageProxy @@ -11964,14 +11956,14 @@ Please try again later. wxBoxSizer V - 59561664 + 60283296 dialog-control-document sizer 0 1 0 - 59551504 + 60264976 0 16/7/2005 wbBoxSizerProxy @@ -11991,14 +11983,14 @@ Please try again later. <Any platform> wxStaticText: wxID_STATIC - 59495072 + 60217056 dialog-control-document statictext 0 1 0 - 59561664 + 60283296 0 16/7/2005 wbStaticTextProxy @@ -12048,14 +12040,14 @@ Please try again later. Spacer - 59581584 + 60303232 dialog-control-document spacer 0 1 0 - 59561664 + 60283296 0 16/7/2005 wbSpacerProxy @@ -12076,14 +12068,14 @@ Please try again later. wxStaticText: wxID_STATIC - 59588624 + 60310304 dialog-control-document statictext 0 1 0 - 59561664 + 60283296 0 16/7/2005 wbStaticTextProxy @@ -12135,14 +12127,14 @@ Please try again later. wxWizardPage: ID_ERRACCOUNTALREADYEXISTSPAGE - 59610304 + 60331648 dialog-control-document panel 0 1 0 - 58136496 + 58861088 0 24/6/2005 wbWizardPageProxy @@ -12179,14 +12171,14 @@ Please try again later. wxBoxSizer V - 59628672 + 60350032 dialog-control-document sizer 0 1 0 - 59610304 + 60331648 0 27/6/2005 wbBoxSizerProxy @@ -12206,14 +12198,14 @@ Please try again later. <Any platform> wxStaticText: wxID_STATIC - 59633680 + 60355024 dialog-control-document statictext 0 1 0 - 59628672 + 60350032 0 27/6/2005 wbStaticTextProxy @@ -12263,14 +12255,14 @@ Please try again later. Spacer - 59648144 + 60369792 dialog-control-document spacer 0 1 0 - 59628672 + 60350032 0 11/7/2005 wbSpacerProxy @@ -12291,14 +12283,14 @@ Please try again later. wxStaticText: wxID_STATIC - 59655152 + 60376864 dialog-control-document statictext 0 1 0 - 59628672 + 60350032 0 27/6/2005 wbStaticTextProxy @@ -12306,19 +12298,10 @@ Please try again later. 5105 wxStaticText - An account with that email address already exists + An account with that email address already exists and has a +different password than the one you entered. - - -and has a different password than the one you entered. - - - -Please visit the project's web site and follow - - - -the instructions there. +Please visit the project's web site and follow the instructions there. @@ -12362,14 +12345,14 @@ the instructions there. wxWizardPage: ID_ERRACCOUNTCREATIONDISABLEDPAGE - 59676848 + 60370400 dialog-control-document panel 0 1 0 - 58136496 + 58861088 0 29/6/2005 wbWizardPageProxy @@ -12406,14 +12389,14 @@ the instructions there. wxBoxSizer V - 59687024 + 60396112 dialog-control-document sizer 0 1 0 - 59676848 + 60370400 0 29/6/2005 wbBoxSizerProxy @@ -12433,14 +12416,14 @@ the instructions there. <Any platform> wxStaticText: wxID_STATIC - 59700208 + 60409248 dialog-control-document statictext 0 1 0 - 59687024 + 60396112 0 29/6/2005 wbStaticTextProxy @@ -12490,14 +12473,14 @@ the instructions there. Spacer - 59714432 + 60428704 dialog-control-document spacer 0 1 0 - 59687024 + 60396112 0 11/7/2005 wbSpacerProxy @@ -12518,14 +12501,14 @@ the instructions there. wxStaticText: wxID_STATIC - 59721504 + 60443904 dialog-control-document statictext 0 1 0 - 59687024 + 60396112 0 29/6/2005 wbStaticTextProxy @@ -12577,14 +12560,14 @@ the instructions there. wxWizardPage: ID_ERRPROXYINFOPAGE - 59715040 + 60403824 dialog-control-document panel 0 1 0 - 58136496 + 58861088 0 27/6/2005 wbWizardPageProxy @@ -12621,14 +12604,14 @@ the instructions there. wxBoxSizer V - 59740752 + 60462016 dialog-control-document sizer 0 1 0 - 59715040 + 60403824 0 27/6/2005 wbBoxSizerProxy @@ -12648,14 +12631,14 @@ the instructions there. <Any platform> wxStaticText: wxID_STATIC - 59753888 + 60475136 dialog-control-document statictext 0 1 0 - 59740752 + 60462016 0 27/6/2005 wbStaticTextProxy @@ -12704,15 +12687,43 @@ the instructions there. + Spacer + 46607072 + dialog-control-document + + spacer + 0 + 1 + 0 + 60462016 + 0 + 25/7/2005 + wbSpacerProxy + 5 + 5 + Left + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + <Any platform> + + wxStaticText: wxID_STATIC - 59779296 + 60500384 dialog-control-document statictext 0 1 0 - 59740752 + 60462016 0 27/6/2005 wbStaticTextProxy @@ -12720,25 +12731,11 @@ the instructions there. 5105 wxStaticText - We were unable to communicate with the project - - - -or other web sites. - - - -Often this means that you are using a proxy server, - - - -and you need to tell us about it. - - - - - + We were unable to communicate with the project or other web +sites. +Often this means that you are using a proxy server, and you need +to tell us about it. Click Next to do proxy configuration. @@ -12780,16 +12777,16 @@ Click Next to do proxy configuration. - + Spacer - 59780048 + 60514400 dialog-control-document spacer 0 1 0 - 59740752 + 60462016 0 27/6/2005 wbSpacerProxy @@ -12810,16 +12807,16 @@ Click Next to do proxy configuration. - + wxWizardPage: ID_ERRPROXYHTTPPAGE - 59754928 + 60397568 dialog-control-document panel 0 1 0 - 58136496 + 58861088 0 27/6/2005 wbWizardPageProxy @@ -12858,16 +12855,16 @@ Click Next to do proxy configuration. -1 - + wxBoxSizer V - 59806400 + 60528768 dialog-control-document sizer 0 1 0 - 59754928 + 60397568 0 27/6/2005 wbBoxSizerProxy @@ -12885,16 +12882,16 @@ Click Next to do proxy configuration. FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 59819552 + 60541984 dialog-control-document statictext 0 1 0 - 59806400 + 60528768 0 27/6/2005 wbStaticTextProxy @@ -12942,16 +12939,44 @@ Click Next to do proxy configuration. - + + Spacer + 46646352 + dialog-control-document + + spacer + 0 + 1 + 0 + 60528768 + 0 + 25/7/2005 + wbSpacerProxy + 5 + 5 + Left + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + <Any platform> + + wxStaticText: wxID_STATIC - 59845344 + 60566944 dialog-control-document statictext 0 1 0 - 59806400 + 60528768 0 27/6/2005 wbStaticTextProxy @@ -12961,8 +12986,6 @@ Click Next to do proxy configuration. If you're using an HTTP proxy, enter its info here. - - If you're not sure, click Autodetect. @@ -13003,16 +13026,16 @@ If you're not sure, click Autodetect. - + Spacer - 59840832 + 60562496 dialog-control-document spacer 0 1 0 - 59806400 + 60528768 0 27/6/2005 wbSpacerProxy @@ -13031,16 +13054,16 @@ If you're not sure, click Autodetect. FALSE <Any platform> - + wxButton: ID_HTTPAUTODETECT - 59821840 + 60542736 dialog-control-document dialogcontrol 0 1 0 - 59806400 + 60528768 0 27/6/2005 wbButtonProxy @@ -13084,16 +13107,16 @@ If you're not sure, click Autodetect. - + wxFlexGridSizer - 59881504 + 60604112 dialog-control-document sizer 0 1 0 - 59806400 + 60528768 0 27/6/2005 wbFlexGridSizerProxy @@ -13116,16 +13139,16 @@ If you're not sure, click Autodetect. FALSE FALSE FALSE - + wxStaticText: ID_PROXYHTTPSERVERSTATICCTRL - 59893344 + 60615968 dialog-control-document statictext 0 1 0 - 59881504 + 60604112 0 27/6/2005 wbStaticTextProxy @@ -13173,16 +13196,16 @@ If you're not sure, click Autodetect. - + wxFlexGridSizer - 59915280 + 60630240 dialog-control-document sizer 0 1 0 - 59881504 + 60604112 0 27/6/2005 wbFlexGridSizerProxy @@ -13205,16 +13228,16 @@ If you're not sure, click Autodetect. FALSE FALSE FALSE - + wxTextCtrl: ID_PROXYHTTPSERVERCTRL - 59926624 + 60641616 dialog-control-document textctrl 0 1 0 - 59915280 + 60630240 0 27/6/2005 wbTextCtrlProxy @@ -13273,16 +13296,16 @@ If you're not sure, click Autodetect. - + wxStaticText: ID_PROXYHTTPPORTSTATICCTRL - 59952320 + 60667040 dialog-control-document statictext 0 1 0 - 59915280 + 60630240 0 27/6/2005 wbStaticTextProxy @@ -13330,16 +13353,16 @@ If you're not sure, click Autodetect. - + wxTextCtrl: ID_PROXYHTTPPORTCTRL - 59947952 + 60668368 dialog-control-document textctrl 0 1 0 - 59915280 + 60630240 0 27/6/2005 wbTextCtrlProxy @@ -13399,16 +13422,16 @@ If you're not sure, click Autodetect. - + wxStaticText: ID_PROXYHTTPUSERNAMESTATICCTRL - 59993536 + 60709376 dialog-control-document statictext 0 1 0 - 59881504 + 60604112 0 27/6/2005 wbStaticTextProxy @@ -13456,16 +13479,16 @@ If you're not sure, click Autodetect. - + wxTextCtrl: ID_PROXYHTTPUSERNAMECTRL - 60008672 + 60730272 dialog-control-document textctrl 0 1 0 - 59881504 + 60604112 0 27/6/2005 wbTextCtrlProxy @@ -13524,16 +13547,16 @@ If you're not sure, click Autodetect. - + wxStaticText: ID_PROXYHTTPPASSWORDSTATICCTRL - 60002864 + 60724464 dialog-control-document statictext 0 1 0 - 59881504 + 60604112 0 27/6/2005 wbStaticTextProxy @@ -13581,16 +13604,16 @@ If you're not sure, click Autodetect. - + wxTextCtrl: ID_PROXYHTTPPASSWORDCTRL - 60050144 + 60765408 dialog-control-document textctrl 0 1 0 - 59881504 + 60604112 0 27/6/2005 wbTextCtrlProxy @@ -13652,16 +13675,16 @@ If you're not sure, click Autodetect. - + wxWizardPage: ID_ERRPROXYSOCKSPAGE - 60075280 + 60790176 dialog-control-document panel 0 1 0 - 58136496 + 58861088 0 27/6/2005 wbWizardPageProxy @@ -13700,16 +13723,16 @@ If you're not sure, click Autodetect. -1 - + wxBoxSizer V - 60085344 + 60808432 dialog-control-document sizer 0 1 0 - 60075280 + 60790176 0 27/6/2005 wbBoxSizerProxy @@ -13727,16 +13750,16 @@ If you're not sure, click Autodetect. FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 59741360 + 60813456 dialog-control-document statictext 0 1 0 - 60085344 + 60808432 0 27/6/2005 wbStaticTextProxy @@ -13784,16 +13807,44 @@ If you're not sure, click Autodetect. - + + Spacer + 46629248 + dialog-control-document + + spacer + 0 + 1 + 0 + 60808432 + 0 + 25/7/2005 + wbSpacerProxy + 5 + 5 + Left + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + <Any platform> + + wxStaticText: wxID_STATIC - 60107232 + 60828640 dialog-control-document statictext 0 1 0 - 60085344 + 60808432 0 27/6/2005 wbStaticTextProxy @@ -13803,13 +13854,7 @@ If you're not sure, click Autodetect. If you're using a SOCKS proxy, enter its info here. - - -If you're not sure, click Autodetect. - - - - +If you're not sure, click Autodetect. @@ -13849,16 +13894,16 @@ If you're not sure, click Autodetect. - + Spacer - 60121392 + 60824208 dialog-control-document spacer 0 1 0 - 60085344 + 60808432 0 27/6/2005 wbSpacerProxy @@ -13877,16 +13922,16 @@ If you're not sure, click Autodetect. FALSE <Any platform> - + wxButton: ID_SOCKSAUTODETECT - 60092592 + 60814240 dialog-control-document dialogcontrol 0 1 0 - 60085344 + 60808432 0 27/6/2005 wbButtonProxy @@ -13930,16 +13975,16 @@ If you're not sure, click Autodetect. - + wxFlexGridSizer - 60142160 + 60863488 dialog-control-document sizer 0 1 0 - 60085344 + 60808432 0 27/6/2005 wbFlexGridSizerProxy @@ -13962,16 +14007,16 @@ If you're not sure, click Autodetect. FALSE FALSE FALSE - + wxStaticText: ID_PROXYSOCKSSERVERSTATICCTRL - 60154016 + 60875344 dialog-control-document statictext 0 1 0 - 60142160 + 60863488 0 27/6/2005 wbStaticTextProxy @@ -14019,16 +14064,16 @@ If you're not sure, click Autodetect. - + wxFlexGridSizer - 60176640 + 60891712 dialog-control-document sizer 0 1 0 - 60142160 + 60863488 0 27/6/2005 wbFlexGridSizerProxy @@ -14051,16 +14096,16 @@ If you're not sure, click Autodetect. FALSE FALSE FALSE - + wxTextCtrl: ID_PROXYSOCKSSERVERCTRL - 60188032 + 60911216 dialog-control-document textctrl 0 1 0 - 60176640 + 60891712 0 27/6/2005 wbTextCtrlProxy @@ -14119,16 +14164,16 @@ If you're not sure, click Autodetect. - + wxStaticText: ID_PROXYSOCKSPORTSTATICCTRL - 60213824 + 60928624 dialog-control-document statictext 0 1 0 - 60176640 + 60891712 0 27/6/2005 wbStaticTextProxy @@ -14176,16 +14221,16 @@ If you're not sure, click Autodetect. - + wxTextCtrl: ID_PROXYSOCKSPORTCTRL - 60208304 + 60928992 dialog-control-document textctrl 0 1 0 - 60176640 + 60891712 0 27/6/2005 wbTextCtrlProxy @@ -14245,16 +14290,16 @@ If you're not sure, click Autodetect. - + wxStaticText: ID_PROXYSOCKSUSERNAMESTATICCTRL - 60255200 + 60969456 dialog-control-document statictext 0 1 0 - 60142160 + 60863488 0 27/6/2005 wbStaticTextProxy @@ -14302,16 +14347,16 @@ If you're not sure, click Autodetect. - + wxTextCtrl: ID_PROXYSOCKSUSERNAMECTRL - 60270816 + 60991456 dialog-control-document textctrl 0 1 0 - 60142160 + 60863488 0 27/6/2005 wbTextCtrlProxy @@ -14370,16 +14415,16 @@ If you're not sure, click Autodetect. - + wxStaticText: ID_PROXYSOCKSPASSWORDSTATICCTRL - 60265008 + 60992736 dialog-control-document statictext 0 1 0 - 60142160 + 60863488 0 27/6/2005 wbStaticTextProxy @@ -14427,16 +14472,16 @@ If you're not sure, click Autodetect. - + wxTextCtrl: ID_PROXYSOCKSPASSWORDCTRL - 60312064 + 61032800 dialog-control-document textctrl 0 1 0 - 60142160 + 60863488 0 27/6/2005 wbTextCtrlProxy @@ -14498,16 +14543,16 @@ If you're not sure, click Autodetect. - + wxWizardPage: ID_ERRPROXYCOMPLETIONPAGE - 60337168 + 61056832 dialog-control-document panel 0 1 0 - 58136496 + 58861088 0 27/6/2005 wbWizardPageProxy @@ -14542,16 +14587,16 @@ If you're not sure, click Autodetect. -1 - + wxBoxSizer V - 60347312 + 61075056 dialog-control-document sizer 0 1 0 - 60337168 + 61056832 0 27/6/2005 wbBoxSizerProxy @@ -14569,16 +14614,16 @@ If you're not sure, click Autodetect. FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 60312800 + 61034000 dialog-control-document statictext 0 1 0 - 60347312 + 61075056 0 27/6/2005 wbStaticTextProxy @@ -14626,16 +14671,16 @@ If you're not sure, click Autodetect. - + wxStaticText: wxID_STATIC - 60368288 + 61087840 dialog-control-document statictext 0 1 0 - 60347312 + 61075056 0 27/6/2005 wbStaticTextProxy @@ -14683,16 +14728,16 @@ If you're not sure, click Autodetect. - + Spacer - 60369104 + 61091248 dialog-control-document spacer 0 1 0 - 60347312 + 61075056 0 27/6/2005 wbSpacerProxy @@ -14713,16 +14758,16 @@ If you're not sure, click Autodetect. - + wxWizardPage: ID_ERRREFCOUNTPAGE - 60331616 + 61068656 dialog-control-document panel 0 1 0 - 58136496 + 58861088 0 9/7/2005 wbWizardPageProxy @@ -14755,16 +14800,16 @@ If you're not sure, click Autodetect. -1 - + wxBoxSizer V - 60402560 + 61121760 dialog-control-document sizer 0 1 0 - 60331616 + 61068656 0 9/7/2005 wbBoxSizerProxy @@ -14782,16 +14827,16 @@ If you're not sure, click Autodetect. FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 60407872 + 61134912 dialog-control-document statictext 0 1 0 - 60402560 + 61121760 0 9/7/2005 wbStaticTextProxy @@ -14839,16 +14884,16 @@ If you're not sure, click Autodetect. - + wxStaticText: wxID_STATIC - 60433664 + 61160384 dialog-control-document statictext 0 1 0 - 60402560 + 61121760 0 9/7/2005 wbStaticTextProxy @@ -14896,16 +14941,16 @@ If you're not sure, click Autodetect. - + Spacer - 60435792 + 61155984 dialog-control-document spacer 0 1 0 - 60402560 + 61121760 0 9/7/2005 wbSpacerProxy @@ -14924,16 +14969,16 @@ If you're not sure, click Autodetect. FALSE <Any platform> - + wxStaticText: wxID_STATIC - 60436240 + 61156240 dialog-control-document statictext 0 1 0 - 60402560 + 61121760 0 9/7/2005 wbStaticTextProxy @@ -14942,13 +14987,6 @@ If you're not sure, click Autodetect. wxStaticText This page just increases the refcount of various bitmap resources - - - - - - - so that DialogBlocks doesn't nuke the refences to them. @@ -14989,16 +15027,16 @@ so that DialogBlocks doesn't nuke the refences to them. - + wxBoxSizer V - 60475776 + 61195584 dialog-control-document sizer 0 1 0 - 60402560 + 61121760 0 15/7/2005 wbBoxSizerProxy @@ -15016,16 +15054,16 @@ so that DialogBlocks doesn't nuke the refences to them. FALSE FALSE <Any platform> - + wxStaticBitmap: wxID_STATIC - 60489488 + 61209488 dialog-control-document staticbitmap 0 1 0 - 60475776 + 61195584 0 15/7/2005 wbStaticBitmapProxy @@ -15067,16 +15105,16 @@ so that DialogBlocks doesn't nuke the refences to them. - + wxStaticBitmap: wxID_STATIC - 60498224 + 61226416 dialog-control-document staticbitmap 0 1 0 - 60475776 + 61195584 0 15/7/2005 wbStaticBitmapProxy @@ -15118,16 +15156,16 @@ so that DialogBlocks doesn't nuke the refences to them. - + wxStaticBitmap: wxID_STATIC - 60515248 + 61219088 dialog-control-document staticbitmap 0 1 0 - 60475776 + 61195584 0 15/7/2005 wbStaticBitmapProxy @@ -15169,16 +15207,16 @@ so that DialogBlocks doesn't nuke the refences to them. - + wxStaticBitmap: wxID_STATIC - 60532288 + 61252144 dialog-control-document staticbitmap 0 1 0 - 60475776 + 61195584 0 15/7/2005 wbStaticBitmapProxy @@ -15220,16 +15258,16 @@ so that DialogBlocks doesn't nuke the refences to them. - + wxStaticBitmap: wxID_STATIC - 60549328 + 61269184 dialog-control-document staticbitmap 0 1 0 - 60475776 + 61195584 0 15/7/2005 wbStaticBitmapProxy @@ -15271,16 +15309,16 @@ so that DialogBlocks doesn't nuke the refences to them. - + wxStaticBitmap: wxID_STATIC - 60565904 + 61286128 dialog-control-document staticbitmap 0 1 0 - 60475776 + 61195584 0 15/7/2005 wbStaticBitmapProxy @@ -15322,16 +15360,16 @@ so that DialogBlocks doesn't nuke the refences to them. - + wxStaticBitmap: wxID_STATIC - 60582944 + 61303136 dialog-control-document staticbitmap 0 1 0 - 60475776 + 61195584 0 15/7/2005 wbStaticBitmapProxy @@ -15373,16 +15411,16 @@ so that DialogBlocks doesn't nuke the refences to them. - + wxStaticBitmap: wxID_STATIC - 60599760 + 61319568 dialog-control-document staticbitmap 0 1 0 - 60475776 + 61195584 0 16/7/2005 wbStaticBitmapProxy @@ -15424,16 +15462,16 @@ so that DialogBlocks doesn't nuke the refences to them. - + wxStaticBitmap: wxID_STATIC - 60592352 + 61336608 dialog-control-document staticbitmap 0 1 0 - 60475776 + 61195584 0 15/7/2005 wbStaticBitmapProxy @@ -15475,16 +15513,16 @@ so that DialogBlocks doesn't nuke the refences to them. - + wxStaticBitmap: wxID_STATIC - 60625312 + 61353424 dialog-control-document staticbitmap 0 1 0 - 60475776 + 61195584 0 15/7/2005 wbStaticBitmapProxy @@ -15526,16 +15564,16 @@ so that DialogBlocks doesn't nuke the refences to them. - + wxStaticBitmap: wxID_STATIC - 60642352 + 61346016 dialog-control-document staticbitmap 0 1 0 - 60475776 + 61195584 0 15/7/2005 wbStaticBitmapProxy @@ -15577,16 +15615,16 @@ so that DialogBlocks doesn't nuke the refences to them. - + wxStaticBitmap: wxID_STATIC - 60658816 + 61378976 dialog-control-document staticbitmap 0 1 0 - 60475776 + 61195584 0 15/7/2005 wbStaticBitmapProxy @@ -15633,390 +15671,390 @@ so that DialogBlocks doesn't nuke the refences to them. - + Images - 60653712 + 61382048 html-document bitmapsfolder 1 1 0 - 14628560 + 14628816 1 - + boincsm.xpm - 60660800 + 61380928 image-document res/boincsm.xpm image 0 0 0 - 60653712 + 61382048 0 1/3/2005 100 - + boinc.xpm - 60660592 + 61380720 image-document res/boinc.xpm image 0 0 0 - 60653712 + 61382048 0 21/6/2005 100 - + boinc_mac.xpm - 60660384 + 61380512 image-document res/boinc_mac.xpm image 0 0 0 - 60653712 + 61382048 0 21/6/2005 100 - + BOINCGUIApp.xpm - 60660176 + 61380304 image-document res/BOINCGUIApp.xpm image 0 0 0 - 60653712 + 61382048 0 21/6/2005 100 - + connect.xpm - 60659968 + 61380048 image-document res/connect.xpm image 0 0 0 - 60653712 + 61382048 0 21/6/2005 100 - + disconnect.xpm - 60659760 + 61379840 image-document res/disconnect.xpm image 0 0 0 - 60653712 + 61382048 0 21/6/2005 100 - + mess.xpm - 60659552 + 61381632 image-document res/mess.xpm image 0 0 0 - 60653712 + 61382048 0 21/6/2005 100 - + proj.xpm - 60661392 + 61379408 image-document res/proj.xpm image 0 0 0 - 60653712 + 61382048 0 21/6/2005 100 - + result.xpm - 60659136 + 61396112 image-document res/result.xpm image 0 0 0 - 60653712 + 61382048 0 21/6/2005 100 - + usage.xpm - 60675888 + 61395936 image-document res/usage.xpm image 0 0 0 - 60653712 + 61382048 0 21/6/2005 100 - + xfer.xpm - 60675680 + 61395728 image-document res/xfer.xpm image 0 0 0 - 60653712 + 61382048 0 21/6/2005 100 - + attachprojectwizard.xpm - 60675440 + 61395520 image-document res/attachprojectwizard.xpm image 0 0 0 - 60653712 + 61382048 0 21/6/2005 100 - + wizprogress01.xpm - 60675232 + 61395312 image-document res/wizprogress01.xpm image 0 0 0 - 60653712 + 61382048 0 15/7/2005 100 - + wizprogress02.xpm - 60675024 + 61395104 image-document res/wizprogress02.xpm image 0 0 0 - 60653712 + 61382048 0 15/7/2005 100 - + wizprogress03.xpm - 60674816 + 61402992 image-document res/wizprogress03.xpm image 0 0 0 - 60653712 + 61382048 0 15/7/2005 100 - + wizprogress04.xpm - 60674608 + 61402848 image-document res/wizprogress04.xpm image 0 0 0 - 60653712 + 61382048 0 15/7/2005 100 - + wizprogress05.xpm - 60674400 + 61402640 image-document res/wizprogress05.xpm image 0 0 0 - 60653712 + 61382048 0 15/7/2005 100 - + wizprogress06.xpm - 60674192 + 61402432 image-document res/wizprogress06.xpm image 0 0 0 - 60653712 + 61382048 0 15/7/2005 100 - + wizprogress07.xpm - 60682096 + 61402224 image-document res/wizprogress07.xpm image 0 0 0 - 60653712 + 61382048 0 15/7/2005 100 - + wizprogress08.xpm - 60681952 + 61402016 image-document res/wizprogress08.xpm image 0 0 0 - 60653712 + 61382048 0 15/7/2005 100 - + wizprogress09.xpm - 60681744 + 61401760 image-document res/wizprogress09.xpm image 0 0 0 - 60653712 + 61382048 0 15/7/2005 100 - + wizprogress10.xpm - 60681488 + 61401616 image-document res/wizprogress10.xpm image 0 0 0 - 60653712 + 61382048 0 15/7/2005 100 - + wizprogress11.xpm - 60681344 + 61401472 image-document res/wizprogress11.xpm image 0 0 0 - 60653712 + 61382048 0 15/7/2005 100 - + wizprogress12.xpm - 60681200 + 61401296 image-document res/wizprogress12.xpm image 0 0 0 - 60653712 + 61382048 0 15/7/2005 100 - + Sources - 60654192 + 61382528 html-document sourcesfolder 1 1 0 - 14628560 + 14628816 1 10/2/2005 - + ValidateAccountKey.cpp - 60680672 + 61400736 source-editor-document ValidateAccountKey.cpp source-editor 0 0 1 - 60654192 + 61382528 0 29/2/2005 - + ValidateURL.cpp - 60680464 + 61400528 source-editor-document ValidateURL.cpp source-editor 0 0 1 - 60654192 + 61382528 0 29/2/2005 diff --git a/clientgui/WizAttachProject.cpp b/clientgui/WizAttachProject.cpp index 3d09827da8..e44230dda9 100644 --- a/clientgui/WizAttachProject.cpp +++ b/clientgui/WizAttachProject.cpp @@ -1652,7 +1652,7 @@ void CAccountKeyPage::CreateControls() itemBoxSizer43->Add(itemStaticText46, 0, wxALIGN_LEFT|wxALL, 5); wxStaticText* itemStaticText47 = new wxStaticText; - itemStaticText47->Create( itemWizardPage42, wxID_STATIC, _("Go to the project's web site to create an account.\n\nYour account key will be emailed to you."), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText47->Create( itemWizardPage42, wxID_STATIC, _("Go to the project's web site to create an account. Your account\nkey will be emailed to you."), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer43->Add(itemStaticText47, 0, wxALIGN_LEFT|wxALL, 5); wxStaticText* itemStaticText48 = new wxStaticText; @@ -2597,7 +2597,7 @@ void CCompletionPage::CreateControls() itemBoxSizer78->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); wxStaticText* itemStaticText82 = new wxStaticText; - itemStaticText82->Create( itemWizardPage77, wxID_STATIC, _("When you click Finish, your web browser will go to a page\n\nwhere you can set your account name and preferences."), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText82->Create( itemWizardPage77, wxID_STATIC, _("When you click Finish, your web browser will go to a page where\nyou can set your account name and preferences."), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer78->Add(itemStaticText82, 0, wxALIGN_LEFT|wxALL, 5); ////@end CCompletionPage content construction @@ -3497,7 +3497,7 @@ void CErrAccountAlreadyExistsPage::CreateControls() itemBoxSizer110->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); wxStaticText* itemStaticText113 = new wxStaticText; - itemStaticText113->Create( itemWizardPage109, wxID_STATIC, _("An account with that email address already exists\n\nand has a different password than the one you entered.\n\nPlease visit the project's web site and follow\n\nthe instructions there."), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText113->Create( itemWizardPage109, wxID_STATIC, _("An account with that email address already exists and has a\ndifferent password than the one you entered.\n\nPlease visit the project's web site and follow the instructions there."), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer110->Add(itemStaticText113, 0, wxALIGN_LEFT|wxALL, 5); ////@end CErrAccountAlreadyExistsPage content construction @@ -3789,9 +3789,11 @@ void CErrProxyInfoPage::CreateControls() itemStaticText121->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); itemBoxSizer120->Add(itemStaticText121, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText122 = new wxStaticText; - itemStaticText122->Create( itemWizardPage119, wxID_STATIC, _("We were unable to communicate with the project\n\nor other web sites.\n\nOften this means that you are using a proxy server,\n\nand you need to tell us about it.\n\n\n\nClick Next to do proxy configuration."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer120->Add(itemStaticText122, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer120->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + + wxStaticText* itemStaticText123 = new wxStaticText; + itemStaticText123->Create( itemWizardPage119, wxID_STATIC, _("We were unable to communicate with the project or other web\nsites.\n\nOften this means that you are using a proxy server, and you need\nto tell us about it.\n\nClick Next to do proxy configuration."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer120->Add(itemStaticText123, 0, wxALIGN_LEFT|wxALL, 5); itemBoxSizer120->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); @@ -3943,65 +3945,67 @@ void CErrProxyHTTPPage::CreateControls() { ////@begin CErrProxyHTTPPage content construction - CErrProxyHTTPPage* itemWizardPage124 = this; + CErrProxyHTTPPage* itemWizardPage125 = this; - wxBoxSizer* itemBoxSizer125 = new wxBoxSizer(wxVERTICAL); - itemWizardPage124->SetSizer(itemBoxSizer125); - - wxStaticText* itemStaticText126 = new wxStaticText; - itemStaticText126->Create( itemWizardPage124, wxID_STATIC, _("HTTP proxy"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText126->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer125->Add(itemStaticText126, 0, wxALIGN_LEFT|wxALL, 5); + wxBoxSizer* itemBoxSizer126 = new wxBoxSizer(wxVERTICAL); + itemWizardPage125->SetSizer(itemBoxSizer126); wxStaticText* itemStaticText127 = new wxStaticText; - itemStaticText127->Create( itemWizardPage124, wxID_STATIC, _("If you're using an HTTP proxy, enter its info here.\n\nIf you're not sure, click Autodetect."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer125->Add(itemStaticText127, 0, wxALIGN_LEFT|wxALL, 5); + itemStaticText127->Create( itemWizardPage125, wxID_STATIC, _("HTTP proxy"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText127->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer126->Add(itemStaticText127, 0, wxALIGN_LEFT|wxALL, 5); - itemBoxSizer125->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer126->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - wxButton* itemButton129 = new wxButton; - itemButton129->Create( itemWizardPage124, ID_HTTPAUTODETECT, _("Autodetect"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer125->Add(itemButton129, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + wxStaticText* itemStaticText129 = new wxStaticText; + itemStaticText129->Create( itemWizardPage125, wxID_STATIC, _("If you're using an HTTP proxy, enter its info here.\n\nIf you're not sure, click Autodetect."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer126->Add(itemStaticText129, 0, wxALIGN_LEFT|wxALL, 5); - wxFlexGridSizer* itemFlexGridSizer130 = new wxFlexGridSizer(3, 2, 0, 0); - itemFlexGridSizer130->AddGrowableCol(1); - itemBoxSizer125->Add(itemFlexGridSizer130, 0, wxGROW|wxALL, 5); + itemBoxSizer126->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + + wxButton* itemButton131 = new wxButton; + itemButton131->Create( itemWizardPage125, ID_HTTPAUTODETECT, _("Autodetect"), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer126->Add(itemButton131, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + + wxFlexGridSizer* itemFlexGridSizer132 = new wxFlexGridSizer(3, 2, 0, 0); + itemFlexGridSizer132->AddGrowableCol(1); + itemBoxSizer126->Add(itemFlexGridSizer132, 0, wxGROW|wxALL, 5); m_ProxyHTTPServerStaticCtrl = new wxStaticText; - m_ProxyHTTPServerStaticCtrl->Create( itemWizardPage124, ID_PROXYHTTPSERVERSTATICCTRL, _("Server:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer130->Add(m_ProxyHTTPServerStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxyHTTPServerStaticCtrl->Create( itemWizardPage125, ID_PROXYHTTPSERVERSTATICCTRL, _("Server:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer132->Add(m_ProxyHTTPServerStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxFlexGridSizer* itemFlexGridSizer132 = new wxFlexGridSizer(1, 3, 0, 0); - itemFlexGridSizer132->AddGrowableCol(0); - itemFlexGridSizer130->Add(itemFlexGridSizer132, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0); + wxFlexGridSizer* itemFlexGridSizer134 = new wxFlexGridSizer(1, 3, 0, 0); + itemFlexGridSizer134->AddGrowableCol(0); + itemFlexGridSizer132->Add(itemFlexGridSizer134, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0); m_ProxyHTTPServerCtrl = new wxTextCtrl; - m_ProxyHTTPServerCtrl->Create( itemWizardPage124, ID_PROXYHTTPSERVERCTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer132->Add(m_ProxyHTTPServerCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxyHTTPServerCtrl->Create( itemWizardPage125, ID_PROXYHTTPSERVERCTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer134->Add(m_ProxyHTTPServerCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxyHTTPPortStaticCtrl = new wxStaticText; - m_ProxyHTTPPortStaticCtrl->Create( itemWizardPage124, ID_PROXYHTTPPORTSTATICCTRL, _("Port:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer132->Add(m_ProxyHTTPPortStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxyHTTPPortStaticCtrl->Create( itemWizardPage125, ID_PROXYHTTPPORTSTATICCTRL, _("Port:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer134->Add(m_ProxyHTTPPortStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxyHTTPPortCtrl = new wxTextCtrl; - m_ProxyHTTPPortCtrl->Create( itemWizardPage124, ID_PROXYHTTPPORTCTRL, _T(""), wxDefaultPosition, wxSize(50, -1), 0 ); - itemFlexGridSizer132->Add(m_ProxyHTTPPortCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxyHTTPPortCtrl->Create( itemWizardPage125, ID_PROXYHTTPPORTCTRL, _T(""), wxDefaultPosition, wxSize(50, -1), 0 ); + itemFlexGridSizer134->Add(m_ProxyHTTPPortCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxyHTTPUsernameStaticCtrl = new wxStaticText; - m_ProxyHTTPUsernameStaticCtrl->Create( itemWizardPage124, ID_PROXYHTTPUSERNAMESTATICCTRL, _("User Name:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer130->Add(m_ProxyHTTPUsernameStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxyHTTPUsernameStaticCtrl->Create( itemWizardPage125, ID_PROXYHTTPUSERNAMESTATICCTRL, _("User Name:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer132->Add(m_ProxyHTTPUsernameStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxyHTTPUsernameCtrl = new wxTextCtrl; - m_ProxyHTTPUsernameCtrl->Create( itemWizardPage124, ID_PROXYHTTPUSERNAMECTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer130->Add(m_ProxyHTTPUsernameCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxyHTTPUsernameCtrl->Create( itemWizardPage125, ID_PROXYHTTPUSERNAMECTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer132->Add(m_ProxyHTTPUsernameCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxyHTTPPasswordStaticCtrl = new wxStaticText; - m_ProxyHTTPPasswordStaticCtrl->Create( itemWizardPage124, ID_PROXYHTTPPASSWORDSTATICCTRL, _("Password:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer130->Add(m_ProxyHTTPPasswordStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxyHTTPPasswordStaticCtrl->Create( itemWizardPage125, ID_PROXYHTTPPASSWORDSTATICCTRL, _("Password:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer132->Add(m_ProxyHTTPPasswordStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxyHTTPPasswordCtrl = new wxTextCtrl; - m_ProxyHTTPPasswordCtrl->Create( itemWizardPage124, ID_PROXYHTTPPASSWORDCTRL, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD ); - itemFlexGridSizer130->Add(m_ProxyHTTPPasswordCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxyHTTPPasswordCtrl->Create( itemWizardPage125, ID_PROXYHTTPPASSWORDCTRL, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD ); + itemFlexGridSizer132->Add(m_ProxyHTTPPasswordCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); // Set validators m_ProxyHTTPServerCtrl->SetValidator( wxTextValidator(wxFILTER_NONE, & m_strProxyHTTPServer) ); @@ -4163,65 +4167,67 @@ bool CErrProxySOCKSPage::Create( wxWizard* parent ) void CErrProxySOCKSPage::CreateControls() { ////@begin CErrProxySOCKSPage content construction - CErrProxySOCKSPage* itemWizardPage140 = this; + CErrProxySOCKSPage* itemWizardPage142 = this; - wxBoxSizer* itemBoxSizer141 = new wxBoxSizer(wxVERTICAL); - itemWizardPage140->SetSizer(itemBoxSizer141); + wxBoxSizer* itemBoxSizer143 = new wxBoxSizer(wxVERTICAL); + itemWizardPage142->SetSizer(itemBoxSizer143); - wxStaticText* itemStaticText142 = new wxStaticText; - itemStaticText142->Create( itemWizardPage140, wxID_STATIC, _("SOCKS proxy"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText142->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer141->Add(itemStaticText142, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText144 = new wxStaticText; + itemStaticText144->Create( itemWizardPage142, wxID_STATIC, _("SOCKS proxy"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText144->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer143->Add(itemStaticText144, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText143 = new wxStaticText; - itemStaticText143->Create( itemWizardPage140, wxID_STATIC, _("If you're using a SOCKS proxy, enter its info here.\n\nIf you're not sure, click Autodetect.\n\n"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer141->Add(itemStaticText143, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer143->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - itemBoxSizer141->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText146 = new wxStaticText; + itemStaticText146->Create( itemWizardPage142, wxID_STATIC, _("If you're using a SOCKS proxy, enter its info here.\n\nIf you're not sure, click Autodetect."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer143->Add(itemStaticText146, 0, wxALIGN_LEFT|wxALL, 5); - wxButton* itemButton145 = new wxButton; - itemButton145->Create( itemWizardPage140, ID_SOCKSAUTODETECT, _("Autodetect"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer141->Add(itemButton145, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + itemBoxSizer143->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - wxFlexGridSizer* itemFlexGridSizer146 = new wxFlexGridSizer(3, 2, 0, 0); - itemFlexGridSizer146->AddGrowableCol(1); - itemBoxSizer141->Add(itemFlexGridSizer146, 0, wxGROW|wxALL, 5); + wxButton* itemButton148 = new wxButton; + itemButton148->Create( itemWizardPage142, ID_SOCKSAUTODETECT, _("Autodetect"), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer143->Add(itemButton148, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + + wxFlexGridSizer* itemFlexGridSizer149 = new wxFlexGridSizer(3, 2, 0, 0); + itemFlexGridSizer149->AddGrowableCol(1); + itemBoxSizer143->Add(itemFlexGridSizer149, 0, wxGROW|wxALL, 5); m_ProxySOCKSServerStaticCtrl = new wxStaticText; - m_ProxySOCKSServerStaticCtrl->Create( itemWizardPage140, ID_PROXYSOCKSSERVERSTATICCTRL, _("Server:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer146->Add(m_ProxySOCKSServerStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxySOCKSServerStaticCtrl->Create( itemWizardPage142, ID_PROXYSOCKSSERVERSTATICCTRL, _("Server:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer149->Add(m_ProxySOCKSServerStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxFlexGridSizer* itemFlexGridSizer148 = new wxFlexGridSizer(1, 3, 0, 0); - itemFlexGridSizer148->AddGrowableCol(0); - itemFlexGridSizer146->Add(itemFlexGridSizer148, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0); + wxFlexGridSizer* itemFlexGridSizer151 = new wxFlexGridSizer(1, 3, 0, 0); + itemFlexGridSizer151->AddGrowableCol(0); + itemFlexGridSizer149->Add(itemFlexGridSizer151, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0); m_ProxySOCKSServerCtrl = new wxTextCtrl; - m_ProxySOCKSServerCtrl->Create( itemWizardPage140, ID_PROXYSOCKSSERVERCTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer148->Add(m_ProxySOCKSServerCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxySOCKSServerCtrl->Create( itemWizardPage142, ID_PROXYSOCKSSERVERCTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer151->Add(m_ProxySOCKSServerCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxySOCKSPortStaticCtrl = new wxStaticText; - m_ProxySOCKSPortStaticCtrl->Create( itemWizardPage140, ID_PROXYSOCKSPORTSTATICCTRL, _("Port:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer148->Add(m_ProxySOCKSPortStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxySOCKSPortStaticCtrl->Create( itemWizardPage142, ID_PROXYSOCKSPORTSTATICCTRL, _("Port:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer151->Add(m_ProxySOCKSPortStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxySOCKSPortCtrl = new wxTextCtrl; - m_ProxySOCKSPortCtrl->Create( itemWizardPage140, ID_PROXYSOCKSPORTCTRL, _T(""), wxDefaultPosition, wxSize(50, -1), 0 ); - itemFlexGridSizer148->Add(m_ProxySOCKSPortCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxySOCKSPortCtrl->Create( itemWizardPage142, ID_PROXYSOCKSPORTCTRL, _T(""), wxDefaultPosition, wxSize(50, -1), 0 ); + itemFlexGridSizer151->Add(m_ProxySOCKSPortCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxySOCKSUsernameStaticCtrl = new wxStaticText; - m_ProxySOCKSUsernameStaticCtrl->Create( itemWizardPage140, ID_PROXYSOCKSUSERNAMESTATICCTRL, _("User Name:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer146->Add(m_ProxySOCKSUsernameStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxySOCKSUsernameStaticCtrl->Create( itemWizardPage142, ID_PROXYSOCKSUSERNAMESTATICCTRL, _("User Name:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer149->Add(m_ProxySOCKSUsernameStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxySOCKSUsernameCtrl = new wxTextCtrl; - m_ProxySOCKSUsernameCtrl->Create( itemWizardPage140, ID_PROXYSOCKSUSERNAMECTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer146->Add(m_ProxySOCKSUsernameCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxySOCKSUsernameCtrl->Create( itemWizardPage142, ID_PROXYSOCKSUSERNAMECTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer149->Add(m_ProxySOCKSUsernameCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxySOCKSPasswordStaticCtrl = new wxStaticText; - m_ProxySOCKSPasswordStaticCtrl->Create( itemWizardPage140, ID_PROXYSOCKSPASSWORDSTATICCTRL, _("Password:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer146->Add(m_ProxySOCKSPasswordStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxySOCKSPasswordStaticCtrl->Create( itemWizardPage142, ID_PROXYSOCKSPASSWORDSTATICCTRL, _("Password:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer149->Add(m_ProxySOCKSPasswordStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxySOCKSPasswordCtrl = new wxTextCtrl; - m_ProxySOCKSPasswordCtrl->Create( itemWizardPage140, ID_PROXYSOCKSPASSWORDCTRL, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD ); - itemFlexGridSizer146->Add(m_ProxySOCKSPasswordCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxySOCKSPasswordCtrl->Create( itemWizardPage142, ID_PROXYSOCKSPASSWORDCTRL, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD ); + itemFlexGridSizer149->Add(m_ProxySOCKSPasswordCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); // Set validators m_ProxySOCKSServerCtrl->SetValidator( wxTextValidator(wxFILTER_NONE, & m_strProxySOCKSServer) ); @@ -4373,21 +4379,21 @@ bool CErrProxyComplationPage::Create( wxWizard* parent ) void CErrProxyComplationPage::CreateControls() { ////@begin CErrProxyComplationPage content construction - CErrProxyComplationPage* itemWizardPage156 = this; + CErrProxyComplationPage* itemWizardPage159 = this; - wxBoxSizer* itemBoxSizer157 = new wxBoxSizer(wxVERTICAL); - itemWizardPage156->SetSizer(itemBoxSizer157); + wxBoxSizer* itemBoxSizer160 = new wxBoxSizer(wxVERTICAL); + itemWizardPage159->SetSizer(itemBoxSizer160); - wxStaticText* itemStaticText158 = new wxStaticText; - itemStaticText158->Create( itemWizardPage156, wxID_STATIC, _("Proxy configuration complete"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText158->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer157->Add(itemStaticText158, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText161 = new wxStaticText; + itemStaticText161->Create( itemWizardPage159, wxID_STATIC, _("Proxy configuration complete"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText161->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer160->Add(itemStaticText161, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText159 = new wxStaticText; - itemStaticText159->Create( itemWizardPage156, wxID_STATIC, _("Click Next to continue."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer157->Add(itemStaticText159, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText162 = new wxStaticText; + itemStaticText162->Create( itemWizardPage159, wxID_STATIC, _("Click Next to continue."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer160->Add(itemStaticText162, 0, wxALIGN_LEFT|wxALL, 5); - itemBoxSizer157->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer160->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); ////@end CErrProxyComplationPage content construction } @@ -4523,100 +4529,100 @@ void CErrRefCountPage::CreateControls() { ////@begin CErrRefCountPage content construction - CErrRefCountPage* itemWizardPage161 = this; + CErrRefCountPage* itemWizardPage164 = this; - wxBoxSizer* itemBoxSizer162 = new wxBoxSizer(wxVERTICAL); - itemWizardPage161->SetSizer(itemBoxSizer162); - - wxStaticText* itemStaticText163 = new wxStaticText; - itemStaticText163->Create( itemWizardPage161, wxID_STATIC, _("Ref Count Page"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText163->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer162->Add(itemStaticText163, 0, wxALIGN_LEFT|wxALL, 5); - - wxStaticText* itemStaticText164 = new wxStaticText; - itemStaticText164->Create( itemWizardPage161, wxID_STATIC, _("This page should never be used in the wizard itself."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer162->Add(itemStaticText164, 0, wxALIGN_LEFT|wxALL, 5); - - itemBoxSizer162->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + wxBoxSizer* itemBoxSizer165 = new wxBoxSizer(wxVERTICAL); + itemWizardPage164->SetSizer(itemBoxSizer165); wxStaticText* itemStaticText166 = new wxStaticText; - itemStaticText166->Create( itemWizardPage161, wxID_STATIC, _("This page just increases the refcount of various bitmap resources\n\n\n\nso that DialogBlocks doesn't nuke the refences to them."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer162->Add(itemStaticText166, 0, wxALIGN_LEFT|wxALL, 5); + itemStaticText166->Create( itemWizardPage164, wxID_STATIC, _("Ref Count Page"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText166->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer165->Add(itemStaticText166, 0, wxALIGN_LEFT|wxALL, 5); - wxBoxSizer* itemBoxSizer167 = new wxBoxSizer(wxVERTICAL); - itemBoxSizer162->Add(itemBoxSizer167, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText167 = new wxStaticText; + itemStaticText167->Create( itemWizardPage164, wxID_STATIC, _("This page should never be used in the wizard itself."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer165->Add(itemStaticText167, 0, wxALIGN_LEFT|wxALL, 5); - wxBitmap itemStaticBitmap168Bitmap(itemWizardPage161->GetBitmapResource(wxT("res/wizprogress01.xpm"))); - wxStaticBitmap* itemStaticBitmap168 = new wxStaticBitmap; - itemStaticBitmap168->Create( itemWizardPage161, wxID_STATIC, itemStaticBitmap168Bitmap, wxDefaultPosition, wxSize(184, 48), 0 ); - itemStaticBitmap168->Show(FALSE); - itemBoxSizer167->Add(itemStaticBitmap168, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + itemBoxSizer165->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - wxBitmap itemStaticBitmap169Bitmap(itemWizardPage161->GetBitmapResource(wxT("res/wizprogress02.xpm"))); - wxStaticBitmap* itemStaticBitmap169 = new wxStaticBitmap; - itemStaticBitmap169->Create( itemWizardPage161, wxID_STATIC, itemStaticBitmap169Bitmap, wxDefaultPosition, wxSize(184, 48), 0 ); - itemStaticBitmap169->Show(FALSE); - itemBoxSizer167->Add(itemStaticBitmap169, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + wxStaticText* itemStaticText169 = new wxStaticText; + itemStaticText169->Create( itemWizardPage164, wxID_STATIC, _("This page just increases the refcount of various bitmap resources\nso that DialogBlocks doesn't nuke the refences to them."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer165->Add(itemStaticText169, 0, wxALIGN_LEFT|wxALL, 5); - wxBitmap itemStaticBitmap170Bitmap(itemWizardPage161->GetBitmapResource(wxT("res/wizprogress03.xpm"))); - wxStaticBitmap* itemStaticBitmap170 = new wxStaticBitmap; - itemStaticBitmap170->Create( itemWizardPage161, wxID_STATIC, itemStaticBitmap170Bitmap, wxDefaultPosition, wxSize(184, 48), 0 ); - itemStaticBitmap170->Show(FALSE); - itemBoxSizer167->Add(itemStaticBitmap170, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + wxBoxSizer* itemBoxSizer170 = new wxBoxSizer(wxVERTICAL); + itemBoxSizer165->Add(itemBoxSizer170, 0, wxALIGN_LEFT|wxALL, 5); - wxBitmap itemStaticBitmap171Bitmap(itemWizardPage161->GetBitmapResource(wxT("res/wizprogress04.xpm"))); + wxBitmap itemStaticBitmap171Bitmap(itemWizardPage164->GetBitmapResource(wxT("res/wizprogress01.xpm"))); wxStaticBitmap* itemStaticBitmap171 = new wxStaticBitmap; - itemStaticBitmap171->Create( itemWizardPage161, wxID_STATIC, itemStaticBitmap171Bitmap, wxDefaultPosition, wxSize(184, 48), 0 ); + itemStaticBitmap171->Create( itemWizardPage164, wxID_STATIC, itemStaticBitmap171Bitmap, wxDefaultPosition, wxSize(184, 48), 0 ); itemStaticBitmap171->Show(FALSE); - itemBoxSizer167->Add(itemStaticBitmap171, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + itemBoxSizer170->Add(itemStaticBitmap171, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - wxBitmap itemStaticBitmap172Bitmap(itemWizardPage161->GetBitmapResource(wxT("res/wizprogress05.xpm"))); + wxBitmap itemStaticBitmap172Bitmap(itemWizardPage164->GetBitmapResource(wxT("res/wizprogress02.xpm"))); wxStaticBitmap* itemStaticBitmap172 = new wxStaticBitmap; - itemStaticBitmap172->Create( itemWizardPage161, wxID_STATIC, itemStaticBitmap172Bitmap, wxDefaultPosition, wxSize(184, 48), 0 ); + itemStaticBitmap172->Create( itemWizardPage164, wxID_STATIC, itemStaticBitmap172Bitmap, wxDefaultPosition, wxSize(184, 48), 0 ); itemStaticBitmap172->Show(FALSE); - itemBoxSizer167->Add(itemStaticBitmap172, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + itemBoxSizer170->Add(itemStaticBitmap172, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - wxBitmap itemStaticBitmap173Bitmap(itemWizardPage161->GetBitmapResource(wxT("res/wizprogress06.xpm"))); + wxBitmap itemStaticBitmap173Bitmap(itemWizardPage164->GetBitmapResource(wxT("res/wizprogress03.xpm"))); wxStaticBitmap* itemStaticBitmap173 = new wxStaticBitmap; - itemStaticBitmap173->Create( itemWizardPage161, wxID_STATIC, itemStaticBitmap173Bitmap, wxDefaultPosition, wxSize(184, 48), 0 ); + itemStaticBitmap173->Create( itemWizardPage164, wxID_STATIC, itemStaticBitmap173Bitmap, wxDefaultPosition, wxSize(184, 48), 0 ); itemStaticBitmap173->Show(FALSE); - itemBoxSizer167->Add(itemStaticBitmap173, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + itemBoxSizer170->Add(itemStaticBitmap173, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - wxBitmap itemStaticBitmap174Bitmap(itemWizardPage161->GetBitmapResource(wxT("res/wizprogress07.xpm"))); + wxBitmap itemStaticBitmap174Bitmap(itemWizardPage164->GetBitmapResource(wxT("res/wizprogress04.xpm"))); wxStaticBitmap* itemStaticBitmap174 = new wxStaticBitmap; - itemStaticBitmap174->Create( itemWizardPage161, wxID_STATIC, itemStaticBitmap174Bitmap, wxDefaultPosition, wxSize(184, 48), 0 ); + itemStaticBitmap174->Create( itemWizardPage164, wxID_STATIC, itemStaticBitmap174Bitmap, wxDefaultPosition, wxSize(184, 48), 0 ); itemStaticBitmap174->Show(FALSE); - itemBoxSizer167->Add(itemStaticBitmap174, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + itemBoxSizer170->Add(itemStaticBitmap174, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - wxBitmap itemStaticBitmap175Bitmap(itemWizardPage161->GetBitmapResource(wxT("res/wizprogress08.xpm"))); + wxBitmap itemStaticBitmap175Bitmap(itemWizardPage164->GetBitmapResource(wxT("res/wizprogress05.xpm"))); wxStaticBitmap* itemStaticBitmap175 = new wxStaticBitmap; - itemStaticBitmap175->Create( itemWizardPage161, wxID_STATIC, itemStaticBitmap175Bitmap, wxDefaultPosition, wxSize(184, 48), 0 ); + itemStaticBitmap175->Create( itemWizardPage164, wxID_STATIC, itemStaticBitmap175Bitmap, wxDefaultPosition, wxSize(184, 48), 0 ); itemStaticBitmap175->Show(FALSE); - itemBoxSizer167->Add(itemStaticBitmap175, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + itemBoxSizer170->Add(itemStaticBitmap175, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - wxBitmap itemStaticBitmap176Bitmap(itemWizardPage161->GetBitmapResource(wxT("res/wizprogress09.xpm"))); + wxBitmap itemStaticBitmap176Bitmap(itemWizardPage164->GetBitmapResource(wxT("res/wizprogress06.xpm"))); wxStaticBitmap* itemStaticBitmap176 = new wxStaticBitmap; - itemStaticBitmap176->Create( itemWizardPage161, wxID_STATIC, itemStaticBitmap176Bitmap, wxDefaultPosition, wxSize(184, 48), 0 ); + itemStaticBitmap176->Create( itemWizardPage164, wxID_STATIC, itemStaticBitmap176Bitmap, wxDefaultPosition, wxSize(184, 48), 0 ); itemStaticBitmap176->Show(FALSE); - itemBoxSizer167->Add(itemStaticBitmap176, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + itemBoxSizer170->Add(itemStaticBitmap176, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - wxBitmap itemStaticBitmap177Bitmap(itemWizardPage161->GetBitmapResource(wxT("res/wizprogress10.xpm"))); + wxBitmap itemStaticBitmap177Bitmap(itemWizardPage164->GetBitmapResource(wxT("res/wizprogress07.xpm"))); wxStaticBitmap* itemStaticBitmap177 = new wxStaticBitmap; - itemStaticBitmap177->Create( itemWizardPage161, wxID_STATIC, itemStaticBitmap177Bitmap, wxDefaultPosition, wxSize(184, 48), 0 ); + itemStaticBitmap177->Create( itemWizardPage164, wxID_STATIC, itemStaticBitmap177Bitmap, wxDefaultPosition, wxSize(184, 48), 0 ); itemStaticBitmap177->Show(FALSE); - itemBoxSizer167->Add(itemStaticBitmap177, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + itemBoxSizer170->Add(itemStaticBitmap177, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - wxBitmap itemStaticBitmap178Bitmap(itemWizardPage161->GetBitmapResource(wxT("res/wizprogress11.xpm"))); + wxBitmap itemStaticBitmap178Bitmap(itemWizardPage164->GetBitmapResource(wxT("res/wizprogress08.xpm"))); wxStaticBitmap* itemStaticBitmap178 = new wxStaticBitmap; - itemStaticBitmap178->Create( itemWizardPage161, wxID_STATIC, itemStaticBitmap178Bitmap, wxDefaultPosition, wxSize(184, 48), 0 ); + itemStaticBitmap178->Create( itemWizardPage164, wxID_STATIC, itemStaticBitmap178Bitmap, wxDefaultPosition, wxSize(184, 48), 0 ); itemStaticBitmap178->Show(FALSE); - itemBoxSizer167->Add(itemStaticBitmap178, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + itemBoxSizer170->Add(itemStaticBitmap178, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - wxBitmap itemStaticBitmap179Bitmap(itemWizardPage161->GetBitmapResource(wxT("res/wizprogress12.xpm"))); + wxBitmap itemStaticBitmap179Bitmap(itemWizardPage164->GetBitmapResource(wxT("res/wizprogress09.xpm"))); wxStaticBitmap* itemStaticBitmap179 = new wxStaticBitmap; - itemStaticBitmap179->Create( itemWizardPage161, wxID_STATIC, itemStaticBitmap179Bitmap, wxDefaultPosition, wxSize(184, 48), 0 ); + itemStaticBitmap179->Create( itemWizardPage164, wxID_STATIC, itemStaticBitmap179Bitmap, wxDefaultPosition, wxSize(184, 48), 0 ); itemStaticBitmap179->Show(FALSE); - itemBoxSizer167->Add(itemStaticBitmap179, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + itemBoxSizer170->Add(itemStaticBitmap179, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + + wxBitmap itemStaticBitmap180Bitmap(itemWizardPage164->GetBitmapResource(wxT("res/wizprogress10.xpm"))); + wxStaticBitmap* itemStaticBitmap180 = new wxStaticBitmap; + itemStaticBitmap180->Create( itemWizardPage164, wxID_STATIC, itemStaticBitmap180Bitmap, wxDefaultPosition, wxSize(184, 48), 0 ); + itemStaticBitmap180->Show(FALSE); + itemBoxSizer170->Add(itemStaticBitmap180, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + + wxBitmap itemStaticBitmap181Bitmap(itemWizardPage164->GetBitmapResource(wxT("res/wizprogress11.xpm"))); + wxStaticBitmap* itemStaticBitmap181 = new wxStaticBitmap; + itemStaticBitmap181->Create( itemWizardPage164, wxID_STATIC, itemStaticBitmap181Bitmap, wxDefaultPosition, wxSize(184, 48), 0 ); + itemStaticBitmap181->Show(FALSE); + itemBoxSizer170->Add(itemStaticBitmap181, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + + wxBitmap itemStaticBitmap182Bitmap(itemWizardPage164->GetBitmapResource(wxT("res/wizprogress12.xpm"))); + wxStaticBitmap* itemStaticBitmap182 = new wxStaticBitmap; + itemStaticBitmap182->Create( itemWizardPage164, wxID_STATIC, itemStaticBitmap182Bitmap, wxDefaultPosition, wxSize(184, 48), 0 ); + itemStaticBitmap182->Show(FALSE); + itemBoxSizer170->Add(itemStaticBitmap182, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); ////@end CErrRefCountPage content construction }