X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fnew_session_dialog.cc;h=c28277b8ab21f810859814f4b4fb9f3301f13d83;hb=f6f3769ae11e3a9e888abdf8c3ed92f08d3c9a5b;hp=fb07daeaccb96b653bf4a77b278715853f22962d;hpb=673fb6a0ede266e33722e22be2aafa0a099a083a;p=ardour.git diff --git a/gtk2_ardour/new_session_dialog.cc b/gtk2_ardour/new_session_dialog.cc index fb07daeacc..c28277b8ab 100644 --- a/gtk2_ardour/new_session_dialog.cc +++ b/gtk2_ardour/new_session_dialog.cc @@ -17,12 +17,13 @@ */ -#include "i18n.h" -#include "new_session_dialog.h" +#include #include #include #include +#include +#include #include #include @@ -35,23 +36,28 @@ #include +using namespace Gtk; using namespace Gtkmm2ext; -using namespace ARDOUR; using namespace PBD; +using namespace ARDOUR; #include "opts.h" +#include "utils.h" +#include "i18n.h" +#include "new_session_dialog.h" NewSessionDialog::NewSessionDialog() : ArdourDialog ("session control") { - 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); + in_destructor = false; + session_name_label = new Gtk::Label(_("Name:")); + m_name = new Gtk::Entry(); + m_name->set_text(ARDOUR_COMMAND_LINE::session_name); - 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 = new Gtk::Label(_("channels")); + chan_count_label_2 = new Gtk::Label(_("channels")); + chan_count_label_3 = new Gtk::Label(_("channels")); + chan_count_label_4 = new Gtk::Label(_("channels")); chan_count_label_1->set_alignment(0,0.5); chan_count_label_1->set_padding(0,0); @@ -69,64 +75,64 @@ NewSessionDialog::NewSessionDialog() 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"))); + bus_label = new Gtk::Label(_("Busses")); + input_label = new Gtk::Label(_("Inputs")); + output_label = new 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(_("Template :"))); - m_template = Gtk::manage(new class Gtk::FileChooserButton()); - m_create_control_bus = Gtk::manage(new class Gtk::CheckButton(_("Create Monitor Bus"))); + session_location_label = new Gtk::Label(_("Create folder in:")); + m_folder = new Gtk::FileChooserButton(Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER); + session_template_label = new Gtk::Label(_("Template:")); + m_template = new Gtk::FileChooserButton(); + m_create_control_bus = new Gtk::CheckButton(_("Create monitor bus")); + + Gtk::Adjustment *m_control_bus_channel_count_adj = Gtk::manage(new Gtk::Adjustment(2, 0, 100, 1, 10, 0)); + m_control_bus_channel_count = new Gtk::SpinButton(*m_control_bus_channel_count_adj, 1, 0); - 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 Gtk::Adjustment(2, 0, 100, 1, 10, 0)); + m_master_bus_channel_count = new Gtk::SpinButton(*m_master_bus_channel_count_adj, 1, 0); + m_create_master_bus = new Gtk::CheckButton(_("Create master bus")); + advanced_table = new Gtk::Table(2, 2, true); + m_connect_inputs = new Gtk::CheckButton(_("Automatically connect to physical inputs")); + m_limit_input_ports = new Gtk::CheckButton(_("Use only")); - 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 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 Gtk::Adjustment(1, 0, 100, 1, 10, 0)); + m_input_limit_count = new Gtk::SpinButton(*m_input_limit_count_adj, 1, 0); + input_port_limit_hbox = new Gtk::HBox(false, 0); + input_port_vbox = new Gtk::VBox(false, 0); + input_table = new Gtk::Table(2, 2, false); + + bus_frame = new Gtk::Frame(); + bus_table = new Gtk::Table (2, 3, false); - 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)); - - 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(_("Use only"))); + input_frame = new Gtk::Frame(); + m_connect_outputs = new Gtk::CheckButton(_("Automatically connect outputs")); + m_limit_output_ports = new 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)); - output_port_limit_hbox = Gtk::manage(new class Gtk::HBox(false, 0)); - output_port_vbox = Gtk::manage(new class Gtk::VBox(false, 0)); + Gtk::Adjustment *m_output_limit_count_adj = Gtk::manage(new Gtk::Adjustment(1, 0, 100, 1, 10, 0)); + m_output_limit_count = new Gtk::SpinButton(*m_output_limit_count_adj, 1, 0); + output_port_limit_hbox = new Gtk::HBox(false, 0); + output_port_vbox = new 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, _("... 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_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_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()); + m_connect_outputs_to_master = new Gtk::RadioButton(_RadioBGroup_m_connect_outputs_to_master, _("... to master bus")); + m_connect_outputs_to_physical = new Gtk::RadioButton(_RadioBGroup_m_connect_outputs_to_master, _("... to physical outputs")); + output_conn_vbox = new Gtk::VBox(false, 0); + output_vbox = new Gtk::VBox(false, 0); + + output_frame = new Gtk::Frame(); + advanced_vbox = new Gtk::VBox(false, 0); + advanced_label = new Gtk::Label(_("Advanced options")); + advanced_expander = new Gtk::Expander(); + new_session_table = new Gtk::Table(2, 2, false); + m_open_filechooser = new Gtk::FileChooserButton(); + open_session_hbox = new Gtk::HBox(false, 0); + m_treeview = new Gtk::TreeView(); + recent_scrolledwindow = new Gtk::ScrolledWindow(); + + recent_sesion_label = new Gtk::Label(_("Recent:")); + recent_frame = new Gtk::Frame(); + open_session_vbox = new Gtk::VBox(false, 0); + m_notebook = new Gtk::Notebook(); session_name_label->set_alignment(0, 0.5); session_name_label->set_padding(6,0); session_name_label->set_line_wrap(false); @@ -160,7 +166,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(_("Browse:"))); + open_session_file_label = new 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); @@ -169,7 +175,7 @@ NewSessionDialog::NewSessionDialog() m_create_master_bus->set_border_width(0); advanced_table->set_row_spacings(0); advanced_table->set_col_spacings(0); - + m_connect_inputs->set_flags(Gtk::CAN_FOCUS); m_connect_inputs->set_relief(Gtk::RELIEF_NORMAL); m_connect_inputs->set_mode(true); @@ -188,7 +194,7 @@ 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 = new Gtk::HBox (false, 0); bus_hbox->pack_start (*bus_table, Gtk::PACK_SHRINK, 18); bus_label->set_alignment(0, 0.5); @@ -219,7 +225,7 @@ NewSessionDialog::NewSessionDialog() 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_hbox = Gtk::manage (new Gtk::HBox (false, 0)); + input_hbox = new Gtk::HBox (false, 0); input_hbox->pack_start (*input_table, Gtk::PACK_SHRINK, 18); input_label->set_alignment(0, 0.5); @@ -279,7 +285,7 @@ NewSessionDialog::NewSessionDialog() output_frame->set_shadow_type(Gtk::SHADOW_NONE); output_frame->set_label_align(0,0.5); - output_hbox = Gtk::manage (new Gtk::HBox (false, 0)); + output_hbox = new Gtk::HBox (false, 0); output_hbox->pack_start (*output_vbox, Gtk::PACK_SHRINK, 18); output_frame->add(*output_hbox); @@ -308,8 +314,11 @@ 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, 6); + if (!ARDOUR::Profile->get_sae()) { + 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); @@ -338,31 +347,48 @@ NewSessionDialog::NewSessionDialog() 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")); - 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); + /* + icon setting is done again in the editor (for the whole app), + but its all chickens and eggs at this point. + */ + + list > window_icons; + Glib::RefPtr icon; + + if ((icon = ::get_icon ("ardour_icon_16px")) != 0) { + window_icons.push_back (icon); + } + if ((icon = ::get_icon ("ardour_icon_22px")) != 0) { + window_icons.push_back (icon); + } + if ((icon = ::get_icon ("ardour_icon_32px")) != 0) { + window_icons.push_back (icon); + } + if ((icon = ::get_icon ("ardour_icon_48px")) != 0) { + window_icons.push_back (icon); + } + if (!window_icons.empty()) { + set_icon_list (window_icons); + } + WindowTitle title(Glib::get_application_name()); title += _("Session Control"); set_title(title.get_string()); - //set_modal(false); - //property_window_position().set_value(Gtk::WIN_POS_NONE); + set_position (Gtk::WIN_POS_MOUSE); 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); + quit_or_cancel_button = 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->append_column (_("Recent sessions"), recent_columns.visible_name); m_treeview->set_headers_visible (false); m_treeview->get_selection()->set_mode (Gtk::SELECTION_SINGLE); @@ -399,9 +425,11 @@ NewSessionDialog::NewSessionDialog() m_notebook->show(); m_notebook->show_all_children(); + engine_page_session_folder = X_(""); + engine_page_session_name = X_(""); set_default_response (Gtk::RESPONSE_OK); - if (!GTK_ARDOUR::session_name.length()) { + if (!ARDOUR_COMMAND_LINE::session_name.length()) { set_response_sensitive (Gtk::RESPONSE_OK, false); set_response_sensitive (Gtk::RESPONSE_NONE, false); } else { @@ -423,13 +451,130 @@ NewSessionDialog::NewSessionDialog() 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(); + + page_set = Pages (0); +} + +NewSessionDialog::~NewSessionDialog() +{ + in_destructor = true; +} + +int +NewSessionDialog::run () +{ + if (!page_set) { + /* nothing to display */ + return Gtk::RESPONSE_OK; + } + if (!(page_set & NewPage) && !(page_set & OpenPage)) { + set_response_sensitive (Gtk::RESPONSE_OK, true); + } + return ArdourDialog::run (); } void -NewSessionDialog::set_session_name(const Glib::ustring& name) +NewSessionDialog::set_have_engine (bool yn) { - m_name->set_text(name); + if (yn) { + m_notebook->remove_page (engine_control); + page_set = Pages (page_set & ~EnginePage); + } else { + if (!(page_set & EnginePage)) { + m_notebook->append_page (engine_control, _("Audio Setup")); + m_notebook->show_all_children(); + page_set = Pages (page_set | EnginePage); + } + } +} + + +void +NewSessionDialog::set_existing_session (bool yn) +{ + if (yn) { + + if (page_set & NewPage) { + m_notebook->remove_page (*new_session_table); + page_set = Pages (page_set & ~NewPage); + } + + if (page_set & OpenPage) { + m_notebook->remove_page (*open_session_vbox); + page_set = Pages (page_set & ~OpenPage); + } + + } else { + if (!(page_set & NewPage)) { + m_notebook->append_page(*new_session_table, _("New Session")); + m_notebook->pages().back().set_tab_label_packing(false, true, Gtk::PACK_START); + page_set = Pages (page_set | NewPage); + } + if (!(page_set & OpenPage)) { + m_notebook->append_page(*open_session_vbox, _("Open Session")); + m_notebook->pages().back().set_tab_label_packing(false, true, Gtk::PACK_START); + page_set = Pages (page_set | OpenPage); + } + + m_notebook->show_all_children(); + } +} + +void +NewSessionDialog::set_session_name (const Glib::ustring& name) +{ + m_name->set_text (name); + engine_page_session_name = name; +} + +void +NewSessionDialog::set_session_folder(const Glib::ustring& dir) +{ + Glib::ustring realdir = dir; + + /* this little tangled mess is a result of 4 things: + + 1) GtkFileChooser vomits when given a non-absolute directory + argument to set_current_folder() + 2) canonicalize_file_name() doesn't exist on OS X + 3) linux man page for realpath() says "do not use this function" + 4) canonicalize_file_name() & realpath() have entirely + different semantics on OS X and Linux when given + a non-existent path. + + as result of all this, we take two distinct pathways through the code. + */ + + +#ifdef __APPLE__ + + char buf[PATH_MAX]; + + if(realpath (dir.c_str(), buf) != 0) { + if (!Glib::file_test (dir, Glib::FILE_TEST_IS_DIR)) { + realdir = Glib::path_get_dirname (realdir); + } + m_folder->set_current_folder (realdir); + engine_page_session_folder = realdir; + } + + +#else + char* res; + if (!Glib::file_test (dir, Glib::FILE_TEST_IS_DIR)) { + realdir = Glib::path_get_dirname (realdir); + cerr << "didn't exist, use " << realdir << endl; + } + + if ((res = canonicalize_file_name (realdir.c_str())) != 0) { + cerr << "canonical, use " << res << endl; + m_folder->set_current_folder (res); + engine_page_session_folder = res; + free (res); + } + +#endif + } std::string @@ -450,36 +595,61 @@ NewSessionDialog::session_name() const } */ - if (on_new_session_page ()) { - 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); + switch (which_page()) { + case NewPage: + case EnginePage: + /* new or audio setup pages */ + if (!(page_set & OpenPage) && !(page_set & NewPage)) { + return Glib::filename_from_utf8(engine_page_session_name); } - Gtk::TreeModel::iterator i = m_treeview->get_selection()->get_selected(); - return (*i)[recent_columns.visible_name]; + return Glib::filename_from_utf8(m_name->get_text()); + default: + break; + } + + 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]; } std::string NewSessionDialog::session_folder() const { - if (on_new_session_page ()) { - 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()); + switch (which_page()) { + case NewPage: + return Glib::filename_from_utf8(m_folder->get_filename()); + + case EnginePage: + if (!(page_set & OpenPage) && !(page_set & NewPage)) { + /* just engine page, nothing else */ + return Glib::filename_from_utf8(engine_page_session_folder); + } + if (page_set == EnginePage) { + /* use m_folder since it should be set */ + return Glib::filename_from_utf8(m_folder->get_filename()); } - Gtk::TreeModel::iterator i = m_treeview->get_selection()->get_selected(); - return (*i)[recent_columns.fullpath]; + break; + + default: + break; } + + if (m_treeview->get_selection()->count_selected_rows() == 0) { + const string filename(Glib::filename_from_utf8(m_open_filechooser->get_filename())); + return Glib::path_get_dirname(filename); + } + + Gtk::TreeModel::iterator i = m_treeview->get_selection()->get_selected(); + return (*i)[recent_columns.fullpath]; } bool NewSessionDialog::use_session_template() const { - if(m_template->get_filename().empty() && (m_notebook->get_current_page() == 0)) return false; + if (m_template->get_filename().empty() && (which_page() == NewPage)) + return false; return true; } @@ -561,10 +731,62 @@ NewSessionDialog::connect_outs_to_physical() const return m_connect_outputs_to_physical->get_active(); } -bool -NewSessionDialog::on_new_session_page() const +int +NewSessionDialog::get_current_page() { - return (m_notebook->get_current_page() == 0); + return m_notebook->get_current_page(); +} + +NewSessionDialog::Pages +NewSessionDialog::which_page () const +{ + int num = m_notebook->get_current_page(); + + if (page_set == NewPage) { + return NewPage; + + } else if (page_set == OpenPage) { + return OpenPage; + + } else if (page_set == EnginePage) { + return EnginePage; + + } else if (page_set == (NewPage|OpenPage)) { + switch (num) { + case 0: + return NewPage; + default: + return OpenPage; + } + + } else if (page_set == (NewPage|EnginePage)) { + switch (num) { + case 0: + return NewPage; + default: + return EnginePage; + } + + } else if (page_set == (NewPage|EnginePage|OpenPage)) { + switch (num) { + case 0: + return NewPage; + case 1: + return OpenPage; + default: + return EnginePage; + } + + } else if (page_set == (OpenPage|EnginePage)) { + switch (num) { + case 0: + return OpenPage; + default: + return EnginePage; + } + } + + return NewPage; /* shouldn't get here */ } void @@ -594,23 +816,38 @@ NewSessionDialog::on_new_session_name_entry_changed () void NewSessionDialog::notebook_page_changed (GtkNotebookPage* np, uint pagenum) { - if (!on_new_session_page ()) { + if (in_destructor) { + return; + } + + switch (which_page()) { + case OpenPage: + on_new_session_page = false; m_okbutton->set_label(_("Open")); + m_okbutton->set_image (*(manage (new Gtk::Image (Gtk::Stock::OPEN, Gtk::ICON_SIZE_BUTTON)))); 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 { - if (m_name->get_text() != "") { - set_response_sensitive (Gtk::RESPONSE_NONE, true); - } + break; + + case EnginePage: + on_new_session_page = false; + m_okbutton->set_label(_("Open")); + m_okbutton->set_image (*(manage (new Gtk::Image (Gtk::Stock::OPEN, Gtk::ICON_SIZE_BUTTON)))); + set_response_sensitive (Gtk::RESPONSE_NONE, false); + set_response_sensitive (Gtk::RESPONSE_OK, true); + break; + + default: + on_new_session_page = 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); + m_name->grab_focus(); } else { set_response_sensitive (Gtk::RESPONSE_OK, true); } @@ -634,11 +871,21 @@ NewSessionDialog::treeview_selection_changed () void NewSessionDialog::file_chosen () { - if (on_new_session_page ()) return; + switch (which_page()) { + case OpenPage: + break; + case NewPage: + case EnginePage: + return; + } m_treeview->get_selection()->unselect_all(); - get_window()->set_cursor(Gdk::Cursor(Gdk::WATCH)); + Glib::RefPtr win (get_window()); + + if (win) { + win->set_cursor(Gdk::Cursor(Gdk::WATCH)); + } if (!m_open_filechooser->get_filename().empty()) { set_response_sensitive (Gtk::RESPONSE_OK, true); @@ -661,7 +908,7 @@ NewSessionDialog::template_chosen () void NewSessionDialog::recent_row_activated (const Gtk::TreePath& path, Gtk::TreeViewColumn* col) { - response (Gtk::RESPONSE_YES); + response (Gtk::RESPONSE_OK); } void @@ -715,13 +962,15 @@ NewSessionDialog::monitor_bus_button_clicked () void NewSessionDialog::reset_template() { - m_template->set_filename(""); + m_template->unselect_all (); } void NewSessionDialog::reset_recent() { - std::vector session_directories; + /* Shamelessly ripped from ardour_ui.cc */ + std::vector *sessions; + std::vector::iterator i; RecentSessionsSorter cmp; recent_model->clear (); @@ -729,51 +978,62 @@ NewSessionDialog::reset_recent() ARDOUR::RecentSessions rs; ARDOUR::read_recent_sessions (rs); - // sort them alphabetically + /* sort them alphabetically */ sort (rs.begin(), rs.end(), cmp); + sessions = new std::vector; for (ARDOUR::RecentSessions::iterator i = rs.begin(); i != rs.end(); ++i) { - session_directories.push_back ((*i).second); + sessions->push_back (new string ((*i).second)); } - for (vector::const_iterator i = session_directories.begin(); - i != session_directories.end(); ++i) - { - std::vector state_file_paths; - - // now get available states for this session - - get_state_files_in_directory (*i, state_file_paths); + for (i = sessions->begin(); i != sessions->end(); ++i) { - if (state_file_paths.empty()) { - // no state file? + std::vector* states; + std::vector item; + std::string fullpath = *(*i); + + /* remove any trailing / */ + + if (fullpath[fullpath.length()-1] == '/') { + fullpath = fullpath.substr (0, fullpath.length()-1); + } + + /* check whether session still exists */ + if (!Glib::file_test(fullpath, Glib::FILE_TEST_EXISTS)) { + /* session doesn't exist */ continue; + } + + /* now get available states for this session */ + + if ((states = ARDOUR::Session::possible_states (fullpath)) == 0) { + /* no state file? */ + continue; } - - std::vector state_file_names(get_file_names_no_extension (state_file_paths)); - + Gtk::TreeModel::Row row = *(recent_model->append()); - - const string fullpath = (*i).to_string(); row[recent_columns.visible_name] = Glib::path_get_basename (fullpath); row[recent_columns.fullpath] = fullpath; - if (state_file_names.size()) { - - // add the children - - for (std::vector::iterator i2 = state_file_names.begin(); - i2 != state_file_names.end(); ++i2) - { - - Gtk::TreeModel::Row child_row = *(recent_model->append (row.children())); - - child_row[recent_columns.visible_name] = *i2; + if (states->size()) { + + /* add the children */ + + for (std::vector::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 @@ -783,3 +1043,13 @@ NewSessionDialog::reset() reset_template(); set_response_sensitive (Gtk::RESPONSE_NONE, false); } + +void +NewSessionDialog::set_offer_cancel (bool yn) +{ + if (yn) { + quit_or_cancel_button->set_label (X_("gtk-cancel")); + } else { + quit_or_cancel_button->set_label (X_("gtk-quit")); + } +}