Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 12281 → Rev 12283

/trunk/Scribus/scribus/stylemanager.cpp
204,7 → 204,7
m_styleActions.clear();
for (int i = 0; i < m_items.count(); ++i)
{
m_items.at(i)->currentDoc(doc);
m_items.at(i)->setCurrentDoc(doc);
addNewType(m_items.at(i)); // forces a reload
if (m_doc)
m_items.at(i)->unitChange();
216,7 → 216,7
{
for (int i = 0; i < m_items.count(); ++i)
{
m_items.at(i)->currentDoc(m_doc);
m_items.at(i)->setCurrentDoc(m_doc);
m_items.at(i)->reload();
}
}
419,8 → 419,8
}
delete dia2;
// Start hack part 2
pstyle->currentDoc(m_doc);
cstyle->currentDoc(m_doc);
pstyle->setCurrentDoc(m_doc);
cstyle->setCurrentDoc(m_doc);
// end hack part 2
reloadStyleView(false);
setSelection(selected);
655,8 → 655,10
return;
loadType(typeName); // get the right style class
Q_ASSERT(m_item);
QString newName = fromParent.isNull() ?
m_item->newStyle() : m_item->newStyle(fromParent);
// qDebug() << "created new style:" << newName << " : " << m_item->isDefaultStyle(newName);
if (newName.isNull())
return;
StyleViewItem *root = 0;
1082,7 → 1084,8
else
{
nameEdit->setText(selection.second[0]);
nameEdit->setEnabled(true);
// qDebug() << selection.second[0] << m_item->isDefaultStyle(selection.second[0]);
nameEdit->setEnabled(! (m_item->isDefaultStyle(selection.second[0])));
m_shortcutWidget->setEnabled(true);
m_shortcutWidget->setShortcut(m_item->shortcut(selection.second[0]));
}
1132,7 → 1135,7
if (m_isEditMode)
return; // don't track changes when in edit mode
 
qDebug() << "Style Manager : doc selection changed";
// qDebug() << "Style Manager : doc selection changed";
 
disconnect(styleView, SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)),
this, SLOT(slotApplyStyle(QTreeWidgetItem*, QTreeWidgetItem*)));
/trunk/Scribus/scribus/styleitem.h
61,7 → 61,7
* @brief Whenever style manager is shown attached StyleItems get the current doc
* @brief passed to them with this function.
*/
virtual void currentDoc(ScribusDoc *doc) = 0;
virtual void setCurrentDoc(ScribusDoc *doc) = 0;
 
/**
* @brief existing styles in this category
147,6 → 147,12
*/
virtual void editMode(bool isOn) {};
 
/** @brief returns if the style is a default style */
virtual bool isDefaultStyle(const QString &stylename) const = 0;
 
/** @brief set if the style is a default style */
virtual void setDefaultStyle(bool ids) = 0;
/** @brief returns the key combination for the style's shortcut */
virtual QString shortcut(const QString &stylename) const = 0;
 
/trunk/Scribus/scribus/styles/charstyle.cpp
7,6 → 7,9
 
 
#include <QObject>
#include <QDebug>
 
#include "commonstrings.h"
#include "sctextstruct.h"
#include "scfonts.h"
#include "resourcecollection.h"
143,6 → 146,8
 
QString CharStyle::displayName() const
{
if ( isDefaultStyle() )
return CommonStrings::trDefaultCharacterStyle;
if ( hasName() || !hasParent() || ! m_context)
return name();
// else if ( inheritsAll() )
/trunk/Scribus/scribus/styles/charstyle.h
95,6 → 95,7
inh_##attr_NAME = true;
#include "charstyle.attrdefs.cxx"
#undef ATTRDEF
m_isDefaultStyle=false;
};
CharStyle(const ScFace& font, int size, StyleFlag style = ScStyle_Default) : Style() {
103,6 → 104,7
inh_##attr_NAME = true;
#include "charstyle.attrdefs.cxx"
#undef ATTRDEF
m_isDefaultStyle=false;
setFont(font);
setFontSize(size);
setEffects(style);
/trunk/Scribus/scribus/styles/paragraphstyle.cpp
13,8 → 13,7
* *
***************************************************************************/
 
 
 
#include "commonstrings.h"
#include "styles/style.h"
#include "paragraphstyle.h"
#include "resourcecollection.h"
32,6 → 31,8
inh_##attr_NAME = true;
#include "paragraphstyle.attrdefs.cxx"
#undef ATTRDEF
m_isDefaultStyle=false;
}
 
 
60,6 → 61,8
 
