Show rec enable button in editor mixer, make mixer strip capitalisation consistent...

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4019 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index 78299941f9956733fe8021cf77076505b9c6a5a0..dff6cec698843ef14ddc01948fd00cfeb15d1e05 100644 (file)
--- 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 7c551a392e253c45e0a74f1ee3e227c510f01dbc..3bb8656b515f2f5ab74cc22d4a3dca196c90a928 100644 (file)
--- 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()));