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
This commit is contained in:
parent
92e5a13fd4
commit
eacba74649
@ -27,20 +27,22 @@
|
|||||||
#include <cctype>
|
#include <cctype>
|
||||||
|
|
||||||
#include <gtkmm.h>
|
#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 "pbd/error.h"
|
||||||
#include <gtkmm2ext/gtk_ui.h>
|
#include "pbd/touchable.h"
|
||||||
#include <gtkmm2ext/textviewer.h>
|
#include "pbd/failed_constructor.h"
|
||||||
#include <gtkmm2ext/popup.h>
|
#include "pbd/pthread_utils.h"
|
||||||
#include <gtkmm2ext/utils.h>
|
#include "pbd/replace_all.h"
|
||||||
#include <gtkmm2ext/window_title.h>
|
|
||||||
#include <gtkmm2ext/actions.h>
|
#include "gtkmm2ext/application.h"
|
||||||
#include <gtkmm2ext/activatable.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"
|
#include "i18n.h"
|
||||||
|
|
||||||
@ -352,14 +354,11 @@ UI::set_tip (Widget *w, const gchar *tip, const gchar *hlp)
|
|||||||
Gtk::AccelKey key;
|
Gtk::AccelKey key;
|
||||||
ustring ap = action->get_accel_path();
|
ustring ap = action->get_accel_path();
|
||||||
if (!ap.empty()) {
|
if (!ap.empty()) {
|
||||||
bool has_key = ActionManager::lookup_entry(ap, key);
|
string shortcut = ActionManager::get_key_representation (ap, key);
|
||||||
if (has_key) {
|
if (!shortcut.empty()) {
|
||||||
string abbrev = key.get_abbrev();
|
replace_all (shortcut, "<", "");
|
||||||
if (!abbrev.empty()) {
|
replace_all (shortcut, ">", "-");
|
||||||
replace_all (abbrev, "<", "");
|
msg.append(_("\n\nShortcut: ")).append (shortcut);
|
||||||
replace_all (abbrev, ">", "-");
|
|
||||||
msg.append(_("\n\nKey: ")).append (abbrev);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user