ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

relayout solo led stuff, as per the boss' requests :)

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7069 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-05-06 01:31:48 +00:00
parent 8c423ea228
commit c52a0d1efc
5 changed files with 91 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk2_ardour/ardour3_ui_dark.rc.in
View File

@ -2,6 +2,11 @@
# This is the GTK style file for Ardour
#
style "smallest_text"
{
font_name = "@FONT_TINY@"
}
style "very_small_text"
{
font_name = "@FONT_SMALLER@"
@ -328,7 +333,7 @@ style "solo_button" = "small_button"
style "solo_isolate_led"
{
fg[ACTIVE] = { 1.0, 0, 0 }
fg[NORMAL] = { 1, 1, 1 }
fg[NORMAL] = { 0, 1.0, 0 }
}
style "solo_safe_led"
@ -1801,3 +1806,4 @@ widget "*PortMatrixLabel*" style:highest "small_text"
widget "*MidiTracerTextView" style:highest "midi_tracer_textview"
widget "*SoloIsolatedLED" style:highest "solo_isolate_led"
widget "*SoloSafeLED" style:highest "solo_safe_led"
widget "*SoloLEDLabel" style:highest "smallest_text"

58
gtk2_ardour/led.cc
View File

@ -30,6 +30,8 @@ using namespace Glib;
LED::LED()
: _visual_state (0)
, _active (false)
, _diameter (0.0)
, _fixed_diameter (false)
, _red (0.0)
, _green (1.0)
, _blue (0.0)
@ -44,49 +46,64 @@ LED::~LED()
void
LED::render (cairo_t* cr)
{
float diameter = std::min (_width, _height);
if (!_fixed_diameter) {
_diameter = std::min (_width, _height);
}
//background
RefPtr<Style> style = get_style();
Color c;
switch (_visual_state) {
case 0:
c = style->get_bg (STATE_NORMAL);
break;
default:
c = style->get_bg (STATE_ACTIVE);
break;
}
cairo_rectangle(cr, 0, 0, _width, _height);
cairo_stroke_preserve(cr);
cairo_set_source_rgb(cr, 0, 0, 0);
cairo_set_source_rgb(cr, c.get_green_p(), c.get_red_p(), c.get_blue_p());
cairo_fill(cr);
cairo_translate(cr, _width/2, _height/2);
#if 0
//inset
cairo_pattern_t *pat = cairo_pattern_create_linear (0.0, 0.0, 0.0, diameter);
cairo_pattern_t *pat = cairo_pattern_create_linear (0.0, 0.0, 0.0, _diameter);
cairo_pattern_add_color_stop_rgba (pat, 0, 0,0,0, 0.4);
cairo_pattern_add_color_stop_rgba (pat, 1, 1,1,1, 0.7);
cairo_arc (cr, 0, 0, diameter/2, 0, 2 * M_PI);
cairo_arc (cr, 0, 0, _diameter/2, 0, 2 * M_PI);
cairo_set_source (cr, pat);
cairo_fill (cr);
cairo_pattern_destroy (pat);
//black ring
cairo_set_source_rgb (cr, 0, 0, 0);
cairo_arc (cr, 0, 0, diameter/2-2, 0, 2 * M_PI);
cairo_arc (cr, 0, 0, _diameter/2-2, 0, 2 * M_PI);
cairo_fill(cr);
//knob color
cairo_set_source_rgba (cr, _red, _green, _blue, _active ? 0.8 : 0.2);
cairo_arc (cr, 0, 0, diameter/2-3, 0, 2 * M_PI);
cairo_arc (cr, 0, 0, _diameter/2-3, 0, 2 * M_PI);
cairo_fill(cr);
//reflection
cairo_scale(cr, 0.7, 0.7);
cairo_pattern_t *pat2 = cairo_pattern_create_linear (0.0, 0.0, 0.0, diameter/2-3);
cairo_pattern_t *pat2 = cairo_pattern_create_linear (0.0, 0.0, 0.0, _diameter/2-3);
cairo_pattern_add_color_stop_rgba (pat2, 0, 1,1,1, _active ? 0.4 : 0.2);
cairo_pattern_add_color_stop_rgba (pat2, 1, 1,1,1, 0.0);
cairo_arc (cr, 0, 0, diameter/2-3, 0, 2 * M_PI);
cairo_arc (cr, 0, 0, _diameter/2-3, 0, 2 * M_PI);
cairo_set_source (cr, pat2);
cairo_fill (cr);
cairo_pattern_destroy (pat2);
#endif
cairo_set_source_rgba (cr, _red, _green, _blue, 1.0);
cairo_arc (cr, 0, 0, diameter/2-5, 0, 2 * M_PI);
cairo_arc (cr, 0, 0, _diameter/2-5, 0, 2 * M_PI);
cairo_fill(cr);
cairo_stroke (cr);
@ -118,3 +135,26 @@ LED::set_visual_state (int32_t s)
set_dirty ();
}
}
void
LED::set_diameter (float d)
{
_diameter = (d*2) + 5.0;
if (_diameter != 0.0) {
_fixed_diameter = true;
}
set_dirty ();
}
void
LED::on_size_request (Gtk::Requisition* req)
{
if (_fixed_diameter) {
req->width = _diameter;
req->height = _diameter;
} else {
CairoWidget::on_size_request (req);
}
}

