smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-06 21:55:43 +01:00
Code Issues Projects Releases Wiki Activity

use FloatingTextEntry class to do "in-place" editing for marker rename

Browse source
This commit is contained in:
Paul Davis 2014-10-31 09:59:42 -04:00
parent 3226f13206
commit d0f648fce4
2 changed files with 15 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gtk2_ardour/editor.h
View file

@ -1534,6 +1534,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
void marker_menu_remove ();
void marker_menu_rename ();
void rename_marker (Marker *marker);
void finish_rename_marker (std::string, Marker *marker);
void toggle_marker_menu_lock ();
void toggle_marker_menu_glue ();
void marker_menu_hide ();

36
gtk2_ardour/editor_markers.cc
View file

@ -44,6 +44,7 @@
#include "actions.h"
#include "prompter.h"
#include "editor_drag.h"
#include "floating_text_entry.h"
#include "i18n.h"
@ -1096,41 +1097,32 @@ Editor::rename_marker(Marker *marker)
if (!loc)
return;
if (loc == transport_loop_location() || loc == transport_punch_location() || loc->is_session_range())
if (loc == transport_loop_location() || loc == transport_punch_location() || loc->is_session_range()) {
return;
}
ArdourPrompter dialog (true);
string txt;
FloatingTextEntry* flt = new FloatingTextEntry;
dialog.set_prompt (_("New Name:"));
flt->use_text.connect (sigc::bind (sigc::mem_fun (*this, &Editor::finish_rename_marker), marker));
flt->present ();
}
if (loc->is_mark()) {
dialog.set_title (_("Rename Mark"));
} else {
dialog.set_title (_("Rename Range"));
}
void
Editor::finish_rename_marker (std::string txt, Marker* marker)
{
dialog.set_name ("MarkRenameWindow");
dialog.set_size_request (250, -1);
dialog.set_position (Gtk::WIN_POS_MOUSE);
Location* loc;
bool ignored;
dialog.add_button (_("Rename"), RESPONSE_ACCEPT);
dialog.set_response_sensitive (Gtk::RESPONSE_ACCEPT, false);
dialog.set_initial_text (loc->name());
loc = find_location_from_marker (marker, ignored);
dialog.show ();
switch (dialog.run ()) {
case RESPONSE_ACCEPT:
break;
default:
if (!loc) {
return;
}
begin_reversible_command ( _("rename marker") );
XMLNode &before = _session->locations()->get_state();
dialog.get_result(txt);
loc->set_name (txt);
_session->set_dirty ();