Added comment explaining new Gtk::Dialog idiom.

[ardour.git] / gtk2_ardour / ardour_ui.h

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index b5ed3b4e3aa265cb51469ea085d00f18667df215..d9ba85bb70e7b36d98a44ef01f4f694a21689504 100644 (file)
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -145,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 ();
@@ -210,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 ();
@@ -334,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 */
 
@@ -484,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 ();
@@ -635,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 ();
 
@@ -647,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 ();
@@ -677,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();
@@ -731,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__ */