shared_ptr fixes
[ardour.git] / gtk2_ardour / new_session_dialog.cc
index 3c113cebf27a40fa4d246d5226974f1f9c899bcf..d1059cebe08f76b204cccf62f0b84cced5fa0f5d 100644 (file)
 
 #include "i18n.h"
 #include "new_session_dialog.h"
-#include "glade_path.h"
 
 #include <ardour/recent_sessions.h>
 #include <ardour/session.h>
 
-#include <pbd/basename.h>
-
 #include <gtkmm/entry.h>
 #include <gtkmm/filechooserbutton.h>
 #include <gtkmm/spinbutton.h>
 #include <gtkmm/stock.h>
 
 
-const char* NewSessionDialogFactory::s_m_top_level_widget_name = X_("NewSessionDialog");
-const char* NewSessionDialogFactory::top_level_widget_name() { return s_m_top_level_widget_name; }
-
-Glib::RefPtr<Gnome::Glade::Xml>
-NewSessionDialogFactory::create()
-{
-       return GladeFactory::create(GladePath::path(X_("new_session_dialog.glade")));
-}
-
-
-NewSessionDialog::NewSessionDialog(BaseObjectType* cobject,
-                                  const Glib::RefPtr<Gnome::Glade::Xml>& xml)
-       : Gtk::Dialog(cobject)    
+NewSessionDialog::NewSessionDialog()
+       : ArdourDialog ("New Session Dialog")
 {
-       // look up the widgets we care about.
-        xml->get_widget(X_("NewSessionDialog"), m_new_session_dialog);
-       xml->get_widget(X_("SessionNameEntry"), m_name);
-       xml->get_widget(X_("SessionFolderChooser"), m_folder);
-       xml->get_widget(X_("SessionTemplateChooser"), m_template);
+        session_name_label = Gtk::manage(new class Gtk::Label(_("New Session Name :")));
+       m_name = Gtk::manage(new class Gtk::Entry());
+       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")));
        
-       xml->get_widget(X_("CreateMasterBus"), m_create_master_bus);
-       xml->get_widget(X_("MasterChannelCount"), m_master_bus_channel_count);
+       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));
        
