Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-04-24 23:13:42 +02:00
Code Issues Releases Wiki Activity

Changed mods back to modules again.

Browse Source 
Review did not like 'mods'.  Was felt to be too non-standard.  Note that we gained a '?' on a question to the user, an internationalisation hint about the word 'modules' and the words 'the Audacity Manual' (note caps) in making and 'reverting' this change.
This commit is contained in:
james.k.crook@gmail.com
2014-10-12 20:15:24 +00:00
parent 3b13b78c02
commit 0ff355fb49
3 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/LoadModules.cpp
View File

@@ -108,8 +108,8 @@ bool Module::Load()
tVersionFn versionFn = (tVersionFn)(mLib->GetSymbol(wxT(versionFnName))); tVersionFn versionFn = (tVersionFn)(mLib->GetSymbol(wxT(versionFnName)));
if (versionFn == NULL){ if (versionFn == NULL){
wxString ShortName = wxFileName( mName ).GetName(); wxString ShortName = wxFileName( mName ).GetName();
wxMessageBox(wxString::Format(_("The mod %s does not provide a version string.\nIt will not be loaded."), ShortName.c_str()), _("Module Unsuitable")); wxMessageBox(wxString::Format(_("The module %s does not provide a version string.\nIt will not be loaded."), ShortName.c_str()), _("Module Unsuitable"));
wxLogMessage(wxString::Format(_("The mod %s does not provide a version string. It will not be loaded."), mName.c_str())); wxLogMessage(wxString::Format(_("The module %s does not provide a version string. It will not be loaded."), mName.c_str()));
mLib->Unload(); mLib->Unload();
return false; return false;
} }
@@ -117,8 +117,8 @@ bool Module::Load()
wxString moduleVersion = versionFn(); wxString moduleVersion = versionFn();
if( !moduleVersion.IsSameAs(AUDACITY_VERSION_STRING)) { if( !moduleVersion.IsSameAs(AUDACITY_VERSION_STRING)) {
wxString ShortName = wxFileName( mName ).GetName(); wxString ShortName = wxFileName( mName ).GetName();
wxMessageBox(wxString::Format(_("The mod %s is matched with Audacity version %s.\n\nIt will not be loaded."), ShortName.c_str(), moduleVersion.c_str()), _("Module Unsuitable")); wxMessageBox(wxString::Format(_("The module %s is matched with Audacity version %s.\n\nIt will not be loaded."), ShortName.c_str(), moduleVersion.c_str()), _("Module Unsuitable"));
wxLogMessage(wxString::Format(_("The mod %s is matched with Audacity version %s. It will not be loaded."), mName.c_str(), moduleVersion.c_str())); wxLogMessage(wxString::Format(_("The module %s is matched with Audacity version %s. It will not be loaded."), mName.c_str(), moduleVersion.c_str()));
mLib->Unload(); mLib->Unload();
return false; return false;
} }
@@ -201,7 +201,7 @@ void ModuleManager::Initialize(CommandHandler &cmdHandler)
for (i = 0; i < audacityPathList.GetCount(); i++) { for (i = 0; i < audacityPathList.GetCount(); i++) {
wxString prefix = audacityPathList[i] + wxFILE_SEP_PATH; wxString prefix = audacityPathList[i] + wxFILE_SEP_PATH;
wxGetApp().AddUniquePathToPathList(prefix + wxT("mods"), wxGetApp().AddUniquePathToPathList(prefix + wxT("modules"),
pathList); pathList);
} }
@@ -241,11 +241,11 @@ void ModuleManager::Initialize(CommandHandler &cmdHandler)
{ {
wxString ShortName = wxFileName( files[i] ).GetName(); wxString ShortName = wxFileName( files[i] ).GetName();
wxString msg; wxString msg;
msg.Printf(_("Found \"%s\"."), ShortName.c_str()); msg.Printf(_("Module \"%s\" found."), ShortName.c_str());
msg += _("\n\nOnly use mods from trusted sources"); msg += _("\n\nOnly use modules from trusted sources");
const wxChar *buttons[] = {_("Yes"), _("No"), NULL}; // could add a button here for 'yes and remember that', and put it into the cfg file. Needs more thought. const wxChar *buttons[] = {_("Yes"), _("No"), NULL}; // could add a button here for 'yes and remember that', and put it into the cfg file. Needs more thought.
int action; int action;
action = ShowMultiDialog(msg, _("Audacity Mod Loader"), buttons, _("Try and load this mod"), false); action = ShowMultiDialog(msg, _("Audacity Module Loader"), buttons, _("Try and load this module?"), false);
#ifdef EXPERIMENTAL_MODULE_PREFS #ifdef EXPERIMENTAL_MODULE_PREFS
// If we're not prompting always, accept the answer permanantly // If we're not prompting always, accept the answer permanantly
if( iModuleStatus == kModuleNew ){ if( iModuleStatus == kModuleNew ){

28
src/prefs/ModulePrefs.cpp
View File

@@ -4,18 +4,14 @@
ModulePrefs.cpp ModulePrefs.cpp
Brian Gunlogson
Joshua Haberman
Dominic Mazzoni
James Crook James Crook
*******************************************************************//** *******************************************************************//**
\class ModulePrefs \class ModulePrefs
\brief A PrefsPanel to enable/disable certain mods. 'Mods' are \brief A PrefsPanel to enable/disable certain mods. 'Modules' are
modules that modify Audacity. They are plug-ins with names like dynamically linked libraries that modify Audacity. They are plug-ins
mnod-script-pipe that add new features. with names like mnod-script-pipe that add new features.
*//*******************************************************************/ *//*******************************************************************/
@@ -31,9 +27,9 @@ mnod-script-pipe that add new features.
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/* i18n-hint: 'Mods' normally shouldn't be translated. 'Mods' modify the program.*/ /* i18n-hint: Modules are optional extensions to Audacity that add new features.*/
ModulePrefs::ModulePrefs(wxWindow * parent) ModulePrefs::ModulePrefs(wxWindow * parent)
: PrefsPanel(parent, _("Mods")) : PrefsPanel(parent, _("Modules"))
{ {
Populate(); Populate();
} }
@@ -61,7 +57,7 @@ void ModulePrefs::GetAllModuleStatuses(){
// Iterate through all Modules listed in prefs. // Iterate through all Modules listed in prefs.
// Get their names and values. // Get their names and values.
gPrefs->SetPath( wxT("Mod/") ); gPrefs->SetPath( wxT("Module/") );
bool bCont = gPrefs->GetFirstEntry(str, dummy); bool bCont = gPrefs->GetFirstEntry(str, dummy);
while ( bCont ) { while ( bCont ) {
int iStatus; int iStatus;
@@ -102,9 +98,9 @@ void ModulePrefs::PopulateOrExchange(ShuttleGui & S)
S.StartStatic(_("")); S.StartStatic(_(""));
{ {
S.AddFixedText(_("These are experimental mods. Enable them only if you've read the Audacity Manual\nand know what you are doing.") ); S.AddFixedText(_("These are experimental modules. Enable them only if you've read the Audacity Manual\nand know what you are doing.") );
S.AddFixedText(wxString(wxT(" ")) + _("'Ask' means Audacity will ask if you want to load the mod each time it starts.") ); S.AddFixedText(wxString(wxT(" ")) + _("'Ask' means Audacity will ask if you want to load the module each time it starts.") );
S.AddFixedText(wxString(wxT(" ")) + _("'Failed' means Audacity thinks the mod is broken and won't run it.") ); S.AddFixedText(wxString(wxT(" ")) + _("'Failed' means Audacity thinks the module is broken and won't run it.") );
S.AddFixedText(wxString(wxT(" ")) + _("'New' means no choice has been made yet.") ); S.AddFixedText(wxString(wxT(" ")) + _("'New' means no choice has been made yet.") );
S.AddFixedText(_("Changes to these settings only take effect when Audacity starts up.")); S.AddFixedText(_("Changes to these settings only take effect when Audacity starts up."));
S.StartScroller(); S.StartScroller();
@@ -117,7 +113,7 @@ void ModulePrefs::PopulateOrExchange(ShuttleGui & S)
} }
if( mModules.GetCount() < 1 ) if( mModules.GetCount() < 1 )
{ {
S.AddFixedText( _("No mods were found") ); S.AddFixedText( _("No modules were found") );
} }
S.EndScroller(); S.EndScroller();
} }
@@ -141,7 +137,7 @@ int ModulePrefs::GetModuleStatus( wxString fname ){
int iStatus = kModuleNew; int iStatus = kModuleNew;
wxString ShortName = wxFileName( fname ).GetName(); wxString ShortName = wxFileName( fname ).GetName();
wxString PrefName = wxString( wxT("/Mod/") ) + ShortName.Lower(); wxString PrefName = wxString( wxT("/Module/") ) + ShortName.Lower();
gPrefs->Read( PrefName, &iStatus, kModuleNew ); gPrefs->Read( PrefName, &iStatus, kModuleNew );
// fix up a bad status. // fix up a bad status.
@@ -152,7 +148,7 @@ int ModulePrefs::GetModuleStatus( wxString fname ){
void ModulePrefs::SetModuleStatus( wxString fname, int iStatus ){ void ModulePrefs::SetModuleStatus( wxString fname, int iStatus ){
wxString ShortName = wxFileName( fname ).GetName(); wxString ShortName = wxFileName( fname ).GetName();
wxString PrefName = wxString( wxT("/Mod/") ) + ShortName.Lower(); wxString PrefName = wxString( wxT("/Module/") ) + ShortName.Lower();
gPrefs->Write( PrefName, iStatus ); gPrefs->Write( PrefName, iStatus );
gPrefs->Flush(); gPrefs->Flush();
} }

2
win/Projects/mod-script-pipe/mod-script-pipe.vcproj
View File

@@ -136,7 +136,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wxmsw28ud_core.lib wxbase28ud.lib odbc32.lib odbccp32.lib oldnames.lib comctl32.lib rpcrt4.lib wsock32.lib netapi32.lib" AdditionalDependencies="wxmsw28ud_core.lib wxbase28ud.lib odbc32.lib odbccp32.lib oldnames.lib comctl32.lib rpcrt4.lib wsock32.lib netapi32.lib"
OutputFile="$(OutDir)\mods\$(ProjectName).dll" OutputFile="$(OutDir)\modules\$(ProjectName).dll"
AdditionalLibraryDirectories="&quot;$(WXWIN)\lib\vc_dll&quot;" AdditionalLibraryDirectories="&quot;$(WXWIN)\lib\vc_dll&quot;"
GenerateDebugInformation="true" GenerateDebugInformation="true"
RandomizedBaseAddress="1" RandomizedBaseAddress="1"