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

Fix: geometry changing for locked items is prevented

Browse Source
This commit is contained in:
Arin Alexander 2019-06-29 18:11:00 +03:00
parent 9bf0ba0ded
commit 11cb534608
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
limereport/lrbasedesignintf.cpp
View File

@ -730,12 +730,12 @@ void BaseDesignIntf::updatePossibleDirectionFlags(){
} }
} }
bool BaseDesignIntf::isItemGeometryLocked() const bool BaseDesignIntf::isGeometryLocked() const
{ {
return m_itemGeometryLocked; return m_itemGeometryLocked;
} }
void BaseDesignIntf::setItemGeometryLocked(bool itemLocked) void BaseDesignIntf::setGeometryLocked(bool itemLocked)
{ {
if (m_itemGeometryLocked != itemLocked){ if (m_itemGeometryLocked != itemLocked){
m_itemGeometryLocked = itemLocked; m_itemGeometryLocked = itemLocked;
@ -1313,7 +1313,7 @@ void BaseDesignIntf::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
QAction* lockGeometryAction = menu.addAction(tr("Lock item geometry")); QAction* lockGeometryAction = menu.addAction(tr("Lock item geometry"));
lockGeometryAction->setCheckable(true); lockGeometryAction->setCheckable(true);
lockGeometryAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_L)); lockGeometryAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_L));
lockGeometryAction->setChecked(isItemGeometryLocked()); lockGeometryAction->setChecked(isGeometryLocked());
menu.addSeparator(); menu.addSeparator();
QAction* copyAction = menu.addAction(QIcon(":/report/images/copy"), tr("Copy")); QAction* copyAction = menu.addAction(QIcon(":/report/images/copy"), tr("Copy"));
@ -1700,7 +1700,7 @@ SelectionMarker::SelectionMarker(QGraphicsItem* parent, BaseDesignIntf* owner)
QColor SelectionMarker::color() const QColor SelectionMarker::color() const
{ {
return owner()->isItemGeometryLocked() ? Qt::darkGray : Marker::color(); return owner()->isGeometryLocked() ? Qt::darkGray : Marker::color();
} }
void SelectionMarker::hoverMoveEvent(QGraphicsSceneHoverEvent *event) void SelectionMarker::hoverMoveEvent(QGraphicsSceneHoverEvent *event)

6
limereport/lrbasedesignintf.h
View File

@ -98,7 +98,7 @@ class BaseDesignIntf :
Q_PROPERTY(int borderLineSize READ borderLineSize WRITE setBorderLineSize) Q_PROPERTY(int borderLineSize READ borderLineSize WRITE setBorderLineSize)
Q_PROPERTY(bool isVisible READ isVisible WRITE setItemVisible DESIGNABLE false) Q_PROPERTY(bool isVisible READ isVisible WRITE setItemVisible DESIGNABLE false)
Q_PROPERTY(QColor borderColor READ borderColor WRITE setBorderColor) Q_PROPERTY(QColor borderColor READ borderColor WRITE setBorderColor)
Q_PROPERTY(bool geometryLocked READ isItemGeometryLocked WRITE setItemGeometryLocked) Q_PROPERTY(bool geometryLocked READ isGeometryLocked WRITE setGeometryLocked)
friend class ReportRender; friend class ReportRender;
public: public:
@ -305,8 +305,8 @@ public:
void setFillTransparentInDesignMode(bool fillTransparentInDesignMode); void setFillTransparentInDesignMode(bool fillTransparentInDesignMode);
void emitPosChanged(QPointF oldPos, QPointF newPos); void emitPosChanged(QPointF oldPos, QPointF newPos);
bool isItemGeometryLocked() const; bool isGeometryLocked() const;
void setItemGeometryLocked(bool itemLocked); void setGeometryLocked(bool itemLocked);
protected: protected:

16
limereport/lrpagedesignintf.cpp
View File

