summaryrefslogtreecommitdiff
path: root/gtk2_ardour/route_time_axis.cc
diff options
context:
space:
mode:
authorBen Loftis <ben@glw.com>2012-12-07 22:38:49 +0000
committerBen Loftis <ben@glw.com>2012-12-07 22:38:49 +0000
commit5249f826035c35ae3ea75cbbd2457a0d8a510a79 (patch)
tree979a94b3123d2cfb0bef3e7f704dc29ec56f3e2a /gtk2_ardour/route_time_axis.cc
parent526a1a71fe8bf0b448a51c1cae47d7c516764882 (diff)
more theming and layout tweaks. new faders that pre-light. fixed some spacing around mixer buttons. tweaked some colors (returned mutes to yellow). removed group button at bottom of mixer strip and replaced it with fader automation mode.
git-svn-id: svn://localhost/ardour2/branches/3.0@13617 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/route_time_axis.cc')
-rw-r--r--gtk2_ardour/route_time_axis.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 3ba36ea6aa..0fbbd83470 100644
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -117,7 +117,7 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, Canvas& c
, playlist_action_menu (0)
, mode_menu (0)
, color_mode_menu (0)
- , gm (sess, slider, slider_desensitised, true, 115)
+ , gm (sess, slider, slider_desensitised, true, 125)
, _ignore_set_layer_display (false)
{
}
@@ -205,11 +205,11 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
}
controls_table.attach (route_group_button, 7, 8, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
- Gtk::VBox* pad = manage (new Gtk::VBox);
- pad->pack_start (gm.get_gain_slider(), false, false);
- pad->pack_start (*manage (new Gtk::Label), true, true);
- pad->show_all ();
- controls_table.attach (*pad, 0, 5, 1, 2, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+// Gtk::VBox* pad = manage (new Gtk::VBox);
+// pad->pack_start (gm.get_gain_slider(), false, false);
+// pad->pack_start (*manage (new Gtk::Label), true, true);
+// pad->show_all ();
+ controls_table.attach (gm.get_gain_slider(), 0, 5, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 3, 0);
ARDOUR_UI::instance()->set_tip(*solo_button,_("Solo"));
ARDOUR_UI::instance()->set_tip(*mute_button,_("Mute"));
@@ -261,7 +261,7 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
route_group_menu = new RouteGroupMenu (_session, plist);
gm.get_gain_slider().signal_scroll_event().connect(sigc::mem_fun(*this, &RouteTimeAxisView::controls_ebox_scroll), false);
- gm.get_gain_slider().set_name ("TrackGainFader");
+ gm.get_gain_slider().set_name ("GainFader");
gm.get_level_meter().signal_scroll_event().connect (sigc::mem_fun (*this, &RouteTimeAxisView::controls_ebox_scroll), false);