Fix out-of-whack notebook tabs wrt their contents in certain port matrices, broken...

[ardour.git] / gtk2_ardour / startup.h

diff --git a/gtk2_ardour/startup.h b/gtk2_ardour/startup.h
index 397b7314e65c446d87f6200dccca06837705a9c8..76183b5b5a6885bf054ff0d432e310c8f1740c94 100644 (file)
--- a/gtk2_ardour/startup.h
+++ b/gtk2_ardour/startup.h
@@ -51,11 +51,11 @@ class ArdourStartup : public Gtk::Assistant {
        void set_new_only (bool);
         void set_load_template( std::string load_template );
 
-       Glib::ustring session_name (bool& should_be_new);
-       Glib::ustring session_folder ();
+       std::string session_name (bool& should_be_new);
+       std::string session_folder ();
 
        bool use_session_template();
-       Glib::ustring session_template_name();
+       std::string session_template_name();
 
        EngineControl* engine_control() { return engine_dialog; }
 
@@ -75,7 +75,7 @@ class ArdourStartup : public Gtk::Assistant {
        bool connect_outs_to_master() const;
        bool connect_outs_to_physical() const;
 
-       gint response () const { 
+       gint response () const {
                return  _response;
        }
 
@@ -141,8 +141,6 @@ class ArdourStartup : public Gtk::Assistant {
        /* recent sessions */
 
        void setup_existing_session_page ();
-       /** true when setup_existing_session_page () has already been called at least once */
-       bool _have_setup_existing_session_page;
 
        struct RecentSessionsSorter {
            bool operator() (std::pair<std::string,std::string> a, std::pair<std::string,std::string> b) const {
@@ -155,8 +153,8 @@ class ArdourStartup : public Gtk::Assistant {
                    add (visible_name);
                    add (fullpath);
            }
-           Gtk::TreeModelColumn<Glib::ustring> visible_name;
-           Gtk::TreeModelColumn<Glib::ustring> fullpath;
+           Gtk::TreeModelColumn<std::string> visible_name;
+           Gtk::TreeModelColumn<std::string> fullpath;
        };
 
        RecentSessionModelColumns    recent_session_columns;
@@ -198,6 +196,7 @@ class ArdourStartup : public Gtk::Assistant {
        Gtk::ComboBox template_chooser;
 
        Gtk::VBox session_new_vbox;
+       Gtk::VBox session_existing_vbox;
        Gtk::CheckButton more_new_session_options_button;
        Gtk::RadioButtonGroup session_template_group;
        Gtk::RadioButton use_session_as_template_button;
@@ -289,6 +288,7 @@ class ArdourStartup : public Gtk::Assistant {
        void move_along_now ();
 
        bool _existing_session_chooser_used; ///< set to true when the existing session chooser has been used
+        void setup_alpha_page ();
 };
 
 #endif /* __gtk2_ardour_startup_h__ */