diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2012-12-07 13:43:45 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-12-07 13:43:45 +0000 |
commit | eacba74649e961508fb85eddb1e8dd51d8c61be5 (patch) | |
tree | 7e935f2ef1af4b3864406810b5492709668a5800 | |
parent | 92e5a13fd41eba37a2634caf921606b7d915c557 (diff) |
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
-rw-r--r-- | libs/gtkmm2ext/gtk_ui.cc | 43 |
1 files 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 <cctype> #include <gtkmm.h> -#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 "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); } } } |