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

Rename 'Cut time' to 'Remove time'

Browse source 
'Cut time' implies that the cut timeline items might end up on the
clipboard to be pasted somewhere: this isn't the case at present, so rename
the functions, class, &c. to say 'remove' rather than 'cut'.

Rename insert_time_dialog.{cc|h} to insert_remove_time_dialog while we're
at it.
This commit is contained in:
Colin Fletcher 2015-06-16 11:23:50 +01:00
parent 721608aef3
commit b56bb944f6
7 changed files with 30 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/ardour.menus.in
View file

@ -375,7 +375,7 @@
<menuitem action='track-mute-toggle'/> <menuitem action='track-mute-toggle'/>
<separator/> <separator/>
<menuitem action='insert-time'/> <menuitem action='insert-time'/>
<menuitem action='cut-time'/> <menuitem action='remove-time'/>
<menuitem action="move-selected-tracks-up"/> <menuitem action="move-selected-tracks-up"/>
<menuitem action="move-selected-tracks-down"/> <menuitem action="move-selected-tracks-down"/>
<menu action='TrackHeightMenu'> <menu action='TrackHeightMenu'>

4
gtk2_ardour/editor.h
View file

@ -1262,8 +1262,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
void do_insert_time (); void do_insert_time ();
void insert_time (framepos_t, framecnt_t, Editing::InsertTimeOption, bool, bool, bool, bool, bool, bool); void insert_time (framepos_t, framecnt_t, Editing::InsertTimeOption, bool, bool, bool, bool, bool, bool);
void do_cut_time (); void do_remove_time ();
void cut_time (framepos_t pos, framecnt_t distance, Editing::InsertTimeOption opt, bool ignore_music_glue, bool markers_too, void remove_time (framepos_t pos, framecnt_t distance, Editing::InsertTimeOption opt, bool ignore_music_glue, bool markers_too,
bool glued_markers_too, bool locked_markers_too, bool tempo_too); bool glued_markers_too, bool locked_markers_too, bool tempo_too);
void tab_to_transient (bool forward); void tab_to_transient (bool forward);

2
gtk2_ardour/editor_actions.cc
View file

@ -405,7 +405,7 @@ Editor::register_actions ()
act = reg_sens (editor_actions, "insert-time", _("Insert Time"), (sigc::mem_fun(*this, &Editor::do_insert_time))); act = reg_sens (editor_actions, "insert-time", _("Insert Time"), (sigc::mem_fun(*this, &Editor::do_insert_time)));
ActionManager::track_selection_sensitive_actions.push_back (act); ActionManager::track_selection_sensitive_actions.push_back (act);
act = ActionManager::register_action (editor_actions, "cut-time", _("Cut Time"), (mem_fun(*this, &Editor::do_cut_time))); act = ActionManager::register_action (editor_actions, "remove-time", _("Remove Time"), (mem_fun(*this, &Editor::do_remove_time)));
ActionManager::session_sensitive_actions.push_back (act); ActionManager::session_sensitive_actions.push_back (act);
ActionManager::track_selection_sensitive_actions.push_back (act); ActionManager::track_selection_sensitive_actions.push_back (act);

13
gtk2_ardour/editor_ops.cc
View file

