diff --git a/checkin_notes b/checkin_notes index 0914c2da69..a6d93aa12d 100755 --- a/checkin_notes +++ b/checkin_notes @@ -10392,3 +10392,14 @@ David 11 Aug 2005 gutil.C client/ client_types.C + +Rom 11 Aug 2005 + - Don't allow the wizard to get stuck in a validation loop during a cancel + operation. + - Hook up the URL and Account Key validators to the wizard. + + clientgui/ + BOINCGUI.pjd + ValidateAccountKey.cpp + ValidateURL.cpp + WizAttachProject.cpp, .h diff --git a/clientgui/BOINCGUI.pjd b/clientgui/BOINCGUI.pjd index f734084e74..027adcfda2 100644 --- a/clientgui/BOINCGUI.pjd +++ b/clientgui/BOINCGUI.pjd @@ -12,7 +12,7 @@ - 350 + 349 TRUE FALSE @@ -102,7 +102,7 @@ <None> - 14628464 + 14634480 data-document @@ -113,14 +113,14 @@ 0 Configurations - 50162176 + 50358784 config-data-document 0 1 0 - 14628464 + 14634480 0 TRUE @@ -168,7 +168,7 @@ Projects - 14629696 + 14626976 root-document project @@ -186,7 +186,7 @@ 1 1 0 - 14629696 + 14626976 1 Options @@ -256,7 +256,7 @@ wxBoxSizer V - 14642384 + 14642608 dialog-control-document sizer @@ -282,14 +282,14 @@ <Any platform> wxNotebook: ID_NOTEBOOK - 14661120 + 14659920 dialog-control-document notebook 0 1 0 - 14642384 + 14642608 0 wbNotebookProxy wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED|OnNotebookPageChanged @@ -345,14 +345,14 @@ wxPanel: ID_GENERAL - 14648512 + 14647344 dialog-control-document panel 0 1 0 - 14661120 + 14659920 0 wbPanelProxy ID_GENERAL @@ -405,14 +405,14 @@ wxBoxSizer V - 14700768 + 14888560 dialog-control-document sizer 0 1 0 - 14648512 + 14647344 0 24/9/2004 wbBoxSizerProxy @@ -432,14 +432,14 @@ <Any platform> wxFlexGridSizer - 14683056 + 14879072 dialog-control-document sizer 0 1 0 - 14700768 + 14888560 0 22/5/2005 wbFlexGridSizerProxy @@ -464,14 +464,14 @@ FALSE wxStaticText: wxID_STATIC - 14769280 + 14931392 dialog-control-document statictext 0 1 0 - 14683056 + 14879072 0 22/5/2005 wbStaticTextProxy @@ -521,14 +521,14 @@ wxComboBox: ID_LANGUAGESELECTION - 14771440 + 14934448 dialog-control-document combobox 0 1 0 - 14683056 + 14879072 0 22/5/2005 wbComboBoxProxy @@ -573,14 +573,14 @@ wxStaticText: wxID_STATIC - 14796160 + 14954544 dialog-control-document statictext 0 1 0 - 14683056 + 14879072 0 22/5/2005 wbStaticTextProxy @@ -630,14 +630,14 @@ wxSlider: ID_REMINDERFREQUENCY - 14796528 + 14957344 dialog-control-document slider 0 1 0 - 14683056 + 14879072 0 22/5/2005 wbSliderProxy @@ -697,14 +697,14 @@ wxPanel: ID_CONNECTONS - 14822144 + 15049520 dialog-control-document panel 0 1 0 - 14661120 + 14659920 0 27/5/2005 wbPanelProxy @@ -758,14 +758,14 @@ wxBoxSizer V - 14815248 + 15138576 dialog-control-document sizer 0 1 0 - 14822144 + 15049520 0 27/5/2005 wbBoxSizerProxy @@ -785,14 +785,14 @@ <Any platform> wxRadioButton: ID_NETWORKAUTODETECT - 14898432 + 15123456 dialog-control-document radiobutton 0 1 0 - 14815248 + 15138576 0 27/5/2005 wbRadioButtonProxy @@ -837,14 +837,14 @@ wxRadioButton: ID_NETWORKLAN - 14882704 + 15111840 dialog-control-document radiobutton 0 1 0 - 14815248 + 15138576 0 27/5/2005 wbRadioButtonProxy @@ -889,14 +889,14 @@ wxRadioButton: ID_NETWORKDIALUP - 14928912 + 38096176 dialog-control-document radiobutton 0 1 0 - 14815248 + 15138576 0 27/5/2005 wbRadioButtonProxy @@ -941,14 +941,14 @@ wxStaticBoxSizer V - 14935328 + 38098448 dialog-control-document sizer 0 1 0 - 14815248 + 15138576 0 27/5/2005 wbStaticBoxSizerProxy @@ -972,14 +972,14 @@ <Any platform> wxFlexGridSizer - 15006928 + 37152464 dialog-control-document sizer 0 1 0 - 14935328 + 38098448 0 27/5/2005 wbFlexGridSizerProxy @@ -1004,14 +1004,14 @@ FALSE wxListBox: ID_DIALUPCONNECTIONS - 14993984 + 37139616 dialog-control-document listbox 0 1 0 - 15006928 + 37152464 0 27/5/2005 wbListBoxProxy @@ -1065,14 +1065,14 @@ wxBoxSizer V - 15068160 + 37361792 dialog-control-document sizer 0 1 0 - 15006928 + 37152464 0 27/5/2005 wbBoxSizerProxy @@ -1092,14 +1092,14 @@ <Any platform> wxButton: ID_DIALUPSETDEFAULT - 15057264 + 37375536 dialog-control-document dialogcontrol 0 1 0 - 15068160 + 37361792 0 27/5/2005 wbButtonProxy @@ -1145,14 +1145,14 @@ wxButton: ID_DIALUPCLEARDEFAULT - 15058448 + 37369024 dialog-control-document dialogcontrol 0 1 0 - 15068160 + 37361792 0 27/5/2005 wbButtonProxy @@ -1200,14 +1200,14 @@ wxFlexGridSizer - 15123360 + 37473616 dialog-control-document sizer 0 1 0 - 14935328 + 38098448 0 27/5/2005 wbFlexGridSizerProxy @@ -1232,14 +1232,14 @@ FALSE wxStaticText: ID_DIALUPDEFAULTCONNECTIONTEXT - 15118800 + 37456768 dialog-control-document statictext 0 1 0 - 15123360 + 37473616 0 27/5/2005 wbStaticTextProxy @@ -1289,14 +1289,14 @@ wxStaticText: ID_DIALUPDEFAULTCONNECTION - 37932320 + 37502736 dialog-control-document statictext 0 1 0 - 15123360 + 37473616 0 27/5/2005 wbStaticTextProxy @@ -1347,14 +1347,14 @@ wxFlexGridSizer - 37939888 + 37510320 dialog-control-document sizer 0 1 0 - 14935328 + 38098448 0 28/5/2005 wbFlexGridSizerProxy @@ -1379,14 +1379,14 @@ FALSE wxCheckBox: ID_DIALUPPROMPTUSERNAMEPASSWORD - 36956304 + 37550800 dialog-control-document checkbox 0 1 0 - 37939888 + 37510320 0 28/5/2005 wbCheckBoxProxy @@ -1435,14 +1435,14 @@ wxPanel: ID_HTTPPROXY - 36939600 + 37531408 dialog-control-document panel 0 1 0 - 14661120 + 14659920 0 wbPanelProxy ID_HTTPPROXY @@ -1495,14 +1495,14 @@ wxBoxSizer V - 37182624 + 37577280 dialog-control-document sizer 0 1 0 - 36939600 + 37531408 0 wbBoxSizerProxy Vertical @@ -1521,14 +1521,14 @@ <Any platform> wxCheckBox: ID_ENABLEHTTPPROXYCTRL - 37175968 + 37566352 dialog-control-document checkbox 0 1 0 - 37182624 + 37577280 0 wbCheckBoxProxy wxEVT_COMMAND_CHECKBOX_CLICKED|OnEnableHTTPProxyCtrlClick @@ -1574,14 +1574,14 @@ wxStaticBoxSizer V - 37279632 + 37612256 dialog-control-document sizer 0 1 0 - 37182624 + 37577280 0 wbStaticBoxSizerProxy wxID_ANY @@ -1604,14 +1604,14 @@ <Any platform> wxGridSizer - 37268976 + 37601552 dialog-control-document sizer 0 1 0 - 37279632 + 37612256 0 wbGridSizerProxy 1 @@ -1633,14 +1633,14 @@ FALSE wxFlexGridSizer - 37258768 + 37591328 dialog-control-document sizer 0 1 0 - 37268976 + 37601552 0 wbFlexGridSizerProxy @@ -1664,14 +1664,14 @@ FALSE wxStaticText: wxID_STATIC - 37315808 + 37650192 dialog-control-document statictext 0 1 0 - 37258768 + 37591328 0 wbStaticTextProxy wxID_STATIC @@ -1720,14 +1720,14 @@ wxTextCtrl: ID_HTTPADDRESSCTRL - 37296736 + 37627232 dialog-control-document textctrl 0 1 0 - 37258768 + 37591328 0 wbTextCtrlProxy ID_HTTPADDRESSCTRL @@ -1787,14 +1787,14 @@ wxStaticText: wxID_STATIC - 37334800 + 37767088 dialog-control-document statictext 0 1 0 - 37258768 + 37591328 0 wbStaticTextProxy wxID_STATIC @@ -1843,14 +1843,14 @@ wxTextCtrl: ID_HTTPPORTCTRL - 37335440 + 37629712 dialog-control-document textctrl 0 1 0 - 37258768 + 37591328 0 wbTextCtrlProxy ID_HTTPPORTCTRL @@ -1912,14 +1912,14 @@ wxStaticBoxSizer V - 37367568 + 37925392 dialog-control-document sizer 0 1 0 - 37279632 + 37612256 0 wbStaticBoxSizerProxy wxID_ANY @@ -1942,14 +1942,14 @@ <Any platform> wxFlexGridSizer - 37259168 + 37914608 dialog-control-document sizer 0 1 0 - 37367568 + 37925392 0 wbFlexGridSizerProxy @@ -1973,14 +1973,14 @@ FALSE wxStaticText: wxID_STATIC - 37412624 + 38008128 dialog-control-document statictext 0 1 0 - 37259168 + 37914608 0 wbStaticTextProxy wxID_STATIC @@ -2031,14 +2031,14 @@ wxTextCtrl: ID_HTTPUSERNAMECTRL - 37393792 + 37987232 dialog-control-document textctrl 0 1 0 - 37259168 + 37914608 0 wbTextCtrlProxy ID_HTTPUSERNAMECTRL @@ -2098,14 +2098,14 @@ wxStaticText: wxID_STATIC - 37431872 + 38059296 dialog-control-document statictext 0 1 0 - 37259168 + 37914608 0 wbStaticTextProxy wxID_STATIC @@ -2156,14 +2156,14 @@ wxTextCtrl: ID_HTTPPASSWORDCTRL - 37473312 + 38063328 dialog-control-document textctrl 0 1 0 - 37259168 + 37914608 0 wbTextCtrlProxy ID_HTTPPASSWORDCTRL @@ -2228,14 +2228,14 @@ wxPanel: ID_SOCKSPROXY - 37479568 + 38123680 dialog-control-document panel 0 1 0 - 14661120 + 14659920 0 wbPanelProxy ID_SOCKSPROXY @@ -2290,14 +2290,14 @@ FALSE wxBoxSizer V - 37516832 + 37916064 dialog-control-document sizer 0 1 0 - 37479568 + 38123680 0 wbBoxSizerProxy Vertical @@ -2316,14 +2316,14 @@ <Any platform> wxCheckBox: ID_ENABLESOCKSPROXYCTRL - 37505936 + 38168912 dialog-control-document checkbox 0 1 0 - 37516832 + 37916064 0 wbCheckBoxProxy wxEVT_COMMAND_CHECKBOX_CLICKED|OnEnableSOCKSProxyCtrlClick @@ -2369,14 +2369,14 @@ wxStaticBoxSizer V - 37508480 + 38172016 dialog-control-document sizer 0 1 0 - 37516832 + 37916064 0 wbStaticBoxSizerProxy wxID_ANY @@ -2399,14 +2399,14 @@ <Any platform> wxGridSizer - 37578208 + 38143664 dialog-control-document sizer 0 1 0 - 37508480 + 38172016 0 wbGridSizerProxy 1 @@ -2428,14 +2428,14 @@ FALSE wxFlexGridSizer - 37567984 + 38180512 dialog-control-document sizer 0 1 0 - 37578208 + 38143664 0 wbFlexGridSizerProxy @@ -2459,14 +2459,14 @@ FALSE wxStaticText: wxID_STATIC - 37555200 + 15052224 dialog-control-document statictext 0 1 0 - 37567984 + 38180512 0 wbStaticTextProxy wxID_STATIC @@ -2517,14 +2517,14 @@ wxTextCtrl: ID_SOCKSADDRESSCTRL - 37727920 + 14694304 dialog-control-document textctrl 0 1 0 - 37567984 + 38180512 0 wbTextCtrlProxy ID_SOCKSADDRESSCTRL @@ -2586,14 +2586,14 @@ wxStaticText: wxID_STATIC - 37801744 + 14689008 dialog-control-document statictext 0 1 0 - 37567984 + 38180512 0 wbStaticTextProxy wxID_STATIC @@ -2644,14 +2644,14 @@ wxTextCtrl: ID_SOCKSPORTCTRL - 37786736 + 37116000 dialog-control-document textctrl 0 1 0 - 37567984 + 38180512 0 wbTextCtrlProxy ID_SOCKSPORTCTRL @@ -2715,14 +2715,14 @@ wxStaticBoxSizer V - 37860816 + 50374624 dialog-control-document sizer 0 1 0 - 37508480 + 38172016 0 wbStaticBoxSizerProxy wxID_ANY @@ -2745,14 +2745,14 @@ <Any platform> wxFlexGridSizer - 37850064 + 50388464 dialog-control-document sizer 0 1 0 - 37860816 + 50374624 0 wbFlexGridSizerProxy @@ -2776,14 +2776,14 @@ FALSE wxStaticText: wxID_STATIC - 37911936 + 37117376 dialog-control-document statictext 0 1 0 - 37850064 + 50388464 0 wbStaticTextProxy wxID_STATIC @@ -2834,14 +2834,14 @@ wxTextCtrl: ID_SOCKSUSERNAMECTRL - 37888768 + 50411424 dialog-control-document textctrl 0 1 0 - 37850064 + 50388464 0 wbTextCtrlProxy ID_SOCKSUSERNAMECTRL @@ -2903,14 +2903,14 @@ wxStaticText: wxID_STATIC - 37966048 + 50434144 dialog-control-document statictext 0 1 0 - 37850064 + 50388464 0 wbStaticTextProxy wxID_STATIC @@ -2961,14 +2961,14 @@ wxTextCtrl: ID_SOCKSPASSWORDCTRL - 37946912 + 50455904 dialog-control-document textctrl 0 1 0 - 37850064 + 50388464 0 wbTextCtrlProxy ID_SOCKSPASSWORDCTRL @@ -3036,14 +3036,14 @@ wxBoxSizer H - 14823456 + 14727712 dialog-control-document sizer 0 1 0 - 14642384 + 14642608 0 wbBoxSizerProxy Horizontal @@ -3062,14 +3062,14 @@ <Any platform> wxButton: wxID_OK - 15114608 + 14733440 dialog-control-document dialogcontrol 0 1 0 - 14823456 + 14727712 0 wbButtonProxy wxID_OK @@ -3113,14 +3113,14 @@ wxButton: wxID_CANCEL - 37861712 + 38170240 dialog-control-document dialogcontrol 0 1 0 - 14823456 + 14727712 0 wbButtonProxy wxID_CANCEL @@ -3167,7 +3167,7 @@ About BOINC - 14724288 + 14721168 dialog-document dialog @@ -3234,14 +3234,14 @@ wxBoxSizer V - 14742816 + 50476624 dialog-control-document sizer 0 1 0 - 14724288 + 14721168 0 wbBoxSizerProxy Vertical @@ -3260,14 +3260,14 @@ <Any platform> wxStaticText: wxID_STATIC - 37850896 + 50490160 dialog-control-document statictext 0 1 0 - 14742816 + 50476624 0 wbStaticTextProxy wxID_STATIC @@ -3316,14 +3316,14 @@ wxBoxSizer H - 36916128 + 14760480 dialog-control-document sizer 0 1 0 - 14742816 + 50476624 0 wbBoxSizerProxy Horizontal @@ -3342,14 +3342,14 @@ <Any platform> wxBoxSizer V - 36923392 + 14767696 dialog-control-document sizer 0 1 0 - 36916128 + 14760480 0 wbBoxSizerProxy Vertical @@ -3368,14 +3368,14 @@ <Any platform> wxStaticBitmap: wxID_STATIC - 14846800 + 50490928 dialog-control-document staticbitmap 0 1 0 - 36923392 + 14767696 0 wbStaticBitmapProxy wxID_STATIC @@ -3419,14 +3419,14 @@ wxFlexGridSizer - 14862720 + 50509040 dialog-control-document sizer 0 1 0 - 36916128 + 14760480 0 wbFlexGridSizerProxy @@ -3450,14 +3450,14 @@ FALSE wxStaticText: wxID_STATIC - 14874960 + 50521248 dialog-control-document statictext 0 1 0 - 14862720 + 50509040 0 wbStaticTextProxy wxID_STATIC @@ -3506,14 +3506,14 @@ wxStaticText: wxID_STATIC - 36975328 + 14794416 dialog-control-document statictext 0 1 0 - 14862720 + 50509040 0 wbStaticTextProxy wxID_STATIC @@ -3562,14 +3562,14 @@ wxStaticText: wxID_STATIC - 36970544 + 14808816 dialog-control-document statictext 0 1 0 - 14862720 + 50509040 0 wbStaticTextProxy wxID_STATIC @@ -3618,14 +3618,14 @@ wxStaticText: wxID_STATIC - 37012576 + 50540896 dialog-control-document statictext 0 1 0 - 14862720 + 50509040 0 wbStaticTextProxy wxID_STATIC @@ -3677,14 +3677,14 @@ All Rights Reserved. wxStaticText: wxID_STATIC - 50179456 + 50510688 dialog-control-document statictext 0 1 0 - 14742816 + 50476624 0 wbStaticTextProxy wxID_STATIC @@ -3735,14 +3735,14 @@ All Rights Reserved. wxStaticText: wxID_STATIC - 50193440 + 14824368 dialog-control-document statictext 0 1 0 - 14742816 + 50476624 0 wbStaticTextProxy wxID_STATIC @@ -3793,14 +3793,14 @@ All Rights Reserved. wxHyperLink: ID_ABOUTBOINCLINK - 50211840 + 14820448 dialog-control-document foreign 0 1 0 - 14742816 + 50476624 0 21/6/2005 wbCustomCtrlProxy:wxHyperLink @@ -3853,14 +3853,14 @@ All Rights Reserved. wxStaticLine: wxID_STATIC - 50206336 + 50584848 dialog-control-document staticline 0 1 0 - 14742816 + 50476624 0 wbStaticLineProxy wxID_STATIC @@ -3900,14 +3900,14 @@ All Rights Reserved. wxButton: wxID_OK - 37039408 + 50578208 dialog-control-document dialogcontrol 0 1 0 - 14742816 + 50476624 0 wbButtonProxy wxID_OK @@ -3955,7 +3955,7 @@ All Rights Reserved. Attach to Project - 37054864 + 14860864 dialog-document dialog @@ -4023,14 +4023,14 @@ All Rights Reserved. wxBoxSizer V - 37065104 + 50597648 dialog-control-document sizer 0 1 0 - 37054864 + 14860864 0 wbBoxSizerProxy Vertical @@ -4049,14 +4049,14 @@ All Rights Reserved. <Any platform> wxFlexGridSizer - 37080208 + 50604352 dialog-control-document sizer 0 1 0 - 37065104 + 50597648 0 29/2/2005 wbFlexGridSizerProxy @@ -4081,14 +4081,14 @@ All Rights Reserved. FALSE wxBoxSizer V - 37086128 + 50610256 dialog-control-document sizer 0 1 0 - 37080208 + 50604352 0 29/2/2005 wbBoxSizerProxy @@ -4108,14 +4108,14 @@ All Rights Reserved. <Any platform> wxFlexGridSizer - 37100000 + 50625344 dialog-control-document sizer 0 1 0 - 37086128 + 50610256 0 29/2/2005 wbFlexGridSizerProxy @@ -4140,14 +4140,14 @@ All Rights Reserved. FALSE wxStaticText: wxID_STATIC - 37111808 + 14985920 dialog-control-document statictext 0 1 0 - 37100000 + 50625344 0 29/2/2005 wbStaticTextProxy @@ -4199,14 +4199,14 @@ All Rights Reserved. wxTextCtrl: ID_PROJECTADDRESS - 37136896 + 15007504 dialog-control-document textctrl 0 1 0 - 37100000 + 50625344 0 29/2/2005 wbTextCtrlProxy @@ -4267,14 +4267,14 @@ All Rights Reserved. wxStaticText: wxID_STATIC - 37131088 + 50648128 dialog-control-document statictext 0 1 0 - 37100000 + 50625344 0 29/2/2005 wbStaticTextProxy @@ -4326,14 +4326,14 @@ All Rights Reserved. wxTextCtrl: ID_PROJECTACCOUNTKEY - 37211600 + 15017792 dialog-control-document textctrl 0 1 0 - 37100000 + 50625344 0 29/2/2005 wbTextCtrlProxy @@ -4395,14 +4395,14 @@ All Rights Reserved. wxStaticText: wxID_STATIC - 37235520 + 50625984 dialog-control-document statictext 0 1 0 - 37086128 + 50610256 0 29/2/2005 wbStaticTextProxy @@ -4455,14 +4455,14 @@ Visit http://boinc.berkeley.edu for a list of projects. wxBoxSizer V - 37231056 + 15089104 dialog-control-document sizer 0 1 0 - 37080208 + 50604352 0 29/2/2005 wbBoxSizerProxy @@ -4482,14 +4482,14 @@ Visit http://boinc.berkeley.edu for a list of projects. <Any platform> wxButton: wxID_OK - 37093440 + 15094592 dialog-control-document dialogcontrol 0 1 0 - 37231056 + 15089104 0 29/2/2005 wbButtonProxy @@ -4536,14 +4536,14 @@ Visit http://boinc.berkeley.edu for a list of projects. wxButton: wxID_CANCEL - 37527808 + 50664352 dialog-control-document dialogcontrol 0 1 0 - 37231056 + 15089104 0 29/2/2005 wbButtonProxy @@ -4594,7 +4594,7 @@ Visit http://boinc.berkeley.edu for a list of projects. Account Manager Signup - 37551504 + 50679888 dialog-document dialog @@ -4663,14 +4663,14 @@ Visit http://boinc.berkeley.edu for a list of projects. wxFlexGridSizer - 37589520 + 15141568 dialog-control-document sizer 0 1 0 - 37551504 + 50679888 0 28/5/2005 wbFlexGridSizerProxy @@ -4695,14 +4695,14 @@ Visit http://boinc.berkeley.edu for a list of projects. FALSE wxBoxSizer V - 37603552 + 15147376 dialog-control-document sizer 0 1 0 - 37589520 + 15141568 0 28/5/2005 wbBoxSizerProxy @@ -4722,14 +4722,14 @@ Visit http://boinc.berkeley.edu for a list of projects. <Any platform> wxStaticText: ID_ACCTMANAGERTEXT - 37616736 + 15160544 dialog-control-document statictext 0 1 0 - 37603552 + 15147376 0 28/5/2005 wbStaticTextProxy @@ -4780,14 +4780,14 @@ For more information, click on the link below. wxHyperLink: ID_ACCTMANAGERDOCLINK - 37634800 + 37174176 dialog-control-document foreign 0 1 0 - 37603552 + 15147376 0 30/5/2005 wbCustomCtrlProxy:wxHyperLink @@ -4840,14 +4840,14 @@ For more information, click on the link below. wxFlexGridSizer - 37656896 + 37170064 dialog-control-document sizer 0 1 0 - 37603552 + 15147376 0 28/5/2005 wbFlexGridSizerProxy @@ -4872,14 +4872,14 @@ For more information, click on the link below. FALSE wxStaticText: wxID_STATIC - 37668672 + 37198112 dialog-control-document statictext 0 1 0 - 37656896 + 37170064 0 28/5/2005 wbStaticTextProxy @@ -4929,14 +4929,14 @@ For more information, click on the link below. wxTextCtrl: ID_ACCTMANAGERURL - 37663504 + 37191712 dialog-control-document textctrl 0 1 0 - 37656896 + 37170064 0 28/5/2005 wbTextCtrlProxy @@ -4997,14 +4997,14 @@ For more information, click on the link below. wxStaticText: wxID_STATIC - 37710560 + 50709488 dialog-control-document statictext 0 1 0 - 37656896 + 37170064 0 28/5/2005 wbStaticTextProxy @@ -5054,14 +5054,14 @@ For more information, click on the link below. wxTextCtrl: ID_ACCTMANAGERUSERNAME - 37764880 + 50704992 dialog-control-document textctrl 0 1 0 - 37656896 + 37170064 0 28/5/2005 wbTextCtrlProxy @@ -5122,14 +5122,14 @@ For more information, click on the link below. wxStaticText: wxID_STATIC - 37759392 + 37251648 dialog-control-document statictext 0 1 0 - 37656896 + 37170064 0 28/5/2005 wbStaticTextProxy @@ -5179,14 +5179,14 @@ For more information, click on the link below. wxTextCtrl: ID_ACCTMANAGERPASSWORD - 37838512 + 37265904 dialog-control-document textctrl 0 1 0 - 37656896 + 37170064 0 28/5/2005 wbTextCtrlProxy @@ -5249,14 +5249,14 @@ For more information, click on the link below. wxFlexGridSizer - 50242624 + 37174704 dialog-control-document sizer 0 1 0 - 37589520 + 15141568 0 28/5/2005 wbFlexGridSizerProxy @@ -5281,14 +5281,14 @@ For more information, click on the link below. FALSE wxButton: wxID_OK - 50255168 + 37291984 dialog-control-document dialogcontrol 0 1 0 - 50242624 + 37174704 0 28/5/2005 wbButtonProxy @@ -5333,14 +5333,14 @@ For more information, click on the link below. wxButton: wxID_CANCEL - 50250272 + 37307280 dialog-control-document dialogcontrol 0 1 0 - 50242624 + 37174704 0 28/5/2005 wbButtonProxy @@ -5388,7 +5388,7 @@ For more information, click on the link below. Account Manager Status - 50286224 + 37334800 dialog-document dialog @@ -5456,14 +5456,14 @@ For more information, click on the link below. wxBoxSizer V - 37591360 + 37353408 dialog-control-document sizer 0 1 0 - 50286224 + 37334800 0 16/5/2005 wbBoxSizerProxy @@ -5483,14 +5483,14 @@ For more information, click on the link below. <Any platform> wxBoxSizer H - 50306544 + 37292320 dialog-control-document sizer 0 1 0 - 37591360 + 37353408 0 16/5/2005 wbBoxSizerProxy @@ -5510,14 +5510,14 @@ For more information, click on the link below. <Any platform> wxBoxSizer V - 50313696 + 37391888 dialog-control-document sizer 0 1 0 - 50306544 + 37292320 0 8/6/2005 wbBoxSizerProxy @@ -5537,14 +5537,14 @@ For more information, click on the link below. <Any platform> wxStaticText: wxID_STATIC - 50326816 + 37396704 dialog-control-document statictext 0 1 0 - 50313696 + 37391888 0 8/6/2005 wbStaticTextProxy @@ -5594,14 +5594,14 @@ For more information, click on the link below. wxFlexGridSizer - 50346208 + 37400176 dialog-control-document sizer 0 1 0 - 50313696 + 37391888 0 8/6/2005 wbFlexGridSizerProxy @@ -5626,14 +5626,14 @@ For more information, click on the link below. FALSE wxStaticText: wxID_STATIC - 50358048 + 37426032 dialog-control-document statictext 0 1 0 - 50346208 + 37400176 0 8/6/2005 wbStaticTextProxy @@ -5683,14 +5683,14 @@ For more information, click on the link below. wxStaticText: ID_ACCTMANAGERNAME - 50372624 + 37421136 dialog-control-document statictext 0 1 0 - 50346208 + 37400176 0 8/6/2005 wbStaticTextProxy @@ -5740,14 +5740,14 @@ For more information, click on the link below. wxStaticText: wxID_STATIC - 50374480 + 37663088 dialog-control-document statictext 0 1 0 - 50346208 + 37400176 0 8/6/2005 wbStaticTextProxy @@ -5797,14 +5797,14 @@ For more information, click on the link below. wxHyperLink: ID_ACCTMANAGERLINK - 50409808 + 37659056 dialog-control-document foreign 0 1 0 - 50346208 + 37400176 0 8/6/2005 wbCustomCtrlProxy:wxHyperLink @@ -5859,14 +5859,14 @@ For more information, click on the link below. wxBoxSizer V - 50405440 + 37701760 dialog-control-document sizer 0 1 0 - 50306544 + 37292320 0 16/5/2005 wbBoxSizerProxy @@ -5886,14 +5886,14 @@ For more information, click on the link below. <Any platform> wxButton: ID_UPDATE - 50431888 + 37715568 dialog-control-document dialogcontrol 0 1 0 - 50405440 + 37701760 0 16/5/2005 wbButtonProxy @@ -5939,14 +5939,14 @@ For more information, click on the link below. wxButton: ID_CHANGE - 50447152 + 37724896 dialog-control-document dialogcontrol 0 1 0 - 50405440 + 37701760 0 16/5/2005 wbButtonProxy @@ -5992,14 +5992,14 @@ For more information, click on the link below. wxButton: wxID_CANCEL - 50467776 + 37725280 dialog-control-document dialogcontrol 0 1 0 - 50405440 + 37701760 0 16/5/2005 wbButtonProxy @@ -6048,7 +6048,7 @@ For more information, click on the link below. Select Computer - 50483664 + 37790272 dialog-document dialog @@ -6116,14 +6116,14 @@ For more information, click on the link below. wxBoxSizer V - 37528656 + 37293488 dialog-control-document sizer 0 1 0 - 50483664 + 37790272 0 29/2/2005 wbBoxSizerProxy @@ -6143,14 +6143,14 @@ For more information, click on the link below. <Any platform> wxFlexGridSizer - 50500240 + 37702016 dialog-control-document sizer 0 1 0 - 37528656 + 37293488 0 29/2/2005 wbFlexGridSizerProxy @@ -6175,14 +6175,14 @@ For more information, click on the link below. FALSE wxBoxSizer V - 50514304 + 37820928 dialog-control-document sizer 0 1 0 - 50500240 + 37702016 0 29/2/2005 wbBoxSizerProxy @@ -6202,14 +6202,14 @@ For more information, click on the link below. <Any platform> wxFlexGridSizer - 50521232 + 37827824 dialog-control-document sizer 0 1 0 - 50514304 + 37820928 0 29/2/2005 wbFlexGridSizerProxy @@ -6234,14 +6234,14 @@ For more information, click on the link below. FALSE wxStaticText: wxID_STATIC - 14947904 + 37839664 dialog-control-document statictext 0 1 0 - 50521232 + 37827824 0 29/2/2005 wbStaticTextProxy @@ -6291,14 +6291,14 @@ For more information, click on the link below. wxComboBox: ID_SELECTCOMPUTERNAME - 14942640 + 37866928 dialog-control-document combobox 0 1 0 - 50521232 + 37827824 0 29/2/2005 wbComboBoxProxy @@ -6343,14 +6343,14 @@ For more information, click on the link below. wxStaticText: wxID_STATIC - 15023296 + 37867280 dialog-control-document statictext 0 1 0 - 50521232 + 37827824 0 29/2/2005 wbStaticTextProxy @@ -6400,14 +6400,14 @@ For more information, click on the link below. wxTextCtrl: ID_SELECTCOMPUTERPASSWORD - 15037328 + 37896464 dialog-control-document textctrl 0 1 0 - 50521232 + 37827824 0 29/2/2005 wbTextCtrlProxy @@ -6470,14 +6470,14 @@ For more information, click on the link below. wxBoxSizer V - 15090768 + 37954720 dialog-control-document sizer 0 1 0 - 50500240 + 37702016 0 29/2/2005 wbBoxSizerProxy @@ -6497,14 +6497,14 @@ For more information, click on the link below. <Any platform> wxButton: wxID_OK - 15104432 + 37968368 dialog-control-document dialogcontrol 0 1 0 - 15090768 + 37954720 0 29/2/2005 wbButtonProxy @@ -6551,14 +6551,14 @@ For more information, click on the link below. wxButton: wxID_CANCEL - 15149616 + 37969680 dialog-control-document dialogcontrol 0 1 0 - 15090768 + 37954720 0 29/2/2005 wbButtonProxy @@ -6609,7 +6609,7 @@ For more information, click on the link below. Dialup Logon - 15165216 + 38023440 dialog-document dialog @@ -6677,14 +6677,14 @@ For more information, click on the link below. wxFlexGridSizer - 50531536 + 37899152 dialog-control-document sizer 0 1 0 - 15165216 + 38023440 0 28/5/2005 wbFlexGridSizerProxy @@ -6709,14 +6709,14 @@ For more information, click on the link below. FALSE wxBoxSizer V - 50537328 + 50730928 dialog-control-document sizer 0 1 0 - 50531536 + 37899152 0 28/5/2005 wbBoxSizerProxy @@ -6736,14 +6736,14 @@ For more information, click on the link below. <Any platform> wxFlexGridSizer - 50552400 + 50737840 dialog-control-document sizer 0 1 0 - 50537328 + 50730928 0 28/5/2005 wbFlexGridSizerProxy @@ -6768,14 +6768,14 @@ For more information, click on the link below. FALSE wxStaticText: wxID_STATIC - 50564544 + 50749632 dialog-control-document statictext 0 1 0 - 50552400 + 50737840 0 28/5/2005 wbStaticTextProxy @@ -6825,14 +6825,14 @@ For more information, click on the link below. wxTextCtrl: ID_USERNAME - 50582912 + 50775072 dialog-control-document textctrl 0 1 0 - 50552400 + 50737840 0 28/5/2005 wbTextCtrlProxy @@ -6893,14 +6893,14 @@ For more information, click on the link below. wxStaticText: wxID_STATIC - 50606864 + 50801344 dialog-control-document statictext 0 1 0 - 50552400 + 50737840 0 28/5/2005 wbStaticTextProxy @@ -6950,14 +6950,14 @@ For more information, click on the link below. wxTextCtrl: ID_PASSWORD - 50608192 + 50815408 dialog-control-document textctrl 0 1 0 - 50552400 + 50737840 0 28/5/2005 wbTextCtrlProxy @@ -7020,14 +7020,14 @@ For more information, click on the link below. wxFlexGridSizer - 50650256 + 50836736 dialog-control-document sizer 0 1 0 - 50531536 + 37899152 0 28/5/2005 wbFlexGridSizerProxy @@ -7052,14 +7052,14 @@ For more information, click on the link below. FALSE wxButton: wxID_OK - 50537936 + 50849248 dialog-control-document dialogcontrol 0 1 0 - 50650256 + 50836736 0 28/5/2005 wbButtonProxy @@ -7104,14 +7104,14 @@ For more information, click on the link below. wxButton: wxID_CANCEL - 50675472 + 50859792 dialog-control-document dialogcontrol 0 1 0 - 50650256 + 50836736 0 28/5/2005 wbButtonProxy @@ -7159,7 +7159,7 @@ For more information, click on the link below. Attach to Project Wizard - 50668384 + 50873504 dialog-document wizarddialog @@ -7206,14 +7206,14 @@ For more information, click on the link below. FALSE wxWizardPage: ID_WELCOMEPAGE - 50695248 + 50838368 dialog-control-document panel 0 1 0 - 50668384 + 50873504 0 21/6/2005 wbWizardPageProxy @@ -7251,14 +7251,14 @@ For more information, click on the link below. wxBoxSizer V - 50705296 + 50896656 dialog-control-document sizer 0 1 0 - 50695248 + 50838368 0 21/6/2005 wbBoxSizerProxy @@ -7278,14 +7278,14 @@ For more information, click on the link below. <Any platform> wxStaticText: wxID_STATIC - 50718432 + 50901712 dialog-control-document statictext 0 1 0 - 50705296 + 50896656 0 21/6/2005 wbStaticTextProxy @@ -7335,14 +7335,14 @@ For more information, click on the link below. wxStaticText: wxID_STATIC - 50737360 + 50926192 dialog-control-document statictext 0 1 0 - 50705296 + 50896656 0 21/6/2005 wbStaticTextProxy @@ -7393,14 +7393,14 @@ project. Spacer - 50733360 + 50921776 dialog-control-document spacer 0 1 0 - 50705296 + 50896656 0 21/6/2005 wbSpacerProxy @@ -7421,14 +7421,14 @@ project. wxStaticBoxSizer V - 50765104 + 50951984 dialog-control-document sizer 0 1 0 - 50705296 + 50896656 0 27/6/2005 wbStaticBoxSizerProxy @@ -7452,14 +7452,14 @@ project. __WXDEBUG__ wxFlexGridSizer - 50770688 + 50961840 dialog-control-document sizer 0 1 0 - 50765104 + 50951984 0 27/6/2005 wbFlexGridSizerProxy @@ -7484,14 +7484,14 @@ project. FALSE wxCheckBox: ID_ERRPROJECTPROPERTIES - 50783200 + 50974352 dialog-control-document checkbox 0 1 0 - 50770688 + 50961840 0 27/6/2005 wbCheckBoxProxy @@ -7536,14 +7536,14 @@ project. wxCheckBox: ID_ERRPROJECTCOMM - 50805840 + 50966624 dialog-control-document checkbox 0 1 0 - 50770688 + 50961840 0 27/6/2005 wbCheckBoxProxy @@ -7588,14 +7588,14 @@ project. wxCheckBox: ID_ERRPROJECTPROPERTIESURL - 50822432 + 51006416 dialog-control-document checkbox 0 1 0 - 50770688 + 50961840 0 29/6/2005 wbCheckBoxProxy @@ -7640,14 +7640,14 @@ project. wxCheckBox: ID_ERRACCOUNTCREATIONDISABLED - 50839024 + 51001680 dialog-control-document checkbox 0 1 0 - 50770688 + 50961840 0 29/6/2005 wbCheckBoxProxy @@ -7692,14 +7692,14 @@ project. wxCheckBox: ID_ERRCLIENTACCOUNTCREATIONDISABLED - 50855648 + 51039440 dialog-control-document checkbox 0 1 0 - 50770688 + 50961840 0 9/7/2005 wbCheckBoxProxy @@ -7744,14 +7744,14 @@ project. wxCheckBox: ID_ERRACCOUNTALREADYEXISTS - 50872080 + 51039792 dialog-control-document checkbox 0 1 0 - 50770688 + 50961840 0 29/6/2005 wbCheckBoxProxy @@ -7796,14 +7796,14 @@ project. wxCheckBox: ID_ERRGOOGLECOMM - 50864432 + 51065216 dialog-control-document checkbox 0 1 0 - 50770688 + 50961840 0 27/6/2005 wbCheckBoxProxy @@ -7848,14 +7848,14 @@ project. Spacer - 50898912 + 51067904 dialog-control-document spacer 0 1 0 - 50770688 + 50961840 0 9/7/2005 wbSpacerProxy @@ -7876,14 +7876,14 @@ project. wxCheckBox: ID_ERRYAHOOCOMM - 50906608 + 51090496 dialog-control-document checkbox 0 1 0 - 50770688 + 50961840 0 27/6/2005 wbCheckBoxProxy @@ -7928,14 +7928,14 @@ project. Spacer - 50899248 + 51092320 dialog-control-document spacer 0 1 0 - 50770688 + 50961840 0 9/7/2005 wbSpacerProxy @@ -7956,14 +7956,14 @@ project. wxCheckBox: ID_ERRNETDETECTION - 50926144 + 51116528 dialog-control-document checkbox 0 1 0 - 50770688 + 50961840 0 27/6/2005 wbCheckBoxProxy @@ -8010,14 +8010,14 @@ project. wxStaticText: wxID_STATIC - 50942336 + 51130416 dialog-control-document statictext 0 1 0 - 50705296 + 50896656 0 21/6/2005 wbStaticTextProxy @@ -8069,14 +8069,14 @@ project. wxWizardPage: ID_PROJECTINFOPAGE - 50965392 + 50843888 dialog-control-document panel 0 1 0 - 50668384 + 50873504 0 21/6/2005 wbWizardPageProxy @@ -8115,14 +8115,14 @@ project. wxBoxSizer V - 50975472 + 51152688 dialog-control-document sizer 0 1 0 - 50965392 + 50843888 0 21/6/2005 wbBoxSizerProxy @@ -8142,14 +8142,14 @@ project. <Any platform> wxStaticText: wxID_STATIC - 50706768 + 51165856 dialog-control-document statictext 0 1 0 - 50975472 + 51152688 0 21/6/2005 wbStaticTextProxy @@ -8199,14 +8199,14 @@ project. wxStaticText: wxID_STATIC - 51001504 + 51159520 dialog-control-document statictext 0 1 0 - 50975472 + 51152688 0 21/6/2005 wbStaticTextProxy @@ -8256,14 +8256,14 @@ project. Spacer - 51002256 + 51201040 dialog-control-document spacer 0 1 0 - 50975472 + 51152688 0 21/6/2005 wbSpacerProxy @@ -8284,14 +8284,14 @@ project. wxStaticText: wxID_STATIC - 51025696 + 51216144 dialog-control-document statictext 0 1 0 - 50975472 + 51152688 0 10/7/2005 wbStaticTextProxy @@ -8341,14 +8341,14 @@ project. Spacer - 51021792 + 51232272 dialog-control-document spacer 0 1 0 - 50975472 + 51152688 0 10/7/2005 wbSpacerProxy @@ -8369,14 +8369,14 @@ project. wxFlexGridSizer - 51051408 + 51225344 dialog-control-document sizer 0 1 0 - 50975472 + 51152688 0 21/6/2005 wbFlexGridSizerProxy @@ -8401,14 +8401,14 @@ project. FALSE wxStaticText: ID_PROJECTURLSTATICCTRL - 51057520 + 51208416 dialog-control-document statictext 0 1 0 - 51051408 + 51225344 0 21/6/2005 wbStaticTextProxy @@ -8458,14 +8458,14 @@ project. wxTextCtrl: ID_PROJECTURLCTRL - 51079728 + 51266624 dialog-control-document textctrl 0 1 0 - 51051408 + 51225344 0 21/6/2005 wbTextCtrlProxy @@ -8482,7 +8482,7 @@ project. FALSE <Any platform> m_strProjectURL - wxTextValidator(wxFILTER_NONE, & %VARIABLE%) + CValidateURL( & %VARIABLE%) FALSE FALSE FALSE @@ -8527,14 +8527,14 @@ project. Spacer - 51103424 + 51293968 dialog-control-document spacer 0 1 0 - 50975472 + 51152688 0 21/6/2005 wbSpacerProxy @@ -8555,14 +8555,14 @@ project. wxStaticText: wxID_STATIC - 51110496 + 51301088 dialog-control-document statictext 0 1 0 - 50975472 + 51152688 0 21/6/2005 wbStaticTextProxy @@ -8612,14 +8612,14 @@ project. wxHyperLink: ID_PROJECRINFOBOINCLINK - 51128288 + 51266992 dialog-control-document foreign 0 1 0 - 50975472 + 51152688 0 21/6/2005 wbCustomCtrlProxy:wxHyperLink @@ -8674,14 +8674,14 @@ project. wxWizardPage: ID_PROJECTPROPERTIESPAGE - 51123168 + 51327696 dialog-control-document panel 0 1 0 - 50668384 + 50873504 0 27/6/2005 wbWizardPageProxy @@ -8718,14 +8718,14 @@ project. wxBoxSizer V - 51154448 + 51346016 dialog-control-document sizer 0 1 0 - 51123168 + 51327696 0 27/6/2005 wbBoxSizerProxy @@ -8745,14 +8745,14 @@ project. <Any platform> wxStaticText: wxID_STATIC - 51159248 + 51267264 dialog-control-document statictext 0 1 0 - 51154448 + 51346016 0 27/6/2005 wbStaticTextProxy @@ -8802,14 +8802,14 @@ project. Spacer - 51162896 + 51365040 dialog-control-document spacer 0 1 0 - 51154448 + 51346016 0 27/6/2005 wbSpacerProxy @@ -8830,14 +8830,14 @@ project. wxFlexGridSizer - 51190304 + 51374032 dialog-control-document sizer 0 1 0 - 51154448 + 51346016 0 27/6/2005 wbFlexGridSizerProxy @@ -8862,14 +8862,14 @@ project. FALSE wxStaticBitmap: ID_RETRPROJECTPROPERTIESIMAGECTRL - 51202864 + 51382288 dialog-control-document staticbitmap 0 1 0 - 51190304 + 51374032 0 27/6/2005 wbStaticBitmapProxy @@ -8877,7 +8877,7 @@ project. 10018 wxStaticBitmap m_RetrProjectPropertiesImageCtrl - res/wizquestion.xpm + res/wizprogress1.xpm @@ -8913,14 +8913,14 @@ project. wxStaticText: ID_RETRPROJECTPROPERTIESCTRL - 51203296 + 51397008 dialog-control-document statictext 0 1 0 - 51190304 + 51374032 0 27/6/2005 wbStaticTextProxy @@ -8971,14 +8971,14 @@ project. wxStaticText: ID_FINALPROJECTPROPERTIESTATUSCTRL - 51233520 + 51423680 dialog-control-document statictext 0 1 0 - 51154448 + 51346016 0 27/6/2005 wbStaticTextProxy @@ -9030,14 +9030,14 @@ project. wxWizardPage: ID_ACCOUNTKEYPAGE - 51190832 + 51418848 dialog-control-document panel 0 1 0 - 50668384 + 50873504 0 29/6/2005 wbWizardPageProxy @@ -9075,14 +9075,14 @@ project. wxBoxSizer V - 51260752 + 51399328 dialog-control-document sizer 0 1 0 - 51190832 + 51418848 0 29/6/2005 wbBoxSizerProxy @@ -9102,14 +9102,14 @@ project. <Any platform> wxStaticText: wxID_STATIC - 51265712 + 51450288 dialog-control-document statictext 0 1 0 - 51260752 + 51399328 0 29/6/2005 wbStaticTextProxy @@ -9159,14 +9159,14 @@ project. wxStaticText: wxID_STATIC - 51291088 + 51452112 dialog-control-document statictext 0 1 0 - 51260752 + 51399328 0 29/6/2005 wbStaticTextProxy @@ -9216,14 +9216,14 @@ project. Spacer - 51286672 + 51493440 dialog-control-document spacer 0 1 0 - 51260752 + 51399328 0 29/6/2005 wbSpacerProxy @@ -9244,14 +9244,14 @@ project. wxStaticText: wxID_STATIC - 51310608 + 51500464 dialog-control-document statictext 0 1 0 - 51260752 + 51399328 0 29/6/2005 wbStaticTextProxy @@ -9302,14 +9302,14 @@ wizard and uses BOINC's account key authentication. wxStaticText: wxID_STATIC - 51331568 + 51522272 dialog-control-document statictext 0 1 0 - 51260752 + 51399328 0 30/6/2005 wbStaticTextProxy @@ -9363,14 +9363,14 @@ message. Please copy and paste it into the text box below. wxStaticText: wxID_STATIC - 51359136 + 51515904 dialog-control-document statictext 0 1 0 - 51260752 + 51399328 0 30/6/2005 wbStaticTextProxy @@ -9420,14 +9420,14 @@ message. Please copy and paste it into the text box below. wxStaticText: wxID_STATIC - 51352800 + 51559872 dialog-control-document statictext 0 1 0 - 51260752 + 51399328 0 30/6/2005 wbStaticTextProxy @@ -9477,14 +9477,14 @@ message. Please copy and paste it into the text box below. Spacer - 51391920 + 51555520 dialog-control-document spacer 0 1 0 - 51260752 + 51399328 0 10/7/2005 wbSpacerProxy @@ -9505,14 +9505,14 @@ message. Please copy and paste it into the text box below. wxFlexGridSizer - 51384912 + 51560208 dialog-control-document sizer 0 1 0 - 51260752 + 51399328 0 30/6/2005 wbFlexGridSizerProxy @@ -9537,14 +9537,14 @@ message. Please copy and paste it into the text box below. FALSE wxStaticText: ID_ACCOUNTKEYSTATICCTRL - 51412752 + 51585456 dialog-control-document statictext 0 1 0 - 51384912 + 51560208 0 30/6/2005 wbStaticTextProxy @@ -9594,14 +9594,14 @@ message. Please copy and paste it into the text box below. wxTextCtrl: ID_ACCOUNTKEYCTRL - 51426688 + 51607664 dialog-control-document textctrl 0 1 0 - 51384912 + 51560208 0 30/6/2005 wbTextCtrlProxy @@ -9618,7 +9618,7 @@ message. Please copy and paste it into the text box below. FALSE <Any platform> m_strAccountKey - wxTextValidator(wxFILTER_ALPHANUMERIC, & %VARIABLE%) + CValidateAccountKey( & %VARIABLE%) FALSE FALSE FALSE @@ -9665,14 +9665,14 @@ message. Please copy and paste it into the text box below. wxWizardPage: ID_ACCOUNTINFOPAGE - 51427840 + 51630784 dialog-control-document panel 0 1 0 - 50668384 + 50873504 0 21/6/2005 wbWizardPageProxy @@ -9713,14 +9713,14 @@ message. Please copy and paste it into the text box below. wxBoxSizer V - 51452928 + 51585824 dialog-control-document sizer 0 1 0 - 51427840 + 51630784 0 21/6/2005 wbBoxSizerProxy @@ -9740,14 +9740,14 @@ message. Please copy and paste it into the text box below. <Any platform> wxStaticText: wxID_STATIC - 51466000 + 51647088 dialog-control-document statictext 0 1 0 - 51452928 + 51585824 0 21/6/2005 wbStaticTextProxy @@ -9797,14 +9797,14 @@ message. Please copy and paste it into the text box below. wxStaticText: wxID_STATIC - 51482768 + 51669792 dialog-control-document statictext 0 1 0 - 51452928 + 51585824 0 21/6/2005 wbStaticTextProxy @@ -9854,14 +9854,14 @@ message. Please copy and paste it into the text box below. Spacer - 51486480 + 51690048 dialog-control-document spacer 0 1 0 - 51452928 + 51585824 0 21/6/2005 wbSpacerProxy @@ -9882,14 +9882,14 @@ message. Please copy and paste it into the text box below. wxStaticText: wxID_STATIC - 51459248 + 51697072 dialog-control-document statictext 0 1 0 - 51452928 + 51585824 0 21/6/2005 wbStaticTextProxy @@ -9942,14 +9942,14 @@ project. wxFlexGridSizer - 51524784 + 51713344 dialog-control-document sizer 0 1 0 - 51452928 + 51585824 0 21/6/2005 wbFlexGridSizerProxy @@ -9974,14 +9974,14 @@ project. FALSE wxRadioButton: ID_ACCOUNTCREATECTRL - 51537376 + 51725920 dialog-control-document radiobutton 0 1 0 - 51524784 + 51713344 0 21/6/2005 wbRadioButtonProxy @@ -10025,14 +10025,14 @@ project. wxRadioButton: ID_ACCOUNTUSEEXISTINGCTRL - 51554224 + 51720768 dialog-control-document radiobutton 0 1 0 - 51524784 + 51713344 0 21/6/2005 wbRadioButtonProxy @@ -10077,14 +10077,14 @@ project. wxFlexGridSizer - 51549344 + 51754544 dialog-control-document sizer 0 1 0 - 51452928 + 51585824 0 21/6/2005 wbFlexGridSizerProxy @@ -10109,14 +10109,14 @@ project. FALSE wxStaticText: ID_ACCOUNTEMAILADDRESSSTATICCTRL - 51538464 + 51766400 dialog-control-document statictext 0 1 0 - 51549344 + 51754544 0 21/6/2005 wbStaticTextProxy @@ -10166,14 +10166,14 @@ project. wxTextCtrl: ID_ACCOUNTEMAILADDRESSCTRL - 51599968 + 51782944 dialog-control-document textctrl 0 1 0 - 51549344 + 51754544 0 21/6/2005 wbTextCtrlProxy @@ -10234,14 +10234,14 @@ project. wxStaticText: ID_ACCOUNTPASSWORDSTATICCTRL - 51624864 + 51785424 dialog-control-document statictext 0 1 0 - 51549344 + 51754544 0 21/6/2005 wbStaticTextProxy @@ -10291,14 +10291,14 @@ project. wxTextCtrl: ID_ACCOUNTPASSWORDCTRL - 51638928 + 51823360 dialog-control-document textctrl 0 1 0 - 51549344 + 51754544 0 21/6/2005 wbTextCtrlProxy @@ -10359,14 +10359,14 @@ project. wxStaticText: ID_ACCOUNTCONFIRMPASSWORDSTATICCTRL - 51666272 + 51854784 dialog-control-document statictext 0 1 0 - 51549344 + 51754544 0 21/6/2005 wbStaticTextProxy @@ -10416,14 +10416,14 @@ project. wxTextCtrl: ID_ACCOUNTCONFIRMPASSWORDCTRL - 51687024 + 51868864 dialog-control-document textctrl 0 1 0 - 51549344 + 51754544 0 21/6/2005 wbTextCtrlProxy @@ -10487,14 +10487,14 @@ project. wxWizardPage: ID_ACCOUNTCREATIONPAGE - 51680864 + 51889248 dialog-control-document panel 0 1 0 - 50668384 + 50873504 0 27/6/2005 wbWizardPageProxy @@ -10531,14 +10531,14 @@ project. wxBoxSizer V - 51555104 + 51869424 dialog-control-document sizer 0 1 0 - 51680864 + 51889248 0 27/6/2005 wbBoxSizerProxy @@ -10558,14 +10558,14 @@ project. <Any platform> wxStaticText: wxID_STATIC - 51717536 + 51908032 dialog-control-document statictext 0 1 0 - 51555104 + 51869424 0 27/6/2005 wbStaticTextProxy @@ -10573,7 +10573,7 @@ project. 5105 wxStaticText - Account Creation + Communicating with Project @@ -10614,73 +10614,15 @@ project. - wxStaticText: wxID_STATIC - 51712080 - dialog-control-document - - statictext - 0 - 1 - 0 - 51555104 - 0 - 27/6/2005 - wbStaticTextProxy - wxID_STATIC - 5105 - wxStaticText - - This wizard is now attempting to create a new account or validate your -existing account. - - - - - - FALSE - <Any platform> - - - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - - -1 - -1 - -1 - -1 - Left - Centre - 0 - 5 - TRUE - TRUE - TRUE - TRUE - FALSE - TRUE - FALSE - - - - Spacer - 51760752 + 51949328 dialog-control-document spacer 0 1 0 - 51555104 + 51869424 0 27/6/2005 wbSpacerProxy @@ -10699,16 +10641,16 @@ existing account. FALSE <Any platform> - + wxFlexGridSizer - 51754096 + 51950144 dialog-control-document sizer 0 1 0 - 51555104 + 51869424 0 27/6/2005 wbFlexGridSizerProxy @@ -10731,16 +10673,16 @@ existing account. FALSE FALSE FALSE - + wxStaticBitmap: ID_PROJECTCOMMUNICATIONSIMAGECTRL - 51713104 + 51962720 dialog-control-document staticbitmap 0 1 0 - 51754096 + 51950144 0 27/6/2005 wbStaticBitmapProxy @@ -10748,7 +10690,7 @@ existing account. 10008 wxStaticBitmap m_ProjectCommunitcationsImageCtrl - res/wizquestion.xpm + res/wizprogress1.xpm @@ -10782,16 +10724,16 @@ existing account. - + wxStaticText: ID_PROJECTCOMMUNICATIONSCTRL - 51791552 + 51980096 dialog-control-document statictext 0 1 0 - 51754096 + 51950144 0 27/6/2005 wbStaticTextProxy @@ -10799,7 +10741,7 @@ existing account. 10009 wxStaticText m_ProjectCommunitcationsCtrl - Communicating with BOINC project + Communicating with the project. @@ -10840,16 +10782,16 @@ existing account. - + wxStaticText: ID_FINALACCOUNTCREATIONSTATUSCTRL - 51786528 + 51974176 dialog-control-document statictext 0 1 0 - 51555104 + 51869424 0 27/6/2005 wbStaticTextProxy @@ -10899,16 +10841,16 @@ existing account. - + wxWizardPage: ID_COMPLETIONPAGE - 51824480 + 52011360 dialog-control-document panel 0 1 0 - 50668384 + 50873504 0 24/6/2005 wbWizardPageProxy @@ -10944,16 +10886,16 @@ existing account. -1 - + wxBoxSizer V - 51675184 + 52029664 dialog-control-document sizer 0 1 0 - 51824480 + 52011360 0 27/6/2005 wbBoxSizerProxy @@ -10971,16 +10913,16 @@ existing account. FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 51841088 + 51976176 dialog-control-document statictext 0 1 0 - 51675184 + 52029664 0 27/6/2005 wbStaticTextProxy @@ -11029,16 +10971,16 @@ Wizard - + wxStaticText: wxID_STATIC - 51861312 + 52053536 dialog-control-document statictext 0 1 0 - 51675184 + 52029664 0 27/6/2005 wbStaticTextProxy @@ -11086,16 +11028,16 @@ Wizard - + Spacer - 51882160 + 52074080 dialog-control-document spacer 0 1 0 - 51675184 + 52029664 0 27/6/2005 wbSpacerProxy @@ -11114,16 +11056,16 @@ Wizard FALSE <Any platform> - + wxStaticText: wxID_STATIC - 51889248 + 52081136 dialog-control-document statictext 0 1 0 - 51675184 + 52029664 0 10/7/2005 wbStaticTextProxy @@ -11174,16 +11116,16 @@ account: - + wxWizardPage: ID_COMPLETIONERRORPAGE - 51883792 + 52048144 dialog-control-document panel 0 1 0 - 50668384 + 50873504 0 10/7/2005 wbWizardPageProxy @@ -11218,16 +11160,16 @@ account: -1 - + wxBoxSizer V - 51916208 + 52102960 dialog-control-document sizer 0 1 0 - 51883792 + 52048144 0 10/7/2005 wbBoxSizerProxy @@ -11245,16 +11187,16 @@ account: FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 51921200 + 52116128 dialog-control-document statictext 0 1 0 - 51916208 + 52102960 0 10/7/2005 wbStaticTextProxy @@ -11303,16 +11245,16 @@ Wizard - + Spacer - 51949072 + 52111648 dialog-control-document spacer 0 1 0 - 51916208 + 52102960 0 10/7/2005 wbSpacerProxy @@ -11331,16 +11273,16 @@ Wizard FALSE <Any platform> - + wxStaticText: wxID_STATIC - 51956096 + 52145936 dialog-control-document statictext 0 1 0 - 51916208 + 52102960 0 10/7/2005 wbStaticTextProxy @@ -11390,16 +11332,16 @@ occurred. - + Spacer - 51941520 + 52141680 dialog-control-document spacer 0 1 0 - 51916208 + 52102960 0 10/7/2005 wbSpacerProxy @@ -11418,16 +11360,16 @@ occurred. FALSE <Any platform> - + wxStaticText: wxID_STATIC - 51974576 + 52111904 dialog-control-document statictext 0 1 0 - 51916208 + 52102960 0 10/7/2005 wbStaticTextProxy @@ -11477,16 +11419,16 @@ occurred. - + wxWizardPage: ID_ERRPROJECTNOTDETECTEDPAGE - 51977200 + 52183872 dialog-control-document panel 0 1 0 - 50668384 + 50873504 0 9/7/2005 wbWizardPageProxy @@ -11521,16 +11463,16 @@ occurred. -1 - + wxBoxSizer V - 52006416 + 52054704 dialog-control-document sizer 0 1 0 - 51977200 + 52183872 0 9/7/2005 wbBoxSizerProxy @@ -11548,16 +11490,16 @@ occurred. FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 52011216 + 52200240 dialog-control-document statictext 0 1 0 - 52006416 + 52054704 0 9/7/2005 wbStaticTextProxy @@ -11605,16 +11547,16 @@ occurred. - + wxStaticText: wxID_STATIC - 52033968 + 52221744 dialog-control-document statictext 0 1 0 - 52006416 + 52054704 0 9/7/2005 wbStaticTextProxy @@ -11662,16 +11604,16 @@ occurred. - + Spacer - 52054944 + 52242288 dialog-control-document spacer 0 1 0 - 52006416 + 52054704 0 9/7/2005 wbSpacerProxy @@ -11690,16 +11632,16 @@ occurred. FALSE <Any platform> - + wxStaticText: wxID_STATIC - 52062048 + 52249376 dialog-control-document statictext 0 1 0 - 52006416 + 52054704 0 9/7/2005 wbStaticTextProxy @@ -11748,16 +11690,16 @@ project. - + wxStaticText: wxID_STATIC - 52084032 + 52244176 dialog-control-document statictext 0 1 0 - 52006416 + 52054704 0 9/7/2005 wbStaticTextProxy @@ -11807,16 +11749,16 @@ provided is correct. - + wxStaticText: wxID_STATIC - 52077712 + 52288544 dialog-control-document statictext 0 1 0 - 52006416 + 52054704 0 9/7/2005 wbStaticTextProxy @@ -11864,16 +11806,16 @@ provided is correct. - + wxHyperLink: ID_HYPERLINK - 52121360 + 52309408 dialog-control-document foreign 0 1 0 - 52006416 + 52054704 0 9/7/2005 wbCustomCtrlProxy:wxHyperLink @@ -11926,16 +11868,16 @@ provided is correct. - + wxWizardPage: ID_ERRPROJECTUNAVAILABLEPAGE - 52113952 + 52304512 dialog-control-document panel 0 1 0 - 50668384 + 50873504 0 24/6/2005 wbWizardPageProxy @@ -11970,16 +11912,16 @@ provided is correct. -1 - + wxBoxSizer V - 52145584 + 52282896 dialog-control-document sizer 0 1 0 - 52113952 + 52304512 0 27/6/2005 wbBoxSizerProxy @@ -11997,16 +11939,16 @@ provided is correct. FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 52150576 + 52340128 dialog-control-document statictext 0 1 0 - 52145584 + 52282896 0 27/6/2005 wbStaticTextProxy @@ -12054,16 +11996,16 @@ provided is correct. - + wxStaticText: wxID_STATIC - 52176320 + 52334672 dialog-control-document statictext 0 1 0 - 52145584 + 52282896 0 27/6/2005 wbStaticTextProxy @@ -12111,16 +12053,16 @@ provided is correct. - + Spacer - 52177072 + 52383344 dialog-control-document spacer 0 1 0 - 52145584 + 52282896 0 27/6/2005 wbSpacerProxy @@ -12139,16 +12081,16 @@ provided is correct. FALSE <Any platform> - + wxStaticText: wxID_STATIC - 52195360 + 52390464 dialog-control-document statictext 0 1 0 - 52145584 + 52282896 0 1/7/2005 wbStaticTextProxy @@ -12200,16 +12142,16 @@ would be better. - + wxStaticText: wxID_STATIC - 52216304 + 52404816 dialog-control-document statictext 0 1 0 - 52145584 + 52282896 0 1/7/2005 wbStaticTextProxy @@ -12258,16 +12200,16 @@ about possible network or project issues. - + wxStaticText: wxID_STATIC - 52236912 + 52406672 dialog-control-document statictext 0 1 0 - 52145584 + 52282896 0 1/7/2005 wbStaticTextProxy @@ -12315,16 +12257,16 @@ about possible network or project issues. - + wxHyperLink: ID_PROJECTUNAVAILABLEBOINCLINK - 52259616 + 52442272 dialog-control-document foreign 0 1 0 - 52145584 + 52282896 0 1/7/2005 wbCustomCtrlProxy:wxHyperLink @@ -12377,16 +12319,16 @@ about possible network or project issues. - + wxWizardPage: ID_ERRNOINTERNETCONNECTIONPAGE - 52274048 + 52437328 dialog-control-document panel 0 1 0 - 50668384 + 50873504 0 24/6/2005 wbWizardPageProxy @@ -12421,16 +12363,16 @@ about possible network or project issues. -1 - + wxBoxSizer V - 52292352 + 52466720 dialog-control-document sizer 0 1 0 - 52274048 + 52437328 0 27/6/2005 wbBoxSizerProxy @@ -12448,16 +12390,16 @@ about possible network or project issues. FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 52138528 + 52479872 dialog-control-document statictext 0 1 0 - 52292352 + 52466720 0 27/6/2005 wbStaticTextProxy @@ -12505,16 +12447,16 @@ about possible network or project issues. - + wxStaticText: wxID_STATIC - 52317968 + 52505568 dialog-control-document statictext 0 1 0 - 52292352 + 52466720 0 27/6/2005 wbStaticTextProxy @@ -12563,16 +12505,16 @@ computers on the Internet. - + Spacer - 52310192 + 52501104 dialog-control-document spacer 0 1 0 - 52292352 + 52466720 0 27/6/2005 wbSpacerProxy @@ -12593,16 +12535,16 @@ computers on the Internet. - + wxWizardPage: ID_ERRACCOUNTALREADYEXISTSPAGE - 52335664 + 52437984 dialog-control-document panel 0 1 0 - 50668384 + 50873504 0 24/6/2005 wbWizardPageProxy @@ -12637,16 +12579,16 @@ computers on the Internet. -1 - + wxBoxSizer V - 52354016 + 52532240 dialog-control-document sizer 0 1 0 - 52335664 + 52437984 0 27/6/2005 wbBoxSizerProxy @@ -12664,16 +12606,16 @@ computers on the Internet. FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 52293392 + 52545408 dialog-control-document statictext 0 1 0 - 52354016 + 52532240 0 27/6/2005 wbStaticTextProxy @@ -12721,16 +12663,16 @@ computers on the Internet. - + wxStaticText: wxID_STATIC - 52382976 + 52571104 dialog-control-document statictext 0 1 0 - 52354016 + 52532240 0 27/6/2005 wbStaticTextProxy @@ -12778,16 +12720,16 @@ computers on the Internet. - + Spacer - 52376144 + 52566672 dialog-control-document spacer 0 1 0 - 52354016 + 52532240 0 27/6/2005 wbSpacerProxy @@ -12808,16 +12750,16 @@ computers on the Internet. - + wxWizardPage: ID_ERRACCOUNTCREATIONDISABLEDPAGE - 52401200 + 52501552 dialog-control-document panel 0 1 0 - 50668384 + 50873504 0 29/6/2005 wbWizardPageProxy @@ -12852,16 +12794,16 @@ computers on the Internet. -1 - + wxBoxSizer V - 52419552 + 52599104 dialog-control-document sizer 0 1 0 - 52401200 + 52501552 0 29/6/2005 wbBoxSizerProxy @@ -12879,16 +12821,16 @@ computers on the Internet. FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 52330512 + 52612288 dialog-control-document statictext 0 1 0 - 52419552 + 52599104 0 29/6/2005 wbStaticTextProxy @@ -12936,16 +12878,16 @@ computers on the Internet. - + wxStaticText: wxID_STATIC - 52448480 + 52637088 dialog-control-document statictext 0 1 0 - 52419552 + 52599104 0 29/6/2005 wbStaticTextProxy @@ -12993,16 +12935,16 @@ computers on the Internet. - + Spacer - 52441632 + 52632640 dialog-control-document spacer 0 1 0 - 52419552 + 52599104 0 29/6/2005 wbSpacerProxy @@ -13023,16 +12965,16 @@ computers on the Internet. - + wxWizardPage: ID_ERRPROXYINFOPAGE - 52466976 + 52571472 dialog-control-document panel 0 1 0 - 50668384 + 50873504 0 27/6/2005 wbWizardPageProxy @@ -13067,16 +13009,16 @@ computers on the Internet. -1 - + wxBoxSizer V - 52485296 + 52665584 dialog-control-document sizer 0 1 0 - 52466976 + 52571472 0 27/6/2005 wbBoxSizerProxy @@ -13094,16 +13036,16 @@ computers on the Internet. FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 52490288 + 52670608 dialog-control-document statictext 0 1 0 - 52485296 + 52665584 0 27/6/2005 wbStaticTextProxy @@ -13151,16 +13093,16 @@ computers on the Internet. - + wxStaticText: wxID_STATIC - 52514240 + 52695184 dialog-control-document statictext 0 1 0 - 52485296 + 52665584 0 27/6/2005 wbStaticTextProxy @@ -13208,16 +13150,16 @@ computers on the Internet. - + Spacer - 52507584 + 52698896 dialog-control-document spacer 0 1 0 - 52485296 + 52665584 0 27/6/2005 wbSpacerProxy @@ -13238,16 +13180,16 @@ computers on the Internet. - + wxWizardPage: ID_ERRPROXYHTTPPAGE - 52532384 + 52719872 dialog-control-document panel 0 1 0 - 50668384 + 50873504 0 27/6/2005 wbWizardPageProxy @@ -13286,16 +13228,16 @@ computers on the Internet. -1 - + wxBoxSizer V - 52550656 + 52731664 dialog-control-document sizer 0 1 0 - 52532384 + 52719872 0 27/6/2005 wbBoxSizerProxy @@ -13313,16 +13255,16 @@ computers on the Internet. FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 52461840 + 52736656 dialog-control-document statictext 0 1 0 - 52550656 + 52731664 0 27/6/2005 wbStaticTextProxy @@ -13370,16 +13312,16 @@ computers on the Internet. - + wxStaticText: wxID_STATIC - 52579776 + 52761200 dialog-control-document statictext 0 1 0 - 52550656 + 52731664 0 27/6/2005 wbStaticTextProxy @@ -13427,16 +13369,44 @@ computers on the Internet. - + Spacer - 52573120 + 52756816 dialog-control-document spacer 0 1 0 - 52550656 + 52731664 + 0 + 27/6/2005 + wbSpacerProxy + 5 + 5 + Left + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + <Any platform> + + + Spacer + 52787152 + dialog-control-document + + spacer + 0 + 1 + 0 + 52731664 0 27/6/2005 wbSpacerProxy @@ -13456,43 +13426,15 @@ computers on the Internet. <Any platform> - Spacer - 52599136 - dialog-control-document - - spacer - 0 - 1 - 0 - 52550656 - 0 - 27/6/2005 - wbSpacerProxy - 5 - 5 - Left - Centre - 0 - 5 - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - <Any platform> - - wxButton: ID_HTTPAUTODETECT - 52606816 + 52762368 dialog-control-document dialogcontrol 0 1 0 - 52550656 + 52731664 0 27/6/2005 wbButtonProxy @@ -13536,16 +13478,16 @@ computers on the Internet. - + wxFlexGridSizer - 52608352 + 52808352 dialog-control-document sizer 0 1 0 - 52550656 + 52731664 0 27/6/2005 wbFlexGridSizerProxy @@ -13568,16 +13510,16 @@ computers on the Internet. FALSE FALSE FALSE - + wxStaticText: ID_PROXYHTTPSERVERSTATICCTRL - 52637120 + 52820192 dialog-control-document statictext 0 1 0 - 52608352 + 52808352 0 27/6/2005 wbStaticTextProxy @@ -13625,16 +13567,16 @@ computers on the Internet. - + wxFlexGridSizer - 52632464 + 52835440 dialog-control-document sizer 0 1 0 - 52608352 + 52808352 0 27/6/2005 wbFlexGridSizerProxy @@ -13657,16 +13599,16 @@ computers on the Internet. FALSE FALSE FALSE - + wxTextCtrl: ID_PROXYHTTPSERVERCTRL - 52664128 + 52846832 dialog-control-document textctrl 0 1 0 - 52632464 + 52835440 0 27/6/2005 wbTextCtrlProxy @@ -13725,16 +13667,16 @@ computers on the Internet. - + wxStaticText: ID_PROXYHTTPPORTSTATICCTRL - 52658592 + 52872576 dialog-control-document statictext 0 1 0 - 52632464 + 52835440 0 27/6/2005 wbStaticTextProxy @@ -13782,16 +13724,16 @@ computers on the Internet. - + wxTextCtrl: ID_PROXYHTTPPORTCTRL - 52708384 + 52891408 dialog-control-document textctrl 0 1 0 - 52632464 + 52835440 0 27/6/2005 wbTextCtrlProxy @@ -13851,16 +13793,16 @@ computers on the Internet. - + wxStaticText: ID_PROXYHTTPUSERNAMESTATICCTRL - 52734368 + 52913632 dialog-control-document statictext 0 1 0 - 52608352 + 52808352 0 27/6/2005 wbStaticTextProxy @@ -13908,16 +13850,16 @@ computers on the Internet. - + wxTextCtrl: ID_PROXYHTTPUSERNAMECTRL - 52728016 + 52929312 dialog-control-document textctrl 0 1 0 - 52608352 + 52808352 0 27/6/2005 wbTextCtrlProxy @@ -13976,16 +13918,16 @@ computers on the Internet. - + wxStaticText: ID_PROXYHTTPPASSWORDSTATICCTRL - 52770432 + 52932144 dialog-control-document statictext 0 1 0 - 52608352 + 52808352 0 27/6/2005 wbStaticTextProxy @@ -14033,16 +13975,16 @@ computers on the Internet. - + wxTextCtrl: ID_PROXYHTTPPASSWORDCTRL - 52734736 + 52970240 dialog-control-document textctrl 0 1 0 - 52608352 + 52808352 0 27/6/2005 wbTextCtrlProxy @@ -14104,16 +14046,16 @@ computers on the Internet. - + wxWizardPage: ID_ERRPROXYSOCKSPAGE - 52812848 + 53002000 dialog-control-document panel 0 1 0 - 50668384 + 50873504 0 27/6/2005 wbWizardPageProxy @@ -14152,16 +14094,16 @@ computers on the Internet. -1 - + wxBoxSizer V - 52551104 + 53012080 dialog-control-document sizer 0 1 0 - 52812848 + 53002000 0 27/6/2005 wbBoxSizerProxy @@ -14179,16 +14121,16 @@ computers on the Internet. FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 52822832 + 52691232 dialog-control-document statictext 0 1 0 - 52551104 + 53012080 0 27/6/2005 wbStaticTextProxy @@ -14236,16 +14178,16 @@ computers on the Internet. - + wxStaticText: wxID_STATIC - 52844368 + 53033408 dialog-control-document statictext 0 1 0 - 52551104 + 53012080 0 27/6/2005 wbStaticTextProxy @@ -14293,16 +14235,44 @@ computers on the Internet. - + Spacer - 52864144 + 53047472 dialog-control-document spacer 0 1 0 - 52551104 + 53012080 + 0 + 27/6/2005 + wbSpacerProxy + 5 + 5 + Left + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + <Any platform> + + + Spacer + 52695552 + dialog-control-document + + spacer + 0 + 1 + 0 + 53012080 0 27/6/2005 wbSpacerProxy @@ -14322,43 +14292,15 @@ computers on the Internet. <Any platform> - Spacer - 52873344 - dialog-control-document - - spacer - 0 - 1 - 0 - 52551104 - 0 - 27/6/2005 - wbSpacerProxy - 5 - 5 - Left - Centre - 0 - 5 - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - <Any platform> - - wxButton: ID_SOCKSAUTODETECT - 52881040 + 53061584 dialog-control-document dialogcontrol 0 1 0 - 52551104 + 53012080 0 27/6/2005 wbButtonProxy @@ -14402,16 +14344,16 @@ computers on the Internet. - + wxFlexGridSizer - 52892208 + 53056816 dialog-control-document sizer 0 1 0 - 52551104 + 53012080 0 27/6/2005 wbFlexGridSizerProxy @@ -14434,16 +14376,16 @@ computers on the Internet. FALSE FALSE FALSE - + wxStaticText: ID_PROXYSOCKSSERVERSTATICCTRL - 52904080 + 53085504 dialog-control-document statictext 0 1 0 - 52892208 + 53056816 0 27/6/2005 wbStaticTextProxy @@ -14491,16 +14433,16 @@ computers on the Internet. - + wxFlexGridSizer - 52927440 + 53108256 dialog-control-document sizer 0 1 0 - 52892208 + 53056816 0 27/6/2005 wbFlexGridSizerProxy @@ -14523,16 +14465,16 @@ computers on the Internet. FALSE FALSE FALSE - + wxTextCtrl: ID_PROXYSOCKSSERVERCTRL - 52938816 + 53120784 dialog-control-document textctrl 0 1 0 - 52927440 + 53108256 0 27/6/2005 wbTextCtrlProxy @@ -14591,16 +14533,16 @@ computers on the Internet. - + wxStaticText: ID_PROXYSOCKSPORTSTATICCTRL - 52963872 + 53143008 dialog-control-document statictext 0 1 0 - 52927440 + 53108256 0 27/6/2005 wbStaticTextProxy @@ -14648,16 +14590,16 @@ computers on the Internet. - + wxTextCtrl: ID_PROXYSOCKSPORTCTRL - 52978000 + 53165120 dialog-control-document textctrl 0 1 0 - 52927440 + 53108256 0 27/6/2005 wbTextCtrlProxy @@ -14717,16 +14659,16 @@ computers on the Internet. - + wxStaticText: ID_PROXYSOCKSUSERNAMESTATICCTRL - 53005536 + 53160272 dialog-control-document statictext 0 1 0 - 52892208 + 53056816 0 27/6/2005 wbStaticTextProxy @@ -14774,16 +14716,16 @@ computers on the Internet. - + wxTextCtrl: ID_PROXYSOCKSUSERNAMECTRL - 52957936 + 53201088 dialog-control-document textctrl 0 1 0 - 52892208 + 53056816 0 27/6/2005 wbTextCtrlProxy @@ -14842,16 +14784,16 @@ computers on the Internet. - + wxStaticText: ID_PROXYSOCKSPASSWORDSTATICCTRL - 53042400 + 53224480 dialog-control-document statictext 0 1 0 - 52892208 + 53056816 0 27/6/2005 wbStaticTextProxy @@ -14899,16 +14841,16 @@ computers on the Internet. - + wxTextCtrl: ID_PROXYSOCKSPASSWORDCTRL - 53063120 + 53246736 dialog-control-document textctrl 0 1 0 - 52892208 + 53056816 0 27/6/2005 wbTextCtrlProxy @@ -14970,16 +14912,16 @@ computers on the Internet. - + wxWizardPage: ID_ERRPROXYCOMPLETIONPAGE - 53057056 + 53267504 dialog-control-document panel 0 1 0 - 50668384 + 50873504 0 27/6/2005 wbWizardPageProxy @@ -15014,16 +14956,16 @@ computers on the Internet. -1 - + wxBoxSizer V - 53036880 + 53277648 dialog-control-document sizer 0 1 0 - 53057056 + 53267504 0 27/6/2005 wbBoxSizerProxy @@ -15041,16 +14983,16 @@ computers on the Internet. FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 53095104 + 53220016 dialog-control-document statictext 0 1 0 - 53036880 + 53277648 0 27/6/2005 wbStaticTextProxy @@ -15098,16 +15040,16 @@ computers on the Internet. - + wxStaticText: wxID_STATIC - 53088752 + 53297360 dialog-control-document statictext 0 1 0 - 53036880 + 53277648 0 27/6/2005 wbStaticTextProxy @@ -15155,16 +15097,16 @@ computers on the Internet. - + Spacer - 53130416 + 53320480 dialog-control-document spacer 0 1 0 - 53036880 + 53277648 0 27/6/2005 wbSpacerProxy @@ -15185,16 +15127,16 @@ computers on the Internet. - + wxWizardPage: ID_ERRREFCOUNTPAGE - 53138736 + 53328784 dialog-control-document panel 0 1 0 - 50668384 + 50873504 0 9/7/2005 wbWizardPageProxy @@ -15227,16 +15169,16 @@ computers on the Internet. -1 - + wxBoxSizer V - 53095472 + 53339024 dialog-control-document sizer 0 1 0 - 53138736 + 53328784 0 9/7/2005 wbBoxSizerProxy @@ -15254,16 +15196,16 @@ computers on the Internet. FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 53154416 + 53298352 dialog-control-document statictext 0 1 0 - 53095472 + 53339024 0 9/7/2005 wbStaticTextProxy @@ -15311,16 +15253,16 @@ computers on the Internet. - + wxStaticText: wxID_STATIC - 53177120 + 53363440 dialog-control-document statictext 0 1 0 - 53095472 + 53339024 0 9/7/2005 wbStaticTextProxy @@ -15368,16 +15310,16 @@ computers on the Internet. - + Spacer - 53197376 + 53384800 dialog-control-document spacer 0 1 0 - 53095472 + 53339024 0 9/7/2005 wbSpacerProxy @@ -15396,16 +15338,16 @@ computers on the Internet. FALSE <Any platform> - + wxStaticText: wxID_STATIC - 53204400 + 53391856 dialog-control-document statictext 0 1 0 - 53095472 + 53339024 0 9/7/2005 wbStaticTextProxy @@ -15454,16 +15396,16 @@ so that DialogBlocks doesn't nuke the refences to them. - + wxBoxSizer H - 53220768 + 53366352 dialog-control-document sizer 0 1 0 - 53095472 + 53339024 0 9/7/2005 wbBoxSizerProxy @@ -15481,16 +15423,16 @@ so that DialogBlocks doesn't nuke the refences to them. FALSE FALSE <Any platform> - + wxStaticBitmap: wxID_STATIC - 53234640 + 53413904 dialog-control-document staticbitmap 0 1 0 - 53220768 + 53366352 0 11/7/2005 wbStaticBitmapProxy @@ -15532,16 +15474,16 @@ so that DialogBlocks doesn't nuke the refences to them. - + wxStaticBitmap: wxID_STATIC - 53243968 + 53429344 dialog-control-document staticbitmap 0 1 0 - 53220768 + 53366352 0 11/7/2005 wbStaticBitmapProxy @@ -15583,16 +15525,16 @@ so that DialogBlocks doesn't nuke the refences to them. - + wxStaticBitmap: wxID_STATIC - 53262672 + 53450304 dialog-control-document staticbitmap 0 1 0 - 53220768 + 53366352 0 11/7/2005 wbStaticBitmapProxy @@ -15634,16 +15576,16 @@ so that DialogBlocks doesn't nuke the refences to them. - + wxStaticBitmap: wxID_STATIC - 53279696 + 53467344 dialog-control-document staticbitmap 0 1 0 - 53220768 + 53366352 0 11/7/2005 wbStaticBitmapProxy @@ -15685,16 +15627,16 @@ so that DialogBlocks doesn't nuke the refences to them. - + wxStaticBitmap: wxID_STATIC - 53295792 + 53451600 dialog-control-document staticbitmap 0 1 0 - 53220768 + 53366352 0 9/7/2005 wbStaticBitmapProxy @@ -15736,16 +15678,16 @@ so that DialogBlocks doesn't nuke the refences to them. - + wxStaticBitmap: wxID_STATIC - 53312800 + 53496112 dialog-control-document staticbitmap 0 1 0 - 53220768 + 53366352 0 9/7/2005 wbStaticBitmapProxy @@ -15792,306 +15734,306 @@ so that DialogBlocks doesn't nuke the refences to them. - + Images - 53324384 + 53445360 html-document bitmapsfolder 1 1 0 - 14629696 + 14626976 1 - + boincsm.xpm - 53323312 + 53321584 image-document res/boincsm.xpm image 0 0 0 - 53324384 + 53445360 0 1/3/2005 100 - + boinc.xpm - 53323056 + 53320928 image-document res/boinc.xpm image 0 0 0 - 53324384 + 53445360 0 21/6/2005 100 - + boinc_mac.xpm - 53322800 + 53339728 image-document res/boinc_mac.xpm image 0 0 0 - 53324384 + 53445360 0 21/6/2005 100 - + BOINCGUIApp.xpm - 53322592 + 53339584 image-document res/BOINCGUIApp.xpm image 0 0 0 - 53324384 + 53445360 0 21/6/2005 100 - + connect.xpm - 53322384 + 53339408 image-document res/connect.xpm image 0 0 0 - 53324384 + 53445360 0 21/6/2005 100 - + disconnect.xpm - 53322176 + 53329776 image-document res/disconnect.xpm image 0 0 0 - 53324384 + 53445360 0 21/6/2005 100 - + mess.xpm - 53323888 + 53329632 image-document res/mess.xpm image 0 0 0 - 53324384 + 53445360 0 21/6/2005 100 - + proj.xpm - 53321760 + 53329424 image-document res/proj.xpm image 0 0 0 - 53324384 + 53445360 0 21/6/2005 100 - + result.xpm - 53329712 + 53329216 image-document res/result.xpm image 0 0 0 - 53324384 + 53445360 0 21/6/2005 100 - + usage.xpm - 53329504 + 53340784 image-document res/usage.xpm image 0 0 0 - 53324384 + 53445360 0 21/6/2005 100 - + xfer.xpm - 53329264 + 53340640 image-document res/xfer.xpm image 0 0 0 - 53324384 + 53445360 0 21/6/2005 100 - + attachprojectwizard.xpm - 53329008 + 53340432 image-document res/attachprojectwizard.xpm image 0 0 0 - 53324384 + 53445360 0 21/6/2005 100 - + wizfailure.xpm - 53328800 + 53340224 image-document res/wizfailure.xpm image 0 0 0 - 53324384 + 53445360 0 25/6/2005 100 - + wizsuccess.xpm - 53328592 + 53340016 image-document res/wizsuccess.xpm image 0 0 0 - 53324384 + 53445360 0 25/6/2005 100 - + wizprogress1.xpm - 53328352 + 53314352 image-document res/wizprogress1.xpm image 0 0 0 - 53324384 + 53445360 0 11/7/2005 100 - + wizprogress2.xpm - 53328144 + 53314144 image-document res/wizprogress2.xpm image 0 0 0 - 53324384 + 53445360 0 11/7/2005 100 - + wizprogress3.xpm - 53327888 + 53313936 image-document res/wizprogress3.xpm image 0 0 0 - 53324384 + 53445360 0 11/7/2005 100 - + wizprogress4.xpm - 53327616 + 53313728 image-document res/wizprogress4.xpm image 0 0 0 - 53324384 + 53445360 0 11/7/2005 100 - + Sources - 53327760 + 53313600 html-document sourcesfolder 1 1 0 - 14629696 + 14626976 1 10/2/2005 - + ValidateAccountKey.cpp - 53327216 + 53364384 source-editor-document ValidateAccountKey.cpp source-editor 0 0 1 - 53327760 + 53313600 0 29/2/2005 - + ValidateURL.cpp - 53326976 + 53364208 source-editor-document ValidateURL.cpp source-editor 0 0 1 - 53327760 + 53313600 0 29/2/2005 diff --git a/clientgui/ValidateAccountKey.cpp b/clientgui/ValidateAccountKey.cpp index 490e8bdfd9..04b2952d3e 100644 --- a/clientgui/ValidateAccountKey.cpp +++ b/clientgui/ValidateAccountKey.cpp @@ -61,11 +61,13 @@ bool CValidateAccountKey::Validate(wxWindow *parent) { if (!control->IsEnabled()) return TRUE; + bool ok = TRUE; wxString val(control->GetValue()); - bool ok = TRUE; - - if ((!wxIsAlphaNumeric(val))) { + if (val.Length() == 0) { + ok = FALSE; + m_errormsg = _("Please specify an account key to continue."); + } else if ((!wxIsAlphaNumeric(val))) { ok = FALSE; m_errormsg = _("Invalid Account Key; please enter a valid Account Key"); } diff --git a/clientgui/ValidateURL.cpp b/clientgui/ValidateURL.cpp index ccd06ca9bf..c3e8c51e41 100644 --- a/clientgui/ValidateURL.cpp +++ b/clientgui/ValidateURL.cpp @@ -59,11 +59,14 @@ bool CValidateURL::Validate(wxWindow *parent) { if (!control->IsEnabled()) return TRUE; - wxURL val(control->GetValue()); - bool ok = TRUE; + wxURL val(control->GetValue()); + wxString str(control->GetValue()); - if (wxURL_NOERR != val.GetError()) { + if (str.Length() == 0) { + ok = FALSE; + m_errormsg = _("Please specify a URL to continue.\nAn example would be:\nhttp://boinc.berkeley.edu/"); + } else if (wxURL_NOERR != val.GetError()) { ok = FALSE; if ((wxURL_NOPROTO == val.GetError()) || wxURL_SNTXERR == val.GetError()) { diff --git a/clientgui/WizAttachProject.cpp b/clientgui/WizAttachProject.cpp index 0bf6168c60..be4cb34fde 100644 --- a/clientgui/WizAttachProject.cpp +++ b/clientgui/WizAttachProject.cpp @@ -447,7 +447,31 @@ void CWizAttachProject::ProcessCancelEvent( wxWizardEvent& event ) { wxICON_QUESTION | wxYES_NO, this ); - + + // Page specific rules - Disable the validator(s) + if (wxYES == iRetVal) { + if (GetCurrentPage() == m_ProjectInfoPage) { + m_ProjectInfoPage->m_ProjectUrlCtrl->SetValidator(wxDefaultValidator); + } else if (GetCurrentPage() == m_AccountKeyPage) { + m_AccountKeyPage->m_AccountKeyCtrl->SetValidator(wxDefaultValidator); + } else if (GetCurrentPage() == m_AccountInfoPage) { + m_AccountInfoPage->m_AccountEmailAddressCtrl->SetValidator(wxDefaultValidator); + m_AccountInfoPage->m_AccountPasswordCtrl->SetValidator(wxDefaultValidator); + m_AccountInfoPage->m_AccountConfirmPasswordCtrl->SetValidator(wxDefaultValidator); + } else if (GetCurrentPage() == m_ErrProxyHTTPPage) { + m_ErrProxyHTTPPage->m_ProxyHTTPServerCtrl->SetValidator(wxDefaultValidator); + m_ErrProxyHTTPPage->m_ProxyHTTPPortCtrl->SetValidator(wxDefaultValidator); + m_ErrProxyHTTPPage->m_ProxyHTTPUsernameCtrl->SetValidator(wxDefaultValidator); + m_ErrProxyHTTPPage->m_ProxyHTTPPasswordCtrl->SetValidator(wxDefaultValidator); + } else if (GetCurrentPage() == m_ErrProxySOCKSPage) { + m_ErrProxySOCKSPage->m_ProxySOCKSServerCtrl->SetValidator(wxDefaultValidator); + m_ErrProxySOCKSPage->m_ProxySOCKSPortCtrl->SetValidator(wxDefaultValidator); + m_ErrProxySOCKSPage->m_ProxySOCKSUsernameCtrl->SetValidator(wxDefaultValidator); + m_ErrProxySOCKSPage->m_ProxySOCKSPasswordCtrl->SetValidator(wxDefaultValidator); + } + } + + // Generic rules if (GetCurrentPage() != m_WelcomePage) { event.Veto(); if (wxYES == iRetVal) { @@ -882,7 +906,7 @@ void CProjectInfoPage::CreateControls() itemBoxSizer22->Add(itemHyperLink33, 0, wxALIGN_LEFT|wxALL, 5); // Set validators - m_ProjectUrlCtrl->SetValidator( wxTextValidator(wxFILTER_NONE, & m_strProjectURL) ); + m_ProjectUrlCtrl->SetValidator( CValidateURL( & m_strProjectURL) ); ////@end CProjectInfoPage content construction } @@ -1061,7 +1085,7 @@ void CProjectPropertiesPage::CreateControls() wxFlexGridSizer* itemFlexGridSizer38 = new wxFlexGridSizer(0, 2, 0, 0); itemBoxSizer35->Add(itemFlexGridSizer38, 0, wxALIGN_LEFT|wxALL, 5); - wxBitmap m_RetrProjectPropertiesImageCtrlBitmap(itemWizardPage34->GetBitmapResource(wxT("res/wizquestion.xpm"))); + wxBitmap m_RetrProjectPropertiesImageCtrlBitmap(itemWizardPage34->GetBitmapResource(wxT("res/wizprogress1.xpm"))); m_RetrProjectPropertiesImageCtrl = new wxStaticBitmap; m_RetrProjectPropertiesImageCtrl->Create( itemWizardPage34, ID_RETRPROJECTPROPERTIESIMAGECTRL, m_RetrProjectPropertiesImageCtrlBitmap, wxDefaultPosition, wxSize(16, 16), 0 ); itemFlexGridSizer38->Add(m_RetrProjectPropertiesImageCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); @@ -1519,7 +1543,7 @@ void CAccountKeyPage::CreateControls() itemFlexGridSizer52->Add(m_AccountKeyCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); // Set validators - m_AccountKeyCtrl->SetValidator( wxTextValidator(wxFILTER_ALPHANUMERIC, & m_strAccountKey) ); + m_AccountKeyCtrl->SetValidator( CValidateAccountKey( & m_strAccountKey) ); ////@end CAccountKeyPage content construction } @@ -1969,27 +1993,23 @@ void CAccountCreationPage::CreateControls() itemWizardPage71->SetSizer(itemBoxSizer72); wxStaticText* itemStaticText73 = new wxStaticText; - itemStaticText73->Create( itemWizardPage71, wxID_STATIC, _("Account Creation"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText73->Create( itemWizardPage71, wxID_STATIC, _("Communicating with Project"), wxDefaultPosition, wxDefaultSize, 0 ); itemStaticText73->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); itemBoxSizer72->Add(itemStaticText73, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText74 = new wxStaticText; - itemStaticText74->Create( itemWizardPage71, wxID_STATIC, _("This wizard is now attempting to create a new account or validate your\nexisting account."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer72->Add(itemStaticText74, 0, wxALIGN_LEFT|wxALL, 5); - itemBoxSizer72->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - wxFlexGridSizer* itemFlexGridSizer76 = new wxFlexGridSizer(0, 2, 0, 0); - itemBoxSizer72->Add(itemFlexGridSizer76, 0, wxALIGN_LEFT|wxALL, 5); + wxFlexGridSizer* itemFlexGridSizer75 = new wxFlexGridSizer(0, 2, 0, 0); + itemBoxSizer72->Add(itemFlexGridSizer75, 0, wxALIGN_LEFT|wxALL, 5); - wxBitmap m_ProjectCommunitcationsImageCtrlBitmap(itemWizardPage71->GetBitmapResource(wxT("res/wizquestion.xpm"))); + wxBitmap m_ProjectCommunitcationsImageCtrlBitmap(itemWizardPage71->GetBitmapResource(wxT("res/wizprogress1.xpm"))); m_ProjectCommunitcationsImageCtrl = new wxStaticBitmap; m_ProjectCommunitcationsImageCtrl->Create( itemWizardPage71, ID_PROJECTCOMMUNICATIONSIMAGECTRL, m_ProjectCommunitcationsImageCtrlBitmap, wxDefaultPosition, wxSize(16, 16), 0 ); - itemFlexGridSizer76->Add(m_ProjectCommunitcationsImageCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemFlexGridSizer75->Add(m_ProjectCommunitcationsImageCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProjectCommunitcationsCtrl = new wxStaticText; - m_ProjectCommunitcationsCtrl->Create( itemWizardPage71, ID_PROJECTCOMMUNICATIONSCTRL, _("Communicating with BOINC project"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer76->Add(m_ProjectCommunitcationsCtrl, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProjectCommunitcationsCtrl->Create( itemWizardPage71, ID_PROJECTCOMMUNICATIONSCTRL, _("Communicating with the project."), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer75->Add(m_ProjectCommunitcationsCtrl, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_FinalAccountCreationStatusCtrl = new wxStaticText; m_FinalAccountCreationStatusCtrl->Create( itemWizardPage71, ID_FINALACCOUNTCREATIONSTATUSCTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); @@ -2317,25 +2337,25 @@ bool CCompletionPage::Create( wxWizard* parent ) void CCompletionPage::CreateControls() { ////@begin CCompletionPage content construction - CCompletionPage* itemWizardPage80 = this; + CCompletionPage* itemWizardPage79 = this; - wxBoxSizer* itemBoxSizer81 = new wxBoxSizer(wxVERTICAL); - itemWizardPage80->SetSizer(itemBoxSizer81); + wxBoxSizer* itemBoxSizer80 = new wxBoxSizer(wxVERTICAL); + itemWizardPage79->SetSizer(itemBoxSizer80); + + wxStaticText* itemStaticText81 = new wxStaticText; + itemStaticText81->Create( itemWizardPage79, wxID_STATIC, _("Completing the Attach to Project\nWizard"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText81->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer80->Add(itemStaticText81, 0, wxALIGN_LEFT|wxALL, 5); wxStaticText* itemStaticText82 = new wxStaticText; - itemStaticText82->Create( itemWizardPage80, wxID_STATIC, _("Completing the Attach to Project\nWizard"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText82->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer81->Add(itemStaticText82, 0, wxALIGN_LEFT|wxALL, 5); + itemStaticText82->Create( itemWizardPage79, wxID_STATIC, _("You have successfully completed the Attach to Project wizard."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer80->Add(itemStaticText82, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText83 = new wxStaticText; - itemStaticText83->Create( itemWizardPage80, wxID_STATIC, _("You have successfully completed the Attach to Project wizard."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer81->Add(itemStaticText83, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer80->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - itemBoxSizer81->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - - wxStaticText* itemStaticText85 = new wxStaticText; - itemStaticText85->Create( itemWizardPage80, wxID_STATIC, _("BOINC will now attach to the following project with the following\naccount:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer81->Add(itemStaticText85, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText84 = new wxStaticText; + itemStaticText84->Create( itemWizardPage79, wxID_STATIC, _("BOINC will now attach to the following project with the following\naccount:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer80->Add(itemStaticText84, 0, wxALIGN_LEFT|wxALL, 5); ////@end CCompletionPage content construction } @@ -2519,27 +2539,27 @@ bool CCompletionErrorPage::Create( wxWizard* parent ) void CCompletionErrorPage::CreateControls() { ////@begin CCompletionErrorPage content construction - CCompletionErrorPage* itemWizardPage86 = this; + CCompletionErrorPage* itemWizardPage85 = this; - wxBoxSizer* itemBoxSizer87 = new wxBoxSizer(wxVERTICAL); - itemWizardPage86->SetSizer(itemBoxSizer87); + wxBoxSizer* itemBoxSizer86 = new wxBoxSizer(wxVERTICAL); + itemWizardPage85->SetSizer(itemBoxSizer86); - wxStaticText* itemStaticText88 = new wxStaticText; - itemStaticText88->Create( itemWizardPage86, wxID_STATIC, _("Completing the Attach to Project\nWizard"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText88->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer87->Add(itemStaticText88, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText87 = new wxStaticText; + itemStaticText87->Create( itemWizardPage85, wxID_STATIC, _("Completing the Attach to Project\nWizard"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText87->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer86->Add(itemStaticText87, 0, wxALIGN_LEFT|wxALL, 5); - itemBoxSizer87->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer86->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText90 = new wxStaticText; - itemStaticText90->Create( itemWizardPage86, wxID_STATIC, _("The Attach to Project Wizard did not complete successfully,\neither because you clicked Cancel or because an error\noccurred."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer87->Add(itemStaticText90, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText89 = new wxStaticText; + itemStaticText89->Create( itemWizardPage85, wxID_STATIC, _("The Attach to Project Wizard did not complete successfully,\neither because you clicked Cancel or because an error\noccurred."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer86->Add(itemStaticText89, 0, wxALIGN_LEFT|wxALL, 5); - itemBoxSizer87->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer86->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText92 = new wxStaticText; - itemStaticText92->Create( itemWizardPage86, wxID_STATIC, _("To close this wizard, click Finish."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer87->Add(itemStaticText92, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText91 = new wxStaticText; + itemStaticText91->Create( itemWizardPage85, wxID_STATIC, _("To close this wizard, click Finish."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer86->Add(itemStaticText91, 0, wxALIGN_LEFT|wxALL, 5); ////@end CCompletionErrorPage content construction } @@ -2670,37 +2690,37 @@ bool CErrProjectNotDetectedPage::Create( wxWizard* parent ) void CErrProjectNotDetectedPage::CreateControls() { ////@begin CErrProjectNotDetectedPage content construction - CErrProjectNotDetectedPage* itemWizardPage93 = this; + CErrProjectNotDetectedPage* itemWizardPage92 = this; - wxBoxSizer* itemBoxSizer94 = new wxBoxSizer(wxVERTICAL); - itemWizardPage93->SetSizer(itemBoxSizer94); + wxBoxSizer* itemBoxSizer93 = new wxBoxSizer(wxVERTICAL); + itemWizardPage92->SetSizer(itemBoxSizer93); + + wxStaticText* itemStaticText94 = new wxStaticText; + itemStaticText94->Create( itemWizardPage92, wxID_STATIC, _("Project Unavailable"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText94->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer93->Add(itemStaticText94, 0, wxALIGN_LEFT|wxALL, 5); wxStaticText* itemStaticText95 = new wxStaticText; - itemStaticText95->Create( itemWizardPage93, wxID_STATIC, _("Project Unavailable"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText95->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer94->Add(itemStaticText95, 0, wxALIGN_LEFT|wxALL, 5); + itemStaticText95->Create( itemWizardPage92, wxID_STATIC, _("This project does not appear to exist."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer93->Add(itemStaticText95, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText96 = new wxStaticText; - itemStaticText96->Create( itemWizardPage93, wxID_STATIC, _("This project does not appear to exist."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer94->Add(itemStaticText96, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer93->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - itemBoxSizer94->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText97 = new wxStaticText; + itemStaticText97->Create( itemWizardPage92, wxID_STATIC, _("The project URL provided does not appear to be a BOINC based\nproject."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer93->Add(itemStaticText97, 0, wxALIGN_LEFT|wxALL, 5); wxStaticText* itemStaticText98 = new wxStaticText; - itemStaticText98->Create( itemWizardPage93, wxID_STATIC, _("The project URL provided does not appear to be a BOINC based\nproject."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer94->Add(itemStaticText98, 0, wxALIGN_LEFT|wxALL, 5); + itemStaticText98->Create( itemWizardPage92, wxID_STATIC, _("You might want to checkout the project’s homepage for news\nabout possible project issues and verify that the project URL\nprovided is correct."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer93->Add(itemStaticText98, 0, wxALIGN_LEFT|wxALL, 5); wxStaticText* itemStaticText99 = new wxStaticText; - itemStaticText99->Create( itemWizardPage93, wxID_STATIC, _("You might want to checkout the project’s homepage for news\nabout possible project issues and verify that the project URL\nprovided is correct."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer94->Add(itemStaticText99, 0, wxALIGN_LEFT|wxALL, 5); + itemStaticText99->Create( itemWizardPage92, wxID_STATIC, _("More information about BOINC can be found here:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer93->Add(itemStaticText99, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText100 = new wxStaticText; - itemStaticText100->Create( itemWizardPage93, wxID_STATIC, _("More information about BOINC can be found here:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer94->Add(itemStaticText100, 0, wxALIGN_LEFT|wxALL, 5); - - wxHyperLink* itemHyperLink101 = new wxHyperLink; - itemHyperLink101->Create( itemWizardPage93, ID_HYPERLINK, wxT("http://boinc.berkeley.edu/"), wxDefaultPosition, wxDefaultSize, wxNO_BORDER ); - itemBoxSizer94->Add(itemHyperLink101, 0, wxALIGN_LEFT|wxALL, 5); + wxHyperLink* itemHyperLink100 = new wxHyperLink; + itemHyperLink100->Create( itemWizardPage92, ID_HYPERLINK, wxT("http://boinc.berkeley.edu/"), wxDefaultPosition, wxDefaultSize, wxNO_BORDER ); + itemBoxSizer93->Add(itemHyperLink100, 0, wxALIGN_LEFT|wxALL, 5); ////@end CErrProjectNotDetectedPage content construction } @@ -2831,37 +2851,37 @@ bool CErrProjectUnavailablePage::Create( wxWizard* parent ) void CErrProjectUnavailablePage::CreateControls() { ////@begin CErrProjectUnavailablePage content construction - CErrProjectUnavailablePage* itemWizardPage102 = this; + CErrProjectUnavailablePage* itemWizardPage101 = this; - wxBoxSizer* itemBoxSizer103 = new wxBoxSizer(wxVERTICAL); - itemWizardPage102->SetSizer(itemBoxSizer103); + wxBoxSizer* itemBoxSizer102 = new wxBoxSizer(wxVERTICAL); + itemWizardPage101->SetSizer(itemBoxSizer102); + + wxStaticText* itemStaticText103 = new wxStaticText; + itemStaticText103->Create( itemWizardPage101, wxID_STATIC, _("Project Temporarily Unavailable"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText103->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer102->Add(itemStaticText103, 0, wxALIGN_LEFT|wxALL, 5); wxStaticText* itemStaticText104 = new wxStaticText; - itemStaticText104->Create( itemWizardPage102, wxID_STATIC, _("Project Temporarily Unavailable"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText104->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer103->Add(itemStaticText104, 0, wxALIGN_LEFT|wxALL, 5); + itemStaticText104->Create( itemWizardPage101, wxID_STATIC, _("This project appears to be offline or down for maintenance."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer102->Add(itemStaticText104, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText105 = new wxStaticText; - itemStaticText105->Create( itemWizardPage102, wxID_STATIC, _("This project appears to be offline or down for maintenance."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer103->Add(itemStaticText105, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer102->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - itemBoxSizer103->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText106 = new wxStaticText; + itemStaticText106->Create( itemWizardPage101, wxID_STATIC, _("This wizard was able to detect a network connection and able to\ncommunicate with Yahoo and/or Google which would indicate that\nnetwork communication is not obstructed. This seems to be a\ntransient error and trying to attach to this project at a later time\nwould be better."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer102->Add(itemStaticText106, 0, wxALIGN_LEFT|wxALL, 5); wxStaticText* itemStaticText107 = new wxStaticText; - itemStaticText107->Create( itemWizardPage102, wxID_STATIC, _("This wizard was able to detect a network connection and able to\ncommunicate with Yahoo and/or Google which would indicate that\nnetwork communication is not obstructed. This seems to be a\ntransient error and trying to attach to this project at a later time\nwould be better."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer103->Add(itemStaticText107, 0, wxALIGN_LEFT|wxALL, 5); + itemStaticText107->Create( itemWizardPage101, wxID_STATIC, _("You might want to checkout the project’s homepage for news\nabout possible network or project issues."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer102->Add(itemStaticText107, 0, wxALIGN_LEFT|wxALL, 5); wxStaticText* itemStaticText108 = new wxStaticText; - itemStaticText108->Create( itemWizardPage102, wxID_STATIC, _("You might want to checkout the project’s homepage for news\nabout possible network or project issues."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer103->Add(itemStaticText108, 0, wxALIGN_LEFT|wxALL, 5); + itemStaticText108->Create( itemWizardPage101, wxID_STATIC, _("More information about BOINC can be found here:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer102->Add(itemStaticText108, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText109 = new wxStaticText; - itemStaticText109->Create( itemWizardPage102, wxID_STATIC, _("More information about BOINC can be found here:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer103->Add(itemStaticText109, 0, wxALIGN_LEFT|wxALL, 5); - - wxHyperLink* itemHyperLink110 = new wxHyperLink; - itemHyperLink110->Create( itemWizardPage102, ID_PROJECTUNAVAILABLEBOINCLINK, wxT("http://boinc.berkeley.edu/"), wxDefaultPosition, wxDefaultSize, wxNO_BORDER ); - itemBoxSizer103->Add(itemHyperLink110, 0, wxALIGN_LEFT|wxALL, 5); + wxHyperLink* itemHyperLink109 = new wxHyperLink; + itemHyperLink109->Create( itemWizardPage101, ID_PROJECTUNAVAILABLEBOINCLINK, wxT("http://boinc.berkeley.edu/"), wxDefaultPosition, wxDefaultSize, wxNO_BORDER ); + itemBoxSizer102->Add(itemHyperLink109, 0, wxALIGN_LEFT|wxALL, 5); ////@end CErrProjectUnavailablePage content construction } @@ -2994,21 +3014,21 @@ bool CErrNoInternetConnectionPage::Create( wxWizard* parent ) void CErrNoInternetConnectionPage::CreateControls() { ////@begin CErrNoInternetConnectionPage content construction - CErrNoInternetConnectionPage* itemWizardPage111 = this; + CErrNoInternetConnectionPage* itemWizardPage110 = this; - wxBoxSizer* itemBoxSizer112 = new wxBoxSizer(wxVERTICAL); - itemWizardPage111->SetSizer(itemBoxSizer112); + wxBoxSizer* itemBoxSizer111 = new wxBoxSizer(wxVERTICAL); + itemWizardPage110->SetSizer(itemBoxSizer111); + + wxStaticText* itemStaticText112 = new wxStaticText; + itemStaticText112->Create( itemWizardPage110, wxID_STATIC, _("No Internet Connection Detected"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText112->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer111->Add(itemStaticText112, 0, wxALIGN_LEFT|wxALL, 5); wxStaticText* itemStaticText113 = new wxStaticText; - itemStaticText113->Create( itemWizardPage111, wxID_STATIC, _("No Internet Connection Detected"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText113->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer112->Add(itemStaticText113, 0, wxALIGN_LEFT|wxALL, 5); + itemStaticText113->Create( itemWizardPage110, wxID_STATIC, _("Could not communicate with the desired project or any of the known\ncomputers on the Internet."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer111->Add(itemStaticText113, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText114 = new wxStaticText; - itemStaticText114->Create( itemWizardPage111, wxID_STATIC, _("Could not communicate with the desired project or any of the known\ncomputers on the Internet."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer112->Add(itemStaticText114, 0, wxALIGN_LEFT|wxALL, 5); - - itemBoxSizer112->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer111->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); ////@end CErrNoInternetConnectionPage content construction } @@ -3145,21 +3165,21 @@ bool CErrAccountAlreadyExistsPage::Create( wxWizard* parent ) void CErrAccountAlreadyExistsPage::CreateControls() { ////@begin CErrAccountAlreadyExistsPage content construction - CErrAccountAlreadyExistsPage* itemWizardPage116 = this; + CErrAccountAlreadyExistsPage* itemWizardPage115 = this; - wxBoxSizer* itemBoxSizer117 = new wxBoxSizer(wxVERTICAL); - itemWizardPage116->SetSizer(itemBoxSizer117); + wxBoxSizer* itemBoxSizer116 = new wxBoxSizer(wxVERTICAL); + itemWizardPage115->SetSizer(itemBoxSizer116); + + wxStaticText* itemStaticText117 = new wxStaticText; + itemStaticText117->Create( itemWizardPage115, wxID_STATIC, _("Account Already Exists"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText117->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer116->Add(itemStaticText117, 0, wxALIGN_LEFT|wxALL, 5); wxStaticText* itemStaticText118 = new wxStaticText; - itemStaticText118->Create( itemWizardPage116, wxID_STATIC, _("Account Already Exists"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText118->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer117->Add(itemStaticText118, 0, wxALIGN_LEFT|wxALL, 5); + itemStaticText118->Create( itemWizardPage115, wxID_STATIC, _("The requested account is already in use."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer116->Add(itemStaticText118, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText119 = new wxStaticText; - itemStaticText119->Create( itemWizardPage116, wxID_STATIC, _("The requested account is already in use."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer117->Add(itemStaticText119, 0, wxALIGN_LEFT|wxALL, 5); - - itemBoxSizer117->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer116->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); ////@end CErrAccountAlreadyExistsPage content construction } @@ -3296,21 +3316,21 @@ bool CErrAccountCreationDisabledPage::Create( wxWizard* parent ) void CErrAccountCreationDisabledPage::CreateControls() { ////@begin CErrAccountCreationDisabledPage content construction - CErrAccountCreationDisabledPage* itemWizardPage121 = this; + CErrAccountCreationDisabledPage* itemWizardPage120 = this; - wxBoxSizer* itemBoxSizer122 = new wxBoxSizer(wxVERTICAL); - itemWizardPage121->SetSizer(itemBoxSizer122); + wxBoxSizer* itemBoxSizer121 = new wxBoxSizer(wxVERTICAL); + itemWizardPage120->SetSizer(itemBoxSizer121); + + wxStaticText* itemStaticText122 = new wxStaticText; + itemStaticText122->Create( itemWizardPage120, wxID_STATIC, _("Account Creation Disabled"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText122->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer121->Add(itemStaticText122, 0, wxALIGN_LEFT|wxALL, 5); wxStaticText* itemStaticText123 = new wxStaticText; - itemStaticText123->Create( itemWizardPage121, wxID_STATIC, _("Account Creation Disabled"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText123->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer122->Add(itemStaticText123, 0, wxALIGN_LEFT|wxALL, 5); + itemStaticText123->Create( itemWizardPage120, wxID_STATIC, _("This project is not accepting any new clients at this time."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer121->Add(itemStaticText123, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText124 = new wxStaticText; - itemStaticText124->Create( itemWizardPage121, wxID_STATIC, _("This project is not accepting any new clients at this time."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer122->Add(itemStaticText124, 0, wxALIGN_LEFT|wxALL, 5); - - itemBoxSizer122->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer121->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); ////@end CErrAccountCreationDisabledPage content construction } @@ -3441,21 +3461,21 @@ bool CErrProxyInfoPage::Create( wxWizard* parent ) void CErrProxyInfoPage::CreateControls() { ////@begin CErrProxyInfoPage content construction - CErrProxyInfoPage* itemWizardPage126 = this; + CErrProxyInfoPage* itemWizardPage125 = this; - wxBoxSizer* itemBoxSizer127 = new wxBoxSizer(wxVERTICAL); - itemWizardPage126->SetSizer(itemBoxSizer127); + wxBoxSizer* itemBoxSizer126 = new wxBoxSizer(wxVERTICAL); + itemWizardPage125->SetSizer(itemBoxSizer126); + + wxStaticText* itemStaticText127 = new wxStaticText; + itemStaticText127->Create( itemWizardPage125, wxID_STATIC, _("Proxy Configuration"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText127->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer126->Add(itemStaticText127, 0, wxALIGN_LEFT|wxALL, 5); wxStaticText* itemStaticText128 = new wxStaticText; - itemStaticText128->Create( itemWizardPage126, wxID_STATIC, _("Proxy Configuration"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText128->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer127->Add(itemStaticText128, 0, wxALIGN_LEFT|wxALL, 5); + itemStaticText128->Create( itemWizardPage125, wxID_STATIC, _("Do you need to configure a proxy server?"), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer126->Add(itemStaticText128, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText129 = new wxStaticText; - itemStaticText129->Create( itemWizardPage126, wxID_STATIC, _("Do you need to configure a proxy server?"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer127->Add(itemStaticText129, 0, wxALIGN_LEFT|wxALL, 5); - - itemBoxSizer127->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer126->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); ////@end CErrProxyInfoPage content construction } @@ -3602,67 +3622,67 @@ bool CErrProxyHTTPPage::Create( wxWizard* parent ) void CErrProxyHTTPPage::CreateControls() { ////@begin CErrProxyHTTPPage content construction - CErrProxyHTTPPage* itemWizardPage131 = this; + CErrProxyHTTPPage* itemWizardPage130 = this; - wxBoxSizer* itemBoxSizer132 = new wxBoxSizer(wxVERTICAL); - itemWizardPage131->SetSizer(itemBoxSizer132); + wxBoxSizer* itemBoxSizer131 = new wxBoxSizer(wxVERTICAL); + itemWizardPage130->SetSizer(itemBoxSizer131); + + wxStaticText* itemStaticText132 = new wxStaticText; + itemStaticText132->Create( itemWizardPage130, wxID_STATIC, _("Proxy Configuration - HTTP Proxy"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText132->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer131->Add(itemStaticText132, 0, wxALIGN_LEFT|wxALL, 5); wxStaticText* itemStaticText133 = new wxStaticText; - itemStaticText133->Create( itemWizardPage131, wxID_STATIC, _("Proxy Configuration - HTTP Proxy"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText133->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer132->Add(itemStaticText133, 0, wxALIGN_LEFT|wxALL, 5); + itemStaticText133->Create( itemWizardPage130, wxID_STATIC, _("Do you need to configure a proxy server?"), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer131->Add(itemStaticText133, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText134 = new wxStaticText; - itemStaticText134->Create( itemWizardPage131, wxID_STATIC, _("Do you need to configure a proxy server?"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer132->Add(itemStaticText134, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer131->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - itemBoxSizer132->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer131->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - itemBoxSizer132->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + wxButton* itemButton136 = new wxButton; + itemButton136->Create( itemWizardPage130, ID_HTTPAUTODETECT, _("Autodetect"), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer131->Add(itemButton136, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - wxButton* itemButton137 = new wxButton; - itemButton137->Create( itemWizardPage131, ID_HTTPAUTODETECT, _("Autodetect"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer132->Add(itemButton137, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - - wxFlexGridSizer* itemFlexGridSizer138 = new wxFlexGridSizer(3, 2, 0, 0); - itemFlexGridSizer138->AddGrowableCol(1); - itemBoxSizer132->Add(itemFlexGridSizer138, 0, wxGROW|wxALL, 5); + wxFlexGridSizer* itemFlexGridSizer137 = new wxFlexGridSizer(3, 2, 0, 0); + itemFlexGridSizer137->AddGrowableCol(1); + itemBoxSizer131->Add(itemFlexGridSizer137, 0, wxGROW|wxALL, 5); m_ProxyHTTPServerStaticCtrl = new wxStaticText; - m_ProxyHTTPServerStaticCtrl->Create( itemWizardPage131, ID_PROXYHTTPSERVERSTATICCTRL, _("Server:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer138->Add(m_ProxyHTTPServerStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxyHTTPServerStaticCtrl->Create( itemWizardPage130, ID_PROXYHTTPSERVERSTATICCTRL, _("Server:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer137->Add(m_ProxyHTTPServerStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxFlexGridSizer* itemFlexGridSizer140 = new wxFlexGridSizer(1, 3, 0, 0); - itemFlexGridSizer140->AddGrowableCol(0); - itemFlexGridSizer138->Add(itemFlexGridSizer140, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0); + wxFlexGridSizer* itemFlexGridSizer139 = new wxFlexGridSizer(1, 3, 0, 0); + itemFlexGridSizer139->AddGrowableCol(0); + itemFlexGridSizer137->Add(itemFlexGridSizer139, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0); m_ProxyHTTPServerCtrl = new wxTextCtrl; - m_ProxyHTTPServerCtrl->Create( itemWizardPage131, ID_PROXYHTTPSERVERCTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer140->Add(m_ProxyHTTPServerCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxyHTTPServerCtrl->Create( itemWizardPage130, ID_PROXYHTTPSERVERCTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer139->Add(m_ProxyHTTPServerCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxyHTTPPortStaticCtrl = new wxStaticText; - m_ProxyHTTPPortStaticCtrl->Create( itemWizardPage131, ID_PROXYHTTPPORTSTATICCTRL, _("Port:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer140->Add(m_ProxyHTTPPortStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxyHTTPPortStaticCtrl->Create( itemWizardPage130, ID_PROXYHTTPPORTSTATICCTRL, _("Port:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer139->Add(m_ProxyHTTPPortStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxyHTTPPortCtrl = new wxTextCtrl; - m_ProxyHTTPPortCtrl->Create( itemWizardPage131, ID_PROXYHTTPPORTCTRL, _T(""), wxDefaultPosition, wxSize(50, -1), 0 ); - itemFlexGridSizer140->Add(m_ProxyHTTPPortCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxyHTTPPortCtrl->Create( itemWizardPage130, ID_PROXYHTTPPORTCTRL, _T(""), wxDefaultPosition, wxSize(50, -1), 0 ); + itemFlexGridSizer139->Add(m_ProxyHTTPPortCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxyHTTPUsernameStaticCtrl = new wxStaticText; - m_ProxyHTTPUsernameStaticCtrl->Create( itemWizardPage131, ID_PROXYHTTPUSERNAMESTATICCTRL, _("User Name:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer138->Add(m_ProxyHTTPUsernameStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxyHTTPUsernameStaticCtrl->Create( itemWizardPage130, ID_PROXYHTTPUSERNAMESTATICCTRL, _("User Name:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer137->Add(m_ProxyHTTPUsernameStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxyHTTPUsernameCtrl = new wxTextCtrl; - m_ProxyHTTPUsernameCtrl->Create( itemWizardPage131, ID_PROXYHTTPUSERNAMECTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer138->Add(m_ProxyHTTPUsernameCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxyHTTPUsernameCtrl->Create( itemWizardPage130, ID_PROXYHTTPUSERNAMECTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer137->Add(m_ProxyHTTPUsernameCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxyHTTPPasswordStaticCtrl = new wxStaticText; - m_ProxyHTTPPasswordStaticCtrl->Create( itemWizardPage131, ID_PROXYHTTPPASSWORDSTATICCTRL, _("Password:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer138->Add(m_ProxyHTTPPasswordStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxyHTTPPasswordStaticCtrl->Create( itemWizardPage130, ID_PROXYHTTPPASSWORDSTATICCTRL, _("Password:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer137->Add(m_ProxyHTTPPasswordStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxyHTTPPasswordCtrl = new wxTextCtrl; - m_ProxyHTTPPasswordCtrl->Create( itemWizardPage131, ID_PROXYHTTPPASSWORDCTRL, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD ); - itemFlexGridSizer138->Add(m_ProxyHTTPPasswordCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxyHTTPPasswordCtrl->Create( itemWizardPage130, ID_PROXYHTTPPASSWORDCTRL, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD ); + itemFlexGridSizer137->Add(m_ProxyHTTPPasswordCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); // Set validators m_ProxyHTTPServerCtrl->SetValidator( wxTextValidator(wxFILTER_NONE, & m_strProxyHTTPServer) ); @@ -3823,67 +3843,67 @@ bool CErrProxySOCKSPage::Create( wxWizard* parent ) void CErrProxySOCKSPage::CreateControls() { ////@begin CErrProxySOCKSPage content construction - CErrProxySOCKSPage* itemWizardPage148 = this; + CErrProxySOCKSPage* itemWizardPage147 = this; - wxBoxSizer* itemBoxSizer149 = new wxBoxSizer(wxVERTICAL); - itemWizardPage148->SetSizer(itemBoxSizer149); + wxBoxSizer* itemBoxSizer148 = new wxBoxSizer(wxVERTICAL); + itemWizardPage147->SetSizer(itemBoxSizer148); + + wxStaticText* itemStaticText149 = new wxStaticText; + itemStaticText149->Create( itemWizardPage147, wxID_STATIC, _("Proxy Configuration - SOCKS Proxy"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText149->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer148->Add(itemStaticText149, 0, wxALIGN_LEFT|wxALL, 5); wxStaticText* itemStaticText150 = new wxStaticText; - itemStaticText150->Create( itemWizardPage148, wxID_STATIC, _("Proxy Configuration - SOCKS Proxy"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText150->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer149->Add(itemStaticText150, 0, wxALIGN_LEFT|wxALL, 5); + itemStaticText150->Create( itemWizardPage147, wxID_STATIC, _("Do you need to configure a proxy server?"), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer148->Add(itemStaticText150, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText151 = new wxStaticText; - itemStaticText151->Create( itemWizardPage148, wxID_STATIC, _("Do you need to configure a proxy server?"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer149->Add(itemStaticText151, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer148->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - itemBoxSizer149->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer148->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - itemBoxSizer149->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + wxButton* itemButton153 = new wxButton; + itemButton153->Create( itemWizardPage147, ID_SOCKSAUTODETECT, _("Autodetect"), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer148->Add(itemButton153, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - wxButton* itemButton154 = new wxButton; - itemButton154->Create( itemWizardPage148, ID_SOCKSAUTODETECT, _("Autodetect"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer149->Add(itemButton154, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - - wxFlexGridSizer* itemFlexGridSizer155 = new wxFlexGridSizer(3, 2, 0, 0); - itemFlexGridSizer155->AddGrowableCol(1); - itemBoxSizer149->Add(itemFlexGridSizer155, 0, wxGROW|wxALL, 5); + wxFlexGridSizer* itemFlexGridSizer154 = new wxFlexGridSizer(3, 2, 0, 0); + itemFlexGridSizer154->AddGrowableCol(1); + itemBoxSizer148->Add(itemFlexGridSizer154, 0, wxGROW|wxALL, 5); m_ProxySOCKSServerStaticCtrl = new wxStaticText; - m_ProxySOCKSServerStaticCtrl->Create( itemWizardPage148, ID_PROXYSOCKSSERVERSTATICCTRL, _("Server:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer155->Add(m_ProxySOCKSServerStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxySOCKSServerStaticCtrl->Create( itemWizardPage147, ID_PROXYSOCKSSERVERSTATICCTRL, _("Server:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer154->Add(m_ProxySOCKSServerStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxFlexGridSizer* itemFlexGridSizer157 = new wxFlexGridSizer(1, 3, 0, 0); - itemFlexGridSizer157->AddGrowableCol(0); - itemFlexGridSizer155->Add(itemFlexGridSizer157, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0); + wxFlexGridSizer* itemFlexGridSizer156 = new wxFlexGridSizer(1, 3, 0, 0); + itemFlexGridSizer156->AddGrowableCol(0); + itemFlexGridSizer154->Add(itemFlexGridSizer156, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0); m_ProxySOCKSServerCtrl = new wxTextCtrl; - m_ProxySOCKSServerCtrl->Create( itemWizardPage148, ID_PROXYSOCKSSERVERCTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer157->Add(m_ProxySOCKSServerCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxySOCKSServerCtrl->Create( itemWizardPage147, ID_PROXYSOCKSSERVERCTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer156->Add(m_ProxySOCKSServerCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxySOCKSPortStaticCtrl = new wxStaticText; - m_ProxySOCKSPortStaticCtrl->Create( itemWizardPage148, ID_PROXYSOCKSPORTSTATICCTRL, _("Port:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer157->Add(m_ProxySOCKSPortStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxySOCKSPortStaticCtrl->Create( itemWizardPage147, ID_PROXYSOCKSPORTSTATICCTRL, _("Port:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer156->Add(m_ProxySOCKSPortStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxySOCKSPortCtrl = new wxTextCtrl; - m_ProxySOCKSPortCtrl->Create( itemWizardPage148, ID_PROXYSOCKSPORTCTRL, _T(""), wxDefaultPosition, wxSize(50, -1), 0 ); - itemFlexGridSizer157->Add(m_ProxySOCKSPortCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxySOCKSPortCtrl->Create( itemWizardPage147, ID_PROXYSOCKSPORTCTRL, _T(""), wxDefaultPosition, wxSize(50, -1), 0 ); + itemFlexGridSizer156->Add(m_ProxySOCKSPortCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxySOCKSUsernameStaticCtrl = new wxStaticText; - m_ProxySOCKSUsernameStaticCtrl->Create( itemWizardPage148, ID_PROXYSOCKSUSERNAMESTATICCTRL, _("User Name:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer155->Add(m_ProxySOCKSUsernameStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxySOCKSUsernameStaticCtrl->Create( itemWizardPage147, ID_PROXYSOCKSUSERNAMESTATICCTRL, _("User Name:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer154->Add(m_ProxySOCKSUsernameStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxySOCKSUsernameCtrl = new wxTextCtrl; - m_ProxySOCKSUsernameCtrl->Create( itemWizardPage148, ID_PROXYSOCKSUSERNAMECTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer155->Add(m_ProxySOCKSUsernameCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxySOCKSUsernameCtrl->Create( itemWizardPage147, ID_PROXYSOCKSUSERNAMECTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer154->Add(m_ProxySOCKSUsernameCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxySOCKSPasswordStaticCtrl = new wxStaticText; - m_ProxySOCKSPasswordStaticCtrl->Create( itemWizardPage148, ID_PROXYSOCKSPASSWORDSTATICCTRL, _("Password:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer155->Add(m_ProxySOCKSPasswordStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxySOCKSPasswordStaticCtrl->Create( itemWizardPage147, ID_PROXYSOCKSPASSWORDSTATICCTRL, _("Password:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer154->Add(m_ProxySOCKSPasswordStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxySOCKSPasswordCtrl = new wxTextCtrl; - m_ProxySOCKSPasswordCtrl->Create( itemWizardPage148, ID_PROXYSOCKSPASSWORDCTRL, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD ); - itemFlexGridSizer155->Add(m_ProxySOCKSPasswordCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxySOCKSPasswordCtrl->Create( itemWizardPage147, ID_PROXYSOCKSPASSWORDCTRL, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD ); + itemFlexGridSizer154->Add(m_ProxySOCKSPasswordCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); // Set validators m_ProxySOCKSServerCtrl->SetValidator( wxTextValidator(wxFILTER_NONE, & m_strProxySOCKSServer) ); @@ -4034,21 +4054,21 @@ bool CErrProxyComplationPage::Create( wxWizard* parent ) void CErrProxyComplationPage::CreateControls() { ////@begin CErrProxyComplationPage content construction - CErrProxyComplationPage* itemWizardPage165 = this; + CErrProxyComplationPage* itemWizardPage164 = this; - wxBoxSizer* itemBoxSizer166 = new wxBoxSizer(wxVERTICAL); - itemWizardPage165->SetSizer(itemBoxSizer166); + wxBoxSizer* itemBoxSizer165 = new wxBoxSizer(wxVERTICAL); + itemWizardPage164->SetSizer(itemBoxSizer165); + + wxStaticText* itemStaticText166 = new wxStaticText; + itemStaticText166->Create( itemWizardPage164, wxID_STATIC, _("Proxy Configuration Completion"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText166->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer165->Add(itemStaticText166, 0, wxALIGN_LEFT|wxALL, 5); wxStaticText* itemStaticText167 = new wxStaticText; - itemStaticText167->Create( itemWizardPage165, wxID_STATIC, _("Proxy Configuration Completion"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText167->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer166->Add(itemStaticText167, 0, wxALIGN_LEFT|wxALL, 5); + itemStaticText167->Create( itemWizardPage164, wxID_STATIC, _("Do you need to configure a proxy server?"), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer165->Add(itemStaticText167, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText168 = new wxStaticText; - itemStaticText168->Create( itemWizardPage165, wxID_STATIC, _("Do you need to configure a proxy server?"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer166->Add(itemStaticText168, 0, wxALIGN_LEFT|wxALL, 5); - - itemBoxSizer166->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer165->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); ////@end CErrProxyComplationPage content construction } @@ -4182,58 +4202,58 @@ bool CErrRefCountPage::Create( wxWizard* parent ) void CErrRefCountPage::CreateControls() { ////@begin CErrRefCountPage content construction - CErrRefCountPage* itemWizardPage170 = this; + CErrRefCountPage* itemWizardPage169 = this; - wxBoxSizer* itemBoxSizer171 = new wxBoxSizer(wxVERTICAL); - itemWizardPage170->SetSizer(itemBoxSizer171); + wxBoxSizer* itemBoxSizer170 = new wxBoxSizer(wxVERTICAL); + itemWizardPage169->SetSizer(itemBoxSizer170); + + wxStaticText* itemStaticText171 = new wxStaticText; + itemStaticText171->Create( itemWizardPage169, wxID_STATIC, _("Ref Count Page"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText171->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer170->Add(itemStaticText171, 0, wxALIGN_LEFT|wxALL, 5); wxStaticText* itemStaticText172 = new wxStaticText; - itemStaticText172->Create( itemWizardPage170, wxID_STATIC, _("Ref Count Page"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText172->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer171->Add(itemStaticText172, 0, wxALIGN_LEFT|wxALL, 5); + itemStaticText172->Create( itemWizardPage169, wxID_STATIC, _("This page should never be used in the wizard itself."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer170->Add(itemStaticText172, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText173 = new wxStaticText; - itemStaticText173->Create( itemWizardPage170, wxID_STATIC, _("This page should never be used in the wizard itself."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer171->Add(itemStaticText173, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer170->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - itemBoxSizer171->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText174 = new wxStaticText; + itemStaticText174->Create( itemWizardPage169, 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 ); + itemBoxSizer170->Add(itemStaticText174, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText175 = new wxStaticText; - itemStaticText175->Create( itemWizardPage170, 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 ); - itemBoxSizer171->Add(itemStaticText175, 0, wxALIGN_LEFT|wxALL, 5); + wxBoxSizer* itemBoxSizer175 = new wxBoxSizer(wxHORIZONTAL); + itemBoxSizer170->Add(itemBoxSizer175, 0, wxALIGN_LEFT|wxALL, 5); - wxBoxSizer* itemBoxSizer176 = new wxBoxSizer(wxHORIZONTAL); - itemBoxSizer171->Add(itemBoxSizer176, 0, wxALIGN_LEFT|wxALL, 5); + wxBitmap itemStaticBitmap176Bitmap(itemWizardPage169->GetBitmapResource(wxT("res/wizprogress1.xpm"))); + wxStaticBitmap* itemStaticBitmap176 = new wxStaticBitmap; + itemStaticBitmap176->Create( itemWizardPage169, wxID_STATIC, itemStaticBitmap176Bitmap, wxDefaultPosition, wxSize(16, 16), 0 ); + itemBoxSizer175->Add(itemStaticBitmap176, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxBitmap itemStaticBitmap177Bitmap(itemWizardPage170->GetBitmapResource(wxT("res/wizprogress1.xpm"))); + wxBitmap itemStaticBitmap177Bitmap(itemWizardPage169->GetBitmapResource(wxT("res/wizprogress2.xpm"))); wxStaticBitmap* itemStaticBitmap177 = new wxStaticBitmap; - itemStaticBitmap177->Create( itemWizardPage170, wxID_STATIC, itemStaticBitmap177Bitmap, wxDefaultPosition, wxSize(16, 16), 0 ); - itemBoxSizer176->Add(itemStaticBitmap177, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemStaticBitmap177->Create( itemWizardPage169, wxID_STATIC, itemStaticBitmap177Bitmap, wxDefaultPosition, wxSize(16, 16), 0 ); + itemBoxSizer175->Add(itemStaticBitmap177, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxBitmap itemStaticBitmap178Bitmap(itemWizardPage170->GetBitmapResource(wxT("res/wizprogress2.xpm"))); + wxBitmap itemStaticBitmap178Bitmap(itemWizardPage169->GetBitmapResource(wxT("res/wizprogress3.xpm"))); wxStaticBitmap* itemStaticBitmap178 = new wxStaticBitmap; - itemStaticBitmap178->Create( itemWizardPage170, wxID_STATIC, itemStaticBitmap178Bitmap, wxDefaultPosition, wxSize(16, 16), 0 ); - itemBoxSizer176->Add(itemStaticBitmap178, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemStaticBitmap178->Create( itemWizardPage169, wxID_STATIC, itemStaticBitmap178Bitmap, wxDefaultPosition, wxSize(16, 16), 0 ); + itemBoxSizer175->Add(itemStaticBitmap178, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxBitmap itemStaticBitmap179Bitmap(itemWizardPage170->GetBitmapResource(wxT("res/wizprogress3.xpm"))); + wxBitmap itemStaticBitmap179Bitmap(itemWizardPage169->GetBitmapResource(wxT("res/wizprogress4.xpm"))); wxStaticBitmap* itemStaticBitmap179 = new wxStaticBitmap; - itemStaticBitmap179->Create( itemWizardPage170, wxID_STATIC, itemStaticBitmap179Bitmap, wxDefaultPosition, wxSize(16, 16), 0 ); - itemBoxSizer176->Add(itemStaticBitmap179, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemStaticBitmap179->Create( itemWizardPage169, wxID_STATIC, itemStaticBitmap179Bitmap, wxDefaultPosition, wxSize(16, 16), 0 ); + itemBoxSizer175->Add(itemStaticBitmap179, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxBitmap itemStaticBitmap180Bitmap(itemWizardPage170->GetBitmapResource(wxT("res/wizprogress4.xpm"))); + wxBitmap itemStaticBitmap180Bitmap(itemWizardPage169->GetBitmapResource(wxT("res/wizfailure.xpm"))); wxStaticBitmap* itemStaticBitmap180 = new wxStaticBitmap; - itemStaticBitmap180->Create( itemWizardPage170, wxID_STATIC, itemStaticBitmap180Bitmap, wxDefaultPosition, wxSize(16, 16), 0 ); - itemBoxSizer176->Add(itemStaticBitmap180, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemStaticBitmap180->Create( itemWizardPage169, wxID_STATIC, itemStaticBitmap180Bitmap, wxDefaultPosition, wxSize(16, 16), 0 ); + itemBoxSizer175->Add(itemStaticBitmap180, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxBitmap itemStaticBitmap181Bitmap(itemWizardPage170->GetBitmapResource(wxT("res/wizfailure.xpm"))); + wxBitmap itemStaticBitmap181Bitmap(itemWizardPage169->GetBitmapResource(wxT("res/wizsuccess.xpm"))); wxStaticBitmap* itemStaticBitmap181 = new wxStaticBitmap; - itemStaticBitmap181->Create( itemWizardPage170, wxID_STATIC, itemStaticBitmap181Bitmap, wxDefaultPosition, wxSize(16, 16), 0 ); - itemBoxSizer176->Add(itemStaticBitmap181, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - - wxBitmap itemStaticBitmap182Bitmap(itemWizardPage170->GetBitmapResource(wxT("res/wizsuccess.xpm"))); - wxStaticBitmap* itemStaticBitmap182 = new wxStaticBitmap; - itemStaticBitmap182->Create( itemWizardPage170, wxID_STATIC, itemStaticBitmap182Bitmap, wxDefaultPosition, wxSize(16, 16), 0 ); - itemBoxSizer176->Add(itemStaticBitmap182, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemStaticBitmap181->Create( itemWizardPage169, wxID_STATIC, itemStaticBitmap181Bitmap, wxDefaultPosition, wxSize(16, 16), 0 ); + itemBoxSizer175->Add(itemStaticBitmap181, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); ////@end CErrRefCountPage content construction } diff --git a/clientgui/WizAttachProject.h b/clientgui/WizAttachProject.h index ddf15415b0..ea526bbf5e 100644 --- a/clientgui/WizAttachProject.h +++ b/clientgui/WizAttachProject.h @@ -30,10 +30,12 @@ ////@begin includes #include "wx/wizard.h" -#include "wx/valtext.h" #include "hyperlink.h" #include "wx/valgen.h" +#include "wx/valtext.h" ////@end includes +#include "ValidateURL.h" +#include "ValidateAccountKey.h" /*! * Forward declarations