Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

MGR: Fixes to new Simple GUI for Windows 

svn path=/trunk/boinc/; revision=23539
This commit is contained in:
Charlie Fenton 2011-05-13 12:51:29 +00:00
parent 23ecffe57d
commit a7cb3f6a6d
7 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
checkin_notes
View File

@ -2939,7 +2939,7 @@ Charlie 12 May 2011
sg_PanelBase.cpp, .h
Charlie 13 May 2011
- MGR: Fixes to new Simple GUI for Linux.
- MGR: Fixes to new Simple GUI for Linux and Windows.
- MGR: Fix logic to enable / disable Show Graphics in new Simple GUI.
- MGR: make sure new Simple GUI Pause / Resume button is large enough
for the larger of the localized words for Pause and Resume; do

2
clientgui/sg_PanelBase.cpp
View File

@ -154,7 +154,7 @@ void CSimplePanelBase::OnPaint(wxPaintEvent& /*event*/) {
}
void CSimplePanelBase::UpdateStaticText(wxStaticText **whichText, wxString s) {
void CSimplePanelBase::UpdateStaticText(CTransparentStaticText **whichText, wxString s) {
EllipseStringIfNeeded(s, *whichText);
if ((*whichText)->GetLabel() != s) {
(*whichText)->SetLabel(s);

2
clientgui/sg_PanelBase.h
View File

@ -77,7 +77,7 @@ class CSimplePanelBase : public wxPanel
void ReskinInterface();
virtual wxRect GetProgressRect() { return wxRect(0, 0, 0, 0); }
void UpdateStaticText(wxStaticText **whichText, wxString s);
void UpdateStaticText(CTransparentStaticText **whichText, wxString s);
void EllipseStringIfNeeded(wxString& s, wxWindow *win);
protected:

4
clientgui/sg_ProjectPanel.cpp
View File

@ -85,7 +85,7 @@ CSimpleProjectPanel::CSimpleProjectPanel( wxWindow* parent ) :
bSizer2 = new wxBoxSizer( wxHORIZONTAL );
bSizer1->AddSpacer(5);
m_myProjectsLabel = new wxStaticText( this, wxID_ANY, _("My Projects:"), wxDefaultPosition, wxDefaultSize, 0 );
m_myProjectsLabel = new CTransparentStaticText( this, wxID_ANY, _("My Projects:"), wxDefaultPosition, wxDefaultSize, 0 );
m_myProjectsLabel->Wrap( -1 );
bSizer2->Add( m_myProjectsLabel, 0, wxRIGHT, 5 );
bSizer2->AddStretchSpacer();
@ -130,7 +130,7 @@ CSimpleProjectPanel::CSimpleProjectPanel( wxWindow* parent ) :
// Make sure m_TotalCreditValue string is large enough
m_fDisplayedCredit = 9999999999.99;
str.Printf(_("%s: %0.2f"), m_sTotalWorkDoneString.c_str(), m_fDisplayedCredit);
m_TotalCreditValue = new wxStaticText( this, wxID_ANY, str, wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE );
m_TotalCreditValue = new CTransparentStaticText( this, wxID_ANY, str, wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE );
m_TotalCreditValue->Wrap( -1 );
bSizer1->Add( m_TotalCreditValue, 0, wxLEFT | wxRIGHT | wxEXPAND, SIDEMARGINS );

4
clientgui/sg_ProjectPanel.h
View File

@ -67,10 +67,10 @@ class CSimpleProjectPanel : public CSimplePanelBase
wxBitmap* GetProjectSpecificBitmap(char* project_url);
protected:
wxStaticText* m_myProjectsLabel;
CTransparentStaticText* m_myProjectsLabel;
CBOINCBitmapComboBox* m_ProjectSelectionCtrl;
wxButton* m_TaskAddProjectButton;
wxStaticText* m_TotalCreditValue;
CTransparentStaticText* m_TotalCreditValue;
CSimpleProjectWebSitesPopupButton* m_ProjectWebSitesButton;
CSimpleProjectCommandPopupButton* m_ProjectCommandsButton;
wxString m_sAddProjectString;

18
clientgui/sg_TaskPanel.cpp
View File

@ -224,7 +224,7 @@ CSimpleTaskPanel::CSimpleTaskPanel( wxWindow* parent ) :
wxBoxSizer* bSizer2;
bSizer2 = new wxBoxSizer( wxHORIZONTAL );
m_myTasksLabel = new wxStaticText( this, wxID_ANY, _("My Tasks:"), wxDefaultPosition, wxDefaultSize, 0 );
m_myTasksLabel = new CTransparentStaticText( this, wxID_ANY, _("My Tasks:"), wxDefaultPosition, wxDefaultSize, 0 );
m_myTasksLabel->Wrap( -1 );
bSizer2->Add( m_myTasksLabel, 0, wxRIGHT, 5 );
@ -250,11 +250,11 @@ CSimpleTaskPanel::CSimpleTaskPanel( wxWindow* parent ) :
wxBoxSizer* bSizer3;
bSizer3 = new wxBoxSizer( wxHORIZONTAL );
m_TaskProjectLabel = new wxStaticText( this, wxID_ANY, _("From Project:"), wxDefaultPosition, wxDefaultSize, 0 );
m_TaskProjectLabel = new CTransparentStaticText( this, wxID_ANY, _("From Project:"), wxDefaultPosition, wxDefaultSize, 0 );
m_TaskProjectLabel->Wrap( -1 );
bSizer3->Add( m_TaskProjectLabel, 0, wxRIGHT, 5 );
m_TaskProjectName = new wxStaticText( this, wxID_ANY, wxT("SETI@home"), wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE );
m_TaskProjectName = new CTransparentStaticText( this, wxID_ANY, wxT("SETI@home"), wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE );
m_TaskProjectName->Wrap( -1 );
m_TaskProjectName->SetFont(wxFont(LARGE_FONT,wxSWISS,wxNORMAL,wxNORMAL,false,wxT("Arial")));
bSizer3->Add( m_TaskProjectName, 1, 0, 0 );
@ -262,7 +262,7 @@ CSimpleTaskPanel::CSimpleTaskPanel( wxWindow* parent ) :
bSizer1->Add( bSizer3, 0, wxLEFT | wxRIGHT | wxEXPAND, SIDEMARGINS );
#if SELECTBYRESULTNAME
m_TaskApplicationName = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE );
m_TaskApplicationName = new CTransparentStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE );
m_TaskApplicationName->Wrap( -1 );
bSizer1->Add( m_TaskApplicationName, 0, wxLEFT | wxRIGHT | wxEXPAND, SIDEMARGINS );
@ -278,13 +278,13 @@ CSimpleTaskPanel::CSimpleTaskPanel( wxWindow* parent ) :
bSizer1->AddSpacer(10);
m_ElapsedTimeValue = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE );
m_ElapsedTimeValue = new CTransparentStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE );
m_ElapsedTimeValue->Wrap( -1 );
bSizer1->Add( m_ElapsedTimeValue, 0, wxLEFT | wxRIGHT | wxEXPAND, SIDEMARGINS );
bSizer1->AddSpacer(7);
m_TimeRemainingValue = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE );
m_TimeRemainingValue = new CTransparentStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE );
m_TimeRemainingValue->Wrap( -1 );
bSizer1->Add( m_TimeRemainingValue, 0, wxLEFT | wxRIGHT | wxEXPAND, SIDEMARGINS );
@ -305,7 +305,7 @@ CSimpleTaskPanel::CSimpleTaskPanel( wxWindow* parent ) :
m_ProgressBar->SetToolTip(_("This task's progress"));
bSizer4->Add( m_ProgressBar, 0, wxRIGHT, 5 );
m_ProgressValueText = new wxStaticText( this, wxID_ANY, wxT("100.0%"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT | wxST_NO_AUTORESIZE );
m_ProgressValueText = new CTransparentStaticText( this, wxID_ANY, wxT("100.0%"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT | wxST_NO_AUTORESIZE );
m_ProgressValueText->Wrap( -1 );
bSizer4->Add( m_ProgressValueText, 0, wxALIGN_RIGHT, 0 );
@ -314,8 +314,8 @@ CSimpleTaskPanel::CSimpleTaskPanel( wxWindow* parent ) :
bSizer1->AddSpacer(7);
// TODO: Can we determine the longest status string and initialize with it?
m_StatusValueText = new wxStaticText( this, wxID_ANY, m_sNoProjectsString, wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE );
// m_StatusValueText = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE );
m_StatusValueText = new CTransparentStaticText( this, wxID_ANY, m_sNoProjectsString, wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE );
// m_StatusValueText = new CTransparentStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE );
m_StatusValueText->Wrap( -1 );
bSizer1->Add( m_StatusValueText, 0, wxLEFT | wxRIGHT | wxEXPAND, SIDEMARGINS );

16
clientgui/sg_TaskPanel.h
View File

@ -109,19 +109,19 @@ class CSimpleTaskPanel : public CSimplePanelBase
void OnEraseBackground(wxEraseEvent& event);
#endif
wxRect* m_progressBarRect;
wxStaticText* m_myTasksLabel;
CTransparentStaticText* m_myTasksLabel;
CBOINCBitmapComboBox* m_TaskSelectionCtrl;
wxStaticText* m_TaskProjectLabel;
wxStaticText* m_TaskProjectName;
CTransparentStaticText* m_TaskProjectLabel;
CTransparentStaticText* m_TaskProjectName;
#if SELECTBYRESULTNAME
wxStaticText* m_TaskApplicationName;
CTransparentStaticText* m_TaskApplicationName;
#endif
CSlideShowPanel* m_SlideShowArea;
wxStaticText* m_ElapsedTimeValue;
wxStaticText* m_TimeRemainingValue;
CTransparentStaticText* m_ElapsedTimeValue;
CTransparentStaticText* m_TimeRemainingValue;
wxGauge* m_ProgressBar;
wxStaticText* m_ProgressValueText;
wxStaticText* m_StatusValueText;
CTransparentStaticText* m_ProgressValueText;
CTransparentStaticText* m_StatusValueText;
wxButton* m_TaskCommandsButton;
wxRect m_ProgressRect;
int m_oldWorkCount;