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

MGR: Use our control IDs instead of wxID_HELP for Help buttons for Mac accessibility 

svn path=/trunk/boinc/; revision=22953
This commit is contained in:
Charlie Fenton 2011-01-28 09:55:03 +00:00
parent 00dfc1e88c
commit 86216c53a9
6 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
checkin_notes
View File

@ -319,9 +319,16 @@ Charlie 28 Jan 2011
dialog.
- MGR: Use standard native buttons in Simple Preferences and
Simple Notices dialogs.
- MGR: Use our control IDs instead of wxID_HELP for Help buttons
for Mac accessibility (wxID_HELP makes a bitmap button on
Macs which VoiceOver screen reader can't read.)
clientgui/
DlgAdvPreferences.cpp
DlgAdvPreferencesBase.cpp
sg_BoincSimpleFrame.cpp
sg_DlgMessages.cpp
sg_DlgPreferences.cpp
wizardex.cpp
SkinManager.cpp

2
clientgui/DlgAdvPreferences.cpp
View File

@ -45,7 +45,7 @@ BEGIN_EVENT_TABLE(CDlgAdvPreferences, wxDialog)
EVT_COMMAND_RANGE(20000,21000,wxEVT_COMMAND_TEXT_UPDATED,CDlgAdvPreferences::OnHandleCommandEvent)
//buttons
EVT_BUTTON(wxID_OK,CDlgAdvPreferences::OnOK)
EVT_BUTTON(wxID_HELP,CDlgAdvPreferences::OnHelp)
EVT_BUTTON(ID_HELPBOINC,CDlgAdvPreferences::OnHelp)
EVT_BUTTON(ID_BTN_CLEAR,CDlgAdvPreferences::OnClear)
END_EVENT_TABLE()

3
clientgui/DlgAdvPreferencesBase.cpp
View File

@ -20,6 +20,7 @@
// http://www.wxformbuilder.org/
#include "stdwx.h"
#include "Events.h"
#include "diagnostics.h"
#include "util.h"
#include "mfile.h"
@ -105,7 +106,7 @@ CDlgAdvPreferencesBase::CDlgAdvPreferencesBase( wxWindow* parent, int id, wxStri
buttonSizer->Add( m_btnCancel, 0, wxALL, 5 );
m_btnHelp = new wxButton( m_panelButtons, wxID_HELP, _("Help"), wxDefaultPosition, wxDefaultSize, 0 );
m_btnHelp = new wxButton( m_panelButtons, ID_HELPBOINC, _("Help"), wxDefaultPosition, wxDefaultSize, 0 );
m_btnHelp->SetToolTip( _("shows the preferences web page") );
buttonSizer->Add( m_btnHelp, 0, wxALL, 5 );

4
clientgui/sg_BoincSimpleFrame.cpp
View File

@ -555,7 +555,7 @@ BEGIN_EVENT_TABLE(CSimpleGUIPanel, wxPanel)
EVT_ERASE_BACKGROUND(CSimpleGUIPanel::OnEraseBackground)
EVT_BUTTON(ID_SGNOTICESBUTTON,CSimpleGUIPanel::OnShowNotices)
EVT_BUTTON(ID_SGPAUSERESUMEBUTTON,CSimpleGUIPanel::OnPauseResume)
EVT_BUTTON(wxID_HELP,CSimpleGUIPanel::OnHelp)
EVT_BUTTON(ID_SIMPLE_HELP,CSimpleGUIPanel::OnHelp)
EVT_TIMER(ID_SIMPLEMESSAGECHECKTIMER, CSimpleGUIPanel::OnCheckForNewNotices)
EVT_PAINT(CSimpleGUIPanel::OnPaint)
END_EVENT_TABLE()
@ -618,7 +618,7 @@ CSimpleGUIPanel::CSimpleGUIPanel(wxWindow* parent) :
buttonsSizer->Add( m_PauseResumeButton, 0, wxEXPAND | wxALIGN_RIGHT, 0 );
buttonsSizer->AddStretchSpacer();
m_HelpButton = new wxButton( this, wxID_HELP, _("Help"), wxDefaultPosition, wxDefaultSize, 0 );
m_HelpButton = new wxButton( this, ID_SIMPLE_HELP, _("Help"), wxDefaultPosition, wxDefaultSize, 0 );
buttonsSizer->Add( m_HelpButton, 0, wxEXPAND | wxALIGN_RIGHT, 0 );
m_HelpButton->SetToolTip( _("Get help with BOINC"));

6
clientgui/sg_DlgMessages.cpp
View File

@ -63,7 +63,7 @@ BEGIN_EVENT_TABLE( CPanelMessages, wxPanel )
////@begin CPanelPreferences event table entries
EVT_ERASE_BACKGROUND( CPanelMessages::OnEraseBackground )
EVT_BUTTON( wxID_OK, CPanelMessages::OnOK )
EVT_BUTTON(wxID_HELP, CPanelMessages::OnButtonHelp)
EVT_BUTTON(ID_SIMPLE_HELP, CPanelMessages::OnButtonHelp)
////@end CPanelPreferences event table entries
END_EVENT_TABLE()
@ -137,7 +137,7 @@ void CPanelMessages::CreateControls()
#ifndef __WXMSW__
#ifdef __WXMAC__
wxButton* itemButton45 = new wxButton( this, wxID_HELP, _("Help"), wxDefaultPosition, wxDefaultSize, 0 );
wxButton* itemButton45 = new wxButton( this, ID_SIMPLE_HELP, _("Help"), wxDefaultPosition, wxDefaultSize, 0 );
#ifdef wxUSE_TOOLTIPS
itemButton45->SetToolTip(new wxToolTip(_("Get help with BOINC")));
#endif
@ -237,7 +237,7 @@ void CPanelMessages::OnOK( wxCommandEvent& event ) {
/*!
* wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_HELP / ID_SIMPLE_HELP
* wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_SIMPLE_HELP
*/
void CPanelMessages::OnButtonHelp( wxCommandEvent& event ) {

8
clientgui/sg_DlgPreferences.cpp
View File

@ -210,7 +210,7 @@ BEGIN_EVENT_TABLE( CPanelPreferences, wxPanel )
EVT_CHECKBOX( ID_CUSTOMIZEPREFERENCES, CPanelPreferences::OnCustomizePreferencesClick )
EVT_COMBOBOX( ID_WORKBETWEENBEGIN, CPanelPreferences::OnWorkBetweenBeginSelected )
EVT_COMBOBOX( ID_CONNECTBETWEENBEGIN, CPanelPreferences::OnConnectBetweenBeginSelected )
EVT_BUTTON( wxID_HELP, CPanelPreferences::OnButtonHelp )
EVT_BUTTON( ID_SIMPLE_HELP, CPanelPreferences::OnButtonHelp )
////@end CPanelPreferences event table entries
END_EVENT_TABLE()
@ -465,7 +465,7 @@ void CPanelPreferences::CreateControls()
#ifndef __WXMSW__
#ifdef __WXMAC__
wxButton* itemButton46 = new wxButton( this, wxID_HELP, _("Help"), wxDefaultPosition, wxDefaultSize, 0 );
wxButton* itemButton46 = new wxButton( this, ID_SIMPLE_HELP, _("Help"), wxDefaultPosition, wxDefaultSize, 0 );
#ifdef wxUSE_TOOLTIPS
itemButton46->SetToolTip(new wxToolTip(_("Get help with BOINC")));
#endif
@ -519,7 +519,7 @@ void CPanelPreferences::OnConnectBetweenBeginSelected( wxCommandEvent& /*event*/
/*!
* wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_HELP / ID_SIMPLE_HELP
* wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_SIMPLE_HELP
*/
void CPanelPreferences::OnButtonHelp( wxCommandEvent& event ) {
@ -533,7 +533,7 @@ void CPanelPreferences::OnButtonHelp( wxCommandEvent& event ) {
wxT("%s?target=simple_preferences&version=%s&controlid=%d"),
strURL.c_str(),
wxString(BOINC_VERSION_STRING, wxConvUTF8).c_str(),
ID_SIMPLE_HELP
event.GetId()
);
wxLaunchDefaultBrowser(wxurl);
}