ardour/livetrax
13
0
Fork 0
Code

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

Browse Source 
Note: using a template is still not actually working ...
This commit is contained in:
Paul Davis 2013-09-21 13:56:59 -04:00
parent e33b29d672
commit 04d66a9e3a
2 changed files with 6 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
gtk2_ardour/startup.cc
View File

@ -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);

5
gtk2_ardour/startup.h
View File

@ -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();