From aeb69034a890c80a3d085208b578d4225bfd41d1 Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Mon, 14 Nov 2005 22:06:17 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=8856 --- checkin_notes | 13 +- clientgui/BOINCGUI.pjd | 595 ++++++++++++++++---------------- clientgui/DlgSelectComputer.cpp | 26 +- clientgui/DlgSelectComputer.h | 7 +- clientgui/MainDocument.cpp | 12 +- clientgui/MainDocument.h | 5 +- clientgui/MainFrame.cpp | 4 +- clientgui/ViewStatistics.cpp | 6 + clientgui/ViewStatistics.h | 7 +- 9 files changed, 363 insertions(+), 312 deletions(-) diff --git a/checkin_notes b/checkin_notes index 7fd5743fcb..b57f4bdde2 100755 --- a/checkin_notes +++ b/checkin_notes @@ -13705,7 +13705,6 @@ David 13 Nov 2005 lib/ crypt.C - - add "venue" to acct mgr RPCs David 13 Nov 2005 - Manager: initialize buffer when read password from file @@ -13724,3 +13723,15 @@ David 14 Nov 2005 xml.inc user/ am_set_host_info.php (new) + +Rom 14 Nov 2005 + - Bug Fix: Force a refresh of the statistics window on a resize event. + - Bug Fix: Prepopulate the password box on the Select Computer dialog + when the participant types in localhost for the computer name. + + clientgui/ + BOINCGUI.pjd + DlgSelectComputer.cpp, .h + MainDocument.cpp, .h + MainFrame.cpp + ViewStatistics.cpp, .h diff --git a/clientgui/BOINCGUI.pjd b/clientgui/BOINCGUI.pjd index 5e544e3112..b6169cc8f2 100644 --- a/clientgui/BOINCGUI.pjd +++ b/clientgui/BOINCGUI.pjd @@ -187,7 +187,7 @@ <None> - 15160776 + 15165040 data-document @@ -198,14 +198,14 @@ 0 Configurations - 15507464 + 15097384 config-data-document 0 1 0 - 15160776 + 15165040 0 TRUE @@ -253,7 +253,7 @@ Projects - 15074928 + 15076832 root-document project @@ -264,25 +264,25 @@ 0 Windows - 15196696 + 15137960 html-document dialogsfolder 1 1 0 - 15074928 + 15076832 1 Options - 15080328 + 15087936 dialog-document dialog 0 1 0 - 15196696 + 15137960 0 8/3/2004 wbDialogProxy @@ -343,14 +343,14 @@ wxBoxSizer V - 15093352 + 15359560 dialog-control-document sizer 0 1 0 - 15080328 + 15087936 0 wbBoxSizerProxy Vertical @@ -369,14 +369,14 @@ <Any platform> wxNotebook: ID_NOTEBOOK - 15102128 + 50709024 dialog-control-document notebook 0 1 0 - 15093352 + 15359560 0 wbNotebookProxy wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED|OnNotebookPageChanged @@ -433,14 +433,14 @@ wxPanel: ID_GENERAL - 15193128 + 50704096 dialog-control-document panel 0 1 0 - 15102128 + 50709024 0 wbPanelProxy ID_GENERAL @@ -494,14 +494,14 @@ wxBoxSizer V - 15154264 + 15107816 dialog-control-document sizer 0 1 0 - 15193128 + 50704096 0 24/9/2004 wbBoxSizerProxy @@ -521,14 +521,14 @@ <Any platform> wxFlexGridSizer - 15276872 + 15142848 dialog-control-document sizer 0 1 0 - 15154264 + 15107816 0 22/5/2005 wbFlexGridSizerProxy @@ -553,14 +553,14 @@ FALSE wxStaticText: wxID_STATIC - 37358856 + 15313376 dialog-control-document statictext 0 1 0 - 15276872 + 15142848 0 22/5/2005 wbStaticTextProxy @@ -611,14 +611,14 @@ wxComboBox: ID_LANGUAGESELECTION - 38347784 + 15521528 dialog-control-document combobox 0 1 0 - 15276872 + 15142848 0 22/5/2005 wbComboBoxProxy @@ -664,14 +664,14 @@ wxStaticText: wxID_STATIC - 15205680 + 15389408 dialog-control-document statictext 0 1 0 - 15276872 + 15142848 0 22/5/2005 wbStaticTextProxy @@ -722,14 +722,14 @@ wxSlider: ID_REMINDERFREQUENCY - 37481544 + 15350448 dialog-control-document slider 0 1 0 - 15276872 + 15142848 0 22/5/2005 wbSliderProxy @@ -790,14 +790,14 @@ wxPanel: ID_CONNECTONS - 37826720 + 15142560 dialog-control-document panel 0 1 0 - 15102128 + 50709024 0 27/5/2005 wbPanelProxy @@ -852,14 +852,14 @@ wxBoxSizer V - 15286712 + 15138080 dialog-control-document sizer 0 1 0 - 37826720 + 15142560 0 27/5/2005 wbBoxSizerProxy @@ -879,14 +879,14 @@ <Any platform> wxRadioButton: ID_NETWORKAUTODETECT - 15173264 + 15288880 dialog-control-document radiobutton 0 1 0 - 15286712 + 15138080 0 27/5/2005 wbRadioButtonProxy @@ -932,14 +932,14 @@ wxRadioButton: ID_NETWORKLAN - 15402008 + 15158792 dialog-control-document radiobutton 0 1 0 - 15286712 + 15138080 0 27/5/2005 wbRadioButtonProxy @@ -985,14 +985,14 @@ wxRadioButton: ID_NETWORKDIALUP - 15177952 + 15363248 dialog-control-document radiobutton 0 1 0 - 15286712 + 15138080 0 27/5/2005 wbRadioButtonProxy @@ -1038,14 +1038,14 @@ wxStaticBoxSizer V - 15307936 + 15445664 dialog-control-document sizer 0 1 0 - 15286712 + 15138080 0 27/5/2005 wbStaticBoxSizerProxy @@ -1073,14 +1073,14 @@ <Any platform> wxFlexGridSizer - 15152120 + 15455304 dialog-control-document sizer 0 1 0 - 15307936 + 15445664 0 27/5/2005 wbFlexGridSizerProxy @@ -1105,14 +1105,14 @@ FALSE wxListBox: ID_DIALUPCONNECTIONS - 37929864 + 15507400 dialog-control-document listbox 0 1 0 - 15152120 + 15455304 0 27/5/2005 wbListBoxProxy @@ -1167,14 +1167,14 @@ wxBoxSizer V - 37384968 + 15334192 dialog-control-document sizer 0 1 0 - 15152120 + 15455304 0 27/5/2005 wbBoxSizerProxy @@ -1194,14 +1194,14 @@ <Any platform> wxButton: ID_DIALUPSETDEFAULT - 37634080 + 15171360 dialog-control-document dialogcontrol 0 1 0 - 37384968 + 15334192 0 27/5/2005 wbButtonProxy @@ -1248,14 +1248,14 @@ wxButton: ID_DIALUPCLEARDEFAULT - 37529944 + 15247224 dialog-control-document dialogcontrol 0 1 0 - 37384968 + 15334192 0 27/5/2005 wbButtonProxy @@ -1304,14 +1304,14 @@ wxFlexGridSizer - 37439376 + 15305912 dialog-control-document sizer 0 1 0 - 15307936 + 15445664 0 27/5/2005 wbFlexGridSizerProxy @@ -1336,14 +1336,14 @@ FALSE wxStaticText: ID_DIALUPDEFAULTCONNECTIONTEXT - 37500680 + 15472672 dialog-control-document statictext 0 1 0 - 37439376 + 15305912 0 27/5/2005 wbStaticTextProxy @@ -1394,14 +1394,14 @@ wxStaticText: ID_DIALUPDEFAULTCONNECTION - 37316816 + 15529776 dialog-control-document statictext 0 1 0 - 37439376 + 15305912 0 27/5/2005 wbStaticTextProxy @@ -1453,14 +1453,14 @@ wxFlexGridSizer - 15247616 + 15489552 dialog-control-document sizer 0 1 0 - 15307936 + 15445664 0 28/5/2005 wbFlexGridSizerProxy @@ -1485,14 +1485,14 @@ FALSE wxCheckBox: ID_DIALUPPROMPTUSERNAMEPASSWORD - 37856936 + 15270768 dialog-control-document checkbox 0 1 0 - 15247616 + 15489552 0 28/5/2005 wbCheckBoxProxy @@ -1542,14 +1542,14 @@ wxPanel: ID_HTTPPROXY - 51334704 + 15450336 dialog-control-document panel 0 1 0 - 15102128 + 50709024 0 wbPanelProxy ID_HTTPPROXY @@ -1603,14 +1603,14 @@ wxBoxSizer V - 15249192 + 15218664 dialog-control-document sizer 0 1 0 - 51334704 + 15450336 0 wbBoxSizerProxy Vertical @@ -1629,14 +1629,14 @@ <Any platform> wxCheckBox: ID_ENABLEHTTPPROXYCTRL - 15234320 + 15324480 dialog-control-document checkbox 0 1 0 - 15249192 + 15218664 0 wbCheckBoxProxy wxEVT_COMMAND_CHECKBOX_CLICKED|OnEnableHTTPProxyCtrlClick @@ -1683,14 +1683,14 @@ wxStaticBoxSizer V - 15136712 + 15186720 dialog-control-document sizer 0 1 0 - 15249192 + 15218664 0 wbStaticBoxSizerProxy wxID_ANY @@ -1717,14 +1717,14 @@ <Any platform> wxGridSizer - 15427600 + 15229184 dialog-control-document sizer 0 1 0 - 15136712 + 15186720 0 wbGridSizerProxy 1 @@ -1746,14 +1746,14 @@ FALSE wxFlexGridSizer - 15224312 + 15307872 dialog-control-document sizer 0 1 0 - 15427600 + 15229184 0 wbFlexGridSizerProxy @@ -1777,14 +1777,14 @@ FALSE wxStaticText: wxID_STATIC - 37885416 + 15515728 dialog-control-document statictext 0 1 0 - 15224312 + 15307872 0 wbStaticTextProxy wxID_STATIC @@ -1834,14 +1834,14 @@ wxTextCtrl: ID_HTTPADDRESSCTRL - 37662152 + 15264568 dialog-control-document textctrl 0 1 0 - 15224312 + 15307872 0 wbTextCtrlProxy ID_HTTPADDRESSCTRL @@ -1903,14 +1903,14 @@ wxStaticText: wxID_STATIC - 37356016 + 50635024 dialog-control-document statictext 0 1 0 - 15224312 + 15307872 0 wbStaticTextProxy wxID_STATIC @@ -1960,14 +1960,14 @@ wxTextCtrl: ID_HTTPPORTCTRL - 37478464 + 15559512 dialog-control-document textctrl 0 1 0 - 15224312 + 15307872 0 wbTextCtrlProxy ID_HTTPPORTCTRL @@ -2031,14 +2031,14 @@ wxStaticBoxSizer V - 37448784 + 15307048 dialog-control-document sizer 0 1 0 - 15136712 + 15186720 0 wbStaticBoxSizerProxy wxID_ANY @@ -2065,14 +2065,14 @@ <Any platform> wxFlexGridSizer - 37416240 + 15587056 dialog-control-document sizer 0 1 0 - 37448784 + 15307048 0 wbFlexGridSizerProxy @@ -2096,14 +2096,14 @@ FALSE wxStaticText: wxID_STATIC - 15586096 + 15203832 dialog-control-document statictext 0 1 0 - 37416240 + 15587056 0 wbStaticTextProxy wxID_STATIC @@ -2155,14 +2155,14 @@ wxTextCtrl: ID_HTTPUSERNAMECTRL - 15413400 + 15385168 dialog-control-document textctrl 0 1 0 - 37416240 + 15587056 0 wbTextCtrlProxy ID_HTTPUSERNAMECTRL @@ -2224,14 +2224,14 @@ wxStaticText: wxID_STATIC - 15449648 + 15426672 dialog-control-document statictext 0 1 0 - 37416240 + 15587056 0 wbStaticTextProxy wxID_STATIC @@ -2283,14 +2283,14 @@ wxTextCtrl: ID_HTTPPASSWORDCTRL - 37271512 + 50607672 dialog-control-document textctrl 0 1 0 - 37416240 + 15587056 0 wbTextCtrlProxy ID_HTTPPASSWORDCTRL @@ -2357,14 +2357,14 @@ wxPanel: ID_SOCKSPROXY - 37855672 + 15171072 dialog-control-document panel 0 1 0 - 15102128 + 50709024 0 wbPanelProxy ID_SOCKSPROXY @@ -2420,14 +2420,14 @@ FALSE wxBoxSizer V - 37836744 + 50655624 dialog-control-document sizer 0 1 0 - 37855672 + 15171072 0 wbBoxSizerProxy Vertical @@ -2446,14 +2446,14 @@ <Any platform> wxCheckBox: ID_ENABLESOCKSPROXYCTRL - 37702136 + 53949416 dialog-control-document checkbox 0 1 0 - 37836744 + 50655624 0 wbCheckBoxProxy wxEVT_COMMAND_CHECKBOX_CLICKED|OnEnableSOCKSProxyCtrlClick @@ -2500,14 +2500,14 @@ wxStaticBoxSizer V - 15483000 + 53964112 dialog-control-document sizer 0 1 0 - 37836744 + 50655624 0 wbStaticBoxSizerProxy wxID_ANY @@ -2534,14 +2534,14 @@ <Any platform> wxGridSizer - 15547512 + 53973936 dialog-control-document sizer 0 1 0 - 15483000 + 53964112 0 wbGridSizerProxy 1 @@ -2563,14 +2563,14 @@ FALSE wxFlexGridSizer - 15232448 + 53982912 dialog-control-document sizer 0 1 0 - 15547512 + 53973936 0 wbFlexGridSizerProxy @@ -2594,14 +2594,14 @@ FALSE wxStaticText: wxID_STATIC - 37648512 + 53993624 dialog-control-document statictext 0 1 0 - 15232448 + 53982912 0 wbStaticTextProxy wxID_STATIC @@ -2653,14 +2653,14 @@ wxTextCtrl: ID_SOCKSADDRESSCTRL - 15539168 + 54011224 dialog-control-document textctrl 0 1 0 - 15232448 + 53982912 0 wbTextCtrlProxy ID_SOCKSADDRESSCTRL @@ -2724,14 +2724,14 @@ wxStaticText: wxID_STATIC - 15492544 + 54032584 dialog-control-document statictext 0 1 0 - 15232448 + 53982912 0 wbStaticTextProxy wxID_STATIC @@ -2783,14 +2783,14 @@ wxTextCtrl: ID_SOCKSPORTCTRL - 15300504 + 54049472 dialog-control-document textctrl 0 1 0 - 15232448 + 53982912 0 wbTextCtrlProxy ID_SOCKSPORTCTRL @@ -2856,14 +2856,14 @@ wxStaticBoxSizer V - 37502824 + 54070624 dialog-control-document sizer 0 1 0 - 15483000 + 53964112 0 wbStaticBoxSizerProxy wxID_ANY @@ -2890,14 +2890,14 @@ <Any platform> wxFlexGridSizer - 37450976 + 54078792 dialog-control-document sizer 0 1 0 - 37502824 + 54070624 0 wbFlexGridSizerProxy @@ -2921,14 +2921,14 @@ FALSE wxStaticText: wxID_STATIC - 15312192 + 54087176 dialog-control-document statictext 0 1 0 - 37450976 + 54078792 0 wbStaticTextProxy wxID_STATIC @@ -2980,14 +2980,14 @@ wxTextCtrl: ID_SOCKSUSERNAMECTRL - 37431200 + 54104808 dialog-control-document textctrl 0 1 0 - 37450976 + 54078792 0 wbTextCtrlProxy ID_SOCKSUSERNAMECTRL @@ -3051,14 +3051,14 @@ wxStaticText: wxID_STATIC - 37894200 + 54126184 dialog-control-document statictext 0 1 0 - 37450976 + 54078792 0 wbStaticTextProxy wxID_STATIC @@ -3110,14 +3110,14 @@ wxTextCtrl: ID_SOCKSPASSWORDCTRL - 37668056 + 54143112 dialog-control-document textctrl 0 1 0 - 37450976 + 54078792 0 wbTextCtrlProxy ID_SOCKSPASSWORDCTRL @@ -3187,14 +3187,14 @@ wxBoxSizer H - 15234032 + 15513408 dialog-control-document sizer 0 1 0 - 15093352 + 15359560 0 wbBoxSizerProxy Horizontal @@ -3213,14 +3213,14 @@ <Any platform> wxButton: wxID_OK - 15427360 + 50709552 dialog-control-document dialogcontrol 0 1 0 - 15234032 + 15513408 0 wbButtonProxy wxID_OK @@ -3265,14 +3265,14 @@ wxButton: wxID_CANCEL - 37311624 + 54176272 dialog-control-document dialogcontrol 0 1 0 - 15234032 + 15513408 0 wbButtonProxy wxID_CANCEL @@ -3320,14 +3320,14 @@ About BOINC - 15158808 + 15112888 dialog-document dialog 0 1 0 - 15196696 + 15137960 0 9/3/2004 wbDialogProxy @@ -3389,14 +3389,14 @@ wxBoxSizer V - 15320920 + 54203488 dialog-control-document sizer 0 1 0 - 15158808 + 15112888 0 wbBoxSizerProxy Vertical @@ -3415,14 +3415,14 @@ <Any platform> wxStaticText: wxID_STATIC - 15391048 + 54210808 dialog-control-document statictext 0 1 0 - 15320920 + 54203488 0 wbStaticTextProxy wxID_STATIC @@ -3472,14 +3472,14 @@ wxBoxSizer H - 15221768 + 54227392 dialog-control-document sizer 0 1 0 - 15320920 + 54203488 0 wbBoxSizerProxy Horizontal @@ -3498,14 +3498,14 @@ <Any platform> wxBoxSizer V - 15262280 + 54233816 dialog-control-document sizer 0 1 0 - 15221768 + 54227392 0 wbBoxSizerProxy Vertical @@ -3524,14 +3524,14 @@ <Any platform> wxStaticBitmap: wxID_STATIC - 38011824 + 54242976 dialog-control-document staticbitmap 0 1 0 - 15262280 + 54233816 0 wbStaticBitmapProxy wxID_STATIC @@ -3576,14 +3576,14 @@ wxFlexGridSizer - 15352992 + 54256920 dialog-control-document sizer 0 1 0 - 15221768 + 54227392 0 wbFlexGridSizerProxy @@ -3607,14 +3607,14 @@ FALSE wxStaticText: wxID_STATIC - 37325472 + 54265384 dialog-control-document statictext 0 1 0 - 15352992 + 54256920 0 wbStaticTextProxy wxID_STATIC @@ -3664,14 +3664,14 @@ wxStaticText: wxID_STATIC - 37179080 + 54281976 dialog-control-document statictext 0 1 0 - 15352992 + 54256920 0 wbStaticTextProxy wxID_STATIC @@ -3721,14 +3721,14 @@ wxStaticText: wxID_STATIC - 37676120 + 54298624 dialog-control-document statictext 0 1 0 - 15352992 + 54256920 0 wbStaticTextProxy wxID_STATIC @@ -3778,14 +3778,14 @@ wxStaticText: wxID_STATIC - 15324640 + 54315264 dialog-control-document statictext 0 1 0 - 15352992 + 54256920 0 wbStaticTextProxy wxID_STATIC @@ -3845,14 +3845,14 @@ All Rights Reserved. wxStaticText: wxID_STATIC - 15373864 + 54331696 dialog-control-document statictext 0 1 0 - 15320920 + 54203488 0 wbStaticTextProxy wxID_STATIC @@ -3904,14 +3904,14 @@ All Rights Reserved. wxStaticText: wxID_STATIC - 15405960 + 54347464 dialog-control-document statictext 0 1 0 - 15320920 + 54203488 0 wbStaticTextProxy wxID_STATIC @@ -3963,14 +3963,14 @@ All Rights Reserved. wxHyperLink: ID_ABOUTBOINCLINK - 15454616 + 54363216 dialog-control-document foreign 0 1 0 - 15320920 + 54203488 0 21/6/2005 wbCustomCtrlProxy:wxHyperLink @@ -3980,6 +3980,7 @@ All Rights Reserved. wxHyperLink TRUE + http://boinc.berkeley.edu/ @@ -4020,18 +4021,17 @@ All Rights Reserved. %PARENT%, %IDENTIFIER%, wxT("http://boinc.berkeley.edu/"), %POSITION%, %SIZE%, %STYLE% - http://boinc.berkeley.edu/ wxStaticLine: wxID_STATIC - 15533216 + 54380672 dialog-control-document staticline 0 1 0 - 15320920 + 54203488 0 wbStaticLineProxy wxID_STATIC @@ -4072,14 +4072,14 @@ All Rights Reserved. wxButton: wxID_OK - 15570440 + 54393328 dialog-control-document dialogcontrol 0 1 0 - 15320920 + 54203488 0 wbButtonProxy wxID_OK @@ -4128,14 +4128,14 @@ All Rights Reserved. Account Manager Status - 37234680 + 53973048 dialog-document dialog 0 1 0 - 15196696 + 15137960 0 16/5/2005 wbDialogProxy @@ -4198,33 +4198,41 @@ All Rights Reserved. wxBoxSizer V - 38161056 + 54424168 dialog-control-document sizer 0 1 0 - 37234680 + 53973048 0 16/5/2005 wbBoxSizerProxy Vertical + Centre + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE FALSE TRUE FALSE <Any platform> wxBoxSizer H - 38167888 + 54431536 dialog-control-document sizer 0 1 0 - 38161056 + 54424168 0 16/5/2005 wbBoxSizerProxy @@ -4244,14 +4252,14 @@ All Rights Reserved. <Any platform> wxBoxSizer V - 38175896 + 54439592 dialog-control-document sizer 0 1 0 - 38167888 + 54431536 0 8/6/2005 wbBoxSizerProxy @@ -4271,14 +4279,14 @@ All Rights Reserved. <Any platform> wxStaticText: wxID_STATIC - 38185376 + 54449096 dialog-control-document statictext 0 1 0 - 38175896 + 54439592 0 8/6/2005 wbStaticTextProxy @@ -4329,14 +4337,14 @@ All Rights Reserved. wxFlexGridSizer - 38201856 + 54465608 dialog-control-document sizer 0 1 0 - 38175896 + 54439592 0 8/6/2005 wbFlexGridSizerProxy @@ -4361,14 +4369,14 @@ All Rights Reserved. FALSE wxStaticText: wxID_STATIC - 38211288 + 54474984 dialog-control-document statictext 0 1 0 - 38201856 + 54465608 0 8/6/2005 wbStaticTextProxy @@ -4419,14 +4427,14 @@ All Rights Reserved. wxStaticText: ID_ACCTMANAGERNAME - 38228072 + 54491760 dialog-control-document statictext 0 1 0 - 38201856 + 54465608 0 8/6/2005 wbStaticTextProxy @@ -4477,14 +4485,14 @@ All Rights Reserved. wxStaticText: wxID_STATIC - 38244784 + 54508472 dialog-control-document statictext 0 1 0 - 38201856 + 54465608 0 8/6/2005 wbStaticTextProxy @@ -4535,14 +4543,14 @@ All Rights Reserved. wxHyperLink: ID_ACCTMANAGERLINK - 38261696 + 54525320 dialog-control-document foreign 0 1 0 - 38201856 + 54465608 0 8/6/2005 wbCustomCtrlProxy:wxHyperLink @@ -4552,6 +4560,7 @@ All Rights Reserved. wxHyperLink TRUE + http://a/b/c @@ -4592,20 +4601,19 @@ All Rights Reserved. %PARENT%, %IDENTIFIER%, wxT("http://a/b/c"), %POSITION%, %SIZE%, %STYLE% - http://a/b/c wxBoxSizer V - 38287520 + 54543200 dialog-control-document sizer 0 1 0 - 38167888 + 54431536 0 16/5/2005 wbBoxSizerProxy @@ -4625,14 +4633,14 @@ All Rights Reserved. <Any platform> wxButton: ID_UPDATE - 38293544 + 54549224 dialog-control-document dialogcontrol 0 1 0 - 38287520 + 54543200 0 16/5/2005 wbButtonProxy @@ -4679,14 +4687,14 @@ All Rights Reserved. wxButton: ID_CHANGE - 38307088 + 54562776 dialog-control-document dialogcontrol 0 1 0 - 38287520 + 54543200 0 16/5/2005 wbButtonProxy @@ -4733,14 +4741,14 @@ All Rights Reserved. wxButton: wxID_CANCEL - 38321096 + 54576832 dialog-control-document dialogcontrol 0 1 0 - 38287520 + 54543200 0 16/5/2005 wbButtonProxy @@ -4790,14 +4798,14 @@ All Rights Reserved. Select Computer - 37793120 + 15098648 dialog-document dialog 0 1 0 - 15196696 + 15137960 0 29/2/2005 wbDialogProxy @@ -4806,7 +4814,7 @@ All Rights Reserved. 0 m_strComputerName|wxString|ComputerName| - m_strComputerPassword|wxString|StrComputerPassword| + m_strComputerPassword|wxString|ComputerPassword| ID_DIALOG 10000 CDlgSelectComputer @@ -4860,14 +4868,14 @@ All Rights Reserved. wxBoxSizer V - 38354496 + 54604808 dialog-control-document sizer 0 1 0 - 37793120 + 15098648 0 29/2/2005 wbBoxSizerProxy @@ -4879,14 +4887,14 @@ All Rights Reserved. <Any platform> wxFlexGridSizer - 38360880 + 54611728 dialog-control-document sizer 0 1 0 - 38354496 + 54604808 0 29/2/2005 wbFlexGridSizerProxy @@ -4911,14 +4919,14 @@ All Rights Reserved. FALSE wxBoxSizer V - 38369808 + 54620872 dialog-control-document sizer 0 1 0 - 38360880 + 54611728 0 29/2/2005 wbBoxSizerProxy @@ -4938,14 +4946,14 @@ All Rights Reserved. <Any platform> wxFlexGridSizer - 38378104 + 54629168 dialog-control-document sizer 0 1 0 - 38369808 + 54620872 0 29/2/2005 wbFlexGridSizerProxy @@ -4970,14 +4978,14 @@ All Rights Reserved. FALSE wxStaticText: wxID_STATIC - 38388760 + 54639872 dialog-control-document statictext 0 1 0 - 38378104 + 54629168 0 29/2/2005 wbStaticTextProxy @@ -5028,17 +5036,18 @@ All Rights Reserved. wxComboBox: ID_SELECTCOMPUTERNAME - 38405400 + 54656480 dialog-control-document combobox 0 1 0 - 38378104 + 54629168 0 29/2/2005 wbComboBoxProxy + wxEVT_COMMAND_TEXT_UPDATED|OnComputerNameUpdated ID_SELECTCOMPUTERNAME 10001 wxComboBox @@ -5081,14 +5090,14 @@ All Rights Reserved. wxStaticText: wxID_STATIC - 38420224 + 54671264 dialog-control-document statictext 0 1 0 - 38378104 + 54629168 0 29/2/2005 wbStaticTextProxy @@ -5139,14 +5148,14 @@ All Rights Reserved. wxTextCtrl: ID_SELECTCOMPUTERPASSWORD - 38437456 + 54688624 dialog-control-document textctrl 0 1 0 - 38378104 + 54629168 0 29/2/2005 wbTextCtrlProxy @@ -5211,14 +5220,14 @@ All Rights Reserved. wxBoxSizer V - 38458536 + 54709600 dialog-control-document sizer 0 1 0 - 38360880 + 54611728 0 29/2/2005 wbBoxSizerProxy @@ -5238,14 +5247,14 @@ All Rights Reserved. <Any platform> wxButton: wxID_OK - 38464664 + 54715528 dialog-control-document dialogcontrol 0 1 0 - 38458536 + 54709600 0 29/2/2005 wbButtonProxy @@ -5293,14 +5302,14 @@ All Rights Reserved. wxButton: wxID_CANCEL - 38478496 + 54729360 dialog-control-document dialogcontrol 0 1 0 - 38458536 + 54709600 0 29/2/2005 wbButtonProxy @@ -5352,14 +5361,14 @@ All Rights Reserved. Dialup Logon - 38090520 + 54430352 dialog-document dialog 0 1 0 - 15196696 + 15137960 0 28/5/2005 wbDialogProxy @@ -5422,14 +5431,14 @@ All Rights Reserved. wxFlexGridSizer - 38506960 + 54757648 dialog-control-document sizer 0 1 0 - 38090520 + 54430352 0 28/5/2005 wbFlexGridSizerProxy @@ -5454,14 +5463,14 @@ All Rights Reserved. FALSE wxBoxSizer V - 38514352 + 54765872 dialog-control-document sizer 0 1 0 - 38506960 + 54757648 0 28/5/2005 wbBoxSizerProxy @@ -5481,14 +5490,14 @@ All Rights Reserved. <Any platform> wxFlexGridSizer - 38522512 + 54774120 dialog-control-document sizer 0 1 0 - 38514352 + 54765872 0 28/5/2005 wbFlexGridSizerProxy @@ -5513,14 +5522,14 @@ All Rights Reserved. FALSE wxStaticText: wxID_STATIC - 38533128 + 54784784 dialog-control-document statictext 0 1 0 - 38522512 + 54774120 0 28/5/2005 wbStaticTextProxy @@ -5571,14 +5580,14 @@ All Rights Reserved. wxTextCtrl: ID_USERNAME - 38550168 + 54801864 dialog-control-document textctrl 0 1 0 - 38522512 + 54774120 0 28/5/2005 wbTextCtrlProxy @@ -5641,14 +5650,14 @@ All Rights Reserved. wxStaticText: wxID_STATIC - 38571208 + 54822864 dialog-control-document statictext 0 1 0 - 38522512 + 54774120 0 28/5/2005 wbStaticTextProxy @@ -5699,14 +5708,14 @@ All Rights Reserved. wxTextCtrl: ID_PASSWORD - 38587856 + 54839504 dialog-control-document textctrl 0 1 0 - 38522512 + 54774120 0 28/5/2005 wbTextCtrlProxy @@ -5771,14 +5780,14 @@ All Rights Reserved. wxFlexGridSizer - 38608696 + 54765384 dialog-control-document sizer 0 1 0 - 38506960 + 54757648 0 28/5/2005 wbFlexGridSizerProxy @@ -5803,14 +5812,14 @@ All Rights Reserved. FALSE wxButton: wxID_OK - 38615928 + 54867384 dialog-control-document dialogcontrol 0 1 0 - 38608696 + 54765384 0 28/5/2005 wbButtonProxy @@ -5856,14 +5865,14 @@ All Rights Reserved. wxButton: wxID_CANCEL - 38629304 + 54880760 dialog-control-document dialogcontrol 0 1 0 - 38608696 + 54765384 0 28/5/2005 wbButtonProxy @@ -5913,347 +5922,347 @@ All Rights Reserved. Images - 52609944 + 15327024 html-document bitmapsfolder 1 1 0 - 15074928 + 15076832 1 boincsm.xpm - 37330768 + 15261736 image-document res/boincsm.xpm image 0 0 0 - 52609944 + 15327024 0 1/3/2005 100 boinc.xpm - 54287608 + 54628880 image-document res/boinc.xpm image 0 0 0 - 52609944 + 15327024 0 21/6/2005 100 boinc_mac.xpm - 52982168 + 54611200 image-document res/boinc_mac.xpm image 0 0 0 - 52609944 + 15327024 0 21/6/2005 100 BOINCGUIApp.xpm - 52982384 + 54611376 image-document res/BOINCGUIApp.xpm image 0 0 0 - 52609944 + 15327024 0 21/6/2005 100 connect.xpm - 52610088 + 54611584 image-document res/connect.xpm image 0 0 0 - 52609944 + 15327024 0 21/6/2005 100 disconnect.xpm - 52610296 + 54619536 image-document res/disconnect.xpm image 0 0 0 - 52609944 + 15327024 0 21/6/2005 100 mess.xpm - 52610504 + 54619744 image-document res/mess.xpm image 0 0 0 - 52609944 + 15327024 0 21/6/2005 100 proj.xpm - 52610712 + 54619952 image-document res/proj.xpm image 0 0 0 - 52609944 + 15327024 0 21/6/2005 100 result.xpm - 54896544 + 54620160 image-document res/result.xpm image 0 0 0 - 52609944 + 15327024 0 21/6/2005 100 usage.xpm - 54896688 + 54894712 image-document res/usage.xpm image 0 0 0 - 52609944 + 15327024 0 21/6/2005 100 xfer.xpm - 54896832 + 54894920 image-document res/xfer.xpm image 0 0 0 - 52609944 + 15327024 0 21/6/2005 100 attachprojectwizard.xpm - 54897040 + 54895128 image-document res/attachprojectwizard.xpm image 0 0 0 - 52609944 + 15327024 0 21/6/2005 100 wizprogress01.xpm - 54897248 + 54895336 image-document res/wizprogress01.xpm image 0 0 0 - 52609944 + 15327024 0 15/7/2005 100 wizprogress02.xpm - 54897456 + 54895616 image-document res/wizprogress02.xpm image 0 0 0 - 52609944 + 15327024 0 15/7/2005 100 wizprogress03.xpm - 54897664 + 54895936 image-document res/wizprogress03.xpm image 0 0 0 - 52609944 + 15327024 0 15/7/2005 100 wizprogress04.xpm - 54897872 + 54896216 image-document res/wizprogress04.xpm image 0 0 0 - 52609944 + 15327024 0 15/7/2005 100 wizprogress05.xpm - 54898080 + 54896496 image-document res/wizprogress05.xpm image 0 0 0 - 52609944 + 15327024 0 15/7/2005 100 wizprogress06.xpm - 54898288 + 54896816 image-document res/wizprogress06.xpm image 0 0 0 - 52609944 + 15327024 0 15/7/2005 100 wizprogress07.xpm - 54898496 + 54897096 image-document res/wizprogress07.xpm image 0 0 0 - 52609944 + 15327024 0 15/7/2005 100 wizprogress08.xpm - 54898704 + 54897376 image-document res/wizprogress08.xpm image 0 0 0 - 52609944 + 15327024 0 15/7/2005 100 wizprogress09.xpm - 54898912 + 54897656 image-document res/wizprogress09.xpm image 0 0 0 - 52609944 + 15327024 0 15/7/2005 100 wizprogress10.xpm - 54899120 + 54897976 image-document res/wizprogress10.xpm image 0 0 0 - 52609944 + 15327024 0 15/7/2005 100 wizprogress11.xpm - 54899328 + 54898256 image-document res/wizprogress11.xpm image 0 0 0 - 52609944 + 15327024 0 15/7/2005 100 wizprogress12.xpm - 54899536 + 54898536 image-document res/wizprogress12.xpm image 0 0 0 - 52609944 + 15327024 0 15/7/2005 100 @@ -6261,40 +6270,40 @@ All Rights Reserved. Sources - 54899744 + 54898800 html-document sourcesfolder 1 1 0 - 15074928 + 15076832 1 10/2/2005 ValidateAccountKey.cpp - 54899928 + 54898984 source-editor-document ValidateAccountKey.cpp source-editor 0 0 1 - 54899744 + 54898800 0 29/2/2005 ValidateURL.cpp - 54900136 + 54899304 source-editor-document ValidateURL.cpp source-editor 0 0 1 - 54899744 + 54898800 0 29/2/2005 diff --git a/clientgui/DlgSelectComputer.cpp b/clientgui/DlgSelectComputer.cpp index c96b40990c..12ee3adc42 100644 --- a/clientgui/DlgSelectComputer.cpp +++ b/clientgui/DlgSelectComputer.cpp @@ -23,6 +23,7 @@ #include "stdwx.h" #include "BOINCGUIApp.h" +#include "MainDocument.h" ////@begin includes ////@end includes @@ -45,6 +46,8 @@ IMPLEMENT_DYNAMIC_CLASS( CDlgSelectComputer, wxDialog ) BEGIN_EVENT_TABLE( CDlgSelectComputer, wxDialog ) ////@begin CDlgSelectComputer event table entries + EVT_TEXT( ID_SELECTCOMPUTERNAME, CDlgSelectComputer::OnComputerNameUpdated ) + ////@end CDlgSelectComputer event table entries END_EVENT_TABLE() @@ -153,7 +156,7 @@ bool CDlgSelectComputer::ShowToolTips(){ * Get bitmap resources */ -wxBitmap CDlgSelectComputer::GetBitmapResource( const wxString& /*name*/ ) +wxBitmap CDlgSelectComputer::GetBitmapResource( const wxString& WXUNUSED(name) ) { // Bitmap retrieval ////@begin CDlgSelectComputer bitmap retrieval @@ -165,11 +168,30 @@ wxBitmap CDlgSelectComputer::GetBitmapResource( const wxString& /*name*/ ) * Get icon resources */ -wxIcon CDlgSelectComputer::GetIconResource( const wxString& /*name*/ ) +wxIcon CDlgSelectComputer::GetIconResource( const wxString& WXUNUSED(name) ) { // Icon retrieval ////@begin CDlgSelectComputer icon retrieval return wxNullIcon; ////@end CDlgSelectComputer icon retrieval } + +/*! + * wxEVT_COMMAND_TEXT_UPDATED event handler for ID_SELECTCOMPUTERNAME + */ + +void CDlgSelectComputer::OnComputerNameUpdated( wxCommandEvent& event ) +{ + wxString strPassword = wxEmptyString; + CMainDocument* pDoc = wxGetApp().GetDocument(); + + wxASSERT(pDoc); + wxASSERT(wxDynamicCast(pDoc, CMainDocument)); + + if (m_ComputerNameCtrl->GetValue().Lower() == wxT("localhost")) { + pDoc->m_pNetworkConnection->GetLocalPassword(strPassword); + m_ComputerPasswordCtrl->SetValue(strPassword); + } +} + const char *BOINC_RCSID_28d78701f5="$Id$"; diff --git a/clientgui/DlgSelectComputer.h b/clientgui/DlgSelectComputer.h index a7324260eb..bd8a508193 100644 --- a/clientgui/DlgSelectComputer.h +++ b/clientgui/DlgSelectComputer.h @@ -87,6 +87,9 @@ public: ////@begin CDlgSelectComputer event handler declarations + /// wxEVT_COMMAND_TEXT_UPDATED event handler for ID_SELECTCOMPUTERNAME + void OnComputerNameUpdated( wxCommandEvent& event ); + ////@end CDlgSelectComputer event handler declarations ////@begin CDlgSelectComputer member function declarations @@ -94,8 +97,8 @@ public: wxString GetComputerName() const { return m_strComputerName ; } void SetComputerName(wxString value) { m_strComputerName = value ; } - wxString GetStrComputerPassword() const { return m_strComputerPassword ; } - void SetStrComputerPassword(wxString value) { m_strComputerPassword = value ; } + wxString GetComputerPassword() const { return m_strComputerPassword ; } + void SetComputerPassword(wxString value) { m_strComputerPassword = value ; } /// Retrieves bitmap resources wxBitmap GetBitmapResource( const wxString& name ); diff --git a/clientgui/MainDocument.cpp b/clientgui/MainDocument.cpp index 8b3921cae5..d57872a820 100644 --- a/clientgui/MainDocument.cpp +++ b/clientgui/MainDocument.cpp @@ -48,10 +48,11 @@ CNetworkConnection::CNetworkConnection(CMainDocument* pDocument) : CNetworkConnection::~CNetworkConnection() { } -void get_password_from_file(wxString& passwd) { +void CNetworkConnection::GetLocalPassword(wxString& strPassword){ + char buf[256]; + FILE* f = fopen("gui_rpc_auth.cfg", "r"); if (!f) return; - char buf[256]; strcpy(buf, ""); fgets(buf, 256, f); fclose(f); @@ -62,7 +63,7 @@ void get_password_from_file(wxString& passwd) { buf[n] = 0; } } - passwd = buf; + strPassword = buf; } // TODO: get rid of "reconnecting" stuff @@ -77,11 +78,6 @@ void* CNetworkConnection::Poll() { retval = m_pDocument->rpc.init_poll(); if (!retval) { wxLogTrace(wxT("Function Status"), wxT("CNetworkConnection::Poll - init_poll() returned ERR_CONNECT, now authorizing...")); - if (m_strNewComputerName.empty() && m_strNewComputerPassword.empty()) { - // if connecting to local computer, - // look for password in file - get_password_from_file(m_strNewComputerPassword); - } retval = m_pDocument->rpc.authorize(m_strNewComputerPassword.c_str()); if (!retval) { wxLogTrace(wxT("Function Status"), wxT("CNetworkConnection::Poll - Connection Success")); diff --git a/clientgui/MainDocument.h b/clientgui/MainDocument.h index 2cc4e97432..c2245edfaf 100644 --- a/clientgui/MainDocument.h +++ b/clientgui/MainDocument.h @@ -39,6 +39,7 @@ public: int FrameShutdownDetected(); int GetConnectedComputerName(wxString& strMachine); int GetConnectingComputerName(wxString& strMachine); + void GetLocalPassword(wxString& strPassword); int SetNewComputerName(const wxChar* szComputer); int SetNewComputerPassword(const wxChar* szPassword); void SetStateError(); @@ -77,8 +78,6 @@ public: // private: - CNetworkConnection* m_pNetworkConnection; - bool m_bCachedStateLocked; wxDateTime m_dtCachedActivityRunModeTimestamp; @@ -93,6 +92,8 @@ private: public: + CNetworkConnection* m_pNetworkConnection; + int OnInit(); int OnExit(); int OnPoll(); diff --git a/clientgui/MainFrame.cpp b/clientgui/MainFrame.cpp index 86d96c17f7..f91a03acaf 100644 --- a/clientgui/MainFrame.cpp +++ b/clientgui/MainFrame.cpp @@ -1383,7 +1383,9 @@ void CMainFrame::OnInitialized(CMainFrameEvent&) { wxASSERT(wxDynamicCast(pDoc, CMainDocument)); if (!pDoc->IsConnected()) { - pDoc->Connect(wxEmptyString, wxEmptyString, TRUE); + wxString strPassword = wxEmptyString; + pDoc->m_pNetworkConnection->GetLocalPassword(strPassword); + pDoc->Connect(wxT("localhost"), strPassword, TRUE); } wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnInitialized - Function End")); diff --git a/clientgui/ViewStatistics.cpp b/clientgui/ViewStatistics.cpp index 11461a32b6..50d9968445 100644 --- a/clientgui/ViewStatistics.cpp +++ b/clientgui/ViewStatistics.cpp @@ -33,6 +33,7 @@ BEGIN_EVENT_TABLE (CPaintStatistics, wxPanel) EVT_PAINT(CPaintStatistics::OnPaint) + EVT_SIZE(CPaintStatistics::OnSize) END_EVENT_TABLE () CPaintStatistics::CPaintStatistics() { @@ -268,6 +269,11 @@ void CPaintStatistics::OnPaint(wxPaintEvent& WXUNUSED(event)) { dc.EndDrawing(); } +void CPaintStatistics::OnSize(wxSizeEvent& event) { + Refresh(TRUE, NULL); + event.Skip(); +} + IMPLEMENT_DYNAMIC_CLASS(CViewStatistics, CBOINCBaseView) BEGIN_EVENT_TABLE (CViewStatistics, CBOINCBaseView) diff --git a/clientgui/ViewStatistics.h b/clientgui/ViewStatistics.h index db5f942ff1..761640fa6e 100644 --- a/clientgui/ViewStatistics.h +++ b/clientgui/ViewStatistics.h @@ -33,12 +33,13 @@ class CPaintStatistics : public wxPanel public: CPaintStatistics(); CPaintStatistics(wxWindow* parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL, const wxString& name = "panel"); - - wxInt32 m_SelectedStatistic; + + wxInt32 m_SelectedStatistic; wxString heading; protected: - void OnPaint(wxPaintEvent& event); + void OnPaint(wxPaintEvent& event); + void OnSize(wxSizeEvent& event); DECLARE_EVENT_TABLE() };