Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 22195 → Rev 22196

/trunk/Scribus/scribus/prefsmanager.cpp
436,7 → 436,7
// lorem ipsum defaults
appPrefs.miscPrefs.useStandardLI = false;
appPrefs.miscPrefs.paragraphsLI = 10;
initDefaultCheckerPrefs(&appPrefs.verifierPrefs.checkerPrefsList);
initDefaultCheckerPrefs(appPrefs.verifierPrefs.checkerPrefsList);
appPrefs.verifierPrefs.curCheckProfile = CommonStrings::PDF_1_4;
appPrefs.verifierPrefs.showPagesWithoutErrors=false;
appPrefs.verifierPrefs.showNonPrintingLayerErrors=false;
943,7 → 943,7
ReadPrefsXML();
if (appPrefs.verifierPrefs.checkerPrefsList.count() == 0)
{
initDefaultCheckerPrefs(&appPrefs.verifierPrefs.checkerPrefsList);
initDefaultCheckerPrefs(appPrefs.verifierPrefs.checkerPrefsList);
appPrefs.verifierPrefs.curCheckProfile = CommonStrings::PDF_1_4;
}
if (!appPrefs.uiPrefs.mainWinState.isEmpty())
2711,54 → 2711,66
return true;
}
 
void PrefsManager::initDefaultCheckerPrefs(CheckerPrefsList* cp)
void PrefsManager::initDefaultCheckerPrefs(CheckerPrefsList& cp)
{
if (cp!=NULL)
struct CheckerPrefs checkerSettings;
checkerSettings.ignoreErrors = false;
checkerSettings.autoCheck = true;
checkerSettings.checkGlyphs = true;
checkerSettings.checkOrphans = true;
checkerSettings.checkOverflow = true;
checkerSettings.checkPictures = true;
checkerSettings.checkResolution = true;
checkerSettings.checkPartFilledImageFrames = false;
checkerSettings.checkTransparency = true;
checkerSettings.checkAnnotations = false;
checkerSettings.checkRasterPDF = true;
checkerSettings.checkForGIF = true;
checkerSettings.ignoreOffLayers = false;
checkerSettings.checkOffConflictLayers = false;
checkerSettings.minResolution = 144.0;
checkerSettings.maxResolution = 2400.0;
checkerSettings.checkNotCMYKOrSpot = false;
checkerSettings.checkDeviceColorsAndOutputIntent = false;
checkerSettings.checkFontNotEmbedded = false;
checkerSettings.checkFontIsOpenType = false;
checkerSettings.checkAppliedMasterDifferentSide = true;
checkerSettings.checkEmptyTextFrames = true;
//TODO Stop translating these into settings!!!!!!!!!
cp.insert(CommonStrings::PostScript, checkerSettings);
checkerSettings.checkFontNotEmbedded = true;
checkerSettings.checkFontIsOpenType = true;
cp.insert(CommonStrings::PDF_1_3 , checkerSettings);
checkerSettings.checkTransparency = false;
cp.insert(CommonStrings::PDF_1_4 , checkerSettings);
cp.insert(CommonStrings::PDF_1_5 , checkerSettings);
checkerSettings.checkTransparency = true;
checkerSettings.checkAnnotations = true;
checkerSettings.minResolution = 144.0;
checkerSettings.checkDeviceColorsAndOutputIntent = true;
cp.insert(CommonStrings::PDF_X3 , checkerSettings);
checkerSettings.checkNotCMYKOrSpot = true;
checkerSettings.checkDeviceColorsAndOutputIntent = false;
cp.insert(CommonStrings::PDF_X1a , checkerSettings);
checkerSettings.checkNotCMYKOrSpot = false;
checkerSettings.checkDeviceColorsAndOutputIntent = true;
checkerSettings.checkTransparency = false;
checkerSettings.checkFontIsOpenType = false;
cp.insert(CommonStrings::PDF_X4 , checkerSettings);
}
 
