From 64d1843c8565b3d5a46b32bdb9d240d76f119c4c Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Wed, 26 Jan 2005 07:09:29 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=5213 --- checkin_notes | 4 + clientgui/BOINCGUI.pjd | 331 +++++++++++++++++++-------------------- clientgui/DlgOptions.cpp | 3 +- 3 files changed, 171 insertions(+), 167 deletions(-) diff --git a/checkin_notes b/checkin_notes index 3c4baca622..3dd628691e 100755 --- a/checkin_notes +++ b/checkin_notes @@ -23257,6 +23257,10 @@ David 25 Jan 2005 Rom 25 Jan 2005 - Allow BOINC Manager to search for it's localization catalog files in a sub directory called 'locale' like it does in Windows. + - The options dialog should grow in size with the different languages, + add a notebook sizer to the mix. clientgui/ + BOINCGUI.pjd BOINCGUIApp.cpp + DlgOptions.cpp \ No newline at end of file diff --git a/clientgui/BOINCGUI.pjd b/clientgui/BOINCGUI.pjd index 7d60c9987f..1625e3b195 100644 --- a/clientgui/BOINCGUI.pjd +++ b/clientgui/BOINCGUI.pjd @@ -50,8 +50,7 @@ ///////////////////////////////////////////////////////////////////////////// - -/*! + /*! * %BODY% */ @@ -78,7 +77,7 @@ Projects - 12616808 + 12516264 root-document project @@ -88,23 +87,23 @@ 0 Windows - 12672920 + 12873624 html-document dialogsfolder 1 1 - 12616808 + 12516264 1 Options - 12864936 + 12828328 dialog-document dialog 0 1 - 12672920 + 12873624 0 8/3/2004 wbDialogProxy @@ -164,13 +163,13 @@ wxBoxSizer V - 12782008 + 12628024 dialog-control-document sizer 0 1 - 12864936 + 12828328 0 wbBoxSizerProxy Vertical @@ -181,13 +180,13 @@ <Any platform> wxNotebook: ID_NOTEBOOK - 12890720 + 12847304 dialog-control-document notebook 0 1 - 12782008 + 12628024 0 wbNotebookProxy wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED|OnNotebookPageChanged @@ -196,7 +195,7 @@ 10001 wxNotebook - FALSE + TRUE @@ -241,13 +240,13 @@ FALSE wxPanel: ID_GENERAL - 12790088 + 12767600 dialog-control-document panel 0 1 - 12890720 + 12847304 0 wbPanelProxy ID_GENERAL @@ -300,13 +299,13 @@ wxBoxSizer V - 13112280 + 12791408 dialog-control-document sizer 0 1 - 12790088 + 12767600 0 24/9/2004 wbBoxSizerProxy @@ -326,13 +325,13 @@ <Any platform> wxStaticText: wxID_STATIC - 17611128 + 12853488 dialog-control-document statictext 0 1 - 13112280 + 12791408 0 24/9/2004 wbStaticTextProxy @@ -380,13 +379,13 @@ wxPanel: ID_HTTPPROXY - 12876584 + 12766840 dialog-control-document panel 0 1 - 12890720 + 12847304 0 wbPanelProxy ID_HTTPPROXY @@ -439,13 +438,13 @@ wxBoxSizer V - 12914128 + 12689024 dialog-control-document sizer 0 1 - 12876584 + 12766840 0 wbBoxSizerProxy Vertical @@ -464,13 +463,13 @@ <Any platform> wxCheckBox: ID_ENABLEHTTPPROXYCTRL - 12879400 + 12690040 dialog-control-document checkbox 0 1 - 12914128 + 12689024 0 wbCheckBoxProxy wxEVT_COMMAND_CHECKBOX_CLICKED|OnEnablehttpproxyctrlClick @@ -512,13 +511,13 @@ wxStaticBoxSizer V - 12953856 + 12749376 dialog-control-document sizer 0 1 - 12914128 + 12689024 0 wbStaticBoxSizerProxy wxID_ANY @@ -541,13 +540,13 @@ <Any platform> wxGridSizer - 12898616 + 12775552 dialog-control-document sizer 0 1 - 12953856 + 12749376 0 wbGridSizerProxy 1 @@ -569,13 +568,13 @@ FALSE wxFlexGridSizer - 12772368 + 12947152 dialog-control-document sizer 0 1 - 12898616 + 12775552 0 wbFlexGridSizerProxy @@ -599,13 +598,13 @@ FALSE wxStaticText: wxID_STATIC - 12919520 + 12942976 dialog-control-document statictext 0 1 - 12772368 + 12947152 0 wbStaticTextProxy wxID_STATIC @@ -650,13 +649,13 @@ wxTextCtrl: ID_HTTPADDRESSCTRL - 12938728 + 12714576 dialog-control-document textctrl 0 1 - 12772368 + 12947152 0 wbTextCtrlProxy ID_HTTPADDRESSCTRL @@ -716,13 +715,13 @@ wxStaticText: wxID_STATIC - 12645456 + 12846480 dialog-control-document statictext 0 1 - 12772368 + 12947152 0 wbStaticTextProxy wxID_STATIC @@ -767,13 +766,13 @@ wxTextCtrl: ID_HTTPPORTCTRL - 12701544 + 12724712 dialog-control-document textctrl 0 1 - 12772368 + 12947152 0 wbTextCtrlProxy ID_HTTPPORTCTRL @@ -835,13 +834,13 @@ wxStaticBoxSizer V - 12897848 + 12814640 dialog-control-document sizer 0 1 - 12953856 + 12749376 0 wbStaticBoxSizerProxy wxID_ANY @@ -864,13 +863,13 @@ <Any platform> wxFlexGridSizer - 12760384 + 12809264 dialog-control-document sizer 0 1 - 12897848 + 12814640 0 wbFlexGridSizerProxy @@ -894,13 +893,13 @@ FALSE wxStaticText: wxID_STATIC - 12730632 + 12538856 dialog-control-document statictext 0 1 - 12760384 + 12809264 0 wbStaticTextProxy wxID_STATIC @@ -945,13 +944,13 @@ wxTextCtrl: ID_HTTPUSERNAMECTRL - 12663240 + 12898800 dialog-control-document textctrl 0 1 - 12760384 + 12809264 0 wbTextCtrlProxy ID_HTTPUSERNAMECTRL @@ -1011,13 +1010,13 @@ wxStaticText: wxID_STATIC - 12713000 + 12918736 dialog-control-document statictext 0 1 - 12760384 + 12809264 0 wbStaticTextProxy wxID_STATIC @@ -1062,13 +1061,13 @@ wxTextCtrl: ID_HTTPPASSWORDCTRL - 12756536 + 12933600 dialog-control-document textctrl 0 1 - 12760384 + 12809264 0 wbTextCtrlProxy ID_HTTPPASSWORDCTRL @@ -1133,13 +1132,13 @@ wxPanel: ID_SOCKSPROXY - 12876320 + 12700032 dialog-control-document panel 0 1 - 12890720 + 12847304 0 wbPanelProxy ID_SOCKSPROXY @@ -1192,13 +1191,13 @@ wxBoxSizer V - 12978488 + 12706472 dialog-control-document sizer 0 1 - 12876320 + 12700032 0 wbBoxSizerProxy Vertical @@ -1217,13 +1216,13 @@ <Any platform> wxCheckBox: ID_ENABLESOCKSPROXYCTRL - 12987616 + 12732296 dialog-control-document checkbox 0 1 - 12978488 + 12706472 0 wbCheckBoxProxy wxEVT_COMMAND_CHECKBOX_CLICKED|OnEnablesocksproxyctrlClick @@ -1265,13 +1264,13 @@ wxStaticBoxSizer V - 18051704 + 12836152 dialog-control-document sizer 0 1 - 12978488 + 12706472 0 wbStaticBoxSizerProxy wxID_ANY @@ -1294,13 +1293,13 @@ <Any platform> wxGridSizer - 18060320 + 12889832 dialog-control-document sizer 0 1 - 18051704 + 12836152 0 wbGridSizerProxy 1 @@ -1322,13 +1321,13 @@ FALSE wxFlexGridSizer - 18069336 + 25793104 dialog-control-document sizer 0 1 - 18060320 + 12889832 0 wbFlexGridSizerProxy @@ -1352,13 +1351,13 @@ FALSE wxStaticText: wxID_STATIC - 18079720 + 25803696 dialog-control-document statictext 0 1 - 18069336 + 25793104 0 wbStaticTextProxy wxID_STATIC @@ -1403,13 +1402,13 @@ wxTextCtrl: ID_SOCKSADDRESSCTRL - 18095968 + 25819896 dialog-control-document textctrl 0 1 - 18069336 + 25793104 0 wbTextCtrlProxy ID_SOCKSADDRESSCTRL @@ -1469,13 +1468,13 @@ wxStaticText: wxID_STATIC - 18116776 + 25840752 dialog-control-document statictext 0 1 - 18069336 + 25793104 0 wbStaticTextProxy wxID_STATIC @@ -1520,13 +1519,13 @@ wxTextCtrl: ID_SOCKSPORTCTRL - 18132200 + 25856176 dialog-control-document textctrl 0 1 - 18069336 + 25793104 0 wbTextCtrlProxy ID_SOCKSPORTCTRL @@ -1588,13 +1587,13 @@ wxStaticBoxSizer V - 18152992 + 12888968 dialog-control-document sizer 0 1 - 18051704 + 12836152 0 wbStaticBoxSizerProxy wxID_ANY @@ -1617,13 +1616,13 @@ <Any platform> wxFlexGridSizer - 18159368 + 25883128 dialog-control-document sizer 0 1 - 18152992 + 12888968 0 wbFlexGridSizerProxy @@ -1647,13 +1646,13 @@ FALSE wxStaticText: wxID_STATIC - 18168240 + 25892272 dialog-control-document statictext 0 1 - 18159368 + 25883128 0 wbStaticTextProxy wxID_STATIC @@ -1698,13 +1697,13 @@ wxTextCtrl: ID_SOCKSUSERNAMECTRL - 18184424 + 25908384 dialog-control-document textctrl 0 1 - 18159368 + 25883128 0 wbTextCtrlProxy ID_SOCKSUSERNAMECTRL @@ -1764,13 +1763,13 @@ wxStaticText: wxID_STATIC - 18205352 + 25929312 dialog-control-document statictext 0 1 - 18159368 + 25883128 0 wbStaticTextProxy wxID_STATIC @@ -1815,13 +1814,13 @@ wxTextCtrl: ID_SOCKSPASSWORDCTRL - 18220752 + 25944744 dialog-control-document textctrl 0 1 - 18159368 + 25883128 0 wbTextCtrlProxy ID_SOCKSPASSWORDCTRL @@ -1887,13 +1886,13 @@ wxBoxSizer H - 12700848 + 12713520 dialog-control-document sizer 0 1 - 12782008 + 12628024 0 wbBoxSizerProxy Horizontal @@ -1912,13 +1911,13 @@ <Any platform> wxButton: wxID_OK - 12740824 + 12731864 dialog-control-document dialogcontrol 0 1 - 12700848 + 12713520 0 wbButtonProxy wxID_OK @@ -1961,13 +1960,13 @@ wxButton: wxID_CANCEL - 18253360 + 25976456 dialog-control-document dialogcontrol 0 1 - 12700848 + 12713520 0 wbButtonProxy wxID_CANCEL @@ -2013,13 +2012,13 @@ About BOINC - 12862368 + 12799392 dialog-document dialog 0 1 - 12672920 + 12873624 0 9/3/2004 wbDialogProxy @@ -2079,13 +2078,13 @@ wxBoxSizer V - 18281520 + 26004448 dialog-control-document sizer 0 1 - 12862368 + 12799392 0 wbBoxSizerProxy Vertical @@ -2104,13 +2103,13 @@ <Any platform> wxStaticText: wxID_STATIC - 18291088 + 26013976 dialog-control-document statictext 0 1 - 18281520 + 26004448 0 wbStaticTextProxy wxID_STATIC @@ -2155,13 +2154,13 @@ wxBoxSizer H - 18306344 + 26029288 dialog-control-document sizer 0 1 - 18281520 + 26004448 0 wbBoxSizerProxy Horizontal @@ -2180,13 +2179,13 @@ <Any platform> wxBoxSizer V - 18312992 + 26035896 dialog-control-document sizer 0 1 - 18306344 + 26029288 0 wbBoxSizerProxy Vertical @@ -2205,13 +2204,13 @@ <Any platform> wxStaticBitmap: wxID_STATIC - 18322096 + 26045152 dialog-control-document staticbitmap 0 1 - 18312992 + 26035896 0 wbStaticBitmapProxy wxID_STATIC @@ -2253,13 +2252,13 @@ wxFlexGridSizer - 18335960 + 26059024 dialog-control-document sizer 0 1 - 18306344 + 26029288 0 wbFlexGridSizerProxy @@ -2283,13 +2282,13 @@ FALSE wxStaticText: wxID_STATIC - 18344520 + 26067528 dialog-control-document statictext 0 1 - 18335960 + 26059024 0 wbStaticTextProxy wxID_STATIC @@ -2334,13 +2333,13 @@ wxStaticText: wxID_STATIC - 18359912 + 26082928 dialog-control-document statictext 0 1 - 18335960 + 26059024 0 wbStaticTextProxy wxID_STATIC @@ -2385,13 +2384,13 @@ wxStaticText: wxID_STATIC - 18375336 + 26098280 dialog-control-document statictext 0 1 - 18335960 + 26059024 0 wbStaticTextProxy wxID_STATIC @@ -2436,13 +2435,13 @@ wxStaticText: wxID_STATIC - 18390824 + 26113736 dialog-control-document statictext 0 1 - 18335960 + 26059024 0 wbStaticTextProxy wxID_STATIC @@ -2487,13 +2486,13 @@ wxStaticText: wxID_STATIC - 18406184 + 26129120 dialog-control-document statictext 0 1 - 18335960 + 26059024 0 wbStaticTextProxy wxID_STATIC @@ -2538,13 +2537,13 @@ wxStaticText: wxID_STATIC - 18421616 + 26144504 dialog-control-document statictext 0 1 - 18335960 + 26059024 0 wbStaticTextProxy wxID_STATIC @@ -2592,13 +2591,13 @@ All Rights Reserved. wxStaticText: wxID_STATIC - 18436888 + 26012960 dialog-control-document statictext 0 1 - 18281520 + 26004448 0 wbStaticTextProxy wxID_STATIC @@ -2643,13 +2642,13 @@ All Rights Reserved. wxStaticText: wxID_STATIC - 18451320 + 26173944 dialog-control-document statictext 0 1 - 18281520 + 26004448 0 wbStaticTextProxy wxID_STATIC @@ -2694,13 +2693,13 @@ All Rights Reserved. wxStaticText: wxID_STATIC - 18465824 + 26188488 dialog-control-document statictext 0 1 - 18281520 + 26004448 0 wbStaticTextProxy wxID_STATIC @@ -2745,13 +2744,13 @@ All Rights Reserved. wxStaticLine: wxID_STATIC - 18480768 + 26203480 dialog-control-document staticline 0 1 - 18281520 + 26004448 0 wbStaticLineProxy wxID_STATIC @@ -2793,13 +2792,13 @@ All Rights Reserved. wxButton: wxID_OK - 18494816 + 26217536 dialog-control-document dialogcontrol 0 1 - 18281520 + 26004448 0 wbButtonProxy wxID_OK @@ -2844,13 +2843,13 @@ All Rights Reserved. Connection - 18095400 + 25944176 dialog-document dialog 0 1 - 12672920 + 12873624 0 9/3/2004 wbDialogProxy @@ -2910,13 +2909,13 @@ All Rights Reserved. wxBoxSizer V - 18525560 + 26248296 dialog-control-document sizer 0 1 - 18095400 + 25944176 0 wbBoxSizerProxy Vertical @@ -2935,13 +2934,13 @@ All Rights Reserved. <Any platform> wxBoxSizer H - 18533544 + 26256320 dialog-control-document sizer 0 1 - 18525560 + 26248296 0 wbBoxSizerProxy Horizontal @@ -2960,13 +2959,13 @@ All Rights Reserved. <Any platform> wxBoxSizer V - 18541432 + 26264240 dialog-control-document sizer 0 1 - 18533544 + 26256320 0 wbBoxSizerProxy Vertical @@ -2985,13 +2984,13 @@ All Rights Reserved. <Any platform> wxStaticText: wxID_STATIC - 18550744 + 26273728 dialog-control-document statictext 0 1 - 18541432 + 26264240 0 wbStaticTextProxy wxID_STATIC @@ -3038,13 +3037,13 @@ May it do so now? wxBoxSizer V - 18566048 + 26289056 dialog-control-document sizer 0 1 - 18533544 + 26256320 0 wbBoxSizerProxy Vertical @@ -3063,13 +3062,13 @@ May it do so now? <Any platform> wxButton: wxID_OK - 18572816 + 26295832 dialog-control-document dialogcontrol 0 1 - 18566048 + 26289056 0 wbButtonProxy wxID_OK @@ -3112,13 +3111,13 @@ May it do so now? wxButton: wxID_CANCEL - 18587040 + 26310096 dialog-control-document dialogcontrol 0 1 - 18566048 + 26289056 0 wbButtonProxy wxID_CANCEL @@ -3165,13 +3164,13 @@ May it do so now? Attach to Project - 12905776 + 26035608 dialog-document dialog 0 1 - 12672920 + 12873624 0 9/3/2004 wbDialogProxy @@ -3231,13 +3230,13 @@ May it do so now? wxBoxSizer V - 18616688 + 26339552 dialog-control-document sizer 0 1 - 12905776 + 26035608 0 wbBoxSizerProxy Vertical @@ -3256,13 +3255,13 @@ May it do so now? <Any platform> wxBoxSizer H - 18623784 + 26346608 dialog-control-document sizer 0 1 - 18616688 + 26339552 0 wbBoxSizerProxy Horizontal @@ -3281,13 +3280,13 @@ May it do so now? <Any platform> wxFlexGridSizer - 18632120 + 26355040 dialog-control-document sizer 0 1 - 18623784 + 26346608 0 wbFlexGridSizerProxy @@ -3311,13 +3310,13 @@ May it do so now? FALSE wxStaticText: wxID_STATIC - 18642504 + 26365624 dialog-control-document statictext 0 1 - 18632120 + 26355040 0 wbStaticTextProxy wxID_STATIC @@ -3362,13 +3361,13 @@ May it do so now? wxTextCtrl: ID_PROJECTADDRESS - 18658616 + 26381776 dialog-control-document textctrl 0 1 - 18632120 + 26355040 0 wbTextCtrlProxy ID_PROJECTADDRESS @@ -3428,13 +3427,13 @@ May it do so now? wxStaticText: wxID_STATIC - 18679432 + 26402632 dialog-control-document statictext 0 1 - 18632120 + 26355040 0 wbStaticTextProxy wxID_STATIC @@ -3479,13 +3478,13 @@ May it do so now? wxTextCtrl: ID_PROJECTACCOUNTKEY - 18694824 + 26418088 dialog-control-document textctrl 0 1 - 18632120 + 26355040 0 wbTextCtrlProxy ID_PROJECTACCOUNTKEY @@ -3546,13 +3545,13 @@ May it do so now? wxBoxSizer V - 18715568 + 26438800 dialog-control-document sizer 0 1 - 18623784 + 26346608 0 wbBoxSizerProxy Vertical @@ -3571,13 +3570,13 @@ May it do so now? <Any platform> wxButton: wxID_OK - 18721952 + 26445176 dialog-control-document dialogcontrol 0 1 - 18715568 + 26438800 0 wbButtonProxy wxID_OK @@ -3620,13 +3619,13 @@ May it do so now? wxButton: wxID_CANCEL - 18735496 + 26458720 dialog-control-document dialogcontrol 0 1 - 18715568 + 26438800 0 wbButtonProxy wxID_CANCEL @@ -3674,23 +3673,23 @@ May it do so now? Images - 12644248 + 12849048 html-document bitmapsfolder 1 1 - 12616808 + 12516264 1 Untitled - 12849472 + 12795144 image-document boincsm.xpm image 0 1 - 12644248 + 12849048 0 9/3/2004 100 diff --git a/clientgui/DlgOptions.cpp b/clientgui/DlgOptions.cpp index 13521ad8ab..fc9c91d2a3 100644 --- a/clientgui/DlgOptions.cpp +++ b/clientgui/DlgOptions.cpp @@ -89,6 +89,7 @@ void CDlgOptions::CreateControls() itemDialog1->SetAutoLayout(TRUE); wxNotebook* itemNotebook3 = new wxNotebook; itemNotebook3->Create( itemDialog1, ID_NOTEBOOK, wxDefaultPosition, wxSize(300, 265), wxNB_TOP ); + wxNotebookSizer* itemNotebook3Sizer = new wxNotebookSizer(itemNotebook3); wxPanel* itemPanel4 = new wxPanel; itemPanel4->Create( itemNotebook3, ID_GENERAL, wxDefaultPosition, wxSize(99, 80), wxTAB_TRAVERSAL ); wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxVERTICAL); @@ -219,7 +220,7 @@ void CDlgOptions::CreateControls() itemFlexGridSizer34->Add(itemTextCtrl38, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); itemNotebook3->AddPage(itemPanel23, _("SOCKS Proxy")); - itemBoxSizer2->Add(itemNotebook3, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + itemBoxSizer2->Add(itemNotebook3Sizer, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); wxBoxSizer* itemBoxSizer39 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer2->Add(itemBoxSizer39, 0, wxALIGN_RIGHT|wxALL, 5);