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

add separator line to meterbridge

Browse source
This commit is contained in:
Robin Gareus 2013-07-24 15:47:53 +02:00
parent d8372bdf9b
commit 6f72c85344
4 changed files with 62 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gtk2_ardour/ardour3_styles.rc.in
View file

@ -1006,3 +1006,8 @@ style "meter_strip_vu" = "default"
bg[NORMAL] = { 1.0, 1.0, 0.85 } bg[NORMAL] = { 1.0, 1.0, 0.85 }
fg[NORMAL] = { 0.0, 0.0, 0.0 } fg[NORMAL] = { 0.0, 0.0, 0.0 }
} }
style "meter_strip_sep" = "default"
{
bg[NORMAL] = { 0.0, 0.0, 0.0 }
}

1
gtk2_ardour/ardour3_widget_list.rc
View file

@ -293,6 +293,7 @@ widget "*PluginEditorButton" style:highest "default_toggle_button"
widget "*meterstripPPM" style:highest "meter_strip_ppm" widget "*meterstripPPM" style:highest "meter_strip_ppm"
widget "*meterstripDPM" style:highest "meter_strip_dpm" widget "*meterstripDPM" style:highest "meter_strip_dpm"
widget "*meterstripVU" style:highest "meter_strip_vu" widget "*meterstripVU" style:highest "meter_strip_vu"
widget "*BlackSeparator" style:highest "meter_strip_sep"
widget "*MetricDialogFrame" style:highest "base_frame" widget "*MetricDialogFrame" style:highest "base_frame"
widget "*MetricEntry" style:highest "medium_bold_entry" widget "*MetricEntry" style:highest "medium_bold_entry"

69
gtk2_ardour/meter_strip.cc
View file

