projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add canvas-based Meter object
[ardour.git]
/
gtk2_ardour
/
editor_snapshots.cc
diff --git
a/gtk2_ardour/editor_snapshots.cc
b/gtk2_ardour/editor_snapshots.cc
index 8b544508d70d0541ea1de3bbb4d463655a4c12cf..b90737cd08dd28b8ba5952fbb885407e215b28c8 100644
(file)
--- a/
gtk2_ardour/editor_snapshots.cc
+++ b/
gtk2_ardour/editor_snapshots.cc
@@
-17,15
+17,25
@@
*/
*/
+
+#include <glib.h>
+#include "pbd/gstdio_compat.h"
+
+#include <glibmm.h>
+#include <glibmm/datetime.h>
+
#include <gtkmm/liststore.h>
#include <gtkmm/liststore.h>
+
#include "gtkmm2ext/choice.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 "ardour/session.h"
#include "ardour/session_state_utils.h"
#include "ardour/session_directory.h"
+
#include "editor_snapshots.h"
#include "ardour_ui.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"
#include "utils.h"
#include "prompter.h"
@@
-33,6
+43,7
@@
using namespace std;
using namespace PBD;
using namespace Gtk;
using namespace ARDOUR;
using namespace PBD;
using namespace Gtk;
using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
EditorSnapshots::EditorSnapshots (Editor* e)
: EditorComponent (e)
EditorSnapshots::EditorSnapshots (Editor* e)
: EditorComponent (e)
@@
-40,7
+51,7
@@
EditorSnapshots::EditorSnapshots (Editor* e)
_model = ListStore::create (_columns);
_display.set_model (_model);
_display.append_column (X_("snapshot"), _columns.visible_name);
_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);
_display.set_size_request (75, -1);
_display.set_headers_visible (false);
_display.set_reorderable (false);
@@
-52,9
+63,9
@@
EditorSnapshots::EditorSnapshots (Editor* e)
}
void
}
void
-EditorSnapshots::
connect_to
_session (Session* s)
+EditorSnapshots::
set
_session (Session* s)
{
{
-
EditorComponent::connect_to
_session (s);
+
SessionHandlePtr::set
_session (s);
redisplay ();
}
redisplay ();
}
@@
-68,7
+79,7
@@
EditorSnapshots::selection_changed ()
TreeModel::iterator i = _display.get_selection()->get_selected();
TreeModel::iterator i = _display.get_selection()->get_selected();
-
Glib::u
string snap_name = (*i)[_columns.real_name];
+
std::
string snap_name = (*i)[_columns.real_name];
if (snap_name.length() == 0) {
return;
if (snap_name.length() == 0) {
return;
@@
-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.
/** 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
*/
void
-EditorSnapshots::popup_context_menu (int button, int32_t time,
Glib::u
string snapshot_name)
+EditorSnapshots::popup_context_menu (int button, int32_t time,
std::
string snapshot_name)
{
using namespace Menu_Helpers;
{
using namespace Menu_Helpers;
@@
-122,19
+133,20
@@
EditorSnapshots::popup_context_menu (int button, int32_t time, Glib::ustring sna
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 (_("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);
}
void
_menu.popup (button, time);
}
void
-EditorSnapshots::rename (
Glib::u
string old_name)
+EditorSnapshots::rename (
std::
string old_name)
{
ArdourPrompter prompter(true);
string new_name;
prompter.set_name ("Prompter");
{
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);
prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
prompter.set_prompt (_("New name of snapshot"));
prompter.set_initial_text (old_name);
@@
-150,16
+162,16
@@
EditorSnapshots::rename (Glib::ustring old_name)
void
void
-EditorSnapshots::remove (
Glib::u
string name)
+EditorSnapshots::remove (
std::
string name)
{
vector<string> choices;
{
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."));
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);
if (prompter.run () == 1) {
_session->remove_state (name);
@@
-174,7
+186,7
@@
EditorSnapshots::redisplay ()
return;
}
return;
}
- vector<s
ys::path
> state_file_paths;
+ vector<s
td::string
> state_file_paths;
get_state_files_in_directory (_session->session_directory().root_path(),
state_file_paths);
get_state_files_in_directory (_session->session_directory().root_path(),
state_file_paths);
@@
-203,8
+215,15
@@
EditorSnapshots::redisplay ()
_display.get_selection()->select(row);
}
_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.visible_name] = display_name;
row[_columns.real_name] = statename;
+ row[_columns.time_formatted] = gdt.format ("%F %H:%M");
}
}
}
}