Skip to content
Snippets Groups Projects
Unverified Commit 9623d6dd authored by Matthieu Hodgkinson's avatar Matthieu Hodgkinson Committed by GitHub
Browse files

Merge pull request #6446 from saintmatthieu/6382-MuseHub-CTAs

6382 muse hub CTAs
parents 15e23de1 93697fb5
Branches
No related tags found
No related merge requests found
...@@ -12,14 +12,15 @@ ...@@ -12,14 +12,15 @@
#include <numeric> #include <numeric>
#include <unordered_map> #include <unordered_map>
#include "AudacityMessageBox.h"
#include "EffectInterface.h" #include "EffectInterface.h"
#include "HelpSystem.h"
#include "IncompatiblePluginsDialog.h" #include "IncompatiblePluginsDialog.h"
#include "ModuleManager.h" #include "ModuleManager.h"
#include "PluginManager.h" #include "PluginManager.h"
#include "PluginStartupRegistration.h" #include "PluginStartupRegistration.h"
#include "ShuttleGui.h"
#include "AudacityMessageBox.h"
#include "ProgressDialog.h" #include "ProgressDialog.h"
#include "ShuttleGui.h"
#include <set> #include <set>
#include <wx/setup.h> // for wxUSE_* macros #include <wx/setup.h> // for wxUSE_* macros
...@@ -43,13 +44,15 @@ enum ...@@ -43,13 +44,15 @@ enum
ID_FilterType, ID_FilterType,
ID_FilterCategory, ID_FilterCategory,
ID_List, ID_List,
ID_Rescan ID_Rescan,
ID_GetMoreEffects,
}; };
BEGIN_EVENT_TABLE(PluginRegistrationDialog, wxDialogWrapper) BEGIN_EVENT_TABLE(PluginRegistrationDialog, wxDialogWrapper)
EVT_BUTTON(wxID_OK, PluginRegistrationDialog::OnOK) EVT_BUTTON(wxID_OK, PluginRegistrationDialog::OnOK)
EVT_BUTTON(wxID_CANCEL, PluginRegistrationDialog::OnCancel) EVT_BUTTON(wxID_CANCEL, PluginRegistrationDialog::OnCancel)
EVT_BUTTON(ID_Rescan, PluginRegistrationDialog::OnRescan) EVT_BUTTON(ID_Rescan, PluginRegistrationDialog::OnRescan)
EVT_BUTTON(ID_GetMoreEffects, PluginRegistrationDialog::OnGetMoreEffects)
EVT_CHOICE(ID_FilterState, PluginRegistrationDialog::OnStateFilterValueChanged) EVT_CHOICE(ID_FilterState, PluginRegistrationDialog::OnStateFilterValueChanged)
EVT_CHOICE(ID_FilterType, PluginRegistrationDialog::OnTypeFilterValueChanged) EVT_CHOICE(ID_FilterType, PluginRegistrationDialog::OnTypeFilterValueChanged)
EVT_CHOICE(ID_FilterCategory, PluginRegistrationDialog::OnCategoryFilterValueChanged) EVT_CHOICE(ID_FilterCategory, PluginRegistrationDialog::OnCategoryFilterValueChanged)
...@@ -200,6 +203,9 @@ void PluginRegistrationDialog::PopulateOrExchange(ShuttleGui &S) ...@@ -200,6 +203,9 @@ void PluginRegistrationDialog::PopulateOrExchange(ShuttleGui &S)
{ {
S.AddSpace(Margin, 1); S.AddSpace(Margin, 1);
S.Id(ID_Rescan).AddButton(XXO("&Rescan")); S.Id(ID_Rescan).AddButton(XXO("&Rescan"));
#if defined(__WXMSW__) || defined(__WXMAC__)
S.Id(ID_GetMoreEffects).AddButton(XXO("&Get more effects..."));
#endif
S.AddSpace(1, 1, 1); S.AddSpace(1, 1, 1);
S.Id(wxID_OK).AddButton(XXO("&OK")); S.Id(wxID_OK).AddButton(XXO("&OK"));
...@@ -336,6 +342,11 @@ void PluginRegistrationDialog::OnRescan(wxCommandEvent& WXUNUSED(evt)) ...@@ -336,6 +342,11 @@ void PluginRegistrationDialog::OnRescan(wxCommandEvent& WXUNUSED(evt))
}); });
} }
void PluginRegistrationDialog::OnGetMoreEffects(wxCommandEvent& WXUNUSED(evt))
{
OpenInDefaultBrowser("https://www.musehub.com");
}
void PluginRegistrationDialog::OnOK(wxCommandEvent & WXUNUSED(evt)) void PluginRegistrationDialog::OnOK(wxCommandEvent & WXUNUSED(evt))
{ {
auto result = ProgressResult::Success; auto result = ProgressResult::Success;
......
...@@ -37,6 +37,7 @@ private: ...@@ -37,6 +37,7 @@ private:
void OnOK(wxCommandEvent & evt); void OnOK(wxCommandEvent & evt);
void OnCancel(wxCommandEvent & evt); void OnCancel(wxCommandEvent & evt);
void OnRescan(wxCommandEvent & evt); void OnRescan(wxCommandEvent & evt);
void OnGetMoreEffects(wxCommandEvent & evt);
wxArrayString mPluginProviderIDs; wxArrayString mPluginProviderIDs;
......
...@@ -754,7 +754,9 @@ public: ...@@ -754,7 +754,9 @@ public:
int commandId = wxID_NONE; int commandId = wxID_NONE;
menu.AppendSeparator(); menu.AppendSeparator();
#if defined(__WXMSW__) || defined(__WXMAC__)
menu.Append(wxID_MORE, _("Get more effects...")); menu.Append(wxID_MORE, _("Get more effects..."));
#endif
menu.Bind(wxEVT_MENU, [&](wxCommandEvent evt) { commandId = evt.GetId(); }); menu.Bind(wxEVT_MENU, [&](wxCommandEvent evt) { commandId = evt.GetId(); });
...@@ -763,7 +765,7 @@ public: ...@@ -763,7 +765,7 @@ public:
if(commandId == wxID_REMOVE) if(commandId == wxID_REMOVE)
return wxString {}; return wxString {};
else if(commandId == wxID_MORE) else if(commandId == wxID_MORE)
OpenInDefaultBrowser("https://plugins.audacityteam.org/"); OpenInDefaultBrowser("https://www.musehub.com");
else else
return visitor.GetPluginID(commandId).GET(); return visitor.GetPluginID(commandId).GET();
} }
......
#include "AudioIO.h"
#include "../Benchmark.h" #include "../Benchmark.h"
#include "../commands/CommandDispatch.h"
#include "../CommonCommandFlags.h" #include "../CommonCommandFlags.h"
#include "Journal.h"
#include "../MenuCreator.h" #include "../MenuCreator.h"
#include "PluginManager.h"
#include "../PluginRegistrationDialog.h" #include "../PluginRegistrationDialog.h"
#include "../ProjectWindows.h"
#include "../commands/CommandDispatch.h"
#include "../effects/EffectManager.h"
#include "../effects/EffectUI.h"
#include "../prefs/PrefsDialog.h"
#include "../toolbars/SelectionBar.h"
#include "../toolbars/ToolManager.h"
#include "AudacityMessageBox.h"
#include "AudioIO.h"
#include "CommandContext.h"
#include "CommandManager.h"
#include "HelpSystem.h"
#include "Journal.h"
#include "MenuHelper.h"
#include "PluginManager.h"
#include "Prefs.h" #include "Prefs.h"
#include "Project.h" #include "Project.h"
#include "ProjectRate.h" #include "ProjectRate.h"
#include "ProjectSnap.h" #include "ProjectSnap.h"
#include "../ProjectWindows.h" #include "RealtimeEffectManager.h"
#include "RealtimeEffectPanel.h" #include "RealtimeEffectPanel.h"
#include "SampleTrack.h" #include "SampleTrack.h"
#include "SyncLock.h" #include "SyncLock.h"
#include "../toolbars/ToolManager.h"
#include "../toolbars/SelectionBar.h"
#include "TrackFocus.h"
#include "TempDirectory.h" #include "TempDirectory.h"
#include "TrackFocus.h"
#include "UndoManager.h" #include "UndoManager.h"
#include "Viewport.h" #include "Viewport.h"
#include "CommandContext.h"
#include "CommandManager.h"
#include "../effects/EffectManager.h"
#include "../effects/EffectUI.h"
#include "RealtimeEffectManager.h"
#include "../prefs/PrefsDialog.h"
#include "AudacityMessageBox.h"
#include "MenuHelper.h"
#include "prefs/EffectsPrefs.h" #include "prefs/EffectsPrefs.h"
// private helper classes and functions // private helper classes and functions
namespace { namespace {
...@@ -346,22 +346,31 @@ auto EffectMenu() ...@@ -346,22 +346,31 @@ auto EffectMenu()
{ {
// All of this is a bit hacky until we can get more things connected into // All of this is a bit hacky until we can get more things connected into
// the plugin manager...sorry! :-( // the plugin manager...sorry! :-(
static auto menu = std::shared_ptr{ static auto menu = std::shared_ptr { Menu(
Menu( wxT("Effect"), XXO("Effe&ct"), wxT("Effect"), XXO("Effe&ct"),
Section( "Manage", Section(
Command( wxT("ManageEffects"), XXO("Plugin Manager"), "Manage", Command(
OnManageEffects, AudioIONotBusyFlag() ) wxT("ManageEffects"), XXO("Plugin Manager"),
), OnManageEffects, AudioIONotBusyFlag())),
Section( "RealtimeEffects", Section(
Command ( wxT("AddRealtimeEffects"), XXO("Add Realtime Effects"), "RealtimeEffects",
Command(
wxT("AddRealtimeEffects"), XXO("Add Realtime Effects"),
OnAddRealtimeEffects, HasTrackFocusFlag(), wxT("E")) OnAddRealtimeEffects, HasTrackFocusFlag(), wxT("E"))
#if defined(__WXMSW__) || defined(__WXMAC__)
, Command(
wxT("GetMoreEffects"), XXO("Get more effects..."),
[](const CommandContext&) {
OpenInDefaultBrowser("https://www.musehub.com");
},
AlwaysEnabledFlag)
#endif
), ),
Section(
Section( "RepeatLast", "RepeatLast",
// Delayed evaluation: // Delayed evaluation:
[](AudacityProject &project) [](AudacityProject& project) {
{
const auto &lastEffect = CommandManager::Get(project).mLastEffect; const auto &lastEffect = CommandManager::Get(project).mLastEffect;
TranslatableString buildMenuLabel; TranslatableString buildMenuLabel;
if (!lastEffect.empty()) if (!lastEffect.empty())
...@@ -375,10 +384,10 @@ auto EffectMenu() ...@@ -375,10 +384,10 @@ auto EffectMenu()
AudioIONotBusyFlag() | TimeSelectedFlag() | AudioIONotBusyFlag() | TimeSelectedFlag() |
WaveTracksSelectedFlag() | HasLastEffectFlag(), WaveTracksSelectedFlag() | HasLastEffectFlag(),
wxT("Ctrl+R") ); wxT("Ctrl+R") );
} }),
),
Section( "Effects", Section(
"Effects",
// Delayed evaluation: // Delayed evaluation:
[](AudacityProject&) { [](AudacityProject&) {
auto result = Items(""); auto result = Items("");
...@@ -389,9 +398,7 @@ auto EffectMenu() ...@@ -389,9 +398,7 @@ auto EffectMenu()
EffectsGroupBy.Read(), EffectsGroupBy.Read(),
&OnEffect); &OnEffect);
return result; return result;
} })) };
)
) };
return menu; return menu;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment