smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-07 14:15:46 +01:00
Code Issues Projects Releases Wiki Activity

[Summary] Progressing MASTER UI

Browse source
This commit is contained in:
VKamyshniy 2014-07-16 11:39:57 +03:00
parent f3ba302683
commit 0c96606026
3 changed files with 32 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

30
gtk2_ardour/ui/master_ui.xml
View file

@ -13,23 +13,23 @@
<HBox box.pack="end" spacing="1">
<VBox spacing="1">
<iconbutton id="master_mute_button"
width="47"
height="27"
normalicon="master_mute"
activeicon="master_mute_active"
prelighticon="master_mute_prelight"/>
width="47"
height="27"
normalicon="master_mute"
activeicon="master_mute_active"
prelighticon="master_mute_prelight"/>
<iconbutton id="clear_solo_button"
width="47"
height="27"
normalicon="master_mute"
activeicon="master_mute_active"
prelighticon="master_mute_prelight"/>
width="47"
height="27"
normalicon="master_clear_solo"
activeicon="master_clear_solo_active"
prelighticon="master_clear_solo_prelight"/>
<iconbutton id="global_rec_button"
width="47"
height="27"
normalicon="master_mute"
activeicon="master_mute_active"
prelighticon="master_mute_prelight"/>
width="47"
height="27"
normalicon="master_global_rec"
activeicon="master_global_rec_active"
prelighticon="master_global_rec_prelight"/>
</VBox>
<Layout bgnormal="#383838" width="47" height="83">
<VBox id="level_meter_home" height="77" x="18" y="3"/>

17
gtk2_ardour/waves_ui.cc
View file

@ -394,6 +394,7 @@ WavesUI::set_attributes (Gtk::Widget& widget, const XMLNode& definition, const X
Gtk::Label* label = dynamic_cast<Gtk::Label*> (&widget);
if (label) {
property = xml_property (definition, "justify", styles, "left");
std::transform(property.begin(), property.end(), property.begin(), ::tolower);
Gtk::Justification justification = Gtk::JUSTIFY_LEFT;
if (property == "left") {
justification = Gtk::JUSTIFY_LEFT;
@ -407,6 +408,22 @@ WavesUI::set_attributes (Gtk::Widget& widget, const XMLNode& definition, const X
dbg_msg ("Invalid justification for Gtk::Label !");
}
label->set_justify (justification);
property = xml_property (definition, "ellipsize", styles, "none");
std::transform(property.begin(), property.end(), property.begin(), ::tolower);
Pango::EllipsizeMode ellipsize_mode = Pango::ELLIPSIZE_NONE;
if (property == "none") {
ellipsize_mode = Pango::ELLIPSIZE_NONE;
} else if (property == "start") {
ellipsize_mode = Pango::ELLIPSIZE_START;
} else if (property == "middle") {
ellipsize_mode = Pango::ELLIPSIZE_MIDDLE;
} else if (property == "end") {
ellipsize_mode = Pango::ELLIPSIZE_END;
} else {
dbg_msg ("Invalid ellipsize mode for Gtk::Label !");
}
label->set_ellipsize (ellipsize_mode);
}
Gtk::Box* box = dynamic_cast<Gtk::Box*> (&widget);

3
libs/ardour/route.cc
View file

@ -105,9 +105,6 @@ Route::Route (Session& sess, string name, Flag flg, DataType default_type)
, _custom_meter_position_noted (false)
, _last_custom_meter_was_at_end (false)
{
if (is_master()) {
_meter_type = MeterK20;
}
processor_max_streams.reset();
}