Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

*** empty log message *** 

svn path=/trunk/boinc/; revision=6731
This commit is contained in:
Rom Walton 2005-07-21 23:06:02 +00:00
parent 371baf3ec4
commit ee18ccfab3
9 changed files with 511 additions and 604 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
checkin_notes
View File

@ -9387,3 +9387,21 @@ David 21 July 2005
lib/
shmem.C
Rom 21 July 2005
- Update the templates for the dialogs that DialogBlocks uses to maintain
the various dialogs with by removing the resizing flag and close box
flag. Making changes directly on the source files without updating the
templates just causes the loss of the change next time DialogBlocks
is loaded.
clientgui/
BOINCGUI.cst (Added)
BOINCGUI.pjd
DlgAbout.cpp, .h
DlgAccountManagerSignup.cpp, .h
DlgAccountManagerStatus.cpp, .h
DlgAttachProject.cpp, .h
DlgDialupCredentials.cpp, .h
DlgOptions.cpp, .h
DlgSelectComputer.cpp, .h

30
clientgui/BOINCGUI.cst Normal file
View File

@ -0,0 +1,30 @@
[wxHyperLink]
Description=
BaseClass=
IncludeFilename=hyperlink.h
ImageFilename=
TileImage=0
ImageHAlignment=2
ImageVAlignment=2
CustomArguments=%PARENT%, %IDENTIFIER%, %POSITION%, %SIZE%, %STYLE%
CustomCtorArguments=
Styles=
ExtraStyles=
DefaultWidth=-1
DefaultHeight=-1
ShowInheritedProperties=1
IsContainer=0
Label=%Label%
Colour=FFFFFF
BorderStyle=wxSIMPLE_BORDER
[wxHyperLink/Properties]
[wxHyperLink/Properties/Label]
Type=wxString
Kind=0
Editor=default
DefaultValue=
Setter=
Getter=
XRCTag=
Description=
Translateable=1

980
clientgui/BOINCGUI.pjd
View File

File diff suppressed because it is too large Load Diff

67
clientgui/DlgAbout.cpp
View File

