diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..141d09c --- /dev/null +++ b/.travis.yml @@ -0,0 +1,26 @@ +language: cpp + +compiler: + - gcc + +sudo: required +dist: trusty + +env: + - QT_BASE=56 + +before_install: + - if [ "$QT_BASE" = "56" ]; then sudo add-apt-repository ppa:beineri/opt-qt56-trusty -y; fi + - sudo apt-get update -qq + +install: + - if [ "$QT_BASE" = "56" ]; then sudo apt-get install -qq qt56base qt56script qt56tools ; source /opt/qt56/bin/qt56-env.sh; fi + + +script: + - qmake -r + - make + - make check + +notifications: + email: false diff --git a/README.md b/README.md index fb970a0..718878e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,9 @@ -# LimeReport v1.3.10 +LimeReport v1.3.10 [![Build Status](https://travis-ci.org/newsages/LimeReport.svg?branch=master)](https://travis-ci.org/newsages/LimeReport) +----------- +----------- + + + ##Features * Multi-platform support * Pure Qt4/Qt5 compatible code @@ -16,6 +21,7 @@ * A Smart band split moving data to the next page * PDF output + ##How to use it 1. Build limereport.pro. It will create a limereport shared library 2. In your project connect the limereport library then in source code add: diff --git a/translations/limereport_es_ES.ts b/translations/limereport_es_ES.ts index 702d834..cbf4d19 100644 --- a/translations/limereport_es_ES.ts +++ b/translations/limereport_es_ES.ts @@ -649,6 +649,21 @@ p, li { white-space: pre-wrap; } + + LimeReport::PreviewReportWidget + + Form + + + + PDF file name + + + + Report file name + + + LimeReport::PreviewReportWindow @@ -731,14 +746,6 @@ p, li { white-space: pre-wrap; } of %1 - - Report file name - - - - PDF file name - - LimeReport::ProxyHolder diff --git a/translations/limereport_ru.qm b/translations/limereport_ru.qm index 1f378b9..c1d4046 100644 Binary files a/translations/limereport_ru.qm and b/translations/limereport_ru.qm differ diff --git a/translations/limereport_ru.ts b/translations/limereport_ru.ts index 31ecc0a..0a3886f 100644 --- a/translations/limereport_ru.ts +++ b/translations/limereport_ru.ts @@ -800,6 +800,21 @@ p, li { white-space: pre-wrap; } Верхний колонтитул + + LimeReport::PreviewReportWidget + + Form + + + + PDF file name + Имя PDF файла + + + Report file name + Файл отчета + + LimeReport::PreviewReportWindow @@ -876,11 +891,11 @@ p, li { white-space: pre-wrap; } Report file name - Файл отчета + Файл отчета PDF file name - Имя PDF файла + Имя PDF файла Preview