-       xml->get_widget(X_("CreateControlBus"), m_create_control_bus);
-       xml->get_widget(X_("ControlChannelCount"), m_control_bus_channel_count);
-
-       xml->get_widget(X_("ConnectInputs"), m_connect_inputs);
-       xml->get_widget(X_("LimitInputPorts"), m_limit_input_ports);
-       xml->get_widget(X_("InputLimitCount"), m_input_limit_count);
-
-       xml->get_widget(X_("ConnectOutputs"), m_connect_outputs);
-       xml->get_widget(X_("LimitOutputPorts"), m_limit_output_ports);
-       xml->get_widget(X_("OutputLimitCount"), m_output_limit_count);  
-       xml->get_widget(X_("ConnectOutsToMaster"), m_connect_outputs_to_master);
-       xml->get_widget(X_("ConnectOutsToPhysical"), m_connect_outputs_to_physical);
-
-       xml->get_widget(X_("OpenFilechooserButton"), m_open_filechooser);
-       xml->get_widget(X_("TheNotebook"), m_notebook);
-       xml->get_widget(X_("TheTreeview"), m_treeview);
-       xml->get_widget(X_("OkButton"), m_okbutton);
-
-       if (m_treeview) {
-               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() + X_("templates/");
-       if (path == Glib::ustring()) {
-         path = ARDOUR::get_system_data_path() + X_("templates/");
+       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(false);
+       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(false);
+       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(false);
+       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(false);
+       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 != Glib::ustring()) {
-         m_template->set_current_folder (path);
+       if (!path.empty()) {
+               m_template->set_current_folder (path + X_("templates/"));
        }
-       m_template->set_show_hidden (true);
-       m_new_session_dialog->set_response_sensitive (Gtk::RESPONSE_OK, false);
-       m_new_session_dialog->set_response_sensitive (0, false);
-       m_notebook->show_all_children();
-       m_notebook->set_current_page(0);
 
-       Gtk::FileFilter* filter = manage (new (Gtk::FileFilter));
-
-       filter->add_pattern(X_("*.ardour"));
-       filter->add_pattern(X_("*.ardour.bak"));
-       m_open_filechooser->set_filter (*filter);
+       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"));
+
+       set_default_response (Gtk::RESPONSE_OK);
+       set_response_sensitive (Gtk::RESPONSE_OK, false);
+       set_response_sensitive (Gtk::RESPONSE_NONE, false);
+       m_notebook->set_current_page(0);
+       m_notebook->show();
+       m_notebook->show_all_children();
 
-       ///@ todo connect some signals
+       ///@ 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));
@@ -260,8 +493,8 @@ NewSessionDialog::get_current_page()
 void
 NewSessionDialog::reset_name()
 {
-       m_name->set_text(Glib::ustring());
-       m_new_session_dialog->set_response_sensitive (Gtk::RESPONSE_OK, false);
+       m_name->set_text("");
+       set_response_sensitive (Gtk::RESPONSE_OK, false);
        
 }
 
@@ -269,10 +502,10 @@ bool
 NewSessionDialog::entry_key_release (GdkEventKey* ev)
 {
         if (m_name->get_text() != "") {
-               m_new_session_dialog->set_response_sensitive (Gtk::RESPONSE_OK, true);
-               m_new_session_dialog->set_response_sensitive (0, true);
+               set_response_sensitive (Gtk::RESPONSE_OK, true);
+               set_response_sensitive (Gtk::RESPONSE_NONE, true);
        } else {
-               m_new_session_dialog->set_response_sensitive (Gtk::RESPONSE_OK, false);
+               set_response_sensitive (Gtk::RESPONSE_OK, false);
        }
        return true;
 }
@@ -281,24 +514,24 @@ void
 NewSessionDialog::notebook_page_changed (GtkNotebookPage* np, uint pagenum)
 {
         if (pagenum == 1) {
-               m_new_session_dialog->set_response_sensitive (0, false);
-               m_okbutton->set_label(_("Open"));
-               m_okbutton->set_image (*(new Gtk::Image (Gtk::Stock::OPEN, Gtk::ICON_SIZE_BUTTON)));
-               if (m_treeview->get_selection()->count_selected_rows() == 0) {
-                       m_new_session_dialog->set_response_sensitive (Gtk::RESPONSE_OK, 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 {
-                       m_new_session_dialog->set_response_sensitive (Gtk::RESPONSE_OK, true);
+                       set_response_sensitive (Gtk::RESPONSE_OK, true);
                }
        } else {
                if (m_name->get_text() != "") {
-                       m_new_session_dialog->set_response_sensitive (0, true);
+                 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() == "") {
-                       m_new_session_dialog->set_response_sensitive (Gtk::RESPONSE_OK, false);
+                      set_response_sensitive (Gtk::RESPONSE_OK, false);
                } else {
-                       m_new_session_dialog->set_response_sensitive (Gtk::RESPONSE_OK, true);
+                       set_response_sensitive (Gtk::RESPONSE_OK, true);
                }
        }
 }
@@ -306,113 +539,150 @@ NewSessionDialog::notebook_page_changed (GtkNotebookPage* np, uint pagenum)
 void
 NewSessionDialog::treeview_selection_changed ()
 {
-  if (m_treeview->get_selection()->count_selected_rows() == 0) {
-          if (!m_open_filechooser->get_filename().empty()) {
-                 m_new_session_dialog->set_response_sensitive (Gtk::RESPONSE_OK, true);
-         } else {
-                 m_new_session_dialog->set_response_sensitive (Gtk::RESPONSE_OK, false);
-         }
-  } else {
-          m_new_session_dialog->set_response_sensitive (Gtk::RESPONSE_OK, true);
-  }
+       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 {
+                set_response_sensitive (Gtk::RESPONSE_OK, true);
+       }
 }
 
 void
 NewSessionDialog::file_chosen ()
 {
         m_treeview->get_selection()->unselect_all();
-  
-       if (m_treeview->get_selection()->count_selected_rows() == 0) {
-               m_new_session_dialog->set_response_sensitive (Gtk::RESPONSE_OK, true);
+
+       if (!m_open_filechooser->get_filename().empty()) {
+                 set_response_sensitive (Gtk::RESPONSE_OK, true);
+       } else {
+                 set_response_sensitive (Gtk::RESPONSE_OK, false);
        }
 }
 
 void
 NewSessionDialog::template_chosen ()
 {
-  if (m_template->get_filename() != "" ) {;
-    m_new_session_dialog->set_response_sensitive (0, true);
-  } else {
-    m_new_session_dialog->set_response_sensitive (0, false);
-  }
-
+        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)
 {
-        m_new_session_dialog->response (Gtk::RESPONSE_YES);
+        response (Gtk::RESPONSE_YES);
+}
+
+void
+NewSessionDialog::connect_inputs_clicked ()
+{
+        m_limit_input_ports->set_sensitive(m_connect_inputs->get_active());
+}
+
+void
+NewSessionDialog::connect_outputs_clicked ()
+{
+        m_limit_output_ports->set_sensitive(m_connect_outputs->get_active());
+}
+
+void
+NewSessionDialog::limit_inputs_clicked ()
+{
+        m_input_limit_count->set_sensitive(m_limit_input_ports->get_active());
+}
+
+void
+NewSessionDialog::limit_outputs_clicked ()
+{
+        m_output_limit_count->set_sensitive(m_limit_output_ports->get_active());
+}
+
+void
+NewSessionDialog::master_bus_button_clicked ()
+{
+        m_master_bus_channel_count->set_sensitive(m_create_master_bus->get_active());
+}
+
+void
+NewSessionDialog::monitor_bus_button_clicked ()
+{
+        m_control_bus_channel_count->set_sensitive(m_create_control_bus->get_active());
 }
 
 void
 NewSessionDialog::reset_template()
 {
-  m_template->set_filename("");
+        m_template->set_filename("");
 }
 
 void
 NewSessionDialog::reset_recent()
 {
-               /* 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);
+        /* 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);
                
-               /* sort them alphabetically */
-               sort (rs.begin(), rs.end(), cmp);
-               sessions = new std::vector<std::string*>;
+               /* remove any trailing / */
                
-               for (ARDOUR::RecentSessions::iterator i = rs.begin(); i != rs.end(); ++i) {
-                       sessions->push_back (new string ((*i).second));
+               if (fullpath[fullpath.length()-1] == '/') {
+                       fullpath = fullpath.substr (0, fullpath.length()-1);
                }
-         
-               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 */
+               /* now get available states for this session */
                  
-                 if ((states = ARDOUR::Session::possible_states (fullpath)) == 0) {
-                         /* no state file? */
-                         continue;
-                 }
+               if ((states = ARDOUR::Session::possible_states (fullpath)) == 0) {
+                       /* no state file? */
+                       continue;
+               }
            
-                 Gtk::TreeModel::Row row = *(recent_model->append());
-                 
-                 row[recent_columns.visible_name] = PBD::basename (fullpath);
-                 row[recent_columns.fullpath] = fullpath;
-                 
-                 if (states->size() > 1) {
+               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 */
+                       /* 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;
+                       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 sessions;
+
+               delete states;
+       }
+       delete sessions;
 }
 
 void
@@ -420,4 +690,5 @@ NewSessionDialog::reset()
 {
        reset_name();
        reset_template();
+       set_response_sensitive (Gtk::RESPONSE_NONE, false);
 }