diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-04-06 10:36:33 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-04-06 10:36:33 +0000 |
| commit | 4089b0ed93c8cbc631474e41502db755b7066a20 (patch) | |
| tree | b61f916eb27b615014327304a854cc5be8519f38 /gtk2_ardour/startup.h | |
| parent | 9e2dc2e50cff95d0822615378d4d1ffc82104fa8 (diff) | |
revert all recent changes to startup dialog, except for colin f's patches to make a few details work better
git-svn-id: svn://localhost/ardour2/branches/3.0@11804 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/startup.h')
| -rw-r--r-- | gtk2_ardour/startup.h | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/gtk2_ardour/startup.h b/gtk2_ardour/startup.h index 19cb1b609d..052a168a37 100644 --- a/gtk2_ardour/startup.h +++ b/gtk2_ardour/startup.h @@ -115,9 +115,9 @@ class ArdourStartup : public Gtk::Assistant { void setup_initial_choice_page (); Gtk::VBox ic_vbox; - Gtk::CheckButton ic_new_session_button; + Gtk::RadioButton ic_new_session_button; + Gtk::RadioButton ic_existing_session_button; bool initial_button_press(GdkEventButton *); - void initial_button_clicked (); void initial_button_activated(); /* monitoring choices */ @@ -136,11 +136,15 @@ class ArdourStartup : public Gtk::Assistant { Gtk::RadioButton no_monitor_section_button; void setup_monitor_section_choice_page (); - /* new session page */ + /* session page (could be new or existing) */ - void setup_new_session_page (); - Gtk::VBox new_session_vbox; - Gtk::HBox new_session_hbox; + void setup_session_page (); + Gtk::VBox session_vbox; + Gtk::HBox session_hbox; + + /* recent sessions */ + + void setup_existing_session_page (); struct RecentSessionsSorter { bool operator() (std::pair<std::string,std::string> a, std::pair<std::string,std::string> b) const { @@ -175,6 +179,7 @@ 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; @@ -279,7 +284,7 @@ class ArdourStartup : public Gtk::Assistant { gint default_folder_page_index; gint monitoring_page_index; gint monitor_section_page_index; - gint new_session_page_index; + gint session_page_index; gint initial_choice_index; gint final_page_index; gint session_options_page_index; |