mirror of
https://github.com/fralx/LimeReport.git
synced 2025-01-11 09:08:09 +03:00
Finish 1.4.123
This commit is contained in:
commit
959aa60d46
@ -119,7 +119,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
|
||||
|
||||
LIMEREPORT_VERSION_MAJOR = 1
|
||||
LIMEREPORT_VERSION_MINOR = 4
|
||||
LIMEREPORT_VERSION_RELEASE = 122
|
||||
LIMEREPORT_VERSION_RELEASE = 123
|
||||
|
||||
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
|
||||
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"
|
||||
|
@ -327,7 +327,11 @@ void PageItemDesignIntf::registerBand(BandDesignIntf *band)
|
||||
band->setParentItem(this);
|
||||
band->setWidth(pageRect().width()/band->columnsCount());
|
||||
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();
|
||||
}
|
||||
|
||||
void PageItemDesignIntf::bandGeometryChanged(QObject* object, QRectF newGeometry, QRectF oldGeometry)
|
||||
{
|
||||
bandPositionChanged(object, newGeometry.topLeft(), oldGeometry.topLeft());
|
||||
}
|
||||
|
||||
void PageItemDesignIntf::collectionLoadFinished(const QString &collectionName)
|
||||
{
|
||||
if (collectionName.compare("children",Qt::CaseInsensitive)==0){
|
||||
|
@ -157,6 +157,7 @@ signals:
|
||||
protected slots:
|
||||
void bandDeleted(QObject* band);
|
||||
void bandPositionChanged(QObject* object, QPointF newPos, QPointF oldPos);
|
||||
void bandGeometryChanged(QObject* object, QRectF newGeometry, QRectF oldGeometry);
|
||||
protected:
|
||||
void collectionLoadFinished(const QString& collectionName);
|
||||
QRectF& pageRect(){return m_pageRect;}
|
||||
|
Loading…
Reference in New Issue
Block a user