Fix region/track naming on MIDI import (remove ugly/unnecessary %a %b etc suffix).

[ardour.git] / gtk2_ardour / ardour_dialog.cc

diff --git a/gtk2_ardour/ardour_dialog.cc b/gtk2_ardour/ardour_dialog.cc
index 22f3f260483089ac93c917f023a0fd752218e7bd..bc24389948cfb993118a1fa082ed1cbfb9636f1a 100644 (file)
--- a/gtk2_ardour/ardour_dialog.cc
+++ b/gtk2_ardour/ardour_dialog.cc
@@ -24,12 +24,23 @@
 #include "ardour_dialog.h"
 #include "keyboard.h"
 #include "ardour_ui.h"
+#include "splash.h"
 
+ArdourDialog::ArdourDialog (string title, bool modal, bool use_seperator)
+       : Dialog (title, modal, use_seperator)
+{
+       session = 0;
+
+       set_type_hint(Gdk::WINDOW_TYPE_HINT_DIALOG);
+}
 
-ArdourDialog::ArdourDialog (string title, bool modal)
-       : Dialog (title, modal)
+ArdourDialog::ArdourDialog (Gtk::Window& parent, string title, bool modal, bool use_seperator)
+       : Dialog (title, parent, modal, use_seperator)
 {
        session = 0;
+
+       set_type_hint(Gdk::WINDOW_TYPE_HINT_DIALOG);
+       set_position (Gtk::WIN_POS_CENTER_ON_PARENT);
 }
 
 ArdourDialog::~ArdourDialog ()
@@ -39,20 +50,14 @@ 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;
 }
 
@@ -61,3 +66,17 @@ ArdourDialog::on_unmap ()
 {
        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 ();
+}