From 8597b5a197bd1a0e5e7fde474689274bb85cb825 Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Fri, 8 Jul 2005 20:59:27 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=6587 --- checkin_notes | 8 + clientgui/BOINCGUI.pjd | 1026 ++++++++++++++----------- clientgui/DlgAccountManagerStatus.cpp | 53 +- clientgui/DlgAccountManagerStatus.h | 4 +- clientgui/MainFrame.cpp | 7 +- 5 files changed, 624 insertions(+), 474 deletions(-) diff --git a/checkin_notes b/checkin_notes index cecff05636..6f9063c312 100755 --- a/checkin_notes +++ b/checkin_notes @@ -9034,3 +9034,11 @@ Rom 7 July 2005 stdwx.h lib/ hostinfo.h + +Rom 8 July 2005 + - Cleanup the Account Manager Status dialog. + + clientgui/ + BOINCGUI.pjd + DlgAccountManagerStatus.cpp, .h + MainFrame.cpp diff --git a/clientgui/BOINCGUI.pjd b/clientgui/BOINCGUI.pjd index bdb3acb6f2..6e6d62ad6f 100644 --- a/clientgui/BOINCGUI.pjd +++ b/clientgui/BOINCGUI.pjd @@ -12,7 +12,7 @@ - 150 + 153 TRUE FALSE @@ -102,7 +102,7 @@ <None> - 14627504 + 14626976 data-document @@ -113,14 +113,14 @@ 0 Configurations - 57424672 + 15200944 config-data-document 0 1 0 - 14627504 + 14626976 0 TRUE @@ -168,7 +168,7 @@ Projects - 14627616 + 14636096 root-document project @@ -179,25 +179,25 @@ 0 Windows - 57420960 + 15184352 html-document dialogsfolder 1 1 0 - 14627616 + 14636096 1 Options - 57418480 + 15201344 dialog-document dialog 0 1 0 - 57420960 + 15184352 0 8/3/2004 wbDialogProxy @@ -256,14 +256,14 @@ wxBoxSizer V - 15184576 + 14632880 dialog-control-document sizer 0 1 0 - 57418480 + 15201344 0 wbBoxSizerProxy Vertical @@ -282,14 +282,14 @@ <Any platform> wxNotebook: ID_NOTEBOOK - 15177024 + 14669408 dialog-control-document notebook 0 1 0 - 15184576 + 14632880 0 wbNotebookProxy wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED|OnNotebookPageChanged @@ -345,14 +345,14 @@ wxPanel: ID_GENERAL - 14667920 + 14775584 dialog-control-document panel 0 1 0 - 15177024 + 14669408 0 wbPanelProxy ID_GENERAL @@ -405,14 +405,14 @@ wxBoxSizer V - 14908384 + 14753840 dialog-control-document sizer 0 1 0 - 14667920 + 14775584 0 24/9/2004 wbBoxSizerProxy @@ -432,14 +432,14 @@ <Any platform> wxFlexGridSizer - 14902816 + 14908624 dialog-control-document sizer 0 1 0 - 14908384 + 14753840 0 22/5/2005 wbFlexGridSizerProxy @@ -464,14 +464,14 @@ FALSE wxStaticText: wxID_STATIC - 14885920 + 14895680 dialog-control-document statictext 0 1 0 - 14902816 + 14908624 0 22/5/2005 wbStaticTextProxy @@ -521,14 +521,14 @@ wxComboBox: ID_LANGUAGESELECTION - 14929104 + 14901936 dialog-control-document combobox 0 1 0 - 14902816 + 14908624 0 22/5/2005 wbComboBoxProxy @@ -573,14 +573,14 @@ wxStaticText: wxID_STATIC - 14912240 + 14922848 dialog-control-document statictext 0 1 0 - 14902816 + 14908624 0 22/5/2005 wbStaticTextProxy @@ -630,14 +630,14 @@ wxSlider: ID_REMINDERFREQUENCY - 14955328 + 14967536 dialog-control-document slider 0 1 0 - 14902816 + 14908624 0 22/5/2005 wbSliderProxy @@ -697,14 +697,14 @@ wxPanel: ID_CONNECTONS - 14956112 + 14971808 dialog-control-document panel 0 1 0 - 15177024 + 14669408 0 27/5/2005 wbPanelProxy @@ -758,14 +758,14 @@ wxBoxSizer V - 15027728 + 15037792 dialog-control-document sizer 0 1 0 - 14956112 + 14971808 0 27/5/2005 wbBoxSizerProxy @@ -785,14 +785,14 @@ <Any platform> wxRadioButton: ID_NETWORKAUTODETECT - 15012864 + 15026960 dialog-control-document radiobutton 0 1 0 - 15027728 + 15037792 0 27/5/2005 wbRadioButtonProxy @@ -837,14 +837,14 @@ wxRadioButton: ID_NETWORKLAN - 15062560 + 15011232 dialog-control-document radiobutton 0 1 0 - 15027728 + 15037792 0 27/5/2005 wbRadioButtonProxy @@ -889,14 +889,14 @@ wxRadioButton: ID_NETWORKDIALUP - 15046864 + 15057120 dialog-control-document radiobutton 0 1 0 - 15027728 + 15037792 0 27/5/2005 wbRadioButtonProxy @@ -941,14 +941,14 @@ wxStaticBoxSizer V - 15093520 + 15058688 dialog-control-document sizer 0 1 0 - 15027728 + 15037792 0 27/5/2005 wbStaticBoxSizerProxy @@ -972,14 +972,14 @@ <Any platform> wxFlexGridSizer - 15086944 + 15100096 dialog-control-document sizer 0 1 0 - 15093520 + 15058688 0 27/5/2005 wbFlexGridSizerProxy @@ -1004,14 +1004,14 @@ FALSE wxListBox: ID_DIALUPCONNECTIONS - 15074160 + 15087264 dialog-control-document listbox 0 1 0 - 15086944 + 15100096 0 27/5/2005 wbListBoxProxy @@ -1065,14 +1065,14 @@ wxBoxSizer V - 15122032 + 15126896 dialog-control-document sizer 0 1 0 - 15086944 + 15100096 0 27/5/2005 wbBoxSizerProxy @@ -1092,14 +1092,14 @@ <Any platform> wxButton: ID_DIALUPSETDEFAULT - 15111264 + 15120144 dialog-control-document dialogcontrol 0 1 0 - 15122032 + 15126896 0 27/5/2005 wbButtonProxy @@ -1145,14 +1145,14 @@ wxButton: ID_DIALUPCLEARDEFAULT - 51173264 + 15121968 dialog-control-document dialogcontrol 0 1 0 - 15122032 + 15126896 0 27/5/2005 wbButtonProxy @@ -1200,14 +1200,14 @@ wxFlexGridSizer - 51176800 + 51202016 dialog-control-document sizer 0 1 0 - 15093520 + 15058688 0 27/5/2005 wbFlexGridSizerProxy @@ -1232,14 +1232,14 @@ FALSE wxStaticText: ID_DIALUPDEFAULTCONNECTIONTEXT - 51210304 + 51189280 dialog-control-document statictext 0 1 0 - 51176800 + 51202016 0 27/5/2005 wbStaticTextProxy @@ -1289,14 +1289,14 @@ wxStaticText: ID_DIALUPDEFAULTCONNECTION - 51212544 + 51231552 dialog-control-document statictext 0 1 0 - 51176800 + 51202016 0 27/5/2005 wbStaticTextProxy @@ -1347,14 +1347,14 @@ wxFlexGridSizer - 51236528 + 51232432 dialog-control-document sizer 0 1 0 - 15093520 + 15058688 0 28/5/2005 wbFlexGridSizerProxy @@ -1379,14 +1379,14 @@ FALSE wxCheckBox: ID_DIALUPPROMPTUSERNAMEPASSWORD - 51228432 + 51274160 dialog-control-document checkbox 0 1 0 - 51236528 + 51232432 0 28/5/2005 wbCheckBoxProxy @@ -1435,14 +1435,14 @@ wxPanel: ID_HTTPPROXY - 51230128 + 51274672 dialog-control-document panel 0 1 0 - 15177024 + 14669408 0 wbPanelProxy ID_HTTPPROXY @@ -1495,14 +1495,14 @@ wxBoxSizer V - 51256944 + 51301904 dialog-control-document sizer 0 1 0 - 51230128 + 51274672 0 wbBoxSizerProxy Vertical @@ -1521,14 +1521,14 @@ <Any platform> wxCheckBox: ID_ENABLEHTTPPROXYCTRL - 51250400 + 51295232 dialog-control-document checkbox 0 1 0 - 51256944 + 51301904 0 wbCheckBoxProxy wxEVT_COMMAND_CHECKBOX_CLICKED|OnEnableHTTPProxyCtrlClick @@ -1574,14 +1574,14 @@ wxStaticBoxSizer V - 51253008 + 51341408 dialog-control-document sizer 0 1 0 - 51256944 + 51301904 0 wbStaticBoxSizerProxy wxID_ANY @@ -1604,14 +1604,14 @@ <Any platform> wxGridSizer - 15098720 + 51326576 dialog-control-document sizer 0 1 0 - 51253008 + 51341408 0 wbGridSizerProxy 1 @@ -1633,14 +1633,14 @@ FALSE wxFlexGridSizer - 51121936 + 51316416 dialog-control-document sizer 0 1 0 - 15098720 + 51326576 0 wbFlexGridSizerProxy @@ -1664,14 +1664,14 @@ FALSE wxStaticText: wxID_STATIC - 51134000 + 51370384 dialog-control-document statictext 0 1 0 - 51121936 + 51316416 0 wbStaticTextProxy wxID_STATIC @@ -1720,14 +1720,14 @@ wxTextCtrl: ID_HTTPADDRESSCTRL - 51147744 + 51351280 dialog-control-document textctrl 0 1 0 - 51121936 + 51316416 0 wbTextCtrlProxy ID_HTTPADDRESSCTRL @@ -1787,14 +1787,14 @@ wxStaticText: wxID_STATIC - 57470128 + 51371792 dialog-control-document statictext 0 1 0 - 51121936 + 51316416 0 wbStaticTextProxy wxID_STATIC @@ -1843,14 +1843,14 @@ wxTextCtrl: ID_HTTPPORTCTRL - 14689216 + 57596544 dialog-control-document textctrl 0 1 0 - 51121936 + 51316416 0 wbTextCtrlProxy ID_HTTPPORTCTRL @@ -1912,14 +1912,14 @@ wxStaticBoxSizer V - 14691840 + 57615104 dialog-control-document sizer 0 1 0 - 51253008 + 51341408 0 wbStaticBoxSizerProxy wxID_ANY @@ -1942,14 +1942,14 @@ <Any platform> wxFlexGridSizer - 57478928 + 57628960 dialog-control-document sizer 0 1 0 - 14691840 + 57615104 0 wbFlexGridSizerProxy @@ -1973,14 +1973,14 @@ FALSE wxStaticText: wxID_STATIC - 57490624 + 57597088 dialog-control-document statictext 0 1 0 - 57478928 + 57628960 0 wbStaticTextProxy wxID_STATIC @@ -2031,14 +2031,14 @@ wxTextCtrl: ID_HTTPUSERNAMECTRL - 57504352 + 57651632 dialog-control-document textctrl 0 1 0 - 57478928 + 57628960 0 wbTextCtrlProxy ID_HTTPUSERNAMECTRL @@ -2098,14 +2098,14 @@ wxStaticText: wxID_STATIC - 14740000 + 57682752 dialog-control-document statictext 0 1 0 - 57478928 + 57628960 0 wbStaticTextProxy wxID_STATIC @@ -2156,14 +2156,14 @@ wxTextCtrl: ID_HTTPPASSWORDCTRL - 57523568 + 57696464 dialog-control-document textctrl 0 1 0 - 57478928 + 57628960 0 wbTextCtrlProxy ID_HTTPPASSWORDCTRL @@ -2228,14 +2228,14 @@ wxPanel: ID_SOCKSPROXY - 57518208 + 57724528 dialog-control-document panel 0 1 0 - 15177024 + 14669408 0 wbPanelProxy ID_SOCKSPROXY @@ -2290,14 +2290,14 @@ FALSE wxBoxSizer V - 57549440 + 57678672 dialog-control-document sizer 0 1 0 - 57518208 + 57724528 0 wbBoxSizerProxy Vertical @@ -2316,14 +2316,14 @@ <Any platform> wxCheckBox: ID_ENABLESOCKSPROXYCTRL - 57563248 + 51342736 dialog-control-document checkbox 0 1 0 - 57549440 + 57678672 0 wbCheckBoxProxy wxEVT_COMMAND_CHECKBOX_CLICKED|OnEnableSOCKSProxyCtrlClick @@ -2369,14 +2369,14 @@ wxStaticBoxSizer V - 57585168 + 57756976 dialog-control-document sizer 0 1 0 - 57549440 + 57678672 0 wbStaticBoxSizerProxy wxID_ANY @@ -2399,14 +2399,14 @@ <Any platform> wxGridSizer - 57591008 + 57762752 dialog-control-document sizer 0 1 0 - 57585168 + 57756976 0 wbGridSizerProxy 1 @@ -2428,14 +2428,14 @@ FALSE wxFlexGridSizer - 57605328 + 57773328 dialog-control-document sizer 0 1 0 - 57591008 + 57762752 0 wbFlexGridSizerProxy @@ -2459,14 +2459,14 @@ FALSE wxStaticText: wxID_STATIC - 57613760 + 57784992 dialog-control-document statictext 0 1 0 - 57605328 + 57773328 0 wbStaticTextProxy wxID_STATIC @@ -2517,14 +2517,14 @@ wxTextCtrl: ID_SOCKSADDRESSCTRL - 57627488 + 57806608 dialog-control-document textctrl 0 1 0 - 57605328 + 57773328 0 wbTextCtrlProxy ID_SOCKSADDRESSCTRL @@ -2586,14 +2586,14 @@ wxStaticText: wxID_STATIC - 57656240 + 57828352 dialog-control-document statictext 0 1 0 - 57605328 + 57773328 0 wbStaticTextProxy wxID_STATIC @@ -2644,14 +2644,14 @@ wxTextCtrl: ID_SOCKSPORTCTRL - 57658240 + 57849824 dialog-control-document textctrl 0 1 0 - 57605328 + 57773328 0 wbTextCtrlProxy ID_SOCKSPORTCTRL @@ -2715,14 +2715,14 @@ wxStaticBoxSizer V - 57699984 + 57851360 dialog-control-document sizer 0 1 0 - 57585168 + 57756976 0 wbStaticBoxSizerProxy wxID_ANY @@ -2745,14 +2745,14 @@ <Any platform> wxFlexGridSizer - 57659152 + 57871632 dialog-control-document sizer 0 1 0 - 57699984 + 57851360 0 wbFlexGridSizerProxy @@ -2776,14 +2776,14 @@ FALSE wxStaticText: wxID_STATIC - 57709360 + 57883296 dialog-control-document statictext 0 1 0 - 57659152 + 57871632 0 wbStaticTextProxy wxID_STATIC @@ -2834,14 +2834,14 @@ wxTextCtrl: ID_SOCKSUSERNAMECTRL - 57731072 + 57904912 dialog-control-document textctrl 0 1 0 - 57659152 + 57871632 0 wbTextCtrlProxy ID_SOCKSUSERNAMECTRL @@ -2903,14 +2903,14 @@ wxStaticText: wxID_STATIC - 57760544 + 57926688 dialog-control-document statictext 0 1 0 - 57659152 + 57871632 0 wbStaticTextProxy wxID_STATIC @@ -2961,14 +2961,14 @@ wxTextCtrl: ID_SOCKSPASSWORDCTRL - 57781344 + 57948128 dialog-control-document textctrl 0 1 0 - 57659152 + 57871632 0 wbTextCtrlProxy ID_SOCKSPASSWORDCTRL @@ -3036,14 +3036,14 @@ wxBoxSizer H - 57777392 + 57948832 dialog-control-document sizer 0 1 0 - 15184576 + 14632880 0 wbBoxSizerProxy Horizontal @@ -3062,14 +3062,14 @@ <Any platform> wxButton: wxID_OK - 57578688 + 57749904 dialog-control-document dialogcontrol 0 1 0 - 57777392 + 57948832 0 wbButtonProxy wxID_OK @@ -3113,14 +3113,14 @@ wxButton: wxID_CANCEL - 57591408 + 14695728 dialog-control-document dialogcontrol 0 1 0 - 57777392 + 57948832 0 wbButtonProxy wxID_CANCEL @@ -3167,14 +3167,14 @@ About BOINC - 57819152 + 14711568 dialog-document dialog 0 1 0 - 57420960 + 15184352 0 9/3/2004 wbDialogProxy @@ -3234,14 +3234,14 @@ wxBoxSizer V - 15186464 + 57977104 dialog-control-document sizer 0 1 0 - 57819152 + 14711568 0 wbBoxSizerProxy Vertical @@ -3260,14 +3260,14 @@ <Any platform> wxStaticText: wxID_STATIC - 57846576 + 57990672 dialog-control-document statictext 0 1 0 - 15186464 + 57977104 0 wbStaticTextProxy wxID_STATIC @@ -3316,14 +3316,14 @@ wxBoxSizer H - 57841408 + 14723488 dialog-control-document sizer 0 1 0 - 15186464 + 57977104 0 wbBoxSizerProxy Horizontal @@ -3342,14 +3342,14 @@ <Any platform> wxBoxSizer V - 57870112 + 14730720 dialog-control-document sizer 0 1 0 - 57841408 + 14723488 0 wbBoxSizerProxy Vertical @@ -3368,14 +3368,14 @@ <Any platform> wxStaticBitmap: wxID_STATIC - 57884080 + 14744688 dialog-control-document staticbitmap 0 1 0 - 57870112 + 14730720 0 wbStaticBitmapProxy wxID_STATIC @@ -3419,14 +3419,14 @@ wxFlexGridSizer - 57871504 + 14788608 dialog-control-document sizer 0 1 0 - 57841408 + 14723488 0 wbFlexGridSizerProxy @@ -3450,14 +3450,14 @@ FALSE wxStaticText: wxID_STATIC - 57907120 + 14800848 dialog-control-document statictext 0 1 0 - 57871504 + 14788608 0 wbStaticTextProxy wxID_STATIC @@ -3506,14 +3506,14 @@ wxStaticText: wxID_STATIC - 57901168 + 14823184 dialog-control-document statictext 0 1 0 - 57871504 + 14788608 0 wbStaticTextProxy wxID_STATIC @@ -3562,14 +3562,14 @@ wxStaticText: wxID_STATIC - 57947456 + 14837248 dialog-control-document statictext 0 1 0 - 57871504 + 14788608 0 wbStaticTextProxy wxID_STATIC @@ -3620,14 +3620,14 @@ wxStaticText: wxID_STATIC - 57949744 + 14859728 dialog-control-document statictext 0 1 0 - 57871504 + 14788608 0 wbStaticTextProxy wxID_STATIC @@ -3676,14 +3676,14 @@ wxStaticText: wxID_STATIC - 57984512 + 14873808 dialog-control-document statictext 0 1 0 - 57871504 + 14788608 0 wbStaticTextProxy wxID_STATIC @@ -3734,14 +3734,14 @@ wxStaticText: wxID_STATIC - 57980048 + 14987472 dialog-control-document statictext 0 1 0 - 57871504 + 14788608 0 wbStaticTextProxy wxID_STATIC @@ -3793,14 +3793,14 @@ All Rights Reserved. wxStaticText: wxID_STATIC - 14769280 + 14782496 dialog-control-document statictext 0 1 0 - 15186464 + 57977104 0 wbStaticTextProxy wxID_STATIC @@ -3851,14 +3851,14 @@ All Rights Reserved. wxStaticText: wxID_STATIC - 14769680 + 15151824 dialog-control-document statictext 0 1 0 - 15186464 + 57977104 0 wbStaticTextProxy wxID_STATIC @@ -3909,14 +3909,14 @@ All Rights Reserved. wxStaticText: wxID_STATIC - 58023360 + 15147040 dialog-control-document statictext 0 1 0 - 15186464 + 57977104 0 wbStaticTextProxy wxID_STATIC @@ -3967,14 +3967,14 @@ All Rights Reserved. wxStaticLine: wxID_STATIC - 14790416 + 58016480 dialog-control-document staticline 0 1 0 - 15186464 + 57977104 0 wbStaticLineProxy wxID_STATIC @@ -4016,14 +4016,14 @@ All Rights Reserved. wxButton: wxID_OK - 14800000 + 58019376 dialog-control-document dialogcontrol 0 1 0 - 15186464 + 57977104 0 wbButtonProxy wxID_OK @@ -4071,14 +4071,14 @@ All Rights Reserved. Attach to Project - 14817920 + 58050560 dialog-document dialog 0 1 0 - 57420960 + 15184352 0 9/3/2004 wbDialogProxy @@ -4139,14 +4139,14 @@ All Rights Reserved. wxBoxSizer V - 14836416 + 58068752 dialog-control-document sizer 0 1 0 - 14817920 + 58050560 0 wbBoxSizerProxy Vertical @@ -4165,14 +4165,14 @@ All Rights Reserved. <Any platform> wxFlexGridSizer - 57798992 + 58075488 dialog-control-document sizer 0 1 0 - 14836416 + 58068752 0 29/2/2005 wbFlexGridSizerProxy @@ -4197,14 +4197,14 @@ All Rights Reserved. FALSE wxBoxSizer V - 14849936 + 58081376 dialog-control-document sizer 0 1 0 - 57798992 + 58075488 0 29/2/2005 wbBoxSizerProxy @@ -4224,14 +4224,14 @@ All Rights Reserved. <Any platform> wxFlexGridSizer - 14856848 + 58096448 dialog-control-document sizer 0 1 0 - 14849936 + 58081376 0 29/2/2005 wbFlexGridSizerProxy @@ -4256,14 +4256,14 @@ All Rights Reserved. FALSE wxStaticText: wxID_STATIC - 14868688 + 58101792 dialog-control-document statictext 0 1 0 - 14856848 + 58096448 0 29/2/2005 wbStaticTextProxy @@ -4315,14 +4315,14 @@ All Rights Reserved. wxTextCtrl: ID_PROJECTADDRESS - 14991968 + 58123296 dialog-control-document textctrl 0 1 0 - 14856848 + 58096448 0 29/2/2005 wbTextCtrlProxy @@ -4383,14 +4383,14 @@ All Rights Reserved. wxStaticText: wxID_STATIC - 15148032 + 58153632 dialog-control-document statictext 0 1 0 - 14856848 + 58096448 0 29/2/2005 wbStaticTextProxy @@ -4442,14 +4442,14 @@ All Rights Reserved. wxTextCtrl: ID_PROJECTACCOUNTKEY - 15169840 + 58173952 dialog-control-document textctrl 0 1 0 - 14856848 + 58096448 0 29/2/2005 wbTextCtrlProxy @@ -4511,14 +4511,14 @@ All Rights Reserved. wxStaticText: wxID_STATIC - 58050240 + 58168144 dialog-control-document statictext 0 1 0 - 14849936 + 58081376 0 29/2/2005 wbStaticTextProxy @@ -4571,14 +4571,14 @@ Visit http://boinc.berkeley.edu for a list of projects. wxBoxSizer V - 15150048 + 58205024 dialog-control-document sizer 0 1 0 - 57798992 + 58075488 0 29/2/2005 wbBoxSizerProxy @@ -4598,14 +4598,14 @@ Visit http://boinc.berkeley.edu for a list of projects. <Any platform> wxButton: wxID_OK - 58067536 + 58218704 dialog-control-document dialogcontrol 0 1 0 - 15150048 + 58205024 0 29/2/2005 wbButtonProxy @@ -4652,14 +4652,14 @@ Visit http://boinc.berkeley.edu for a list of projects. wxButton: wxID_CANCEL - 58081648 + 58213344 dialog-control-document dialogcontrol 0 1 0 - 15150048 + 58205024 0 29/2/2005 wbButtonProxy @@ -4710,14 +4710,14 @@ Visit http://boinc.berkeley.edu for a list of projects. Account Manager Signup - 58109712 + 58245424 dialog-document dialog 0 1 0 - 57420960 + 15184352 0 10/2/2005 wbDialogProxy @@ -4779,14 +4779,14 @@ Visit http://boinc.berkeley.edu for a list of projects. wxFlexGridSizer - 58128016 + 58213952 dialog-control-document sizer 0 1 0 - 58109712 + 58245424 0 28/5/2005 wbFlexGridSizerProxy @@ -4811,14 +4811,14 @@ Visit http://boinc.berkeley.edu for a list of projects. FALSE wxBoxSizer V - 14818400 + 58266912 dialog-control-document sizer 0 1 0 - 58128016 + 58213952 0 28/5/2005 wbBoxSizerProxy @@ -4838,14 +4838,14 @@ Visit http://boinc.berkeley.edu for a list of projects. <Any platform> wxStaticText: ID_ACCTMANAGERTEXT - 58132544 + 58280096 dialog-control-document statictext 0 1 0 - 14818400 + 58266912 0 28/5/2005 wbStaticTextProxy @@ -4896,14 +4896,14 @@ For more information, click on the link below. wxHyperLink: ID_ACCTMANAGERDOCLINK - 58152736 + 58305504 dialog-control-document foreign 0 1 0 - 14818400 + 58266912 0 30/5/2005 wbCustomCtrlProxy:wxHyperLink @@ -4956,14 +4956,14 @@ For more information, click on the link below. wxFlexGridSizer - 58178736 + 58301008 dialog-control-document sizer 0 1 0 - 14818400 + 58266912 0 28/5/2005 wbFlexGridSizerProxy @@ -4988,14 +4988,14 @@ For more information, click on the link below. FALSE wxStaticText: wxID_STATIC - 58190592 + 58330560 dialog-control-document statictext 0 1 0 - 58178736 + 58301008 0 28/5/2005 wbStaticTextProxy @@ -5045,14 +5045,14 @@ For more information, click on the link below. wxTextCtrl: ID_ACCTMANAGERURL - 58206144 + 58348928 dialog-control-document textctrl 0 1 0 - 58178736 + 58301008 0 28/5/2005 wbTextCtrlProxy @@ -5113,14 +5113,14 @@ For more information, click on the link below. wxStaticText: wxID_STATIC - 58207680 + 58372912 dialog-control-document statictext 0 1 0 - 58178736 + 58301008 0 28/5/2005 wbStaticTextProxy @@ -5170,14 +5170,14 @@ For more information, click on the link below. wxTextCtrl: ID_ACCTMANAGERUSERNAME - 58248656 + 58374240 dialog-control-document textctrl 0 1 0 - 58178736 + 58301008 0 28/5/2005 wbTextCtrlProxy @@ -5238,14 +5238,14 @@ For more information, click on the link below. wxStaticText: wxID_STATIC - 58272128 + 58415296 dialog-control-document statictext 0 1 0 - 58178736 + 58301008 0 28/5/2005 wbStaticTextProxy @@ -5295,14 +5295,14 @@ For more information, click on the link below. wxTextCtrl: ID_ACCTMANAGERPASSWORD - 58265744 + 58435328 dialog-control-document textctrl 0 1 0 - 58178736 + 58301008 0 28/5/2005 wbTextCtrlProxy @@ -5365,14 +5365,14 @@ For more information, click on the link below. wxFlexGridSizer - 58307696 + 58268832 dialog-control-document sizer 0 1 0 - 58128016 + 58213952 0 28/5/2005 wbFlexGridSizerProxy @@ -5397,14 +5397,14 @@ For more information, click on the link below. FALSE wxButton: wxID_OK - 58320224 + 58461968 dialog-control-document dialogcontrol 0 1 0 - 58307696 + 58268832 0 28/5/2005 wbButtonProxy @@ -5449,14 +5449,14 @@ For more information, click on the link below. wxButton: wxID_CANCEL - 58333136 + 58475360 dialog-control-document dialogcontrol 0 1 0 - 58307696 + 58268832 0 28/5/2005 wbButtonProxy @@ -5504,14 +5504,14 @@ For more information, click on the link below. Account Manager Status - 58348992 + 58475872 dialog-document dialog 0 1 0 - 57420960 + 15184352 0 16/5/2005 wbDialogProxy @@ -5572,41 +5572,33 @@ For more information, click on the link below. wxBoxSizer V - 58363408 + 58506144 dialog-control-document sizer 0 1 0 - 58348992 + 58475872 0 16/5/2005 wbBoxSizerProxy Vertical - Centre - Centre - 0 - 5 - TRUE - TRUE - TRUE - TRUE FALSE - FALSE + TRUE FALSE <Any platform> wxBoxSizer H - 58370432 + 58513200 dialog-control-document sizer 0 1 0 - 58363408 + 58506144 0 16/5/2005 wbBoxSizerProxy @@ -5621,30 +5613,24 @@ For more information, click on the link below. TRUE TRUE FALSE - FALSE + TRUE FALSE <Any platform> - wxFlexGridSizer - 58377360 + wxBoxSizer V + 58520416 dialog-control-document sizer 0 1 0 - 58370432 + 58513200 0 - 16/5/2005 - wbFlexGridSizerProxy - - - 1 - 3 - 0 - 0 + 8/6/2005 + wbBoxSizerProxy + Vertical - <Any platform> Centre Centre 0 @@ -5654,20 +5640,21 @@ For more information, click on the link below. TRUE TRUE FALSE - FALSE + TRUE FALSE + <Any platform> wxStaticText: wxID_STATIC - 58389232 + 58533248 dialog-control-document statictext 0 1 0 - 58377360 + 58520416 0 - 16/5/2005 + 8/6/2005 wbStaticTextProxy wxID_STATIC 5105 @@ -5714,107 +5701,26 @@ For more information, click on the link below. - wxStaticText: ID_ACCTMANAGERNAME - 58416192 + wxFlexGridSizer + 58529200 dialog-control-document - statictext + sizer 0 1 0 - 58377360 + 58520416 0 - 16/5/2005 - wbStaticTextProxy - ID_ACCTMANAGERNAME - 10031 - wxStaticText - m_AcctManagerNameCtrl - foo - - - - - - FALSE - <Any platform> - m_strAcctManagerName - wxGenericValidator(& %VARIABLE%) - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - - -1 - -1 - -1 - -1 - Left - Centre - 0 - 5 - TRUE - TRUE - TRUE - TRUE - FALSE - TRUE - FALSE - - - - - wxHyperLink: ID_ACCTMANAGERLINK - 58436992 - dialog-control-document - - foreign - 0 - 1 - 0 - 58377360 - 0 - 30/5/2005 - wbCustomCtrlProxy:wxHyperLink - ID_ACCTMANAGERLINK - 10032 - wxHyperLink - wxHyperLink + 8/6/2005 + wbFlexGridSizerProxy + + + 2 + 2 + 0 + 0 - TRUE - http://a/b/c - - - - - - FALSE <Any platform> - m_strAcctManagerURL - wxGenericValidator(& %VARIABLE%) - TRUE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - - -1 - -1 - -1 - -1 Left Centre 0 @@ -5826,21 +5732,249 @@ For more information, click on the link below. FALSE TRUE FALSE - - %PARENT%, %IDENTIFIER%, wxT("http://a/b/c"), %POSITION%, %SIZE%, %STYLE% - + + wxStaticText: wxID_STATIC + 58561632 + dialog-control-document + + statictext + 0 + 1 + 0 + 58529200 + 0 + 8/6/2005 + wbStaticTextProxy + wxID_STATIC + 5105 + wxStaticText + + Name: + + + + + + FALSE + <Any platform> + + + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + + -1 + -1 + -1 + -1 + Right + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + TRUE + FALSE + + + + + wxStaticText: ID_ACCTMANAGERNAME + 58556464 + dialog-control-document + + statictext + 0 + 1 + 0 + 58529200 + 0 + 8/6/2005 + wbStaticTextProxy + ID_ACCTMANAGERNAME + 10001 + wxStaticText + m_AcctManagerNameCtrl + foo + + + + + + FALSE + <Any platform> + m_strAcctManagerName + wxGenericValidator(& %VARIABLE%) + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + + -1 + -1 + 200 + -1 + Expand + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + TRUE + FALSE + + + + + wxStaticText: wxID_STATIC + 58601808 + dialog-control-document + + statictext + 0 + 1 + 0 + 58529200 + 0 + 8/6/2005 + wbStaticTextProxy + wxID_STATIC + 5105 + wxStaticText + + URL: + + + + + + FALSE + <Any platform> + + + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + + -1 + -1 + -1 + -1 + Right + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + TRUE + FALSE + + + + + wxHyperLink: ID_ACCTMANAGERLINK + 58597776 + dialog-control-document + + foreign + 0 + 1 + 0 + 58529200 + 0 + 8/6/2005 + wbCustomCtrlProxy:wxHyperLink + ID_ACCTMANAGERLINK + 10002 + wxHyperLink + wxHyperLink + + TRUE + http://a/b/c + + + + + + FALSE + <Any platform> + m_strAcctManagerURL + wxGenericValidator(& %VARIABLE%) + TRUE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + + -1 + -1 + 200 + -1 + Expand + Centre + 0 + 5 + TRUE + TRUE + TRUE + TRUE + FALSE + TRUE + FALSE + + %PARENT%, %IDENTIFIER%, wxT("http://a/b/c"), %POSITION%, %SIZE%, %STYLE% + + - + wxBoxSizer V - 58433024 + 58640864 dialog-control-document sizer 0 1 0 - 58370432 + 58513200 0 16/5/2005 wbBoxSizerProxy @@ -5855,19 +5989,19 @@ For more information, click on the link below. TRUE TRUE FALSE - FALSE + TRUE FALSE <Any platform> - + wxButton: ID_UPDATE - 58416560 + 58654480 dialog-control-document dialogcontrol 0 1 0 - 58433024 + 58640864 0 16/5/2005 wbButtonProxy @@ -5911,16 +6045,16 @@ For more information, click on the link below. - + wxButton: ID_CHANGE - 58478352 + 58665040 dialog-control-document dialogcontrol 0 1 0 - 58433024 + 58640864 0 16/5/2005 wbButtonProxy @@ -5964,16 +6098,16 @@ For more information, click on the link below. - + wxButton: wxID_CANCEL - 58471152 + 58658896 dialog-control-document dialogcontrol 0 1 0 - 58433024 + 58640864 0 16/5/2005 wbButtonProxy @@ -6020,16 +6154,16 @@ For more information, click on the link below. - + Select Computer - 58510208 + 58697024 dialog-document dialog 0 1 0 - 57420960 + 15184352 0 29/2/2005 wbDialogProxy @@ -6088,16 +6222,16 @@ For more information, click on the link below. 400 300 - + wxBoxSizer V - 58328416 + 58634384 dialog-control-document sizer 0 1 0 - 58510208 + 58697024 0 29/2/2005 wbBoxSizerProxy @@ -6115,16 +6249,16 @@ For more information, click on the link below. FALSE FALSE <Any platform> - + wxFlexGridSizer - 58526400 + 58478352 dialog-control-document sizer 0 1 0 - 58328416 + 58634384 0 29/2/2005 wbFlexGridSizerProxy @@ -6147,16 +6281,16 @@ For more information, click on the link below. FALSE FALSE FALSE - + wxBoxSizer V - 58532192 + 58728048 dialog-control-document sizer 0 1 0 - 58526400 + 58478352 0 29/2/2005 wbBoxSizerProxy @@ -6174,16 +6308,16 @@ For more information, click on the link below. FALSE FALSE <Any platform> - + wxFlexGridSizer - 58547312 + 58735072 dialog-control-document sizer 0 1 0 - 58532192 + 58728048 0 29/2/2005 wbFlexGridSizerProxy @@ -6206,16 +6340,16 @@ For more information, click on the link below. FALSE FALSE FALSE - + wxStaticText: wxID_STATIC - 58559936 + 58746880 dialog-control-document statictext 0 1 0 - 58547312 + 58735072 0 29/2/2005 wbStaticTextProxy @@ -6263,16 +6397,16 @@ For more information, click on the link below. - + wxComboBox: ID_SELECTCOMPUTERNAME - 58579376 + 58766208 dialog-control-document combobox 0 1 0 - 58547312 + 58735072 0 29/2/2005 wbComboBoxProxy @@ -6315,16 +6449,16 @@ For more information, click on the link below. - + wxStaticText: wxID_STATIC - 58600896 + 58782160 dialog-control-document statictext 0 1 0 - 58547312 + 58735072 0 29/2/2005 wbStaticTextProxy @@ -6372,16 +6506,16 @@ For more information, click on the link below. - + wxTextCtrl: ID_SELECTCOMPUTERPASSWORD - 58615168 + 58804544 dialog-control-document textctrl 0 1 0 - 58547312 + 58735072 0 29/2/2005 wbTextCtrlProxy @@ -6442,16 +6576,16 @@ For more information, click on the link below. - + wxBoxSizer V - 58635936 + 58830416 dialog-control-document sizer 0 1 0 - 58526400 + 58478352 0 29/2/2005 wbBoxSizerProxy @@ -6469,16 +6603,16 @@ For more information, click on the link below. FALSE FALSE <Any platform> - + wxButton: wxID_OK - 58649616 + 58835872 dialog-control-document dialogcontrol 0 1 0 - 58635936 + 58830416 0 29/2/2005 wbButtonProxy @@ -6523,16 +6657,16 @@ For more information, click on the link below. FALSE FALSE - + wxButton: wxID_CANCEL - 58642848 + 58800320 dialog-control-document dialogcontrol 0 1 0 - 58635936 + 58830416 0 29/2/2005 wbButtonProxy @@ -6581,16 +6715,16 @@ For more information, click on the link below. - + Dialup Logon - 58679056 + 58866240 dialog-document dialog 0 1 0 - 57420960 + 15184352 0 28/5/2005 wbDialogProxy @@ -6649,16 +6783,16 @@ For more information, click on the link below. 400 300 - + wxFlexGridSizer - 58350000 + 58801024 dialog-control-document sizer 0 1 0 - 58679056 + 58866240 0 28/5/2005 wbFlexGridSizerProxy @@ -6681,16 +6815,16 @@ For more information, click on the link below. FALSE FALSE FALSE - + wxBoxSizer V - 58699088 + 58891888 dialog-control-document sizer 0 1 0 - 58350000 + 58801024 0 28/5/2005 wbBoxSizerProxy @@ -6708,16 +6842,16 @@ For more information, click on the link below. FALSE FALSE <Any platform> - + wxFlexGridSizer - 58705984 + 58898944 dialog-control-document sizer 0 1 0 - 58699088 + 58891888 0 28/5/2005 wbFlexGridSizerProxy @@ -6740,16 +6874,16 @@ For more information, click on the link below. FALSE FALSE FALSE - + wxStaticText: wxID_STATIC - 58717824 + 58910784 dialog-control-document statictext 0 1 0 - 58705984 + 58898944 0 28/5/2005 wbStaticTextProxy @@ -6797,16 +6931,16 @@ For more information, click on the link below. - + wxTextCtrl: ID_USERNAME - 58744176 + 58937104 dialog-control-document textctrl 0 1 0 - 58705984 + 58898944 0 28/5/2005 wbTextCtrlProxy @@ -6865,16 +6999,16 @@ For more information, click on the link below. - + wxStaticText: wxID_STATIC - 58768608 + 58961344 dialog-control-document statictext 0 1 0 - 58705984 + 58898944 0 28/5/2005 wbStaticTextProxy @@ -6922,16 +7056,16 @@ For more information, click on the link below. - + wxTextCtrl: ID_PASSWORD - 58782704 + 58975632 dialog-control-document textctrl 0 1 0 - 58705984 + 58898944 0 28/5/2005 wbTextCtrlProxy @@ -6992,16 +7126,16 @@ For more information, click on the link below. - + wxFlexGridSizer - 58803632 + 58997776 dialog-control-document sizer 0 1 0 - 58350000 + 58801024 0 28/5/2005 wbFlexGridSizerProxy @@ -7024,16 +7158,16 @@ For more information, click on the link below. FALSE FALSE FALSE - + wxButton: wxID_OK - 58816128 + 59010288 dialog-control-document dialogcontrol 0 1 0 - 58803632 + 58997776 0 28/5/2005 wbButtonProxy @@ -7076,16 +7210,16 @@ For more information, click on the link below. - + wxButton: wxID_CANCEL - 58830128 + 59003504 dialog-control-document dialogcontrol 0 1 0 - 58803632 + 58997776 0 28/5/2005 wbButtonProxy @@ -7132,68 +7266,68 @@ For more information, click on the link below. - + Images - 58825520 + 59028288 html-document bitmapsfolder 1 1 0 - 14627616 + 14636096 1 - + boincsm.xpm - 58824448 + 59035376 image-document res/boincsm.xpm image 0 0 0 - 58825520 + 59028288 0 1/3/2005 100 - + Sources - 58825296 + 59028128 html-document sourcesfolder 1 1 0 - 14627616 + 14636096 1 10/2/2005 - + ValidateAccountKey.cpp - 58823952 + 59034912 source-editor-document ValidateAccountKey.cpp source-editor 0 0 1 - 58825296 + 59028128 0 29/2/2005 - + ValidateURL.cpp - 58823776 + 59034704 source-editor-document ValidateURL.cpp source-editor 0 0 1 - 58825296 + 59028128 0 29/2/2005 diff --git a/clientgui/DlgAccountManagerStatus.cpp b/clientgui/DlgAccountManagerStatus.cpp index 70fba4d96b..225c8d1ad7 100644 --- a/clientgui/DlgAccountManagerStatus.cpp +++ b/clientgui/DlgAccountManagerStatus.cpp @@ -103,40 +103,51 @@ void CDlgAccountManagerStatus::CreateControls() wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer2->Add(itemBoxSizer3, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - wxFlexGridSizer* itemFlexGridSizer4 = new wxFlexGridSizer(3, 1, 0, 0); - itemBoxSizer3->Add(itemFlexGridSizer4, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + wxBoxSizer* itemBoxSizer4 = new wxBoxSizer(wxVERTICAL); + itemBoxSizer3->Add(itemBoxSizer4, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); wxStaticText* itemStaticText5 = new wxStaticText; itemStaticText5->Create( itemDialog1, wxID_STATIC, _("Your current account manager is:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer4->Add(itemStaticText5, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemBoxSizer4->Add(itemStaticText5, 0, wxALIGN_LEFT|wxALL, 5); + + wxFlexGridSizer* itemFlexGridSizer6 = new wxFlexGridSizer(2, 2, 0, 0); + itemBoxSizer4->Add(itemFlexGridSizer6, 0, wxALIGN_LEFT|wxALL, 5); + + wxStaticText* itemStaticText7 = new wxStaticText; + itemStaticText7->Create( itemDialog1, wxID_STATIC, _("Name:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer6->Add(itemStaticText7, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_AcctManagerNameCtrl = new wxStaticText; - m_AcctManagerNameCtrl->Create( itemDialog1, ID_ACCTMANAGERNAME, _("foo"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer4->Add(m_AcctManagerNameCtrl, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_AcctManagerNameCtrl->Create( itemDialog1, ID_ACCTMANAGERNAME, _("foo"), wxDefaultPosition, wxSize(200, -1), 0 ); + itemFlexGridSizer6->Add(m_AcctManagerNameCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxHyperLink* itemHyperLink7 = new wxHyperLink; - itemHyperLink7->Create( itemDialog1, ID_ACCTMANAGERLINK, wxT("http://a/b/c"), wxDefaultPosition, wxDefaultSize, wxNO_BORDER ); - itemFlexGridSizer4->Add(itemHyperLink7, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + wxStaticText* itemStaticText9 = new wxStaticText; + itemStaticText9->Create( itemDialog1, wxID_STATIC, _("URL:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexGridSizer6->Add(itemStaticText9, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxBoxSizer* itemBoxSizer8 = new wxBoxSizer(wxVERTICAL); - itemBoxSizer3->Add(itemBoxSizer8, 0, wxALIGN_TOP|wxALL, 5); + wxHyperLink* itemHyperLink10 = new wxHyperLink; + itemHyperLink10->Create( itemDialog1, ID_ACCTMANAGERLINK, wxT("http://a/b/c"), wxDefaultPosition, wxSize(200, -1), wxNO_BORDER ); + itemFlexGridSizer6->Add(itemHyperLink10, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxButton* itemButton9 = new wxButton; - itemButton9->Create( itemDialog1, ID_UPDATE, _("&Update"), wxDefaultPosition, wxDefaultSize, 0 ); - itemButton9->SetDefault(); - itemBoxSizer8->Add(itemButton9, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + wxBoxSizer* itemBoxSizer11 = new wxBoxSizer(wxVERTICAL); + itemBoxSizer3->Add(itemBoxSizer11, 0, wxALIGN_TOP|wxALL, 5); - wxButton* itemButton10 = new wxButton; - itemButton10->Create( itemDialog1, ID_CHANGE, _("Change"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer8->Add(itemButton10, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + wxButton* itemButton12 = new wxButton; + itemButton12->Create( itemDialog1, ID_UPDATE, _("&Update"), wxDefaultPosition, wxDefaultSize, 0 ); + itemButton12->SetDefault(); + itemBoxSizer11->Add(itemButton12, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - wxButton* itemButton11 = new wxButton; - itemButton11->Create( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer8->Add(itemButton11, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + wxButton* itemButton13 = new wxButton; + itemButton13->Create( itemDialog1, ID_CHANGE, _("Change"), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer11->Add(itemButton13, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + + wxButton* itemButton14 = new wxButton; + itemButton14->Create( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer11->Add(itemButton14, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); // Set validators m_AcctManagerNameCtrl->SetValidator( wxGenericValidator(& m_strAcctManagerName) ); - itemHyperLink7->SetValidator( wxGenericValidator(& m_strAcctManagerURL) ); + itemHyperLink10->SetValidator( wxGenericValidator(& m_strAcctManagerURL) ); ////@end CDlgAccountManagerStatus content construction } diff --git a/clientgui/DlgAccountManagerStatus.h b/clientgui/DlgAccountManagerStatus.h index 76091adf8e..5743b50441 100644 --- a/clientgui/DlgAccountManagerStatus.h +++ b/clientgui/DlgAccountManagerStatus.h @@ -51,8 +51,8 @@ #define SYMBOL_CDLGACCOUNTMANAGERSTATUS_IDNAME ID_DIALOG #define SYMBOL_CDLGACCOUNTMANAGERSTATUS_SIZE wxSize(400, 300) #define SYMBOL_CDLGACCOUNTMANAGERSTATUS_POSITION wxDefaultPosition -#define ID_ACCTMANAGERNAME 10031 -#define ID_ACCTMANAGERLINK 10032 +#define ID_ACCTMANAGERNAME 10001 +#define ID_ACCTMANAGERLINK 10002 #define ID_UPDATE 10005 #define ID_CHANGE 10017 ////@end control identifiers diff --git a/clientgui/MainFrame.cpp b/clientgui/MainFrame.cpp index 69a380f241..fb1f05f5f2 100644 --- a/clientgui/MainFrame.cpp +++ b/clientgui/MainFrame.cpp @@ -972,11 +972,8 @@ void CMainFrame::OnToolsManageAccounts(wxCommandEvent& WXUNUSED(event)) if (ami.acct_mgr_url.size()) { strTitle = pDlgSignup->GetTitle(); strTitle += wxT(" - ") + wxString(ami.acct_mgr_name.c_str()); - char buf[256]; - sprintf(buf, "Name: %s", ami.acct_mgr_name.c_str()); - pDlgStatus->SetAcctManagerName(wxT(buf)); - sprintf(buf, "URL: %s", ami.acct_mgr_url.c_str()); - pDlgStatus->SetAcctManagerURL(wxT(buf)); + pDlgStatus->SetAcctManagerName(ami.acct_mgr_name.c_str()); + pDlgStatus->SetAcctManagerURL(ami.acct_mgr_url.c_str()); pDlgStatus->SetTitle(strTitle); iAnswer = pDlgStatus->ShowModal();