#include "pbd/replace_all.h"
#include "gtkmm2ext/application.h"
+#include "gtkmm2ext/bindings.h"
#include "gtkmm2ext/gtk_ui.h"
#include "gtkmm2ext/textviewer.h"
#include "gtkmm2ext/popup.h"
using namespace PBD;
using std::map;
-UI *UI::theGtkUI = 0;
+UI* UI::theGtkUI = 0;
+float UI::ui_scale = 1.0;
BaseUI::RequestType Gtkmm2ext::NullMessage = BaseUI::new_request_type();
BaseUI::RequestType Gtkmm2ext::ErrorMessage = BaseUI::new_request_type();
template class AbstractUI<Gtkmm2ext::UIRequest>;
-UI::UI (string namestr, int *argc, char ***argv)
- : AbstractUI<UIRequest> (namestr)
+UI::UI (string application_name, string thread_name, int *argc, char ***argv)
+ : AbstractUI<UIRequest> (thread_name)
, _receiver (*this)
+ , global_bindings (0)
, errors (0)
-
{
theMain = new Main (argc, argv);
pthread_set_name ("gui");
-
+
_active = false;
if (!theGtkUI) {
*/
run_loop_thread = Threads::Thread::self();
-
+
/* store "this" as the UI-for-thread of this thread, same argument
as for previous line.
*/
set_event_loop_for_thread (this);
+ /* we will be receiving requests */
+
+ EventLoop::register_request_buffer_factory ("gui", request_buffer_factory);
+
/* attach our request source to the default main context */
attach_request_source ();
errors->text().set_name ("ErrorText");
errors->signal_unmap().connect (sigc::bind (sigc::ptr_fun (&ActionManager::uncheck_toggleaction), X_("<Actions>/Editor/toggle-log-window")));
- Glib::set_application_name(namestr);
+ Glib::set_application_name (application_name);
WindowTitle title(Glib::get_application_name());
title += _("Log");
/* Yes, pointers to Glib::RefPtr. If these are not kept around,
* a segfault somewhere deep in the wonderfully robust glib will result.
* This does not occur if wiget.get_style is used instead of rc.get_style below,
- * except that doesn't actually work...
+ * except that doesn't actually work...
*/
-
+
static Glib::RefPtr<Style>* fatal_style = 0;
static Glib::RefPtr<Style>* error_style = 0;
static Glib::RefPtr<Style>* warning_style = 0;
}
if (action) {
- Gtk::AccelKey key;
- ustring ap = action->get_accel_path();
- if (!ap.empty()) {
- string shortcut = ActionManager::get_key_representation (ap, key);
+ Bindings* bindings = (Bindings*) w->get_data ("ardour-bindings");
+ if (!bindings) {
+ Gtk::Window* win = (Gtk::Window*) w->get_toplevel();
+ if (win) {
+ bindings = (Bindings*) win->get_data ("ardour-bindings");
+ }
+ }
+
+ if (!bindings) {
+ bindings = global_bindings;
+ }
+
+ if (bindings) {
+ Bindings::Operation op;
+ KeyboardKey kb = bindings->get_binding_for_action (action, op);
+ string shortcut = kb.display_label ();
if (!shortcut.empty()) {
replace_all (shortcut, "<", "");
replace_all (shortcut, ">", "-");
} else if (req->type == CallSlot) {
#ifndef NDEBUG
if (getenv ("DEBUG_THREADED_SIGNALS")) {
- cerr << "call slot for " << name() << endl;
+ cerr << "call slot for " << event_loop_name() << endl;
}
#endif
req->the_slot ();
}
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
-
+
if (tact->get_active()) {
errors->set_position (WIN_POS_MOUSE);
errors->show ();
MessageDialog msg (text);
msg.set_title (string_compose (_("I'm sorry %1, I can't do that"), g_get_user_name()));
- msg.set_wmclass (X_("error"), name());
+ msg.set_wmclass (X_("error"), Glib::get_application_name());
msg.set_position (WIN_POS_MOUSE);
msg.run ();
}