PageItem cutting and deleting has been forbidden

This commit is contained in:
Arin Alexander 2016-05-30 21:32:55 +04:00
parent de6ce6741f
commit be63934c32

View File

@ -1224,12 +1224,12 @@ void PageDesignIntf::paste()
void PageDesignIntf::deleteSelected() void PageDesignIntf::deleteSelected()
{ {
if (selectedItems().count()==1){ if (selectedItems().count()==1){
if (!dynamic_cast<PageItemDesignIntf*>(selectedItems().at(0)))
saveCommand(removeReportItemCommand(dynamic_cast<BaseDesignIntf*>(selectedItems().at(0)))); saveCommand(removeReportItemCommand(dynamic_cast<BaseDesignIntf*>(selectedItems().at(0))));
} else { } else {
QList<QGraphicsItem*> itemsToDelete = selectedItems(); QList<QGraphicsItem*> itemsToDelete = selectedItems();
CommandGroup::Ptr commandGroup = CommandGroup::create(); CommandGroup::Ptr commandGroup = CommandGroup::create();
QList<BandDesignIntf*> bands; QList<BandDesignIntf*> bands;
@ -1797,6 +1797,7 @@ CommandIf::Ptr CutCommand::create(PageDesignIntf *page)
command->setPage(page); command->setPage(page);
ItemsWriterIntf *writer = new XMLWriter(); ItemsWriterIntf *writer = new XMLWriter();
foreach(QGraphicsItem * item, page->selectedItems()) { foreach(QGraphicsItem * item, page->selectedItems()) {
if (!dynamic_cast<PageItemDesignIntf*>(item)){
BaseDesignIntf *reportItem = dynamic_cast<BaseDesignIntf *>(item); BaseDesignIntf *reportItem = dynamic_cast<BaseDesignIntf *>(item);
if (reportItem) { if (reportItem) {
@ -1804,6 +1805,7 @@ CommandIf::Ptr CutCommand::create(PageDesignIntf *page)
writer->putItem(reportItem); writer->putItem(reportItem);
} }
} }
}
command->setXML(writer->saveToString()); command->setXML(writer->saveToString());
if (command->m_itemNames.count() > 0) { if (command->m_itemNames.count() > 0) {