remove cruft (unused UI::ui_scale)

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

diff --git a/libs/gtkmm2ext/gtk_ui.cc b/libs/gtkmm2ext/gtk_ui.cc
index 64fef47ca5d2e02ae110a22cde06fb9ebf622649..c2210bba934714a12f58255befdd0954140e28d4 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;
@@ -54,7 +55,6 @@ using namespace PBD;
 using std::map;
 
 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();
@@ -71,8 +71,8 @@ template class AbstractUI<Gtkmm2ext::UIRequest>;
 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);
 
@@ -365,10 +365,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, ">", "-");
@@ -715,7 +727,7 @@ UI::popup_error (const string& text)
 }
 
 void
-UI::flush_pending ()
+UI::flush_pending (float timeout)
 {
        if (!caller_is_ui_thread()) {
                error << "non-UI threads cannot call UI::flush_pending()"
@@ -723,9 +735,15 @@ UI::flush_pending ()
                return;
        }
 
+       int64_t end = g_get_monotonic_time () + timeout * 1e6;
+
        gtk_main_iteration();
 
        while (gtk_events_pending()) {
+               if (timeout > 0 && end < g_get_monotonic_time ()) {
+                       cerr << "UI::flush_pending timed out after " << timeout << "s.\n";
+                       break;
+               }
                gtk_main_iteration();
        }
 }
@@ -737,42 +755,6 @@ UI::just_hide_it (GdkEventAny* /*ev*/, Window *win)
        return true;
 }
 
-Gdk::Color
-UI::get_color (const string& prompt, bool& picked, const Gdk::Color* initial)
-{
-       Gdk::Color color;
-
-       ColorSelectionDialog color_dialog (prompt);
-
-       color_dialog.set_modal (true);
-       color_dialog.get_cancel_button()->signal_clicked().connect (bind (mem_fun (*this, &UI::color_selection_done), false));
-       color_dialog.get_ok_button()->signal_clicked().connect (bind (mem_fun (*this, &UI::color_selection_done), true));
-       color_dialog.signal_delete_event().connect (mem_fun (*this, &UI::color_selection_deleted));
-
-       if (initial) {
-               color_dialog.get_colorsel()->set_current_color (*initial);
-       }
-
-       color_dialog.show_all ();
-       color_picked = false;
-       picked = false;
-
-       Main::run();
-
-       color_dialog.hide_all ();
-
-       if (color_picked) {
-               Gdk::Color f_rgba = color_dialog.get_colorsel()->get_current_color ();
-               color.set_red(f_rgba.get_red());
-               color.set_green(f_rgba.get_green());
-               color.set_blue(f_rgba.get_blue());
-
-               picked = true;
-       }
-
-       return color;
-}
-
 void
 UI::color_selection_done (bool status)
 {