projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
proper 1px track separator
[ardour.git]
/
gtk2_ardour
/
ardour_dialog.h
diff --git
a/gtk2_ardour/ardour_dialog.h
b/gtk2_ardour/ardour_dialog.h
index d2665c0ed8797c9eb319061b1e5f11d86529f49c..d994c0a6d110ce37fa23de8b4df6fc574a444579 100644
(file)
--- a/
gtk2_ardour/ardour_dialog.h
+++ b/
gtk2_ardour/ardour_dialog.h
@@
-20,57
+20,42
@@
#ifndef __ardour_dialog_h__
#define __ardour_dialog_h__
#ifndef __ardour_dialog_h__
#define __ardour_dialog_h__
-#include <ardour/ardour.h>
#include <gtkmm/window.h>
#include <gtkmm/dialog.h>
#include <gtkmm/window.h>
#include <gtkmm/dialog.h>
-#include "
keyboard_target
.h"
+#include "
ardour/session_handle
.h"
-namespace
ARDOUR
{
- class
Session
;
-}
;
+namespace
WM
{
+ class
ProxyTemporary
;
+}
/*
* This virtual parent class is so that each dialog box uses the
/*
* This virtual parent class is so that each dialog box uses the
- * same mechanism to declare its closing, and to have a common
- * method of connecting and disconnecting from a Session.
+ * same mechanism to declare its closing. It shares a common
+ * method of connecting and disconnecting from a Session with
+ * all other objects that have a handle on a Session.
*/
*/
-class ArdourDialog : public Gtk::Dialog, public
KeyboardTarget
+class ArdourDialog : public Gtk::Dialog, public
ARDOUR::SessionHandlePtr
{
public:
{
public:
- ArdourDialog (string name);
+ ArdourDialog (std::string title, bool modal = false, bool use_separator = false);
+ ArdourDialog (Gtk::Window& parent, std::string title, bool modal = false, bool use_separator = false);
~ArdourDialog();
~ArdourDialog();
- bool within_hiding() const { return _within_hiding; }
-
- void run ();
- void stop (int);
- void set_keyboard_input (bool yn);
- void set_hide_on_stop (bool yn);
- int run_status();
-
bool on_enter_notify_event (GdkEventCrossing*);
bool on_leave_notify_event (GdkEventCrossing*);
bool on_enter_notify_event (GdkEventCrossing*);
bool on_leave_notify_event (GdkEventCrossing*);
+ bool on_delete_event (GdkEventAny*);
+ bool on_key_press_event (GdkEventKey*);
void on_unmap ();
void on_unmap ();
-
- ARDOUR::Session *session;
-
- virtual void set_session (ARDOUR::Session* s) {
- session = s;
- }
-
- virtual void session_gone () {
- set_session (0);
- }
-
- void quit ();
+ void on_show ();
private:
private:
-
int _run_status
;
-
bool _within_hiding
;
-
bool kbd_input
;
- bool running;
-
bool hide_on_stop
;
+
WM::ProxyTemporary* proxy
;
+
bool _splash_pushed
;
+
void init ()
;
+
+
static sigc::signal<void> CloseAllDialogs
;
};
#endif // __ardour_dialog_h__
};
#endif // __ardour_dialog_h__
+