mirror of
https://github.com/fralx/LimeReport.git
synced 2024-12-25 00:54:39 +03:00
Finish 1.4.100
This commit is contained in:
commit
0bbb4be044
@ -118,7 +118,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
|
|||||||
|
|
||||||
LIMEREPORT_VERSION_MAJOR = 1
|
LIMEREPORT_VERSION_MAJOR = 1
|
||||||
LIMEREPORT_VERSION_MINOR = 4
|
LIMEREPORT_VERSION_MINOR = 4
|
||||||
LIMEREPORT_VERSION_RELEASE = 99
|
LIMEREPORT_VERSION_RELEASE = 100
|
||||||
|
|
||||||
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
|
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
|
||||||
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"
|
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"
|
||||||
|
@ -511,10 +511,15 @@ void BandDesignIntf::moveItemsDown(qreal startPos, qreal offset){
|
|||||||
|
|
||||||
void BandDesignIntf::preparePopUpMenu(QMenu &menu)
|
void BandDesignIntf::preparePopUpMenu(QMenu &menu)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
QList<QString> disabledActions;
|
||||||
|
disabledActions << tr("Bring to top") <<
|
||||||
|
tr("Send to back") <<
|
||||||
|
tr("Cut") <<
|
||||||
|
tr("Copy");
|
||||||
|
|
||||||
foreach (QAction* action, menu.actions()) {
|
foreach (QAction* action, menu.actions()) {
|
||||||
if (action->text().compare(tr("Bring to top")) == 0 ||
|
action->setEnabled(!disabledActions.contains(action->text()));
|
||||||
action->text().compare(tr("Send to back")) == 0 )
|
|
||||||
action->setEnabled(false);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
menu.addSeparator();
|
menu.addSeparator();
|
||||||
|
@ -1944,7 +1944,7 @@ CommandIf::Ptr CutCommand::create(PageDesignIntf *page)
|
|||||||
ItemsWriterIntf *writer = new XMLWriter();
|
ItemsWriterIntf *writer = new XMLWriter();
|
||||||
foreach(QGraphicsItem * item, page->selectedItems()) {
|
foreach(QGraphicsItem * item, page->selectedItems()) {
|
||||||
if (!dynamic_cast<PageItemDesignIntf*>(item)){
|
if (!dynamic_cast<PageItemDesignIntf*>(item)){
|
||||||
BaseDesignIntf *reportItem = dynamic_cast<BaseDesignIntf *>(item);
|
ItemDesignIntf *reportItem = dynamic_cast<ItemDesignIntf *>(item);
|
||||||
|
|
||||||
if (reportItem) {
|
if (reportItem) {
|
||||||
command->m_itemNames.push_back(reportItem->objectName());
|
command->m_itemNames.push_back(reportItem->objectName());
|
||||||
|
Loading…
Reference in New Issue
Block a user