*** empty log message ***

svn path=/trunk/boinc/; revision=11414
This commit is contained in:
Kevin Reed 2006-10-31 16:35:21 +00:00
parent 4342e0ca89
commit ec707df24d
4 changed files with 45 additions and 33 deletions

View File

@ -11856,3 +11856,12 @@ Kevin 31 Oct 2006 (Boo!)
clientgui/
sg_ProjectsComponent.cpp/h
sg_StatImageLoader.cpp/h
Kevin 31 Oct 2006 (Spooky!)
- MGR: Change button behavior so that it uses the wxBU_AUTODRAW setting.
This causes buttons to look more 'button' like when clicked.
clientgui/
sg_ProjectsComponent.cpp/h
sg_StatImageLoader.cpp/h

View File

@ -112,8 +112,10 @@ void CDlgMessages::CreateDialog()
SetBackgroundColour(*pSkinSimple->GetBackgroundImage()->GetBackgroundColor());
wxToolTip *ttClose = new wxToolTip(_("Close message window"));
btnClose=new wxBitmapButton(this,ID_CLOSEBUTTON,*(pSkinSimple->GetCloseButton()->GetBitmap()),wxPoint(472,398),wxSize(57,16),wxBU_NOAUTODRAW);
btnClose->SetBitmapSelected(*(pSkinSimple->GetCloseButton()->GetBitmapClicked()));
btnClose=new wxBitmapButton(this,ID_CLOSEBUTTON,*pSkinSimple->GetCloseButton()->GetBitmap(),wxPoint(472,398),wxSize(57,16),wxBU_AUTODRAW);
if ( pSkinSimple->GetCloseButton()->GetBitmapClicked() != NULL ) {
btnClose->SetBitmapSelected(*pSkinSimple->GetCloseButton()->GetBitmapClicked());
}
btnClose->SetToolTip(ttClose);
Refresh();

View File

