mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-10-09 05:57:14 +03:00
Code Activity

Merge branch 'master' into 1.4

Browse Source 
# Conflicts:
#	limereport/limereport.pri
#	limereport/lrreportrender.cpp
This commit is contained in:
Arin Alexander
2016-10-04 04:47:05 +04:00
parent e4457787f5 dc41959d52
commit d6eedd8cbd
17 changed files with 226 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
limereport/lrreportdesignwindow.cpp
View File

@@ -405,6 +405,11 @@ void ReportDesignWindow::createBandsButton()
m_bandsAddSignalsMap->setMapping(m_newGroupFooter,BandDesignIntf::GroupFooter);
m_newBandButton->addAction(m_newGroupFooter);
m_newTearOffBand=new QAction(QIcon(),tr("Tear-off Band"),this);
connect(m_newTearOffBand,SIGNAL(triggered()),m_bandsAddSignalsMap,SLOT(map()));
m_bandsAddSignalsMap->setMapping(m_newTearOffBand,BandDesignIntf::TearOffBand);
m_newBandButton->addAction(m_newTearOffBand);
connect(m_bandsAddSignalsMap,SIGNAL(mapped(int)),this,SLOT(slotNewBand(int)));
}
@@ -1051,6 +1056,8 @@ void ReportDesignWindow::slotBandAdded(PageDesignIntf *, BandDesignIntf * band)
break;
case BandDesignIntf::ReportFooter:
m_newReportFooter->setDisabled(true);
case BandDesignIntf::TearOffBand:
m_newTearOffBand->setDisabled(true);
default:
break;
}
@@ -1072,6 +1079,8 @@ void ReportDesignWindow::slotBandDeleted(PageDesignIntf *, BandDesignIntf *band)
break;
case BandDesignIntf::ReportFooter:
m_newReportFooter->setEnabled(true);
case BandDesignIntf::TearOffBand:
m_newTearOffBand->setEnabled(true);
default:
break;
}