diff --git a/checkin_notes b/checkin_notes index 474d4f7f7f..87f6ef649f 100755 --- a/checkin_notes +++ b/checkin_notes @@ -8640,3 +8640,11 @@ Bruce 28 June 2005 ops/ grant_credit.php +Rom 28 June 2005 + - Make the Dial-up functionality Windows only. + + clientgui/ + BOINCGUI.pjd + BOINCGUIApp.cpp, .h + DlgOptions.cpp, .h + MainFrame.cpp, .h diff --git a/clientgui/BOINCGUI.pjd b/clientgui/BOINCGUI.pjd index 5a2f5eb19e..de2d9bd571 100644 --- a/clientgui/BOINCGUI.pjd +++ b/clientgui/BOINCGUI.pjd @@ -12,7 +12,7 @@ - 120 + 134 TRUE FALSE @@ -114,7 +114,7 @@ 0 Configurations - 14843600 + 56113968 config-data-document @@ -179,7 +179,7 @@ 0 Windows - 14826192 + 56110192 html-document dialogsfolder @@ -190,21 +190,21 @@ 1 Options - 14823200 + 56108256 dialog-document dialog 0 1 0 - 14826192 + 56110192 0 8/3/2004 wbDialogProxy 10000 FALSE - m_bProxySectionConfigured|bool|BProxySectionConfigured| + m_bProxySectionConfigured|bool|ProxySectionConfigured| ID_DIALOG 10000 CDlgOptions @@ -257,14 +257,14 @@ wxBoxSizer V - 14316784 + 14791936 dialog-control-document sizer 0 1 0 - 14823200 + 56108256 0 wbBoxSizerProxy Vertical @@ -275,14 +275,14 @@ <Any platform> wxNotebook: ID_NOTEBOOK - 14301168 + 14780368 dialog-control-document notebook 0 1 0 - 14316784 + 14791936 0 wbNotebookProxy wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED|OnNotebookPageChanged @@ -319,8 +319,8 @@ -1 -1 - 350 - 265 + -1 + -1 Centre Centre 0 @@ -336,14 +336,14 @@ wxPanel: ID_GENERAL - 14340544 + 14302224 dialog-control-document panel 0 1 0 - 14301168 + 14780368 0 wbPanelProxy ID_GENERAL @@ -396,14 +396,14 @@ wxBoxSizer V - 14417440 + 14344416 dialog-control-document sizer 0 1 0 - 14340544 + 14302224 0 24/9/2004 wbBoxSizerProxy @@ -423,14 +423,14 @@ <Any platform> wxFlexGridSizer - 54541216 + 14334912 dialog-control-document sizer 0 1 0 - 14417440 + 14344416 0 22/5/2005 wbFlexGridSizerProxy @@ -455,14 +455,14 @@ FALSE wxStaticText: wxID_STATIC - 54553312 + 14327856 dialog-control-document statictext 0 1 0 - 54541216 + 14334912 0 22/5/2005 wbStaticTextProxy @@ -511,24 +511,24 @@ - wxComboBox: ID_COMBOBOX - 54612592 + wxComboBox: ID_LANGUAGESELECTION + 14357904 dialog-control-document combobox 0 1 0 - 54541216 + 14334912 0 22/5/2005 wbComboBoxProxy - ID_COMBOBOX + ID_LANGUAGESELECTION 10004 wxComboBox m_LanguageSelectionCtrl - (Automatic Detection) + What language should the manager display by default. @@ -559,19 +559,19 @@ FALSE FALSE FALSE - %PARENT%, %ID%, _("(Automatic Detection)"), %POSITION%, %SIZE%, wxGetApp().GetSupportedLanguagesCount(), wxGetApp().GetSupportedLanguages(), %STYLE% + wxStaticText: wxID_STATIC - 54623120 + 14360352 dialog-control-document statictext 0 1 0 - 54541216 + 14334912 0 22/5/2005 wbStaticTextProxy @@ -620,24 +620,24 @@ - wxSlider: ID_SLIDER - 54577696 + wxSlider: ID_REMINDERFREQUENCY + 14396496 dialog-control-document slider 0 1 0 - 54541216 + 14334912 0 22/5/2005 wbSliderProxy - ID_SLIDER + ID_REMINDERFREQUENCY 10018 wxSlider - + m_ReminderFrequencyCtrl 0 - 240 + 120 60 How often, in minutes, should the manager remind you of possible connection events. @@ -686,15 +686,663 @@ - wxPanel: ID_HTTPPROXY - 14420608 + wxPanel: ID_CONNECTONS + 14538576 dialog-control-document panel 0 1 0 - 14301168 + 14780368 + 0 + 27/5/2005 + wbPanelProxy + ID_CONNECTONS + 10019 + wxPanel + Connections + + wxPanel + + FALSE + + + + + + FALSE + __WXMSW__ + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + TRUE + FALSE + FALSE + + TRUE + -1 + -1 + -1 + -1 + Centre + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + + + + + wxBoxSizer V + 14517104 + dialog-control-document + + sizer + 0 + 1 + 0 + 14538576 + 0 + 27/5/2005 + wbBoxSizerProxy + Vertical + + Centre + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + <Any platform> + + wxRadioButton: ID_NETWORKAUTODETECT + 14396992 + dialog-control-document + + radiobutton + 0 + 1 + 0 + 14517104 + 0 + 27/5/2005 + wbRadioButtonProxy + wxEVT_COMMAND_RADIOBUTTON_SELECTED|OnNetworkautodetectSelected + ID_NETWORKAUTODETECT + 10020 + wxRadioButton + m_NetworkAutomaticDetectionCtrl + Automatically detect network connection settings + TRUE + + + + + + FALSE + <Any platform> + + + TRUE + FALSE + FALSE + + -1 + -1 + -1 + -1 + Left + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + + + + + wxRadioButton: ID_NETWORKLAN + 14566544 + dialog-control-document + + radiobutton + 0 + 1 + 0 + 14517104 + 0 + 27/5/2005 + wbRadioButtonProxy + wxEVT_COMMAND_RADIOBUTTON_SELECTED|OnNetworklanSelected + ID_NETWORKLAN + 10021 + wxRadioButton + m_NetworkUseLANCtrl + Use my Local Area Network(LAN) connection + FALSE + + + + + + FALSE + <Any platform> + + + FALSE + FALSE + FALSE + + -1 + -1 + -1 + -1 + Left + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + + + + + wxRadioButton: ID_NETWORKDIALUP + 14550896 + dialog-control-document + + radiobutton + 0 + 1 + 0 + 14517104 + 0 + 27/5/2005 + wbRadioButtonProxy + wxEVT_COMMAND_RADIOBUTTON_SELECTED|OnNetworkdialupSelected + ID_NETWORKDIALUP + 10022 + wxRadioButton + m_NetworkUseDialupCtrl + Use my Dial-up and Virtual Private Network connection + FALSE + + + + + + FALSE + <Any platform> + + + FALSE + FALSE + FALSE + + -1 + -1 + -1 + -1 + Left + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + + + + + wxStaticBoxSizer V + 14602016 + dialog-control-document + + sizer + 0 + 1 + 0 + 14517104 + 0 + 27/5/2005 + wbStaticBoxSizerProxy + wxID_ANY + -1 + Dial-up and Virtual Private Network settings + m_DialupStaticBoxCtrl + Vertical + + Expand + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + <Any platform> + + wxFlexGridSizer + 14595408 + dialog-control-document + + sizer + 0 + 1 + 0 + 14602016 + 0 + 27/5/2005 + wbFlexGridSizerProxy + 0 + + 2 + 1 + 0 + 0 + + <Any platform> + Expand + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + + wxListBox: ID_DIALUPCONNECTIONS + 14567632 + dialog-control-document + + listbox + 0 + 1 + 0 + 14595408 + 0 + 27/5/2005 + wbListBoxProxy + ID_DIALUPCONNECTIONS + 10023 + wxListBox + m_DialupConnectionsCtrl + + + + + + + + FALSE + <Any platform> + + + TRUE + FALSE + FALSE + FALSE + TRUE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + + -1 + -1 + -1 + -1 + Expand + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + + + + + wxBoxSizer V + 14622336 + dialog-control-document + + sizer + 0 + 1 + 0 + 14595408 + 0 + 27/5/2005 + wbBoxSizerProxy + Vertical + + Centre + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + <Any platform> + + wxButton: ID_DIALUPSETDEFAULT + 14615696 + dialog-control-document + + dialogcontrol + 0 + 1 + 0 + 14622336 + 0 + 27/5/2005 + wbButtonProxy + ID_DIALUPSETDEFAULT + 10024 + wxButton + m_DialupSetDefaultCtrl + Set Default + TRUE + + + + + + FALSE + <Any platform> + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + + -1 + -1 + -1 + -1 + Expand + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + + + + + wxButton: ID_DIALUPCLEARDEFAULT + 14665408 + dialog-control-document + + dialogcontrol + 0 + 1 + 0 + 14622336 + 0 + 27/5/2005 + wbButtonProxy + ID_DIALUPCLEARDEFAULT + 10025 + wxButton + m_DialupClearDefaultCtrl + Clear Default + FALSE + + + + + + FALSE + <Any platform> + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + + -1 + -1 + -1 + -1 + Expand + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + + + + + + + wxFlexGridSizer + 14668976 + dialog-control-document + + sizer + 0 + 1 + 0 + 14602016 + 0 + 27/5/2005 + wbFlexGridSizerProxy + 1 + + 2 + 1 + 0 + 0 + + <Any platform> + Expand + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + + wxStaticText: ID_DIALUPDEFAULTCONNECTIONTEXT + 14712608 + dialog-control-document + + statictext + 0 + 1 + 0 + 14668976 + 0 + 27/5/2005 + wbStaticTextProxy + ID_DIALUPDEFAULTCONNECTIONTEXT + 10027 + wxStaticText + m_DialupDefaultConnectionTextCtrl + Default Connection: + + + + + + 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 + + + + + wxStaticText: ID_DIALUPDEFAULTCONNECTION + 14691712 + dialog-control-document + + statictext + 0 + 1 + 0 + 14668976 + 0 + 27/5/2005 + wbStaticTextProxy + ID_DIALUPDEFAULTCONNECTION + 10026 + wxStaticText + m_DialupDefaultConnectionCtrl + + + + + + + FALSE + <Any platform> + + + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + + -1 + -1 + -1 + -1 + Expand + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + TRUE + FALSE + + + + + + + + + wxPanel: ID_HTTPPROXY + 14734832 + dialog-control-document + + panel + 0 + 1 + 0 + 14780368 0 wbPanelProxy ID_HTTPPROXY @@ -745,16 +1393,16 @@ - + wxBoxSizer V - 14475488 + 14717488 dialog-control-document sizer 0 1 0 - 14420608 + 14734832 0 wbBoxSizerProxy Vertical @@ -771,16 +1419,16 @@ FALSE FALSE <Any platform> - + wxCheckBox: ID_ENABLEHTTPPROXYCTRL - 14464736 + 14666400 dialog-control-document checkbox 0 1 0 - 14475488 + 14717488 0 wbCheckBoxProxy wxEVT_COMMAND_CHECKBOX_CLICKED|OnEnablehttpproxyctrlClick @@ -822,16 +1470,16 @@ FALSE FALSE - + wxStaticBoxSizer V - 14543856 + 14766912 dialog-control-document sizer 0 1 0 - 14475488 + 14717488 0 wbStaticBoxSizerProxy wxID_ANY @@ -852,16 +1500,16 @@ FALSE FALSE <Any platform> - + wxGridSizer - 14533200 + 14756304 dialog-control-document sizer 0 1 0 - 14543856 + 14766912 0 wbGridSizerProxy 1 @@ -881,16 +1529,16 @@ FALSE FALSE FALSE - + wxFlexGridSizer - 14522992 + 14746096 dialog-control-document sizer 0 1 0 - 14533200 + 14756304 0 wbFlexGridSizerProxy @@ -912,16 +1560,16 @@ FALSE FALSE FALSE - + wxStaticText: wxID_STATIC - 14581136 + 14839584 dialog-control-document statictext 0 1 0 - 14522992 + 14746096 0 wbStaticTextProxy wxID_STATIC @@ -967,19 +1615,17 @@ FALSE - FALSE - FALSE - + wxTextCtrl: ID_HTTPADDRESSCTRL - 14554032 + 14816816 dialog-control-document textctrl 0 1 0 - 14522992 + 14746096 0 wbTextCtrlProxy ID_HTTPADDRESSCTRL @@ -1037,16 +1683,16 @@ - + wxStaticText: wxID_STATIC - 14632464 + 50408800 dialog-control-document statictext 0 1 0 - 14522992 + 14746096 0 wbStaticTextProxy wxID_STATIC @@ -1092,19 +1738,17 @@ FALSE - FALSE - FALSE - + wxTextCtrl: ID_HTTPPORTCTRL - 14561696 + 50449824 dialog-control-document textctrl 0 1 0 - 14522992 + 14746096 0 wbTextCtrlProxy ID_HTTPPORTCTRL @@ -1164,16 +1808,16 @@ - + wxStaticBoxSizer V - 14664752 + 50454304 dialog-control-document sizer 0 1 0 - 14543856 + 14766912 0 wbStaticBoxSizerProxy wxID_ANY @@ -1194,16 +1838,16 @@ FALSE FALSE <Any platform> - + wxFlexGridSizer - 14649872 + 14817168 dialog-control-document sizer 0 1 0 - 14664752 + 50454304 0 wbFlexGridSizerProxy @@ -1225,16 +1869,16 @@ FALSE FALSE FALSE - + wxStaticText: wxID_STATIC - 14743664 + 56136000 dialog-control-document statictext 0 1 0 - 14649872 + 14817168 0 wbStaticTextProxy wxID_STATIC @@ -1283,16 +1927,16 @@ FALSE FALSE - + wxTextCtrl: ID_HTTPUSERNAMECTRL - 14726032 + 56158000 dialog-control-document textctrl 0 1 0 - 14649872 + 14817168 0 wbTextCtrlProxy ID_HTTPUSERNAMECTRL @@ -1350,16 +1994,16 @@ - + wxStaticText: wxID_STATIC - 14763152 + 14441680 dialog-control-document statictext 0 1 0 - 14649872 + 14817168 0 wbStaticTextProxy wxID_STATIC @@ -1408,16 +2052,16 @@ FALSE FALSE - + wxTextCtrl: ID_HTTPPASSWORDCTRL - 14762928 + 56176320 dialog-control-document textctrl 0 1 0 - 14649872 + 14817168 0 wbTextCtrlProxy ID_HTTPPASSWORDCTRL @@ -1480,16 +2124,16 @@ - + wxPanel: ID_SOCKSPROXY - 14851872 + 56168704 dialog-control-document panel 0 1 0 - 14301168 + 14780368 0 wbPanelProxy ID_SOCKSPROXY @@ -1542,16 +2186,16 @@ FALSE FALSE - + wxBoxSizer V - 14744976 + 14455040 dialog-control-document sizer 0 1 0 - 14851872 + 56168704 0 wbBoxSizerProxy Vertical @@ -1568,16 +2212,16 @@ FALSE FALSE <Any platform> - + wxCheckBox: ID_ENABLESOCKSPROXYCTRL - 50216448 + 14468960 dialog-control-document checkbox 0 1 0 - 14744976 + 14455040 0 wbCheckBoxProxy wxEVT_COMMAND_CHECKBOX_CLICKED|OnEnablesocksproxyctrlClick @@ -1619,16 +2263,16 @@ FALSE FALSE - + wxStaticBoxSizer V - 50218096 + 14470384 dialog-control-document sizer 0 1 0 - 14744976 + 14455040 0 wbStaticBoxSizerProxy wxID_ANY @@ -1649,16 +2293,16 @@ FALSE FALSE <Any platform> - + wxGridSizer - 14358992 + 14488176 dialog-control-document sizer 0 1 0 - 50218096 + 14470384 0 wbGridSizerProxy 1 @@ -1678,16 +2322,16 @@ FALSE FALSE FALSE - + wxFlexGridSizer - 14365168 + 14502544 dialog-control-document sizer 0 1 0 - 14358992 + 14488176 0 wbFlexGridSizerProxy @@ -1709,16 +2353,16 @@ FALSE FALSE FALSE - + wxStaticText: wxID_STATIC - 14377008 + 14514384 dialog-control-document statictext 0 1 0 - 14365168 + 14502544 0 wbStaticTextProxy wxID_STATIC @@ -1767,16 +2411,16 @@ FALSE FALSE - + wxTextCtrl: ID_SOCKSADDRESSCTRL - 55658736 + 56221472 dialog-control-document textctrl 0 1 0 - 14365168 + 14502544 0 wbTextCtrlProxy ID_SOCKSADDRESSCTRL @@ -1836,16 +2480,16 @@ FALSE FALSE - + wxStaticText: wxID_STATIC - 14493648 + 14853200 dialog-control-document statictext 0 1 0 - 14365168 + 14502544 0 wbStaticTextProxy wxID_STATIC @@ -1894,16 +2538,16 @@ FALSE FALSE - + wxTextCtrl: ID_SOCKSPORTCTRL - 14515552 + 14873520 dialog-control-document textctrl 0 1 0 - 14365168 + 14502544 0 wbTextCtrlProxy ID_SOCKSPORTCTRL @@ -1965,16 +2609,16 @@ - + wxStaticBoxSizer V - 14594512 + 56247904 dialog-control-document sizer 0 1 0 - 50218096 + 14470384 0 wbStaticBoxSizerProxy wxID_ANY @@ -1995,16 +2639,16 @@ FALSE FALSE <Any platform> - + wxFlexGridSizer - 14608384 + 56261792 dialog-control-document sizer 0 1 0 - 14594512 + 56247904 0 wbFlexGridSizerProxy @@ -2026,16 +2670,16 @@ FALSE FALSE FALSE - + wxStaticText: wxID_STATIC - 14493904 + 56266096 dialog-control-document statictext 0 1 0 - 14608384 + 56261792 0 wbStaticTextProxy wxID_STATIC @@ -2084,16 +2728,16 @@ FALSE FALSE - + wxTextCtrl: ID_SOCKSUSERNAMECTRL - 14704224 + 56284112 dialog-control-document textctrl 0 1 0 - 14608384 + 56261792 0 wbTextCtrlProxy ID_SOCKSUSERNAMECTRL @@ -2153,16 +2797,16 @@ FALSE FALSE - + wxStaticText: wxID_STATIC - 14793968 + 56308944 dialog-control-document statictext 0 1 0 - 14608384 + 56261792 0 wbStaticTextProxy wxID_STATIC @@ -2211,16 +2855,16 @@ FALSE FALSE - + wxTextCtrl: ID_SOCKSPASSWORDCTRL - 14807680 + 56309952 dialog-control-document textctrl 0 1 0 - 14608384 + 56261792 0 wbTextCtrlProxy ID_SOCKSPASSWORDCTRL @@ -2286,16 +2930,16 @@ - + wxBoxSizer H - 55690544 + 56344800 dialog-control-document sizer 0 1 0 - 14316784 + 14791936 0 wbBoxSizerProxy Horizontal @@ -2312,16 +2956,16 @@ FALSE FALSE <Any platform> - + wxButton: wxID_OK - 55704352 + 56358656 dialog-control-document dialogcontrol 0 1 0 - 55690544 + 56344800 0 wbButtonProxy wxID_OK @@ -2365,16 +3009,16 @@ FALSE FALSE - + wxButton: wxID_CANCEL - 14853520 + 14782880 dialog-control-document dialogcontrol 0 1 0 - 55690544 + 56344800 0 wbButtonProxy wxID_CANCEL @@ -2421,16 +3065,16 @@ - + About BOINC - 55720240 + 56374320 dialog-document dialog 0 1 0 - 14826192 + 56110192 0 9/3/2004 wbDialogProxy @@ -2488,16 +3132,16 @@ 400 300 - + wxBoxSizer V - 14317248 + 14793072 dialog-control-document sizer 0 1 0 - 55720240 + 56374320 0 wbBoxSizerProxy Vertical @@ -2514,16 +3158,16 @@ FALSE FALSE <Any platform> - + wxStaticText: wxID_STATIC - 55742240 + 56398832 dialog-control-document statictext 0 1 0 - 14317248 + 14793072 0 wbStaticTextProxy wxID_STATIC @@ -2570,16 +3214,16 @@ - + wxBoxSizer H - 55754928 + 56400944 dialog-control-document sizer 0 1 0 - 14317248 + 14793072 0 wbBoxSizerProxy Horizontal @@ -2596,16 +3240,16 @@ FALSE FALSE <Any platform> - + wxBoxSizer V - 55770368 + 56422688 dialog-control-document sizer 0 1 0 - 55754928 + 56400944 0 wbBoxSizerProxy Vertical @@ -2622,16 +3266,16 @@ FALSE FALSE <Any platform> - + wxStaticBitmap: wxID_STATIC - 55771536 + 56436896 dialog-control-document staticbitmap 0 1 0 - 55770368 + 56422688 0 wbStaticBitmapProxy wxID_STATIC @@ -2673,16 +3317,16 @@ - + wxFlexGridSizer - 55772976 + 56431744 dialog-control-document sizer 0 1 0 - 55754928 + 56400944 0 wbFlexGridSizerProxy @@ -2704,16 +3348,16 @@ FALSE FALSE FALSE - + wxStaticText: wxID_STATIC - 55802304 + 56461024 dialog-control-document statictext 0 1 0 - 55772976 + 56431744 0 wbStaticTextProxy wxID_STATIC @@ -2760,16 +3404,16 @@ - + wxStaticText: wxID_STATIC - 55823168 + 56482144 dialog-control-document statictext 0 1 0 - 55772976 + 56431744 0 wbStaticTextProxy wxID_STATIC @@ -2816,16 +3460,16 @@ - + wxStaticText: wxID_STATIC - 55816896 + 56501840 dialog-control-document statictext 0 1 0 - 55772976 + 56431744 0 wbStaticTextProxy wxID_STATIC @@ -2874,16 +3518,16 @@ FALSE FALSE - + wxStaticText: wxID_STATIC - 55860000 + 56524432 dialog-control-document statictext 0 1 0 - 55772976 + 56431744 0 wbStaticTextProxy wxID_STATIC @@ -2930,16 +3574,16 @@ - + wxStaticText: wxID_STATIC - 55880720 + 56539792 dialog-control-document statictext 0 1 0 - 55772976 + 56431744 0 wbStaticTextProxy wxID_STATIC @@ -2988,16 +3632,16 @@ FALSE FALSE - + wxStaticText: wxID_STATIC - 55874352 + 56534336 dialog-control-document statictext 0 1 0 - 55772976 + 56431744 0 wbStaticTextProxy wxID_STATIC @@ -3047,16 +3691,16 @@ All Rights Reserved. - + wxStaticText: wxID_STATIC - 55911504 + 56577008 dialog-control-document statictext 0 1 0 - 14317248 + 14793072 0 wbStaticTextProxy wxID_STATIC @@ -3105,16 +3749,16 @@ All Rights Reserved. FALSE FALSE - + wxStaticText: wxID_STATIC - 55912848 + 56577824 dialog-control-document statictext 0 1 0 - 14317248 + 14793072 0 wbStaticTextProxy wxID_STATIC @@ -3163,16 +3807,16 @@ All Rights Reserved. FALSE FALSE - + wxStaticText: wxID_STATIC - 55949872 + 56609616 dialog-control-document statictext 0 1 0 - 14317248 + 14793072 0 wbStaticTextProxy wxID_STATIC @@ -3221,16 +3865,16 @@ All Rights Reserved. FALSE FALSE - + wxStaticLine: wxID_STATIC - 55944832 + 56605456 dialog-control-document staticline 0 1 0 - 14317248 + 14793072 0 wbStaticLineProxy wxID_STATIC @@ -3270,16 +3914,16 @@ All Rights Reserved. FALSE FALSE - + wxButton: wxID_OK - 55983808 + 56635456 dialog-control-document dialogcontrol 0 1 0 - 14317248 + 14793072 0 wbButtonProxy wxID_OK @@ -3325,16 +3969,16 @@ All Rights Reserved. - + Attach to Project - 55979072 + 56345424 dialog-document dialog 0 1 0 - 14826192 + 56110192 0 9/3/2004 wbDialogProxy @@ -3393,34 +4037,42 @@ All Rights Reserved. 400 300 - + wxBoxSizer V - 56114560 + 56671408 dialog-control-document sizer 0 1 0 - 55979072 + 56345424 0 wbBoxSizerProxy Vertical + Centre + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE FALSE FALSE FALSE <Any platform> - + wxFlexGridSizer - 56121488 + 56678352 dialog-control-document sizer 0 1 0 - 56114560 + 56671408 0 29/2/2005 wbFlexGridSizerProxy @@ -3443,16 +4095,16 @@ All Rights Reserved. FALSE FALSE FALSE - + wxBoxSizer V - 56135456 + 56692512 dialog-control-document sizer 0 1 0 - 56121488 + 56678352 0 29/2/2005 wbBoxSizerProxy @@ -3470,16 +4122,16 @@ All Rights Reserved. FALSE FALSE <Any platform> - + wxFlexGridSizer - 56142192 + 56699280 dialog-control-document sizer 0 1 0 - 56135456 + 56692512 0 29/2/2005 wbFlexGridSizerProxy @@ -3502,16 +4154,16 @@ All Rights Reserved. FALSE FALSE FALSE - + wxStaticText: wxID_STATIC - 56154064 + 56711152 dialog-control-document statictext 0 1 0 - 56142192 + 56699280 0 29/2/2005 wbStaticTextProxy @@ -3561,16 +4213,16 @@ All Rights Reserved. FALSE FALSE - + wxTextCtrl: ID_PROJECTADDRESS - 56178704 + 56735792 dialog-control-document textctrl 0 1 0 - 56142192 + 56699280 0 29/2/2005 wbTextCtrlProxy @@ -3629,16 +4281,16 @@ All Rights Reserved. - + wxStaticText: wxID_STATIC - 56174752 + 56730768 dialog-control-document statictext 0 1 0 - 56142192 + 56699280 0 29/2/2005 wbStaticTextProxy @@ -3688,16 +4340,16 @@ All Rights Reserved. FALSE FALSE - + wxTextCtrl: ID_PROJECTACCOUNTKEY - 56220944 + 56777008 dialog-control-document textctrl 0 1 0 - 56142192 + 56699280 0 29/2/2005 wbTextCtrlProxy @@ -3757,16 +4409,16 @@ All Rights Reserved. - + wxStaticText: wxID_STATIC - 56239264 + 56795424 dialog-control-document statictext 0 1 0 - 56135456 + 56692512 0 29/2/2005 wbStaticTextProxy @@ -3817,16 +4469,16 @@ Visit http://boinc.berkeley.edu for a list of projects. - + wxBoxSizer V - 56241456 + 56797584 dialog-control-document sizer 0 1 0 - 56121488 + 56678352 0 29/2/2005 wbBoxSizerProxy @@ -3844,16 +4496,16 @@ Visit http://boinc.berkeley.edu for a list of projects. FALSE FALSE <Any platform> - + wxButton: wxID_OK - 56215520 + 56699600 dialog-control-document dialogcontrol 0 1 0 - 56241456 + 56797584 0 29/2/2005 wbButtonProxy @@ -3898,16 +4550,16 @@ Visit http://boinc.berkeley.edu for a list of projects. FALSE FALSE - + wxButton: wxID_CANCEL - 56282624 + 56839776 dialog-control-document dialogcontrol 0 1 0 - 56241456 + 56797584 0 29/2/2005 wbButtonProxy @@ -3956,16 +4608,16 @@ Visit http://boinc.berkeley.edu for a list of projects. - + Account Manager Signup - 56017584 + 56772944 dialog-document dialog 0 1 0 - 14826192 + 56110192 0 10/2/2005 wbDialogProxy @@ -4025,16 +4677,16 @@ Visit http://boinc.berkeley.edu for a list of projects. 400 300 - + wxBoxSizer V - 56305776 + 56862048 dialog-control-document sizer 0 1 0 - 56017584 + 56772944 0 10/2/2005 wbBoxSizerProxy @@ -4052,16 +4704,16 @@ Visit http://boinc.berkeley.edu for a list of projects. FALSE FALSE <Any platform> - + wxBoxSizer H - 56313040 + 56869200 dialog-control-document sizer 0 1 0 - 56305776 + 56862048 0 10/2/2005 wbBoxSizerProxy @@ -4079,16 +4731,16 @@ Visit http://boinc.berkeley.edu for a list of projects. FALSE FALSE <Any platform> - + wxFlexGridSizer - 56327968 + 56884320 dialog-control-document sizer 0 1 0 - 56313040 + 56869200 0 10/2/2005 wbFlexGridSizerProxy @@ -4111,16 +4763,16 @@ Visit http://boinc.berkeley.edu for a list of projects. FALSE FALSE FALSE - + wxStaticText: wxID_STATIC - 56333488 + 56890448 dialog-control-document statictext 0 1 0 - 56327968 + 56884320 0 16/5/2005 wbStaticTextProxy @@ -4168,16 +4820,16 @@ Visit http://boinc.berkeley.edu for a list of projects. - + wxTextCtrl: ID_ACCTMANAGERURL - 56354304 + 56911280 dialog-control-document textctrl 0 1 0 - 56327968 + 56884320 0 16/5/2005 wbTextCtrlProxy @@ -4236,16 +4888,16 @@ Visit http://boinc.berkeley.edu for a list of projects. - + wxStaticText: wxID_STATIC - 56377824 + 56934736 dialog-control-document statictext 0 1 0 - 56327968 + 56884320 0 10/2/2005 wbStaticTextProxy @@ -4293,16 +4945,16 @@ Visit http://boinc.berkeley.edu for a list of projects. - + wxTextCtrl: ID_ACCTMANAGERUSERNAME - 56397888 + 56962688 dialog-control-document textctrl 0 1 0 - 56327968 + 56884320 0 10/2/2005 wbTextCtrlProxy @@ -4361,16 +5013,16 @@ Visit http://boinc.berkeley.edu for a list of projects. - + wxStaticText: wxID_STATIC - 56400176 + 56956912 dialog-control-document statictext 0 1 0 - 56327968 + 56884320 0 10/2/2005 wbStaticTextProxy @@ -4418,16 +5070,16 @@ Visit http://boinc.berkeley.edu for a list of projects. - + wxTextCtrl: ID_ACCTMANAGERPASSWORD - 56439664 + 56996880 dialog-control-document textctrl 0 1 0 - 56327968 + 56884320 0 10/2/2005 wbTextCtrlProxy @@ -4487,16 +5139,16 @@ Visit http://boinc.berkeley.edu for a list of projects. - + wxBoxSizer V - 56466160 + 57023216 dialog-control-document sizer 0 1 0 - 56313040 + 56869200 0 10/2/2005 wbBoxSizerProxy @@ -4514,16 +5166,16 @@ Visit http://boinc.berkeley.edu for a list of projects. FALSE FALSE <Any platform> - + wxButton: wxID_OK - 56471808 + 57028864 dialog-control-document dialogcontrol 0 1 0 - 56466160 + 57023216 0 10/2/2005 wbButtonProxy @@ -4566,16 +5218,16 @@ Visit http://boinc.berkeley.edu for a list of projects. - + wxButton: wxID_CANCEL - 56488768 + 57045824 dialog-control-document dialogcontrol 0 1 0 - 56466160 + 57023216 0 10/2/2005 wbButtonProxy @@ -4622,16 +5274,16 @@ Visit http://boinc.berkeley.edu for a list of projects. - + Account Manager Status - 56501040 + 57058480 dialog-document dialog 0 1 0 - 14826192 + 56110192 0 16/5/2005 wbDialogProxy @@ -4689,16 +5341,16 @@ Visit http://boinc.berkeley.edu for a list of projects. 400 300 - + wxBoxSizer V - 55992416 + 56773584 dialog-control-document sizer 0 1 0 - 56501040 + 57058480 0 16/5/2005 wbBoxSizerProxy @@ -4716,16 +5368,16 @@ Visit http://boinc.berkeley.edu for a list of projects. FALSE FALSE <Any platform> - + wxBoxSizer H - 56466768 + 57023824 dialog-control-document sizer 0 1 0 - 55992416 + 56773584 0 16/5/2005 wbBoxSizerProxy @@ -4743,16 +5395,16 @@ Visit http://boinc.berkeley.edu for a list of projects. FALSE FALSE <Any platform> - + wxFlexGridSizer - 56531472 + 57088496 dialog-control-document sizer 0 1 0 - 56466768 + 57023824 0 16/5/2005 wbFlexGridSizerProxy @@ -4775,16 +5427,16 @@ Visit http://boinc.berkeley.edu for a list of projects. FALSE FALSE FALSE - + wxStaticText: wxID_STATIC - 56544928 + 57101920 dialog-control-document statictext 0 1 0 - 56531472 + 57088496 0 16/5/2005 wbStaticTextProxy @@ -4832,16 +5484,16 @@ Visit http://boinc.berkeley.edu for a list of projects. - + wxStaticText: wxID_STATIC - 56562624 + 57119680 dialog-control-document statictext 0 1 0 - 56531472 + 57088496 0 16/5/2005 wbStaticTextProxy @@ -4890,16 +5542,16 @@ Visit http://boinc.berkeley.edu for a list of projects. - + wxBoxSizer V - 56564880 + 57121936 dialog-control-document sizer 0 1 0 - 56466768 + 57023824 0 16/5/2005 wbBoxSizerProxy @@ -4917,16 +5569,16 @@ Visit http://boinc.berkeley.edu for a list of projects. FALSE FALSE <Any platform> - + wxButton: ID_UPDATE - 56544480 + 57101696 dialog-control-document dialogcontrol 0 1 0 - 56564880 + 57121936 0 16/5/2005 wbButtonProxy @@ -4970,16 +5622,16 @@ Visit http://boinc.berkeley.edu for a list of projects. - + wxButton: ID_CHANGE - 56604736 + 57162080 dialog-control-document dialogcontrol 0 1 0 - 56564880 + 57121936 0 16/5/2005 wbButtonProxy @@ -5023,16 +5675,16 @@ Visit http://boinc.berkeley.edu for a list of projects. - + wxButton: wxID_CANCEL - 56598592 + 57155632 dialog-control-document dialogcontrol 0 1 0 - 56564880 + 57121936 0 16/5/2005 wbButtonProxy @@ -5079,16 +5731,16 @@ Visit http://boinc.berkeley.edu for a list of projects. - + Select Computer - 56637168 + 57193520 dialog-document dialog 0 1 0 - 14826192 + 56110192 0 29/2/2005 wbDialogProxy @@ -5147,16 +5799,16 @@ Visit http://boinc.berkeley.edu for a list of projects. 400 300 - + wxBoxSizer V - 56565264 + 57122320 dialog-control-document sizer 0 1 0 - 56637168 + 57193520 0 29/2/2005 wbBoxSizerProxy @@ -5174,16 +5826,16 @@ Visit http://boinc.berkeley.edu for a list of projects. FALSE FALSE <Any platform> - + wxFlexGridSizer - 56663712 + 57219568 dialog-control-document sizer 0 1 0 - 56565264 + 57122320 0 29/2/2005 wbFlexGridSizerProxy @@ -5206,16 +5858,16 @@ Visit http://boinc.berkeley.edu for a list of projects. FALSE FALSE FALSE - + wxBoxSizer V - 56669664 + 57225536 dialog-control-document sizer 0 1 0 - 56663712 + 57219568 0 29/2/2005 wbBoxSizerProxy @@ -5233,16 +5885,16 @@ Visit http://boinc.berkeley.edu for a list of projects. FALSE FALSE <Any platform> - + wxFlexGridSizer - 56676544 + 57240672 dialog-control-document sizer 0 1 0 - 56669664 + 57225536 0 29/2/2005 wbFlexGridSizerProxy @@ -5265,16 +5917,16 @@ Visit http://boinc.berkeley.edu for a list of projects. FALSE FALSE FALSE - + wxStaticText: wxID_STATIC - 56692512 + 57248608 dialog-control-document statictext 0 1 0 - 56676544 + 57240672 0 29/2/2005 wbStaticTextProxy @@ -5322,16 +5974,16 @@ Visit http://boinc.berkeley.edu for a list of projects. - + wxComboBox: ID_SELECTCOMPUTERNAME - 56711744 + 57268816 dialog-control-document combobox 0 1 0 - 56676544 + 57240672 0 29/2/2005 wbComboBoxProxy @@ -5374,16 +6026,16 @@ Visit http://boinc.berkeley.edu for a list of projects. - + wxStaticText: wxID_STATIC - 56726688 + 57290080 dialog-control-document statictext 0 1 0 - 56676544 + 57240672 0 29/2/2005 wbStaticTextProxy @@ -5431,16 +6083,16 @@ Visit http://boinc.berkeley.edu for a list of projects. - + wxTextCtrl: ID_SELECTCOMPUTERPASSWORD - 56747552 + 57310880 dialog-control-document textctrl 0 1 0 - 56676544 + 57240672 0 29/2/2005 wbTextCtrlProxy @@ -5501,16 +6153,16 @@ Visit http://boinc.berkeley.edu for a list of projects. - + wxBoxSizer V - 56767888 + 57331488 dialog-control-document sizer 0 1 0 - 56663712 + 57219568 0 29/2/2005 wbBoxSizerProxy @@ -5528,16 +6180,16 @@ Visit http://boinc.berkeley.edu for a list of projects. FALSE FALSE <Any platform> - + wxButton: wxID_OK - 56781600 + 57337168 dialog-control-document dialogcontrol 0 1 0 - 56767888 + 57331488 0 29/2/2005 wbButtonProxy @@ -5582,16 +6234,16 @@ Visit http://boinc.berkeley.edu for a list of projects. FALSE FALSE - + wxButton: wxID_CANCEL - 56775296 + 57337920 dialog-control-document dialogcontrol 0 1 0 - 56767888 + 57331488 0 29/2/2005 wbButtonProxy @@ -5641,9 +6293,9 @@ Visit http://boinc.berkeley.edu for a list of projects. - + Images - 56799456 + 57356320 html-document bitmapsfolder @@ -5652,24 +6304,24 @@ Visit http://boinc.berkeley.edu for a list of projects. 0 14287632 1 - + boincsm.xpm - 56806528 + 57363408 image-document res/boincsm.xpm image 0 0 0 - 56799456 + 57356320 0 1/3/2005 100 - + Sources - 56800288 + 57364240 html-document sourcesfolder @@ -5679,30 +6331,30 @@ Visit http://boinc.berkeley.edu for a list of projects. 14287632 1 10/2/2005 - + ValidateAccountKey.cpp - 56806000 + 57362896 source-editor-document ValidateAccountKey.cpp source-editor 0 0 1 - 56800288 + 57364240 0 29/2/2005 - + ValidateURL.cpp - 56805824 + 57362656 source-editor-document ValidateURL.cpp source-editor 0 0 1 - 56800288 + 57364240 0 29/2/2005 diff --git a/clientgui/BOINCGUIApp.cpp b/clientgui/BOINCGUIApp.cpp index 8c0efed218..5ddb235843 100644 --- a/clientgui/BOINCGUIApp.cpp +++ b/clientgui/BOINCGUIApp.cpp @@ -317,15 +317,18 @@ void CBOINCGUIApp::InitSupportedLanguages() { wxInt32 iIndex = 0; const wxLanguageInfo* liLanguage = NULL; + // Prepare the array + m_astrLanguages.Insert(wxEmptyString, 0, wxLANGUAGE_USER_DEFINED+1); + // These are just special tags so deal with them in a special way - m_strLanguages[wxLANGUAGE_DEFAULT] = _("(Automatic Detection)"); - m_strLanguages[wxLANGUAGE_UNKNOWN] = _("(Unknown)"); - m_strLanguages[wxLANGUAGE_USER_DEFINED] = _("(User Defined)"); + m_astrLanguages[wxLANGUAGE_DEFAULT] = _("(Automatic Detection)"); + m_astrLanguages[wxLANGUAGE_UNKNOWN] = _("(Unknown)"); + m_astrLanguages[wxLANGUAGE_USER_DEFINED] = _("(User Defined)"); for (iIndex = 0; iIndex <= wxLANGUAGE_USER_DEFINED; iIndex++) { liLanguage = wxLocale::GetLanguageInfo(iIndex); if (liLanguage) { - m_strLanguages[iIndex] = liLanguage->Description; + m_astrLanguages[iIndex] = liLanguage->Description; } } } diff --git a/clientgui/BOINCGUIApp.h b/clientgui/BOINCGUIApp.h index 094e4b498c..1e39846d57 100644 --- a/clientgui/BOINCGUIApp.h +++ b/clientgui/BOINCGUIApp.h @@ -86,7 +86,7 @@ protected: // The last value defined in the wxLanguage enum is wxLANGUAGE_USER_DEFINED. // defined in: wx/intl.h - wxString m_strLanguages[wxLANGUAGE_USER_DEFINED + 1]; + wxArrayString m_astrLanguages; public: @@ -107,8 +107,7 @@ public: #endif #endif - wxString* GetSupportedLanguages() { return (wxString*)&m_strLanguages; } - int GetSupportedLanguagesCount() { return WXSIZEOF(m_strLanguages); } + wxArrayString& GetSupportedLanguages() { return m_astrLanguages; } }; diff --git a/clientgui/DlgOptions.cpp b/clientgui/DlgOptions.cpp index 2cb3dd9699..abac758ca8 100644 --- a/clientgui/DlgOptions.cpp +++ b/clientgui/DlgOptions.cpp @@ -47,6 +47,18 @@ BEGIN_EVENT_TABLE(CDlgOptions, wxDialog) EVT_NOTEBOOK_PAGE_CHANGED( ID_NOTEBOOK, CDlgOptions::OnNotebookPageChanged ) EVT_UPDATE_UI( ID_NOTEBOOK, CDlgOptions::OnNotebookUpdate ) +#if defined(__WXMSW__) + EVT_RADIOBUTTON( ID_NETWORKAUTODETECT, CDlgOptions::OnNetworkautodetectSelected ) +#endif + +#if defined(__WXMSW__) + EVT_RADIOBUTTON( ID_NETWORKLAN, CDlgOptions::OnNetworklanSelected ) +#endif + +#if defined(__WXMSW__) + EVT_RADIOBUTTON( ID_NETWORKDIALUP, CDlgOptions::OnNetworkdialupSelected ) +#endif + EVT_CHECKBOX( ID_ENABLEHTTPPROXYCTRL, CDlgOptions::OnEnablehttpproxyctrlClick ) EVT_UPDATE_UI( ID_ENABLEHTTPPROXYCTRL, CDlgOptions::OnEnablehttpproxyctrlUpdate ) @@ -78,6 +90,34 @@ bool CDlgOptions::Create(wxWindow* parent, wxWindowID id, const wxString& captio { ////@begin CDlgOptions member initialisation m_LanguageSelectionCtrl = NULL; + m_ReminderFrequencyCtrl = NULL; +#if defined(__WXMSW__) + m_NetworkAutomaticDetectionCtrl = NULL; +#endif +#if defined(__WXMSW__) + m_NetworkUseLANCtrl = NULL; +#endif +#if defined(__WXMSW__) + m_NetworkUseDialupCtrl = NULL; +#endif +#if defined(__WXMSW__) + m_DialupStaticBoxCtrl = NULL; +#endif +#if defined(__WXMSW__) + m_DialupConnectionsCtrl = NULL; +#endif +#if defined(__WXMSW__) + m_DialupSetDefaultCtrl = NULL; +#endif +#if defined(__WXMSW__) + m_DialupClearDefaultCtrl = NULL; +#endif +#if defined(__WXMSW__) + m_DialupDefaultConnectionTextCtrl = NULL; +#endif +#if defined(__WXMSW__) + m_DialupDefaultConnectionCtrl = NULL; +#endif m_EnableHTTPProxyCtrl = NULL; m_HTTPAddressCtrl = NULL; m_HTTPPortCtrl = NULL; @@ -116,7 +156,7 @@ void CDlgOptions::CreateControls() itemDialog1->SetSizer(itemBoxSizer2); wxNotebook* itemNotebook3 = new wxNotebook; - itemNotebook3->Create( itemDialog1, ID_NOTEBOOK, wxDefaultPosition, wxSize(350, 265), wxNB_TOP ); + itemNotebook3->Create( itemDialog1, ID_NOTEBOOK, wxDefaultPosition, wxDefaultSize, wxNB_TOP ); #if !wxCHECK_VERSION(2,5,2) wxNotebookSizer* itemNotebook3Sizer = new wxNotebookSizer(itemNotebook3); #endif @@ -134,8 +174,7 @@ void CDlgOptions::CreateControls() wxString* m_LanguageSelectionCtrlStrings = NULL; m_LanguageSelectionCtrl = new wxComboBox; - m_LanguageSelectionCtrl->Create( itemPanel4, ID_COMBOBOX, _("(Automatic Detection)"), wxDefaultPosition, wxDefaultSize, wxGetApp().GetSupportedLanguagesCount(), wxGetApp().GetSupportedLanguages(), wxCB_READONLY ); - m_LanguageSelectionCtrl->SetStringSelection(_("(Automatic Detection)")); + m_LanguageSelectionCtrl->Create( itemPanel4, ID_LANGUAGESELECTION, _T(""), wxDefaultPosition, wxDefaultSize, 0, m_LanguageSelectionCtrlStrings, wxCB_READONLY ); if (ShowToolTips()) m_LanguageSelectionCtrl->SetToolTip(_("What language should the manager display by default.")); itemFlexGridSizer6->Add(m_LanguageSelectionCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); @@ -144,125 +183,182 @@ void CDlgOptions::CreateControls() itemStaticText9->Create( itemPanel4, wxID_STATIC, _("Reminder Frequency:"), wxDefaultPosition, wxDefaultSize, 0 ); itemFlexGridSizer6->Add(itemStaticText9, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); - wxSlider* itemSlider10 = new wxSlider; - itemSlider10->Create( itemPanel4, ID_SLIDER, 60, 0, 240, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS ); + m_ReminderFrequencyCtrl = new wxSlider; + m_ReminderFrequencyCtrl->Create( itemPanel4, ID_REMINDERFREQUENCY, 60, 0, 120, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS ); if (ShowToolTips()) - itemSlider10->SetToolTip(_("How often, in minutes, should the manager remind you of possible connection events.")); - itemFlexGridSizer6->Add(itemSlider10, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_ReminderFrequencyCtrl->SetToolTip(_("How often, in minutes, should the manager remind you of possible connection events.")); + itemFlexGridSizer6->Add(m_ReminderFrequencyCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); itemNotebook3->AddPage(itemPanel4, _("General")); +#if defined(__WXMSW__) wxPanel* itemPanel11 = new wxPanel; - itemPanel11->Create( itemNotebook3, ID_HTTPPROXY, wxDefaultPosition, wxSize(99, 150), wxTAB_TRAVERSAL ); + itemPanel11->Create( itemNotebook3, ID_CONNECTONS, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* itemBoxSizer12 = new wxBoxSizer(wxVERTICAL); itemPanel11->SetSizer(itemBoxSizer12); - m_EnableHTTPProxyCtrl = new wxCheckBox; - m_EnableHTTPProxyCtrl->Create( itemPanel11, ID_ENABLEHTTPPROXYCTRL, _("Connect via HTTP proxy server"), wxDefaultPosition, wxDefaultSize, 0 ); - m_EnableHTTPProxyCtrl->SetValue(FALSE); - itemBoxSizer12->Add(m_EnableHTTPProxyCtrl, 0, wxGROW|wxALL, 5); + m_NetworkAutomaticDetectionCtrl = new wxRadioButton; + 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); - wxStaticBox* itemStaticBoxSizer14Static = new wxStaticBox(itemPanel11, wxID_ANY, _("HTTP Proxy Server Configuration")); - wxStaticBoxSizer* itemStaticBoxSizer14 = new wxStaticBoxSizer(itemStaticBoxSizer14Static, wxVERTICAL); - itemBoxSizer12->Add(itemStaticBoxSizer14, 0, wxGROW|wxALL, 5); - wxGridSizer* itemGridSizer15 = new wxGridSizer(2, 1, 0, 0); - itemStaticBoxSizer14->Add(itemGridSizer15, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - wxFlexGridSizer* itemFlexGridSizer16 = new wxFlexGridSizer(2, 2, 0, 0); - itemGridSizer15->Add(itemFlexGridSizer16, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxStaticText* itemStaticText17 = new wxStaticText; - itemStaticText17->Create( itemPanel11, wxID_STATIC, _("Address:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer16->Add(itemStaticText17, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + m_NetworkUseLANCtrl = new wxRadioButton; + 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->SetValue(FALSE); + itemBoxSizer12->Add(m_NetworkUseDialupCtrl, 0, wxALIGN_LEFT|wxALL, 5); + + wxStaticBox* itemStaticBoxSizer16Static = new wxStaticBox(itemPanel11, wxID_ANY, _("Dial-up and Virtual Private Network settings")); + m_DialupStaticBoxCtrl = new wxStaticBoxSizer(itemStaticBoxSizer16Static, wxVERTICAL); + itemBoxSizer12->Add(m_DialupStaticBoxCtrl, 0, wxGROW|wxALL, 5); + wxFlexGridSizer* itemFlexGridSizer17 = new wxFlexGridSizer(1, 2, 0, 0); + itemFlexGridSizer17->AddGrowableCol(0); + m_DialupStaticBoxCtrl->Add(itemFlexGridSizer17, 0, wxGROW|wxALL, 5); + wxString* m_DialupConnectionsCtrlStrings = NULL; + m_DialupConnectionsCtrl = new wxListBox; + m_DialupConnectionsCtrl->Create( itemPanel11, ID_DIALUPCONNECTIONS, wxDefaultPosition, wxDefaultSize, 0, m_DialupConnectionsCtrlStrings, wxLB_SINGLE|wxLB_NEEDED_SB ); + itemFlexGridSizer17->Add(m_DialupConnectionsCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + + 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->SetDefault(); + itemBoxSizer19->Add(m_DialupSetDefaultCtrl, 0, wxGROW|wxALL, 5); + + m_DialupClearDefaultCtrl = new wxButton; + 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); + itemFlexGridSizer22->AddGrowableCol(1); + m_DialupStaticBoxCtrl->Add(itemFlexGridSizer22, 0, wxGROW|wxALL, 5); + m_DialupDefaultConnectionTextCtrl = new wxStaticText; + m_DialupDefaultConnectionTextCtrl->Create( itemPanel11, ID_DIALUPDEFAULTCONNECTIONTEXT, _("Default Connection:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer22->Add(m_DialupDefaultConnectionTextCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + + m_DialupDefaultConnectionCtrl = new wxStaticText; + m_DialupDefaultConnectionCtrl->Create( itemPanel11, ID_DIALUPDEFAULTCONNECTION, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer22->Add(m_DialupDefaultConnectionCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + + itemNotebook3->AddPage(itemPanel11, _("Connections")); +#endif + + wxPanel* itemPanel25 = new wxPanel; + itemPanel25->Create( itemNotebook3, ID_HTTPPROXY, wxDefaultPosition, wxSize(99, 150), wxTAB_TRAVERSAL ); + wxBoxSizer* itemBoxSizer26 = new wxBoxSizer(wxVERTICAL); + itemPanel25->SetSizer(itemBoxSizer26); + + m_EnableHTTPProxyCtrl = new wxCheckBox; + m_EnableHTTPProxyCtrl->Create( itemPanel25, ID_ENABLEHTTPPROXYCTRL, _("Connect via HTTP proxy server"), wxDefaultPosition, wxDefaultSize, 0 ); + m_EnableHTTPProxyCtrl->SetValue(FALSE); + itemBoxSizer26->Add(m_EnableHTTPProxyCtrl, 0, wxGROW|wxALL, 5); + + wxStaticBox* itemStaticBoxSizer28Static = new wxStaticBox(itemPanel25, wxID_ANY, _("HTTP Proxy Server Configuration")); + wxStaticBoxSizer* itemStaticBoxSizer28 = new wxStaticBoxSizer(itemStaticBoxSizer28Static, wxVERTICAL); + itemBoxSizer26->Add(itemStaticBoxSizer28, 0, wxGROW|wxALL, 5); + wxGridSizer* itemGridSizer29 = new wxGridSizer(2, 1, 0, 0); + itemStaticBoxSizer28->Add(itemGridSizer29, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + wxFlexGridSizer* itemFlexGridSizer30 = new wxFlexGridSizer(2, 2, 0, 0); + itemGridSizer29->Add(itemFlexGridSizer30, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + wxStaticText* itemStaticText31 = new wxStaticText; + itemStaticText31->Create( itemPanel25, wxID_STATIC, _("Address:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer30->Add(itemStaticText31, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); m_HTTPAddressCtrl = new wxTextCtrl; - m_HTTPAddressCtrl->Create( itemPanel11, ID_HTTPADDRESSCTRL, _T(""), wxDefaultPosition, wxSize(150, -1), 0 ); - itemFlexGridSizer16->Add(m_HTTPAddressCtrl, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_HTTPAddressCtrl->Create( itemPanel25, ID_HTTPADDRESSCTRL, _T(""), wxDefaultPosition, wxSize(150, -1), 0 ); + itemFlexGridSizer30->Add(m_HTTPAddressCtrl, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxStaticText* itemStaticText19 = new wxStaticText; - itemStaticText19->Create( itemPanel11, wxID_STATIC, _("Port:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer16->Add(itemStaticText19, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + wxStaticText* itemStaticText33 = new wxStaticText; + itemStaticText33->Create( itemPanel25, wxID_STATIC, _("Port:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer30->Add(itemStaticText33, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); m_HTTPPortCtrl = new wxTextCtrl; - m_HTTPPortCtrl->Create( itemPanel11, ID_HTTPPORTCTRL, _T(""), wxDefaultPosition, wxSize(50, -1), 0 ); - itemFlexGridSizer16->Add(m_HTTPPortCtrl, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_HTTPPortCtrl->Create( itemPanel25, ID_HTTPPORTCTRL, _T(""), wxDefaultPosition, wxSize(50, -1), 0 ); + itemFlexGridSizer30->Add(m_HTTPPortCtrl, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxStaticBox* itemStaticBoxSizer21Static = new wxStaticBox(itemPanel11, wxID_ANY, _("Leave these blank if not needed")); - wxStaticBoxSizer* itemStaticBoxSizer21 = new wxStaticBoxSizer(itemStaticBoxSizer21Static, wxVERTICAL); - itemStaticBoxSizer14->Add(itemStaticBoxSizer21, 0, wxGROW|wxALL, 5); - wxFlexGridSizer* itemFlexGridSizer22 = new wxFlexGridSizer(2, 2, 0, 0); - itemStaticBoxSizer21->Add(itemFlexGridSizer22, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText23 = new wxStaticText; - itemStaticText23->Create( itemPanel11, wxID_STATIC, _("User Name:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer22->Add(itemStaticText23, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + wxStaticBox* itemStaticBoxSizer35Static = new wxStaticBox(itemPanel25, wxID_ANY, _("Leave these blank if not needed")); + wxStaticBoxSizer* itemStaticBoxSizer35 = new wxStaticBoxSizer(itemStaticBoxSizer35Static, wxVERTICAL); + itemStaticBoxSizer28->Add(itemStaticBoxSizer35, 0, wxGROW|wxALL, 5); + wxFlexGridSizer* itemFlexGridSizer36 = new wxFlexGridSizer(2, 2, 0, 0); + itemStaticBoxSizer35->Add(itemFlexGridSizer36, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText37 = new wxStaticText; + itemStaticText37->Create( itemPanel25, wxID_STATIC, _("User Name:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer36->Add(itemStaticText37, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); m_HTTPUsernameCtrl = new wxTextCtrl; - m_HTTPUsernameCtrl->Create( itemPanel11, ID_HTTPUSERNAMECTRL, _T(""), wxDefaultPosition, wxSize(175, -1), 0 ); - itemFlexGridSizer22->Add(m_HTTPUsernameCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_HTTPUsernameCtrl->Create( itemPanel25, ID_HTTPUSERNAMECTRL, _T(""), wxDefaultPosition, wxSize(175, -1), 0 ); + itemFlexGridSizer36->Add(m_HTTPUsernameCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxStaticText* itemStaticText25 = new wxStaticText; - itemStaticText25->Create( itemPanel11, wxID_STATIC, _("Password:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer22->Add(itemStaticText25, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + wxStaticText* itemStaticText39 = new wxStaticText; + itemStaticText39->Create( itemPanel25, wxID_STATIC, _("Password:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer36->Add(itemStaticText39, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); m_HTTPPasswordCtrl = new wxTextCtrl; - m_HTTPPasswordCtrl->Create( itemPanel11, ID_HTTPPASSWORDCTRL, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD ); - itemFlexGridSizer22->Add(m_HTTPPasswordCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_HTTPPasswordCtrl->Create( itemPanel25, ID_HTTPPASSWORDCTRL, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD ); + itemFlexGridSizer36->Add(m_HTTPPasswordCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); - itemNotebook3->AddPage(itemPanel11, _("HTTP Proxy")); + itemNotebook3->AddPage(itemPanel25, _("HTTP Proxy")); - wxPanel* itemPanel27 = new wxPanel; - itemPanel27->Create( itemNotebook3, ID_SOCKSPROXY, wxDefaultPosition, wxSize(99, 80), wxTAB_TRAVERSAL ); - wxBoxSizer* itemBoxSizer28 = new wxBoxSizer(wxVERTICAL); - itemPanel27->SetSizer(itemBoxSizer28); + wxPanel* itemPanel41 = new wxPanel; + itemPanel41->Create( itemNotebook3, ID_SOCKSPROXY, wxDefaultPosition, wxSize(99, 80), wxTAB_TRAVERSAL ); + wxBoxSizer* itemBoxSizer42 = new wxBoxSizer(wxVERTICAL); + itemPanel41->SetSizer(itemBoxSizer42); m_EnableSOCKSProxyCtrl = new wxCheckBox; - m_EnableSOCKSProxyCtrl->Create( itemPanel27, ID_ENABLESOCKSPROXYCTRL, _("Connect via SOCKS proxy server"), wxDefaultPosition, wxDefaultSize, 0 ); + m_EnableSOCKSProxyCtrl->Create( itemPanel41, ID_ENABLESOCKSPROXYCTRL, _("Connect via SOCKS proxy server"), wxDefaultPosition, wxDefaultSize, 0 ); m_EnableSOCKSProxyCtrl->SetValue(FALSE); - itemBoxSizer28->Add(m_EnableSOCKSProxyCtrl, 0, wxGROW|wxALL, 5); + itemBoxSizer42->Add(m_EnableSOCKSProxyCtrl, 0, wxGROW|wxALL, 5); - wxStaticBox* itemStaticBoxSizer30Static = new wxStaticBox(itemPanel27, wxID_ANY, _("SOCKS Proxy Server Configuration")); - wxStaticBoxSizer* itemStaticBoxSizer30 = new wxStaticBoxSizer(itemStaticBoxSizer30Static, wxVERTICAL); - itemBoxSizer28->Add(itemStaticBoxSizer30, 0, wxGROW|wxALL, 5); - wxGridSizer* itemGridSizer31 = new wxGridSizer(2, 1, 0, 0); - itemStaticBoxSizer30->Add(itemGridSizer31, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - wxFlexGridSizer* itemFlexGridSizer32 = new wxFlexGridSizer(2, 2, 0, 0); - itemGridSizer31->Add(itemFlexGridSizer32, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxStaticText* itemStaticText33 = new wxStaticText; - itemStaticText33->Create( itemPanel27, wxID_STATIC, _("Address:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer32->Add(itemStaticText33, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + wxStaticBox* itemStaticBoxSizer44Static = new wxStaticBox(itemPanel41, wxID_ANY, _("SOCKS Proxy Server Configuration")); + wxStaticBoxSizer* itemStaticBoxSizer44 = new wxStaticBoxSizer(itemStaticBoxSizer44Static, wxVERTICAL); + itemBoxSizer42->Add(itemStaticBoxSizer44, 0, wxGROW|wxALL, 5); + wxGridSizer* itemGridSizer45 = new wxGridSizer(2, 1, 0, 0); + itemStaticBoxSizer44->Add(itemGridSizer45, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + wxFlexGridSizer* itemFlexGridSizer46 = new wxFlexGridSizer(2, 2, 0, 0); + itemGridSizer45->Add(itemFlexGridSizer46, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + wxStaticText* itemStaticText47 = new wxStaticText; + itemStaticText47->Create( itemPanel41, wxID_STATIC, _("Address:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer46->Add(itemStaticText47, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); m_SOCKSAddressCtrl = new wxTextCtrl; - m_SOCKSAddressCtrl->Create( itemPanel27, ID_SOCKSADDRESSCTRL, _T(""), wxDefaultPosition, wxSize(150, -1), 0 ); - itemFlexGridSizer32->Add(m_SOCKSAddressCtrl, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_SOCKSAddressCtrl->Create( itemPanel41, ID_SOCKSADDRESSCTRL, _T(""), wxDefaultPosition, wxSize(150, -1), 0 ); + itemFlexGridSizer46->Add(m_SOCKSAddressCtrl, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxStaticText* itemStaticText35 = new wxStaticText; - itemStaticText35->Create( itemPanel27, wxID_STATIC, _("Port:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer32->Add(itemStaticText35, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + wxStaticText* itemStaticText49 = new wxStaticText; + itemStaticText49->Create( itemPanel41, wxID_STATIC, _("Port:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer46->Add(itemStaticText49, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); m_SOCKSPortCtrl = new wxTextCtrl; - m_SOCKSPortCtrl->Create( itemPanel27, ID_SOCKSPORTCTRL, _T(""), wxDefaultPosition, wxSize(50, -1), 0 ); - itemFlexGridSizer32->Add(m_SOCKSPortCtrl, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_SOCKSPortCtrl->Create( itemPanel41, ID_SOCKSPORTCTRL, _T(""), wxDefaultPosition, wxSize(50, -1), 0 ); + itemFlexGridSizer46->Add(m_SOCKSPortCtrl, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxStaticBox* itemStaticBoxSizer37Static = new wxStaticBox(itemPanel27, wxID_ANY, _("Leave these blank if not needed")); - wxStaticBoxSizer* itemStaticBoxSizer37 = new wxStaticBoxSizer(itemStaticBoxSizer37Static, wxVERTICAL); - itemStaticBoxSizer30->Add(itemStaticBoxSizer37, 0, wxGROW|wxALL, 5); - wxFlexGridSizer* itemFlexGridSizer38 = new wxFlexGridSizer(2, 2, 0, 0); - itemStaticBoxSizer37->Add(itemFlexGridSizer38, 0, wxALIGN_LEFT|wxALL, 5); - wxStaticText* itemStaticText39 = new wxStaticText; - itemStaticText39->Create( itemPanel27, wxID_STATIC, _("User Name:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer38->Add(itemStaticText39, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + wxStaticBox* itemStaticBoxSizer51Static = new wxStaticBox(itemPanel41, wxID_ANY, _("Leave these blank if not needed")); + wxStaticBoxSizer* itemStaticBoxSizer51 = new wxStaticBoxSizer(itemStaticBoxSizer51Static, wxVERTICAL); + itemStaticBoxSizer44->Add(itemStaticBoxSizer51, 0, wxGROW|wxALL, 5); + wxFlexGridSizer* itemFlexGridSizer52 = new wxFlexGridSizer(2, 2, 0, 0); + itemStaticBoxSizer51->Add(itemFlexGridSizer52, 0, wxALIGN_LEFT|wxALL, 5); + wxStaticText* itemStaticText53 = new wxStaticText; + itemStaticText53->Create( itemPanel41, wxID_STATIC, _("User Name:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer52->Add(itemStaticText53, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); m_SOCKSUsernameCtrl = new wxTextCtrl; - m_SOCKSUsernameCtrl->Create( itemPanel27, ID_SOCKSUSERNAMECTRL, _T(""), wxDefaultPosition, wxSize(175, -1), 0 ); - itemFlexGridSizer38->Add(m_SOCKSUsernameCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_SOCKSUsernameCtrl->Create( itemPanel41, ID_SOCKSUSERNAMECTRL, _T(""), wxDefaultPosition, wxSize(175, -1), 0 ); + itemFlexGridSizer52->Add(m_SOCKSUsernameCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxStaticText* itemStaticText41 = new wxStaticText; - itemStaticText41->Create( itemPanel27, wxID_STATIC, _("Password:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer38->Add(itemStaticText41, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + wxStaticText* itemStaticText55 = new wxStaticText; + itemStaticText55->Create( itemPanel41, wxID_STATIC, _("Password:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer52->Add(itemStaticText55, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); m_SOCKSPasswordCtrl = new wxTextCtrl; - m_SOCKSPasswordCtrl->Create( itemPanel27, ID_SOCKSPASSWORDCTRL, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD ); - itemFlexGridSizer38->Add(m_SOCKSPasswordCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_SOCKSPasswordCtrl->Create( itemPanel41, ID_SOCKSPASSWORDCTRL, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD ); + itemFlexGridSizer52->Add(m_SOCKSPasswordCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); - itemNotebook3->AddPage(itemPanel27, _("SOCKS Proxy")); + itemNotebook3->AddPage(itemPanel41, _("SOCKS Proxy")); #if !wxCHECK_VERSION(2,5,2) itemBoxSizer2->Add(itemNotebook3Sizer, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); @@ -270,17 +366,17 @@ void CDlgOptions::CreateControls() itemBoxSizer2->Add(itemNotebook3, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); #endif - wxBoxSizer* itemBoxSizer43 = new wxBoxSizer(wxHORIZONTAL); - itemBoxSizer2->Add(itemBoxSizer43, 0, wxALIGN_RIGHT|wxALL, 5); + wxBoxSizer* itemBoxSizer57 = new wxBoxSizer(wxHORIZONTAL); + itemBoxSizer2->Add(itemBoxSizer57, 0, wxALIGN_RIGHT|wxALL, 5); - wxButton* itemButton44 = new wxButton; - itemButton44->Create( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 ); - itemButton44->SetDefault(); - itemBoxSizer43->Add(itemButton44, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + wxButton* itemButton58 = new wxButton; + itemButton58->Create( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 ); + itemButton58->SetDefault(); + itemBoxSizer57->Add(itemButton58, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxButton* itemButton45 = new wxButton; - itemButton45->Create( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer43->Add(itemButton45, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + wxButton* itemButton59 = new wxButton; + itemButton59->Create( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer57->Add(itemButton59, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); ////@end CDlgOptions content construction } @@ -434,3 +530,42 @@ wxIcon CDlgOptions::GetIconResource(const wxString&) { return wxNullIcon; ////@end CDlgOptions icon retrieval } +/*! + * wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_RADIOBUTTON + */ + +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. +} + + +/*! + * 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. +} + + +/*! + * 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. +} + + diff --git a/clientgui/DlgOptions.h b/clientgui/DlgOptions.h index 5a2006cd32..aa3b11d298 100644 --- a/clientgui/DlgOptions.h +++ b/clientgui/DlgOptions.h @@ -52,8 +52,17 @@ #define SYMBOL_CDLGOPTIONS_POSITION wxDefaultPosition #define ID_NOTEBOOK 10001 #define ID_GENERAL 10002 -#define ID_COMBOBOX 10004 -#define ID_SLIDER 10018 +#define ID_LANGUAGESELECTION 10004 +#define ID_REMINDERFREQUENCY 10018 +#define ID_CONNECTONS 10019 +#define ID_NETWORKAUTODETECT 10020 +#define ID_NETWORKLAN 10021 +#define ID_NETWORKDIALUP 10022 +#define ID_DIALUPCONNECTIONS 10023 +#define ID_DIALUPSETDEFAULT 10024 +#define ID_DIALUPCLEARDEFAULT 10025 +#define ID_DIALUPDEFAULTCONNECTIONTEXT 10027 +#define ID_DIALUPDEFAULTCONNECTION 10026 #define ID_HTTPPROXY 10003 #define ID_ENABLEHTTPPROXYCTRL 10007 #define ID_HTTPADDRESSCTRL 10010 @@ -107,6 +116,21 @@ public: /// wxEVT_UPDATE_UI event handler for ID_NOTEBOOK void OnNotebookUpdate( wxUpdateUIEvent& event ); +#if defined(__WXMSW__) + /// wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_NETWORKAUTODETECT + void OnNetworkautodetectSelected( wxCommandEvent& event ); + +#endif +#if defined(__WXMSW__) + /// wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_NETWORKLAN + void OnNetworklanSelected( wxCommandEvent& event ); + +#endif +#if defined(__WXMSW__) + /// wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_NETWORKDIALUP + void OnNetworkdialupSelected( wxCommandEvent& event ); + +#endif /// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for ID_ENABLEHTTPPROXYCTRL void OnEnablehttpproxyctrlClick( wxCommandEvent& event ); @@ -123,8 +147,8 @@ public: ////@begin CDlgOptions member function declarations - bool GetBProxySectionConfigured() const { return m_bProxySectionConfigured ; } - void SetBProxySectionConfigured(bool value) { m_bProxySectionConfigured = value ; } + bool GetProxySectionConfigured() const { return m_bProxySectionConfigured ; } + void SetProxySectionConfigured(bool value) { m_bProxySectionConfigured = value ; } /// Retrieves bitmap resources wxBitmap GetBitmapResource( const wxString& name ); @@ -138,6 +162,34 @@ public: ////@begin CDlgOptions member variables wxComboBox* m_LanguageSelectionCtrl; + wxSlider* m_ReminderFrequencyCtrl; +#if defined(__WXMSW__) + wxRadioButton* m_NetworkAutomaticDetectionCtrl; +#endif +#if defined(__WXMSW__) + wxRadioButton* m_NetworkUseLANCtrl; +#endif +#if defined(__WXMSW__) + wxRadioButton* m_NetworkUseDialupCtrl; +#endif +#if defined(__WXMSW__) + wxStaticBoxSizer* m_DialupStaticBoxCtrl; +#endif +#if defined(__WXMSW__) + wxListBox* m_DialupConnectionsCtrl; +#endif +#if defined(__WXMSW__) + wxButton* m_DialupSetDefaultCtrl; +#endif +#if defined(__WXMSW__) + wxButton* m_DialupClearDefaultCtrl; +#endif +#if defined(__WXMSW__) + wxStaticText* m_DialupDefaultConnectionTextCtrl; +#endif +#if defined(__WXMSW__) + wxStaticText* m_DialupDefaultConnectionCtrl; +#endif wxCheckBox* m_EnableHTTPProxyCtrl; wxTextCtrl* m_HTTPAddressCtrl; wxTextCtrl* m_HTTPPortCtrl; diff --git a/clientgui/MainFrame.cpp b/clientgui/MainFrame.cpp index e52d8a08c8..497d6e5df6 100644 --- a/clientgui/MainFrame.cpp +++ b/clientgui/MainFrame.cpp @@ -166,6 +166,10 @@ BEGIN_EVENT_TABLE (CMainFrame, wxFrame) EVT_TIMER(ID_FRAMELISTRENDERTIMER, CMainFrame::OnListPanelRender) EVT_TIMER(ID_DOCUMENTPOLLTIMER, CMainFrame::OnDocumentPoll) EVT_NOTEBOOK_PAGE_CHANGED(ID_FRAMENOTEBOOK, CMainFrame::OnNotebookSelectionChanged) +#ifdef __WXMSW__ + EVT_DIALUP_CONNECTED(CMainFrame::OnInternetConnection) + EVT_DIALUP_DISCONNECTED(CMainFrame::OnInternetConnection) +#endif END_EVENT_TABLE () @@ -188,19 +192,25 @@ CMainFrame::CMainFrame(wxString strTitle) : m_iReminderFrequency = 0; m_strBaseTitle = strTitle; + m_bInternetSuccessfullyConnected = false; + m_bInternetDisconnectEventAlreadyDetected = false; m_aSelectedComputerMRU.Clear(); SetIcon(wxICON(APP_ICON)); - wxCHECK_RET(CreateMenu(), _T("Failed to create menu bar.")); wxCHECK_RET(CreateNotebook(), _T("Failed to create notebook.")); wxCHECK_RET(CreateStatusbar(), _T("Failed to create status bar.")); + RestoreState(); + + SetStatusBarPane(0); + + m_pDialupManager = wxDialUpManager::Create(); - wxASSERT(m_pDialupManager); + wxASSERT(m_pDialupManager->IsOk()); m_pRefreshStateTimer = new wxTimer(this, ID_REFRESHSTATETIMER); wxASSERT(m_pRefreshStateTimer); @@ -214,14 +224,11 @@ CMainFrame::CMainFrame(wxString strTitle) : m_pDocumentPollTimer = new wxTimer(this, ID_DOCUMENTPOLLTIMER); wxASSERT(m_pDocumentPollTimer); - m_pRefreshStateTimer->Start(60000); // Send event every 60 seconds + m_pRefreshStateTimer->Start(300000); // Send event every 5 minutes m_pFrameRenderTimer->Start(1000); // Send event every 1 second m_pFrameListPanelRenderTimer->Start(5000); // Send event every 5 seconds m_pDocumentPollTimer->Start(250); // Send event every 250 milliseconds - RestoreState(); - - SetStatusBarPane(0); // Limit the number of times the UI can update itself to two times a second // NOTE: Linux and Mac were updating several times a second and eating @@ -1006,15 +1013,28 @@ void CMainFrame::OnToolsOptions(wxCommandEvent& WXUNUSED(event)) { CMainDocument* pDoc = wxGetApp().GetDocument(); CDlgOptions* pDlg = new CDlgOptions(this); int iAnswer = 0; - bool bProxyInformationConfigured = false; int iBuffer = 0; wxString strBuffer = wxEmptyString; + wxArrayString astrDialupConnections; + bool bProxyInformationConfigured = false; wxASSERT(pDoc); wxASSERT(wxDynamicCast(pDoc, CMainDocument)); wxASSERT(pDlg); + wxASSERT(m_pDialupManager); + // General Tab + pDlg->m_LanguageSelectionCtrl->Append(wxGetApp().GetSupportedLanguages()); + pDlg->m_LanguageSelectionCtrl->SetSelection(m_iSelectedLanguage); + +#ifdef __WXMSW__ + // Connection Tab + m_pDialupManager->GetISPNames(astrDialupConnections); + pDlg->m_DialupConnectionsCtrl->Append(astrDialupConnections); +#endif + + // Proxy Tabs bProxyInformationConfigured = (0 == pDoc->GetProxyConfiguration()); if (bProxyInformationConfigured) { pDlg->m_bProxySectionConfigured = true; @@ -1033,8 +1053,6 @@ void CMainFrame::OnToolsOptions(wxCommandEvent& WXUNUSED(event)) { strBuffer.Printf(wxT("%d"), pDoc->proxy_info.socks_server_port); pDlg->m_SOCKSPortCtrl->SetValue(strBuffer); - - pDlg->m_LanguageSelectionCtrl->SetSelection(m_iSelectedLanguage); } iAnswer = pDlg->ShowModal(); @@ -1320,8 +1338,6 @@ void CMainFrame::OnFrameRender(wxTimerEvent &event) { #ifdef __WXMSW__ // Determine if we need to connect to the Internet // Executes every ten seconds - static bool successfully_connected = false; - static bool disconnect_event_already_detected = false; static wxDateTime dtLastDialupCheck = wxDateTime((time_t)0); static wxDateTime dtLastDialupAlertSent = wxDateTime((time_t)0); static wxDateTime dtLastDialupRequest = wxDateTime((time_t)0); @@ -1347,7 +1363,8 @@ void CMainFrame::OnFrameRender(wxTimerEvent &event) { ShowAlert( _("BOINC Manager - Network Status"), _("BOINC needs a connection to the Internet to perform some maintenance, open the BOINC Manager to connect up and perform the needed work."), - wxICON_INFORMATION + wxICON_INFORMATION, + true ); } } else { @@ -1373,31 +1390,9 @@ void CMainFrame::OnFrameRender(wxTimerEvent &event) { answer = wxYES; } - // Process any UI update events - ::wxYield(); - // Are we allow to connect? if (wxYES == answer) { - if (m_pDialupManager->Dial(wxEmptyString, wxEmptyString, wxEmptyString, false)) { - ShowAlert( - _("BOINC Manager - Network Status"), - _("BOINC has successfully connected to the internet."), - wxICON_INFORMATION - ); - - successfully_connected = true; - disconnect_event_already_detected = false; - pDoc->rpc.network_available(); - } else { - ShowAlert( - _("BOINC Manager - Network Status"), - _("BOINC failed to connect to the internet."), - wxICON_ERROR - ); - - successfully_connected = false; - disconnect_event_already_detected = false; - } + m_pDialupManager->Dial(); } } } @@ -1412,21 +1407,22 @@ void CMainFrame::OnFrameRender(wxTimerEvent &event) { true ); pDoc->rpc.network_available(); - } else if (m_pDialupManager->IsOnline() && !want_network && successfully_connected) { + } else if (m_pDialupManager->IsOnline() && !want_network && m_bInternetSuccessfullyConnected) { // Should we disconnect now? The first time we see the disconnect event // we should ignore it and allow an additional loop in case BOINC really // isn't done. - if (disconnect_event_already_detected) { + if (m_bInternetDisconnectEventAlreadyDetected) { if (pDoc->state.global_prefs.hangup_if_dialed) { if (m_pDialupManager->HangUp()) { ShowAlert( _("BOINC Manager - Network Status"), _("BOINC has successfully disconnected from the internet."), - wxICON_INFORMATION + wxICON_INFORMATION, + true ); - successfully_connected = false; - disconnect_event_already_detected = false; + m_bInternetSuccessfullyConnected = false; + m_bInternetDisconnectEventAlreadyDetected = false; } else { ShowAlert( _("BOINC Manager - Network Status"), @@ -1436,7 +1432,7 @@ void CMainFrame::OnFrameRender(wxTimerEvent &event) { } } } else { - disconnect_event_already_detected = true; + m_bInternetDisconnectEventAlreadyDetected = true; } } } @@ -1612,6 +1608,46 @@ void CMainFrame::OnNotebookSelectionChanged(wxNotebookEvent& event) { } +#ifdef __WXMSW__ + +void CMainFrame::OnInternetConnection(wxDialUpEvent& event) { + wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnInternetConnection - Function Begin")); + + CMainDocument* pDoc = wxGetApp().GetDocument(); + + wxASSERT(pDoc); + wxASSERT(wxDynamicCast(pDoc, CMainDocument)); + + if (event.IsOwnEvent()) { + if (event.IsConnectedEvent()) { + ShowAlert( + _("BOINC Manager - Network Status"), + _("BOINC has successfully connected to the internet, updating all transfers and projects."), + wxICON_INFORMATION, + true + ); + + m_bInternetSuccessfullyConnected = true; + m_bInternetDisconnectEventAlreadyDetected = false; + pDoc->rpc.network_available(); + } else { + ShowAlert( + _("BOINC Manager - Network Status"), + _("BOINC failed to connect to the internet."), + wxICON_ERROR + ); + + m_bInternetSuccessfullyConnected = false; + m_bInternetDisconnectEventAlreadyDetected = false; + } + } + + wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnInternetConnection - Function End")); +} + +#endif + + void CMainFrame::UpdateStatusText(const wxChar* szStatus) { wxString strStatus = szStatus; m_pStatusbar->SetStatusText(strStatus); diff --git a/clientgui/MainFrame.h b/clientgui/MainFrame.h index 5b9b7f1ce4..e19472dec0 100644 --- a/clientgui/MainFrame.h +++ b/clientgui/MainFrame.h @@ -83,6 +83,10 @@ public: void OnNotebookSelectionChanged( wxNotebookEvent& event ); +#ifdef __WXMSW__ + void OnInternetConnection( wxDialUpEvent& event ); +#endif + void OnAlert( CMainFrameAlertEvent& event ); void OnInitialized( CMainFrameEvent& event ); void OnRefreshView( CMainFrameEvent& event ); @@ -102,7 +106,9 @@ private: wxMenuBar* m_pMenubar; wxNotebook* m_pNotebook; CStatusBar* m_pStatusbar; +#ifdef __WXMSW__ wxDialUpManager* m_pDialupManager; +#endif wxTimer* m_pRefreshStateTimer; wxTimer* m_pFrameRenderTimer; wxTimer* m_pFrameListPanelRenderTimer; @@ -114,6 +120,9 @@ private: wxInt32 m_iReminderFrequency; wxArrayString m_aSelectedComputerMRU; + bool m_bInternetSuccessfullyConnected; + bool m_bInternetDisconnectEventAlreadyDetected; + bool CreateMenu(); bool DeleteMenu(); diff --git a/clientgui/Makefile.am b/clientgui/Makefile.am index 0abd75bccc..347477f442 100644 --- a/clientgui/Makefile.am +++ b/clientgui/Makefile.am @@ -16,7 +16,6 @@ boinc_gui_SOURCES = \ DlgAccountManagerSignup.cpp \ DlgAccountManagerStatus.cpp \ DlgAttachProject.cpp \ - DlgConnection.cpp \ DlgOptions.cpp \ DlgSelectComputer.cpp \ LogBOINC.cpp \