mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-09-26 17:59:08 +03:00
Code Activity

#284 Issue has been fixed. The objects will get new names in paste process

Browse Source
This commit is contained in:
Arin Alexandex
2020-08-11 20:37:21 +03:00
parent 0693ba10ec
commit 5b127ce99c
6 changed files with 29 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
limereport/lrpagedesignintf.cpp
View File

@@ -132,23 +132,6 @@ void PageDesignIntf::updatePageRect()
emit sceneRectChanged(sceneRect());
}
//PageDesignIntf::Orientation PageDesignIntf::getOrientation()
//{
// return m_orientation;
//}
//void PageDesignIntf::setPageSize(PageDesignIntf::PageSize sizeType, QSizeF sizeValue)
//{
// m_pageSize = sizeType;
// m_pageSizeValue = sizeValue;
// updatePageRect();
//}
//PageDesignIntf::PageSize PageDesignIntf::pageSize() const
//{
// return m_pageSize;
//}
void PageDesignIntf::keyPressEvent(QKeyEvent *event)
{
if (event->modifiers() == Qt::NoModifier ||
@@ -1342,9 +1325,9 @@ void PageDesignIntf::copy()
}
BaseDesignIntf* PageDesignIntf::findDestObject(BaseDesignIntf* item){
if (item && item->canContainChildren()) return item;
if (item && item->canAcceptPaste()) return item;
BaseDesignIntf * curItem = item;
while (curItem && !curItem->canContainChildren()){
while (curItem && !curItem->canAcceptPaste()){
curItem = dynamic_cast<BaseDesignIntf*>(curItem->parentItem());
}
return curItem;
@@ -2110,6 +2093,9 @@ bool PasteCommand::insertItem(ItemsReaderIntf::Ptr reader)
if (page()->reportItemsByName(item->objectName()).size()>1){
item->setObjectName(objectName);
}
foreach(QObject* child, item->children()){
changeName(page(), child);
};
m_itemNames.push_back(item->objectName());
}
return true;
@@ -2117,6 +2103,14 @@ bool PasteCommand::insertItem(ItemsReaderIntf::Ptr reader)
return false;
}
void PasteCommand::changeName(PageDesignIntf *page, QObject* item)
{
item->setObjectName(page->genObjectName(*item));
foreach(QObject* child, item->children()){
changeName(page, child);
};
}
CommandIf::Ptr CutCommand::create(PageDesignIntf *page)
{
CutCommand *command = new CutCommand();