enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h

[ardour.git] / libs / gtkmm2ext / gtk_ui.cc

diff --git a/libs/gtkmm2ext/gtk_ui.cc b/libs/gtkmm2ext/gtk_ui.cc
index d1601468591945033b5954fd07887ef28eed3d1c..c3e94c922eee2c3b5899afabc5b9eaac6d96ce8e 100644 (file)
--- a/libs/gtkmm2ext/gtk_ui.cc
+++ b/libs/gtkmm2ext/gtk_ui.cc
@@ -35,6 +35,7 @@
 #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"
@@ -45,7 +46,7 @@
 #include "gtkmm2ext/actions.h"
 #include "gtkmm2ext/gui_thread.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Gtkmm2ext;
 using namespace Gtk;
@@ -53,7 +54,8 @@ using namespace Glib;
 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();
@@ -67,11 +69,11 @@ BaseUI::RequestType Gtkmm2ext::AddTimeout = 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);
 
@@ -98,6 +100,10 @@ UI::UI (string namestr, int *argc, char ***argv)
 
        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 ();
@@ -107,7 +113,7 @@ UI::UI (string namestr, int *argc, char ***argv)
        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");
@@ -360,10 +366,22 @@ UI::set_tip (Widget *w, const gchar *tip, const gchar *hlp)
        }
 
        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, ">", "-");
@@ -449,7 +467,7 @@ UI::do_request (UIRequest* req)
        } 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 ();
@@ -704,7 +722,7 @@ UI::popup_error (const string& text)
 
        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 ();
 }