allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

consistently use mixed-case labels

Browse Source
This commit is contained in:
Ben Loftis
2014-08-01 14:31:18 -05:00
parent 3687dae6f6
commit b128271f29
4 changed files with 44 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gtk2_ardour/ardour_ui.cc
View File

@@ -190,9 +190,9 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
, follow_edits_button (ArdourButton::led_default_elements)
, auto_input_button (ArdourButton::led_default_elements)
, auditioning_alert_button (_("audition"))
, solo_alert_button (_("solo"))
, feedback_alert_button (_("feedback"))
, auditioning_alert_button (_("Audition"))
, solo_alert_button (_("Solo"))
, feedback_alert_button (_("Feedback"))
, editor_meter(0)
, editor_meter_peak_display()

30
gtk2_ardour/mixer_strip.cc
View File

@@ -210,8 +210,8 @@ MixerStrip::init ()
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"), "");
solo_safe_led->set_text (_("lock"));
solo_isolated_led->set_text (_("iso"));
solo_safe_led->set_text (_("Lock"));
solo_isolated_led->set_text (_("Iso"));
solo_iso_table.set_homogeneous (true);
solo_iso_table.set_spacings (2);
@@ -1747,48 +1747,48 @@ MixerStrip::meter_point_string (MeterPoint mp)
case Wide:
switch (mp) {
case MeterInput:
return _("in");
return _("In");
break;
case MeterPreFader:
return _("pre");
return _("Pre");
break;
case MeterPostFader:
return _("post");
return _("Post");
break;
case MeterOutput:
return _("out");
return _("Out");
break;
case MeterCustom:
default:
return _("custom");
return _("Custom");
break;
}
break;
case Narrow:
switch (mp) {
case MeterInput:
return _("in");
return _("In");
break;
case MeterPreFader:
return _("pr");
return _("Pr");
break;
case MeterPostFader:
return _("po");
return _("Po");
break;
case MeterOutput:
return _("o");
return _("O");
break;
case MeterCustom:
default:
return _("c");
return _("C");
break;
}
break;
@@ -1956,8 +1956,8 @@ MixerStrip::set_button_names ()
break;
}
}
solo_isolated_led->set_text (_("iso"));
solo_safe_led->set_text (_("lock"));
solo_isolated_led->set_text (_("Iso"));
solo_safe_led->set_text (_("Lock"));
break;
default:
@@ -1984,7 +1984,7 @@ MixerStrip::set_button_names ()
}
}
solo_isolated_led->set_text (_("i"));
solo_isolated_led->set_text (_("I"));
solo_safe_led->set_text (_("L"));
break;
}

42
gtk2_ardour/monitor_section.cc
View File

