Merge branch 'master' into cairocanvas

[ardour.git] / gtk2_ardour / editor_snapshots.cc

diff --git a/gtk2_ardour/editor_snapshots.cc b/gtk2_ardour/editor_snapshots.cc
index d8e0fd164463bc995a8304802e9f11534bb88a59..08b5acddc82c19305dfd73af474aa304941555e1 100644 (file)
--- a/gtk2_ardour/editor_snapshots.cc
+++ b/gtk2_ardour/editor_snapshots.cc
@@ -25,7 +25,6 @@
 #include "editor_snapshots.h"
 #include "ardour_ui.h"
 #include "i18n.h"
-#include "editor.h"
 #include "utils.h"
 #include "prompter.h"
 
@@ -40,7 +39,6 @@ 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);
@@ -108,7 +106,7 @@ 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, std::string snapshot_name)
@@ -122,7 +120,7 @@ EditorSnapshots::popup_context_menu (int button, int32_t time, std::string snaps
 
        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"), sigc::bind (sigc::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);
 }
@@ -135,6 +133,7 @@ EditorSnapshots::rename (std::string old_name)
        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);
@@ -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);