summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mainsbridge <beatroute@iprimus.com.au>2008-10-27 17:36:04 +0000
committerNick Mainsbridge <beatroute@iprimus.com.au>2008-10-27 17:36:04 +0000
commit632bebc2f98780dab8862e507ae02e8f6806f0ef (patch)
treeadde1a98c5368d69c01e721573fb83e89d82ad48
parentfc54f2eab1c946a2740cf3d15bfbeb2fbb7a3654 (diff)
Show rec enable button in editor mixer, make mixer strip capitalisation consistent, remove unneeded stuff from toggle editor mixer on top.
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4019 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r--gtk2_ardour/ardour_ui_dependents.cc2
-rw-r--r--gtk2_ardour/mixer_strip.cc7
2 files changed, 4 insertions, 5 deletions
diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index 78299941f9..dff6cec698 100644
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -117,10 +117,8 @@ ARDOUR_UI::toggle_editor_mixer_on_top ()
{
if (_mixer_on_top) {
goto_editor_window ();
- _mixer_on_top = false;
} else {
goto_mixer_window ();
- _mixer_on_top = true;
}
}
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 7c551a392e..3bb8656b51 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -362,6 +362,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
#endif /* VARISPEED_IN_MIXER_STRIP */
button_table.attach (*rec_enable_button, 0, 2, 2, 3);
+ rec_enable_button->show();
}
if (_route->phase_invert()) {
@@ -481,17 +482,17 @@ MixerStrip::set_width (Width w, void* owner)
set_size_request (-1, -1);
if (rec_enable_button) {
- ((Gtk::Label*)rec_enable_button->get_child())->set_text (_("record"));
+ ((Gtk::Label*)rec_enable_button->get_child())->set_text (_("Record"));
}
((Gtk::Label*)mute_button->get_child())->set_text (_("Mute"));
((Gtk::Label*)solo_button->get_child())->set_text (_("Solo"));
if (_route->comment() == "") {
comment_button.unset_bg (STATE_NORMAL);
- ((Gtk::Label*)comment_button.get_child())->set_text (_("comments"));
+ ((Gtk::Label*)comment_button.get_child())->set_text (_("Comments"));
} else {
comment_button.modify_bg (STATE_NORMAL, color());
- ((Gtk::Label*)comment_button.get_child())->set_text (_("*comments*"));
+ ((Gtk::Label*)comment_button.get_child())->set_text (_("*Comments*"));
}
((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (gpm.astyle_string(_route->gain_automation_curve().automation_style()));