X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_dialog.cc;h=34027ca0c3600f3f207e2b460034234a15662389;hb=5fef65538040fbac1b9edd1847a269aa925a49c9;hp=87b48d986a7b67138d78d8b8d3a41bc92a2cca9c;hpb=e2f0c5f91e2579c41d8efc9495b6ebac31a61ba3;p=ardour.git

diff --git a/gtk2_ardour/ardour_dialog.cc b/gtk2_ardour/ardour_dialog.cc
index 87b48d986a..34027ca0c3 100644
--- a/gtk2_ardour/ardour_dialog.cc
+++ b/gtk2_ardour/ardour_dialog.cc
@@ -23,17 +23,20 @@
 #include <gtkmm2ext/doi.h>
 
 #include "ardour_dialog.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;
-
-sigc::signal<void> ArdourDialog::CloseAllDialogs;
+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 ();
@@ -57,6 +60,16 @@ ArdourDialog::~ArdourDialog ()
                         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
@@ -95,12 +108,28 @@ ArdourDialog::on_show ()
 	}
 }
 
+bool
+ArdourDialog::on_delete_event (GdkEventAny*)
+{
+	hide ();
+	return false;
+}
+
 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));
+
+	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);
 }