diff --git a/common.pri b/common.pri index 1fe6c55..aef2487 100644 --- a/common.pri +++ b/common.pri @@ -118,7 +118,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MINOR = 4 -LIMEREPORT_VERSION_RELEASE = 99 +LIMEREPORT_VERSION_RELEASE = 100 LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}' DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\" diff --git a/limereport/lrbanddesignintf.cpp b/limereport/lrbanddesignintf.cpp index 9f39638..1b689b6 100644 --- a/limereport/lrbanddesignintf.cpp +++ b/limereport/lrbanddesignintf.cpp @@ -511,10 +511,15 @@ void BandDesignIntf::moveItemsDown(qreal startPos, qreal offset){ void BandDesignIntf::preparePopUpMenu(QMenu &menu) { + + QList disabledActions; + disabledActions << tr("Bring to top") << + tr("Send to back") << + tr("Cut") << + tr("Copy"); + foreach (QAction* action, menu.actions()) { - if (action->text().compare(tr("Bring to top")) == 0 || - action->text().compare(tr("Send to back")) == 0 ) - action->setEnabled(false); + action->setEnabled(!disabledActions.contains(action->text())); } menu.addSeparator(); diff --git a/limereport/lrpagedesignintf.cpp b/limereport/lrpagedesignintf.cpp index 5c85b86..a0ee81f 100644 --- a/limereport/lrpagedesignintf.cpp +++ b/limereport/lrpagedesignintf.cpp @@ -1944,7 +1944,7 @@ CommandIf::Ptr CutCommand::create(PageDesignIntf *page) ItemsWriterIntf *writer = new XMLWriter(); foreach(QGraphicsItem * item, page->selectedItems()) { if (!dynamic_cast(item)){ - BaseDesignIntf *reportItem = dynamic_cast(item); + ItemDesignIntf *reportItem = dynamic_cast(item); if (reportItem) { command->m_itemNames.push_back(reportItem->objectName());