@ -64,9 +64,11 @@ MeterStrip::MeterStrip (int metricmode, MeterType mt)
{ {
level_meter = 0; level_meter = 0;
_strip_type = 0; _strip_type = 0;
strip.set_spacing(2); mtr_vbox.set_spacing(2);
nfo_vbox.set_spacing(2);
peakbx.set_size_request(-1, 14); peakbx.set_size_request(-1, 14);
namebx.set_size_request(18, 52); namebx.set_size_request(18, 52);
spacer.set_size_request(-1,0);
set_metric_mode(metricmode, mt); set_metric_mode(metricmode, mt);
@ -77,17 +79,30 @@ MeterStrip::MeterStrip (int metricmode, MeterType mt)
meterbox.pack_start(meter_metric_area, true, false); meterbox.pack_start(meter_metric_area, true, false);
strip.pack_start (peakbx, false, false); mtr_vbox.pack_start (peakbx, false, false);
strip.pack_start (meterbox, true, true); mtr_vbox.pack_start (meterbox, true, true);
strip.pack_start (btnbox, false, false); mtr_vbox.pack_start (spacer, false, false);
strip.pack_start (namebx, false, false); mtr_container.add(mtr_vbox);
add(strip);
mtr_hsep.set_size_request(-1,1);
mtr_hsep.set_name("BlackSeparator");
nfo_vbox.pack_start (mtr_hsep, false, false);
nfo_vbox.pack_start (btnbox, false, false);
nfo_vbox.pack_start (namebx, false, false);
pack_start (mtr_container, true, true);
pack_start (nfo_vbox, false, false);
peakbx.show(); peakbx.show();
btnbox.show(); btnbox.show();
meter_metric_area.show(); meter_metric_area.show();
meterbox.show(); meterbox.show();
strip.show(); spacer.show();
mtr_vbox.show();
mtr_container.show();
mtr_hsep.show();
nfo_vbox.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));
@ -100,7 +115,8 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
, _route(rt) , _route(rt)
, peak_display() , peak_display()
{ {
strip.set_spacing(2); mtr_vbox.set_spacing(2);
nfo_vbox.set_spacing(2);
RouteUI::set_route (rt); RouteUI::set_route (rt);
SessionHandlePtr::set_session (sess); SessionHandlePtr::set_session (sess);
@ -173,27 +189,42 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
mutebox.set_size_request(16, 16); mutebox.set_size_request(16, 16);
solobox.set_size_request(16, 16); solobox.set_size_request(16, 16);
recbox.set_size_request(16, 16); recbox.set_size_request(16, 16);
spacer.set_size_request(-1,0);
update_button_box(); update_button_box();
update_name_box(); update_name_box();
update_background (_route->meter_type()); update_background (_route->meter_type());
strip.pack_start (peakbx, false, false); mtr_vbox.pack_start (peakbx, false, false);
strip.pack_start (meterbox, true, true); mtr_vbox.pack_start (meterbox, true, true);
strip.pack_start (btnbox, false, false); mtr_vbox.pack_start (spacer, false, false);
strip.pack_start (namebx, false, false); mtr_container.add(mtr_vbox);
mtr_hsep.set_size_request(-1,1);
mtr_hsep.set_name("BlackSeparator");
nfo_vbox.pack_start (mtr_hsep, false, false);
nfo_vbox.pack_start (btnbox, false, false);
nfo_vbox.pack_start (namebx, false, false);
pack_start (mtr_container, true, true);
pack_start (nfo_vbox, false, false);
name_label.show(); name_label.show();
peak_display.show(); peak_display.show();
peakbx.show(); peakbx.show();
meter_ticks1_area.show(); meter_ticks1_area.show();
meter_ticks2_area.show(); meter_ticks2_area.show();
meterbox.show(); meterbox.show();
spacer.show();
level_meter->show(); level_meter->show();
meter_align.show(); meter_align.show();
peak_align.show(); peak_align.show();
btnbox.show(); btnbox.show();
add(strip); mtr_vbox.show();
strip.show(); mtr_container.show();
mtr_hsep.show();
nfo_vbox.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()
@ -380,7 +411,7 @@ MeterStrip::meter_configuration_changed (ChanCount c)
void void
MeterStrip::on_size_request (Gtk::Requisition* r) MeterStrip::on_size_request (Gtk::Requisition* r)
{ {
EventBox::on_size_request(r); VBox::on_size_request(r);
} }
void void
@ -395,7 +426,7 @@ MeterStrip::on_size_allocate (Gtk::Allocation& a)
name_label.set_size_request(18, nh-2); name_label.set_size_request(18, nh-2);
name_label.layout()->set_width((nh-4) * PANGO_SCALE); name_label.layout()->set_width((nh-4) * PANGO_SCALE);
} }
EventBox::on_size_allocate(a); VBox::on_size_allocate(a);
} }
gint gint
@ -446,13 +477,13 @@ MeterStrip::update_background(MeterType type)
case MeterIEC2EBU: case MeterIEC2EBU:
case MeterK14: case MeterK14:
case MeterK20: case MeterK20:
set_name ("meterstripPPM"); mtr_container.set_name ("meterstripPPM");
break; break;
case MeterVU: case MeterVU:
set_name ("meterstripVU"); mtr_container.set_name ("meterstripVU");
break; break;
default: default:
set_name ("meterstripDPM"); mtr_container.set_name ("meterstripDPM");
} }
} }

8
gtk2_ardour/meter_strip.h
View file

@ -43,7 +43,7 @@ namespace Gtk {
class Style; class Style;
} }
class MeterStrip : public Gtk::EventBox, public RouteUI class MeterStrip : public Gtk::VBox, public RouteUI
{ {
public: public:
MeterStrip (ARDOUR::Session*, boost::shared_ptr<ARDOUR::Route>); MeterStrip (ARDOUR::Session*, boost::shared_ptr<ARDOUR::Route>);
@ -90,8 +90,12 @@ class MeterStrip : public Gtk::EventBox, public RouteUI
void set_button_names (); void set_button_names ();
private: private:
Gtk::VBox strip; Gtk::VBox mtr_vbox;
Gtk::VBox nfo_vbox;
Gtk::EventBox mtr_container;
Gtk::HSeparator mtr_hsep;
Gtk::HBox meterbox; Gtk::HBox meterbox;
Gtk::HBox spacer;
Gtk::HBox namebx; Gtk::HBox namebx;
ArdourButton name_label; ArdourButton name_label;
Gtk::DrawingArea meter_metric_area; Gtk::DrawingArea meter_metric_area;