mirror of https://github.com/BOINC/boinc.git
- MGR: Add missing keyboard accellerators for the event log.
- MGR: Re-enable the next button when the terms of use wizard page when the back button is pressed. clientgui/ DlgEventLog.cpp TermsOfUsePage.cpp svn path=/trunk/boinc/; revision=23363
This commit is contained in:
parent
b9c959ed1d
commit
61ba61d846
|
@ -2193,3 +2193,12 @@ Rom 11 Apr 2011
|
|||
|
||||
clientgui/
|
||||
BOINCTaskBar.cpp
|
||||
|
||||
Rom 13 Apr 2011
|
||||
- MGR: Add missing keyboard accellerators for the event log.
|
||||
- MGR: Re-enable the next button when the terms of use wizard
|
||||
page when the back button is pressed.
|
||||
|
||||
clientgui/
|
||||
DlgEventLog.cpp
|
||||
TermsOfUsePage.cpp
|
||||
|
|
|
@ -260,11 +260,11 @@ void CDlgEventLog::CreateControls()
|
|||
|
||||
itemFlexGridSizer2->Add(itemBoxSizer4, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 12);
|
||||
|
||||
m_pFilterButton = new wxButton(this, ID_TASK_MESSAGES_FILTERBYPROJECT, _("Show only this project"), wxDefaultPosition, wxDefaultSize);
|
||||
m_pFilterButton = new wxButton(this, ID_TASK_MESSAGES_FILTERBYPROJECT, _("&Show only this project"), wxDefaultPosition, wxDefaultSize);
|
||||
itemBoxSizer4->Add(m_pFilterButton, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
|
||||
|
||||
#ifdef wxUSE_CLIPBOARD
|
||||
wxButton* itemButton1 = new wxButton(this, ID_COPYAll, _("Copy All"), wxDefaultPosition, wxDefaultSize );
|
||||
wxButton* itemButton1 = new wxButton(this, ID_COPYAll, _("Copy &All"), wxDefaultPosition, wxDefaultSize );
|
||||
itemButton1->SetHelpText(
|
||||
_("Copy all the messages to the clipboard.")
|
||||
);
|
||||
|
@ -275,7 +275,7 @@ void CDlgEventLog::CreateControls()
|
|||
#endif
|
||||
itemBoxSizer4->Add(itemButton1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
|
||||
|
||||
m_pCopySelectedButton = new wxButton(this, ID_COPYSELECTED, _("Copy Selected"), wxDefaultPosition, wxDefaultSize );
|
||||
m_pCopySelectedButton = new wxButton(this, ID_COPYSELECTED, _("Copy &Selected"), wxDefaultPosition, wxDefaultSize );
|
||||
m_pCopySelectedButton->SetHelpText(
|
||||
#ifdef __WXMAC__
|
||||
_("Copy the selected messages to the clipboard. You can select multiple messages by holding down the shift or command key while clicking on messages.")
|
||||
|
@ -295,14 +295,14 @@ void CDlgEventLog::CreateControls()
|
|||
itemBoxSizer4->Add(m_pCopySelectedButton, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
|
||||
#endif
|
||||
|
||||
wxButton* itemButton44 = new wxButton(this, wxID_OK, _("Close"), wxDefaultPosition, wxDefaultSize);
|
||||
wxButton* itemButton44 = new wxButton(this, wxID_OK, _("&Close"), wxDefaultPosition, wxDefaultSize);
|
||||
itemBoxSizer4->Add(itemButton44, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
|
||||
|
||||
#ifndef __WXMAC__
|
||||
wxContextHelpButton* itemButton45 = new wxContextHelpButton(this);
|
||||
itemBoxSizer4->Add(itemButton45, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
|
||||
#else
|
||||
wxButton* itemButton45 = new wxButton(this, ID_SIMPLE_HELP, _("Help"), wxDefaultPosition, wxDefaultSize);
|
||||
wxButton* itemButton45 = new wxButton(this, ID_SIMPLE_HELP, _("&Help"), wxDefaultPosition, wxDefaultSize);
|
||||
wxString helpTip;
|
||||
helpTip.Printf(_("Get help with %s"), pSkinAdvanced->GetApplicationShortName().c_str());
|
||||
itemButton45->SetHelpText(helpTip);
|
||||
|
|
|
@ -250,13 +250,17 @@ void CTermsOfUsePage::OnPageChanged( wxWizardExEvent& event ) {
|
|||
*/
|
||||
|
||||
void CTermsOfUsePage::OnPageChanging( wxWizardExEvent& event ) {
|
||||
if (event.GetDirection() == false) return;
|
||||
|
||||
CWizardAttach* pWA = ((CWizardAttach*)GetParent());
|
||||
|
||||
wxASSERT(pWA);
|
||||
wxASSERT(wxDynamicCast(pWA, CWizardAttach));
|
||||
|
||||
// If the user has left the terms of use disagree radio button
|
||||
// selected, then the next button is disabled and needs to be
|
||||
// re-enabled if the back button is pressed.
|
||||
pWA->EnableNextButton();
|
||||
|
||||
if (event.GetDirection() == false) return;
|
||||
|
||||
if (!CHECK_CLOSINGINPROGRESS()) {
|
||||
// We are leaving this page.
|
||||
|
|
Loading…
Reference in New Issue