TianZD
/
QtXlsxWriter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Don't lost theme colors when edit exist .xlxs files

master
Debao Zhang 12 years ago
parent
af4de1afdb
commit
9b0eb98048
4 changed files with 81 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      src/xlsx/xlsxformat.cpp
  2. 20
      src/xlsx/xlsxformat_p.h
  3. 78
      src/xlsx/xlsxstyles.cpp
  4. 4
      src/xlsx/xlsxstyles_p.h

5
src/xlsx/xlsxformat.cpp
View File

@ -219,6 +219,11 @@ void Format::setFontStrikeOut(bool strikeOut)
QColor Format::fontColor() const QColor Format::fontColor() const
{ {
Q_D(const Format); Q_D(const Format);
if (!d->fontData.color.isValid() && !d->fontData.themeColor.isEmpty()) {
//!Todo, get the real color from the theme{1}.xml file
//The same is ture for border and fill colord
return QColor();
}
return d->fontData.color; return d->fontData.color;
} }

20
src/xlsx/xlsxformat_p.h
View File

@ -53,6 +53,7 @@ struct FontData
bool italic; bool italic;
bool strikeOut; bool strikeOut;
QColor color; QColor color;
QString themeColor;
bool bold; bool bold;
Format::FontScript scirpt; Format::FontScript scirpt;
Format::FontUnderline underline; Format::FontUnderline underline;
@ -70,7 +71,7 @@ struct FontData
if (_dirty) { if (_dirty) {
QByteArray key; QByteArray key;
QDataStream stream(&key, QIODevice::WriteOnly); QDataStream stream(&key, QIODevice::WriteOnly);
stream<<bold<<charset<<color<<condense stream<<bold<<charset<<color<<themeColor<<condense
<<extend<<family<<italic<<name <<extend<<family<<italic<<name
<<outline<<scheme<<scirpt<<shadow <<outline<<scheme<<scirpt<<shadow
<<size<<strikeOut<<underline; <<size<<strikeOut<<underline;
@ -141,6 +142,11 @@ struct BorderData
QColor topColor; QColor topColor;
QColor bottomColor; QColor bottomColor;
QColor diagonalColor; QColor diagonalColor;
QString leftThemeColor;
QString rightThemeColor;
QString topThemeColor;
QString bottomThemeColor;
QString diagonalThemeColor;
Format::DiagonalBorderType diagonalType; Format::DiagonalBorderType diagonalType;
QByteArray key() const QByteArray key() const
@ -148,9 +154,9 @@ struct BorderData
if (_dirty) { if (_dirty) {
QByteArray key; QByteArray key;
QDataStream stream(&key, QIODevice::WriteOnly); QDataStream stream(&key, QIODevice::WriteOnly);
stream << bottom << bottomColor << top << topColor stream << bottom << bottomColor << bottomThemeColor << top << topColor << topThemeColor
<< diagonal << diagonalColor << diagonalType << diagonal << diagonalColor << diagonalThemeColor << diagonalType
<< left << leftColor << right << rightColor; << left << leftColor << leftThemeColor << right << rightColor << rightThemeColor;
const_cast<BorderData*>(this)->_key = key; const_cast<BorderData*>(this)->_key = key;
const_cast<BorderData*>(this)->_dirty = false; const_cast<BorderData*>(this)->_dirty = false;
const_cast<BorderData*>(this)->_indexValid = false; const_cast<BorderData*>(this)->_indexValid = false;
@ -192,13 +198,17 @@ struct FillData {
Format::FillPattern pattern; Format::FillPattern pattern;
QColor bgColor; QColor bgColor;
QColor fgColor; QColor fgColor;
QString bgThemeColor;
QString fgThemeColor;
QByteArray key() const QByteArray key() const
{ {
if (_dirty) { if (_dirty) {
QByteArray key; QByteArray key;
QDataStream stream(&key, QIODevice::WriteOnly); QDataStream stream(&key, QIODevice::WriteOnly);
stream<<bgColor<<fgColor<<pattern; stream<< bgColor << bgThemeColor
<< fgColor << fgThemeColor
<< pattern;
const_cast<FillData*>(this)->_key = key; const_cast<FillData*>(this)->_key = key;
const_cast<FillData*>(this)->_dirty = false; const_cast<FillData*>(this)->_dirty = false;
const_cast<FillData*>(this)->_indexValid = false; const_cast<FillData*>(this)->_indexValid = false;

78
src/xlsx/xlsxstyles.cpp
View File

@ -322,6 +322,12 @@ void Styles::writeFonts(XmlStreamWriter &writer)
writer.writeEmptyElement(QStringLiteral("color")); writer.writeEmptyElement(QStringLiteral("color"));
QString color = font->color.name(); QString color = font->color.name();
writer.writeAttribute(QStringLiteral("rgb"), QStringLiteral("FF")+color.mid(1));//remove # writer.writeAttribute(QStringLiteral("rgb"), QStringLiteral("FF")+color.mid(1));//remove #
} else if (!font->themeColor.isEmpty()) {
writer.writeEmptyElement(QStringLiteral("color"));
QStringList themes = font->themeColor.split(QLatin1Char(':'));
writer.writeAttribute(QStringLiteral("theme"), themes[0]);
if (!themes[1].isEmpty())
writer.writeAttribute(QStringLiteral("tint"), themes[1]);
} }
writer.writeEmptyElement(QStringLiteral("name")); writer.writeEmptyElement(QStringLiteral("name"));
@ -413,10 +419,22 @@ void Styles::writeFill(XmlStreamWriter &writer, FillData *fill)
if (fill->fgColor.isValid()) { if (fill->fgColor.isValid()) {
writer.writeEmptyElement(fill->pattern == Format::PatternSolid ? QStringLiteral("bgColor") : QStringLiteral("fgColor")); writer.writeEmptyElement(fill->pattern == Format::PatternSolid ? QStringLiteral("bgColor") : QStringLiteral("fgColor"));
writer.writeAttribute(QStringLiteral("rgb"), QStringLiteral("FF")+fill->fgColor.name().mid(1)); writer.writeAttribute(QStringLiteral("rgb"), QStringLiteral("FF")+fill->fgColor.name().mid(1));
} else if (!fill->fgThemeColor.isEmpty()) {
writer.writeEmptyElement(QStringLiteral("fgColor"));
QStringList themes = fill->fgThemeColor.split(QLatin1Char(':'));
writer.writeAttribute(QStringLiteral("theme"), themes[0]);
if (!themes[1].isEmpty())
writer.writeAttribute(QStringLiteral("tint"), themes[1]);
} }
if (fill->bgColor.isValid()) { if (fill->bgColor.isValid()) {
writer.writeEmptyElement(fill->pattern == Format::PatternSolid ? QStringLiteral("fgColor") : QStringLiteral("bgColor")); writer.writeEmptyElement(fill->pattern == Format::PatternSolid ? QStringLiteral("fgColor") : QStringLiteral("bgColor"));
writer.writeAttribute(QStringLiteral("rgb"), QStringLiteral("FF")+fill->bgColor.name().mid(1)); writer.writeAttribute(QStringLiteral("rgb"), QStringLiteral("FF")+fill->bgColor.name().mid(1));
} else if (!fill->bgThemeColor.isEmpty()) {
writer.writeEmptyElement(QStringLiteral("bgColor"));
QStringList themes = fill->bgThemeColor.split(QLatin1Char(':'));
writer.writeAttribute(QStringLiteral("theme"), themes[0]);
if (!themes[1].isEmpty())
writer.writeAttribute(QStringLiteral("tint"), themes[1]);
} }
writer.writeEndElement();//patternFill writer.writeEndElement();//patternFill
@ -439,20 +457,20 @@ void Styles::writeBorders(XmlStreamWriter &writer)
writer.writeAttribute(QStringLiteral("diagonalUp"), QStringLiteral("1")); writer.writeAttribute(QStringLiteral("diagonalUp"), QStringLiteral("1"));
writer.writeAttribute(QStringLiteral("diagonalDown"), QStringLiteral("1")); writer.writeAttribute(QStringLiteral("diagonalDown"), QStringLiteral("1"));
} }
writeSubBorder(writer, QStringLiteral("left"), border->left, border->leftColor); writeSubBorder(writer, QStringLiteral("left"), border->left, border->leftColor, border->leftThemeColor);
writeSubBorder(writer, QStringLiteral("right"), border->right, border->rightColor); writeSubBorder(writer, QStringLiteral("right"), border->right, border->rightColor, border->rightThemeColor);
writeSubBorder(writer, QStringLiteral("top"), border->top, border->topColor); writeSubBorder(writer, QStringLiteral("top"), border->top, border->topColor, border->topThemeColor);
writeSubBorder(writer, QStringLiteral("bottom"), border->bottom, border->bottomColor); writeSubBorder(writer, QStringLiteral("bottom"), border->bottom, border->bottomColor, border->bottomThemeColor);
// if (!format->isDxfFormat()) { // if (!format->isDxfFormat()) {
writeSubBorder(writer, QStringLiteral("diagonal"), border->diagonal, border->diagonalColor); writeSubBorder(writer, QStringLiteral("diagonal"), border->diagonal, border->diagonalColor, border->diagonalThemeColor);
// } // }
writer.writeEndElement();//border writer.writeEndElement();//border
} }
writer.writeEndElement();//borders writer.writeEndElement();//borders
} }
void Styles::writeSubBorder(XmlStreamWriter &writer, const QString &type, int style, const QColor &color) void Styles::writeSubBorder(XmlStreamWriter &writer, const QString &type, int style, const QColor &color, const QString &themeColor)
{ {
if (style == Format::BorderNone) { if (style == Format::BorderNone) {
writer.writeEmptyElement(type); writer.writeEmptyElement(type);
@ -480,10 +498,16 @@ void Styles::writeSubBorder(XmlStreamWriter &writer, const QString &type, int st
writer.writeStartElement(type); writer.writeStartElement(type);
writer.writeAttribute(QStringLiteral("style"), stylesString[style]); writer.writeAttribute(QStringLiteral("style"), stylesString[style]);
writer.writeEmptyElement(QStringLiteral("color")); writer.writeEmptyElement(QStringLiteral("color"));
if (color.isValid()) if (color.isValid()) {
writer.writeAttribute(QStringLiteral("rgb"), QStringLiteral("FF")+color.name().mid(1)); //remove # writer.writeAttribute(QStringLiteral("rgb"), QStringLiteral("FF")+color.name().mid(1)); //remove #
else } else if (!themeColor.isEmpty()) {
QStringList themes = themeColor.split(QLatin1Char(':'));
writer.writeAttribute(QStringLiteral("theme"), themes[0]);
if (!themes[1].isEmpty())
writer.writeAttribute(QStringLiteral("tint"), themes[1]);
} else {
writer.writeAttribute(QStringLiteral("auto"), QStringLiteral("1")); writer.writeAttribute(QStringLiteral("auto"), QStringLiteral("1"));
}
writer.writeEndElement();//type writer.writeEndElement();//type
} }
@ -623,7 +647,9 @@ bool Styles::readFonts(XmlStreamReader &reader)
} else if (attributes.hasAttribute(QLatin1String("indexed"))) { } else if (attributes.hasAttribute(QLatin1String("indexed"))) {
font->color = getColorByIndex(attributes.value(QLatin1String("indexed")).toInt()); font->color = getColorByIndex(attributes.value(QLatin1String("indexed")).toInt());
} else if (attributes.hasAttribute(QLatin1String("theme"))) { } else if (attributes.hasAttribute(QLatin1String("theme"))) {
QString theme = attributes.value(QLatin1String("theme")).toString();
QString tint = attributes.value(QLatin1String("tint")).toString();
font->themeColor = theme + QLatin1Char(':') + tint;
} }
} else if (reader.name() == QLatin1String("name")) { } else if (reader.name() == QLatin1String("name")) {
font->name = reader.attributes().value(QLatin1String("val")).toString(); font->name = reader.attributes().value(QLatin1String("val")).toString();
@ -696,10 +722,15 @@ bool Styles::readFill(XmlStreamReader &reader)
} else if (reader.name() == QLatin1String("fgColor")) { } else if (reader.name() == QLatin1String("fgColor")) {
QXmlStreamAttributes attributes = reader.attributes(); QXmlStreamAttributes attributes = reader.attributes();
QColor c; QColor c;
if (attributes.hasAttribute(QLatin1String("rgb"))) if (attributes.hasAttribute(QLatin1String("rgb"))) {
c = fromARGBString(attributes.value(QLatin1String("rgb")).toString()); c = fromARGBString(attributes.value(QLatin1String("rgb")).toString());
else if (attributes.hasAttribute(QLatin1String("indexed"))) } else if (attributes.hasAttribute(QLatin1String("indexed"))) {
c = getColorByIndex(attributes.value(QLatin1String("indexed")).toInt()); c = getColorByIndex(attributes.value(QLatin1String("indexed")).toInt());
} else if (attributes.hasAttribute(QLatin1String("theme"))) {
QString theme = attributes.value(QLatin1String("theme")).toString();
QString tint = attributes.value(QLatin1String("tint")).toString();
fill->fgThemeColor = theme + QLatin1Char(':') + tint;
}
if (fill->pattern == Format::PatternSolid) if (fill->pattern == Format::PatternSolid)
fill->bgColor = c; fill->bgColor = c;
else else
@ -707,10 +738,15 @@ bool Styles::readFill(XmlStreamReader &reader)
} else if (reader.name() == QLatin1String("bgColor")) { } else if (reader.name() == QLatin1String("bgColor")) {
QXmlStreamAttributes attributes = reader.attributes(); QXmlStreamAttributes attributes = reader.attributes();
QColor c; QColor c;
if (attributes.hasAttribute(QLatin1String("rgb"))) if (attributes.hasAttribute(QLatin1String("rgb"))) {
c = fromARGBString(attributes.value(QLatin1String("rgb")).toString()); c = fromARGBString(attributes.value(QLatin1String("rgb")).toString());
else if (attributes.hasAttribute(QLatin1String("indexed"))) } else if (attributes.hasAttribute(QLatin1String("indexed"))) {
c = getColorByIndex(attributes.value(QLatin1String("indexed")).toInt()); c = getColorByIndex(attributes.value(QLatin1String("indexed")).toInt());
} else if (attributes.hasAttribute(QLatin1String("theme"))) {
QString theme = attributes.value(QLatin1String("theme")).toString();
QString tint = attributes.value(QLatin1String("tint")).toString();
fill->bgThemeColor = theme + QLatin1Char(':') + tint;
}
if (fill->pattern == Format::PatternSolid) if (fill->pattern == Format::PatternSolid)
fill->fgColor = c; fill->fgColor = c;
else else
@ -762,15 +798,15 @@ bool Styles::readBorder(XmlStreamReader &reader)
while((reader.readNextStartElement(), true)) { //read until border endelement while((reader.readNextStartElement(), true)) { //read until border endelement
if (reader.tokenType() == QXmlStreamReader::StartElement) { if (reader.tokenType() == QXmlStreamReader::StartElement) {
if (reader.name() == QLatin1String("left")) if (reader.name() == QLatin1String("left"))
readSubBorder(reader, reader.name().toString(), border->left, border->leftColor); readSubBorder(reader, reader.name().toString(), border->left, border->leftColor, border->leftThemeColor);
else if (reader.name() == QLatin1String("right")) else if (reader.name() == QLatin1String("right"))
readSubBorder(reader, reader.name().toString(), border->right, border->rightColor); readSubBorder(reader, reader.name().toString(), border->right, border->rightColor, border->rightThemeColor);
else if (reader.name() == QLatin1String("top")) else if (reader.name() == QLatin1String("top"))
readSubBorder(reader, reader.name().toString(), border->top, border->topColor); readSubBorder(reader, reader.name().toString(), border->top, border->topColor, border->topThemeColor);
else if (reader.name() == QLatin1String("bottom")) else if (reader.name() == QLatin1String("bottom"))
readSubBorder(reader, reader.name().toString(), border->bottom, border->bottomColor); readSubBorder(reader, reader.name().toString(), border->bottom, border->bottomColor, border->bottomThemeColor);
else if (reader.name() == QLatin1String("diagonal")) else if (reader.name() == QLatin1String("diagonal"))
readSubBorder(reader, reader.name().toString(), border->diagonal, border->diagonalColor); readSubBorder(reader, reader.name().toString(), border->diagonal, border->diagonalColor, border->diagonalThemeColor);
} }
if (reader.tokenType() == QXmlStreamReader::EndElement && reader.name() == QLatin1String("border")) if (reader.tokenType() == QXmlStreamReader::EndElement && reader.name() == QLatin1String("border"))
@ -784,7 +820,7 @@ bool Styles::readBorder(XmlStreamReader &reader)
return true; return true;
} }
bool Styles::readSubBorder(XmlStreamReader &reader, const QString &name, Format::BorderStyle &style, QColor &color) bool Styles::readSubBorder(XmlStreamReader &reader, const QString &name, Format::BorderStyle &style, QColor &color, QString &themeColor)
{ {
Q_ASSERT(reader.name() == name); Q_ASSERT(reader.name() == name);
@ -822,6 +858,10 @@ bool Styles::readSubBorder(XmlStreamReader &reader, const QString &name, Format:
color = fromARGBString(colorString); color = fromARGBString(colorString);
} else if (colorAttrs.hasAttribute(QLatin1String("indexed"))) { } else if (colorAttrs.hasAttribute(QLatin1String("indexed"))) {
color = getColorByIndex(colorAttrs.value(QLatin1String("indexed")).toInt()); color = getColorByIndex(colorAttrs.value(QLatin1String("indexed")).toInt());
} else if (colorAttrs.hasAttribute(QLatin1String("theme"))) {
QString theme = attributes.value(QLatin1String("theme")).toString();
QString tint = attributes.value(QLatin1String("tint")).toString();
themeColor = theme + QLatin1Char(':') + tint;
} }
} }

