X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fnew_session_dialog.cc;h=9e094c9ad041d08019a511cd80d4ad07412539ef;hb=9d548f998b94dcc5e04496740aead50f2b9f5f07;hp=993db62d59bd2940da001a668f3991d90d850d6d;hpb=f995ac37860140c513e29c3bc58701474a7ed336;p=ardour.git diff --git a/gtk2_ardour/new_session_dialog.cc b/gtk2_ardour/new_session_dialog.cc index 993db62d59..9e094c9ad0 100644 --- a/gtk2_ardour/new_session_dialog.cc +++ b/gtk2_ardour/new_session_dialog.cc @@ -31,21 +31,46 @@ #include #include #include +#include #include "opts.h" NewSessionDialog::NewSessionDialog() - : ArdourDialog ("New Session Dialog") + : ArdourDialog ("session control") { - session_name_label = Gtk::manage(new class Gtk::Label(_("New Session Name :"))); + session_name_label = Gtk::manage(new class Gtk::Label(_("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 :"))); + chan_count_label_1 = Gtk::manage(new class Gtk::Label(_("channels"))); + chan_count_label_2 = Gtk::manage(new class Gtk::Label(_("channels"))); + chan_count_label_3 = Gtk::manage(new class Gtk::Label(_("channels"))); + chan_count_label_4 = Gtk::manage(new class Gtk::Label(_("channels"))); + + chan_count_label_1->set_alignment(0,0.5); + chan_count_label_1->set_padding(0,0); + chan_count_label_1->set_line_wrap(false); + + chan_count_label_2->set_alignment(0,0.5); + chan_count_label_2->set_padding(0,0); + chan_count_label_2->set_line_wrap(false); + + chan_count_label_3->set_alignment(0,0.5); + chan_count_label_3->set_padding(0,0); + chan_count_label_3->set_line_wrap(false); + + chan_count_label_4->set_alignment(0,0.5); + chan_count_label_4->set_padding(0,0); + chan_count_label_4->set_line_wrap(false); + + bus_label = Gtk::manage(new class Gtk::Label(_("Busses"))); + input_label = Gtk::manage(new class Gtk::Label(_("Inputs"))); + output_label = Gtk::manage(new class Gtk::Label(_("Outputs"))); + + session_location_label = Gtk::manage(new class Gtk::Label(_("Create Folder 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 :"))); + session_template_label = Gtk::manage(new class Gtk::Label(_("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)); @@ -55,19 +80,21 @@ NewSessionDialog::NewSessionDialog() 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"))); + m_connect_inputs = Gtk::manage(new class Gtk::CheckButton(_("Automatically Connect to Physical Inputs"))); + m_limit_input_ports = Gtk::manage(new class Gtk::CheckButton(_("Use only"))); 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(_("Track/Bus Inputs"))); + + bus_frame = Gtk::manage(new class Gtk::Frame()); + bus_table = Gtk::manage (new Gtk::Table (2, 3, false)); + 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"))); + m_limit_output_ports = Gtk::manage(new class Gtk::CheckButton(_("Use only"))); 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)); @@ -75,12 +102,11 @@ NewSessionDialog::NewSessionDialog() 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"))); + m_connect_outputs_to_master = Gtk::manage(new class Gtk::RadioButton(_RadioBGroup_m_connect_outputs_to_master, _("... to Master Bus"))); + m_connect_outputs_to_physical = Gtk::manage(new class Gtk::RadioButton(_RadioBGroup_m_connect_outputs_to_master, _("... 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(_("Track/Bus Outputs"))); + 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"))); @@ -90,25 +116,26 @@ NewSessionDialog::NewSessionDialog() 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_sesion_label = Gtk::manage(new class Gtk::Label(_("Recent:"))); 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_padding(6,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); + m_name->set_width_chars (40); session_location_label->set_alignment(0,0.5); - session_location_label->set_padding(0,0); + session_location_label->set_padding(6,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_padding(6,0); session_template_label->set_line_wrap(false); session_template_label->set_selectable(false); m_create_control_bus->set_flags(Gtk::CAN_FOCUS); @@ -127,7 +154,7 @@ NewSessionDialog::NewSessionDialog() 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 = Gtk::manage(new class Gtk::Label(_("Browse:"))); 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); @@ -136,11 +163,6 @@ NewSessionDialog::NewSessionDialog() 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); @@ -160,14 +182,40 @@ NewSessionDialog::NewSessionDialog() m_input_limit_count->set_wrap(false); m_input_limit_count->set_sensitive(false); + bus_hbox = Gtk::manage (new Gtk::HBox (false, 0)); + bus_hbox->pack_start (*bus_table, Gtk::PACK_SHRINK, 18); + + bus_label->set_alignment(0, 0.5); + bus_label->set_padding(0,0); + bus_label->set_line_wrap(false); + bus_label->set_selectable(false); + bus_label->set_use_markup(true); + bus_frame->set_shadow_type(Gtk::SHADOW_NONE); + bus_frame->set_label_align(0,0.5); + bus_frame->add(*bus_hbox); + bus_frame->set_label_widget(*bus_label); + + bus_table->set_row_spacings (0); + bus_table->set_col_spacings (0); + bus_table->attach (*m_create_master_bus, 0, 1, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); + bus_table->attach (*m_master_bus_channel_count, 1, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); + bus_table->attach (*chan_count_label_1, 2, 3, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 6, 0); + bus_table->attach (*m_create_control_bus, 0, 1, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); + bus_table->attach (*m_control_bus_channel_count, 1, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); + bus_table->attach (*chan_count_label_2, 2, 3, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 6, 0); + 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_limit_hbox->pack_start(*m_input_limit_count, Gtk::PACK_SHRINK, 0); + input_port_limit_hbox->pack_start(*chan_count_label_3, Gtk::PACK_SHRINK, 6); 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_hbox = Gtk::manage (new Gtk::HBox (false, 0)); + input_hbox->pack_start (*input_table, Gtk::PACK_SHRINK, 18); + input_label->set_alignment(0, 0.5); input_label->set_padding(0,0); input_label->set_line_wrap(false); @@ -175,8 +223,9 @@ NewSessionDialog::NewSessionDialog() 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->add(*input_hbox); 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); @@ -194,9 +243,8 @@ NewSessionDialog::NewSessionDialog() 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); + output_port_limit_hbox->pack_start(*m_output_limit_count, Gtk::PACK_SHRINK, 0); + output_port_limit_hbox->pack_start(*chan_count_label_4, Gtk::PACK_SHRINK, 6); 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); @@ -207,12 +255,16 @@ NewSessionDialog::NewSessionDialog() 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, Gtk::PACK_SHRINK, 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_port_vbox->pack_start(*output_port_limit_hbox, Gtk::PACK_SHRINK, 0); + output_vbox->pack_start(*output_conn_vbox); - output_port_alignment->add(*output_vbox); + output_vbox->pack_start(*output_port_vbox); + output_label->set_alignment(0, 0.5); output_label->set_padding(0,0); output_label->set_line_wrap(false); @@ -220,10 +272,16 @@ NewSessionDialog::NewSessionDialog() 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_hbox = Gtk::manage (new Gtk::HBox (false, 0)); + output_hbox->pack_start (*output_vbox, Gtk::PACK_SHRINK, 18); + + output_frame->add(*output_hbox); 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(*bus_frame, Gtk::PACK_SHRINK, 6); + advanced_vbox->pack_start(*input_frame, Gtk::PACK_SHRINK, 6); advanced_vbox->pack_start(*output_frame, Gtk::PACK_SHRINK, 0); advanced_label->set_padding(0,0); advanced_label->set_line_wrap(false); @@ -236,7 +294,7 @@ NewSessionDialog::NewSessionDialog() 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_row_spacings(6); 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); @@ -244,11 +302,9 @@ NewSessionDialog::NewSessionDialog() 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); + new_session_table->attach(*advanced_expander, 0, 2, 3, 4, Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 6); + + open_session_hbox->pack_start(*open_session_file_label, false, false, 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); @@ -257,7 +313,6 @@ NewSessionDialog::NewSessionDialog() 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); @@ -265,16 +320,16 @@ NewSessionDialog::NewSessionDialog() 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_shadow_type(Gtk::SHADOW_NONE); + recent_frame->add(*recent_scrolledwindow); 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); + open_session_vbox->pack_start(*open_session_hbox, Gtk::PACK_SHRINK, 12); m_notebook->set_flags(Gtk::CAN_FOCUS); m_notebook->set_scrollable(true); m_notebook->append_page(*new_session_table, _("New Session")); @@ -302,17 +357,29 @@ NewSessionDialog::NewSessionDialog() 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(); } + + const char * const template_dir_name = X_("templates"); + if (!path.empty()) { - m_template->set_current_folder (path + X_("templates/")); + string user_template_path = path + template_dir_name; + + if (Glib::file_test(user_template_path, Glib::FILE_TEST_IS_DIR)) + { + m_template->set_current_folder (user_template_path); + } } - const std::string sys_templates_dir = ARDOUR::get_system_data_path() + X_("templates"); + const std::string sys_templates_dir = ARDOUR::get_system_data_path() + template_dir_name; + 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")); @@ -573,10 +640,13 @@ NewSessionDialog::file_chosen () m_treeview->get_selection()->unselect_all(); + get_window()->set_cursor(Gdk::Cursor(Gdk::WATCH)); + if (!m_open_filechooser->get_filename().empty()) { - set_response_sensitive (Gtk::RESPONSE_OK, true); + set_response_sensitive (Gtk::RESPONSE_OK, true); + response (Gtk::RESPONSE_OK); } else { - set_response_sensitive (Gtk::RESPONSE_OK, false); + set_response_sensitive (Gtk::RESPONSE_OK, false); } } @@ -653,13 +723,13 @@ NewSessionDialog::reset_template() void NewSessionDialog::reset_recent() { - /* Shamelessly ripped from ardour_ui.cc */ - std::vector *sessions; + /* Shamelessly ripped from ardour_ui.cc */ + std::vector *sessions; std::vector::iterator i; RecentSessionsSorter cmp; recent_model->clear (); - + ARDOUR::RecentSessions rs; ARDOUR::read_recent_sessions (rs); @@ -673,7 +743,7 @@ NewSessionDialog::reset_recent() for (i = sessions->begin(); i != sessions->end(); ++i) { - std::vector* states; + std::vector* states; std::vector item; std::string fullpath = *(*i); @@ -695,7 +765,7 @@ NewSessionDialog::reset_recent() row[recent_columns.visible_name] = Glib::path_get_basename (fullpath); row[recent_columns.fullpath] = fullpath; - if (states->size() > 1) { + if (states->size()) { /* add the children */