From 058715c525b6a238b17bfc75d47abaf7e6061e96 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 14 Feb 2012 16:25:13 +0000 Subject: rearrange startup/new session dialog to include new+recent sessions on same page git-svn-id: svn://localhost/ardour2/branches/3.0@11489 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/startup.h | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'gtk2_ardour/startup.h') diff --git a/gtk2_ardour/startup.h b/gtk2_ardour/startup.h index 052a168a37..956af395ef 100644 --- a/gtk2_ardour/startup.h +++ b/gtk2_ardour/startup.h @@ -136,15 +136,11 @@ class ArdourStartup : public Gtk::Assistant { Gtk::RadioButton no_monitor_section_button; void setup_monitor_section_choice_page (); - /* session page (could be new or existing) */ + /* new session page */ - void setup_session_page (); - Gtk::VBox session_vbox; - Gtk::HBox session_hbox; - - /* recent sessions */ - - void setup_existing_session_page (); + void setup_new_session_page (); + Gtk::VBox new_session_vbox; + Gtk::HBox new_session_hbox; struct RecentSessionsSorter { bool operator() (std::pair a, std::pair b) const { @@ -179,7 +175,6 @@ class ArdourStartup : public Gtk::Assistant { /* new sessions */ - void setup_new_session_page (); Gtk::Entry new_name_entry; Gtk::FileChooserButton new_folder_chooser; Gtk::FileChooserButton session_template_chooser; @@ -284,7 +279,7 @@ class ArdourStartup : public Gtk::Assistant { gint default_folder_page_index; gint monitoring_page_index; gint monitor_section_page_index; - gint session_page_index; + gint new_session_page_index; gint initial_choice_index; gint final_page_index; gint session_options_page_index; -- cgit v1.2.3