diff --git a/checkin_notes b/checkin_notes index e7ebf60dd6..fea7dbd7af 100755 --- a/checkin_notes +++ b/checkin_notes @@ -4509,3 +4509,19 @@ Rom 7 May 2007 BOINCx64.ism David 7 May 2007 + - core client: add config option; + eliminates use of alternate platforms. + + client/ + client_state.h + cs_platforms.C + cs_statefile.C + log_flags.C,h + +Rom 7 May 2007 + - fixes #110 - Simple GUI: "spacer" image is not updated + + clientgui/ + sg_ImageLoader.cpp + sg_ProjectsComponent.cpp, .h + \ No newline at end of file diff --git a/clientgui/sg_ImageLoader.cpp b/clientgui/sg_ImageLoader.cpp index 30456d9f00..96b34603c4 100644 --- a/clientgui/sg_ImageLoader.cpp +++ b/clientgui/sg_ImageLoader.cpp @@ -37,10 +37,13 @@ BEGIN_EVENT_TABLE(ImageLoader, wxWindow) EVT_PAINT(ImageLoader::OnPaint) END_EVENT_TABLE() -ImageLoader::ImageLoader(wxWindow* parent, bool center) : wxWindow(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNO_BORDER) +ImageLoader::ImageLoader(wxWindow* parent, bool center) : + wxWindow(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNO_BORDER) { centerOnParent = center; } + + void ImageLoader::LoadImage(wxBitmap image) { int width = image.GetWidth(); @@ -52,6 +55,7 @@ void ImageLoader::LoadImage(wxBitmap image) } } + void ImageLoader::OnPaint(wxPaintEvent& WXUNUSED(event)) { wxPaintDC dc(this); diff --git a/clientgui/sg_ProjectsComponent.cpp b/clientgui/sg_ProjectsComponent.cpp index 590faaa349..22f6937f92 100644 --- a/clientgui/sg_ProjectsComponent.cpp +++ b/clientgui/sg_ProjectsComponent.cpp @@ -190,9 +190,9 @@ void CProjectsComponent::CreateComponent() btnAlertMessages->Show(false); //spacer - wxWindow *w_sp1 = new wxWindow(this,-1,wxPoint(83,91),wxSize(2,11)); - i_spacer = new ImageLoader(w_sp1); - i_spacer->LoadImage(*(pSkinSimple->GetSpacerImage()->GetBitmap())); + w_sp1 = new wxWindow(this,-1,wxPoint(83,91),wxSize(2,11)); + i_spacer1 = new ImageLoader(w_sp1); + i_spacer1->LoadImage(*(pSkinSimple->GetSpacerImage()->GetBitmap())); // pause btn wxToolTip *ttPause = new wxToolTip(_("Stop all activity")); @@ -219,9 +219,9 @@ void CProjectsComponent::CreateComponent() btnResume->SetToolTip(ttResume); //spacer - wxWindow *w_sp2 = new wxWindow(this,-1,wxPoint(144,91),wxSize(2,11)); - i_spacer = new ImageLoader(w_sp2); - i_spacer->LoadImage(*(pSkinSimple->GetSpacerImage()->GetBitmap())); + w_sp2 = new wxWindow(this,-1,wxPoint(144,91),wxSize(2,11)); + i_spacer2 = new ImageLoader(w_sp2); + i_spacer2->LoadImage(*(pSkinSimple->GetSpacerImage()->GetBitmap())); // Pref Btn wxToolTip *ttPreferences = new wxToolTip(_("Open a window to set your preferences")); @@ -236,9 +236,9 @@ void CProjectsComponent::CreateComponent() btnPreferences->SetToolTip(ttPreferences); //spacer - wxWindow *w_sp3 = new wxWindow(this,-1,wxPoint(230,91),wxSize(2,11)); - i_spacer = new ImageLoader(w_sp3); - i_spacer->LoadImage(*(pSkinSimple->GetSpacerImage()->GetBitmap())); + w_sp3 = new wxWindow(this,-1,wxPoint(230,91),wxSize(2,11)); + i_spacer3 = new ImageLoader(w_sp3); + i_spacer3->LoadImage(*(pSkinSimple->GetSpacerImage()->GetBitmap())); // Advanced View wxToolTip *ttAdvView = new wxToolTip(_("Switch to the BOINC advanced view")); @@ -573,6 +573,11 @@ void CProjectsComponent::ReskinInterface() lnMyProjTop->SetLineColor(pSkinSimple->GetStaticLineColor()); lnMyProjBtm->SetLineColor(pSkinSimple->GetStaticLineColor()); + // spacers + i_spacer1->LoadImage(*(pSkinSimple->GetSpacerImage()->GetBitmap())); + i_spacer2->LoadImage(*(pSkinSimple->GetSpacerImage()->GetBitmap())); + i_spacer2->LoadImage(*(pSkinSimple->GetSpacerImage()->GetBitmap())); + // Rebuild stat menus and reload icons for(int m = 0; m < (int)m_statProjects.size(); m++){ StatImageLoader *i_statImage = m_statProjects.at(m); diff --git a/clientgui/sg_ProjectsComponent.h b/clientgui/sg_ProjectsComponent.h index 60227dfbf2..418702d4c1 100644 --- a/clientgui/sg_ProjectsComponent.h +++ b/clientgui/sg_ProjectsComponent.h @@ -48,7 +48,9 @@ public: CTransparentStaticLine *lnMyProjBtm; // default icon // spacer - ImageLoader *i_spacer; + ImageLoader *i_spacer1; + ImageLoader *i_spacer2; + ImageLoader *i_spacer3; wxBitmapButton *btnArwLeft; wxBitmapButton *btnArwRight; @@ -60,6 +62,9 @@ public: wxBitmapButton *btnResume; wxBitmapButton *btnPreferences; wxBitmapButton *btnAdvancedView; + wxWindow *w_sp1; + wxWindow *w_sp2; + wxWindow *w_sp3; CProjectsComponent(); CProjectsComponent(CSimplePanel* parent,wxPoint coord);