Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 23990 → Rev 23991

/trunk/Scribus/scribus/gtparagraphstyle.h
111,7 → 111,7
void setBullet(bool newBullet, const QString& str);
QString getBullet() const;
bool hasNum() const;
void setNum(bool newNum, int format=0, int level=0, int start = 1, const QString& prefix = "", const QString& suffix = "");
void setNum(bool newNum, int format=0, int level=0, int start = 1, const QString& prefix = QString(), const QString& suffix = QString());
int getNumLevel() const;
int getNumFormat() const;
int getNumStart() const;
/trunk/Scribus/scribus/plugins/gettext/docxim/docxim.cpp
293,7 → 293,7
{
currentParagraphStyle = defaultParagraphStyle;
bool hasStyle = false;
QString currStyleName = "";
QString currStyleName;
for (QDomElement spr = spf.firstChildElement(); !spr.isNull(); spr = spr.nextSiblingElement())
{
if (spr.tagName() == "w:pPr")
/trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp
928,7 → 928,7
DRWParagraph para = paragraphList.at(paragraphCounter);
paragraphCounter++;
ParagraphStyle newStyle;
newStyle.setLineSpacingMode(static_cast<ParagraphStyle::LineSpacingMode>(1));
newStyle.setLineSpacingMode(ParagraphStyle::AutomaticLineSpacing);
newStyle.setAlignment(static_cast<ParagraphStyle::AlignmentType>(para.paragraphAlignment));
newStyle.charStyle().setFontSize(fontSize * scaleFactor * 10.0 * 0.8);
QString fontN(m_Doc->itemToolPrefs().textFont);
/trunk/Scribus/scribus/styles/charstyle.h
110,7 → 110,7
#undef ATTRDEF
m_isDefaultStyle=false;
setFont(font);
setFontSize(size);
setFontSize(size);
setEffects(style);
}
/trunk/Scribus/scribus/ui/stylemanager.cpp
1189,8 → 1189,7
else if (m_widget && !m_widget->isEnabled())
m_widget->setEnabled(true);
 
disconnect(nameEdit, SIGNAL(textChanged(const QString&)),
this, SLOT(slotNameChanged(const QString&)));
disconnect(nameEdit, SIGNAL(textChanged(const QString&)), this, SLOT(slotNameChanged(const QString&)));
if (!typeName.isEmpty())
{
m_item->selected(selection.second);