summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2011-03-01 23:25:55 +0000
committerCarl Hetherington <carl@carlh.net>2011-03-01 23:25:55 +0000
commit115a1504702d39130fa263197a16382ec64f979f (patch)
tree96904bcc205145aa1fb6169aeedd9bdd4ea71afe /gtk2_ardour
parent468f35ba295f81ba59b5bbb8b7dbc33d5ebe8a75 (diff)
Make track shrink / expand bindable actions (#3695).
git-svn-id: svn://localhost/ardour2/branches/3.0@9017 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/ardour.menus.in2
-rw-r--r--gtk2_ardour/editor.cc14
-rw-r--r--gtk2_ardour/editor_actions.cc5
3 files changed, 15 insertions, 6 deletions
diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index c0ea09b76a..c6dbc01047 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -352,6 +352,8 @@
<menuitem action='zoom-to-region'/>
<menuitem action='zoom-to-region-both-axes'/>
<menuitem action='toggle-zoom'/>
+ <menuitem action='expand-tracks'/>
+ <menuitem action='shrink-tracks'/>
</menu>
<menu name='ZoomFocus' action='ZoomFocus'>
<menuitem action='zoom-focus-left'/>
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 478ef8f972..179ea80175 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -2807,14 +2807,16 @@ Editor::setup_toolbar ()
/* Track zoom buttons */
tav_expand_button.set_name ("TrackHeightButton");
- tav_expand_button.set_size_request(-1,20);
- tav_expand_button.add (*(manage (new Image (::get_icon("tav_exp")))));
- tav_expand_button.signal_clicked().connect (sigc::bind (sigc::mem_fun(*this, &Editor::tav_zoom_step), false));
+ tav_expand_button.set_size_request (-1, 20);
+ tav_expand_button.add (*(manage (new Image (::get_icon ("tav_exp")))));
+ RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("expand-tracks"));
+ act->connect_proxy (tav_expand_button);
tav_shrink_button.set_name ("TrackHeightButton");
- tav_shrink_button.set_size_request(-1,20);
- tav_shrink_button.add (*(manage (new Image (::get_icon("tav_shrink")))));
- tav_shrink_button.signal_clicked().connect (sigc::bind (sigc::mem_fun(*this, &Editor::tav_zoom_step), true));
+ tav_shrink_button.set_size_request (-1, 20);
+ tav_shrink_button.add (*(manage (new Image (::get_icon ("tav_shrink")))));
+ act = ActionManager::get_action (X_("Editor"), X_("shrink-tracks"));
+ act->connect_proxy (tav_shrink_button);
_zoom_box.pack_start (tav_shrink_button);
_zoom_box.pack_start (tav_expand_button);
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index c3a62cb63f..13e6bdc608 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -267,6 +267,11 @@ Editor::register_actions ()
act = ActionManager::register_action (editor_actions, "toggle-zoom", _("Toggle Zoom State"), sigc::mem_fun(*this, &Editor::swap_visual_state));
ActionManager::session_sensitive_actions.push_back (act);
+ act = ActionManager::register_action (editor_actions, "expand-tracks", _("Expand Track Height"), sigc::bind (sigc::mem_fun (*this, &Editor::tav_zoom_step), false));
+ ActionManager::session_sensitive_actions.push_back (act);
+ act = ActionManager::register_action (editor_actions, "shrink-tracks", _("Shrink Track Height"), sigc::bind (sigc::mem_fun (*this, &Editor::tav_zoom_step), true));
+ ActionManager::session_sensitive_actions.push_back (act);
+
act = ActionManager::register_action (editor_actions, "move-selected-tracks-up", _("Move Selected Tracks Up"), sigc::bind (sigc::mem_fun(*_routes, &EditorRoutes::move_selected_tracks), true));
ActionManager::session_sensitive_actions.push_back (act);
ActionManager::track_selection_sensitive_actions.push_back (act);