change the error-log button to toggle the log window

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 258a59c2cccf10db0044335ceab317ebc1c3b792..cf4b7a0687064bd8c21f6bc716652ecda8cde718 100644 (file)
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -211,7 +211,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
        , auditioning_alert_button (_("Audition"))
        , solo_alert_button (_("Solo"))
        , feedback_alert_button (_("Feedback"))
-       , error_alert_button ( ArdourButton::Element (ArdourButton::Edge | ArdourButton::Indicator) )
+       , error_alert_button ( ArdourButton::just_led_default_elements )
 
        , editor_meter(0)
        , editor_meter_peak_display()

diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index 3459d0373f086f8c984e286bd062a43bc800d8f2..5674e88e9bc04348a8bde9543f4f75e28a4908af 100644 (file)
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -332,6 +332,8 @@ ARDOUR_UI::setup_transport ()
        feedback_alert_button.signal_button_press_event().connect (sigc::mem_fun (*this, &ARDOUR_UI::feedback_alert_press), false);
        error_alert_button.set_name ("error alert");
        error_alert_button.signal_button_press_event().connect (sigc::mem_fun(*this,&ARDOUR_UI::error_alert_press), false);
+       act = ActionManager::get_action (X_("Editor"), X_("toggle-log-window"));
+       error_alert_button.set_related_action(act);
 
        alert_box.set_homogeneous (true);
        alert_box.set_spacing (2);
@@ -548,7 +550,6 @@ ARDOUR_UI::error_alert_press (GdkEventButton*)
 {
        _log_not_acknowledged = LogLevelNone;
        error_blink (false); // immediate acknowledge
-       UI::show_errors();
        return true;
 }
 
@@ -633,23 +634,18 @@ ARDOUR_UI::error_blink (bool onoff)
                        // blink
                        if (onoff) {
                                error_alert_button.set_custom_led_color(0xff0000ff); // bright red
-                               error_alert_button.set_active (true);
                        } else {
                                error_alert_button.set_custom_led_color(0x880000ff); // dark red
-                               error_alert_button.set_active (false);
                        }
                        break;
                case LogLevelWarning:
                        error_alert_button.set_custom_led_color(0xccaa00ff); // yellow
-                       error_alert_button.set_active (true);
                        break;
                case LogLevelInfo:
                        error_alert_button.set_custom_led_color(0x88cc00ff); // lime green
-                       error_alert_button.set_active (true);
                        break;
                default:
                        error_alert_button.set_custom_led_color(0x333333ff); // gray
-                       error_alert_button.set_active (false);
                        break;
        }
 }