@ -461,12 +461,16 @@ void CDlgPreferences::CreateControls()
wxBoxSizer* itemBoxSizer44 = new wxBoxSizer(wxHORIZONTAL);
itemBoxSizer2->Add(itemBoxSizer44, 0, wxALIGN_RIGHT|wxALL, 5);
wxBitmapButton* itemBitmapButton44 = new wxBitmapButton( itemDialog1, wxID_OK, *pSkinSimple->GetSaveButton()->GetBitmap(), wxDefaultPosition, wxDefaultSize, wxBU_NOAUTODRAW );
itemBitmapButton44->SetBitmapSelected(*pSkinSimple->GetSaveButton()->GetBitmapClicked());
wxBitmapButton* itemBitmapButton44 = new wxBitmapButton( itemDialog1, wxID_OK, *pSkinSimple->GetSaveButton()->GetBitmap(), wxPoint(120,340),wxSize(57,16), wxBU_AUTODRAW );
if ( pSkinSimple->GetSaveButton()->GetBitmapClicked() != NULL ) {
itemBitmapButton44->SetBitmapSelected(*pSkinSimple->GetSaveButton()->GetBitmapClicked());
}
itemBoxSizer44->Add(itemBitmapButton44, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxBitmapButton* itemBitmapButton45 = new wxBitmapButton( itemDialog1, wxID_CANCEL, *pSkinSimple->GetCancelButton()->GetBitmap(), wxDefaultPosition, wxDefaultSize, wxBU_NOAUTODRAW );
itemBitmapButton45->SetBitmapSelected(*pSkinSimple->GetCancelButton()->GetBitmapClicked());
wxBitmapButton* itemBitmapButton45 = new wxBitmapButton( itemDialog1, wxID_CANCEL, *pSkinSimple->GetCancelButton()->GetBitmap(), wxPoint(187,340),wxSize(57,16), wxBU_AUTODRAW );
if ( pSkinSimple->GetCancelButton()->GetBitmapClicked() != NULL ) {
itemBitmapButton45->SetBitmapSelected(*pSkinSimple->GetCancelButton()->GetBitmapClicked());
}
itemBoxSizer44->Add(itemBitmapButton45, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);

View File

@ -98,11 +98,13 @@ void CProjectsComponent::CreateComponent()
*pSkinSimple->GetAttachProjectButton()->GetBitmap(),
wxPoint(235,7),
wxSize(81,18),
wxBU_NOAUTODRAW
);
btnAddProj->SetBitmapSelected(
*pSkinSimple->GetAttachProjectButton()->GetBitmapClicked()
wxBU_AUTODRAW
);
if ( pSkinSimple->GetAttachProjectButton()->GetBitmapClicked() != NULL ) {
btnAddProj->SetBitmapSelected(
*pSkinSimple->GetAttachProjectButton()->GetBitmapClicked()
);
}
btnAddProj->SetToolTip(ttAddProject);
/// Line
@ -113,40 +115,40 @@ void CProjectsComponent::CreateComponent()
btnArwLeft = new wxBitmapButton(
this,
-1,
*(pSkinSimple->GetLeftArrowButton()->GetBitmap()),
*pSkinSimple->GetLeftArrowButton()->GetBitmap(),
wxPoint(29,47),
wxSize(20,20),
wxBU_NOAUTODRAW
wxBU_AUTODRAW
);
btnArwLeft->SetBitmapSelected(*(pSkinSimple->GetLeftArrowButton()->GetBitmapClicked()));
if ( pSkinSimple->GetLeftArrowButton()->GetBitmapClicked() != NULL ) {
btnArwLeft->SetBitmapSelected(*pSkinSimple->GetLeftArrowButton()->GetBitmapClicked());
}
btnArwLeft->Show(false);//on creation this one is always false
btnArwRight = new wxBitmapButton(
this,
-1,
*(pSkinSimple->GetRightArrowButton()->GetBitmap()),
*pSkinSimple->GetRightArrowButton()->GetBitmap(),
wxPoint(301,47),
wxSize(20,20),
wxBU_NOAUTODRAW
wxBU_AUTODRAW
);
btnArwRight->SetBitmapSelected(*(pSkinSimple->GetRightArrowButton()->GetBitmapClicked()));
if ( pSkinSimple->GetRightArrowButton()->GetBitmapClicked() != NULL ) {
btnArwRight->SetBitmapSelected(*pSkinSimple->GetRightArrowButton()->GetBitmapClicked());
}
btnArwRight->Show(false);
// load stat icons and put them in the proper position
// UpdateProjectArray();
//
//// Messages Play Pause Btns
wxToolTip *ttMessages = new wxToolTip(_("Messages"));
btnMessages = new wxBitmapButton(
this,
-1,
*(pSkinSimple->GetMessagesLink()->GetBitmap()),
*pSkinSimple->GetMessagesLink()->GetBitmap(),
wxPoint(11,86),
wxSize(70,20),
wxBU_NOAUTODRAW
wxBU_AUTODRAW
);
btnMessages->SetBitmapSelected(*(pSkinSimple->GetMessagesLink()->GetBitmap()));
btnMessages->SetToolTip(ttMessages);
wxToolTip *ttAlertMessages = new wxToolTip(_("Messages"));
@ -156,9 +158,8 @@ void CProjectsComponent::CreateComponent()
*(pSkinSimple->GetMessagesAlertLink()->GetBitmap()),
wxPoint(11,86),
wxSize(70,20),
wxBU_NOAUTODRAW
wxBU_AUTODRAW
);
btnAlertMessages->SetBitmapSelected(*(pSkinSimple->GetMessagesAlertLink()->GetBitmap()));
btnAlertMessages->SetToolTip(ttAlertMessages);
btnAlertMessages->Show(false);
@ -172,12 +173,11 @@ void CProjectsComponent::CreateComponent()
btnPause = new wxBitmapButton(
this,
-1,
*(pSkinSimple->GetSuspendLink()->GetBitmap()),
*pSkinSimple->GetSuspendLink()->GetBitmap(),
wxPoint(85,86),
wxSize(59,20),
wxBU_NOAUTODRAW
wxBU_AUTODRAW
);
btnPause->SetBitmapSelected(*(pSkinSimple->GetSuspendLink()->GetBitmap()));
btnPause->SetToolTip(ttPause);
// resume btn
@ -188,9 +188,8 @@ void CProjectsComponent::CreateComponent()
*(pSkinSimple->GetResumeLink()->GetBitmap()),
wxPoint(85,86),
wxSize(59,20),
wxBU_NOAUTODRAW
wxBU_AUTODRAW
);
btnResume->SetBitmapSelected(*(pSkinSimple->GetResumeLink()->GetBitmap()));
btnResume->SetToolTip(ttResume);
// Show resume or pause as appropriate
@ -220,9 +219,8 @@ void CProjectsComponent::CreateComponent()
*(pSkinSimple->GetPreferencesLink()->GetBitmap()),
wxPoint(149,86),
wxSize(81,20),
wxBU_NOAUTODRAW
wxBU_AUTODRAW
);
btnPreferences->SetBitmapSelected(*(pSkinSimple->GetPreferencesLink()->GetBitmap()));
btnPreferences->SetToolTip(ttPreferences);
//spacer
@ -238,9 +236,8 @@ void CProjectsComponent::CreateComponent()
*(pSkinSimple->GetAdvancedLink()->GetBitmap()),
wxPoint(233,86),
wxSize(101,20),
wxBU_NOAUTODRAW
wxBU_AUTODRAW
);
btnAdvancedView->SetBitmapSelected(*(pSkinSimple->GetAdvancedLink()->GetBitmap()));
btnAdvancedView->SetToolTip(ttAdvView);
/// Line