X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_snapshots.cc;h=b90737cd08dd28b8ba5952fbb885407e215b28c8;hb=d13435a4e1d0e85654a8477ae99a7b41ff621159;hp=673d5c22a1b6ab4169d17a2c3d76785925a8fc5c;hpb=7a378ef1503a8da433bb245f42c9e9b2412176eb;p=ardour.git diff --git a/gtk2_ardour/editor_snapshots.cc b/gtk2_ardour/editor_snapshots.cc index 673d5c22a1..b90737cd08 100644 --- a/gtk2_ardour/editor_snapshots.cc +++ b/gtk2_ardour/editor_snapshots.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2009 Paul Davis + Copyright (C) 2000-2009 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 @@ -17,22 +17,33 @@ */ + +#include +#include "pbd/gstdio_compat.h" + +#include +#include + #include + #include "gtkmm2ext/choice.h" + +#include "ardour/filename_extensions.h" +#include "ardour/session.h" #include "ardour/session_state_utils.h" #include "ardour/session_directory.h" + #include "editor_snapshots.h" #include "ardour_ui.h" -#include "i18n.h" -#include "editor.h" +#include "pbd/i18n.h" #include "utils.h" #include "prompter.h" using namespace std; -using namespace sigc; using namespace PBD; using namespace Gtk; using namespace ARDOUR; +using namespace ARDOUR_UI_UTILS; EditorSnapshots::EditorSnapshots (Editor* e) : EditorComponent (e) @@ -40,21 +51,21 @@ EditorSnapshots::EditorSnapshots (Editor* e) _model = ListStore::create (_columns); _display.set_model (_model); _display.append_column (X_("snapshot"), _columns.visible_name); - _display.set_name ("SnapshotDisplay"); + _display.append_column (X_("lastmod"), _columns.time_formatted); _display.set_size_request (75, -1); _display.set_headers_visible (false); _display.set_reorderable (false); _scroller.add (_display); _scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC); - _display.get_selection()->signal_changed().connect (mem_fun(*this, &EditorSnapshots::selection_changed)); - _display.signal_button_press_event().connect (mem_fun (*this, &EditorSnapshots::button_press), false); + _display.get_selection()->signal_changed().connect (sigc::mem_fun(*this, &EditorSnapshots::selection_changed)); + _display.signal_button_press_event().connect (sigc::mem_fun (*this, &EditorSnapshots::button_press), false); } void -EditorSnapshots::connect_to_session (Session* s) +EditorSnapshots::set_session (Session* s) { - EditorComponent::connect_to_session (s); + SessionHandlePtr::set_session (s); redisplay (); } @@ -67,17 +78,17 @@ EditorSnapshots::selection_changed () if (_display.get_selection()->count_selected_rows() > 0) { TreeModel::iterator i = _display.get_selection()->get_selected(); - - Glib::ustring snap_name = (*i)[_columns.real_name]; + + std::string snap_name = (*i)[_columns.real_name]; if (snap_name.length() == 0) { return; } - + if (_session->snap_name() == snap_name) { return; } - + ARDOUR_UI::instance()->load_session (_session->path(), string (snap_name)); } } @@ -108,10 +119,10 @@ EditorSnapshots::button_press (GdkEventButton* ev) /** Pop up the snapshot display context menu. * @param button Button used to open the menu. * @param time Menu open time. - * @snapshot_name Name of the snapshot that the menu click was over. + * @param snapshot_name Name of the snapshot that the menu click was over. */ void -EditorSnapshots::popup_context_menu (int button, int32_t time, Glib::ustring snapshot_name) +EditorSnapshots::popup_context_menu (int button, int32_t time, std::string snapshot_name) { using namespace Menu_Helpers; @@ -120,25 +131,26 @@ EditorSnapshots::popup_context_menu (int button, int32_t time, Glib::ustring sna const bool modification_allowed = (_session->snap_name() != snapshot_name && _session->name() != snapshot_name); - add_item_with_sensitivity (items, MenuElem (_("Remove"), bind (mem_fun (*this, &EditorSnapshots::remove), snapshot_name)), modification_allowed); + add_item_with_sensitivity (items, MenuElem (_("Remove"), sigc::bind (sigc::mem_fun (*this, &EditorSnapshots::remove), snapshot_name)), modification_allowed); - add_item_with_sensitivity (items, MenuElem (_("Rename"), bind (mem_fun (*this, &EditorSnapshots::rename), snapshot_name)), modification_allowed); + add_item_with_sensitivity (items, MenuElem (_("Rename..."), sigc::bind (sigc::mem_fun (*this, &EditorSnapshots::rename), snapshot_name)), modification_allowed); _menu.popup (button, time); } void -EditorSnapshots::rename (Glib::ustring old_name) +EditorSnapshots::rename (std::string old_name) { ArdourPrompter prompter(true); string new_name; prompter.set_name ("Prompter"); + prompter.set_title (_("Rename Snapshot")); prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT); prompter.set_prompt (_("New name of snapshot")); prompter.set_initial_text (old_name); - + if (prompter.run() == RESPONSE_ACCEPT) { prompter.get_result (new_name); if (new_name.length()) { @@ -150,16 +162,16 @@ EditorSnapshots::rename (Glib::ustring old_name) void -EditorSnapshots::remove (Glib::ustring name) +EditorSnapshots::remove (std::string name) { vector choices; - std::string prompt = string_compose (_("Do you really want to remove snapshot \"%1\" ?\n(cannot be undone)"), name); + std::string prompt = string_compose (_("Do you really want to remove snapshot \"%1\" ?\n(which cannot be undone)"), name); choices.push_back (_("No, do nothing.")); choices.push_back (_("Yes, remove it.")); - Gtkmm2ext::Choice prompter (prompt, choices); + Gtkmm2ext::Choice prompter (_("Remove snapshot"), prompt, choices); if (prompter.run () == 1) { _session->remove_state (name); @@ -174,7 +186,7 @@ EditorSnapshots::redisplay () return; } - vector state_file_paths; + vector state_file_paths; get_state_files_in_directory (_session->session_directory().root_path(), state_file_paths); @@ -191,20 +203,27 @@ EditorSnapshots::redisplay () { string statename = (*i); TreeModel::Row row = *(_model->append()); - + /* this lingers on in case we ever want to change the visible name of the snapshot. */ - + string display_name; display_name = statename; if (statename == _session->snap_name()) { _display.get_selection()->select(row); - } - + } + + std::string s = Glib::build_filename (_session->path(), statename + ARDOUR::statefile_suffix); + + GStatBuf gsb; + g_stat (s.c_str(), &gsb); + Glib::DateTime gdt(Glib::DateTime::create_now_local (gsb.st_mtime)); + row[_columns.visible_name] = display_name; row[_columns.real_name] = statename; + row[_columns.time_formatted] = gdt.format ("%F %H:%M"); } }