mirror of
https://github.com/fralx/LimeReport.git
synced 2024-12-24 08:34:38 +03:00
Finish 1.4.118
This commit is contained in:
commit
1253d30610
@ -77,7 +77,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 = 117
|
LIMEREPORT_VERSION_RELEASE = 118
|
||||||
|
|
||||||
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}\"
|
||||||
|
@ -1126,6 +1126,12 @@ void BaseDesignIntf::setItemPos(const QPointF &newPos)
|
|||||||
void BaseDesignIntf::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
|
void BaseDesignIntf::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
|
||||||
{
|
{
|
||||||
QGraphicsItem::mouseReleaseEvent(event);
|
QGraphicsItem::mouseReleaseEvent(event);
|
||||||
|
QRectF newGeometry = geometry();
|
||||||
|
if (newGeometry != m_oldGeometry) {
|
||||||
|
geometryChangedEvent(newGeometry, m_oldGeometry);
|
||||||
|
updateSelectionMarker();
|
||||||
|
emit(geometryChanged(this, newGeometry, m_oldGeometry));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void BaseDesignIntf::showEditorDialog(){
|
void BaseDesignIntf::showEditorDialog(){
|
||||||
|
@ -666,33 +666,35 @@ void PageItemDesignIntf::moveBandFromTo(int from, int to)
|
|||||||
|
|
||||||
void PageItemDesignIntf::bandGeometryChanged(QObject* object, QRectF newGeometry, QRectF oldGeometry)
|
void PageItemDesignIntf::bandGeometryChanged(QObject* object, QRectF newGeometry, QRectF oldGeometry)
|
||||||
{
|
{
|
||||||
BandDesignIntf* band = dynamic_cast<BandDesignIntf*>(object);
|
if (itemMode() == DesignMode){
|
||||||
int curIndex = band->bandIndex();
|
BandDesignIntf* band = dynamic_cast<BandDesignIntf*>(object);
|
||||||
BandDesignIntf* bandToSwap = 0;
|
int curIndex = band->bandIndex();
|
||||||
foreach(BandDesignIntf* curBand, bands()){
|
BandDesignIntf* bandToSwap = 0;
|
||||||
if (newGeometry.y() > oldGeometry.y()) {
|
foreach(BandDesignIntf* curBand, bands()){
|
||||||
if (curBand->bandType() == band->bandType()
|
if (newGeometry.y() > oldGeometry.y()) {
|
||||||
&& curIndex < curBand->bandIndex()
|
if (curBand->bandType() == band->bandType()
|
||||||
&& (curBand->pos().y() + (curBand->height()/2)) < newGeometry.y()
|
&& curIndex < curBand->bandIndex()
|
||||||
&& curBand->parentBand() == band->parentBand())
|
&& (curBand->pos().y() + (curBand->height()/2)) < newGeometry.y()
|
||||||
{
|
&& curBand->parentBand() == band->parentBand())
|
||||||
curIndex = curBand->bandIndex();
|
{
|
||||||
bandToSwap = curBand;
|
curIndex = curBand->bandIndex();
|
||||||
}
|
bandToSwap = curBand;
|
||||||
} else {
|
}
|
||||||
if (curBand->bandType() == band->bandType()
|
} else {
|
||||||
&& curIndex>curBand->bandIndex()
|
if (curBand->bandType() == band->bandType()
|
||||||
&& (curBand->pos().y() + (curBand->height()/2)) > newGeometry.y()
|
&& curIndex>curBand->bandIndex()
|
||||||
&& curBand->parentBand() == band->parentBand())
|
&& (curBand->pos().y() + (curBand->height()/2)) > newGeometry.y()
|
||||||
{
|
&& curBand->parentBand() == band->parentBand())
|
||||||
curIndex = curBand->bandIndex();
|
{
|
||||||
bandToSwap = curBand;
|
curIndex = curBand->bandIndex();
|
||||||
|
bandToSwap = curBand;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
if (curIndex != band->bandIndex() && itemMode() == DesignMode){
|
||||||
if (curIndex != band->bandIndex() && itemMode() == DesignMode){
|
if (page())
|
||||||
if (page())
|
page()->saveCommand(BandMoveFromToCommand::create(page(), band->bandIndex(), bandToSwap->bandIndex()), true);
|
||||||
page()->saveCommand(BandMoveFromToCommand::create(page(), band->bandIndex(), bandToSwap->bandIndex()), true);
|
}
|
||||||
}
|
}
|
||||||
relocateBands();
|
relocateBands();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user