X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_dialog.cc;h=34027ca0c3600f3f207e2b460034234a15662389;hb=9204b2837ebbaa771d318cadf5cb2ea4d35e9fef;hp=41d9c60444a0a57280e8f380fb5a298e161cefe6;hpb=f69c9ed5648041a7059f56f9ea2d26cbb489d427;p=ardour.git

diff --git a/gtk2_ardour/ardour_dialog.cc b/gtk2_ardour/ardour_dialog.cc
index 41d9c60444..34027ca0c3 100644
--- a/gtk2_ardour/ardour_dialog.cc
+++ b/gtk2_ardour/ardour_dialog.cc
@@ -18,40 +18,118 @@
 */
 
 #include <iostream>
+#include <sigc++/bind.h>
 
 #include <gtkmm2ext/doi.h>
 
 #include "ardour_dialog.h"
-#include "keyboard.h"
 #include "ardour_ui.h"
+#include "keyboard.h"
+#include "splash.h"
+#include "utils.h"
+#include "window_manager.h"
 
+using namespace std;
+using namespace Gtk;
+using namespace Gtkmm2ext;
+using namespace ARDOUR_UI_UTILS;
 
 ArdourDialog::ArdourDialog (string title, bool modal, bool use_seperator)
 	: Dialog (title, modal, use_seperator)
+	, proxy (0)
+        , _splash_pushed (false)
+{
+	init ();
+	set_position (Gtk::WIN_POS_MOUSE);
+}
+
+ArdourDialog::ArdourDialog (Gtk::Window& parent, string title, bool modal, bool use_seperator)
+	: Dialog (title, parent, modal, use_seperator)
+        , _splash_pushed (false)
 {
-	session = 0;
+	init ();
+	set_position (Gtk::WIN_POS_CENTER_ON_PARENT);
 }
 
 ArdourDialog::~ArdourDialog ()
 {
+        if (_splash_pushed) {
+                Splash* spl = Splash::instance();
+                
+                if (spl) {
+                        spl->pop_front();
+                }
+        }
+	WM::Manager::instance().remove (proxy);
+}
+
+bool
+ArdourDialog::on_key_press_event (GdkEventKey* ev)
+{
+	if (!relay_key_press (ev, this)) {
+		return Gtk::Window::on_key_press_event(ev);
+	}
+	return true;
 }
 
 bool
 ArdourDialog::on_enter_notify_event (GdkEventCrossing *ev)
 {
 	Keyboard::the_keyboard().enter_window (ev, this);
-	return false;
+	return Dialog::on_enter_notify_event (ev);
 }
 
 bool
 ArdourDialog::on_leave_notify_event (GdkEventCrossing *ev)
 {
 	Keyboard::the_keyboard().leave_window (ev, this);
-	return false;
+	return Dialog::on_leave_notify_event (ev);
 }
 
 void
 ArdourDialog::on_unmap ()
 {
+	Keyboard::the_keyboard().leave_window (0, this);
 	Dialog::on_unmap ();
 }
+
+void
+ArdourDialog::on_show ()
+{
+	Dialog::on_show ();
+
+	// never allow the splash screen to obscure any dialog
+
+	Splash* spl = Splash::instance();
+
+	if (spl && spl->is_visible()) {
+		spl->pop_back_for (*this);
+                _splash_pushed = true;
+	}
+}
+
+bool
+ArdourDialog::on_delete_event (GdkEventAny*)
+{
+	hide ();
+	return false;
+}
+
+void
+ArdourDialog::init ()
+{
+	set_border_width (10);
+
+	set_type_hint (Gdk::WINDOW_TYPE_HINT_DIALOG);
+
+	Gtk::Window* parent = WM::Manager::instance().transient_parent();
+
+	if (parent) {
+		set_transient_for (*parent);
+	}
+
+	ARDOUR_UI::CloseAllDialogs.connect (sigc::bind (sigc::mem_fun (*this, &ArdourDialog::response), RESPONSE_CANCEL));
+
+	proxy = new WM::ProxyTemporary (get_title(), this);
+	WM::Manager::instance().register_window (proxy);
+}