diff --git a/checkin_notes b/checkin_notes index 3a76be732c..735f9b9f52 100644 --- a/checkin_notes +++ b/checkin_notes @@ -3288,3 +3288,27 @@ David April 17 2008 coproc.C,h sched/ Makefile.am + +Rom April 17 2008 + - MGR: Make help system work again + - MGR: Add pre-release to the BOINC Manager title bar and about + dialog if it is a pre-release version of BOINC. + - CLI: Add some pre-release text to the CC startup routine and + suggest they revert back to a released build if they don't + plan on testing the client. + + / + version.h + version.h.in + client/ + auto_update.C + client_state.C + clientgui/ + AdvancedFrame.cpp + DlgAbout.cpp + sg_BoincSimpleGUI.cpp + sg_DlgMessages.cpp + sg_DlgPreferences.cpp + SkinManager.cpp + lib/ + common_defs.h diff --git a/client/auto_update.C b/client/auto_update.C index 9b0b9d28b3..d30c0047f6 100644 --- a/client/auto_update.C +++ b/client/auto_update.C @@ -263,6 +263,7 @@ int VERSION_INFO::parse(MIOFILE& in) { if (parse_int(buf, "", major)) continue; if (parse_int(buf, "", minor)) continue; if (parse_int(buf, "", release)) continue; + if (parse_bool(buf, "", prerelease)) continue; } return ERR_XML_PARSE; } @@ -273,8 +274,9 @@ void VERSION_INFO::write(MIOFILE& out) { " %d\n" " %d\n" " %d\n" + " %d\n" "\n", - major, minor, release + major, minor, release, prerelease ); } diff --git a/client/client_state.C b/client/client_state.C index 4ab85dacce..e4401d7397 100644 --- a/client/client_state.C +++ b/client/client_state.C @@ -82,6 +82,7 @@ CLIENT_STATE::CLIENT_STATE(): core_client_version.major = BOINC_MAJOR_VERSION; core_client_version.minor = BOINC_MINOR_VERSION; core_client_version.release = BOINC_RELEASE; + core_client_version.prerelease = BOINC_PRERELEASE; exit_after_app_start_secs = 0; app_started = 0; exit_before_upload = false; @@ -183,6 +184,13 @@ int CLIENT_STATE::init() { #endif ); + if (core_client_version.prerelease) { + msg_printf(NULL, MSG_USER_ERROR, "Pre-release Software: This version of BOINC is a development version and may not function properly."); + msg_printf(NULL, MSG_USER_ERROR, "This version is not supported through the normal support methods."); + msg_printf(NULL, MSG_USER_ERROR, "Report any problems to boinc_alpha@ssl.berkeley.edu."); + msg_printf(NULL, MSG_USER_ERROR, "If you did not intend to help test BOINC download and install the latest non-development release."); + } + log_flags.show(); msg_printf(NULL, MSG_INFO, "Libraries: %s", curl_version()); diff --git a/clientgui/AdvancedFrame.cpp b/clientgui/AdvancedFrame.cpp index b4a9eb1729..cd27a7b1b7 100644 --- a/clientgui/AdvancedFrame.cpp +++ b/clientgui/AdvancedFrame.cpp @@ -1189,7 +1189,7 @@ void CAdvancedFrame::OnSelectComputer(wxCommandEvent& WXUNUSED(event)) { // Connect to the remote machine wxString sHost = dlg.m_ComputerNameCtrl->GetValue(); long lPort = GUI_RPC_PORT; - int iPos = sHost.find(_(":")); + size_t iPos = sHost.find(_(":")); if (iPos != -1) { wxString sPort = sHost.substr(iPos + 1); if (!sPort.ToLong(&lPort)) lPort = GUI_RPC_PORT; @@ -1683,7 +1683,6 @@ void CAdvancedFrame::OnHelp(wxHelpEvent& event) { if (IsShown()) { std::string url; url = wxGetApp().GetSkinManager()->GetAdvanced()->GetOrganizationHelpUrl().mb_str(); - canonicalize_master_url(url); wxString wxurl; wxurl.Printf( @@ -1705,7 +1704,6 @@ void CAdvancedFrame::OnHelpBOINC(wxCommandEvent& event) { if (IsShown()) { std::string url; url = wxGetApp().GetSkinManager()->GetAdvanced()->GetOrganizationHelpUrl().mb_str(); - canonicalize_master_url(url); wxString wxurl; wxurl.Printf( @@ -1990,11 +1988,11 @@ void CAdvancedFrame::OnFrameRender(wxTimerEvent &event) { strComputerName = wxT("localhost"); } + strTitle.Printf(_("%s - (%s)"), m_strBaseTitle.c_str(), strComputerName.c_str()); + if (pDoc->IsReconnecting()) { - strTitle.Printf(_("%s - (%s)"), m_strBaseTitle.c_str(), strComputerName.c_str()); strStatusText.Printf(_("Connecting to %s"), strComputerName.c_str()); } else { - strTitle.Printf(_("%s - (%s)"), m_strBaseTitle.c_str(), strComputerName.c_str()); strStatusText.Printf( _("Connected to %s (%s)"), strComputerName.c_str(), @@ -2004,8 +2002,9 @@ void CAdvancedFrame::OnFrameRender(wxTimerEvent &event) { // The Mac takes a huge performance hit redrawing this window, // window, so don't change the text unless we really have too. - if (GetTitle() != strTitle) + if (GetTitle() != strTitle) { SetTitle(strTitle); + } if (strStatusText != strCachedStatusText) { strCachedStatusText = strStatusText; diff --git a/clientgui/DlgAbout.cpp b/clientgui/DlgAbout.cpp index 3e44422f09..7894a7d2ad 100644 --- a/clientgui/DlgAbout.cpp +++ b/clientgui/DlgAbout.cpp @@ -165,7 +165,7 @@ void CDlgAbout::CreateControls() { itemFlexGridSizer7->Add(itemStaticText10, 0, wxALIGN_RIGHT|wxALIGN_TOP|wxLEFT|wxRIGHT, 5); wxStaticText* itemStaticText11 = new wxStaticText; - itemStaticText11->Create( itemDialog1, wxID_STATIC, _("(C) 2003-2007 University of California, Berkeley.\nAll Rights Reserved."), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText11->Create( itemDialog1, wxID_STATIC, _("(C) 2003-2008 University of California, Berkeley.\nAll Rights Reserved."), wxDefaultPosition, wxDefaultSize, 0 ); itemFlexGridSizer7->Add(itemStaticText11, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5); m_AboutBOINCSloganCtrl = new wxStaticText; diff --git a/clientgui/SkinManager.cpp b/clientgui/SkinManager.cpp index 9c2f262d7e..271f0516c2 100644 --- a/clientgui/SkinManager.cpp +++ b/clientgui/SkinManager.cpp @@ -30,6 +30,7 @@ #include "BOINCGUIApp.h" #include "BOINCBaseFrame.h" #include "SkinManager.h" +#include "version.h" ////@begin XPM images @@ -909,7 +910,11 @@ int CSkinAdvanced::Parse(MIOFILE& in) { wxString CSkinAdvanced::GetApplicationName() { - return m_strApplicationName; + wxString strApplicationName = m_strApplicationName; +#ifdef BOINC_PRERELEASE + strApplicationName += wxT(" (Pre-release)"); +#endif + return strApplicationName; } diff --git a/clientgui/sg_BoincSimpleGUI.cpp b/clientgui/sg_BoincSimpleGUI.cpp index e802175e0a..5d68ddd0e8 100644 --- a/clientgui/sg_BoincSimpleGUI.cpp +++ b/clientgui/sg_BoincSimpleGUI.cpp @@ -282,7 +282,6 @@ void CSimpleFrame::OnHelp(wxHelpEvent& event) { if (IsShown()) { std::string url; url = wxGetApp().GetSkinManager()->GetAdvanced()->GetOrganizationHelpUrl().mb_str(); - canonicalize_master_url(url); wxString wxurl; wxurl.Printf( @@ -304,7 +303,6 @@ void CSimpleFrame::OnHelpBOINCManager(wxCommandEvent& event) { if (IsShown()) { std::string url; url = wxGetApp().GetSkinManager()->GetAdvanced()->GetOrganizationHelpUrl().mb_str(); - canonicalize_master_url(url); wxString wxurl; wxurl.Printf( diff --git a/clientgui/sg_DlgMessages.cpp b/clientgui/sg_DlgMessages.cpp index 2e6c026b10..ece744c107 100644 --- a/clientgui/sg_DlgMessages.cpp +++ b/clientgui/sg_DlgMessages.cpp @@ -462,7 +462,6 @@ void CPanelMessages::OnButtonHelp( wxCommandEvent& event ) { std::string url; url = wxGetApp().GetSkinManager()->GetAdvanced()->GetOrganizationHelpUrl().mb_str(); - canonicalize_master_url(url); wxString wxurl; wxurl.Printf( diff --git a/clientgui/sg_DlgPreferences.cpp b/clientgui/sg_DlgPreferences.cpp index ce8ca8089f..e8bba66c4a 100644 --- a/clientgui/sg_DlgPreferences.cpp +++ b/clientgui/sg_DlgPreferences.cpp @@ -1069,7 +1069,6 @@ void CDlgPreferences::OnHelp(wxHelpEvent& event) { if (IsShown()) { std::string url; url = wxGetApp().GetSkinManager()->GetAdvanced()->GetOrganizationHelpUrl().mb_str(); - canonicalize_master_url(url); wxString wxurl; wxurl.Printf( diff --git a/lib/common_defs.h b/lib/common_defs.h index 678692840f..fd7d5d7449 100644 --- a/lib/common_defs.h +++ b/lib/common_defs.h @@ -177,6 +177,7 @@ struct VERSION_INFO { int major; int minor; int release; + bool prerelease; int parse(MIOFILE&); void write(MIOFILE&); bool greater_than(VERSION_INFO&); diff --git a/version.h b/version.h index bf46647305..0c3b61172d 100644 --- a/version.h +++ b/version.h @@ -15,6 +15,9 @@ /* String representation of BOINC version number */ #define BOINC_VERSION_STRING "6.1.15" +/* Package is a pre-release (Alpha/Beta) package */ +#define BOINC_PRERELEASE 1 + #if (defined(_WIN32) || defined(__APPLE__)) /* Name of package */ #define PACKAGE "boinc" diff --git a/version.h.in b/version.h.in index ebafdb83f3..ca1b11af03 100644 --- a/version.h.in +++ b/version.h.in @@ -15,6 +15,9 @@ /* String representation of BOINC version number */ #define BOINC_VERSION_STRING "@BOINC_VERSION_STRING@" +/* Package is a pre-release (Alpha/Beta) package */ +#define BOINC_PRERELEASE 1 + #if (defined(_WIN32) || defined(__APPLE__)) /* Name of package */ #define PACKAGE "@PACKAGE@"