diff --git a/checkin_notes b/checkin_notes index b64914d423..6d54d227a1 100755 --- a/checkin_notes +++ b/checkin_notes @@ -26915,3 +26915,15 @@ David 8 April 2005 app_graphics.C html/inc/ host.inc + +David 8 April 2005 + - Manager: removed extraneous stuff from About box + - Manager: don't show version number in status bar + + clientgui/ + DlgAbout.cpp + DlgSelectComputer.cpp + MainFrame.cpp + lib/ + gui_rpc_client.C + diff --git a/clientgui/DlgAbout.cpp b/clientgui/DlgAbout.cpp index b8295b07cb..fea54762c0 100644 --- a/clientgui/DlgAbout.cpp +++ b/clientgui/DlgAbout.cpp @@ -110,8 +110,8 @@ void CDlgAbout::CreateControls() { wxStaticText* itemStaticText3 = new wxStaticText; 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|wxADJUST_MINSIZE, 5); + itemStaticText3->SetFont(wxFont(16, wxDEFAULT, wxNORMAL, wxBOLD, FALSE, _T(""))); + itemBoxSizer2->Add(itemStaticText3, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); wxBoxSizer* itemBoxSizer4 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer2->Add(itemBoxSizer4, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); @@ -119,11 +119,6 @@ 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); @@ -135,14 +130,6 @@ void CDlgAbout::CreateControls() { itemStaticText9->Create(itemDialog1, wxID_STATIC, _T(""), wxDefaultPosition, wxDefaultSize, 0); itemFlexGridSizer7->Add(itemStaticText9, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5); - wxStaticText* itemStaticText10 = new wxStaticText; - itemStaticText10->Create(itemDialog1, wxID_STATIC, _("Licence type:"), wxDefaultPosition, wxDefaultSize, 0); - itemFlexGridSizer7->Add(itemStaticText10, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5); - - wxStaticText* itemStaticText11 = new wxStaticText; - itemStaticText11->Create(itemDialog1, wxID_STATIC, _("Lesser GNU Public License"), wxDefaultPosition, wxDefaultSize, 0); - itemFlexGridSizer7->Add(itemStaticText11, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 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); @@ -155,10 +142,6 @@ void CDlgAbout::CreateControls() { 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); - wxStaticText* itemStaticText15 = new wxStaticText; - itemStaticText15->Create(itemDialog1, wxID_STATIC, _("A software platform for distributed computing using volunteered computer resources"), wxDefaultPosition, wxDefaultSize, 0); - itemBoxSizer2->Add(itemStaticText15, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxADJUST_MINSIZE, 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); diff --git a/clientgui/DlgSelectComputer.cpp b/clientgui/DlgSelectComputer.cpp index 388e7cb07a..9d31a6ebe8 100644 --- a/clientgui/DlgSelectComputer.cpp +++ b/clientgui/DlgSelectComputer.cpp @@ -154,8 +154,7 @@ void CDlgSelectComputer::CreateControls() * Should we show tooltips? */ -bool CDlgSelectComputer::ShowToolTips() -{ +bool CDlgSelectComputer::ShowToolTips(){ return TRUE; } diff --git a/clientgui/MainFrame.cpp b/clientgui/MainFrame.cpp index 80eae7b0b9..ef6944eb41 100644 --- a/clientgui/MainFrame.cpp +++ b/clientgui/MainFrame.cpp @@ -1136,8 +1136,7 @@ void CMainFrame::OnConnectError(CMainFrameEvent&) { wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnConnectError - Function Begin")); ::wxMessageBox( - _("The BOINC client you have attempted to connect too could not be reached. Please " - "check the computer name/password and try again."), + _("Connection failed.\nIf using a Client Firewall, please try again."), _("Connection Error"), wxICON_ERROR ); @@ -1328,12 +1327,8 @@ void CMainFrame::OnFrameRender(wxTimerEvent &event) { strTitle.Printf(_("%s - (%s)"), m_strBaseTitle.c_str(), strComputerName.c_str()); strStatusText.Printf(_("Connecting to %s"), strComputerName.c_str()); } else { - setlocale(LC_NUMERIC, "C"); - strBuffer.Printf(wxT("%.2f"), pDoc->GetCoreClientVersion()/100.0); - setlocale(LC_NUMERIC, strLocale.c_str()); - strTitle.Printf(_("%s - (%s)"), m_strBaseTitle.c_str(), strComputerName.c_str()); - strStatusText.Printf(_("Connected to %s (%s)"), strComputerName.c_str(), strBuffer.c_str()); + strStatusText.Printf(_("Connected to %s"), strComputerName.c_str()); } SetTitle(strTitle); diff --git a/lib/gui_rpc_client.C b/lib/gui_rpc_client.C index e75e2dd4fa..4f9f7e0eb7 100644 --- a/lib/gui_rpc_client.C +++ b/lib/gui_rpc_client.C @@ -975,11 +975,14 @@ int RPC_CLIENT::init(const char* host) { } retval = connect(sock, (const sockaddr*)(&addr), sizeof(addr)); if (retval) { +#ifdef _WIN32 + printf( "connect 1: Windows Socket Error '%d'\n", WSAGetLastError() ); +#endif addr.sin_port = htons(GUI_RPC_PORT); retval = connect(sock, (const sockaddr*)(&addr), sizeof(addr)); if (retval) { #ifdef _WIN32 - printf( "Windows Socket Error '%d'\n", WSAGetLastError() ); + printf( "connect 2: Windows Socket Error '%d'\n", WSAGetLastError() ); #endif perror("connect"); close();