audacia
/
audacia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

EffectManager returns TranslatableString for family and vendor

This commit is contained in:
Paul Licameli 2019-12-12 15:23:53 -05:00
parent 70ec69fa3d
commit aac50ae36e
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/effects/EffectManager.cpp
View File

@ -300,19 +300,19 @@ wxString EffectManager::GetCommandName(const PluginID & ID)
return GetCommandSymbol(ID).Translation();
}
wxString EffectManager::GetEffectFamilyName(const PluginID & ID)
TranslatableString EffectManager::GetEffectFamilyName(const PluginID & ID)
{
auto effect = GetEffect(ID);
if (effect)
return effect->GetFamily().Translation();
return effect->GetFamily().Msgid();
return {};
}
wxString EffectManager::GetVendorName(const PluginID & ID)
TranslatableString EffectManager::GetVendorName(const PluginID & ID)
{
auto effect = GetEffect(ID);
if (effect)
return effect->GetVendor().Translation();
return effect->GetVendor().Msgid();
return {};
}

4
src/effects/EffectManager.h
View File

@ -93,8 +93,8 @@ public:
NotifyingSelectedRegion &selectedRegion,
bool shouldPrompt = true);
wxString GetEffectFamilyName(const PluginID & ID);
wxString GetVendorName(const PluginID & ID);
TranslatableString GetEffectFamilyName(const PluginID & ID);
TranslatableString GetVendorName(const PluginID & ID);
/** Run a command given the plugin ID */
// Returns true on success.

24
src/menus/PluginMenus.cpp
View File

@ -74,8 +74,8 @@ bool CompareEffectsByPublisher(
const PluginDescriptor *a, const PluginDescriptor *b)
{
auto &em = EffectManager::Get();
auto akey = em.GetVendorName(a->GetID());
auto bkey = em.GetVendorName(b->GetID());
auto akey = em.GetVendorName(a->GetID()).Translation();
auto bkey = em.GetVendorName(b->GetID()).Translation();
if (akey.empty())
{
@ -99,8 +99,8 @@ bool CompareEffectsByPublisherAndName(
const PluginDescriptor *a, const PluginDescriptor *b)
{
auto &em = EffectManager::Get();
auto akey = em.GetVendorName(a->GetID());
auto bkey = em.GetVendorName(b->GetID());
auto akey = em.GetVendorName(a->GetID()).Translation();
auto bkey = em.GetVendorName(b->GetID()).Translation();
if (a->IsEffectDefault())
{
@ -124,8 +124,8 @@ bool CompareEffectsByTypeAndName(
const PluginDescriptor *a, const PluginDescriptor *b)
{
auto &em = EffectManager::Get();
auto akey = em.GetEffectFamilyName(a->GetID());
auto bkey = em.GetEffectFamilyName(b->GetID());
auto akey = em.GetEffectFamilyName(a->GetID()).Translation();
auto bkey = em.GetEffectFamilyName(b->GetID()).Translation();
if (akey.empty())
{
@ -157,8 +157,8 @@ bool CompareEffectsByTypeAndName(
bool CompareEffectsByType(const PluginDescriptor *a, const PluginDescriptor *b)
{
auto &em = EffectManager::Get();
auto akey = em.GetEffectFamilyName(a->GetID());
auto bkey = em.GetEffectFamilyName(b->GetID());
auto akey = em.GetEffectFamilyName(a->GetID()).Translation();
auto bkey = em.GetEffectFamilyName(b->GetID()).Translation();
if (akey.empty())
{
@ -231,7 +231,7 @@ void AddEffectMenuItems(
if (groupBy == wxT("groupby:publisher"))
{
current = EffectManager::Get().GetVendorName(plug->GetID());
current = EffectManager::Get().GetVendorName(plug->GetID()).Translation();
if (current.empty())
{
current = _("Unknown");
@ -239,7 +239,7 @@ void AddEffectMenuItems(
}
else if (groupBy == wxT("groupby:type"))
{
current = EffectManager::Get().GetEffectFamilyName(plug->GetID());
current = EffectManager::Get().GetEffectFamilyName(plug->GetID()).Translation();
if (current.empty())
{
current = _("Unknown");
@ -300,11 +300,11 @@ void AddEffectMenuItems(
wxString group;
if (groupBy == wxT("sortby:publisher:name"))
{
group = EffectManager::Get().GetVendorName(plug->GetID());
group = EffectManager::Get().GetVendorName(plug->GetID()).Translation();
}
else if (groupBy == wxT("sortby:type:name"))
{
group = EffectManager::Get().GetEffectFamilyName(plug->GetID());
group = EffectManager::Get().GetEffectFamilyName(plug->GetID()).Translation();
}
if (plug->IsEffectDefault())