merge from trunk
[ardour.git] / gtk2_ardour / new_session_dialog.cc
index d17d5d3015ca237204f7d05b58aa70bca28c17a2..993db62d59bd2940da001a668f3991d90d850d6d 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 1999-2002 Paul Davis 
+    Copyright (C) 2005 Paul Davis 
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     $Id$
 */
 
-#include <list>
-#include <string>
+#include "i18n.h"
+#include "new_session_dialog.h"
+
+#include <ardour/recent_sessions.h>
 #include <ardour/session.h>
-#include <ardour/audioengine.h>
 
-#include "prompter.h"
-#include "new_session_dialog.h"
+#include <gtkmm/entry.h>
+#include <gtkmm/filechooserbutton.h>
+#include <gtkmm/spinbutton.h>
+#include <gtkmm/checkbutton.h>
+#include <gtkmm/radiobutton.h>
+#include <gtkmm/filefilter.h>
+#include <gtkmm/stock.h>
 
-using namespace Gtkmm2ext;
-using namespace Gtk;
-using namespace ARDOUR;
+#include "opts.h"
 
-#include "i18n.h"
+NewSessionDialog::NewSessionDialog()
+       : ArdourDialog ("New Session Dialog")
+{
+        session_name_label = Gtk::manage(new class Gtk::Label(_("New Session Name :")));
+       m_name = Gtk::manage(new class Gtk::Entry());
+       m_name->set_text(GTK_ARDOUR::session_name);
+
+       session_location_label = Gtk::manage(new class Gtk::Label(_("Create Session Directory In :")));
+       m_folder = Gtk::manage(new class Gtk::FileChooserButton(Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER));
+       session_template_label = Gtk::manage(new class Gtk::Label(_("Use Session Template :")));
+       m_template = Gtk::manage(new class Gtk::FileChooserButton());
+       chan_count_label = Gtk::manage(new class Gtk::Label(_("Channel Count")));
+       m_create_control_bus = Gtk::manage(new class Gtk::CheckButton(_("Create Monitor Bus")));
+       
+       Gtk::Adjustment *m_control_bus_channel_count_adj = Gtk::manage(new class Gtk::Adjustment(2, 0, 100, 1, 10, 10));
+       m_control_bus_channel_count = Gtk::manage(new class Gtk::SpinButton(*m_control_bus_channel_count_adj, 1, 0));
+       
+       Gtk::Adjustment *m_master_bus_channel_count_adj = Gtk::manage(new class Gtk::Adjustment(2, 0, 100, 1, 10, 10));
+       m_master_bus_channel_count = Gtk::manage(new class Gtk::SpinButton(*m_master_bus_channel_count_adj, 1, 0));
+       m_create_master_bus = Gtk::manage(new class Gtk::CheckButton(_("Create Master Bus")));
+       advanced_table = Gtk::manage(new class Gtk::Table(2, 2, true));
+       m_connect_inputs = Gtk::manage(new class Gtk::CheckButton(_("Automatically Connect Inputs")));
+       m_limit_input_ports = Gtk::manage(new class Gtk::CheckButton(_("Port Limit")));
+       
+       Gtk::Adjustment *m_input_limit_count_adj = Gtk::manage(new class Gtk::Adjustment(1, 0, 100, 1, 10, 10));
+       m_input_limit_count = Gtk::manage(new class Gtk::SpinButton(*m_input_limit_count_adj, 1, 0));
+       input_port_limit_hbox = Gtk::manage(new class Gtk::HBox(false, 0));
+       input_port_vbox = Gtk::manage(new class Gtk::VBox(false, 0));
+       input_table = Gtk::manage(new class Gtk::Table(2, 2, false));
+       input_port_alignment = Gtk::manage(new class Gtk::Alignment(0.5, 0.5, 1, 1));
+       input_label = Gtk::manage(new class Gtk::Label(_("<b>Track/Bus Inputs</b>")));
+       input_frame = Gtk::manage(new class Gtk::Frame());
+       m_connect_outputs = Gtk::manage(new class Gtk::CheckButton(_("Automatically Connect Outputs")));
+       m_limit_output_ports = Gtk::manage(new class Gtk::CheckButton(_("Port Limit")));
+       
+       Gtk::Adjustment *m_output_limit_count_adj = Gtk::manage(new class Gtk::Adjustment(1, 0, 100, 1, 10, 10));
+       m_output_limit_count = Gtk::manage(new class Gtk::SpinButton(*m_output_limit_count_adj, 1, 0));
+       output_port_limit_hbox = Gtk::manage(new class Gtk::HBox(false, 0));
+       output_port_vbox = Gtk::manage(new class Gtk::VBox(false, 0));
+       
+       Gtk::RadioButton::Group _RadioBGroup_m_connect_outputs_to_master;
+       m_connect_outputs_to_master = Gtk::manage(new class Gtk::RadioButton(_RadioBGroup_m_connect_outputs_to_master, _("Connect to Master Bus")));
+       m_connect_outputs_to_physical = Gtk::manage(new class Gtk::RadioButton(_RadioBGroup_m_connect_outputs_to_master, _("Connect to Physical Outputs")));
+       output_conn_vbox = Gtk::manage(new class Gtk::VBox(false, 0));
+       output_vbox = Gtk::manage(new class Gtk::VBox(false, 0));
+       output_port_alignment = Gtk::manage(new class Gtk::Alignment(0.5, 0.5, 1, 1));
+       output_label = Gtk::manage(new class Gtk::Label(_("<b>Track/Bus Outputs</b>")));
+       output_frame = Gtk::manage(new class Gtk::Frame());
+       advanced_vbox = Gtk::manage(new class Gtk::VBox(false, 0));
+       advanced_label = Gtk::manage(new class Gtk::Label(_("Advanced Options")));
+       advanced_expander = Gtk::manage(new class Gtk::Expander());
+       new_session_table = Gtk::manage(new class Gtk::Table(2, 2, false));
+       m_open_filechooser = Gtk::manage(new class Gtk::FileChooserButton());
+       open_session_hbox = Gtk::manage(new class Gtk::HBox(false, 0));
+       m_treeview = Gtk::manage(new class Gtk::TreeView());
+       recent_scrolledwindow = Gtk::manage(new class Gtk::ScrolledWindow());
+       recent_alignment = Gtk::manage(new class Gtk::Alignment(0.5, 0.5, 1, 1));
+       recent_sesion_label = Gtk::manage(new class Gtk::Label(_("Open Recent Session")));
+       recent_frame = Gtk::manage(new class Gtk::Frame());
+       open_session_vbox = Gtk::manage(new class Gtk::VBox(false, 0));
+       m_notebook = Gtk::manage(new class Gtk::Notebook());
+       session_name_label->set_alignment(0, 0.5);
+       session_name_label->set_padding(0,0);
+       session_name_label->set_line_wrap(false);
+       session_name_label->set_selectable(false);
+       m_name->set_editable(true);
+       m_name->set_max_length(0);
+       m_name->set_has_frame(true);
+       m_name->set_activates_default(true);
+       session_location_label->set_alignment(0,0.5);
+       session_location_label->set_padding(0,0);
+       session_location_label->set_line_wrap(false);
+       session_location_label->set_selectable(false);
+       session_template_label->set_alignment(0,0.5);
+       session_template_label->set_padding(0,0);
+       session_template_label->set_line_wrap(false);
+       session_template_label->set_selectable(false);
+       m_create_control_bus->set_flags(Gtk::CAN_FOCUS);
+       m_create_control_bus->set_relief(Gtk::RELIEF_NORMAL);
+       m_create_control_bus->set_mode(true);
+       m_create_control_bus->set_active(false);
+       m_create_control_bus->set_border_width(0);
+       m_control_bus_channel_count->set_flags(Gtk::CAN_FOCUS);
+       m_control_bus_channel_count->set_update_policy(Gtk::UPDATE_ALWAYS);
+       m_control_bus_channel_count->set_numeric(true);
+       m_control_bus_channel_count->set_digits(0);
+       m_control_bus_channel_count->set_wrap(false);
+       m_control_bus_channel_count->set_sensitive(false);
+       m_master_bus_channel_count->set_flags(Gtk::CAN_FOCUS);
+       m_master_bus_channel_count->set_update_policy(Gtk::UPDATE_ALWAYS);
+       m_master_bus_channel_count->set_numeric(true);
+       m_master_bus_channel_count->set_digits(0);
+       m_master_bus_channel_count->set_wrap(false);
+       open_session_file_label = Gtk::manage(new class Gtk::Label(_("Open Session File :")));
+       open_session_file_label->set_alignment(0, 0.5);
+       m_create_master_bus->set_flags(Gtk::CAN_FOCUS);
+       m_create_master_bus->set_relief(Gtk::RELIEF_NORMAL);
+       m_create_master_bus->set_mode(true);
+       m_create_master_bus->set_active(true);
+       m_create_master_bus->set_border_width(0);
+       advanced_table->set_row_spacings(0);
+       advanced_table->set_col_spacings(0);
+       advanced_table->attach(*chan_count_label, 1, 2, 0, 1, Gtk::AttachOptions(), Gtk::AttachOptions(), 0, 0);
+       advanced_table->attach(*m_create_control_bus, 0, 1, 2, 3, Gtk::FILL, Gtk::AttachOptions(), 0, 0);
+       advanced_table->attach(*m_control_bus_channel_count, 1, 2, 2, 3, Gtk::AttachOptions(), Gtk::AttachOptions(), 0, 0);
+       advanced_table->attach(*m_master_bus_channel_count, 1, 2, 1, 2, Gtk::AttachOptions(), Gtk::AttachOptions(), 0, 0);
+       advanced_table->attach(*m_create_master_bus, 0, 1, 1, 2, Gtk::FILL, Gtk::AttachOptions(), 0, 0);
+
+       m_connect_inputs->set_flags(Gtk::CAN_FOCUS);
+       m_connect_inputs->set_relief(Gtk::RELIEF_NORMAL);
+       m_connect_inputs->set_mode(true);
+       m_connect_inputs->set_active(true);
+       m_connect_inputs->set_border_width(0);
+
+       m_limit_input_ports->set_flags(Gtk::CAN_FOCUS);
+       m_limit_input_ports->set_relief(Gtk::RELIEF_NORMAL);
+       m_limit_input_ports->set_mode(true);
+       m_limit_input_ports->set_sensitive(true);
+       m_limit_input_ports->set_border_width(0);
+       m_input_limit_count->set_flags(Gtk::CAN_FOCUS);
+       m_input_limit_count->set_update_policy(Gtk::UPDATE_ALWAYS);
+       m_input_limit_count->set_numeric(true);
+       m_input_limit_count->set_digits(0);
+       m_input_limit_count->set_wrap(false);
+       m_input_limit_count->set_sensitive(false);
+
+       input_port_limit_hbox->pack_start(*m_limit_input_ports, Gtk::PACK_SHRINK, 6);
+       input_port_limit_hbox->pack_start(*m_input_limit_count, Gtk::PACK_EXPAND_PADDING, 0);
+       input_port_vbox->pack_start(*m_connect_inputs, Gtk::PACK_SHRINK, 0);
+       input_port_vbox->pack_start(*input_port_limit_hbox, Gtk::PACK_EXPAND_PADDING, 0);
+       input_table->set_row_spacings(0);
+       input_table->set_col_spacings(0);
+       input_table->attach(*input_port_vbox, 0, 1, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 6, 6);
+       input_port_alignment->add(*input_table);
+       input_label->set_alignment(0, 0.5);
+       input_label->set_padding(0,0);
+       input_label->set_line_wrap(false);
+       input_label->set_selectable(false);
+       input_label->set_use_markup(true);
+       input_frame->set_shadow_type(Gtk::SHADOW_NONE);
+       input_frame->set_label_align(0,0.5);
+       input_frame->add(*input_port_alignment);
+       input_frame->set_label_widget(*input_label);
+       m_connect_outputs->set_flags(Gtk::CAN_FOCUS);
+       m_connect_outputs->set_relief(Gtk::RELIEF_NORMAL);
+       m_connect_outputs->set_mode(true);
+       m_connect_outputs->set_active(true);
+       m_connect_outputs->set_border_width(0);
+       m_limit_output_ports->set_flags(Gtk::CAN_FOCUS);
+       m_limit_output_ports->set_relief(Gtk::RELIEF_NORMAL);
+       m_limit_output_ports->set_mode(true);
+       m_limit_output_ports->set_sensitive(true);
+       m_limit_output_ports->set_border_width(0);
+       m_output_limit_count->set_flags(Gtk::CAN_FOCUS);
+       m_output_limit_count->set_update_policy(Gtk::UPDATE_ALWAYS);
+       m_output_limit_count->set_numeric(false);
+       m_output_limit_count->set_digits(0);
+       m_output_limit_count->set_wrap(false);
+       m_output_limit_count->set_sensitive(false);
+       output_port_limit_hbox->pack_start(*m_limit_output_ports, Gtk::PACK_SHRINK, 6);
+       output_port_limit_hbox->pack_start(*m_output_limit_count, Gtk::PACK_EXPAND_PADDING, 0);
+       output_port_vbox->pack_start(*m_connect_outputs, Gtk::PACK_SHRINK, 0);
+       output_port_vbox->pack_start(*output_port_limit_hbox, Gtk::PACK_EXPAND_PADDING, 0);
+       m_connect_outputs_to_master->set_flags(Gtk::CAN_FOCUS);
+       m_connect_outputs_to_master->set_relief(Gtk::RELIEF_NORMAL);
+       m_connect_outputs_to_master->set_mode(true);
+       m_connect_outputs_to_master->set_active(false);
+       m_connect_outputs_to_master->set_border_width(0);
+       m_connect_outputs_to_physical->set_flags(Gtk::CAN_FOCUS);
+       m_connect_outputs_to_physical->set_relief(Gtk::RELIEF_NORMAL);
+       m_connect_outputs_to_physical->set_mode(true);
+       m_connect_outputs_to_physical->set_active(false);
+       m_connect_outputs_to_physical->set_border_width(0);
+       output_conn_vbox->pack_start(*m_connect_outputs_to_master, Gtk::PACK_SHRINK, 0);
+       output_conn_vbox->pack_start(*m_connect_outputs_to_physical, Gtk::PACK_SHRINK, 0);
+       output_vbox->set_border_width(6);
+       output_vbox->pack_start(*output_port_vbox);
+       output_vbox->pack_start(*output_conn_vbox);
+       output_port_alignment->add(*output_vbox);
+       output_label->set_alignment(0, 0.5);
+       output_label->set_padding(0,0);
+       output_label->set_line_wrap(false);
+       output_label->set_selectable(false);
+       output_label->set_use_markup(true);
+       output_frame->set_shadow_type(Gtk::SHADOW_NONE);
+       output_frame->set_label_align(0,0.5);
+       output_frame->add(*output_port_alignment);
+       output_frame->set_label_widget(*output_label);
+       advanced_vbox->pack_start(*advanced_table, Gtk::PACK_SHRINK, 0);
+       advanced_vbox->pack_start(*input_frame, Gtk::PACK_SHRINK, 12);
+       advanced_vbox->pack_start(*output_frame, Gtk::PACK_SHRINK, 0);
+       advanced_label->set_padding(0,0);
+       advanced_label->set_line_wrap(false);
+       advanced_label->set_selectable(false);
+       advanced_label->set_alignment(0, 0.5);
+       advanced_expander->set_flags(Gtk::CAN_FOCUS);
+       advanced_expander->set_border_width(0);
+       advanced_expander->set_expanded(false);
+       advanced_expander->set_spacing(0);
+       advanced_expander->add(*advanced_vbox);
+       advanced_expander->set_label_widget(*advanced_label);
+       new_session_table->set_border_width(12);
+       new_session_table->set_row_spacings(0);
+       new_session_table->set_col_spacings(0);
+       new_session_table->attach(*session_name_label, 0, 1, 0, 1, Gtk::FILL, Gtk::FILL, 0, 0);
+       new_session_table->attach(*m_name, 1, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::FILL, 0, 0);
+       new_session_table->attach(*session_location_label, 0, 1, 1, 2, Gtk::FILL, Gtk::FILL, 0, 0);
+       new_session_table->attach(*m_folder, 1, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::FILL, 0, 0);
+       new_session_table->attach(*session_template_label, 0, 1, 2, 3, Gtk::FILL, Gtk::FILL, 0, 0);
+       new_session_table->attach(*m_template, 1, 2, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::FILL, 0, 0);
+       new_session_table->attach(*advanced_expander, 0, 2, 3, 4, Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 12);
+       chan_count_label->set_padding(0,0);
+       chan_count_label->set_line_wrap(false);
+       chan_count_label->set_selectable(false);
+       open_session_hbox->pack_start(*open_session_file_label, true, true, 12);
+       open_session_hbox->pack_start(*m_open_filechooser, true, true, 12);
+       m_treeview->set_flags(Gtk::CAN_FOCUS);
+       m_treeview->set_headers_visible(true);
+       m_treeview->set_rules_hint(false);
+       m_treeview->set_reorderable(false);
+       m_treeview->set_enable_search(true);
+       m_treeview->set_fixed_height_mode(false);
+       m_treeview->set_hover_selection(false);
+       m_treeview->set_hover_expand(true);
+       m_treeview->set_size_request(-1, 150);
+       recent_scrolledwindow->set_flags(Gtk::CAN_FOCUS);
+       recent_scrolledwindow->set_border_width(6);
+       recent_scrolledwindow->set_shadow_type(Gtk::SHADOW_IN);
+       recent_scrolledwindow->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+       recent_scrolledwindow->property_window_placement().set_value(Gtk::CORNER_TOP_LEFT);
+       recent_scrolledwindow->add(*m_treeview);
+       recent_alignment->add(*recent_scrolledwindow);
+       recent_sesion_label->set_padding(0,0);
+       recent_sesion_label->set_line_wrap(false);
+       recent_sesion_label->set_selectable(false);
+       recent_frame->set_border_width(12);
+       recent_frame->set_shadow_type(Gtk::SHADOW_IN);
+       recent_frame->add(*recent_alignment);
+       recent_frame->set_label_widget(*recent_sesion_label);
+       open_session_vbox->pack_start(*open_session_hbox, Gtk::PACK_SHRINK, 12);
+       open_session_vbox->pack_start(*recent_frame, Gtk::PACK_EXPAND_WIDGET, 0);
+       m_notebook->set_flags(Gtk::CAN_FOCUS);
+       m_notebook->set_scrollable(true);
+       m_notebook->append_page(*new_session_table, _("New Session"));
+       m_notebook->pages().back().set_tab_label_packing(false, true, Gtk::PACK_START);
+       m_notebook->append_page(*open_session_vbox, _("Open Session"));
+       m_notebook->pages().back().set_tab_label_packing(false, true, Gtk::PACK_START);
+       get_vbox()->set_homogeneous(false);
+       get_vbox()->set_spacing(0);
+       get_vbox()->pack_start(*m_notebook, Gtk::PACK_SHRINK, 0);
+       set_title(_("ardour: session control"));
+       //set_modal(false);
+       //property_window_position().set_value(Gtk::WIN_POS_NONE);
+       set_resizable(false);
+       //property_destroy_with_parent().set_value(false);
+       set_has_separator(false);
+       // add_button(Gtk::Stock::HELP, Gtk::RESPONSE_HELP);
+       add_button(Gtk::Stock::QUIT, Gtk::RESPONSE_CANCEL);
+       add_button(Gtk::Stock::CLEAR, Gtk::RESPONSE_NONE);
+       m_okbutton = add_button(Gtk::Stock::NEW, Gtk::RESPONSE_OK);
+
+       recent_model = Gtk::TreeStore::create (recent_columns);
+       m_treeview->set_model (recent_model);
+       m_treeview->append_column (_("Recent Sessions"), recent_columns.visible_name);
+       m_treeview->set_headers_visible (false);
+       m_treeview->get_selection()->set_mode (Gtk::SELECTION_SINGLE);
+
+       std::string path = ARDOUR::get_user_ardour_path();
+       if (path.empty()) {
+               path = ARDOUR::get_system_data_path();
+       }
+       if (!path.empty()) {
+               m_template->set_current_folder (path + X_("templates/"));
+       }
 
-extern std::vector<string> channel_combo_strings;
-
-NewSessionDialog::NewSessionDialog (ARDOUR::AudioEngine& engine, bool startup, string given_path)
-       : ArdourDialog ("new session dialog"),
-         file_selector (_("Session name:"), _("Create")),
-         use_control_button (_("use control outs")),
-         use_master_button (_("use master outs")),
-         connect_to_physical_inputs_button (_("automatically connect track inputs to physical ports")),
-         connect_to_master_button (_("automatically connect track outputs to master outs")),
-         connect_to_physical_outputs_button (_("automatically connect track outputs to physical ports")),
-         manual_connect_outputs_button (_("manually connect track outputs")),
-         in_count_adjustment (2, 1, 1000, 1, 2),
-         out_count_adjustment (2, 1, 1000, 1, 2),
-         output_label (_("Output Connections")),
-         input_label (_("Input Connections")),
-         expansion_button (_("Advanced...")),
-         out_table (2, 2),
-         show_again (_("show again")),
-         in_count_spinner (in_count_adjustment),
-         out_count_spinner (out_count_adjustment),
-         in_count_label (_("Hardware Inputs: use")),
-         out_count_label (_("Hardware Outputs: use"))
+       const std::string sys_templates_dir = ARDOUR::get_system_data_path() + X_("templates");
+       if (Glib::file_test(sys_templates_dir, Glib::FILE_TEST_IS_DIR))
+               m_template->add_shortcut_folder(sys_templates_dir);
        
+       m_template->set_title(_("select template"));
+       Gtk::FileFilter* session_filter = manage (new (Gtk::FileFilter));
+       session_filter->add_pattern(X_("*.ardour"));
+       session_filter->add_pattern(X_("*.ardour.bak"));
+       m_open_filechooser->set_filter (*session_filter);
+       m_open_filechooser->set_current_folder(getenv ("HOME"));
+       m_open_filechooser->set_title(_("select session file"));
+
+       Gtk::FileFilter* template_filter = manage (new (Gtk::FileFilter));
+       template_filter->add_pattern(X_("*.ardour"));
+       template_filter->add_pattern(X_("*.ardour.bak"));
+       template_filter->add_pattern(X_("*.template"));
+       m_template->set_filter (*template_filter);
+
+       m_folder->set_current_folder(getenv ("HOME"));
+       m_folder->set_title(_("select directory"));
+
+       on_new_session_page = true;
+       m_notebook->set_current_page(0);
+       m_notebook->show();
+       m_notebook->show_all_children();
+
+
+       set_default_response (Gtk::RESPONSE_OK);
+       if (!GTK_ARDOUR::session_name.length()) {
+               set_response_sensitive (Gtk::RESPONSE_OK, false);
+               set_response_sensitive (Gtk::RESPONSE_NONE, false);
+       } else {
+               set_response_sensitive (Gtk::RESPONSE_OK, true);
+               set_response_sensitive (Gtk::RESPONSE_NONE, true);
+       }
+
+       ///@ connect some signals
+
+       m_connect_inputs->signal_clicked().connect (mem_fun (*this, &NewSessionDialog::connect_inputs_clicked));
+       m_connect_outputs->signal_clicked().connect (mem_fun (*this, &NewSessionDialog::connect_outputs_clicked));
+       m_limit_input_ports->signal_clicked().connect (mem_fun (*this, &NewSessionDialog::limit_inputs_clicked));
+       m_limit_output_ports->signal_clicked().connect (mem_fun (*this, &NewSessionDialog::limit_outputs_clicked));
+       m_create_master_bus->signal_clicked().connect (mem_fun (*this, &NewSessionDialog::master_bus_button_clicked));
+       m_create_control_bus->signal_clicked().connect (mem_fun (*this, &NewSessionDialog::monitor_bus_button_clicked));
+       m_name->signal_key_release_event().connect(mem_fun (*this, &NewSessionDialog::entry_key_release));
+       m_notebook->signal_switch_page().connect (mem_fun (*this, &NewSessionDialog::notebook_page_changed));
+       m_treeview->get_selection()->signal_changed().connect (mem_fun (*this, &NewSessionDialog::treeview_selection_changed));
+       m_treeview->signal_row_activated().connect (mem_fun (*this, &NewSessionDialog::recent_row_activated));
+       m_open_filechooser->signal_selection_changed ().connect (mem_fun (*this, &NewSessionDialog::file_chosen));
+       m_template->signal_selection_changed ().connect (mem_fun (*this, &NewSessionDialog::template_chosen));
+       m_name->grab_focus();
+}
+
+void
+NewSessionDialog::set_session_name(const Glib::ustring& name)
 {
-       using namespace Notebook_Helpers;
-
-       set_name ("NewSessionDialog");
-       set_title (_("new session setup"));
-       set_wmclass (_("ardour_new_session"), "Ardour");
-       set_position (Gtk::WIN_POS_MOUSE);
-       set_keyboard_input (true);
-       set_policy (false, true, false);
-       set_modal (true);
-
-       /* sample rate */
-
-       sr_label1.set_text (compose 
-                          (_("This session will playback and record at %1 Hz"),
-                           engine.frame_rate()));
-       sr_label2.set_text (_("This rate is set by JACK and cannot be changed.\n"
-                             "If you want to use a different sample rate\n"
-                             "please exit and restart JACK"));
-       sr_box.set_spacing (12);
-       sr_box.set_border_width (12);
-       sr_box.pack_start (sr_label1, false, false);
-       sr_box.pack_start (sr_label2, false, false);
-       sr_frame.add (sr_box);
-
-       /* input */
-
-       connect_to_physical_inputs_button.set_active (true);
-       connect_to_physical_inputs_button.set_name ("NewSessionDialogButton");
-       
-       HBox* input_limit_box = manage (new HBox);
-       input_limit_box->set_spacing (7);
-       input_limit_box->pack_start (in_count_label, false, false);
-       input_limit_box->pack_start (in_count_spinner, false, false);
+       m_name->set_text(name);
+}
 
