From 59dfa42f2cb35f2cb806712009dd05a95f11d114 Mon Sep 17 00:00:00 2001 From: Kevin Reed Date: Thu, 9 Nov 2006 22:22:54 +0000 Subject: [PATCH] - BSG: Fix bug that didn't allow the messages window to close when the red X was clicked - BSG: Added better text to status messages and tooltips - BSG: Increased slide show timer to 10 seconds svn path=/trunk/boinc/; revision=11507 --- checkin_notes | 16 +++++++++++++--- clientgui/sg_DlgMessages.cpp | 2 +- clientgui/sg_ImageButton.cpp | 2 +- clientgui/sg_ProjectsComponent.cpp | 14 +++++++------- clientgui/sg_ViewTabPage.cpp | 2 +- 5 files changed, 23 insertions(+), 13 deletions(-) diff --git a/checkin_notes b/checkin_notes index c6bc8a33df..b2f3106565 100755 --- a/checkin_notes +++ b/checkin_notes @@ -12424,9 +12424,6 @@ Kevin 8 Nov 2006 - BSG: Remove workunit name - BSG: Formatting changes to text on main screen - BSG: Re-arrange the layout on the main screen - - lib/ - parse.C David 8 Nov 2006 - API: move is_graphics_possible() from boinc_api.C to graphics_lib.C @@ -12478,3 +12475,16 @@ David 9 Nov 2006 clientgui/ ValidateEmailAddress.cpp + +Kevin 9 Nov 2006 + - BSG: Fix bug that didn't allow the messages window + to close when the red X was clicked + - BSG: Added better text to status messages and tooltips + - BSG: Increased slide show timer to 10 seconds + + clientgui/ + sg_DlgMessages.cpp + sg_ImageButton.cpp + sg_ProjectsComponent.cpp + sg_ViewTabPage.cpp + diff --git a/clientgui/sg_DlgMessages.cpp b/clientgui/sg_DlgMessages.cpp index d1f5cc2c11..57fa528399 100644 --- a/clientgui/sg_DlgMessages.cpp +++ b/clientgui/sg_DlgMessages.cpp @@ -45,7 +45,7 @@ enum #define COLUMN_TIME 1 #define COLUMN_MESSAGE 2 -BEGIN_EVENT_TABLE( CDlgMessages,wxWindow) +BEGIN_EVENT_TABLE( CDlgMessages,wxDialog) EVT_BUTTON(-1,CDlgMessages::OnBtnClick) END_EVENT_TABLE() // end events diff --git a/clientgui/sg_ImageButton.cpp b/clientgui/sg_ImageButton.cpp index 87e99da0d8..0d4b3aff70 100644 --- a/clientgui/sg_ImageButton.cpp +++ b/clientgui/sg_ImageButton.cpp @@ -92,7 +92,7 @@ wxString CImageButton::GetStatusText() { } else if ( status == TAB_STATUS_PREEMPTED ) { return wxString(_T("Paused: Other work running")); } else if ( status == TAB_STATUS_PAUSED_USER_REQ ) { - return wxString(_T("Paused: User initiatied")); + return wxString(_T("Paused: User initiatied. Click 'Resume' to continue")); } else if ( status == TAB_STATUS_PAUSED_USER_ACTIVE ) { return wxString(_T("Paused: User active")); } else if ( status == TAB_STATUS_PAUSED_POWER ) { diff --git a/clientgui/sg_ProjectsComponent.cpp b/clientgui/sg_ProjectsComponent.cpp index 4b734b193c..ca4bac1e87 100644 --- a/clientgui/sg_ProjectsComponent.cpp +++ b/clientgui/sg_ProjectsComponent.cpp @@ -91,7 +91,7 @@ void CProjectsComponent::CreateComponent() //Static content in my Projects section // add project button - wxToolTip *ttAddProject = new wxToolTip(_("Add Project")); + wxToolTip *ttAddProject = new wxToolTip(_("Attach to an additional project")); btnAddProj=new wxBitmapButton( this, -1, @@ -140,7 +140,7 @@ void CProjectsComponent::CreateComponent() // //// Messages Play Pause Btns - wxToolTip *ttMessages = new wxToolTip(_("Messages")); + wxToolTip *ttMessages = new wxToolTip(_("Open a window to view messages")); btnMessages = new wxBitmapButton( this, -1, @@ -151,7 +151,7 @@ void CProjectsComponent::CreateComponent() ); btnMessages->SetToolTip(ttMessages); - wxToolTip *ttAlertMessages = new wxToolTip(_("Messages")); + wxToolTip *ttAlertMessages = new wxToolTip(_("Open a window to view messages")); btnAlertMessages = new wxBitmapButton( this, -1, @@ -169,7 +169,7 @@ void CProjectsComponent::CreateComponent() i_spacer->LoadImage(*(pSkinSimple->GetSpacerImage()->GetBitmap())); // pause btn - wxToolTip *ttPause = new wxToolTip(_("Pause all processing")); + wxToolTip *ttPause = new wxToolTip(_("Stop all activity")); btnPause = new wxBitmapButton( this, -1, @@ -181,7 +181,7 @@ void CProjectsComponent::CreateComponent() btnPause->SetToolTip(ttPause); // resume btn - wxToolTip *ttResume = new wxToolTip(_("Resume all Processing")); + wxToolTip *ttResume = new wxToolTip(_("Resume activity")); btnResume = new wxBitmapButton( this, -1, @@ -212,7 +212,7 @@ void CProjectsComponent::CreateComponent() i_spacer->LoadImage(*(pSkinSimple->GetSpacerImage()->GetBitmap())); // Pref Btn - wxToolTip *ttPreferences = new wxToolTip(_("Preferences")); + wxToolTip *ttPreferences = new wxToolTip(_("Open a window to set your preferences")); btnPreferences = new wxBitmapButton( this, ID_SIMPLE_PREFERENCES, @@ -229,7 +229,7 @@ void CProjectsComponent::CreateComponent() i_spacer->LoadImage(*(pSkinSimple->GetSpacerImage()->GetBitmap())); // Advanced View - wxToolTip *ttAdvView = new wxToolTip(_("Advanced View")); + wxToolTip *ttAdvView = new wxToolTip(_("Switch to the BOINC advanced view")); btnAdvancedView = new wxBitmapButton( this, -1, diff --git a/clientgui/sg_ViewTabPage.cpp b/clientgui/sg_ViewTabPage.cpp index 1e264f9fd4..1e8705e166 100644 --- a/clientgui/sg_ViewTabPage.cpp +++ b/clientgui/sg_ViewTabPage.cpp @@ -679,7 +679,7 @@ WorkunitNotebook::WorkunitNotebook(wxWindow* parent, wxWindowID id, const wxPoin SetImageList(&m_ImageList); changeSlideTimer = new wxTimer(this, ID_CHANGE_SLIDE_TIMER); - changeSlideTimer->Start(5000); + changeSlideTimer->Start(10000); Update();