From 76f58c1f76ba290e3ad104e7fa1175c773673cfe Mon Sep 17 00:00:00 2001 From: Brian Nixon Date: Mon, 17 Apr 2023 10:12:05 +0100 Subject: [PATCH] Improve consistency of control labels and accelerators --- clientgui/AdvancedFrame.cpp | 6 +++--- clientgui/DlgAdvPreferencesBase.cpp | 8 ++++---- clientgui/DlgDiagnosticLogFlags.cpp | 4 ++-- clientgui/DlgExclusiveApps.cpp | 8 ++++---- clientgui/DlgExitMessage.cpp | 4 ++-- clientgui/DlgGenericMessage.cpp | 4 ++-- clientgui/DlgHiddenColumns.cpp | 4 ++-- clientgui/DlgOptions.cpp | 18 ++++++++++-------- clientgui/DlgSelectComputer.cpp | 4 ++-- clientgui/sg_BoincSimpleFrame.cpp | 4 ++-- clientgui/sg_DlgMessages.cpp | 4 ++-- clientgui/sg_DlgPreferences.cpp | 8 ++++---- clientgui/wizardex.cpp | 2 +- 13 files changed, 40 insertions(+), 38 deletions(-) diff --git a/clientgui/AdvancedFrame.cpp b/clientgui/AdvancedFrame.cpp index 1e664a77b7..4304a8cdd7 100644 --- a/clientgui/AdvancedFrame.cpp +++ b/clientgui/AdvancedFrame.cpp @@ -1,6 +1,6 @@ // This file is part of BOINC. // http://boinc.berkeley.edu -// Copyright (C) 2022 University of California +// Copyright (C) 2023 University of California // // BOINC is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License @@ -368,12 +368,12 @@ bool CAdvancedFrame::CreateMenus() { ); if (is_boinc_started_by_manager) { strMenuName.Printf( - _("Exit %s"), + _("E&xit %s"), pSkinAdvanced->GetApplicationShortName().c_str() ); } else { strMenuName.Printf( - _("Exit %s"), + _("E&xit %s"), pSkinAdvanced->GetApplicationName().c_str() ); } diff --git a/clientgui/DlgAdvPreferencesBase.cpp b/clientgui/DlgAdvPreferencesBase.cpp index d93a5bcfa5..807c44795f 100644 --- a/clientgui/DlgAdvPreferencesBase.cpp +++ b/clientgui/DlgAdvPreferencesBase.cpp @@ -1,6 +1,6 @@ // This file is part of BOINC. // http://boinc.berkeley.edu -// Copyright (C) 2022 University of California +// Copyright (C) 2023 University of California // // BOINC is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License @@ -185,15 +185,15 @@ CDlgAdvPreferencesBase::CDlgAdvPreferencesBase( wxWindow* parent, int id, wxStri m_panelButtons = new wxPanel( this, ID_DEFAULT, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* buttonSizer = new wxBoxSizer( wxHORIZONTAL ); - m_btnOK = new wxButton( m_panelButtons, wxID_OK, _("Save"), wxDefaultPosition, wxDefaultSize, 0 ); - m_btnOK->SetToolTip( _("Save all values and close the dialog.") ); + m_btnOK = new wxButton( m_panelButtons, wxID_OK, _("&Save"), wxDefaultPosition, wxDefaultSize, 0 ); + m_btnOK->SetToolTip( _("Save all values and close the dialog") ); if (m_bUsingLocalPrefs) { m_btnOK->SetDefault(); } buttonSizer->Add( m_btnOK, 0, wxALL, 5 ); m_btnCancel = new wxButton( m_panelButtons, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); - m_btnCancel->SetToolTip( _("Close the dialog without saving.") ); + m_btnCancel->SetToolTip( _("Close the dialog without saving") ); if (!m_bUsingLocalPrefs) { m_btnCancel->SetDefault(); } diff --git a/clientgui/DlgDiagnosticLogFlags.cpp b/clientgui/DlgDiagnosticLogFlags.cpp index 71ac25099c..d59289493d 100644 --- a/clientgui/DlgDiagnosticLogFlags.cpp +++ b/clientgui/DlgDiagnosticLogFlags.cpp @@ -1,6 +1,6 @@ // This file is part of BOINC. // http://boinc.berkeley.edu -// Copyright (C) 2022 University of California +// Copyright (C) 2023 University of California // // BOINC is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License @@ -117,7 +117,7 @@ CDlgDiagnosticLogFlags::CDlgDiagnosticLogFlags(wxWindow* parent) : wxBoxSizer* buttonSizer = new wxBoxSizer( wxHORIZONTAL ); - wxButton* btnOK = new wxButton( this, wxID_OK, _("Save"), wxDefaultPosition, wxDefaultSize, 0 ); + wxButton* btnOK = new wxButton( this, wxID_OK, _("&Save"), wxDefaultPosition, wxDefaultSize, 0 ); btnOK->SetToolTip( _("Save all values and close the dialog") ); buttonSizer->Add( btnOK, 0, wxALL, 5 ); diff --git a/clientgui/DlgExclusiveApps.cpp b/clientgui/DlgExclusiveApps.cpp index cd2b809355..89c54b7bd2 100644 --- a/clientgui/DlgExclusiveApps.cpp +++ b/clientgui/DlgExclusiveApps.cpp @@ -1,6 +1,6 @@ // This file is part of BOINC. // http://boinc.berkeley.edu -// Copyright (C) 2022 University of California +// Copyright (C) 2023 University of California // // BOINC is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License @@ -143,13 +143,13 @@ CDlgExclusiveApps::CDlgExclusiveApps(wxWindow* parent) : m_panelButtons = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); wxBoxSizer* buttonSizer = new wxBoxSizer( wxHORIZONTAL ); - m_btnOK = new wxButton( m_panelButtons, wxID_OK, _("Save"), wxDefaultPosition, wxDefaultSize, 0 ); - m_btnOK->SetToolTip( _("save all values and close the dialog") ); + m_btnOK = new wxButton( m_panelButtons, wxID_OK, _("&Save"), wxDefaultPosition, wxDefaultSize, 0 ); + m_btnOK->SetToolTip( _("Save all values and close the dialog") ); buttonSizer->Add( m_btnOK, 0, wxALL, 5 ); m_btnCancel = new wxButton( m_panelButtons, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); - m_btnCancel->SetToolTip( _("close the dialog without saving") ); + m_btnCancel->SetToolTip( _("Close the dialog without saving") ); m_btnCancel->SetDefault(); buttonSizer->Add( m_btnCancel, 0, wxALL, 5 ); diff --git a/clientgui/DlgExitMessage.cpp b/clientgui/DlgExitMessage.cpp index ea1d770640..b7cee87c33 100644 --- a/clientgui/DlgExitMessage.cpp +++ b/clientgui/DlgExitMessage.cpp @@ -1,6 +1,6 @@ // This file is part of BOINC. // http://boinc.berkeley.edu -// Copyright (C) 2008 University of California +// Copyright (C) 2023 University of California // // BOINC is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License @@ -187,7 +187,7 @@ void CDlgExitMessage::CreateControls() itemFlexGridSizer8->Add(itemButton9, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); wxButton* itemButton10 = new wxButton; - itemButton10->Create( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); + itemButton10->Create( itemDialog1, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); itemFlexGridSizer8->Add(itemButton10, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); ////@end CDlgExitMessage content construction diff --git a/clientgui/DlgGenericMessage.cpp b/clientgui/DlgGenericMessage.cpp index 372feb2cb1..702109eeb2 100644 --- a/clientgui/DlgGenericMessage.cpp +++ b/clientgui/DlgGenericMessage.cpp @@ -1,6 +1,6 @@ // This file is part of BOINC. // http://boinc.berkeley.edu -// Copyright (C) 2008 University of California +// Copyright (C) 2023 University of California // // BOINC is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License @@ -122,7 +122,7 @@ void CDlgGenericMessage::CreateControls() itemFlexGridSizer8->Add(itemButton9, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); wxButton* itemButton10 = new wxButton; - itemButton10->Create( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); + itemButton10->Create( itemDialog1, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); itemFlexGridSizer8->Add(itemButton10, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); ////@end CDlgGenericMessage content construction diff --git a/clientgui/DlgHiddenColumns.cpp b/clientgui/DlgHiddenColumns.cpp index d633d81673..e2f93c0a08 100644 --- a/clientgui/DlgHiddenColumns.cpp +++ b/clientgui/DlgHiddenColumns.cpp @@ -1,6 +1,6 @@ // This file is part of BOINC. // http://boinc.berkeley.edu -// Copyright (C) 2022 University of California +// Copyright (C) 2023 University of California // // BOINC is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License @@ -97,7 +97,7 @@ CDlgHiddenColumns::CDlgHiddenColumns(wxWindow* parent) : wxBoxSizer* buttonSizer = new wxBoxSizer( wxHORIZONTAL ); - m_btnOK = new wxButton( this, wxID_OK, _("Save"), wxDefaultPosition, wxDefaultSize, 0 ); + m_btnOK = new wxButton( this, wxID_OK, _("&Save"), wxDefaultPosition, wxDefaultSize, 0 ); m_btnOK->SetToolTip( _("Save all values and close the dialog") ); buttonSizer->Add( m_btnOK, 0, wxALL, 5 ); diff --git a/clientgui/DlgOptions.cpp b/clientgui/DlgOptions.cpp index 92d7bc2bf8..2d21161b25 100644 --- a/clientgui/DlgOptions.cpp +++ b/clientgui/DlgOptions.cpp @@ -1,6 +1,6 @@ // This file is part of BOINC. // http://boinc.berkeley.edu -// Copyright (C) 2008 University of California +// Copyright (C) 2023 University of California // // BOINC is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License @@ -432,14 +432,16 @@ void CDlgOptions::CreateControls() { wxBoxSizer* itemBoxSizer59 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer2->Add(itemBoxSizer59, 0, wxALIGN_RIGHT|wxALL, 5); - wxButton* itemButton60 = new wxButton; - itemButton60->Create( itemDialog1, wxID_OK, _("&Save"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer59->Add(itemButton60, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + wxButton* btnSave = new wxButton; + btnSave->Create( itemDialog1, wxID_OK, _("&Save"), wxDefaultPosition, wxDefaultSize, 0 ); + btnSave->SetToolTip( _("Save all values and close the dialog") ); + itemBoxSizer59->Add(btnSave, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxButton* itemButton61 = new wxButton; - itemButton61->Create( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); - itemButton61->SetDefault(); - itemBoxSizer59->Add(itemButton61, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + wxButton* btnCancel = new wxButton; + btnCancel->Create( itemDialog1, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); + btnCancel->SetToolTip( _("Close the dialog without saving") ); + btnCancel->SetDefault(); + itemBoxSizer59->Add(btnCancel, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); // Set validators diff --git a/clientgui/DlgSelectComputer.cpp b/clientgui/DlgSelectComputer.cpp index 42a4049d40..8ddf011f9e 100644 --- a/clientgui/DlgSelectComputer.cpp +++ b/clientgui/DlgSelectComputer.cpp @@ -1,6 +1,6 @@ // This file is part of BOINC. // http://boinc.berkeley.edu -// Copyright (C) 2008 University of California +// Copyright (C) 2023 University of California // // BOINC is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License @@ -165,7 +165,7 @@ void CDlgSelectComputer::CreateControls(bool required) itemBoxSizer10->Add(itemButton11, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); wxButton* itemButton12 = new wxButton; - itemButton12->Create( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); + itemButton12->Create( itemDialog1, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer10->Add(itemButton12, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); // Set validators diff --git a/clientgui/sg_BoincSimpleFrame.cpp b/clientgui/sg_BoincSimpleFrame.cpp index a4af537770..7263cea4ca 100644 --- a/clientgui/sg_BoincSimpleFrame.cpp +++ b/clientgui/sg_BoincSimpleFrame.cpp @@ -1,6 +1,6 @@ // This file is part of BOINC. // http://boinc.berkeley.edu -// Copyright (C) 2022 University of California +// Copyright (C) 2023 University of California // // BOINC is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License @@ -162,7 +162,7 @@ bool CSimpleFrame::CreateMenus() { ); strMenuName.Printf( - _("Exit %s"), + _("E&xit %s"), pSkinAdvanced->GetApplicationName().c_str() ); diff --git a/clientgui/sg_DlgMessages.cpp b/clientgui/sg_DlgMessages.cpp index 885ea0dc8b..dcc7c89d27 100644 --- a/clientgui/sg_DlgMessages.cpp +++ b/clientgui/sg_DlgMessages.cpp @@ -1,6 +1,6 @@ // This file is part of BOINC. // http://boinc.berkeley.edu -// Copyright (C) 2022 University of California +// Copyright (C) 2023 University of California // // BOINC is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License @@ -143,7 +143,7 @@ void CPanelMessages::CreateControls() wxBoxSizer* itemBoxSizer4 = new wxBoxSizer(wxHORIZONTAL); - wxButton* itemButton44 = new wxButton(itemDialog1, wxID_OK, _("Close"), wxDefaultPosition, wxDefaultSize); + wxButton* itemButton44 = new wxButton(itemDialog1, wxID_OK, _("&Close"), wxDefaultPosition, wxDefaultSize); itemBoxSizer4->Add(itemButton44, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); diff --git a/clientgui/sg_DlgPreferences.cpp b/clientgui/sg_DlgPreferences.cpp index a7d139400b..9344890fe0 100644 --- a/clientgui/sg_DlgPreferences.cpp +++ b/clientgui/sg_DlgPreferences.cpp @@ -1,6 +1,6 @@ // This file is part of BOINC. // http://boinc.berkeley.edu -// Copyright (C) 2022 University of California +// Copyright (C) 2023 University of California // // BOINC is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License @@ -350,15 +350,15 @@ void CPanelPreferences::CreateControls() wxBoxSizer* itemBoxSizer44 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer2->Add(itemBoxSizer44, 0, wxALIGN_RIGHT|wxALL, 5); - wxButton* itemButton44 = new wxButton( itemDialog1, wxID_OK, _("Save"), wxDefaultPosition, wxDefaultSize, 0 ); - itemButton44->SetToolTip( _("Save all values and close the dialog.") ); + wxButton* itemButton44 = new wxButton( itemDialog1, wxID_OK, _("&Save"), wxDefaultPosition, wxDefaultSize, 0 ); + itemButton44->SetToolTip( _("Save all values and close the dialog") ); if (m_bUsingLocalPrefs) { itemButton44->SetDefault(); } itemBoxSizer44->Add(itemButton44, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); wxButton* itemButton45 = new wxButton( itemDialog1, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); - itemButton45->SetToolTip( _("Close the dialog without saving.") ); + itemButton45->SetToolTip( _("Close the dialog without saving") ); if (!m_bUsingLocalPrefs) { itemButton45->SetDefault(); } diff --git a/clientgui/wizardex.cpp b/clientgui/wizardex.cpp index ba49d26500..b1ed83ba74 100644 --- a/clientgui/wizardex.cpp +++ b/clientgui/wizardex.cpp @@ -384,7 +384,7 @@ void wxWizardEx::AddButtonRow(wxBoxSizer *mainColumn) #endif m_btnNext = new wxButton(this, wxID_FORWARD, _("&Next >")); - m_btnCancel = new wxButton(this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, buttonStyle); + m_btnCancel = new wxButton(this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, buttonStyle); #ifndef __WXMAC__ if (GetExtraStyle() & wxWIZARD_EX_HELPBUTTON) btnHelp = new wxButton(this, wxID_HELP, _("&Help"), wxDefaultPosition, wxDefaultSize, buttonStyle);