@ -1464,7 +1464,7 @@ void PageDesignIntf::alignToLeft()
CommandGroup::Ptr cm = CommandGroup::create(); CommandGroup::Ptr cm = CommandGroup::create();
foreach(QGraphicsItem * item, selectedItems()) { foreach(QGraphicsItem * item, selectedItems()) {
BaseDesignIntf *bdItem = dynamic_cast<BaseDesignIntf *>(item); BaseDesignIntf *bdItem = dynamic_cast<BaseDesignIntf *>(item);
if (bdItem) { if (bdItem && !bdItem->isGeometryLocked()) {
QRectF oldGeometry = bdItem->geometry(); QRectF oldGeometry = bdItem->geometry();
bdItem->setPos(QPoint(m_firstSelectedItem->pos().x(), item->pos().y())); bdItem->setPos(QPoint(m_firstSelectedItem->pos().x(), item->pos().y()));
CommandIf::Ptr command = PropertyChangedCommand::create(this, bdItem->objectName(), "geometry", oldGeometry, bdItem->geometry()); CommandIf::Ptr command = PropertyChangedCommand::create(this, bdItem->objectName(), "geometry", oldGeometry, bdItem->geometry());
@ -1481,7 +1481,7 @@ void PageDesignIntf::alignToRigth()
CommandGroup::Ptr cm = CommandGroup::create(); CommandGroup::Ptr cm = CommandGroup::create();
foreach(QGraphicsItem * item, selectedItems()) { foreach(QGraphicsItem * item, selectedItems()) {
BaseDesignIntf *bdItem = dynamic_cast<BaseDesignIntf *>(item); BaseDesignIntf *bdItem = dynamic_cast<BaseDesignIntf *>(item);
if (bdItem) { if (bdItem && !bdItem->isGeometryLocked()) {
QRectF oldGeometry = bdItem->geometry(); QRectF oldGeometry = bdItem->geometry();
bdItem->setPos(QPoint(m_firstSelectedItem->geometry().right() - bdItem->width(), bdItem->pos().y())); bdItem->setPos(QPoint(m_firstSelectedItem->geometry().right() - bdItem->width(), bdItem->pos().y()));
CommandIf::Ptr command = PropertyChangedCommand::create(this, bdItem->objectName(), "geometry", oldGeometry, bdItem->geometry()); CommandIf::Ptr command = PropertyChangedCommand::create(this, bdItem->objectName(), "geometry", oldGeometry, bdItem->geometry());
@ -1498,7 +1498,7 @@ void PageDesignIntf::alignToVCenter()
CommandGroup::Ptr cm = CommandGroup::create(); CommandGroup::Ptr cm = CommandGroup::create();
foreach(QGraphicsItem * item, selectedItems()) { foreach(QGraphicsItem * item, selectedItems()) {
BaseDesignIntf *bdItem = dynamic_cast<BaseDesignIntf *>(item); BaseDesignIntf *bdItem = dynamic_cast<BaseDesignIntf *>(item);
if (bdItem) { if (bdItem && !bdItem->isGeometryLocked()) {
QRectF oldGeometry = bdItem->geometry(); QRectF oldGeometry = bdItem->geometry();
bdItem->setPos(QPoint((m_firstSelectedItem->geometry().right() - m_firstSelectedItem->width() / 2) - bdItem->width() / 2, bdItem->pos().y())); bdItem->setPos(QPoint((m_firstSelectedItem->geometry().right() - m_firstSelectedItem->width() / 2) - bdItem->width() / 2, bdItem->pos().y()));
CommandIf::Ptr command = PropertyChangedCommand::create(this, bdItem->objectName(), "geometry", oldGeometry, bdItem->geometry()); CommandIf::Ptr command = PropertyChangedCommand::create(this, bdItem->objectName(), "geometry", oldGeometry, bdItem->geometry());
@ -1515,7 +1515,7 @@ void PageDesignIntf::alignToTop()
CommandGroup::Ptr cm = CommandGroup::create(); CommandGroup::Ptr cm = CommandGroup::create();
foreach(QGraphicsItem * item, selectedItems()) { foreach(QGraphicsItem * item, selectedItems()) {
BaseDesignIntf *bdItem = dynamic_cast<BaseDesignIntf *>(item); BaseDesignIntf *bdItem = dynamic_cast<BaseDesignIntf *>(item);
if (bdItem) { if (bdItem && !bdItem->isGeometryLocked()) {
QRectF oldGeometry = bdItem->geometry(); QRectF oldGeometry = bdItem->geometry();
bdItem->setPos(QPoint(bdItem->pos().x(), m_firstSelectedItem->pos().y())); bdItem->setPos(QPoint(bdItem->pos().x(), m_firstSelectedItem->pos().y()));
CommandIf::Ptr command = PropertyChangedCommand::create(this, bdItem->objectName(), "geometry", oldGeometry, bdItem->geometry()); CommandIf::Ptr command = PropertyChangedCommand::create(this, bdItem->objectName(), "geometry", oldGeometry, bdItem->geometry());
@ -1532,7 +1532,7 @@ void PageDesignIntf::alignToBottom()
CommandGroup::Ptr cm = CommandGroup::create(); CommandGroup::Ptr cm = CommandGroup::create();
foreach(QGraphicsItem * item, selectedItems()) { foreach(QGraphicsItem * item, selectedItems()) {
BaseDesignIntf *bdItem = dynamic_cast<BaseDesignIntf *>(item); BaseDesignIntf *bdItem = dynamic_cast<BaseDesignIntf *>(item);
if (bdItem) { if (bdItem && !bdItem->isGeometryLocked()) {
QRectF oldGeometry = bdItem->geometry(); QRectF oldGeometry = bdItem->geometry();
bdItem->setPos(QPoint(bdItem->pos().x(), m_firstSelectedItem->geometry().bottom() - bdItem->height())); bdItem->setPos(QPoint(bdItem->pos().x(), m_firstSelectedItem->geometry().bottom() - bdItem->height()));
CommandIf::Ptr command = PropertyChangedCommand::create(this, bdItem->objectName(), "geometry", oldGeometry, bdItem->geometry()); CommandIf::Ptr command = PropertyChangedCommand::create(this, bdItem->objectName(), "geometry", oldGeometry, bdItem->geometry());
@ -1549,7 +1549,7 @@ void PageDesignIntf::alignToHCenter()
CommandGroup::Ptr cm = CommandGroup::create(); CommandGroup::Ptr cm = CommandGroup::create();
foreach(QGraphicsItem * item, selectedItems()) { foreach(QGraphicsItem * item, selectedItems()) {
BaseDesignIntf *bdItem = dynamic_cast<BaseDesignIntf *>(item); BaseDesignIntf *bdItem = dynamic_cast<BaseDesignIntf *>(item);
if (bdItem) { if (bdItem && !bdItem->isGeometryLocked()) {
QRectF oldGeometry = bdItem->geometry(); QRectF oldGeometry = bdItem->geometry();
bdItem->setPos(QPoint(bdItem->pos().x(), (m_firstSelectedItem->geometry().bottom() - m_firstSelectedItem->height() / 2) - bdItem->height() / 2)); bdItem->setPos(QPoint(bdItem->pos().x(), (m_firstSelectedItem->geometry().bottom() - m_firstSelectedItem->height() / 2) - bdItem->height() / 2));
CommandIf::Ptr command = PropertyChangedCommand::create(this, bdItem->objectName(), "geometry", oldGeometry, bdItem->geometry()); CommandIf::Ptr command = PropertyChangedCommand::create(this, bdItem->objectName(), "geometry", oldGeometry, bdItem->geometry());
@ -1566,7 +1566,7 @@ void PageDesignIntf::sameWidth()
CommandGroup::Ptr cm = CommandGroup::create(); CommandGroup::Ptr cm = CommandGroup::create();
foreach(QGraphicsItem * item, selectedItems()) { foreach(QGraphicsItem * item, selectedItems()) {
BaseDesignIntf *bdItem = dynamic_cast<BaseDesignIntf *>(item); BaseDesignIntf *bdItem = dynamic_cast<BaseDesignIntf *>(item);
if (bdItem) { if (bdItem && !bdItem->isGeometryLocked()) {
QRectF oldGeometry = bdItem->geometry(); QRectF oldGeometry = bdItem->geometry();
bdItem->setWidth(m_firstSelectedItem->width()); bdItem->setWidth(m_firstSelectedItem->width());
CommandIf::Ptr command = PropertyChangedCommand::create(this, bdItem->objectName(), "geometry", oldGeometry, bdItem->geometry()); CommandIf::Ptr command = PropertyChangedCommand::create(this, bdItem->objectName(), "geometry", oldGeometry, bdItem->geometry());
@ -1583,7 +1583,7 @@ void PageDesignIntf::sameHeight()
CommandGroup::Ptr cm = CommandGroup::create(); CommandGroup::Ptr cm = CommandGroup::create();
foreach(QGraphicsItem * item, selectedItems()) { foreach(QGraphicsItem * item, selectedItems()) {
BaseDesignIntf *bdItem = dynamic_cast<BaseDesignIntf *>(item); BaseDesignIntf *bdItem = dynamic_cast<BaseDesignIntf *>(item);
if (bdItem) { if (bdItem && !bdItem->isGeometryLocked()) {
QRectF oldGeometry = bdItem->geometry(); QRectF oldGeometry = bdItem->geometry();
bdItem->setHeight(m_firstSelectedItem->height()); bdItem->setHeight(m_firstSelectedItem->height());
CommandIf::Ptr command = PropertyChangedCommand::create(this, bdItem->objectName(), "geometry", oldGeometry, bdItem->geometry()); CommandIf::Ptr command = PropertyChangedCommand::create(this, bdItem->objectName(), "geometry", oldGeometry, bdItem->geometry());