@ -78,7 +78,7 @@ bool CDlgAbout::Create(wxWindow* parent, wxWindowID id, const wxString& caption,
////@begin CDlgAbout creation
SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS);
wxDialog::Create(parent, id, caption, pos, size, style);
wxDialog::Create( parent, id, caption, pos, size, style );
CreateControls();
GetSizer()->Fit(this);
@ -94,16 +94,15 @@ bool CDlgAbout::Create(wxWindow* parent, wxWindowID id, const wxString& caption,
void CDlgAbout::CreateControls() {
////@begin CDlgAbout content construction
CDlgAbout* itemDialog1 = this;
wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL);
itemDialog1->SetSizer(itemBoxSizer2);
wxStaticText* itemStaticText3 = new wxStaticText;
itemStaticText3->Create(itemDialog1, wxID_STATIC, _("BOINC Manager"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE);
itemStaticText3->SetFont(wxFont(16, wxDEFAULT, wxNORMAL, wxBOLD, FALSE, _T("")));
itemBoxSizer2->Add(itemStaticText3, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5);
itemStaticText3->Create( itemDialog1, wxID_STATIC, _("BOINC Manager"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
itemStaticText3->SetFont(wxFont(24, wxDEFAULT, wxNORMAL, wxBOLD, FALSE, _T("")));
itemBoxSizer2->Add(itemStaticText3, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
wxBoxSizer* itemBoxSizer4 = new wxBoxSizer(wxHORIZONTAL);
itemBoxSizer2->Add(itemBoxSizer4, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
@ -111,44 +110,53 @@ void CDlgAbout::CreateControls() {
wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxVERTICAL);
itemBoxSizer4->Add(itemBoxSizer5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxBitmap itemStaticBitmap6Bitmap(itemDialog1->GetBitmapResource(wxT("res/boincsm.xpm")));
wxStaticBitmap* itemStaticBitmap6 = new wxStaticBitmap;
itemStaticBitmap6->Create( itemDialog1, wxID_STATIC, itemStaticBitmap6Bitmap, wxDefaultPosition, wxSize(50, 50), 0 );
itemBoxSizer5->Add(itemStaticBitmap6, 0, wxALIGN_LEFT|wxALL, 5);
wxFlexGridSizer* itemFlexGridSizer7 = new wxFlexGridSizer(0, 2, 0, 0);
itemBoxSizer4->Add(itemFlexGridSizer7, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxStaticText* itemStaticText8 = new wxStaticText;
itemStaticText8->Create(itemDialog1, wxID_STATIC, _("Version:"), wxDefaultPosition, wxDefaultSize, 0);
itemFlexGridSizer7->Add(itemStaticText8, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
itemStaticText8->Create( itemDialog1, wxID_STATIC, _("Version:"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer7->Add(itemStaticText8, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
wxStaticText* itemStaticText9 = new wxStaticText;
itemStaticText9->Create(itemDialog1, wxID_STATIC, _T(""), wxDefaultPosition, wxDefaultSize, 0);
itemFlexGridSizer7->Add(itemStaticText9, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
itemStaticText9->Create( itemDialog1, wxID_STATIC, _T(""), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer7->Add(itemStaticText9, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
wxStaticText* itemStaticText10 = new wxStaticText;
itemStaticText10->Create( itemDialog1, wxID_STATIC, _("Copyright:"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer7->Add(itemStaticText10, 0, wxALIGN_RIGHT|wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
wxStaticText* itemStaticText11 = new wxStaticText;
itemStaticText11->Create( itemDialog1, wxID_STATIC, _("(C) 2005 University of California at Berkeley.\nAll Rights Reserved."), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer7->Add(itemStaticText11, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
wxStaticText* itemStaticText12 = new wxStaticText;
itemStaticText12->Create(itemDialog1, wxID_STATIC, _("Copyright:"), wxDefaultPosition, wxDefaultSize, 0);
itemFlexGridSizer7->Add(itemStaticText12, 0, wxALIGN_RIGHT|wxALIGN_TOP|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
itemStaticText12->Create( itemDialog1, wxID_STATIC, _("Berkeley Open Infrastructure for Network Computing"), wxDefaultPosition, wxDefaultSize, 0 );
itemBoxSizer2->Add(itemStaticText12, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
wxStaticText* itemStaticText13 = new wxStaticText;
itemStaticText13->Create(itemDialog1, wxID_STATIC, _("(C) 2005 University of California at Berkeley.\nAll Rights Reserved."), wxDefaultPosition, wxDefaultSize, 0);
itemFlexGridSizer7->Add(itemStaticText13, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
itemStaticText13->Create( itemDialog1, wxID_STATIC, _("A software platform for distributed computing using volunteered computer resources"), wxDefaultPosition, wxDefaultSize, 0 );
itemBoxSizer2->Add(itemStaticText13, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
wxStaticText* itemStaticText14 = new wxStaticText;
itemStaticText14->Create(itemDialog1, wxID_STATIC, _("Berkeley Open Infrastructure for Network Computing"), wxDefaultPosition, wxDefaultSize, 0);
itemBoxSizer2->Add(itemStaticText14, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxADJUST_MINSIZE, 5);
wxHyperLink* itemHyperLink14 = new wxHyperLink;
itemHyperLink14->Create( itemDialog1, ID_BOINCLINK, wxT("http://boinc.berkeley.edu/"), wxDefaultPosition, wxDefaultSize, wxNO_BORDER );
itemBoxSizer2->Add(itemHyperLink14, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
wxStaticText* itemStaticText16 = new wxStaticText;
itemStaticText16->Create(itemDialog1, wxID_STATIC, _("http://boinc.berkeley.edu/"), wxDefaultPosition, wxDefaultSize, 0);
itemBoxSizer2->Add(itemStaticText16, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxADJUST_MINSIZE, 5);
wxStaticLine* itemStaticLine15 = new wxStaticLine;
itemStaticLine15->Create( itemDialog1, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
itemBoxSizer2->Add(itemStaticLine15, 0, wxGROW|wxALL, 5);
wxStaticLine* itemStaticLine17 = new wxStaticLine;
itemStaticLine17->Create(itemDialog1, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL);
itemBoxSizer2->Add(itemStaticLine17, 0, wxGROW|wxALL, 5);
wxButton* itemButton18 = new wxButton;
itemButton18->Create(itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0);
itemButton18->SetDefault();
itemBoxSizer2->Add(itemButton18, 0, wxALIGN_RIGHT|wxALL, 5);
wxButton* itemButton16 = new wxButton;
itemButton16->Create( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
itemButton16->SetDefault();
itemBoxSizer2->Add(itemButton16, 0, wxALIGN_RIGHT|wxALL, 5);
// Set validators
itemStaticText9->SetValidator(wxGenericValidator(& m_strVersion));
itemStaticText9->SetValidator( wxGenericValidator(& m_strVersion) );
////@end CDlgAbout content construction
}
@ -167,7 +175,8 @@ bool CDlgAbout::ShowToolTips() {
wxBitmap CDlgAbout::GetBitmapResource(const wxString& name) {
// Bitmap retrieval
////@begin CDlgAbout bitmap retrieval
if (name == wxT("res/boincsm.xpm")) {
if (name == wxT("res/boincsm.xpm"))
{
wxBitmap bitmap(boincsm_xpm);
return bitmap;
}

2
clientgui/DlgAbout.h
View File

@ -30,6 +30,7 @@
////@begin includes
#include "wx/valgen.h"
#include "hyperlink.h"
#include "wx/statline.h"
////@end includes
@ -51,6 +52,7 @@
#define SYMBOL_CDLGABOUT_IDNAME ID_DIALOG
#define SYMBOL_CDLGABOUT_SIZE wxSize(400, 300)
#define SYMBOL_CDLGABOUT_POSITION wxDefaultPosition
#define ID_BOINCLINK 10031
////@end control identifiers
/*!

7
clientgui/DlgAttachProject.cpp
View File

@ -94,7 +94,6 @@ bool CDlgAttachProject::Create( wxWindow* parent, wxWindowID id, const wxString&
void CDlgAttachProject::CreateControls()
{
////@begin CDlgAttachProject content construction
CDlgAttachProject* itemDialog1 = this;
wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL);
@ -111,7 +110,7 @@ void CDlgAttachProject::CreateControls()
wxStaticText* itemStaticText6 = new wxStaticText;
itemStaticText6->Create( itemDialog1, wxID_STATIC, _("URL:"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer5->Add(itemStaticText6, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5);
itemFlexGridSizer5->Add(itemStaticText6, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
m_ProjectAddressCtrl = new wxTextCtrl;
m_ProjectAddressCtrl->Create( itemDialog1, ID_PROJECTADDRESS, _T(""), wxDefaultPosition, wxSize(200, -1), 0 );
@ -119,7 +118,7 @@ void CDlgAttachProject::CreateControls()
wxStaticText* itemStaticText8 = new wxStaticText;
itemStaticText8->Create( itemDialog1, wxID_STATIC, _("Account Key:"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer5->Add(itemStaticText8, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5);
itemFlexGridSizer5->Add(itemStaticText8, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
m_ProjectAccountKeyCtrl = new wxTextCtrl;
m_ProjectAccountKeyCtrl->Create( itemDialog1, ID_PROJECTACCOUNTKEY, _T(""), wxDefaultPosition, wxSize(200, -1), 0 );
@ -127,7 +126,7 @@ void CDlgAttachProject::CreateControls()
wxStaticText* itemStaticText10 = new wxStaticText;
itemStaticText10->Create( itemDialog1, wxID_STATIC, _("These are emailed to you when you create an account.\nGo to project web sites to create accounts.\nVisit http://boinc.berkeley.edu for a list of projects."), wxDefaultPosition, wxDefaultSize, 0 );
itemBoxSizer4->Add(itemStaticText10, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxADJUST_MINSIZE, 5);
itemBoxSizer4->Add(itemStaticText10, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
wxBoxSizer* itemBoxSizer11 = new wxBoxSizer(wxVERTICAL);
itemFlexGridSizer3->Add(itemBoxSizer11, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_TOP|wxALL, 5);

2
clientgui/DlgDialupCredentials.h
View File

@ -45,7 +45,7 @@
////@begin control identifiers
#define ID_DIALOG 10000
#define SYMBOL_CDLGDIALUPCREDENTIALS_STYLE wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX
#define SYMBOL_CDLGDIALUPCREDENTIALS_STYLE wxCAPTION|wxSYSTEM_MENU
#define SYMBOL_CDLGDIALUPCREDENTIALS_TITLE _("Dialup Logon")
#define SYMBOL_CDLGDIALUPCREDENTIALS_IDNAME ID_DIALOG
#define SYMBOL_CDLGDIALUPCREDENTIALS_SIZE wxSize(400, 300)

4
clientgui/DlgOptions.h
View File

@ -45,9 +45,7 @@
////@begin control identifiers
#define ID_DIALOG 10000
// Temporarily allow resizong until size is fixed -- CAF
//#define SYMBOL_CDLGOPTIONS_STYLE wxCAPTION|wxSYSTEM_MENU
#define SYMBOL_CDLGOPTIONS_STYLE wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU
#define SYMBOL_CDLGOPTIONS_STYLE wxCAPTION|wxSYSTEM_MENU
#define SYMBOL_CDLGOPTIONS_TITLE _("Options")
#define SYMBOL_CDLGOPTIONS_IDNAME ID_DIALOG
#define SYMBOL_CDLGOPTIONS_SIZE wxDefaultSize

5
clientgui/DlgSelectComputer.cpp
View File

@ -92,7 +92,6 @@ bool CDlgSelectComputer::Create( wxWindow* parent, wxWindowID id, const wxString
void CDlgSelectComputer::CreateControls()
{
////@begin CDlgSelectComputer content construction
CDlgSelectComputer* itemDialog1 = this;
wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL);
@ -109,7 +108,7 @@ void CDlgSelectComputer::CreateControls()
wxStaticText* itemStaticText6 = new wxStaticText;
itemStaticText6->Create( itemDialog1, wxID_STATIC, _("Host name:"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer5->Add(itemStaticText6, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5);
itemFlexGridSizer5->Add(itemStaticText6, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxString* m_ComputerNameCtrlStrings = NULL;
m_ComputerNameCtrl = new wxComboBox;
@ -118,7 +117,7 @@ void CDlgSelectComputer::CreateControls()
wxStaticText* itemStaticText8 = new wxStaticText;
itemStaticText8->Create( itemDialog1, wxID_STATIC, _("Password:"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer5->Add(itemStaticText8, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5);
itemFlexGridSizer5->Add(itemStaticText8, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
m_ComputerPasswordCtrl = new wxTextCtrl;
m_ComputerPasswordCtrl->Create( itemDialog1, ID_SELECTCOMPUTERPASSWORD, _T(""), wxDefaultPosition, wxSize(250, -1), wxTE_PASSWORD );