python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2025-09-23 08:39:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.4

Browse Source
This commit is contained in:
Arin Alexander
2016-11-01 14:56:18 +03:00
parent a6d17858cf c623932afb
commit 16605c1414
9 changed files with 75 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
limereport/items/lralignpropitem.cpp
View File

@@ -109,7 +109,8 @@ void AlignmentItemEditor::setModelData(QWidget *propertyEditor, QAbstractItemMod
int align = m_acceptableValues.value(qobject_cast<ComboBoxEditor*>(propertyEditor)->text());
flags=clearAcceptableValues(flags) | align;
object()->setProperty(propertyName().toLatin1(),flags);
foreach(QObject* item,*objects()){item->setProperty(propertyName().toLatin1(),flags);}
if (objects())
foreach(QObject* item,*objects()){item->setProperty(propertyName().toLatin1(),flags);}
parent()->setPropertyValue(flags);
model->setData(index,align);
}

12
limereport/items/lrtextitem.cpp
View File

@@ -60,6 +60,18 @@ TextItem::TextItem(QObject *owner, QGraphicsItem *parent)
m_allowHTMLInFields(false)
{
m_text = new QTextDocument();
PageItemDesignIntf* pageItem = dynamic_cast<PageItemDesignIntf*>(parent);
BaseDesignIntf* parentItem = dynamic_cast<BaseDesignIntf*>(parent);
while (!pageItem){
parentItem = dynamic_cast<BaseDesignIntf*>(parentItem->parentItem());
pageItem = dynamic_cast<PageItemDesignIntf*>(parentItem);
}
if (pageItem){
QFont defaultFont = pageItem->font();
setFont(defaultFont);
}
Init();
}