Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 6207 → Rev 6208

/branches/Version13x/Scribus/scribus/scribuscore.h
92,7 → 92,7
int havePNGAlpha() const {return m_HavePngAlpha;};
int haveTIFFSep() const {return m_HaveTiffSep;};
void getCMSProfiles();
void getCMSProfilesDir(QString pfad);
void getCMSProfilesDir(QString pfad, bool recursive);
bool fileWatcherActive() const;
//Main Window members
/branches/Version13x/Scribus/scribus/scribuscore.cpp
337,7 → 337,7
{
if(profDir.right(1) != "/")
profDir += "/";
getCMSProfilesDir(profDir);
getCMSProfilesDir(profDir, true);
}
}
if ((!PrinterProfiles.isEmpty()) && (!InputProfiles.isEmpty()) && (!MonitorProfiles.isEmpty()))
346,7 → 346,7
m_HaveCMS = false;
}
 
void ScribusCore::getCMSProfilesDir(QString pfad)
void ScribusCore::getCMSProfilesDir(QString pfad, bool recursive)
{
#ifdef HAVE_CMS
QDir d(pfad, "*", QDir::Name, QDir::Files | QDir::Readable | QDir::Dirs | QDir::NoSymLinks);
359,9 → 359,11
for (uint dc = 0; dc < d.count(); ++dc)
{
QFileInfo fi(pfad + "/" + d[dc]);
if (fi.isDir() && d[dc][0] != '.')
if (fi.isDir() && !recursive)
continue;
else if (fi.isDir() && d[dc][0] != '.')
{
getCMSProfilesDir(fi.filePath()+"/");
getCMSProfilesDir(fi.filePath()+"/", true);
continue;
}
 
/branches/Version13x/Scribus/scribus/scribus.cpp
3361,7 → 3361,7
is12doc=true;
}
 
ScCore->getCMSProfilesDir(fi.dirPath(true)+"/");
ScCore->getCMSProfilesDir(fi.dirPath(true)+"/", false);
prefsManager->appPrefs.AvailFonts.AddScalableFonts(fi.dirPath(true)+"/", FName);
prefsManager->appPrefs.AvailFonts.updateFontMap();
doc=new ScribusDoc();