Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-24 08:28:04 +02:00
Code Issues Releases Wiki Activity

Do not breakup default effects into subgroups based on count

Browse Source
This commit is contained in:
lllucius@gmail.com 2014-12-14 16:22:13 +00:00
parent 4903c95b82
commit 07b5a68274
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Menus.cpp
View File

@ -1351,14 +1351,14 @@ void AudacityProject::PopulateEffectsMenu(CommandManager* c,
optplugs.Sort(SortEffectsByName); optplugs.Sort(SortEffectsByName);
} }
AddEffectMenuItems(c, defplugs, batchflags, realflags); AddEffectMenuItems(c, defplugs, batchflags, realflags, true);
if (optplugs.GetCount()) if (optplugs.GetCount())
{ {
c->AddSeparator(); c->AddSeparator();
} }
AddEffectMenuItems(c, optplugs, batchflags, realflags); AddEffectMenuItems(c, optplugs, batchflags, realflags, false);
return; return;
} }
@ -1366,16 +1366,10 @@ void AudacityProject::PopulateEffectsMenu(CommandManager* c,
void AudacityProject::AddEffectMenuItems(CommandManager *c, void AudacityProject::AddEffectMenuItems(CommandManager *c,
EffectPlugs & plugs, EffectPlugs & plugs,
int batchflags, int batchflags,
int realflags) int realflags,
bool isDefault)
{ {
size_t pluginCnt = plugs.GetCount(); size_t pluginCnt = plugs.GetCount();
int perGroup;
#if defined(__WXGTK__)
gPrefs->Read(wxT("/Effects/MaxPerGroup"), &perGroup, 15);
#else
gPrefs->Read(wxT("/Effects/MaxPerGroup"), &perGroup, 0);
#endif
wxString groupBy = gPrefs->Read(wxT("/Effects/GroupBy"), wxT("name")); wxString groupBy = gPrefs->Read(wxT("/Effects/GroupBy"), wxT("name"));
@ -1435,7 +1429,7 @@ void AudacityProject::AddEffectMenuItems(CommandManager *c,
c->BeginSubMenu(last); c->BeginSubMenu(last);
} }
AddEffectMenuItemGroup(c, groupNames, groupPlugs, groupFlags); AddEffectMenuItemGroup(c, groupNames, groupPlugs, groupFlags, isDefault);
if (!last.IsEmpty()) if (!last.IsEmpty())
{ {
@ -1457,7 +1451,7 @@ void AudacityProject::AddEffectMenuItems(CommandManager *c,
{ {
c->BeginSubMenu(current); c->BeginSubMenu(current);
AddEffectMenuItemGroup(c, groupNames, groupPlugs, groupFlags); AddEffectMenuItemGroup(c, groupNames, groupPlugs, groupFlags, isDefault);
c->EndSubMenu(); c->EndSubMenu();
} }
@ -1508,7 +1502,7 @@ void AudacityProject::AddEffectMenuItems(CommandManager *c,
} }
if (groupNames.GetCount() > 0) if (groupNames.GetCount() > 0)
{ {
AddEffectMenuItemGroup(c, groupNames, groupPlugs, groupFlags); AddEffectMenuItemGroup(c, groupNames, groupPlugs, groupFlags, isDefault);
} }
} }
@ -1519,7 +1513,8 @@ void AudacityProject::AddEffectMenuItems(CommandManager *c,
void AudacityProject::AddEffectMenuItemGroup(CommandManager *c, void AudacityProject::AddEffectMenuItemGroup(CommandManager *c,
const wxArrayString & names, const wxArrayString & names,
const PluginIDList & plugs, const PluginIDList & plugs,
const wxArrayInt & flags) const wxArrayInt & flags,
bool isDefault)
{ {
int groupCnt = (int) names.GetCount(); int groupCnt = (int) names.GetCount();
int perGroup; int perGroup;
@ -1530,6 +1525,12 @@ void AudacityProject::AddEffectMenuItemGroup(CommandManager *c,
gPrefs->Read(wxT("/Effects/MaxPerGroup"), &perGroup, 0); gPrefs->Read(wxT("/Effects/MaxPerGroup"), &perGroup, 0);
#endif #endif
// The "default" effects shouldn't be broken into subgroups
if (groupCnt > 0 && isDefault)
{
perGroup = 0;
}
int max = perGroup; int max = perGroup;
int items = perGroup; int items = perGroup;

4
src/Menus.h
View File

@ -39,8 +39,8 @@ void AddEffectsToMenu(CommandManager* c, const EffectSet& effects);
#endif #endif
void PopulateEffectsMenu(CommandManager *c, EffectType type, int batchflags, int realflags); void PopulateEffectsMenu(CommandManager *c, EffectType type, int batchflags, int realflags);
void AddEffectMenuItems(CommandManager *c, EffectPlugs & plugs, int batchflags, int realflags); void AddEffectMenuItems(CommandManager *c, EffectPlugs & plugs, int batchflags, int realflags, bool isDefault);
void AddEffectMenuItemGroup(CommandManager *c, const wxArrayString & names, const PluginIDList & plugs, const wxArrayInt & flags); void AddEffectMenuItemGroup(CommandManager *c, const wxArrayString & names, const PluginIDList & plugs, const wxArrayInt & flags, bool isDefault);
void CreateRecentFilesMenu(CommandManager *c); void CreateRecentFilesMenu(CommandManager *c);
void ModifyUndoMenuItems(); void ModifyUndoMenuItems();
void ModifyToolbarMenus(); void ModifyToolbarMenus();