python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2025-10-31 13:51:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

Finish 1.4.117

Browse Source
This commit is contained in:
Arin Alexander
2019-01-18 20:19:48 +03:00
parent 7efe1d3d49 5d019fbd87
commit 925cbf0956
4 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common.pri
View File

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

2
limereport/items/lrtextitem.cpp
View File

@@ -127,6 +127,7 @@ void TextItem::processPopUpAction(QAction *action)
if (action->text().compare(tr("Edit")) == 0){
this->showEditorDialog();
}
if (page()){
if (action->text().compare(tr("Auto height")) == 0){
page()->setPropertyToSelectedItems("autoHeight",action->isChecked());
}
@@ -139,6 +140,7 @@ void TextItem::processPopUpAction(QAction *action)
if (action->text().compare(tr("Stretch to max height")) == 0){
page()->setPropertyToSelectedItems("stretchToMaxHeight",action->isChecked());
}
}
if (action->text().compare(tr("Transparent")) == 0){
if (action->isChecked()){
setProperty("backgroundMode",TransparentMode);

24
limereport/lrbasedesignintf.cpp
View File

@@ -556,11 +556,13 @@ void BaseDesignIntf::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
setItemPos(QPointF(div(m_startPos.x(), hStep).quot * hStep, div(m_startPos.y(), vStep).quot * vStep) - delta);
if (!isBand() && scene()->selectedItems().count()>1)
if (page()){
if (!isBand() && page()->selectedItems().count()>1)
moveSelectedItems(tmpPos - pos());
if (scene()->selectedItems().count()==1 && (page()->magneticMovement()))
if (page()->selectedItems().count()==1 && (page()->magneticMovement()))
page()->itemMoved(this);
}
}
}
int BaseDesignIntf::possibleResizeDirectionFlags() const
@@ -843,29 +845,29 @@ void BaseDesignIntf::setBorderLineSize(int value)
void BaseDesignIntf::moveRight()
{
if (!m_fixedPos) setItemPos(pos().x() + page()->horizontalGridStep(), pos().y());
if (!m_fixedPos && page()) setItemPos(pos().x() + page()->horizontalGridStep(), pos().y());
}
void BaseDesignIntf::moveLeft()
{
if (!m_fixedPos) setItemPos(pos().x() - page()->horizontalGridStep(), pos().y());
if (!m_fixedPos && page()) setItemPos(pos().x() - page()->horizontalGridStep(), pos().y());
}
void BaseDesignIntf::moveDown()
{
if (!m_fixedPos) setItemPos(pos().x(), pos().y() + page()->verticalGridStep());
if (!m_fixedPos && page()) setItemPos(pos().x(), pos().y() + page()->verticalGridStep());
}
void BaseDesignIntf::moveUp()
{
if (!m_fixedPos) setItemPos(pos().x(), pos().y() - page()->verticalGridStep());
if (!m_fixedPos && page()) setItemPos(pos().x(), pos().y() - page()->verticalGridStep());
}
void BaseDesignIntf::sizeRight()
{
if ((m_possibleResizeDirectionFlags & ResizeLeft) ||
(m_possibleResizeDirectionFlags & ResizeRight)) {
setWidth(width() + page()->horizontalGridStep());
if (page()) setWidth(width() + page()->horizontalGridStep());
}
}
@@ -873,7 +875,7 @@ void BaseDesignIntf::sizeLeft()
{
if ((m_possibleResizeDirectionFlags & ResizeLeft) ||
(m_possibleResizeDirectionFlags & ResizeRight)) {
setWidth(width() - page()->horizontalGridStep());
if(page()) setWidth(width() - page()->horizontalGridStep());
}
}
@@ -881,7 +883,7 @@ void BaseDesignIntf::sizeUp()
{
if ((m_possibleResizeDirectionFlags & ResizeTop) ||
(m_possibleResizeDirectionFlags & ResizeBottom)) {
setHeight(height() - page()->verticalGridStep());
if (page()) setHeight(height() - page()->verticalGridStep());
}
}
@@ -889,7 +891,7 @@ void BaseDesignIntf::sizeDown()
{
if ((m_possibleResizeDirectionFlags & ResizeTop) ||
(m_possibleResizeDirectionFlags & ResizeBottom)) {
setHeight(height() + page()->verticalGridStep());
if (page()) setHeight(height() + page()->verticalGridStep());
}
}
@@ -1384,7 +1386,7 @@ void BaseDesignIntf::collectionLoadFinished(const QString &collectionName)
foreach(QObject * obj, QObject::children()) {
#endif
BaseDesignIntf *item = dynamic_cast<BaseDesignIntf *>(obj);
if (item) {
if (item && page()) {
page()->registerItem(item);
}
}

5
limereport/lrpageitemdesignintf.cpp
View File

@@ -824,9 +824,8 @@ void PageItemDesignIntf::bandGeometryChanged(QObject* object, QRectF newGeometry
}
}
}
if (curIndex != band->bandIndex()){
//swapBands(band, bandToSwap);
//page()->saveCommand(BandSwapCommand::create(page(), band->objectName(), bandToSwap->objectName()), true);
if (curIndex != band->bandIndex() && itemMode() == DesignMode){
if (page())
page()->saveCommand(BandMoveFromToCommand::create(page(), band->bandIndex(), bandToSwap->bandIndex()), true);
}
relocateBands();