pay attention to MIDI channel selector when creating notes with GUI (fixes #3233)

[ardour.git] / gtk2_ardour / ardour_dialog.cc

diff --git a/gtk2_ardour/ardour_dialog.cc b/gtk2_ardour/ardour_dialog.cc
index 22f3f260483089ac93c917f023a0fd752218e7bd..cd95666b16f120b3fd85fa2c5b12cc12b4ce68cc 100644 (file)
--- a/gtk2_ardour/ardour_dialog.cc
+++ b/gtk2_ardour/ardour_dialog.cc
@@ -18,18 +18,34 @@
 */
 
 #include <iostream>
+#include <sigc++/bind.h>
 
 #include <gtkmm2ext/doi.h>
 
 #include "ardour_dialog.h"
 #include "keyboard.h"
 #include "ardour_ui.h"
+#include "splash.h"
+#include "public_editor.h"
+#include "utils.h"
 
+using namespace std;
+using namespace Gtk;
+using namespace Gtkmm2ext;
 
-ArdourDialog::ArdourDialog (string title, bool modal)
-       : Dialog (title, modal)
+sigc::signal<void> ArdourDialog::CloseAllDialogs;
+
+ArdourDialog::ArdourDialog (string title, bool modal, bool use_seperator)
+       : Dialog (title, modal, use_seperator)
+{
+       init ();
+}
+
+ArdourDialog::ArdourDialog (Gtk::Window& parent, string title, bool modal, bool use_seperator)
+       : Dialog (title, parent, modal, use_seperator)
 {
-       session = 0;
+       init ();
+       set_position (Gtk::WIN_POS_CENTER_ON_PARENT);
 }
 
 ArdourDialog::~ArdourDialog ()
@@ -39,25 +55,48 @@ ArdourDialog::~ArdourDialog ()
 bool
 ArdourDialog::on_enter_notify_event (GdkEventCrossing *ev)
 {
-       if (ev->detail != GDK_NOTIFY_INFERIOR) {
-               // GTK2FIX
-               //Keyboard::the_keyboard().set_current_dialog (this);
-       }
+       Keyboard::the_keyboard().enter_window (ev, this);
        return false;
 }
 
 bool
 ArdourDialog::on_leave_notify_event (GdkEventCrossing *ev)
 {
-       if (ev->detail != GDK_NOTIFY_INFERIOR) {
-               // GTK2FIX
-               //Keyboard::the_keyboard().set_current_dialog (0);
-       }
+       Keyboard::the_keyboard().leave_window (ev, this);
        return false;
 }
 
 void
 ArdourDialog::on_unmap ()
 {
+       Keyboard::the_keyboard().leave_window (0, this);
        Dialog::on_unmap ();
 }
+
+void
+ArdourDialog::on_show ()
+{
+       // never allow the splash screen to obscure any dialog
+
+       Splash* spl = Splash::instance();
+
+       if (spl) {
+               spl->pop_back ();
+       }
+
+       Dialog::on_show ();
+}
+
+void
+ArdourDialog::init ()
+{
+       set_type_hint(Gdk::WINDOW_TYPE_HINT_DIALOG);
+       set_border_width (10);
+       CloseAllDialogs.connect (sigc::bind (sigc::mem_fun (*this, &ArdourDialog::response), RESPONSE_CANCEL));
+}
+
+bool
+ArdourDialog::on_key_press_event (GdkEventKey* key)
+{
+       return Gtk::Dialog::on_key_press_event (key);
+}