remove use-session-as-template option from new session dialog and fix ability to...

Note: using a template is still not actually working ...

diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc
index 5d9e1742496e1d60177e1d898f0cd449282fdf00..ff16d7c1e8054c40d66601da29df387143ec054e 100644 (file)
--- a/gtk2_ardour/startup.cc
+++ b/gtk2_ardour/startup.cc
@@ -96,9 +96,6 @@ ArdourStartup::ArdourStartup (bool require_new, const std::string& session_name,
        
        if (need_session_info || new_user) {
 
-               use_template_button.set_group (session_template_group);
-               use_session_as_template_button.set_group (session_template_group);
-               
                set_keep_above (true);
                set_position (WIN_POS_CENTER);
                set_border_width (12);
@@ -207,9 +204,9 @@ ArdourStartup::use_session_template ()
 
        if (use_template_button.get_active()) {
                return template_chooser.get_active_row_number() > 0;
-       } else {
-               return !session_template_chooser.get_filename().empty();
-       }
+       } 
+       
+       return false;
 }
 
 std::string
@@ -225,10 +222,9 @@ ArdourStartup::session_template_name ()
                TreeModel::Row row = (*iter);
                string s = row[session_template_columns.path];
                return s;
-       } else {
-               return session_template_chooser.get_filename();
+       } 
 
-       }
+       return string();
 }
 
 std::string
@@ -849,29 +845,6 @@ ArdourStartup::setup_new_session_page ()
 
        vbox3->pack_start (*hbox4a, false, false);
 
-       /* --- */
-
-       if (!new_user) {
-               session_template_chooser.set_current_folder (poor_mans_glob (Config->get_default_session_parent_dir()));
-               
-               HBox* hbox4b = manage (new HBox);
-               use_session_as_template_button.set_label (_("Use an existing session as a template:"));
-               
-               hbox4b->set_spacing (6);
-               hbox4b->pack_start (use_session_as_template_button, false, false);
-               hbox4b->pack_start (session_template_chooser, true, true);
-               
-               use_session_as_template_button.show ();
-               session_template_chooser.show ();
-               
-               Gtk::FileFilter* session_filter = manage (new (Gtk::FileFilter));
-               session_filter->add_pattern (X_("*.ardour"));
-               session_template_chooser.set_filter (*session_filter);
-               session_template_chooser.set_title (_("Select template"));
-               
-               vbox3->pack_start (*hbox4b, false, false);
-       }
-       
        /* --- */
        
        HBox* hbox5 = manage (new HBox);

diff --git a/gtk2_ardour/startup.h b/gtk2_ardour/startup.h
index 45d11190f9602d6c2e601126cca5ee184a298b22..361d00e9e14ac01982f37fde424620b62c057e5a 100644 (file)
--- a/gtk2_ardour/startup.h
+++ b/gtk2_ardour/startup.h
@@ -174,7 +174,6 @@ class ArdourStartup : public Gtk::Assistant {
        void setup_new_session_page ();
        Gtk::Entry new_name_entry;
        Gtk::FileChooserButton new_folder_chooser;
-       Gtk::FileChooserButton session_template_chooser;
 
        struct SessionTemplateColumns : public Gtk::TreeModel::ColumnRecord {
                SessionTemplateColumns () {
@@ -193,9 +192,7 @@ class ArdourStartup : public Gtk::Assistant {
        Gtk::VBox session_new_vbox;
        Gtk::VBox session_existing_vbox;
        Gtk::Expander more_new_session_options_button;
-       Gtk::RadioButtonGroup session_template_group;
-       Gtk::RadioButton use_session_as_template_button;
-       Gtk::RadioButton use_template_button;
+       Gtk::CheckButton use_template_button;
         std::string load_template_override;
 
        void more_new_session_options_button_clicked();