From 3999dc00bd6ba58046902c46487e73ebda4a61e9 Mon Sep 17 00:00:00 2001
From: Arin Alexander <arin_a@bk.ru>
Date: Tue, 30 Jul 2019 14:09:09 +0300
Subject: [PATCH 01/13] Static build has been fixed

---
 3rdparty/zint-2.6.1/backend_qt/backend_qt.pro | 3 ++-
 3rdparty/zint-2.6.1/backend_qt/qzint_global.h | 4 ++++
 common.pri                                    | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/3rdparty/zint-2.6.1/backend_qt/backend_qt.pro b/3rdparty/zint-2.6.1/backend_qt/backend_qt.pro
index 63eadfd..2af6b7d 100644
--- a/3rdparty/zint-2.6.1/backend_qt/backend_qt.pro
+++ b/3rdparty/zint-2.6.1/backend_qt/backend_qt.pro
@@ -66,7 +66,8 @@ HEADERS +=  $$PWD/../backend/aztec.h \
             $$PWD/../backend/sjis.h \
             $$PWD/../backend/stdint_msvc.h \
             $$PWD/../backend/zint.h \
-            $$PWD/qzint.h
+            $$PWD/qzint.h \
+            $$PWD/qzint_global.h
 
 SOURCES += $$PWD/../backend/2of5.c \
            $$PWD/../backend/auspost.c \
diff --git a/3rdparty/zint-2.6.1/backend_qt/qzint_global.h b/3rdparty/zint-2.6.1/backend_qt/qzint_global.h
index 025b16e..ea46fe2 100644
--- a/3rdparty/zint-2.6.1/backend_qt/qzint_global.h
+++ b/3rdparty/zint-2.6.1/backend_qt/qzint_global.h
@@ -3,10 +3,14 @@
 
 #include <QtCore/qglobal.h>
 
+#ifdef HAVE_STATIC_BUILD
+#  define QZINTSHARED_EXPORT /**/
+#else
 #if defined(QZINT_LIBRARY)
 #  define QZINTSHARED_EXPORT Q_DECL_EXPORT
 #else
 #  define QZINTSHARED_EXPORT Q_DECL_IMPORT
 #endif
+#endif
 
 #endif // QZINT_GLOBAL_H
diff --git a/common.pri b/common.pri
index 367a666..3dcb931 100644
--- a/common.pri
+++ b/common.pri
@@ -127,7 +127,7 @@ RCC_DIR        = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
 
 LIMEREPORT_VERSION_MAJOR = 1
 LIMEREPORT_VERSION_MINOR = 5
-LIMEREPORT_VERSION_RELEASE = 4
+LIMEREPORT_VERSION_RELEASE = 5
 
 LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
 DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"

From 09e95cd63351f7f0138ecd7e542bcac1967f105a Mon Sep 17 00:00:00 2001
From: Arin Alexander <arin_a@bk.ru>
Date: Wed, 31 Jul 2019 00:28:45 +0300
Subject: [PATCH 02/13] Drawing of report items borders has been fixed

---
 common.pri                      |  2 +-
 limereport/lrbanddesignintf.cpp | 23 +++++++++++++++--------
 limereport/lrbanddesignintf.h   |  6 +++---
 limereport/lrbasedesignintf.cpp |  4 +++-
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/common.pri b/common.pri
index 3dcb931..e76450d 100644
--- a/common.pri
+++ b/common.pri
@@ -127,7 +127,7 @@ RCC_DIR        = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
 
 LIMEREPORT_VERSION_MAJOR = 1
 LIMEREPORT_VERSION_MINOR = 5
-LIMEREPORT_VERSION_RELEASE = 5
+LIMEREPORT_VERSION_RELEASE = 6
 
 LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
 DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"
diff --git a/limereport/lrbanddesignintf.cpp b/limereport/lrbanddesignintf.cpp
index caac574..d8a6bbb 100644
--- a/limereport/lrbanddesignintf.cpp
+++ b/limereport/lrbanddesignintf.cpp
@@ -356,7 +356,7 @@ void BandDesignIntf::setDataSourceName(const QString &datasource){
     m_dataSourceName=datasource;
 }
 