@ -76,7 +76,7 @@
#include "editor_regions.h" #include "editor_regions.h"
#include "editor_routes.h" #include "editor_routes.h"
#include "gui_thread.h" #include "gui_thread.h"
#include "insert_time_dialog.h" #include "insert_remove_time_dialog.h"
#include "interthread_progress_window.h" #include "interthread_progress_window.h"
#include "item_counts.h" #include "item_counts.h"
#include "keyboard.h" #include "keyboard.h"
@ -6926,7 +6926,7 @@ Editor::do_insert_time ()
return; return;
} }
InsertTimeDialog d (*this); InsertRemoveTimeDialog d (*this);
int response = d.run (); int response = d.run ();
if (response != RESPONSE_OK) { if (response != RESPONSE_OK) {
@ -7065,15 +7065,16 @@ Editor::insert_time (
commit_reversible_command (); commit_reversible_command ();
} }
} }
void void
Editor::do_cut_time () Editor::do_remove_time ()
{ {
if (selection->tracks.empty()) { if (selection->tracks.empty()) {
return; return;
} }
framepos_t pos = get_preferred_edit_position (EDIT_IGNORE_MOUSE); framepos_t pos = get_preferred_edit_position (EDIT_IGNORE_MOUSE);
InsertTimeDialog d (*this, true); InsertRemoveTimeDialog d (*this, true);
int response = d.run (); int response = d.run ();
@ -7087,7 +7088,7 @@ Editor::do_cut_time ()
return; return;
} }
cut_time ( remove_time (
pos, pos,
distance, distance,
SplitIntersected, SplitIntersected,
@ -7100,7 +7101,7 @@ Editor::do_cut_time ()
} }
void void
Editor::cut_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt, Editor::remove_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt,
bool ignore_music_glue, bool markers_too, bool glued_markers_too, bool locked_markers_too, bool tempo_too) bool ignore_music_glue, bool markers_too, bool glued_markers_too, bool locked_markers_too, bool tempo_too)
{ {
bool commit = false; bool commit = false;

32
gtk2_ardour/insert_time_dialog.cc → gtk2_ardour/insert_remove_time_dialog.cc
View file

@ -21,15 +21,15 @@
#include <gtkmm/comboboxtext.h> #include <gtkmm/comboboxtext.h>
#include <gtkmm/stock.h> #include <gtkmm/stock.h>
#include <gtkmm/alignment.h> #include <gtkmm/alignment.h>
#include "insert_time_dialog.h" #include "insert_remove_time_dialog.h"
#include "audio_clock.h" #include "audio_clock.h"
#include "i18n.h" #include "i18n.h"
using namespace Gtk; using namespace Gtk;
using namespace Editing; using namespace Editing;
InsertTimeDialog::InsertTimeDialog (PublicEditor& e, bool cut) InsertRemoveTimeDialog::InsertRemoveTimeDialog (PublicEditor& e, bool remove)
: ArdourDialog (cut ? _("Cut time") : _("Insert Time")) : ArdourDialog (remove ? _("Remove Time") : _("Insert Time"))
, _editor (e) , _editor (e)
, _clock ("insertTimeClock", true, "", true, false, true, false) , _clock ("insertTimeClock", true, "", true, false, true, false)
{ {
@ -43,7 +43,7 @@ InsertTimeDialog::InsertTimeDialog (PublicEditor& e, bool cut)
Table* table = manage (new Table (2, 2)); Table* table = manage (new Table (2, 2));
table->set_spacings (4); table->set_spacings (4);
Label* time_label = manage (new Label (cut ? _("Time to cut") : _("Time to insert:"))); Label* time_label = manage (new Label (remove ? _("Time to remove") : _("Time to insert:")));
time_label->set_alignment (1, 0.5); time_label->set_alignment (1, 0.5);
table->attach (*time_label, 0, 1, 0, 1, FILL | EXPAND); table->attach (*time_label, 0, 1, 0, 1, FILL | EXPAND);
_clock.set (0); _clock.set (0);
@ -51,7 +51,7 @@ InsertTimeDialog::InsertTimeDialog (PublicEditor& e, bool cut)
_clock.set_bbt_reference (pos); _clock.set_bbt_reference (pos);
table->attach (_clock, 1, 2, 0, 1); table->attach (_clock, 1, 2, 0, 1);
if (!cut) { if (!remove) {
Label* intersected_label = manage (new Label (_("Intersected regions should:"))); Label* intersected_label = manage (new Label (_("Intersected regions should:")));
intersected_label->set_alignment (1, 0.5); intersected_label->set_alignment (1, 0.5);
table->attach (*intersected_label, 0, 1, 1, 2, FILL | EXPAND); table->attach (*intersected_label, 0, 1, 1, 2, FILL | EXPAND);
@ -71,7 +71,7 @@ InsertTimeDialog::InsertTimeDialog (PublicEditor& e, bool cut)
get_vbox()->pack_start (_move_glued); get_vbox()->pack_start (_move_glued);
_move_markers.set_label (_("Move markers")); _move_markers.set_label (_("Move markers"));
get_vbox()->pack_start (_move_markers); get_vbox()->pack_start (_move_markers);
_move_markers.signal_toggled().connect (sigc::mem_fun (*this, &InsertTimeDialog::move_markers_toggled)); _move_markers.signal_toggled().connect (sigc::mem_fun (*this, &InsertRemoveTimeDialog::move_markers_toggled));
_move_glued_markers.set_label (_("Move glued markers")); _move_glued_markers.set_label (_("Move glued markers"));
Alignment* indent = manage (new Alignment); Alignment* indent = manage (new Alignment);
indent->set_padding (0, 0, 12, 0); indent->set_padding (0, 0, 12, 0);
@ -90,14 +90,14 @@ InsertTimeDialog::InsertTimeDialog (PublicEditor& e, bool cut)
get_vbox()->pack_start (*tempo_box); get_vbox()->pack_start (*tempo_box);
add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
add_button (cut ? _("Cut time") : _("Insert time"), Gtk::RESPONSE_OK); add_button (remove ? _("Cut time") : _("Insert time"), Gtk::RESPONSE_OK);
show_all (); show_all ();
move_markers_toggled (); move_markers_toggled ();
} }
InsertTimeOption InsertTimeOption
InsertTimeDialog::intersected_region_action () InsertRemoveTimeDialog::intersected_region_action ()
{ {
/* only setting this to keep GCC quiet */ /* only setting this to keep GCC quiet */
InsertTimeOption opt = LeaveIntersected; InsertTimeOption opt = LeaveIntersected;
@ -118,49 +118,49 @@ InsertTimeDialog::intersected_region_action ()
} }
bool bool
InsertTimeDialog::all_playlists () const InsertRemoveTimeDialog::all_playlists () const
{ {
return _all_playlists.get_active (); return _all_playlists.get_active ();
} }
bool bool
InsertTimeDialog::move_glued () const InsertRemoveTimeDialog::move_glued () const
{ {
return _move_glued.get_active (); return _move_glued.get_active ();
} }
bool bool
InsertTimeDialog::move_tempos () const InsertRemoveTimeDialog::move_tempos () const
{ {
return _move_tempos.get_active (); return _move_tempos.get_active ();
} }
bool bool
InsertTimeDialog::move_markers () const InsertRemoveTimeDialog::move_markers () const
{ {
return _move_markers.get_active (); return _move_markers.get_active ();
} }
bool bool
InsertTimeDialog::move_glued_markers () const InsertRemoveTimeDialog::move_glued_markers () const
{ {
return _move_glued_markers.get_active (); return _move_glued_markers.get_active ();
} }
bool bool
InsertTimeDialog::move_locked_markers () const InsertRemoveTimeDialog::move_locked_markers () const
{ {
return _move_locked_markers.get_active (); return _move_locked_markers.get_active ();
} }
framepos_t framepos_t
InsertTimeDialog::distance () const InsertRemoveTimeDialog::distance () const
{ {
return _clock.current_duration (_editor.get_preferred_edit_position ()); return _clock.current_duration (_editor.get_preferred_edit_position ());
} }
void void
InsertTimeDialog::move_markers_toggled () InsertRemoveTimeDialog::move_markers_toggled ()
{ {
_move_glued_markers.set_sensitive (_move_markers.get_active ()); _move_glued_markers.set_sensitive (_move_markers.get_active ());
_move_locked_markers.set_sensitive (_move_markers.get_active ()); _move_locked_markers.set_sensitive (_move_markers.get_active ());

4
gtk2_ardour/insert_time_dialog.h → gtk2_ardour/insert_remove_time_dialog.h
View file

@ -22,10 +22,10 @@
#include "editing.h" #include "editing.h"
#include "audio_clock.h" #include "audio_clock.h"
class InsertTimeDialog : public ArdourDialog class InsertRemoveTimeDialog : public ArdourDialog
{ {
public: public:
InsertTimeDialog (PublicEditor &, bool cut = false); InsertRemoveTimeDialog (PublicEditor &, bool remove = false);
Editing::InsertTimeOption intersected_region_action (); Editing::InsertTimeOption intersected_region_action ();
bool all_playlists () const; bool all_playlists () const;

2
gtk2_ardour/wscript
View file

@ -106,7 +106,7 @@ gtk2_ardour_sources = [
'group_tabs.cc', 'group_tabs.cc',
'gtk_pianokeyboard.c', 'gtk_pianokeyboard.c',
'gui_object.cc', 'gui_object.cc',
'insert_time_dialog.cc', 'insert_remove_time_dialog.cc',
'instrument_selector.cc', 'instrument_selector.cc',
'interthread_progress_window.cc', 'interthread_progress_window.cc',
'io_selector.cc', 'io_selector.cc',