X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fsession_import_dialog.cc;h=b528f91b6c325f2f69fdd65fc9b26d511a570b88;hb=24d5f1a6249b08a8b21854ecf001be7e07e5bf23;hp=675a3b060326cd086b5f45b74780762410165820;hpb=f450df300c9c057141a4caf79ff6dbfbf58492d9;p=ardour.git diff --git a/gtk2_ardour/session_import_dialog.cc b/gtk2_ardour/session_import_dialog.cc index 675a3b0603..b528f91b6c 100644 --- a/gtk2_ardour/session_import_dialog.cc +++ b/gtk2_ardour/session_import_dialog.cc @@ -25,6 +25,7 @@ #include "ardour/audio_region_importer.h" #include "ardour/audio_playlist_importer.h" #include "ardour/audio_track_importer.h" +#include "ardour/filename_extensions.h" #include "ardour/location_importer.h" #include "ardour/tempo_map_importer.h" @@ -32,13 +33,15 @@ #include "gui_thread.h" #include "prompter.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; +using namespace PBD; +using namespace Gtk; SessionImportDialog::SessionImportDialog (ARDOUR::Session* target) : - ArdourDialog (_("Import from session")), + ArdourDialog (_("Import from Session")), file_browse_button (_("Browse")) { set_session (target); @@ -64,7 +67,7 @@ SessionImportDialog::SessionImportDialog (ARDOUR::Session* target) : get_vbox()->pack_start (file_frame, false, false); // Session browser - session_tree = Gtk::TreeStore::create (sb_cols); + session_tree = TreeStore::create (sb_cols); session_browser.set_model (session_tree); session_browser.set_name ("SessionBrowser"); @@ -73,29 +76,29 @@ SessionImportDialog::SessionImportDialog (ARDOUR::Session* target) : session_browser.set_tooltip_column (3); session_browser.get_column(0)->set_min_width (180); session_browser.get_column(1)->set_min_width (40); - session_browser.get_column(1)->set_sizing (Gtk::TREE_VIEW_COLUMN_AUTOSIZE); + session_browser.get_column(1)->set_sizing (TREE_VIEW_COLUMN_AUTOSIZE); - session_scroll.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); + session_scroll.set_policy (POLICY_AUTOMATIC, POLICY_AUTOMATIC); session_scroll.add (session_browser); session_scroll.set_size_request (220, 400); // Connect signals - Gtk::CellRendererToggle *toggle = dynamic_cast (session_browser.get_column_cell_renderer (1)); + CellRendererToggle *toggle = dynamic_cast (session_browser.get_column_cell_renderer (1)); toggle->signal_toggled().connect(sigc::mem_fun (*this, &SessionImportDialog::update)); session_browser.signal_row_activated().connect(sigc::mem_fun (*this, &SessionImportDialog::show_info)); get_vbox()->pack_start (session_scroll, false, false); // Buttons - cancel_button = add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); + cancel_button = add_button (Stock::CANCEL, RESPONSE_CANCEL); cancel_button->signal_clicked().connect (sigc::mem_fun (*this, &SessionImportDialog::end_dialog)); - ok_button = add_button (_("Import"), Gtk::RESPONSE_ACCEPT); + ok_button = add_button (_("Import"), RESPONSE_ACCEPT); ok_button->signal_clicked().connect (sigc::mem_fun (*this, &SessionImportDialog::do_merge)); // prompt signals XXX: problem - handlers to be in the same thread since they return values ElementImporter::Rename.connect_same_thread (connections, boost::bind (&SessionImportDialog::open_rename_dialog, this, _1, _2)); ElementImporter::Prompt.connect_same_thread (connections, boost::bind (&SessionImportDialog::open_prompt_dialog, this, _1)); - + // Finalize show_all(); } @@ -104,23 +107,26 @@ void SessionImportDialog::load_session (const string& filename) { if (_session) { - tree.read (filename); + if (tree.read (filename)) { + error << string_compose (_("Cannot load XML for session from %1"), filename) << endmsg; + return; + } boost::shared_ptr region_handler (new AudioRegionImportHandler (tree, *_session)); boost::shared_ptr pl_handler (new AudioPlaylistImportHandler (tree, *_session, *region_handler)); - + handlers.push_back (boost::static_pointer_cast (region_handler)); handlers.push_back (boost::static_pointer_cast (pl_handler)); handlers.push_back (HandlerPtr(new UnusedAudioPlaylistImportHandler (tree, *_session, *region_handler))); handlers.push_back (HandlerPtr(new AudioTrackImportHandler (tree, *_session, *pl_handler))); handlers.push_back (HandlerPtr(new LocationImportHandler (tree, *_session))); handlers.push_back (HandlerPtr(new TempoMapImportHandler (tree, *_session))); - + fill_list(); - + if (ElementImportHandler::dirty()) { // Warn user string txt = _("Some elements had errors in them. Please see the log for details"); - Gtk::MessageDialog msg (txt, false, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_OK, true); + MessageDialog msg (txt, false, MESSAGE_WARNING, BUTTONS_OK, true); msg.run(); } } @@ -133,8 +139,8 @@ SessionImportDialog::fill_list () // Loop through element types for (HandlerList::iterator handler = handlers.begin(); handler != handlers.end(); ++handler) { - Gtk::TreeModel::iterator iter = session_tree->append(); - Gtk::TreeModel::Row row = *iter; + TreeModel::iterator iter = session_tree->append(); + TreeModel::Row row = *iter; row[sb_cols.name] = (*handler)->get_info(); row[sb_cols.queued] = false; row[sb_cols.element] = ElementPtr(); // "Null" pointer @@ -143,7 +149,7 @@ SessionImportDialog::fill_list () ElementList &elements = (*handler)->elements; for (ElementList::iterator element = elements.begin(); element != elements.end(); ++element) { iter = session_tree->append(row.children()); - Gtk::TreeModel::Row child = *iter; + TreeModel::Row child = *iter; child[sb_cols.name] = (*element)->get_name(); child[sb_cols.queued] = false; child[sb_cols.element] = *element; @@ -155,16 +161,22 @@ SessionImportDialog::fill_list () void SessionImportDialog::browse () { - Gtk::FileChooserDialog dialog(_("Import from session"), browse_action()); + FileChooserDialog dialog(_("Import from session"), browse_action()); dialog.set_transient_for(*this); dialog.set_filename (file_entry.get_text()); - dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); - dialog.add_button(Gtk::Stock::OK, Gtk::RESPONSE_OK); + FileFilter session_filter; + session_filter.add_pattern (string_compose(X_("*%1"), ARDOUR::statefile_suffix)); + session_filter.set_name (string_compose (_("%1 sessions"), PROGRAM_NAME)); + dialog.add_filter (session_filter); + dialog.set_filter (session_filter); + + dialog.add_button(Stock::CANCEL, RESPONSE_CANCEL); + dialog.add_button(Stock::OK, RESPONSE_OK); int result = dialog.run(); - if (result == Gtk::RESPONSE_OK) { + if (result == RESPONSE_OK) { string filename = dialog.get_filename(); if (filename.length()) { @@ -179,12 +191,12 @@ SessionImportDialog::do_merge () { // element types - Gtk::TreeModel::Children types = session_browser.get_model()->children(); - Gtk::TreeModel::Children::iterator ti; + TreeModel::Children types = session_browser.get_model()->children(); + TreeModel::Children::iterator ti; for (ti = types.begin(); ti != types.end(); ++ti) { // elements - Gtk::TreeModel::Children elements = ti->children(); - Gtk::TreeModel::Children::iterator ei; + TreeModel::Children elements = ti->children(); + TreeModel::Children::iterator ei; for (ei = elements.begin(); ei != elements.end(); ++ei) { if ((*ei)[sb_cols.queued]) { ElementPtr element = (*ei)[sb_cols.element]; @@ -198,7 +210,7 @@ SessionImportDialog::do_merge () if (ElementImportHandler::errors()) { // Warn user string txt = _("Some elements had errors in them. Please see the log for details"); - Gtk::MessageDialog msg (txt, false, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_OK, true); + MessageDialog msg (txt, false, MESSAGE_WARNING, BUTTONS_OK, true); msg.run(); } } @@ -207,22 +219,22 @@ SessionImportDialog::do_merge () void SessionImportDialog::update (string path) { - Gtk::TreeModel::iterator cell = session_browser.get_model()->get_iter (path); + TreeModel::iterator cell = session_browser.get_model()->get_iter (path); // Select all elements if element type is selected if (path.size() == 1) { { // Prompt user for verification string txt = _("This will select all elements of this type!"); - Gtk::MessageDialog msg (txt, false, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_OK_CANCEL, true); - if (msg.run() == Gtk::RESPONSE_CANCEL) { + MessageDialog msg (txt, false, MESSAGE_QUESTION, BUTTONS_OK_CANCEL, true); + if (msg.run() == RESPONSE_CANCEL) { (*cell)[sb_cols.queued] = false; return; } } - Gtk::TreeModel::Children elements = cell->children(); - Gtk::TreeModel::Children::iterator ei; + TreeModel::Children elements = cell->children(); + TreeModel::Children::iterator ei; for (ei = elements.begin(); ei != elements.end(); ++ei) { ElementPtr element = (*ei)[sb_cols.element]; if (element->prepare_move()) { @@ -245,16 +257,16 @@ SessionImportDialog::update (string path) } void -SessionImportDialog::show_info(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn*) +SessionImportDialog::show_info(const TreeModel::Path& path, TreeViewColumn*) { if (path.size() == 1) { return; } - Gtk::TreeModel::iterator cell = session_browser.get_model()->get_iter (path); + TreeModel::iterator cell = session_browser.get_model()->get_iter (path); string info = (*cell)[sb_cols.info]; - Gtk::MessageDialog msg (info, false, Gtk::MESSAGE_INFO, Gtk::BUTTONS_OK, true); + MessageDialog msg (info, false, MESSAGE_INFO, BUTTONS_OK, true); msg.run(); } @@ -274,11 +286,11 @@ SessionImportDialog::open_rename_dialog (string text, string name) string new_name; prompter.set_name ("Prompter"); - prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT); + prompter.add_button (Stock::SAVE, RESPONSE_ACCEPT); prompter.set_prompt (text); prompter.set_initial_text (name); - if (prompter.run() == Gtk::RESPONSE_ACCEPT) { + if (prompter.run() == RESPONSE_ACCEPT) { prompter.get_result (new_name); if (new_name.length()) { name = new_name; @@ -291,8 +303,8 @@ SessionImportDialog::open_rename_dialog (string text, string name) bool SessionImportDialog::open_prompt_dialog (string text) { - Gtk::MessageDialog msg (text, false, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_OK_CANCEL, true); - if (msg.run() == Gtk::RESPONSE_OK) { + MessageDialog msg (text, false, MESSAGE_QUESTION, BUTTONS_OK_CANCEL, true); + if (msg.run() == RESPONSE_OK) { return true; } return false;