projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
first compilable version of tabbable design.
[ardour.git]
/
gtk2_ardour
/
ardour_dialog.cc
diff --git
a/gtk2_ardour/ardour_dialog.cc
b/gtk2_ardour/ardour_dialog.cc
index 1755214bd85207bf744495ef9b99cf067443d73c..f8071c2e622d960481789c42cbbaea1857726ed1 100644
(file)
--- a/
gtk2_ardour/ardour_dialog.cc
+++ b/
gtk2_ardour/ardour_dialog.cc
@@
-18,152
+18,111
@@
*/
#include <iostream>
*/
#include <iostream>
+#include <sigc++/bind.h>
#include <gtkmm2ext/doi.h>
#include "ardour_dialog.h"
#include <gtkmm2ext/doi.h>
#include "ardour_dialog.h"
-#include "keyboard.h"
#include "ardour_ui.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 name)
- : Gtk::Window (GTK_WINDOW_TOPLEVEL),
- KeyboardTarget (*this, name)
+ArdourDialog::ArdourDialog (string title, bool modal, bool use_seperator)
+ : Dialog (title, modal, use_seperator)
+ , proxy (0)
+ , _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_MOUSE);
}
}
-ArdourDialog::~ArdourDialog ()
+ArdourDialog::ArdourDialog (Gtk::Window& parent, string title, bool modal, bool use_seperator)
+ : Dialog (title, parent, modal, use_seperator)
+ , _splash_pushed (false)
{
{
+ init ();
+ set_position (Gtk::WIN_POS_CENTER_ON_PARENT);
}
}
-gint
-ArdourDialog::on_enter_notify_event (GdkEventCrossing *ev)
+ArdourDialog::~ArdourDialog ()
{
{
- if (ev->detail != GDK_NOTIFY_INFERIOR) {
- Keyboard::the_keyboard().set_current_dialog (this);
- }
- return FALSE;
-}
+ if (_splash_pushed) {
+ Splash* spl = Splash::instance();
-gint
-ArdourDialog::on_leave_notify_event (GdkEventCrossing *ev)
-{
- if (ev->detail != GDK_NOTIFY_INFERIOR) {
- Keyboard::the_keyboard().set_current_dialog (0);
- }
- return FALSE;
+ if (spl) {
+ spl->pop_front();
+ }
+ }
+ WM::Manager::instance().remove (proxy);
}
}
-gint
-ArdourDialog:
on_unmap (GdkEventAny
*ev)
+bool
+ArdourDialog:
:on_focus_in_event (GdkEventFocus
*ev)
{
{
- _within_hiding = true;
- Hiding (); /* EMIT_SIGNAL */
- _within_hiding = false;
- return Gtk::Window::on_unmap (ev);
+ Keyboard::the_keyboard().focus_in_window (ev, this);
+ return Dialog::on_focus_in_event (ev);
}
}
-void
-ArdourDialog::
wm_close(
)
+bool
+ArdourDialog::
on_focus_out_event (GdkEventFocus *ev
)
{
{
- stop (-1);
- ARDOUR_UI::instance()->allow_focus(false);
-}
-
-void
-ArdourDialog::wm_doi ()
-{
- if (!hide_on_stop) {
- Hiding (); /* EMIT_SIGNAL */
+ if (!get_modal()) {
+ Keyboard::the_keyboard().focus_out_window (ev, this);
}
}
- stop (-1);
- delete_when_idle (this);
-}
-
-gint
-ArdourDialog::wm_close_event (GdkEventAny* ev)
-{
- wm_close ();
- return TRUE;
-}
-
-gint
-ArdourDialog::wm_doi_event (GdkEventAny* ev)
-{
- wm_doi ();
- return TRUE;
-}
-
-gint
-ArdourDialog::wm_doi_event_stop (GdkEventAny* ev)
-{
- stop (-1);
- return TRUE;
+ return Dialog::on_focus_out_event (ev);
}
void
}
void
-ArdourDialog::
set_hide_on_stop (bool yn
)
+ArdourDialog::
on_unmap (
)
{
{
- hide_on_stop = yn;
+ Keyboard::the_keyboard().leave_window (0, this);
+ Dialog::on_unmap ();
}
void
}
void
-ArdourDialog::
close
()
+ArdourDialog::
on_show
()
{
{
-
hide_all
();
+
Dialog::on_show
();
- if (kbd_input) {
- ARDOUR_UI::instance()->allow_focus (false);
- }
-}
+ // never allow the splash screen to obscure any dialog
-void
-ArdourDialog::stop (int rr)
-{
- _run_status = rr;
+ Splash* spl = Splash::instance();
- if (hide_on_stop) {
- Hiding (); /* EMIT_SIGNAL */
- hide_all ();
-
- if (kbd_input) {
- ARDOUR_UI::instance()->allow_focus (false);
- }
+ if (spl && spl->is_visible()) {
+ spl->pop_back_for (*this);
+ _splash_pushed = true;
}
}
+}
- if (running) {
- Gtk::Main::quit ();
- running = false;
- }
+bool
+ArdourDialog::on_delete_event (GdkEventAny*)
+{
+ hide ();
+ return false;
}
void
}
void
-ArdourDialog::
run
()
+ArdourDialog::
init
()
{
{
- show_all ();
+ set_border_width (10);
+ add_events (Gdk::FOCUS_CHANGE_MASK);
+ set_type_hint (Gdk::WINDOW_TYPE_HINT_DIALOG);
+
+ Gtk::Window* parent = WM::Manager::instance().transient_parent();
- if (
kbd_inpu
t) {
-
ARDOUR_UI::instance()->allow_focus (true
);
+ if (
paren
t) {
+
set_transient_for (*parent
);
}
}
- running = true;
- Gtk::Main::run ();
-}
+ ARDOUR_UI::CloseAllDialogs.connect (sigc::bind (sigc::mem_fun (*this, &ArdourDialog::response), RESPONSE_CANCEL));
-void
-ArdourDialog::set_keyboard_input (bool yn)
-{
- kbd_input = yn;
-}
-
-int
-ArdourDialog::run_status ()
-{
- return _run_status;
+ proxy = new WM::ProxyTemporary (get_title(), this);
+ WM::Manager::instance().register_window (proxy);
}
}