Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 20640 → Rev 20641

/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
2467,10 → 2467,10
if (attrs.hasAttribute(SCOLOR))
newStyle.setStrokeColor(attrs.valueAsString(SCOLOR, CommonStrings::None));
 
static const QString BCOLOR("BCOLOR");
static const QString BCOLOR("BGCOLOR");
if (attrs.hasAttribute(BCOLOR))
newStyle.setBackColor(attrs.valueAsString(BCOLOR, CommonStrings::None));
static const QString BSHADE("BSHADE");
static const QString BSHADE("BGSHADE");
if (attrs.hasAttribute(BSHADE))
newStyle.setBackShade(attrs.valueAsInt(BSHADE, 100));
 
/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
786,9 → 786,9
if ( ! style.isInhStrokeColor())
docu.writeAttribute("SCOLOR", style.strokeColor());
if ( ! style.isInhBackColor())
docu.writeAttribute("BCOLOR", style.backColor());
docu.writeAttribute("BGCOLOR", style.backColor());
if ( ! style.isInhBackShade())
docu.writeAttribute("BSHADE", style.backShade());
docu.writeAttribute("BGSHADE", style.backShade());
if ( ! style.isInhStrokeShade())
docu.writeAttribute("SSHADE", style.strokeShade());
if ( ! style.isInhShadowXOffset())
/trunk/Scribus/scribus/scribusdoc.cpp
5805,9 → 5805,6
newItem->setFillShade(docPrefsData.itemToolPrefs.textFillColorShade);
newItem->setLineColor(docPrefsData.itemToolPrefs.textLineColor);
newItem->setLineShade(docPrefsData.itemToolPrefs.textLineColorShade);
defaultParagraphStyle.setParent(CommonStrings::DefaultParagraphStyle);
defaultParagraphStyle.charStyle().setParent(CommonStrings::DefaultCharacterStyle);
newItem->itemText.setDefaultStyle(defaultParagraphStyle);
break;
case PageItem::Line:
newItem->PLineArt = Qt::PenStyle(docPrefsData.itemToolPrefs.lineStyle);