Browse Source

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

tags/2021-05-28
ed 8 years ago
parent
commit
18c0e37f43
2 changed files with 5 additions and 4 deletions
  1. +4
    -3
      extras/Projucer/Source/Project/jucer_Module.cpp
  2. +1
    -1
      extras/Projucer/Source/Project/jucer_Module.h

+ 4
- 3
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)


+ 1
- 1
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;


Loading…
Cancel
Save