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

Merge branch 'master' of ssh://isaac.ssl.berkeley.edu/boinc-v2

This commit is contained in:
David Anderson 2014-01-08 20:00:13 +00:00
parent 2b896184d5 24fb792e27
commit 2efe05ab2f
2 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
clientgui/sg_TaskPanel.cpp
View File

@ -55,6 +55,7 @@ CScrolledTextBox::CScrolledTextBox( wxWindow* parent) :
SetForegroundColour(*wxBLACK); SetForegroundColour(*wxBLACK);
m_TextSizer = new wxBoxSizer( wxVERTICAL ); m_TextSizer = new wxBoxSizer( wxVERTICAL );
m_hLine = 0;
this->SetSizerAndFit( m_TextSizer ); this->SetSizerAndFit( m_TextSizer );
this->Layout(); this->Layout();
@ -114,7 +115,7 @@ void CScrolledTextBox::OnOutputLine(const wxString& line) {
if ( !m_hLine ) { if ( !m_hLine ) {
m_hLine = GetCharHeight(); m_hLine = GetCharHeight();
} }
m_TextSizer->Add(5, m_hLine); m_TextSizer->Add(5, m_hLine/3);
} }
} }
@ -136,6 +137,7 @@ int CScrolledTextBox::Wrap(const wxString& text, int widthMax, int *lineHeight)
} }
if ( *p == _T('\n') || *p == _T('\0') ) { if ( *p == _T('\n') || *p == _T('\0') ) {
line.Trim();
OnOutputLine(line); OnOutputLine(line);
m_eol = true; m_eol = true;
++numLines; ++numLines;
@ -155,6 +157,7 @@ int CScrolledTextBox::Wrap(const wxString& text, int widthMax, int *lineHeight)
if ( width > widthMax ) { if ( width > widthMax ) {
// remove the last word from this line // remove the last word from this line
line.erase(lastSpace - lineStart, p + 1 - lineStart); line.erase(lastSpace - lineStart, p + 1 - lineStart);
line.Trim();
OnOutputLine(line); OnOutputLine(line);
m_eol = true; m_eol = true;
++numLines; ++numLines;
@ -194,17 +197,9 @@ CSlideShowPanel::CSlideShowPanel( wxWindow* parent ) :
wxBoxSizer* bSizer1; wxBoxSizer* bSizer1;
bSizer1 = new wxBoxSizer( wxVERTICAL ); bSizer1 = new wxBoxSizer( wxVERTICAL );
m_institution = new CTransparentStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
bSizer1->Add( m_institution, 0, 0, 0 );
m_scienceArea = new CTransparentStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
bSizer1->Add( m_scienceArea, 0, 0, 0 );
bSizer1->AddSpacer(DESCRIPTIONSPACER);
m_description = new CScrolledTextBox( this ); m_description = new CScrolledTextBox( this );
GetSize(&w, &h); GetSize(&w, &h);
m_description->SetMinSize(wxSize(w, h - (2 * GetCharHeight()) - DESCRIPTIONSPACER)); m_description->SetMinSize(wxSize(w, h));
bSizer1->Add( m_description, 1, wxEXPAND, 0 ); bSizer1->Add( m_description, 1, wxEXPAND, 0 );
this->SetSizer( bSizer1 ); this->SetSizer( bSizer1 );
@ -240,7 +235,7 @@ void CSlideShowPanel::OnSlideShowTimer(wxTimerEvent& WXUNUSED(event)) {
void CSlideShowPanel::AdvanceSlideShow(bool changeSlide, bool reload) { void CSlideShowPanel::AdvanceSlideShow(bool changeSlide, bool reload) {
double xRatio, yRatio, ratio; double xRatio, yRatio, ratio;
unsigned int i; unsigned int i;
wxString s; wxString s, ss;
TaskSelectionData* selData = ((CSimpleTaskPanel*)GetParent())->GetTaskSelectionData(); TaskSelectionData* selData = ((CSimpleTaskPanel*)GetParent())->GetTaskSelectionData();
if (selData == NULL) return; if (selData == NULL) return;
@ -264,8 +259,6 @@ numSlides = 0;
dc.DrawBitmap(backgroundBitmap, 0, 0); dc.DrawBitmap(backgroundBitmap, 0, 0);
// Force redraws if text unchanged; hide all if not in all-projects list // Force redraws if text unchanged; hide all if not in all-projects list
m_institution->Show(false);
m_scienceArea->Show(false);
m_description->Show(false); m_description->Show(false);
Enable( false ); Enable( false );
@ -280,14 +273,15 @@ numSlides = 0;
for (i=0; i<m_AllProjectsList.projects.size(); i++) { for (i=0; i<m_AllProjectsList.projects.size(); i++) {
if (!strcmp(m_AllProjectsList.projects[i]->url.c_str(), selData->project_url)) { if (!strcmp(m_AllProjectsList.projects[i]->url.c_str(), selData->project_url)) {
s = wxString(m_AllProjectsList.projects[i]->home.c_str(), wxConvUTF8); s = wxString(m_AllProjectsList.projects[i]->home.c_str(), wxConvUTF8);
m_institution->SetLabel(wxGetTranslation(s)); ss = wxGetTranslation(s);
ss.Append("\n\n");
s = wxString(m_AllProjectsList.projects[i]->specific_area.c_str(), wxConvUTF8); s = wxString(m_AllProjectsList.projects[i]->specific_area.c_str(), wxConvUTF8);
m_scienceArea->SetLabel(wxGetTranslation(s)); ss += wxGetTranslation(s);
ss.Append("\n\n");
s = wxString(m_AllProjectsList.projects[i]->description.c_str(), wxConvUTF8); s = wxString(m_AllProjectsList.projects[i]->description.c_str(), wxConvUTF8);
m_description->SetValue(wxGetTranslation(s)); ss += wxGetTranslation(s);
m_description->SetValue(ss);
m_institution->Show(true);
m_scienceArea->Show(true);
m_description->Show(true); m_description->Show(true);
Enable( true ); Enable( true );
m_description->Enable(); m_description->Enable();
@ -312,8 +306,6 @@ numSlides = 0;
#endif // HIDEDEFAULTSLIDE #endif // HIDEDEFAULTSLIDE
} else { } else {
#if HIDEDEFAULTSLIDE #if HIDEDEFAULTSLIDE
m_institution->Show(false);
m_scienceArea->Show(false);
m_description->Show(false); m_description->Show(false);
Enable( false ); Enable( false );

2
clientgui/sg_TaskPanel.h
View File

@ -85,8 +85,6 @@ class CSlideShowPanel : public wxPanel
void OnEraseBackground(wxEraseEvent& event); void OnEraseBackground(wxEraseEvent& event);
private: private:
CTransparentStaticText* m_institution;
CTransparentStaticText* m_scienceArea;
CScrolledTextBox* m_description; CScrolledTextBox* m_description;
wxTimer* m_ChangeSlideTimer; wxTimer* m_ChangeSlideTimer;
wxBitmap m_SlideBitmap; wxBitmap m_SlideBitmap;