diff --git a/src/tracks/playabletrack/ui/PlayableTrackButtonHandles.cpp b/src/tracks/playabletrack/ui/PlayableTrackButtonHandles.cpp index 3b29bfcf5..e60a819e7 100644 --- a/src/tracks/playabletrack/ui/PlayableTrackButtonHandles.cpp +++ b/src/tracks/playabletrack/ui/PlayableTrackButtonHandles.cpp @@ -41,7 +41,8 @@ UIHandle::Result MuteButtonHandle::CommitChanges return RefreshCode::RefreshNone; } -TranslatableString MuteButtonHandle::Tip(const wxMouseState &) const +TranslatableString MuteButtonHandle::Tip( + const wxMouseState &, AudacityProject &) const { auto name = XO("Mute"); auto project = ::GetActiveProject(); @@ -97,7 +98,8 @@ UIHandle::Result SoloButtonHandle::CommitChanges return RefreshCode::RefreshNone; } -TranslatableString SoloButtonHandle::Tip(const wxMouseState &) const +TranslatableString SoloButtonHandle::Tip( + const wxMouseState &, AudacityProject &) const { auto name = XO("Solo"); auto project = ::GetActiveProject(); diff --git a/src/tracks/playabletrack/ui/PlayableTrackButtonHandles.h b/src/tracks/playabletrack/ui/PlayableTrackButtonHandles.h index 7de3db68b..3bd94588b 100644 --- a/src/tracks/playabletrack/ui/PlayableTrackButtonHandles.h +++ b/src/tracks/playabletrack/ui/PlayableTrackButtonHandles.h @@ -31,7 +31,8 @@ protected: (const wxMouseEvent &event, AudacityProject *pProject, wxWindow *pParent) override; - TranslatableString Tip(const wxMouseState &state) const override; + TranslatableString Tip( + const wxMouseState &state, AudacityProject &) const override; bool StopsOnKeystroke () override { return true; } @@ -61,7 +62,8 @@ protected: (const wxMouseEvent &event, AudacityProject *pProject, wxWindow *pParent) override; - TranslatableString Tip(const wxMouseState &state) const override; + TranslatableString Tip( + const wxMouseState &state, AudacityProject &) const override; bool StopsOnKeystroke () override { return true; } diff --git a/src/tracks/ui/ButtonHandle.cpp b/src/tracks/ui/ButtonHandle.cpp index f3a56fba3..e24726952 100644 --- a/src/tracks/ui/ButtonHandle.cpp +++ b/src/tracks/ui/ButtonHandle.cpp @@ -71,10 +71,12 @@ UIHandle::Result ButtonHandle::Drag } HitTestPreview ButtonHandle::Preview -(const TrackPanelMouseState &st, AudacityProject *) +(const TrackPanelMouseState &st, AudacityProject *project) { // No special cursor - auto message = Tip(st.state); + TranslatableString message; + if (project) + message = Tip(st.state, *project); return { message, {}, message }; } diff --git a/src/tracks/ui/ButtonHandle.h b/src/tracks/ui/ButtonHandle.h index 95420bd61..04dd7b7e0 100644 --- a/src/tracks/ui/ButtonHandle.h +++ b/src/tracks/ui/ButtonHandle.h @@ -46,7 +46,8 @@ protected: (const wxMouseEvent &event, AudacityProject *pProject, wxWindow *pParent) = 0; // Define a message for the status bar and tooltip. - virtual TranslatableString Tip(const wxMouseState &state) const = 0; + virtual TranslatableString Tip( + const wxMouseState &state, AudacityProject &) const = 0; void Enter(bool forward, AudacityProject *) final override; diff --git a/src/tracks/ui/TrackButtonHandles.cpp b/src/tracks/ui/TrackButtonHandles.cpp index 05244cda0..8b00dbf8e 100644 --- a/src/tracks/ui/TrackButtonHandles.cpp +++ b/src/tracks/ui/TrackButtonHandles.cpp @@ -57,7 +57,8 @@ UIHandle::Result MinimizeButtonHandle::CommitChanges return RefreshNone; } -TranslatableString MinimizeButtonHandle::Tip(const wxMouseState &) const +TranslatableString MinimizeButtonHandle::Tip( + const wxMouseState &, AudacityProject &) const { auto pTrack = GetTrack(); return TrackView::Get( *pTrack ).GetMinimized() @@ -108,7 +109,8 @@ UIHandle::Result SelectButtonHandle::CommitChanges return RefreshNone; } -TranslatableString SelectButtonHandle::Tip(const wxMouseState &) const +TranslatableString SelectButtonHandle::Tip( + const wxMouseState &, AudacityProject &) const { auto pTrack = GetTrack(); #if defined(__WXMAC__) @@ -170,7 +172,8 @@ UIHandle::Result CloseButtonHandle::CommitChanges return result; } -TranslatableString CloseButtonHandle::Tip(const wxMouseState &) const +TranslatableString CloseButtonHandle::Tip( + const wxMouseState &, AudacityProject &) const { auto name = XO("Close"); auto project = ::GetActiveProject(); @@ -230,7 +233,8 @@ UIHandle::Result MenuButtonHandle::CommitChanges return RefreshCode::RefreshNone; } -TranslatableString MenuButtonHandle::Tip(const wxMouseState &) const +TranslatableString MenuButtonHandle::Tip( + const wxMouseState &, AudacityProject&) const { auto name = XO("Open menu..."); auto project = ::GetActiveProject(); diff --git a/src/tracks/ui/TrackButtonHandles.h b/src/tracks/ui/TrackButtonHandles.h index f1d30d9c8..99def2387 100644 --- a/src/tracks/ui/TrackButtonHandles.h +++ b/src/tracks/ui/TrackButtonHandles.h @@ -24,7 +24,8 @@ protected: (const wxMouseEvent &event, AudacityProject *pProject, wxWindow *pParent) override; - TranslatableString Tip(const wxMouseState &state) const override; + TranslatableString Tip( + const wxMouseState &state, AudacityProject &) const override; public: explicit MinimizeButtonHandle @@ -49,7 +50,8 @@ protected: (const wxMouseEvent &event, AudacityProject *pProject, wxWindow *pParent) override; - TranslatableString Tip(const wxMouseState &state) const override; + TranslatableString Tip( + const wxMouseState &state, AudacityProject &) const override; public: explicit SelectButtonHandle @@ -74,7 +76,8 @@ protected: (const wxMouseEvent &event, AudacityProject *pProject, wxWindow *pParent) override; - TranslatableString Tip(const wxMouseState &state) const override; + TranslatableString Tip( + const wxMouseState &state, AudacityProject &project) const override; bool StopsOnKeystroke () override { return true; } @@ -102,7 +105,8 @@ protected: (const wxMouseEvent &event, AudacityProject *pProject, wxWindow *pParent) override; - TranslatableString Tip(const wxMouseState &state) const override; + TranslatableString Tip( + const wxMouseState &state, AudacityProject &) const override; public: explicit MenuButtonHandle