From 0319bc4dfeeff20b730723fd9982faf86bac3bc6 Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Tue, 18 Oct 2011 13:47:36 +0000 Subject: [PATCH] - MGR: More simple GUI text changes - MHR: Reduce clutter in log file clientgui/ sg_BoincSimpleFrame.cpp sg_ProjectPanel.cpp, .h svn path=/trunk/boinc/; revision=24415 --- checkin_notes | 8 ++++++++ clientgui/sg_BoincSimpleFrame.cpp | 9 ++++----- clientgui/sg_ProjectPanel.cpp | 11 +++++++---- clientgui/sg_ProjectPanel.h | 15 ++------------- 4 files changed, 21 insertions(+), 22 deletions(-) diff --git a/checkin_notes b/checkin_notes index b3368d5ae4..602c624116 100644 --- a/checkin_notes +++ b/checkin_notes @@ -7436,3 +7436,11 @@ Charlie 18 Oct 2011 samples/ jpeglib/ jconfig.h + +Rom 18 Oct 2011 + - MGR: More simple GUI text changes + - MHR: Reduce clutter in log file + + clientgui/ + sg_BoincSimpleFrame.cpp + sg_ProjectPanel.cpp, .h diff --git a/clientgui/sg_BoincSimpleFrame.cpp b/clientgui/sg_BoincSimpleFrame.cpp index 6a95b06125..69ad980b90 100755 --- a/clientgui/sg_BoincSimpleFrame.cpp +++ b/clientgui/sg_BoincSimpleFrame.cpp @@ -584,11 +584,10 @@ CSimpleGUIPanel::CSimpleGUIPanel(wxWindow* parent) : checkForNewNoticesTimer->Start(5000); dlgOpen = false; - m_sPauseString = _("Pause"); - m_sResumeString = _("Resume"); - m_sPauseButtonToolTip = _("Stop all activity"); - m_sResumeButtonToolTip = _("Resume activity"); - + m_sPauseString = _("Suspend Computing"); + m_sResumeString = _("Resume Computing"); + m_sPauseButtonToolTip = _("Suspend computational activity"); + m_sResumeButtonToolTip = _("Resume computational activity"); m_taskPanel = new CSimpleTaskPanel(this); m_projPanel = new CSimpleProjectPanel(this); diff --git a/clientgui/sg_ProjectPanel.cpp b/clientgui/sg_ProjectPanel.cpp index f0df266c6f..32468c34a3 100755 --- a/clientgui/sg_ProjectPanel.cpp +++ b/clientgui/sg_ProjectPanel.cpp @@ -117,7 +117,7 @@ CSimpleProjectPanel::CSimpleProjectPanel( wxWindow* parent ) : // m_ProjectSelectionCtrl->SetStringSelection(tempArray[1]); m_ProjectSelectionCtrl->SetSelection(1); #else - m_ProjectSelectionCtrl = new CBOINCBitmapComboBox( this, ID_SGPROJECTSELECTOR, wxT(""), wxDefaultPosition, wxSize(-1, 42), 0, NULL, wxCB_READONLY ); + m_ProjectSelectionCtrl = new CBOINCBitmapComboBox( this, ID_SGPROJECTSELECTOR, wxT(""), wxDefaultPosition, wxSize(-1, 42), 0, NULL, wxCB_READONLY); #endif // TODO: Might want better wording for Project Selection Combo Box tooltip str = _("Select a project to access with the controls below"); @@ -460,9 +460,12 @@ wxBitmap* CSimpleProjectPanel::GetProjectSpecificBitmap(char* project_url) { // Only update if it is project specific is found if(boinc_resolve_filename(GetProjectIconLoc(project_url).c_str(), defaultIcnPath, sizeof(defaultIcnPath)) == 0) { wxBitmap* projectBM = new wxBitmap(); - if ( projectBM->LoadFile(wxString(defaultIcnPath,wxConvUTF8), wxBITMAP_TYPE_ANY) ) { - return projectBM; - } + wxString strIconPath = wxString(defaultIcnPath,wxConvUTF8); + if (wxFile::Exists(strIconPath)) { + if ( projectBM->LoadFile(strIconPath, wxBITMAP_TYPE_ANY) ) { + return projectBM; + } + } } return pSkinSimple->GetProjectImage()->GetBitmap(); } diff --git a/clientgui/sg_ProjectPanel.h b/clientgui/sg_ProjectPanel.h index 996b0ba403..0511553345 100755 --- a/clientgui/sg_ProjectPanel.h +++ b/clientgui/sg_ProjectPanel.h @@ -28,21 +28,10 @@ typedef struct { double project_files_downloaded_time; } ProjectSelectionData; - - /////////////////////////////////////////////////////////////////////////////// /// Class CSimpleProjectPanel /////////////////////////////////////////////////////////////////////////////// -#if 0 -#ifdef __WXMAC__ -#include "MacBitmapComboBox.h" -#else -#define CBOINCBitmapComboBox wxBitmapComboBox -#define EVT_BOINCBITMAPCOMBOBOX EVT_COMBOBOX -#endif -#endif - class CSimpleProjectPanel : public CSimplePanelBase { DECLARE_DYNAMIC_CLASS( CSimpleProjectPanel ) @@ -68,10 +57,10 @@ class CSimpleProjectPanel : public CSimplePanelBase wxBitmap* GetProjectSpecificBitmap(char* project_url); protected: - CTransparentStaticText* m_myProjectsLabel; + CTransparentStaticText* m_myProjectsLabel; CBOINCBitmapComboBox* m_ProjectSelectionCtrl; wxButton* m_TaskAddProjectButton; - CTransparentStaticText* m_TotalCreditValue; + CTransparentStaticText* m_TotalCreditValue; CSimpleProjectWebSitesPopupButton* m_ProjectWebSitesButton; CSimpleProjectCommandPopupButton* m_ProjectCommandsButton; wxString m_sAddProjectString;