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

meterbridge track-name -> button

Browse source
This commit is contained in:
Robin Gareus 2013-07-03 19:06:40 +02:00
parent 0276b1f69a
commit 71ee4d276f
4 changed files with 22 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gtk2_ardour/ardour3_styles.rc.in
View file

@ -766,11 +766,6 @@ style "audio_bus_metrics_inactive" = "track_controls_inactive"
font_name = "@FONT_TINY@" font_name = "@FONT_TINY@"
} }
style "meterbridge_label" = "very_small_text"
{
}
style "track_name_display" = "medium_text" style "track_name_display" = "medium_text"
{ {
fg[NORMAL] = @@COLPREFIX@_fg fg[NORMAL] = @@COLPREFIX@_fg

2
gtk2_ardour/ardour3_widget_list.rc
View file

@ -373,5 +373,3 @@ widget "*transport option button" style:highest "small_text"
widget "*transport active option button" style:highest "small_text" widget "*transport active option button" style:highest "small_text"
widget "*plugin bypass button" style:highest "small_text" widget "*plugin bypass button" style:highest "small_text"
widget "*punch button" style:highest "small_text" widget "*punch button" style:highest "small_text"
widget "*MeterbridgeLabel*" style:highest "meterbridge_label"

37
gtk2_ardour/meter_strip.cc
View file

@ -63,6 +63,7 @@ MeterStrip::MeterStrip (int metricmode)
set_spacing(2); set_spacing(2);
peakbx.set_size_request(-1, 14); peakbx.set_size_request(-1, 14);
btnbox.set_size_request(-1, 16); btnbox.set_size_request(-1, 16);
namebx.set_size_request(14, 52);
_types.clear (); _types.clear ();
switch(metricmode) { switch(metricmode) {
@ -92,22 +93,16 @@ MeterStrip::MeterStrip (int metricmode)
meterbox.pack_start(meter_metric_area, true, false); meterbox.pack_start(meter_metric_area, true, false);
label.set_text("");
label.set_name("MeterbridgeLabel");
label.set_angle(90.0);
label.set_alignment(0.5, 1.0);
label.set_size_request(12, 52);
pack_start (peakbx, false, false); pack_start (peakbx, false, false);
pack_start (meterbox, true, true); pack_start (meterbox, true, true);
pack_start (btnbox, false, false); pack_start (btnbox, false, false);
pack_start (label, false, false, 2); pack_start (namebx, false, false);
peakbx.show(); peakbx.show();
btnbox.show(); btnbox.show();
label.show();
meter_metric_area.show(); meter_metric_area.show();
meterbox.show(); meterbox.show();
namebx.show();
UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &MeterStrip::on_theme_changed)); UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &MeterStrip::on_theme_changed));
ColorsChanged.connect (sigc::mem_fun (*this, &MeterStrip::on_theme_changed)); ColorsChanged.connect (sigc::mem_fun (*this, &MeterStrip::on_theme_changed));
@ -148,6 +143,7 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
max_peak = minus_infinity(); max_peak = minus_infinity();
peak_display.unset_flags (Gtk::CAN_FOCUS); peak_display.unset_flags (Gtk::CAN_FOCUS);
peak_display.set_size_request(12, 8); peak_display.set_size_request(12, 8);
peak_display.set_corner_radius(2);
Gtk::Alignment *peak_align = Gtk::manage (new Gtk::Alignment()); Gtk::Alignment *peak_align = Gtk::manage (new Gtk::Alignment());
peak_align->set(0.5, 1.0, 1.0, 0.8); peak_align->set(0.5, 1.0, 1.0, 0.8);
@ -155,21 +151,27 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
peakbx.pack_start(*peak_align, true, true, 3); peakbx.pack_start(*peak_align, true, true, 3);
peakbx.set_size_request(-1, 14); peakbx.set_size_request(-1, 14);
// add track-name label -- TODO ellipsize // add track-name label
label.set_text(_route->name().c_str()); name_label.set_text(_route->name().c_str());
label.set_name("MeterbridgeLabel"); name_label.set_corner_radius(2);
label.set_angle(90.0); name_label.set_name("solo isolate"); // XXX re-use 'very_small_text'
label.set_alignment(0.5, 1.0); name_label.set_angle(-90.0);
label.set_size_request(12, 52); name_label.layout()->set_ellipsize (Pango::ELLIPSIZE_END);
name_label.layout()->set_width(48 * PANGO_SCALE);
name_label.set_size_request(14, 50);
namebx.set_size_request(14, 52);
namebx.pack_start(name_label, true, false, 3);
// rec-enable button // rec-enable button
btnbox.pack_start(*rec_enable_button, true, false); btnbox.pack_start(*rec_enable_button, true, false);
rec_enable_button->set_corner_radius(2);
btnbox.set_size_request(-1, 16); btnbox.set_size_request(-1, 16);
pack_start (peakbx, false, false); pack_start (peakbx, false, false);
pack_start (meterbox, true, true); pack_start (meterbox, true, true);
pack_start (btnbox, false, false); pack_start (btnbox, false, false);
pack_start (label, false, false, 2); pack_start (namebx, false, false);
peak_display.show(); peak_display.show();
peakbx.show(); peakbx.show();
@ -180,7 +182,8 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
meter_align->show(); meter_align->show();
peak_align->show(); peak_align->show();
btnbox.show(); btnbox.show();
label.show(); name_label.show();
namebx.show();
_route->shared_peak_meter()->ConfigurationChanged.connect ( _route->shared_peak_meter()->ConfigurationChanged.connect (
route_connections, invalidator (*this), boost::bind (&MeterStrip::meter_configuration_changed, this, _1), gui_context() route_connections, invalidator (*this), boost::bind (&MeterStrip::meter_configuration_changed, this, _1), gui_context()
@ -239,7 +242,7 @@ MeterStrip::strip_property_changed (const PropertyChange& what_changed)
return; return;
} }
ENSURE_GUI_THREAD (*this, &MeterStrip::strip_name_changed, what_changed) ENSURE_GUI_THREAD (*this, &MeterStrip::strip_name_changed, what_changed)
label.set_text(_route->name()); name_label.set_text(_route->name());
} }
void void

3
gtk2_ardour/meter_strip.h
View file

@ -87,7 +87,8 @@ class MeterStrip : public Gtk::VBox, public RouteUI
private: private:
Gtk::HBox meterbox; Gtk::HBox meterbox;
Gtk::Label label; Gtk::HBox namebx;
ArdourButton name_label;
Gtk::DrawingArea meter_metric_area; Gtk::DrawingArea meter_metric_area;
Gtk::DrawingArea meter_ticks1_area; Gtk::DrawingArea meter_ticks1_area;
Gtk::DrawingArea meter_ticks2_area; Gtk::DrawingArea meter_ticks2_area;