X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_snapshots.cc;h=b90737cd08dd28b8ba5952fbb885407e215b28c8;hb=842c33fba81ee7d360bb347a9a011582f6aac95f;hp=92fa6d76d658d32edb5ce0834591ad803dc0a91b;hpb=c83e48e07a0b4790512c6251d8ad8f941c881021;p=ardour.git

diff --git a/gtk2_ardour/editor_snapshots.cc b/gtk2_ardour/editor_snapshots.cc
index 92fa6d76d6..b90737cd08 100644
--- a/gtk2_ardour/editor_snapshots.cc
+++ b/gtk2_ardour/editor_snapshots.cc
@@ -17,23 +17,33 @@
 
 */
 
+
+#include <glib.h>
+#include "pbd/gstdio_compat.h"
+
+#include <glibmm.h>
+#include <glibmm/datetime.h>
+
 #include <gtkmm/liststore.h>
+
 #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)
@@ -41,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 ();
 }
@@ -69,7 +79,7 @@ EditorSnapshots::selection_changed ()
 
 		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;
@@ -109,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;
 
@@ -121,21 +131,22 @@ 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);
@@ -151,16 +162,16 @@ EditorSnapshots::rename (Glib::ustring old_name)
 
 
 void
-EditorSnapshots::remove (Glib::ustring name)
+EditorSnapshots::remove (std::string name)
 {
 	vector<string> 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);
@@ -175,7 +186,7 @@ EditorSnapshots::redisplay ()
 		return;
 	}
 
-	vector<sys::path> state_file_paths;
+	vector<std::string> state_file_paths;
 
 	get_state_files_in_directory (_session->session_directory().root_path(),
 				      state_file_paths);
@@ -204,8 +215,15 @@ EditorSnapshots::redisplay ()
 			_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");
 	}
 }