X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_dialog.cc;h=89b9914120147b4586ca137ad0d73df5ad17c3b7;hb=25ec63968c0e792217a015c402ac52ae59a85e3b;hp=3af944d85ccafb3c8e17375d4aab6b90464f3d3a;hpb=08d33fcb0d35b6448ac1b5a4bcc54095cacbfccd;p=ardour.git

diff --git a/gtk2_ardour/ardour_dialog.cc b/gtk2_ardour/ardour_dialog.cc
index 3af944d85c..89b9914120 100644
--- a/gtk2_ardour/ardour_dialog.cc
+++ b/gtk2_ardour/ardour_dialog.cc
@@ -18,123 +18,112 @@
 */
 
 #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 (string name)
-	: Dialog (name), 
-	  KeyboardTarget (*this, name)
+ArdourDialog::ArdourDialog (Gtk::Window& parent, string title, bool modal, bool use_seperator)
+	: Dialog (title, parent, modal, use_seperator)
+        , _splash_pushed (false)
 {
-	session = 0;
-	kbd_input = false;
-	running = false;
-	_run_status = 0;
-	_within_hiding = false;
-	hide_on_stop = true;
+	init ();
+	set_position (Gtk::WIN_POS_CENTER_ON_PARENT);
 }
 
 ArdourDialog::~ArdourDialog ()
 {
+        if (_splash_pushed) {
+                Splash* spl = Splash::instance();
+
+                if (spl) {
+                        spl->pop_front();
+                }
+        }
+        Keyboard::the_keyboard().focus_out_window (0, this);
+        WM::Manager::instance().remove (proxy);
 }
 
 bool
-ArdourDialog::on_enter_notify_event (GdkEventCrossing *ev)
+ArdourDialog::on_focus_in_event (GdkEventFocus *ev)
 {
-	if (ev->detail != GDK_NOTIFY_INFERIOR) {
-		Keyboard::the_keyboard().set_current_dialog (this);
-	}
-	return FALSE;
+	Keyboard::the_keyboard().focus_in_window (ev, this);
+	return Dialog::on_focus_in_event (ev);
 }
 
 bool
-ArdourDialog::on_leave_notify_event (GdkEventCrossing *ev)
+ArdourDialog::on_focus_out_event (GdkEventFocus *ev)
 {
-	if (ev->detail != GDK_NOTIFY_INFERIOR) {
-		Keyboard::the_keyboard().set_current_dialog (0);
+	if (!get_modal()) {
+		Keyboard::the_keyboard().focus_out_window (ev, this);
 	}
-	return FALSE;
+	return Dialog::on_focus_out_event (ev);
 }
 
 void
 ArdourDialog::on_unmap ()
 {
-	_within_hiding = true;
-	Hiding (); /* EMIT_SIGNAL */
-	_within_hiding = false;
+	Keyboard::the_keyboard().leave_window (0, this);
 	Dialog::on_unmap ();
 }
 
 void
-ArdourDialog::set_hide_on_stop (bool yn)
+ArdourDialog::on_show ()
 {
-	hide_on_stop = yn;
-}
+	Dialog::on_show ();
 
-void
-ArdourDialog::stop (int rr)
-{
-	if (hide_on_stop) {
-		Hiding (); /* EMIT_SIGNAL */
-		hide_all ();
+	// never allow the splash screen to obscure any dialog
 
-		if (kbd_input) {
-			ARDOUR_UI::instance()->allow_focus (false);
-		}
-	}
+	Splash* spl = Splash::instance();
 
-	if (running) {
-		if (rr == 0) {
-			response (GTK_RESPONSE_ACCEPT);
-		} else {
-			response (GTK_RESPONSE_CANCEL);
-		}
-		running = false;
+	if (spl && spl->is_visible()) {
+		spl->pop_back_for (*this);
+                _splash_pushed = true;
 	}
 }
 
-void
-ArdourDialog::run ()
+bool
+ArdourDialog::on_delete_event (GdkEventAny*)
 {
-	show_all ();
-
-	if (kbd_input) {
-		ARDOUR_UI::instance()->allow_focus (true);
-	}
+	hide ();
+	return false;
+}
 
-	running = true;
-	switch (Dialog::run ()) {
-	case GTK_RESPONSE_ACCEPT:
-		_run_status = 0;
-		break;
-		
-	case GTK_RESPONSE_DELETE_EVENT:
-		_run_status = -1;
-		break;
-
-	default:
-		_run_status = -1;
-	}
+void
+ArdourDialog::init ()
+{
+	set_border_width (10);
+	add_events (Gdk::FOCUS_CHANGE_MASK);
+	set_type_hint (Gdk::WINDOW_TYPE_HINT_DIALOG);
 
-	hide_all ();
+	Gtk::Window* parent = WM::Manager::instance().transient_parent();
 
-	if (kbd_input) {
-		ARDOUR_UI::instance()->allow_focus (false);
+	if (parent) {
+		set_transient_for (*parent);
 	}
-}
 
-void
-ArdourDialog::set_keyboard_input (bool yn)
-{
-	kbd_input = yn;
-}
+	ARDOUR_UI::CloseAllDialogs.connect (sigc::bind (sigc::mem_fun (*this, &ArdourDialog::response), RESPONSE_CANCEL));
 
-int
-ArdourDialog::run_status ()
-{
-	return _run_status;
+	proxy = new WM::ProxyTemporary (get_title(), this);
+	WM::Manager::instance().register_window (proxy);
 }