smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-11 00:56:33 +01:00
Code Issues Projects Releases Wiki Activity

Observe preference to prompt for names when adding range markers

Browse source
This commit is contained in:
Alex Pilon 2018-12-27 20:58:24 -05:00 • committed by Robin Gareus
parent 04ccd328dc
commit e7091cb2cd
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/editor.h
View file

@ -714,7 +714,7 @@ private:
void mouse_add_new_range (samplepos_t); void mouse_add_new_range (samplepos_t);
void mouse_add_new_loop (samplepos_t); void mouse_add_new_loop (samplepos_t);
void mouse_add_new_punch (samplepos_t); void mouse_add_new_punch (samplepos_t);
bool choose_new_marker_name(std::string &name); bool choose_new_marker_name(std::string &name, bool is_range=false);
void update_cd_marker_display (); void update_cd_marker_display ();
void ensure_cd_marker_updated (LocationMarkers * lam, ARDOUR::Location * location); void ensure_cd_marker_updated (LocationMarkers * lam, ARDOUR::Location * location);

11
gtk2_ardour/editor_ops.cc
View file

@ -2153,7 +2153,7 @@ Editor::temporal_zoom_to_sample (bool coarser, samplepos_t sample)
bool bool
Editor::choose_new_marker_name(string &name) { Editor::choose_new_marker_name(string &name, bool is_range) {
if (!UIConfiguration::instance().get_name_new_markers()) { if (!UIConfiguration::instance().get_name_new_markers()) {
/* don't prompt user for a new name */ /* don't prompt user for a new name */
@ -2164,7 +2164,11 @@ Editor::choose_new_marker_name(string &name) {
dialog.set_prompt (_("New Name:")); dialog.set_prompt (_("New Name:"));
dialog.set_title (_("New Location Marker")); if (is_range) {
dialog.set_title(_("New Range"));
} else {
dialog.set_title (_("New Location Marker"));
}
dialog.set_name ("MarkNameWindow"); dialog.set_name ("MarkNameWindow");
dialog.set_size_request (250, -1); dialog.set_size_request (250, -1);
@ -2205,6 +2209,9 @@ Editor::add_location_from_selection ()
samplepos_t end = selection->time[clicked_selection].end; samplepos_t end = selection->time[clicked_selection].end;
_session->locations()->next_available_name(rangename,"selection"); _session->locations()->next_available_name(rangename,"selection");
if (!choose_new_marker_name(rangename, true)) {
return;
}
Location *location = new Location (*_session, start, end, rangename, Location::IsRangeMarker, get_grid_music_divisions(0)); Location *location = new Location (*_session, start, end, rangename, Location::IsRangeMarker, get_grid_music_divisions(0));
begin_reversible_command (_("add marker")); begin_reversible_command (_("add marker"));