ardour/livetrax
13
0
Fork 0
Code

remove all_group_active_button. if you want to operate on all tracks, choose select-all-tracks ( ctrl+t in the mnemonic bindings ). this is more explicit and allows safer use of the deselected-region-under-mouse operations

Browse Source
This commit is contained in:
Ben Loftis 2014-07-06 14:20:50 -05:00
parent c028d223df
commit 64404a16c1
3 changed files with 0 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtk2_ardour/editor.cc
View File

@ -4548,13 +4548,6 @@ Editor::get_regions_from_selection_and_edit_point ()
if ( regions.empty() ) { if ( regions.empty() ) {
TrackViewList tracks = selection->tracks; TrackViewList tracks = selection->tracks;
if (_route_groups->all_group_active_button().get_active() && tracks.empty()) {
/* tracks is empty (no track selected), and 'No Selection = All Tracks'
* is enabled, so consider all tracks
*/
tracks = track_views;
}
if (!tracks.empty()) { if (!tracks.empty()) {
/* no region selected or entered, but some selected tracks: /* no region selected or entered, but some selected tracks:
* act on all regions on the selected tracks at the edit point * act on all regions on the selected tracks at the edit point

30
gtk2_ardour/editor_route_groups.cc
View File

@ -64,7 +64,6 @@ struct ColumnInfo {
EditorRouteGroups::EditorRouteGroups (Editor* e) EditorRouteGroups::EditorRouteGroups (Editor* e)
: EditorComponent (e) : EditorComponent (e)
, _all_group_active_button (_("No Selection = All Tracks?"))
, _in_row_change (false) , _in_row_change (false)
, _in_rebuild (false) , _in_rebuild (false)
{ {
@ -188,15 +187,8 @@ EditorRouteGroups::EditorRouteGroups (Editor* e)
button_box->pack_start (*add_button); button_box->pack_start (*add_button);
button_box->pack_start (*remove_button); button_box->pack_start (*remove_button);
_all_group_active_button.show ();
_display_packer.pack_start (_scroller, true, true); _display_packer.pack_start (_scroller, true, true);
_display_packer.pack_start (_all_group_active_button, false, false);
_display_packer.pack_start (*button_box, false, false); _display_packer.pack_start (*button_box, false, false);
_all_group_active_button.signal_toggled().connect (sigc::mem_fun (*this, &EditorRouteGroups::all_group_toggled));
_all_group_active_button.set_name (X_("EditorRouteGroupsAllGroupButton"));
ARDOUR_UI::instance()->set_tip (_all_group_active_button, _("Activate this button to operate on all tracks when none are selected."));
} }
void void
@ -561,8 +553,6 @@ EditorRouteGroups::set_session (Session* s)
RouteGroup& arg (_session->all_route_group()); RouteGroup& arg (_session->all_route_group());
arg.PropertyChanged.connect (all_route_groups_changed_connection, MISSING_INVALIDATOR, boost::bind (&EditorRouteGroups::all_group_changed, this, _1), gui_context());
_session->route_group_added.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&EditorRouteGroups::add, this, _1), gui_context()); _session->route_group_added.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&EditorRouteGroups::add, this, _1), gui_context());
_session->route_group_removed.connect ( _session->route_group_removed.connect (
_session_connections, MISSING_INVALIDATOR, boost::bind (&EditorRouteGroups::groups_changed, this), gui_context() _session_connections, MISSING_INVALIDATOR, boost::bind (&EditorRouteGroups::groups_changed, this), gui_context()
@ -575,7 +565,6 @@ EditorRouteGroups::set_session (Session* s)
PBD::PropertyChange pc; PBD::PropertyChange pc;
pc.add (Properties::select); pc.add (Properties::select);
pc.add (Properties::active); pc.add (Properties::active);
all_group_changed (pc);
groups_changed (); groups_changed ();
} }
@ -588,25 +577,6 @@ EditorRouteGroups::run_new_group_dialog ()
return _editor->_group_tabs->run_new_group_dialog (rl); return _editor->_group_tabs->run_new_group_dialog (rl);
} }
void
EditorRouteGroups::all_group_toggled ()
{
if (_session) {
_session->all_route_group().set_select (_all_group_active_button.get_active());
}
}
void
EditorRouteGroups::all_group_changed (const PropertyChange&)
{
if (_session) {
RouteGroup& arg (_session->all_route_group());
_all_group_active_button.set_active (arg.is_active() && arg.is_select());
} else {
_all_group_active_button.set_active (false);
}
}
/** Called when a model row is deleted, but also when the model is /** Called when a model row is deleted, but also when the model is
* reordered by a user drag-and-drop; the latter is what we are * reordered by a user drag-and-drop; the latter is what we are
* interested in here. * interested in here.

4
gtk2_ardour/editor_route_groups.h
View File

@ -32,7 +32,6 @@ public:
} }
void clear (); void clear ();
Gtkmm2ext::StatefulToggleButton& all_group_active_button() { return _all_group_active_button; }
private: private:
@ -80,8 +79,6 @@ private:
void property_changed (ARDOUR::RouteGroup*, const PBD::PropertyChange &); void property_changed (ARDOUR::RouteGroup*, const PBD::PropertyChange &);
void remove_selected (); void remove_selected ();
void run_new_group_dialog (); void run_new_group_dialog ();
void all_group_toggled();
void all_group_changed (const PBD::PropertyChange&);
void row_deleted (Gtk::TreeModel::Path const &); void row_deleted (Gtk::TreeModel::Path const &);
Glib::RefPtr<Gtk::ListStore> _model; Glib::RefPtr<Gtk::ListStore> _model;
@ -89,7 +86,6 @@ private:
Gtk::TreeView _display; Gtk::TreeView _display;
Gtk::ScrolledWindow _scroller; Gtk::ScrolledWindow _scroller;
Gtk::VBox _display_packer; Gtk::VBox _display_packer;
Gtkmm2ext::StatefulToggleButton _all_group_active_button;
bool _in_row_change; bool _in_row_change;
bool _in_rebuild; bool _in_rebuild;
PBD::ScopedConnectionList _property_changed_connections; PBD::ScopedConnectionList _property_changed_connections;