fix gtk errors caused by using non-escaped paths in a column used as a tooltip (which...

[ardour.git] / gtk2_ardour / startup.h

diff --git a/gtk2_ardour/startup.h b/gtk2_ardour/startup.h
index 95803785c10140ddb09840faf8f43e54d3d28de6..cf14103b52ee7056836d5989da461a378feaf188 100644 (file)
--- a/gtk2_ardour/startup.h
+++ b/gtk2_ardour/startup.h
@@ -45,17 +45,16 @@ class EngineControl;
 
 class ArdourStartup : public Gtk::Assistant {
   public:
-       ArdourStartup ();
+        ArdourStartup (bool require_new, const std::string& session_name, const std::string& session_path, const std::string& template_name);
        ~ArdourStartup ();
 
-       void set_new_only (bool);
-        void set_load_template( std::string load_template );
+        bool ready_without_display () const;
 
-       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 +74,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;
        }
 
@@ -83,7 +82,13 @@ class ArdourStartup : public Gtk::Assistant {
        gint _response;
        bool config_modified;
        bool new_user;
+        bool need_audio_setup;
+        bool need_session_info;
        bool new_only;
+        std::string _provided_session_name;
+        std::string _provided_session_path;
+
+       std::string been_here_before_path () const;
 
        void on_apply ();
        void on_cancel ();
@@ -113,7 +118,7 @@ class ArdourStartup : public Gtk::Assistant {
        Gtk::VBox ic_vbox;
        Gtk::RadioButton ic_new_session_button;
        Gtk::RadioButton ic_existing_session_button;
-       bool initial_button_press(GdkEventButton *);
+        bool initial_button_clicked(GdkEventButton*);
        void initial_button_activated();
 
        /* monitoring choices */
@@ -151,10 +156,12 @@ class ArdourStartup : public Gtk::Assistant {
        struct RecentSessionModelColumns : public Gtk::TreeModel::ColumnRecord {
            RecentSessionModelColumns() {
                    add (visible_name);
+                   add (tip);
                    add (fullpath);
            }
-           Gtk::TreeModelColumn<Glib::ustring> visible_name;
-           Gtk::TreeModelColumn<Glib::ustring> fullpath;
+           Gtk::TreeModelColumn<std::string> visible_name;
+           Gtk::TreeModelColumn<std::string> tip;
+           Gtk::TreeModelColumn<std::string> fullpath;
        };
 
        RecentSessionModelColumns    recent_session_columns;
@@ -179,7 +186,6 @@ class ArdourStartup : public Gtk::Assistant {
        Gtk::Entry new_name_entry;
        Gtk::FileChooserButton new_folder_chooser;
        Gtk::FileChooserButton session_template_chooser;
-        void new_name_mapped ();
 
        struct SessionTemplateColumns : public Gtk::TreeModel::ColumnRecord {
                SessionTemplateColumns () {
@@ -288,6 +294,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_prerelease_page ();
 };
 
 #endif /* __gtk2_ardour_startup_h__ */