From bce372bfee62093b0c8b7ca199c94b1af4020e4f Mon Sep 17 00:00:00 2001 From: "james.k.crook@gmail.com" Date: Thu, 13 Nov 2014 16:29:08 +0000 Subject: [PATCH] Tooltip on recording meter toolbar now changes with meter on/off --- src/toolbars/MeterToolBar.cpp | 8 ++++++-- src/widgets/Meter.cpp | 5 ++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/toolbars/MeterToolBar.cpp b/src/toolbars/MeterToolBar.cpp index 299fb06b5..1b6ed3695 100644 --- a/src/toolbars/MeterToolBar.cpp +++ b/src/toolbars/MeterToolBar.cpp @@ -141,9 +141,13 @@ void MeterToolBar::RegenerateTooltips() { #if wxUSE_TOOLTIPS if( mPlayMeter ) - mPlayMeter->SetToolTip( _("Playback Level") ); + mPlayMeter->SetToolTip( _("Playback Level.") ); if( mRecordMeter ) - mRecordMeter->SetToolTip( _("Recording Level (Click to monitor.)") ); + mRecordMeter->SetToolTip( + !gAudioIO->IsMonitoring() ? + _("Recording Level. (Click to monitor).") : + _("Recording Level. (Click to turn monitoring off).") + ); #endif } diff --git a/src/widgets/Meter.cpp b/src/widgets/Meter.cpp index 3c28d20dd..497f06dd9 100644 --- a/src/widgets/Meter.cpp +++ b/src/widgets/Meter.cpp @@ -1417,7 +1417,10 @@ void Meter::StartMonitoring() gAudioIO->SetMeters(record, play); } } - + // Update preferences also forces tooltips to be changed. + wxCommandEvent e(EVT_METER_PREFERENCES_CHANGED); + e.SetEventObject(this); + GetParent()->GetEventHandler()->ProcessEvent(e); } //