mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-01-11 17:18:10 +03:00
Code

Edit mode changed

Browse Source
This commit is contained in:
Arin Alexander 2019-03-01 19:41:27 +03:00
parent ca57e5c195
commit c7045ec1d6
4 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
limereport/lrbanddesignintf.cpp
View File

@ -105,6 +105,7 @@ void BandMarker::mousePressEvent(QGraphicsSceneMouseEvent *event)
if (!(event->modifiers() & Qt::ControlModifier)) if (!(event->modifiers() & Qt::ControlModifier))
m_band->scene()->clearSelection(); m_band->scene()->clearSelection();
m_band->setSelected(true); m_band->setSelected(true);
m_oldBandPos = m_band->pos();
update(0,0,boundingRect().width(),boundingRect().width()); update(0,0,boundingRect().width(),boundingRect().width());
} }
} }
@ -136,7 +137,7 @@ void BandMarker::mouseMoveEvent(QGraphicsSceneMouseEvent* event)
void BandMarker::mouseReleaseEvent(QGraphicsSceneMouseEvent* event) void BandMarker::mouseReleaseEvent(QGraphicsSceneMouseEvent* event)
{ {
m_band->posChanged(m_band, m_band->pos(), m_band->pos()); m_band->posChanged(m_band, m_band->pos(), m_oldBandPos);
} }
BandDesignIntf::BandDesignIntf(BandsType bandType, const QString &xmlTypeName, QObject* owner, QGraphicsItem *parent) : BandDesignIntf::BandDesignIntf(BandsType bandType, const QString &xmlTypeName, QObject* owner, QGraphicsItem *parent) :

1
limereport/lrbanddesignintf.h
View File

@ -72,6 +72,7 @@ private:
QRectF m_rect; QRectF m_rect;
QColor m_color; QColor m_color;
BandDesignIntf* m_band; BandDesignIntf* m_band;
QPointF m_oldBandPos;
}; };
class BandNameLabel : public QGraphicsItem{ class BandNameLabel : public QGraphicsItem{

22
limereport/lrpagedesignintf.cpp
View File

@ -256,7 +256,7 @@ void PageDesignIntf::startEditMode()
PageItemDesignIntf *PageDesignIntf::pageItem() PageItemDesignIntf *PageDesignIntf::pageItem()
{ {
return m_pageItem.data(); return m_currentPage ? m_currentPage : m_pageItem.data();
} }
void PageDesignIntf::setPageItem(PageItemDesignIntf::Ptr pageItem) void PageDesignIntf::setPageItem(PageItemDesignIntf::Ptr pageItem)
@ -1079,7 +1079,11 @@ PageItemDesignIntf* PageDesignIntf::getCurrentPage() const
void PageDesignIntf::setCurrentPage(PageItemDesignIntf* currentPage) void PageDesignIntf::setCurrentPage(PageItemDesignIntf* currentPage)
{ {
if (m_currentPage != currentPage ){ if (m_currentPage != currentPage ){
if (m_currentPage) m_currentPage->setItemMode(PreviewMode);
m_currentPage = currentPage; m_currentPage = currentPage;
if (m_itemMode == DesignMode){
m_currentPage->setItemMode(DesignMode);
}
} }
} }
@ -1766,13 +1770,14 @@ void PageDesignIntf::removeAllItems()
void PageDesignIntf::setItemMode(BaseDesignIntf::ItemMode state) void PageDesignIntf::setItemMode(BaseDesignIntf::ItemMode state)
{ {
m_itemMode = state; m_itemMode = state;
foreach(QGraphicsItem * item, items()) { // foreach(QGraphicsItem * item, items()) {
BaseDesignIntf *reportItem = dynamic_cast<BaseDesignIntf *>(item); // BaseDesignIntf *reportItem = dynamic_cast<BaseDesignIntf *>(item);
if (reportItem) { // if (reportItem) {
reportItem->setItemMode(itemMode()); // reportItem->setItemMode(itemMode());
} // }
} // }
if (m_currentPage) m_currentPage->setItemMode(state);
} }
BaseDesignIntf* PageDesignIntf::reportItemByName(const QString &name) BaseDesignIntf* PageDesignIntf::reportItemByName(const QString &name)
@ -2507,7 +2512,8 @@ bool BandMoveFromToCommand::doIt()
void BandMoveFromToCommand::undoIt() void BandMoveFromToCommand::undoIt()
{ {
if (page()) page()->pageItem()->moveBandFromTo(to, from); if (page() && page()->pageItem())
page()->pageItem()->moveBandFromTo(to, from);
} }
} }

3
limereport/lrpreviewreportwindow.cpp
View File

@ -261,6 +261,7 @@ void PreviewReportWindow::moveEvent(QMoveEvent* e)
void PreviewReportWindow::showEvent(QShowEvent *) void PreviewReportWindow::showEvent(QShowEvent *)
{ {
m_fontEditor->setVisible(ui->actionEdit_Mode->isChecked()); m_fontEditor->setVisible(ui->actionEdit_Mode->isChecked());
ui->editModeTools->setVisible(false);
m_textAlignmentEditor->setVisible(ui->actionEdit_Mode->isChecked()); m_textAlignmentEditor->setVisible(ui->actionEdit_Mode->isChecked());
switch (m_previewScaleType) { switch (m_previewScaleType) {
case FitWidth: case FitWidth:
@ -458,5 +459,3 @@ void PreviewReportWindow::on_actionShow_Toolbar_triggered()
}// namespace LimeReport }// namespace LimeReport