mirror of https://github.com/BOINC/boinc.git
- 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 svn path=/trunk/boinc/; revision=15067
This commit is contained in:
parent
fa6d38a51e
commit
5a46215511
|
@ -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
|
||||
|
|
|
@ -263,6 +263,7 @@ int VERSION_INFO::parse(MIOFILE& in) {
|
|||
if (parse_int(buf, "<major>", major)) continue;
|
||||
if (parse_int(buf, "<minor>", minor)) continue;
|
||||
if (parse_int(buf, "<release>", release)) continue;
|
||||
if (parse_bool(buf, "<prerelease>", prerelease)) continue;
|
||||
}
|
||||
return ERR_XML_PARSE;
|
||||
}
|
||||
|
@ -273,8 +274,9 @@ void VERSION_INFO::write(MIOFILE& out) {
|
|||
" <major>%d</major>\n"
|
||||
" <minor>%d</minor>\n"
|
||||
" <release>%d</release>\n"
|
||||
" <prerelease>%d</prerelease>\n"
|
||||
"</version>\n",
|
||||
major, minor, release
|
||||
major, minor, release, prerelease
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -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());
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -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(
|
||||
|
|
|
@ -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(
|
||||
|
|
|
@ -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(
|
||||
|
|
|
@ -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&);
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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@"
|
||||
|
|
Loading…
Reference in New Issue