void PrefsManager::insertMissingCheckerProfiles(CheckerPrefsList& cp)
{
CheckerPrefsList defaultList;
initDefaultCheckerPrefs(defaultList);
 
CheckerPrefsList::const_iterator it = defaultList.constBegin();
for (; it != defaultList.constEnd(); ++it)
{
struct CheckerPrefs checkerSettings;
checkerSettings.ignoreErrors = false;
checkerSettings.autoCheck = true;
checkerSettings.checkGlyphs = true;
checkerSettings.checkOrphans = true;
checkerSettings.checkOverflow = true;
checkerSettings.checkPictures = true;
checkerSettings.checkResolution = true;
checkerSettings.checkPartFilledImageFrames = false;
checkerSettings.checkTransparency = true;
checkerSettings.checkAnnotations = false;
checkerSettings.checkRasterPDF = true;
checkerSettings.checkForGIF = true;
checkerSettings.ignoreOffLayers = false;
checkerSettings.checkOffConflictLayers = false;
checkerSettings.minResolution = 144.0;
checkerSettings.maxResolution = 2400.0;
checkerSettings.checkNotCMYKOrSpot = false;
checkerSettings.checkDeviceColorsAndOutputIntent = false;
checkerSettings.checkFontNotEmbedded = false;
checkerSettings.checkFontIsOpenType = false;
checkerSettings.checkAppliedMasterDifferentSide = true;
checkerSettings.checkEmptyTextFrames = true;
//TODO Stop translating these into settings!!!!!!!!!
cp->insert( CommonStrings::PostScript, checkerSettings);
checkerSettings.checkFontNotEmbedded = true;
checkerSettings.checkFontIsOpenType = true;
cp->insert( CommonStrings::PDF_1_3 , checkerSettings);
checkerSettings.checkTransparency = false;
cp->insert( CommonStrings::PDF_1_4 , checkerSettings);
cp->insert( CommonStrings::PDF_1_5 , checkerSettings);
checkerSettings.checkTransparency = true;
checkerSettings.checkAnnotations = true;
checkerSettings.minResolution = 144.0;
checkerSettings.checkDeviceColorsAndOutputIntent = true;
cp->insert( CommonStrings::PDF_X3 , checkerSettings);
checkerSettings.checkNotCMYKOrSpot = true;
checkerSettings.checkDeviceColorsAndOutputIntent = false;
cp->insert( CommonStrings::PDF_X1a , checkerSettings);
checkerSettings.checkNotCMYKOrSpot = false;
checkerSettings.checkDeviceColorsAndOutputIntent = true;
checkerSettings.checkTransparency = false;
checkerSettings.checkFontIsOpenType = false;
cp->insert( CommonStrings::PDF_X4 , checkerSettings);
QString name = it.key();
if (cp.contains(name))
continue;
cp.insert(name, it.value());
}
}
 
/trunk/Scribus/scribus/prefsmanager.h
66,11 → 66,17
*/
void initDefaults();
void initDefaultGUIFont(const QFont&);
void initDefaultCheckerPrefs(CheckerPrefsList* cp);
void initDefaultCheckerPrefs(CheckerPrefsList& cp);
void initDefaultActionKeys();
void applyLoadedShortCuts();
void initArrowStyles();
 
/*!
\brief Insert checker profiles not available in specified list
*/
void insertMissingCheckerProfiles(CheckerPrefsList& cp);
 
/*!
\author Craig Bradney
\date Thu 18 Nov 2004
\brief Set the user's preference file location. Rename any existing old preferences files
/trunk/Scribus/scribus/scribus.cpp
3608,9 → 3608,10
HaveDoc++;
if (doc->checkerProfiles().count() == 0)
{
m_prefsManager->initDefaultCheckerPrefs(&(doc->checkerProfiles()));
m_prefsManager->initDefaultCheckerPrefs(doc->checkerProfiles());
doc->setCurCheckProfile(CommonStrings::PDF_1_4);
}
m_prefsManager->insertMissingCheckerProfiles(doc->checkerProfiles());
if (doc->pdfOptions().LPISettings.count() == 0)
{
struct LPIData lpo;