python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2024-12-23 20:22:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

QT_VERSION < 0x060000 -> (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))

Browse Source 
page order has been fixed when TOC page is present and some pages are not printable
This commit is contained in:
Alexander Arin 2021-12-16 00:13:39 +03:00
parent 37b929459b
commit c7eec9160d
30 changed files with 360 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demo_r2/mainwindow.cpp
View File

@ -3,7 +3,7 @@
#include <QSqlDatabase> #include <QSqlDatabase>
#include <QDir> #include <QDir>
#include <QDebug> #include <QDebug>
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
#include <QDesktopWidget> #include <QDesktopWidget>
#else #else
#include <QScreen> #include <QScreen>
@ -44,7 +44,7 @@ MainWindow::MainWindow(QWidget *parent) :
connect(ui->actionOne_to_One, SIGNAL(triggered()), this, SLOT(slotOneToOne())); connect(ui->actionOne_to_One, SIGNAL(triggered()), this, SLOT(slotOneToOne()));
initPercentCombobox(); initPercentCombobox();
enableUI(false); enableUI(false);
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
QDesktopWidget *desktop = QApplication::desktop(); QDesktopWidget *desktop = QApplication::desktop();
int screenWidth = desktop->screenGeometry().width(); int screenWidth = desktop->screenGeometry().width();

2
include/lrglobal.cpp
View File

@ -67,7 +67,7 @@ QString replaceHTMLSymbols(const QString &value)
return result; return result;
} }
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
QVector<QString> normalizeCaptures(const QRegExp& reg){ QVector<QString> normalizeCaptures(const QRegExp& reg){
#else #else
QVector<QString> normalizeCaptures(const QRegularExpressionMatch &reg){ QVector<QString> normalizeCaptures(const QRegularExpressionMatch &reg){

8
limereport/dialogdesigner/3rdparty/qtcreator/designerintegrationv2/sizehandlerect.cpp vendored
View File

@ -103,9 +103,11 @@ void SizeHandleRect::mousePressEvent(QMouseEvent *e)
return; return;
m_startSize = m_curSize = m_resizable->size(); m_startSize = m_curSize = m_resizable->size();
#if QT_VERSION < QT_VERSION_CHECK(5,15,3)
m_startPos = m_curPos = m_resizable->mapFromGlobal(e->globalPos()); m_startPos = m_curPos = m_resizable->mapFromGlobal(e->globalPos());
if (debugSizeHandle) #else
qDebug() << "SizeHandleRect::mousePressEvent" << m_startSize << m_startPos << m_curPos; m_startPos = m_curPos = m_resizable->mapFromGlobal(e->globalPosition());
#endif
} }
@ -136,7 +138,7 @@ void SizeHandleRect::mouseMoveEvent(QMouseEvent *e)
delta = QSize(0, 0); delta = QSize(0, 0);
break; break;
} }
if (delta != QSize(0, 0)) if (delta != QSizeF(0, 0))
tryResize(delta); tryResize(delta);
} }

7
limereport/dialogdesigner/3rdparty/qtcreator/designerintegrationv2/sizehandlerect.h vendored
View File

@ -66,8 +66,15 @@ private:
private: private:
const Direction m_dir; const Direction m_dir;
#if QT_VERSION < QT_VERSION_CHECK(5,12,3)
QPoint m_startPos; QPoint m_startPos;
QPoint m_curPos; QPoint m_curPos;
#else
QPointF m_startPos;
QPointF m_curPos;
// QSizeF m_startSize;
// QSizeF m_curSize;
#endif
QSize m_startSize; QSize m_startSize;
QSize m_curSize; QSize m_curSize;
QWidget *m_resizable; QWidget *m_resizable;

2
limereport/items/lrchartitem.cpp
View File

