Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 15215 → Rev 15216

/trunk/Scribus/scribus/prefsmanager.cpp
162,7 → 162,7
appPrefs.colorPrefs.DColors.insert("Red", ScColor(0, 255, 255, 0));
appPrefs.colorPrefs.DColors.insert("Yellow", ScColor(0, 0, 255, 0));
appPrefs.colorPrefs.DColors.insert("Magenta", ScColor(0, 255, 0, 0));
appPrefs.colorPrefs.DColorSet = "Scribus-Small";
appPrefs.colorPrefs.DColorSet = "Scribus_Small";
}
else
{
1679,7 → 1679,7
elem.appendChild(cos);
}
QDomElement cosd=docu.createElement("DefaultColorSet");
cosd.setAttribute("NAME",appPrefs.colorPrefs.DColorSet);
cosd.setAttribute("Name",appPrefs.colorPrefs.DColorSet);
elem.appendChild(cosd);
 
QDomElement pdf = docu.createElement("PDF");
/trunk/Scribus/scribus/colorsetmanager.cpp
17,7 → 17,6
#include <QDomElement>
#include <QTextStream>
#include <QByteArray>
//Added by qt3to4:
 
ColorSetManager::ColorSetManager()
{
29,9 → 28,8
 
void ColorSetManager::initialiseDefaultPrefs(struct ApplicationPrefs& appPrefs)
{
QString pfadC = ScPaths::instance().libDir()+"swatches/";
QString pfadC2 = pfadC + "Scribus_Basic.xml";
QFile fiC(pfadC2);
QString defaultSwatch = ScPaths::instance().libDir() + "swatches/" + "Scribus_Basic.xml";
QFile fiC(defaultSwatch);
if (!fiC.exists())
{
appPrefs.colorPrefs.DColors.insert("White", ScColor(0, 0, 0, 0));
45,7 → 43,7
appPrefs.colorPrefs.DColors.insert("Red", ScColor(0, 255, 255, 0));
appPrefs.colorPrefs.DColors.insert("Yellow", ScColor(0, 0, 255, 0));
appPrefs.colorPrefs.DColors.insert("Magenta", ScColor(0, 255, 0, 0));
appPrefs.colorPrefs.DColorSet = "Scribus-Small";
appPrefs.colorPrefs.DColorSet = "Scribus_Small";
}
else
{
58,7 → 56,7
if (ColorEn.startsWith("<?xml version="))
{
QByteArray docBytes("");
loadRawText(pfadC2, docBytes);
loadRawText(defaultSwatch, docBytes);
QString docText("");
docText = QString::fromUtf8(docBytes);
QDomDocument docu("scridoc");