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

Merge pull request #8 from fralx/master

Browse Source 
update fork
This commit is contained in:
newsages 2016-03-31 14:31:50 +02:00
commit d63ff0403b
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
3rdparty/zint-2.4.4/backend_qt4/Zint.pro vendored
View File

@ -8,7 +8,6 @@ include(../../../common.pri)
macx{ macx{
CONFIG -= dll CONFIG -= dll
CONFIG += lib_bundle CONFIG += lib_bundle
CONFIG += plugin
} }
unix{ unix{

6
demo_r1/demo_r1.pro
View File

@ -30,19 +30,20 @@ EXTRA_DIR += $$PWD/demo_reports/*
DEST_DIR = $${BUILD_DIR}/$${BUILD_TYPE}/demo DEST_DIR = $${BUILD_DIR}/$${BUILD_TYPE}/demo
REPORTS_DIR = $${DEST_DIR}/demo_reports REPORTS_DIR = $${DEST_DIR}/demo_reports
unix{ unix:{
LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -llimereport LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -llimereport
contains(CONFIG,zint){ contains(CONFIG,zint){
LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -lQtZint LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -lQtZint
} }
DESTDIR = $$DEST_DIR DESTDIR = $$DEST_DIR
QMAKE_POST_LINK += mkdir -p $$quote($$REPORTS_DIR) | $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\n\t) QMAKE_POST_LINK += mkdir -p $$quote($$REPORTS_DIR) | $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\n\t)
!macx{
#Link share lib to ../lib rpath #Link share lib to ../lib rpath
QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN
QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/lib QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/lib
QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/../lib QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/../lib
QMAKE_LFLAGS_RPATH += #. .. ./libs QMAKE_LFLAGS_RPATH += #. .. ./libs
}
target.path = $${DEST_DIR} target.path = $${DEST_DIR}
INSTALLS = target INSTALLS = target
} }
@ -58,4 +59,3 @@ win32 {
QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\\n\\t) QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\\n\\t)
LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -llimereport LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -llimereport
} }

9
include/lrpreviewreportwidget.h
View File

@ -22,11 +22,8 @@ class LIMEREPORT_EXPORT PreviewReportWidget : public QWidget
public: public:
explicit PreviewReportWidget(ReportEnginePrivate *report, QWidget *parent = 0); explicit PreviewReportWidget(ReportEnginePrivate *report, QWidget *parent = 0);
~PreviewReportWidget(); ~PreviewReportWidget();
void initPreview();
void setErrorsMesagesVisible(bool visible);
void setErrorMessages(const QStringList &value);
void refreshPages();
public slots: public slots:
void refreshPages();
void slotZoomIn(); void slotZoomIn();
void slotZoomOut(); void slotZoomOut();
@ -44,6 +41,10 @@ signals:
private slots: private slots:
void slotSliderMoved(int value); void slotSliderMoved(int value);
void reportEngineDestroyed(QObject* object); void reportEngineDestroyed(QObject* object);
private:
void initPreview();
void setErrorsMesagesVisible(bool visible);
void setErrorMessages(const QStringList &value);
private: private:
Ui::PreviewReportWidget *ui; Ui::PreviewReportWidget *ui;
PreviewReportWidgetPrivate* d_ptr; PreviewReportWidgetPrivate* d_ptr;

12
limereport/limereport.pro
View File

@ -9,6 +9,7 @@ CONFIG += link_prl
macx{ macx{
CONFIG -= dll CONFIG -= dll
CONFIG += lib_bundle CONFIG += lib_bundle
CONFIG += plugin
} }
DEFINES += LIMEREPORT_EXPORTS DEFINES += LIMEREPORT_EXPORTS
@ -19,17 +20,20 @@ EXTRA_FILES += \
$$PWD/lrdatasourcemanagerintf.h \ $$PWD/lrdatasourcemanagerintf.h \
$$PWD/lrreportengine.h \ $$PWD/lrreportengine.h \
$$PWD/lrscriptenginemanagerintf.h \ $$PWD/lrscriptenginemanagerintf.h \
$$PWD/lrcallbackdatasourceintf.h $$PWD/lrcallbackdatasourceintf.h \
$$PWD/lrpreviewreportwidget.h
include(limereport.pri) include(limereport.pri)
unix { unix {
DESTDIR = $${BUILD_DIR}/$${BUILD_TYPE}/lib DESTDIR = $${BUILD_DIR}/$${BUILD_TYPE}/lib
QMAKE_POST_LINK += mkdir -p $$quote($${DESTDIR}/include) $$escape_expand(\\n\\t) # qmake need make mkdir -p on subdirs more than root/
for(FILE,EXTRA_FILES){ for(FILE,EXTRA_FILES){
QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($${DESTDIR}/include) $$escape_expand(\\n\\t) # inside of libs make /include/files QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($${DEST_INCLUDE_DIR}) $$escape_expand(\\n\\t)
} }
QMAKE_POST_LINK += $(COPY_DIR) $$quote($${DEST_INCLUDE_DIR}*) $$quote($${DESTDIR}/include) #copy includes to /lib/include macx{
QMAKE_POST_LINK += mkdir -p $$quote($${DESTDIR}/include) $$escape_expand(\\n\\t)
}
QMAKE_POST_LINK += $(COPY_DIR) $$quote($${DEST_INCLUDE_DIR}*) $$quote($${DESTDIR}/include/)
} }
win32 { win32 {