diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2005-10-06 18:24:23 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2005-10-06 18:24:23 +0000 |
commit | 5a52d8fee4c9abac7ffb1f1e6464785d979acd68 (patch) | |
tree | 52328a74b8b643b76bc3773e6bda7e1c03728cbf /gtk2_ardour/ardour_ui.h | |
parent | f7b1b0fbbdee17e80908df4b24038e2e144f1f23 (diff) |
changes from colin for route_params, nick for location_ui and route_ui, and me for ardour_ui.cc
git-svn-id: svn://localhost/trunk/ardour2@50 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour_ui.h')
-rw-r--r-- | gtk2_ardour/ardour_ui.h | 45 |
1 files changed, 30 insertions, 15 deletions
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index 1dc09cac75..a22c6e2bb4 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -41,7 +41,6 @@ #include <gtkmm2ext/gtk_ui.h> #include <gtkmm2ext/pix.h> #include <gtkmm2ext/click_box.h> -#include <gtkmm2ext/selector.h> #include <ardour/ardour.h> #include <ardour/session.h> @@ -380,8 +379,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI Gtk::Label speed_display_label; Gtk::Button shuttle_units_button; Gtk::Button shuttle_style_button; - Gtk::Menu shuttle_unit_menu; - Gtk::Menu shuttle_style_menu; + Gtk::Menu* shuttle_unit_menu; + Gtk::Menu* shuttle_style_menu; ShuttleBehaviour shuttle_behaviour; ShuttleUnits shuttle_units; @@ -447,26 +446,39 @@ class ARDOUR_UI : public Gtkmm2ext::UI static void rate_printer (char buf[32], Gtk::Adjustment &, void *); - Gtk::Menu* session_popup_menu; - Gtkmm2ext::Selector session_selector; - ArdourDialog* session_selector_window; - - Gtk::FileSelection* open_session_selector; + Gtk::Menu* session_popup_menu; + + struct RecentSessionModelColumns : public Gtk::TreeModel::ColumnRecord { + RecentSessionModelColumns() { + add (visible_name); + add (fullpath); + } + Gtk::TreeModelColumn<Glib::ustring> visible_name; + Gtk::TreeModelColumn<Glib::ustring> fullpath; + }; + + RecentSessionModelColumns recent_session_columns; + Gtk::TreeView recent_session_display; + Glib::RefPtr<Gtk::TreeStore> recent_session_model; + + ArdourDialog* session_selector_window; + Gtk::FileChooserDialog* open_session_selector; void build_session_selector(); - void session_selection (Gtk::TreeView&, Glib::RefPtr<Gtk::TreeSelection>); + void recent_session_selection_changed (); + void redisplay_recent_sessions(); + struct RecentSessionsSorter { - bool operator() (std::pair<string,string> a, std::pair<string,string> b) const { - return cmp_nocase(a.first, b.first) == -1; + bool operator() (std::pair<string,string> a, std::pair<string,string> b) const { + return cmp_nocase(a.first, b.first) == -1; } }; - void redisplay_recent_sessions(); /* menu bar and associated stuff */ - Gtk::MenuBar menu_bar; - Gtk::Fixed menu_bar_base; - Gtk::HBox menu_hbox; + Gtk::MenuBar* menu_bar; + Gtk::Fixed menu_bar_base; + Gtk::HBox menu_hbox; void build_menu_bar (); void pack_toplevel_controls(); @@ -720,6 +732,9 @@ class ARDOUR_UI : public Gtkmm2ext::UI Gtk::Menu* jack_bufsize_menu; int make_session_clean (); + bool filter_ardour_session_dirs (const Gtk::FileFilter::Info&); + + Glib::RefPtr<Gtk::UIManager> ui_manager; }; #endif /* __ardour_gui_h__ */ |