From 720c68d7e1fc2c3e18bf50e542b1d9cad05a227a Mon Sep 17 00:00:00 2001 From: Mathias Buhr Date: Tue, 8 Mar 2016 09:14:50 +0100 Subject: Adds a tooltip to the icon --- gtk2_ardour/keyeditor.cc | 3 ++- libs/gtkmm2ext/gtkmm2ext/searchbar.h | 5 ++++- libs/gtkmm2ext/searchbar.cc | 12 ++++++------ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/gtk2_ardour/keyeditor.cc b/gtk2_ardour/keyeditor.cc index d7a92bd630..f300b4751c 100644 --- a/gtk2_ardour/keyeditor.cc +++ b/gtk2_ardour/keyeditor.cc @@ -68,7 +68,7 @@ KeyEditor::KeyEditor () : ArdourWindow (_("Key Bindings")) , unbind_button (_("Remove shortcut")) , unbind_box (BUTTONBOX_END) - , filter_entry (_("Search...")) + , filter_entry (_("Search..."), true) , filter_string("") , sort_column(0) , sort_type(Gtk::SORT_ASCENDING) @@ -80,6 +80,7 @@ KeyEditor::KeyEditor () Glib::RefPtr icon = ARDOUR_UI_UTILS::get_icon ("search"); filter_entry.set_icon_from_pixbuf (icon); + filter_entry.set_icon_tooltip_text (_("Click to reset search string")); filter_entry.signal_search_string_updated ().connect (sigc::mem_fun (*this, &KeyEditor::search_string_updated)); vpacker.pack_start (filter_entry, false, false); diff --git a/libs/gtkmm2ext/gtkmm2ext/searchbar.h b/libs/gtkmm2ext/gtkmm2ext/searchbar.h index 5096ed53f9..d14d3bed3f 100644 --- a/libs/gtkmm2ext/gtkmm2ext/searchbar.h +++ b/libs/gtkmm2ext/gtkmm2ext/searchbar.h @@ -8,8 +8,11 @@ namespace Gtkmm2ext { class SearchBar : public Gtk::Entry { public: - SearchBar(const std::string& placeholder_text = "Search...", bool icon_click_resets = true); + SearchBar( + const std::string& placeholder_text = "Search...", + bool icon_click_resets = true); + // resets the searchbar to the initial state void reset (); // emitted when the filter has been updated sigc::signal signal_search_string_updated () { return sig_search_string_updated; } diff --git a/libs/gtkmm2ext/searchbar.cc b/libs/gtkmm2ext/searchbar.cc index 75915c1f2e..6bfb7e0629 100644 --- a/libs/gtkmm2ext/searchbar.cc +++ b/libs/gtkmm2ext/searchbar.cc @@ -64,12 +64,12 @@ SearchBar::key_press_event (GdkEventKey* ev) void SearchBar::icon_clicked_event (Gtk::EntryIconPosition, const GdkEventButton*) { - if (icon_click_resets) { - reset (); - } - else { - search_string_changed (); - } + if (icon_click_resets) { + reset (); + } + else { + search_string_changed (); + } } void -- cgit v1.2.3