4
gtk2_ardour/led.h
View File

@ -32,13 +32,17 @@ class LED : public CairoWidget
void set_visual_state (int32_t s);
int32_t visual_state() const { return _visual_state; }
void set_diameter (float);
protected:
void render (cairo_t *);
void on_size_request (Gtk::Requisition* req);
private:
int32_t _visual_state;
bool _active;
float _diameter;
bool _fixed_diameter;
float _red;
float _green;
float _blue;

38
gtk2_ardour/mixer_strip.cc
View File

@ -85,7 +85,8 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
, panners (sess)
, _mono_button (_("Mono"))
, button_table (4, 2)
, middle_button_table (2, 2)
, solo_led_table (2, 2)
, middle_button_table (1, 2)
, bottom_button_table (1, 2)
, meter_point_label (_("pre"))
, comment_button (_("Comments"))
@ -187,6 +188,7 @@ MixerStrip::init ()
solo_isolated_led = manage (new LED);
solo_isolated_led->show ();
solo_isolated_led->set_diameter (5);
solo_isolated_led->set_no_show_all (true);
solo_isolated_led->set_name (X_("SoloIsolatedLED"));
solo_isolated_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
@ -195,12 +197,33 @@ MixerStrip::init ()
solo_safe_led = manage (new LED);
solo_safe_led->show ();
solo_safe_led->set_diameter (5);
solo_safe_led->set_no_show_all (true);
solo_safe_led->set_name (X_("SoloSafeLED"));
solo_safe_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
solo_safe_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_safe_button_release));
UI::instance()->set_tip (solo_safe_led, _("Lock Solo Status"), "");
Label* iso_label = manage (new Label (_("iso")));
Label* safe_label = manage (new Label (_("lock")));
iso_label->set_name (X_("SoloLEDLabel"));
safe_label->set_name (X_("SoloLEDLabel"));
iso_label->show ();
safe_label->show ();
solo_led_table.set_spacings (0);
solo_led_table.set_border_width (1);
solo_led_table.attach (*solo_isolated_led, 0, 1, 0, 1, Gtk::FILL, Gtk::FILL);
solo_led_table.attach (*iso_label, 1, 2, 0, 1, Gtk::FILL, Gtk::FILL);
solo_led_table.attach (*solo_safe_led, 0, 1, 1, 2, Gtk::FILL, Gtk::FILL);
solo_led_table.attach (*safe_label, 1, 2, 1, 2, Gtk::FILL, Gtk::FILL);
solo_led_table.show ();
solo_led_box.pack_end (solo_led_table, false, false);
solo_led_box.show ();
button_table.set_homogeneous (true);
button_table.set_spacings (0);
@ -210,10 +233,8 @@ MixerStrip::init ()
middle_button_table.set_homogeneous (true);
middle_button_table.set_spacings (0);
middle_button_table.attach (*solo_safe_led, 0, 1, 0, 1);
middle_button_table.attach (*solo_isolated_led, 1, 2, 0, 1);
middle_button_table.attach (*mute_button, 0, 1, 1, 2);
middle_button_table.attach (*solo_button, 1, 2, 1, 2);
middle_button_table.attach (*mute_button, 0, 1, 0, 1);
middle_button_table.attach (*solo_button, 1, 2, 0, 1);
bottom_button_table.set_col_spacings (0);
bottom_button_table.set_homogeneous (true);
@ -255,6 +276,7 @@ MixerStrip::init ()
global_vpacker.pack_start (whvbox, Gtk::PACK_SHRINK);
global_vpacker.pack_start (button_table,Gtk::PACK_SHRINK);
global_vpacker.pack_start (processor_box, true, true);
global_vpacker.pack_start (solo_led_box,Gtk::PACK_SHRINK);
global_vpacker.pack_start (middle_button_table,Gtk::PACK_SHRINK);
global_vpacker.pack_start (gain_meter_alignment,Gtk::PACK_SHRINK);
global_vpacker.pack_start (bottom_button_table,Gtk::PACK_SHRINK);
@ -365,12 +387,10 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
if (route()->is_master()) {
solo_button->hide ();
solo_isolated_led->hide ();
solo_safe_led->hide ();
solo_led_box.hide ();
} else {
solo_button->show ();
solo_isolated_led->show ();
solo_safe_led->show ();
solo_led_box.show ();
}
if (_mixer_owned && (route()->is_master() || route()->is_monitor())) {

2
gtk2_ardour/mixer_strip.h
View File

@ -148,6 +148,8 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
Gtk::ToggleButton _mono_button;
Gtk::Table button_table;
Gtk::Table solo_led_table;
Gtk::HBox solo_led_box;
Gtk::Table middle_button_table;
Gtk::Table bottom_button_table;