@ -722,7 +722,7 @@ QFont AbstractSeriesChart::adaptLabelsFont(QRectF rect, QFont font)
QFontMetrics fm(font); QFontMetrics fm(font);
foreach(QString label, m_chartItem->labels()){ foreach(QString label, m_chartItem->labels()){
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
foreach (QString currentWord, label.split(QRegExp("\\W+"))){ foreach (QString currentWord, label.split(QRegExp("\\W+"))){
#else #else
foreach (QString currentWord, label.split(QRegularExpression("\\W+"))){ foreach (QString currentWord, label.split(QRegularExpression("\\W+"))){

6
limereport/items/lrtextitem.cpp
View File

@ -360,10 +360,10 @@ void TextItem::updateLayout()
bool TextItem::isNeedExpandContent() const bool TextItem::isNeedExpandContent() const
{ {
bool result = false; #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
#if QT_VERSION < 0x060000
QRegExp rx("$*\\{[^{]*\\}"); QRegExp rx("$*\\{[^{]*\\}");
#else #else
bool result = false;
QRegularExpression rx("\\$*\\{[^{]*\\}"); QRegularExpression rx("\\$*\\{[^{]*\\}");
result = content().contains(rx) || isContentBackedUp(); result = content().contains(rx) || isContentBackedUp();
return result; return result;
@ -824,7 +824,7 @@ void TextItem::expandContent(DataSourceManager* dataManager, RenderPass pass)
{ {
QString context=content(); QString context=content();
foreach (QString variableName, dataManager->variableNamesByRenderPass(SecondPass)) { foreach (QString variableName, dataManager->variableNamesByRenderPass(SecondPass)) {
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
QRegExp rx(QString(Const::NAMED_VARIABLE_RX).arg(variableName)); QRegExp rx(QString(Const::NAMED_VARIABLE_RX).arg(variableName));
#else #else
QRegularExpression rx(QString(Const::NAMED_VARIABLE_RX).arg(variableName)); QRegularExpression rx(QString(Const::NAMED_VARIABLE_RX).arg(variableName));

2
limereport/limereport.pri
View File

@ -15,6 +15,7 @@ INCLUDEPATH += \
$$REPORT_PATH/scripteditor $$REPORT_PATH/scripteditor
SOURCES += \ SOURCES += \
$$PWD/scripteditor/lrcompletermodel.cpp \
$$REPORT_PATH/bands/lrpageheader.cpp \ $$REPORT_PATH/bands/lrpageheader.cpp \
$$REPORT_PATH/bands/lrpagefooter.cpp \ $$REPORT_PATH/bands/lrpagefooter.cpp \
$$REPORT_PATH/bands/lrreportheader.cpp \ $$REPORT_PATH/bands/lrreportheader.cpp \
@ -90,6 +91,7 @@ CONFIG(svg) {
HEADERS += \ HEADERS += \
$$PWD/items/lreditableimageitemintf.h \ $$PWD/items/lreditableimageitemintf.h \
$$PWD/scripteditor/lrcompletermodel.h \
$$REPORT_PATH/base/lrsingleton.h \ $$REPORT_PATH/base/lrsingleton.h \
$$REPORT_PATH/base/lrsimpleabstractfactory.h \ $$REPORT_PATH/base/lrsimpleabstractfactory.h \
$$REPORT_PATH/base/lrattribsabstractfactory.h \ $$REPORT_PATH/base/lrattribsabstractfactory.h \

2
limereport/lrbasedesignintf.cpp
View File

@ -64,7 +64,7 @@ BaseDesignIntf::BaseDesignIntf(const QString &storageTypeName, QObject *owner, Q
m_borderLineSize(1), m_borderLineSize(1),
m_BGMode(OpaqueMode), m_BGMode(OpaqueMode),
m_opacity(100), m_opacity(100),
m_borderLinesFlags(0), m_borderLinesFlags(BorderLines()),
m_storageTypeName(storageTypeName), m_storageTypeName(storageTypeName),
m_itemMode(DesignMode), m_itemMode(DesignMode),
m_objectState(ObjectCreated), m_objectState(ObjectCreated),

4
limereport/lrdatasourcemanager.cpp
View File

@ -31,7 +31,7 @@
#include "lrdatadesignintf.h" #include "lrdatadesignintf.h"
#include <QStringList> #include <QStringList>
#include <QSqlQuery> #include <QSqlQuery>
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
#include <QRegExp> #include <QRegExp>
#endif #endif
#include <QSqlError> #include <QSqlError>
@ -1495,7 +1495,7 @@ void DataSourceManager::invalidateQueriesContainsVariable(const QString& variabl
foreach (const QString& datasourceName, dataSourceNames()){ foreach (const QString& datasourceName, dataSourceNames()){
QueryHolder* holder = dynamic_cast<QueryHolder*>(m_datasources.value(datasourceName)); QueryHolder* holder = dynamic_cast<QueryHolder*>(m_datasources.value(datasourceName));
if (holder){ if (holder){
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
QRegExp rx(QString(Const::NAMED_VARIABLE_RX).arg(variableName)); QRegExp rx(QString(Const::NAMED_VARIABLE_RX).arg(variableName));
#else #else
QRegularExpression rx(QString(Const::NAMED_VARIABLE_RX).arg(variableName)); QRegularExpression rx(QString(Const::NAMED_VARIABLE_RX).arg(variableName));

2
limereport/lrgraphicsviewzoom.cpp
View File

@ -53,7 +53,7 @@ bool GraphicsViewZoomer::eventFilter(QObject *object, QEvent *event) {
} else if (event->type() == QEvent::Wheel) { } else if (event->type() == QEvent::Wheel) {
QWheelEvent* wheel_event = static_cast<QWheelEvent*>(event); QWheelEvent* wheel_event = static_cast<QWheelEvent*>(event);
if (QApplication::keyboardModifiers() == m_modifiers) { if (QApplication::keyboardModifiers() == m_modifiers) {
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
if (wheel_event->orientation() == Qt::Vertical) { if (wheel_event->orientation() == Qt::Vertical) {
double angle = wheel_event->delta(); double angle = wheel_event->delta();
double factor = qPow(m_zoomFactorBase, angle); double factor = qPow(m_zoomFactorBase, angle);

16
limereport/lrgroupfunctions.cpp
View File

@ -34,7 +34,7 @@
#include "lrscriptenginemanager.h" #include "lrscriptenginemanager.h"
#include "lrpageitemdesignintf.h" #include "lrpageitemdesignintf.h"
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
#include <QRegExp> #include <QRegExp>
#endif #endif
@ -44,7 +44,7 @@ void GroupFunction::slotBandRendered(BandDesignIntf *band)
{ {
ScriptEngineManager& sm = ScriptEngineManager::instance(); ScriptEngineManager& sm = ScriptEngineManager::instance();
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
QRegExp rxField(Const::FIELD_RX); QRegExp rxField(Const::FIELD_RX);
QRegExp rxVar(Const::VARIABLE_RX); QRegExp rxVar(Const::VARIABLE_RX);
#else #else
@ -54,7 +54,7 @@ void GroupFunction::slotBandRendered(BandDesignIntf *band)
switch (m_dataType){ switch (m_dataType){
case Field:{ case Field:{
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
if (rxField.indexIn(m_data) != -1){ if (rxField.indexIn(m_data) != -1){
QString field = rxField.cap(1); QString field = rxField.cap(1);
#else #else
@ -72,7 +72,7 @@ void GroupFunction::slotBandRendered(BandDesignIntf *band)
break; break;
} }
case Variable:{ case Variable:{
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
if (rxVar.indexIn(m_data) != -1){ if (rxVar.indexIn(m_data) != -1){
QString var = rxVar.cap(1); QString var = rxVar.cap(1);
#else #else
@ -149,7 +149,7 @@ QVariant GroupFunction::multiplication(QVariant value1, QVariant value2)
GroupFunction::GroupFunction(const QString &expression, const QString &dataBandName, DataSourceManager* dataManager) GroupFunction::GroupFunction(const QString &expression, const QString &dataBandName, DataSourceManager* dataManager)
:m_data(expression), m_dataBandName(dataBandName), m_dataManager(dataManager), m_isValid(true), m_errorMessage("") :m_data(expression), m_dataBandName(dataBandName), m_dataManager(dataManager), m_isValid(true), m_errorMessage("")
{ {
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
QRegExp rxField(Const::FIELD_RX,Qt::CaseInsensitive); QRegExp rxField(Const::FIELD_RX,Qt::CaseInsensitive);
QRegExp rxVariable(Const::VARIABLE_RX,Qt::CaseInsensitive); QRegExp rxVariable(Const::VARIABLE_RX,Qt::CaseInsensitive);
QRegExp rxScript(Const::SCRIPT_RX,Qt::CaseInsensitive); QRegExp rxScript(Const::SCRIPT_RX,Qt::CaseInsensitive);
@ -158,7 +158,7 @@ GroupFunction::GroupFunction(const QString &expression, const QString &dataBandN
QRegularExpression rxVariable(Const::VARIABLE_RX, QRegularExpression::CaseInsensitiveOption); QRegularExpression rxVariable(Const::VARIABLE_RX, QRegularExpression::CaseInsensitiveOption);
QRegularExpression rxScript(Const::SCRIPT_RX, QRegularExpression::CaseInsensitiveOption); QRegularExpression rxScript(Const::SCRIPT_RX, QRegularExpression::CaseInsensitiveOption);
#endif #endif
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
if (rxScript.indexIn(expression) != -1){ if (rxScript.indexIn(expression) != -1){
#else #else
QRegularExpressionMatch matchScript = rxScript.match(expression); QRegularExpressionMatch matchScript = rxScript.match(expression);
@ -168,7 +168,7 @@ GroupFunction::GroupFunction(const QString &expression, const QString &dataBandN
return; return;
} }
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
if (rxField.indexIn(expression) != -1){ if (rxField.indexIn(expression) != -1){
#else #else
QRegularExpressionMatch matchField = rxField.match(expression); QRegularExpressionMatch matchField = rxField.match(expression);
@ -178,7 +178,7 @@ GroupFunction::GroupFunction(const QString &expression, const QString &dataBandN
return; return;
} }
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
if (rxVariable.indexIn(expression) != -1){ if (rxVariable.indexIn(expression) != -1){
#else #else
QRegularExpressionMatch matchVariable = rxVariable.match(expression); QRegularExpressionMatch matchVariable = rxVariable.match(expression);

2
limereport/lritemdesignintf.cpp
View File

@ -35,7 +35,7 @@
#include "lrglobal.h" #include "lrglobal.h"
#include <QDebug> #include <QDebug>
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
#include <QRegExp> #include <QRegExp>
#endif #endif
#include <QVariant> #include <QVariant>

4
limereport/lrpagedesignintf.cpp
View File

@ -753,7 +753,7 @@ void PageDesignIntf::dropEvent(QGraphicsSceneDragDropEvent* event)
BaseDesignIntf* item = addReportItem("TextItem",event->scenePos(),QSize(250, 50)); BaseDesignIntf* item = addReportItem("TextItem",event->scenePos(),QSize(250, 50));
TextItem* ti = dynamic_cast<TextItem*>(item); TextItem* ti = dynamic_cast<TextItem*>(item);
QString data = event->mimeData()->text().remove(0,event->mimeData()->text().indexOf(":")+1); QString data = event->mimeData()->text().remove(0,event->mimeData()->text().indexOf(":")+1);
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
if (isVar) data = data.remove(QRegExp(" \\[.*\\]")); if (isVar) data = data.remove(QRegExp(" \\[.*\\]"));
#else #else
if (isVar) data = data.remove(QRegularExpression(" \\[.*\\]")); if (isVar) data = data.remove(QRegularExpression(" \\[.*\\]"));
@ -762,7 +762,7 @@ void PageDesignIntf::dropEvent(QGraphicsSceneDragDropEvent* event)
if (!isVar){ if (!isVar){
BandDesignIntf* parentBand = dynamic_cast<BandDesignIntf*>(ti->parentItem()); BandDesignIntf* parentBand = dynamic_cast<BandDesignIntf*>(ti->parentItem());
if (parentBand && parentBand->datasourceName().isEmpty()){ if (parentBand && parentBand->datasourceName().isEmpty()){
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
QRegExp dataSource("(?:\\$D\\{\\s*(.*)\\..*\\})"); QRegExp dataSource("(?:\\$D\\{\\s*(.*)\\..*\\})");
if (dataSource.indexIn(data) != -1){ if (dataSource.indexIn(data) != -1){
parentBand->setProperty("datasource",dataSource.cap(1)); parentBand->setProperty("datasource",dataSource.cap(1));

2
limereport/lrpageitemdesignintf.cpp
View File

@ -711,7 +711,7 @@ QSizeF PageItemDesignIntf::getRectByPageSize(const PageSize& size)
if (size != Custom) { if (size != Custom) {
QPrinter printer; QPrinter printer;
printer.setOutputFormat(QPrinter::PdfFormat); printer.setOutputFormat(QPrinter::PdfFormat);
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
printer.setOrientation((QPrinter::Orientation)pageOrientation()); printer.setOrientation((QPrinter::Orientation)pageOrientation());
printer.setPaperSize((QPrinter::PageSize)size); printer.setPaperSize((QPrinter::PageSize)size);
return QSizeF(printer.paperSize(QPrinter::Millimeter).width() * 10, return QSizeF(printer.paperSize(QPrinter::Millimeter).width() * 10,

2
limereport/lrpageitemdesignintf.h
View File

@ -66,7 +66,7 @@ class PageItemDesignIntf : public ItemsContainerDesignInft
Q_PROPERTY(bool mixWithPriorPage READ mixWithPriorPage WRITE setMixWithPriorPage) Q_PROPERTY(bool mixWithPriorPage READ mixWithPriorPage WRITE setMixWithPriorPage)
friend class ReportRender; friend class ReportRender;
public: public:
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
enum Orientation { Portrait = QPrinter::Portrait, Landscape = QPrinter::Landscape }; enum Orientation { Portrait = QPrinter::Portrait, Landscape = QPrinter::Landscape };
enum PrintBehavior {Scale, Split}; enum PrintBehavior {Scale, Split};

6
limereport/lrpreviewreportwidget.cpp
View File

@ -143,7 +143,7 @@ void PreviewReportWidget::initPreview()
{ {
if (ui->graphicsView->scene()!=d_ptr->m_previewPage) if (ui->graphicsView->scene()!=d_ptr->m_previewPage)
ui->graphicsView->setScene(d_ptr->m_previewPage); ui->graphicsView->setScene(d_ptr->m_previewPage);
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
ui->graphicsView->resetMatrix(); ui->graphicsView->resetMatrix();
#else #else
ui->graphicsView->resetTransform(); ui->graphicsView->resetTransform();
@ -299,7 +299,7 @@ void PreviewReportWidget::saveToFile()
void PreviewReportWidget::setScalePercent(int percent) void PreviewReportWidget::setScalePercent(int percent)
{ {
m_scaleChanging = true; m_scaleChanging = true;
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
ui->graphicsView->resetMatrix(); ui->graphicsView->resetMatrix();
#else #else
ui->graphicsView->resetTransform(); ui->graphicsView->resetTransform();
@ -482,7 +482,7 @@ void PreviewReportWidget::reportEngineDestroyed(QObject *object)
void PreviewReportWidget::slotZoomed(double ) void PreviewReportWidget::slotZoomed(double )
{ {
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
d_ptr->m_scalePercent = ui->graphicsView->matrix().m11()*100; d_ptr->m_scalePercent = ui->graphicsView->matrix().m11()*100;
#else #else
d_ptr->m_scalePercent = ui->graphicsView->transform().m11()*100; d_ptr->m_scalePercent = ui->graphicsView->transform().m11()*100;

4
limereport/lrpreviewreportwindow.cpp
View File

@ -41,7 +41,7 @@
#include <QPrintDialog> #include <QPrintDialog>
#include <QFileDialog> #include <QFileDialog>
#include <QScrollBar> #include <QScrollBar>
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
#include <QDesktopWidget> #include <QDesktopWidget>
#else #else
#include <QScreen> #include <QScreen>
@ -147,7 +147,7 @@ void PreviewReportWindow::restoreSetting()
if (v.isValid()){ if (v.isValid()){
restoreGeometry(v.toByteArray()); restoreGeometry(v.toByteArray());
} else { } else {
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
QDesktopWidget *desktop = QApplication::desktop(); QDesktopWidget *desktop = QApplication::desktop();
int screenWidth = desktop->screenGeometry().width(); int screenWidth = desktop->screenGeometry().width();

2
limereport/lrreportdesignwidget.cpp
View File

@ -1058,7 +1058,7 @@ bool ReportDesignWidget::eventFilter(QObject *target, QEvent *event)
if (event->type() == QEvent::Wheel){ if (event->type() == QEvent::Wheel){
QWheelEvent* we = dynamic_cast<QWheelEvent*>(event); QWheelEvent* we = dynamic_cast<QWheelEvent*>(event);
if (QApplication::keyboardModifiers()==Qt::ControlModifier){ if (QApplication::keyboardModifiers()==Qt::ControlModifier){
#if QT_VERSION < 0x060000 #if QT_VERSION < QT_VERSION_CHECK(5,12,3)
if(we->delta()<0) scale(1.2,1.2); if(we->delta()<0) scale(1.2,1.2);
else scale(1/1.2,1/1.2); else scale(1/1.2,1/1.2);
#else #else

4
limereport/lrreportdesignwindow.cpp
View File

@ -39,7 +39,7 @@
#include <QMenuBar> #include <QMenuBar>
#include <QCheckBox> #include <QCheckBox>
#include <QVBoxLayout> #include <QVBoxLayout>
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
#include <QDesktopWidget> #include <QDesktopWidget>
#else #else
#include <QScreen> #include <QScreen>
@ -1552,7 +1552,7 @@ void ReportDesignWindow::slotPageDeleted()
void ReportDesignWindow::slotFilterTextChanged(const QString& filter) void ReportDesignWindow::slotFilterTextChanged(const QString& filter)
{ {
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
m_filterModel->setFilterRegExp(QRegExp(filter, Qt::CaseInsensitive, QRegExp::FixedString)); m_filterModel->setFilterRegExp(QRegExp(filter, Qt::CaseInsensitive, QRegExp::FixedString));
#else #else
m_filterModel->setFilterRegularExpression(QRegularExpression(filter, QRegularExpression::CaseInsensitiveOption)); m_filterModel->setFilterRegularExpression(QRegularExpression(filter, QRegularExpression::CaseInsensitiveOption));

8
limereport/lrreportengine.cpp
View File

@ -32,7 +32,7 @@
#include <QPrinterInfo> #include <QPrinterInfo>
#include <QMessageBox> #include <QMessageBox>
#include <QApplication> #include <QApplication>
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
#include <QDesktopWidget> #include <QDesktopWidget>
#else #else
#include <QScreen> #include <QScreen>
@ -1324,7 +1324,7 @@ ReportPages ReportEnginePrivate::renderToPages()
m_reportRender->renderPageToPages(page), m_reportRender->renderPageToPages(page),
page->mixWithPriorPage() ? MixPages : AppendPages page->mixWithPriorPage() ? MixPages : AppendPages
); );
} else { } else if (page->isTOC()){
startTOCPage = result.count(); startTOCPage = result.count();
pageAfterTOCIndex = i+1; pageAfterTOCIndex = i+1;
m_reportRender->createTOCMarker(page->resetPageNumber()); m_reportRender->createTOCMarker(page->resetPageNumber());
@ -1818,7 +1818,7 @@ PrintProcessor::PrintProcessor(QPrinter* printer)
bool PrintProcessor::printPage(PageItemDesignIntf::Ptr page) bool PrintProcessor::printPage(PageItemDesignIntf::Ptr page)
{ {
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
if (!m_firstPage && !m_painter->isActive()) return false; if (!m_firstPage && !m_painter->isActive()) return false;
PageDesignIntf* backupPage = dynamic_cast<PageDesignIntf*>(page->scene()); PageDesignIntf* backupPage = dynamic_cast<PageDesignIntf*>(page->scene());
@ -1949,7 +1949,7 @@ bool PrintProcessor::printPage(PageItemDesignIntf::Ptr page)
void PrintProcessor::initPrinter(PageItemDesignIntf* page) void PrintProcessor::initPrinter(PageItemDesignIntf* page)
{ {
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
if (page->oldPrintMode()){ if (page->oldPrintMode()){
m_printer->setPageMargins(page->leftMargin(), m_printer->setPageMargins(page->leftMargin(),
page->topMargin(), page->topMargin(),

1
limereport/lrreporttranslation.h
View File

@ -64,6 +64,7 @@ private:
PageTranslation* createPageTranslation(PageDesignIntf* page); PageTranslation* createPageTranslation(PageDesignIntf* page);
private: private:
QLocale::Language m_language; QLocale::Language m_language;
QLocale::Script m_script;
QList<PageTranslation*> m_pagesTranslation; QList<PageTranslation*> m_pagesTranslation;
}; };

8
limereport/lrscriptenginemanager.cpp
View File

@ -354,7 +354,7 @@ void ScriptEngineManager::setDataManager(DataSourceManager *dataManager){
QString ScriptEngineManager::expandUserVariables(QString context, RenderPass /* pass */, ExpandType expandType, QVariant &varValue) QString ScriptEngineManager::expandUserVariables(QString context, RenderPass /* pass */, ExpandType expandType, QVariant &varValue)
{ {
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
QRegExp rx(Const::VARIABLE_RX); QRegExp rx(Const::VARIABLE_RX);
if (context.contains(rx)){ if (context.contains(rx)){
int pos = 0; int pos = 0;
@ -452,7 +452,7 @@ QString ScriptEngineManager::expandUserVariables(QString context, RenderPass /*
QString ScriptEngineManager::expandDataFields(QString context, ExpandType expandType, QVariant &varValue, QObject *reportItem) QString ScriptEngineManager::expandDataFields(QString context, ExpandType expandType, QVariant &varValue, QObject *reportItem)
{ {
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
QRegExp rx(Const::FIELD_RX); QRegExp rx(Const::FIELD_RX);
if (context.contains(rx)){ if (context.contains(rx)){
@ -562,7 +562,7 @@ QString ScriptEngineManager::expandDataFields(QString context, ExpandType expand
QString ScriptEngineManager::expandScripts(QString context, QVariant& varValue, QObject *reportItem) QString ScriptEngineManager::expandScripts(QString context, QVariant& varValue, QObject *reportItem)
{ {
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
QRegExp rx(Const::SCRIPT_RX); QRegExp rx(Const::SCRIPT_RX);
if (context.contains(rx)){ if (context.contains(rx)){
@ -631,7 +631,7 @@ QString ScriptEngineManager::replaceScripts(QString context, QVariant &varValue,
QVariant ScriptEngineManager::evaluateScript(const QString& script){ QVariant ScriptEngineManager::evaluateScript(const QString& script){
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
QRegExp rx(Const::SCRIPT_RX); QRegExp rx(Const::SCRIPT_RX);
QVariant varValue; QVariant varValue;

4
limereport/objectinspector/editors/lrbuttonlineeditor.cpp
View File

@ -34,7 +34,7 @@
#include <QFocusEvent> #include <QFocusEvent>
#include <QApplication> #include <QApplication>
#include <QStyle> #include <QStyle>
#if QT_VERSION < 0x060000 #if QT_VERSION < QT_VERSION_CHECK(5,12,3)
#include <QDesktopWidget> #include <QDesktopWidget>
#else #else
#include <QScreen> #include <QScreen>
@ -70,7 +70,7 @@ void ButtonLineEditor::editButtonClicked()
{ {
TextItemPropertyEditor* editor = new TextItemPropertyEditor(QApplication::activeWindow()); TextItemPropertyEditor* editor = new TextItemPropertyEditor(QApplication::activeWindow());
editor->setAttribute(Qt::WA_DeleteOnClose); editor->setAttribute(Qt::WA_DeleteOnClose);
#if QT_VERSION < 0x060000 #if QT_VERSION < QT_VERSION_CHECK(5,12,3)
editor->setGeometry(QStyle::alignedRect(Qt::LeftToRight, Qt::AlignCenter, editor->size(), QApplication::desktop()->availableGeometry())); editor->setGeometry(QStyle::alignedRect(Qt::LeftToRight, Qt::AlignCenter, editor->size(), QApplication::desktop()->availableGeometry()));
#else #else
editor->setGeometry(QStyle::alignedRect(Qt::LeftToRight, Qt::AlignCenter, editor->size(), QGuiApplication::screens().first()->availableGeometry())); editor->setGeometry(QStyle::alignedRect(Qt::LeftToRight, Qt::AlignCenter, editor->size(), QGuiApplication::screens().first()->availableGeometry()));

6
limereport/objectinspector/lrobjectinspectorwidget.cpp
View File

@ -168,7 +168,7 @@ bool PropertyFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sou
{ {
QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent); QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent);
if (sourceParent.isValid()) return true; if (sourceParent.isValid()) return true;
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
return sourceModel()->data(index).toString().contains(filterRegExp()); return sourceModel()->data(index).toString().contains(filterRegExp());
#else #else
return sourceModel()->data(index).toString().contains(filterRegularExpression()); return sourceModel()->data(index).toString().contains(filterRegularExpression());
@ -182,7 +182,7 @@ ObjectInspectorWidget::ObjectInspectorWidget(QWidget *parent)
m_propertyModel = new BaseDesignPropertyModel(this); m_propertyModel = new BaseDesignPropertyModel(this);
m_filterModel = new PropertyFilterModel(this); m_filterModel = new PropertyFilterModel(this);
m_filterModel->setSourceModel(m_propertyModel); m_filterModel->setSourceModel(m_propertyModel);
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
m_filterModel->setFilterRegExp(QRegExp("", Qt::CaseInsensitive, QRegExp::FixedString)); m_filterModel->setFilterRegExp(QRegExp("", Qt::CaseInsensitive, QRegExp::FixedString));
#else #else
m_filterModel->setFilterRegularExpression(QRegularExpression("", QRegularExpression::CaseInsensitiveOption)); m_filterModel->setFilterRegularExpression(QRegularExpression("", QRegularExpression::CaseInsensitiveOption));
@ -314,7 +314,7 @@ void ObjectInspectorWidget::updateProperty(const QString &propertyName)
void ObjectInspectorWidget::slotFilterTextChanged(const QString &filter) void ObjectInspectorWidget::slotFilterTextChanged(const QString &filter)
{ {
if (m_filterModel) if (m_filterModel)
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
m_filterModel->setFilterRegExp(QRegExp(filter, Qt::CaseInsensitive, QRegExp::FixedString)); m_filterModel->setFilterRegExp(QRegExp(filter, Qt::CaseInsensitive, QRegExp::FixedString));
#else #else
m_filterModel->setFilterRegularExpression(QRegularExpression(filter, QRegularExpression::CaseInsensitiveOption)); m_filterModel->setFilterRegularExpression(QRegularExpression(filter, QRegularExpression::CaseInsensitiveOption));

7
limereport/scripteditor/lrcodeeditor.cpp
View File

@ -282,14 +282,13 @@ void CodeEditor::insertCompletion(const QString &completion)
if (m_completer->widget() != this) if (m_completer->widget() != this)
return; return;
QTextCursor tc = textCursor(); QTextCursor tc = textCursor();
int extra = completion.length() - m_completer->completionPrefix().length(); // QString prefix = m_completer->completionPrefix();
//tc.movePosition(QTextCursor::Left); // int extra = completion.length() - prefix.length();
//tc.movePosition(QTextCursor::EndOfWord);
for (int i=0; i < m_completer->completionPrefix().length(); ++i ) { for (int i=0; i < m_completer->completionPrefix().length(); ++i ) {
tc.deletePreviousChar(); tc.deletePreviousChar();
} }
tc.insertText(completion); tc.insertText(completion);
//tc.insertText(completion.right(extra)); // tc.insertText(completion.right(extra));
setTextCursor(tc); setTextCursor(tc);
} }

142
limereport/scripteditor/lrcompletermodel.cpp Normal file
View File

@ -0,0 +1,142 @@
#include "lrcompletermodel.h"
#include <QDebug>
CompleterModel::CompleterModel(QObject *parent) : QAbstractItemModel(parent){m_root.setModel(this);}
QModelIndex CompleterModel::index(int row, int column, const QModelIndex &parent) const
{
CompleterItem const *parentItem;
if (!parent.isValid())
parentItem = &m_root;
else
parentItem = static_cast<CompleterItem*>(parent.internalPointer());
if ((parentItem == nullptr)
|| (row < 0)
|| (column < 0)
|| (row >= parentItem->rowCount())
|| (column >= 1))
{
return QModelIndex();
}
return createIndex(row, column, parentItem->child(row));
}
QModelIndex CompleterModel::parent(const QModelIndex &child) const
{
if (child.isValid()){
CompleterItem *childItem = static_cast<CompleterItem*>(child.internalPointer());
CompleterItem *parentItem = childItem->parent();
if (parentItem != &m_root) {
return indexFromItem(parentItem);
}
}
return QModelIndex();
}
int CompleterModel::rowCount(const QModelIndex &parent) const
{
if (parent.isValid()){
CompleterItem *parentItem = static_cast<CompleterItem*>(parent.internalPointer());
return parentItem->rowCount();
}
return m_root.rowCount();
}
int CompleterModel::columnCount(const QModelIndex &parent) const
{
Q_UNUSED(parent)
return 1;
}
QVariant CompleterModel::data(const QModelIndex &index, int role) const
{
if (index.isValid()){
CompleterItem* item = static_cast<CompleterItem*>(index.internalPointer());
switch (role) {
case Qt::DisplayRole:
case Qt::EditRole:
if (!item) return QVariant();
if (index.column()==0){
return item->text();
} else {
return "";
}
case Qt::DecorationRole :
if (!item) return QIcon();
if (index.column()==0){
return item->icon();
} else return QIcon();
default:
return QVariant();
}
}
return QVariant();
}
QList<CompleterItem *> CompleterModel::findItems(const QString &text, Qt::MatchFlags flags, int column) const
{
QModelIndexList indexes = match(index(0, column, QModelIndex()),
Qt::DisplayRole, text, -1, flags);
QList<CompleterItem*> items;
const int numIndexes = indexes.size();
items.reserve(numIndexes);
for (int i = 0; i < numIndexes; ++i)
items.append(itemFromIndex(indexes.at(i)));
return items;
}
void CompleterModel::clear()
{
beginResetModel();
m_root.clear();
endResetModel();
}
CompleterItem *CompleterModel::itemFromIndex(const QModelIndex index) const
{
if ((index.row() < 0) || (index.column() < 0) || (index.model() != this))
return nullptr;
CompleterItem *parent = static_cast<CompleterItem*>(index.internalPointer());
if (parent == nullptr)
return nullptr;
CompleterItem *item = parent->child(index.row());
return item;
}
QModelIndex CompleterModel::indexFromItem(CompleterItem *item) const
{
if (item && item->parent()){
return createIndex(item->row(), 0, item);
}
return QModelIndex();
}
CompleterItem::~CompleterItem(){}
void CompleterItem::setIcon(const QIcon &newIcon)
{
m_icon = newIcon;
}
void CompleterItem::setText(const QString &newText)
{
m_text = newText;
}
void CompleterItem::appendRow(CompleterItem *child){
child->m_parent = this;
child->m_model = this->m_model;
m_children.append(QSharedPointer<CompleterItem>(child));
if (m_model){
QModelIndex start = m_model->indexFromItem(child);
emit m_model->dataChanged(start, start);
}
}
void CompleterItem::appendRows(const QList<CompleterItem*> &children){
foreach(CompleterItem* item, children){
appendRow(item);
}
}

71
limereport/scripteditor/lrcompletermodel.h Normal file
View File

@ -0,0 +1,71 @@
#ifndef COMPLETERMODEL_H
#define COMPLETERMODEL_H
#include <QAbstractItemModel>
#include <QIcon>
class CompleterModel;
class CompleterItem {
public:
CompleterItem():m_parent(0), m_model(0){}
CompleterItem(QString text, QIcon icon):m_parent(0), m_text(text), m_icon(icon), m_model(0){}
~CompleterItem();
int rowCount() const {return m_children.count();}
CompleterItem* child(int row) const {return m_children.at(row).data();}
CompleterItem* parent() const {return m_parent;}
int row() const{
if (m_parent){
for(int i=0; i < m_parent->m_children.count(); ++i){
CompleterItem* c = m_parent->m_children.at(i).data();
if (c == this) return i;
}
}
return -1;
}
QString text(){return m_text;}
QIcon icon() {return m_icon;}
void setIcon(const QIcon &newIcon);
void setText(const QString &newText);
void setModel(CompleterModel* model){m_model=model;}
void clear(){m_children.clear();}
void appendRow(CompleterItem* child);
void appendRows(const QList<CompleterItem *> &children);
private:
CompleterItem* m_parent;
QVector<QSharedPointer<CompleterItem> > m_children;
QString m_text;
QIcon m_icon;
CompleterModel* m_model;
};
class CompleterModel : public QAbstractItemModel
{
friend CompleterItem;
public:
explicit CompleterModel(QObject *parent = nullptr);
// QAbstractItemModel interface
public:
QModelIndex index(int row, int column, const QModelIndex &parent) const;
QModelIndex parent(const QModelIndex &child) const;
int rowCount(const QModelIndex &parent) const;
int columnCount(const QModelIndex &parent) const;
QVariant data(const QModelIndex &index, int role) const;
CompleterItem* invisibleRootItem(){return &m_root;}
QList<CompleterItem*> findItems(const QString &text,
Qt::MatchFlags flags = Qt::MatchExactly,
int column = 0) const;
void clear();
private:
CompleterItem *itemFromIndex(const QModelIndex index) const;
QModelIndex indexFromItem(CompleterItem *item) const;
private:
CompleterItem m_root;
public:
};
#endif // COMPLETERMODEL_H

116
limereport/scripteditor/lrscripteditor.cpp
View File

@ -20,7 +20,7 @@ ScriptEditor::ScriptEditor(QWidget *parent) :
setFocusProxy(ui->textEdit); setFocusProxy(ui->textEdit);
m_completer = new ReportStructureCompleater(this); m_completer = new ReportStructureCompleater(this);
ui->textEdit->setCompleter(m_completer); ui->textEdit->setCompleter(m_completer);
#if QT_VERSION < 0x060000 #if QT_VERSION < QT_VERSION_CHECK(5,12,3)
ui->textEdit->setTabStopWidth(ui->textEdit->fontMetrics().boundingRect("0").width()*m_tabIndention); ui->textEdit->setTabStopWidth(ui->textEdit->fontMetrics().boundingRect("0").width()*m_tabIndention);
#else #else
ui->textEdit->setTabStopDistance(ui->textEdit->fontMetrics().boundingRect("0").width()*m_tabIndention); ui->textEdit->setTabStopDistance(ui->textEdit->fontMetrics().boundingRect("0").width()*m_tabIndention);
@ -90,7 +90,7 @@ void ScriptEditor::setPageBand(BandDesignIntf* band)
void ScriptEditor::setTabIndention(int charCount) void ScriptEditor::setTabIndention(int charCount)
{ {
if (m_tabIndention != charCount){ if (m_tabIndention != charCount){
#if QT_VERSION < 0x060000 #if QT_VERSION < QT_VERSION_CHECK(5,12,3)
ui->textEdit->setTabStopWidth(ui->textEdit->fontMetrics().boundingRect("W").width()*charCount); ui->textEdit->setTabStopWidth(ui->textEdit->fontMetrics().boundingRect("W").width()*charCount);
#else #else
ui->textEdit->setTabStopDistance(ui->textEdit->fontMetrics().boundingRect("W").width()*charCount); ui->textEdit->setTabStopDistance(ui->textEdit->fontMetrics().boundingRect("W").width()*charCount);
@ -182,21 +182,21 @@ QStringList ReportStructureCompleater::splitPath(const QString &path) const
return path.split("."); return path.split(".");
} }
void ReportStructureCompleater::addAdditionalDatawords(QStandardItemModel* model, DataSourceManager* dataManager){ void ReportStructureCompleater::addAdditionalDatawords(CompleterModel* model, DataSourceManager* dataManager){
foreach(const QString &dsName,dataManager->dataSourceNames()){ foreach(const QString &dsName,dataManager->dataSourceNames()){
QStandardItem* dsNode = new QStandardItem; CompleterItem* dsNode = new CompleterItem;
dsNode->setText(dsName); dsNode->setText(dsName);
model->invisibleRootItem()->appendRow(dsNode);
foreach(const QString &field, dataManager->fieldNames(dsName)){ foreach(const QString &field, dataManager->fieldNames(dsName)){
QStandardItem* fieldNode = new QStandardItem; CompleterItem* fieldNode = new CompleterItem;
fieldNode->setText(field); fieldNode->setText(field);
dsNode->appendRow(fieldNode); dsNode->appendRow(fieldNode);
} }
model->invisibleRootItem()->appendRow(dsNode);
} }
foreach (QString varName, dataManager->variableNames()) { foreach (QString varName, dataManager->variableNames()) {
QStandardItem* varNode = new QStandardItem; CompleterItem* varNode = new CompleterItem;
varNode->setText(varName.remove("#")); varNode->setText(varName.remove("#"));
model->invisibleRootItem()->appendRow(varNode); model->invisibleRootItem()->appendRow(varNode);
} }
@ -208,19 +208,20 @@ void ReportStructureCompleater::addAdditionalDatawords(QStandardItemModel* model
while (it.hasNext()){ while (it.hasNext()){
it.next(); it.next();
if (it.value().isCallable() ){ if (it.value().isCallable() ){
QStandardItem* itemNode = new QStandardItem; CompleterItem* itemNode = new CompleterItem;
itemNode->setText(it.name()+"()"); itemNode->setText(it.name()+"()");
model->invisibleRootItem()->appendRow(itemNode); model->invisibleRootItem()->appendRow(itemNode);
} }
if (it.value().isQObject()){ if (it.value().isQObject()){
if (it.value().toQObject()){ if (it.value().toQObject()){
if (model->findItems(it.name()).isEmpty()){ if (model->findItems(it.name()).isEmpty()){
QStandardItem* objectNode = new QStandardItem; CompleterItem* objectNode = new CompleterItem;
objectNode->setText(it.name()); objectNode->setText(it.name());
objectNode->setIcon(QIcon(":/report/images/object")); objectNode->setIcon(QIcon(":/report/images/object"));
for (int i = 0; i< it.value().toQObject()->metaObject()->methodCount();++i){ for (int i = 0; i< it.value().toQObject()->metaObject()->methodCount();++i){
if (it.value().toQObject()->metaObject()->method(i).methodType() == QMetaMethod::Method){ if (it.value().toQObject()->metaObject()->method(i).methodType() == QMetaMethod::Method){
QStandardItem* methodNode = new QStandardItem; CompleterItem* methodNode = new CompleterItem;
QMetaMethod m = it.value().toQObject()->metaObject()->method(i); QMetaMethod m = it.value().toQObject()->metaObject()->method(i);
QString methodSignature = m.name() + "("; QString methodSignature = m.name() + "(";
bool isFirst = true; bool isFirst = true;
@ -245,46 +246,49 @@ void ReportStructureCompleater::addAdditionalDatawords(QStandardItemModel* model
void ReportStructureCompleater::updateCompleaterModel(ReportEnginePrivateInterface* report) void ReportStructureCompleater::updateCompleaterModel(ReportEnginePrivateInterface* report)
{ {
if (report){ if (report){
m_model.clear(); m_newModel.clear();
QIcon signalIcon(":/report/images/signal"); QIcon signalIcon(":/report/images/signal");
QIcon propertyIcon(":/report/images/property"); QIcon propertyIcon(":/report/images/property");
for ( int i = 0; i < report->pageCount(); ++i){ for ( int i = 0; i < report->pageCount(); ++i){
PageDesignIntf* page = report->pageAt(i); PageDesignIntf* page = report->pageAt(i);
QStandardItem* itemNode = new QStandardItem; CompleterItem* itemNode = new CompleterItem;
itemNode->setText(page->pageItem()->objectName()); itemNode->setText(page->pageItem()->objectName());
itemNode->setIcon(QIcon(":/report/images/object")); itemNode->setIcon(QIcon(":/report/images/object"));
m_model.invisibleRootItem()->appendRow(itemNode);
QStringList items = extractSignalNames(page->pageItem()); QStringList items = extractSignalNames(page->pageItem());
foreach(QString slotName, items){ foreach(QString slotName, items){
QStandardItem* slotItem = new QStandardItem; CompleterItem* slotItem = new CompleterItem;
slotItem->setText(slotName); slotItem->setText(slotName);
slotItem->setIcon(signalIcon); slotItem->setIcon(signalIcon);
itemNode->appendRow(slotItem); itemNode->appendRow(slotItem);
} }
items = extractProperties(page->pageItem()); items = extractProperties(page->pageItem());
foreach(QString propertyName, items){ foreach(QString propertyName, items){
QStandardItem* properyItem = new QStandardItem; CompleterItem* properyItem = new CompleterItem;
properyItem->setText(propertyName); properyItem->setText(propertyName);
properyItem->setIcon(propertyIcon); properyItem->setIcon(propertyIcon);
itemNode->appendRow(properyItem); itemNode->appendRow(properyItem);
} }
foreach (BaseDesignIntf* item, page->pageItem()->childBaseItems()){ foreach (BaseDesignIntf* item, page->pageItem()->childBaseItems()){
addChildItem(item, itemNode->text(), m_model.invisibleRootItem()); addChildItem(item, itemNode->text(), m_newModel.invisibleRootItem());
} }
m_newModel.invisibleRootItem()->appendRow(itemNode);
} }
addAdditionalDatawords(&m_model, report->dataManager()); addAdditionalDatawords(&m_newModel, report->dataManager());
m_model.sort(0); m_newModel.sort(0);
} }
} }
void ReportStructureCompleater::updateCompleaterModel(DataSourceManager *dataManager) void ReportStructureCompleater::updateCompleaterModel(DataSourceManager *dataManager)
{ {
m_model.clear(); m_newModel.clear();
addAdditionalDatawords(&m_model, dataManager); addAdditionalDatawords(&m_newModel, dataManager);
} }
QStringList ReportStructureCompleater::extractSignalNames(BaseDesignIntf *item) QStringList ReportStructureCompleater::extractSignalNames(BaseDesignIntf *item)
@ -325,46 +329,64 @@ QStringList ReportStructureCompleater::extractProperties(BaseDesignIntf *item)
return result; return result;
} }
void ReportStructureCompleater::addChildItem(BaseDesignIntf *item, const QString &pageName, QStandardItem *parent) void ReportStructureCompleater::addChildItem(BaseDesignIntf *item, const QString &pageName, CompleterItem *parent)
{ {
if (!item) return; if (!item) return;
QIcon signalIcon(":/report/images/signal"); QIcon signalIcon(":/report/images/signal");
QIcon propertyIcon(":/report/images/property"); QIcon propertyIcon(":/report/images/property");
QStandardItem* itemNode = new QStandardItem; CompleterItem* itemNode = new CompleterItem;
itemNode->setText(pageName+"_"+item->objectName()); itemNode->setText(pageName+"_"+item->objectName());
itemNode->setIcon(QIcon(":/report/images/object")); itemNode->setIcon(QIcon(":/report/images/object"));
parent->appendRow(itemNode); parent->appendRow(itemNode);
QStringList items;
if (!m_signals.contains(item->metaObject()->className())){ // if (m_cache.contains(item->metaObject()->className())){
items = extractSignalNames(item);
m_signals.insert(item->metaObject()->className(),items);
} else {
items = m_signals.value(item->metaObject()->className());
}
foreach(QString slotName, items){ // QSharedPointer<CacheItem> cacheItem = m_cache.value(item->metaObject()->className());
QStandardItem* slotItem = new QStandardItem; // itemNode->appendRows(cacheItem->slotsItems);
slotItem->setText(slotName); // itemNode->appendRows(cacheItem->propsItems);
slotItem->setIcon(signalIcon);
itemNode->appendRow(slotItem);
}
if (!m_properties.contains(item->metaObject()->className())){ // } else {
items = extractProperties(item);
m_properties.insert(item->metaObject()->className(),items);
} else {
items = m_properties.value(item->metaObject()->className());
}
foreach(QString propertyName, items){ // QSharedPointer<CacheItem> cacheItem = QSharedPointer<CacheItem>(new CacheItem);
QStandardItem* properyItem = new QStandardItem;
properyItem->setText(propertyName); QStringList items;
properyItem->setIcon(propertyIcon); if (!m_signals.contains(item->metaObject()->className())){
itemNode->appendRow(properyItem); items = extractSignalNames(item);
} m_signals.insert(item->metaObject()->className(),items);
} else {
items = m_signals.value(item->metaObject()->className());
}
foreach(QString slotName, items){
CompleterItem* slotItem = new CompleterItem;
slotItem->setText(slotName);
slotItem->setIcon(signalIcon);
//cacheItem->slotsItems.append(QSharedPointer<CompleterItem>(slotItem));
itemNode->appendRow(slotItem);
}
if (!m_properties.contains(item->metaObject()->className())){
items = extractProperties(item);
m_properties.insert(item->metaObject()->className(),items);
} else {
items = m_properties.value(item->metaObject()->className());
}
foreach(QString propertyName, items){
CompleterItem* properyItem = new CompleterItem;
properyItem->setText(propertyName);
properyItem->setIcon(propertyIcon);
itemNode->appendRow(properyItem);
//cacheItem->propsItems.append(QSharedPointer<CompleterItem>(properyItem));
}
//m_cache.insert(item->metaObject()->className(), cacheItem);
//itemNode->appendRows(cacheItem->slotsItems);
//itemNode->appendRows(cacheItem->propsItems);
//}
foreach (BaseDesignIntf* child, item->childBaseItems()){ foreach (BaseDesignIntf* child, item->childBaseItems()){
addChildItem(child, pageName, parent); addChildItem(child, pageName, parent);

16
limereport/scripteditor/lrscripteditor.h
View File

@ -7,6 +7,7 @@
#include <QKeyEvent> #include <QKeyEvent>
#include <QScrollBar> #include <QScrollBar>
#include <QStandardItemModel> #include <QStandardItemModel>
#include "lrcompletermodel.h"
namespace LimeReport{ namespace LimeReport{
@ -20,12 +21,17 @@ namespace Ui {
class ScriptEditor; class ScriptEditor;
} }
struct CacheItem {
QList<QSharedPointer<CompleterItem>> propsItems;
QList<QSharedPointer<CompleterItem>> slotsItems;
};
class ReportStructureCompleater : public QCompleter{ class ReportStructureCompleater : public QCompleter{
Q_OBJECT Q_OBJECT
public: public:
explicit ReportStructureCompleater(QObject* parent = 0): QCompleter(parent){ setModel(&m_model);} explicit ReportStructureCompleater(QObject* parent = 0): QCompleter(parent){ setModel(&m_newModel);}
explicit ReportStructureCompleater(QAbstractItemModel* model, QObject* parent = 0) explicit ReportStructureCompleater(QAbstractItemModel* model, QObject* parent = 0)
:QCompleter(model, parent){ setModel(&m_model);} :QCompleter(model, parent){ setModel(&m_newModel);}
public: public:
// QCompleter interface // QCompleter interface
QString pathFromIndex(const QModelIndex& index) const; QString pathFromIndex(const QModelIndex& index) const;
@ -35,10 +41,10 @@ public:
protected: protected:
QStringList extractSignalNames(BaseDesignIntf* item); QStringList extractSignalNames(BaseDesignIntf* item);
QStringList extractProperties(BaseDesignIntf* item); QStringList extractProperties(BaseDesignIntf* item);
void addChildItem(BaseDesignIntf *item, const QString &pageName, QStandardItem *parent); void addChildItem(BaseDesignIntf *item, const QString &pageName, CompleterItem *parent);
void addAdditionalDatawords(QStandardItemModel* model, DataSourceManager *dataManager); void addAdditionalDatawords(CompleterModel *model, DataSourceManager *dataManager);
private: private:
QStandardItemModel m_model; CompleterModel m_newModel;
QMap<QString, QStringList> m_properties; QMap<QString, QStringList> m_properties;
QMap<QString, QStringList> m_signals; QMap<QString, QStringList> m_signals;
}; };

4
lrdview/MainWindow.cpp
View File

@ -5,7 +5,7 @@
#include <private/qzipreader_p.h> #include <private/qzipreader_p.h>
#include <QDebug> #include <QDebug>
#include <QtCore/qabstractanimation.h> #include <QtCore/qabstractanimation.h>
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
#include <QDesktopWidget> #include <QDesktopWidget>
#endif #endif
#include "XmlModel.h" #include "XmlModel.h"
@ -17,7 +17,7 @@
//#endif //#endif
void centerWindow(QWidget* widget, double widthFactor, double heightFactor) { void centerWindow(QWidget* widget, double widthFactor, double heightFactor) {
#if QT_VERSION < 0x060000 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
QDesktopWidget desk; QDesktopWidget desk;
int ww = desk.width() * widthFactor; int ww = desk.width() * widthFactor;
int wh = desk.height() * heightFactor; int wh = desk.height() * heightFactor;