-       input_label.set_alignment (0.1, 0.5);
-       input_vbox.pack_start (input_label, false, false, 7);
-       input_vbox.pack_start (connect_to_physical_inputs_button, false, false);
+std::string
+NewSessionDialog::session_name() const
+{
+        std::string str = Glib::filename_from_utf8(m_open_filechooser->get_filename());
+       std::string::size_type position = str.find_last_of ('/');
+       str = str.substr (position+1);
+       position = str.find_last_of ('.');
+       str = str.substr (0, position);
+
+       /*
+         XXX what to do if it's a .bak file?
+         load_session doesn't allow it!
+
+       if ((position = str.rfind(".bak")) != string::npos) {
+               str = str.substr (0, position);
+       }         
+       */
+
+       if (m_notebook->get_current_page() == 0) {
+               return Glib::filename_from_utf8(m_name->get_text());
+       } else {
+               if (m_treeview->get_selection()->count_selected_rows() == 0) {
+                       return Glib::filename_from_utf8(str);
+               }
+               Gtk::TreeModel::iterator i = m_treeview->get_selection()->get_selected();
+               return (*i)[recent_columns.visible_name];
+       }
+}
 
-       if (engine.n_physical_inputs() > 2) {
-               input_vbox.pack_start (*input_limit_box, false, false);
+std::string
+NewSessionDialog::session_folder() const
+{
+        if (m_notebook->get_current_page() == 0) {
+               return Glib::filename_from_utf8(m_folder->get_current_folder());
+       } else {
+              
+               if (m_treeview->get_selection()->count_selected_rows() == 0) {
+                       return Glib::filename_from_utf8(m_open_filechooser->get_current_folder());
+               }
+               Gtk::TreeModel::iterator i = m_treeview->get_selection()->get_selected();
+               return (*i)[recent_columns.fullpath];
        }
+}
 
-       /* output */
+bool
+NewSessionDialog::use_session_template() const
+{
+        if(m_template->get_filename().empty() && (m_notebook->get_current_page() == 0)) return false;
+       return true;
+}
 
-       use_master_button.set_active (true);
-       use_master_button.set_name ("NewSessionDialogButton");
-       
-       connect_to_physical_outputs_button.set_group (connect_to_master_button.get_group());
-       manual_connect_outputs_button.set_group (connect_to_master_button.get_group());
-       connect_to_master_button.set_active (true);
-       
-       connect_to_physical_outputs_button.set_name ("NewSessionDialogButton");
-       manual_connect_outputs_button.set_name ("NewSessionDialogButton");
-       connect_to_master_button.set_name ("NewSessionDialogButton");
-       use_control_button.set_name ("NewSessionDialogButton");
-       
-       out_count_adjustment.set_value (engine.n_physical_outputs());
-       in_count_adjustment.set_value (engine.n_physical_inputs());
+std::string
+NewSessionDialog::session_template_name() const
+{
+       return Glib::filename_from_utf8(m_template->get_filename());
+}
 
-       set_popdown_strings (control_out_channel_combo, channel_combo_strings);
-       control_out_channel_combo.set_name (X_("NewSessionChannelCombo"));
-       // use stereo as default
-       control_out_channel_combo.set_active_text (channel_combo_strings.front());
+bool
+NewSessionDialog::create_master_bus() const
+{
+       return m_create_master_bus->get_active();
+}
 
-       set_popdown_strings (master_out_channel_combo, channel_combo_strings);
-       master_out_channel_combo.set_name (X_("NewSessionChannelCombo"));
-       // use stereo as default
-       master_out_channel_combo.set_active_text (channel_combo_strings.front());
+int
+NewSessionDialog::master_channel_count() const
+{
+       return m_master_bus_channel_count->get_value_as_int();
+}
 
-       
-       out_table.set_col_spacings (7);
-       out_table.set_row_spacings (7);
-       if (engine.n_physical_outputs() > 2) {
-               out_table.attach (out_count_label, 0, 1, 0, 1, 0, 0);   
-               out_table.attach (out_count_spinner, 1, 2, 0, 1, 0, 0);
-       }
-       out_table.attach (use_control_button, 0, 1, 1, 2, 0, 0);
-       out_table.attach (control_out_channel_combo, 1, 2, 1, 2, 0, 0);
-       out_table.attach (use_master_button, 0, 1, 2, 3, 0, 0);
-       out_table.attach (master_out_channel_combo, 1, 2, 2, 3, 0, 0);
-       
-       output_label.set_alignment (0.1, 0.5);
-       output_vbox.pack_start (output_label, true, true, 7);
-       output_vbox.pack_start (out_table, false, false, 5);
-       output_vbox.pack_start (connect_to_master_button, false);
-       output_vbox.pack_start (connect_to_physical_outputs_button, false);
-       output_vbox.pack_start (manual_connect_outputs_button, false);
-       
-       input_hbox.pack_start (input_vbox, false, false);
-       output_hbox.pack_start (output_vbox, false, false);
+bool
+NewSessionDialog::create_control_bus() const
+{
+       return m_create_control_bus->get_active();
+}
 
-       VBox* template_vbox = manage (new VBox);
-       Label* template_label = manage (new Label (_("Session template")));
-       
-       template_label->set_alignment (0.1, 0.5);
-       template_vbox->pack_start (*template_label, true, true, 7);
-       template_vbox->pack_start (template_combo, false, false);
+int
+NewSessionDialog::control_channel_count() const
+{
+       return m_control_bus_channel_count->get_value_as_int();
+}
+
+bool
+NewSessionDialog::connect_inputs() const
+{
+       return m_connect_inputs->get_active();
+}
 
-       io_box.set_border_width (12);
-       io_box.set_spacing (7);
-       io_box.pack_start (*template_vbox);
+bool
+NewSessionDialog::limit_inputs_used_for_connection() const
+{
+       return m_limit_input_ports->get_active();
+}
 
-       io_box.pack_start (input_hbox);
-       io_box.pack_start (output_hbox);
+int
+NewSessionDialog::input_limit_count() const
+{
+       return m_input_limit_count->get_value_as_int();
+}
 
-       reset_templates();
+bool
+NewSessionDialog::connect_outputs() const
+{
+       return m_connect_outputs->get_active();
+}
 
-       option_hbox.set_spacing (7);
-       option_hbox.pack_start (io_box);
+bool
+NewSessionDialog::limit_outputs_used_for_connection() const
+{
+       return m_limit_output_ports->get_active();
+}
 
-       fsbox.set_border_width (12);
-       fsbox.set_spacing (7);
-       fsbox.pack_start (file_selector.table, false, false);
+int
+NewSessionDialog::output_limit_count() const
+{
+       return m_output_limit_count->get_value_as_int();
+}
 
-       notebook.pages().push_back (TabElem (fsbox, _("Location")));
-       notebook.pages().push_back (TabElem (option_hbox, _("Configuration")));
+bool
+NewSessionDialog::connect_outs_to_master() const
+{
+       return m_connect_outputs_to_master->get_active();
+}
 
-       if (startup) {
-               show_again.set_active(true);
-               show_again.toggled.connect (mem_fun(*this, &NewSessionDialog::show_again_toggled));
-               file_selector.button_box.pack_end(show_again, false, false);
-       }
+bool
+NewSessionDialog::connect_outs_to_physical() const
+{
+       return m_connect_outputs_to_physical->get_active();
+}
 
-       main_vbox.set_border_width (12);
-       main_vbox.set_border_width (12);
-       main_vbox.set_spacing (7);
-       main_vbox.pack_start (sr_frame, false, false);
-       main_vbox.pack_start (notebook, false, false);
-       main_vbox.pack_start (file_selector.button_box, false, false);
+int
+NewSessionDialog::get_current_page()
+{
+       return m_notebook->get_current_page();
        
-       add (main_vbox);
-
-//     template_selector.shift_made.connect (
-//             mem_fun(*this, &NewSessionDialog::mix_template_shift));
-//     template_selector.control_made.connect (
-//             mem_fun(*this, &NewSessionDialog::mix_template_control));
-
-       file_selector.cancel_button.signal_clicked().connect (bind (mem_fun(*this, &ArdourDialog::stop), -1));
-       file_selector.op_button.signal_clicked().connect (bind (mem_fun(*this, &ArdourDialog::stop), 0));
-       file_selector.Expanded.connect (mem_fun(*this, &NewSessionDialog::file_selector_expansion));
-
-       delete_event.connect (mem_fun(*this, &ArdourDialog::wm_close_event));
-       show.connect (mem_fun(*this, &NewSessionDialog::fixup_at_show));
-
-       file_selector.entry_label.set_name ("NewSessionMainLabel");
-       file_selector.where_label.set_name ("NewSessionMainLabel");
-       template_label->set_name ("NewSessionIOLabel");
-       input_label.set_name ("NewSessionIOLabel");
-       output_label.set_name ("NewSessionIOLabel");
-       sr_label1.set_name ("NewSessionSR1Label");
-       sr_label2.set_name ("NewSessionSR2Label");
-
-       if (given_path.empty()) {
-               Session::FavoriteDirs favs;
-               Session::read_favorite_dirs (favs);
-               file_selector.set_favorites (favs);
+}
+
+void
+NewSessionDialog::reset_name()
+{
+       m_name->set_text("");
+       set_response_sensitive (Gtk::RESPONSE_OK, false);
+       
+}
+
+bool
+NewSessionDialog::entry_key_release (GdkEventKey* ev)
+{
+       if (m_name->get_text() != "") {
+               set_response_sensitive (Gtk::RESPONSE_OK, true);
+               set_response_sensitive (Gtk::RESPONSE_NONE, true);
        } else {
-               file_selector.set_path (given_path, true);
-               notebook.set_page (-1);
-               notebook.show.connect (bind (mem_fun (notebook, &Notebook::set_page), -1));
+               set_response_sensitive (Gtk::RESPONSE_OK, false);
+       }
+       return true;
+}
+
+void
+NewSessionDialog::notebook_page_changed (GtkNotebookPage* np, uint pagenum)
+{
+       if (pagenum == 1) {
+               on_new_session_page = false;
+               m_okbutton->set_label(_("Open"));
+               set_response_sensitive (Gtk::RESPONSE_NONE, false);
+               m_okbutton->set_image (*(new Gtk::Image (Gtk::Stock::OPEN, Gtk::ICON_SIZE_BUTTON)));
+               if (m_treeview->get_selection()->count_selected_rows() == 0) {
+                       set_response_sensitive (Gtk::RESPONSE_OK, false);
+               } else {
+                       set_response_sensitive (Gtk::RESPONSE_OK, true);
+               }
+       } else {
+               on_new_session_page = true;
+               if (m_name->get_text() != "") {
+                       set_response_sensitive (Gtk::RESPONSE_NONE, true);
+               }
+               m_okbutton->set_label(_("New"));
+               m_okbutton->set_image (*(new Gtk::Image (Gtk::Stock::NEW, Gtk::ICON_SIZE_BUTTON)));
+               if (m_name->get_text() == "") {
+                       set_response_sensitive (Gtk::RESPONSE_OK, false);
+               } else {
+                       set_response_sensitive (Gtk::RESPONSE_OK, true);
+               }
        }
-       set_default_size(531, 358);
 }
 
 void
-NewSessionDialog::file_selector_expansion (bool expanded)
+NewSessionDialog::treeview_selection_changed ()
 {
-       if (expanded) {
-               fsbox.pack_start (file_selector.expansion_vbox);
-               fsbox.reorder_child (file_selector.expansion_vbox, 2);
+       if (m_treeview->get_selection()->count_selected_rows() == 0) {
+               if (!m_open_filechooser->get_filename().empty()) {
+                       set_response_sensitive (Gtk::RESPONSE_OK, true);
+               } else {
+                       set_response_sensitive (Gtk::RESPONSE_OK, false);
+               }
        } else {
-               fsbox.remove (file_selector.expansion_vbox);
+               set_response_sensitive (Gtk::RESPONSE_OK, true);
        }
 }
 
 void
-NewSessionDialog::fixup_at_show ()
+NewSessionDialog::file_chosen ()
 {
-//     if (template_selector.clist().rows().size() == 0) {
-//             use_template_button.set_sensitive (false);
-//     }
+       if (on_new_session_page) return;
 
-       Session::FavoriteDirs favs;
-       Session::read_favorite_dirs (favs);
-       file_selector.set_favorites (favs);
+       m_treeview->get_selection()->unselect_all();
 
-       file_selector.entry.grab_focus ();
+       if (!m_open_filechooser->get_filename().empty()) {
+               set_response_sensitive (Gtk::RESPONSE_OK, true);
+       } else {
+               set_response_sensitive (Gtk::RESPONSE_OK, false);
+       }
 }
 
 void
-NewSessionDialog::_mix_template_refiller (CList &clist, void *arg)
+NewSessionDialog::template_chosen ()
+{
+       if (m_template->get_filename() != "" ) {;
+               set_response_sensitive (Gtk::RESPONSE_NONE, true);
+       } else {
+               set_response_sensitive (Gtk::RESPONSE_NONE, false);
+       }
+}
 
+void
+NewSessionDialog::recent_row_activated (const Gtk::TreePath& path, Gtk::TreeViewColumn* col)
 {
-       ((NewSessionDialog*) arg)->mix_template_refiller (clist);
+        response (Gtk::RESPONSE_YES);
 }
 
 void
-NewSessionDialog::mix_template_refiller (CList &clist)
+NewSessionDialog::connect_inputs_clicked ()
 {
-       const gchar *rowdata[2];
-       list<string> templates;
-       list<string>::iterator i;
-       
-       Session::get_template_list(templates);
-       
-       rowdata[0] = _("blank");
-       clist.insert_row (0, rowdata);
+        m_limit_input_ports->set_sensitive(m_connect_inputs->get_active());
 
-       guint row;
-       for (row=1, i=templates.begin(); i != templates.end(); ++row, ++i) {
-               rowdata[0] = (*i).c_str();
-               clist.insert_row (row, rowdata);
-       }
+               if (m_connect_inputs->get_active() && m_limit_input_ports->get_active()) {
+               m_input_limit_count->set_sensitive(true);
+               } else {
+               m_input_limit_count->set_sensitive(false);
+               }
 }
 
 void
-NewSessionDialog::mix_template_shift (Gtkmm2ext::Selector* selector, Gtkmm2ext::SelectionResult* res)
+NewSessionDialog::connect_outputs_clicked ()
 {
-       if (res && res->text){
-               Session::delete_template(*res->text);
-               // template_selector.rescan();
-       }
+        m_limit_output_ports->set_sensitive(m_connect_outputs->get_active());
+
+               if (m_connect_outputs->get_active() && m_limit_output_ports->get_active()) {
+               m_output_limit_count->set_sensitive(true);
+               } else {
+               m_output_limit_count->set_sensitive(false);
+               }
 }
 
 void
-NewSessionDialog::mix_template_control (Gtkmm2ext::Selector* selector, Gtkmm2ext::SelectionResult* res)
+NewSessionDialog::limit_inputs_clicked ()
 {
-#if 0
-       if (res && res->text) {
-               ArdourPrompter prompter (true);
-               prompter.set_prompt(_("Name for mix template:"));
-
-               string old_name = *(res->text);
-               prompter.set_initial_text (old_name);
-               prompter.done.connect (Gtk::Main::quit.slot());
-               prompter.show_all();
-               
-               Gtk::Main::run();
-               
-               if (prompter.status == Gtkmm2ext::Prompter::entered) {
-                       string name;
+        m_input_limit_count->set_sensitive(m_limit_input_ports->get_active());
+}
 
-                       prompter.get_result (name);
+void
+NewSessionDialog::limit_outputs_clicked ()
+{
+        m_output_limit_count->set_sensitive(m_limit_output_ports->get_active());
+}
 
-                       if (name.length() && name != old_name) {
-                               Session::rename_template(old_name, name);
-                               template_selector.rescan();
-                       }
-               }
-       }
-#endif
+void
+NewSessionDialog::master_bus_button_clicked ()
+{
+        m_master_bus_channel_count->set_sensitive(m_create_master_bus->get_active());
 }
 
 void
-NewSessionDialog::show_again_toggled ()
+NewSessionDialog::monitor_bus_button_clicked ()
 {
-       Config->set_no_new_session_dialog(!show_again.get_active());
-       Config->save_state();
+        m_control_bus_channel_count->set_sensitive(m_create_control_bus->get_active());
 }
 
 void
-NewSessionDialog::reset_template()
+NewSessionDialog::reset_template()
 {
-       templates.clear ();
-       templates.push_back (_("No template - create tracks/busses manually"));
-       Session::get_template_list (templates);
-       set_popdown_strings (template_combo, templates);
+        m_template->set_filename("");
 }
 
-string
-NewSessionDialog::get_template_name()
+void
+NewSessionDialog::reset_recent()
 {
-       string str = template_combo.get_entry()->get_text();
-       if (str.substr (0, 11) == _("No template")) {
-               return "";
-       } else {
-               return str;
+        /* Shamelessly ripped from ardour_ui.cc */
+        std::vector<string *> *sessions;
+       std::vector<string *>::iterator i;
+       RecentSessionsSorter cmp;
+       
+       recent_model->clear ();
+       
+       ARDOUR::RecentSessions rs;
+       ARDOUR::read_recent_sessions (rs);
+       
+       /* sort them alphabetically */
+       sort (rs.begin(), rs.end(), cmp);
+       sessions = new std::vector<std::string*>;
+       
+       for (ARDOUR::RecentSessions::iterator i = rs.begin(); i != rs.end(); ++i) {
+               sessions->push_back (new string ((*i).second));
        }
+       
+       for (i = sessions->begin(); i != sessions->end(); ++i) {
+
+               std::vector<std::string*>* states;
+               std::vector<const gchar*> item;
+               std::string fullpath = *(*i);
+               
+               /* remove any trailing / */
+               
+               if (fullpath[fullpath.length()-1] == '/') {
+                       fullpath = fullpath.substr (0, fullpath.length()-1);
+               }
+           
+               /* now get available states for this session */
+                 
+               if ((states = ARDOUR::Session::possible_states (fullpath)) == 0) {
+                       /* no state file? */
+                       continue;
+               }
+           
+               Gtk::TreeModel::Row row = *(recent_model->append());
+               
+               row[recent_columns.visible_name] = Glib::path_get_basename (fullpath);
+               row[recent_columns.fullpath] = fullpath;
+               
+               if (states->size() > 1) {
+                   
+                       /* add the children */
+                   
+                       for (std::vector<std::string*>::iterator i2 = states->begin(); i2 != states->end(); ++i2) {
+
+                               Gtk::TreeModel::Row child_row = *(recent_model->append (row.children()));
+                               
+                               child_row[recent_columns.visible_name] = **i2;
+                               child_row[recent_columns.fullpath] = fullpath;
+                               
+                               delete *i2;
+                       }
+               }
+
+               delete states;
+       }
+       delete sessions;
+}
+
+void
+NewSessionDialog::reset()
+{
+       reset_name();
+       reset_template();
+       set_response_sensitive (Gtk::RESPONSE_NONE, false);
 }