4
src/xlsx/xlsxstyles_p.h
View File

@ -70,7 +70,7 @@ private:
void writeFills(XmlStreamWriter &writer); void writeFills(XmlStreamWriter &writer);
void writeFill(XmlStreamWriter &writer, FillData *fill); void writeFill(XmlStreamWriter &writer, FillData *fill);
void writeBorders(XmlStreamWriter &writer); void writeBorders(XmlStreamWriter &writer);
void writeSubBorder(XmlStreamWriter &writer, const QString &type, int style, const QColor &color); void writeSubBorder(XmlStreamWriter &writer, const QString &type, int style, const QColor &color, const QString &themeColor);
void writeCellXfs(XmlStreamWriter &writer); void writeCellXfs(XmlStreamWriter &writer);
void writeDxfs(XmlStreamWriter &writer); void writeDxfs(XmlStreamWriter &writer);
@ -80,7 +80,7 @@ private:
bool readFill(XmlStreamReader &reader); bool readFill(XmlStreamReader &reader);
bool readBorders(XmlStreamReader &reader); bool readBorders(XmlStreamReader &reader);
bool readBorder(XmlStreamReader &reader); bool readBorder(XmlStreamReader &reader);
bool readSubBorder(XmlStreamReader &reader, const QString &name, Format::BorderStyle &style, QColor &color); bool readSubBorder(XmlStreamReader &reader, const QString &name, Format::BorderStyle &style, QColor &color, QString &themeColor);
bool readCellXfs(XmlStreamReader &reader); bool readCellXfs(XmlStreamReader &reader);
bool readColors(XmlStreamReader &reader); bool readColors(XmlStreamReader &reader);
bool readIndexedColors(XmlStreamReader &reader); bool readIndexedColors(XmlStreamReader &reader);

Write Preview
Loading…
Cancel
Save