X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_snapshots.cc;h=08b5acddc82c19305dfd73af474aa304941555e1;hb=bb59def1ca8a21f915cf636dd1e54957df981656;hp=80ffdb449137f902e98a348fd5880a3b5c58152f;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/gtk2_ardour/editor_snapshots.cc b/gtk2_ardour/editor_snapshots.cc
index 80ffdb4491..08b5acddc8 100644
--- a/gtk2_ardour/editor_snapshots.cc
+++ b/gtk2_ardour/editor_snapshots.cc
@@ -19,17 +19,16 @@
 
 #include <gtkmm/liststore.h>
 #include "gtkmm2ext/choice.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 "utils.h"
 #include "prompter.h"
 
 using namespace std;
-using namespace sigc;
 using namespace PBD;
 using namespace Gtk;
 using namespace ARDOUR;
@@ -40,21 +39,20 @@ 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.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 ();
 }
@@ -68,7 +66,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;
@@ -108,10 +106,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,21 +118,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);
@@ -150,16 +149,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);
@@ -174,7 +173,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);