Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-29 14:48:39 +02:00
Code Issues Releases Wiki Activity

Bug 1902 - "Nyquist Prompt" confusingly shown only as "Nyquist" when "Grouped by Type" is active

Browse Source 
Now shown as "Nyquist Effects Prompt" (in Effects menu) and "Nyquist Tools Prompt" (in Tools Menu).
These prompts will have slightly different behaviour, e.g. only tools allow aud-do.
This commit is contained in:
James Crook 2018-07-14 16:49:41 +01:00
parent 0c7dbd311d
commit 2739020342
4 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Menus.cpp
View File

@ -1788,7 +1788,8 @@ void AudacityProject::PopulateEffectsMenu(CommandManager* c,
else if (plug->IsEffectDefault() else if (plug->IsEffectDefault()
#ifdef EXPERIMENTAL_DA #ifdef EXPERIMENTAL_DA
// Move Nyquist prompt into nyquist group. // Move Nyquist prompt into nyquist group.
&& (plug->GetName() != _("Nyquist Prompt")) && (plug->GetSymbol() != IdentInterfaceSymbol("Nyquist Effects Prompt"))
&& (plug->GetSymbol() != IdentInterfaceSymbol("Nyquist Tools Prompt"))
#endif #endif
) )
defplugs.push_back(plug); defplugs.push_back(plug);
@ -1885,18 +1886,15 @@ void AudacityProject::AddEffectMenuItems(CommandManager *c,
if (current != last) if (current != last)
{ {
if (!last.IsEmpty()) bool bInSubmenu = !last.IsEmpty() && (groupNames.Count() > 1);
{ if( bInSubmenu)
c->BeginSubMenu(last); c->BeginSubMenu(last);
}
AddEffectMenuItemGroup(c, groupNames, vHasDialog, AddEffectMenuItemGroup(c, groupNames, vHasDialog,
groupPlugs, groupFlags, isDefault); groupPlugs, groupFlags, isDefault);
if (!last.IsEmpty()) if (bInSubmenu)
{
c->EndSubMenu(); c->EndSubMenu();
}
groupNames.Clear(); groupNames.Clear();
vHasDialog.clear(); vHasDialog.clear();
@ -1913,11 +1911,14 @@ void AudacityProject::AddEffectMenuItems(CommandManager *c,
if (groupNames.GetCount() > 0) if (groupNames.GetCount() > 0)
{ {
c->BeginSubMenu(current); bool bInSubmenu = groupNames.Count() > 1;
if (bInSubmenu)
c->BeginSubMenu(current);
AddEffectMenuItemGroup(c, groupNames, vHasDialog, groupPlugs, groupFlags, isDefault); AddEffectMenuItemGroup(c, groupNames, vHasDialog, groupPlugs, groupFlags, isDefault);
c->EndSubMenu(); if (bInSubmenu)
c->EndSubMenu();
} }
} }
else else

2
src/commands/ScreenshotCommand.cpp
View File

@ -502,7 +502,7 @@ void ScreenshotCommand::CaptureEffects(
"Limiter...", "Limiter...",
"Low Pass Filter...", "Low Pass Filter...",
"Notch Filter...", "Notch Filter...",
"Nyquist Prompt...", "Nyquist Effects Prompt...",
//"Studio Fade Out", //"Studio Fade Out",
"Tremolo...", "Tremolo...",
"Vocal Reduction and Isolation...", "Vocal Reduction and Isolation...",

10
src/effects/nyquist/Nyquist.cpp
View File

@ -150,16 +150,16 @@ NyquistEffect::NyquistEffect(const wxString &fName)
mMaxLen = NYQ_MAX_LEN; mMaxLen = NYQ_MAX_LEN;
// Interactive Nyquist // Interactive Nyquist (for effects)
if (fName == NYQUIST_PROMPT_ID) { if (fName == NYQUIST_PROMPT_ID) {
mName = XO("Nyquist Prompt"); mName = XO("Nyquist Effects Prompt");
mType = EffectTypeProcess; mType = EffectTypeProcess;
mOK = true; mOK = true;
mIsPrompt = true; mIsPrompt = true;
return; return;
} }
// Interactive Nyquist // Interactive Nyquist (for general tools)
if (fName == NYQUIST_TOOLS_PROMPT_ID) { if (fName == NYQUIST_TOOLS_PROMPT_ID) {
mName = XO("Nyquist Tools Prompt"); mName = XO("Nyquist Tools Prompt");
mType = EffectTypeTool; mType = EffectTypeTool;
@ -205,7 +205,7 @@ IdentInterfaceSymbol NyquistEffect::GetSymbol()
if (mIsPrompt) if (mIsPrompt)
return (mType == EffectTypeTool) ? return (mType == EffectTypeTool) ?
XO("Nyquist Tools Prompt") : XO("Nyquist Tools Prompt") :
XO("Nyquist Prompt"); XO("Nyquist Effects Prompt");
return mName; return mName;
} }
@ -512,7 +512,7 @@ bool NyquistEffect::Init()
// EffectType may not be defined in script, so // EffectType may not be defined in script, so
// reset each time we call the Nyquist Prompt. // reset each time we call the Nyquist Prompt.
if (mIsPrompt) { if (mIsPrompt) {
mName = XO("Nyquist Prompt"); mName = XO("Nyquist Effects Prompt");
// Reset effect type each time we call the Nyquist Prompt. // Reset effect type each time we call the Nyquist Prompt.
mType = EffectTypeProcess; mType = EffectTypeProcess;
mIsSpectral = false; mIsSpectral = false;

4
src/effects/nyquist/Nyquist.h
View File

@ -34,7 +34,7 @@
name into another alphabet. */ name into another alphabet. */
#define NYQUISTEFFECTS_FAMILY ( IdentInterfaceSymbol{ XO("Nyquist") } ) #define NYQUISTEFFECTS_FAMILY ( IdentInterfaceSymbol{ XO("Nyquist") } )
#define NYQUIST_PROMPT_ID wxT("Nyquist Prompt") #define NYQUIST_PROMPT_ID wxT("Nyquist Effects Prompt")
#define NYQUIST_TOOLS_PROMPT_ID wxT("Nyquist Tools Prompt") #define NYQUIST_TOOLS_PROMPT_ID wxT("Nyquist Tools Prompt")
#define NYQUIST_WORKER_ID wxT("Nyquist Worker") #define NYQUIST_WORKER_ID wxT("Nyquist Worker")
@ -219,7 +219,7 @@ private:
bool mExternal; bool mExternal;
bool mIsSpectral; bool mIsSpectral;
/** True if the code to execute is obtained interactively from the user via /** True if the code to execute is obtained interactively from the user via
* the "Nyquist Prompt", or "Nyquist Tools Prompt", false for all other effects (lisp code read from * the "Nyquist Effect Prompt", or "Nyquist Tools Prompt", false for all other effects (lisp code read from
* files) * files)
*/ */
bool mIsPrompt; bool mIsPrompt;