Author: jghali
Date: Sun May 31 12:58:12 2020
New Revision: 23868
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23868
Log:
Code cleanup
Modified:
trunk/Scribus/scribus/plugins/gettext/csvim/csvdia.h
trunk/Scribus/scribus/plugins/gettext/csvim/csvim.h
trunk/Scribus/scribus/plugins/gettext/docim/docim.h
trunk/Scribus/scribus/plugins/gettext/docxim/docxim.cpp
trunk/Scribus/scribus/plugins/gettext/docxim/docxim.h
trunk/Scribus/scribus/plugins/gettext/htmlim/htmlim.h
trunk/Scribus/scribus/plugins/gettext/htmlim/htmlreader.cpp
trunk/Scribus/scribus/plugins/gettext/htmlim/htmlreader.h
trunk/Scribus/scribus/plugins/gettext/odt2im/importodt.h
trunk/Scribus/scribus/plugins/gettext/pdbim/pdbim.h
trunk/Scribus/scribus/plugins/gettext/sxwim/stylereader.cpp
trunk/Scribus/scribus/plugins/gettext/sxwim/stylereader.h
trunk/Scribus/scribus/plugins/gettext/sxwim/sxwdia.h
trunk/Scribus/scribus/plugins/gettext/sxwim/sxwim.h
trunk/Scribus/scribus/plugins/gettext/textfilter/textfilter.cpp
trunk/Scribus/scribus/plugins/gettext/textfilter/textfilter.h
trunk/Scribus/scribus/plugins/gettext/textfilter/tfdia.h
trunk/Scribus/scribus/plugins/gettext/txtim/txtim.h
trunk/Scribus/scribus/plugins/gettext/xtgim/fontselectdialog.cpp
trunk/Scribus/scribus/plugins/gettext/xtgim/fontselectdialog.h
trunk/Scribus/scribus/plugins/gettext/xtgim/xtgdialog.h
trunk/Scribus/scribus/plugins/gettext/xtgim/xtgim.h
trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.cpp
trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.h
trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
trunk/Scribus/scribus/plugins/import/odg/importodg.h
Modified: trunk/Scribus/scribus/plugins/gettext/csvim/csvdia.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23868&path=/trunk/Scribus/scribus/plugins/gettext/csvim/csvdia.h
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/csvim/csvdia.h (original)
+++ trunk/Scribus/scribus/plugins/gettext/csvim/csvdia.h Sun May 31
12:58:12 2020
@@ -20,17 +20,18 @@
public:
CsvDialog();
~CsvDialog();
+
QString getFDelim();
QString getVDelim();
bool hasHeader();
bool useVDelim();
private:
- QComboBox* fdelimCombo;
- QComboBox* vdelimCombo;
- QCheckBox* headerCheck;
- QPushButton* okButton;
- QPushButton* cancelButton;
+ QComboBox* fdelimCombo { nullptr };
+ QComboBox* vdelimCombo { nullptr };
+ QCheckBox* headerCheck { nullptr };
+ QPushButton* okButton { nullptr };
+ QPushButton* cancelButton { nullptr };
};
#endif // CSVDIA_H
Modified: trunk/Scribus/scribus/plugins/gettext/csvim/csvim.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23868&path=/trunk/Scribus/scribus/plugins/gettext/csvim/csvim.h
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/csvim/csvim.h (original)
+++ trunk/Scribus/scribus/plugins/gettext/csvim/csvim.h Sun May 31 12:58:12 2020
@@ -31,24 +31,27 @@
CsvIm(const QString& fname, const QString& enc, gtWriter *w, const
QString& fdelim = ",",
const QString& vdelim = "\"", bool hasheader = false, bool usevdelim
= true);
~CsvIm();
+
void setFieldDelimiter(const QString& fdelim);
void setValueDelimiter(const QString& vdelim);
void write();
+
private:
QString fieldDelimiter;
QString valueDelimiter;
- bool hasHeader;
- bool useVDelim;
+ bool hasHeader { false };
+ bool useVDelim { true };
QString filename;
QString encoding;
- gtWriter *writer;
+ gtWriter *writer { nullptr };
QString header;
QString data;
- int rowNumber;
- int colIndex;
- int colCount;
- gtParagraphStyle *pstyleData;
- gtParagraphStyle *pstyleHeader;
+ int rowNumber { 0 };
+ int colIndex { 0 };
+ int colCount { 0 };
+ gtParagraphStyle *pstyleData { nullptr };
+ gtParagraphStyle *pstyleHeader { nullptr };
+
void loadFile();
void parseLine(const QString& line, bool isHeader);
QString toUnicode(const QByteArray& rawText);
Modified: trunk/Scribus/scribus/plugins/gettext/docim/docim.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23868&path=/trunk/Scribus/scribus/plugins/gettext/docim/docim.h
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/docim/docim.h (original)
+++ trunk/Scribus/scribus/plugins/gettext/docim/docim.h Sun May 31 12:58:12 2020
@@ -29,20 +29,23 @@
class DocIm : public QObject
{
Q_OBJECT
+
public:
DocIm(const QString& fname, const QString& enc, bool textOnly, gtWriter
*w);
~DocIm();
+
void write();
bool isRunning();
+
private:
QString filename;
QString encoding;
QBuffer textBuffer;
QBuffer errorBuffer;
- gtWriter *writer;
- QProcess *proc;
- bool failed;
- bool textOnly;
+ gtWriter *writer { nullptr };
+ QProcess *proc { nullptr };
+ bool failed { false };
+ bool textOnly { false };
};
#endif // DOCIM_H
Modified: trunk/Scribus/scribus/plugins/gettext/docxim/docxim.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23868&path=/trunk/Scribus/scribus/plugins/gettext/docxim/docxim.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/docxim/docxim.cpp (original)
+++ trunk/Scribus/scribus/plugins/gettext/docxim/docxim.cpp Sun May 31
12:58:12 2020
@@ -46,11 +46,7 @@
m_item = textItem;
m_prefixName = prefix;
m_append = append;
- themePart = "";
- docPart = "";
- stylePart = "";
- themeFont1 = "";
- themeFont2 = "";
+
uz = new ScZipHandler();
if (!uz->open(fileName))
{
Modified: trunk/Scribus/scribus/plugins/gettext/docxim/docxim.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23868&path=/trunk/Scribus/scribus/plugins/gettext/docxim/docxim.h
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/docxim/docxim.h (original)
+++ trunk/Scribus/scribus/plugins/gettext/docxim/docxim.h Sun May 31
12:58:12 2020
@@ -31,6 +31,7 @@
public:
DocXIm(const QString& fileName, PageItem *textItem, bool
textOnly, bool prefix, bool append);
~DocXIm();
+
private:
void parseContentTypes();
void parseTheme();
@@ -41,16 +42,17 @@
void parsePlainTextOnly(PageItem *textItem);
QString getFontName(const QString& name);
double pixelsFromTwips(double twips);
+
QString themePart;
QString docPart;
QString stylePart;
QString themeFont1;
QString themeFont2;
- ScZipHandler *uz;
- ScribusDoc* m_Doc;
- PageItem* m_item;
- bool m_prefixName;
- bool m_append;
+ ScZipHandler *uz { nullptr };
+ ScribusDoc* m_Doc { nullptr };
+ PageItem* m_item { nullptr };
+ bool m_prefixName { false};
+ bool m_append { false};
ParagraphStyle defaultParagraphStyle;
ParagraphStyle currentParagraphStyle;
QHash<QString, QString> map_ID_to_Name;
Modified: trunk/Scribus/scribus/plugins/gettext/htmlim/htmlim.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23868&path=/trunk/Scribus/scribus/plugins/gettext/htmlim/htmlim.h
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/htmlim/htmlim.h (original)
+++ trunk/Scribus/scribus/plugins/gettext/htmlim/htmlim.h Sun May 31
12:58:12 2020
@@ -45,12 +45,13 @@
public:
HTMLIm(const QString& fname, const QString& encoding, gtWriter *w, bool
textOnly);
~HTMLIm();
+
private:
QString encoding;
QString filename;
- gtWriter *writer;
- gtParagraphStyle *pstyle;
-// int defaultFontSize;
+ gtWriter *writer { nullptr };
+ gtParagraphStyle *pstyle { nullptr };
+
void importText(bool textOnly);
};
Modified: trunk/Scribus/scribus/plugins/gettext/htmlim/htmlreader.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23868&path=/trunk/Scribus/scribus/plugins/gettext/htmlim/htmlreader.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/htmlim/htmlreader.cpp (original)
+++ trunk/Scribus/scribus/plugins/gettext/htmlim/htmlreader.cpp Sun May 31
12:58:12 2020
@@ -44,30 +44,8 @@
defaultWeight = ps->getFont()->getWeight();
defaultSlant = ps->getFont()->getSlant();
initPStyles();
- inH1 = false;
- inH2 = false;
- inH3 = false;
- inH4 = false;
- inH5 = false;
- inH6 = false;
- inA = false;
- inCode = false;
- inBody = false;
- inPre = false;
- inP = false;
- inCenter = false;
+
writer = w;
- href = "";
- extLinks = "";
- extIndex = 1;
- listLevel = -1;
- inOL = false;
- wasInOL = false;
- inUL = false;
- wasInUL = false;
- inLI = false;
- addedLI = false;
- lastCharWasSpace = false;
noFormatting = textOnly;
hreader = this;
}
Modified: trunk/Scribus/scribus/plugins/gettext/htmlim/htmlreader.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23868&path=/trunk/Scribus/scribus/plugins/gettext/htmlim/htmlreader.h
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/htmlim/htmlreader.h (original)
+++ trunk/Scribus/scribus/plugins/gettext/htmlim/htmlreader.h Sun May 31
12:58:12 2020
@@ -44,6 +44,18 @@
*/
class HTMLReader
{
+public:
+ HTMLReader(gtParagraphStyle *ps, gtWriter *w, bool textOnly);
+ ~HTMLReader();
+
+ void parse(const QString& filename);
+ static void startElement(void *user_data, const xmlChar * fullname,
const xmlChar ** atts);
+ static void endElement(void *user_data, const xmlChar * name);
+ static void characters(void *user_data, const xmlChar * ch, int len);
+ bool startElement(const QString&, const QString&, const QString &name,
const QXmlAttributes &attrs);
+ bool endElement(const QString&, const QString&, const QString &name);
+ bool characters(const QString &ch);
+
private:
QString currentDir;
QString currentFile;
@@ -53,44 +65,49 @@
QString templateCategory;
QString href;
QString extLinks;
- int extIndex;
- int listLevel;
+ int extIndex { 1 };
+ int listLevel { -1 };
std::vector<gtParagraphStyle*> listStyles;
std::vector<int> nextItemNumbers;
- gtWriter *writer;
- gtParagraphStyle *pstyle;
- gtParagraphStyle *pstylec;
- gtParagraphStyle *pstyleh1;
- gtParagraphStyle *pstyleh2;
- gtParagraphStyle *pstyleh3;
- gtParagraphStyle *pstyleh4;
- gtParagraphStyle *pstyleh5;
- gtParagraphStyle *pstyleh6;
- gtParagraphStyle *pstylecode;
- gtParagraphStyle *pstylep;
- gtParagraphStyle *pstylepre;
- bool inOL;
- bool wasInOL;
- bool inUL;
- bool wasInUL;
- bool inLI;
- bool addedLI;
- bool inH1;
- bool inH2;
- bool inH3;
- bool inH4;
- bool inH5;
- bool inH6;
- bool inA;
- bool inCenter;
- bool inCode;
- bool inBody;
- bool inPre;
- bool inP;
+ gtWriter *writer { nullptr };
+ gtParagraphStyle *pstyle { nullptr };
+ gtParagraphStyle *pstylec { nullptr };
+ gtParagraphStyle *pstyleh1 { nullptr };
+ gtParagraphStyle *pstyleh2 { nullptr };
+ gtParagraphStyle *pstyleh3 { nullptr };
+ gtParagraphStyle *pstyleh4 { nullptr };
+ gtParagraphStyle *pstyleh5 { nullptr };
+ gtParagraphStyle *pstyleh6 { nullptr };
+ gtParagraphStyle *pstylecode { nullptr };
+ gtParagraphStyle *pstylep { nullptr };
+ gtParagraphStyle *pstylepre { nullptr };
+ bool inOL { false };
+ bool wasInOL { false };
+ bool inUL { false };
+ bool wasInUL { false };
+ bool inLI { false };
+ bool addedLI { false };
+ bool inH1 { false };
+ bool inH2 { false };
+ bool inH3 { false };
+ bool inH4 { false };
+ bool inH5 { false };
+ bool inH6 { false };
+ bool inA { false };
+ bool inCenter { false };
+ bool inCode { false };
+ bool inBody { false };
+ bool inPre { false };
+ bool inP { false };
+
static bool elemJustStarted;
static bool elemJustFinished;
- bool lastCharWasSpace;
- bool noFormatting;
+
+ bool lastCharWasSpace { false };
+ bool noFormatting { false };
+
+ static HTMLReader* hreader;
+
void initPStyles();
void toggleEffect(FontEffect e);
void setItalicFont();
@@ -100,17 +117,6 @@
void setBoldFont();
void unSetBoldFont();
void createListStyle();
- static HTMLReader* hreader;
-public:
- HTMLReader(gtParagraphStyle *ps, gtWriter *w, bool textOnly);
- ~HTMLReader();
- void parse(const QString& filename);
- static void startElement(void *user_data, const xmlChar * fullname,
const xmlChar ** atts);
- static void endElement(void *user_data, const xmlChar * name);
- static void characters(void *user_data, const xmlChar * ch, int len);
- bool startElement(const QString&, const QString&, const QString &name,
const QXmlAttributes &attrs);
- bool endElement(const QString&, const QString&, const QString &name);
- bool characters(const QString &ch);
};
#endif
Modified: trunk/Scribus/scribus/plugins/gettext/odt2im/importodt.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23868&path=/trunk/Scribus/scribus/plugins/gettext/odt2im/importodt.h
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/odt2im/importodt.h (original)
+++ trunk/Scribus/scribus/plugins/gettext/odt2im/importodt.h Sun May 31
12:58:12 2020
@@ -33,6 +33,7 @@
{
public:
ObjStyleODT() {}
+
QString CurrColorText {"Black"};
QString CurrColorBText {CommonStrings::None};
QString CurrColorBPara {CommonStrings::None};
@@ -64,77 +65,79 @@
class ODTIm
{
- public:
+public:
ODTIm(const QString& fileName, PageItem *textItem, bool textOnly, bool
prefix, bool append);
- ~ODTIm();
- private:
- struct DrawStyle
- {
- AttributeValue styleOrigin;
- AttributeValue styleType;
- AttributeValue displayName;
- AttributeValue parentStyle;
- AttributeValue fontColor;
- AttributeValue fontName;
- AttributeValue fontSize;
- AttributeValue fontStyle;
- AttributeValue fontWeight;
- AttributeValue textIndent;
- AttributeValue textAlign;
- AttributeValue textPos;
- AttributeValue textOutline;
- AttributeValue textUnderline;
- AttributeValue textUnderlineWords;
- AttributeValue textUnderlineColor;
- AttributeValue textStrikeThrough;
- AttributeValue textShadow;
- AttributeValue fontVariant;
- AttributeValue textBackgroundColor;
- AttributeValue parBackgroundColor;
- AttributeValue lineHeight;
- AttributeValue margin_top;
- AttributeValue margin_bottom;
- AttributeValue margin_left;
- AttributeValue margin_right;
- AttributeValue verticalAlignment;
- AttributeValue tabDists;
- AttributeValue tabTypes;
- AttributeValue breakBefore;
- AttributeValue breakAfter;
- };
- bool parseRawDocReference(const QString& designMap);
- bool parseRawDocReferenceXML(QDomDocument &designMapDom);
- void parseRawTextSpan(QDomElement &elem, PageItem* item,
ParagraphStyle &tmpStyle, CharStyle &tmpCStyle, int &posC);
- void parseRawTextParagraph(QDomNode &elem, PageItem* item,
ParagraphStyle &newStyle, int &posC);
- void parseRawText(QDomElement &elem, PageItem* item);
+ ~ODTIm();
- bool parseStyleSheets(const QString& designMap);
- bool parseStyleSheetsXML(QDomDocument &designMapDom);
- void parseStyles(QDomElement &sp, const QString& type);
- bool parseDocReference(const QString& designMap);
- bool parseDocReferenceXML(QDomDocument &designMapDom);
- void parseTextSpan(QDomElement &elem, PageItem* item,
ParagraphStyle &tmpStyle, CharStyle &tmpCStyle, ObjStyleODT& tmpOStyle, int
&posC);
- void parseTextParagraph(QDomNode &elem, PageItem* item,
ParagraphStyle &newStyle, ObjStyleODT &tmpOStyle, int &posC);
- void parseText(QDomElement &elem, PageItem* item, ObjStyleODT&
tmpOStyle);
- void insertChars(PageItem *item, QString &txt, ParagraphStyle
&tmpStyle, CharStyle &tmpCStyle, int &posC);
- void applyCharacterStyle(CharStyle &tmpCStyle, ObjStyleODT
&oStyle);
- void applyParagraphStyle(ParagraphStyle &tmpStyle, ObjStyleODT
&oStyle);
- void resolveStyle(ObjStyleODT &tmpOStyle, const QString&
pAttrs);
- double parseUnit(const QString &unit);
- QString parseColor( const QString &s );
- QString constructFontName(const QString& fontBaseName, const
QString& fontStyle);
- void setFontstyle(CharStyle &tmpCStyle, int kind);
- ScZipHandler *uz {nullptr};
- ScribusDoc* m_Doc {nullptr};
- PageItem* m_item {nullptr};
- bool m_prefixName {false};
- bool m_append {false};
- QHash<QString, QString> map_ID_to_Name;
- QHash<QString, QString> m_fontMap;
- QHash<QString, DrawStyle> m_Styles;
- QStack<QString> m_textStylesStack;
- DrawStyle parDefaultStyle;
- DrawStyle txtDefaultStyle;
+private:
+ struct DrawStyle
+ {
+ AttributeValue styleOrigin;
+ AttributeValue styleType;
+ AttributeValue displayName;
+ AttributeValue parentStyle;
+ AttributeValue fontColor;
+ AttributeValue fontName;
+ AttributeValue fontSize;
+ AttributeValue fontStyle;
+ AttributeValue fontWeight;
+ AttributeValue textIndent;
+ AttributeValue textAlign;
+ AttributeValue textPos;
+ AttributeValue textOutline;
+ AttributeValue textUnderline;
+ AttributeValue textUnderlineWords;
+ AttributeValue textUnderlineColor;
+ AttributeValue textStrikeThrough;
+ AttributeValue textShadow;
+ AttributeValue fontVariant;
+ AttributeValue textBackgroundColor;
+ AttributeValue parBackgroundColor;
+ AttributeValue lineHeight;
+ AttributeValue margin_top;
+ AttributeValue margin_bottom;
+ AttributeValue margin_left;
+ AttributeValue margin_right;
+ AttributeValue verticalAlignment;
+ AttributeValue tabDists;
+ AttributeValue tabTypes;
+ AttributeValue breakBefore;
+ AttributeValue breakAfter;
+ };
+ bool parseRawDocReference(const QString& designMap);
+ bool parseRawDocReferenceXML(QDomDocument &designMapDom);
+ void parseRawTextSpan(QDomElement &elem, PageItem* item, ParagraphStyle
&tmpStyle, CharStyle &tmpCStyle, int &posC);
+ void parseRawTextParagraph(QDomNode &elem, PageItem* item,
ParagraphStyle &newStyle, int &posC);
+ void parseRawText(QDomElement &elem, PageItem* item);
+
+ bool parseStyleSheets(const QString& designMap);
+ bool parseStyleSheetsXML(QDomDocument &designMapDom);
+ void parseStyles(QDomElement &sp, const QString& type);
+ bool parseDocReference(const QString& designMap);
+ bool parseDocReferenceXML(QDomDocument &designMapDom);
+ void parseTextSpan(QDomElement &elem, PageItem* item, ParagraphStyle
&tmpStyle, CharStyle &tmpCStyle, ObjStyleODT& tmpOStyle, int &posC);
+ void parseTextParagraph(QDomNode &elem, PageItem* item, ParagraphStyle
&newStyle, ObjStyleODT &tmpOStyle, int &posC);
+ void parseText(QDomElement &elem, PageItem* item, ObjStyleODT&
tmpOStyle);
+ void insertChars(PageItem *item, QString &txt, ParagraphStyle
&tmpStyle, CharStyle &tmpCStyle, int &posC);
+ void applyCharacterStyle(CharStyle &tmpCStyle, ObjStyleODT &oStyle);
+ void applyParagraphStyle(ParagraphStyle &tmpStyle, ObjStyleODT &oStyle);
+ void resolveStyle(ObjStyleODT &tmpOStyle, const QString& pAttrs);
+ double parseUnit(const QString &unit);
+ QString parseColor( const QString &s );
+ QString constructFontName(const QString& fontBaseName, const QString&
fontStyle);
+ void setFontstyle(CharStyle &tmpCStyle, int kind);
+
+ ScZipHandler *uz {nullptr};
+ ScribusDoc* m_Doc {nullptr};
+ PageItem* m_item {nullptr};
+ bool m_prefixName {false};
+ bool m_append {false};
+ QHash<QString, QString> map_ID_to_Name;
+ QHash<QString, QString> m_fontMap;
+ QHash<QString, DrawStyle> m_Styles;
+ QStack<QString> m_textStylesStack;
+ DrawStyle parDefaultStyle;
+ DrawStyle txtDefaultStyle;
};
#endif
Modified: trunk/Scribus/scribus/plugins/gettext/pdbim/pdbim.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23868&path=/trunk/Scribus/scribus/plugins/gettext/pdbim/pdbim.h
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/pdbim/pdbim.h (original)
+++ trunk/Scribus/scribus/plugins/gettext/pdbim/pdbim.h Sun May 31 12:58:12 2020
@@ -19,9 +19,6 @@
extern "C" PLUGIN_API QString FileFormatName();
extern "C" PLUGIN_API QStringList FileExtensions();
-
-
-
/*! \brief Abiword's internal data types */
typedef unsigned int UT_uint32;
@@ -120,22 +117,24 @@
\param w a reference to the gtWriter instance */
PdbIm(const QString& fname, const QString& enc, gtWriter *w);
~PdbIm();
+
/*! \brief Write data into Scribus text frame.
User should specify encoding of the imported text - it's recoded here.
*/
void write();
+
private:
//! \brief Binary buffer for extraction tasks
- buffer *m_buf;
+ buffer *m_buf { nullptr };
//! \brief Store the extracted text here
QString data;
//! \brief Name of the codec/encoding to recode
QString encoding;
//! \brief Imp plugin handler
- gtWriter *writer;
+ gtWriter *writer { nullptr };
//! \brief A "bit order" flag. True on little endian systems.
- bool m_littlendian;
+ bool m_littlendian { true };
//! \brief A "document uses that strange compress algorithm" flag.
- bool bCompressed;
+ bool bCompressed { false };
/*! \brief Parse the PDB file.
\param fname a filename to open */
Modified: trunk/Scribus/scribus/plugins/gettext/sxwim/stylereader.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23868&path=/trunk/Scribus/scribus/plugins/gettext/sxwim/stylereader.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/sxwim/stylereader.cpp (original)
+++ trunk/Scribus/scribus/plugins/gettext/sxwim/stylereader.cpp Sun May 31
12:58:12 2020
@@ -41,16 +41,10 @@
{
sreader = this;
docname = documentName;
- readProperties = false;
writer = w;
importTextOnly = textOnly;
usePrefix = prefix;
packStyles = combineStyles;
- currentStyle = nullptr;
- parentStyle = nullptr;
- inList = false;
- currentList = "";
- defaultStyleCreated = false;
}
bool StyleReader::startElement(const QString&, const QString&, const QString
&name, const QXmlAttributes &attrs)
Modified: trunk/Scribus/scribus/plugins/gettext/sxwim/stylereader.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23868&path=/trunk/Scribus/scribus/plugins/gettext/sxwim/stylereader.h
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/sxwim/stylereader.h (original)
+++ trunk/Scribus/scribus/plugins/gettext/sxwim/stylereader.h Sun May 31
12:58:12 2020
@@ -45,33 +45,10 @@
class StyleReader
{
-private:
- static StyleReader *sreader;
- gtWriter *writer;
- bool importTextOnly;
- bool usePrefix;
- bool packStyles;
- bool readProperties;
- QString docname;
- StyleMap styles;
- StyleMap listParents;
- StyleMap attrsStyles;
- CounterMap pstyleCounts;
- FontMap fonts;
- gtStyle* currentStyle;
- gtStyle* parentStyle;
- bool inList;
- QString currentList;
- bool defaultStyleCreated;
- double getSize(const QString& s, double parentSize = -1);
- void styleProperties(const QXmlAttributes& attrs);
- void defaultStyle(const QXmlAttributes& attrs);
- void styleStyle(const QXmlAttributes& attrs);
- void tabStop(const QXmlAttributes& attrs);
- void setupFrameStyle();
public:
StyleReader(const QString& documentName, gtWriter *wr, bool textOnly,
bool prefix, bool combineStyles = true);
~StyleReader();
+
bool updateStyle(gtStyle* style, gtStyle* parent2Style, const QString&
key, const QString& value);
static void startElement(void *user_data, const xmlChar * fullname,
const xmlChar ** atts);
static void endElement(void *user_data, const xmlChar * name);
@@ -82,6 +59,33 @@
gtStyle* getStyle(const QString& name);
void setStyle(const QString& name, gtStyle* style);
QString getFont(const QString& key);
+
+private:
+ static StyleReader *sreader;
+
+ gtWriter *writer { nullptr };
+ bool importTextOnly { false };
+ bool usePrefix { false };
+ bool packStyles { false };
+ bool readProperties { false };
+ QString docname;
+ StyleMap styles;
+ StyleMap listParents;
+ StyleMap attrsStyles;
+ CounterMap pstyleCounts;
+ FontMap fonts;
+ gtStyle* currentStyle { nullptr };
+ gtStyle* parentStyle { nullptr };
+ bool inList { false };
+ QString currentList;
+ bool defaultStyleCreated { false };
+
+ double getSize(const QString& s, double parentSize = -1);
+ void styleProperties(const QXmlAttributes& attrs);
+ void defaultStyle(const QXmlAttributes& attrs);
+ void styleStyle(const QXmlAttributes& attrs);
+ void tabStop(const QXmlAttributes& attrs);
+ void setupFrameStyle();
};
#endif
Modified: trunk/Scribus/scribus/plugins/gettext/sxwim/sxwdia.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23868&path=/trunk/Scribus/scribus/plugins/gettext/sxwim/sxwdia.h
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/sxwim/sxwdia.h (original)
+++ trunk/Scribus/scribus/plugins/gettext/sxwim/sxwdia.h Sun May 31
12:58:12 2020
@@ -20,17 +20,19 @@
public:
SxwDialog(bool update, bool prefix, bool pack);
~SxwDialog();
+
bool shouldUpdate();
bool usePrefix();
bool askAgain();
bool packStyles();
+
private:
- QCheckBox* updateCheck;
- QCheckBox* prefixCheck;
- QCheckBox* doNotAskCheck;
- QCheckBox* packCheck;
- QPushButton* okButton;
- QPushButton* cancelButton;
+ QCheckBox* updateCheck { nullptr };
+ QCheckBox* prefixCheck { nullptr };
+ QCheckBox* doNotAskCheck { nullptr };
+ QCheckBox* packCheck { nullptr };
+ QPushButton* okButton { nullptr };
+ QPushButton* cancelButton { nullptr };
};
#endif // CSVDIA_H
Modified: trunk/Scribus/scribus/plugins/gettext/sxwim/sxwim.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23868&path=/trunk/Scribus/scribus/plugins/gettext/sxwim/sxwim.h
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/sxwim/sxwim.h (original)
+++ trunk/Scribus/scribus/plugins/gettext/sxwim/sxwim.h Sun May 31 12:58:12 2020
@@ -48,11 +48,12 @@
~SxwIm();
private:
- gtWriter* writer;
+ gtWriter* writer { nullptr };
QString encoding;
QString filename;
QString stylePath;
QString contentPath;
+
bool decompress();
};
Modified: trunk/Scribus/scribus/plugins/gettext/textfilter/textfilter.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23868&path=/trunk/Scribus/scribus/plugins/gettext/textfilter/textfilter.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/textfilter/textfilter.cpp
(original)
+++ trunk/Scribus/scribus/plugins/gettext/textfilter/textfilter.cpp Sun May
31 12:58:12 2020
@@ -43,7 +43,6 @@
{
filename = fname;
encoding = enc;
- filters = nullptr;
writer = w;
writer->setOverridePStyleFont(false);
prefs =
PrefsManager::instance().prefsFile->getPluginContext("TextFilter");
Modified: trunk/Scribus/scribus/plugins/gettext/textfilter/textfilter.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23868&path=/trunk/Scribus/scribus/plugins/gettext/textfilter/textfilter.h
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/textfilter/textfilter.h
(original)
+++ trunk/Scribus/scribus/plugins/gettext/textfilter/textfilter.h Sun May
31 12:58:12 2020
@@ -21,20 +21,22 @@
class TextFilter
{
+public:
+ TextFilter(const QString& fname, const QString& enc, gtWriter* w);
+ ~TextFilter();
+
private:
- PrefsContext* prefs;
+ PrefsContext* prefs { nullptr };
QString text;
QString encoding;
QString filename;
- gtWriter* writer;
- std::vector<tfFilter*> *filters;
+ gtWriter* writer { nullptr };
+ std::vector<tfFilter*> *filters { nullptr };
+
void loadText();
void write();
void replace(QString* text);
void replaceHex(QString* text);
-public:
- TextFilter(const QString& fname, const QString& enc, gtWriter* w);
- ~TextFilter();
};
#endif // TEXTFILTER_H
Modified: trunk/Scribus/scribus/plugins/gettext/textfilter/tfdia.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23868&path=/trunk/Scribus/scribus/plugins/gettext/textfilter/tfdia.h
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/textfilter/tfdia.h (original)
+++ trunk/Scribus/scribus/plugins/gettext/textfilter/tfdia.h Sun May 31
12:58:12 2020
@@ -24,25 +24,35 @@
class tfDia : public QDialog
{
Q_OBJECT
+
+public:
+ tfDia();
+ ~tfDia();
+
+ std::vector<tfFilter*> filters;
+
private:
- PrefsContext* prefs;
- QBoxLayout* layout;
- QBoxLayout* alayout;
- QComboBox* filtersCombo;
- QLineEdit* saveEdit;
- QPushButton* clearButton;
- QPushButton* deleteButton;
- QPushButton* okButton;
- QPushButton* cancelButton;
- QString currentFilter;
- QScrollArea* qsv;
- QFrame* vbox;
- int currentIndex;
+ PrefsContext* prefs { nullptr };
+ QBoxLayout* layout { nullptr };
+ QBoxLayout* alayout { nullptr };
+ QComboBox* filtersCombo { nullptr };
+ QLineEdit* saveEdit { nullptr };
+ QPushButton* clearButton { nullptr };
+ QPushButton* deleteButton { nullptr };
+ QPushButton* okButton { nullptr };
+ QPushButton* cancelButton { nullptr };
+ QScrollArea* qsv { nullptr };
+ QFrame* vbox { nullptr };
+
+ QString currentFilter { "tf_lastUsed" };
+ int currentIndex { 0 };
+
void clear();
void createLayout();
void createFilter(PrefsTable* table);
void writeFilterRow(PrefsTable* table, int row, tfFilter* filter);
void storeLastFilter();
+
private slots:
void adjustVBoxSize();
void saveTextChanged(const QString& text);
@@ -54,10 +64,6 @@
void deleteClicked();
void loadFilter(const QString& name);
void resizeEvent(QResizeEvent* e);
-public:
- std::vector<tfFilter*> filters;
- tfDia();
- ~tfDia();
};
#endif // TFDIA_H
Modified: trunk/Scribus/scribus/plugins/gettext/txtim/txtim.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23868&path=/trunk/Scribus/scribus/plugins/gettext/txtim/txtim.h
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/txtim/txtim.h (original)
+++ trunk/Scribus/scribus/plugins/gettext/txtim/txtim.h Sun May 31 12:58:12 2020
@@ -23,13 +23,16 @@
public:
TxtIm(const QString& fname, const QString& enc, bool textOnly, gtWriter
*w);
~TxtIm();
+
void write();
+
private:
QString filename;
QString encoding;
QString text;
- gtWriter *writer;
- bool textOnly;
+ gtWriter *writer { nullptr };
+ bool textOnly { true };
+
void loadText();
QString toUnicode(const QByteArray& rawText);
};
Modified: trunk/Scribus/scribus/plugins/gettext/xtgim/fontselectdialog.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23868&path=/trunk/Scribus/scribus/plugins/gettext/xtgim/fontselectdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/xtgim/fontselectdialog.cpp
(original)
+++ trunk/Scribus/scribus/plugins/gettext/xtgim/fontselectdialog.cpp Sun May
31 12:58:12 2020
@@ -52,7 +52,6 @@
horizontalLayout_2->addWidget(fontList);
-
verticalLayout_2->addLayout(horizontalLayout_2);
horizontalLayout_3 = new QHBoxLayout();
Modified: trunk/Scribus/scribus/plugins/gettext/xtgim/fontselectdialog.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23868&path=/trunk/Scribus/scribus/plugins/gettext/xtgim/fontselectdialog.h
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/xtgim/fontselectdialog.h
(original)
+++ trunk/Scribus/scribus/plugins/gettext/xtgim/fontselectdialog.h Sun May
31 12:58:12 2020
@@ -45,7 +45,7 @@
class FontSelect:public QDialog
{
-Q_OBJECT
+ Q_OBJECT
public:
FontSelect(QStringList list);
@@ -55,16 +55,18 @@
private slots:
void selectFont();
void resetFont();
+
private:
- QLabel *label;
- QComboBox *fontList;
- QPushButton *okButton;
+ QLabel *label { nullptr };
+ QComboBox *fontList { nullptr };
+ QPushButton *okButton { nullptr };
+ QWidget *layoutWidget { nullptr };
+ QVBoxLayout *verticalLayout_2 { nullptr };
+ QHBoxLayout *horizontalLayout_2 { nullptr };
+ QSpacerItem *horizontalSpacer { nullptr };
+ QHBoxLayout *horizontalLayout_3 { nullptr };
+
QString font;
- QWidget *layoutWidget;
- QVBoxLayout *verticalLayout_2;
- QHBoxLayout *horizontalLayout_2;
- QSpacerItem *horizontalSpacer;
- QHBoxLayout *horizontalLayout_3;
};
#endif
Modified: trunk/Scribus/scribus/plugins/gettext/xtgim/xtgdialog.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23868&path=/trunk/Scribus/scribus/plugins/gettext/xtgim/xtgdialog.h
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/xtgim/xtgdialog.h (original)
+++ trunk/Scribus/scribus/plugins/gettext/xtgim/xtgdialog.h Sun May 31
12:58:12 2020
@@ -41,8 +41,10 @@
public:
XtgDialog(bool prefix);
~XtgDialog();
+
bool usePrefix();
bool askAgain();
+
private:
QCheckBox* prefixCheck;
QCheckBox* doNotAskCheck;
Modified: trunk/Scribus/scribus/plugins/gettext/xtgim/xtgim.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23868&path=/trunk/Scribus/scribus/plugins/gettext/xtgim/xtgim.h
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/xtgim/xtgim.h (original)
+++ trunk/Scribus/scribus/plugins/gettext/xtgim/xtgim.h Sun May 31 12:58:12 2020
@@ -49,6 +49,6 @@
bool import(const QString& fileName);
protected:
- XtgScanner* m_scanner;
+ XtgScanner* m_scanner { nullptr };
};
#endif /* XTGIM_H */
Modified: trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23868&path=/trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.cpp (original)
+++ trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.cpp Sun May 31
12:58:12 2020
@@ -45,16 +45,7 @@
: m_item(item),
m_importTextOnly(textOnly),
m_prefixName(prefix),
- m_append(append),
- m_newlineFlag(false),
- m_xflag(false),
- m_inDef(false),
- m_bufferIndex(0),
- m_textIndex(0),
- m_define(0),
- m_isBold(false),
- m_isItalic(false),
- m_decoder(nullptr)
+ m_append(append)
{
m_doc = item->doc();
initTagMode();
Modified: trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23868&path=/trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.h
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.h (original)
+++ trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.h Sun May 31
12:58:12 2020
@@ -58,73 +58,6 @@
class XtgScanner
{
-private:
- /**
- \variable Variables based on which scanner works in different modes
- */
- scannerMode m_mode;
- scannerMode m_prevMode;
- /**
- \variable Variables of the importer
- */
- PageItem* m_item;
- bool m_importTextOnly;
- bool m_prefixName;
- bool m_append;
- /**
- \variable Flag variables used in the scanner
- */
- bool m_newlineFlag;
- bool m_xflag;
- bool m_inDef;
- /**
- \variable Input buffer to which properly encoded file is loaded
- */
- QByteArray m_inputBuffer;
- int m_bufferIndex;
-
- QString m_decodedText;
- int m_textIndex;
-
- ScribusDoc* m_doc;
- /**
- \variable current Character and paragraph styles
- */
- CharStyle m_currentCharStyle;
- ParagraphStyle m_currentParagraphStyle;
- StyleFlag m_styleEffects;
-
- /** To store unsupported attributes */
- QSet<QString> m_unsupported;
- /**
- \brief m_textToAppend will be the QString used by the function
TextWriter::append(QString& )
- */
- QString m_textToAppend;
- QString m_token;
- QString m_sfcName; // Name of Style/Fontset/Color to be defined, hence
named m_sfcName
-
- QHash<QString,void (XtgScanner::*)(void)> m_tagModeHash;
- QHash<QString,void (XtgScanner::*)(void)> m_textModeHash;
- QHash<QString,void (XtgScanner::*)(void)> m_nameModeHash;
- QHash<int,QString> languages;
-
- /** m_define variable will take the following values :
- \brief
- 0 Not a definition
- 1 Character Stylesheet Definition
- 2 Paragraph Stylesheet Definition
- */
- int m_define;
- bool m_isBold;
- bool m_isItalic;
-
- QTextDecoder *m_decoder;
-
- /**
- \brief Decode text from input buffer until specified index
- */
- bool decodeText(int index);
-
public:
XtgScanner(PageItem* item, bool textOnly, bool prefix, bool append);
~XtgScanner();
@@ -268,9 +201,75 @@
void defAtRate();
void defColon();
-
protected:
void (XtgScanner::*funPointer)(void);
+
+private:
+ /**
+ \variable Variables based on which scanner works in different modes
+ */
+ scannerMode m_mode;
+ scannerMode m_prevMode;
+ /**
+ \variable Variables of the importer
+ */
+ PageItem* m_item { nullptr };
+ bool m_importTextOnly { false};
+ bool m_prefixName { false};
+ bool m_append { false};
+ /**
+ \variable Flag variables used in the scanner
+ */
+ bool m_newlineFlag { false };
+ bool m_xflag { false };
+ bool m_inDef { false };
+ /**
+ \variable Input buffer to which properly encoded file is loaded
+ */
+ QByteArray m_inputBuffer;
+ int m_bufferIndex { 0 };
+
+ QString m_decodedText;
+ int m_textIndex { 0 };
+
+ ScribusDoc* m_doc { nullptr };
+ /**
+ \variable current Character and paragraph styles
+ */
+ CharStyle m_currentCharStyle;
+ ParagraphStyle m_currentParagraphStyle;
+ StyleFlag m_styleEffects;
+
+ /** To store unsupported attributes */
+ QSet<QString> m_unsupported;
+ /**
+ \brief m_textToAppend will be the QString used by the function
TextWriter::append(QString& )
+ */
+ QString m_textToAppend;
+ QString m_token;
+ QString m_sfcName; // Name of Style/Fontset/Color to be defined, hence
named m_sfcName
+
+ QHash<QString,void (XtgScanner::*)(void)> m_tagModeHash;
+ QHash<QString,void (XtgScanner::*)(void)> m_textModeHash;
+ QHash<QString,void (XtgScanner::*)(void)> m_nameModeHash;
+ QHash<int,QString> languages;
+
+ /** m_define variable will take the following values :
+ \brief
+ 0 Not a definition
+ 1 Character Stylesheet Definition
+ 2 Paragraph Stylesheet Definition
+ */
+ int m_define { 0 };
+ bool m_isBold { false };
+ bool m_isItalic { false };
+
+ QTextDecoder *m_decoder { nullptr };
+
+ /**
+ \brief Decode text from input buffer until specified index
+ */
+ bool decodeText(int index);
};
#endif
Modified: trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23868&path=/trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/odg/importodg.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/odg/importodg.cpp Sun May 31
12:58:12 2020
@@ -474,7 +474,7 @@
{
ObjStyle tmpBStyle;
resovleStyle(tmpBStyle,
backGroundStyle);
- int z =
m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX, baseY,
tmpOStyle.page_width, tmpOStyle.page_height, 0, tmpBStyle.CurrColorFill,
CommonStrings::None);
+ int z =
m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX, baseY,
tmpOStyle.page_width, tmpOStyle.page_height, 0, tmpBStyle.currColorFill,
CommonStrings::None);
PageItem *retObj =
m_Doc->Items->at(z);
finishItem(retObj,
tmpBStyle);
}
@@ -600,7 +600,7 @@
{
ObjStyle tmpBStyle;
resovleStyle(tmpBStyle,
currStyle.page_layout_name.value);
- int z =
m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX, baseY,
tmpOStyle.page_width, tmpOStyle.page_height, 0, tmpBStyle.CurrColorFill,
CommonStrings::None);
+ int z =
m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX, baseY,
tmpOStyle.page_width, tmpOStyle.page_height, 0, tmpBStyle.currColorFill,
CommonStrings::None);
PageItem *retObj =
m_Doc->Items->at(z);
finishItem(retObj,
tmpBStyle);
}
@@ -835,7 +835,7 @@
pArray.parseSVG(e.attribute("svg:d"));
if (pArray.size() > 3)
{
- int z = m_Doc->itemAdd(PageItem::PolyLine,
PageItem::Unspecified, baseX, baseY, 10, 10, tmpOStyle.LineW,
CommonStrings::None, tmpOStyle.CurrColorStroke);
+ int z = m_Doc->itemAdd(PageItem::PolyLine,
PageItem::Unspecified, baseX, baseY, 10, 10, tmpOStyle.LineW,
CommonStrings::None, tmpOStyle.currColorStroke);
retObj = m_Doc->Items->at(z);
retObj->PoLine = pArray.copy();
QTransform mat;
@@ -1033,7 +1033,7 @@
PageItem::ItemType itype =
parseEnhPath(paths[a], pArray, filled, stroked) ? PageItem::PolyLine :
PageItem::Polygon;
if (pArray.size() > 3)
{
- QString fillC =
tmpOStyle.CurrColorFill;
+ QString fillC =
tmpOStyle.currColorFill;
if (!filled)
fillC =
CommonStrings::None;
else
@@ -1112,7 +1112,7 @@
fillC =
modifyColor(fillC, true, 120);
}
}
- QString strokeC =
tmpOStyle.CurrColorStroke;
+ QString strokeC =
tmpOStyle.currColorStroke;
if (!stroked)
strokeC =
CommonStrings::None;
int z = m_Doc->itemAdd(itype,
PageItem::Unspecified, baseX + x, baseY + y, w, h, tmpOStyle.LineW, fillC,
strokeC);
@@ -1250,7 +1250,7 @@
normRef.setLength(tmpOStyle.measureDist + tmpOStyle.fontSize * 1.2);
if (normRef.length() != 0)
{
- int z = m_Doc->itemAdd(PageItem::PolyLine,
PageItem::Unspecified, baseX, baseY, 10, 10, tmpOStyle.LineW,
CommonStrings::None, tmpOStyle.CurrColorStroke);
+ int z = m_Doc->itemAdd(PageItem::PolyLine,
PageItem::Unspecified, baseX, baseY, 10, 10, tmpOStyle.LineW,
CommonStrings::None, tmpOStyle.currColorStroke);
retObj = m_Doc->Items->at(z);
retObj->PoLine.resize(4);
retObj->PoLine.setPoint(0, FPoint(x1, y1));
@@ -1269,7 +1269,7 @@
normRef2.setLength(tmpOStyle.measureDist + tmpOStyle.fontSize / 2.0);
if (normRef2.length() != 0)
{
- int z = m_Doc->itemAdd(PageItem::PolyLine,
PageItem::Unspecified, baseX, baseY, 10, 10, tmpOStyle.LineW,
CommonStrings::None, tmpOStyle.CurrColorStroke);
+ int z = m_Doc->itemAdd(PageItem::PolyLine,
PageItem::Unspecified, baseX, baseY, 10, 10, tmpOStyle.LineW,
CommonStrings::None, tmpOStyle.currColorStroke);
retObj = m_Doc->Items->at(z);
retObj->PoLine.resize(4);
retObj->PoLine.setPoint(0, FPoint(x2, y2));
@@ -1286,9 +1286,9 @@
QLineF textLine = QLineF(normRef.p2(), normRef2.p2());
if (textLine.length() != 0)
{
- int z = m_Doc->itemAdd(PageItem::TextFrame,
PageItem::Unspecified, baseX+normRef.p2().x(), baseY+normRef.p2().y(),
textLine.length(), tmpOStyle.fontSize * 1.2, tmpOStyle.LineW,
tmpOStyle.CurrColorFill, tmpOStyle.CurrColorStroke);
+ int z = m_Doc->itemAdd(PageItem::TextFrame,
PageItem::Unspecified, baseX+normRef.p2().x(), baseY+normRef.p2().y(),
textLine.length(), tmpOStyle.fontSize * 1.2, tmpOStyle.LineW,
tmpOStyle.currColorFill, tmpOStyle.currColorStroke);
retObj = m_Doc->Items->at(z);
- retObj->setFillColor(tmpOStyle.CurrColorFill);
+ retObj->setFillColor(tmpOStyle.currColorFill);
retObj->setTextToFrameDist(0.0, 0.0, 0.0, 0.0);
retObj->setTextFlowMode(PageItem::TextFlowDisabled);
finishItem(retObj, tmpOStyle);
@@ -1314,7 +1314,7 @@
resovleStyle(tmpOStyle, getStyleName(e));
if (tmpOStyle.stroke_type == 0)
return retObj;
- int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified,
baseX, baseY, 10, 10, tmpOStyle.LineW, CommonStrings::None,
tmpOStyle.CurrColorStroke);
+ int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified,
baseX, baseY, 10, 10, tmpOStyle.LineW, CommonStrings::None,
tmpOStyle.currColorStroke);
retObj = m_Doc->Items->at(z);
retObj->PoLine.resize(4);
retObj->PoLine.setPoint(0, FPoint(x1, y1));
@@ -1353,7 +1353,7 @@
resovleStyle(tmpOStyle, getStyleName(e));
if ((tmpOStyle.fill_type == 0) && (tmpOStyle.stroke_type == 0))
return retObj;
- int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX+x,
baseY+y, w, h, tmpOStyle.LineW, tmpOStyle.CurrColorFill,
tmpOStyle.CurrColorStroke);
+ int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Ellipse, baseX+x,
baseY+y, w, h, tmpOStyle.LineW, tmpOStyle.currColorFill,
tmpOStyle.currColorStroke);
retObj = m_Doc->Items->at(z);
if (e.hasAttribute("draw:transform"))
parseTransform(&retObj->PoLine, e.attribute("draw:transform"));
@@ -1375,7 +1375,7 @@
resovleStyle(tmpOStyle, getStyleName(e));
if ((tmpOStyle.fill_type == 0) && (tmpOStyle.stroke_type == 0))
return retObj;
- int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX+x,
baseY+y, w, h, tmpOStyle.LineW, tmpOStyle.CurrColorFill,
tmpOStyle.CurrColorStroke);
+ int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, baseX+x,
baseY+y, w, h, tmpOStyle.LineW, tmpOStyle.currColorFill,
tmpOStyle.currColorStroke);
retObj = m_Doc->Items->at(z);
if (corner != 0)
{
@@ -1398,7 +1398,7 @@
resovleStyle(tmpOStyle, getStyleName(e));
if ((tmpOStyle.fill_type == 0) && (tmpOStyle.stroke_type == 0))
return retObj;
- int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX,
baseY, 10, 10, tmpOStyle.LineW, tmpOStyle.CurrColorFill,
tmpOStyle.CurrColorStroke);
+ int z = m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX,
baseY, 10, 10, tmpOStyle.LineW, tmpOStyle.currColorFill,
tmpOStyle.currColorStroke);
retObj = m_Doc->Items->at(z);
retObj->PoLine.resize(0);
appendPoints(&retObj->PoLine, e, true);
@@ -1417,7 +1417,7 @@
resovleStyle(tmpOStyle, getStyleName(e));
if (tmpOStyle.stroke_type == 0)
return retObj;
- int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified,
baseX, baseY, 10, 10, tmpOStyle.LineW, CommonStrings::None,
tmpOStyle.CurrColorStroke);
+ int z = m_Doc->itemAdd(PageItem::PolyLine, PageItem::Unspecified,
baseX, baseY, 10, 10, tmpOStyle.LineW, CommonStrings::None,
tmpOStyle.currColorStroke);
retObj = m_Doc->Items->at(z);
retObj->PoLine.resize(0);
appendPoints(&retObj->PoLine, e, false);
@@ -1458,7 +1458,7 @@
double y = parseUnit(e.attribute("svg:y")) ;
double w = parseUnit(e.attribute("svg:width"));
double h = parseUnit(e.attribute("svg:height"));
- int z = m_Doc->itemAdd(itype, PageItem::Unspecified, baseX + x,
baseY + y, w, h, tmpOStyle.LineW, tmpOStyle.CurrColorFill,
tmpOStyle.CurrColorStroke);
+ int z = m_Doc->itemAdd(itype, PageItem::Unspecified, baseX + x,
baseY + y, w, h, tmpOStyle.LineW, tmpOStyle.currColorFill,
tmpOStyle.currColorStroke);
retObj = m_Doc->Items->at(z);
retObj->PoLine = pArray.copy();
QTransform mat;
@@ -1519,9 +1519,9 @@
{
if (n.text().isEmpty())
return retObj;
- int z = m_Doc->itemAdd(PageItem::TextFrame,
PageItem::Unspecified, baseX+x, baseY+y, w, h, tmpOStyle.LineW,
tmpOStyle.CurrColorFill, tmpOStyle.CurrColorStroke);
+ int z = m_Doc->itemAdd(PageItem::TextFrame,
PageItem::Unspecified, baseX+x, baseY+y, w, h, tmpOStyle.LineW,
tmpOStyle.currColorFill, tmpOStyle.currColorStroke);
retObj = m_Doc->Items->at(z);
- retObj->setFillColor(tmpOStyle.CurrColorFill);
+ retObj->setFillColor(tmpOStyle.currColorFill);
retObj->setTextToFrameDist(0.0, 0.0, 0.0, 0.0);
retObj->setTextFlowMode(PageItem::TextFlowDisabled);
retObj->setVerticalAlignment(tmpOStyle.verticalAlignment);
@@ -1544,7 +1544,7 @@
QStringList allFormatsV =
LoadSavePlugin::getExtensionsForImport(FORMATID_FIRSTUSER);
if (formats.contains(ext.toUtf8()))
{
- int z =
m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX+x, baseY+y,
w, h, tmpOStyle.LineW, tmpOStyle.CurrColorFill, tmpOStyle.CurrColorStroke);
+ int z =
m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX+x, baseY+y,
w, h, tmpOStyle.LineW, tmpOStyle.currColorFill, tmpOStyle.currColorStroke);
retObj = m_Doc->Items->at(z);
if (e.hasAttribute("draw:transform"))
retObj->setRotation(r, true);
@@ -1638,7 +1638,7 @@
}
else
{
- int z =
m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX+x, baseY+y,
w, h, tmpOStyle.LineW, tmpOStyle.CurrColorFill, tmpOStyle.CurrColorStroke);
+ int z =
m_Doc->itemAdd(PageItem::ImageFrame, PageItem::Unspecified, baseX+x, baseY+y,
w, h, tmpOStyle.LineW, tmpOStyle.currColorFill, tmpOStyle.currColorStroke);
retObj =
m_Doc->Items->at(z);
if
(e.hasAttribute("draw:transform"))
retObj->setRotation(r, true);
@@ -1856,8 +1856,8 @@
{
tmpCStyle.setFont((*m_Doc->AllFonts)[oStyle.fontName]);
tmpCStyle.setFontSize(oStyle.fontSize * 10);
- tmpCStyle.setFillColor(oStyle.CurrColorText);
- tmpCStyle.setBackColor(oStyle.CurrColorBText);
+ tmpCStyle.setFillColor(oStyle.currColorText);
+ tmpCStyle.setBackColor(oStyle.currColorBText);
StyleFlag styleEffects = tmpCStyle.effects();
if ((oStyle.textPos.startsWith("super")) ||
(oStyle.textPos.startsWith("sub")))
{
@@ -1871,7 +1871,7 @@
styleEffects |= ScStyle_Outline;
tmpCStyle.setOutlineWidth(30);
tmpCStyle.setFillColor("White");
- tmpCStyle.setStrokeColor(oStyle.CurrColorText);
+ tmpCStyle.setStrokeColor(oStyle.currColorText);
}
if (oStyle.textUnderline)
{
@@ -1888,14 +1888,14 @@
styleEffects |= ScStyle_Strikethrough;
tmpCStyle.setStrikethruOffset(-1);
tmpCStyle.setStrikethruWidth(-1);
- tmpCStyle.setStrokeColor(oStyle.CurrColorText);
+ tmpCStyle.setStrokeColor(oStyle.currColorText);
}
if (oStyle.textShadow)
{
styleEffects |= ScStyle_Shadowed;
tmpCStyle.setShadowXOffset(30);
tmpCStyle.setShadowYOffset(-30);
- tmpCStyle.setStrokeColor(oStyle.CurrColorText);
+ tmpCStyle.setStrokeColor(oStyle.currColorText);
}
tmpCStyle.setFeatures(styleEffects.featureList());
}
@@ -2170,10 +2170,10 @@
if (spe.tagName() == "style:graphic-properties")
{
currStyle.fillMode =
AttributeValue(spe.attribute("draw:fill", ""));
- currStyle.CurrColorFill =
AttributeValue(spe.attribute("draw:fill-color", ""));
+ currStyle.currColorFill =
AttributeValue(spe.attribute("draw:fill-color", ""));
currStyle.strokeMode =
AttributeValue(spe.attribute("draw:stroke", ""));
- currStyle.CurrColorStroke =
AttributeValue(spe.attribute("svg:stroke-color", ""));
- currStyle.CurrColorShadow =
AttributeValue(spe.attribute("draw:shadow-color", ""));
+ currStyle.currColorStroke =
AttributeValue(spe.attribute("svg:stroke-color", ""));
+ currStyle.currColorShadow =
AttributeValue(spe.attribute("draw:shadow-color", ""));
currStyle.hasShadow =
AttributeValue(spe.attribute("draw:shadow", ""));
currStyle.shadowX =
AttributeValue(spe.attribute("draw:shadow-offset-x", ""));
currStyle.shadowY =
AttributeValue(spe.attribute("draw:shadow-offset-y", ""));
@@ -2230,7 +2230,7 @@
else if (spe.tagName() ==
"style:drawing-page-properties")
{
currStyle.fillMode =
AttributeValue(spe.attribute("draw:fill", ""));
- currStyle.CurrColorFill =
AttributeValue(spe.attribute("draw:fill-color", ""));
+ currStyle.currColorFill =
AttributeValue(spe.attribute("draw:fill-color", ""));
currStyle.patternName =
AttributeValue(spe.attribute("draw:fill-image-name", ""));
currStyle.gradientName =
AttributeValue(spe.attribute("draw:fill-gradient-name", ""));
currStyle.hatchName =
AttributeValue(spe.attribute("draw:fill-hatch-name", ""));
@@ -2325,14 +2325,14 @@
actStyle.stroke_dash_style =
AttributeValue(currStyle.stroke_dash_style.value);
if (currStyle.fillMode.valid)
actStyle.fillMode =
AttributeValue(currStyle.fillMode.value);
- if (currStyle.CurrColorFill.valid)
- actStyle.CurrColorFill =
AttributeValue(currStyle.CurrColorFill.value);
+ if (currStyle.currColorFill.valid)
+ actStyle.currColorFill =
AttributeValue(currStyle.currColorFill.value);
if (currStyle.strokeMode.valid)
actStyle.strokeMode =
AttributeValue(currStyle.strokeMode.value);
- if (currStyle.CurrColorStroke.valid)
- actStyle.CurrColorStroke =
AttributeValue(currStyle.CurrColorStroke.value);
- if (currStyle.CurrColorShadow.valid)
- actStyle.CurrColorShadow =
AttributeValue(currStyle.CurrColorShadow.value);
+ if (currStyle.currColorStroke.valid)
+ actStyle.currColorStroke =
AttributeValue(currStyle.currColorStroke.value);
+ if (currStyle.currColorShadow.valid)
+ actStyle.currColorShadow =
AttributeValue(currStyle.currColorShadow.value);
if (currStyle.hasShadow.valid)
actStyle.hasShadow =
AttributeValue(currStyle.hasShadow.value);
if (currStyle.shadowX.valid)
@@ -2469,15 +2469,15 @@
if (actStyle.stroke_dash_dots2_length.valid)
tmpOStyle.stroke_dash_dots2_length =
parseUnit(actStyle.stroke_dash_dots2_length.value);
- if (actStyle.CurrColorFill.valid)
+ if (actStyle.currColorFill.valid)
{
if (actStyle.fillMode.valid && (actStyle.fillMode.value
!= "none"))
- tmpOStyle.CurrColorFill =
parseColor(actStyle.CurrColorFill.value);
+ tmpOStyle.currColorFill =
parseColor(actStyle.currColorFill.value);
else
- tmpOStyle.CurrColorFill = CommonStrings::None;
+ tmpOStyle.currColorFill = CommonStrings::None;
}
else
- tmpOStyle.CurrColorFill = CommonStrings::None;
+ tmpOStyle.currColorFill = CommonStrings::None;
if (actStyle.fillMode.valid)
{
if (actStyle.fillMode.value == "none")
@@ -2503,15 +2503,15 @@
tmpOStyle.hatchName =
actStyle.hatchName.value;
}
}
- if (actStyle.CurrColorStroke.valid)
+ if (actStyle.currColorStroke.valid)
{
if (actStyle.strokeMode.valid &&
(actStyle.strokeMode.value != "none"))
- tmpOStyle.CurrColorStroke =
parseColor(actStyle.CurrColorStroke.value);
+ tmpOStyle.currColorStroke =
parseColor(actStyle.currColorStroke.value);
else
- tmpOStyle.CurrColorStroke = CommonStrings::None;
+ tmpOStyle.currColorStroke = CommonStrings::None;
}
else
- tmpOStyle.CurrColorStroke = CommonStrings::None;
+ tmpOStyle.currColorStroke = CommonStrings::None;
if (actStyle.strokeMode.valid)
{
if (actStyle.strokeMode.value == "none")
@@ -2525,8 +2525,8 @@
tmpOStyle.dashName =
actStyle.dashName.value;
}
}
- if (actStyle.CurrColorShadow.valid)
- tmpOStyle.CurrColorShadow =
parseColor(actStyle.CurrColorShadow.value);
+ if (actStyle.currColorShadow.valid)
+ tmpOStyle.currColorShadow =
parseColor(actStyle.currColorShadow.value);
if (actStyle.hasShadow.valid)
tmpOStyle.hasShadow = actStyle.hasShadow.value ==
"visible";
if (actStyle.shadowX.valid)
@@ -2571,9 +2571,9 @@
if (actStyle.fontSize.valid)
tmpOStyle.fontSize = parseUnit(actStyle.fontSize.value);
if (actStyle.fontColor.valid)
- tmpOStyle.CurrColorText =
parseColor(actStyle.fontColor.value);
+ tmpOStyle.currColorText =
parseColor(actStyle.fontColor.value);
if (actStyle.textBackgroundColor.valid)
- tmpOStyle.CurrColorBText =
parseColor(actStyle.textBackgroundColor.value);
+ tmpOStyle.currColorBText =
parseColor(actStyle.textBackgroundColor.value);
if (actStyle.margin_top.valid)
tmpOStyle.margin_top =
parseUnit(actStyle.margin_top.value);
if (actStyle.margin_bottom.valid)
@@ -2634,7 +2634,7 @@
if (actStyle.textUnderlineColor.valid)
{
if (actStyle.textUnderlineColor.value == "font-color")
- tmpOStyle.textUnderlineColor =
tmpOStyle.CurrColorText;
+ tmpOStyle.textUnderlineColor =
tmpOStyle.currColorText;
else
tmpOStyle.textUnderlineColor =
parseColor(actStyle.textUnderlineColor.value);
}
@@ -3396,7 +3396,7 @@
arrowTrans.translate(-m_Doc->currentPage()->xOffset(),
-m_Doc->currentPage()->yOffset());
arrowTrans.translate(Start.x() +
ite->xPos(), Start.y() + ite->yPos());
EndArrow.map(arrowTrans);
- int zS =
m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10,
0, obState.CurrColorStroke, CommonStrings::None);
+ int zS =
m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10,
0, obState.currColorStroke, CommonStrings::None);
iteS = m_Doc->Items->at(zS);
iteS->PoLine = EndArrow.copy();
iteS->ClipEdited = true;
@@ -3463,7 +3463,7 @@
arrowTrans.translate(-m_Doc->currentPage()->xOffset(),
-m_Doc->currentPage()->yOffset());
arrowTrans.translate(End.x() +
ite->xPos(), End.y() + ite->yPos());
EndArrow.map(arrowTrans);
- int zE =
m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10,
0, obState.CurrColorStroke, CommonStrings::None);
+ int zE =
m_Doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, baseX, baseY, 10, 10,
0, obState.currColorStroke, CommonStrings::None);
iteS = m_Doc->Items->at(zE);
iteS->PoLine = EndArrow.copy();
iteS->ClipEdited = true;
@@ -4015,7 +4015,7 @@
hatchS = 1;
else if (gStyle.hatchStyle == "triple")
hatchS = 2;
- item->setHatchParameters(hatchS, gStyle.hatchDistance,
gStyle.hatchRotation, obState.hatchSolidFill, obState.CurrColorFill,
gStyle.hatchColor);
+ item->setHatchParameters(hatchS, gStyle.hatchDistance,
gStyle.hatchRotation, obState.hatchSolidFill, obState.currColorFill,
gStyle.hatchColor);
item->GrType = 14;
}
if (!obState.opacityName.isEmpty())
@@ -4129,7 +4129,7 @@
if (obState.hasShadow)
{
item->setHasSoftShadow(true);
- item->setSoftShadowColor(obState.CurrColorShadow);
+ item->setSoftShadowColor(obState.currColorShadow);
item->setSoftShadowXOffset(obState.shadowX);
item->setSoftShadowYOffset(obState.shadowY);
item->setSoftShadowBlurRadius(0);
Modified: trunk/Scribus/scribus/plugins/import/odg/importodg.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23868&path=/trunk/Scribus/scribus/plugins/import/odg/importodg.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/odg/importodg.h (original)
+++ trunk/Scribus/scribus/plugins/import/odg/importodg.h Sun May 31
12:58:12 2020
@@ -37,168 +37,88 @@
class ObjStyle
{
public:
- ObjStyle() :
- markerViewBox(),
- markerPath(),
- startMarkerName(""),
- startMarkerWidth(0.0),
- startMarkerCentered(false),
- endMarkerName(""),
- endMarkerWidth(0.0),
- endMarkerCentered(false),
- stroke_dash_distance(0.0),
- stroke_dash_dots1(1),
- stroke_dash_dots1_length(0.0),
- stroke_dash_dots2(1),
- stroke_dash_dots2_length(0.0),
- stroke_dash_style("solid"),
- dashName(""),
- CurrColorFill(CommonStrings::None),
- CurrColorStroke(CommonStrings::None),
- CurrColorText("Black"),
- CurrColorBText(CommonStrings::None),
- CurrColorShadow("Black"),
- fillOpacity(0.0),
- strokeOpacity(0.0),
- LineW(0.0),
- fontName(""),
- fontSize(10.0),
- textIndent(0.0),
- textAlign(ParagraphStyle::LeftAligned),
- textPos(""),
- textOutline(""),
- textUnderline(false),
- textUnderlineWords(false),
- textUnderlineColor(CommonStrings::None),
- textStrikeThrough(false),
- textShadow(false),
- lineHeight(1.0),
- absLineHeight(false),
- margin_top(0.0),
- margin_bottom(0.0),
- margin_left(0.0),
- margin_right(0.0),
- verticalAlignment(0),
- page_width(595.0),
- page_height(841.0),
- page_layout_name(""),
- fill_type(0),
- stroke_type(0),
- gradientAngle(0.0),
- gradientBorder(0.0),
- gradientEndColor(CommonStrings::None),
- gradientEndShade(100.0),
- gradientStartColor(CommonStrings::None),
- gradientStartShade(100.0),
- gradientCenterX(0.0),
- gradientCenterY(0.0),
- gradientType("linear"),
- gradientName(""),
- hasShadow(false),
- shadowX(0.0),
- shadowY(0.0),
- shadowTrans(0.0),
- measureDist(0.0),
- patternName(""),
- patternPath(""),
- patternData(),
- patternWidth(0.0),
- patternHeight(0.0),
- patternX(0.0),
- patternY(0.0),
- patternDim_W_in_Percent(false),
- patternDim_H_in_Percent(false),
- patternStretch(""),
- hatchName(""),
- hatchColor(""),
- hatchDistance(0.0),
- hatchRotation(0.0),
- hatchStyle(""),
- hatchSolidFill(false),
- opacityName(""),
- opacityEnd(1.0),
- opacityStart(0.0)
- {}
+ ObjStyle() {}
+
QRectF markerViewBox;
QPainterPath markerPath;
QString startMarkerName;
- double
startMarkerWidth;
- bool
startMarkerCentered;
+ double
startMarkerWidth { 0.0 };
+ bool
startMarkerCentered { false };
QString endMarkerName;
- double endMarkerWidth;
- bool
endMarkerCentered;
- double
stroke_dash_distance;
- int
stroke_dash_dots1;
- double
stroke_dash_dots1_length;
- int
stroke_dash_dots2;
- double
stroke_dash_dots2_length;
- QString
stroke_dash_style;
+ double endMarkerWidth
{ 0.0 };
+ bool
endMarkerCentered { false };
+ double
stroke_dash_distance { 0.0 };
+ int
stroke_dash_dots1 { 1 };
+ double
stroke_dash_dots1_length { 0.0 };
+ int
stroke_dash_dots2 { 1 };
+ double
stroke_dash_dots2_length { 0.0 };
+ QString
stroke_dash_style { "solid" };
QString dashName;
- QString CurrColorFill;
- QString CurrColorStroke;
- QString CurrColorText;
- QString CurrColorBText;
- QString CurrColorShadow;
- double fillOpacity;
- double strokeOpacity;
- double LineW;
+ QString currColorFill {
CommonStrings::None };
+ QString currColorStroke
{ CommonStrings::None };
+ QString currColorText {
"Black" };
+ QString currColorBText
{ CommonStrings::None };
+ QString currColorShadow
{ "Black" };
+ double fillOpacity {
0.0 };
+ double strokeOpacity {
0.0 };
+ double LineW { 0.0 };
QString fontName;
- double fontSize;
- double textIndent;
- ParagraphStyle::AlignmentType textAlign; // 0 = left
+ double fontSize{ 10.0
};
+ double textIndent {
0.0 };
+ ParagraphStyle::AlignmentType textAlign { ParagraphStyle::LeftAligned
}; // 0 = left
QString textPos;
QString textOutline;
- bool textUnderline;
- bool
textUnderlineWords;
- QString
textUnderlineColor;
- bool
textStrikeThrough;
- bool textShadow;
- double lineHeight;
- bool absLineHeight;
- double margin_top;
- double margin_bottom;
- double margin_left;
- double margin_right;
- int
verticalAlignment;
- double page_width;
- double page_height;
+ bool textUnderline {
false };
+ bool
textUnderlineWords { false };
+ QString
textUnderlineColor { CommonStrings::None };
+ bool
textStrikeThrough { false };
+ bool textShadow {
false };
+ double lineHeight {
1.0 };
+ bool absLineHeight {
false };
+ double margin_top {
0.0 };
+ double margin_bottom {
0.0 };
+ double margin_left {
0.0 };
+ double margin_right {
0.0 };
+ int
verticalAlignment{ 0 };
+ double page_width {
595.0 };
+ double page_height {
841.0 };
QString
page_layout_name;
- int
fill_type; // 0 = none, 1 = solid, 2 = gradient, 3 = bitmap 4 =
hatch
- int
stroke_type; // 0 = none, 1 = solid, 2 = dashed
- double gradientAngle;
- double gradientBorder;
- QString
gradientEndColor;
- double
gradientEndShade;
- QString
gradientStartColor;
- double
gradientStartShade;
- double gradientCenterX;
- double gradientCenterY;
- QString gradientType;
+ int
fill_type { 0 }; // 0 = none, 1 = solid, 2 = gradient, 3 =
bitmap 4 = hatch
+ int
stroke_type { 0 }; // 0 = none, 1 = solid, 2 = dashed
+ double gradientAngle {
0.0 };
+ double gradientBorder
{ 0.0 };
+ QString
gradientEndColor { CommonStrings::None };
+ double
gradientEndShade { 100.0 };
+ QString
gradientStartColor { CommonStrings::None };
+ double
gradientStartShade { 100.0 };
+ double gradientCenterX
{ 0.0 };
+ double gradientCenterY
{ 0.0 };
+ QString gradientType {
"linear" };
QString gradientName;
- bool hasShadow;
- double shadowX;
- double shadowY;
- double shadowTrans;
- double measureDist;
+ bool hasShadow {
false };
+ double shadowX { 0.0 };
+ double shadowY { 0.0 };
+ double shadowTrans {
0.0 };
+ double measureDist {
0.0 };
QString patternName;
QString patternPath;
QByteArray patternData;
- double patternWidth;
- double patternHeight;
- double patternX;
- double patternY;
- bool
patternDim_W_in_Percent;
- bool
patternDim_H_in_Percent;
+ double patternWidth {
0.0 };
+ double patternHeight {
0.0 };
+ double patternX { 0.0
};
+ double patternY { 0.0
};
+ bool
patternDim_W_in_Percent { false };
+ bool
patternDim_H_in_Percent { false };
QString patternStretch;
QString hatchName;
QString hatchColor;
- double hatchDistance;
- double hatchRotation;
+ double hatchDistance {
0.0 };
+ double hatchRotation {
0.0 };
QString hatchStyle;
- bool hatchSolidFill;
+ bool hatchSolidFill
{ false };
QString opacityName;
- double opacityEnd;
- double opacityStart;
+ double opacityEnd {
1.0 };
+ double opacityStart {
0.0 };
};
class OdgPlug : public QObject
@@ -251,11 +171,11 @@
AttributeValue stroke_dash_style;
AttributeValue dashName;
AttributeValue fillMode;
- AttributeValue CurrColorFill;
+ AttributeValue currColorFill;
AttributeValue strokeMode;
- AttributeValue CurrColorStroke;
+ AttributeValue currColorStroke;
AttributeValue fontColor;
- AttributeValue CurrColorShadow;
+ AttributeValue currColorShadow;
AttributeValue fillOpacity;
AttributeValue strokeOpacity;
AttributeValue LineW;
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
