diff --git a/checkin_notes b/checkin_notes index dc1922facb..757c2a72c8 100755 --- a/checkin_notes +++ b/checkin_notes @@ -10133,3 +10133,23 @@ Bruce August 8, 2005 sched/ file_deleter.C +Rom 8 Aug 2005 + - Fix build breaks and reenable the lookup website code with + a changed prototype. + - Figured out how to automatically advance from one wizard page + to the next. Yes, I know it breaks convention. + - Remove extra text on the project properties page. + - Display the hourglass cursor while executing the project + properties page. + + client/ + acct_setup.C, .h + client_state.h + file_names.h + gui_rpc_server_ops.C + clientgui/ + BOINCGUI.pjd + WizAttachProject.cpp, .h + lib/ + gui_rpc_client.h + gui_rpc_client_ops.C diff --git a/client/acct_setup.C b/client/acct_setup.C index c6b5974390..d367c6a5d2 100644 --- a/client/acct_setup.C +++ b/client/acct_setup.C @@ -121,13 +121,10 @@ void CREATE_ACCOUNT_OP::handle_reply(int http_op_retval) { } } -#if 0 -int LOOKUP_GOOGLE_OP::do_rpc() { +int LOOKUP_WEBSITE_OP::do_rpc(string& url) { int retval; - string url; - url = "http://www.google.com/"; - retval = gstate.gui_http.do_rpc(this, url, LOOKUP_GOOGLE_FILENAME); + retval = gstate.gui_http.do_rpc(this, url, LOOKUP_WEBSITE_FILENAME); if (retval) { error_num = retval; } else { @@ -136,43 +133,6 @@ int LOOKUP_GOOGLE_OP::do_rpc() { return retval; } -void LOOKUP_GOOGLE_OP::handle_reply(int http_op_retval) { - if (http_op_retval) { - error_num = http_op_retval; - } else { - FILE* f = fopen(LOOKUP_GOOGLE_FILENAME, "r"); - if (f) { - file_to_str(f, reply); - fclose(f); - } - error_num = BOINC_SUCCESS; - } +void LOOKUP_WEBSITE_OP::handle_reply(int http_op_retval) { + error_num = http_op_retval; } - -int LOOKUP_YAHOO_OP::do_rpc() { - int retval; - string url; - - url = "http://www.yahoo.com/"; - retval = gstate.gui_http.do_rpc(this, url, LOOKUP_YAHOO_FILENAME); - if (retval) { - error_num = retval; - } else { - error_num = ERR_IN_PROGRESS; - } - return retval; -} - -void LOOKUP_YAHOO_OP::handle_reply(int http_op_retval) { - if (http_op_retval) { - error_num = http_op_retval; - } else { - FILE* f = fopen(LOOKUP_YAHOO_FILENAME, "r"); - if (f) { - file_to_str(f, reply); - fclose(f); - } - error_num = BOINC_SUCCESS; - } -} -#endif diff --git a/client/acct_setup.h b/client/acct_setup.h index 79963608d5..98c17d6102 100644 --- a/client/acct_setup.h +++ b/client/acct_setup.h @@ -59,24 +59,12 @@ struct CREATE_ACCOUNT_OP: public GUI_HTTP_OP { CREATE_ACCOUNT_OP(){error_num = BOINC_SUCCESS;} }; -#if 0 -struct LOOKUP_GOOGLE_OP: public GUI_HTTP_OP { - std::string reply; +struct LOOKUP_WEBSITE_OP: public GUI_HTTP_OP { int error_num; - int do_rpc(); + int do_rpc(std::string&); virtual void handle_reply(int http_op_retval); - LOOKUP_GOOGLE_OP(){error_num = BOINC_SUCCESS;} + LOOKUP_WEBSITE_OP(){error_num = BOINC_SUCCESS;} }; -struct LOOKUP_YAHOO_OP: public GUI_HTTP_OP { - std::string reply; - int error_num; - - int do_rpc(); - virtual void handle_reply(int http_op_retval); - LOOKUP_YAHOO_OP(){error_num = BOINC_SUCCESS;} -}; -#endif - #endif diff --git a/client/client_state.h b/client/client_state.h index 61ee2f9f2a..c4ec94dbc8 100644 --- a/client/client_state.h +++ b/client/client_state.h @@ -100,10 +100,7 @@ public: GET_PROJECT_CONFIG_OP get_project_config_op; LOOKUP_ACCOUNT_OP lookup_account_op; CREATE_ACCOUNT_OP create_account_op; -#if 0 - LOOKUP_GOOGLE_OP lookup_google_op; - LOOKUP_YAHOO_OP lookup_yahoo_op; -#endif + LOOKUP_WEBSITE_OP lookup_website_op; int core_client_major_version; int core_client_minor_version; diff --git a/client/file_names.h b/client/file_names.h index cb8ead09b5..df94b45d79 100644 --- a/client/file_names.h +++ b/client/file_names.h @@ -75,7 +75,6 @@ extern void get_master_filename(PROJECT&, char*); #define GET_PROJECT_CONFIG_FILENAME "get_project_config.xml" #define LOOKUP_ACCOUNT_FILENAME "lookup_account.xml" #define CREATE_ACCOUNT_FILENAME "create_account.xml" -#define LOOKUP_GOOGLE_FILENAME "lookup_google.html" -#define LOOKUP_YAHOO_FILENAME "lookup_yahoo.html" +#define LOOKUP_WEBSITE_FILENAME "lookup_website.html" #endif diff --git a/client/gui_rpc_server_ops.C b/client/gui_rpc_server_ops.C index fdfadb3547..7ac4a40c13 100644 --- a/client/gui_rpc_server_ops.C +++ b/client/gui_rpc_server_ops.C @@ -560,28 +560,27 @@ static void handle_create_account_poll(char*, MIOFILE& fout) { } } -#if 0 -static void handle_lookup_google(char*, MIOFILE&) { - gstate.lookup_google_op.do_rpc(); +static void handle_lookup_website(char* buf, MIOFILE& fout) { + std::string url; + if (match_tag(buf, "Invalid website\n"); + return; + } + fout.printf("\n"); } -static void handle_lookup_google_poll(char*, MIOFILE& fout) { +static void handle_lookup_website_poll(char*, MIOFILE& fout) { fout.printf("\n"); - fout.printf(" %d\n", gstate.lookup_google_op.error_num); + fout.printf(" %d\n", gstate.lookup_website_op.error_num); fout.printf("\n"); } -static void handle_lookup_yahoo(char*, MIOFILE&) { - gstate.lookup_yahoo_op.do_rpc(); -} - -static void handle_lookup_yahoo_poll(char*, MIOFILE& fout) { - fout.printf("\n"); - fout.printf(" %d\n", gstate.lookup_yahoo_op.error_num); - fout.printf("\n"); -} -#endif - int GUI_RPC_CONN::handle_rpc() { char request_msg[4096]; int n; @@ -719,16 +718,10 @@ int GUI_RPC_CONN::handle_rpc() { handle_create_account(request_msg, mf); } else if (match_tag(request_msg, "unrecognized op\n"); } diff --git a/clientgui/BOINCGUI.pjd b/clientgui/BOINCGUI.pjd index 62b33cf3d0..0e4a65e9f8 100644 --- a/clientgui/BOINCGUI.pjd +++ b/clientgui/BOINCGUI.pjd @@ -12,7 +12,7 @@ - 321 + 325 TRUE FALSE @@ -102,7 +102,7 @@ <None> - 14638400 + 14634480 data-document @@ -113,14 +113,14 @@ 0 Configurations - 80567520 + 15073120 config-data-document 0 1 0 - 14638400 + 14634480 0 TRUE @@ -168,7 +168,7 @@ Projects - 14638512 + 14626976 root-document project @@ -179,25 +179,25 @@ 0 Windows - 15124992 + 15056480 html-document dialogsfolder 1 1 0 - 14638512 + 14626976 1 Options - 15132352 + 15052976 dialog-document dialog 0 1 0 - 15124992 + 15056480 0 8/3/2004 wbDialogProxy @@ -256,14 +256,14 @@ wxBoxSizer V - 14307088 + 14639888 dialog-control-document sizer 0 1 0 - 15132352 + 15052976 0 wbBoxSizerProxy Vertical @@ -282,14 +282,14 @@ <Any platform> wxNotebook: ID_NOTEBOOK - 14679008 + 14668896 dialog-control-document notebook 0 1 0 - 14307088 + 14639888 0 wbNotebookProxy wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED|OnNotebookPageChanged @@ -345,14 +345,14 @@ wxPanel: ID_GENERAL - 14657920 + 14709520 dialog-control-document panel 0 1 0 - 14679008 + 14668896 0 wbPanelProxy ID_GENERAL @@ -405,14 +405,14 @@ wxBoxSizer V - 14697184 + 14696016 dialog-control-document sizer 0 1 0 - 14657920 + 14709520 0 24/9/2004 wbBoxSizerProxy @@ -432,14 +432,14 @@ <Any platform> wxFlexGridSizer - 14687664 + 14810320 dialog-control-document sizer 0 1 0 - 14697184 + 14696016 0 22/5/2005 wbFlexGridSizerProxy @@ -464,14 +464,14 @@ FALSE wxStaticText: wxID_STATIC - 14738944 + 14797376 dialog-control-document statictext 0 1 0 - 14687664 + 14810320 0 22/5/2005 wbStaticTextProxy @@ -521,14 +521,14 @@ wxComboBox: ID_LANGUAGESELECTION - 14741872 + 14799584 dialog-control-document combobox 0 1 0 - 14687664 + 14810320 0 22/5/2005 wbComboBoxProxy @@ -573,14 +573,14 @@ wxStaticText: wxID_STATIC - 14769936 + 14890080 dialog-control-document statictext 0 1 0 - 14687664 + 14810320 0 22/5/2005 wbStaticTextProxy @@ -630,14 +630,14 @@ wxSlider: ID_REMINDERFREQUENCY - 14747488 + 14934848 dialog-control-document slider 0 1 0 - 14687664 + 14810320 0 22/5/2005 wbSliderProxy @@ -697,14 +697,14 @@ wxPanel: ID_CONNECTONS - 14792000 + 14939008 dialog-control-document panel 0 1 0 - 14679008 + 14668896 0 27/5/2005 wbPanelProxy @@ -758,14 +758,14 @@ wxBoxSizer V - 14747824 + 14972448 dialog-control-document sizer 0 1 0 - 14792000 + 14939008 0 27/5/2005 wbBoxSizerProxy @@ -785,14 +785,14 @@ <Any platform> wxRadioButton: ID_NETWORKAUTODETECT - 14869728 + 14957392 dialog-control-document radiobutton 0 1 0 - 14747824 + 14972448 0 27/5/2005 wbRadioButtonProxy @@ -837,14 +837,14 @@ wxRadioButton: ID_NETWORKLAN - 14858080 + 14945776 dialog-control-document radiobutton 0 1 0 - 14747824 + 14972448 0 27/5/2005 wbRadioButtonProxy @@ -889,14 +889,14 @@ wxRadioButton: ID_NETWORKDIALUP - 14899600 + 14991616 dialog-control-document radiobutton 0 1 0 - 14747824 + 14972448 0 27/5/2005 wbRadioButtonProxy @@ -941,14 +941,14 @@ wxStaticBoxSizer V - 14902544 + 14993184 dialog-control-document sizer 0 1 0 - 14747824 + 14972448 0 27/5/2005 wbStaticBoxSizerProxy @@ -972,14 +972,14 @@ <Any platform> wxFlexGridSizer - 14872336 + 15034560 dialog-control-document sizer 0 1 0 - 14902544 + 14993184 0 27/5/2005 wbFlexGridSizerProxy @@ -1004,14 +1004,14 @@ FALSE wxListBox: ID_DIALUPCONNECTIONS - 14926848 + 15021760 dialog-control-document listbox 0 1 0 - 14872336 + 15034560 0 27/5/2005 wbListBoxProxy @@ -1065,14 +1065,14 @@ wxBoxSizer V - 14927792 + 15197376 dialog-control-document sizer 0 1 0 - 14872336 + 15034560 0 27/5/2005 wbBoxSizerProxy @@ -1092,14 +1092,14 @@ <Any platform> wxButton: ID_DIALUPSETDEFAULT - 15000704 + 15186416 dialog-control-document dialogcontrol 0 1 0 - 14927792 + 15197376 0 27/5/2005 wbButtonProxy @@ -1145,14 +1145,14 @@ wxButton: ID_DIALUPCLEARDEFAULT - 14984656 + 15187728 dialog-control-document dialogcontrol 0 1 0 - 14927792 + 15197376 0 27/5/2005 wbButtonProxy @@ -1200,14 +1200,14 @@ wxFlexGridSizer - 15031856 + 35339568 dialog-control-document sizer 0 1 0 - 14902544 + 14993184 0 27/5/2005 wbFlexGridSizerProxy @@ -1232,14 +1232,14 @@ FALSE wxStaticText: ID_DIALUPDEFAULTCONNECTIONTEXT - 15019072 + 35330880 dialog-control-document statictext 0 1 0 - 15031856 + 35339568 0 27/5/2005 wbStaticTextProxy @@ -1289,14 +1289,14 @@ wxStaticText: ID_DIALUPDEFAULTCONNECTION - 15026864 + 35372816 dialog-control-document statictext 0 1 0 - 15031856 + 35339568 0 27/5/2005 wbStaticTextProxy @@ -1347,14 +1347,14 @@ wxFlexGridSizer - 15055040 + 35349328 dialog-control-document sizer 0 1 0 - 14902544 + 14993184 0 28/5/2005 wbFlexGridSizerProxy @@ -1379,14 +1379,14 @@ FALSE wxCheckBox: ID_DIALUPPROMPTUSERNAMEPASSWORD - 15042864 + 35448720 dialog-control-document checkbox 0 1 0 - 15055040 + 35349328 0 28/5/2005 wbCheckBoxProxy @@ -1435,14 +1435,14 @@ wxPanel: ID_HTTPPROXY - 15093184 + 35431984 dialog-control-document panel 0 1 0 - 14679008 + 14668896 0 wbPanelProxy ID_HTTPPROXY @@ -1495,14 +1495,14 @@ wxBoxSizer V - 14688336 + 35476448 dialog-control-document sizer 0 1 0 - 15093184 + 35431984 0 wbBoxSizerProxy Vertical @@ -1521,14 +1521,14 @@ <Any platform> wxCheckBox: ID_ENABLEHTTPPROXYCTRL - 15056080 + 35465616 dialog-control-document checkbox 0 1 0 - 14688336 + 35476448 0 wbCheckBoxProxy wxEVT_COMMAND_CHECKBOX_CLICKED|OnEnableHTTPProxyCtrlClick @@ -1574,14 +1574,14 @@ wxStaticBoxSizer V - 15157136 + 35503760 dialog-control-document sizer 0 1 0 - 14688336 + 35476448 0 wbStaticBoxSizerProxy wxID_ANY @@ -1604,14 +1604,14 @@ <Any platform> wxGridSizer - 15150576 + 35505488 dialog-control-document sizer 0 1 0 - 15157136 + 35503760 0 wbGridSizerProxy 1 @@ -1633,14 +1633,14 @@ FALSE wxFlexGridSizer - 15204112 + 35491088 dialog-control-document sizer 0 1 0 - 15150576 + 35505488 0 wbFlexGridSizerProxy @@ -1664,14 +1664,14 @@ FALSE wxStaticText: wxID_STATIC - 15191472 + 35544848 dialog-control-document statictext 0 1 0 - 15204112 + 35491088 0 wbStaticTextProxy wxID_STATIC @@ -1720,14 +1720,14 @@ wxTextCtrl: ID_HTTPADDRESSCTRL - 15172464 + 35530064 dialog-control-document textctrl 0 1 0 - 15204112 + 35491088 0 wbTextCtrlProxy ID_HTTPADDRESSCTRL @@ -1787,14 +1787,14 @@ wxStaticText: wxID_STATIC - 56466512 + 35567568 dialog-control-document statictext 0 1 0 - 15204112 + 35491088 0 wbStaticTextProxy wxID_STATIC @@ -1843,14 +1843,14 @@ wxTextCtrl: ID_HTTPPORTCTRL - 55557680 + 35571376 dialog-control-document textctrl 0 1 0 - 15204112 + 35491088 0 wbTextCtrlProxy ID_HTTPPORTCTRL @@ -1912,14 +1912,14 @@ wxStaticBoxSizer V - 55596240 + 35595520 dialog-control-document sizer 0 1 0 - 15157136 + 35503760 0 wbStaticBoxSizerProxy wxID_ANY @@ -1942,14 +1942,14 @@ <Any platform> wxFlexGridSizer - 55589536 + 35491376 dialog-control-document sizer 0 1 0 - 55596240 + 35595520 0 wbFlexGridSizerProxy @@ -1973,14 +1973,14 @@ FALSE wxStaticText: wxID_STATIC - 55566448 + 35642816 dialog-control-document statictext 0 1 0 - 55589536 + 35491376 0 wbStaticTextProxy wxID_STATIC @@ -2031,14 +2031,14 @@ wxTextCtrl: ID_HTTPUSERNAMECTRL - 55620112 + 35627888 dialog-control-document textctrl 0 1 0 - 55589536 + 35491376 0 wbTextCtrlProxy ID_HTTPUSERNAMECTRL @@ -2098,14 +2098,14 @@ wxStaticText: wxID_STATIC - 55758272 + 35665184 dialog-control-document statictext 0 1 0 - 55589536 + 35491376 0 wbStaticTextProxy wxID_STATIC @@ -2156,14 +2156,14 @@ wxTextCtrl: ID_HTTPPASSWORDCTRL - 55743424 + 35668320 dialog-control-document textctrl 0 1 0 - 55589536 + 35491376 0 wbTextCtrlProxy ID_HTTPPASSWORDCTRL @@ -2228,14 +2228,14 @@ wxPanel: ID_SOCKSPROXY - 55782848 + 35718912 dialog-control-document panel 0 1 0 - 14679008 + 14668896 0 wbPanelProxy ID_SOCKSPROXY @@ -2290,14 +2290,14 @@ FALSE wxBoxSizer V - 55834432 + 35782256 dialog-control-document sizer 0 1 0 - 55782848 + 35718912 0 wbBoxSizerProxy Vertical @@ -2316,14 +2316,14 @@ <Any platform> wxCheckBox: ID_ENABLESOCKSPROXYCTRL - 55823536 + 35771168 dialog-control-document checkbox 0 1 0 - 55834432 + 35782256 0 wbCheckBoxProxy wxEVT_COMMAND_CHECKBOX_CLICKED|OnEnableSOCKSProxyCtrlClick @@ -2369,14 +2369,14 @@ wxStaticBoxSizer V - 55825776 + 35772960 dialog-control-document sizer 0 1 0 - 55834432 + 35782256 0 wbStaticBoxSizerProxy wxID_ANY @@ -2399,14 +2399,14 @@ <Any platform> wxGridSizer - 55863008 + 35805568 dialog-control-document sizer 0 1 0 - 55825776 + 35772960 0 wbGridSizerProxy 1 @@ -2428,14 +2428,14 @@ FALSE wxFlexGridSizer - 55852752 + 35799472 dialog-control-document sizer 0 1 0 - 55863008 + 35805568 0 wbFlexGridSizerProxy @@ -2459,14 +2459,14 @@ FALSE wxStaticText: wxID_STATIC - 55840000 + 35790608 dialog-control-document statictext 0 1 0 - 55852752 + 35799472 0 wbStaticTextProxy wxID_STATIC @@ -2517,14 +2517,14 @@ wxTextCtrl: ID_SOCKSADDRESSCTRL - 55914160 + 35830880 dialog-control-document textctrl 0 1 0 - 55852752 + 35799472 0 wbTextCtrlProxy ID_SOCKSADDRESSCTRL @@ -2586,14 +2586,14 @@ wxStaticText: wxID_STATIC - 55987984 + 35870880 dialog-control-document statictext 0 1 0 - 55852752 + 35799472 0 wbStaticTextProxy wxID_STATIC @@ -2644,14 +2644,14 @@ wxTextCtrl: ID_SOCKSPORTCTRL - 55968960 + 35851664 dialog-control-document textctrl 0 1 0 - 55852752 + 35799472 0 wbTextCtrlProxy ID_SOCKSPORTCTRL @@ -2715,14 +2715,14 @@ wxStaticBoxSizer V - 56112640 + 35897456 dialog-control-document sizer 0 1 0 - 55825776 + 35772960 0 wbStaticBoxSizerProxy wxID_ANY @@ -2745,14 +2745,14 @@ <Any platform> wxFlexGridSizer - 56101872 + 35886704 dialog-control-document sizer 0 1 0 - 56112640 + 35897456 0 wbFlexGridSizerProxy @@ -2776,14 +2776,14 @@ FALSE wxStaticText: wxID_STATIC - 55990560 + 35874128 dialog-control-document statictext 0 1 0 - 56101872 + 35886704 0 wbStaticTextProxy wxID_STATIC @@ -2834,14 +2834,14 @@ wxTextCtrl: ID_SOCKSUSERNAMECTRL - 56141856 + 35991248 dialog-control-document textctrl 0 1 0 - 56101872 + 35886704 0 wbTextCtrlProxy ID_SOCKSUSERNAMECTRL @@ -2903,14 +2903,14 @@ wxStaticText: wxID_STATIC - 56284864 + 36031712 dialog-control-document statictext 0 1 0 - 56101872 + 35886704 0 wbStaticTextProxy wxID_STATIC @@ -2961,14 +2961,14 @@ wxTextCtrl: ID_SOCKSPASSWORDCTRL - 56148400 + 36012576 dialog-control-document textctrl 0 1 0 - 56101872 + 35886704 0 wbTextCtrlProxy ID_SOCKSPASSWORDCTRL @@ -3036,14 +3036,14 @@ wxBoxSizer H - 56337472 + 36095200 dialog-control-document sizer 0 1 0 - 14307088 + 14639888 0 wbBoxSizerProxy Horizontal @@ -3062,14 +3062,14 @@ <Any platform> wxButton: wxID_OK - 56330896 + 36080432 dialog-control-document dialogcontrol 0 1 0 - 56337472 + 36095200 0 wbButtonProxy wxID_OK @@ -3113,14 +3113,14 @@ wxButton: wxID_CANCEL - 56143264 + 36034672 dialog-control-document dialogcontrol 0 1 0 - 56337472 + 36095200 0 wbButtonProxy wxID_CANCEL @@ -3167,14 +3167,14 @@ About BOINC - 56377456 + 36126800 dialog-document dialog 0 1 0 - 15124992 + 15056480 0 9/3/2004 wbDialogProxy @@ -3234,14 +3234,14 @@ wxBoxSizer V - 56426144 + 36174816 dialog-control-document sizer 0 1 0 - 56377456 + 36126800 0 wbBoxSizerProxy Vertical @@ -3260,14 +3260,14 @@ <Any platform> wxStaticText: wxID_STATIC - 56414816 + 36163760 dialog-control-document statictext 0 1 0 - 56426144 + 36174816 0 wbStaticTextProxy wxID_STATIC @@ -3316,14 +3316,14 @@ wxBoxSizer H - 56416896 + 36165792 dialog-control-document sizer 0 1 0 - 56426144 + 36174816 0 wbBoxSizerProxy Horizontal @@ -3342,14 +3342,14 @@ <Any platform> wxBoxSizer V - 56453888 + 36203232 dialog-control-document sizer 0 1 0 - 56416896 + 36165792 0 wbBoxSizerProxy Vertical @@ -3368,14 +3368,14 @@ <Any platform> wxStaticBitmap: wxID_STATIC - 56439200 + 36192528 dialog-control-document staticbitmap 0 1 0 - 56453888 + 36203232 0 wbStaticBitmapProxy wxID_STATIC @@ -3419,14 +3419,14 @@ wxFlexGridSizer - 56442368 + 36195680 dialog-control-document sizer 0 1 0 - 56416896 + 36165792 0 wbFlexGridSizerProxy @@ -3450,14 +3450,14 @@ FALSE wxStaticText: wxID_STATIC - 56493968 + 36232976 dialog-control-document statictext 0 1 0 - 56442368 + 36195680 0 wbStaticTextProxy wxID_STATIC @@ -3506,14 +3506,14 @@ wxStaticText: wxID_STATIC - 15124480 + 36214816 dialog-control-document statictext 0 1 0 - 56442368 + 36195680 0 wbStaticTextProxy wxID_STATIC @@ -3562,14 +3562,14 @@ wxStaticText: wxID_STATIC - 15133072 + 36254688 dialog-control-document statictext 0 1 0 - 56442368 + 36195680 0 wbStaticTextProxy wxID_STATIC @@ -3618,14 +3618,14 @@ wxStaticText: wxID_STATIC - 55533008 + 36256240 dialog-control-document statictext 0 1 0 - 56442368 + 36195680 0 wbStaticTextProxy wxID_STATIC @@ -3677,14 +3677,14 @@ All Rights Reserved. wxStaticText: wxID_STATIC - 55651712 + 14994608 dialog-control-document statictext 0 1 0 - 56426144 + 36174816 0 wbStaticTextProxy wxID_STATIC @@ -3735,14 +3735,14 @@ All Rights Reserved. wxStaticText: wxID_STATIC - 55665696 + 14716256 dialog-control-document statictext 0 1 0 - 56426144 + 36174816 0 wbStaticTextProxy wxID_STATIC @@ -3793,14 +3793,14 @@ All Rights Reserved. wxHyperLink: ID_ABOUTBOINCLINK - 14822400 + 14734816 dialog-control-document foreign 0 1 0 - 56426144 + 36174816 0 21/6/2005 wbCustomCtrlProxy:wxHyperLink @@ -3853,14 +3853,14 @@ All Rights Reserved. wxStaticLine: wxID_STATIC - 14816896 + 14754544 dialog-control-document staticline 0 1 0 - 56426144 + 36174816 0 wbStaticLineProxy wxID_STATIC @@ -3900,14 +3900,14 @@ All Rights Reserved. wxButton: wxID_OK - 55684624 + 14772528 dialog-control-document dialogcontrol 0 1 0 - 56426144 + 36174816 0 wbButtonProxy wxID_OK @@ -3955,14 +3955,14 @@ All Rights Reserved. Attach to Project - 55700160 + 14821152 dialog-document dialog 0 1 0 - 15124992 + 15056480 0 9/3/2004 wbDialogProxy @@ -4023,14 +4023,14 @@ All Rights Reserved. wxBoxSizer V - 55717648 + 14757648 dialog-control-document sizer 0 1 0 - 55700160 + 14821152 0 wbBoxSizerProxy Vertical @@ -4049,14 +4049,14 @@ All Rights Reserved. <Any platform> wxFlexGridSizer - 55724672 + 35393296 dialog-control-document sizer 0 1 0 - 55717648 + 14757648 0 29/2/2005 wbFlexGridSizerProxy @@ -4081,14 +4081,14 @@ All Rights Reserved. FALSE wxBoxSizer V - 55730560 + 35399040 dialog-control-document sizer 0 1 0 - 55724672 + 35393296 0 29/2/2005 wbBoxSizerProxy @@ -4108,14 +4108,14 @@ All Rights Reserved. <Any platform> wxFlexGridSizer - 55876064 + 35405968 dialog-control-document sizer 0 1 0 - 55730560 + 35399040 0 29/2/2005 wbFlexGridSizerProxy @@ -4140,14 +4140,14 @@ All Rights Reserved. FALSE wxStaticText: wxID_STATIC - 55887904 + 35687712 dialog-control-document statictext 0 1 0 - 55876064 + 35405968 0 29/2/2005 wbStaticTextProxy @@ -4199,14 +4199,14 @@ All Rights Reserved. wxTextCtrl: ID_PROJECTADDRESS - 55945728 + 35705824 dialog-control-document textctrl 0 1 0 - 55876064 + 35405968 0 29/2/2005 wbTextCtrlProxy @@ -4267,14 +4267,14 @@ All Rights Reserved. wxStaticText: wxID_STATIC - 55939920 + 14858656 dialog-control-document statictext 0 1 0 - 55876064 + 35405968 0 29/2/2005 wbStaticTextProxy @@ -4326,14 +4326,14 @@ All Rights Reserved. wxTextCtrl: ID_PROJECTACCOUNTKEY - 56020432 + 35688208 dialog-control-document textctrl 0 1 0 - 55876064 + 35405968 0 29/2/2005 wbTextCtrlProxy @@ -4395,14 +4395,14 @@ All Rights Reserved. wxStaticText: wxID_STATIC - 56044160 + 35936672 dialog-control-document statictext 0 1 0 - 55730560 + 35399040 0 29/2/2005 wbStaticTextProxy @@ -4455,14 +4455,14 @@ Visit http://boinc.berkeley.edu for a list of projects. wxBoxSizer V - 56039728 + 35937488 dialog-control-document sizer 0 1 0 - 55724672 + 35393296 0 29/2/2005 wbBoxSizerProxy @@ -4482,14 +4482,14 @@ Visit http://boinc.berkeley.edu for a list of projects. <Any platform> wxButton: wxID_OK - 55876496 + 35951712 dialog-control-document dialogcontrol 0 1 0 - 56039728 + 35937488 0 29/2/2005 wbButtonProxy @@ -4536,14 +4536,14 @@ Visit http://boinc.berkeley.edu for a list of projects. wxButton: wxID_CANCEL - 56081360 + 35968288 dialog-control-document dialogcontrol 0 1 0 - 56039728 + 35937488 0 29/2/2005 wbButtonProxy @@ -4594,14 +4594,14 @@ Visit http://boinc.berkeley.edu for a list of projects. Account Manager Signup - 56096896 + 36053728 dialog-document dialog 0 1 0 - 15124992 + 15056480 0 10/2/2005 wbDialogProxy @@ -4663,14 +4663,14 @@ Visit http://boinc.berkeley.edu for a list of projects. wxFlexGridSizer - 56176400 + 35947264 dialog-control-document sizer 0 1 0 - 56096896 + 36053728 0 28/5/2005 wbFlexGridSizerProxy @@ -4695,14 +4695,14 @@ Visit http://boinc.berkeley.edu for a list of projects. FALSE wxBoxSizer V - 56182416 + 14817408 dialog-control-document sizer 0 1 0 - 56176400 + 35947264 0 28/5/2005 wbBoxSizerProxy @@ -4722,14 +4722,14 @@ Visit http://boinc.berkeley.edu for a list of projects. <Any platform> wxStaticText: ID_ACCTMANAGERTEXT - 56195584 + 48140304 dialog-control-document statictext 0 1 0 - 56182416 + 14817408 0 28/5/2005 wbStaticTextProxy @@ -4780,14 +4780,14 @@ For more information, click on the link below. wxHyperLink: ID_ACCTMANAGERDOCLINK - 56214256 + 48141776 dialog-control-document foreign 0 1 0 - 56182416 + 14817408 0 30/5/2005 wbCustomCtrlProxy:wxHyperLink @@ -4840,14 +4840,14 @@ For more information, click on the link below. wxFlexGridSizer - 56236160 + 15086240 dialog-control-document sizer 0 1 0 - 56182416 + 14817408 0 28/5/2005 wbFlexGridSizerProxy @@ -4872,14 +4872,14 @@ For more information, click on the link below. FALSE wxStaticText: wxID_STATIC - 56248000 + 15098096 dialog-control-document statictext 0 1 0 - 56236160 + 15086240 0 28/5/2005 wbStaticTextProxy @@ -4929,14 +4929,14 @@ For more information, click on the link below. wxTextCtrl: ID_ACCTMANAGERURL - 56242912 + 15120544 dialog-control-document textctrl 0 1 0 - 56236160 + 15086240 0 28/5/2005 wbTextCtrlProxy @@ -4997,14 +4997,14 @@ For more information, click on the link below. wxStaticText: wxID_STATIC - 56315920 + 15115040 dialog-control-document statictext 0 1 0 - 56236160 + 15086240 0 28/5/2005 wbStaticTextProxy @@ -5054,14 +5054,14 @@ For more information, click on the link below. wxTextCtrl: ID_ACCTMANAGERUSERNAME - 80584752 + 15161696 dialog-control-document textctrl 0 1 0 - 56236160 + 15086240 0 28/5/2005 wbTextCtrlProxy @@ -5122,14 +5122,14 @@ For more information, click on the link below. wxStaticText: wxID_STATIC - 80580800 + 48183712 dialog-control-document statictext 0 1 0 - 56236160 + 15086240 0 28/5/2005 wbStaticTextProxy @@ -5179,14 +5179,14 @@ For more information, click on the link below. wxTextCtrl: ID_ACCTMANAGERPASSWORD - 14966544 + 48177312 dialog-control-document textctrl 0 1 0 - 56236160 + 15086240 0 28/5/2005 wbTextCtrlProxy @@ -5249,14 +5249,14 @@ For more information, click on the link below. wxFlexGridSizer - 80618864 + 48219392 dialog-control-document sizer 0 1 0 - 56176400 + 35947264 0 28/5/2005 wbFlexGridSizerProxy @@ -5281,14 +5281,14 @@ For more information, click on the link below. FALSE wxButton: wxID_OK - 80631392 + 48231904 dialog-control-document dialogcontrol 0 1 0 - 80618864 + 48219392 0 28/5/2005 wbButtonProxy @@ -5333,14 +5333,14 @@ For more information, click on the link below. wxButton: wxID_CANCEL - 56237776 + 48244976 dialog-control-document dialogcontrol 0 1 0 - 80618864 + 48219392 0 28/5/2005 wbButtonProxy @@ -5388,14 +5388,14 @@ For more information, click on the link below. Account Manager Status - 80655712 + 48260848 dialog-document dialog 0 1 0 - 15124992 + 15056480 0 16/5/2005 wbDialogProxy @@ -5456,14 +5456,14 @@ For more information, click on the link below. wxBoxSizer V - 56098032 + 48272512 dialog-control-document sizer 0 1 0 - 80655712 + 48260848 0 16/5/2005 wbBoxSizerProxy @@ -5483,14 +5483,14 @@ For more information, click on the link below. <Any platform> wxBoxSizer H - 80681728 + 48279696 dialog-control-document sizer 0 1 0 - 56098032 + 48272512 0 16/5/2005 wbBoxSizerProxy @@ -5510,14 +5510,14 @@ For more information, click on the link below. <Any platform> wxBoxSizer V - 80688960 + 48295088 dialog-control-document sizer 0 1 0 - 80681728 + 48279696 0 8/6/2005 wbBoxSizerProxy @@ -5537,14 +5537,14 @@ For more information, click on the link below. <Any platform> wxStaticText: wxID_STATIC - 80702048 + 48301376 dialog-control-document statictext 0 1 0 - 80688960 + 48295088 0 8/6/2005 wbStaticTextProxy @@ -5594,14 +5594,14 @@ For more information, click on the link below. wxFlexGridSizer - 80722176 + 48324128 dialog-control-document sizer 0 1 0 - 80688960 + 48295088 0 8/6/2005 wbFlexGridSizerProxy @@ -5626,14 +5626,14 @@ For more information, click on the link below. FALSE wxStaticText: wxID_STATIC - 80734048 + 48336320 dialog-control-document statictext 0 1 0 - 80722176 + 48324128 0 8/6/2005 wbStaticTextProxy @@ -5683,14 +5683,14 @@ For more information, click on the link below. wxStaticText: ID_ACCTMANAGERNAME - 80749824 + 48355104 dialog-control-document statictext 0 1 0 - 80722176 + 48324128 0 8/6/2005 wbStaticTextProxy @@ -5740,14 +5740,14 @@ For more information, click on the link below. wxStaticText: wxID_STATIC - 80744528 + 48377184 dialog-control-document statictext 0 1 0 - 80722176 + 48324128 0 8/6/2005 wbStaticTextProxy @@ -5797,14 +5797,14 @@ For more information, click on the link below. wxHyperLink: ID_ACCTMANAGERLINK - 80787136 + 48370848 dialog-control-document foreign 0 1 0 - 80722176 + 48324128 0 8/6/2005 wbCustomCtrlProxy:wxHyperLink @@ -5859,14 +5859,14 @@ For more information, click on the link below. wxBoxSizer V - 80689264 + 48407568 dialog-control-document sizer 0 1 0 - 80681728 + 48279696 0 16/5/2005 wbBoxSizerProxy @@ -5886,14 +5886,14 @@ For more information, click on the link below. <Any platform> wxButton: ID_UPDATE - 80809744 + 48421264 dialog-control-document dialogcontrol 0 1 0 - 80689264 + 48407568 0 16/5/2005 wbButtonProxy @@ -5939,14 +5939,14 @@ For more information, click on the link below. wxButton: ID_CHANGE - 80823024 + 48422448 dialog-control-document dialogcontrol 0 1 0 - 80689264 + 48407568 0 16/5/2005 wbButtonProxy @@ -5992,14 +5992,14 @@ For more information, click on the link below. wxButton: wxID_CANCEL - 80824784 + 48451344 dialog-control-document dialogcontrol 0 1 0 - 80689264 + 48407568 0 16/5/2005 wbButtonProxy @@ -6048,14 +6048,14 @@ For more information, click on the link below. Select Computer - 80856160 + 48273120 dialog-document dialog 0 1 0 - 15124992 + 15056480 0 29/2/2005 wbDialogProxy @@ -6116,14 +6116,14 @@ For more information, click on the link below. wxBoxSizer V - 80826128 + 48474976 dialog-control-document sizer 0 1 0 - 80856160 + 48273120 0 29/2/2005 wbBoxSizerProxy @@ -6143,14 +6143,14 @@ For more information, click on the link below. <Any platform> wxFlexGridSizer - 80878048 + 48481872 dialog-control-document sizer 0 1 0 - 80826128 + 48474976 0 29/2/2005 wbFlexGridSizerProxy @@ -6175,14 +6175,14 @@ For more information, click on the link below. FALSE wxBoxSizer V - 80883968 + 48495952 dialog-control-document sizer 0 1 0 - 80878048 + 48481872 0 29/2/2005 wbBoxSizerProxy @@ -6202,14 +6202,14 @@ For more information, click on the link below. <Any platform> wxFlexGridSizer - 80899024 + 48503072 dialog-control-document sizer 0 1 0 - 80883968 + 48495952 0 29/2/2005 wbFlexGridSizerProxy @@ -6234,14 +6234,14 @@ For more information, click on the link below. FALSE wxStaticText: wxID_STATIC - 80909888 + 48514976 dialog-control-document statictext 0 1 0 - 80899024 + 48503072 0 29/2/2005 wbStaticTextProxy @@ -6291,14 +6291,14 @@ For more information, click on the link below. wxComboBox: ID_SELECTCOMPUTERNAME - 80904624 + 48540976 dialog-control-document combobox 0 1 0 - 80899024 + 48503072 0 29/2/2005 wbComboBoxProxy @@ -6343,14 +6343,14 @@ For more information, click on the link below. wxStaticText: wxID_STATIC - 80952512 + 48556960 dialog-control-document statictext 0 1 0 - 80899024 + 48503072 0 29/2/2005 wbStaticTextProxy @@ -6400,14 +6400,14 @@ For more information, click on the link below. wxTextCtrl: ID_SELECTCOMPUTERPASSWORD - 80966576 + 48571168 dialog-control-document textctrl 0 1 0 - 80899024 + 48503072 0 29/2/2005 wbTextCtrlProxy @@ -6470,14 +6470,14 @@ For more information, click on the link below. wxBoxSizer V - 80987872 + 48489344 dialog-control-document sizer 0 1 0 - 80878048 + 48481872 0 29/2/2005 wbBoxSizerProxy @@ -6497,14 +6497,14 @@ For more information, click on the link below. <Any platform> wxButton: wxID_OK - 81001552 + 48598800 dialog-control-document dialogcontrol 0 1 0 - 80987872 + 48489344 0 29/2/2005 wbButtonProxy @@ -6551,14 +6551,14 @@ For more information, click on the link below. wxButton: wxID_CANCEL - 81014064 + 48611664 dialog-control-document dialogcontrol 0 1 0 - 80987872 + 48489344 0 29/2/2005 wbButtonProxy @@ -6609,14 +6609,14 @@ For more information, click on the link below. Dialup Logon - 81029616 + 48634752 dialog-document dialog 0 1 0 - 15124992 + 15056480 0 28/5/2005 wbDialogProxy @@ -6677,14 +6677,14 @@ For more information, click on the link below. wxFlexGridSizer - 81038016 + 48653008 dialog-control-document sizer 0 1 0 - 81029616 + 48634752 0 28/5/2005 wbFlexGridSizerProxy @@ -6709,14 +6709,14 @@ For more information, click on the link below. FALSE wxBoxSizer V - 81043824 + 48468736 dialog-control-document sizer 0 1 0 - 81038016 + 48653008 0 28/5/2005 wbBoxSizerProxy @@ -6736,14 +6736,14 @@ For more information, click on the link below. <Any platform> wxFlexGridSizer - 81058896 + 48663760 dialog-control-document sizer 0 1 0 - 81043824 + 48468736 0 28/5/2005 wbFlexGridSizerProxy @@ -6768,14 +6768,14 @@ For more information, click on the link below. FALSE wxStaticText: wxID_STATIC - 81071552 + 48675488 dialog-control-document statictext 0 1 0 - 81058896 + 48663760 0 28/5/2005 wbStaticTextProxy @@ -6825,14 +6825,14 @@ For more information, click on the link below. wxTextCtrl: ID_USERNAME - 81089920 + 48689504 dialog-control-document textctrl 0 1 0 - 81058896 + 48663760 0 28/5/2005 wbTextCtrlProxy @@ -6893,14 +6893,14 @@ For more information, click on the link below. wxStaticText: wxID_STATIC - 81113872 + 48720000 dialog-control-document statictext 0 1 0 - 81058896 + 48663760 0 28/5/2005 wbStaticTextProxy @@ -6950,14 +6950,14 @@ For more information, click on the link below. wxTextCtrl: ID_PASSWORD - 81115200 + 48742032 dialog-control-document textctrl 0 1 0 - 81058896 + 48663760 0 28/5/2005 wbTextCtrlProxy @@ -7020,14 +7020,14 @@ For more information, click on the link below. wxFlexGridSizer - 81150080 + 48738064 dialog-control-document sizer 0 1 0 - 81038016 + 48653008 0 28/5/2005 wbFlexGridSizerProxy @@ -7052,14 +7052,14 @@ For more information, click on the link below. FALSE wxButton: wxID_OK - 81162560 + 48765872 dialog-control-document dialogcontrol 0 1 0 - 81150080 + 48738064 0 28/5/2005 wbButtonProxy @@ -7104,14 +7104,14 @@ For more information, click on the link below. wxButton: wxID_CANCEL - 81182480 + 48782704 dialog-control-document dialogcontrol 0 1 0 - 81150080 + 48738064 0 28/5/2005 wbButtonProxy @@ -7159,14 +7159,14 @@ For more information, click on the link below. Attach to Project Wizard - 81175360 + 48803600 dialog-document wizarddialog 0 1 0 - 15124992 + 15056480 0 21/6/2005 wbWizardProxy @@ -7207,14 +7207,14 @@ For more information, click on the link below. FALSE wxWizardPage: ID_WELCOMEPAGE - 81163552 + 48812208 dialog-control-document panel 0 1 0 - 81175360 + 48803600 0 21/6/2005 wbWizardPageProxy @@ -7250,14 +7250,14 @@ For more information, click on the link below. wxBoxSizer V - 81214080 + 48766736 dialog-control-document sizer 0 1 0 - 81163552 + 48812208 0 21/6/2005 wbBoxSizerProxy @@ -7277,14 +7277,14 @@ For more information, click on the link below. <Any platform> wxStaticText: wxID_STATIC - 81227200 + 48829008 dialog-control-document statictext 0 1 0 - 81214080 + 48766736 0 21/6/2005 wbStaticTextProxy @@ -7335,14 +7335,14 @@ Wizard wxStaticText: wxID_STATIC - 81244560 + 48830832 dialog-control-document statictext 0 1 0 - 81214080 + 48766736 0 21/6/2005 wbStaticTextProxy @@ -7392,14 +7392,14 @@ Wizard Spacer - 81240496 + 48872000 dialog-control-document spacer 0 1 0 - 81214080 + 48766736 0 21/6/2005 wbSpacerProxy @@ -7420,14 +7420,14 @@ Wizard wxStaticText: wxID_STATIC - 81270560 + 48879024 dialog-control-document statictext 0 1 0 - 81214080 + 48766736 0 21/6/2005 wbStaticTextProxy @@ -7478,14 +7478,14 @@ a project using an existing account or creating a new one. wxStaticBoxSizer V - 81266656 + 48895360 dialog-control-document sizer 0 1 0 - 81214080 + 48766736 0 27/6/2005 wbStaticBoxSizerProxy @@ -7506,17 +7506,17 @@ a project using an existing account or creating a new one. FALSE FALSE FALSE - <Any platform> + __WXDEBUG__ wxFlexGridSizer - 81221936 + 48909088 dialog-control-document sizer 0 1 0 - 81266656 + 48895360 0 27/6/2005 wbFlexGridSizerProxy @@ -7541,14 +7541,14 @@ a project using an existing account or creating a new one. FALSE wxCheckBox: ID_ERRPROJECTPROPERTIES - 81307408 + 48921616 dialog-control-document checkbox 0 1 0 - 81221936 + 48909088 0 27/6/2005 wbCheckBoxProxy @@ -7593,14 +7593,14 @@ a project using an existing account or creating a new one. wxCheckBox: ID_ERRPROJECTCOMM - 81324032 + 48931024 dialog-control-document checkbox 0 1 0 - 81221936 + 48909088 0 27/6/2005 wbCheckBoxProxy @@ -7645,14 +7645,14 @@ a project using an existing account or creating a new one. wxCheckBox: ID_ERRPROJECTPROPERTIESURL - 81345104 + 48931920 dialog-control-document checkbox 0 1 0 - 81221936 + 48909088 0 29/6/2005 wbCheckBoxProxy @@ -7697,14 +7697,14 @@ a project using an existing account or creating a new one. wxCheckBox: ID_ERRACCOUNTCREATIONDISABLED - 81361712 + 48964256 dialog-control-document checkbox 0 1 0 - 81221936 + 48909088 0 29/6/2005 wbCheckBoxProxy @@ -7749,14 +7749,14 @@ a project using an existing account or creating a new one. wxCheckBox: ID_ERRACCOUNTALREADYEXISTS - 81378672 + 48980880 dialog-control-document checkbox 0 1 0 - 81221936 + 48909088 0 29/6/2005 wbCheckBoxProxy @@ -7801,14 +7801,14 @@ a project using an existing account or creating a new one. wxCheckBox: ID_ERRGOOGLECOMM - 81395232 + 48997504 dialog-control-document checkbox 0 1 0 - 81221936 + 48909088 0 27/6/2005 wbCheckBoxProxy @@ -7853,14 +7853,14 @@ a project using an existing account or creating a new one. wxCheckBox: ID_ERRYAHOOCOMM - 81411536 + 49014144 dialog-control-document checkbox 0 1 0 - 81221936 + 48909088 0 27/6/2005 wbCheckBoxProxy @@ -7905,14 +7905,14 @@ a project using an existing account or creating a new one. wxCheckBox: ID_ERRNETDETECTION - 81428160 + 49030864 dialog-control-document checkbox 0 1 0 - 81221936 + 48909088 0 27/6/2005 wbCheckBoxProxy @@ -7959,14 +7959,14 @@ a project using an existing account or creating a new one. wxStaticText: wxID_STATIC - 81443968 + 49047088 dialog-control-document statictext 0 1 0 - 81214080 + 48766736 0 21/6/2005 wbStaticTextProxy @@ -8018,18 +8018,18 @@ a project using an existing account or creating a new one. wxWizardPage: ID_PROJECTINFOPAGE - 81438512 + 49057952 dialog-control-document panel 0 1 0 - 81175360 + 48803600 0 21/6/2005 wbWizardPageProxy - m_strProjectURL|wxString|StrProjectURL| + m_strProjectURL|wxString|ProjectURL| ID_PROJECTINFOPAGE 10034 CProjectInfoPage @@ -8061,14 +8061,14 @@ a project using an existing account or creating a new one. wxBoxSizer V - 81411856 + 49076288 dialog-control-document sizer 0 1 0 - 81438512 + 49057952 0 21/6/2005 wbBoxSizerProxy @@ -8088,14 +8088,14 @@ a project using an existing account or creating a new one. <Any platform> wxStaticText: wxID_STATIC - 81465520 + 48654928 dialog-control-document statictext 0 1 0 - 81411856 + 49076288 0 21/6/2005 wbStaticTextProxy @@ -8145,14 +8145,14 @@ a project using an existing account or creating a new one. wxStaticText: wxID_STATIC - 81488304 + 49101728 dialog-control-document statictext 0 1 0 - 81411856 + 49076288 0 21/6/2005 wbStaticTextProxy @@ -8202,14 +8202,14 @@ a project using an existing account or creating a new one. Spacer - 81508896 + 49097296 dialog-control-document spacer 0 1 0 - 81411856 + 49076288 0 21/6/2005 wbSpacerProxy @@ -8230,14 +8230,14 @@ a project using an existing account or creating a new one. wxStaticText: wxID_STATIC - 81515968 + 49122752 dialog-control-document statictext 0 1 0 - 81411856 + 49076288 0 21/6/2005 wbStaticTextProxy @@ -8288,14 +8288,14 @@ a web address and can be found in your browsers address bar. wxFlexGridSizer - 81531776 + 49143504 dialog-control-document sizer 0 1 0 - 81411856 + 49076288 0 21/6/2005 wbFlexGridSizerProxy @@ -8320,14 +8320,14 @@ a web address and can be found in your browsers address bar. FALSE wxStaticText: ID_PROJECTURLSTATICCTRL - 81543664 + 49102416 dialog-control-document statictext 0 1 0 - 81531776 + 49143504 0 21/6/2005 wbStaticTextProxy @@ -8377,14 +8377,14 @@ a web address and can be found in your browsers address bar. wxTextCtrl: ID_PROJECTURLCTRL - 81545920 + 49176336 dialog-control-document textctrl 0 1 0 - 81531776 + 49143504 0 21/6/2005 wbTextCtrlProxy @@ -8446,14 +8446,14 @@ a web address and can be found in your browsers address bar. Spacer - 81580320 + 49194416 dialog-control-document spacer 0 1 0 - 81411856 + 49076288 0 21/6/2005 wbSpacerProxy @@ -8474,14 +8474,14 @@ a web address and can be found in your browsers address bar. wxStaticText: wxID_STATIC - 81539408 + 49201456 dialog-control-document statictext 0 1 0 - 81411856 + 49076288 0 21/6/2005 wbStaticTextProxy @@ -8532,14 +8532,14 @@ go to: wxHyperLink: ID_PROJECRINFOBOINCLINK - 81605008 + 49195024 dialog-control-document foreign 0 1 0 - 81411856 + 49076288 0 21/6/2005 wbCustomCtrlProxy:wxHyperLink @@ -8594,14 +8594,14 @@ go to: wxWizardPage: ID_PROJECTPROPERTIESPAGE - 81436800 + 49234112 dialog-control-document panel 0 1 0 - 81175360 + 48803600 0 27/6/2005 wbWizardPageProxy @@ -8637,14 +8637,14 @@ go to: wxBoxSizer V - 81629968 + 49060752 dialog-control-document sizer 0 1 0 - 81436800 + 49234112 0 27/6/2005 wbBoxSizerProxy @@ -8664,14 +8664,14 @@ go to: <Any platform> wxStaticText: wxID_STATIC - 81643136 + 49255024 dialog-control-document statictext 0 1 0 - 81629968 + 49060752 0 27/6/2005 wbStaticTextProxy @@ -8721,14 +8721,14 @@ go to: wxStaticText: wxID_STATIC - 81668576 + 49277728 dialog-control-document statictext 0 1 0 - 81629968 + 49060752 0 27/6/2005 wbStaticTextProxy @@ -8779,14 +8779,14 @@ server. Spacer - 81682736 + 49297984 dialog-control-document spacer 0 1 0 - 81629968 + 49060752 0 27/6/2005 wbSpacerProxy @@ -8807,14 +8807,14 @@ server. wxFlexGridSizer - 81710320 + 49306944 dialog-control-document sizer 0 1 0 - 81629968 + 49060752 0 27/6/2005 wbFlexGridSizerProxy @@ -8839,14 +8839,14 @@ server. FALSE wxStaticBitmap: ID_RETRPROJECTPROPERTIESIMAGECTRL - 81722896 + 49201824 dialog-control-document staticbitmap 0 1 0 - 81710320 + 49306944 0 27/6/2005 wbStaticBitmapProxy @@ -8890,14 +8890,14 @@ server. wxStaticText: ID_RETRPROJECTPROPERTIESCTRL - 81737824 + 49331104 dialog-control-document statictext 0 1 0 - 81710320 + 49306944 0 27/6/2005 wbStaticTextProxy @@ -8945,341 +8945,17 @@ server. - - wxStaticBitmap: ID_COMMYAHOOIMAGECTRL - 81732672 - dialog-control-document - - staticbitmap - 0 - 1 - 0 - 81710320 - 0 - 27/6/2005 - wbStaticBitmapProxy - ID_COMMYAHOOIMAGECTRL - 10010 - wxStaticBitmap - m_CommYahooImageCtrl - res/wizsuccess.xpm - - - - - - FALSE - <Any platform> - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - - -1 - -1 - 16 - 16 - Centre - Centre - 0 - 5 - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - - - - - wxStaticText: ID_COMMYAHOOCTRL - 81769456 - dialog-control-document - - statictext - 0 - 1 - 0 - 81710320 - 0 - 27/6/2005 - wbStaticTextProxy - ID_COMMYAHOOCTRL - 10011 - wxStaticText - m_CommYahooCtrl - Communicating with Yahoo - - - - - - 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 - - - - - wxStaticBitmap: ID_COMMGOOGLEIMAGECTRL - 81769696 - dialog-control-document - - staticbitmap - 0 - 1 - 0 - 81710320 - 0 - 27/6/2005 - wbStaticBitmapProxy - ID_COMMGOOGLEIMAGECTRL - 10012 - wxStaticBitmap - m_CommGoogleImageCtrl - res/wizfailure.xpm - - - - - - FALSE - <Any platform> - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - - -1 - -1 - 16 - 16 - Centre - Centre - 0 - 5 - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - - - - - wxStaticText: ID_COMMGOOGLECTRL - 81808672 - dialog-control-document - - statictext - 0 - 1 - 0 - 81710320 - 0 - 27/6/2005 - wbStaticTextProxy - ID_COMMGOOGLECTRL - 10013 - wxStaticText - m_CommGoogleCtrl - Communicating with Google - - - - - - 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 - - - - - wxStaticBitmap: ID_DETERMINECONNECTIONSTATUSIMAGECTRL - 81827104 - dialog-control-document - - staticbitmap - 0 - 1 - 0 - 81710320 - 0 - 27/6/2005 - wbStaticBitmapProxy - ID_DETERMINECONNECTIONSTATUSIMAGECTRL - 10014 - wxStaticBitmap - m_DetermineConnectionStatusImageCtrl - res/wizquestion.xpm - - - - - - FALSE - <Any platform> - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - - -1 - -1 - 16 - 16 - Centre - Centre - 0 - 5 - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - - - - - wxStaticText: ID_DETERMINECONNECTIONSTATUSCTRL - 81843600 - dialog-control-document - - statictext - 0 - 1 - 0 - 81710320 - 0 - 27/6/2005 - wbStaticTextProxy - ID_DETERMINECONNECTIONSTATUSCTRL - 10015 - wxStaticText - m_DetermineConnectionStatusCtrl - Determining connection status - - - - - - 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 - - - - + wxStaticText: ID_FINALPROJECTPROPERTIESTATUSCTRL - 81858704 + 49324736 dialog-control-document statictext 0 1 0 - 81629968 + 49060752 0 27/6/2005 wbStaticTextProxy @@ -9329,16 +9005,16 @@ server. - + wxWizardPage: ID_ACCOUNTKEYPAGE - 81861424 + 49362464 dialog-control-document panel 0 1 0 - 81175360 + 48803600 0 29/6/2005 wbWizardPageProxy @@ -9372,16 +9048,16 @@ server. -1 - + wxBoxSizer V - 81631776 + 49380784 dialog-control-document sizer 0 1 0 - 81861424 + 49362464 0 29/6/2005 wbBoxSizerProxy @@ -9399,16 +9075,16 @@ server. FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 81891952 + 49325424 dialog-control-document statictext 0 1 0 - 81631776 + 49380784 0 29/6/2005 wbStaticTextProxy @@ -9456,16 +9132,16 @@ server. - + wxStaticText: wxID_STATIC - 81914656 + 49398512 dialog-control-document statictext 0 1 0 - 81631776 + 49380784 0 29/6/2005 wbStaticTextProxy @@ -9513,16 +9189,16 @@ server. - + Spacer - 81934912 + 49421552 dialog-control-document spacer 0 1 0 - 81631776 + 49380784 0 29/6/2005 wbSpacerProxy @@ -9541,16 +9217,16 @@ server. FALSE <Any platform> - + wxStaticText: wxID_STATIC - 81941936 + 49428576 dialog-control-document statictext 0 1 0 - 81631776 + 49380784 0 29/6/2005 wbStaticTextProxy @@ -9599,16 +9275,16 @@ wizard and uses BOINC's account key authentication. - + wxStaticText: wxID_STATIC - 81964384 + 49414704 dialog-control-document statictext 0 1 0 - 81631776 + 49380784 0 30/6/2005 wbStaticTextProxy @@ -9660,16 +9336,16 @@ message. Please copy and paste it into the text box below. - + wxStaticText: wxID_STATIC - 81978992 + 49467152 dialog-control-document statictext 0 1 0 - 81631776 + 49380784 0 30/6/2005 wbStaticTextProxy @@ -9717,16 +9393,16 @@ message. Please copy and paste it into the text box below. - + wxStaticText: wxID_STATIC - 81993808 + 49462400 dialog-control-document statictext 0 1 0 - 81631776 + 49380784 0 30/6/2005 wbStaticTextProxy @@ -9774,16 +9450,16 @@ message. Please copy and paste it into the text box below. - + wxFlexGridSizer - 81996912 + 49497584 dialog-control-document sizer 0 1 0 - 81631776 + 49380784 0 30/6/2005 wbFlexGridSizerProxy @@ -9806,16 +9482,16 @@ message. Please copy and paste it into the text box below. FALSE FALSE FALSE - + wxStaticText: ID_ACCOUNTKEYSTATICCTRL - 82025920 + 49509440 dialog-control-document statictext 0 1 0 - 81996912 + 49497584 0 30/6/2005 wbStaticTextProxy @@ -9863,16 +9539,16 @@ message. Please copy and paste it into the text box below. - + wxTextCtrl: ID_ACCOUNTKEYCTRL - 82040208 + 49531392 dialog-control-document textctrl 0 1 0 - 81996912 + 49497584 0 30/6/2005 wbTextCtrlProxy @@ -9934,16 +9610,16 @@ message. Please copy and paste it into the text box below. - + wxWizardPage: ID_ACCOUNTINFOPAGE - 82070544 + 49556304 dialog-control-document panel 0 1 0 - 81175360 + 48803600 0 21/6/2005 wbWizardPageProxy @@ -9981,16 +9657,16 @@ message. Please copy and paste it into the text box below. -1 - + wxBoxSizer V - 82080688 + 49566464 dialog-control-document sizer 0 1 0 - 82070544 + 49556304 0 21/6/2005 wbBoxSizerProxy @@ -10008,16 +9684,16 @@ message. Please copy and paste it into the text box below. FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 82022160 + 49498016 dialog-control-document statictext 0 1 0 - 82080688 + 49566464 0 21/6/2005 wbStaticTextProxy @@ -10065,16 +9741,16 @@ message. Please copy and paste it into the text box below. - + wxStaticText: wxID_STATIC - 82100976 + 49586448 dialog-control-document statictext 0 1 0 - 82080688 + 49566464 0 21/6/2005 wbStaticTextProxy @@ -10122,16 +9798,16 @@ message. Please copy and paste it into the text box below. - + Spacer - 82123552 + 49590032 dialog-control-document spacer 0 1 0 - 82080688 + 49566464 0 21/6/2005 wbSpacerProxy @@ -10150,16 +9826,16 @@ message. Please copy and paste it into the text box below. FALSE <Any platform> - + wxStaticText: wxID_STATIC - 82130560 + 49587344 dialog-control-document statictext 0 1 0 - 82080688 + 49566464 0 21/6/2005 wbStaticTextProxy @@ -10210,16 +9886,16 @@ project. - + wxFlexGridSizer - 82131888 + 49627856 dialog-control-document sizer 0 1 0 - 82080688 + 49566464 0 21/6/2005 wbFlexGridSizerProxy @@ -10242,16 +9918,16 @@ project. FALSE FALSE FALSE - + wxRadioButton: ID_ACCOUNTCREATECTRL - 82151440 + 49640432 dialog-control-document radiobutton 0 1 0 - 82131888 + 49627856 0 21/6/2005 wbRadioButtonProxy @@ -10293,16 +9969,16 @@ project. - + wxRadioButton: ID_ACCOUNTUSEEXISTINGCTRL - 82166944 + 49657936 dialog-control-document radiobutton 0 1 0 - 82131888 + 49627856 0 21/6/2005 wbRadioButtonProxy @@ -10345,16 +10021,16 @@ project. - + wxFlexGridSizer - 82187824 + 49652912 dialog-control-document sizer 0 1 0 - 82080688 + 49566464 0 21/6/2005 wbFlexGridSizerProxy @@ -10377,16 +10053,16 @@ project. FALSE FALSE FALSE - + wxStaticText: ID_ACCOUNTEMAILADDRESSSTATICCTRL - 82199680 + 49677632 dialog-control-document statictext 0 1 0 - 82187824 + 49652912 0 21/6/2005 wbStaticTextProxy @@ -10434,16 +10110,16 @@ project. - + wxTextCtrl: ID_ACCOUNTEMAILADDRESSCTRL - 82200048 + 49698128 dialog-control-document textctrl 0 1 0 - 82187824 + 49652912 0 21/6/2005 wbTextCtrlProxy @@ -10502,16 +10178,16 @@ project. - + wxStaticText: ID_ACCOUNTPASSWORDSTATICCTRL - 82235888 + 49728960 dialog-control-document statictext 0 1 0 - 82187824 + 49652912 0 21/6/2005 wbStaticTextProxy @@ -10559,16 +10235,16 @@ project. - + wxTextCtrl: ID_ACCOUNTPASSWORDCTRL - 82256240 + 49721744 dialog-control-document textctrl 0 1 0 - 82187824 + 49652912 0 21/6/2005 wbTextCtrlProxy @@ -10627,16 +10303,16 @@ project. - + wxStaticText: ID_ACCOUNTCONFIRMPASSWORDSTATICCTRL - 82258176 + 49762352 dialog-control-document statictext 0 1 0 - 82187824 + 49652912 0 21/6/2005 wbStaticTextProxy @@ -10684,16 +10360,16 @@ project. - + wxTextCtrl: ID_ACCOUNTCONFIRMPASSWORDCTRL - 82297072 + 49782864 dialog-control-document textctrl 0 1 0 - 82187824 + 49652912 0 21/6/2005 wbTextCtrlProxy @@ -10755,16 +10431,16 @@ project. - + wxWizardPage: ID_ACCOUNTCREATIONPAGE - 82322624 + 49786640 dialog-control-document panel 0 1 0 - 81175360 + 48803600 0 27/6/2005 wbWizardPageProxy @@ -10798,16 +10474,16 @@ project. -1 - + wxBoxSizer V - 82340992 + 49814896 dialog-control-document sizer 0 1 0 - 82322624 + 49786640 0 27/6/2005 wbBoxSizerProxy @@ -10825,16 +10501,16 @@ project. FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 82063936 + 49819856 dialog-control-document statictext 0 1 0 - 82340992 + 49814896 0 27/6/2005 wbStaticTextProxy @@ -10882,16 +10558,16 @@ project. - + wxStaticText: wxID_STATIC - 82354208 + 49844288 dialog-control-document statictext 0 1 0 - 82340992 + 49814896 0 27/6/2005 wbStaticTextProxy @@ -10940,16 +10616,16 @@ existing account. - + Spacer - 82357616 + 49848080 dialog-control-document spacer 0 1 0 - 82340992 + 49814896 0 27/6/2005 wbSpacerProxy @@ -10968,16 +10644,16 @@ existing account. FALSE <Any platform> - + wxStaticText: wxID_STATIC - 82382272 + 49815648 dialog-control-document statictext 0 1 0 - 82340992 + 49814896 0 27/6/2005 wbStaticTextProxy @@ -11026,16 +10702,16 @@ couple known good websites in an effort to help diagnose the problem. - + wxFlexGridSizer - 82402992 + 49887088 dialog-control-document sizer 0 1 0 - 82340992 + 49814896 0 27/6/2005 wbFlexGridSizerProxy @@ -11058,16 +10734,16 @@ couple known good websites in an effort to help diagnose the problem. FALSE FALSE FALSE - + wxStaticBitmap: ID_PROJECTCOMMUNICATIONSIMAGECTRL - 82065088 + 49899632 dialog-control-document staticbitmap 0 1 0 - 82402992 + 49887088 0 27/6/2005 wbStaticBitmapProxy @@ -11109,16 +10785,16 @@ couple known good websites in an effort to help diagnose the problem. - + wxStaticText: ID_PROJECTCOMMUNICATIONSCTRL - 82431264 + 49915584 dialog-control-document statictext 0 1 0 - 82402992 + 49887088 0 27/6/2005 wbStaticTextProxy @@ -11167,16 +10843,16 @@ couple known good websites in an effort to help diagnose the problem. - + wxStaticText: ID_FINALACCOUNTCREATIONSTATUSCTRL - 82426256 + 49938192 dialog-control-document statictext 0 1 0 - 82340992 + 49814896 0 27/6/2005 wbStaticTextProxy @@ -11226,16 +10902,16 @@ couple known good websites in an effort to help diagnose the problem. - + wxWizardPage: ID_COMPLETIONPAGE - 82463312 + 49947168 dialog-control-document panel 0 1 0 - 81175360 + 48803600 0 24/6/2005 wbWizardPageProxy @@ -11268,16 +10944,16 @@ couple known good websites in an effort to help diagnose the problem. -1 - + wxBoxSizer V - 82473552 + 49965536 dialog-control-document sizer 0 1 0 - 82463312 + 49947168 0 27/6/2005 wbBoxSizerProxy @@ -11295,16 +10971,16 @@ couple known good websites in an effort to help diagnose the problem. FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 82479168 + 49807872 dialog-control-document statictext 0 1 0 - 82473552 + 49965536 0 27/6/2005 wbStaticTextProxy @@ -11352,16 +11028,16 @@ couple known good websites in an effort to help diagnose the problem. - + wxStaticText: wxID_STATIC - 82499392 + 49990912 dialog-control-document statictext 0 1 0 - 82473552 + 49965536 0 27/6/2005 wbStaticTextProxy @@ -11409,16 +11085,16 @@ couple known good websites in an effort to help diagnose the problem. - + Spacer - 82521680 + 50011376 dialog-control-document spacer 0 1 0 - 82473552 + 49965536 0 27/6/2005 wbSpacerProxy @@ -11439,16 +11115,16 @@ couple known good websites in an effort to help diagnose the problem. - + wxWizardPage: ID_ERRPROJECTUNAVAILABLEPAGE - 82529968 + 50019696 dialog-control-document panel 0 1 0 - 81175360 + 48803600 0 24/6/2005 wbWizardPageProxy @@ -11481,16 +11157,16 @@ couple known good websites in an effort to help diagnose the problem. -1 - + wxBoxSizer V - 82540224 + 50029936 dialog-control-document sizer 0 1 0 - 82529968 + 50019696 0 27/6/2005 wbBoxSizerProxy @@ -11508,16 +11184,16 @@ couple known good websites in an effort to help diagnose the problem. FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 82479872 + 49984080 dialog-control-document statictext 0 1 0 - 82540224 + 50029936 0 27/6/2005 wbStaticTextProxy @@ -11565,16 +11241,16 @@ couple known good websites in an effort to help diagnose the problem. - + wxStaticText: wxID_STATIC - 82566016 + 50049392 dialog-control-document statictext 0 1 0 - 82540224 + 50029936 0 27/6/2005 wbStaticTextProxy @@ -11622,16 +11298,16 @@ couple known good websites in an effort to help diagnose the problem. - + Spacer - 82580752 + 50045360 dialog-control-document spacer 0 1 0 - 82540224 + 50029936 0 27/6/2005 wbSpacerProxy @@ -11650,16 +11326,16 @@ couple known good websites in an effort to help diagnose the problem. FALSE <Any platform> - + wxStaticText: wxID_STATIC - 82587792 + 50074976 dialog-control-document statictext 0 1 0 - 82540224 + 50029936 0 1/7/2005 wbStaticTextProxy @@ -11711,16 +11387,16 @@ would be better. - + wxStaticText: wxID_STATIC - 82581024 + 50097696 dialog-control-document statictext 0 1 0 - 82540224 + 50029936 0 1/7/2005 wbStaticTextProxy @@ -11769,16 +11445,16 @@ about possible network or project issues. - + wxStaticText: wxID_STATIC - 82626048 + 50114928 dialog-control-document statictext 0 1 0 - 82540224 + 50029936 0 1/7/2005 wbStaticTextProxy @@ -11826,16 +11502,16 @@ about possible network or project issues. - + wxHyperLink: ID_PROJECTUNAVAILABLEBOINCLINK - 82645552 + 50110560 dialog-control-document foreign 0 1 0 - 82540224 + 50029936 0 1/7/2005 wbCustomCtrlProxy:wxHyperLink @@ -11888,16 +11564,16 @@ about possible network or project issues. - + wxWizardPage: ID_ERRNOINTERNETCONNECTIONPAGE - 82648304 + 50153248 dialog-control-document panel 0 1 0 - 81175360 + 48803600 0 24/6/2005 wbWizardPageProxy @@ -11930,16 +11606,16 @@ about possible network or project issues. -1 - + wxBoxSizer V - 82622032 + 50020112 dialog-control-document sizer 0 1 0 - 82648304 + 50153248 0 27/6/2005 wbBoxSizerProxy @@ -11957,16 +11633,16 @@ about possible network or project issues. FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 82684512 + 50169920 dialog-control-document statictext 0 1 0 - 82622032 + 50020112 0 27/6/2005 wbStaticTextProxy @@ -12014,16 +11690,16 @@ about possible network or project issues. - + wxStaticText: wxID_STATIC - 82678208 + 50190144 dialog-control-document statictext 0 1 0 - 82622032 + 50020112 0 27/6/2005 wbStaticTextProxy @@ -12072,16 +11748,16 @@ computers on the Internet. - + Spacer - 82719920 + 50210992 dialog-control-document spacer 0 1 0 - 82622032 + 50020112 0 27/6/2005 wbSpacerProxy @@ -12102,16 +11778,16 @@ computers on the Internet. - + wxWizardPage: ID_ERRACCOUNTALREADYEXISTSPAGE - 82728240 + 50219344 dialog-control-document panel 0 1 0 - 81175360 + 48803600 0 24/6/2005 wbWizardPageProxy @@ -12144,16 +11820,16 @@ computers on the Internet. -1 - + wxBoxSizer V - 82684880 + 50229600 dialog-control-document sizer 0 1 0 - 82728240 + 50219344 0 27/6/2005 wbBoxSizerProxy @@ -12171,16 +11847,16 @@ computers on the Internet. FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 82743920 + 50236864 dialog-control-document statictext 0 1 0 - 82684880 + 50229600 0 27/6/2005 wbStaticTextProxy @@ -12228,16 +11904,16 @@ computers on the Internet. - + wxStaticText: wxID_STATIC - 82766624 + 50255680 dialog-control-document statictext 0 1 0 - 82684880 + 50229600 0 27/6/2005 wbStaticTextProxy @@ -12285,16 +11961,16 @@ computers on the Internet. - + Spacer - 82786880 + 50278160 dialog-control-document spacer 0 1 0 - 82684880 + 50229600 0 27/6/2005 wbSpacerProxy @@ -12315,16 +11991,16 @@ computers on the Internet. - + wxWizardPage: ID_ERRACCOUNTCREATIONDISABLEDPAGE - 82795136 + 50286352 dialog-control-document panel 0 1 0 - 81175360 + 48803600 0 29/6/2005 wbWizardPageProxy @@ -12357,16 +12033,16 @@ computers on the Internet. -1 - + wxBoxSizer V - 82745872 + 50296720 dialog-control-document sizer 0 1 0 - 82795136 + 50286352 0 29/6/2005 wbBoxSizerProxy @@ -12384,16 +12060,16 @@ computers on the Internet. FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 82810656 + 50250512 dialog-control-document statictext 0 1 0 - 82745872 + 50296720 0 29/6/2005 wbStaticTextProxy @@ -12441,16 +12117,16 @@ computers on the Internet. - + wxStaticText: wxID_STATIC - 82833168 + 50322304 dialog-control-document statictext 0 1 0 - 82745872 + 50296720 0 29/6/2005 wbStaticTextProxy @@ -12498,16 +12174,16 @@ computers on the Internet. - + Spacer - 82846864 + 50337376 dialog-control-document spacer 0 1 0 - 82745872 + 50296720 0 29/6/2005 wbSpacerProxy @@ -12528,16 +12204,16 @@ computers on the Internet. - + wxWizardPage: ID_ERRPROXYINFOPAGE - 82855168 + 50345696 dialog-control-document panel 0 1 0 - 81175360 + 48803600 0 27/6/2005 wbWizardPageProxy @@ -12570,16 +12246,16 @@ computers on the Internet. -1 - + wxBoxSizer V - 82721040 + 50364016 dialog-control-document sizer 0 1 0 - 82855168 + 50345696 0 27/6/2005 wbBoxSizerProxy @@ -12597,16 +12273,16 @@ computers on the Internet. FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 82871616 + 50322672 dialog-control-document statictext 0 1 0 - 82721040 + 50364016 0 27/6/2005 wbStaticTextProxy @@ -12654,16 +12330,16 @@ computers on the Internet. - + wxStaticText: wxID_STATIC - 82892624 + 50381552 dialog-control-document statictext 0 1 0 - 82721040 + 50364016 0 27/6/2005 wbStaticTextProxy @@ -12711,16 +12387,16 @@ computers on the Internet. - + Spacer - 82914432 + 50402912 dialog-control-document spacer 0 1 0 - 82721040 + 50364016 0 27/6/2005 wbSpacerProxy @@ -12741,16 +12417,16 @@ computers on the Internet. - + wxWizardPage: ID_ERRPROXYHTTPPAGE - 82922512 + 50410976 dialog-control-document panel 0 1 0 - 81175360 + 48803600 0 27/6/2005 wbWizardPageProxy @@ -12787,16 +12463,16 @@ computers on the Internet. -1 - + wxBoxSizer V - 82932656 + 50429328 dialog-control-document sizer 0 1 0 - 82922512 + 50410976 0 27/6/2005 wbBoxSizerProxy @@ -12814,16 +12490,16 @@ computers on the Internet. FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 82939328 + 50381920 dialog-control-document statictext 0 1 0 - 82932656 + 50429328 0 27/6/2005 wbStaticTextProxy @@ -12871,16 +12547,16 @@ computers on the Internet. - + wxStaticText: wxID_STATIC - 82958144 + 50447088 dialog-control-document statictext 0 1 0 - 82932656 + 50429328 0 27/6/2005 wbStaticTextProxy @@ -12928,16 +12604,16 @@ computers on the Internet. - + Spacer - 82973088 + 50468448 dialog-control-document spacer 0 1 0 - 82932656 + 50429328 0 27/6/2005 wbSpacerProxy @@ -12956,16 +12632,16 @@ computers on the Internet. FALSE <Any platform> - + Spacer - 82982288 + 50477664 dialog-control-document spacer 0 1 0 - 82932656 + 50429328 0 27/6/2005 wbSpacerProxy @@ -12984,16 +12660,16 @@ computers on the Internet. FALSE <Any platform> - + wxButton: ID_HTTPAUTODETECT - 82989952 + 50485344 dialog-control-document dialogcontrol 0 1 0 - 82932656 + 50429328 0 27/6/2005 wbButtonProxy @@ -13037,16 +12713,16 @@ computers on the Internet. - + wxFlexGridSizer - 83007680 + 50470240 dialog-control-document sizer 0 1 0 - 82932656 + 50429328 0 27/6/2005 wbFlexGridSizerProxy @@ -13069,16 +12745,16 @@ computers on the Internet. FALSE FALSE FALSE - + wxStaticText: ID_PROXYHTTPSERVERSTATICCTRL - 83019520 + 50507200 dialog-control-document statictext 0 1 0 - 83007680 + 50470240 0 27/6/2005 wbStaticTextProxy @@ -13126,16 +12802,16 @@ computers on the Internet. - + wxFlexGridSizer - 83021552 + 50502544 dialog-control-document sizer 0 1 0 - 83007680 + 50470240 0 27/6/2005 wbFlexGridSizerProxy @@ -13158,16 +12834,16 @@ computers on the Internet. FALSE FALSE FALSE - + wxTextCtrl: ID_PROXYHTTPSERVERCTRL - 83044992 + 50534208 dialog-control-document textctrl 0 1 0 - 83021552 + 50502544 0 27/6/2005 wbTextCtrlProxy @@ -13226,16 +12902,16 @@ computers on the Internet. - + wxStaticText: ID_PROXYHTTPPORTSTATICCTRL - 83039248 + 50528672 dialog-control-document statictext 0 1 0 - 83021552 + 50502544 0 27/6/2005 wbStaticTextProxy @@ -13283,16 +12959,16 @@ computers on the Internet. - + wxTextCtrl: ID_PROXYHTTPPORTCTRL - 83090048 + 50578496 dialog-control-document textctrl 0 1 0 - 83021552 + 50502544 0 27/6/2005 wbTextCtrlProxy @@ -13352,16 +13028,16 @@ computers on the Internet. - + wxStaticText: ID_PROXYHTTPUSERNAMESTATICCTRL - 83114688 + 50603040 dialog-control-document statictext 0 1 0 - 83007680 + 50470240 0 27/6/2005 wbStaticTextProxy @@ -13409,16 +13085,16 @@ computers on the Internet. - + wxTextCtrl: ID_PROXYHTTPUSERNAMECTRL - 83128752 + 50625296 dialog-control-document textctrl 0 1 0 - 83007680 + 50470240 0 27/6/2005 wbTextCtrlProxy @@ -13477,16 +13153,16 @@ computers on the Internet. - + wxStaticText: ID_PROXYHTTPPASSWORDSTATICCTRL - 83156752 + 50640032 dialog-control-document statictext 0 1 0 - 83007680 + 50470240 0 27/6/2005 wbStaticTextProxy @@ -13534,16 +13210,16 @@ computers on the Internet. - + wxTextCtrl: ID_PROXYHTTPPASSWORDCTRL - 83169888 + 50640400 dialog-control-document textctrl 0 1 0 - 83007680 + 50470240 0 27/6/2005 wbTextCtrlProxy @@ -13605,16 +13281,16 @@ computers on the Internet. - + wxWizardPage: ID_ERRPROXYSOCKSPAGE - 83166464 + 50681312 dialog-control-document panel 0 1 0 - 81175360 + 48803600 0 27/6/2005 wbWizardPageProxy @@ -13651,16 +13327,16 @@ computers on the Internet. -1 - + wxBoxSizer V - 83150112 + 50429712 dialog-control-document sizer 0 1 0 - 83166464 + 50681312 0 27/6/2005 wbBoxSizerProxy @@ -13678,16 +13354,16 @@ computers on the Internet. FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 83202224 + 50696784 dialog-control-document statictext 0 1 0 - 83150112 + 50429712 0 27/6/2005 wbStaticTextProxy @@ -13735,16 +13411,16 @@ computers on the Internet. - + wxStaticText: wxID_STATIC - 83225008 + 50698640 dialog-control-document statictext 0 1 0 - 83150112 + 50429712 0 27/6/2005 wbStaticTextProxy @@ -13792,16 +13468,16 @@ computers on the Internet. - + Spacer - 83245632 + 50739776 dialog-control-document spacer 0 1 0 - 83150112 + 50429712 0 27/6/2005 wbSpacerProxy @@ -13820,16 +13496,16 @@ computers on the Internet. FALSE <Any platform> - + Spacer - 83254816 + 50748960 dialog-control-document spacer 0 1 0 - 83150112 + 50429712 0 27/6/2005 wbSpacerProxy @@ -13848,16 +13524,16 @@ computers on the Internet. FALSE <Any platform> - + wxButton: ID_SOCKSAUTODETECT - 83262512 + 50756656 dialog-control-document dialogcontrol 0 1 0 - 83150112 + 50429712 0 27/6/2005 wbButtonProxy @@ -13901,16 +13577,16 @@ computers on the Internet. - + wxFlexGridSizer - 83273056 + 50768192 dialog-control-document sizer 0 1 0 - 83150112 + 50429712 0 27/6/2005 wbFlexGridSizerProxy @@ -13933,16 +13609,16 @@ computers on the Internet. FALSE FALSE FALSE - + wxStaticText: ID_PROXYSOCKSSERVERSTATICCTRL - 83284912 + 50780032 dialog-control-document statictext 0 1 0 - 83273056 + 50768192 0 27/6/2005 wbStaticTextProxy @@ -13990,16 +13666,16 @@ computers on the Internet. - + wxFlexGridSizer - 83307984 + 50795392 dialog-control-document sizer 0 1 0 - 83273056 + 50768192 0 27/6/2005 wbFlexGridSizerProxy @@ -14022,16 +13698,16 @@ computers on the Internet. FALSE FALSE FALSE - + wxTextCtrl: ID_PROXYSOCKSSERVERCTRL - 83319328 + 50806800 dialog-control-document textctrl 0 1 0 - 83307984 + 50795392 0 27/6/2005 wbTextCtrlProxy @@ -14090,16 +13766,16 @@ computers on the Internet. - + wxStaticText: ID_PROXYSOCKSPORTSTATICCTRL - 83345168 + 50832416 dialog-control-document statictext 0 1 0 - 83307984 + 50795392 0 27/6/2005 wbStaticTextProxy @@ -14147,16 +13823,16 @@ computers on the Internet. - + wxTextCtrl: ID_PROXYSOCKSPORTCTRL - 83359360 + 50854704 dialog-control-document textctrl 0 1 0 - 83307984 + 50795392 0 27/6/2005 wbTextCtrlProxy @@ -14216,16 +13892,16 @@ computers on the Internet. - + wxStaticText: ID_PROXYSOCKSUSERNAMESTATICCTRL - 83386128 + 50874048 dialog-control-document statictext 0 1 0 - 83273056 + 50768192 0 27/6/2005 wbStaticTextProxy @@ -14273,16 +13949,16 @@ computers on the Internet. - + wxTextCtrl: ID_PROXYSOCKSUSERNAMECTRL - 83381552 + 50874416 dialog-control-document textctrl 0 1 0 - 83273056 + 50768192 0 27/6/2005 wbTextCtrlProxy @@ -14341,16 +14017,16 @@ computers on the Internet. - + wxStaticText: ID_PROXYSOCKSPASSWORDSTATICCTRL - 83422016 + 50909488 dialog-control-document statictext 0 1 0 - 83273056 + 50768192 0 27/6/2005 wbStaticTextProxy @@ -14398,16 +14074,16 @@ computers on the Internet. - + wxTextCtrl: ID_PROXYSOCKSPASSWORDCTRL - 83443472 + 50937360 dialog-control-document textctrl 0 1 0 - 83273056 + 50768192 0 27/6/2005 wbTextCtrlProxy @@ -14469,16 +14145,16 @@ computers on the Internet. - + wxWizardPage: ID_ERRPROXYCOMPLETIONPAGE - 83439152 + 50933296 dialog-control-document panel 0 1 0 - 81175360 + 48803600 0 27/6/2005 wbWizardPageProxy @@ -14511,16 +14187,16 @@ computers on the Internet. -1 - + wxBoxSizer V - 83467568 + 50961280 dialog-control-document sizer 0 1 0 - 83439152 + 50933296 0 27/6/2005 wbBoxSizerProxy @@ -14538,16 +14214,16 @@ computers on the Internet. FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 83472560 + 50966592 dialog-control-document statictext 0 1 0 - 83467568 + 50961280 0 27/6/2005 wbStaticTextProxy @@ -14595,16 +14271,16 @@ computers on the Internet. - + wxStaticText: wxID_STATIC - 83497104 + 50998688 dialog-control-document statictext 0 1 0 - 83467568 + 50961280 0 27/6/2005 wbStaticTextProxy @@ -14652,16 +14328,16 @@ computers on the Internet. - + Spacer - 83500816 + 50994240 dialog-control-document spacer 0 1 0 - 83467568 + 50961280 0 27/6/2005 wbSpacerProxy @@ -14682,266 +14358,718 @@ computers on the Internet. + + wxWizardPage: ID_ERRREFCOUNTPAGE + 40319232 + dialog-control-document + + panel + 0 + 1 + 0 + 48803600 + 0 + 9/7/2005 + wbWizardPageProxy + ID_ERRREFCOUNTPAGE + 10075 + CErrRefCountPage + wxWizardPage + m_ErrRefCountPage + + + + + + + FALSE + <Any platform> + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + TRUE + FALSE + + TRUE + -1 + -1 + + + + wxBoxSizer V + 44250512 + dialog-control-document + + sizer + 0 + 1 + 0 + 40319232 + 0 + 9/7/2005 + wbBoxSizerProxy + Vertical + + Centre + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + <Any platform> + + wxStaticText: wxID_STATIC + 44242096 + dialog-control-document + + statictext + 0 + 1 + 0 + 44250512 + 0 + 9/7/2005 + wbStaticTextProxy + wxID_STATIC + 5105 + wxStaticText + + Ref Count Page + + + + + 10, wxSWISS, wxNORMAL, wxBOLD, false, Verdana + 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 + + + + + wxStaticText: wxID_STATIC + 44239504 + dialog-control-document + + statictext + 0 + 1 + 0 + 44250512 + 0 + 9/7/2005 + wbStaticTextProxy + wxID_STATIC + 5105 + wxStaticText + + This page should never be used in the wizard itself. + + + + + + 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 + 44267968 + dialog-control-document + + spacer + 0 + 1 + 0 + 44250512 + 0 + 9/7/2005 + wbSpacerProxy + 5 + 5 + Left + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + <Any platform> + + + wxStaticText: wxID_STATIC + 44334064 + dialog-control-document + + statictext + 0 + 1 + 0 + 44250512 + 0 + 9/7/2005 + wbStaticTextProxy + wxID_STATIC + 5105 + wxStaticText + + This page just increases the refcount of various bitmap resources +so that DialogBlocks doesn't nuke the refences to them. + + + + + + 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 + + + + + wxBoxSizer H + 44335120 + dialog-control-document + + sizer + 0 + 1 + 0 + 44250512 + 0 + 9/7/2005 + wbBoxSizerProxy + Horizontal + + Left + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + <Any platform> + + wxStaticBitmap: wxID_STATIC + 44383936 + dialog-control-document + + staticbitmap + 0 + 1 + 0 + 44335120 + 0 + 9/7/2005 + wbStaticBitmapProxy + wxID_STATIC + 5105 + wxStaticBitmap + + res/wizfailure.xpm + + + + + + FALSE + <Any platform> + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + + -1 + -1 + 16 + 16 + Centre + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + + + + + wxStaticBitmap: wxID_STATIC + 44382192 + dialog-control-document + + staticbitmap + 0 + 1 + 0 + 44335120 + 0 + 9/7/2005 + wbStaticBitmapProxy + wxID_STATIC + 5105 + wxStaticBitmap + + res/wizquestion.xpm + + + + + + FALSE + <Any platform> + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + + -1 + -1 + 16 + 16 + Centre + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + + + + + wxStaticBitmap: wxID_STATIC + 44400944 + dialog-control-document + + staticbitmap + 0 + 1 + 0 + 44335120 + 0 + 9/7/2005 + wbStaticBitmapProxy + wxID_STATIC + 5105 + wxStaticBitmap + + res/wizsuccess.xpm + + + + + + FALSE + <Any platform> + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + + -1 + -1 + 16 + 16 + Centre + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + + + + + + - + Images - 83497392 + 50998976 html-document bitmapsfolder 1 1 0 - 14638512 + 14626976 1 - + boincsm.xpm - 83497888 + 50991456 image-document res/boincsm.xpm image 0 0 0 - 83497392 + 50998976 0 1/3/2005 100 - + boinc.xpm - 83523200 + 51016624 image-document res/boinc.xpm image 0 0 0 - 83497392 + 50998976 0 21/6/2005 100 - + boinc_mac.xpm - 83522992 + 51016416 image-document res/boinc_mac.xpm image 0 0 0 - 83497392 + 50998976 0 21/6/2005 100 - + BOINCGUIApp.xpm - 83522784 + 51016208 image-document res/BOINCGUIApp.xpm image 0 0 0 - 83497392 + 50998976 0 21/6/2005 100 - + connect.xpm - 83522576 + 51016000 image-document res/connect.xpm image 0 0 0 - 83497392 + 50998976 0 21/6/2005 100 - + disconnect.xpm - 83522368 + 50994656 image-document res/disconnect.xpm image 0 0 0 - 83497392 + 50998976 0 21/6/2005 100 - + mess.xpm - 83522160 + 50937712 image-document res/mess.xpm image 0 0 0 - 83497392 + 50998976 0 21/6/2005 100 - + proj.xpm - 83521952 + 50933616 image-document res/proj.xpm image 0 0 0 - 83497392 + 50998976 0 21/6/2005 100 - + result.xpm - 83521744 + 50962288 image-document res/result.xpm image 0 0 0 - 83497392 + 50998976 0 21/6/2005 100 - + usage.xpm - 83439472 + 50983056 image-document res/usage.xpm image 0 0 0 - 83497392 + 50998976 0 21/6/2005 100 - + xfer.xpm - 83431840 + 50974576 image-document res/xfer.xpm image 0 0 0 - 83497392 + 50998976 0 21/6/2005 100 - + attachprojectwizard.xpm - 83431696 + 50974432 image-document res/attachprojectwizard.xpm image 0 0 0 - 83497392 + 50998976 0 21/6/2005 100 - + wizfailure.xpm - 83460112 + 50961984 image-document res/wizfailure.xpm image 0 0 0 - 83497392 + 50998976 0 25/6/2005 100 - + wizquestion.xpm - 83468416 + 50961840 image-document res/wizquestion.xpm image 0 0 0 - 83497392 + 50998976 0 25/6/2005 100 - + wizsuccess.xpm - 83473024 + 50961696 image-document res/wizsuccess.xpm image 0 0 0 - 83497392 + 50998976 0 25/6/2005 100 - + Sources - 83472896 + 50982928 html-document sourcesfolder 1 1 0 - 14638512 + 14626976 1 10/2/2005 - + ValidateAccountKey.cpp - 83468144 + 50961520 source-editor-document ValidateAccountKey.cpp source-editor 0 0 1 - 83472896 + 50982928 0 29/2/2005 - + ValidateURL.cpp - 83468000 + 50967616 source-editor-document ValidateURL.cpp source-editor 0 0 1 - 83472896 + 50982928 0 29/2/2005 diff --git a/clientgui/WizAttachProject.cpp b/clientgui/WizAttachProject.cpp index 0b8e4308a3..4f75edad9f 100644 --- a/clientgui/WizAttachProject.cpp +++ b/clientgui/WizAttachProject.cpp @@ -24,6 +24,7 @@ #include "stdwx.h" #include "BOINCGUIApp.h" #include "error_numbers.h" +#include "network.h" ////@begin includes ////@end includes @@ -33,8 +34,8 @@ ////@begin XPM images #include "res/attachprojectwizard.xpm" #include "res/wizquestion.xpm" -#include "res/wizsuccess.xpm" #include "res/wizfailure.xpm" +#include "res/wizsuccess.xpm" ////@end XPM images @@ -63,6 +64,9 @@ IMPLEMENT_DYNAMIC_CLASS( CWizAttachProject, wxWizard ) BEGIN_EVENT_TABLE( CWizAttachProject, wxWizard ) + EVT_BUTTON(wxID_BACKWARD, CWizAttachProject::OnWizardBack) + EVT_BUTTON(wxID_FORWARD, CWizAttachProject::OnWizardNext) + ////@begin CWizAttachProject event table entries EVT_WIZARD_CANCEL( ID_ATTACHPROJECTWIZARD, CWizAttachProject::OnWizardCancel ) @@ -105,8 +109,13 @@ bool CWizAttachProject::Create( wxWindow* parent, wxWindowID id, const wxPoint& m_ErrProxyHTTPPage = NULL; m_ErrProxySOCKSPage = NULL; m_ErrProxyCompletionPage = NULL; + m_ErrRefCountPage = NULL; ////@end CWizAttachProject member initialisation + // Button pointer cache + m_pbtnBack = NULL; + m_pbtnNext = NULL; + // Wizard support m_ulDiagFlags = 0; @@ -196,6 +205,10 @@ void CWizAttachProject::CreateControls() m_ErrProxyCompletionPage->Create( itemWizard1 ); itemWizard1->FitToPage(m_ErrProxyCompletionPage); + m_ErrRefCountPage = new CErrRefCountPage; + m_ErrRefCountPage->Create( itemWizard1 ); + + itemWizard1->FitToPage(m_ErrRefCountPage); wxWizardPageSimple* lastPage = NULL; ////@end CWizAttachProject content construction @@ -405,6 +418,15 @@ void CWizAttachProject::OnWizardCancel( wxWizardEvent& event ) } } +void CWizAttachProject::OnWizardBack( wxCommandEvent& event ) { + if (!GetBackButton()) SetBackButton((wxButton*)event.GetEventObject()); + event.Skip(); +} + +void CWizAttachProject::OnWizardNext( wxCommandEvent& event ) { + if (!GetNextButton()) SetNextButton((wxButton*)event.GetEventObject()); + event.Skip(); +} /*! * CWelcomePage type definition @@ -445,14 +467,30 @@ CWelcomePage::CWelcomePage( wxWizard* parent ) bool CWelcomePage::Create( wxWizard* parent ) { ////@begin CWelcomePage member initialisation +#if defined(__WXDEBUG__) m_ErrProjectPropertiesCtrl = NULL; +#endif +#if defined(__WXDEBUG__) m_ErrProjectCommCtrl = NULL; +#endif +#if defined(__WXDEBUG__) m_ErrProjectPropertiesURLCtrl = NULL; +#endif +#if defined(__WXDEBUG__) m_ErrAccountCreationDisabledCtrl = NULL; +#endif +#if defined(__WXDEBUG__) m_ErrAccountAlreadyExistsCtrl = NULL; +#endif +#if defined(__WXDEBUG__) m_ErrGoogleCommCtrl = NULL; +#endif +#if defined(__WXDEBUG__) m_ErrYahooCommCtrl = NULL; +#endif +#if defined(__WXDEBUG__) m_ErrNetDetectionCtrl = NULL; +#endif ////@end CWelcomePage member initialisation ////@begin CWelcomePage creation @@ -492,6 +530,7 @@ void CWelcomePage::CreateControls() itemStaticText7->Create( itemWizardPage2, wxID_STATIC, _("This wizard will require access to the Internet in order to attach to\na project using an existing account or creating a new one."), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer3->Add(itemStaticText7, 0, wxALIGN_LEFT|wxALL, 5); +#if defined(__WXDEBUG__) wxStaticBox* itemStaticBoxSizer8Static = new wxStaticBox(itemWizardPage2, wxID_ANY, _("Debug Flags")); wxStaticBoxSizer* itemStaticBoxSizer8 = new wxStaticBoxSizer(itemStaticBoxSizer8Static, wxVERTICAL); itemBoxSizer3->Add(itemStaticBoxSizer8, 0, wxGROW|wxALL, 5); @@ -541,6 +580,8 @@ void CWelcomePage::CreateControls() m_ErrNetDetectionCtrl->SetValue(FALSE); itemFlexGridSizer9->Add(m_ErrNetDetectionCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0); +#endif + wxStaticText* itemStaticText18 = new wxStaticText; itemStaticText18->Create( itemWizardPage2, wxID_STATIC, _("To continue, click Next."), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer3->Add(itemStaticText18, 0, wxALIGN_LEFT|wxALL, 5); @@ -849,12 +890,6 @@ bool CProjectPropertiesPage::Create( wxWizard* parent ) ////@begin CProjectPropertiesPage member initialisation m_RetrProjectPropertiesImageCtrl = NULL; m_RetrProjectPropertiesCtrl = NULL; - m_CommYahooImageCtrl = NULL; - m_CommYahooCtrl = NULL; - m_CommGoogleImageCtrl = NULL; - m_CommGoogleCtrl = NULL; - m_DetermineConnectionStatusImageCtrl = NULL; - m_DetermineConnectionStatusCtrl = NULL; m_FinalProjectPropertiesStatusCtrl = NULL; ////@end CProjectPropertiesPage member initialisation m_bProjectPropertiesSucceeded = false; @@ -910,33 +945,6 @@ void CProjectPropertiesPage::CreateControls() m_RetrProjectPropertiesCtrl->Create( itemWizardPage31, ID_RETRPROJECTPROPERTIESCTRL, _("Communicating with the project server."), wxDefaultPosition, wxDefaultSize, 0 ); itemFlexGridSizer36->Add(m_RetrProjectPropertiesCtrl, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxBitmap m_CommYahooImageCtrlBitmap(itemWizardPage31->GetBitmapResource(wxT("res/wizsuccess.xpm"))); - m_CommYahooImageCtrl = new wxStaticBitmap; - m_CommYahooImageCtrl->Create( itemWizardPage31, ID_COMMYAHOOIMAGECTRL, m_CommYahooImageCtrlBitmap, wxDefaultPosition, wxSize(16, 16), 0 ); - itemFlexGridSizer36->Add(m_CommYahooImageCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); - - m_CommYahooCtrl = new wxStaticText; - m_CommYahooCtrl->Create( itemWizardPage31, ID_COMMYAHOOCTRL, _("Communicating with Yahoo"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer36->Add(m_CommYahooCtrl, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - - wxBitmap m_CommGoogleImageCtrlBitmap(itemWizardPage31->GetBitmapResource(wxT("res/wizfailure.xpm"))); - m_CommGoogleImageCtrl = new wxStaticBitmap; - m_CommGoogleImageCtrl->Create( itemWizardPage31, ID_COMMGOOGLEIMAGECTRL, m_CommGoogleImageCtrlBitmap, wxDefaultPosition, wxSize(16, 16), 0 ); - itemFlexGridSizer36->Add(m_CommGoogleImageCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); - - m_CommGoogleCtrl = new wxStaticText; - m_CommGoogleCtrl->Create( itemWizardPage31, ID_COMMGOOGLECTRL, _("Communicating with Google"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer36->Add(m_CommGoogleCtrl, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - - wxBitmap m_DetermineConnectionStatusImageCtrlBitmap(itemWizardPage31->GetBitmapResource(wxT("res/wizquestion.xpm"))); - m_DetermineConnectionStatusImageCtrl = new wxStaticBitmap; - m_DetermineConnectionStatusImageCtrl->Create( itemWizardPage31, ID_DETERMINECONNECTIONSTATUSIMAGECTRL, m_DetermineConnectionStatusImageCtrlBitmap, wxDefaultPosition, wxSize(16, 16), 0 ); - itemFlexGridSizer36->Add(m_DetermineConnectionStatusImageCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); - - m_DetermineConnectionStatusCtrl = new wxStaticText; - m_DetermineConnectionStatusCtrl->Create( itemWizardPage31, ID_DETERMINECONNECTIONSTATUSCTRL, _("Determining connection status"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer36->Add(m_DetermineConnectionStatusCtrl, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - m_FinalProjectPropertiesStatusCtrl = new wxStaticText; m_FinalProjectPropertiesStatusCtrl->Create( itemWizardPage31, ID_FINALPROJECTPROPERTIESTATUSCTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer32->Add(m_FinalProjectPropertiesStatusCtrl, 0, wxALIGN_LEFT|wxALL, 5); @@ -1067,20 +1075,12 @@ void CProjectPropertiesPage::OnStateChange( CProjectPropertiesPageEvent& event ) switch(GetCurrentState()) { case PROJPROP_INIT: + // Change the cursor to an hourglass + ::wxBeginBusyCursor(); + // Set initial bitmaps to question marks since we don't yet know how // things will turn out. m_RetrProjectPropertiesImageCtrl->SetBitmap(GetBitmapResource(wxT("res/wizquestion.xpm"))); - m_CommYahooImageCtrl->SetBitmap(GetBitmapResource(wxT("res/wizquestion.xpm"))); - m_CommGoogleImageCtrl->SetBitmap(GetBitmapResource(wxT("res/wizquestion.xpm"))); - m_DetermineConnectionStatusImageCtrl->SetBitmap(GetBitmapResource(wxT("res/wizquestion.xpm"))); - - // Hide the additional diagnostics stuff until we really need it. - m_CommYahooImageCtrl->Hide(); - m_CommYahooCtrl->Hide(); - m_CommGoogleImageCtrl->Hide(); - m_CommGoogleCtrl->Hide(); - m_DetermineConnectionStatusImageCtrl->Hide(); - m_DetermineConnectionStatusCtrl->Hide(); // Clear out any text that might exist in the final status field m_FinalProjectPropertiesStatusCtrl->SetLabel(wxT("")); @@ -1113,7 +1113,6 @@ void CProjectPropertiesPage::OnStateChange( CProjectPropertiesPageEvent& event ) // correct 'next' page. bSuccessfulCondition = (BOINC_SUCCESS == iReturnValue) || (HTTP_STATUS_NOT_FOUND == iReturnValue); if (bSuccessfulCondition && !CHECK_DEBUG_FLAG(WIZDEBUG_ERRPROJECTPROPERTIES)) { - m_RetrProjectPropertiesImageCtrl->SetBitmap(GetBitmapResource(wxT("res/wizsuccess.xpm"))); SetProjectPropertiesSucceeded(true); bSuccessfulCondition = (HTTP_STATUS_NOT_FOUND == iReturnValue); @@ -1130,103 +1129,87 @@ void CProjectPropertiesPage::OnStateChange( CProjectPropertiesPageEvent& event ) SetProjectAccountCreationDisabled(false); } - // Say something useful to go with this condition - m_FinalProjectPropertiesStatusCtrl->SetLabel(_("To continue, click Next.")); - - SetNextState(PROJPROP_END); + SetNextState(PROJPROP_CLEANUP); } else { - m_RetrProjectPropertiesImageCtrl->SetBitmap(GetBitmapResource(wxT("res/wizfailure.xpm"))); - - // Show the additional diagnostics stuff. - m_CommYahooImageCtrl->Show(); - m_CommYahooCtrl->Show(); - m_CommGoogleImageCtrl->Show(); - m_CommGoogleCtrl->Show(); - m_DetermineConnectionStatusImageCtrl->Show(); - m_DetermineConnectionStatusCtrl->Show(); - SetProjectPropertiesSucceeded(false); SetNextState(PROJPROP_COMMUNICATEYAHOO_BEGIN); } - m_RetrProjectPropertiesCtrl->SetFont(fontOriginal); break; case PROJPROP_COMMUNICATEYAHOO_BEGIN: - // Highlight the current activity by making it bold - m_CommYahooCtrl->SetFont(fontBold); SetNextState(PROJPROP_COMMUNICATEYAHOO_EXECUTE); break; case PROJPROP_COMMUNICATEYAHOO_EXECUTE: // Attempt to successfully download the Yahoo homepage - pDoc->rpc.lookup_yahoo(); + pDoc->rpc.lookup_website(LOOKUP_YAHOO); // Wait until we are done processing the request. iReturnValue = ERR_IN_PROGRESS; while (ERR_IN_PROGRESS == iReturnValue) { - iReturnValue = pDoc->rpc.lookup_yahoo_poll(); + iReturnValue = pDoc->rpc.lookup_website_poll(); wxSleep(1); } if ((BOINC_SUCCESS == iReturnValue) && !CHECK_DEBUG_FLAG(WIZDEBUG_ERRYAHOOCOMM)) { - m_CommYahooImageCtrl->SetBitmap(GetBitmapResource(wxT("res/wizsuccess.xpm"))); SetCommunicateYahooSucceeded(true); } else { - m_CommYahooImageCtrl->SetBitmap(GetBitmapResource(wxT("res/wizfailure.xpm"))); SetCommunicateYahooSucceeded(false); } SetNextState(PROJPROP_COMMUNICATEGOOGLE_BEGIN); - m_CommYahooCtrl->SetFont(fontOriginal); break; case PROJPROP_COMMUNICATEGOOGLE_BEGIN: - // Highlight the current activity by making it bold - m_CommGoogleCtrl->SetFont(fontBold); SetNextState(PROJPROP_COMMUNICATEGOOGLE_EXECUTE); break; case PROJPROP_COMMUNICATEGOOGLE_EXECUTE: // Attempt to successfully download the Google homepage - pDoc->rpc.lookup_yahoo(); + pDoc->rpc.lookup_website(LOOKUP_GOOGLE); // Wait until we are done processing the request. iReturnValue = ERR_IN_PROGRESS; while (ERR_IN_PROGRESS == iReturnValue) { - iReturnValue = pDoc->rpc.lookup_yahoo_poll(); + iReturnValue = pDoc->rpc.lookup_website_poll(); wxSleep(1); } if ((BOINC_SUCCESS == iReturnValue) && !CHECK_DEBUG_FLAG(WIZDEBUG_ERRGOOGLECOMM)) { - m_CommGoogleImageCtrl->SetBitmap(GetBitmapResource(wxT("res/wizsuccess.xpm"))); SetCommunicateGoogleSucceeded(true); } else { - m_CommGoogleImageCtrl->SetBitmap(GetBitmapResource(wxT("res/wizfailure.xpm"))); SetCommunicateGoogleSucceeded(false); } - m_CommGoogleCtrl->SetFont(fontOriginal); SetNextState(PROJPROP_DETERMINENETWORKSTATUS_BEGIN); break; case PROJPROP_DETERMINENETWORKSTATUS_BEGIN: - // Highlight the current activity by making it bold - m_DetermineConnectionStatusCtrl->SetFont(fontBold); SetNextState(PROJPROP_DETERMINENETWORKSTATUS_EXECUTE); break; case PROJPROP_DETERMINENETWORKSTATUS_EXECUTE: // Attempt to determine if we are even connected to a network - wxSleep(2); - - // Replace with the function call that really does the work. - if (!CHECK_DEBUG_FLAG(WIZDEBUG_ERRNETDETECTION)) { - m_DetermineConnectionStatusImageCtrl->SetBitmap(GetBitmapResource(wxT("res/wizsuccess.xpm"))); + bSuccessfulCondition = CONNECTED_STATE_CONNECTED == get_connected_state(); + if (bSuccessfulCondition && !CHECK_DEBUG_FLAG(WIZDEBUG_ERRNETDETECTION)) { SetDeterminingConnectionStatusSucceeded(true); } else { - m_DetermineConnectionStatusImageCtrl->SetBitmap(GetBitmapResource(wxT("res/wizfailure.xpm"))); SetDeterminingConnectionStatusSucceeded(false); } - m_DetermineConnectionStatusCtrl->SetFont(fontOriginal); - - // Say something useful to go with this condition - m_FinalProjectPropertiesStatusCtrl->SetLabel(_("One or more problems detected, click Next to troubleshoot the\nproblem.")); + SetNextState(PROJPROP_CLEANUP); + break; + case PROJPROP_CLEANUP: + if (GetProjectPropertiesSucceeded()) { + m_RetrProjectPropertiesImageCtrl->SetBitmap(GetBitmapResource(wxT("res/wizsuccess.xpm"))); + } else { + m_RetrProjectPropertiesImageCtrl->SetBitmap(GetBitmapResource(wxT("res/wizfailure.xpm"))); + } + m_RetrProjectPropertiesCtrl->SetFont(fontOriginal); SetNextState(PROJPROP_END); break; default: + // Allow a glimps of what the result was before advancing to the next page. + wxSleep(1); + wxCommandEvent eventNext(wxEVT_COMMAND_BUTTON_CLICKED, ((CWizAttachProject*)GetParent())->GetNextButton()->GetId()); + eventNext.SetEventObject(((CWizAttachProject*)GetParent())->GetNextButton()); + GetParent()->AddPendingEvent(eventNext); + + // Change the cursor to a normal cursor + ::wxEndBusyCursor(); + bPostNewEvent = false; break; } @@ -1298,50 +1281,50 @@ bool CAccountKeyPage::Create( wxWizard* parent ) void CAccountKeyPage::CreateControls() { ////@begin CAccountKeyPage content construction - CAccountKeyPage* itemWizardPage46 = this; + CAccountKeyPage* itemWizardPage40 = this; - wxBoxSizer* itemBoxSizer47 = new wxBoxSizer(wxVERTICAL); - itemWizardPage46->SetSizer(itemBoxSizer47); + wxBoxSizer* itemBoxSizer41 = new wxBoxSizer(wxVERTICAL); + itemWizardPage40->SetSizer(itemBoxSizer41); + + wxStaticText* itemStaticText42 = new wxStaticText; + itemStaticText42->Create( itemWizardPage40, wxID_STATIC, _("Account Key"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText42->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer41->Add(itemStaticText42, 0, wxALIGN_LEFT|wxALL, 5); + + wxStaticText* itemStaticText43 = new wxStaticText; + itemStaticText43->Create( itemWizardPage40, wxID_STATIC, _("Do you have your project account key handy?"), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer41->Add(itemStaticText43, 0, wxALIGN_LEFT|wxALL, 5); + + itemBoxSizer41->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + + wxStaticText* itemStaticText45 = new wxStaticText; + itemStaticText45->Create( itemWizardPage40, wxID_STATIC, _("This project does not support account management through this\nwizard and uses BOINC's account key authentication."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer41->Add(itemStaticText45, 0, wxALIGN_LEFT|wxALL, 5); + + wxStaticText* itemStaticText46 = new wxStaticText; + itemStaticText46->Create( itemWizardPage40, wxID_STATIC, _("An account key is a string of 32 random letters and numbers that\nare assigned during the account creation process and is treated\nlike a username and password on other web based systems. It will\nhave been sent to you via email as part of the confirmation email\nmessage. Please copy and paste it into the text box below."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer41->Add(itemStaticText46, 0, wxALIGN_LEFT|wxALL, 5); + + wxStaticText* itemStaticText47 = new wxStaticText; + itemStaticText47->Create( itemWizardPage40, wxID_STATIC, _("An account key typically looks like:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer41->Add(itemStaticText47, 0, wxALIGN_LEFT|wxALL, 5); wxStaticText* itemStaticText48 = new wxStaticText; - itemStaticText48->Create( itemWizardPage46, wxID_STATIC, _("Account Key"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText48->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer47->Add(itemStaticText48, 0, wxALIGN_LEFT|wxALL, 5); + itemStaticText48->Create( itemWizardPage40, wxID_STATIC, _("82412313ac88e9a3638f66ea82186948"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText48->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, FALSE, _T("Courier New"))); + itemBoxSizer41->Add(itemStaticText48, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 0); - wxStaticText* itemStaticText49 = new wxStaticText; - itemStaticText49->Create( itemWizardPage46, wxID_STATIC, _("Do you have your project account key handy?"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer47->Add(itemStaticText49, 0, wxALIGN_LEFT|wxALL, 5); - - itemBoxSizer47->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - - wxStaticText* itemStaticText51 = new wxStaticText; - itemStaticText51->Create( itemWizardPage46, wxID_STATIC, _("This project does not support account management through this\nwizard and uses BOINC's account key authentication."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer47->Add(itemStaticText51, 0, wxALIGN_LEFT|wxALL, 5); - - wxStaticText* itemStaticText52 = new wxStaticText; - itemStaticText52->Create( itemWizardPage46, wxID_STATIC, _("An account key is a string of 32 random letters and numbers that\nare assigned during the account creation process and is treated\nlike a username and password on other web based systems. It will\nhave been sent to you via email as part of the confirmation email\nmessage. Please copy and paste it into the text box below."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer47->Add(itemStaticText52, 0, wxALIGN_LEFT|wxALL, 5); - - wxStaticText* itemStaticText53 = new wxStaticText; - itemStaticText53->Create( itemWizardPage46, wxID_STATIC, _("An account key typically looks like:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer47->Add(itemStaticText53, 0, wxALIGN_LEFT|wxALL, 5); - - wxStaticText* itemStaticText54 = new wxStaticText; - itemStaticText54->Create( itemWizardPage46, wxID_STATIC, _("82412313ac88e9a3638f66ea82186948"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText54->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, FALSE, _T("Courier New"))); - itemBoxSizer47->Add(itemStaticText54, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 0); - - wxFlexGridSizer* itemFlexGridSizer55 = new wxFlexGridSizer(1, 2, 0, 0); - itemFlexGridSizer55->AddGrowableCol(1); - itemBoxSizer47->Add(itemFlexGridSizer55, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + wxFlexGridSizer* itemFlexGridSizer49 = new wxFlexGridSizer(1, 2, 0, 0); + itemFlexGridSizer49->AddGrowableCol(1); + itemBoxSizer41->Add(itemFlexGridSizer49, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); m_AccountKeyStaticCtrl = new wxStaticText; - m_AccountKeyStaticCtrl->Create( itemWizardPage46, ID_ACCOUNTKEYSTATICCTRL, _("Account key:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer55->Add(m_AccountKeyStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_AccountKeyStaticCtrl->Create( itemWizardPage40, ID_ACCOUNTKEYSTATICCTRL, _("Account key:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer49->Add(m_AccountKeyStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_AccountKeyCtrl = new wxTextCtrl; - m_AccountKeyCtrl->Create( itemWizardPage46, ID_ACCOUNTKEYCTRL, _T(""), wxDefaultPosition, wxSize(225, -1), 0 ); - itemFlexGridSizer55->Add(m_AccountKeyCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_AccountKeyCtrl->Create( itemWizardPage40, ID_ACCOUNTKEYCTRL, _T(""), wxDefaultPosition, wxSize(225, -1), 0 ); + itemFlexGridSizer49->Add(m_AccountKeyCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); // Set validators m_AccountKeyCtrl->SetValidator( wxTextValidator(wxFILTER_ALPHANUMERIC, & m_strAccountKey) ); @@ -1468,67 +1451,67 @@ bool CAccountInfoPage::Create( wxWizard* parent ) void CAccountInfoPage::CreateControls() { ////@begin CAccountInfoPage content construction - CAccountInfoPage* itemWizardPage58 = this; + CAccountInfoPage* itemWizardPage52 = this; - wxBoxSizer* itemBoxSizer59 = new wxBoxSizer(wxVERTICAL); - itemWizardPage58->SetSizer(itemBoxSizer59); + wxBoxSizer* itemBoxSizer53 = new wxBoxSizer(wxVERTICAL); + itemWizardPage52->SetSizer(itemBoxSizer53); - wxStaticText* itemStaticText60 = new wxStaticText; - itemStaticText60->Create( itemWizardPage58, wxID_STATIC, _("Account Information"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText60->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer59->Add(itemStaticText60, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText54 = new wxStaticText; + itemStaticText54->Create( itemWizardPage52, wxID_STATIC, _("Account Information"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText54->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer53->Add(itemStaticText54, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText61 = new wxStaticText; - itemStaticText61->Create( itemWizardPage58, wxID_STATIC, _("Do you wish to use an existing account or create a new one?"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer59->Add(itemStaticText61, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText55 = new wxStaticText; + itemStaticText55->Create( itemWizardPage52, wxID_STATIC, _("Do you wish to use an existing account or create a new one?"), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer53->Add(itemStaticText55, 0, wxALIGN_LEFT|wxALL, 5); - itemBoxSizer59->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer53->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText63 = new wxStaticText; - itemStaticText63->Create( itemWizardPage58, wxID_STATIC, _("If this is the first time you have attempted to attach to this project then\nyou should create a new account. If you already have an account you\nshould use your existing email address and password to attach to the\nproject."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer59->Add(itemStaticText63, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText57 = new wxStaticText; + itemStaticText57->Create( itemWizardPage52, wxID_STATIC, _("If this is the first time you have attempted to attach to this project then\nyou should create a new account. If you already have an account you\nshould use your existing email address and password to attach to the\nproject."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer53->Add(itemStaticText57, 0, wxALIGN_LEFT|wxALL, 5); - wxFlexGridSizer* itemFlexGridSizer64 = new wxFlexGridSizer(1, 2, 0, 0); - itemFlexGridSizer64->AddGrowableCol(1); - itemBoxSizer59->Add(itemFlexGridSizer64, 0, wxGROW|wxALL, 5); + wxFlexGridSizer* itemFlexGridSizer58 = new wxFlexGridSizer(1, 2, 0, 0); + itemFlexGridSizer58->AddGrowableCol(1); + itemBoxSizer53->Add(itemFlexGridSizer58, 0, wxGROW|wxALL, 5); m_AccountCreateCtrl = new wxRadioButton; - m_AccountCreateCtrl->Create( itemWizardPage58, ID_ACCOUNTCREATECTRL, _("Create new account"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); + m_AccountCreateCtrl->Create( itemWizardPage52, ID_ACCOUNTCREATECTRL, _("Create new account"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); m_AccountCreateCtrl->SetValue(FALSE); - itemFlexGridSizer64->Add(m_AccountCreateCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemFlexGridSizer58->Add(m_AccountCreateCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_AccountUseExistingCtrl = new wxRadioButton; - m_AccountUseExistingCtrl->Create( itemWizardPage58, ID_ACCOUNTUSEEXISTINGCTRL, _("Use existing account"), wxDefaultPosition, wxDefaultSize, 0 ); + m_AccountUseExistingCtrl->Create( itemWizardPage52, ID_ACCOUNTUSEEXISTINGCTRL, _("Use existing account"), wxDefaultPosition, wxDefaultSize, 0 ); m_AccountUseExistingCtrl->SetValue(FALSE); - itemFlexGridSizer64->Add(m_AccountUseExistingCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemFlexGridSizer58->Add(m_AccountUseExistingCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxFlexGridSizer* itemFlexGridSizer67 = new wxFlexGridSizer(3, 2, 0, 0); - itemFlexGridSizer67->AddGrowableCol(1); - itemBoxSizer59->Add(itemFlexGridSizer67, 0, wxGROW|wxALL, 5); + wxFlexGridSizer* itemFlexGridSizer61 = new wxFlexGridSizer(3, 2, 0, 0); + itemFlexGridSizer61->AddGrowableCol(1); + itemBoxSizer53->Add(itemFlexGridSizer61, 0, wxGROW|wxALL, 5); m_AccountEmailAddressStaticCtrl = new wxStaticText; - m_AccountEmailAddressStaticCtrl->Create( itemWizardPage58, ID_ACCOUNTEMAILADDRESSSTATICCTRL, _("Email address:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer67->Add(m_AccountEmailAddressStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_AccountEmailAddressStaticCtrl->Create( itemWizardPage52, ID_ACCOUNTEMAILADDRESSSTATICCTRL, _("Email address:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer61->Add(m_AccountEmailAddressStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_AccountEmailAddressCtrl = new wxTextCtrl; - m_AccountEmailAddressCtrl->Create( itemWizardPage58, ID_ACCOUNTEMAILADDRESSCTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer67->Add(m_AccountEmailAddressCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_AccountEmailAddressCtrl->Create( itemWizardPage52, ID_ACCOUNTEMAILADDRESSCTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer61->Add(m_AccountEmailAddressCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_AccountPasswordStaticCtrl = new wxStaticText; - m_AccountPasswordStaticCtrl->Create( itemWizardPage58, ID_ACCOUNTPASSWORDSTATICCTRL, _("Password:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer67->Add(m_AccountPasswordStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_AccountPasswordStaticCtrl->Create( itemWizardPage52, ID_ACCOUNTPASSWORDSTATICCTRL, _("Password:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer61->Add(m_AccountPasswordStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_AccountPasswordCtrl = new wxTextCtrl; - m_AccountPasswordCtrl->Create( itemWizardPage58, ID_ACCOUNTPASSWORDCTRL, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD ); - itemFlexGridSizer67->Add(m_AccountPasswordCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_AccountPasswordCtrl->Create( itemWizardPage52, ID_ACCOUNTPASSWORDCTRL, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD ); + itemFlexGridSizer61->Add(m_AccountPasswordCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_AccountConfirmPasswordStaticCtrl = new wxStaticText; - m_AccountConfirmPasswordStaticCtrl->Create( itemWizardPage58, ID_ACCOUNTCONFIRMPASSWORDSTATICCTRL, _("Confirm password:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer67->Add(m_AccountConfirmPasswordStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_AccountConfirmPasswordStaticCtrl->Create( itemWizardPage52, ID_ACCOUNTCONFIRMPASSWORDSTATICCTRL, _("Confirm password:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer61->Add(m_AccountConfirmPasswordStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_AccountConfirmPasswordCtrl = new wxTextCtrl; - m_AccountConfirmPasswordCtrl->Create( itemWizardPage58, ID_ACCOUNTCONFIRMPASSWORDCTRL, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD ); - itemFlexGridSizer67->Add(m_AccountConfirmPasswordCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_AccountConfirmPasswordCtrl->Create( itemWizardPage52, ID_ACCOUNTCONFIRMPASSWORDCTRL, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD ); + itemFlexGridSizer61->Add(m_AccountConfirmPasswordCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); // Set validators m_AccountEmailAddressCtrl->SetValidator( wxGenericValidator(& m_strAccountEmailAddress) ); @@ -1684,41 +1667,41 @@ bool CAccountCreationPage::Create( wxWizard* parent ) void CAccountCreationPage::CreateControls() { ////@begin CAccountCreationPage content construction - CAccountCreationPage* itemWizardPage74 = this; + CAccountCreationPage* itemWizardPage68 = this; - wxBoxSizer* itemBoxSizer75 = new wxBoxSizer(wxVERTICAL); - itemWizardPage74->SetSizer(itemBoxSizer75); + wxBoxSizer* itemBoxSizer69 = new wxBoxSizer(wxVERTICAL); + itemWizardPage68->SetSizer(itemBoxSizer69); - wxStaticText* itemStaticText76 = new wxStaticText; - itemStaticText76->Create( itemWizardPage74, wxID_STATIC, _("Account Creation"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText76->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer75->Add(itemStaticText76, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText70 = new wxStaticText; + itemStaticText70->Create( itemWizardPage68, wxID_STATIC, _("Account Creation"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText70->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer69->Add(itemStaticText70, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText77 = new wxStaticText; - itemStaticText77->Create( itemWizardPage74, wxID_STATIC, _("This wizard is now attempting to create a new account or validate your\nexisting account."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer75->Add(itemStaticText77, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText71 = new wxStaticText; + itemStaticText71->Create( itemWizardPage68, wxID_STATIC, _("This wizard is now attempting to create a new account or validate your\nexisting account."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer69->Add(itemStaticText71, 0, wxALIGN_LEFT|wxALL, 5); - itemBoxSizer75->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer69->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText79 = new wxStaticText; - itemStaticText79->Create( itemWizardPage74, wxID_STATIC, _("If this wizard cannot reach the project server, it'll attempt to contact a\ncouple known good websites in an effort to help diagnose the problem."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer75->Add(itemStaticText79, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText73 = new wxStaticText; + itemStaticText73->Create( itemWizardPage68, wxID_STATIC, _("If this wizard cannot reach the project server, it'll attempt to contact a\ncouple known good websites in an effort to help diagnose the problem."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer69->Add(itemStaticText73, 0, wxALIGN_LEFT|wxALL, 5); - wxFlexGridSizer* itemFlexGridSizer80 = new wxFlexGridSizer(0, 2, 0, 0); - itemBoxSizer75->Add(itemFlexGridSizer80, 0, wxALIGN_LEFT|wxALL, 5); + wxFlexGridSizer* itemFlexGridSizer74 = new wxFlexGridSizer(0, 2, 0, 0); + itemBoxSizer69->Add(itemFlexGridSizer74, 0, wxALIGN_LEFT|wxALL, 5); - wxBitmap m_ProjectCommunitcationsImageCtrlBitmap(itemWizardPage74->GetBitmapResource(wxT("res/wizquestion.xpm"))); + wxBitmap m_ProjectCommunitcationsImageCtrlBitmap(itemWizardPage68->GetBitmapResource(wxT("res/wizquestion.xpm"))); m_ProjectCommunitcationsImageCtrl = new wxStaticBitmap; - m_ProjectCommunitcationsImageCtrl->Create( itemWizardPage74, ID_PROJECTCOMMUNICATIONSIMAGECTRL, m_ProjectCommunitcationsImageCtrlBitmap, wxDefaultPosition, wxSize(16, 16), 0 ); - itemFlexGridSizer80->Add(m_ProjectCommunitcationsImageCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProjectCommunitcationsImageCtrl->Create( itemWizardPage68, ID_PROJECTCOMMUNICATIONSIMAGECTRL, m_ProjectCommunitcationsImageCtrlBitmap, wxDefaultPosition, wxSize(16, 16), 0 ); + itemFlexGridSizer74->Add(m_ProjectCommunitcationsImageCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProjectCommunitcationsCtrl = new wxStaticText; - m_ProjectCommunitcationsCtrl->Create( itemWizardPage74, ID_PROJECTCOMMUNICATIONSCTRL, _("Communicating with BOINC project"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer80->Add(m_ProjectCommunitcationsCtrl, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProjectCommunitcationsCtrl->Create( itemWizardPage68, ID_PROJECTCOMMUNICATIONSCTRL, _("Communicating with BOINC project"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer74->Add(m_ProjectCommunitcationsCtrl, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_FinalAccountCreationStatusCtrl = new wxStaticText; - m_FinalAccountCreationStatusCtrl->Create( itemWizardPage74, ID_FINALACCOUNTCREATIONSTATUSCTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer75->Add(m_FinalAccountCreationStatusCtrl, 0, wxALIGN_LEFT|wxALL, 5); + m_FinalAccountCreationStatusCtrl->Create( itemWizardPage68, ID_FINALACCOUNTCREATIONSTATUSCTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer69->Add(m_FinalAccountCreationStatusCtrl, 0, wxALIGN_LEFT|wxALL, 5); ////@end CAccountCreationPage content construction } @@ -1940,21 +1923,21 @@ bool CCompletionPage::Create( wxWizard* parent ) void CCompletionPage::CreateControls() { ////@begin CCompletionPage content construction - CCompletionPage* itemWizardPage84 = this; + CCompletionPage* itemWizardPage78 = this; - wxBoxSizer* itemBoxSizer85 = new wxBoxSizer(wxVERTICAL); - itemWizardPage84->SetSizer(itemBoxSizer85); + wxBoxSizer* itemBoxSizer79 = new wxBoxSizer(wxVERTICAL); + itemWizardPage78->SetSizer(itemBoxSizer79); - wxStaticText* itemStaticText86 = new wxStaticText; - itemStaticText86->Create( itemWizardPage84, wxID_STATIC, _("Wizard Completion"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText86->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer85->Add(itemStaticText86, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText80 = new wxStaticText; + itemStaticText80->Create( itemWizardPage78, wxID_STATIC, _("Wizard Completion"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText80->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer79->Add(itemStaticText80, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText87 = new wxStaticText; - itemStaticText87->Create( itemWizardPage84, wxID_STATIC, _("Congratulations"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer85->Add(itemStaticText87, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText81 = new wxStaticText; + itemStaticText81->Create( itemWizardPage78, wxID_STATIC, _("Congratulations"), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer79->Add(itemStaticText81, 0, wxALIGN_LEFT|wxALL, 5); - itemBoxSizer85->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer79->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); ////@end CCompletionPage content construction } @@ -2067,37 +2050,37 @@ bool CErrProjectUnavailablePage::Create( wxWizard* parent ) void CErrProjectUnavailablePage::CreateControls() { ////@begin CErrProjectUnavailablePage content construction - CErrProjectUnavailablePage* itemWizardPage89 = this; + CErrProjectUnavailablePage* itemWizardPage83 = this; - wxBoxSizer* itemBoxSizer90 = new wxBoxSizer(wxVERTICAL); - itemWizardPage89->SetSizer(itemBoxSizer90); + wxBoxSizer* itemBoxSizer84 = new wxBoxSizer(wxVERTICAL); + itemWizardPage83->SetSizer(itemBoxSizer84); - wxStaticText* itemStaticText91 = new wxStaticText; - itemStaticText91->Create( itemWizardPage89, wxID_STATIC, _("Project Temporarily Unavailable"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText91->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer90->Add(itemStaticText91, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText85 = new wxStaticText; + itemStaticText85->Create( itemWizardPage83, wxID_STATIC, _("Project Temporarily Unavailable"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText85->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer84->Add(itemStaticText85, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText92 = new wxStaticText; - itemStaticText92->Create( itemWizardPage89, wxID_STATIC, _("This project appears to be offline or down for maintenance."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer90->Add(itemStaticText92, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText86 = new wxStaticText; + itemStaticText86->Create( itemWizardPage83, wxID_STATIC, _("This project appears to be offline or down for maintenance."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer84->Add(itemStaticText86, 0, wxALIGN_LEFT|wxALL, 5); - itemBoxSizer90->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer84->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText94 = new wxStaticText; - itemStaticText94->Create( itemWizardPage89, 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 ); - itemBoxSizer90->Add(itemStaticText94, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText88 = new wxStaticText; + itemStaticText88->Create( itemWizardPage83, 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 ); + itemBoxSizer84->Add(itemStaticText88, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText95 = new wxStaticText; - itemStaticText95->Create( itemWizardPage89, wxID_STATIC, _("You might want to checkout the project’s homepage for news\nabout possible network or project issues."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer90->Add(itemStaticText95, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText89 = new wxStaticText; + itemStaticText89->Create( itemWizardPage83, wxID_STATIC, _("You might want to checkout the project’s homepage for news\nabout possible network or project issues."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer84->Add(itemStaticText89, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText96 = new wxStaticText; - itemStaticText96->Create( itemWizardPage89, wxID_STATIC, _("More information about BOINC can be found here:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer90->Add(itemStaticText96, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText90 = new wxStaticText; + itemStaticText90->Create( itemWizardPage83, wxID_STATIC, _("More information about BOINC can be found here:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer84->Add(itemStaticText90, 0, wxALIGN_LEFT|wxALL, 5); - wxHyperLink* itemHyperLink97 = new wxHyperLink; - itemHyperLink97->Create( itemWizardPage89, ID_PROJECTUNAVAILABLEBOINCLINK, wxT("http://boinc.berkeley.edu/"), wxDefaultPosition, wxDefaultSize, wxNO_BORDER ); - itemBoxSizer90->Add(itemHyperLink97, 0, wxALIGN_LEFT|wxALL, 5); + wxHyperLink* itemHyperLink91 = new wxHyperLink; + itemHyperLink91->Create( itemWizardPage83, ID_PROJECTUNAVAILABLEBOINCLINK, wxT("http://boinc.berkeley.edu/"), wxDefaultPosition, wxDefaultSize, wxNO_BORDER ); + itemBoxSizer84->Add(itemHyperLink91, 0, wxALIGN_LEFT|wxALL, 5); ////@end CErrProjectUnavailablePage content construction } @@ -2210,21 +2193,21 @@ bool CErrNoInternetConnectionPage::Create( wxWizard* parent ) void CErrNoInternetConnectionPage::CreateControls() { ////@begin CErrNoInternetConnectionPage content construction - CErrNoInternetConnectionPage* itemWizardPage98 = this; + CErrNoInternetConnectionPage* itemWizardPage92 = this; - wxBoxSizer* itemBoxSizer99 = new wxBoxSizer(wxVERTICAL); - itemWizardPage98->SetSizer(itemBoxSizer99); + wxBoxSizer* itemBoxSizer93 = new wxBoxSizer(wxVERTICAL); + itemWizardPage92->SetSizer(itemBoxSizer93); - wxStaticText* itemStaticText100 = new wxStaticText; - itemStaticText100->Create( itemWizardPage98, wxID_STATIC, _("No Internet Connection Detected"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText100->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer99->Add(itemStaticText100, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText94 = new wxStaticText; + itemStaticText94->Create( itemWizardPage92, wxID_STATIC, _("No Internet Connection Detected"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText94->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer93->Add(itemStaticText94, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText101 = new wxStaticText; - itemStaticText101->Create( itemWizardPage98, wxID_STATIC, _("Could not communicate with the desired project or any of the known\ncomputers on the Internet."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer99->Add(itemStaticText101, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText95 = new wxStaticText; + itemStaticText95->Create( itemWizardPage92, wxID_STATIC, _("Could not communicate with the desired project or any of the known\ncomputers on the Internet."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer93->Add(itemStaticText95, 0, wxALIGN_LEFT|wxALL, 5); - itemBoxSizer99->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer93->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); ////@end CErrNoInternetConnectionPage content construction } @@ -2336,21 +2319,21 @@ bool CErrAccountAlreadyExistsPage::Create( wxWizard* parent ) void CErrAccountAlreadyExistsPage::CreateControls() { ////@begin CErrAccountAlreadyExistsPage content construction - CErrAccountAlreadyExistsPage* itemWizardPage103 = this; + CErrAccountAlreadyExistsPage* itemWizardPage97 = this; - wxBoxSizer* itemBoxSizer104 = new wxBoxSizer(wxVERTICAL); - itemWizardPage103->SetSizer(itemBoxSizer104); + wxBoxSizer* itemBoxSizer98 = new wxBoxSizer(wxVERTICAL); + itemWizardPage97->SetSizer(itemBoxSizer98); - wxStaticText* itemStaticText105 = new wxStaticText; - itemStaticText105->Create( itemWizardPage103, wxID_STATIC, _("Account Already Exists"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText105->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer104->Add(itemStaticText105, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText99 = new wxStaticText; + itemStaticText99->Create( itemWizardPage97, wxID_STATIC, _("Account Already Exists"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText99->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer98->Add(itemStaticText99, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText106 = new wxStaticText; - itemStaticText106->Create( itemWizardPage103, wxID_STATIC, _("The requested account is already in use."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer104->Add(itemStaticText106, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText100 = new wxStaticText; + itemStaticText100->Create( itemWizardPage97, wxID_STATIC, _("The requested account is already in use."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer98->Add(itemStaticText100, 0, wxALIGN_LEFT|wxALL, 5); - itemBoxSizer104->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer98->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); ////@end CErrAccountAlreadyExistsPage content construction } @@ -2463,21 +2446,21 @@ bool CErrAccountCreationDisabledPage::Create( wxWizard* parent ) void CErrAccountCreationDisabledPage::CreateControls() { ////@begin CErrAccountCreationDisabledPage content construction - CErrAccountCreationDisabledPage* itemWizardPage108 = this; + CErrAccountCreationDisabledPage* itemWizardPage102 = this; - wxBoxSizer* itemBoxSizer109 = new wxBoxSizer(wxVERTICAL); - itemWizardPage108->SetSizer(itemBoxSizer109); + wxBoxSizer* itemBoxSizer103 = new wxBoxSizer(wxVERTICAL); + itemWizardPage102->SetSizer(itemBoxSizer103); - wxStaticText* itemStaticText110 = new wxStaticText; - itemStaticText110->Create( itemWizardPage108, wxID_STATIC, _("Account Creation Disabled"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText110->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer109->Add(itemStaticText110, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText104 = new wxStaticText; + itemStaticText104->Create( itemWizardPage102, wxID_STATIC, _("Account Creation Disabled"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText104->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer103->Add(itemStaticText104, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText111 = new wxStaticText; - itemStaticText111->Create( itemWizardPage108, wxID_STATIC, _("This project is not accepting any new clients at this time."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer109->Add(itemStaticText111, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText105 = new wxStaticText; + itemStaticText105->Create( itemWizardPage102, wxID_STATIC, _("This project is not accepting any new clients at this time."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer103->Add(itemStaticText105, 0, wxALIGN_LEFT|wxALL, 5); - itemBoxSizer109->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer103->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); ////@end CErrAccountCreationDisabledPage content construction } @@ -2590,21 +2573,21 @@ bool CErrProxyInfoPage::Create( wxWizard* parent ) void CErrProxyInfoPage::CreateControls() { ////@begin CErrProxyInfoPage content construction - CErrProxyInfoPage* itemWizardPage113 = this; + CErrProxyInfoPage* itemWizardPage107 = this; - wxBoxSizer* itemBoxSizer114 = new wxBoxSizer(wxVERTICAL); - itemWizardPage113->SetSizer(itemBoxSizer114); + wxBoxSizer* itemBoxSizer108 = new wxBoxSizer(wxVERTICAL); + itemWizardPage107->SetSizer(itemBoxSizer108); - wxStaticText* itemStaticText115 = new wxStaticText; - itemStaticText115->Create( itemWizardPage113, wxID_STATIC, _("Proxy Configuration"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText115->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer114->Add(itemStaticText115, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText109 = new wxStaticText; + itemStaticText109->Create( itemWizardPage107, wxID_STATIC, _("Proxy Configuration"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText109->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer108->Add(itemStaticText109, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText116 = new wxStaticText; - itemStaticText116->Create( itemWizardPage113, wxID_STATIC, _("Do you need to configure a proxy server?"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer114->Add(itemStaticText116, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText110 = new wxStaticText; + itemStaticText110->Create( itemWizardPage107, wxID_STATIC, _("Do you need to configure a proxy server?"), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer108->Add(itemStaticText110, 0, wxALIGN_LEFT|wxALL, 5); - itemBoxSizer114->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer108->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); ////@end CErrProxyInfoPage content construction } @@ -2726,67 +2709,67 @@ bool CErrProxyHTTPPage::Create( wxWizard* parent ) void CErrProxyHTTPPage::CreateControls() { ////@begin CErrProxyHTTPPage content construction - CErrProxyHTTPPage* itemWizardPage118 = this; + CErrProxyHTTPPage* itemWizardPage112 = this; - wxBoxSizer* itemBoxSizer119 = new wxBoxSizer(wxVERTICAL); - itemWizardPage118->SetSizer(itemBoxSizer119); + wxBoxSizer* itemBoxSizer113 = new wxBoxSizer(wxVERTICAL); + itemWizardPage112->SetSizer(itemBoxSizer113); - wxStaticText* itemStaticText120 = new wxStaticText; - itemStaticText120->Create( itemWizardPage118, wxID_STATIC, _("Proxy Configuration - HTTP Proxy"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText120->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer119->Add(itemStaticText120, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText114 = new wxStaticText; + itemStaticText114->Create( itemWizardPage112, wxID_STATIC, _("Proxy Configuration - HTTP Proxy"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText114->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer113->Add(itemStaticText114, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText121 = new wxStaticText; - itemStaticText121->Create( itemWizardPage118, wxID_STATIC, _("Do you need to configure a proxy server?"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer119->Add(itemStaticText121, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText115 = new wxStaticText; + itemStaticText115->Create( itemWizardPage112, wxID_STATIC, _("Do you need to configure a proxy server?"), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer113->Add(itemStaticText115, 0, wxALIGN_LEFT|wxALL, 5); - itemBoxSizer119->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer113->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - itemBoxSizer119->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer113->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - wxButton* itemButton124 = new wxButton; - itemButton124->Create( itemWizardPage118, ID_HTTPAUTODETECT, _("Autodetect"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer119->Add(itemButton124, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + wxButton* itemButton118 = new wxButton; + itemButton118->Create( itemWizardPage112, ID_HTTPAUTODETECT, _("Autodetect"), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer113->Add(itemButton118, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - wxFlexGridSizer* itemFlexGridSizer125 = new wxFlexGridSizer(3, 2, 0, 0); - itemFlexGridSizer125->AddGrowableCol(1); - itemBoxSizer119->Add(itemFlexGridSizer125, 0, wxGROW|wxALL, 5); + wxFlexGridSizer* itemFlexGridSizer119 = new wxFlexGridSizer(3, 2, 0, 0); + itemFlexGridSizer119->AddGrowableCol(1); + itemBoxSizer113->Add(itemFlexGridSizer119, 0, wxGROW|wxALL, 5); m_ProxyHTTPServerStaticCtrl = new wxStaticText; - m_ProxyHTTPServerStaticCtrl->Create( itemWizardPage118, ID_PROXYHTTPSERVERSTATICCTRL, _("Server:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer125->Add(m_ProxyHTTPServerStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxyHTTPServerStaticCtrl->Create( itemWizardPage112, ID_PROXYHTTPSERVERSTATICCTRL, _("Server:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer119->Add(m_ProxyHTTPServerStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxFlexGridSizer* itemFlexGridSizer127 = new wxFlexGridSizer(1, 3, 0, 0); - itemFlexGridSizer127->AddGrowableCol(0); - itemFlexGridSizer125->Add(itemFlexGridSizer127, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0); + wxFlexGridSizer* itemFlexGridSizer121 = new wxFlexGridSizer(1, 3, 0, 0); + itemFlexGridSizer121->AddGrowableCol(0); + itemFlexGridSizer119->Add(itemFlexGridSizer121, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0); m_ProxyHTTPServerCtrl = new wxTextCtrl; - m_ProxyHTTPServerCtrl->Create( itemWizardPage118, ID_PROXYHTTPSERVERCTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer127->Add(m_ProxyHTTPServerCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxyHTTPServerCtrl->Create( itemWizardPage112, ID_PROXYHTTPSERVERCTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer121->Add(m_ProxyHTTPServerCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxyHTTPPortStaticCtrl = new wxStaticText; - m_ProxyHTTPPortStaticCtrl->Create( itemWizardPage118, ID_PROXYHTTPPORTSTATICCTRL, _("Port:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer127->Add(m_ProxyHTTPPortStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxyHTTPPortStaticCtrl->Create( itemWizardPage112, ID_PROXYHTTPPORTSTATICCTRL, _("Port:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer121->Add(m_ProxyHTTPPortStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxyHTTPPortCtrl = new wxTextCtrl; - m_ProxyHTTPPortCtrl->Create( itemWizardPage118, ID_PROXYHTTPPORTCTRL, _T(""), wxDefaultPosition, wxSize(50, -1), 0 ); - itemFlexGridSizer127->Add(m_ProxyHTTPPortCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxyHTTPPortCtrl->Create( itemWizardPage112, ID_PROXYHTTPPORTCTRL, _T(""), wxDefaultPosition, wxSize(50, -1), 0 ); + itemFlexGridSizer121->Add(m_ProxyHTTPPortCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxyHTTPUsernameStaticCtrl = new wxStaticText; - m_ProxyHTTPUsernameStaticCtrl->Create( itemWizardPage118, ID_PROXYHTTPUSERNAMESTATICCTRL, _("User Name:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer125->Add(m_ProxyHTTPUsernameStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxyHTTPUsernameStaticCtrl->Create( itemWizardPage112, ID_PROXYHTTPUSERNAMESTATICCTRL, _("User Name:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer119->Add(m_ProxyHTTPUsernameStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxyHTTPUsernameCtrl = new wxTextCtrl; - m_ProxyHTTPUsernameCtrl->Create( itemWizardPage118, ID_PROXYHTTPUSERNAMECTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer125->Add(m_ProxyHTTPUsernameCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxyHTTPUsernameCtrl->Create( itemWizardPage112, ID_PROXYHTTPUSERNAMECTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer119->Add(m_ProxyHTTPUsernameCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxyHTTPPasswordStaticCtrl = new wxStaticText; - m_ProxyHTTPPasswordStaticCtrl->Create( itemWizardPage118, ID_PROXYHTTPPASSWORDSTATICCTRL, _("Password:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer125->Add(m_ProxyHTTPPasswordStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxyHTTPPasswordStaticCtrl->Create( itemWizardPage112, ID_PROXYHTTPPASSWORDSTATICCTRL, _("Password:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer119->Add(m_ProxyHTTPPasswordStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxyHTTPPasswordCtrl = new wxTextCtrl; - m_ProxyHTTPPasswordCtrl->Create( itemWizardPage118, ID_PROXYHTTPPASSWORDCTRL, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD ); - itemFlexGridSizer125->Add(m_ProxyHTTPPasswordCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxyHTTPPasswordCtrl->Create( itemWizardPage112, ID_PROXYHTTPPASSWORDCTRL, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD ); + itemFlexGridSizer119->Add(m_ProxyHTTPPasswordCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); // Set validators m_ProxyHTTPServerCtrl->SetValidator( wxTextValidator(wxFILTER_NONE, & m_strProxyHTTPServer) ); @@ -2923,67 +2906,67 @@ bool CErrProxySOCKSPage::Create( wxWizard* parent ) void CErrProxySOCKSPage::CreateControls() { ////@begin CErrProxySOCKSPage content construction - CErrProxySOCKSPage* itemWizardPage135 = this; + CErrProxySOCKSPage* itemWizardPage129 = this; - wxBoxSizer* itemBoxSizer136 = new wxBoxSizer(wxVERTICAL); - itemWizardPage135->SetSizer(itemBoxSizer136); + wxBoxSizer* itemBoxSizer130 = new wxBoxSizer(wxVERTICAL); + itemWizardPage129->SetSizer(itemBoxSizer130); - wxStaticText* itemStaticText137 = new wxStaticText; - itemStaticText137->Create( itemWizardPage135, wxID_STATIC, _("Proxy Configuration - SOCKS Proxy"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText137->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer136->Add(itemStaticText137, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText131 = new wxStaticText; + itemStaticText131->Create( itemWizardPage129, wxID_STATIC, _("Proxy Configuration - SOCKS Proxy"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText131->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer130->Add(itemStaticText131, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText138 = new wxStaticText; - itemStaticText138->Create( itemWizardPage135, wxID_STATIC, _("Do you need to configure a proxy server?"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer136->Add(itemStaticText138, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText132 = new wxStaticText; + itemStaticText132->Create( itemWizardPage129, wxID_STATIC, _("Do you need to configure a proxy server?"), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer130->Add(itemStaticText132, 0, wxALIGN_LEFT|wxALL, 5); - itemBoxSizer136->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer130->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - itemBoxSizer136->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer130->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); - wxButton* itemButton141 = new wxButton; - itemButton141->Create( itemWizardPage135, ID_SOCKSAUTODETECT, _("Autodetect"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer136->Add(itemButton141, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + wxButton* itemButton135 = new wxButton; + itemButton135->Create( itemWizardPage129, ID_SOCKSAUTODETECT, _("Autodetect"), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer130->Add(itemButton135, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - wxFlexGridSizer* itemFlexGridSizer142 = new wxFlexGridSizer(3, 2, 0, 0); - itemFlexGridSizer142->AddGrowableCol(1); - itemBoxSizer136->Add(itemFlexGridSizer142, 0, wxGROW|wxALL, 5); + wxFlexGridSizer* itemFlexGridSizer136 = new wxFlexGridSizer(3, 2, 0, 0); + itemFlexGridSizer136->AddGrowableCol(1); + itemBoxSizer130->Add(itemFlexGridSizer136, 0, wxGROW|wxALL, 5); m_ProxySOCKSServerStaticCtrl = new wxStaticText; - m_ProxySOCKSServerStaticCtrl->Create( itemWizardPage135, ID_PROXYSOCKSSERVERSTATICCTRL, _("Server:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer142->Add(m_ProxySOCKSServerStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxySOCKSServerStaticCtrl->Create( itemWizardPage129, ID_PROXYSOCKSSERVERSTATICCTRL, _("Server:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer136->Add(m_ProxySOCKSServerStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxFlexGridSizer* itemFlexGridSizer144 = new wxFlexGridSizer(1, 3, 0, 0); - itemFlexGridSizer144->AddGrowableCol(0); - itemFlexGridSizer142->Add(itemFlexGridSizer144, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0); + wxFlexGridSizer* itemFlexGridSizer138 = new wxFlexGridSizer(1, 3, 0, 0); + itemFlexGridSizer138->AddGrowableCol(0); + itemFlexGridSizer136->Add(itemFlexGridSizer138, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0); m_ProxySOCKSServerCtrl = new wxTextCtrl; - m_ProxySOCKSServerCtrl->Create( itemWizardPage135, ID_PROXYSOCKSSERVERCTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer144->Add(m_ProxySOCKSServerCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxySOCKSServerCtrl->Create( itemWizardPage129, ID_PROXYSOCKSSERVERCTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer138->Add(m_ProxySOCKSServerCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxySOCKSPortStaticCtrl = new wxStaticText; - m_ProxySOCKSPortStaticCtrl->Create( itemWizardPage135, ID_PROXYSOCKSPORTSTATICCTRL, _("Port:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer144->Add(m_ProxySOCKSPortStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxySOCKSPortStaticCtrl->Create( itemWizardPage129, ID_PROXYSOCKSPORTSTATICCTRL, _("Port:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer138->Add(m_ProxySOCKSPortStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxySOCKSPortCtrl = new wxTextCtrl; - m_ProxySOCKSPortCtrl->Create( itemWizardPage135, ID_PROXYSOCKSPORTCTRL, _T(""), wxDefaultPosition, wxSize(50, -1), 0 ); - itemFlexGridSizer144->Add(m_ProxySOCKSPortCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxySOCKSPortCtrl->Create( itemWizardPage129, ID_PROXYSOCKSPORTCTRL, _T(""), wxDefaultPosition, wxSize(50, -1), 0 ); + itemFlexGridSizer138->Add(m_ProxySOCKSPortCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxySOCKSUsernameStaticCtrl = new wxStaticText; - m_ProxySOCKSUsernameStaticCtrl->Create( itemWizardPage135, ID_PROXYSOCKSUSERNAMESTATICCTRL, _("User Name:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer142->Add(m_ProxySOCKSUsernameStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxySOCKSUsernameStaticCtrl->Create( itemWizardPage129, ID_PROXYSOCKSUSERNAMESTATICCTRL, _("User Name:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer136->Add(m_ProxySOCKSUsernameStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxySOCKSUsernameCtrl = new wxTextCtrl; - m_ProxySOCKSUsernameCtrl->Create( itemWizardPage135, ID_PROXYSOCKSUSERNAMECTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer142->Add(m_ProxySOCKSUsernameCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxySOCKSUsernameCtrl->Create( itemWizardPage129, ID_PROXYSOCKSUSERNAMECTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer136->Add(m_ProxySOCKSUsernameCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxySOCKSPasswordStaticCtrl = new wxStaticText; - m_ProxySOCKSPasswordStaticCtrl->Create( itemWizardPage135, ID_PROXYSOCKSPASSWORDSTATICCTRL, _("Password:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer142->Add(m_ProxySOCKSPasswordStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxySOCKSPasswordStaticCtrl->Create( itemWizardPage129, ID_PROXYSOCKSPASSWORDSTATICCTRL, _("Password:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer136->Add(m_ProxySOCKSPasswordStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ProxySOCKSPasswordCtrl = new wxTextCtrl; - m_ProxySOCKSPasswordCtrl->Create( itemWizardPage135, ID_PROXYSOCKSPASSWORDCTRL, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD ); - itemFlexGridSizer142->Add(m_ProxySOCKSPasswordCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ProxySOCKSPasswordCtrl->Create( itemWizardPage129, ID_PROXYSOCKSPASSWORDCTRL, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD ); + itemFlexGridSizer136->Add(m_ProxySOCKSPasswordCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); // Set validators m_ProxySOCKSServerCtrl->SetValidator( wxTextValidator(wxFILTER_NONE, & m_strProxySOCKSServer) ); @@ -3110,21 +3093,21 @@ bool CErrProxyComplationPage::Create( wxWizard* parent ) void CErrProxyComplationPage::CreateControls() { ////@begin CErrProxyComplationPage content construction - CErrProxyComplationPage* itemWizardPage152 = this; + CErrProxyComplationPage* itemWizardPage146 = this; - wxBoxSizer* itemBoxSizer153 = new wxBoxSizer(wxVERTICAL); - itemWizardPage152->SetSizer(itemBoxSizer153); + wxBoxSizer* itemBoxSizer147 = new wxBoxSizer(wxVERTICAL); + itemWizardPage146->SetSizer(itemBoxSizer147); - wxStaticText* itemStaticText154 = new wxStaticText; - itemStaticText154->Create( itemWizardPage152, wxID_STATIC, _("Proxy Configuration Completion"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText154->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer153->Add(itemStaticText154, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText148 = new wxStaticText; + itemStaticText148->Create( itemWizardPage146, wxID_STATIC, _("Proxy Configuration Completion"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText148->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer147->Add(itemStaticText148, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText155 = new wxStaticText; - itemStaticText155->Create( itemWizardPage152, wxID_STATIC, _("Do you need to configure a proxy server?"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer153->Add(itemStaticText155, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText149 = new wxStaticText; + itemStaticText149->Create( itemWizardPage146, wxID_STATIC, _("Do you need to configure a proxy server?"), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer147->Add(itemStaticText149, 0, wxALIGN_LEFT|wxALL, 5); - itemBoxSizer153->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + itemBoxSizer147->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); ////@end CErrProxyComplationPage content construction } @@ -3180,3 +3163,168 @@ wxIcon CErrProxyComplationPage::GetIconResource( const wxString& name ) ////@end CErrProxyComplationPage icon retrieval } + +/*! + * CErrRefCountPage type definition + */ + +IMPLEMENT_DYNAMIC_CLASS( CErrRefCountPage, wxWizardPage ) + +/*! + * CErrRefCountPage event table definition + */ + +BEGIN_EVENT_TABLE( CErrRefCountPage, wxWizardPage ) + +////@begin CErrRefCountPage event table entries +////@end CErrRefCountPage event table entries + +END_EVENT_TABLE() + +/*! + * CErrRefCountPage constructors + */ + +CErrRefCountPage::CErrRefCountPage( ) +{ +} + +CErrRefCountPage::CErrRefCountPage( wxWizard* parent ) +{ + Create( parent ); +} + +/*! + * CErrRefCountPage creator + */ + +bool CErrRefCountPage::Create( wxWizard* parent ) +{ +////@begin CErrRefCountPage member initialisation +////@end CErrRefCountPage member initialisation + +////@begin CErrRefCountPage creation + wxBitmap wizardBitmap(wxNullBitmap); + wxWizardPage::Create( parent, wizardBitmap ); + + CreateControls(); + GetSizer()->Fit(this); +////@end CErrRefCountPage creation + return TRUE; +} + +/*! + * Control creation for CErrRefCountPage + */ + +void CErrRefCountPage::CreateControls() +{ +////@begin CErrRefCountPage content construction + CErrRefCountPage* itemWizardPage151 = this; + + wxBoxSizer* itemBoxSizer152 = new wxBoxSizer(wxVERTICAL); + itemWizardPage151->SetSizer(itemBoxSizer152); + + wxStaticText* itemStaticText153 = new wxStaticText; + itemStaticText153->Create( itemWizardPage151, wxID_STATIC, _("Ref Count Page"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText153->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); + itemBoxSizer152->Add(itemStaticText153, 0, wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE, 5); + + wxStaticText* itemStaticText154 = new wxStaticText; + itemStaticText154->Create( itemWizardPage151, wxID_STATIC, _("This page should never be used in the wizard itself."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer152->Add(itemStaticText154, 0, wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE, 5); + + itemBoxSizer152->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + + wxStaticText* itemStaticText156 = new wxStaticText; + itemStaticText156->Create( itemWizardPage151, 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 ); + itemBoxSizer152->Add(itemStaticText156, 0, wxALIGN_LEFT|wxALL, 5); + + wxBoxSizer* itemBoxSizer157 = new wxBoxSizer(wxHORIZONTAL); + itemBoxSizer152->Add(itemBoxSizer157, 0, wxALIGN_LEFT|wxALL, 5); + + wxBitmap itemStaticBitmap158Bitmap(itemWizardPage151->GetBitmapResource(wxT("res/wizfailure.xpm"))); + wxStaticBitmap* itemStaticBitmap158 = new wxStaticBitmap; + itemStaticBitmap158->Create( itemWizardPage151, wxID_STATIC, itemStaticBitmap158Bitmap, wxDefaultPosition, wxSize(16, 16), 0 ); + itemBoxSizer157->Add(itemStaticBitmap158, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + + wxBitmap itemStaticBitmap159Bitmap(itemWizardPage151->GetBitmapResource(wxT("res/wizquestion.xpm"))); + wxStaticBitmap* itemStaticBitmap159 = new wxStaticBitmap; + itemStaticBitmap159->Create( itemWizardPage151, wxID_STATIC, itemStaticBitmap159Bitmap, wxDefaultPosition, wxSize(16, 16), 0 ); + itemBoxSizer157->Add(itemStaticBitmap159, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + + wxBitmap itemStaticBitmap160Bitmap(itemWizardPage151->GetBitmapResource(wxT("res/wizsuccess.xpm"))); + wxStaticBitmap* itemStaticBitmap160 = new wxStaticBitmap; + itemStaticBitmap160->Create( itemWizardPage151, wxID_STATIC, itemStaticBitmap160Bitmap, wxDefaultPosition, wxSize(16, 16), 0 ); + itemBoxSizer157->Add(itemStaticBitmap160, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + +////@end CErrRefCountPage content construction +} + +/*! + * Gets the previous page. + */ + +wxWizardPage* CErrRefCountPage::GetPrev() const +{ + // TODO: return the previous page + return NULL; +} + +/*! + * Gets the next page. + */ + +wxWizardPage* CErrRefCountPage::GetNext() const +{ + // TODO: return the next page + return NULL; +} + +/*! + * Should we show tooltips? + */ + +bool CErrRefCountPage::ShowToolTips() +{ + return TRUE; +} + +/*! + * Get bitmap resources + */ + +wxBitmap CErrRefCountPage::GetBitmapResource( const wxString& name ) +{ + // Bitmap retrieval +////@begin CErrRefCountPage bitmap retrieval + if (name == wxT("res/wizfailure.xpm")) + { + wxBitmap bitmap(wizfailure_xpm); + return bitmap; + } + else if (name == wxT("res/wizquestion.xpm")) + { + wxBitmap bitmap(wizquestion_xpm); + return bitmap; + } + else if (name == wxT("res/wizsuccess.xpm")) + { + wxBitmap bitmap(wizsuccess_xpm); + return bitmap; + } + return wxNullBitmap; +////@end CErrRefCountPage bitmap retrieval +} + +/*! + * Get icon resources + */ + +wxIcon CErrRefCountPage::GetIconResource( const wxString& name ) +{ + // Icon retrieval +////@begin CErrRefCountPage icon retrieval + return wxNullIcon; +////@end CErrRefCountPage icon retrieval +} diff --git a/clientgui/WizAttachProject.h b/clientgui/WizAttachProject.h index 6c9e435b6f..bdef5819b5 100644 --- a/clientgui/WizAttachProject.h +++ b/clientgui/WizAttachProject.h @@ -55,6 +55,7 @@ class CErrProxyInfoPage; class CErrProxyHTTPPage; class CErrProxySOCKSPage; class CErrProxyComplationPage; +class CErrRefCountPage; ////@end forward declarations /*! @@ -80,12 +81,6 @@ class CErrProxyComplationPage; #define ID_PROJECTPROPERTIESPAGE 10017 #define ID_RETRPROJECTPROPERTIESIMAGECTRL 10018 #define ID_RETRPROJECTPROPERTIESCTRL 10019 -#define ID_COMMYAHOOIMAGECTRL 10010 -#define ID_COMMYAHOOCTRL 10011 -#define ID_COMMGOOGLEIMAGECTRL 10012 -#define ID_COMMGOOGLECTRL 10013 -#define ID_DETERMINECONNECTIONSTATUSIMAGECTRL 10014 -#define ID_DETERMINECONNECTIONSTATUSCTRL 10015 #define ID_FINALPROJECTPROPERTIESTATUSCTRL 10026 #define ID_ACCOUNTKEYPAGE 10054 #define ID_ACCOUNTKEYSTATICCTRL 10074 @@ -131,6 +126,7 @@ class CErrProxyComplationPage; #define ID_PROXYSOCKSPASSWORDSTATICCTRL 10069 #define ID_PROXYSOCKSPASSWORDCTRL 10005 #define ID_ERRPROXYCOMPLETIONPAGE 10063 +#define ID_ERRREFCOUNTPAGE 10075 ////@end control identifiers /*! @@ -186,6 +182,11 @@ public: ////@end CWizAttachProject event handler declarations + /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_BACKWARD + void OnWizardBack( wxCommandEvent& event ); + /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_FORWARD + void OnWizardNext( wxCommandEvent& event ); + ////@begin CWizAttachProject member function declarations /// Runs the wizard. @@ -202,6 +203,12 @@ public: virtual bool HasNextPage( wxWizardPage* page ); virtual bool HasPrevPage( wxWizardPage* page ); + wxButton* GetBackButton() const { return m_pbtnBack ; } + void SetBackButton(wxButton* value) { m_pbtnBack = value ; } + + wxButton* GetNextButton() const { return m_pbtnNext ; } + void SetNextButton(wxButton* value) { m_pbtnNext = value ; } + /// Diagnostics functions void SetDiagFlags( unsigned long ulFlags ); bool IsDiagFlagsSet( unsigned long ulFlags ); @@ -229,8 +236,15 @@ public: CErrProxyHTTPPage* m_ErrProxyHTTPPage; CErrProxySOCKSPage* m_ErrProxySOCKSPage; CErrProxyComplationPage* m_ErrProxyCompletionPage; + CErrRefCountPage* m_ErrRefCountPage; ////@end CWizAttachProject member variables + // Since the buttons are not publically exposed, we are going to cheat to get + // the pointers to them by trapping the click event and caching the button + // class pointers. + wxButton* m_pbtnBack; // the "" or "Finish" button + // Wizard support unsigned long m_ulDiagFlags; std::stack m_PageTransition; @@ -289,14 +303,30 @@ public: static bool ShowToolTips(); ////@begin CWelcomePage member variables +#if defined(__WXDEBUG__) wxCheckBox* m_ErrProjectPropertiesCtrl; +#endif +#if defined(__WXDEBUG__) wxCheckBox* m_ErrProjectCommCtrl; +#endif +#if defined(__WXDEBUG__) wxCheckBox* m_ErrProjectPropertiesURLCtrl; +#endif +#if defined(__WXDEBUG__) wxCheckBox* m_ErrAccountCreationDisabledCtrl; +#endif +#if defined(__WXDEBUG__) wxCheckBox* m_ErrAccountAlreadyExistsCtrl; +#endif +#if defined(__WXDEBUG__) wxCheckBox* m_ErrGoogleCommCtrl; +#endif +#if defined(__WXDEBUG__) wxCheckBox* m_ErrYahooCommCtrl; +#endif +#if defined(__WXDEBUG__) wxCheckBox* m_ErrNetDetectionCtrl; +#endif ////@end CWelcomePage member variables }; @@ -390,7 +420,8 @@ END_DECLARE_EVENT_TYPES() #define PROJPROP_COMMUNICATEGOOGLE_EXECUTE 6 #define PROJPROP_DETERMINENETWORKSTATUS_BEGIN 7 #define PROJPROP_DETERMINENETWORKSTATUS_EXECUTE 8 -#define PROJPROP_END 9 +#define PROJPROP_CLEANUP 9 +#define PROJPROP_END 10 /*! * CProjectPropertiesPage class declaration @@ -464,12 +495,6 @@ public: ////@begin CProjectPropertiesPage member variables wxStaticBitmap* m_RetrProjectPropertiesImageCtrl; wxStaticText* m_RetrProjectPropertiesCtrl; - wxStaticBitmap* m_CommYahooImageCtrl; - wxStaticText* m_CommYahooCtrl; - wxStaticBitmap* m_CommGoogleImageCtrl; - wxStaticText* m_CommGoogleCtrl; - wxStaticBitmap* m_DetermineConnectionStatusImageCtrl; - wxStaticText* m_DetermineConnectionStatusCtrl; wxStaticText* m_FinalProjectPropertiesStatusCtrl; ////@end CProjectPropertiesPage member variables @@ -1200,5 +1225,52 @@ public: ////@end CErrProxyComplationPage member variables }; +/*! + * CErrRefCountPage class declaration + */ + +class CErrRefCountPage: public wxWizardPage +{ + DECLARE_DYNAMIC_CLASS( CErrRefCountPage ) + DECLARE_EVENT_TABLE() + +public: + /// Constructors + CErrRefCountPage( ); + + CErrRefCountPage( wxWizard* parent ); + + /// Creation + bool Create( wxWizard* parent ); + + /// Creates the controls and sizers + void CreateControls(); + +////@begin CErrRefCountPage event handler declarations + +////@end CErrRefCountPage event handler declarations + +////@begin CErrRefCountPage member function declarations + + /// Gets the previous page. + virtual wxWizardPage* GetPrev() const; + + /// Gets the next page. + virtual wxWizardPage* GetNext() const; + + /// Retrieves bitmap resources + wxBitmap GetBitmapResource( const wxString& name ); + + /// Retrieves icon resources + wxIcon GetIconResource( const wxString& name ); +////@end CErrRefCountPage member function declarations + + /// Should we show tooltips? + static bool ShowToolTips(); + +////@begin CErrRefCountPage member variables +////@end CErrRefCountPage member variables +}; + #endif // _WIZATTACHPROJECT_H_ diff --git a/lib/gui_rpc_client.h b/lib/gui_rpc_client.h index 4a7934a6bf..83500991a1 100644 --- a/lib/gui_rpc_client.h +++ b/lib/gui_rpc_client.h @@ -37,6 +37,18 @@ #define GUI_RPC_PORT 1043 #define GUI_RPC_PORT_ALT 31416 +// official HTTP status codes +// +#define HTTP_STATUS_OK 200 +#define HTTP_STATUS_PARTIAL_CONTENT 206 +#define HTTP_STATUS_RANGE_REQUEST_ERROR 416 +#define HTTP_STATUS_MOVED_PERM 301 +#define HTTP_STATUS_MOVED_TEMP 302 +#define HTTP_STATUS_NOT_FOUND 404 +#define HTTP_STATUS_PROXY_AUTH_REQ 407 +#define HTTP_STATUS_INTERNAL_SERVER_ERROR 500 +#define HTTP_STATUS_SERVICE_UNAVAILABLE 503 + #define RUN_MODE_ALWAYS 0 #define RUN_MODE_NEVER 1 #define RUN_MODE_AUTO 2 @@ -63,18 +75,6 @@ #define SS_STATUS_QUIT 8 #define SS_STATUS_NOPROJECTSDETECTED 9 -// official HTTP status codes -// -#define HTTP_STATUS_OK 200 -#define HTTP_STATUS_PARTIAL_CONTENT 206 -#define HTTP_STATUS_RANGE_REQUEST_ERROR 416 -#define HTTP_STATUS_MOVED_PERM 301 -#define HTTP_STATUS_MOVED_TEMP 302 -#define HTTP_STATUS_NOT_FOUND 404 -#define HTTP_STATUS_PROXY_AUTH_REQ 407 -#define HTTP_STATUS_INTERNAL_SERVER_ERROR 500 -#define HTTP_STATUS_SERVICE_UNAVAILABLE 503 - // These MUST match the constants in client/client_msgs.h // #define MSG_PRIORITY_INFO 1 @@ -86,6 +86,11 @@ #define MSG_PRIORITY_ALERT_ERROR 5 // show error message in a modal dialog +// Which websites can we lookup? +// +#define LOOKUP_GOOGLE 1 +#define LOOKUP_YAHOO 2 + struct GUI_URL { std::string name; std::string description; @@ -434,7 +439,7 @@ struct PROJECT_CONFIG { int error_num; std::string name; int min_passwd_length; - bool uses_username_id; + bool uses_email_id; bool account_creation_disabled; PROJECT_CONFIG(); @@ -442,6 +447,7 @@ struct PROJECT_CONFIG { int parse(MIOFILE&); void print(); + void clear(); }; struct ACCOUNT_IN { @@ -465,9 +471,9 @@ struct ACCOUNT_OUT { int parse(MIOFILE&); void print(); + void clear(); }; -#if 0 struct LOOKUP_WEBSITE { int error_num; @@ -477,7 +483,6 @@ struct LOOKUP_WEBSITE { int parse(MIOFILE&); void clear(); }; -#endif class RPC_CLIENT { public: @@ -554,12 +559,8 @@ public: int lookup_account_poll(ACCOUNT_OUT&); int create_account(ACCOUNT_IN&); int create_account_poll(ACCOUNT_OUT&); -#if 0 - int lookup_google(); - int lookup_google_poll(); - int lookup_yahoo(); - int lookup_yahoo_poll(); -#endif + int lookup_website(int); + int lookup_website_poll(); }; struct RPC { diff --git a/lib/gui_rpc_client_ops.C b/lib/gui_rpc_client_ops.C index 504c68b100..2e665ab549 100644 --- a/lib/gui_rpc_client_ops.C +++ b/lib/gui_rpc_client_ops.C @@ -793,8 +793,8 @@ int PROJECT_CONFIG::parse(MIOFILE& in) { else if (parse_int(buf, "", error_num)) return error_num; else if (parse_str(buf, "", name)) continue; else if (parse_int(buf, "", min_passwd_length)) continue; - else if (match_tag(buf, "")) { - uses_username_id = true; + else if (match_tag(buf, "")) { + uses_email_id = true; continue; } else if (match_tag(buf, "")) { @@ -809,7 +809,7 @@ void PROJECT_CONFIG::clear() { error_num = -1; name.clear(); min_passwd_length = 6; - uses_username_id = false; + uses_email_id = true; account_creation_disabled = false; } @@ -839,7 +839,8 @@ ACCOUNT_OUT::~ACCOUNT_OUT() { int ACCOUNT_OUT::parse(MIOFILE& in) { char buf[256]; while (in.fgets(buf, 256)) { - if (parse_int(buf, "", error_num)) continue; + if (match_tag(buf, "")) return 0; + if (parse_int(buf, "", error_num)) return error_num; if (parse_str(buf, "", authenticator)) continue; } return 0; @@ -850,7 +851,6 @@ void ACCOUNT_OUT::clear() { authenticator.clear(); } -#if 0 LOOKUP_WEBSITE::LOOKUP_WEBSITE() { clear(); } @@ -862,18 +862,15 @@ LOOKUP_WEBSITE::~LOOKUP_WEBSITE() { int LOOKUP_WEBSITE::parse(MIOFILE& in) { char buf[256]; while (in.fgets(buf, 256)) { - if (match_tag(buf, "", uses_email_id)) continue; - if (parse_str(buf, "", name)) continue; - if (parse_int(buf, "", min_passwd_length)) continue; + if (match_tag(buf, "")) return 0; + if (parse_int(buf, "", error_num)) return error_num; } - return 0; + return ERR_XML_PARSE; } void LOOKUP_WEBSITE::clear() { error_num = 0; } -#endif /////////// END OF PARSING FUNCTIONS. RPCS START HERE //////////////// @@ -1562,34 +1559,27 @@ int RPC_CLIENT::create_account_poll(ACCOUNT_OUT& ao) { return ao.parse(rpc.fin); } -#if 0 -int RPC_CLIENT::lookup_google() { +int RPC_CLIENT::lookup_website(int website_id) { + char buf[4096]; RPC rpc(this); - return rpc.do_rpc("\n"); + if ((website_id < LOOKUP_GOOGLE) || (website_id > LOOKUP_YAHOO)) return ERR_INVALID_PARAM; + sprintf(buf, + "\n" + " %s%s\n" + "\n", + (LOOKUP_GOOGLE == website_id)?"":"", + (LOOKUP_YAHOO == website_id)?"":"" + ); + return rpc.do_rpc(buf); } -int RPC_CLIENT::lookup_google_poll() { +int RPC_CLIENT::lookup_website_poll() { RPC rpc(this); LOOKUP_WEBSITE lw; int retval; - retval = rpc.do_rpc("\n"); + retval = rpc.do_rpc("\n"); if (retval) return retval; return lw.parse(rpc.fin); } -int RPC_CLIENT::lookup_yahoo() { - RPC rpc(this); - return rpc.do_rpc("\n"); -} - -int RPC_CLIENT::lookup_yahoo_poll() { - RPC rpc(this); - LOOKUP_WEBSITE lw; - int retval; - - retval = rpc.do_rpc("\n"); - if (retval) return retval; - return lw.parse(rpc.fin); -} -#endif