more miscellaneous fixes to make things even nicer

[ardour.git] / gtk2_ardour / ardour_ui.h

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index c835303de7cc662ca3f42c3b766969c3b08306cc..d9ba85bb70e7b36d98a44ef01f4f694a21689504 100644 (file)
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -61,6 +61,7 @@
 #include "audio_clock.h"
 #include "ardour_dialog.h"
 #include "editing.h"
+#include "glade_factory.h"
 
 class AudioClock;
 class PublicEditor;
@@ -127,7 +128,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
                _will_create_new_session_automatically = yn;
        }
 
-       void new_session (bool startup = false, std::string path = string());
+       void new_session(bool startup = false, std::string path = string());
        gint cmdline_new_session (std::string path);
        int  unload_session ();
        void close_session() { unload_session(); }
@@ -144,11 +145,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        PublicEditor&     the_editor(){return *editor;}
        Mixer_UI* the_mixer() { return mixer; }
        
-       void allow_focus (bool yn);
-
-       static gint generic_focus_in_event (GdkEventFocus *);
-       static gint generic_focus_out_event (GdkEventFocus *);
-
        void toggle_location_window ();
        void toggle_big_clock_window ();
        void toggle_connection_editor ();
@@ -209,7 +205,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI
   protected:
        friend class PublicEditor;
 
-       void toggle_metering ();
        void toggle_clocking ();
        void toggle_auto_play ();
        void toggle_auto_input ();
@@ -333,9 +328,11 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        void         start_clocking ();
        void         stop_clocking ();
 
-       AudioClock               big_clock;
-       Gtk::Frame               big_clock_frame;
-       ArdourDialog*          big_clock_window;
+       void manage_window (Gtk::Window&);
+       
+       AudioClock   big_clock;
+       Gtk::Frame   big_clock_frame;
+       Gtk::Window* big_clock_window;
 
        /* Transport Control */
 
@@ -483,33 +480,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        void build_menu_bar ();
        void pack_toplevel_controls();
 
-       /* handles on the menu bar items that need to 
-          be sensitive to whether or not we have
-          a session loaded.
-       */
-
-       Gtk::MenuItem *add_track_item;
-       Gtk::MenuItem *save_item;
-       Gtk::MenuItem *snapshot_item;
-       Gtk::MenuItem *save_as_item;
-       Gtk::MenuItem *save_template_item;
-       Gtk::MenuItem *export_item;
-       Gtk::MenuItem *close_item;
-
-       Gtk::CheckMenuItem *meter_bridge_dialog_check;
-       Gtk::CheckMenuItem *connection_editor_check;
-       Gtk::CheckMenuItem *route_params_check;
-       Gtk::CheckMenuItem *locations_dialog_check;
-       Gtk::CheckMenuItem *big_clock_check;
-       Gtk::CheckMenuItem *tempo_editor_check;
-       Gtk::CheckMenuItem *sfdb_check;
-       Gtk::CheckMenuItem *options_window_check;
-       
-       /* <CMT Additions> */
-       Gtk::MenuItem *image_compositor_item ;
-       /* </CMT Additions> */
-
-
        Gtk::Label   wall_clock_label;
        Gtk::EventBox wall_clock_box;
        gint update_wall_clock ();
@@ -548,16 +518,9 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 
        bool _will_create_new_session_automatically;
 
-       NewSessionDialog* new_session_window;
-       string template_name;
-
-       void new_session_ok_clicked ();
-       void new_session_template_choice (Gtk::TreeView&, Glib::RefPtr<Gtk::TreeSelection>);
-       void hide_dialog (ArdourDialog *dialog);
-
-       void fs_cancel_clicked (Gtk::FileSelection*);
-       gint fs_delete_event (GdkEventAny*, Gtk::FileSelection*);
-
+       GladeRef m_new_session_dialog_ref;
+       NewSessionDialog* m_new_session_dialog;
+       
        void open_session ();
        void open_recent_session ();
        void open_ok_clicked ();
@@ -641,9 +604,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        PublicEditor     *editor;
        int         create_editor ();
 
-       MeterBridge  *meter_bridge;
-       int          create_meter_bridge ();
-
        RouteParams_UI *route_params;
        int             create_route_params ();
 
@@ -653,7 +613,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        LocationUI *location_ui;
        int         create_location_ui ();
 
-       void meter_bridge_hiding ();
        void location_ui_hiding ();
        void big_clock_hiding ();
        void route_params_hiding ();
@@ -683,6 +642,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        /* Keymap handling */
 
        void install_keybindings ();
+       Glib::RefPtr<Gtk::ActionGroup> get_common_actions();
        void install_actions ();
        void test_binding_action (const char *);
        void start_keyboard_prefix();
@@ -737,7 +697,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        int make_session_clean ();
        bool filter_ardour_session_dirs (const Gtk::FileFilter::Info&);
 
-       Glib::RefPtr<Gtk::UIManager> ui_manager;
+       Glib::RefPtr<Gtk::ActionGroup> common_actions;
 };
 
 #endif /* __ardour_gui_h__ */