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

Merge pull request #337 from darktorres/master

Browse Source 
Some more small changes
This commit is contained in:
Alexander Arin 2021-08-19 02:28:10 +03:00 committed by GitHub
commit 09a31a96a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
184 changed files with 406 additions and 411 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/3rdparty.pro vendored
View File

@ -1,4 +1,4 @@
ZINT_PATH = $$PWD/zint-2.6.1/
ZINT_PATH = $$PWD/zint-2.6.1
ZINT_VERSION = 2.6.1
INCLUDEPATH += $${ZINT_PATH}/backend $${ZINT_PATH}/backend_qt
DEPENDPATH += $${ZINT_PATH}/backend $${ZINT_PATH}/backend_qt

4
3rdparty/zint-2.6.1/backend_qt/backend_qt.pro vendored
View File

@ -1,13 +1,13 @@
DEFINES += NO_PNG
TEMPLATE = lib
contains(CONFIG, static_build){
CONFIG(static_build) {
message(Static Build)
CONFIG += staticlib
DEFINES += QZINT_STATIC_BUILD
}
!contains(CONFIG, staticlib){
!CONFIG(staticlib) {
CONFIG += dll
DEFINES += QZINT_LIBRARY
}

52
common.pri
View File

@ -1,34 +1,44 @@
# uncomment to disable translations
#CONFIG += no_build_translations
# uncomment to disable zint
#CONFIG += no_zint
# uncomment to disable svg
#CONFIG += no_svg
# uncomment to enable easy_profiler
#CONFIG *= easy_profiler
isEmpty(BINARY_RESULT_DIR) {
BINARY_RESULT_DIR = $${PWD}
}
!contains(CONFIG, no_build_translations){
CONFIG += build_translations
!CONFIG(no_build_translations) {
CONFIG *= build_translations
}
#CONFIG *= easy_profiler
!contains(CONFIG, no_zint){
!CONFIG(no_zint) {
CONFIG *= zint
}
!contains(CONGIG, no_svg){
!CONFIG(no_svg) {
QT *= svg
CONFIG *= svg
DEFINES += HAVE_SVG
DEFINES *= HAVE_SVG
}
INCLUDEPATH += $$PWD/3rdparty/easyprofiler/easy_profiler_core/include
DEPENDPATH += $$PWD/3rdparty/easyprofiler/easy_profiler_core/include
contains(CONFIG, easy_profiler){
CONFIG(easy_profiler) {
message(EasyProfiler)
unix|win32: LIBS += -L$$PWD/3rdparty/easyprofiler/build/bin/ -leasy_profiler
INCLUDEPATH *= $$PWD/3rdparty/easyprofiler/easy_profiler_core/include
DEPENDPATH *= $$PWD/3rdparty/easyprofiler/easy_profiler_core/include
unix|win32: LIBS *= -L$$PWD/3rdparty/easyprofiler/build/bin/ -leasy_profiler
greaterThan(QT_MAJOR_VERSION, 4) {
DEFINES += BUILD_WITH_EASY_PROFILER
DEFINES *= BUILD_WITH_EASY_PROFILER
}
}
!contains(CONFIG, qtscriptengine){
!CONFIG(qtscriptengine) {
greaterThan(QT_MAJOR_VERSION, 4) {
greaterThan(QT_MINOR_VERSION, 5) {
CONFIG *= qjsengine
@ -42,25 +52,25 @@ lessThan(QT_MAJOR_VERSION, 5){
}
}
contains(CONFIG, qtscriptengine){
CONFIG(qtscriptengine) {
CONFIG -= qjsengine
QT *= script
DEFINES *= USE_QTSCRIPTENGINE
message(qtscriptengine)
}
!contains(CONFIG, no_formdesigner){
!CONFIG(no_formdesigner) {
CONFIG *= dialogdesigner
}
!contains(CONFIG, no_embedded_designer){
!CONFIG(no_embedded_designer) {
CONFIG *= embedded_designer
DEFINES += HAVE_REPORT_DESIGNER
DEFINES *= HAVE_REPORT_DESIGNER
message(embedded designer)
}
ZINT_PATH = $$PWD/3rdparty/zint-2.6.1
contains(CONFIG,zint){
CONFIG(zint) {
DEFINES *= HAVE_ZINT
}
@ -83,13 +93,16 @@ CONFIG(release, debug|release){
BUILD_DIR = $${BINARY_RESULT_DIR}/build/$${QT_VERSION}
DEST_INCLUDE_DIR = $$PWD/include
unix{
ARCH_DIR = $${OUT_PWD}/unix
ARCH_TYPE = unix
macx{
ARCH_DIR = $${OUT_PWD}/macx
ARCH_TYPE = macx
}
linux{
!contains(QT_ARCH, x86_64) {
message("Compiling for 32bit system")
@ -102,6 +115,7 @@ unix{
}
}
}
win32 {
!contains(QT_ARCH, x86_64) {
message("Compiling for 32bit system")
@ -143,7 +157,7 @@ greaterThan(QT_MAJOR_VERSION, 4) {
message(uitools)
DEFINES *= HAVE_UI_LOADER
}
contains(CONFIG, qjsengine){
CONFIG(qjsengine) {
message(qjsengine)
DEFINES *= USE_QJSENGINE
QT *= qml

5
console/console.pro
View File

@ -23,8 +23,8 @@ CONFIG(debug, debug|release) {
} else {
LIBS += -llimereport
}
!contains(CONFIG, static_build){
contains(CONFIG,zint){
!CONFIG(static_build) : CONFIG(zint) {
LIBS += -L$${DEST_LIBS}
CONFIG(debug, debug|release) {
LIBS += -lQtZintd
@ -32,4 +32,3 @@ CONFIG(debug, debug|release) {
LIBS += -lQtZint
}
}
}

4
demo_r1/demo_r1.pro
View File

@ -67,8 +67,7 @@ CONFIG(debug, debug|release) {
}
message($$LIBS)
!contains(CONFIG, static_build){
contains(CONFIG,zint){
!CONFIG(static_build) : CONFIG(zint) {
LIBS += -L$${DEST_LIBS}
CONFIG(debug, debug|release) {
LIBS += -lQtZintd
@ -76,4 +75,3 @@ message($$LIBS)
LIBS += -lQtZint
}
}
}

2
demo_r1/main.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
demo_r1/mainwindow.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
demo_r1/mainwindow.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

4
demo_r2/demo_r2.pro
View File

@ -65,8 +65,7 @@ CONFIG(debug, debug|release) {
LIBS += -llimereport
}
!contains(CONFIG, static_build){
contains(CONFIG,zint){
!CONFIG(static_build) : CONFIG(zint) {
LIBS += -L$${DEST_LIBS}
CONFIG(debug, debug|release) {
LIBS += -lQtZintd
@ -74,4 +73,3 @@ CONFIG(debug, debug|release) {
LIBS += -lQtZint
}
}
}

7
designer/designer.pro
View File

@ -1,11 +1,12 @@
include(../common.pri)
QT += core gui
contains(CONFIG,release) {
CONFIG(release) {
TARGET = LRDesigner
} else {
TARGET = LRDesignerd
}
TEMPLATE = app
HEADERS += \
@ -56,12 +57,10 @@ CONFIG(debug, debug|release) {
LIBS += -llimereport
}
!contains(CONFIG, static_build){
contains(CONFIG,zint){
!CONFIG(static_build) : CONFIG(zint) {
CONFIG(debug, debug|release) {
LIBS += -L$${DEST_LIBS} -lQtZintd
} else {
LIBS += -L$${DEST_LIBS} -lQtZint
}
}
}

4
designer_plugin/designer_plugin.pro
View File

@ -4,7 +4,7 @@ include(../common.pri)
include(../limereport/limereport.pri)
include(../limereport/designer.pri)
contains(CONFIG,release) {
CONFIG(release) {
TARGET = designer_plugin
} else {
TARGET = designer_plugind
@ -33,7 +33,7 @@ unix {
}
contains(CONFIG,zint){
CONFIG(zint) {
message(zint)
INCLUDEPATH += $$ZINT_PATH/backend $$ZINT_PATH/backend_qt
DEPENDPATH += $$ZINT_PATH/backend $$ZINT_PATH/backend_qt

2
include/lrdatasourcemanagerintf.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
include/lrglobal.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
include/lrglobal.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
include/lrreportengine.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
include/lrscriptenginemanagerintf.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

20
limereport.pro
View File

@ -1,31 +1,23 @@
TEMPLATE = subdirs
!contains(CONFIG, no_zint){
CONFIG += zint
}
include(common.pri)
contains(CONFIG, zint){
CONFIG += ordered
CONFIG(zint) {
SUBDIRS += 3rdparty
}
export($$CONFIG)
CONFIG += ordered
SUBDIRS += \
limereport \
demo_r1 \
demo_r2 \
designer
greaterThan(QT_MAJOR_VERSION, 4){
greaterThan(QT_MINOR_VERSION, 1){
greaterThan(QT_MAJOR_VERSION, 4) : greaterThan(QT_MINOR_VERSION, 1) {
SUBDIRS += console
}
}
!contains(CONFIG, embedded_designer){
!contains(CONFIG, static_build){
!CONFIG(embedded_designer) : !CONFIG(static_build) {
SUBDIRS += designer_plugin
}
}

2
limereport/bands/lrdataband.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/bands/lrdataband.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/bands/lrgroupbands.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/bands/lrgroupbands.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/bands/lrpagefooter.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/bands/lrpagefooter.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/bands/lrpageheader.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/bands/lrpageheader.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/bands/lrreportfooter.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/bands/lrreportfooter.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/bands/lrreportheader.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/bands/lrreportheader.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/bands/lrsubdetailband.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/bands/lrsubdetailband.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/base/lrattribsabstractfactory.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/base/lrsimpleabstractfactory.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/base/lrsingleton.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/databrowser/lrconnectiondialog.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/databrowser/lrconnectiondialog.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/databrowser/lrdatabrowser.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/databrowser/lrdatabrowser.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/databrowser/lrdatabrowsertree.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/databrowser/lrdatabrowsertree.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/databrowser/lrsqleditdialog.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/databrowser/lrsqleditdialog.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/databrowser/lrvariabledialog.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/databrowser/lrvariabledialog.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

5
limereport/designer.pri
View File

@ -1,7 +1,8 @@
include(../common.pri)
DEFINES += HAVE_REPORT_DESIGNER
contains(CONFIG,dialogdesigner){
CONFIG(dialogdesigner) {
include($$REPORT_PATH/dialogdesigner/dialogdesigner.pri)
}
@ -51,7 +52,7 @@ SOURCES += \
$$REPORT_PATH/lrreportdesignwidget.cpp \
$$REPORT_PATH/lrreportdesignwindow.cpp
contains(CONFIG, svg){
CONFIG(svg) {
SOURCES += \
$$REPORT_PATH/objectinspector/editors/lrsvgeditor.cpp \
$$REPORT_PATH/objectinspector/propertyItems/lrsvgpropitem.cpp

12
limereport/dialogdesigner/dialogdesigner.pri
View File

@ -1,20 +1,18 @@
include(../../common.pri)
include($$PWD/3rdparty/qtcreator/designerintegrationv2/designerintegration.pri)
INCLUDEPATH *= $$PWD/3rdparty/designer
greaterThan(QT_MAJOR_VERSION, 4) {
contains(QT,uitools){
greaterThan(QT_MAJOR_VERSION, 4) : contains(QT, uitools) {
DEFINES += HAVE_QTDESIGNER_INTEGRATION
}
}
lessThan(QT_MAJOR_VERSION, 5){
contains(CONFIG,uitools){
lessThan(QT_MAJOR_VERSION, 5) : CONFIG(uitools) {
DEFINES += HAVE_QTDESIGNER_INTEGRATION
}
}
greaterThan(QT_MAJOR_VERSION, 4) {
QT *= designer designercomponents-private
} else {
CONFIG *= designer
qtAddLibrary(QtDesignerComponents)

2
limereport/items/editors/lrfonteditorwidget.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/items/editors/lrfonteditorwidget.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/items/editors/lritemeditorwidget.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/items/editors/lritemeditorwidget.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/items/editors/lritemsaligneditorwidget.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/items/editors/lritemsaligneditorwidget.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/items/editors/lritemsborderseditorwidget.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/items/editors/lritemsborderseditorwidget.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/items/editors/lrtextalignmenteditorwidget.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/items/editors/lrtextalignmenteditorwidget.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/items/lralignpropitem.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/items/lralignpropitem.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/items/lrbarcodeitem.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/items/lrbarcodeitem.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/items/lrhorizontallayout.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/items/lrhorizontallayout.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/items/lrimageitem.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/items/lrimageitem.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/items/lrshapeitem.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/items/lrshapeitem.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/items/lrsimpletagparser.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/items/lrsimpletagparser.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/items/lrsubitemparentpropitem.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/items/lrsubitemparentpropitem.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/items/lrtextitem.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/items/lrtextitem.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/items/lrtextitemeditor.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/items/lrtextitemeditor.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

14
limereport/limereport.pri
View File

@ -76,16 +76,15 @@ SOURCES += \
$$REPORT_PATH/exporters/lrpdfexporter.cpp \
$$REPORT_PATH/lrpreparedpages.cpp
contains(CONFIG, staticlib){
CONFIG(staticlib) {
SOURCES += $$REPORT_PATH/lrfactoryinitializer.cpp
}
contains(CONFIG, zint){
CONFIG(zint) {
SOURCES += $$REPORT_PATH/items/lrbarcodeitem.cpp
}
contains(CONFIG, svg){
CONFIG(svg) {
SOURCES += $$REPORT_PATH/items/lrsvgitem.cpp \
}
@ -171,15 +170,15 @@ HEADERS += \
$$REPORT_PATH/lrpreparedpages.h \
$$REPORT_PATH/lrpreparedpagesintf.h
contains(CONFIG, staticlib){
CONFIG(staticlib) {
HEADERS += $$REPORT_PATH/lrfactoryinitializer.h
}
contains(CONFIG,zint){
CONFIG(zint) {
HEADERS += $$REPORT_PATH/items/lrbarcodeitem.h
}
contains(CONFIG, svg){
CONFIG(svg) {
HEADERS += $$REPORT_PATH/items/lrsvgitem.h
}
@ -196,4 +195,3 @@ FORMS += \
RESOURCES += \
$$REPORT_PATH/report.qrc \
$$REPORT_PATH/items/items.qrc

12
limereport/limereport.pro
View File

@ -6,11 +6,11 @@ CONFIG(debug, debug|release){
TEMPLATE = lib
contains(CONFIG, static_build){
CONFIG(static_build) {
CONFIG += staticlib
}
!contains(CONFIG, staticlib){
!CONFIG(staticlib) {
CONFIG += lib
CONFIG += dll
}
@ -26,7 +26,7 @@ macx{
DEFINES += LIMEREPORT_EXPORTS
contains(CONFIG, staticlib){
CONFIG(staticlib) {
DEFINES += HAVE_STATIC_BUILD
DEFINES += QZINT_STATIC_BUILD
message(STATIC_BUILD)
@ -85,7 +85,7 @@ win32 {
}
}
contains(CONFIG,zint){
CONFIG(zint) {
message(zint)
INCLUDEPATH += $$ZINT_PATH/backend $$ZINT_PATH/backend_qt
DEPENDPATH += $$ZINT_PATH/backend $$ZINT_PATH/backend_qt
@ -112,7 +112,7 @@ INSTALLS += target
####Automatically build required translation files (*.qm)
contains(CONFIG,build_translations){
CONFIG(build_translations) {
LANGUAGES = ru es ar fr zh pl
defineReplace(prependAll) {
@ -139,5 +139,3 @@ contains(CONFIG,build_translations){
}
#### EN AUTOMATIC TRANSLATIONS

2
limereport/lraboutdialog.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/lraboutdialog.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/lraboutdialog.ui
View File

@ -42,7 +42,7 @@ p, li { white-space: pre-wrap; }
<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt; text-decoration: underline; color:#0000ff;"><br /></p>
<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; font-weight:600;">This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.</span></p>
<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt; font-weight:600; color:#000000;"><br /></p>
&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Copyright 2015 Arin Alexander. All rights reserved.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Copyright 2021 Arin Alexander. All rights reserved.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>

2
limereport/lrbanddesignintf.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/lrbanddesignintf.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/lrbandsmanager.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/lrbandsmanager.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/lrbasedesignintf.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/lrbasedesignintf.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/lrcollection.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/lrdatadesignintf.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/lrdatadesignintf.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/lrdatasourcemanager.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/lrdatasourcemanager.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/lrdatasourcemanagerintf.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/lrdesignelementsfactory.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/lrglobal.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/lrglobal.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/lrgroupfunctions.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/lrgroupfunctions.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/lritemdesignintf.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/lritemdesignintf.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/lrpagedesignintf.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

2
limereport/lrpagedesignintf.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
* This file is part of the Lime Report project *
* Copyright (C) 2015 by Alexander Arin *
* Copyright (C) 2021 by Alexander Arin *
* arin_a@bk.ru *
* *
** GNU General Public License Usage **

Some files were not shown because too many files have changed in this diff Show More