From eacba74649e961508fb85eddb1e8dd51d8c61be5 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 7 Dec 2012 13:43:45 +0000 Subject: change presentation of shortcut in tooltips and fix include paths git-svn-id: svn://localhost/ardour2/branches/3.0@13612 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/gtkmm2ext/gtk_ui.cc | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/libs/gtkmm2ext/gtk_ui.cc b/libs/gtkmm2ext/gtk_ui.cc index a1b932af59..6e466f5c9f 100644 --- a/libs/gtkmm2ext/gtk_ui.cc +++ b/libs/gtkmm2ext/gtk_ui.cc @@ -27,20 +27,22 @@ #include #include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include + +#include "pbd/error.h" +#include "pbd/touchable.h" +#include "pbd/failed_constructor.h" +#include "pbd/pthread_utils.h" +#include "pbd/replace_all.h" + +#include "gtkmm2ext/application.h" +#include "gtkmm2ext/gtk_ui.h" +#include "gtkmm2ext/textviewer.h" +#include "gtkmm2ext/popup.h" +#include "gtkmm2ext/utils.h" +#include "gtkmm2ext/window_title.h" +#include "gtkmm2ext/actions.h" +#include "gtkmm2ext/activatable.h" +#include "gtkmm2ext/actions.h" #include "i18n.h" @@ -352,14 +354,11 @@ UI::set_tip (Widget *w, const gchar *tip, const gchar *hlp) Gtk::AccelKey key; ustring ap = action->get_accel_path(); if (!ap.empty()) { - bool has_key = ActionManager::lookup_entry(ap, key); - if (has_key) { - string abbrev = key.get_abbrev(); - if (!abbrev.empty()) { - replace_all (abbrev, "<", ""); - replace_all (abbrev, ">", "-"); - msg.append(_("\n\nKey: ")).append (abbrev); - } + string shortcut = ActionManager::get_key_representation (ap, key); + if (!shortcut.empty()) { + replace_all (shortcut, "<", ""); + replace_all (shortcut, ">", "-"); + msg.append(_("\n\nShortcut: ")).append (shortcut); } } } -- cgit v1.2.3