diff --git a/checkin_notes b/checkin_notes index c6e9454e10..4e3f885223 100755 --- a/checkin_notes +++ b/checkin_notes @@ -8678,6 +8678,14 @@ Bruce 28 June 2005 sched/ sched_locality.C +Rom 28 June 2005 + - Additional Dial-up work + - Add space for description and hyperlink access to the + DlgAccountManagerSignup dialog. - - + clientgui/ + BOINCGUI.pjd + DlgOptions.cpp, .h + DlgAccountManagerSignup.cpp, .h + hyperlink.cpp, .h (Added) + MainFrame.cpp diff --git a/clientgui/BOINCGUI.pjd b/clientgui/BOINCGUI.pjd index de2d9bd571..d40c996fc2 100644 --- a/clientgui/BOINCGUI.pjd +++ b/clientgui/BOINCGUI.pjd @@ -12,7 +12,7 @@ - 134 + 136 TRUE FALSE @@ -100,10 +100,9 @@ FALSE <None> - TRUE - 14287520 + 14628464 data-document @@ -114,16 +113,17 @@ 0 Configurations - 56113968 + 56718448 config-data-document 0 1 0 - 14287520 + 14628464 0 + TRUE Debug ANSI @@ -168,7 +168,7 @@ Projects - 14287632 + 14629872 root-document project @@ -179,25 +179,25 @@ 0 Windows - 56110192 + 15188640 html-document dialogsfolder 1 1 0 - 14287632 + 14629872 1 Options - 56108256 + 15184928 dialog-document dialog 0 1 0 - 56110192 + 15188640 0 8/3/2004 wbDialogProxy @@ -205,6 +205,7 @@ FALSE m_bProxySectionConfigured|bool|ProxySectionConfigured| + m_strDefaultDialupConnection|wxString|DefaultDialupConnection| ID_DIALOG 10000 CDlgOptions @@ -257,32 +258,40 @@ wxBoxSizer V - 14791936 + 14639504 dialog-control-document sizer 0 1 0 - 56108256 + 15184928 0 wbBoxSizerProxy Vertical + Centre + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE FALSE FALSE FALSE <Any platform> wxNotebook: ID_NOTEBOOK - 14780368 + 14671504 dialog-control-document notebook 0 1 0 - 14791936 + 14639504 0 wbNotebookProxy wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED|OnNotebookPageChanged @@ -307,6 +316,8 @@ FALSE FALSE FALSE + FALSE + FALSE FALSE FALSE FALSE @@ -336,21 +347,19 @@ wxPanel: ID_GENERAL - 14302224 + 14744768 dialog-control-document panel 0 1 0 - 14780368 + 14671504 0 wbPanelProxy ID_GENERAL 10002 wxPanel - General - wxPanel FALSE @@ -394,16 +403,18 @@ + General + wxBoxSizer V - 14344416 + 14723088 dialog-control-document sizer 0 1 0 - 14302224 + 14744768 0 24/9/2004 wbBoxSizerProxy @@ -423,14 +434,14 @@ <Any platform> wxFlexGridSizer - 14334912 + 14713632 dialog-control-document sizer 0 1 0 - 14344416 + 14723088 0 22/5/2005 wbFlexGridSizerProxy @@ -455,14 +466,14 @@ FALSE wxStaticText: wxID_STATIC - 14327856 + 14762352 dialog-control-document statictext 0 1 0 - 14334912 + 14713632 0 22/5/2005 wbStaticTextProxy @@ -512,14 +523,14 @@ wxComboBox: ID_LANGUAGESELECTION - 14357904 + 14764496 dialog-control-document combobox 0 1 0 - 14334912 + 14713632 0 22/5/2005 wbComboBoxProxy @@ -564,14 +575,14 @@ wxStaticText: wxID_STATIC - 14360352 + 14826432 dialog-control-document statictext 0 1 0 - 14334912 + 14713632 0 22/5/2005 wbStaticTextProxy @@ -621,14 +632,14 @@ wxSlider: ID_REMINDERFREQUENCY - 14396496 + 14828752 dialog-control-document slider 0 1 0 - 14334912 + 14713632 0 22/5/2005 wbSliderProxy @@ -656,6 +667,7 @@ FALSE FALSE FALSE + FALSE FALSE FALSE FALSE @@ -687,22 +699,20 @@ wxPanel: ID_CONNECTONS - 14538576 + 14852240 dialog-control-document panel 0 1 0 - 14780368 + 14671504 0 27/5/2005 wbPanelProxy ID_CONNECTONS 10019 wxPanel - Connections - wxPanel FALSE @@ -746,16 +756,18 @@ + Connections + wxBoxSizer V - 14517104 + 14907200 dialog-control-document sizer 0 1 0 - 14538576 + 14852240 0 27/5/2005 wbBoxSizerProxy @@ -775,23 +787,24 @@ <Any platform> wxRadioButton: ID_NETWORKAUTODETECT - 14396992 + 14900432 dialog-control-document radiobutton 0 1 0 - 14517104 + 14907200 0 27/5/2005 wbRadioButtonProxy - wxEVT_COMMAND_RADIOBUTTON_SELECTED|OnNetworkautodetectSelected + wxEVT_COMMAND_RADIOBUTTON_SELECTED|OnNetworkAutoDetectSelected + wxEVT_UPDATE_UI|OnNetworkAutoDetectUpdate ID_NETWORKAUTODETECT 10020 wxRadioButton m_NetworkAutomaticDetectionCtrl - Automatically detect network connection settings + &Automatically detect network connection settings TRUE @@ -826,23 +839,24 @@ wxRadioButton: ID_NETWORKLAN - 14566544 + 14880528 dialog-control-document radiobutton 0 1 0 - 14517104 + 14907200 0 27/5/2005 wbRadioButtonProxy - wxEVT_COMMAND_RADIOBUTTON_SELECTED|OnNetworklanSelected + wxEVT_COMMAND_RADIOBUTTON_SELECTED|OnNetworkLANSelected + wxEVT_UPDATE_UI|OnNetworkLANUpdate ID_NETWORKLAN 10021 wxRadioButton m_NetworkUseLANCtrl - Use my Local Area Network(LAN) connection + Use my &Local Area Network(LAN) connection FALSE @@ -877,23 +891,24 @@ wxRadioButton: ID_NETWORKDIALUP - 14550896 + 14962912 dialog-control-document radiobutton 0 1 0 - 14517104 + 14907200 0 27/5/2005 wbRadioButtonProxy - wxEVT_COMMAND_RADIOBUTTON_SELECTED|OnNetworkdialupSelected + wxEVT_COMMAND_RADIOBUTTON_SELECTED|OnNetworkDialupSelected + wxEVT_UPDATE_UI|OnNetworkDialupUpdate ID_NETWORKDIALUP 10022 wxRadioButton m_NetworkUseDialupCtrl - Use my Dial-up and Virtual Private Network connection + Use my &Dial-up and Virtual Private Network connection FALSE @@ -928,14 +943,14 @@ wxStaticBoxSizer V - 14602016 + 14964480 dialog-control-document sizer 0 1 0 - 14517104 + 14907200 0 27/5/2005 wbStaticBoxSizerProxy @@ -959,14 +974,14 @@ <Any platform> wxFlexGridSizer - 14595408 + 15002992 dialog-control-document sizer 0 1 0 - 14602016 + 14964480 0 27/5/2005 wbFlexGridSizerProxy @@ -991,14 +1006,14 @@ FALSE wxListBox: ID_DIALUPCONNECTIONS - 14567632 + 14990176 dialog-control-document listbox 0 1 0 - 14595408 + 15002992 0 27/5/2005 wbListBoxProxy @@ -1052,14 +1067,14 @@ wxBoxSizer V - 14622336 + 15031760 dialog-control-document sizer 0 1 0 - 14595408 + 15002992 0 27/5/2005 wbBoxSizerProxy @@ -1079,22 +1094,23 @@ <Any platform> wxButton: ID_DIALUPSETDEFAULT - 14615696 + 15020928 dialog-control-document dialogcontrol 0 1 0 - 14622336 + 15031760 0 27/5/2005 wbButtonProxy + wxEVT_COMMAND_BUTTON_CLICKED|OnDialupSetDefaultClick ID_DIALUPSETDEFAULT 10024 wxButton m_DialupSetDefaultCtrl - Set Default + &Set Default TRUE @@ -1131,22 +1147,23 @@ wxButton: ID_DIALUPCLEARDEFAULT - 14665408 + 15023888 dialog-control-document dialogcontrol 0 1 0 - 14622336 + 15031760 0 27/5/2005 wbButtonProxy + wxEVT_COMMAND_BUTTON_CLICKED|OnDialupClearDefaultClick ID_DIALUPCLEARDEFAULT 10025 wxButton m_DialupClearDefaultCtrl - Clear Default + &Clear Default FALSE @@ -1185,14 +1202,14 @@ wxFlexGridSizer - 14668976 + 15058064 dialog-control-document sizer 0 1 0 - 14602016 + 14964480 0 27/5/2005 wbFlexGridSizerProxy @@ -1217,14 +1234,14 @@ FALSE wxStaticText: ID_DIALUPDEFAULTCONNECTIONTEXT - 14712608 + 15045328 dialog-control-document statictext 0 1 0 - 14668976 + 15058064 0 27/5/2005 wbStaticTextProxy @@ -1274,14 +1291,14 @@ wxStaticText: ID_DIALUPDEFAULTCONNECTION - 14691712 + 15095648 dialog-control-document statictext 0 1 0 - 14668976 + 15058064 0 27/5/2005 wbStaticTextProxy @@ -1297,8 +1314,8 @@ FALSE <Any platform> - - + m_strDefaultDialupConnection + wxTextValidator(wxFILTER_NONE, & %VARIABLE%) FALSE FALSE FALSE @@ -1335,21 +1352,19 @@ wxPanel: ID_HTTPPROXY - 14734832 + 15077136 dialog-control-document panel 0 1 0 - 14780368 + 14671504 0 wbPanelProxy ID_HTTPPROXY 10003 wxPanel - HTTP Proxy - wxPanel FALSE @@ -1393,16 +1408,18 @@ + HTTP Proxy + wxBoxSizer V - 14717488 + 15137760 dialog-control-document sizer 0 1 0 - 14734832 + 15077136 0 wbBoxSizerProxy Vertical @@ -1421,18 +1438,18 @@ <Any platform> wxCheckBox: ID_ENABLEHTTPPROXYCTRL - 14666400 + 15126800 dialog-control-document checkbox 0 1 0 - 14717488 + 15137760 0 wbCheckBoxProxy - wxEVT_COMMAND_CHECKBOX_CLICKED|OnEnablehttpproxyctrlClick - wxEVT_UPDATE_UI|OnEnablehttpproxyctrlUpdate + wxEVT_COMMAND_CHECKBOX_CLICKED|OnEnableHTTPProxyCtrlClick + wxEVT_UPDATE_UI|OnEnableHTTPProxyCtrlUpdate ID_ENABLEHTTPPROXYCTRL 10007 wxCheckBox @@ -1448,6 +1465,10 @@ FALSE <Any platform> + FALSE + TRUE + FALSE + FALSE FALSE -1 @@ -1467,19 +1488,17 @@ FALSE - FALSE - FALSE wxStaticBoxSizer V - 14766912 + 15129136 dialog-control-document sizer 0 1 0 - 14717488 + 15137760 0 wbStaticBoxSizerProxy wxID_ANY @@ -1502,14 +1521,14 @@ <Any platform> wxGridSizer - 14756304 + 15165824 dialog-control-document sizer 0 1 0 - 14766912 + 15129136 0 wbGridSizerProxy 1 @@ -1531,14 +1550,14 @@ FALSE wxFlexGridSizer - 14746096 + 15151536 dialog-control-document sizer 0 1 0 - 14756304 + 15165824 0 wbFlexGridSizerProxy @@ -1562,14 +1581,14 @@ FALSE wxStaticText: wxID_STATIC - 14839584 + 15147360 dialog-control-document statictext 0 1 0 - 14746096 + 15151536 0 wbStaticTextProxy wxID_STATIC @@ -1618,14 +1637,14 @@ wxTextCtrl: ID_HTTPADDRESSCTRL - 14816816 + 50934848 dialog-control-document textctrl 0 1 0 - 14746096 + 15151536 0 wbTextCtrlProxy ID_HTTPADDRESSCTRL @@ -1685,14 +1704,14 @@ wxStaticText: wxID_STATIC - 50408800 + 50980128 dialog-control-document statictext 0 1 0 - 14746096 + 15151536 0 wbStaticTextProxy wxID_STATIC @@ -1741,14 +1760,14 @@ wxTextCtrl: ID_HTTPPORTCTRL - 50449824 + 50963152 dialog-control-document textctrl 0 1 0 - 14746096 + 15151536 0 wbTextCtrlProxy ID_HTTPPORTCTRL @@ -1810,14 +1829,14 @@ wxStaticBoxSizer V - 50454304 + 50998416 dialog-control-document sizer 0 1 0 - 14766912 + 15129136 0 wbStaticBoxSizerProxy wxID_ANY @@ -1840,14 +1859,14 @@ <Any platform> wxFlexGridSizer - 14817168 + 50987728 dialog-control-document sizer 0 1 0 - 50454304 + 50998416 0 wbFlexGridSizerProxy @@ -1871,14 +1890,14 @@ FALSE wxStaticText: wxID_STATIC - 56136000 + 15167248 dialog-control-document statictext 0 1 0 - 14817168 + 50987728 0 wbStaticTextProxy wxID_STATIC @@ -1929,14 +1948,14 @@ wxTextCtrl: ID_HTTPUSERNAMECTRL - 56158000 + 14700016 dialog-control-document textctrl 0 1 0 - 14817168 + 50987728 0 wbTextCtrlProxy ID_HTTPUSERNAMECTRL @@ -1996,14 +2015,14 @@ wxStaticText: wxID_STATIC - 14441680 + 14692560 dialog-control-document statictext 0 1 0 - 14817168 + 50987728 0 wbStaticTextProxy wxID_STATIC @@ -2054,14 +2073,14 @@ wxTextCtrl: ID_HTTPPASSWORDCTRL - 56176320 + 56744160 dialog-control-document textctrl 0 1 0 - 14817168 + 50987728 0 wbTextCtrlProxy ID_HTTPPASSWORDCTRL @@ -2126,21 +2145,19 @@ wxPanel: ID_SOCKSPROXY - 56168704 + 56768736 dialog-control-document panel 0 1 0 - 14780368 + 14671504 0 wbPanelProxy ID_SOCKSPROXY 10006 wxPanel - SOCKS Proxy - wxPanel FALSE @@ -2184,18 +2201,20 @@ + SOCKS Proxy + FALSE FALSE wxBoxSizer V - 14455040 + 56737872 dialog-control-document sizer 0 1 0 - 56168704 + 56768736 0 wbBoxSizerProxy Vertical @@ -2214,18 +2233,18 @@ <Any platform> wxCheckBox: ID_ENABLESOCKSPROXYCTRL - 14468960 + 50999648 dialog-control-document checkbox 0 1 0 - 14455040 + 56737872 0 wbCheckBoxProxy - wxEVT_COMMAND_CHECKBOX_CLICKED|OnEnablesocksproxyctrlClick - wxEVT_UPDATE_UI|OnEnablesocksproxyctrlUpdate + wxEVT_COMMAND_CHECKBOX_CLICKED|OnEnableSOCKSProxyCtrlClick + wxEVT_UPDATE_UI|OnEnableSOCKSProxyCtrlUpdate ID_ENABLESOCKSPROXYCTRL 10012 wxCheckBox @@ -2241,6 +2260,10 @@ FALSE <Any platform> + FALSE + TRUE + FALSE + FALSE FALSE -1 @@ -2260,19 +2283,17 @@ FALSE - FALSE - FALSE wxStaticBoxSizer V - 14470384 + 14791584 dialog-control-document sizer 0 1 0 - 14455040 + 56737872 0 wbStaticBoxSizerProxy wxID_ANY @@ -2295,14 +2316,14 @@ <Any platform> wxGridSizer - 14488176 + 14805504 dialog-control-document sizer 0 1 0 - 14470384 + 14791584 0 wbGridSizerProxy 1 @@ -2324,14 +2345,14 @@ FALSE wxFlexGridSizer - 14502544 + 56790800 dialog-control-document sizer 0 1 0 - 14488176 + 14805504 0 wbFlexGridSizerProxy @@ -2355,14 +2376,14 @@ FALSE wxStaticText: wxID_STATIC - 14514384 + 56802464 dialog-control-document statictext 0 1 0 - 14502544 + 56790800 0 wbStaticTextProxy wxID_STATIC @@ -2413,14 +2434,14 @@ wxTextCtrl: ID_SOCKSADDRESSCTRL - 56221472 + 56816112 dialog-control-document textctrl 0 1 0 - 14502544 + 56790800 0 wbTextCtrlProxy ID_SOCKSADDRESSCTRL @@ -2482,14 +2503,14 @@ wxStaticText: wxID_STATIC - 14853200 + 56845920 dialog-control-document statictext 0 1 0 - 14502544 + 56790800 0 wbStaticTextProxy wxID_STATIC @@ -2540,14 +2561,14 @@ wxTextCtrl: ID_SOCKSPORTCTRL - 14873520 + 14924512 dialog-control-document textctrl 0 1 0 - 14502544 + 56790800 0 wbTextCtrlProxy ID_SOCKSPORTCTRL @@ -2611,14 +2632,14 @@ wxStaticBoxSizer V - 56247904 + 14925008 dialog-control-document sizer 0 1 0 - 14470384 + 14791584 0 wbStaticBoxSizerProxy wxID_ANY @@ -2641,14 +2662,14 @@ <Any platform> wxFlexGridSizer - 56261792 + 56860144 dialog-control-document sizer 0 1 0 - 56247904 + 14925008 0 wbFlexGridSizerProxy @@ -2672,14 +2693,14 @@ FALSE wxStaticText: wxID_STATIC - 56266096 + 56872000 dialog-control-document statictext 0 1 0 - 56261792 + 56860144 0 wbStaticTextProxy wxID_STATIC @@ -2730,14 +2751,14 @@ wxTextCtrl: ID_SOCKSUSERNAMECTRL - 56284112 + 56895904 dialog-control-document textctrl 0 1 0 - 56261792 + 56860144 0 wbTextCtrlProxy ID_SOCKSUSERNAMECTRL @@ -2799,14 +2820,14 @@ wxStaticText: wxID_STATIC - 56308944 + 56889776 dialog-control-document statictext 0 1 0 - 56261792 + 56860144 0 wbStaticTextProxy wxID_STATIC @@ -2857,14 +2878,14 @@ wxTextCtrl: ID_SOCKSPASSWORDCTRL - 56309952 + 56937840 dialog-control-document textctrl 0 1 0 - 56261792 + 56860144 0 wbTextCtrlProxy ID_SOCKSPASSWORDCTRL @@ -2932,14 +2953,14 @@ wxBoxSizer H - 56344800 + 56955232 dialog-control-document sizer 0 1 0 - 14791936 + 14639504 0 wbBoxSizerProxy Horizontal @@ -2958,14 +2979,14 @@ <Any platform> wxButton: wxID_OK - 56358656 + 56969008 dialog-control-document dialogcontrol 0 1 0 - 56344800 + 56955232 0 wbButtonProxy wxID_OK @@ -3011,14 +3032,14 @@ wxButton: wxID_CANCEL - 14782880 + 56854272 dialog-control-document dialogcontrol 0 1 0 - 56344800 + 56955232 0 wbButtonProxy wxID_CANCEL @@ -3067,14 +3088,14 @@ About BOINC - 56374320 + 14674176 dialog-document dialog 0 1 0 - 56110192 + 15188640 0 9/3/2004 wbDialogProxy @@ -3134,14 +3155,14 @@ wxBoxSizer V - 14793072 + 56995152 dialog-control-document sizer 0 1 0 - 56374320 + 14674176 0 wbBoxSizerProxy Vertical @@ -3160,14 +3181,14 @@ <Any platform> wxStaticText: wxID_STATIC - 56398832 + 57000512 dialog-control-document statictext 0 1 0 - 14793072 + 56995152 0 wbStaticTextProxy wxID_STATIC @@ -3216,14 +3237,14 @@ wxBoxSizer H - 56400944 + 57028208 dialog-control-document sizer 0 1 0 - 14793072 + 56995152 0 wbBoxSizerProxy Horizontal @@ -3242,14 +3263,14 @@ <Any platform> wxBoxSizer V - 56422688 + 57035520 dialog-control-document sizer 0 1 0 - 56400944 + 57028208 0 wbBoxSizerProxy Vertical @@ -3268,14 +3289,14 @@ <Any platform> wxStaticBitmap: wxID_STATIC - 56436896 + 57041312 dialog-control-document staticbitmap 0 1 0 - 56422688 + 57035520 0 wbStaticBitmapProxy wxID_STATIC @@ -3319,14 +3340,14 @@ wxFlexGridSizer - 56431744 + 57060560 dialog-control-document sizer 0 1 0 - 56400944 + 57028208 0 wbFlexGridSizerProxy @@ -3350,14 +3371,14 @@ FALSE wxStaticText: wxID_STATIC - 56461024 + 57072816 dialog-control-document statictext 0 1 0 - 56431744 + 57060560 0 wbStaticTextProxy wxID_STATIC @@ -3406,14 +3427,14 @@ wxStaticText: wxID_STATIC - 56482144 + 57086880 dialog-control-document statictext 0 1 0 - 56431744 + 57060560 0 wbStaticTextProxy wxID_STATIC @@ -3462,14 +3483,14 @@ wxStaticText: wxID_STATIC - 56501840 + 57109040 dialog-control-document statictext 0 1 0 - 56431744 + 57060560 0 wbStaticTextProxy wxID_STATIC @@ -3520,14 +3541,14 @@ wxStaticText: wxID_STATIC - 56524432 + 57124064 dialog-control-document statictext 0 1 0 - 56431744 + 57060560 0 wbStaticTextProxy wxID_STATIC @@ -3576,14 +3597,14 @@ wxStaticText: wxID_STATIC - 56539792 + 57146288 dialog-control-document statictext 0 1 0 - 56431744 + 57060560 0 wbStaticTextProxy wxID_STATIC @@ -3634,14 +3655,14 @@ wxStaticText: wxID_STATIC - 56534336 + 57160960 dialog-control-document statictext 0 1 0 - 56431744 + 57060560 0 wbStaticTextProxy wxID_STATIC @@ -3693,14 +3714,14 @@ All Rights Reserved. wxStaticText: wxID_STATIC - 56577008 + 57021088 dialog-control-document statictext 0 1 0 - 14793072 + 56995152 0 wbStaticTextProxy wxID_STATIC @@ -3751,14 +3772,14 @@ All Rights Reserved. wxStaticText: wxID_STATIC - 56577824 + 57193888 dialog-control-document statictext 0 1 0 - 14793072 + 56995152 0 wbStaticTextProxy wxID_STATIC @@ -3809,14 +3830,14 @@ All Rights Reserved. wxStaticText: wxID_STATIC - 56609616 + 57195744 dialog-control-document statictext 0 1 0 - 14793072 + 56995152 0 wbStaticTextProxy wxID_STATIC @@ -3867,14 +3888,14 @@ All Rights Reserved. wxStaticLine: wxID_STATIC - 56605456 + 57230528 dialog-control-document staticline 0 1 0 - 14793072 + 56995152 0 wbStaticLineProxy wxID_STATIC @@ -3916,14 +3937,14 @@ All Rights Reserved. wxButton: wxID_OK - 56635456 + 57225744 dialog-control-document dialogcontrol 0 1 0 - 14793072 + 56995152 0 wbButtonProxy wxID_OK @@ -3971,14 +3992,14 @@ All Rights Reserved. Attach to Project - 56345424 + 57264608 dialog-document dialog 0 1 0 - 56110192 + 15188640 0 9/3/2004 wbDialogProxy @@ -4039,14 +4060,14 @@ All Rights Reserved. wxBoxSizer V - 56671408 + 57281504 dialog-control-document sizer 0 1 0 - 56345424 + 57264608 0 wbBoxSizerProxy Vertical @@ -4065,14 +4086,14 @@ All Rights Reserved. <Any platform> wxFlexGridSizer - 56678352 + 57288384 dialog-control-document sizer 0 1 0 - 56671408 + 57281504 0 29/2/2005 wbFlexGridSizerProxy @@ -4097,14 +4118,14 @@ All Rights Reserved. FALSE wxBoxSizer V - 56692512 + 57302480 dialog-control-document sizer 0 1 0 - 56678352 + 57288384 0 29/2/2005 wbBoxSizerProxy @@ -4124,14 +4145,14 @@ All Rights Reserved. <Any platform> wxFlexGridSizer - 56699280 + 57309376 dialog-control-document sizer 0 1 0 - 56692512 + 57302480 0 29/2/2005 wbFlexGridSizerProxy @@ -4156,14 +4177,14 @@ All Rights Reserved. FALSE wxStaticText: wxID_STATIC - 56711152 + 57320960 dialog-control-document statictext 0 1 0 - 56699280 + 57309376 0 29/2/2005 wbStaticTextProxy @@ -4215,14 +4236,14 @@ All Rights Reserved. wxTextCtrl: ID_PROJECTADDRESS - 56735792 + 57342800 dialog-control-document textctrl 0 1 0 - 56699280 + 57309376 0 29/2/2005 wbTextCtrlProxy @@ -4283,14 +4304,14 @@ All Rights Reserved. wxStaticText: wxID_STATIC - 56730768 + 57364944 dialog-control-document statictext 0 1 0 - 56699280 + 57309376 0 29/2/2005 wbStaticTextProxy @@ -4342,14 +4363,14 @@ All Rights Reserved. wxTextCtrl: ID_PROJECTACCOUNTKEY - 56777008 + 57386816 dialog-control-document textctrl 0 1 0 - 56699280 + 57309376 0 29/2/2005 wbTextCtrlProxy @@ -4411,14 +4432,14 @@ All Rights Reserved. wxStaticText: wxID_STATIC - 56795424 + 57310016 dialog-control-document statictext 0 1 0 - 56692512 + 57302480 0 29/2/2005 wbStaticTextProxy @@ -4471,14 +4492,14 @@ Visit http://boinc.berkeley.edu for a list of projects. wxBoxSizer V - 56797584 + 57425360 dialog-control-document sizer 0 1 0 - 56678352 + 57288384 0 29/2/2005 wbBoxSizerProxy @@ -4498,14 +4519,14 @@ Visit http://boinc.berkeley.edu for a list of projects. <Any platform> wxButton: wxID_OK - 56699600 + 57430848 dialog-control-document dialogcontrol 0 1 0 - 56797584 + 57425360 0 29/2/2005 wbButtonProxy @@ -4552,14 +4573,14 @@ Visit http://boinc.berkeley.edu for a list of projects. wxButton: wxID_CANCEL - 56839776 + 57447328 dialog-control-document dialogcontrol 0 1 0 - 56797584 + 57425360 0 29/2/2005 wbButtonProxy @@ -4610,14 +4631,14 @@ Visit http://boinc.berkeley.edu for a list of projects. Account Manager Signup - 56772944 + 57462864 dialog-document dialog 0 1 0 - 56110192 + 15188640 0 10/2/2005 wbDialogProxy @@ -4678,20 +4699,26 @@ Visit http://boinc.berkeley.edu for a list of projects. 300 - wxBoxSizer V - 56862048 + wxFlexGridSizer + 57478352 dialog-control-document sizer 0 1 0 - 56772944 + 57462864 0 - 10/2/2005 - wbBoxSizerProxy - Vertical + 28/5/2005 + wbFlexGridSizerProxy + + + 2 + 1 + 0 + 0 + <Any platform> Centre Centre 0 @@ -4703,21 +4730,20 @@ Visit http://boinc.berkeley.edu for a list of projects. FALSE FALSE FALSE - <Any platform> - wxBoxSizer H - 56869200 + wxBoxSizer V + 57484144 dialog-control-document sizer 0 1 0 - 56862048 + 57478352 0 - 10/2/2005 + 28/5/2005 wbBoxSizerProxy - Horizontal + Vertical Centre Centre @@ -4732,17 +4758,134 @@ Visit http://boinc.berkeley.edu for a list of projects. FALSE <Any platform> + wxStaticText: ID_ACCTMANAGERTEXT + 57497312 + dialog-control-document + + statictext + 0 + 1 + 0 + 57484144 + 0 + 28/5/2005 + wbStaticTextProxy + ID_ACCTMANAGERTEXT + 10028 + wxStaticText + + foo + + + + + + FALSE + <Any platform> + + + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + + -1 + -1 + -1 + -1 + Centre + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + TRUE + FALSE + + + + + wxHyperLink: ID_ACCTMANAGERLINK + 55199216 + dialog-control-document + + foreign + 0 + 1 + 0 + 57484144 + 0 + 28/5/2005 + wbCustomCtrlProxy:wxHyperLink + ID_ACCTMANAGERLINK + 10029 + wxHyperLink + wxHyperLink + + TRUE + http://www.yahoo.com/ + + + + + + FALSE + <Any platform> + + + FALSE + TRUE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + + -1 + -1 + -1 + -1 + Centre + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + + %PARENT%, %IDENTIFIER%, %LABEL%, %POSITION%, %SIZE%, %STYLE% + + + wxFlexGridSizer - 56884320 + 57516912 dialog-control-document sizer 0 1 0 - 56869200 + 57484144 0 - 10/2/2005 + 28/5/2005 wbFlexGridSizerProxy @@ -4763,18 +4906,18 @@ Visit http://boinc.berkeley.edu for a list of projects. FALSE FALSE FALSE - + wxStaticText: wxID_STATIC - 56890448 + 57528784 dialog-control-document statictext 0 1 0 - 56884320 + 57516912 0 - 16/5/2005 + 28/5/2005 wbStaticTextProxy wxID_STATIC 5105 @@ -4820,18 +4963,18 @@ Visit http://boinc.berkeley.edu for a list of projects. - + wxTextCtrl: ID_ACCTMANAGERURL - 56911280 + 57551392 dialog-control-document textctrl 0 1 0 - 56884320 + 57516912 0 - 16/5/2005 + 28/5/2005 wbTextCtrlProxy ID_ACCTMANAGERURL 10001 @@ -4888,18 +5031,18 @@ Visit http://boinc.berkeley.edu for a list of projects. - + wxStaticText: wxID_STATIC - 56934736 + 57545600 dialog-control-document statictext 0 1 0 - 56884320 + 57516912 0 - 10/2/2005 + 28/5/2005 wbStaticTextProxy wxID_STATIC 5105 @@ -4945,18 +5088,18 @@ Visit http://boinc.berkeley.edu for a list of projects. - + wxTextCtrl: ID_ACCTMANAGERUSERNAME - 56962688 + 57592960 dialog-control-document textctrl 0 1 0 - 56884320 + 57516912 0 - 10/2/2005 + 28/5/2005 wbTextCtrlProxy ID_ACCTMANAGERUSERNAME 10002 @@ -5013,18 +5156,18 @@ Visit http://boinc.berkeley.edu for a list of projects. - + wxStaticText: wxID_STATIC - 56956912 + 57616896 dialog-control-document statictext 0 1 0 - 56884320 + 57516912 0 - 10/2/2005 + 28/5/2005 wbStaticTextProxy wxID_STATIC 5105 @@ -5070,18 +5213,18 @@ Visit http://boinc.berkeley.edu for a list of projects. - + wxTextCtrl: ID_ACCTMANAGERPASSWORD - 56996880 + 57610736 dialog-control-document textctrl 0 1 0 - 56884320 + 57516912 0 - 10/2/2005 + 28/5/2005 wbTextCtrlProxy ID_ACCTMANAGERPASSWORD 10003 @@ -5139,23 +5282,79 @@ Visit http://boinc.berkeley.edu for a list of projects. - - wxBoxSizer V - 57023216 + + + wxFlexGridSizer + 57652512 + dialog-control-document + + sizer + 0 + 1 + 0 + 57478352 + 0 + 28/5/2005 + wbFlexGridSizerProxy + + + 1 + 2 + 0 + 0 + + <Any platform> + Centre + Top + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + + wxButton: wxID_OK + 57665024 dialog-control-document - sizer + dialogcontrol 0 1 0 - 56869200 + 57652512 0 - 10/2/2005 - wbBoxSizerProxy - Vertical + 28/5/2005 + wbButtonProxy + wxID_OK + 5100 + wxButton + &OK + TRUE + + + + + + FALSE + <Any platform> + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + + -1 + -1 + -1 + -1 Centre - Top + Centre 0 5 TRUE @@ -5165,125 +5364,74 @@ Visit http://boinc.berkeley.edu for a list of projects. FALSE FALSE FALSE + + + + + wxButton: wxID_CANCEL + 57665776 + dialog-control-document + + dialogcontrol + 0 + 1 + 0 + 57652512 + 0 + 28/5/2005 + wbButtonProxy + wxID_CANCEL + 5101 + wxButton + + &Cancel + FALSE + + + + + + FALSE <Any platform> - - wxButton: wxID_OK - 57028864 - dialog-control-document - - dialogcontrol - 0 - 1 - 0 - 57023216 - 0 - 10/2/2005 - wbButtonProxy - wxID_OK - 5100 - wxButton - - &OK - TRUE - - - - - - FALSE - <Any platform> - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - - -1 - -1 - -1 - -1 - Centre - Centre - 0 - 5 - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - - - - - wxButton: wxID_CANCEL - 57045824 - dialog-control-document - - dialogcontrol - 0 - 1 - 0 - 57023216 - 0 - 10/2/2005 - wbButtonProxy - wxID_CANCEL - 5101 - wxButton - - &Cancel - FALSE - - - - - - FALSE - <Any platform> - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - - -1 - -1 - -1 - -1 - Centre - Centre - 0 - 5 - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - - - + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + + -1 + -1 + -1 + -1 + Centre + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + + - + Account Manager Status - 57058480 + 57688464 dialog-document dialog 0 1 0 - 56110192 + 15188640 0 16/5/2005 wbDialogProxy @@ -5341,16 +5489,16 @@ Visit http://boinc.berkeley.edu for a list of projects. 400 300 - + wxBoxSizer V - 56773584 + 57666928 dialog-control-document sizer 0 1 0 - 57058480 + 57688464 0 16/5/2005 wbBoxSizerProxy @@ -5368,16 +5516,16 @@ Visit http://boinc.berkeley.edu for a list of projects. FALSE FALSE <Any platform> - + wxBoxSizer H - 57023824 + 57716304 dialog-control-document sizer 0 1 0 - 56773584 + 57666928 0 16/5/2005 wbBoxSizerProxy @@ -5395,16 +5543,16 @@ Visit http://boinc.berkeley.edu for a list of projects. FALSE FALSE <Any platform> - + wxFlexGridSizer - 57088496 + 57723232 dialog-control-document sizer 0 1 0 - 57023824 + 57716304 0 16/5/2005 wbFlexGridSizerProxy @@ -5427,16 +5575,16 @@ Visit http://boinc.berkeley.edu for a list of projects. FALSE FALSE FALSE - + wxStaticText: wxID_STATIC - 57101920 + 57735072 dialog-control-document statictext 0 1 0 - 57088496 + 57723232 0 16/5/2005 wbStaticTextProxy @@ -5484,16 +5632,16 @@ Visit http://boinc.berkeley.edu for a list of projects. - + wxStaticText: wxID_STATIC - 57119680 + 57754352 dialog-control-document statictext 0 1 0 - 57088496 + 57723232 0 16/5/2005 wbStaticTextProxy @@ -5542,16 +5690,16 @@ Visit http://boinc.berkeley.edu for a list of projects. - + wxBoxSizer V - 57121936 + 57755680 dialog-control-document sizer 0 1 0 - 57023824 + 57716304 0 16/5/2005 wbBoxSizerProxy @@ -5569,16 +5717,16 @@ Visit http://boinc.berkeley.edu for a list of projects. FALSE FALSE <Any platform> - + wxButton: ID_UPDATE - 57101696 + 57770176 dialog-control-document dialogcontrol 0 1 0 - 57121936 + 57755680 0 16/5/2005 wbButtonProxy @@ -5622,16 +5770,16 @@ Visit http://boinc.berkeley.edu for a list of projects. - + wxButton: ID_CHANGE - 57162080 + 57771168 dialog-control-document dialogcontrol 0 1 0 - 57121936 + 57755680 0 16/5/2005 wbButtonProxy @@ -5675,16 +5823,16 @@ Visit http://boinc.berkeley.edu for a list of projects. - + wxButton: wxID_CANCEL - 57155632 + 57807088 dialog-control-document dialogcontrol 0 1 0 - 57121936 + 57755680 0 16/5/2005 wbButtonProxy @@ -5731,16 +5879,16 @@ Visit http://boinc.berkeley.edu for a list of projects. - + Select Computer - 57193520 + 57831120 dialog-document dialog 0 1 0 - 56110192 + 15188640 0 29/2/2005 wbDialogProxy @@ -5799,16 +5947,16 @@ Visit http://boinc.berkeley.edu for a list of projects. 400 300 - + wxBoxSizer V - 57122320 + 57838560 dialog-control-document sizer 0 1 0 - 57193520 + 57831120 0 29/2/2005 wbBoxSizerProxy @@ -5826,16 +5974,16 @@ Visit http://boinc.berkeley.edu for a list of projects. FALSE FALSE <Any platform> - + wxFlexGridSizer - 57219568 + 57845344 dialog-control-document sizer 0 1 0 - 57122320 + 57838560 0 29/2/2005 wbFlexGridSizerProxy @@ -5858,16 +6006,16 @@ Visit http://boinc.berkeley.edu for a list of projects. FALSE FALSE FALSE - + wxBoxSizer V - 57225536 + 57859376 dialog-control-document sizer 0 1 0 - 57219568 + 57845344 0 29/2/2005 wbBoxSizerProxy @@ -5885,16 +6033,16 @@ Visit http://boinc.berkeley.edu for a list of projects. FALSE FALSE <Any platform> - + wxFlexGridSizer - 57240672 + 57866288 dialog-control-document sizer 0 1 0 - 57225536 + 57859376 0 29/2/2005 wbFlexGridSizerProxy @@ -5917,16 +6065,16 @@ Visit http://boinc.berkeley.edu for a list of projects. FALSE FALSE FALSE - + wxStaticText: wxID_STATIC - 57248608 + 57877664 dialog-control-document statictext 0 1 0 - 57240672 + 57866288 0 29/2/2005 wbStaticTextProxy @@ -5974,16 +6122,16 @@ Visit http://boinc.berkeley.edu for a list of projects. - + wxComboBox: ID_SELECTCOMPUTERNAME - 57268816 + 57872768 dialog-control-document combobox 0 1 0 - 57240672 + 57866288 0 29/2/2005 wbComboBoxProxy @@ -6026,16 +6174,16 @@ Visit http://boinc.berkeley.edu for a list of projects. - + wxStaticText: wxID_STATIC - 57290080 + 57921296 dialog-control-document statictext 0 1 0 - 57240672 + 57866288 0 29/2/2005 wbStaticTextProxy @@ -6083,16 +6231,16 @@ Visit http://boinc.berkeley.edu for a list of projects. - + wxTextCtrl: ID_SELECTCOMPUTERPASSWORD - 57310880 + 57916192 dialog-control-document textctrl 0 1 0 - 57240672 + 57866288 0 29/2/2005 wbTextCtrlProxy @@ -6153,16 +6301,16 @@ Visit http://boinc.berkeley.edu for a list of projects. - + wxBoxSizer V - 57331488 + 57955328 dialog-control-document sizer 0 1 0 - 57219568 + 57845344 0 29/2/2005 wbBoxSizerProxy @@ -6180,16 +6328,16 @@ Visit http://boinc.berkeley.edu for a list of projects. FALSE FALSE <Any platform> - + wxButton: wxID_OK - 57337168 + 57859760 dialog-control-document dialogcontrol 0 1 0 - 57331488 + 57955328 0 29/2/2005 wbButtonProxy @@ -6234,16 +6382,16 @@ Visit http://boinc.berkeley.edu for a list of projects. FALSE FALSE - + wxButton: wxID_CANCEL - 57337920 + 57974896 dialog-control-document dialogcontrol 0 1 0 - 57331488 + 57955328 0 29/2/2005 wbButtonProxy @@ -6293,68 +6441,68 @@ Visit http://boinc.berkeley.edu for a list of projects. - + Images - 57356320 + 57978560 html-document bitmapsfolder 1 1 0 - 14287632 + 14629872 1 - + boincsm.xpm - 57363408 + 57977440 image-document res/boincsm.xpm image 0 0 0 - 57356320 + 57978560 0 1/3/2005 100 - + Sources - 57364240 + 57978256 html-document sourcesfolder 1 1 0 - 14287632 + 14629872 1 10/2/2005 - + ValidateAccountKey.cpp - 57362896 + 57976912 source-editor-document ValidateAccountKey.cpp source-editor 0 0 1 - 57364240 + 57978256 0 29/2/2005 - + ValidateURL.cpp - 57362656 + 57976624 source-editor-document ValidateURL.cpp source-editor 0 0 1 - 57364240 + 57978256 0 29/2/2005 diff --git a/clientgui/DlgAccountManagerSignup.cpp b/clientgui/DlgAccountManagerSignup.cpp index dae7f11a0a..433bee0580 100644 --- a/clientgui/DlgAccountManagerSignup.cpp +++ b/clientgui/DlgAccountManagerSignup.cpp @@ -113,44 +113,48 @@ void CDlgAccountManagerSignup::CreateControls() itemStaticText4->Create( itemDialog1, ID_ACCTMANAGERTEXT, _("foo"), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer3->Add(itemStaticText4, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxADJUST_MINSIZE, 5); - wxFlexGridSizer* itemFlexGridSizer5 = new wxFlexGridSizer(3, 2, 0, 0); - itemBoxSizer3->Add(itemFlexGridSizer5, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + wxHyperLink* itemHyperLink5 = new wxHyperLink; + itemHyperLink5->Create( itemDialog1, ID_ACCTMANAGERLINK, _T("http://boinc.berkeley.edu/"), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer3->Add(itemHyperLink5, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - wxStaticText* itemStaticText6 = new wxStaticText; - itemStaticText6->Create( itemDialog1, wxID_STATIC, _("URL:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer5->Add(itemStaticText6, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + wxFlexGridSizer* itemFlexGridSizer6 = new wxFlexGridSizer(3, 2, 0, 0); + itemBoxSizer3->Add(itemFlexGridSizer6, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + + wxStaticText* itemStaticText7 = new wxStaticText; + itemStaticText7->Create( itemDialog1, wxID_STATIC, _("URL:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer6->Add(itemStaticText7, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); m_AcctManagerURLCtrl = new wxTextCtrl; m_AcctManagerURLCtrl->Create( itemDialog1, ID_ACCTMANAGERURL, _T(""), wxDefaultPosition, wxSize(200, -1), 0 ); - itemFlexGridSizer5->Add(m_AcctManagerURLCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemFlexGridSizer6->Add(m_AcctManagerURLCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxStaticText* itemStaticText8 = new wxStaticText; - itemStaticText8->Create( itemDialog1, wxID_STATIC, _("Username:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT ); - itemFlexGridSizer5->Add(itemStaticText8, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + wxStaticText* itemStaticText9 = new wxStaticText; + itemStaticText9->Create( itemDialog1, wxID_STATIC, _("Username:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT ); + itemFlexGridSizer6->Add(itemStaticText9, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); m_AcctManagerUsernameCtrl = new wxTextCtrl; m_AcctManagerUsernameCtrl->Create( itemDialog1, ID_ACCTMANAGERUSERNAME, _T(""), wxDefaultPosition, wxSize(200, -1), 0 ); - itemFlexGridSizer5->Add(m_AcctManagerUsernameCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemFlexGridSizer6->Add(m_AcctManagerUsernameCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxStaticText* itemStaticText10 = new wxStaticText; - itemStaticText10->Create( itemDialog1, wxID_STATIC, _("Password:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT ); - itemFlexGridSizer5->Add(itemStaticText10, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + wxStaticText* itemStaticText11 = new wxStaticText; + itemStaticText11->Create( itemDialog1, wxID_STATIC, _("Password:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT ); + itemFlexGridSizer6->Add(itemStaticText11, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); m_AcctManagerPasswordCtrl = new wxTextCtrl; m_AcctManagerPasswordCtrl->Create( itemDialog1, ID_ACCTMANAGERPASSWORD, _T(""), wxDefaultPosition, wxSize(200, -1), wxTE_PASSWORD ); - itemFlexGridSizer5->Add(m_AcctManagerPasswordCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemFlexGridSizer6->Add(m_AcctManagerPasswordCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxFlexGridSizer* itemFlexGridSizer12 = new wxFlexGridSizer(2, 1, 0, 0); - itemFlexGridSizer2->Add(itemFlexGridSizer12, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_TOP|wxALL, 5); - - wxButton* itemButton13 = new wxButton; - itemButton13->Create( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 ); - itemButton13->SetDefault(); - itemFlexGridSizer12->Add(itemButton13, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); + wxFlexGridSizer* itemFlexGridSizer13 = new wxFlexGridSizer(2, 1, 0, 0); + itemFlexGridSizer2->Add(itemFlexGridSizer13, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_TOP|wxALL, 5); wxButton* itemButton14 = new wxButton; - itemButton14->Create( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer12->Add(itemButton14, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemButton14->Create( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 ); + itemButton14->SetDefault(); + itemFlexGridSizer13->Add(itemButton14, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); + + wxButton* itemButton15 = new wxButton; + itemButton15->Create( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer13->Add(itemButton15, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); // Set validators m_AcctManagerURLCtrl->SetValidator( wxGenericValidator(& m_strAcctManagerURL) ); diff --git a/clientgui/DlgAccountManagerSignup.h b/clientgui/DlgAccountManagerSignup.h index 9f61188fe6..98194c292f 100644 --- a/clientgui/DlgAccountManagerSignup.h +++ b/clientgui/DlgAccountManagerSignup.h @@ -29,6 +29,7 @@ */ ////@begin includes +#include "hyperlink.h" #include "wx/valgen.h" ////@end includes @@ -51,6 +52,7 @@ #define SYMBOL_CDLGACCOUNTMANAGERSIGNUP_SIZE wxSize(400, 300) #define SYMBOL_CDLGACCOUNTMANAGERSIGNUP_POSITION wxDefaultPosition #define ID_ACCTMANAGERTEXT 10028 +#define ID_ACCTMANAGERLINK 10029 #define ID_ACCTMANAGERURL 10001 #define ID_ACCTMANAGERUSERNAME 10002 #define ID_ACCTMANAGERPASSWORD 10003 diff --git a/clientgui/DlgOptions.cpp b/clientgui/DlgOptions.cpp index 3db62660a0..ea03566153 100644 --- a/clientgui/DlgOptions.cpp +++ b/clientgui/DlgOptions.cpp @@ -48,22 +48,33 @@ BEGIN_EVENT_TABLE(CDlgOptions, wxDialog) EVT_UPDATE_UI( ID_NOTEBOOK, CDlgOptions::OnNotebookUpdate ) #if defined(__WXMSW__) - EVT_RADIOBUTTON( ID_NETWORKAUTODETECT, CDlgOptions::OnNetworkautodetectSelected ) + EVT_RADIOBUTTON( ID_NETWORKAUTODETECT, CDlgOptions::OnNetworkAutoDetectSelected ) + EVT_UPDATE_UI( ID_NETWORKAUTODETECT, CDlgOptions::OnNetworkAutoDetectUpdate ) #endif #if defined(__WXMSW__) - EVT_RADIOBUTTON( ID_NETWORKLAN, CDlgOptions::OnNetworklanSelected ) + EVT_RADIOBUTTON( ID_NETWORKLAN, CDlgOptions::OnNetworkLANSelected ) + EVT_UPDATE_UI( ID_NETWORKLAN, CDlgOptions::OnNetworkLANUpdate ) #endif #if defined(__WXMSW__) - EVT_RADIOBUTTON( ID_NETWORKDIALUP, CDlgOptions::OnNetworkdialupSelected ) + EVT_RADIOBUTTON( ID_NETWORKDIALUP, CDlgOptions::OnNetworkDialupSelected ) + EVT_UPDATE_UI( ID_NETWORKDIALUP, CDlgOptions::OnNetworkDialupUpdate ) #endif - EVT_CHECKBOX( ID_ENABLEHTTPPROXYCTRL, CDlgOptions::OnEnablehttpproxyctrlClick ) - EVT_UPDATE_UI( ID_ENABLEHTTPPROXYCTRL, CDlgOptions::OnEnablehttpproxyctrlUpdate ) +#if defined(__WXMSW__) + EVT_BUTTON( ID_DIALUPSETDEFAULT, CDlgOptions::OnDialupSetDefaultClick ) +#endif - EVT_CHECKBOX( ID_ENABLESOCKSPROXYCTRL, CDlgOptions::OnEnablesocksproxyctrlClick ) - EVT_UPDATE_UI( ID_ENABLESOCKSPROXYCTRL, CDlgOptions::OnEnablesocksproxyctrlUpdate ) +#if defined(__WXMSW__) + EVT_BUTTON( ID_DIALUPCLEARDEFAULT, CDlgOptions::OnDialupClearDefaultClick ) +#endif + + EVT_CHECKBOX( ID_ENABLEHTTPPROXYCTRL, CDlgOptions::OnEnableHTTPProxyCtrlClick ) + EVT_UPDATE_UI( ID_ENABLEHTTPPROXYCTRL, CDlgOptions::OnEnableHTTPProxyCtrlUpdate ) + + EVT_CHECKBOX( ID_ENABLESOCKSPROXYCTRL, CDlgOptions::OnEnableSOCKSProxyCtrlClick ) + EVT_UPDATE_UI( ID_ENABLESOCKSPROXYCTRL, CDlgOptions::OnEnableSOCKSProxyCtrlUpdate ) ////@end CDlgOptions event table entries @@ -149,7 +160,6 @@ bool CDlgOptions::Create(wxWindow* parent, wxWindowID id, const wxString& captio void CDlgOptions::CreateControls() { ////@begin CDlgOptions content construction - CDlgOptions* itemDialog1 = this; wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL); @@ -198,17 +208,17 @@ void CDlgOptions::CreateControls() itemPanel11->SetSizer(itemBoxSizer12); m_NetworkAutomaticDetectionCtrl = new wxRadioButton; - m_NetworkAutomaticDetectionCtrl->Create( itemPanel11, ID_NETWORKAUTODETECT, _("Automatically detect network connection settings"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); + m_NetworkAutomaticDetectionCtrl->Create( itemPanel11, ID_NETWORKAUTODETECT, _("&Automatically detect network connection settings"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); m_NetworkAutomaticDetectionCtrl->SetValue(TRUE); itemBoxSizer12->Add(m_NetworkAutomaticDetectionCtrl, 0, wxALIGN_LEFT|wxALL, 5); m_NetworkUseLANCtrl = new wxRadioButton; - m_NetworkUseLANCtrl->Create( itemPanel11, ID_NETWORKLAN, _("Use my Local Area Network(LAN) connection"), wxDefaultPosition, wxDefaultSize, 0 ); + m_NetworkUseLANCtrl->Create( itemPanel11, ID_NETWORKLAN, _("Use my &Local Area Network(LAN) connection"), wxDefaultPosition, wxDefaultSize, 0 ); m_NetworkUseLANCtrl->SetValue(FALSE); itemBoxSizer12->Add(m_NetworkUseLANCtrl, 0, wxALIGN_LEFT|wxALL, 5); m_NetworkUseDialupCtrl = new wxRadioButton; - m_NetworkUseDialupCtrl->Create( itemPanel11, ID_NETWORKDIALUP, _("Use my Dial-up and Virtual Private Network connection"), wxDefaultPosition, wxDefaultSize, 0 ); + m_NetworkUseDialupCtrl->Create( itemPanel11, ID_NETWORKDIALUP, _("Use my &Dial-up and Virtual Private Network connection"), wxDefaultPosition, wxDefaultSize, 0 ); m_NetworkUseDialupCtrl->SetValue(FALSE); itemBoxSizer12->Add(m_NetworkUseDialupCtrl, 0, wxALIGN_LEFT|wxALL, 5); @@ -226,12 +236,12 @@ void CDlgOptions::CreateControls() wxBoxSizer* itemBoxSizer19 = new wxBoxSizer(wxVERTICAL); itemFlexGridSizer17->Add(itemBoxSizer19, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_DialupSetDefaultCtrl = new wxButton; - m_DialupSetDefaultCtrl->Create( itemPanel11, ID_DIALUPSETDEFAULT, _("Set Default"), wxDefaultPosition, wxDefaultSize, 0 ); + m_DialupSetDefaultCtrl->Create( itemPanel11, ID_DIALUPSETDEFAULT, _("&Set Default"), wxDefaultPosition, wxDefaultSize, 0 ); m_DialupSetDefaultCtrl->SetDefault(); itemBoxSizer19->Add(m_DialupSetDefaultCtrl, 0, wxGROW|wxALL, 5); m_DialupClearDefaultCtrl = new wxButton; - m_DialupClearDefaultCtrl->Create( itemPanel11, ID_DIALUPCLEARDEFAULT, _("Clear Default"), wxDefaultPosition, wxDefaultSize, 0 ); + m_DialupClearDefaultCtrl->Create( itemPanel11, ID_DIALUPCLEARDEFAULT, _("&Clear Default"), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer19->Add(m_DialupClearDefaultCtrl, 0, wxGROW|wxALL, 5); wxFlexGridSizer* itemFlexGridSizer22 = new wxFlexGridSizer(1, 2, 0, 0); @@ -245,6 +255,9 @@ void CDlgOptions::CreateControls() m_DialupDefaultConnectionCtrl->Create( itemPanel11, ID_DIALUPDEFAULTCONNECTION, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); itemFlexGridSizer22->Add(m_DialupDefaultConnectionCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); +#endif + +#if defined(__WXMSW__) itemNotebook3->AddPage(itemPanel11, _("Connections")); #endif @@ -254,7 +267,7 @@ void CDlgOptions::CreateControls() itemPanel25->SetSizer(itemBoxSizer26); m_EnableHTTPProxyCtrl = new wxCheckBox; - m_EnableHTTPProxyCtrl->Create( itemPanel25, ID_ENABLEHTTPPROXYCTRL, _("Connect via HTTP proxy server"), wxDefaultPosition, wxDefaultSize, 0 ); + m_EnableHTTPProxyCtrl->Create( itemPanel25, ID_ENABLEHTTPPROXYCTRL, _("Connect via HTTP proxy server"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); m_EnableHTTPProxyCtrl->SetValue(FALSE); itemBoxSizer26->Add(m_EnableHTTPProxyCtrl, 0, wxGROW|wxALL, 5); @@ -310,7 +323,7 @@ void CDlgOptions::CreateControls() itemPanel41->SetSizer(itemBoxSizer42); m_EnableSOCKSProxyCtrl = new wxCheckBox; - m_EnableSOCKSProxyCtrl->Create( itemPanel41, ID_ENABLESOCKSPROXYCTRL, _("Connect via SOCKS proxy server"), wxDefaultPosition, wxDefaultSize, 0 ); + m_EnableSOCKSProxyCtrl->Create( itemPanel41, ID_ENABLESOCKSPROXYCTRL, _("Connect via SOCKS proxy server"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); m_EnableSOCKSProxyCtrl->SetValue(FALSE); itemBoxSizer42->Add(m_EnableSOCKSProxyCtrl, 0, wxGROW|wxALL, 5); @@ -378,38 +391,174 @@ void CDlgOptions::CreateControls() itemButton59->Create( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer57->Add(itemButton59, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + // Set validators +#if defined(__WXMSW__) + m_DialupDefaultConnectionCtrl->SetValidator( wxTextValidator(wxFILTER_NONE, & m_strDefaultDialupConnection) ); +#endif ////@end CDlgOptions content construction } + /*! * wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED event handler for ID_NOTEBOOK */ void CDlgOptions::OnNotebookPageChanged(wxNotebookEvent& event) { -////@begin wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED event handler for ID_NOTEBOOK in CDlgToolsOptions. - // Before editing this code, remove the block markers. event.Skip(); -////@end wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED event handler for ID_NOTEBOOK in CDlgToolsOptions. } + /*! * wxEVT_UPDATE_UI event handler for ID_NOTEBOOK */ void CDlgOptions::OnNotebookUpdate(wxUpdateUIEvent& event) { -////@begin wxEVT_UPDATE_UI event handler for ID_NOTEBOOK in CDlgToolsOptions. - // Before editing this code, remove the block markers. event.Skip(); -////@end wxEVT_UPDATE_UI event handler for ID_NOTEBOOK in CDlgToolsOptions. } + +#if defined(__WXMSW__) +/*! + * wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_NETWORKAUTODETECT + */ + +void CDlgOptions::OnNetworkAutoDetectSelected( wxCommandEvent& event ) +{ + if (event.IsChecked()) { + m_DialupConnectionsCtrl->Enable(false); + m_DialupSetDefaultCtrl->Enable(false); + m_DialupClearDefaultCtrl->Enable(false); + m_DialupDefaultConnectionTextCtrl->Enable(false); + m_DialupDefaultConnectionCtrl->Enable(false); + } +} + +#endif + + +#if defined(__WXMSW__) +/*! + * wxEVT_UPDATE_UI event handler for ID_NETWORKAUTODETECT + */ + +void CDlgOptions::OnNetworkAutoDetectUpdate( wxUpdateUIEvent& event ) +{ + if (m_NetworkAutomaticDetectionCtrl->GetValue()) { + m_DialupConnectionsCtrl->Enable(false); + m_DialupSetDefaultCtrl->Enable(false); + m_DialupClearDefaultCtrl->Enable(false); + m_DialupDefaultConnectionTextCtrl->Enable(false); + m_DialupDefaultConnectionCtrl->Enable(false); + } +} +#endif + + +#if defined(__WXMSW__) +/*! + * wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_NETWORKLAN + */ + +void CDlgOptions::OnNetworkLANSelected( wxCommandEvent& event ) +{ + if (event.IsChecked()) { + m_DialupConnectionsCtrl->Enable(false); + m_DialupSetDefaultCtrl->Enable(false); + m_DialupClearDefaultCtrl->Enable(false); + m_DialupDefaultConnectionTextCtrl->Enable(false); + m_DialupDefaultConnectionCtrl->Enable(false); + } +} + +#endif + + +#if defined(__WXMSW__) +/*! + * wxEVT_UPDATE_UI event handler for ID_NETWORKLAN + */ + +void CDlgOptions::OnNetworkLANUpdate( wxUpdateUIEvent& event ) +{ + if (m_NetworkUseLANCtrl->GetValue()) { + m_DialupConnectionsCtrl->Enable(false); + m_DialupSetDefaultCtrl->Enable(false); + m_DialupClearDefaultCtrl->Enable(false); + m_DialupDefaultConnectionTextCtrl->Enable(false); + m_DialupDefaultConnectionCtrl->Enable(false); + } +} +#endif + + +#if defined(__WXMSW__) +/*! + * wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_NETWORKDIALUP + */ + +void CDlgOptions::OnNetworkDialupSelected( wxCommandEvent& event ) +{ + if (event.IsChecked()) { + m_DialupConnectionsCtrl->Enable(true); + m_DialupSetDefaultCtrl->Enable(true); + m_DialupClearDefaultCtrl->Enable(true); + m_DialupDefaultConnectionTextCtrl->Enable(true); + m_DialupDefaultConnectionCtrl->Enable(true); + } +} + +#endif + + +#if defined(__WXMSW__) +/*! + * wxEVT_UPDATE_UI event handler for ID_NETWORKDIALUP + */ + +void CDlgOptions::OnNetworkDialupUpdate( wxUpdateUIEvent& event ) +{ + if (m_NetworkUseDialupCtrl->GetValue()) { + m_DialupConnectionsCtrl->Enable(true); + m_DialupSetDefaultCtrl->Enable(true); + m_DialupClearDefaultCtrl->Enable(true); + m_DialupDefaultConnectionTextCtrl->Enable(true); + m_DialupDefaultConnectionCtrl->Enable(true); + } +} +#endif + + +#if defined(__WXMSW__) +/*! + * wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_DIALUPSETDEFAULT + */ + +void CDlgOptions::OnDialupSetDefaultClick( wxCommandEvent& event ) +{ + m_DialupDefaultConnectionCtrl->SetLabel(m_DialupConnectionsCtrl->GetStringSelection()); +} +#endif + + +#if defined(__WXMSW__) +/*! + * wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_DIALUPCLEARDEFAULT + */ + +void CDlgOptions::OnDialupClearDefaultClick( wxCommandEvent& event ) +{ + m_DialupDefaultConnectionCtrl->SetLabel(wxEmptyString); +} +#endif + + /*! * wxEVT_COMMAND_CHECKBOX_CLICKED event handler for ID_ENABLEHTTPPROXYCTRL */ -void CDlgOptions::OnEnablehttpproxyctrlClick(wxCommandEvent& event) { +void CDlgOptions::OnEnableHTTPProxyCtrlClick(wxCommandEvent& event) { if (event.IsChecked()) { m_HTTPAddressCtrl->Enable(true); m_HTTPPortCtrl->Enable(true); @@ -425,11 +574,12 @@ void CDlgOptions::OnEnablehttpproxyctrlClick(wxCommandEvent& event) { event.Skip(); } + /*! * wxEVT_UPDATE_UI event handler for ID_ENABLEHTTPPROXYCTRL */ -void CDlgOptions::OnEnablehttpproxyctrlUpdate(wxUpdateUIEvent& event) { +void CDlgOptions::OnEnableHTTPProxyCtrlUpdate(wxUpdateUIEvent& event) { if (m_bProxySectionConfigured) { m_EnableHTTPProxyCtrl->Enable(true); if (m_EnableHTTPProxyCtrl->IsChecked()) { @@ -453,11 +603,12 @@ void CDlgOptions::OnEnablehttpproxyctrlUpdate(wxUpdateUIEvent& event) { event.Skip(); } + /*! * wxEVT_COMMAND_CHECKBOX_CLICKED event handler for ID_ENABLESOCKSPROXYCTRL */ -void CDlgOptions::OnEnablesocksproxyctrlClick(wxCommandEvent& event) { +void CDlgOptions::OnEnableSOCKSProxyCtrlClick(wxCommandEvent& event) { if (event.IsChecked()) { m_SOCKSAddressCtrl->Enable(true); m_SOCKSPortCtrl->Enable(true); @@ -472,11 +623,12 @@ void CDlgOptions::OnEnablesocksproxyctrlClick(wxCommandEvent& event) { event.Skip(); } + /*! * wxEVT_UPDATE_UI event handler for ID_ENABLESOCKSPROXYCTRL */ -void CDlgOptions::OnEnablesocksproxyctrlUpdate(wxUpdateUIEvent& event) { +void CDlgOptions::OnEnableSOCKSProxyCtrlUpdate(wxUpdateUIEvent& event) { if (m_bProxySectionConfigured) { m_EnableSOCKSProxyCtrl->Enable(true); if (m_EnableSOCKSProxyCtrl->IsChecked()) { @@ -500,6 +652,7 @@ void CDlgOptions::OnEnablesocksproxyctrlUpdate(wxUpdateUIEvent& event) { event.Skip(); } + /*! * Should we show tooltips? */ @@ -509,72 +662,29 @@ bool CDlgOptions::ShowToolTips() return TRUE; } + /*! * Get bitmap resources */ -wxBitmap CDlgOptions::GetBitmapResource(const wxString&) { +wxBitmap CDlgOptions::GetBitmapResource(const wxString&) +{ // Bitmap retrieval ////@begin CDlgOptions bitmap retrieval return wxNullBitmap; ////@end CDlgOptions bitmap retrieval } + /*! * Get icon resources */ -wxIcon CDlgOptions::GetIconResource(const wxString&) { +wxIcon CDlgOptions::GetIconResource(const wxString&) +{ // Icon retrieval ////@begin CDlgOptions icon retrieval return wxNullIcon; ////@end CDlgOptions icon retrieval } -/*! - * wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_RADIOBUTTON - */ -#if defined(__WXMSW__) - -void CDlgOptions::OnNetworkautodetectSelected( wxCommandEvent& event ) -{ -////@begin wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_RADIOBUTTON in CDlgOptions. - // Before editing this code, remove the block markers. - event.Skip(); -////@end wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_RADIOBUTTON in CDlgOptions. -} - -#endif - - -#if defined(__WXMSW__) - -/*! - * wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_RADIOBUTTON1 - */ - -void CDlgOptions::OnNetworklanSelected( wxCommandEvent& event ) -{ -////@begin wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_RADIOBUTTON1 in CDlgOptions. - // Before editing this code, remove the block markers. - event.Skip(); -////@end wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_RADIOBUTTON1 in CDlgOptions. -} - -#endif - -#if defined(__WXMSW__) - -/*! - * wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_RADIOBUTTON2 - */ - -void CDlgOptions::OnNetworkdialupSelected( wxCommandEvent& event ) -{ -////@begin wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_RADIOBUTTON2 in CDlgOptions. - // Before editing this code, remove the block markers. - event.Skip(); -////@end wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_RADIOBUTTON2 in CDlgOptions. -} - -#endif diff --git a/clientgui/DlgOptions.h b/clientgui/DlgOptions.h index aa3b11d298..a0166af11b 100644 --- a/clientgui/DlgOptions.h +++ b/clientgui/DlgOptions.h @@ -30,6 +30,7 @@ ////@begin includes #include "wx/notebook.h" +#include "wx/valtext.h" ////@end includes /*! @@ -118,30 +119,49 @@ public: #if defined(__WXMSW__) /// wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_NETWORKAUTODETECT - void OnNetworkautodetectSelected( wxCommandEvent& event ); + void OnNetworkAutoDetectSelected( wxCommandEvent& event ); + + /// wxEVT_UPDATE_UI event handler for ID_NETWORKAUTODETECT + void OnNetworkAutoDetectUpdate( wxUpdateUIEvent& event ); #endif #if defined(__WXMSW__) /// wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_NETWORKLAN - void OnNetworklanSelected( wxCommandEvent& event ); + void OnNetworkLANSelected( wxCommandEvent& event ); + + /// wxEVT_UPDATE_UI event handler for ID_NETWORKLAN + void OnNetworkLANUpdate( wxUpdateUIEvent& event ); #endif #if defined(__WXMSW__) /// wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_NETWORKDIALUP - void OnNetworkdialupSelected( wxCommandEvent& event ); + void OnNetworkDialupSelected( wxCommandEvent& event ); + + /// wxEVT_UPDATE_UI event handler for ID_NETWORKDIALUP + void OnNetworkDialupUpdate( wxUpdateUIEvent& event ); + +#endif +#if defined(__WXMSW__) + /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_DIALUPSETDEFAULT + void OnDialupSetDefaultClick( wxCommandEvent& event ); + +#endif +#if defined(__WXMSW__) + /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_DIALUPCLEARDEFAULT + void OnDialupClearDefaultClick( wxCommandEvent& event ); #endif /// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for ID_ENABLEHTTPPROXYCTRL - void OnEnablehttpproxyctrlClick( wxCommandEvent& event ); + void OnEnableHTTPProxyCtrlClick( wxCommandEvent& event ); /// wxEVT_UPDATE_UI event handler for ID_ENABLEHTTPPROXYCTRL - void OnEnablehttpproxyctrlUpdate( wxUpdateUIEvent& event ); + void OnEnableHTTPProxyCtrlUpdate( wxUpdateUIEvent& event ); /// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for ID_ENABLESOCKSPROXYCTRL - void OnEnablesocksproxyctrlClick( wxCommandEvent& event ); + void OnEnableSOCKSProxyCtrlClick( wxCommandEvent& event ); /// wxEVT_UPDATE_UI event handler for ID_ENABLESOCKSPROXYCTRL - void OnEnablesocksproxyctrlUpdate( wxUpdateUIEvent& event ); + void OnEnableSOCKSProxyCtrlUpdate( wxUpdateUIEvent& event ); ////@end CDlgOptions event handler declarations @@ -150,6 +170,9 @@ public: bool GetProxySectionConfigured() const { return m_bProxySectionConfigured ; } void SetProxySectionConfigured(bool value) { m_bProxySectionConfigured = value ; } + wxString GetDefaultDialupConnection() const { return m_strDefaultDialupConnection ; } + void SetDefaultDialupConnection(wxString value) { m_strDefaultDialupConnection = value ; } + /// Retrieves bitmap resources wxBitmap GetBitmapResource( const wxString& name ); @@ -201,6 +224,7 @@ public: wxTextCtrl* m_SOCKSUsernameCtrl; wxTextCtrl* m_SOCKSPasswordCtrl; bool m_bProxySectionConfigured; + wxString m_strDefaultDialupConnection; ////@end CDlgOptions member variables }; diff --git a/clientgui/MainFrame.cpp b/clientgui/MainFrame.cpp index 497d6e5df6..756e1d85b2 100644 --- a/clientgui/MainFrame.cpp +++ b/clientgui/MainFrame.cpp @@ -22,6 +22,7 @@ #endif #include "stdwx.h" +#include "hyperlink.h" #include "BOINCGUIApp.h" #include "MainFrame.h" #include "Events.h" @@ -209,8 +210,10 @@ CMainFrame::CMainFrame(wxString strTitle) : SetStatusBarPane(0); +#ifdef __WXMSW__ m_pDialupManager = wxDialUpManager::Create(); wxASSERT(m_pDialupManager->IsOk()); +#endif m_pRefreshStateTimer = new wxTimer(this, ID_REFRESHSTATETIMER); wxASSERT(m_pRefreshStateTimer); @@ -256,8 +259,9 @@ CMainFrame::~CMainFrame() { wxASSERT(m_pMenubar); wxASSERT(m_pNotebook); wxASSERT(m_pStatusbar); +#ifdef __WXMSW__ wxASSERT(m_pDialupManager); - +#endif SaveState(); @@ -290,8 +294,10 @@ CMainFrame::~CMainFrame() { if (m_pMenubar) wxCHECK_RET(DeleteMenu(), _T("Failed to delete menu bar.")); +#ifdef __WXMSW__ if (m_pDialupManager) delete m_pDialupManager; +#endif wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::~CMainFrame - Function End")); @@ -1021,8 +1027,13 @@ void CMainFrame::OnToolsOptions(wxCommandEvent& WXUNUSED(event)) { wxASSERT(pDoc); wxASSERT(wxDynamicCast(pDoc, CMainDocument)); wxASSERT(pDlg); - wxASSERT(m_pDialupManager); +#ifdef __WXMSW__ + wxASSERT(m_pDialupManager); +#endif + + + pDoc->GetProxyConfiguration(); // General Tab pDlg->m_LanguageSelectionCtrl->Append(wxGetApp().GetSupportedLanguages()); @@ -1035,28 +1046,38 @@ void CMainFrame::OnToolsOptions(wxCommandEvent& WXUNUSED(event)) { #endif // Proxy Tabs - bProxyInformationConfigured = (0 == pDoc->GetProxyConfiguration()); - if (bProxyInformationConfigured) { - pDlg->m_bProxySectionConfigured = true; - pDlg->m_EnableHTTPProxyCtrl->SetValue(pDoc->proxy_info.use_http_proxy); - pDlg->m_HTTPAddressCtrl->SetValue(pDoc->proxy_info.http_server_name.c_str()); - pDlg->m_HTTPUsernameCtrl->SetValue(pDoc->proxy_info.http_user_name.c_str()); - pDlg->m_HTTPPasswordCtrl->SetValue(pDoc->proxy_info.http_user_passwd.c_str()); + pDlg->m_EnableHTTPProxyCtrl->SetValue(pDoc->proxy_info.use_http_proxy); + pDlg->m_HTTPAddressCtrl->SetValue(pDoc->proxy_info.http_server_name.c_str()); + pDlg->m_HTTPUsernameCtrl->SetValue(pDoc->proxy_info.http_user_name.c_str()); + pDlg->m_HTTPPasswordCtrl->SetValue(pDoc->proxy_info.http_user_passwd.c_str()); - strBuffer.Printf(wxT("%d"), pDoc->proxy_info.http_server_port); - pDlg->m_HTTPPortCtrl->SetValue(strBuffer); + strBuffer.Printf(wxT("%d"), pDoc->proxy_info.http_server_port); + pDlg->m_HTTPPortCtrl->SetValue(strBuffer); - pDlg->m_EnableSOCKSProxyCtrl->SetValue(pDoc->proxy_info.use_socks_proxy); - pDlg->m_SOCKSAddressCtrl->SetValue(pDoc->proxy_info.socks_server_name.c_str()); - pDlg->m_SOCKSUsernameCtrl->SetValue(pDoc->proxy_info.socks5_user_name.c_str()); - pDlg->m_SOCKSPasswordCtrl->SetValue(pDoc->proxy_info.socks5_user_passwd.c_str()); + pDlg->m_EnableSOCKSProxyCtrl->SetValue(pDoc->proxy_info.use_socks_proxy); + pDlg->m_SOCKSAddressCtrl->SetValue(pDoc->proxy_info.socks_server_name.c_str()); + pDlg->m_SOCKSUsernameCtrl->SetValue(pDoc->proxy_info.socks5_user_name.c_str()); + pDlg->m_SOCKSPasswordCtrl->SetValue(pDoc->proxy_info.socks5_user_passwd.c_str()); - strBuffer.Printf(wxT("%d"), pDoc->proxy_info.socks_server_port); - pDlg->m_SOCKSPortCtrl->SetValue(strBuffer); - } + strBuffer.Printf(wxT("%d"), pDoc->proxy_info.socks_server_port); + pDlg->m_SOCKSPortCtrl->SetValue(strBuffer); iAnswer = pDlg->ShowModal(); if (wxID_OK == iAnswer) { + // General Tab + if (m_iSelectedLanguage != pDlg->m_LanguageSelectionCtrl->GetSelection()) { + ShowAlert( + _("The BOINC Managers default language has been changed, in order for this change to take affect you must restart the manager."), + _("Language Selection..."), + wxICON_INFORMATION + ); + } + + m_iSelectedLanguage = pDlg->m_LanguageSelectionCtrl->GetSelection(); + + // Connections Tab + + // Proxy Tabs pDoc->proxy_info.use_http_proxy = pDlg->m_EnableHTTPProxyCtrl->GetValue(); pDoc->proxy_info.http_server_name = pDlg->m_HTTPAddressCtrl->GetValue().c_str(); pDoc->proxy_info.http_user_name = pDlg->m_HTTPUsernameCtrl->GetValue().c_str(); @@ -1076,16 +1097,6 @@ void CMainFrame::OnToolsOptions(wxCommandEvent& WXUNUSED(event)) { pDoc->proxy_info.socks_server_port = iBuffer; pDoc->SetProxyConfiguration(); - - if (m_iSelectedLanguage != pDlg->m_LanguageSelectionCtrl->GetSelection()) { - ShowAlert( - _("The BOINC Managers default language has been changed, in order for this change to take affect you must restart the manager."), - _("Language Selection..."), - wxICON_INFORMATION - ); - } - - m_iSelectedLanguage = pDlg->m_LanguageSelectionCtrl->GetSelection(); } if (pDlg) @@ -1680,32 +1691,7 @@ void CMainFrame::ShowAlert( const wxString title, const wxString message, const void CMainFrame::ExecuteBrowserLink(const wxString &strLink) { - wxString strMimeType = wxEmptyString; - - if (strLink.StartsWith(wxT("http://"))) - strMimeType = wxT("text/html"); - else if (strLink.StartsWith(wxT("ftp://"))) - strMimeType = wxT("text/html"); - else if (strLink.StartsWith(wxT("mailto:"))) - strMimeType = wxT("message/rfc822"); - else - return; - - wxFileType* ft = wxTheMimeTypesManager->GetFileTypeFromMimeType(strMimeType); - if (ft) { - wxString cmd; - if (ft->GetOpenCommand(&cmd, wxFileType::MessageParameters(strLink))) { -#ifdef __WXMAC__ - cmd.Replace(wxT("<"), wxEmptyString); - cmd.Prepend(wxT("open ")); -#else - cmd.Replace(wxT("file://"), wxEmptyString); -#endif - ::wxExecute(cmd); - } - - delete ft; - } + wxHyperLink::ExecuteLink(strLink); } diff --git a/clientgui/hyperlink.cpp b/clientgui/hyperlink.cpp new file mode 100644 index 0000000000..4d649ab6c9 --- /dev/null +++ b/clientgui/hyperlink.cpp @@ -0,0 +1,212 @@ +////////////////////////////////////////////////////////////////////////////// +// File: hyperlink.cpp +// Purpose: wxHyperLink control +// Maintainer: Wyo +// Created: 2003-04-07 +// RCS-ID: $Id$ +// Copyright: (c) 2004 wxCode +// Licence: wxWindows +////////////////////////////////////////////////////////////////////////////// + +//---------------------------------------------------------------------------- +// information +//---------------------------------------------------------------------------- + + +//---------------------------------------------------------------------------- +// headers +//---------------------------------------------------------------------------- + +// For compilers that support precompilation, includes . +#include + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +// for all others, include the necessary headers (this file is usually all you +// need because it includes almost all 'standard' wxWidgets headers) +#ifndef WX_PRECOMP + #include +#endif + +// wxWidgets headers +#include // mimetype support + +// hyperlink headers +#include "hyperlink.h" // wxHyperLink control + + +//---------------------------------------------------------------------------- +// resources +//---------------------------------------------------------------------------- + + +//============================================================================ +// declarations +//============================================================================ + + +//============================================================================ +// implementation +//============================================================================ + +//---------------------------------------------------------------------------- +// wxHyperLink +//---------------------------------------------------------------------------- + +IMPLEMENT_DYNAMIC_CLASS (wxHyperLink, wxStaticText) + +BEGIN_EVENT_TABLE (wxHyperLink, wxStaticText) + EVT_ENTER_WINDOW (wxHyperLink::OnWindowEnter) + EVT_LEAVE_WINDOW (wxHyperLink::OnWindowLeave) + EVT_LEFT_DCLICK (wxHyperLink::OnLinkActivate) + EVT_LEFT_DOWN (wxHyperLink::OnLinkActivate) +END_EVENT_TABLE() + +bool wxHyperLink::Create (wxWindow *parent, + wxWindowID id, + const wxString &label, + const wxPoint &pos, + const wxSize &size, + long style, + const wxString &name) { + bool okay = FALSE; + + // create static text + okay = wxStaticText::Create (parent, id, label, pos, size, style, name); + wxASSERT_MSG (okay, _("Failed to create wxStaticText, needed by wxHyperLink!")); + + // initialize variables + m_URL = wxEmptyString; + m_Marked = false; + m_Visited = false; + m_MarkedColour = wxColour (_T("DARK GREY")); + m_NormalColour = wxColour (_T("BLUE")); + m_VisitedColour = wxColour (_T("PURPLE")); + m_HoverCursor = wxCursor (wxCURSOR_HAND); + + // set foreground colour + SetForegroundColour (m_NormalColour); + wxFont font = GetFont(); + font.SetUnderlined (true); + SetFont (font); + + // get background colour + m_BackgroundColour = GetBackgroundColour (); + + return okay; +} // Create + +//---------------------------------------------------------------------------- +// event handlers + +void wxHyperLink::OnWindowEnter (wxMouseEvent &WXUNUSED(event)) { + SetCursor (m_HoverCursor); + Refresh(); +} + +void wxHyperLink::OnWindowLeave (wxMouseEvent &WXUNUSED(event)) { + SetCursor (wxNullCursor); + Refresh(); +} + +void wxHyperLink::OnLinkActivate (wxMouseEvent &WXUNUSED(event)) { + m_Visited = TRUE; + SetForegroundColour (m_VisitedColour); + SetBackgroundColour (m_BackgroundColour); + Refresh(); + if (m_URL.IsEmpty()) { + ExecuteLink (GetLabel()); + }else{ + ExecuteLink (m_URL); + } +} + +//---------------------------------------------------------------------------- +// settings functions + +wxCursor wxHyperLink::GetHoverCursor () { + return m_HoverCursor; +} + +void wxHyperLink::SetHoverCursor (wxCursor cursor) { + m_HoverCursor = cursor; +} + +wxColour wxHyperLink::GetMarkedColour () { + return m_MarkedColour; +} + +void wxHyperLink::SetMarkedColour (wxColour colour) { + m_MarkedColour = colour; +} + +wxColour wxHyperLink::GetNormalColour () { + return m_NormalColour; +} + +void wxHyperLink::SetNormalColour (wxColour colour) { + m_NormalColour = colour; + if (!m_Visited) { + SetForegroundColour (m_NormalColour); + }else{ + SetForegroundColour (m_VisitedColour); + } + Refresh(); +} + +wxColour wxHyperLink::GetVisitedColour () { + return m_VisitedColour; +} + +void wxHyperLink::SetVisitedColour (wxColour colour) { + m_VisitedColour = colour; + if (!m_Visited) { + SetForegroundColour (m_NormalColour); + }else{ + SetForegroundColour (m_VisitedColour); + } + Refresh(); +} + +wxString wxHyperLink::GetURL () { + return m_URL; +} + +void wxHyperLink::SetURL (const wxString &url) { + m_URL = url; +} + +//---------------------------------------------------------------------------- +// private functions + +void wxHyperLink::ExecuteLink (const wxString &strLink) { + wxString strMimeType = wxEmptyString; + + if (strLink.StartsWith(wxT("http://"))) + strMimeType = wxT("text/html"); + else if (strLink.StartsWith(wxT("ftp://"))) + strMimeType = wxT("text/html"); + else if (strLink.StartsWith(wxT("mailto:"))) + strMimeType = wxT("message/rfc822"); + else + return; + + wxFileType* ft = wxTheMimeTypesManager->GetFileTypeFromMimeType(strMimeType); + if (ft) { + wxString cmd; + if (ft->GetOpenCommand(&cmd, wxFileType::MessageParameters(strLink))) { +#ifdef __WXMAC__ + cmd.Replace(wxT("<"), wxEmptyString); + cmd.Prepend(wxT("open ")); +#else + cmd.Replace(wxT("file://"), wxEmptyString); +#endif + ::wxExecute(cmd); + } + + delete ft; + } +} + diff --git a/clientgui/hyperlink.h b/clientgui/hyperlink.h new file mode 100644 index 0000000000..5777667bb5 --- /dev/null +++ b/clientgui/hyperlink.h @@ -0,0 +1,106 @@ +////////////////////////////////////////////////////////////////////////////// +// File: hyperlink.h +// Purpose: wxHyperLink control +// Maintainer: Wyo +// Created: 2003-04-07 +// RCS-ID: $Id$ +// Copyright: (c) 2004 wxCode +// Licence: wxWindows +////////////////////////////////////////////////////////////////////////////// + +#ifndef _MY_HYPERLINK_H_ +#define _MY_HYPERLINK_H_ + +#ifdef __GNUG__ + #pragma implementation "hyperlink.h" +#endif + +//---------------------------------------------------------------------------- +// information +//---------------------------------------------------------------------------- + + +//---------------------------------------------------------------------------- +// headers +//---------------------------------------------------------------------------- +//! wxWidgets headers + + +//============================================================================ +// declarations +//============================================================================ + +//---------------------------------------------------------------------------- +//! + + +//---------------------------------------------------------------------------- +//! wxHyperLink +class wxHyperLink: public wxStaticText { + +DECLARE_DYNAMIC_CLASS (wxHyperLink) + +public: + + //! default constructor + wxHyperLink () {} + + //! create constructor + wxHyperLink (wxWindow *parent, + wxWindowID id, + const wxString &label = wxEmptyString, + const wxPoint &pos = wxDefaultPosition, + const wxSize &size = wxDefaultSize, + long style = 0, + const wxString &name = _T("HyperLink")) { + Create (parent, id, label, pos, size, style, name); + } + + // function create + bool Create (wxWindow *parent, + wxWindowID id, + const wxString &label = wxEmptyString, + const wxPoint &pos = wxDefaultPosition, + const wxSize &size = wxDefaultSize, + long style = 0, + const wxString &name = _T("HyperLink")); + + // event handlers + void OnWindowEnter (wxMouseEvent& event); + void OnWindowLeave (wxMouseEvent& event); + void OnLinkActivate (wxMouseEvent& event); + + // get/set settings + wxCursor GetHoverCursor (); + void SetHoverCursor (wxCursor cursor); + wxColour GetMarkedColour (); + void SetMarkedColour (wxColour colour); + wxColour GetNormalColour (); + void SetNormalColour (wxColour colour); + wxColour GetVisitedColour (); + void SetVisitedColour (wxColour colour); + wxString GetURL (); + void SetURL (const wxString &url); + + //! execute according to mimetype + static void ExecuteLink (const wxString &link); + +private: + + //! hypertext variables + wxString m_URL; + bool m_Marked; + bool m_Visited; + + //! style settings + wxCursor m_HoverCursor; + wxColour m_MarkedColour; + wxColour m_NormalColour; + wxColour m_VisitedColour; + wxColour m_BackgroundColour; + + DECLARE_EVENT_TABLE() +}; + +#endif // _MY_HYPERLINK_H_ + diff --git a/win_build/BOINCGUI.vcproj b/win_build/BOINCGUI.vcproj index 28a4e67936..37e8cd6e41 100644 --- a/win_build/BOINCGUI.vcproj +++ b/win_build/BOINCGUI.vcproj @@ -238,6 +238,9 @@ CompileAs="2"/> + + @@ -491,6 +494,9 @@ + +