python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2025-01-12 04:41:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Finish 1.5.9

Browse Source
This commit is contained in:
Arin Alexander 2019-08-11 12:48:34 +03:00
commit 6af025471b
12 changed files with 563 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

559
.travis.yml
View File

@ -1,27 +1,548 @@
language: cpp matrix:
include:
- env: Qt4.8.5_Ubuntu_14.04
os: linux
dist: trusty
language: cpp
compiler: gcc
cache: ccache
addons:
apt:
packages:
- qt4-default
script:
- qmake -r limereport.pro
- make
- make check
compiler: - env: Qt4.8.5_Ubuntu_14.04
- gcc os: linux
dist: trusty
language: cpp
compiler: clang
cache: ccache
addons:
apt:
packages:
- qt4-default
script:
- qmake -r limereport.pro
- make
- make check
- env: Qt5.1.1_Ubuntu_14.04
os: linux
dist: trusty
language: cpp
compiler: gcc
cache: ccache
addons:
apt:
sources:
- sourceline: 'ppa:beineri/opt-qt511-trusty'
packages:
- qt51base
- qt51script
- qt51tools
script:
- source /opt/qt51/bin/qt51-env.sh
- /opt/qt51/bin/qmake -r limereport.pro
- make
- make check
- env: Qt5.1.1_Ubuntu_14.04
os: linux
dist: trusty
language: cpp
compiler: clang
cache: ccache
addons:
apt:
sources:
- sourceline: 'ppa:beineri/opt-qt511-trusty'
packages:
- qt51base
- qt51script
- qt51tools
script:
- source /opt/qt51/bin/qt51-env.sh
- /opt/qt51/bin/qmake -r limereport.pro
- make
- make check
sudo: required - env: Qt5.2.1_Ubuntu_14.04
dist: trusty os: linux
dist: trusty
language: cpp
compiler: gcc
cache: ccache
addons:
apt:
sources:
- sourceline: 'ppa:beineri/opt-qt521-trusty'
packages:
- qt52base
- qt52script
- qt52tools
script:
- source /opt/qt52/bin/qt52-env.sh
- /opt/qt52/bin/qmake -r limereport.pro
- make
- make check
env: - env: Qt5.2.1_Ubuntu_14.04
- QT_BASE=56 os: linux
dist: trusty
language: cpp
compiler: clang
cache: ccache
addons:
apt:
sources:
- sourceline: 'ppa:beineri/opt-qt521-trusty'
packages:
- qt52base
- qt52script
- qt52tools
script:
- source /opt/qt52/bin/qt52-env.sh
- /opt/qt52/bin/qmake -r limereport.pro
- make
- make check
- env: Qt5.3.2_Ubuntu_14.04
os: linux
dist: trusty
language: cpp
compiler: gcc
cache: ccache
addons:
apt:
sources:
- sourceline: 'ppa:beineri/opt-qt532-trusty'
packages:
- qt53base
- qt53script
- qt53tools
script:
- source /opt/qt53/bin/qt53-env.sh
- /opt/qt53/bin/qmake -r limereport.pro
- make
- make check
before_install: - env: Qt5.3.2_Ubuntu_14.04
- if [ "$QT_BASE" = "56" ]; then sudo add-apt-repository ppa:beineri/opt-qt562-trusty -y; fi os: linux
- sudo apt-get update -qq dist: trusty
language: cpp
compiler: clang
cache: ccache
addons:
apt:
sources:
- sourceline: 'ppa:beineri/opt-qt532-trusty'
packages:
- qt53base
- qt53script
- qt53tools
script:
- source /opt/qt53/bin/qt53-env.sh
- /opt/qt53/bin/qmake -r limereport.pro
- make
- make check
- env: Qt5.4.2_Ubuntu_14.04
os: linux
dist: trusty
language: cpp
compiler: gcc
cache: ccache
addons:
apt:
sources:
- sourceline: 'ppa:beineri/opt-qt542-trusty'
packages:
- qt54base
- qt54script
- qt54tools
script:
- source /opt/qt54/bin/qt54-env.sh
- /opt/qt54/bin/qmake -r limereport.pro
- make
- make check
install: - env: Qt5.4.2_Ubuntu_14.04
- if [ "$QT_BASE" = "56" ]; then sudo apt-get install -qq qt56base qt56script qt56tools ; source /opt/qt56/bin/qt56-env.sh; fi os: linux
dist: trusty
language: cpp
compiler: clang
cache: ccache
addons:
apt:
sources:
- sourceline: 'ppa:beineri/opt-qt542-trusty'
packages:
- qt54base
- qt54script
- qt54tools
script:
- source /opt/qt54/bin/qt54-env.sh
- /opt/qt54/bin/qmake -r limereport.pro
- make
- make check
- env: Qt5.5.1_Ubuntu_14.04
os: linux
dist: trusty
language: cpp
compiler: gcc
cache: ccache
addons:
apt:
sources:
- sourceline: 'ppa:beineri/opt-qt551-trusty'
packages:
- qt55base
- qt55script
- qt55tools
script:
- source /opt/qt55/bin/qt55-env.sh
- /opt/qt55/bin/qmake -r limereport.pro
- make
- make check
script: - env: Qt5.5.1_Ubuntu_14.04
- qmake -r limereport.pro os: linux
- make dist: trusty
- make check language: cpp
compiler: clang
cache: ccache
addons:
apt:
sources:
- sourceline: 'ppa:beineri/opt-qt551-trusty'
packages:
- qt55base
- qt55script
- qt55tools
script:
- source /opt/qt55/bin/qt55-env.sh
- /opt/qt55/bin/qmake -r limereport.pro
- make
- make check
- env: Qt5.6.3_Ubuntu_14.04
os: linux
dist: trusty
language: cpp
compiler: gcc
cache: ccache
addons:
apt:
sources:
- sourceline: 'ppa:beineri/opt-qt563-trusty'
packages:
- qt56base
- qt56script
- qt56tools
script:
- source /opt/qt56/bin/qt56-env.sh
- /opt/qt56/bin/qmake -r limereport.pro
- make
- make check
- env: Qt5.6.3_Ubuntu_14.04
os: linux
dist: trusty
language: cpp
compiler: clang
cache: ccache
addons:
apt:
sources:
- sourceline: 'ppa:beineri/opt-qt563-trusty'
packages:
- qt56base
- qt56script
- qt56tools
script:
- source /opt/qt56/bin/qt56-env.sh
- /opt/qt56/bin/qmake -r limereport.pro
- make
- make check
- env: Qt5.7.1_Ubuntu_14.04
os: linux
dist: trusty
language: cpp
compiler: gcc
cache: ccache
addons:
apt:
sources:
- sourceline: 'ppa:beineri/opt-qt571-trusty'
packages:
- qt57base
- qt57script
- qt57tools
script:
- source /opt/qt57/bin/qt57-env.sh
- /opt/qt57/bin/qmake -r limereport.pro
- make
- make check
- env: Qt5.7.1_Ubuntu_14.04
os: linux
dist: trusty
language: cpp
compiler: clang
cache: ccache
addons:
apt:
sources:
- sourceline: 'ppa:beineri/opt-qt571-trusty'
packages:
- qt57base
- qt57script
- qt57tools
script:
- source /opt/qt57/bin/qt57-env.sh
- /opt/qt57/bin/qmake -r limereport.pro
- make
- make check
- env: Qt5.8.0_Ubuntu_14.04
os: linux
dist: trusty
language: cpp
compiler: gcc
cache: ccache
addons:
apt:
sources:
- sourceline: 'ppa:beineri/opt-qt58-trusty'
packages:
- qt58base
- qt58script
- qt58tools
script:
- source /opt/qt58/bin/qt58-env.sh
- /opt/qt58/bin/qmake -r limereport.pro
- make
- make check
- env: Qt5.8.0_Ubuntu_14.04
os: linux
dist: trusty
language: cpp
compiler: clang
cache: ccache
addons:
apt:
sources:
- sourceline: 'ppa:beineri/opt-qt58-trusty'
packages:
- qt58base
- qt58script
- qt58tools
script:
- source /opt/qt58/bin/qt58-env.sh
- /opt/qt58/bin/qmake -r limereport.pro
- make
- make check
- env: Qt5.9.7_Ubuntu_14.04
os: linux
dist: trusty
language: cpp
compiler: gcc
cache: ccache
addons:
apt:
sources:
- sourceline: 'ppa:beineri/opt-qt597-trusty'
packages:
- qt59base
- qt59script
- qt59tools
script:
- source /opt/qt59/bin/qt59-env.sh
- /opt/qt59/bin/qmake -r limereport.pro
- make
- make check
- env: Qt5.9.7_Ubuntu_14.04
os: linux
dist: trusty
language: cpp
compiler: clang
cache: ccache
addons:
apt:
sources:
- sourceline: 'ppa:beineri/opt-qt597-trusty'
packages:
- qt59base
- qt59script
- qt59tools
script:
- source /opt/qt59/bin/qt59-env.sh
- /opt/qt59/bin/qmake -r limereport.pro
- make
- make check
- env: Qt5.10.1_Ubuntu_14.04
os: linux
dist: trusty
language: cpp
compiler: gcc
cache: ccache
addons:
apt:
sources:
- sourceline: 'ppa:beineri/opt-qt-5.10.1-trusty'
packages:
- qt510base
- qt510script
- qt510tools
script:
- source /opt/qt510/bin/qt510-env.sh
- /opt/qt510/bin/qmake -r limereport.pro
- make
- make check
- env: Qt5.10.1_Ubuntu_14.04
os: linux
dist: trusty
language: cpp
compiler: clang
cache: ccache
addons:
apt:
sources:
- sourceline: 'ppa:beineri/opt-qt-5.10.1-trusty'
packages:
- qt510base
- qt510script
- qt510tools
script:
- source /opt/qt510/bin/qt510-env.sh
- /opt/qt510/bin/qmake -r limereport.pro
- make
- make check
- env: Qt5.11.3_Ubuntu_18.04
os: linux
dist: bionic
language: cpp
compiler: gcc
cache: ccache
addons:
apt:
sources:
- sourceline: 'ppa:beineri/opt-qt-5.11.3-bionic'
packages:
- qt511base
- qt511script
- qt511tools
- mesa-common-dev
- libgl1-mesa-dev
script:
- source /opt/qt511/bin/qt511-env.sh
- /opt/qt511/bin/qmake -r limereport.pro
- make
- make check
- env: Qt5.11.3_Ubuntu_18.04
os: linux
dist: bionic
language: cpp
compiler: clang
cache: ccache
addons:
apt:
sources:
- sourceline: 'ppa:beineri/opt-qt-5.11.3-bionic'
packages:
- qt511base
- qt511script
- qt511tools
- mesa-common-dev
- libgl1-mesa-dev
script:
- source /opt/qt511/bin/qt511-env.sh
- /opt/qt511/bin/qmake -r limereport.pro
- make
- make check
- env: Qt5.12.3_Ubuntu_18.04
os: linux
dist: bionic
language: cpp
compiler: gcc
cache: ccache
addons:
apt:
sources:
- sourceline: 'ppa:beineri/opt-qt-5.12.3-bionic'
packages:
- qt512base
- qt512script
- qt512tools
- mesa-common-dev
- libgl1-mesa-dev
script:
- source /opt/qt512/bin/qt512-env.sh
- /opt/qt512/bin/qmake -r limereport.pro
- make
- make check
- env: Qt5.12.3_Ubuntu_18.04
os: linux
dist: bionic
language: cpp
compiler: clang
cache: ccache
addons:
apt:
sources:
- sourceline: 'ppa:beineri/opt-qt-5.12.3-bionic'
packages:
- qt512base
- qt512script
- qt512tools
- mesa-common-dev
- libgl1-mesa-dev
script:
- source /opt/qt512/bin/qt512-env.sh
- /opt/qt512/bin/qmake -r limereport.pro
- make
- make check
notifications: notifications:
email: false email: false

