mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Projucer: Always initially disable "Use global path" when adding a module from a specified folder

Browse source
This commit is contained in:
ed 2017-07-04 10:30:48 +01:00
parent 98092a7384
commit 18c0e37f43
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
extras/Projucer/Source/Project/jucer_Module.cpp
View file

@ -929,7 +929,7 @@ void EnabledModuleList::addModuleFromUserSelectedFile()
if (fc.browseForDirectory())
{
lastLocation = fc.getResult();
addModuleOfferingToCopy (lastLocation);
addModuleOfferingToCopy (lastLocation, true);
}
}
@ -958,7 +958,7 @@ void EnabledModuleList::addModuleInteractive (const String& moduleID)
addModuleFromUserSelectedFile();
}
void EnabledModuleList::addModuleOfferingToCopy (const File& f)
void EnabledModuleList::addModuleOfferingToCopy (const File& f, bool isFromUserSpecifiedFolder)
{
ModuleDescription m (f);
@ -976,7 +976,8 @@ void EnabledModuleList::addModuleOfferingToCopy (const File& f)
return;
}
addModule (m.moduleFolder, areMostModulesCopiedLocally(), areMostModulesUsingGlobalPath());
addModule (m.moduleFolder, areMostModulesCopiedLocally(), isFromUserSpecifiedFolder ? false
: areMostModulesUsingGlobalPath());
}
bool isJuceFolder (const File& f)

2
extras/Projucer/Source/Project/jucer_Module.h
View file

@ -155,7 +155,7 @@ public:
void addModule (const File& moduleManifestFile, bool copyLocally, bool useGlobalPath);
void addModuleInteractive (const String& moduleID);
void addModuleFromUserSelectedFile();
void addModuleOfferingToCopy (const File&);
void addModuleOfferingToCopy (const File&, bool isFromUserSpecifiedFolder);
StringArray getAllModules() const;
StringArray getExtraDependenciesNeeded (const String& moduleID) const;