Import Dialog is Window. Dialog Esc behavior needs to be emulated.

[ardour.git] / gtk2_ardour / panner2d.cc

diff --git a/gtk2_ardour/panner2d.cc b/gtk2_ardour/panner2d.cc
index 23c4976861ba3fcce31493aba3f57cda81d09cda..57d54d5f47e52cb91b5a24ceab61bdce2aa8c24d 100644 (file)
--- a/gtk2_ardour/panner2d.cc
+++ b/gtk2_ardour/panner2d.cc
@@ -35,16 +35,15 @@
 
 #include "canvas/colors.h"
 
-#include "ardour_ui.h"
-#include "global_signals.h"
 #include "panner2d.h"
 #include "keyboard.h"
 #include "gui_thread.h"
 #include "rgb_macros.h"
 #include "utils.h"
 #include "public_editor.h"
+#include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtk;
@@ -91,7 +90,7 @@ Panner2d::Panner2d (boost::shared_ptr<PannerShell> p, int32_t h)
                have_colors = true;
        }
 
-       ColorsChanged.connect (sigc::mem_fun (*this, &Panner2d::color_handler));
+       UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &Panner2d::color_handler));
 
        panner_shell->Changed.connect (panshell_connections, invalidator (*this), boost::bind (&Panner2d::handle_state_change, this), gui_context());
 
@@ -109,13 +108,16 @@ Panner2d::~Panner2d()
        for (Targets::iterator i = speakers.begin(); i != speakers.end(); ++i) {
                delete *i;
        }
+       for (Targets::iterator i = signals.begin(); i != signals.end(); ++i) {
+               delete *i;
+       }
 }
 
 void
 Panner2d::set_colors ()
 {
        // TODO get all colors from theme, resolve dups
-       colors.background = ARDOUR_UI::config()->color ("mono panner bg");
+       colors.background = UIConfiguration::instance().color ("mono panner bg");
        colors.crosshairs =          0x4884a9ff; // 0.282, 0.517, 0.662, 1.0
        colors.signalcircle_border = 0x84c5e1ff; // 0.517, 0.772, 0.882, 1.0
        colors.signalcircle =        0x4884a9ff; // 0.282, 0.517, 0.662, 1.0  // also used with a = 0.9
@@ -471,7 +473,7 @@ Panner2d::on_expose_event (GdkEventExpose *event)
 
        uint32_t bg = colors.background;
        if (_send_mode) {
-               bg = ARDOUR_UI::config()->color ("send bg");
+               bg = UIConfiguration::instance().color ("send bg");
        }
 
        if (!panner_shell->bypassed()) {
@@ -1014,7 +1016,7 @@ Panner2dWindow::set_width ()
 bool
 Panner2dWindow::on_key_press_event (GdkEventKey* event)
 {
-       return relay_key_press (event, &PublicEditor::instance());
+       return relay_key_press (event, this);
 }
 
 bool