2
common.pri
View File

@ -127,7 +127,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MAJOR = 1
LIMEREPORT_VERSION_MINOR = 5 LIMEREPORT_VERSION_MINOR = 5
LIMEREPORT_VERSION_RELEASE = 7 LIMEREPORT_VERSION_RELEASE = 9
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}\\\"

7
limereport.pro
View File

@ -16,9 +16,14 @@ SUBDIRS += \
limereport \ limereport \
demo_r1 \ demo_r1 \
demo_r2 \ demo_r2 \
console \
designer designer
greaterThan(QT_MAJOR_VERSION, 4){
greaterThan(QT_MINOR_VERSION, 1){
SUBDIRS += console
}
}
!contains(CONFIG, embedded_designer){ !contains(CONFIG, embedded_designer){
!contains(CONFIG, static_build){ !contains(CONFIG, static_build){
SUBDIRS += designer_plugin SUBDIRS += designer_plugin

2
limereport/exporters/lrpdfexporter.h
View File

@ -11,7 +11,7 @@ class PDFExporter : public QObject, public ReportExporterInterface
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit PDFExporter(ReportEnginePrivate *parent = nullptr); explicit PDFExporter(ReportEnginePrivate *parent = NULL);
// ReportExporterInterface interface // ReportExporterInterface interface
bool exportPages(ReportPages pages, const QString &fileName, const QMap<QString, QVariant> &params); bool exportPages(ReportPages pages, const QString &fileName, const QMap<QString, QVariant> &params);
QString exporterName() QString exporterName()

2
limereport/items/lrimageitemeditor.h
View File

@ -16,7 +16,7 @@ class ImageItemEditor : public QWidget
Q_OBJECT Q_OBJECT
public: public:
explicit ImageItemEditor(LimeReport::ImageItem* item, QWidget *parent = nullptr); explicit ImageItemEditor(LimeReport::ImageItem* item, QWidget *parent = NULL);
~ImageItemEditor(); ~ImageItemEditor();
private: private:
void updateImage(); void updateImage();

2
limereport/lrbanddesignintf.cpp
View File

@ -176,7 +176,7 @@ BandDesignIntf::BandDesignIntf(BandsType bandType, const QString &xmlTypeName, Q
if (parentItem) setWidth(parentItem->width()); if (parentItem) setWidth(parentItem->width());
} }
setBackgroundMode(BGMode::TransparentMode); setBackgroundMode(BaseDesignIntf::TransparentMode);
setFillTransparentInDesignMode(false); setFillTransparentInDesignMode(false);
setHeight(100); setHeight(100);
setFixedPos(true); setFixedPos(true);

4
limereport/lrbasedesignintf.h
View File

@ -262,7 +262,7 @@ public:
QString itemTypeName() const; QString itemTypeName() const;
void setItemTypeName(const QString &itemTypeName); void setItemTypeName(const QString &itemTypeName);
void emitObjectNamePropertyChanged(const QString& oldName, const QString& newName);
int borderLineSize() const; int borderLineSize() const;
void setBorderLineSize(int value); void setBorderLineSize(int value);
void showEditorDialog(); void showEditorDialog();
@ -303,7 +303,9 @@ public:
bool fillTransparentInDesignMode() const; bool fillTransparentInDesignMode() const;
void setFillTransparentInDesignMode(bool fillTransparentInDesignMode); void setFillTransparentInDesignMode(bool fillTransparentInDesignMode);
void emitPosChanged(QPointF oldPos, QPointF newPos); void emitPosChanged(QPointF oldPos, QPointF newPos);
void emitObjectNamePropertyChanged(const QString& oldName, const QString& newName);
bool isGeometryLocked() const; bool isGeometryLocked() const;
void setGeometryLocked(bool itemLocked); void setGeometryLocked(bool itemLocked);

2
limereport/lrpagedesignintf.cpp
View File

@ -2136,7 +2136,7 @@ bool PosChangedCommand::doIt()
if (reportItem && (reportItem->pos() != m_newPos[i].pos)){ if (reportItem && (reportItem->pos() != m_newPos[i].pos)){
QPointF oldValue = reportItem->pos(); QPointF oldValue = reportItem->pos();
reportItem->setPos(m_newPos[i].pos); reportItem->setPos(m_newPos[i].pos);
emit reportItem->posChanged(reportItem, oldValue, reportItem->pos()); reportItem->emitPosChanged(oldValue, reportItem->pos());
} }
} }

4
limereport/lrreportdesignwidget.h
View File

@ -82,12 +82,12 @@ private:
class PageView: public QGraphicsView{ class PageView: public QGraphicsView{
public: public:
PageView(QWidget *parent = nullptr): QGraphicsView(parent), PageView(QWidget *parent = NULL): QGraphicsView(parent),
m_horizontalRuller(0), m_verticalRuller(0) m_horizontalRuller(0), m_verticalRuller(0)
{ {
setViewportMargins(20,20,0,0); setViewportMargins(20,20,0,0);
} }
PageView(QGraphicsScene *scene, QWidget *parent = nullptr): PageView(QGraphicsScene *scene, QWidget *parent = NULL):
QGraphicsView(scene, parent), QGraphicsView(scene, parent),
m_horizontalRuller(0), m_verticalRuller(0) m_horizontalRuller(0), m_verticalRuller(0)
{ {

4
limereport/lrreportengine.cpp
View File

@ -299,7 +299,7 @@ void ReportEnginePrivate::printReport(ItemsReaderIntf::Ptr reader, QPrinter& pri
void ReportEnginePrivate::printReport(ReportPages pages, QPrinter &printer) void ReportEnginePrivate::printReport(ReportPages pages, QPrinter &printer)
{ {
int currenPage = 1; int currenPage = 1;
QMap<QString, QSharedPointer<PrintProcessor>> printProcessors; QMap<QString, QSharedPointer<PrintProcessor> > printProcessors;
printProcessors.insert("default",QSharedPointer<PrintProcessor>(new PrintProcessor(&printer))); printProcessors.insert("default",QSharedPointer<PrintProcessor>(new PrintProcessor(&printer)));
foreach(PageItemDesignIntf::Ptr page, pages){ foreach(PageItemDesignIntf::Ptr page, pages){
if ( if (
@ -320,7 +320,7 @@ void ReportEnginePrivate::printReport(ReportPages pages, QMap<QString, QPrinter*
{ {
if (printers.values().isEmpty()) return; if (printers.values().isEmpty()) return;
int currenPage = 1; int currenPage = 1;
QMap<QString, QSharedPointer<PrintProcessor>> printProcessors; QMap<QString, QSharedPointer<PrintProcessor> > printProcessors;
for (int i = 0; i < printers.keys().count(); ++i) { for (int i = 0; i < printers.keys().count(); ++i) {
printProcessors.insert(printers.keys()[i],QSharedPointer<PrintProcessor>(new PrintProcessor(printers[printers.keys()[i]]))); printProcessors.insert(printers.keys()[i],QSharedPointer<PrintProcessor>(new PrintProcessor(printers[printers.keys()[i]])));
} }

2
limereport/lrscriptenginemanager.cpp
View File

@ -1930,7 +1930,7 @@ bool DatasourceFunctions::isEOF(const QString &datasourceName)
bool DatasourceFunctions::invalidate(const QString& datasourceName) bool DatasourceFunctions::invalidate(const QString& datasourceName)
{ {
if (m_dataManager && m_dataManager->dataSource(datasourceName)){ if (m_dataManager && m_dataManager->dataSource(datasourceName)){
m_dataManager->dataSourceHolder(datasourceName)->invalidate(IDataSource::DatasourceMode::RENDER_MODE); m_dataManager->dataSourceHolder(datasourceName)->invalidate(IDataSource::RENDER_MODE);
return true; return true;
} }
return false; return false;

5
limereport/objectinspector/lrobjectpropitem.h
View File

@ -99,7 +99,7 @@ namespace LimeReport{
#endif #endif
private: private:
bool m_valid; bool m_valid;
void invalidate(){m_object=0; m_objects=0; m_valid = false; m_name = ""; m_value=QVariant(), m_isClass=false;} void invalidate(){m_object=0; m_objects=0; m_valid = false; m_name = ""; m_value=QVariant(); m_isClass=false;}
protected: protected:
void beginChangeValue(){ m_changingValue = true; } void beginChangeValue(){ m_changingValue = true; }
@ -140,4 +140,7 @@ namespace LimeReport{
}; };
} }
Q_DECLARE_METATYPE(LimeReport::ObjectPropItem*)
#endif // LROBJECTPROPITEM_H #endif // LROBJECTPROPITEM_H