diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-05 00:49:47 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-05 00:49:47 +0000 |
| commit | 4443dee989426bb1322a6f7d50d419d3e50480ba (patch) | |
| tree | aa11876fac8285086c8a55f75266bebd088cb990 | |
| parent | 3136752d0a0232af79b370667a5aa62a707ad48c (diff) | |
| download | chromium_src-4443dee989426bb1322a6f7d50d419d3e50480ba.zip chromium_src-4443dee989426bb1322a6f7d50d419d3e50480ba.tar.gz chromium_src-4443dee989426bb1322a6f7d50d419d3e50480ba.tar.bz2 | |
views/gtk: Add missing keyboard accelerators to Search Engines dialog.
BUG=16380
TEST=manual
Patch from Thiago Farina <thiago.farina@gmail.com>.
Review URL: http://codereview.chromium.org/518028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35499 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/app/generated_resources.grd | 4 | ||||
| -rw-r--r-- | chrome/browser/gtk/keyword_editor_view.cc | 13 | ||||
| -rw-r--r-- | chrome/browser/views/keyword_editor_view.cc | 6 |
3 files changed, 16 insertions, 7 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 0bf1e62..2b99bdc 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -1060,11 +1060,11 @@ each locale. --> </message> <message name="IDS_SEARCH_ENGINES_EDITOR_NEW_BUTTON" desc="Text of the new button in the search engines editor"> - Add... + &Add... </message> <message name="IDS_SEARCH_ENGINES_EDITOR_REMOVE_BUTTON" desc="Text of the remove button in the search engines editor"> - Remove + &Remove </message> <message name="IDS_SEARCH_ENGINES_EDITOR_EDIT_BUTTON" desc="Text of the edit button in the search engines editor"> diff --git a/chrome/browser/gtk/keyword_editor_view.cc b/chrome/browser/gtk/keyword_editor_view.cc index b1de93f..7ed31ed 100644 --- a/chrome/browser/gtk/keyword_editor_view.cc +++ b/chrome/browser/gtk/keyword_editor_view.cc @@ -152,8 +152,10 @@ void KeywordEditorView::Init() { GtkWidget* button_box = gtk_vbox_new(FALSE, gtk_util::kControlSpacing); gtk_box_pack_start(GTK_BOX(hbox), button_box, FALSE, FALSE, 0); - add_button_ = gtk_button_new_with_label( - l10n_util::GetStringUTF8(IDS_SEARCH_ENGINES_EDITOR_NEW_BUTTON).c_str()); + add_button_ = gtk_button_new_with_mnemonic( + gtk_util::ConvertAcceleratorsFromWindowsStyle( + l10n_util::GetStringUTF8( + IDS_SEARCH_ENGINES_EDITOR_NEW_BUTTON)).c_str()); g_signal_connect(G_OBJECT(add_button_), "clicked", G_CALLBACK(OnAddButtonClicked), this); gtk_box_pack_start(GTK_BOX(button_box), add_button_, FALSE, FALSE, 0); @@ -164,9 +166,10 @@ void KeywordEditorView::Init() { G_CALLBACK(OnEditButtonClicked), this); gtk_box_pack_start(GTK_BOX(button_box), edit_button_, FALSE, FALSE, 0); - remove_button_ = gtk_button_new_with_label( - l10n_util::GetStringUTF8( - IDS_SEARCH_ENGINES_EDITOR_REMOVE_BUTTON).c_str()); + remove_button_ = gtk_button_new_with_mnemonic( + gtk_util::ConvertAcceleratorsFromWindowsStyle( + l10n_util::GetStringUTF8( + IDS_SEARCH_ENGINES_EDITOR_REMOVE_BUTTON)).c_str()); g_signal_connect(G_OBJECT(remove_button_), "clicked", G_CALLBACK(OnRemoveButtonClicked), this); gtk_box_pack_start(GTK_BOX(button_box), remove_button_, FALSE, FALSE, 0); diff --git a/chrome/browser/views/keyword_editor_view.cc b/chrome/browser/views/keyword_editor_view.cc index ed1b938..1981dc0 100644 --- a/chrome/browser/views/keyword_editor_view.cc +++ b/chrome/browser/views/keyword_editor_view.cc @@ -155,6 +155,9 @@ void KeywordEditorView::Init() { add_button_ = new views::NativeButton( this, l10n_util::GetString(IDS_SEARCH_ENGINES_EDITOR_NEW_BUTTON)); add_button_->SetEnabled(controller_->loaded()); + add_button_->AddAccelerator( + views::Accelerator(base::VKEY_A, false, false, true)); + add_button_->SetAccessibleKeyboardShortcut(L"A"); edit_button_ = new views::NativeButton( this, l10n_util::GetString(IDS_SEARCH_ENGINES_EDITOR_EDIT_BUTTON)); @@ -163,6 +166,9 @@ void KeywordEditorView::Init() { remove_button_ = new views::NativeButton( this, l10n_util::GetString(IDS_SEARCH_ENGINES_EDITOR_REMOVE_BUTTON)); remove_button_->SetEnabled(false); + remove_button_->AddAccelerator( + views::Accelerator(base::VKEY_R, false, false, true)); + remove_button_->SetAccessibleKeyboardShortcut(L"R"); make_default_button_ = new views::NativeButton( this, |