first compilable version of tabbable design.

[ardour.git] / gtk2_ardour / mixer_ui.h

diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h
index 5399307be69e86b8a646e199116a5c9ddb00680a..4721bf106f81c75fd301b3ebffc384391452d20b 100644 (file)
--- a/gtk2_ardour/mixer_ui.h
+++ b/gtk2_ardour/mixer_ui.h
@@ -42,10 +42,13 @@
 #include "ardour/plugin.h"
 #include "ardour/plugin_manager.h"
 
+
 #include "gtkmm2ext/visibility_tracker.h"
 #include "gtkmm2ext/dndtreeview.h"
 #include "gtkmm2ext/treeutils.h"
 
+#include "gtkmm2ext/tabbable.h"
+
 #include "enums.h"
 #include "mixer_actor.h"
 
@@ -72,12 +75,15 @@ protected:
        virtual bool row_drop_possible_vfunc (const Gtk::TreeModel::Path&, const Gtk::SelectionData&) const;
 };
 
-class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr, public MixerActor, public Gtkmm2ext::VisibilityTracker
+class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr, public MixerActor, public Gtkmm2ext::VisibilityTracker
 {
   public:
        static Mixer_UI* instance();
        ~Mixer_UI();
 
+       Gtk::Window* use_own_window ();
+       void show_window ();
+
        void set_session (ARDOUR::Session *);
        void track_editor_selection ();
 
@@ -89,22 +95,18 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
        void unselect_strip_in_display (MixerStrip*);
        void select_strip_in_display (MixerStrip*);
 
-       XMLNode& get_state (void);
-       int set_state (const XMLNode& );
+       XMLNode& get_state ();
+       int set_state (const XMLNode&, int /* version */);
 
        void show_mixer_list (bool yn);
        void show_monitor_section (bool);
-       
-       void show_window ();
-       bool hide_window (GdkEventAny *ev);
+
        void show_strip (MixerStrip *);
        void hide_strip (MixerStrip *);
 
        void maximise_mixer_space();
        void restore_mixer_space();
 
-       void ensure_float (Gtk::Window&);
-
         MonitorSection* monitor_section() const { return _monitor_section; }
 
        void deselect_all_strip_processors();
@@ -112,22 +114,22 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
 
        void select_none ();
 
+       bool window_not_visible () const;
+
   protected:
        void set_route_targets_for_operation ();
 
   private:
        Mixer_UI ();
-       static Mixer_UI* _instance;
-
-       bool                                    _visible;
-
-       Gtk::HBox                               global_hpacker;
-       Gtk::VBox                               global_vpacker;
-       Gtk::ScrolledWindow             scroller;
-       Gtk::EventBox                   scroller_base;
-       Gtk::HBox                               scroller_hpacker;
-       Gtk::VBox                               mixer_scroller_vpacker;
-       Gtk::VBox                               list_vpacker;
+       static Mixer_UI*     _instance;
+       Gtk::VBox            _content;
+       Gtk::HBox             global_hpacker;
+       Gtk::VBox             global_vpacker;
+       Gtk::ScrolledWindow   scroller;
+       Gtk::EventBox         scroller_base;
+       Gtk::HBox             scroller_hpacker;
+       Gtk::VBox             mixer_scroller_vpacker;
+       Gtk::VBox             list_vpacker;
        Gtk::Label                              group_display_button_label;
        Gtk::Button                             group_display_button;
        Gtk::ScrolledWindow             track_display_scroller;
@@ -201,6 +203,7 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
        void plugin_row_activated (const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* column);
        bool plugin_row_button_press (GdkEventButton*);
        void popup_note_context_menu (GdkEventButton*);
+       void plugin_drop (const Glib::RefPtr<Gdk::DragContext>&, const Gtk::SelectionData& data);
 
        enum ProcessorPosition {
                AddTop,
@@ -211,6 +214,9 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
 
        void add_selected_processor (ProcessorPosition);
        void add_favorite_processor (ARDOUR::PluginPresetPtr, ProcessorPosition);
+       void remove_selected_from_favorites ();
+       void delete_selected_preset ();
+       ARDOUR::PluginPresetPtr selected_plugin ();
 
        void initial_track_display ();
        void show_track_list_menu ();
@@ -343,6 +349,7 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
 
        void monitor_section_going_away ();
 
+<<<<<<< HEAD
        void monitor_section_attached ();
        void monitor_section_detached ();
 
@@ -350,7 +357,13 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
        void refiller (ARDOUR::PluginInfoList& result, const ARDOUR::PluginInfoList& plugs);
        void refill_favorite_plugins ();
        void sync_treeview_from_favorite_order ();
+       void sync_treeview_favorite_ui_state (const Gtk::TreeModel::Path&, const Gtk::TreeModel::iterator&);
+       void save_favorite_ui_state (const Gtk::TreeModel::iterator& iter, const Gtk::TreeModel::Path& path);
 
+=======
+       void create_own_window ();
+
+>>>>>>> the basics of tabbed
        /// true if we are in fullscreen mode
        bool _maximised;
 
@@ -359,5 +372,3 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
 };
 
 #endif /* __ardour_mixer_ui_h__ */
-
-