-void BandDesignIntf::setKeepBottomSpaceOption(bool value){
+void BandDesignIntf::setKeepBottomSpace(bool value){
     if (m_keepBottomSpace!=value){
         m_keepBottomSpace=value;
         if (!isLoading())
@@ -584,7 +584,11 @@ void BandDesignIntf::preparePopUpMenu(QMenu &menu)
 
     currAction = menu.addAction(tr("Keep bottom space"));
     currAction->setCheckable(true);
-    currAction->setChecked(keepBottomSpaceOption());
+    currAction->setChecked(keepBottomSpace());
+
+    currAction = menu.addAction(tr("Keep top space"));
+    currAction->setCheckable(true);
+    currAction->setChecked(keepTopSpace());
 
     currAction = menu.addAction(tr("Print if empty"));
     currAction->setCheckable(true);
@@ -603,6 +607,9 @@ void BandDesignIntf::processPopUpAction(QAction *action)
     if (action->text().compare(tr("Keep bottom space")) == 0){
         setProperty("keepBottomSpace",action->isChecked());
     }
+    if (action->text().compare(tr("Keep top space")) == 0){
+        setProperty("keepTopSpace",action->isChecked());
+    }
 
     if (action->text().compare(tr("Print if empty")) == 0){
         setProperty("printIfEmpty",action->isChecked());
@@ -1090,10 +1097,10 @@ void BandDesignIntf::setKeepFooterTogether(bool value)
 
 void BandDesignIntf::updateItemSize(DataSourceManager* dataManager, RenderPass pass, int maxHeight)
 {
-    qreal spaceBorder=0;
-    if (keepBottomSpaceOption()) spaceBorder = bottomSpace();
+    qreal spaceBorder = 0;
+    if (keepBottomSpace()) spaceBorder = bottomSpace();
     spaceBorder = spaceBorder > 0 ? spaceBorder : 0;
-    if (borderLines()!=0){
+    if (borderLines() != 0){
         spaceBorder += borderLineSize();
     }
 
@@ -1105,14 +1112,14 @@ void BandDesignIntf::updateItemSize(DataSourceManager* dataManager, RenderPass p
     arrangeSubItems(pass, dataManager); 
     if (autoHeight()){
         if (!keepTopSpace()) {
-            qreal minTop = findMinTop();
+            qreal minTop = findMinTop() - spaceBorder;
             foreach (BaseDesignIntf* item, childBaseItems()) {
                 item->setY(item->y() - minTop);
             }
         }
-        setHeight(findMaxBottom()+spaceBorder);
+        setHeight(findMaxBottom() + spaceBorder);
     }
-    if ((maxHeight>0)&&(height()>maxHeight)){
+    if ((maxHeight > 0) && (height() > maxHeight)){
         trimToMaxHeight(maxHeight);
         setHeight(maxHeight);
     }
diff --git a/limereport/lrbanddesignintf.h b/limereport/lrbanddesignintf.h
index a6e09be..3f4f5f7 100644
--- a/limereport/lrbanddesignintf.h
+++ b/limereport/lrbanddesignintf.h
@@ -105,7 +105,7 @@ class BandDesignIntf : public ItemsContainerDesignInft
     Q_OBJECT
     Q_PROPERTY(bool autoHeight READ autoHeight WRITE setAutoHeight )
     Q_PROPERTY(int bandIndex READ bandIndex WRITE setBandIndex DESIGNABLE false )
-    Q_PROPERTY(bool keepBottomSpace READ keepBottomSpaceOption WRITE setKeepBottomSpaceOption )
+    Q_PROPERTY(bool keepBottomSpace READ keepBottomSpace WRITE setKeepBottomSpace )
     Q_PROPERTY(bool keepTopSpace READ keepTopSpace WRITE setKeepTopSpace)
     Q_PROPERTY(QString parentBand READ parentBandName WRITE setParentBandName DESIGNABLE false )
     Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor)
@@ -162,8 +162,8 @@ public:
     QString datasourceName();
     void setDataSourceName(const QString& datasourceName);
 
-    void setKeepBottomSpaceOption(bool value);
-    bool keepBottomSpaceOption() const {return m_keepBottomSpace;}
+    void setKeepBottomSpace(bool value);
+    bool keepBottomSpace() const {return m_keepBottomSpace;}
 
     bool keepTopSpace() const;
     void setKeepTopSpace(bool value);
diff --git a/limereport/lrbasedesignintf.cpp b/limereport/lrbasedesignintf.cpp
index 71f2f94..1555aaf 100644
--- a/limereport/lrbasedesignintf.cpp
+++ b/limereport/lrbasedesignintf.cpp
@@ -97,7 +97,9 @@ BaseDesignIntf::BaseDesignIntf(const QString &storageTypeName, QObject *owner, Q
 
 QRectF BaseDesignIntf::boundingRect() const
 {
-    return rect();
+    qreal halfpw = pen().widthF() / 2;
+            halfpw += 2;
+    return rect().adjusted(-halfpw, -halfpw, halfpw, halfpw);
 }
 
 BaseDesignIntf::~BaseDesignIntf(void) {

From afa4bcb9bf95700129e0062e0d4cb62572a4b067 Mon Sep 17 00:00:00 2001
From: Arin Alexander <arin_a@bk.ru>
Date: Wed, 7 Aug 2019 12:40:42 +0300
Subject: [PATCH 03/13] If resourcePath contains a simple path to an image
 file, that image will be shown in design mode.

---
 limereport/items/lrimageitem.cpp | 15 +++++++++++++++
 limereport/items/lrimageitem.h   |  4 ++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/limereport/items/lrimageitem.cpp b/limereport/items/lrimageitem.cpp
index c3fce2f..9952479 100644
--- a/limereport/items/lrimageitem.cpp
+++ b/limereport/items/lrimageitem.cpp
@@ -340,6 +340,21 @@ void ImageItem::setImage(QImage value)
     }
 }
 
+QImage ImageItem::image(){
+    if (m_picture.isNull() && !resourcePath().isEmpty() && itemMode() == DesignMode){
+        QFileInfo fileInfo(m_resourcePath);
+        if (fileInfo.exists()){
+            return  QImage(m_resourcePath);
+        }
+    }
+    return m_picture;
+}
+
+void ImageItem::setResourcePath(const QString &value){
+    m_resourcePath=value;
+    update();
+}
+
 ImageItem::Format ImageItem::format() const
 {
     return m_format;
diff --git a/limereport/items/lrimageitem.h b/limereport/items/lrimageitem.h
index 5d474e2..8eb7da7 100644
--- a/limereport/items/lrimageitem.h
+++ b/limereport/items/lrimageitem.h
@@ -61,8 +61,8 @@ public:
     ImageItem(QObject *owner, QGraphicsItem *parent);
     virtual void paint(QPainter *ppainter, const QStyleOptionGraphicsItem *option, QWidget *widget);
     void setImage(QImage value);
-    QImage image(){return m_picture;}
-    void setResourcePath(const QString &value){m_resourcePath=value;}
+    QImage image();
+    void setResourcePath(const QString &value);
     QString resourcePath() const;
     QString datasource() const;
     void setDatasource(const QString &datasource);

From 4556e3bc78fb85705cbe841e1b4b408331c411d3 Mon Sep 17 00:00:00 2001
From: Arin Alexander <arin_a@bk.ru>
Date: Wed, 7 Aug 2019 21:06:47 +0300
Subject: [PATCH 04/13] Image editor has been added

---
 common.pri                             |   2 +-
 limereport/items/lrimageitem.cpp       |  59 ++++++---
 limereport/items/lrimageitem.h         |   5 +-
 limereport/items/lrimageitemeditor.cpp |  70 ++++++++++
 limereport/items/lrimageitemeditor.h   |  37 ++++++
 limereport/items/lrimageitemeditor.ui  | 170 +++++++++++++++++++++++++
 limereport/limereport.pri              |   3 +
 7 files changed, 328 insertions(+), 18 deletions(-)
 create mode 100644 limereport/items/lrimageitemeditor.cpp
 create mode 100644 limereport/items/lrimageitemeditor.h
 create mode 100644 limereport/items/lrimageitemeditor.ui

diff --git a/common.pri b/common.pri
index e76450d..cbe3fc1 100644
--- a/common.pri
+++ b/common.pri
@@ -127,7 +127,7 @@ RCC_DIR        = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
 
 LIMEREPORT_VERSION_MAJOR = 1
 LIMEREPORT_VERSION_MINOR = 5
-LIMEREPORT_VERSION_RELEASE = 6
+LIMEREPORT_VERSION_RELEASE = 7
 
 LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
 DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"
diff --git a/limereport/items/lrimageitem.cpp b/limereport/items/lrimageitem.cpp
index 9952479..76542d3 100644
--- a/limereport/items/lrimageitem.cpp
+++ b/limereport/items/lrimageitem.cpp
@@ -32,6 +32,7 @@
 #include "lrglobal.h"
 #include "lrdatasourcemanager.h"
 #include "lrpagedesignintf.h"
+#include "lrimageitemeditor.h"
 
 namespace{
 
@@ -83,9 +84,15 @@ void ImageItem::loadPictureFromVariant(QVariant& data){
 
 void ImageItem::preparePopUpMenu(QMenu &menu)
 {
+    QAction* editAction = menu.addAction(QIcon(":/report/images/edit_pecil2.png"),tr("Edit"));
+    menu.insertAction(menu.actions().at(0),editAction);
+    menu.insertSeparator(menu.actions().at(1));
+
+    menu.addSeparator();
     QAction* action = menu.addAction(tr("Watermark"));
     action->setCheckable(true);
     action->setChecked(isWatermark());
+
 }
 
 void ImageItem::processPopUpAction(QAction *action)
@@ -93,9 +100,26 @@ void ImageItem::processPopUpAction(QAction *action)
     if (action->text().compare(tr("Watermark")) == 0){
         page()->setPropertyToSelectedItems("watermark",action->isChecked());
     }
+    if (action->text().compare(tr("Edit")) == 0){
+        this->showEditorDialog();
+    }
     ItemDesignIntf::processPopUpAction(action);
 }
 
+QImage getFileByResourcePath(QString resourcePath){
+    QFileInfo resourceFile(resourcePath);
+    if (resourceFile.exists())
+        return QImage(resourcePath);
+    return QImage();
+}
+
+QImage ImageItem::drawImage()
+{
+    if (image().isNull())
+        return getFileByResourcePath(m_resourcePath);
+    return image();
+}
+
 bool ImageItem::useExternalPainter() const
 {
     return m_useExternalPainter;
@@ -110,6 +134,13 @@ void ImageItem::setUseExternalPainter(bool value)
     }
 }
 
+QWidget *ImageItem::defaultEditor()
+{
+    ImageItemEditor* editor = new ImageItemEditor(this);
+    editor->setAttribute(Qt::WA_DeleteOnClose);
+    return editor;
+}
+
 void ImageItem::updateItemSize(DataSourceManager* dataManager, RenderPass pass, int maxHeight)
 {
 
@@ -220,8 +251,8 @@ void ImageItem::setAutoSize(bool autoSize)
     if (m_autoSize != autoSize){
         m_autoSize = autoSize;
         if (m_autoSize && !m_picture.isNull()){
-            setWidth(image().width());
-            setHeight(image().height());
+            setWidth(drawImage().width());
+            setHeight(drawImage().height());
             setPossibleResizeDirectionFlags(Fixed);
         } else {
             setPossibleResizeDirectionFlags(AllDirections);
@@ -271,10 +302,10 @@ void ImageItem::paint(QPainter *ppainter, const QStyleOptionGraphicsItem *option
     QPointF point = rect().topLeft();
     QImage img;
 
-    if (m_scale && !image().isNull()){
-        img = image().scaled(rect().width(), rect().height(), keepAspectRatio() ? Qt::KeepAspectRatio : Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+    if (m_scale && !drawImage().isNull()){
+        img = drawImage().scaled(rect().width(), rect().height(), keepAspectRatio() ? Qt::KeepAspectRatio : Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
     } else {
-        img = image();
+        img = drawImage();
     }
 
     qreal shiftHeight = rect().height() - img.height();
@@ -328,9 +359,9 @@ void ImageItem::paint(QPainter *ppainter, const QStyleOptionGraphicsItem *option
 
 void ImageItem::setImage(QImage value)
 {
-    if (m_picture!=value){
+    if (m_picture != value){
         QImage oldValue = m_picture;
-        m_picture=value;
+        m_picture = value;
         if (m_autoSize){
             setWidth(m_picture.width());
             setHeight(m_picture.height());
@@ -341,18 +372,16 @@ void ImageItem::setImage(QImage value)
 }
 
 QImage ImageItem::image(){
-    if (m_picture.isNull() && !resourcePath().isEmpty() && itemMode() == DesignMode){
-        QFileInfo fileInfo(m_resourcePath);
-        if (fileInfo.exists()){
-            return  QImage(m_resourcePath);
-        }
-    }
     return m_picture;
 }
 
 void ImageItem::setResourcePath(const QString &value){
-    m_resourcePath=value;
-    update();
+    if (m_resourcePath != value){
+        QString oldValue = m_resourcePath;
+        m_resourcePath = value;
+        update();
+        notify("resourcePath", oldValue, value);
+    }
 }
 
 ImageItem::Format ImageItem::format() const
diff --git a/limereport/items/lrimageitem.h b/limereport/items/lrimageitem.h
index 8eb7da7..587d39d 100644
--- a/limereport/items/lrimageitem.h
+++ b/limereport/items/lrimageitem.h
@@ -89,6 +89,7 @@ public:
     bool useExternalPainter() const;
     void setUseExternalPainter(bool value);
 
+    QWidget* defaultEditor();
 protected:
     BaseDesignIntf* createSameTypeItem(QObject *owner, QGraphicsItem *parent);
     void updateItemSize(DataSourceManager *dataManager, RenderPass pass, int maxHeight);
@@ -97,6 +98,7 @@ protected:
     void loadPictureFromVariant(QVariant& data);
     void preparePopUpMenu(QMenu &menu);
     void processPopUpAction(QAction *action);
+    QImage drawImage();
 private:
     QImage  m_picture;
     bool m_useExternalPainter;
@@ -109,8 +111,7 @@ private:
     bool    m_keepAspectRatio;
     bool    m_center;
     Format  m_format;
-    QString m_variable;
-
+    QString m_variable;    
 };
 
 }
diff --git a/limereport/items/lrimageitemeditor.cpp b/limereport/items/lrimageitemeditor.cpp
new file mode 100644
index 0000000..9e34df9
--- /dev/null
+++ b/limereport/items/lrimageitemeditor.cpp
@@ -0,0 +1,70 @@
+#include "lrimageitemeditor.h"
+#include "ui_lrimageitemeditor.h"
+#include "lrimageitem.h"
+
+#include <QFileInfo>
+#include <QFileDialog>
+
+ImageItemEditor::ImageItemEditor(LimeReport::ImageItem *item, QWidget *parent) :
+    QWidget(parent),
+    ui(new Ui::ImageItemEditor), m_item(item)
+{
+    ui->setupUi(this);
+    m_image = QPixmap::fromImage(m_item->image());
+    ui->resourcePath->setText(m_item->resourcePath());
+    updateImage();
+}
+
+ImageItemEditor::~ImageItemEditor()
+{
+    delete ui;
+}
+
+void ImageItemEditor::updateImage()
+{
+    ui->imageViewer->setPixmap(m_image);
+    if (m_image.isNull() && !ui->resourcePath->text().isEmpty()){
+        if (m_resourcePathImage.isNull())
+            m_resourcePathImage = QPixmap(ui->resourcePath->text());
+        ui->imageViewer->setPixmap(m_resourcePathImage);
+    }
+}
+
+void ImageItemEditor::on_tbLoadImage_clicked()
+{
+    QString fileName = QFileDialog::getOpenFileName(this, tr("Select image file"));
+    m_image = QPixmap(fileName);
+    updateImage();
+}
+
+void ImageItemEditor::on_tbClearImage_clicked()
+{
+    m_image = QPixmap();
+    updateImage();
+}
+
+void ImageItemEditor::on_buttonBox_accepted()
+{
+    m_item->setImage(m_image.toImage());
+    m_item->setResourcePath(ui->resourcePath->text());
+    this->close();
+}
+
+void ImageItemEditor::on_buttonBox_rejected()
+{
+    this->close();
+}
+
+void ImageItemEditor::on_toolButton_clicked()
+{
+    ui->resourcePath->setText(QFileDialog::getOpenFileName(this, tr("Select image file")));
+    m_resourcePathImage = QPixmap(ui->resourcePath->text());
+    if (!m_resourcePathImage.isNull() && m_image.isNull())
+        ui->imageViewer->setPixmap(m_resourcePathImage);
+}
+
+void ImageItemEditor::on_tbResourcePath_clicked()
+{
+    ui->resourcePath->setText("");
+    updateImage();
+}
diff --git a/limereport/items/lrimageitemeditor.h b/limereport/items/lrimageitemeditor.h
new file mode 100644
index 0000000..a8cc474
--- /dev/null
+++ b/limereport/items/lrimageitemeditor.h
@@ -0,0 +1,37 @@
+#ifndef LRIMAGEITEMEDITOR_H
+#define LRIMAGEITEMEDITOR_H
+
+#include <QWidget>
+
+namespace Ui {
+class ImageItemEditor;
+}
+
+namespace LimeReport {
+class ImageItem;
+}
+
+class ImageItemEditor : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit ImageItemEditor(LimeReport::ImageItem* item, QWidget *parent = nullptr);
+    ~ImageItemEditor();
+private:
+    void updateImage();
+private:
+    Ui::ImageItemEditor *ui;
+    LimeReport::ImageItem* m_item;
+    QPixmap m_image;
+    QPixmap m_resourcePathImage;
+private slots:
+    void on_tbLoadImage_clicked();
+    void on_tbClearImage_clicked();
+    void on_buttonBox_accepted();
+    void on_buttonBox_rejected();
+    void on_toolButton_clicked();
+    void on_tbResourcePath_clicked();
+};
+
+#endif // LRIMAGEITEMEDITOR_H
diff --git a/limereport/items/lrimageitemeditor.ui b/limereport/items/lrimageitemeditor.ui
new file mode 100644
index 0000000..12152d4
--- /dev/null
+++ b/limereport/items/lrimageitemeditor.ui
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ImageItemEditor</class>
+ <widget class="QWidget" name="ImageItemEditor">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>358</width>
+    <height>403</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Ignored" vsizetype="Ignored">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string>Image Item Editor</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="items.qrc">
+    <normaloff>:/items/images/imageItem3.png</normaloff>:/items/images/imageItem3.png</iconset>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item>
+    <widget class="QGroupBox" name="groupBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title">
+      <string>Image</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="QToolButton" name="tbLoadImage">
+          <property name="text">
+           <string>...</string>
+          </property>
+          <property name="icon">
+           <iconset resource="../report.qrc">
+            <normaloff>:/report/images/folder</normaloff>:/report/images/folder</iconset>
+          </property>
+          <property name="autoRaise">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QToolButton" name="tbClearImage">
+          <property name="text">
+           <string>...</string>
+          </property>
+          <property name="icon">
+           <iconset resource="../objectinspector/lobjectinspector.qrc">
+            <normaloff>:/items/clear.png</normaloff>:/items/clear.png</iconset>
+          </property>
+          <property name="autoRaise">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <widget class="QLabel" name="imageViewer">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="pixmap">
+         <pixmap resource="../../demo_r2/demo_r2.qrc">:/images/images/logo.png</pixmap>
+        </property>
+        <property name="scaledContents">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>Resource path</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="resourcePath"/>
+     </item>
+     <item>
+      <widget class="QToolButton" name="toolButton">
+       <property name="text">
+        <string>...</string>
+       </property>
+       <property name="icon">
+        <iconset resource="../report.qrc">
+         <normaloff>:/report/images/folder</normaloff>:/report/images/folder</iconset>
+       </property>
+       <property name="autoRaise">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="tbResourcePath">
+       <property name="text">
+        <string>...</string>
+       </property>
+       <property name="icon">
+        <iconset resource="../objectinspector/lobjectinspector.qrc">
+         <normaloff>:/items/clear.png</normaloff>:/items/clear.png</iconset>
+       </property>
+       <property name="autoRaise">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../../demo_r2/demo_r2.qrc"/>
+  <include location="../report.qrc"/>
+  <include location="items.qrc"/>
+  <include location="../objectinspector/lobjectinspector.qrc"/>
+  <include location="../report.qrc"/>
+  <include location="items.qrc"/>
+  <include location="../objectinspector/lobjectinspector.qrc"/>
+ </resources>
+ <connections/>
+</ui>
diff --git a/limereport/limereport.pri b/limereport/limereport.pri
index e039138..0918890 100644
--- a/limereport/limereport.pri
+++ b/limereport/limereport.pri
@@ -36,6 +36,7 @@ SOURCES += \
     $$REPORT_PATH/items/editors/lritemsborderseditorwidget.cpp \
     $$REPORT_PATH/items/lrsimpletagparser.cpp \
     $$REPORT_PATH/items/lrimageitem.cpp \
+    $$REPORT_PATH/items/lrimageitemeditor.cpp \
     $$REPORT_PATH/items/lrtextitemeditor.cpp \
     $$REPORT_PATH/items/lrshapeitem.cpp \
     $$REPORT_PATH/items/lrtextitem.cpp \
@@ -108,6 +109,7 @@ HEADERS += \
     $$REPORT_PATH/items/lrtextitemeditor.h \
     $$REPORT_PATH/items/lrshapeitem.h \
     $$REPORT_PATH/items/lrimageitem.h \
+    $$REPORT_PATH/items/lrimageitemeditor.h \
     $$REPORT_PATH/items/lrsimpletagparser.h \
     $$REPORT_PATH/items/lrverticallayout.h \
     $$REPORT_PATH/items/lrlayoutmarker.h \
@@ -171,6 +173,7 @@ FORMS += \
     $$REPORT_PATH/lraboutdialog.ui \
     $$REPORT_PATH/lrsettingdialog.ui \
     $$REPORT_PATH/items/lrchartitemeditor.ui \
+    $$REPORT_PATH/items/lrimageitemeditor.ui \
     $$REPORT_PATH/scripteditor/lrscripteditor.ui
 
 RESOURCES += \

From db015827054e4b5342878a66a0f471bc967ec76b Mon Sep 17 00:00:00 2001
From: fralx <arin_a@bk.ru>
Date: Thu, 8 Aug 2019 21:48:14 +0300
Subject: [PATCH 05/13] Update README.md

---
 README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b1eafc3..aedcaa1 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,11 @@
+
 # LimeReport v1.5.0 [![Build Status](https://api.travis-ci.org/fralx/LimeReport.svg?branch=master)](https://travis-ci.org/fralx/LimeReport) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/bc31412ea4814f30825b5ed3723e9a70)](https://app.codacy.com/app/fralx/LimeReport?utm_source=github.com&utm_medium=referral&utm_content=fralx/LimeReport&utm_campaign=Badge_Grade_Dashboard)
 
 ## Official LimeReport web site [http://limereport.ru](http://limereport.ru)
 
-### Features
+## Donation [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.me/arinalex)
+
+## Features
 
 * Multi-platform support
 * Pure Qt4/Qt5 compatible code

From 4eb22ac6dff278a41695864f3adf1f2f20482e31 Mon Sep 17 00:00:00 2001
From: Arin Alexander <arin_a@bk.ru>
Date: Thu, 8 Aug 2019 22:02:44 +0300
Subject: [PATCH 06/13] Russian translation has been updated

---
 translations/limereport_ru.qm | Bin 123356 -> 124649 bytes
 translations/limereport_ru.ts |  99 ++++++++++++++++++++++------------
 2 files changed, 65 insertions(+), 34 deletions(-)

diff --git a/translations/limereport_ru.qm b/translations/limereport_ru.qm
index 12ec7530b47fb12eeb917efec1ff743ed4673b60..3a14c7e8b2b1993263ea938faeb5d67aaaa60cc5 100644
GIT binary patch
delta 7046
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
b!6v;x&8S&^#t)n+DLsTv`F>Y<gZ6&_pT78d

delta 6231
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
CZEbY`

diff --git a/translations/limereport_ru.ts b/translations/limereport_ru.ts
index 4329fe8..adf4c0e 100644
--- a/translations/limereport_ru.ts
+++ b/translations/limereport_ru.ts
@@ -55,6 +55,29 @@
         <translation>Название ряда</translation>
     </message>
 </context>
+<context>
+    <name>ImageItemEditor</name>
+    <message>
+        <source>Image Item Editor</source>
+        <translation>Редакор изображения</translation>
+    </message>
+    <message>
+        <source>Image</source>
+        <translation>Изображение</translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <source>Resource path</source>
+        <translation>Путь к русурсам</translation>
+    </message>
+    <message>
+        <source>Select image file</source>
+        <translation>Выбрать файл изображения</translation>
+    </message>
+</context>
 <context>
     <name>LRVariableDialog</name>
     <message>
@@ -392,6 +415,10 @@ p, li { white-space: pre-wrap; }
         <source>Copy</source>
         <translation>Копировать</translation>
     </message>
+    <message>
+        <source>Keep top space</source>
+        <translation>Сохранять отступ сверху</translation>
+    </message>
 </context>
 <context>
     <name>LimeReport::BaseDesignIntf</name>
@@ -433,7 +460,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Lock item geometry</source>
-        <translation>Блокировать изменения геометрии</translation>
+        <translation>Заблокировать геометрию элемента</translation>
     </message>
 </context>
 <context>
@@ -1003,11 +1030,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Scale</source>
-        <translation>Масштабировать</translation>
+        <translation>Масштаб</translation>
     </message>
     <message>
         <source>Split</source>
-        <translation>Разделять на части</translation>
+        <translation>Разделить</translation>
     </message>
 </context>
 <context>
@@ -1130,6 +1157,10 @@ p, li { white-space: pre-wrap; }
         <source>Watermark</source>
         <translation>Водный знак</translation>
     </message>
+    <message>
+        <source>Edit</source>
+        <translation>Правка</translation>
+    </message>
 </context>
 <context>
     <name>LimeReport::ItemLocationPropItem</name>
@@ -1249,7 +1280,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Translate properties</source>
-        <translation>Переводить имена свойств</translation>
+        <translation>Свойства перевода</translation>
     </message>
 </context>
 <context>
@@ -1329,10 +1360,6 @@ p, li { white-space: pre-wrap; }
         <source>Report</source>
         <translation>Отчет</translation>
     </message>
-    <message>
-        <source>toolBar</source>
-        <translation>Панель инструментов</translation>
-    </message>
     <message>
         <source>Print</source>
         <translation>Печать</translation>
@@ -1433,10 +1460,6 @@ p, li { white-space: pre-wrap; }
         <source>Show toolbar</source>
         <translation>Показать панель инструментов</translation>
     </message>
-    <message>
-        <source>toolBar_2</source>
-        <translation>Редактирование</translation>
-    </message>
     <message>
         <source>InsertTextItem</source>
         <translation>Вставить текстовый элемент</translation>
@@ -1457,6 +1480,14 @@ p, li { white-space: pre-wrap; }
         <source>Del</source>
         <translation>Удалить</translation>
     </message>
+    <message>
+        <source>MainToolBar</source>
+        <translation>Основная панель инструментов</translation>
+    </message>
+    <message>
+        <source>EditModeTools</source>
+        <translation>Панель инструментов редактирования</translation>
+    </message>
 </context>
 <context>
     <name>LimeReport::ProxyHolder</name>
@@ -1881,7 +1912,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>setPageSizeToPrinter</source>
-        <translation>Отправить параметры страницы в принтер</translation>
+        <translation>Оправитьпараметры страницы в принтер</translation>
     </message>
     <message>
         <source>fillInSecondPass</source>
@@ -1961,11 +1992,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>option3</source>
-        <translation></translation>
+        <translation>Опция 3</translation>
     </message>
     <message>
         <source>units</source>
-        <translation>Единицы измерения</translation>
+        <translation>Еденицы измерения</translation>
     </message>
     <message>
         <source>geometryLocked</source>
@@ -1973,7 +2004,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>printBehavior</source>
-        <translation>Режим печати</translation>
+        <translation>Поведение при печати</translation>
     </message>
 </context>
 <context>
@@ -2301,15 +2332,15 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Lock selected items</source>
-        <translation>Заблокировать выбранные элементы</translation>
+        <translation>Заблокировать выделенные элементы</translation>
     </message>
     <message>
         <source>Unlock selected items</source>
-        <translation>Разблокировать выбранные элементы</translation>
+        <translation>Разблокировать выделенные элементы</translation>
     </message>
     <message>
         <source>Select one level items</source>
-        <translation>Выбрать все элементы одного уровня</translation>
+        <translation>Выделить элементы одного уровня</translation>
     </message>
 </context>
 <context>
@@ -2482,7 +2513,7 @@ This preview is no longer valid.</source>
     </message>
     <message>
         <source>CSV</source>
-        <translation></translation>
+        <translation>CSV</translation>
     </message>
     <message>
         <source>Separator</source>
@@ -2494,7 +2525,7 @@ This preview is no longer valid.</source>
     </message>
     <message>
         <source>Use first row as header</source>
-        <translation>Первая строка как заголовок</translation>
+        <translation>Использовать первую строку в качестве заголовка</translation>
     </message>
 </context>
 <context>
@@ -2729,7 +2760,7 @@ This preview is no longer valid.</source>
     </message>
     <message>
         <source>Report units</source>
-        <translation>Единицы измерения</translation>
+        <translation>Еденицы измерения</translation>
     </message>
 </context>
 <context>
@@ -3146,18 +3177,18 @@ This preview is no longer valid.</source>
         <source>Export to PDF</source>
         <translation>Экспортировать в PDF</translation>
     </message>
+    <message>
+        <source>Dark</source>
+        <translation>Темная</translation>
+    </message>
+    <message>
+        <source>Light</source>
+        <translation>Светаля</translation>
+    </message>
     <message>
         <source>Default</source>
         <translation>По умолчанию</translation>
     </message>
-    <message>
-        <source>margin</source>
-        <translation>Поля</translation>
-    </message>
-    <message>
-        <source>&apos;&apos;</source>
-        <translation></translation>
-    </message>
     <message>
         <source>Millimeters</source>
         <translation>Миллиметры</translation>
@@ -3167,12 +3198,12 @@ This preview is no longer valid.</source>
         <translation>Дюймы</translation>
     </message>
     <message>
-        <source>Dark</source>
-        <translation>Темная</translation>
+        <source>margin</source>
+        <translation>Поля</translation>
     </message>
     <message>
-        <source>Light</source>
-        <translation>Светлая</translation>
+        <source>&apos;&apos;</source>
+        <translation>&apos;&apos;</translation>
     </message>
 </context>
 </TS>

From 6c44ce86d2c280fd1027e669b27c55b6cb395da2 Mon Sep 17 00:00:00 2001
From: Rodrigo Torres <torres.dark@gmail.com>
Date: Sat, 10 Aug 2019 18:41:07 -0300
Subject: [PATCH 07/13] Update .travis.yml

---
 .travis.yml | 559 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 540 insertions(+), 19 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 39dedbc..f879261 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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:
-  - gcc
+      - env: Qt4.8.5_Ubuntu_14.04
+        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
-dist: trusty
+      - env: Qt5.2.1_Ubuntu_14.04
+        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:
-  - QT_BASE=56
+      - env: Qt5.2.1_Ubuntu_14.04
+        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:
-  - if [ "$QT_BASE" = "56" ]; then sudo add-apt-repository ppa:beineri/opt-qt562-trusty -y; fi
-  - sudo apt-get update -qq
+      - env: Qt5.3.2_Ubuntu_14.04
+        os: linux
+        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:
-  - if [ "$QT_BASE" = "56" ]; then sudo apt-get install -qq qt56base qt56script qt56tools ; source /opt/qt56/bin/qt56-env.sh; fi
-  
+      - env: Qt5.4.2_Ubuntu_14.04
+        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:
-  - qmake -r limereport.pro
-  - make
-  - make check
+      - env: Qt5.5.1_Ubuntu_14.04
+        os: linux
+        dist: trusty
+        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:
-  email: false
-
+  email: false
\ No newline at end of file

From c549035c7638f844ab86b944d5d6d687022cee38 Mon Sep 17 00:00:00 2001
From: Rodrigo Torres <torres.dark@gmail.com>
Date: Sat, 10 Aug 2019 18:45:27 -0300
Subject: [PATCH 08/13] Fix compilation

Qt4 still have one remaining compiler error
---
 limereport.pro                                | 7 ++++++-
 limereport/exporters/lrpdfexporter.h          | 2 +-
 limereport/items/lrimageitemeditor.h          | 2 +-
 limereport/lrbanddesignintf.cpp               | 2 +-
 limereport/lrreportdesignwidget.h             | 4 ++--
 limereport/lrreportengine.cpp                 | 4 ++--
 limereport/lrscriptenginemanager.cpp          | 2 +-
 limereport/objectinspector/lrobjectpropitem.h | 5 ++++-
 8 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/limereport.pro b/limereport.pro
index 9e33bcc..9bc801f 100644
--- a/limereport.pro
+++ b/limereport.pro
@@ -16,9 +16,14 @@ SUBDIRS += \
         limereport \
         demo_r1 \
         demo_r2 \
-        console \
         designer
 
+greaterThan(QT_MAJOR_VERSION, 4){
+greaterThan(QT_MINOR_VERSION, 1){
+        SUBDIRS += console
+    }
+}
+
 !contains(CONFIG, embedded_designer){
 !contains(CONFIG, static_build){
 SUBDIRS += designer_plugin
diff --git a/limereport/exporters/lrpdfexporter.h b/limereport/exporters/lrpdfexporter.h
index 225c80b..d758ff1 100644
--- a/limereport/exporters/lrpdfexporter.h
+++ b/limereport/exporters/lrpdfexporter.h
@@ -11,7 +11,7 @@ class PDFExporter : public QObject, public ReportExporterInterface
 {
     Q_OBJECT
 public:
-    explicit PDFExporter(ReportEnginePrivate *parent = nullptr);
+    explicit PDFExporter(ReportEnginePrivate *parent = NULL);
     // ReportExporterInterface interface
     bool exportPages(ReportPages pages, const QString &fileName, const QMap<QString, QVariant> &params);
     QString exporterName()
diff --git a/limereport/items/lrimageitemeditor.h b/limereport/items/lrimageitemeditor.h
index a8cc474..551baae 100644
--- a/limereport/items/lrimageitemeditor.h
+++ b/limereport/items/lrimageitemeditor.h
@@ -16,7 +16,7 @@ class ImageItemEditor : public QWidget
     Q_OBJECT
 
 public:
-    explicit ImageItemEditor(LimeReport::ImageItem* item, QWidget *parent = nullptr);
+    explicit ImageItemEditor(LimeReport::ImageItem* item, QWidget *parent = NULL);
     ~ImageItemEditor();
 private:
     void updateImage();
diff --git a/limereport/lrbanddesignintf.cpp b/limereport/lrbanddesignintf.cpp
index d8a6bbb..1690bbc 100644
--- a/limereport/lrbanddesignintf.cpp
+++ b/limereport/lrbanddesignintf.cpp
@@ -176,7 +176,7 @@ BandDesignIntf::BandDesignIntf(BandsType bandType, const QString &xmlTypeName, Q
         if (parentItem) setWidth(parentItem->width());
     }
 
-    setBackgroundMode(BGMode::TransparentMode);
+    setBackgroundMode(BaseDesignIntf::TransparentMode);
     setFillTransparentInDesignMode(false);
     setHeight(100);
     setFixedPos(true);
diff --git a/limereport/lrreportdesignwidget.h b/limereport/lrreportdesignwidget.h
index 4b7248e..ef3b81b 100644
--- a/limereport/lrreportdesignwidget.h
+++ b/limereport/lrreportdesignwidget.h
@@ -82,12 +82,12 @@ private:
 
 class PageView: public QGraphicsView{
 public:
-    PageView(QWidget *parent = nullptr): QGraphicsView(parent),
+    PageView(QWidget *parent = NULL): QGraphicsView(parent),
         m_horizontalRuller(0), m_verticalRuller(0)
     {
         setViewportMargins(20,20,0,0);
     }
-    PageView(QGraphicsScene *scene, QWidget *parent = nullptr):
+    PageView(QGraphicsScene *scene, QWidget *parent = NULL):
         QGraphicsView(scene, parent),
         m_horizontalRuller(0), m_verticalRuller(0)
     {
diff --git a/limereport/lrreportengine.cpp b/limereport/lrreportengine.cpp
index c07cff4..8a624e2 100644
--- a/limereport/lrreportengine.cpp
+++ b/limereport/lrreportengine.cpp
@@ -299,7 +299,7 @@ void ReportEnginePrivate::printReport(ItemsReaderIntf::Ptr reader, QPrinter& pri
 void ReportEnginePrivate::printReport(ReportPages pages, QPrinter &printer)
 {
     int currenPage = 1;
-    QMap<QString, QSharedPointer<PrintProcessor>> printProcessors;
+    QMap<QString, QSharedPointer<PrintProcessor> > printProcessors;
     printProcessors.insert("default",QSharedPointer<PrintProcessor>(new PrintProcessor(&printer)));
     foreach(PageItemDesignIntf::Ptr page, pages){
         if (
@@ -320,7 +320,7 @@ void ReportEnginePrivate::printReport(ReportPages pages, QMap<QString, QPrinter*
 {
     if (printers.values().isEmpty()) return;
     int currenPage = 1;
-    QMap<QString, QSharedPointer<PrintProcessor>> printProcessors;
+    QMap<QString, QSharedPointer<PrintProcessor> > printProcessors;
     for (int i = 0; i < printers.keys().count(); ++i) {
         printProcessors.insert(printers.keys()[i],QSharedPointer<PrintProcessor>(new PrintProcessor(printers[printers.keys()[i]])));
     }
diff --git a/limereport/lrscriptenginemanager.cpp b/limereport/lrscriptenginemanager.cpp
index cb6e219..f126a4c 100644
--- a/limereport/lrscriptenginemanager.cpp
+++ b/limereport/lrscriptenginemanager.cpp
@@ -1930,7 +1930,7 @@ bool DatasourceFunctions::isEOF(const QString &datasourceName)
 bool DatasourceFunctions::invalidate(const QString& 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 false;
diff --git a/limereport/objectinspector/lrobjectpropitem.h b/limereport/objectinspector/lrobjectpropitem.h
index 46392fc..f765213 100644
--- a/limereport/objectinspector/lrobjectpropitem.h
+++ b/limereport/objectinspector/lrobjectpropitem.h
@@ -99,7 +99,7 @@ namespace LimeReport{
 #endif
     private:
         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:
         void beginChangeValue(){ m_changingValue = true; }
@@ -140,4 +140,7 @@ namespace LimeReport{
     };
 
 }
+
+Q_DECLARE_METATYPE(LimeReport::ObjectPropItem*)
+
 #endif // LROBJECTPROPITEM_H

From fa795fe3ab922320b13b0a8bd11ba53106021b49 Mon Sep 17 00:00:00 2001
From: Arin Alexander <arin_a@bk.ru>
Date: Sun, 11 Aug 2019 12:48:16 +0300
Subject: [PATCH 09/13] Qt4 build has been fixed

---
 common.pri                      | 2 +-
 limereport/lrbasedesignintf.h   | 4 +++-
 limereport/lrpagedesignintf.cpp | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/common.pri b/common.pri
index cbe3fc1..64fa9c2 100644
--- a/common.pri
+++ b/common.pri
@@ -127,7 +127,7 @@ RCC_DIR        = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
 
 LIMEREPORT_VERSION_MAJOR = 1
 LIMEREPORT_VERSION_MINOR = 5
-LIMEREPORT_VERSION_RELEASE = 7
+LIMEREPORT_VERSION_RELEASE = 9
 
 LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
 DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"
diff --git a/limereport/lrbasedesignintf.h b/limereport/lrbasedesignintf.h
index 40c4761..b7fbbbb 100644
--- a/limereport/lrbasedesignintf.h
+++ b/limereport/lrbasedesignintf.h
@@ -262,7 +262,7 @@ public:
 
     QString itemTypeName() const;
     void setItemTypeName(const QString &itemTypeName);
-    void emitObjectNamePropertyChanged(const QString& oldName, const QString& newName);
+
     int borderLineSize() const;
     void setBorderLineSize(int value);
     void showEditorDialog();
@@ -303,7 +303,9 @@ public:
 
     bool fillTransparentInDesignMode() const;
     void setFillTransparentInDesignMode(bool fillTransparentInDesignMode);
+
     void emitPosChanged(QPointF oldPos, QPointF newPos);
+    void emitObjectNamePropertyChanged(const QString& oldName, const QString& newName);
 
     bool isGeometryLocked() const;
     void setGeometryLocked(bool itemLocked);
diff --git a/limereport/lrpagedesignintf.cpp b/limereport/lrpagedesignintf.cpp
index bc81b94..89a18f4 100644
--- a/limereport/lrpagedesignintf.cpp
+++ b/limereport/lrpagedesignintf.cpp
@@ -2136,7 +2136,7 @@ bool PosChangedCommand::doIt()
         if (reportItem && (reportItem->pos() != m_newPos[i].pos)){
             QPointF oldValue = reportItem->pos();
             reportItem->setPos(m_newPos[i].pos);
-            emit reportItem->posChanged(reportItem, oldValue, reportItem->pos());
+            reportItem->emitPosChanged(oldValue, reportItem->pos());
         }
     }
 

From fde44e67c17d0470db991087d1448f9fb55e2c04 Mon Sep 17 00:00:00 2001
From: Arin Alex <arin_a@bk.ru>
Date: Mon, 9 Sep 2019 21:25:08 +0300
Subject: [PATCH 10/13] Nested scripts have been fixed

---
 common.pri                           |  2 +-
 include/lrglobal.h                   |  4 ++
 limereport/items/lrabstractlayout.h  |  2 +-
 limereport/lrglobal.h                |  4 ++
 limereport/lrscriptenginemanager.cpp | 85 +++++++++++++++-------------
 limereport/lrscriptenginemanager.h   | 74 ++++++++++++++----------
 6 files changed, 99 insertions(+), 72 deletions(-)

diff --git a/common.pri b/common.pri
index 64fa9c2..20eedaf 100644
--- a/common.pri
+++ b/common.pri
@@ -127,7 +127,7 @@ RCC_DIR        = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
 
 LIMEREPORT_VERSION_MAJOR = 1
 LIMEREPORT_VERSION_MINOR = 5
-LIMEREPORT_VERSION_RELEASE = 9
+LIMEREPORT_VERSION_RELEASE = 10
 
 LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
 DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"
diff --git a/include/lrglobal.h b/include/lrglobal.h
index da6ab47..3ba2b02 100644
--- a/include/lrglobal.h
+++ b/include/lrglobal.h
@@ -91,6 +91,10 @@ namespace Const{
     const QString EOW("~!@#$%^&*()+{}|:\"<>?,/;'[]\\-=");
     const int DEFAULT_TAB_INDENTION = 4;
     const int DOCKWIDGET_MARGINS = 4;
+
+    const char SCRIPT_SIGN = 'S';
+    const char FIELD_SIGN = 'D';
+    const char VARIABLE_SIGN = 'V';
 }
     QString extractClassName(QString className);
     QString escapeSimbols(const QString& value);
diff --git a/limereport/items/lrabstractlayout.h b/limereport/items/lrabstractlayout.h
index 1324ff7..07a1d9f 100644
--- a/limereport/items/lrabstractlayout.h
+++ b/limereport/items/lrabstractlayout.h
@@ -34,7 +34,7 @@ public:
     int  childrenCount();
     int layoutSpacing() const;
     void setLayoutSpacing(int layoutSpacing);
-    qreal layoutSpacingMM(){ return  m_layoutSpacing * unitFactor();}
+    qreal layoutSpacingMM(){ return  m_layoutSpacing * Const::mmFACTOR;}
 protected:
     void beforeDelete();
     void childAddedEvent(BaseDesignIntf *child);
diff --git a/limereport/lrglobal.h b/limereport/lrglobal.h
index da6ab47..3ba2b02 100644
--- a/limereport/lrglobal.h
+++ b/limereport/lrglobal.h
@@ -91,6 +91,10 @@ namespace Const{
     const QString EOW("~!@#$%^&*()+{}|:\"<>?,/;'[]\\-=");
     const int DEFAULT_TAB_INDENTION = 4;
     const int DOCKWIDGET_MARGINS = 4;
+
+    const char SCRIPT_SIGN = 'S';
+    const char FIELD_SIGN = 'D';
+    const char VARIABLE_SIGN = 'V';
 }
     QString extractClassName(QString className);
     QString escapeSimbols(const QString& value);
diff --git a/limereport/lrscriptenginemanager.cpp b/limereport/lrscriptenginemanager.cpp
index f126a4c..05dba0a 100644
--- a/limereport/lrscriptenginemanager.cpp
+++ b/limereport/lrscriptenginemanager.cpp
@@ -465,15 +465,13 @@ QString ScriptEngineManager::expandScripts(QString context, QVariant& varValue,
 
     if (context.contains(rx)){
 
-        if (ScriptEngineManager::instance().dataManager()!=dataManager())
+        if (ScriptEngineManager::instance().dataManager() != dataManager())
             ScriptEngineManager::instance().setDataManager(dataManager());
 
         ScriptEngineType* se = ScriptEngineManager::instance().scriptEngine();
 
         if (reportItem){
-
             ScriptValueType svThis;
-
 #ifdef USE_QJSENGINE
             svThis = getJSValue(*se, reportItem);
             se->globalObject().setProperty("THIS",svThis);
@@ -490,29 +488,37 @@ QString ScriptEngineManager::expandScripts(QString context, QVariant& varValue,
 
         ScriptExtractor scriptExtractor(context);
         if (scriptExtractor.parse()){
-            for(int i=0; i<scriptExtractor.count();++i){
-                QString scriptBody = expandDataFields(scriptExtractor.bodyAt(i),EscapeSymbols, varValue, reportItem);
-                scriptBody = expandUserVariables(scriptBody, FirstPass, EscapeSymbols, varValue);
-                ScriptValueType value = se->evaluate(scriptBody);
-#ifdef USE_QJSENGINE
-                if (!value.isError()){
-                    varValue = value.toVariant();
-                    context.replace(scriptExtractor.scriptAt(i),value.toString());
-                } else {
-                    context.replace(scriptExtractor.scriptAt(i),value.toString());
-                }
-#else
-                if (!se->hasUncaughtException()) {
-                    varValue = value.toVariant();
-                    context.replace(scriptExtractor.scriptAt(i),value.toString());
-                } else {
-                    context.replace(scriptExtractor.scriptAt(i),se->uncaughtException().toString());
-                }
-#endif
-            }
+            context = replaceScripts(context, varValue, reportItem, se, scriptExtractor.scriptTree());
         }
-    }
 
+    }
+    return context;
+}
+
+QString ScriptEngineManager::replaceScripts(QString context, QVariant &varValue, QObject *reportItem, ScriptEngineType* se, ScriptNode *scriptTree)
+{
+    foreach(ScriptNode* item, scriptTree->children()){
+        QString scriptBody = expandDataFields(item->body(), EscapeSymbols, varValue, reportItem);
+        if (item->children().size() > 0)
+            scriptBody = replaceScripts(scriptBody, varValue, reportItem, se, item);
+        scriptBody = expandUserVariables(scriptBody, FirstPass, EscapeSymbols, varValue);
+        ScriptValueType value = se->evaluate(scriptBody);
+#ifdef USE_QJSENGINE
+        if (!value.isError()){
+            varValue = value.toVariant();
+            context.replace(item->script(), value.toString());
+        } else {
+            context.replace(item->script(), value.toString());
+        }
+#else
+        if (!se->hasUncaughtException()) {
+            varValue = value.toVariant();
+            context.replace(scriptTree->children()[i]->script(), value.toString());
+        } else {
+            context.replace(scriptTree->children()[i]->script(), se->uncaughtException().toString());
+        }
+#endif
+    }
     return context;
 }
 
@@ -530,7 +536,7 @@ QVariant ScriptEngineManager::evaluateScript(const QString& script){
 
         ScriptExtractor scriptExtractor(script);
         if (scriptExtractor.parse()){
-            QString scriptBody = expandDataFields(scriptExtractor.bodyAt(0),EscapeSymbols, varValue, 0);
+            QString scriptBody = expandDataFields(scriptExtractor.scriptTree()[0].body(), EscapeSymbols, varValue, 0);
             scriptBody = expandUserVariables(scriptBody, FirstPass, EscapeSymbols, varValue);
             ScriptValueType value = se->evaluate(scriptBody);
 #ifdef USE_QJSENGINE
@@ -976,12 +982,11 @@ ScriptEngineManager::ScriptEngineManager()
 bool ScriptExtractor::parse()
 {
     int currentPos = 0;
-    parse(currentPos,None);
-    return m_scriptsBody.count()>0;
-
+    parse(currentPos, None, m_scriptTree);
+    return m_scriptTree->children().count() > 0;
 }
 
-bool ScriptExtractor::parse(int &curPos,const State& state)
+bool ScriptExtractor::parse(int &curPos, const State& state, ScriptNode* scriptNode)
 {
     while (curPos<m_context.length()){
         switch (state) {
@@ -990,13 +995,13 @@ bool ScriptExtractor::parse(int &curPos,const State& state)
                 return true;
             } else {
                 if (m_context[curPos]=='{')
-                   extractBracket(curPos);
+                   extractBracket(curPos, scriptNode);
             }
         case None:
             if (m_context[curPos]=='$'){
                 int startPos = curPos;
                 if (isStartScriptLexem(curPos))
-                    extractScript(curPos,substring(m_context,startPos,curPos));
+                    extractScript(curPos, substring(m_context,startPos,curPos), scriptNode->createChildNode());
                 if (isStartFieldLexem(curPos) || isStartVariableLexem(curPos))
                     skipField(curPos);
             }
@@ -1008,13 +1013,13 @@ bool ScriptExtractor::parse(int &curPos,const State& state)
     return false;
 }
 
-void ScriptExtractor::extractScript(int &curPos, const QString& startStr)
+void ScriptExtractor::extractScript(int &curPos, const QString& startStr, ScriptNode* scriptNode)
 {
     int startPos = curPos;
-    if (extractBracket(curPos)){
+    if (extractBracket(curPos, scriptNode)){
         QString scriptBody = substring(m_context,startPos+1,curPos);
-        m_scriptsBody.push_back(scriptBody);
-        m_scriptsStartLex.push_back(startStr+'{');
+        scriptNode->setBody(scriptBody);
+        scriptNode->setStartLex(startStr+'{');
     }
 }
 
@@ -1028,10 +1033,10 @@ void ScriptExtractor::skipField(int &curPos){
     }
 }
 
-bool ScriptExtractor::extractBracket(int &curPos)
+bool ScriptExtractor::extractBracket(int &curPos, ScriptNode* scriptNode)
 {
     curPos++;
-    return parse(curPos,OpenBracketFound);
+    return parse(curPos,OpenBracketFound, scriptNode);
 }
 
 bool ScriptExtractor::isStartLexem(int& curPos, QChar value){
@@ -1064,16 +1069,16 @@ bool ScriptExtractor::isStartLexem(int& curPos, QChar value){
 
 bool ScriptExtractor::isStartScriptLexem(int& curPos)
 {
-    return isStartLexem(curPos, SCRIPT_SIGN);
+    return isStartLexem(curPos, Const::SCRIPT_SIGN);
 }
 
 bool ScriptExtractor::isStartFieldLexem(int& curPos){
-    return isStartLexem(curPos, FIELD_SIGN);
+    return isStartLexem(curPos, Const::FIELD_SIGN);
 }
 
 bool ScriptExtractor::isStartVariableLexem(int &curPos)
 {
-    return isStartLexem(curPos, VARIABLE_SIGN);
+    return isStartLexem(curPos, Const::VARIABLE_SIGN);
 }
 
 
diff --git a/limereport/lrscriptenginemanager.h b/limereport/lrscriptenginemanager.h
index f59405c..784253d 100644
--- a/limereport/lrscriptenginemanager.h
+++ b/limereport/lrscriptenginemanager.h
@@ -396,6 +396,47 @@ private:
     QMap<QString, IWrapperCreator*> m_wrappersFactory;
 };
 
+class ScriptNode{
+public:
+    QString body(){return m_body;}
+    void setBody(const QString& body){ m_body = body;}
+    void setStartLex(const QString startLex){ m_startLex = startLex;}
+    QString script(){return m_startLex + m_body + '}';}
+    ScriptNode* createChildNode(){
+        ScriptNode* result = new ScriptNode();
+        m_children.append(result);
+        return result;
+    }
+    QVector<ScriptNode*> children() const {return m_children;}
+private:
+    QVector<ScriptNode*> m_children;
+    QString m_body;
+    QString m_startLex;
+};
+
+class ScriptExtractor
+{
+public:
+    enum State{None,BuksFound,SFound,StartScriptFound,OpenBracketFound,CloseBracketFound,DFound,VFound, SignFound};
+    explicit ScriptExtractor(const QString& value):
+        m_context(value), m_scriptTree(new ScriptNode()){}
+    bool parse();
+    ScriptNode* scriptTree(){return m_scriptTree;}
+private:
+    bool isStartLexem(int &curPos, QChar value);
+    bool parse(int& curPos, const State &state, ScriptNode *scriptNode);
+    void skipField(int &curPos);
+    void extractScript(int& curPos, const QString &startStr, ScriptNode *scriptNode);
+    bool extractBracket(int& curPos, ScriptNode *scriptNode);
+    bool isStartScriptLexem(int &curPos);
+    bool isStartFieldLexem(int &curPos);
+    bool isStartVariableLexem(int &curPos);
+    QString substring(const QString& value, int start, int end);
+private:
+    QString m_context;
+    ScriptNode* m_scriptTree;
+};
+
 class ScriptEngineManager : public QObject, public Singleton<ScriptEngineManager>, public IScriptEngineManager
 {    
     Q_OBJECT
@@ -423,6 +464,9 @@ public:
     QString expandUserVariables(QString context, RenderPass pass, ExpandType expandType, QVariant &varValue);
     QString expandDataFields(QString context, ExpandType expandType, QVariant &varValue, QObject* reportItem);
     QString expandScripts(QString context, QVariant &varValue, QObject* reportItem);
+
+    QString replaceScripts(QString context, QVariant& varValue, QObject *reportItem, ScriptEngineType *se, ScriptNode* scriptTree);
+
     QVariant evaluateScript(const QString &script);
     void    addBookMark(const QString &uniqKey, const QString &content);
     int     findPageIndexByBookmark(const QString& uniqKey);
@@ -466,36 +510,6 @@ private:
     ScriptFunctionsManager* m_functionManager;
 };
 
-class ScriptExtractor
-{
-public:
-    enum State{None,BuksFound,SFound,StartScriptFound,OpenBracketFound,CloseBracketFound,DFound,VFound, SignFound};
-    explicit ScriptExtractor(const QString& value):m_context(value){}
-    bool parse();
-    int count(){return m_scriptsBody.count();}
-    QString bodyAt(int index){return m_scriptsBody[index];}
-    QString scriptAt(int index){return m_scriptsStartLex[index]+m_scriptsBody[index]+'}';}
-
-private:
-    static const char SCRIPT_SIGN = 'S';
-    static const char FIELD_SIGN = 'D';
-    static const char VARIABLE_SIGN = 'V';
-
-    bool isStartLexem(int &curPos, QChar value);
-    bool parse(int& curPos, const State &state);
-    void skipField(int &curPos);
-    void extractScript(int& curPos, const QString &startStr);
-    bool extractBracket(int& curPos);
-    bool isStartScriptLexem(int &curPos);
-    bool isStartFieldLexem(int &curPos);
-    bool isStartVariableLexem(int &curPos);
-    QString substring(const QString& value, int start, int end);
-private:
-    QString m_context;
-    QVector<QString> m_scriptsBody;
-    QVector<QString> m_scriptsStartLex;
-
-};
 
 #ifdef USE_QTSCRIPTENGINE
 class QFontPrototype : public QObject, public QScriptable {

From 3b360e0f71ea3771e40074b82bede7894e498fd8 Mon Sep 17 00:00:00 2001
From: Arin Alex <arin_a@bk.ru>
Date: Mon, 9 Sep 2019 22:33:13 +0300
Subject: [PATCH 11/13] Qt4 build fixed

---
 common.pri                           | 2 +-
 limereport/lrscriptenginemanager.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common.pri b/common.pri
index 20eedaf..e2a07e5 100644
--- a/common.pri
+++ b/common.pri
@@ -127,7 +127,7 @@ RCC_DIR        = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
 
 LIMEREPORT_VERSION_MAJOR = 1
 LIMEREPORT_VERSION_MINOR = 5
-LIMEREPORT_VERSION_RELEASE = 10
+LIMEREPORT_VERSION_RELEASE = 11
 
 LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
 DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"
diff --git a/limereport/lrscriptenginemanager.cpp b/limereport/lrscriptenginemanager.cpp
index 05dba0a..91bc9bc 100644
--- a/limereport/lrscriptenginemanager.cpp
+++ b/limereport/lrscriptenginemanager.cpp
@@ -513,9 +513,9 @@ QString ScriptEngineManager::replaceScripts(QString context, QVariant &varValue,
 #else
         if (!se->hasUncaughtException()) {
             varValue = value.toVariant();
-            context.replace(scriptTree->children()[i]->script(), value.toString());
+            context.replace(item->script(), value.toString());
         } else {
-            context.replace(scriptTree->children()[i]->script(), se->uncaughtException().toString());
+            context.replace(item->script(), se->uncaughtException().toString());
         }
 #endif
     }

From 5c7c9a1baca943471e4861d28d16f3f112a99872 Mon Sep 17 00:00:00 2001
From: Arin Alexander <arin_a@bk.ru>
Date: Tue, 10 Sep 2019 22:49:49 +0300
Subject: [PATCH 12/13] Items alignment tools has been refactored

---
 common.pri                      |  2 +-
 limereport/lrpagedesignintf.cpp | 63 +++++++++++++++++++++++++++------
 limereport/lrpagedesignintf.h   |  2 ++
 3 files changed, 55 insertions(+), 12 deletions(-)

diff --git a/common.pri b/common.pri
index e2a07e5..fa50060 100644
--- a/common.pri
+++ b/common.pri
@@ -127,7 +127,7 @@ RCC_DIR        = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
 
 LIMEREPORT_VERSION_MAJOR = 1
 LIMEREPORT_VERSION_MINOR = 5
-LIMEREPORT_VERSION_RELEASE = 11
+LIMEREPORT_VERSION_RELEASE = 12
 
 LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
 DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"
diff --git a/limereport/lrpagedesignintf.cpp b/limereport/lrpagedesignintf.cpp
index 89a18f4..3e0ad34 100644
--- a/limereport/lrpagedesignintf.cpp
+++ b/limereport/lrpagedesignintf.cpp
@@ -1459,15 +1459,24 @@ void PageDesignIntf::sendToBack()
     }
 }
 
+bool PageDesignIntf::selectionContainsBand(){
+    foreach(QGraphicsItem * item,selectedItems()){
+        BandDesignIntf *band = dynamic_cast<BandDesignIntf *>(item);
+        if (band) return true;
+    }
+    return false;
+}
+
 void PageDesignIntf::alignToLeft()
 {
     if ((selectedItems().count() > 0) && m_firstSelectedItem) {
         CommandGroup::Ptr cm = CommandGroup::create();
+        bool moveInBand = selectionContainsBand();
         foreach(QGraphicsItem * item, selectedItems()) {
             BaseDesignIntf *bdItem = dynamic_cast<BaseDesignIntf *>(item);
             if (bdItem && !bdItem->isGeometryLocked()) {
                 QRectF oldGeometry = bdItem->geometry();
-                bdItem->setPos(QPoint(m_firstSelectedItem->pos().x(), item->pos().y()));
+                bdItem->setPos(QPointF(moveInBand ? 0 : m_firstSelectedItem->pos().x(), item->pos().y()));
                 CommandIf::Ptr command = PropertyChangedCommand::create(this, bdItem->objectName(), "geometry", oldGeometry, bdItem->geometry());
                 cm->addCommand(command, false);
             }
@@ -1480,11 +1489,19 @@ void PageDesignIntf::alignToRigth()
 {
     if ((selectedItems().count() > 0) && m_firstSelectedItem) {
         CommandGroup::Ptr cm = CommandGroup::create();
+        bool moveInBand = selectionContainsBand();
         foreach(QGraphicsItem * item, selectedItems()) {
             BaseDesignIntf *bdItem = dynamic_cast<BaseDesignIntf *>(item);
-            if (bdItem && !bdItem->isGeometryLocked()) {
+            if (bdItem && !bdItem->isGeometryLocked() && !bdItem->isBand()) {
                 QRectF oldGeometry = bdItem->geometry();
-                bdItem->setPos(QPoint(m_firstSelectedItem->geometry().right() - bdItem->width(), bdItem->pos().y()));
+                if (moveInBand && dynamic_cast<BandDesignIntf*>(bdItem->parent()))
+                {
+                    bdItem->setPos(QPointF(dynamic_cast<BandDesignIntf*>(bdItem->parent())->geometry().width() - bdItem->width(),
+                                          bdItem->pos().y()));
+                } else {
+                    qreal x = m_firstSelectedItem->geometry().right() - bdItem->width();
+                    bdItem->setPos(QPointF(x+1, bdItem->pos().y()));
+                }
                 CommandIf::Ptr command = PropertyChangedCommand::create(this, bdItem->objectName(), "geometry", oldGeometry, bdItem->geometry());
                 cm->addCommand(command, false);
             }
@@ -1497,11 +1514,18 @@ void PageDesignIntf::alignToVCenter()
 {
     if ((selectedItems().count() > 0) && m_firstSelectedItem) {
         CommandGroup::Ptr cm = CommandGroup::create();
+        bool moveInBand = selectionContainsBand();
         foreach(QGraphicsItem * item, selectedItems()) {
             BaseDesignIntf *bdItem = dynamic_cast<BaseDesignIntf *>(item);
-            if (bdItem && !bdItem->isGeometryLocked()) {
+            if (bdItem && !bdItem->isGeometryLocked() && !bdItem->isBand()) {
                 QRectF oldGeometry = bdItem->geometry();
-                bdItem->setPos(QPoint((m_firstSelectedItem->geometry().right() - m_firstSelectedItem->width() / 2) - bdItem->width() / 2, bdItem->pos().y()));
+                if (moveInBand && dynamic_cast<BandDesignIntf*>(bdItem->parent())){
+                    bdItem->setPos(QPointF((dynamic_cast<BandDesignIntf*>(bdItem->parent())->geometry().width() / 2) - bdItem->width() / 2,
+                                          bdItem->pos().y()));
+                } else {
+                    qreal x = (m_firstSelectedItem->geometry().right() - m_firstSelectedItem->width() / 2) - bdItem->width() / 2;
+                    bdItem->setPos(QPointF(x+1, bdItem->pos().y()));
+                }
                 CommandIf::Ptr command = PropertyChangedCommand::create(this, bdItem->objectName(), "geometry", oldGeometry, bdItem->geometry());
                 cm->addCommand(command, false);
             }
@@ -1514,11 +1538,16 @@ void PageDesignIntf::alignToTop()
 {
     if ((selectedItems().count() > 0) && m_firstSelectedItem) {
         CommandGroup::Ptr cm = CommandGroup::create();
+        bool moveInBand = selectionContainsBand();
         foreach(QGraphicsItem * item, selectedItems()) {
             BaseDesignIntf *bdItem = dynamic_cast<BaseDesignIntf *>(item);
-            if (bdItem && !bdItem->isGeometryLocked()) {
+            if (bdItem && !bdItem->isGeometryLocked() && !bdItem->isBand()) {
                 QRectF oldGeometry = bdItem->geometry();
-                bdItem->setPos(QPoint(bdItem->pos().x(), m_firstSelectedItem->pos().y()));
+                if (moveInBand){
+                    bdItem->setPos(QPointF(0, m_firstSelectedItem->pos().y()));
+                } else {
+                    bdItem->setPos(QPointF(bdItem->pos().x(), m_firstSelectedItem->pos().y()));
+                }
                 CommandIf::Ptr command = PropertyChangedCommand::create(this, bdItem->objectName(), "geometry", oldGeometry, bdItem->geometry());
                 cm->addCommand(command, false);
             }
@@ -1531,11 +1560,17 @@ void PageDesignIntf::alignToBottom()
 {
     if ((selectedItems().count() > 0) && m_firstSelectedItem) {
         CommandGroup::Ptr cm = CommandGroup::create();
+        bool moveInBand = selectionContainsBand();
         foreach(QGraphicsItem * item, selectedItems()) {
             BaseDesignIntf *bdItem = dynamic_cast<BaseDesignIntf *>(item);
-            if (bdItem && !bdItem->isGeometryLocked()) {
+            if (bdItem && !bdItem->isGeometryLocked() && !bdItem->isBand()) {
                 QRectF oldGeometry = bdItem->geometry();
-                bdItem->setPos(QPoint(bdItem->pos().x(), m_firstSelectedItem->geometry().bottom() - bdItem->height()));
+                if (moveInBand && dynamic_cast<BandDesignIntf*>(bdItem->parent())){
+                   bdItem->setPos(QPointF(bdItem->pos().x(), dynamic_cast<BandDesignIntf*>(bdItem->parent())->height() - bdItem->height()));
+                } else {
+                    qreal y = m_firstSelectedItem->geometry().bottom() - bdItem->height();
+                    bdItem->setPos(QPointF(bdItem->pos().x(), y+1));
+                }
                 CommandIf::Ptr command = PropertyChangedCommand::create(this, bdItem->objectName(), "geometry", oldGeometry, bdItem->geometry());
                 cm->addCommand(command, false);
             }
@@ -1548,11 +1583,17 @@ void PageDesignIntf::alignToHCenter()
 {
     if ((selectedItems().count() > 0) && m_firstSelectedItem) {
         CommandGroup::Ptr cm = CommandGroup::create();
+        bool moveInBand = selectionContainsBand();
         foreach(QGraphicsItem * item, selectedItems()) {
             BaseDesignIntf *bdItem = dynamic_cast<BaseDesignIntf *>(item);
-            if (bdItem && !bdItem->isGeometryLocked()) {
+            if (bdItem && !bdItem->isGeometryLocked() && !bdItem->isBand()) {
                 QRectF oldGeometry = bdItem->geometry();
-                bdItem->setPos(QPoint(bdItem->pos().x(), (m_firstSelectedItem->geometry().bottom() - m_firstSelectedItem->height() / 2) - bdItem->height() / 2));
+                if (moveInBand && dynamic_cast<BandDesignIntf*>(bdItem->parent())){
+                    bdItem->setPos(QPointF(bdItem->pos().x(), (dynamic_cast<BandDesignIntf*>(bdItem->parent())->height() / 2) - bdItem->height() / 2));
+                } else {
+                    qreal y = (m_firstSelectedItem->geometry().bottom() - m_firstSelectedItem->height() / 2) - bdItem->height() / 2;
+                    bdItem->setPos(QPointF(bdItem->pos().x(), y+1));
+                }
                 CommandIf::Ptr command = PropertyChangedCommand::create(this, bdItem->objectName(), "geometry", oldGeometry, bdItem->geometry());
                 cm->addCommand(command, false);
             }
diff --git a/limereport/lrpagedesignintf.h b/limereport/lrpagedesignintf.h
index d94abfe..b02a2de 100644
--- a/limereport/lrpagedesignintf.h
+++ b/limereport/lrpagedesignintf.h
@@ -282,6 +282,7 @@ namespace LimeReport {
         void changeSelectedGroupProperty(const QString& name,const QVariant& value);
         void activateItemToJoin(QRectF itemRect, QList<ItemProjections>& items);
         void selectAllChildren(BaseDesignIntf* item);
+        bool selectionContainsBand();
     private:
         enum JoinType{Width, Height};
         LimeReport::PageItemDesignIntf::Ptr m_pageItem;
@@ -322,6 +323,7 @@ namespace LimeReport {
         bool             m_magneticMovement;
         ReportSettings*  m_reportSettings;
         PageItemDesignIntf* m_currentPage;
+
     };
 
     class AbstractPageCommand : public CommandIf{

From 076576ce883888cc237718857a7fdfccf34ce074 Mon Sep 17 00:00:00 2001
From: Arin Alexander <arin_a@bk.ru>
Date: Mon, 23 Sep 2019 14:20:00 +0300
Subject: [PATCH 13/13] setPageItems method has been fixed

---
 common.pri                      | 2 +-
 limereport/lrpagedesignintf.cpp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/common.pri b/common.pri
index fa50060..7913e8e 100644
--- a/common.pri
+++ b/common.pri
@@ -127,7 +127,7 @@ RCC_DIR        = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
 
 LIMEREPORT_VERSION_MAJOR = 1
 LIMEREPORT_VERSION_MINOR = 5
-LIMEREPORT_VERSION_RELEASE = 12
+LIMEREPORT_VERSION_RELEASE = 13
 
 LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
 DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"
diff --git a/limereport/lrpagedesignintf.cpp b/limereport/lrpagedesignintf.cpp
index 3e0ad34..52c1e4d 100644
--- a/limereport/lrpagedesignintf.cpp
+++ b/limereport/lrpagedesignintf.cpp
@@ -278,6 +278,7 @@ void PageDesignIntf::setPageItem(PageItemDesignIntf::Ptr pageItem)
 
 void PageDesignIntf::setPageItems(QList<PageItemDesignIntf::Ptr> pages)
 {
+    m_currentPage = 0;
     if (!m_pageItem.isNull()) {
         removeItem(m_pageItem.data());
         m_pageItem.clear();