QString ParagraphStyle::displayName() const
{
if ( isDefaultStyle() )
return CommonStrings::trDefaultParagraphStyle;
if ( hasName() || !hasParent() || !m_context)
return name();
// else if ( inheritsAll() )
/trunk/Scribus/scribus/style.h
37,6 → 37,7
*/
class SCRIBUS_API Style : public SaxIO {
protected:
bool m_isDefaultStyle;
QString m_name;
const StyleContext* m_context;
int m_contextversion;
45,13 → 46,14
public:
// static const short NOVALUE = -16000;
 
Style(): m_name(""), m_context(NULL), m_contextversion(-1), m_parent(""), m_shortcut() {}
Style(): m_isDefaultStyle(false), m_name(""), m_context(NULL), m_contextversion(-1), m_parent(""), m_shortcut() {}
 
Style(StyleContext* b, QString n): m_name(n), m_context(b), m_contextversion(-1), m_parent(""), m_shortcut() {}
Style(StyleContext* b, QString n): m_isDefaultStyle(false), m_name(n), m_context(b), m_contextversion(-1), m_parent(""), m_shortcut() {}
Style& operator=(const Style& o)
{ //assert(typeinfo() == o.typeinfo());
m_name = o.m_name;
m_isDefaultStyle = o.m_isDefaultStyle;
m_name = o.m_name;
// m_context = o.m_context;
m_contextversion = -1;
m_parent = o.m_parent;
59,7 → 61,7
return *this;
}
Style(const Style& o) : SaxIO(), m_name(o.m_name),
Style(const Style& o) : SaxIO(), m_isDefaultStyle(o.m_isDefaultStyle),m_name(o.m_name),
m_context(o.m_context), m_contextversion(o.m_contextversion), m_parent(o.m_parent), m_shortcut(o.m_shortcut) {}
virtual ~Style() {}
74,12 → 76,14
//virtual void saxx(SaxHandler& handler, const Xml_string& elemtag) const;
//virtual void saxx(SaxHandler& handler) const { saxx(handler, saxxDefaultElem); }
void setDefaultStyle(bool ids) { m_isDefaultStyle = ids; }
bool isDefaultStyle() const { return m_isDefaultStyle; }
QString name() const { return m_name; }
void setName(const QString& n) { m_name = n.isEmpty() ? "" : n; }
bool hasName() const { return ! m_name.isEmpty(); }
 
virtual QString displayName() const {
virtual QString displayName() const = 0;/*{
if ( hasName() || !hasParent() || !m_context)
return name();
// else if ( inheritsAll() )
86,7 → 90,7
// return parent()->displayName();
else
return parentStyle()->displayName();
}
}*/
QString parent() const { return m_parent; }
void setParent(const QString& p) { if (m_parent != p) m_contextversion = -1; m_parent = p.isEmpty()? "" : p; }
/trunk/Scribus/scribus/smlinestyle.h
29,7 → 29,7
QTabWidget* widget();
QString typeNamePlural();
QString typeNameSingular();
void currentDoc(ScribusDoc *doc);
void setCurrentDoc(ScribusDoc *doc);
QList<StyleName> styles(bool reloadFromDoc = true);
void reload();
void selected(const QStringList &styleNames);
38,6 → 38,8
QString newStyle();
QString newStyle(const QString &fromStyle);
void apply();
bool isDefaultStyle(const QString &stylename) const;
void setDefaultStyle(bool ids);
QString shortcut(const QString &stylename) const;
void setShortcut(const QString &shortcut);
void deleteStyles(const QList<RemoveItem> &removeList);
/trunk/Scribus/scribus/smcstylewidget.cpp
7,6 → 7,7
 
#include <QEvent>
 
#include "langmgr.h"
#include "smcstylewidget.h"
#include "util_icon.h"
#include "util.h"
238,6 → 239,9
defLang : parent->language();
 
int ci = -1, pi = -1, di = -1;
LanguageManager langmgr;
langmgr.init(true);
QString tl;
for (int i = 0; i < language_->count(); ++i)
{
if (language_->itemText(i) == langMap_[clang])
245,9 → 249,13
if (hasParent && language_->itemText(i) == langMap_[plang])
pi = i;
 
if (language_->itemText(i) == defLang || language_->itemText(i) == langMap_[defLang])
tl=langmgr.getTransLangFromLang(defLang);
// qDebug() << i << language_->itemText(i) << defLang << langMap_[defLang] << tl;
if (language_->itemText(i) == defLang || language_->itemText(i) == langMap_[defLang] || language_->itemText(i) == tl)
// {
di = i;
// qDebug() << "match on:" << di;
// }
}
 
// qDebug(QString("SMCStyleWidget::show(): deflan='%1'->'%2'").arg(defLang).arg(langMap_[defLang]));
/trunk/Scribus/scribus/langmgr.h
40,6 → 40,7
void init(bool generateInstalledList = true);
const QString getLangFromAbbrev(QString, bool getTranslated=true);
const QString getAbbrevFromLang(QString, bool getFromTranslated=true, bool useInstalled=true);
const QString getTransLangFromLang(QString lang);
void fillInstalledStringList(QStringList *stringListToFill, bool addDefaults);
void printInstalledList();
QString numericSequence(QString seq);
/trunk/Scribus/scribus/smtextstyles.h
27,7 → 27,7
QTabWidget* widget();
QString typeNamePlural();
QString typeNameSingular();
void currentDoc(ScribusDoc *doc);
void setCurrentDoc(ScribusDoc *doc);
QList<StyleName> styles(bool reloadFromDoc = true);
void reload();
void selected(const QStringList &styleNames);
37,6 → 37,8
QString newStyle(const QString &fromStyle);
void apply();
void editMode(bool isOn);
bool isDefaultStyle(const QString &stylename) const;
void setDefaultStyle(bool ids);
QString shortcut(const QString &stylename) const;
void setShortcut(const QString &shortcut);
void deleteStyles(const QList<RemoveItem> &removeList);
108,7 → 110,7
QTabWidget* widget();
QString typeNamePlural();
QString typeNameSingular();
void currentDoc(ScribusDoc *doc);
void setCurrentDoc(ScribusDoc *doc);
QList<StyleName> styles(bool reloadFromDoc = true);
void reload();
void selected(const QStringList &styleNames);
118,6 → 120,8
QString newStyle(const QString &fromStyle);
void apply();
void editMode(bool isOn);
bool isDefaultStyle(const QString &stylename) const;
void setDefaultStyle(bool ids);
QString shortcut(const QString &stylename) const;
void setShortcut(const QString &shortcut);
void deleteStyles(const QList<RemoveItem> &removeList);
/trunk/Scribus/scribus/scribusdoc.cpp
414,7 → 414,8
 
ParagraphStyle pstyle;
pstyle.setName( tr("Default Paragraph Style"));
pstyle.setDefaultStyle(true);
pstyle.setName(CommonStrings::DefaultParagraphStyle);
pstyle.setLineSpacingMode(ParagraphStyle::FixedLineSpacing);
pstyle.setLineSpacing(15);
pstyle.setAlignment(ParagraphStyle::Leftaligned);
429,7 → 430,8
pstyle.charStyle().setParent("");
CharStyle cstyle;
cstyle.setName( tr("Default Character Style"));
cstyle.setDefaultStyle(true);
cstyle.setName(CommonStrings::DefaultCharacterStyle);
cstyle.setFont(prefsData.AvailFonts[toolSettings.defFont]);
cstyle.setFontSize(toolSettings.defSize);
cstyle.setFeatures(QStringList(CharStyle::INHERIT));
/trunk/Scribus/scribus/commonstrings.cpp
99,6 → 99,14
QString CommonStrings::trPenStyle_DashDotDotLine = "";
 
 
QString CommonStrings::DefaultParagraphStyle ="";
QString CommonStrings::DefaultCharacterStyle ="";
QString CommonStrings::DefaultLineStyle ="";
QString CommonStrings::trDefaultParagraphStyle ="";
QString CommonStrings::trDefaultCharacterStyle ="";
QString CommonStrings::trDefaultLineStyle ="";
 
 
QString CommonStrings::monday="", CommonStrings::tuesday="", CommonStrings::wednesday="";
QString CommonStrings::thursday="", CommonStrings::friday="", CommonStrings::saturday="", CommonStrings::sunday="";
QString CommonStrings::january="", CommonStrings::february="", CommonStrings::march="";
311,6 → 319,14
CommonStrings::trPenStyle_DashDotLine = tr("Dash Dot Line");
CommonStrings::trPenStyle_DashDotDotLine = tr("Dash Dot Dot Line");
CommonStrings::DefaultParagraphStyle = "Default Paragraph Style";
CommonStrings::DefaultCharacterStyle = "Default Character Style";
CommonStrings::DefaultLineStyle = "Default Line Style";
CommonStrings::trDefaultParagraphStyle = tr("Default Paragraph Style");
CommonStrings::trDefaultCharacterStyle = tr("Default Character Style");
CommonStrings::trDefaultLineStyle = tr("Default Line Style");
 
CommonStrings::monday = tr("Monday");
CommonStrings::tuesday = tr("Tuesday");
CommonStrings::wednesday = tr("Wednesday");
/trunk/Scribus/scribus/smlinestyle.cpp
47,7 → 47,7
return tr("Line Style");
}
 
void SMLineStyle::currentDoc(ScribusDoc *doc)
void SMLineStyle::setCurrentDoc(ScribusDoc *doc)
{
doc_ = doc;
if (doc_)
266,6 → 266,32
selectionIsDirty_ = false;
}
 
bool SMLineStyle::isDefaultStyle(const QString &stylename) const
{
return false;//we have no default line styles yet
// Q_ASSERT(tmpLines.contains(stylename));
// return tmpLines[stylename].isDefaultStyle();
}
 
void SMLineStyle::setDefaultStyle(bool ids)
{
/* we dont have default line styles yet
Q_ASSERT(selection_.count() == 1);
if (selection_.count() != 1)
return;
 
QMap<QString, multiLine*>::iterator it;
for (it = selection_.begin(); it != selection_.end(); ++it)
(*it)->setDefaultStyle(ids);
if (!selectionIsDirty_)
{
selectionIsDirty_ = true;
emit selectionDirty();
}
*/
}
 
QString SMLineStyle::shortcut(const QString &stylename) const
{
Q_ASSERT(tmpLines.contains(stylename));
786,3 → 812,4
widget_ = 0;
twidget_ = 0;
}
 
/trunk/Scribus/scribus/commonstrings.h
165,6 → 165,14
static QString trPenStyle_DashDotLine;
static QString trPenStyle_DashDotDotLine;
//Default Styles
static QString DefaultParagraphStyle;
static QString DefaultCharacterStyle;
static QString DefaultLineStyle;
static QString trDefaultParagraphStyle;
static QString trDefaultCharacterStyle;
static QString trDefaultLineStyle;
//Days and Months
static QString monday;
static QString tuesday;
/trunk/Scribus/scribus/styleitem.cpp
6,7 → 6,6
*/
 
#include "styleitem.h"
//#include "styleitem.moc"
 
StyleItem::StyleItem() : QObject()
{}
/trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp
432,6 → 432,8
docu.writeAttribute("NAME", style.name());
if ( ! style.parent().isEmpty())
docu.writeAttribute("PARENT", style.parent());
if ( style.isDefaultStyle())
docu.writeAttribute("DefaultStyle", style.isDefaultStyle());
if ( ! style.isInhAlignment())
docu.writeAttribute("ALIGN", style.alignment());
532,6 → 534,8
docu.writeAttribute("CNAME", style.name());
if ( ! style.parent().isEmpty() )
docu.writeAttribute("CPARENT", style.parent());
if ( style.isDefaultStyle())
docu.writeAttribute("DefaultStyle", style.isDefaultStyle());
if ( ! style.isInhFont())
docu.writeAttribute("FONT", style.font().scName());
if ( ! style.isInhFontSize())
/trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
1611,7 → 1611,10
newStyle.setName(it->attribute("CNAME"));
if (it->hasAttribute("CPARENT"))
newStyle.setParent(it->attribute("CPARENT"));
if (it->hasAttribute("DefaultStyle"))
newStyle.setDefaultStyle(it->attribute("DefaultStyle").toInt());
else
newStyle.setDefaultStyle(false);
if (it->hasAttribute("FONT"))
newStyle.setFont(m_AvailableFonts->findFont(it->attribute("FONT"),doc));
1871,6 → 1874,10
vg.erase();
vg.setName(pg.attribute("NAME", ""));
vg.setParent(pg.attribute("PARENT", ""));
if (pg.hasAttribute("DefaultStyle"))
vg.setDefaultStyle(pg.attribute("DefaultStyle").toInt());
else
vg.setDefaultStyle(false);
if (pg.hasAttribute("LINESPMode"))
vg.setLineSpacingMode(static_cast<ParagraphStyle::LineSpacingMode>(pg.attribute("LINESPMode").toInt()));
if (pg.hasAttribute("LINESP"))
/trunk/Scribus/scribus/langmgr.cpp
184,6 → 184,18
return "";
}
 
const QString LanguageManager::getTransLangFromLang(QString lang)
{
QMap<QString, langPair>::Iterator it;
if (lang == "English" || lang == QObject::tr( "English"))
for (it=langList.begin();it!=langList.end();++it)
{
if (it.value().first==lang)
return it.value().second;
}
return "";
}
 
void LanguageManager::fillInstalledStringList(QStringList *stringListToFill, bool addDefaults)
{
if (stringListToFill)
/trunk/Scribus/scribus/smtextstyles.cpp
6,6 → 6,7
*/
 
#include <QEvent>
#include <QTabWidget>
 
#include "alignselect.h"
#include "colorcombo.h"
36,8 → 37,6
#include "util.h"
 
 
#include <QTabWidget>
 
SMParagraphStyle::SMParagraphStyle(StyleSet<CharStyle> *cstyles) : StyleItem(),
pwidget_(0), doc_(0), selectionIsDirty_(false), unitRatio_(1.0), cstyles_(cstyles)
{
61,7 → 60,7
return tr("Paragraph Style");
}
 
void SMParagraphStyle::currentDoc(ScribusDoc *doc)
void SMParagraphStyle::setCurrentDoc(ScribusDoc *doc)
{
doc_ = doc;
if (doc_)
106,7 → 105,7
{
if (tmpStyles_[i].hasName())
{
QString styleName(tmpStyles_[i].name());
QString styleName(tmpStyles_[i].displayName());
QString parentName(QString::null);
 
if (tmpStyles_[i].hasParent() )
208,6 → 207,7
 
QString s(getUniqueName( tr("New Style")));
ParagraphStyle p;
p.setDefaultStyle(false);
p.setName(s);
tmpStyles_.create(p);
return s;
221,6 → 221,7
 
QString s(getUniqueName( tr("Clone of %1").arg(fromStyle)));
ParagraphStyle p(tmpStyles_.get(fromStyle));
p.setDefaultStyle(false);
p.setName(s);
p.setShortcut(QString::null); // do not clone the sc
tmpStyles_.create(p);
283,6 → 284,39
reloadTmpStyles();
}
 
bool SMParagraphStyle::isDefaultStyle(const QString &stylename) const
{
int index = tmpStyles_.find(stylename);
bool b=false;
if (index > -1)
b = tmpStyles_[index].isDefaultStyle();
else
{
if (CommonStrings::trDefaultParagraphStyle==stylename)
{
index = tmpStyles_.find(CommonStrings::DefaultParagraphStyle);
if (index > -1)
b = tmpStyles_[index].isDefaultStyle();
}
}
return b;
}
 
void SMParagraphStyle::setDefaultStyle(bool ids)
{
Q_ASSERT(selection_.count() == 1);
if (selection_.count() != 1)
return;
 
selection_[0]->setDefaultStyle(ids);
if (!selectionIsDirty_)
{
selectionIsDirty_ = true;
emit selectionDirty();
}
}
 
QString SMParagraphStyle::shortcut(const QString &stylename) const
{
QString s(QString::null);
1202,7 → 1236,7
return tr("Character Style");
}
 
void SMCharacterStyle::currentDoc(ScribusDoc *doc)
void SMCharacterStyle::setCurrentDoc(ScribusDoc *doc)
{
doc_ = doc;
if (doc_)
1242,7 → 1276,7
{
if (tmpStyles_[i].hasName())
{
QString styleName(tmpStyles_[i].name());
QString styleName(tmpStyles_[i].displayName());
QString parentName(QString::null);
 
if (tmpStyles_[i].hasParent())
1324,6 → 1358,7
 
QString s = getUniqueName( tr("New Style"));
CharStyle c;
c.setDefaultStyle(false);
c.setName(s);
tmpStyles_.create(c);
return s;
1337,6 → 1372,7
 
QString s = getUniqueName( tr("Clone of %1").arg(fromStyle));
CharStyle c(tmpStyles_.get(fromStyle));
c.setDefaultStyle(false);
c.setName(s);
c.setShortcut(QString::null);
tmpStyles_.create(c);
1398,6 → 1434,39
reloadTmpStyles();
}
 
bool SMCharacterStyle::isDefaultStyle(const QString &stylename) const
{
int index = tmpStyles_.find(stylename);
bool b=false;
if (index > -1)
b = tmpStyles_[index].isDefaultStyle();
else
{
if (CommonStrings::trDefaultCharacterStyle==stylename)
{
index = tmpStyles_.find(CommonStrings::DefaultCharacterStyle);
if (index > -1)
b = tmpStyles_[index].isDefaultStyle();
}
}
return b;
}
 
void SMCharacterStyle::setDefaultStyle(bool ids)
{
Q_ASSERT(selection_.count() == 1);
if (selection_.count() != 1)
return;
 
selection_[0]->setDefaultStyle(ids);
if (!selectionIsDirty_)
{
selectionIsDirty_ = true;
emit selectionDirty();
}
}
 
QString SMCharacterStyle::shortcut(const QString &stylename) const
{
QString s = QString::null;
1962,4 → 2031,3
widget_ = 0;
}
 
 
/trunk/Scribus/Scribus.pro
1,5 → 1,5
######################################################################
# Automatically generated by qmake (2.01a) Thu Feb 14 22:02:34 2008
# Automatically generated by qmake (2.01a) Sat Jun 21 00:08:13 2008
######################################################################
 
TEMPLATE = app
11,10 → 11,10
scribus/fonts \
scribus/old \
scribus/plugins \
scribus/po \
scribus/styles \
scribus/text \
scribus/ui \
translations/po \
scribus/designer/smwidgets \
scribus/plugins/aiimplugin \
scribus/plugins/barcodegenerator \
52,7 → 52,11
scribus/plugins/tools/pathfinder \
scribus/plugins/tools/pathstroker \
scribus/plugins/tools/spellcheck \
scribus/plugins/tools/subdivide
scribus/plugins/tools/subdivide \
scribus/plugins/tools/transform \
scribus/plugins/tools/2geomtools/lib2geom \
scribus/plugins/tools/2geomtools/meshdistortion \
scribus/plugins/tools/2geomtools/pathalongpath
INCLUDEPATH += . \
scribus \
scribus/fonts \
99,7 → 103,11
scribus/plugins/tools/pathfinder \
scribus/plugins/tools/pathstroker \
scribus/plugins/tools/spellcheck \
scribus/plugins/tools/subdivide
scribus/plugins/tools/subdivide \
scribus/plugins/tools/transform \
scribus/plugins/tools/2geomtools/lib2geom \
scribus/plugins/tools/2geomtools/meshdistortion \
scribus/plugins/tools/2geomtools/pathalongpath
 
# Input
HEADERS += scribus/about.h \
114,6 → 122,7
scribus/arrowchooser.h \
scribus/autoform.h \
scribus/autoformbuttongroup.h \
scribus/basepointwidget.h \
scribus/bookmarkpalette.h \
scribus/bookmwin.h \
scribus/buttonicon.h \
284,6 → 293,8
scribus/rawimage.h \
scribus/rc4.h \
scribus/reformdoc.h \
scribus/replacecolors.h \
scribus/replaceonecolor.h \
scribus/resourcecollection.h \
scribus/rulermover.h \
scribus/sampleitem.h \
318,6 → 329,7
scribus/scpageoutput.h \
scribus/scpageoutput_ps2.h \
scribus/scpainter.h \
scribus/scpainterex_cairo.h \
scribus/scpainterex_gdi.h \
scribus/scpainterex_gdiplus.h \
scribus/scpainterex_ps2.h \
344,6 → 356,7
scribus/scribusXml.h \
scribus/scrpalettebase.h \
scribus/scrspinbox.h \
scribus/scslainforeader.h \
scribus/scstreamfilter.h \
scribus/scstreamfilter_ascii85.h \
scribus/scstreamfilter_flate.h \
352,8 → 365,10
scribus/sctextbrowser.h \
scribus/sctextstruct.h \
scribus/sctoolbar.h \
scribus/scxmlstreamwriter.h \
scribus/search.h \
scribus/selection.h \
scribus/selectobjects.h \
scribus/selfield.h \
scribus/serializer.h \
scribus/shadebutton.h \
424,6 → 439,7
scribus/util_icon.h \
scribus/util_math.h \
scribus/util_printer.h \
scribus/util_text.h \
scribus/vgradient.h \
scribus/vgradientex.h \
scribus/vruler.h \
586,6 → 602,60
scribus/plugins/tools/spellcheck/aspellpluginimpl.h \
scribus/plugins/tools/spellcheck/suggest.h \
scribus/plugins/tools/subdivide/subdivide.h \
scribus/plugins/tools/transform/transformdialog.h \
scribus/plugins/tools/transform/transformeffect.h \
scribus/plugins/tools/2geomtools/lib2geom/angle.h \
scribus/plugins/tools/2geomtools/lib2geom/basic-intersection.h \
scribus/plugins/tools/2geomtools/lib2geom/bezier-to-sbasis.h \
scribus/plugins/tools/2geomtools/lib2geom/bezier-utils.h \
scribus/plugins/tools/2geomtools/lib2geom/bezier.h \
scribus/plugins/tools/2geomtools/lib2geom/choose.h \
scribus/plugins/tools/2geomtools/lib2geom/circulator.h \
scribus/plugins/tools/2geomtools/lib2geom/concepts.h \
scribus/plugins/tools/2geomtools/lib2geom/conjugate_gradient.h \
scribus/plugins/tools/2geomtools/lib2geom/convex-cover.h \
scribus/plugins/tools/2geomtools/lib2geom/coord.h \
scribus/plugins/tools/2geomtools/lib2geom/crossing.h \
scribus/plugins/tools/2geomtools/lib2geom/d2-sbasis.h \
scribus/plugins/tools/2geomtools/lib2geom/d2.h \
scribus/plugins/tools/2geomtools/lib2geom/exception.h \
scribus/plugins/tools/2geomtools/lib2geom/geom.h \
scribus/plugins/tools/2geomtools/lib2geom/interval.h \
scribus/plugins/tools/2geomtools/lib2geom/isnan.h \
scribus/plugins/tools/2geomtools/lib2geom/linear.h \
scribus/plugins/tools/2geomtools/lib2geom/matrix.h \
scribus/plugins/tools/2geomtools/lib2geom/ord.h \
scribus/plugins/tools/2geomtools/lib2geom/path-intersection.h \
scribus/plugins/tools/2geomtools/lib2geom/path.h \
scribus/plugins/tools/2geomtools/lib2geom/piecewise.h \
scribus/plugins/tools/2geomtools/lib2geom/point-l.h \
scribus/plugins/tools/2geomtools/lib2geom/point-ops.h \
scribus/plugins/tools/2geomtools/lib2geom/point.h \
scribus/plugins/tools/2geomtools/lib2geom/poly-dk-solve.h \
scribus/plugins/tools/2geomtools/lib2geom/poly-laguerre-solve.h \
scribus/plugins/tools/2geomtools/lib2geom/poly.h \
scribus/plugins/tools/2geomtools/lib2geom/quadtree.h \
scribus/plugins/tools/2geomtools/lib2geom/rect.h \
scribus/plugins/tools/2geomtools/lib2geom/region.h \
scribus/plugins/tools/2geomtools/lib2geom/sbasis-2d.h \
scribus/plugins/tools/2geomtools/lib2geom/sbasis-geometric.h \
scribus/plugins/tools/2geomtools/lib2geom/sbasis-math.h \
scribus/plugins/tools/2geomtools/lib2geom/sbasis-poly.h \
scribus/plugins/tools/2geomtools/lib2geom/sbasis-to-bezier.h \
scribus/plugins/tools/2geomtools/lib2geom/sbasis.h \
scribus/plugins/tools/2geomtools/lib2geom/scribushelper.h \
scribus/plugins/tools/2geomtools/lib2geom/shape.h \
scribus/plugins/tools/2geomtools/lib2geom/solver.h \
scribus/plugins/tools/2geomtools/lib2geom/sturm.h \
scribus/plugins/tools/2geomtools/lib2geom/svg-elliptical-arc.h \
scribus/plugins/tools/2geomtools/lib2geom/svg-path.h \
scribus/plugins/tools/2geomtools/lib2geom/sweep.h \
scribus/plugins/tools/2geomtools/lib2geom/transforms.h \
scribus/plugins/tools/2geomtools/lib2geom/utils.h \
scribus/plugins/tools/2geomtools/meshdistortion/meshdistortion.h \
scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.h \
scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.h \
scribus/plugins/tools/2geomtools/pathalongpath/pathdialog.h \
scribus/styles/charstyle.attrdefs.cxx \
scribus/styles/paragraphstyle.attrdefs.cxx \
scribus/main_nix.cpp \
609,6 → 679,10
scribus/picsearchoptions.ui \
scribus/picstatus.ui \
scribus/pluginmanagerprefsgui.ui \
scribus/printdialogbase.ui \
scribus/replacecolors.ui \
scribus/replaceonecolor.ui \
scribus/selectobjects.ui \
scribus/shortcutwidget.ui \
scribus/smcstylewidget.ui \
scribus/smlinestylewidget.ui \
641,7 → 715,10
scribus/plugins/scriptplugin/scripterprefsgui.ui \
scribus/plugins/tools/lenseffects/lensdialogbase.ui \
scribus/plugins/tools/pathfinder/pathfinderbase.ui \
scribus/plugins/tools/spellcheck/aspellpluginbase.ui
scribus/plugins/tools/spellcheck/aspellpluginbase.ui \
scribus/plugins/tools/transform/transformdialogbase.ui \
scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.ui \
scribus/plugins/tools/2geomtools/pathalongpath/pathdialogbase.ui
SOURCES += scribus/about.cpp \
scribus/aboutplugins.cpp \
scribus/actionmanager.cpp \
654,6 → 731,7
scribus/arrowchooser.cpp \
scribus/autoform.cpp \
scribus/autoformbuttongroup.cpp \
scribus/basepointwidget.cpp \
scribus/bookmarkpalette.cpp \
scribus/bookmwin.cpp \
scribus/buttonicon.cpp \
820,6 → 898,8
scribus/rawimage.cpp \
scribus/rc4.c \
scribus/reformdoc.cpp \
scribus/replacecolors.cpp \
scribus/replaceonecolor.cpp \
scribus/rulermover.cpp \
scribus/sampleitem.cpp \
scribus/sccolor.cpp \
850,6 → 930,7
scribus/scpageoutput.cpp \
scribus/scpageoutput_ps2.cpp \
scribus/scpainter.cpp \
scribus/scpainterex_cairo.cpp \
scribus/scpainterex_gdi.cpp \
scribus/scpainterex_gdiplus.cpp \
scribus/scpainterex_ps2.cpp \
872,6 → 953,7
scribus/scribusXml.cpp \
scribus/scrpalettebase.cpp \
scribus/scrspinbox.cpp \
scribus/scslainforeader.cpp \
scribus/scstreamfilter.cpp \
scribus/scstreamfilter_ascii85.cpp \
scribus/scstreamfilter_flate.cpp \
882,6 → 964,7
scribus/sctoolbar.cpp \
scribus/search.cpp \
scribus/selection.cpp \
scribus/selectobjects.cpp \
scribus/selfield.cpp \
scribus/serializer.cpp \
scribus/shadebutton.cpp \
950,6 → 1033,7
scribus/util_icon.cpp \
scribus/util_math.cpp \
scribus/util_printer.cpp \
scribus/util_text.cpp \
scribus/vgradient.cpp \
scribus/vgradientex.cpp \
scribus/vruler.cpp \
1113,42 → 1197,80
scribus/plugins/tools/spellcheck/aspellplugin.cpp \
scribus/plugins/tools/spellcheck/aspellpluginimpl.cpp \
scribus/plugins/tools/spellcheck/suggest.cpp \
scribus/plugins/tools/subdivide/subdivide.cpp
TRANSLATIONS += scribus/po/scribus.af.ts \
scribus/po/scribus.ar.ts \
scribus/po/scribus.bg.ts \
scribus/po/scribus.ca.ts \
scribus/po/scribus.cs_CZ.ts \
scribus/po/scribus.cy.ts \
scribus/po/scribus.da_DK.ts \
scribus/po/scribus.de.ts \
scribus/po/scribus.de_CH.ts \
scribus/po/scribus.de_ol.ts \
scribus/po/scribus.en_AU.ts \
scribus/po/scribus.en_GB.ts \
scribus/po/scribus.en_US.ts \
scribus/po/scribus.es_ES.ts \
scribus/po/scribus.et.ts \
scribus/po/scribus.eu.ts \
scribus/po/scribus.fi.ts \
scribus/po/scribus.fr.ts \
scribus/po/scribus.gl.ts \
scribus/po/scribus.hu.ts \
scribus/po/scribus.id.ts \
scribus/po/scribus.ja.ts \
scribus/po/scribus.lt_LT.ts \
scribus/po/scribus.nb_NO.ts \
scribus/po/scribus.nl.ts \
scribus/po/scribus.pl_PL.ts \
scribus/po/scribus.pt.ts \
scribus/po/scribus.ru.ts \
scribus/po/scribus.sk_SK.ts \
scribus/po/scribus.sl.ts \
scribus/po/scribus.sq.ts \
scribus/po/scribus.sr.ts \
scribus/po/scribus.sv.ts \
scribus/po/scribus.th_TH.ts \
scribus/po/scribus.tr.ts \
scribus/po/scribus.uk.ts \
scribus/po/scribus.zh_CN.ts \
scribus/po/scribus.zh_TW.ts
scribus/plugins/tools/subdivide/subdivide.cpp \
scribus/plugins/tools/transform/transformdialog.cpp \
scribus/plugins/tools/transform/transformeffect.cpp \
scribus/plugins/tools/2geomtools/lib2geom/basic-intersection.cpp \
scribus/plugins/tools/2geomtools/lib2geom/bezier-utils.cpp \
scribus/plugins/tools/2geomtools/lib2geom/circle-circle.cpp \
scribus/plugins/tools/2geomtools/lib2geom/conjugate_gradient.cpp \
scribus/plugins/tools/2geomtools/lib2geom/convex-cover.cpp \
scribus/plugins/tools/2geomtools/lib2geom/crossing.cpp \
scribus/plugins/tools/2geomtools/lib2geom/d2-sbasis.cpp \
scribus/plugins/tools/2geomtools/lib2geom/geom.cpp \
scribus/plugins/tools/2geomtools/lib2geom/matrix.cpp \
scribus/plugins/tools/2geomtools/lib2geom/path-intersection.cpp \
scribus/plugins/tools/2geomtools/lib2geom/path.cpp \
scribus/plugins/tools/2geomtools/lib2geom/piecewise.cpp \
scribus/plugins/tools/2geomtools/lib2geom/point.cpp \
scribus/plugins/tools/2geomtools/lib2geom/poly-dk-solve.cpp \
scribus/plugins/tools/2geomtools/lib2geom/poly-laguerre-solve.cpp \
scribus/plugins/tools/2geomtools/lib2geom/poly.cpp \
scribus/plugins/tools/2geomtools/lib2geom/quadtree.cpp \
scribus/plugins/tools/2geomtools/lib2geom/region.cpp \
scribus/plugins/tools/2geomtools/lib2geom/sbasis-2d.cpp \
scribus/plugins/tools/2geomtools/lib2geom/sbasis-geometric.cpp \
scribus/plugins/tools/2geomtools/lib2geom/sbasis-math.cpp \
scribus/plugins/tools/2geomtools/lib2geom/sbasis-poly.cpp \
scribus/plugins/tools/2geomtools/lib2geom/sbasis-roots.cpp \
scribus/plugins/tools/2geomtools/lib2geom/sbasis-to-bezier.cpp \
scribus/plugins/tools/2geomtools/lib2geom/sbasis.cpp \
scribus/plugins/tools/2geomtools/lib2geom/scribushelper.cpp \
scribus/plugins/tools/2geomtools/lib2geom/shape.cpp \
scribus/plugins/tools/2geomtools/lib2geom/solve-bezier-one-d.cpp \
scribus/plugins/tools/2geomtools/lib2geom/solve-bezier-parametric.cpp \
scribus/plugins/tools/2geomtools/lib2geom/svg-path.cpp \
scribus/plugins/tools/2geomtools/lib2geom/sweep.cpp \
scribus/plugins/tools/2geomtools/lib2geom/transforms.cpp \
scribus/plugins/tools/2geomtools/meshdistortion/meshdistortion.cpp \
scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp \
scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp \
scribus/plugins/tools/2geomtools/pathalongpath/pathdialog.cpp
TRANSLATIONS += translations/po/scribus.af.ts \
translations/po/scribus.ar.ts \
translations/po/scribus.bg.ts \
translations/po/scribus.ca.ts \
translations/po/scribus.cs_CZ.ts \
translations/po/scribus.cy.ts \
translations/po/scribus.da_DK.ts \
translations/po/scribus.de.ts \
translations/po/scribus.de_CH.ts \
translations/po/scribus.de_ol.ts \
translations/po/scribus.en_AU.ts \
translations/po/scribus.en_GB.ts \
translations/po/scribus.en_US.ts \
translations/po/scribus.es_ES.ts \
translations/po/scribus.et.ts \
translations/po/scribus.eu.ts \
translations/po/scribus.fi.ts \
translations/po/scribus.fr.ts \
translations/po/scribus.gl.ts \
translations/po/scribus.hu.ts \
translations/po/scribus.id.ts \
translations/po/scribus.ja.ts \
translations/po/scribus.lt_LT.ts \
translations/po/scribus.nb_NO.ts \
translations/po/scribus.nl.ts \
translations/po/scribus.pl_PL.ts \
translations/po/scribus.pt.ts \
translations/po/scribus.ru.ts \
translations/po/scribus.sk_SK.ts \
translations/po/scribus.sl.ts \
translations/po/scribus.sq.ts \
translations/po/scribus.sr.ts \
translations/po/scribus.sv.ts \
translations/po/scribus.th_TH.ts \
translations/po/scribus.tr.ts \
translations/po/scribus.uk.ts \
translations/po/scribus.zh_CN.ts \
translations/po/scribus.zh_TW.ts