Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-14 17:14:07 +01:00
Code Issues Releases Wiki Activity

Pass AudacityProject & into ButtonHandle::Tip

Browse Source
This commit is contained in:
Paul Licameli
2020-01-04 11:24:43 -05:00
parent 2f71f2768d
commit dffe3155b0
6 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/tracks/playabletrack/ui/PlayableTrackButtonHandles.cpp
View File

@@ -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();

6
src/tracks/playabletrack/ui/PlayableTrackButtonHandles.h
View File

@@ -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; }

6
src/tracks/ui/ButtonHandle.cpp
View File

@@ -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 };
}

3
src/tracks/ui/ButtonHandle.h
View File

@@ -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;

12
src/tracks/ui/TrackButtonHandles.cpp
View File

@@ -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();

12
src/tracks/ui/TrackButtonHandles.h
View File

@@ -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