@@ -94,15 +94,15 @@ MonitorSection::MonitorSection (Session* s)
/* Rude Solo */
rude_solo_button.set_text (_("soloing"));
rude_solo_button.set_text (_("Soloing"));
rude_solo_button.set_name ("rude solo");
rude_solo_button.show ();
rude_iso_button.set_text (_("isolated"));
rude_iso_button.set_text (_("Isolated"));
rude_iso_button.set_name ("rude isolate");
rude_iso_button.show ();
rude_audition_button.set_text (_("auditioning"));
rude_audition_button.set_text (_("Auditioning"));
rude_audition_button.set_name ("rude audition");
rude_audition_button.show ();
@@ -233,7 +233,7 @@ MonitorSection::MonitorSection (Session* s)
dim_packer->pack_start (*spin_packer, true, false);
exclusive_solo_button.set_text (_("excl. solo"));
exclusive_solo_button.set_text (_("Excl. Solo"));
exclusive_solo_button.set_name (X_("monitor solo exclusive"));
ARDOUR_UI::instance()->set_tip (&exclusive_solo_button, _("Exclusive solo means that only 1 solo is active at a time"));
@@ -242,7 +242,7 @@ MonitorSection::MonitorSection (Session* s)
exclusive_solo_button.set_related_action (act);
}
solo_mute_override_button.set_text (_("solo » mute"));
solo_mute_override_button.set_text (_("Solo » Mute"));
solo_mute_override_button.set_name (X_("monitor solo override"));
ARDOUR_UI::instance()->set_tip (&solo_mute_override_button, _("If enabled, solo will override mute\n(a soloed & muted track or bus will be audible)"));
@@ -270,7 +270,7 @@ MonitorSection::MonitorSection (Session* s)
upper_packer.pack_start (*solo_opt_box, false, false);
upper_packer.pack_start (*solo_packer, false, false, 12);
cut_all_button.set_text (_("mute"));
cut_all_button.set_text (_("Mute"));
cut_all_button.set_name ("monitor section cut");
cut_all_button.set_name (X_("monitor section cut"));
cut_all_button.set_size_request (-1,50);
@@ -281,14 +281,14 @@ MonitorSection::MonitorSection (Session* s)
cut_all_button.set_related_action (act);
}
dim_all_button.set_text (_("dim"));
dim_all_button.set_text (_("Dim"));
dim_all_button.set_name ("monitor section dim");
act = ActionManager::get_action (X_("Monitor"), X_("monitor-dim-all"));
if (act) {
dim_all_button.set_related_action (act);
}
mono_button.set_text (_("mono"));
mono_button.set_text (_("Mono"));
mono_button.set_name ("monitor section mono");
act = ActionManager::get_action (X_("Monitor"), X_("monitor-mono"));
if (act) {
@@ -342,21 +342,27 @@ MonitorSection::MonitorSection (Session* s)
channel_size_group->add_widget (channel_table);
channel_table_header.resize (1, 5);
Label* l1 = manage (new Label (X_("out")));
Label* l1 = manage (new Label (X_(" ")));
l1->set_name (X_("MonitorSectionLabel"));
channel_table_header.attach (*l1, 0, 1, 0, 1, EXPAND|FILL);
l1 = manage (new Label (X_("mute")));
channel_table_header.attach (*l1, 0, 1, 0, 1, EXPAND|FILL);
l1 = manage (new Label (X_("Mute")));
l1->set_name (X_("MonitorSectionLabel"));
channel_table_header.attach (*l1, 1, 2, 0, 1, EXPAND|FILL);
l1 = manage (new Label (X_("dim")));
channel_table_header.attach (*l1, 1, 2, 0, 1, EXPAND|FILL);
l1 = manage (new Label (X_("Dim")));
l1->set_name (X_("MonitorSectionLabel"));
channel_table_header.attach (*l1, 2, 3, 0, 1, EXPAND|FILL);
l1 = manage (new Label (X_("solo")));
channel_table_header.attach (*l1, 2, 3, 0, 1, EXPAND|FILL);
l1 = manage (new Label (X_("Solo")));
l1->set_name (X_("MonitorSectionLabel"));
channel_table_header.attach (*l1, 3, 4, 0, 1, EXPAND|FILL);
l1 = manage (new Label (X_("inv")));
channel_table_header.attach (*l1, 3, 4, 0, 1, EXPAND|FILL);
l1 = manage (new Label (X_("Inv")));
l1->set_name (X_("MonitorSectionLabel"));
channel_table_header.attach (*l1, 4, 5, 0, 1, EXPAND|FILL);
channel_table_header.attach (*l1, 4, 5, 0, 1, EXPAND|FILL);
channel_table_header.show ();
table_hpacker.pack_start (channel_table, true, true);

4
libs/ardour/session_state.cc
View File

@@ -540,7 +540,7 @@ Session::create (const string& session_template, BusProfile* bus_profile)
ChanCount count(DataType::AUDIO, bus_profile->master_out_channels);
if (bus_profile->master_out_channels) {
boost::shared_ptr<Route> r (new Route (*this, _("master"), Route::MasterOut, DataType::AUDIO));
boost::shared_ptr<Route> r (new Route (*this, _("Master"), Route::MasterOut, DataType::AUDIO));
if (r->init ()) {
return -1;
}
@@ -2969,7 +2969,7 @@ Session::controllable_by_descriptor (const ControllableDescriptor& desc)
case ControllableDescriptor::NamedRoute:
{
std::string str = desc.top_level_name();
if (str == "master") {
if (str == "Master" || str == "master") {
r = _master_out;
} else if (str == "control" || str == "listen") {
r = _monitor_out;