python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2025-01-11 20:31:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

Finish 1.4.123

Browse Source
This commit is contained in:
Arin Alexander 2019-01-31 22:14:25 +03:00
commit 959aa60d46
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.pri
View File

@ -119,7 +119,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MAJOR = 1
LIMEREPORT_VERSION_MINOR = 4 LIMEREPORT_VERSION_MINOR = 4
LIMEREPORT_VERSION_RELEASE = 122 LIMEREPORT_VERSION_RELEASE = 123
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}' LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\" DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"

11
limereport/lrpageitemdesignintf.cpp
View File

@ -327,7 +327,11 @@ void PageItemDesignIntf::registerBand(BandDesignIntf *band)
band->setParentItem(this); band->setParentItem(this);
band->setWidth(pageRect().width()/band->columnsCount()); band->setWidth(pageRect().width()/band->columnsCount());
connect(band, SIGNAL(destroyed(QObject*)),this,SLOT(bandDeleted(QObject*))); connect(band, SIGNAL(destroyed(QObject*)),this,SLOT(bandDeleted(QObject*)));
connect(band, SIGNAL(posChanged(QObject*,QPointF,QPointF)),this,SLOT(bandPositionChanged(QObject*,QPointF,QPointF))); connect(band, SIGNAL(posChanged(QObject*, QPointF, QPointF)),
this, SLOT(bandPositionChanged(QObject*, QPointF, QPointF)));
connect(band, SIGNAL(geometryChanged(QObject*, QRectF, QRectF)),
this, SLOT(bandGeometryChanged(QObject*, QRectF, QRectF)));
} }
} }
@ -833,6 +837,11 @@ void PageItemDesignIntf::bandPositionChanged(QObject* object, QPointF newPos, QP
relocateBands(); relocateBands();
} }
void PageItemDesignIntf::bandGeometryChanged(QObject* object, QRectF newGeometry, QRectF oldGeometry)
{
bandPositionChanged(object, newGeometry.topLeft(), oldGeometry.topLeft());
}
void PageItemDesignIntf::collectionLoadFinished(const QString &collectionName) void PageItemDesignIntf::collectionLoadFinished(const QString &collectionName)
{ {
if (collectionName.compare("children",Qt::CaseInsensitive)==0){ if (collectionName.compare("children",Qt::CaseInsensitive)==0){

1
limereport/lrpageitemdesignintf.h
View File

@ -157,6 +157,7 @@ signals:
protected slots: protected slots:
void bandDeleted(QObject* band); void bandDeleted(QObject* band);
void bandPositionChanged(QObject* object, QPointF newPos, QPointF oldPos); void bandPositionChanged(QObject* object, QPointF newPos, QPointF oldPos);
void bandGeometryChanged(QObject* object, QRectF newGeometry, QRectF oldGeometry);
protected: protected:
void collectionLoadFinished(const QString& collectionName); void collectionLoadFinished(const QString& collectionName);
QRectF& pageRect(){return m_pageRect;} QRectF& pageRect(){return m_pageRect;}