fader+meter: update numeric display bg on style change

[ardour.git] / gtk2_ardour / editor_snapshots.cc

diff --git a/gtk2_ardour/editor_snapshots.cc b/gtk2_ardour/editor_snapshots.cc
index d9c1489e822edb29a27869c05fc7ba9fe17e08d9..ed49ef35b3c3dca02bf4b4dc6cf4a05509437a65 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"
 
@@ -33,6 +32,7 @@ using namespace std;
 using namespace PBD;
 using namespace Gtk;
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 
 EditorSnapshots::EditorSnapshots (Editor* e)
        : EditorComponent (e)
@@ -121,7 +121,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);
 }
@@ -134,6 +134,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);
@@ -173,7 +174,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);