From 5e91fb0c33e5ef92717b589dfdb05c421b3f162d Mon Sep 17 00:00:00 2001
From: yanis60 <yand900@hotmail.fr>
Date: Fri, 3 Feb 2023 15:55:36 +0100
Subject: [PATCH] Fixed defined objectname changed after pasting items

---
 CMakeLists.txt                                |  59 +-
 README.md                                     |  35 +-
 common.pri                                    |   2 +-
 demo_r1/CMakeLists.txt                        |   9 +-
 designer/CMakeLists.txt                       |  12 +-
 include/lrglobal.h                            |  22 +-
 limereport/databrowser/lrdatabrowsertree.cpp  |   4 +
 limereport/databrowser/lrdatabrowsertree.h    |   6 +-
 limereport/databrowser/lrsqleditdialog.cpp    | 274 +++---
 limereport/images/border_settings.png         | Bin 0 -> 5843 bytes
 .../editors/lritemsborderseditorwidget.cpp    |  54 +-
 .../editors/lritemsborderseditorwidget.h      |   6 +-
 limereport/items/lrbordereditor.cpp           | 206 ++---
 limereport/items/lrbordereditor.h             |  55 +-
 limereport/items/lrbordereditor.ui            |  87 +-
 limereport/items/lrborderframeeditor.cpp      | 181 ++++
 limereport/items/lrborderframeeditor.h        |  46 +
 limereport/items/lrborderframeeditor.ui       |  73 ++
 limereport/items/lrimageitem.cpp              |  35 +-
 limereport/items/lrimageitem.h                |  10 +-
 limereport/items/lrpageeditor.cpp             |  84 +-
 limereport/items/lrpageeditor.h               |  17 +-
 limereport/items/lrpageeditor.ui              |  45 +-
 limereport/items/lrsvgitem.cpp                |  15 +-
 limereport/items/lrtextitem.cpp               |  54 +-
 limereport/limereport.pri                     |   6 +-
 limereport/lrbanddesignintf.h                 |   1 -
 limereport/lrbasedesignintf.cpp               |  41 +-
 limereport/lrbasedesignintf.h                 |  10 +-
 limereport/lrcollection.h                     |   6 +-
 limereport/lrdatadesignintf.cpp               |   5 +
 limereport/lrdatasourcemanager.cpp            |  24 +-
 limereport/lrfactoryinitializer.cpp           |   2 +-
 limereport/lrglobal.cpp                       |  51 +-
 limereport/lrglobal.h                         |  22 +-
 limereport/lrgroupfunctions.cpp               |  10 +-
 limereport/lritemscontainerdesignitf.h        |  12 +-
 limereport/lrpagedesignintf.cpp               |  24 +-
 limereport/lrpagedesignintf.h                 |   5 +
 limereport/lrpageitemdesignintf.cpp           |  34 +-
 limereport/lrpageitemdesignintf.h             |   2 +-
 limereport/lrreportdesignwidget.cpp           |  10 +
 limereport/lrreportdesignwidget.h             |   2 +
 limereport/lrreportengine.cpp                 |   2 +-
 limereport/lrreportrender.cpp                 |  58 +-
 limereport/lrscriptenginemanager.cpp          |  59 +-
 limereport/lrscriptenginemanager.h            |   6 +-
 .../editors/lrcomboboxeditor.cpp              |   7 +-
 .../propertyItems/lrrectproptem.cpp           |  12 +
 limereport/report.qrc                         |   1 +
 limereport/serializators/lrstorageintf.h      |   7 +-
 limereport/serializators/lrxmlwriter.cpp      |  22 +-
 .../translationeditor/languageselectdialog.h  |  10 +-
 .../translationeditor/translationeditor.cpp   |   7 +-
 .../translationeditor/translationeditor.h     |   2 +
 translations/limereport_ar.ts                 | 380 ++++----
 translations/limereport_es.ts                 | 380 ++++----
 translations/limereport_fr.ts                 | 830 +++++++++---------
 translations/limereport_pl.ts                 | 830 +++++++++---------
 translations/limereport_ru.qm                 | Bin 123741 -> 123781 bytes
 translations/limereport_ru.ts                 | 380 ++++----
 translations/limereport_zh.ts                 | 380 ++++----
 62 files changed, 2760 insertions(+), 2271 deletions(-)
 create mode 100644 limereport/images/border_settings.png
 create mode 100644 limereport/items/lrborderframeeditor.cpp
 create mode 100644 limereport/items/lrborderframeeditor.h
 create mode 100644 limereport/items/lrborderframeeditor.ui

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ba0f51..fbab265 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,17 +1,20 @@
-project(limereport)
 cmake_minimum_required(VERSION 3.14)
+project(limereport)
 
 set(LIMEREPORT_VERSION_MAJOR 1)
 set(LIMEREPORT_VERSION_MINOR 6)
-set(LIMEREPORT_VERSION_RELEASE 6)
+set(LIMEREPORT_VERSION_RELEASE 8)
 
 option(ENABLE_ZINT "Enable libzint build for barcode support" OFF)
 option(LIMEREPORT_STATIC "Build LimeReport as static library" OFF)
+option(LIMEREPORT_DEMO "Build LimeReport demos" OFF)
+option(USE_QT6 "Use Qt6" OFF)
 
-find_package(
-  QT NAMES Qt6 Qt5
-  COMPONENTS Core Widgets Sql Network Xml Svg Qml PrintSupport REQUIRED
-  )
+if(USE_QT6)
+    find_package(QT NAMES Qt6)
+else()
+    find_package(QT NAMES Qt5)
+endif(USE_QT6)
 find_package(
   Qt${QT_VERSION_MAJOR}
   COMPONENTS Core Widgets Sql Network Xml Svg Qml PrintSupport REQUIRED
@@ -35,8 +38,11 @@ if (Qt${QT_VERSION_MAJOR}Widgets_FOUND)
 endif()
 
 add_subdirectory(3rdparty)
-add_subdirectory(designer EXCLUDE_FROM_ALL)
-add_subdirectory(demo_r1 EXCLUDE_FROM_ALL)
+
+if (LIMEREPORT_DEMO)
+    add_subdirectory(designer)
+    add_subdirectory(demo_r1)
+endif()
 
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTOUIC ON)
@@ -77,12 +83,16 @@ ${PROJECT_NAME}/items/editors/lritemsborderseditorwidget.cpp
 ${PROJECT_NAME}/items/editors/lrtextalignmenteditorwidget.cpp
 ${PROJECT_NAME}/items/lrabstractlayout.cpp
 ${PROJECT_NAME}/items/lralignpropitem.cpp
+${PROJECT_NAME}/items/lrborderframeeditor.cpp
+${PROJECT_NAME}/items/lrbordereditor.cpp
 ${PROJECT_NAME}/items/lrchartitem.cpp
+${PROJECT_NAME}/items/lrchartaxiseditor.cpp
 ${PROJECT_NAME}/items/lrchartitemeditor.cpp
 ${PROJECT_NAME}/items/lrhorizontallayout.cpp
 ${PROJECT_NAME}/items/lrimageitem.cpp
 ${PROJECT_NAME}/items/lrimageitemeditor.cpp
 ${PROJECT_NAME}/items/lrlayoutmarker.cpp
+${PROJECT_NAME}/items/lrpageeditor.cpp
 ${PROJECT_NAME}/items/lrshapeitem.cpp
 ${PROJECT_NAME}/items/lrsubitemparentpropitem.cpp
 ${PROJECT_NAME}/items/lrsvgitem.cpp
@@ -188,13 +198,17 @@ ${PROJECT_NAME}/items/editors/lritemsborderseditorwidget.h
 ${PROJECT_NAME}/items/editors/lrtextalignmenteditorwidget.h
 ${PROJECT_NAME}/items/lrabstractlayout.h
 ${PROJECT_NAME}/items/lralignpropitem.h
+${PROJECT_NAME}/items/lrborderframeeditor.h
+${PROJECT_NAME}/items/lrbordereditor.h
 ${PROJECT_NAME}/items/lrchartitem.h
+${PROJECT_NAME}/items/lrchartaxiseditor.h
 ${PROJECT_NAME}/items/lrchartitemeditor.h
 ${PROJECT_NAME}/items/lreditableimageitemintf.h
 ${PROJECT_NAME}/items/lrhorizontallayout.h
 ${PROJECT_NAME}/items/lrimageitem.h
 ${PROJECT_NAME}/items/lrimageitemeditor.h
 ${PROJECT_NAME}/items/lrlayoutmarker.h
+${PROJECT_NAME}/items/lrpageeditor.h
 ${PROJECT_NAME}/items/lrshapeitem.h
 ${PROJECT_NAME}/items/lrsubitemparentpropitem.h
 ${PROJECT_NAME}/items/lrsvgitem.h
@@ -284,8 +298,12 @@ ${PROJECT_NAME}/databrowser/lrdatabrowser.ui
 ${PROJECT_NAME}/databrowser/lrsqleditdialog.ui
 ${PROJECT_NAME}/databrowser/lrvariabledialog.ui
 ${PROJECT_NAME}/dialogdesigner/templates/Dialog.ui
+${PROJECT_NAME}/items/lrborderframeeditor.ui
+${PROJECT_NAME}/items/lrbordereditor.ui
 ${PROJECT_NAME}/items/lrchartitemeditor.ui
+${PROJECT_NAME}/items/lrchartaxiseditor.ui
 ${PROJECT_NAME}/items/lrimageitemeditor.ui
+${PROJECT_NAME}/items/lrpageeditor.ui
 ${PROJECT_NAME}/items/lrtextitemeditor.ui
 ${PROJECT_NAME}/lraboutdialog.ui
 ${PROJECT_NAME}/lrpreviewreportwidget.ui
@@ -340,13 +358,16 @@ set(GLOBAL_HEADERS
     ${CMAKE_CURRENT_BINARY_DIR}/config.h
     )
 
+set(PROJECT_NAME ${PROJECT_NAME}-qt${QT_VERSION_MAJOR})
+
 if (LIMEREPORT_STATIC)
-	message(STATUS "STATIC LIBRARY")
-	add_library(${PROJECT_NAME} STATIC  ${EXTRA_FILES} ${LIMEREPORT_SOURCES})
+    message(STATUS "STATIC LIBRARY")
+    add_library(${PROJECT_NAME} STATIC  ${EXTRA_FILES} ${LIMEREPORT_SOURCES})
     target_compile_definitions( ${PROJECT_NAME} PUBLIC -DHAVE_STATIC_BUILD)
 else()
     add_library(${PROJECT_NAME} SHARED  ${EXTRA_FILES} ${LIMEREPORT_SOURCES})
-    target_compile_definitions( ${PROJECT_NAME} PUBLIC -DLIMEREPORT_EXPORTS)
+    target_compile_definitions( ${PROJECT_NAME} PRIVATE -DLIMEREPORT_EXPORTS)
+    target_compile_definitions( ${PROJECT_NAME} INTERFACE -DLIMEREPORT_IMPORTS)
 endif()
 
 target_compile_definitions(${PROJECT_NAME} PUBLIC -DCMAKE_CONFIG)
@@ -385,16 +406,16 @@ target_include_directories( ${PROJECT_NAME} PRIVATE
 	limereport/serializators
 	limereport/scripteditor )
 
+target_include_directories( ${PROJECT_NAME} INTERFACE
+        ${CMAKE_CURRENT_SOURCE_DIR}/include)
+
+list (APPEND GLOBAL_HEADERS ${EXTRA_FILES})
+set_target_properties(${PROJECT_NAME} PROPERTIES PUBLIC_HEADER "${GLOBAL_HEADERS}")
+
 install(TARGETS
 	${PROJECT_NAME}
 	ARCHIVE DESTINATION lib
 	LIBRARY DESTINATION lib
-	RUNTIME DESTINATION bin)
+	RUNTIME DESTINATION bin
+	PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/limereport)
 
-install(FILES
-  ${EXTRA_FILES}
-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}")
-
-install(FILES
-  ${GLOBAL_HEADERS}
-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}")
diff --git a/README.md b/README.md
index f03702b..0bafa82 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 
-# LimeReport v1.5.87 [![Build Status](https://app.travis-ci.com/fralx/LimeReport.svg?branch=master)](https://app.travis-ci.com/fralx/LimeReport) [![Build status](https://ci.appveyor.com/api/projects/status/wna5429pix7ilcmo/branch/master?svg=true)](https://ci.appveyor.com/project/fralx/limereport/branch/master) [![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)
+# LimeReport v1.5.87 [![Build status](https://ci.appveyor.com/api/projects/status/wna5429pix7ilcmo/branch/master?svg=true)](https://ci.appveyor.com/project/fralx/limereport/branch/master) [![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) ![Cmake Build Status](https://github.com/fralx/limereport/actions/workflows/cmake.yml/badge.svg)
 
 ## Official LimeReport web site [http://limereport.ru](http://limereport.ru)
 
@@ -23,8 +23,37 @@
 
 ### 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:
+#### QMake
+
+- Build limereport.pro. It will create a limereport shared library  
+- In your project connect the limereport library
+
+#### CMake
+
+To use in your application without installation
+
+There are 2 possible ways:
+
+- Use cmake subdirectory in your CMakeLists.txt:
+
+```cmake
+add_subdirectory(LimeReport)
+target_link_libraries(myapp PRIVATE limereport-qt${QT_VERSION_MAJOR})
+```
+- Use cmake FetchContent in your CMakeLists.txt:
+
+```cmake
+include(FetchContent)
+FetchContent_Declare(
+  LimeReport
+  GIT_REPOSITORY https://github.com/fralx/LimeReport.git
+  GIT_TAG        sha-of-the-commit
+)
+FetchContent_MakeAvailable(LimeReport)
+target_link_libraries(myapp PRIVATE limereport-qt${QT_VERSION_MAJOR})
+```
+
+- Then in source code add:
 
 ```cpp
   #include "lrreportengine.h" to add report engine
diff --git a/common.pri b/common.pri
index ebf1c89..160fdce 100644
--- a/common.pri
+++ b/common.pri
@@ -141,7 +141,7 @@ RCC_DIR        = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
 
 LIMEREPORT_VERSION_MAJOR = 1
 LIMEREPORT_VERSION_MINOR = 6
-LIMEREPORT_VERSION_RELEASE = 0
+LIMEREPORT_VERSION_RELEASE = 8
 
 LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
 DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"
diff --git a/demo_r1/CMakeLists.txt b/demo_r1/CMakeLists.txt
index a694da1..4f68d4a 100644
--- a/demo_r1/CMakeLists.txt
+++ b/demo_r1/CMakeLists.txt
@@ -1,3 +1,5 @@
+project(demo_r1)
+
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTORCC ON)
@@ -9,15 +11,14 @@ set(PROJECT_SOURCES
         mainwindow.ui
 )
 
-add_executable(demo_r1 main.cpp ${PROJECT_SOURCES})
+add_executable(${PROJECT_NAME} main.cpp ${PROJECT_SOURCES})
 
-target_include_directories( demo_r1 PRIVATE ../include/ )
-target_link_libraries(demo_r1 PRIVATE
+target_link_libraries(${PROJECT_NAME} PRIVATE
         Qt${QT_VERSION_MAJOR}::Core
         Qt${QT_VERSION_MAJOR}::Widgets
         Qt${QT_VERSION_MAJOR}::PrintSupport
         Qt${QT_VERSION_MAJOR}::Qml
         Qt${QT_VERSION_MAJOR}::Sql
-        ${PROJECT_NAME}
+        limereport-qt${QT_VERSION_MAJOR}
 )
 
diff --git a/designer/CMakeLists.txt b/designer/CMakeLists.txt
index 3f3ffe4..9ae1a39 100644
--- a/designer/CMakeLists.txt
+++ b/designer/CMakeLists.txt
@@ -1,3 +1,5 @@
+project(LRDesigner)
+
 set(CMAKE_AUTOMOC ON)
 
 set(LRDESIGNER_FILES
@@ -7,12 +9,12 @@ set(LRDESIGNER_FILES
     mainicon.rc
 )
 
-add_executable(LRDesigner ${LRDESIGNER_FILES})
+add_executable(${PROJECT_NAME} ${LRDESIGNER_FILES})
 
-target_include_directories(LRDesigner PUBLIC ${PROJECT_SOURCE_DIR}/include)
-
-target_link_libraries(LRDesigner PUBLIC
+target_link_libraries(${PROJECT_NAME} PUBLIC
     Qt${QT_VERSION_MAJOR}::Core
     Qt${QT_VERSION_MAJOR}::Widgets
-    ${PROJECT_NAME}
+    Qt${QT_VERSION_MAJOR}::PrintSupport
+    Qt${QT_VERSION_MAJOR}::Qml
+    limereport-qt${QT_VERSION_MAJOR}
 )
diff --git a/include/lrglobal.h b/include/lrglobal.h
index ed0254a..95f9801 100644
--- a/include/lrglobal.h
+++ b/include/lrglobal.h
@@ -104,7 +104,7 @@ namespace Const{
     QString extractClassName(QString className);
     QString escapeSimbols(const QString& value);
     QString replaceHTMLSymbols(const QString &value);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 3)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 1)
     QVector<QString> normalizeCaptures(const QRegularExpressionMatch &reg);
 #else
     QVector<QString> normalizeCaptures(const QRegExp &reg);    
@@ -125,12 +125,12 @@ namespace Const{
     Q_DECLARE_FLAGS(PreviewHints, PreviewHint)
     Q_FLAGS(PreviewHints)
 
-    class ReportError : public std::runtime_error{
+    class LIMEREPORT_EXPORT ReportError : public std::runtime_error{
     public:
         ReportError(const QString& message);
     };
 
-    class ReportSettings{
+    class LIMEREPORT_EXPORT ReportSettings{
     public:
         ReportSettings():m_suppressAbsentFieldsAndVarsWarnings(false){}
         void setDefaultValues(){m_suppressAbsentFieldsAndVarsWarnings = false;}
@@ -140,13 +140,13 @@ namespace Const{
         bool m_suppressAbsentFieldsAndVarsWarnings;
     };
 
-    class IExternalPainter{
+    class LIMEREPORT_EXPORT IExternalPainter{
     public:
         virtual void paintByExternalPainter(const QString& objectName, QPainter* painter, const QStyleOptionGraphicsItem* options) = 0;
         virtual ~IExternalPainter();
     };
 
-    class IPainterProxy{
+    class LIMEREPORT_EXPORT IPainterProxy{
     public:
         virtual void setExternalPainter(IExternalPainter* externalPainter) = 0;
         virtual ~IPainterProxy();
@@ -157,8 +157,18 @@ namespace Const{
 #else
     typedef QStyleOptionViewItem StyleOptionViewItem;
 #endif
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 1)
+    QRegularExpression getRegEx(QString expression);
+    QRegularExpression getVariableRegEx();
+    QRegularExpression getFieldRegEx();
+    QRegularExpression getScriptRegEx();
+    QRegularExpression getGroupFunctionRegEx(QString functionName);
+    QRegularExpression getGroupFunctionNameRegEx(QString functionName);
+    QRegularExpression getNamedVariableRegEx(QString variableName);
+#endif
 
-    class Enums
+
+    class LIMEREPORT_EXPORT Enums
     {
     public:
         enum VariableDataType {Undefined, String, Bool, Int, Real, Date, Time, DateTime};
diff --git a/limereport/databrowser/lrdatabrowsertree.cpp b/limereport/databrowser/lrdatabrowsertree.cpp
index 2625602..53934f3 100644
--- a/limereport/databrowser/lrdatabrowsertree.cpp
+++ b/limereport/databrowser/lrdatabrowsertree.cpp
@@ -36,7 +36,11 @@ namespace LimeReport {
 DataBrowserTree::DataBrowserTree(QWidget *parent) :
     QTreeWidget(parent){}
 
+#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
+QMimeData *DataBrowserTree::mimeData(const QList<QTreeWidgetItem *> &items) const
+#else
 QMimeData *DataBrowserTree::mimeData(const QList<QTreeWidgetItem *> items) const
+#endif
 {
     QMimeData* result = QTreeWidget::mimeData(items);
     if (items.at(0)->type()==Row){
diff --git a/limereport/databrowser/lrdatabrowsertree.h b/limereport/databrowser/lrdatabrowsertree.h
index 3cbcdff..eb03791 100644
--- a/limereport/databrowser/lrdatabrowsertree.h
+++ b/limereport/databrowser/lrdatabrowsertree.h
@@ -42,7 +42,11 @@ public:
     enum NodeType{Connection, Table, Row, Category, Variable, ExternalVariable};
     explicit DataBrowserTree(QWidget *parent = 0);
 protected:
-    QMimeData* mimeData(const QList<QTreeWidgetItem *> items) const;
+#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
+    virtual QMimeData *mimeData(const QList<QTreeWidgetItem *> &items) const;
+#else
+    virtual QMimeData *mimeData(const QList<QTreeWidgetItem*> items) const;
+#endif
 
 public slots:
 
diff --git a/limereport/databrowser/lrsqleditdialog.cpp b/limereport/databrowser/lrsqleditdialog.cpp
index 7fe874f..92e5b3a 100644
--- a/limereport/databrowser/lrsqleditdialog.cpp
+++ b/limereport/databrowser/lrsqleditdialog.cpp
@@ -28,20 +28,18 @@
  *   GNU General Public License for more details.                          *
  ****************************************************************************/
 #include "lrsqleditdialog.h"
-#include "ui_lrsqleditdialog.h"
 #include "lrreportengine_p.h"
+#include "ui_lrsqleditdialog.h"
 
 #include <QDebug>
-#include <QSqlDatabase>
 #include <QMessageBox>
+#include <QSqlDatabase>
 
-namespace LimeReport{
+namespace LimeReport {
 
-SQLEditDialog::SQLEditDialog(QWidget *parent, LimeReport::DataSourceManager *dataSources, SQLDialogMode dialogMode) :
-    QDialog(parent),
-    ui(new Ui::SQLEditDialog),m_datasources(dataSources),m_dialogMode(dialogMode), m_oldDatasourceName(""),
-    m_settings(0), m_ownedSettings(false)
-{
+SQLEditDialog::SQLEditDialog(QWidget *parent, LimeReport::DataSourceManager *dataSources, SQLDialogMode dialogMode)
+    : QDialog(parent), ui(new Ui::SQLEditDialog), m_datasources(dataSources), m_dialogMode(dialogMode),
+      m_oldDatasourceName(""), m_settings(0), m_ownedSettings(false) {
     ui->setupUi(this);
     m_masterDatasources = new QCompleter(this);
     ui->leMaster->setCompleter(m_masterDatasources);
@@ -54,72 +52,72 @@ SQLEditDialog::SQLEditDialog(QWidget *parent, LimeReport::DataSourceManager *dat
     ui->rbSubQuery->setVisible(false);
     ui->leMaster->setVisible(false);
     ui->lbMaster->setVisible(false);
-    ui->fieldsMap->setHorizontalHeaderItem(0,new QTableWidgetItem("master"));
-    ui->fieldsMap->setHorizontalHeaderItem(1,new QTableWidgetItem("detail"));
+    ui->fieldsMap->setHorizontalHeaderItem(0, new QTableWidgetItem("master"));
+    ui->fieldsMap->setHorizontalHeaderItem(1, new QTableWidgetItem("detail"));
 
-#ifdef HAVE_QT5
     ui->fieldsMap->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
-#else
-    ui->fieldsMap->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
-#endif
+
     ui->pnlChildDatasource->setVisible(false);
     connect(ui->pbPreview, SIGNAL(pressed()), this, SLOT(slotPreviewData()));
     connect(ui->pbHidePreview, SIGNAL(pressed()), this, SLOT(slotHidePreview()));
 }
 
-SQLEditDialog::~SQLEditDialog()
-{
+SQLEditDialog::~SQLEditDialog() {
     delete ui;
     if (m_settings && m_ownedSettings)
         delete m_settings;
 }
 
-QSettings *SQLEditDialog::settings(){
-    if (m_settings){
+QSettings *SQLEditDialog::settings() {
+    if (m_settings) {
         return m_settings;
     } else {
-        m_settings = new QSettings("LimeReport",QCoreApplication::applicationName());
+        m_settings = new QSettings("LimeReport", QCoreApplication::applicationName());
         m_ownedSettings = true;
         return m_settings;
     }
 }
 
-void SQLEditDialog::setSettings(QSettings *value, bool owned){
-    if (m_settings && m_ownedSettings) delete m_settings;
+void SQLEditDialog::setSettings(QSettings *value, bool owned) {
+    if (m_settings && m_ownedSettings)
+        delete m_settings;
     m_settings = value;
     m_ownedSettings = owned;
 }
 
-void SQLEditDialog::accept()
-{
+void SQLEditDialog::accept() {
     SQLEditResult result;
 
-    if (ui->tabWidget->currentIndex() == 1){
+    if (ui->tabWidget->currentIndex() == 1) {
         result.resultMode = SQLEditResult::CSVText;
-    } else if (!ui->cbSubdetail->isChecked()){
-        result.resultMode=SQLEditResult::Query;
+    } else if (!ui->cbSubdetail->isChecked()) {
+        result.resultMode = SQLEditResult::Query;
     } else {
-        if (ui->rbSubQuery->isChecked()) result.resultMode = SQLEditResult::SubQuery;
-        else result.resultMode=SQLEditResult::SubProxy;
+        if (ui->rbSubQuery->isChecked())
+            result.resultMode = SQLEditResult::SubQuery;
+        else
+            result.resultMode = SQLEditResult::SubProxy;
     }
 
     result.connectionName = ConnectionDesc::connectionNameForReport(ui->cbbConnection->currentText());
-    result.datasourceName=ui->leDatasourceName->text();
+    result.datasourceName = ui->leDatasourceName->text();
     result.sql = ui->sqlText->toPlainText();
     result.csv = ui->csvText->toPlainText();
     result.dialogMode = m_dialogMode;
     result.oldDatasourceName = m_oldDatasourceName;
     result.subdetail = ui->cbSubdetail->isChecked();
-    result.masterDatasource=ui->leMaster->text();
-    result.childDataSource=ui->leChild->text();
+    result.masterDatasource = ui->leMaster->text();
+    result.childDataSource = ui->leChild->text();
     result.separator = ui->leSeparator->text();
     result.firstRowIsHeader = ui->cbUseFirstRowAsHeader->isChecked();
 
-    if (ui->fieldsMap->rowCount() > 0){
-        for(int i=0; i< ui->fieldsMap->rowCount(); ++i){
+    if (ui->fieldsMap->rowCount() > 0) {
+        for (int i = 0; i < ui->fieldsMap->rowCount(); ++i) {
             LimeReport::FieldsCorrelation fieldsCorrelation;
-            fieldsCorrelation.master = ui->fieldsMap->item(i,0) ? ui->fieldsMap->item(i,0)->data(Qt::DisplayRole).toString() : "";
-            fieldsCorrelation.detail = ui->fieldsMap->item(i,1) ? ui->fieldsMap->item(i,1)->data(Qt::DisplayRole).toString() : "";
+            fieldsCorrelation.master =
+                ui->fieldsMap->item(i, 0) ? ui->fieldsMap->item(i, 0)->data(Qt::DisplayRole).toString() : "";
+            fieldsCorrelation.detail =
+                ui->fieldsMap->item(i, 1) ? ui->fieldsMap->item(i, 1)->data(Qt::DisplayRole).toString() : "";
             result.fieldMap.append(fieldsCorrelation);
         }
     }
@@ -128,87 +126,83 @@ void SQLEditDialog::accept()
         check();
         emit signalSqlEditingFinished(result);
         QDialog::accept();
-    }catch(LimeReport::ReportError &exception){
-        QMessageBox::critical(this,tr("Error"),exception.what());
+    } catch (LimeReport::ReportError &exception) {
+        QMessageBox::critical(this, tr("Error"), exception.what());
     }
 }
 
-void SQLEditDialog::showEvent(QShowEvent *)
-{
+void SQLEditDialog::showEvent(QShowEvent *) {
     ui->lblInfo->setVisible(false);
     initConnections();
     readSettings();
 }
 
-void SQLEditDialog::closeEvent(QCloseEvent *)
-{
-    writeSetting();
-}
+void SQLEditDialog::closeEvent(QCloseEvent *) { writeSetting(); }
 
-void SQLEditDialog::hideEvent(QHideEvent *)
-{
-    writeSetting();
-}
+void SQLEditDialog::hideEvent(QHideEvent *) { writeSetting(); }
 
-void SQLEditDialog::check()
-{
-    if (ui->leDatasourceName->text().isEmpty()) throw LimeReport::ReportError(tr("Datasource Name is empty!"));
-    if (ui->sqlText->toPlainText().isEmpty() && (!ui->rbProxy) ) throw LimeReport::ReportError(tr("SQL is empty!"));
-    if (m_dialogMode==AddMode){
-        if (m_datasources->containsDatasource(ui->leDatasourceName->text())){
-            throw LimeReport::ReportError(QString(tr("Datasource with name: \"%1\" already exists!")).arg(ui->leDatasourceName->text()));
+void SQLEditDialog::check() {
+    if (ui->leDatasourceName->text().isEmpty())
+        throw LimeReport::ReportError(tr("Datasource Name is empty!"));
+    if (ui->sqlText->toPlainText().isEmpty() && (!ui->rbProxy))
+        throw LimeReport::ReportError(tr("SQL is empty!"));
+    if (m_dialogMode == AddMode) {
+        if (m_datasources->containsDatasource(ui->leDatasourceName->text())) {
+            throw LimeReport::ReportError(
+                QString(tr("Datasource with name: \"%1\" already exists!")).arg(ui->leDatasourceName->text()));
         }
     }
 }
 
-void SQLEditDialog::initConnections()
-{
-    foreach(QString connectionName, QSqlDatabase::connectionNames()){
-        ui->cbbConnection->addItem(QIcon(":/databrowser/images/plug-connect.png"),ConnectionDesc::connectionNameForUser(connectionName));
+void SQLEditDialog::initConnections() {
+    foreach (QString connectionName, QSqlDatabase::connectionNames()) {
+        ui->cbbConnection->addItem(QIcon(":/databrowser/images/plug-connect.png"),
+                                   ConnectionDesc::connectionNameForUser(connectionName));
     }
 
-    foreach(QString connectionName, m_datasources->connectionNames()){
-        connectionName = (connectionName.compare(QSqlDatabase::defaultConnection)==0) ?
-                         tr("defaultConnection") : connectionName;
-        if (ui->cbbConnection->findText(connectionName,Qt::MatchExactly )==-1)
-            ui->cbbConnection->addItem(QIcon(":/databrowser/images/plug-disconnect.png"),ConnectionDesc::connectionNameForUser(connectionName));
+    foreach (QString connectionName, m_datasources->connectionNames()) {
+        connectionName =
+            (connectionName.compare(QSqlDatabase::defaultConnection) == 0) ? tr("defaultConnection") : connectionName;
+        if (ui->cbbConnection->findText(connectionName, Qt::MatchExactly) == -1)
+            ui->cbbConnection->addItem(QIcon(":/databrowser/images/plug-disconnect.png"),
+                                       ConnectionDesc::connectionNameForUser(connectionName));
     }
 
     ui->cbbConnection->setCurrentIndex(ui->cbbConnection->findText(m_defaultConnection));
-    if (!m_oldDatasourceName.isEmpty()){
-        ui->cbbConnection->setCurrentIndex(ui->cbbConnection->findText(ConnectionDesc::connectionNameForUser(m_datasources->connectionName(m_oldDatasourceName))));
+    if (!m_oldDatasourceName.isEmpty()) {
+        ui->cbbConnection->setCurrentIndex(ui->cbbConnection->findText(
+            ConnectionDesc::connectionNameForUser(m_datasources->connectionName(m_oldDatasourceName))));
     }
 }
 
-void SQLEditDialog::setDataSources(LimeReport::DataSourceManager *dataSources, QString datasourceName)
-{
-    m_datasources=dataSources;
-    if (!datasourceName.isEmpty()){
+void SQLEditDialog::setDataSources(LimeReport::DataSourceManager *dataSources, QString datasourceName) {
+    m_datasources = dataSources;
+    if (!datasourceName.isEmpty()) {
         ui->cbSubdetail->setEnabled(true);
-        m_oldDatasourceName=datasourceName;
+        m_oldDatasourceName = datasourceName;
         ui->leDatasourceName->setText(datasourceName);
         ui->sqlText->setText(dataSources->queryText(datasourceName));
-        if (dataSources->isQuery(datasourceName)){
+        if (dataSources->isQuery(datasourceName)) {
             initQueryMode();
         }
-        if (dataSources->isSubQuery(datasourceName)){
+        if (dataSources->isSubQuery(datasourceName)) {
             initSubQueryMode();
             ui->leMaster->setText(dataSources->subQueryByName(datasourceName)->master());
         }
-        if (dataSources->isProxy(datasourceName)){
+        if (dataSources->isProxy(datasourceName)) {
             initProxyMode();
-            LimeReport::ProxyDesc* proxyDesc = dataSources->proxyByName(datasourceName);
+            LimeReport::ProxyDesc *proxyDesc = dataSources->proxyByName(datasourceName);
             ui->leChild->setText(proxyDesc->child());
             ui->leMaster->setText(proxyDesc->master());
-            int curIndex=0;
-            foreach(LimeReport::FieldMapDesc* fields, *proxyDesc->fieldsMap()){
-                ui->fieldsMap->setRowCount(curIndex+1);
-                ui->fieldsMap->setItem(curIndex,0,new QTableWidgetItem(fields->master()));
-                ui->fieldsMap->setItem(curIndex,1,new QTableWidgetItem(fields->detail()));
+            int curIndex = 0;
+            foreach (LimeReport::FieldMapDesc *fields, *proxyDesc->fieldsMap()) {
+                ui->fieldsMap->setRowCount(curIndex + 1);
+                ui->fieldsMap->setItem(curIndex, 0, new QTableWidgetItem(fields->master()));
+                ui->fieldsMap->setItem(curIndex, 1, new QTableWidgetItem(fields->detail()));
                 curIndex++;
             }
         }
-        if (dataSources->isCSV(datasourceName)){
+        if (dataSources->isCSV(datasourceName)) {
             ui->csvText->setPlainText(dataSources->csvByName(datasourceName)->csvText());
             ui->leSeparator->setText(dataSources->csvByName(datasourceName)->separator());
             ui->cbUseFirstRowAsHeader->setChecked(dataSources->csvByName(datasourceName)->firstRowIsHeader());
@@ -217,59 +211,55 @@ void SQLEditDialog::setDataSources(LimeReport::DataSourceManager *dataSources, Q
     }
 }
 
-void SQLEditDialog::setDefaultConnection(QString defaultConnection)
-{
+void SQLEditDialog::setDefaultConnection(QString defaultConnection) {
     m_defaultConnection = ConnectionDesc::connectionNameForUser(defaultConnection);
 }
 
-void SQLEditDialog::slotDataSourceNameEditing()
-{
-    if (m_dialogMode==AddMode){
-        QPalette palette=ui->leDatasourceName->palette();
-        if (m_datasources->containsDatasource(ui->leDatasourceName->text())){
-            palette.setColor(QPalette::Text,Qt::red);
+void SQLEditDialog::slotDataSourceNameEditing() {
+    if (m_dialogMode == AddMode) {
+        QPalette palette = ui->leDatasourceName->palette();
+        if (m_datasources->containsDatasource(ui->leDatasourceName->text())) {
+            palette.setColor(QPalette::Text, Qt::red);
             ui->leDatasourceName->setPalette(palette);
-            ui->lblInfo->setText(QString(tr("Datasource with name %1 already exist")).arg(ui->leDatasourceName->text()));
+            ui->lblInfo->setText(
+                QString(tr("Datasource with name %1 already exist")).arg(ui->leDatasourceName->text()));
             ui->lblInfo->setVisible(true);
         } else {
-            palette.setColor(QPalette::Text,QApplication::palette().text().color());
+            palette.setColor(QPalette::Text, QApplication::palette().text().color());
             ui->leDatasourceName->setPalette(palette);
             ui->lblInfo->setVisible(false);
         }
     }
 }
 
-void SQLEditDialog::on_cbSubdetail_clicked(bool checked)
-{
-    if (checked){
-        m_masterDatasources->setModel(new QStringListModel(m_datasources->dataSourceNames(),m_datasources));
+void SQLEditDialog::on_cbSubdetail_clicked(bool checked) {
+    if (checked) {
+        m_masterDatasources->setModel(new QStringListModel(m_datasources->dataSourceNames(), m_datasources));
     }
     ui->leMaster->setEnabled(checked);
     ui->rbProxy->setEnabled(checked);
     ui->rbSubQuery->setEnabled(checked);
-    if ((checked)&&(ui->rbProxy->isChecked())) initProxyMode();
-    if ((checked)&&(ui->rbSubQuery->isChecked())) initSubQueryMode();
-    if (!checked) initQueryMode();
+    if ((checked) && (ui->rbProxy->isChecked()))
+        initProxyMode();
+    if ((checked) && (ui->rbSubQuery->isChecked()))
+        initSubQueryMode();
+    if (!checked)
+        initQueryMode();
 }
 
-void SQLEditDialog::on_rbProxy_clicked(bool checked)
-{
-    if (checked) initProxyMode();
+void SQLEditDialog::on_rbProxy_clicked(bool checked) {
+    if (checked)
+        initProxyMode();
 }
 
-void SQLEditDialog::on_rbSubQuery_clicked(bool checked)
-{
-    if (checked) initSubQueryMode();
+void SQLEditDialog::on_rbSubQuery_clicked(bool checked) {
+    if (checked)
+        initSubQueryMode();
 }
 
-void SQLEditDialog::on_pbAddField_clicked()
-{
-    ui->fieldsMap->setRowCount(ui->fieldsMap->rowCount()+1);
-}
+void SQLEditDialog::on_pbAddField_clicked() { ui->fieldsMap->setRowCount(ui->fieldsMap->rowCount() + 1); }
 
-
-void SQLEditDialog::initQueryMode()
-{
+void SQLEditDialog::initQueryMode() {
     ui->gbSQL->setVisible(true);
     ui->gbFieldsMap->setVisible(false);
     ui->pnlChildDatasource->setVisible(false);
@@ -278,12 +268,11 @@ void SQLEditDialog::initQueryMode()
     ui->cbSubdetail->setChecked(false);
     ui->leMaster->setVisible(false);
     ui->lbMaster->setVisible(false);
-    //ui->tabWidget->removeTab(1);
+    // ui->tabWidget->removeTab(1);
     ui->tabWidget->addTab(ui->csvTab, tr("CSV"));
 }
 
-void SQLEditDialog::initSubQueryMode()
-{
+void SQLEditDialog::initSubQueryMode() {
     ui->gbSQL->setVisible(true);
     ui->gbFieldsMap->setVisible(false);
     ui->pnlChildDatasource->setVisible(false);
@@ -297,8 +286,7 @@ void SQLEditDialog::initSubQueryMode()
     ui->tabWidget->removeTab(1);
 }
 
-void SQLEditDialog::initProxyMode()
-{
+void SQLEditDialog::initProxyMode() {
     ui->gbSQL->setVisible(false);
     ui->gbFieldsMap->setVisible(true);
     ui->pnlChildDatasource->setVisible(true);
@@ -313,23 +301,17 @@ void SQLEditDialog::initProxyMode()
     ui->tabWidget->removeTab(1);
 }
 
-void SQLEditDialog::initCSVMode()
-{
-    ui->tabWidget->setCurrentWidget(ui->csvTab);
-}
+void SQLEditDialog::initCSVMode() { ui->tabWidget->setCurrentWidget(ui->csvTab); }
 
-void SQLEditDialog::slotPreviewData()
-{
-    if (ui->cbbConnection->currentText().isEmpty()){
-        QMessageBox::critical(this,tr("Attention"),tr("Connection is not specified"));
+void SQLEditDialog::slotPreviewData() {
+    if (ui->cbbConnection->currentText().isEmpty()) {
+        QMessageBox::critical(this, tr("Attention"), tr("Connection is not specified"));
         return;
     }
-    m_previewModel = m_datasources->previewSQL(
-                ConnectionDesc::connectionNameForReport(ui->cbbConnection->currentText()),
-                ui->sqlText->toPlainText(),
-                ui->leMaster->text()
-    );
-    if (m_previewModel){
+    m_previewModel =
+        m_datasources->previewSQL(ConnectionDesc::connectionNameForReport(ui->cbbConnection->currentText()),
+                                  ui->sqlText->toPlainText(), ui->leMaster->text());
+    if (m_previewModel) {
         ui->tvPreview->setModel(m_previewModel.data());
         ui->gbDataPreview->setVisible(true);
         ui->pbPreview->setText(tr("Refresh"));
@@ -337,49 +319,37 @@ void SQLEditDialog::slotPreviewData()
     } else {
         if (ui->gbDataPreview->isVisible())
             hidePreview();
-        QMessageBox::critical(this,tr("Attention"),m_datasources->lastError());
+        QMessageBox::critical(this, tr("Attention"), m_datasources->lastError());
     }
 }
 
-void SQLEditDialog::slotHidePreview()
-{
-    hidePreview();
-}
+void SQLEditDialog::slotHidePreview() { hidePreview(); }
 
-void SQLEditDialog::writeSetting()
-{
-    if (settings()!=0){
+void SQLEditDialog::writeSetting() {
+    if (settings() != 0) {
         settings()->beginGroup("SQLEditor");
-        settings()->setValue("Geometry",saveGeometry());
+        settings()->setValue("Geometry", saveGeometry());
         settings()->endGroup();
     }
 }
 
-void SQLEditDialog::readSettings()
-{
-    if (settings()==0) return;
+void SQLEditDialog::readSettings() {
+    if (settings() == 0)
+        return;
     settings()->beginGroup("SQLEditor");
     QVariant v = settings()->value("Geometry");
-    if (v.isValid()){
+    if (v.isValid()) {
         restoreGeometry(v.toByteArray());
     }
     settings()->endGroup();
 }
 
-void SQLEditDialog::hidePreview()
-{
+void SQLEditDialog::hidePreview() {
     ui->gbDataPreview->setVisible(false);
     ui->pbPreview->setText(tr("Preview"));
     ui->pbHidePreview->setVisible(false);
 }
 
-void SQLEditDialog::on_pbDelField_clicked()
-{
-    ui->fieldsMap->removeRow(ui->fieldsMap->currentRow());
-}
+void SQLEditDialog::on_pbDelField_clicked() { ui->fieldsMap->removeRow(ui->fieldsMap->currentRow()); }
 
 } // namespace LimeReport
-
-
-
-
diff --git a/limereport/images/border_settings.png b/limereport/images/border_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bae2c8c8626033ef5c59aed46123ad2a09cae81
GIT binary patch
literal 5843
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
C$=tdC

literal 0
HcmV?d00001

diff --git a/limereport/items/editors/lritemsborderseditorwidget.cpp b/limereport/items/editors/lritemsborderseditorwidget.cpp
index 7b4853a..a49aef2 100644
--- a/limereport/items/editors/lritemsborderseditorwidget.cpp
+++ b/limereport/items/editors/lritemsborderseditorwidget.cpp
@@ -44,7 +44,7 @@ void ItemsBordersEditorWidget::setItemEvent(BaseDesignIntf* item)
         updateValues((BaseDesignIntf::BorderLines)borders.toInt());
         setEnabled(true);
     }
-    itm = item;
+    m_item = item;
 }
 
 void ItemsBordersEditorWidget::properyChangedEvent(const QString& property, const QVariant& oldValue, const QVariant& newValue)
@@ -72,21 +72,18 @@ void ItemsBordersEditorWidget::allBordesClicked()
     updateValues((BaseDesignIntf::BorderLines)borders);
 }
 
-void ItemsBordersEditorWidget::buttonClicked(bool)
-{
-
-}
+void ItemsBordersEditorWidget::buttonClicked(bool){}
 
 void ItemsBordersEditorWidget::editBorderClicked()
 {
-    lrbordereditor be;
-    be.loadItem(itm);
-    if(be.exec() == QDialog::Rejected)return;
+    BorderEditor be;
+    be.loadItem(m_item);
+    if ( be.exec() == QDialog::Rejected ) return;
     updateValues(be.borderSides());
-    itm->setBorderLinesFlags(be.borderSides());
-    itm->setBorderLineSize(be.border_width());
-    itm->setBorderStyle((LimeReport::BaseDesignIntf::BorderStyle)be.border_style());
-    itm->setBorderColor(be.borderColor());
+    m_item->setBorderLinesFlags(be.borderSides());
+    m_item->setBorderLineSize(be.borderWidth());
+    m_item->setBorderStyle((LimeReport::BaseDesignIntf::BorderStyle)be.borderStyle());
+    m_item->setBorderColor(be.borderColor());
 }
 
 void ItemsBordersEditorWidget::initEditor()
@@ -129,7 +126,7 @@ void ItemsBordersEditorWidget::initEditor()
     addAction(m_allLines);
     addSeparator();
     m_BorderEditor = new QAction(tr("Edit border"),this);
-    m_BorderEditor->setIcon(QIcon(":/report/images/allLines"));
+    m_BorderEditor->setIcon(QIcon(":/report/images/borderEditor"));
     connect(m_BorderEditor,SIGNAL(triggered()),this,SLOT(editBorderClicked()));
     addAction(m_BorderEditor);
 
@@ -140,20 +137,20 @@ void ItemsBordersEditorWidget::initEditor()
 void ItemsBordersEditorWidget::updateValues(BaseDesignIntf::BorderLines borders)
 {
     m_changing = true;
-    m_topLine->setChecked(borders&BaseDesignIntf::TopLine);
-    m_bottomLine->setChecked(borders&BaseDesignIntf::BottomLine);
-    m_leftLine->setChecked(borders&BaseDesignIntf::LeftLine);
-    m_rightLine->setChecked(borders&BaseDesignIntf::RightLine);
+    m_topLine->setChecked(borders & BaseDesignIntf::TopLine);
+    m_bottomLine->setChecked(borders & BaseDesignIntf::BottomLine);
+    m_leftLine->setChecked(borders & BaseDesignIntf::LeftLine);
+    m_rightLine->setChecked(borders & BaseDesignIntf::RightLine);
     m_changing = false;
 }
 
 BaseDesignIntf::BorderLines ItemsBordersEditorWidget::createBorders()
 {
     int borders = 0;
-    borders += (m_topLine->isChecked())?BaseDesignIntf::TopLine:0;
-    borders += (m_bottomLine->isChecked())?BaseDesignIntf::BottomLine:0;
-    borders += (m_leftLine->isChecked())?BaseDesignIntf::LeftLine:0;
-    borders += (m_rightLine->isChecked())?BaseDesignIntf::RightLine:0;
+    borders += (m_topLine->isChecked()) ? BaseDesignIntf::TopLine:0;
+    borders += (m_bottomLine->isChecked()) ? BaseDesignIntf::BottomLine:0;
+    borders += (m_leftLine->isChecked()) ? BaseDesignIntf::LeftLine:0;
+    borders += (m_rightLine->isChecked()) ? BaseDesignIntf::RightLine:0;
     return (BaseDesignIntf::BorderLines)borders;
 }
 
@@ -180,6 +177,21 @@ void ItemsBordersEditorWidgetForDesigner::allBordesClicked()
     ItemsBordersEditorWidget::allBordesClicked();
     m_reportEditor->setBorders(createBorders());
 }
+
+void ItemsBordersEditorWidgetForDesigner::editBorderClicked()
+{
+    BorderEditor be;
+    be.loadItem(m_item);
+    if ( be.exec() == QDialog::Rejected ) return;
+
+    m_reportEditor->setBordersExt(
+                be.borderSides(),
+                be.borderWidth(),
+                (LimeReport::BaseDesignIntf::BorderStyle)be.borderStyle(),
+                be.borderColor()
+    );
+}
+
 #endif
 
 } //namespace LimeReport
diff --git a/limereport/items/editors/lritemsborderseditorwidget.h b/limereport/items/editors/lritemsborderseditorwidget.h
index 2538258..ef83dbc 100644
--- a/limereport/items/editors/lritemsborderseditorwidget.h
+++ b/limereport/items/editors/lritemsborderseditorwidget.h
@@ -49,11 +49,12 @@ protected slots:
     virtual void noBordesClicked();
     virtual void allBordesClicked();
     virtual void buttonClicked(bool);
-    void editBorderClicked();
+    virtual void editBorderClicked();
 protected:
     void setItemEvent(BaseDesignIntf *item);
     void properyChangedEvent(const QString &property, const QVariant &oldValue, const QVariant &newValue);
     BaseDesignIntf::BorderLines createBorders();
+    BaseDesignIntf *m_item;
 private:
     void initEditor();
     void updateValues(BaseDesignIntf::BorderLines borders);
@@ -66,7 +67,7 @@ private:
     QAction* m_BorderEditor;
     bool m_changing;
     int m_borders;
-    BaseDesignIntf *itm;
+
 };
 
 #ifdef HAVE_REPORT_DESIGNER
@@ -79,6 +80,7 @@ protected slots:
     void buttonClicked(bool);
     void noBordesClicked();
     void allBordesClicked();
+    void editBorderClicked();
 private:
     ReportDesignWidget* m_reportEditor;
 
diff --git a/limereport/items/lrbordereditor.cpp b/limereport/items/lrbordereditor.cpp
index e8e2af3..63d8b88 100644
--- a/limereport/items/lrbordereditor.cpp
+++ b/limereport/items/lrbordereditor.cpp
@@ -2,181 +2,155 @@
 #include "ui_lrbordereditor.h"
 #include <QColorDialog>
 #include "lrbasedesignintf.h"
-lrbordereditor::lrbordereditor(QWidget *parent) :
+
+namespace LimeReport{
+
+BorderEditor::BorderEditor(QWidget *parent) :
     QDialog(parent),
-    ui(new Ui::lrbordereditor)
+    ui(new Ui::BorderEditor),
+    m_borderStyle(1),
+    m_borderWidth(1)
 {
     ui->setupUi(this);
-
-    connect(ui->borderFrame,SIGNAL(borderSideClicked(int, bool)), this, SLOT(checkToolButtons(int, bool)));
+    connect(
+        ui->borderFrame, SIGNAL(borderSideClicked(LimeReport::BaseDesignIntf::BorderSide, bool)),
+        this, SLOT(checkToolButtons(LimeReport::BaseDesignIntf::BorderSide, bool))
+    );
 }
 
-void lrbordereditor::loadItem(LimeReport::BaseDesignIntf *i)
+void BorderEditor::loadItem(LimeReport::BaseDesignIntf *item)
 {
-    item = i;
-    if(item->borderLines() & LimeReport::BaseDesignIntf::TopLine)
-    {
-        emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::TopLine,true);
+    m_item = item;
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::TopLine,
+                                            item->borderLines() & LimeReport::BaseDesignIntf::TopLine);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::LeftLine,
+                                            item->borderLines() & LimeReport::BaseDesignIntf::LeftLine);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::RightLine,
+                                            item->borderLines() & LimeReport::BaseDesignIntf::RightLine);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::BottomLine,
+                                            item->borderLines() & LimeReport::BaseDesignIntf::BottomLine);
 
-    }
-    if(item->borderLines() & LimeReport::BaseDesignIntf::LeftLine)
-    {
-        emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::LeftLine,true);
-
-    }
-    if(item->borderLines() & LimeReport::BaseDesignIntf::RightLine)
-    {
-        emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::RightLine,true);
-
-    }
-    if(item->borderLines() & LimeReport::BaseDesignIntf::BottomLine)
-    {
-        emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::BottomLine,true);
-    }
     QPen pen;
     pen.setWidthF(item->borderLineSize());
     pen.setColor(item->borderColor());
     pen.setStyle((Qt::PenStyle)item->borderStyle());
     ui->borderFrame->setPen(pen);
-    border_color = item->borderColor().name();
+    m_borderColor = item->borderColor().name();
     ui->listWidget->setCurrentRow((Qt::PenStyle)item->borderStyle());
     ui->comboBox->setCurrentText(QString::number(item->borderLineSize()));
-            borderWidth = ui->comboBox->currentText().toDouble();
-    borderStyle =ui->listWidget->currentRow();
-    ui->pushButton->setStyleSheet(QString("#pushButton{background-color:%1;}").arg(border_color));
+    m_borderWidth = ui->comboBox->currentText().toDouble();
+    m_borderStyle =ui->listWidget->currentRow();
+    ui->colorIndicator->setStyleSheet(QString("background-color:%1;").arg(m_borderColor));
 }
 
-LimeReport::BaseDesignIntf::BorderLines lrbordereditor::borderSides()
+LimeReport::BaseDesignIntf::BorderLines BorderEditor::borderSides()
 {
     int borders = 0;
-    borders += (ui->topLine->isChecked())?LimeReport::BaseDesignIntf::TopLine:0;
-    borders += (ui->bottomLine->isChecked())?LimeReport::BaseDesignIntf::BottomLine:0;
-    borders += (ui->leftLine->isChecked())?LimeReport::BaseDesignIntf::LeftLine:0;
-    borders += (ui->rightLine->isChecked())?LimeReport::BaseDesignIntf::RightLine:0;
-    return (LimeReport::BaseDesignIntf::BorderLines)borders;
+    borders += (ui->topLine->isChecked()) ? LimeReport::BaseDesignIntf::TopLine : 0;
+    borders += (ui->bottomLine->isChecked()) ? LimeReport::BaseDesignIntf::BottomLine : 0;
+    borders += (ui->leftLine->isChecked()) ? LimeReport::BaseDesignIntf::LeftLine : 0;
+    borders += (ui->rightLine->isChecked()) ? LimeReport::BaseDesignIntf::RightLine : 0;
+    return (LimeReport::BaseDesignIntf::BorderLines) borders;
 }
 
-LimeReport::BaseDesignIntf::BorderStyle lrbordereditor::border_style()
+LimeReport::BaseDesignIntf::BorderStyle BorderEditor::borderStyle()
 {
-    return (LimeReport::BaseDesignIntf::BorderStyle)borderStyle;
+    return (LimeReport::BaseDesignIntf::BorderStyle) m_borderStyle;
 }
 
-QString lrbordereditor::borderColor()
+QString BorderEditor::borderColor()
 {
-    return border_color;
+    return m_borderColor;
 }
 
-double lrbordereditor::border_width()
+double BorderEditor::borderWidth()
 {
-    return borderWidth;
+    return m_borderWidth;
 }
 
-lrbordereditor::~lrbordereditor()
+BorderEditor::~BorderEditor()
 {
     delete ui;
 }
 
-void lrbordereditor::on_listWidget_currentRowChanged(int currentRow)
+void BorderEditor::on_listWidget_currentRowChanged(int currentRow)
 {
     QPen pen = ui->borderFrame->pen();
     pen.setStyle((Qt::PenStyle)currentRow);
-    borderStyle = currentRow;
+    m_borderStyle = currentRow;
     ui->borderFrame->setPen(pen);
-
-
 }
 
-
-void lrbordereditor::on_comboBox_currentTextChanged(const QString &arg1)
+void BorderEditor::on_comboBox_currentTextChanged(const QString &arg1)
 {
     QPen pen = ui->borderFrame->pen();
     pen.setWidthF(arg1.toDouble());
     ui->borderFrame->setPen(pen);
-    borderWidth = arg1.toDouble();
+    m_borderWidth = arg1.toDouble();
 }
 
-
-void lrbordereditor::on_pushButton_clicked()
+void BorderEditor::checkToolButtons(LimeReport::BaseDesignIntf::BorderSide side, bool check)
 {
-    QColorDialog cd(this);
-    if(cd.exec() == QDialog::Rejected)return;
-    QPen pen = ui->borderFrame->pen();
-    pen.setColor(cd.selectedColor().name());
-    border_color = pen.color().name();
-
-    ui->pushButton->setStyleSheet(QString("#pushButton{background-color:%1;}").arg(border_color));
-    ui->borderFrame->setPen(pen);
-}
-
-
-void lrbordereditor::on_toolButton_4_clicked()
-{
-    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::TopLine,true);
-    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::BottomLine,true);
-    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::LeftLine,true);
-    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::RightLine,true);
-    QPen pen = ui->borderFrame->pen();
-
-    ui->borderFrame->setPen(pen);
-}
-
-
-void lrbordereditor::on_noLines_clicked()
-{
-    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::TopLine,false);
-    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::BottomLine,false);
-    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::LeftLine,false);
-    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::RightLine,false);
-
-}
-
-
-void lrbordereditor::on_topLine_clicked()
-{
-
-    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::TopLine,ui->topLine->isChecked());
-
-}
-
-void lrbordereditor::checkToolButtons(int side, bool check)
-{
-
     switch(side)
     {
-    case LimeReport::BaseDesignIntf::BorderSide::TopLine:
-    {
-        ui->topLine->setChecked(check);
-    }break;
-    case LimeReport::BaseDesignIntf::BorderSide::BottomLine:
-    {
-        ui->bottomLine->setChecked(check);
-    }break;
-    case LimeReport::BaseDesignIntf::BorderSide::LeftLine:
-    {
-        ui->leftLine->setChecked(check);
-    }break;
-    case LimeReport::BaseDesignIntf::BorderSide::RightLine:
-    {
-        ui->rightLine->setChecked(check);
-    }break;
+        case BaseDesignIntf::BorderSide::TopLine:
+            ui->topLine->setChecked(check);
+            break;
+        case BaseDesignIntf::BorderSide::BottomLine:
+            ui->bottomLine->setChecked(check);
+            break;
+        case BaseDesignIntf::BorderSide::LeftLine:
+            ui->leftLine->setChecked(check);
+            break;
+        case BaseDesignIntf::BorderSide::RightLine:
+            ui->rightLine->setChecked(check);
+            break;
     }
 }
 
+void BorderEditor::on_topLine_clicked(bool checked){
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::TopLine, checked);
+}
 
-void lrbordereditor::on_bottomLine_clicked()
-{
-    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::BottomLine,ui->bottomLine->isChecked());
+void BorderEditor::on_bottomLine_clicked(bool checked){
+    emit ui->borderFrame->borderSideClicked(BaseDesignIntf::BorderSide::BottomLine, checked);
+}
+
+void BorderEditor::on_leftLine_clicked(bool checked){
+    emit ui->borderFrame->borderSideClicked(BaseDesignIntf::BorderSide::LeftLine, checked);
+}
+
+void BorderEditor::on_rightLine_clicked(bool checked){
+    emit ui->borderFrame->borderSideClicked(BaseDesignIntf::BorderSide::RightLine, checked);
 }
 
 
-void lrbordereditor::on_leftLine_clicked()
+void BorderEditor::on_allLines_clicked()
 {
-    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::LeftLine,ui->leftLine->isChecked());
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::TopLine, true);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::BottomLine, true);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::LeftLine, true);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::RightLine, true);
+}
+
+void BorderEditor::on_noLines_clicked()
+{
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::TopLine, false);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::BottomLine, false);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::LeftLine, false);
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::RightLine, false);
 }
 
 
-void lrbordereditor::on_toolButton_3_clicked()
+void BorderEditor::on_selectColor_clicked()
 {
-    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::RightLine,ui->rightLine->isChecked());
+    QColorDialog cd(this);
+    if(cd.exec() == QDialog::Rejected) return;
+    QPen pen = ui->borderFrame->pen();
+    pen.setColor(cd.selectedColor().name());
+    m_borderColor = pen.color().name();
+    ui->colorIndicator->setStyleSheet(QString("background-color:%1;").arg(m_borderColor));
+    ui->borderFrame->setPen(pen);
 }
 
+} // namespace LimeReport
diff --git a/limereport/items/lrbordereditor.h b/limereport/items/lrbordereditor.h
index 5c2c9ba..2baf2f3 100644
--- a/limereport/items/lrbordereditor.h
+++ b/limereport/items/lrbordereditor.h
@@ -3,54 +3,47 @@
 
 #include <QDialog>
 #include "lrbasedesignintf.h"
+
+namespace LimeReport{
+
 namespace Ui {
-class lrbordereditor;
+    class BorderEditor;
 }
 
-class lrbordereditor : public QDialog
+
+class LIMEREPORT_EXPORT BorderEditor : public QDialog
 {
     Q_OBJECT
 
 public:
-    explicit lrbordereditor(QWidget *parent = nullptr);
-    void loadItem(LimeReport::BaseDesignIntf *i);
+    explicit BorderEditor(QWidget *parent = nullptr);
+    void loadItem(LimeReport::BaseDesignIntf *item);
     LimeReport::BaseDesignIntf::BorderLines borderSides();
-    LimeReport::BaseDesignIntf::BorderStyle border_style();
+    LimeReport::BaseDesignIntf::BorderStyle borderStyle();
     QString borderColor();
-    double border_width();
-
-
-    ~lrbordereditor();
+    double borderWidth();
+    ~BorderEditor();
 
 private slots:
     void on_listWidget_currentRowChanged(int currentRow);
-
     void on_comboBox_currentTextChanged(const QString &arg1);
-
-    void on_pushButton_clicked();
-
-    void on_toolButton_4_clicked();
-
     void on_noLines_clicked();
-
-    void on_topLine_clicked();
-    void checkToolButtons(int side, bool check);
-
-    void on_bottomLine_clicked();
-
-    void on_leftLine_clicked();
-
-    void on_toolButton_3_clicked();
+    void on_topLine_clicked(bool checked);
+    void on_bottomLine_clicked(bool checked);
+    void on_leftLine_clicked(bool checked);
+    void on_rightLine_clicked(bool checked);
+    void on_allLines_clicked();
+    void checkToolButtons(LimeReport::BaseDesignIntf::BorderSide side, bool check);
+    void on_selectColor_clicked();
 
 private:
-    Ui::lrbordereditor *ui;
-    LimeReport::BaseDesignIntf *item;
-    QString border_color;
-    int borderStyle = 1;
-    double borderWidth = 1;
-
-
+    Ui::BorderEditor *ui;
+    LimeReport::BaseDesignIntf *m_item;
+    QString m_borderColor;
+    int m_borderStyle;
+    double m_borderWidth;
 };
 
+} // namespace LimeReport
 
 #endif // LRBORDEREDITOR_H
diff --git a/limereport/items/lrbordereditor.ui b/limereport/items/lrbordereditor.ui
index 7cd7a39..fb975d3 100644
--- a/limereport/items/lrbordereditor.ui
+++ b/limereport/items/lrbordereditor.ui
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>lrbordereditor</class>
- <widget class="QDialog" name="lrbordereditor">
+ <class>LimeReport::BorderEditor</class>
+ <widget class="QDialog" name="LimeReport::BorderEditor">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>381</width>
-    <height>311</height>
+    <height>352</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -31,7 +31,7 @@
            <string>No lines</string>
           </property>
           <property name="icon">
-           <iconset resource="../report.qrc">
+           <iconset>
             <normaloff>:/report/images/noLines</normaloff>:/report/images/noLines</iconset>
           </property>
           <property name="checkable">
@@ -46,12 +46,12 @@
          </widget>
         </item>
         <item>
-         <widget class="QToolButton" name="toolButton_4">
+         <widget class="QToolButton" name="allLines">
           <property name="text">
            <string>Outline</string>
           </property>
           <property name="icon">
-           <iconset resource="../report.qrc">
+           <iconset>
             <normaloff>:/report/images/allLines</normaloff>:/report/images/allLines</iconset>
           </property>
           <property name="toolButtonStyle">
@@ -81,7 +81,7 @@
                <string>...</string>
               </property>
               <property name="icon">
-               <iconset resource="../report.qrc">
+               <iconset>
                 <normaloff>:/report/images/topLine</normaloff>:/report/images/topLine</iconset>
               </property>
               <property name="checkable">
@@ -108,7 +108,7 @@
                <string>...</string>
               </property>
               <property name="icon">
-               <iconset resource="../report.qrc">
+               <iconset>
                 <normaloff>:/report/images/bottomLine</normaloff>:/report/images/bottomLine</iconset>
               </property>
               <property name="checkable">
@@ -119,7 +119,7 @@
            </layout>
           </item>
           <item row="0" column="1">
-           <widget class="BorderFrameEditor" name="borderFrame" native="true"/>
+           <widget class="LimeReport::BorderFrameEditor" name="borderFrame" native="true"/>
           </item>
           <item row="1" column="1">
            <layout class="QHBoxLayout" name="horizontalLayout">
@@ -129,7 +129,7 @@
                <string>...</string>
               </property>
               <property name="icon">
-               <iconset resource="../report.qrc">
+               <iconset>
                 <normaloff>:/report/images/leftLine</normaloff>:/report/images/leftLine</iconset>
               </property>
               <property name="checkable">
@@ -156,7 +156,7 @@
                <string>...</string>
               </property>
               <property name="icon">
-               <iconset resource="../report.qrc">
+               <iconset>
                 <normaloff>:/report/images/rightLine</normaloff>:/report/images/rightLine</iconset>
               </property>
               <property name="checkable">
@@ -319,14 +319,34 @@
        </widget>
       </item>
       <item>
-       <widget class="QPushButton" name="pushButton">
-        <property name="styleSheet">
-         <string notr="true">#pushButton{background-color: black;}</string>
-        </property>
-        <property name="text">
-         <string>Select...</string>
-        </property>
-       </widget>
+       <layout class="QHBoxLayout" name="horizontalLayout_3">
+        <item>
+         <widget class="QWidget" name="colorIndicator" native="true">
+          <property name="minimumSize">
+           <size>
+            <width>20</width>
+            <height>20</height>
+           </size>
+          </property>
+          <property name="baseSize">
+           <size>
+            <width>10</width>
+            <height>10</height>
+           </size>
+          </property>
+          <property name="styleSheet">
+           <string notr="true">background-color: rgb(0, 0, 0);</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="selectColor">
+          <property name="text">
+           <string>Select</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
       </item>
      </layout>
     </widget>
@@ -342,46 +362,43 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BorderFrameEditor</class>
+   <class>LimeReport::BorderFrameEditor</class>
    <extends>QWidget</extends>
-   <header>borderframeeditor.h</header>
+   <header>lrborderframeeditor.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
- <resources>
-  <include location="../report.qrc"/>
-  <include location="../report.qrc"/>
- </resources>
+ <resources/>
  <connections>
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>lrbordereditor</receiver>
+   <receiver>LimeReport::BorderEditor</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>253</x>
-     <y>255</y>
+     <x>119</x>
+     <y>322</y>
     </hint>
     <hint type="destinationlabel">
-     <x>219</x>
-     <y>275</y>
+     <x>377</x>
+     <y>309</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>lrbordereditor</receiver>
+   <receiver>LimeReport::BorderEditor</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>316</x>
-     <y>258</y>
+     <x>48</x>
+     <y>334</y>
     </hint>
     <hint type="destinationlabel">
-     <x>345</x>
-     <y>277</y>
+     <x>66</x>
+     <y>348</y>
     </hint>
    </hints>
   </connection>
diff --git a/limereport/items/lrborderframeeditor.cpp b/limereport/items/lrborderframeeditor.cpp
new file mode 100644
index 0000000..46fd9b9
--- /dev/null
+++ b/limereport/items/lrborderframeeditor.cpp
@@ -0,0 +1,181 @@
+#include "lrborderframeeditor.h"
+#include "ui_lrborderframeeditor.h"
+#include <QPainter>
+#include <QGraphicsLineItem>
+#include <QDebug>
+#include <QMouseEvent>
+#include "lrbasedesignintf.h"
+#include "lrbordereditor.h"
+
+namespace LimeReport{
+
+BorderFrameEditor::BorderFrameEditor(QWidget *parent)
+    : QWidget(parent)
+    , ui(new Ui::BorderFrameEditor)
+{
+    ui->setupUi(this);
+    scene = new QGraphicsScene(ui->graphicsView);
+
+    QRect vRect = rect();
+
+    //Draw corder lines
+    //topLeft
+    scene->addLine(10, 5, 10, 10, QPen(Qt::gray));
+    scene->addLine(5, 10, 10, 10, QPen(Qt::gray));
+    //bottomLeft
+    scene->addLine(10,vRect.bottom() -5, 10, vRect.bottom()-10, QPen(Qt::gray));
+    scene->addLine(5,vRect.bottom()-10, 10, vRect.bottom()-10, QPen(Qt::gray));
+    //bottomRight
+    scene->addLine(vRect.right() - 10, vRect.bottom() - 5, vRect.right()- 10, vRect.bottom() - 10, QPen(Qt::gray));
+    scene->addLine(vRect.right() - 5, vRect.bottom() - 10, vRect.right() - 10, vRect.bottom() - 10, QPen(Qt::gray));
+    //topRight
+    scene->addLine(vRect.width() - 10, 5, vRect.width() - 10, 10, QPen(Qt::gray));
+    scene->addLine(vRect.width() - 5, 10, vRect.width() - 10, 10, QPen(Qt::gray));
+    scene->setSceneRect(vRect);
+    ui->graphicsView->setScene(scene);
+    QGraphicsSimpleTextItem * io = new QGraphicsSimpleTextItem();
+    io->setAcceptedMouseButtons(Qt::LeftButton);
+    io->setPos(scene->sceneRect().center());
+    io->setText(tr("Text"));
+    scene->addItem(io);
+
+    QRectF bR = io->sceneBoundingRect();
+    io->setPos( scene->sceneRect().center().x() - bR.width()/2, scene->sceneRect().center().y() - bR.height()/2 );
+    connect(
+        this, SIGNAL(borderSideClicked(LimeReport::BaseDesignIntf::BorderSide, bool)),
+        this, SLOT(slotBorderSideClicked(LimeReport::BaseDesignIntf::BorderSide, bool))
+    );
+
+}
+
+BorderFrameEditor::~BorderFrameEditor()
+{
+    delete ui;
+}
+
+void BorderFrameEditor::setPen(QPen pen)
+{
+    m_pen = pen;
+    updateBorders();
+}
+
+QPen BorderFrameEditor::pen()
+{
+    return m_pen;
+}
+
+void BorderFrameEditor::setAllLines()
+{
+    if (!topLine)
+        topLine = createSideLine(LimeReport::BaseDesignIntf::BorderSide::TopLine);
+    if (!leftLine)
+        leftLine = createSideLine(LimeReport::BaseDesignIntf::BorderSide::LeftLine);
+    if (!bottomLine)
+        bottomLine = createSideLine(LimeReport::BaseDesignIntf::BorderSide::BottomLine);
+    if (!rightLine)
+        rightLine = createSideLine(LimeReport::BaseDesignIntf::BorderSide::RightLine);
+}
+
+void BorderFrameEditor::unSetAllLines()
+{
+    if (topLine){
+        scene->removeItem(topLine);
+        topLine = NULL;
+    }
+    if (leftLine){
+        scene->removeItem(leftLine);
+        leftLine = NULL;
+    }
+    if (bottomLine){
+        scene->removeItem(bottomLine);
+        bottomLine = NULL;
+    }
+    if (rightLine){
+        scene->removeItem(rightLine);
+        rightLine = NULL;
+    }
+
+}
+
+void BorderFrameEditor::mousePressEvent(QMouseEvent *event)
+{
+    if (event->x() >= 10 && event->y() <30)
+        emit borderSideClicked(BaseDesignIntf::BorderSide::TopLine, !topLine);
+
+    if ((event->x() >= 10 && event->x() < 30) && (event->y() > 10))
+        emit borderSideClicked(BaseDesignIntf::BorderSide::LeftLine, !leftLine);
+
+    if (event->x() >= 10 && (event->y() >80 && event->y() < rect().bottom()))
+        emit borderSideClicked(BaseDesignIntf::BorderSide::BottomLine, !bottomLine);
+
+    if ((event->x() >= 130 && event->x() < rect().width()) && event->y() > 10)
+        emit borderSideClicked(BaseDesignIntf::BorderSide::RightLine, !rightLine);
+}
+
+void BorderFrameEditor::slotBorderSideClicked(BaseDesignIntf::BorderSide side, bool show)
+{
+
+    switch(side){
+
+    case BaseDesignIntf::BorderSide::TopLine:
+        if (show){
+            if (!topLine) topLine = createSideLine(side);
+        } else {
+            if (topLine) scene->removeItem(topLine);
+            topLine = NULL;
+        }
+        break;
+
+    case BaseDesignIntf::LeftLine:
+        if (show){
+            if (!leftLine) leftLine = createSideLine(side);
+        } else {
+            if (leftLine) scene->removeItem(leftLine);
+            leftLine = NULL;
+        }
+        break;
+
+    case BaseDesignIntf::BottomLine:
+        if (show){
+            if (!bottomLine) bottomLine = createSideLine(side);
+        } else {
+            if (bottomLine) scene->removeItem(bottomLine);
+            bottomLine = NULL;
+        }
+        break;
+
+    case BaseDesignIntf::RightLine:
+        if (show){
+            if (!rightLine) rightLine = createSideLine(side);
+        } else {
+            if(rightLine) scene->removeItem(rightLine);
+            rightLine = NULL;
+        }
+
+    }
+    updateBorders();
+}
+
+QGraphicsLineItem *BorderFrameEditor::createSideLine(LimeReport::BaseDesignIntf::BorderSide side)
+{
+    switch(side){
+    case BaseDesignIntf::BorderSide::TopLine:
+        return scene->addLine(QLineF(10, 10, rect().width() - 10, 10), m_pen);
+    case BaseDesignIntf::BorderSide::LeftLine:
+        return scene->addLine(QLineF(10, 10, 10, rect().height() - 10), m_pen);
+    case BaseDesignIntf::BorderSide::RightLine:
+        return scene->addLine(QLineF(rect().width() - 10, 10 ,rect().width() - 10, rect().height() - 10), m_pen);
+    case BaseDesignIntf::BorderSide::BottomLine:
+        return scene->addLine(QLineF(10, rect().bottom() - 10, rect().width() - 10, rect().bottom() - 10), m_pen);
+    }
+}
+
+void BorderFrameEditor::updateBorders()
+{
+    if (topLine) topLine->setPen(m_pen);
+    if (leftLine) leftLine->setPen(m_pen);
+    if (bottomLine) bottomLine->setPen(m_pen);
+    if (rightLine) rightLine->setPen(m_pen);
+}
+
+} //namespace LimeReport
diff --git a/limereport/items/lrborderframeeditor.h b/limereport/items/lrborderframeeditor.h
new file mode 100644
index 0000000..9333677
--- /dev/null
+++ b/limereport/items/lrborderframeeditor.h
@@ -0,0 +1,46 @@
+#ifndef WIDGET
+#define WIDGET
+
+#include <QWidget>
+#include <QGraphicsScene>
+#include <QGraphicsLineItem>
+#include "lrbasedesignintf.h"
+namespace LimeReport{
+
+namespace Ui { class BorderFrameEditor; }
+
+class BorderFrameEditor : public QWidget
+{
+    Q_OBJECT
+
+public:
+    BorderFrameEditor(QWidget *parent = nullptr);
+    ~BorderFrameEditor();
+    void setPen(QPen pen);
+    QPen pen();
+    void setAllLines();
+    void unSetAllLines();
+protected:
+    void mousePressEvent(QMouseEvent *event);
+signals:
+    void borderSideClicked(LimeReport::BaseDesignIntf::BorderSide side, bool show);
+private slots:
+    void slotBorderSideClicked(LimeReport::BaseDesignIntf::BorderSide side, bool show);
+
+private:
+    QGraphicsLineItem *createSideLine(LimeReport::BaseDesignIntf::BorderSide side);
+    void updateBorders();
+private:
+    Ui::BorderFrameEditor *ui;
+    QGraphicsScene *scene;
+    QGraphicsLineItem *topLine = NULL
+                ,*bottomLine = NULL
+                ,*leftLine = NULL
+                ,*rightLine = NULL;
+    QPen m_pen;
+
+
+
+};
+} // namespace LimeReport
+#endif // WIDGET
diff --git a/limereport/items/lrborderframeeditor.ui b/limereport/items/lrborderframeeditor.ui
new file mode 100644
index 0000000..3f70f12
--- /dev/null
+++ b/limereport/items/lrborderframeeditor.ui
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>LimeReport::BorderFrameEditor</class>
+ <widget class="QWidget" name="LimeReport::BorderFrameEditor">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>150</width>
+    <height>100</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string>BorderFrameEditor</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QGraphicsView" name="graphicsView">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>150</width>
+       <height>100</height>
+      </size>
+     </property>
+     <property name="baseSize">
+      <size>
+       <width>150</width>
+       <height>100</height>
+      </size>
+     </property>
+     <property name="verticalScrollBarPolicy">
+      <enum>Qt::ScrollBarAlwaysOff</enum>
+     </property>
+     <property name="horizontalScrollBarPolicy">
+      <enum>Qt::ScrollBarAlwaysOff</enum>
+     </property>
+     <property name="sizeAdjustPolicy">
+      <enum>QAbstractScrollArea::AdjustToContents</enum>
+     </property>
+     <property name="resizeAnchor">
+      <enum>QGraphicsView::AnchorViewCenter</enum>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/limereport/items/lrimageitem.cpp b/limereport/items/lrimageitem.cpp
index 02f7daa..4958807 100644
--- a/limereport/items/lrimageitem.cpp
+++ b/limereport/items/lrimageitem.cpp
@@ -61,8 +61,13 @@ BaseDesignIntf *ImageItem::createSameTypeItem(QObject *owner, QGraphicsItem *par
 }
 
 void ImageItem::loadPictureFromVariant(QVariant& data){
+    //TODO: Migrate to QMetaType
     if (data.isValid()){
-        if (data.type()==QVariant::Image){
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+        if (data.typeId() == QMetaType::QImage){
+#else
+        if (data.type() == QVariant::Image){
+#endif
           m_picture =  data.value<QImage>();
         } else {
             switch (m_format) {
@@ -106,14 +111,14 @@ void ImageItem::processPopUpAction(QAction *action)
     ItemDesignIntf::processPopUpAction(action);
 }
 
-QImage getFileByResourcePath(QString resourcePath){
+QImage getFileByResourcePath(QString resourcePath) {
     QFileInfo resourceFile(resourcePath);
     if (resourceFile.exists())
         return QImage(resourcePath);
     return QImage();
 }
 
-QImage ImageItem::drawImage()
+QImage ImageItem::drawImage() const
 {
     if (image().isNull())
         return getFileByResourcePath(m_resourcePath);
@@ -178,11 +183,22 @@ void ImageItem::updateItemSize(DataSourceManager* dataManager, RenderPass pass,
            m_resourcePath = expandDataFields(m_resourcePath, NoEscapeSymbols, dataManager);
            m_picture = QImage(m_resourcePath);
        } else if (!m_variable.isEmpty()){
+            //TODO: Migrate to QMetaType
            QVariant data = dataManager->variable(m_variable);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+           if (data.typeId() == QMetaType::QString){
+#else
            if (data.type() == QVariant::String){
+#endif
                 m_picture = QImage(data.toString());
-           } else if (data.type() == QVariant::Image){
-                loadPictureFromVariant(data);
+           } else {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+               if (data.typeId() == QMetaType::QImage){
+#else
+               if (data.type() == QVariant::Image){
+#endif
+                    loadPictureFromVariant(data);
+               }
            }
        }
    }
@@ -348,7 +364,7 @@ void ImageItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
             }
 
             if (shiftHeight > 0){
-                point.setY(point.x()+shiftHeight/2);
+                point.setY(point.y()+shiftHeight/2);
             } else {
                 cutY = fabs(shiftHeight/2);
                 cutHeigth += shiftHeight;
@@ -394,7 +410,7 @@ void ImageItem::setImage(QImage value)
     }
 }
 
-QImage ImageItem::image(){
+QImage ImageItem::image() const{
     return m_picture;
 }
 
@@ -423,3 +439,8 @@ void ImageItem::setFormat(Format format)
 }
 
 }
+
+bool LimeReport::ImageItem::isEmpty() const
+{
+  return drawImage().isNull();
+}
diff --git a/limereport/items/lrimageitem.h b/limereport/items/lrimageitem.h
index 5640e8a..7d6127d 100644
--- a/limereport/items/lrimageitem.h
+++ b/limereport/items/lrimageitem.h
@@ -67,7 +67,7 @@ public:
     ImageItem(QObject *owner, QGraphicsItem *parent);
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
     void setImage(QImage value);
-    QImage image();
+    QImage image() const;
     void setResourcePath(const QString &value);
     QString resourcePath() const;
     QString datasource() const;
@@ -108,7 +108,7 @@ protected:
     void loadPictureFromVariant(QVariant& data);
     void preparePopUpMenu(QMenu &menu);
     void processPopUpAction(QAction *action);
-    QImage drawImage();
+    QImage drawImage() const;
 private:
     QImage  m_picture;
     bool m_useExternalPainter;
@@ -121,8 +121,12 @@ private:
     bool    m_keepAspectRatio;
     bool    m_center;
     Format  m_format;
-    QString m_variable;    
+    QString m_variable;
 
+
+    // BaseDesignIntf interface
+  public:
+    bool isEmpty() const override;
 };
 
 }
diff --git a/limereport/items/lrpageeditor.cpp b/limereport/items/lrpageeditor.cpp
index d0c2f46..3748e7a 100644
--- a/limereport/items/lrpageeditor.cpp
+++ b/limereport/items/lrpageeditor.cpp
@@ -1,11 +1,15 @@
 #include "lrpageeditor.h"
 #include "ui_lrpageeditor.h"
 #include "lrpagedesignintf.h"
+#include "lrpageitemdesignintf.h"
 #include <QPushButton>
 #include <QPageSize>
-lrpageeditor::lrpageeditor(QWidget *parent, LimeReport::PageItemDesignIntf *page) :
+
+namespace LimeReport{
+
+PageEditor::PageEditor(QWidget *parent, LimeReport::PageItemDesignIntf *page) :
     QDialog(parent),
-    ui(new Ui::lrpageeditor)
+    ui(new Ui::PageEditor)
 {
     ui->setupUi(this);
     m_page = page;
@@ -16,8 +20,8 @@ lrpageeditor::lrpageeditor(QWidget *parent, LimeReport::PageItemDesignIntf *page
         ui->format->addItem(pageSizes.key(i));
     }
     ui->format->setCurrentIndex(m_page->pageSize());
-    ui->width->setValue(m_page->width() / LimeReport::Const::mmFACTOR);
-    ui->height->setValue(m_page->height() / LimeReport::Const::mmFACTOR);
+    ui->width->setValue(m_page->width() / m_page->unitFactor());
+    ui->height->setValue(m_page->height() / m_page->unitFactor());
     ui->portrait->setChecked(m_page->pageOrientation() == LimeReport::PageItemDesignIntf::Portrait);
     ui->landscape->setChecked(m_page->pageOrientation() == LimeReport::PageItemDesignIntf::Landscape);
     //Margins
@@ -33,18 +37,17 @@ lrpageeditor::lrpageeditor(QWidget *parent, LimeReport::PageItemDesignIntf *page
     ui->fullPage->setChecked(m_page->fullPage());
 }
 
-lrpageeditor::~lrpageeditor()
+PageEditor::~PageEditor()
 {
     delete ui;
 }
 
-void lrpageeditor::applyChanges()
+void PageEditor::applyChanges()
 {
     m_page->setPageSize(static_cast<LimeReport::PageItemDesignIntf::PageSize>(ui->format->currentIndex()));
-    m_page->setWidth(ui->width->value()* LimeReport::Const::mmFACTOR);
-    m_page->setHeight(ui->height->value()*  LimeReport::Const::mmFACTOR);
-    m_page->setPageOrientation(ui->portrait->isChecked()?LimeReport::PageItemDesignIntf::Portrait : LimeReport::PageItemDesignIntf::Landscape);
-
+    m_page->setWidth(ui->width->value() * LimeReport::Const::mmFACTOR);
+    m_page->setHeight(ui->height->value() *  LimeReport::Const::mmFACTOR);
+    m_page->setPageOrientation(ui->portrait->isChecked()? LimeReport::PageItemDesignIntf::Portrait : LimeReport::PageItemDesignIntf::Landscape);
     m_page->setTopMargin(ui->marginTop->value());
     m_page->setBottomMargin(ui->marginBottom->value());
     m_page->setRightMargin(ui->marginRight->value());
@@ -52,53 +55,56 @@ void lrpageeditor::applyChanges()
     m_page->setDropPrinterMargins(ui->dropPrinterMargins->isChecked());
     ui->endlessHeight->setChecked(ui->endlessHeight->isChecked());
     m_page->setExtendedHeight(ui->extendedHeight->value());
+    ui->width->setValue(m_page->getItemWidth());
+    ui->height->setValue(m_page->getItemHeight());
 }
 
-void lrpageeditor::on_buttonBox_accepted()
+QSizeF PageEditor::getRectByPageSize(const LimeReport::PageItemDesignIntf::PageSize& size)
 {
-    applyChanges();
-    accept();
-
-}
-
-QSizeF lrpageeditor::getRectByPageSize(const LimeReport::PageItemDesignIntf::PageSize& size)
-{
-    if (size != LimeReport::PageItemDesignIntf::Custom) {
+    if (size != PageItemDesignIntf::Custom) {
         QPrinter printer;
         printer.setOutputFormat(QPrinter::PdfFormat);
 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
-        printer.setOrientation(ui->portrait->isChecked()?QPrinter::Portrait : QPrinter::Landscape);
+        printer.setOrientation(ui->portrait->isChecked() ? QPrinter::Portrait : QPrinter::Landscape);
         printer.setPaperSize((QPrinter::PageSize)size);
-        return QSizeF(printer.paperSize(QPrinter::Millimeter).width() * 10,
-                      printer.paperSize(QPrinter::Millimeter).height() * 10);
+        return QSizeF(printer.paperSize(QPrinter::Millimeter).width() * m_page->unitFactor(),
+                      printer.paperSize(QPrinter::Millimeter).height() * m_page->unitFactor());
 
 #else
-        QPageSize pageSize = QPageSize((QPageSize::PageSizeId)size);
-        qreal width = pageSize.size(QPageSize::Millimeter).width() * 10;
-        qreal height = pageSize.size(QPageSize::Millimeter).height() * 10;
-        return QSizeF(pageOrientation() == Portrait ? width : height,
-                      pageOrientation() == Portrait ? height : width);
-
-//        printer.setPageOrientation((QPageLayout::Orientation)pageOrientation());
-//        printer.setPageSize(QPageSize((QPageSize::PageSizeId)size));
-//        return QSizeF(printer.pageLayout().pageSize().size(QPageSize::Millimeter).width() * 10,
-//                      printer.pageLayout().pageSize().size(QPageSize::Millimeter).height() * 10);
+        printer.setPageOrientation((QPageLayout::Orientation)m_page->pageOrientation());
+        printer.setPageSize(QPageSize((QPageSize::PageSizeId)size));
+        return QSizeF(printer.pageLayout().pageSize().size(QPageSize::Millimeter).width() * m_page->unitFactor(),
+                      printer.pageLayout().pageSize().size(QPageSize::Millimeter).height() * m_page->unitFactor());
 #endif
-    }
-
-    else {
-        return QSizeF(width(),height());
+    } else {
+        return QSizeF(m_page->getItemWidth(), m_page->getItemHeight());
     }
 }
-void lrpageeditor::on_format_currentIndexChanged(int index)
+
+void PageEditor::on_format_currentIndexChanged(int index)
 {
     QPageSize ps = *new QPageSize();
     if(ui->format->currentText() != "Custom")
     {
         QSizeF pageSize = getRectByPageSize(static_cast<LimeReport::PageItemDesignIntf::PageSize>(index));
-    ui->width->setValue(pageSize.width()/10);
-    ui->height->setValue(pageSize.height()/10);
+        ui->width->setValue(pageSize.width() / m_page->unitFactor());
+        ui->height->setValue(pageSize.height() / m_page->unitFactor());
     }
 
 }
 
+
+void PageEditor::on_buttonBox_clicked(QAbstractButton *button)
+{
+    switch(ui->buttonBox->buttonRole(button)){
+        case QDialogButtonBox::ApplyRole:
+            applyChanges();
+            break;
+        case QDialogButtonBox::AcceptRole:
+            applyChanges();
+            accept();
+    }
+
+}
+
+} // namespace
diff --git a/limereport/items/lrpageeditor.h b/limereport/items/lrpageeditor.h
index 545ca3e..f2c07c2 100644
--- a/limereport/items/lrpageeditor.h
+++ b/limereport/items/lrpageeditor.h
@@ -4,28 +4,33 @@
 #include <QDialog>
 #include "lrpageitemdesignintf.h"
 #include <QPushButton>
+namespace LimeReport{
+
 namespace Ui {
-class lrpageeditor;
+    class PageEditor;
 }
 
-class lrpageeditor : public QDialog
+class LIMEREPORT_EXPORT PageEditor : public QDialog
 {
     Q_OBJECT
 
 public:
-    explicit lrpageeditor(QWidget *parent = nullptr,LimeReport::PageItemDesignIntf *page = nullptr);
-    ~lrpageeditor();
+    explicit PageEditor(QWidget *parent = nullptr,LimeReport::PageItemDesignIntf *page = nullptr);
+    ~PageEditor();
 
 private slots:
-    void on_buttonBox_accepted();
+//    void on_buttonBox_accepted();
     void on_format_currentIndexChanged(int index);
+    void on_buttonBox_clicked(QAbstractButton *button);
 
 private:
-    Ui::lrpageeditor *ui;
+    Ui::PageEditor *ui;
     LimeReport::PageItemDesignIntf* m_page;
 
     void applyChanges();
     QSizeF getRectByPageSize(const LimeReport::PageItemDesignIntf::PageSize& size);
 };
 
+} // namespace LimeReport
+
 #endif // LRPAGEEDITOR_H
diff --git a/limereport/items/lrpageeditor.ui b/limereport/items/lrpageeditor.ui
index 70ca440..e42f06c 100644
--- a/limereport/items/lrpageeditor.ui
+++ b/limereport/items/lrpageeditor.ui
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>lrpageeditor</class>
- <widget class="QDialog" name="lrpageeditor">
+ <class>LimeReport::PageEditor</class>
+ <widget class="QDialog" name="LimeReport::PageEditor">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>306</width>
-    <height>322</height>
+    <height>356</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -131,6 +131,19 @@
          </layout>
         </widget>
        </item>
+       <item>
+        <spacer name="verticalSpacer_3">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_2">
@@ -297,7 +310,7 @@
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons">
-      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::Apply|QDialogButtonBox::Close|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
@@ -305,22 +318,6 @@
  </widget>
  <resources/>
  <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>lrpageeditor</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>325</x>
-     <y>312</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
   <connection>
    <sender>endlessHeight</sender>
    <signal>clicked(bool)</signal>
@@ -328,12 +325,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>60</x>
-     <y>50</y>
+     <x>72</x>
+     <y>81</y>
     </hint>
     <hint type="destinationlabel">
-     <x>130</x>
-     <y>85</y>
+     <x>131</x>
+     <y>134</y>
     </hint>
    </hints>
   </connection>
diff --git a/limereport/items/lrsvgitem.cpp b/limereport/items/lrsvgitem.cpp
index fe3c1a1..9bf1ea6 100644
--- a/limereport/items/lrsvgitem.cpp
+++ b/limereport/items/lrsvgitem.cpp
@@ -107,11 +107,22 @@ void SVGItem::updateItemSize(DataSourceManager *dataManager, RenderPass pass, in
             m_resourcePath = expandDataFields(m_resourcePath, NoEscapeSymbols, dataManager);
             m_image = imageFromResource(m_resourcePath);
         } else if (!m_variable.isEmpty()){
+            //TODO: Migrate to QMetaType
             QVariant data = dataManager->variable(m_variable);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+            if (data.typeId() == QMetaType::QString){
+#else
             if (data.type() == QVariant::String){
+#endif
                 m_image = imageFromResource(data.toString());
-            } else if (data.type() == QVariant::ByteArray) {
-                m_image = data.value<QByteArray>() ;
+            } else {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+                if (data.typeId() == QMetaType::QByteArray) {
+#else
+                if (data.type() == QVariant::ByteArray) {
+#endif
+                    m_image = data.value<QByteArray>() ;
+                }
             }
         }
     }
diff --git a/limereport/items/lrtextitem.cpp b/limereport/items/lrtextitem.cpp
index 086adca..4677892 100644
--- a/limereport/items/lrtextitem.cpp
+++ b/limereport/items/lrtextitem.cpp
@@ -276,10 +276,6 @@ void TextItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* style, Q
     BaseDesignIntf::paint(painter, style, widget);
 }
 
-QString TextItem::content() const{
-    return m_strText;
-}
-
 void TextItem::Init()
 {
     m_autoWidth = NoneAutoWidth;
@@ -299,14 +295,8 @@ void TextItem::setContent(const QString &value)
 {
     if (m_strText.compare(value)!=0){
         QString oldValue = m_strText;
-        if (m_trimValue)
-            m_strText=value.trimmed();
-        else
-            m_strText=value;
 
-//        if (itemMode() == DesignMode && (autoHeight())){
-//            initTextSizes();
-//        }
+        m_strText = value;
 
         if (!isLoading()){
             if (autoHeight() || autoWidth() || hasFollower())
@@ -317,6 +307,10 @@ void TextItem::setContent(const QString &value)
     }
 }
 
+QString TextItem::content() const{
+    return m_strText;
+}
+
 void TextItem::updateItemSize(DataSourceManager* dataManager, RenderPass pass, int maxHeight)
 {
 
@@ -395,6 +389,7 @@ void TextItem::setTextFont(TextPtr text, const QFont& value) const {
 void TextItem::adaptFontSize(TextPtr text) const{
     QFont _font = transformToSceneFont(font());
     do{
+//        qApp->processEvents();
         setTextFont(text,_font);
         if (_font.pixelSize()>2)
             _font.setPixelSize(_font.pixelSize()-1);
@@ -493,29 +488,43 @@ QString TextItem::formatFieldValue()
         }
     }
 
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
     switch (value.type()) {
-    case QVariant::Date:
-    case QVariant::DateTime:
-        return formatDateTime(value.toDateTime());
-    case QVariant::Double:
-        return formatNumber(value.toDouble());
-    default:
-        return value.toString();
+        case QVariant::Date:
+        case QVariant::DateTime:
+            return formatDateTime(value.toDateTime());
+        case QVariant::Double:
+            return formatNumber(value.toDouble());
+        default:
+            return value.toString();
     }
+#else
+    switch (value.typeId()) {
+        case QMetaType::QDate:
+        case QMetaType::QDateTime:
+            return formatDateTime(value.toDateTime());
+        case QMetaType::Double:
+            return formatNumber(value.toDouble());
+        default:
+            return value.toString();
+    }
+#endif
+
 }
 
 TextItem::TextPtr TextItem::textDocument() const
 {
     TextPtr text(new QTextDocument);
+    QString content = m_trimValue ? m_strText.trimmed() : m_strText;
 
     if (allowHTML())
         if (isReplaceCarriageReturns()){
-            text->setHtml(replaceReturns(m_strText));
+            text->setHtml(replaceReturns(content));
         } else {
-            text->setHtml(m_strText);
+            text->setHtml(content);
         }
     else
-        text->setPlainText(m_strText);
+        text->setPlainText(content);
 
     QTextOption to;
     to.setAlignment(m_alignment);
@@ -785,6 +794,7 @@ void TextItem::setTrimValue(bool value)
 {
     bool oldValue = m_trimValue;
     m_trimValue = value;
+    update();
     notify("trimValue",oldValue,value);
 }
 
@@ -827,7 +837,7 @@ void TextItem::expandContent(DataSourceManager* dataManager, RenderPass pass)
 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
         QRegExp rx(QString(Const::NAMED_VARIABLE_RX).arg(variableName));
 #else
-        QRegularExpression rx(QString(Const::NAMED_VARIABLE_RX).arg(variableName));
+        QRegularExpression rx = getNamedVariableRegEx(variableName);
 #endif
         if (context.contains(rx) && pass == FirstPass){
             backupContent();
diff --git a/limereport/limereport.pri b/limereport/limereport.pri
index 524d3d8..c86b575 100644
--- a/limereport/limereport.pri
+++ b/limereport/limereport.pri
@@ -80,7 +80,7 @@ SOURCES += \
     $$REPORT_PATH/lraxisdata.cpp \
     $$REPORT_PATH/lrpreparedpages.cpp \
     $$REPORT_PATH/items/lrpageeditor.cpp \
-    $$REPORT_PATH/items/borderframeeditor.cpp \
+    $$REPORT_PATH/items/lrborderframeeditor.cpp \
     $$REPORT_PATH/items/lrbordereditor.cpp
 
 CONFIG(staticlib) {
@@ -181,7 +181,7 @@ HEADERS += \
     $$REPORT_PATH/lraxisdata.h \
     $$REPORT_PATH/lrpreparedpagesintf.h \
     $$REPORT_PATH/items/lrpageeditor.h \
-    $$REPORT_PATH/items/borderframeeditor.h \
+    $$REPORT_PATH/items/lrborderframeeditor.h \
     $$REPORT_PATH/items/lrbordereditor.h
 
 CONFIG(staticlib) {
@@ -207,7 +207,7 @@ FORMS += \
     $$REPORT_PATH/items/lrimageitemeditor.ui \
     $$REPORT_PATH/scripteditor/lrscripteditor.ui \
     $$REPORT_PATH/items/lrpageeditor.ui \
-    $$REPORT_PATH/items/borderframeeditor.ui \
+    $$REPORT_PATH/items/lrborderframeeditor.ui \
     $$REPORT_PATH/items/lrbordereditor.ui
 
 RESOURCES += \
diff --git a/limereport/lrbanddesignintf.h b/limereport/lrbanddesignintf.h
index 71d02e1..8960eeb 100644
--- a/limereport/lrbanddesignintf.h
+++ b/limereport/lrbanddesignintf.h
@@ -261,7 +261,6 @@ public:
     void setAlternateBackgroundColor(const QColor &alternateBackgroundColor);
     bool useAlternateBackgroundColor() const;
     void setUseAlternateBackgroundColor(bool useAlternateBackgroundColor);    
-    void replaceGroupsFunction(BandDesignIntf *band);
     qreal bottomSpace() const;
     void setBackgroundModeProperty(BGMode value);
     void setBackgroundOpacity(int value);
diff --git a/limereport/lrbasedesignintf.cpp b/limereport/lrbasedesignintf.cpp
index 3539601..d66efeb 100644
--- a/limereport/lrbasedesignintf.cpp
+++ b/limereport/lrbasedesignintf.cpp
@@ -431,7 +431,7 @@ void BaseDesignIntf::paint(QPainter *ppainter, const QStyleOptionGraphicsItem *o
     setupPainter(ppainter);
     drawBorder(ppainter, rect());
     if(m_shadow)
-        drawShadow(ppainter, rect());
+        drawShadow(ppainter, rect(), 6);
     //    if (m_joinMarkerOn) { drawMarker(ppainter, Const::JOIN_COLOR);}
     //    if (isSelected() && !m_joinMarkerOn) {drawMarker(ppainter, Const::SELECTION_COLOR);}
     drawResizeZone(ppainter);
@@ -1145,10 +1145,9 @@ void BaseDesignIntf::drawBorder(QPainter *painter, QRectF rect) const
     painter->restore();
 }
 
-void BaseDesignIntf::drawShadow(QPainter *painter, QRectF rect) const
+void BaseDesignIntf::drawShadow(QPainter *painter, QRectF rect, qreal shadowSize) const
 {
-
-    qreal shWidth = rect.width()/100;
+    qreal shWidth = shadowSize;
     QRectF rshadow(rect.topRight() + QPointF(0, shWidth),
                    rect.bottomRight() + QPointF(shWidth, 0));
     QLinearGradient rgrad(rshadow.topLeft(), rshadow.topRight());
@@ -1167,8 +1166,6 @@ void BaseDesignIntf::drawShadow(QPainter *painter, QRectF rect) const
     cgrad.setColorAt(0.0, QColor(0,0,0,255));
     cgrad.setColorAt(1.0, QColor(0,0,0,0));
     painter->fillRect(cshadow, QBrush(cgrad));
-
-
 }
 
 void BaseDesignIntf::setGeometry(QRectF rect)
@@ -1446,18 +1443,27 @@ void BaseDesignIntf::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
 
     QAction* lockGeometryAction = menu.addAction(tr("Lock item geometry"));
     lockGeometryAction->setCheckable(true);
-    lockGeometryAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_L));
+
     lockGeometryAction->setChecked(isGeometryLocked());
     menu.addSeparator();
 
     QAction* copyAction = menu.addAction(QIcon(":/report/images/copy"), tr("Copy"));
-    copyAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_C));
-    QAction* cutAction = menu.addAction(QIcon(":/report/images/cut"), tr("Cut"));
-    cutAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_X));
+    QAction* cutAction = menu.addAction(QIcon(":/report/images/cut"), tr("Cut"));    
     QAction* pasteAction = menu.addAction(QIcon(":/report/images/paste"), tr("Paste"));
-    pasteAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_V));
     pasteAction->setEnabled(false);
 
+#if QT_VERSION >=QT_VERSION_CHECK(5,0,0)
+    lockGeometryAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_L));
+    copyAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_C));
+    cutAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_X));
+    pasteAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_V));
+#else
+    lockGeometryAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_L));
+    copyAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_C));
+    cutAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_X));
+    pasteAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_V));
+#endif
+
     QClipboard *clipboard = QApplication::clipboard();
     ItemsReaderIntf::Ptr reader = StringXMLreader::create(clipboard->text());
     if (reader->first() && reader->itemType() == "Object"){
@@ -1477,7 +1483,7 @@ void BaseDesignIntf::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
     menu.addSeparator();
     QAction* noBordersAction = menu.addAction(QIcon(":/report/images/noLines"), tr("No borders"));
     QAction* allBordersAction = menu.addAction(QIcon(":/report/images/allLines"), tr("All borders"));
-    QAction* editBorderAction = menu.addAction(QIcon(":/report/images/allLines"), tr("Edit borders..."));
+    QAction* editBorderAction = menu.addAction(QIcon(":/report/images/borderEditor"), tr("Edit borders..."));
     preparePopUpMenu(menu);
     QAction* a = menu.exec(event->screenPos());
     if (a){
@@ -1498,15 +1504,12 @@ void BaseDesignIntf::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
             page->setBorders(BaseDesignIntf::NoLine);
         if (a == allBordersAction)
             page->setBorders(BaseDesignIntf::AllLines);
-        if(a == editBorderAction)
+        if (a == editBorderAction)
         {
-            lrbordereditor be;
+            BorderEditor be;
             be.loadItem(this);
-            if(be.exec() == QDialog::Rejected)return;
-            setBorderLinesFlags(be.borderSides());
-            setBorderLineSize(be.border_width());
-            setBorderStyle((LimeReport::BaseDesignIntf::BorderStyle)be.border_style());
-            setBorderColor(be.borderColor());
+            if (be.exec() == QDialog::Rejected) return;
+            page->setBordersExt(be.borderSides(), be.borderWidth(), (LimeReport::BaseDesignIntf::BorderStyle)be.borderStyle(), be.borderColor());
         }
         if (a == createHLayout)
             page->addHLayout();
diff --git a/limereport/lrbasedesignintf.h b/limereport/lrbasedesignintf.h
index adf7d21..4314de9 100644
--- a/limereport/lrbasedesignintf.h
+++ b/limereport/lrbasedesignintf.h
@@ -49,7 +49,7 @@ class ReportEnginePrivate;
 class PageDesignIntf;
 class  BaseDesignIntf;
 
-class Marker : public QGraphicsItem{
+class LIMEREPORT_EXPORT Marker : public QGraphicsItem{
 public:
     Marker(QGraphicsItem* parent = 0, BaseDesignIntf* owner = 0): QGraphicsItem(parent), m_owner(owner){}
     QRectF boundingRect() const;
@@ -65,7 +65,7 @@ private:
     BaseDesignIntf* m_owner;
 };
 
-class SelectionMarker : public Marker{
+class LIMEREPORT_EXPORT SelectionMarker : public Marker{
 public:
     SelectionMarker(QGraphicsItem* parent=0, BaseDesignIntf* owner = 0);
     QColor color() const;
@@ -80,7 +80,7 @@ protected:
 class DataSourceManager;
 class ReportRender;
 
-class  BaseDesignIntf :
+class LIMEREPORT_EXPORT BaseDesignIntf :
         public QObject, public QGraphicsItem, public ICollectionContainer, public ObjectLoadingStateIntf {
     Q_OBJECT
     Q_INTERFACES(QGraphicsItem)
@@ -389,7 +389,7 @@ protected:
 
 
     void drawBorder(QPainter* painter, QRectF rect) const;
-    void drawShadow(QPainter* painter, QRectF rect) const;
+    void drawShadow(QPainter* painter, QRectF rect, qreal shadowSize) const;
     void drawDesignModeBorder(QPainter* painter, QRectF rect) const;
     void drawRenderModeBorder(QPainter *painter, QRectF rect) const;
     void drawResizeZone(QPainter*);
@@ -515,7 +515,7 @@ signals:
     void afterRender();
 };
 
-class BookmarkContainerDesignIntf: public BaseDesignIntf{
+class LIMEREPORT_EXPORT BookmarkContainerDesignIntf: public BaseDesignIntf{
     Q_OBJECT
 public:
     BookmarkContainerDesignIntf(const QString& storageTypeName, QObject* owner = 0, QGraphicsItem* parent = 0)
diff --git a/limereport/lrcollection.h b/limereport/lrcollection.h
index 4e3aded..e66d1b9 100644
--- a/limereport/lrcollection.h
+++ b/limereport/lrcollection.h
@@ -35,7 +35,7 @@
 
 #include "lrglobal.h"
 
-class ACollectionProperty{
+class LIMEREPORT_EXPORT ACollectionProperty{
 public:
     ACollectionProperty(){}
     ACollectionProperty(const ACollectionProperty& ){}
@@ -45,8 +45,8 @@ Q_DECLARE_METATYPE(ACollectionProperty)
 
 namespace LimeReport{
 
-const int COLLECTION_TYPE_ID = qMetaTypeId<ACollectionProperty>();
-class ICollectionContainer{
+const int inline COLLECTION_TYPE_ID = qMetaTypeId<ACollectionProperty>();
+class LIMEREPORT_EXPORT ICollectionContainer{
 public:
     virtual QObject* createElement(const QString& collectionName,const QString& elementType)=0;
     virtual int elementsCount(const QString& collectionName)=0;
diff --git a/limereport/lrdatadesignintf.cpp b/limereport/lrdatadesignintf.cpp
index f970c86..0315c27 100644
--- a/limereport/lrdatadesignintf.cpp
+++ b/limereport/lrdatadesignintf.cpp
@@ -85,7 +85,12 @@ bool QueryHolder::runQuery(IDataSource::DatasourceMode mode)
     query.exec();
 
     QSqlQueryModel *model = new QSqlQueryModel;
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 2, 0)
+    model->setQuery(std::move(query));
+#else
     model->setQuery(query);
+#endif
 
     while (model->canFetchMore())
         model->fetchMore();
diff --git a/limereport/lrdatasourcemanager.cpp b/limereport/lrdatasourcemanager.cpp
index b3e3738..91f1189 100644
--- a/limereport/lrdatasourcemanager.cpp
+++ b/limereport/lrdatasourcemanager.cpp
@@ -392,7 +392,13 @@ QSharedPointer<QAbstractItemModel>DataSourceManager::previewSQL(const QString &c
         }
 
         query.exec();
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 2, 0)
+        model->setQuery(std::move(query));
+#else
         model->setQuery(query);
+#endif
+
         m_lastError = model->lastError().text();
         putError(m_lastError);
         if (model->query().isActive())
@@ -423,8 +429,8 @@ QString DataSourceManager::extractField(QString source)
 }
 
 QString DataSourceManager::replaceVariables(QString value){
-#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 3)
-    QRegularExpression rx(Const::VARIABLE_RX);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 1)
+    QRegularExpression rx = getVariableRegEx();
     QRegularExpressionMatchIterator iter = rx.globalMatch(value);
     qsizetype pos = 0;
     QString result;
@@ -443,7 +449,6 @@ QString DataSourceManager::replaceVariables(QString value){
     }
     result += value.mid(pos);
     return result;
-    // TODO: Qt6 port - done
 #else
     QRegExp rx(Const::VARIABLE_RX);
 
@@ -468,8 +473,8 @@ QString DataSourceManager::replaceVariables(QString value){
 
 QString DataSourceManager::replaceVariables(QString query, QMap<QString,QString> &aliasesToParam)
 {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 3)
-    QRegularExpression rx(Const::VARIABLE_RX);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 1)
+    QRegularExpression rx = getVariableRegEx();
     int curentAliasIndex = 0;
     if (query.contains(rx)){
         int pos = -1;
@@ -508,7 +513,6 @@ QString DataSourceManager::replaceVariables(QString query, QMap<QString,QString>
             match = rx.match(query);
         }
     }
-    // TODO: Qt6 port - done
 #else
     QRegExp rx(Const::VARIABLE_RX);
     int curentAliasIndex = 0;
@@ -553,9 +557,8 @@ QString DataSourceManager::replaceVariables(QString query, QMap<QString,QString>
 
 QString DataSourceManager::replaceFields(QString query, QMap<QString,QString> &aliasesToParam, QString masterDatasource)
 {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 3)
-
-    QRegularExpression rx(Const::FIELD_RX);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 1)
+    QRegularExpression rx = getFieldRegEx();
     int curentAliasIndex = 0;
     if (query.contains(rx)){
         int pos = -1;
@@ -583,7 +586,6 @@ QString DataSourceManager::replaceFields(QString query, QMap<QString,QString> &a
             match = rx.match(query);
         }
     }
-    // TODO: Qt6 port - done
 #else
     QRegExp rx(Const::FIELD_RX);
     if (query.contains(rx)){
@@ -1498,7 +1500,7 @@ void DataSourceManager::invalidateQueriesContainsVariable(const QString& variabl
 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
                     QRegExp rx(QString(Const::NAMED_VARIABLE_RX).arg(variableName));
 #else
-                    QRegularExpression rx(QString(Const::NAMED_VARIABLE_RX).arg(variableName));
+                    QRegularExpression rx = getNamedVariableRegEx(variableName);
 #endif
                     if  (holder->queryText().contains(rx)){
                         holder->invalidate(designTime() ? IDataSource::DESIGN_MODE : IDataSource::RENDER_MODE);
diff --git a/limereport/lrfactoryinitializer.cpp b/limereport/lrfactoryinitializer.cpp
index ccfc024..2a7225e 100644
--- a/limereport/lrfactoryinitializer.cpp
+++ b/limereport/lrfactoryinitializer.cpp
@@ -165,7 +165,7 @@ void initReportItems(){
 
 #ifdef HAVE_SVG
     DesignElementsFactory::instance().registerCreator(
-        "BarcodeItem",
+        "SVGItem",
         LimeReport::ItemAttribs(QObject::tr("SVG Item"),"Item"),
         createSVGItem
         );
diff --git a/limereport/lrglobal.cpp b/limereport/lrglobal.cpp
index cd2b6c0..ac78588 100644
--- a/limereport/lrglobal.cpp
+++ b/limereport/lrglobal.cpp
@@ -67,7 +67,7 @@ QString replaceHTMLSymbols(const QString &value)
     return result;
 }
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 3)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 1)
 QVector<QString> normalizeCaptures(const QRegularExpressionMatch& reg){
 #else
 QVector<QString> normalizeCaptures(const QRegExp& reg){
@@ -93,4 +93,53 @@ ReportError::ReportError(const QString& message):std::runtime_error(message.toSt
 IExternalPainter::~IExternalPainter(){}
 IPainterProxy::~IPainterProxy(){}
 
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 1)
+QRegularExpression getRegEx(QString expression){
+    return QRegularExpression(expression, QRegularExpression::DotMatchesEverythingOption);
+}
+QRegularExpression getVariableRegEx(){
+    return QRegularExpression(
+                Const::VARIABLE_RX,
+                QRegularExpression::DotMatchesEverythingOption |
+                QRegularExpression::CaseInsensitiveOption
+           );
+}
+QRegularExpression getFieldRegEx(){
+    return QRegularExpression(
+                Const::FIELD_RX,
+                QRegularExpression::DotMatchesEverythingOption |
+                QRegularExpression::CaseInsensitiveOption
+           );
+}
+QRegularExpression getScriptRegEx(){
+    return QRegularExpression(
+                Const::SCRIPT_RX,
+                QRegularExpression::DotMatchesEverythingOption |
+                QRegularExpression::CaseInsensitiveOption
+           );
+}
+QRegularExpression getGroupFunctionRegEx(QString functionName){
+    return QRegularExpression(
+                QString(Const::GROUP_FUNCTION_RX).arg(functionName),
+                QRegularExpression::DotMatchesEverythingOption |
+                QRegularExpression::InvertedGreedinessOption
+           );
+}
+QRegularExpression getGroupFunctionNameRegEx(QString functionName){
+    return QRegularExpression(
+                QString(Const::GROUP_FUNCTION_NAME_RX).arg(functionName),
+                QRegularExpression::DotMatchesEverythingOption |
+                QRegularExpression::InvertedGreedinessOption
+           );
+}
+QRegularExpression getNamedVariableRegEx(QString variableName){
+    return QRegularExpression(
+                QString(Const::NAMED_VARIABLE_RX).arg(variableName),
+                QRegularExpression::DotMatchesEverythingOption
+           );
+}
+#endif
+
+
 } //namespace LimeReport
diff --git a/limereport/lrglobal.h b/limereport/lrglobal.h
index ed0254a..95f9801 100644
--- a/limereport/lrglobal.h
+++ b/limereport/lrglobal.h
@@ -104,7 +104,7 @@ namespace Const{
     QString extractClassName(QString className);
     QString escapeSimbols(const QString& value);
     QString replaceHTMLSymbols(const QString &value);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 3)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 1)
     QVector<QString> normalizeCaptures(const QRegularExpressionMatch &reg);
 #else
     QVector<QString> normalizeCaptures(const QRegExp &reg);    
@@ -125,12 +125,12 @@ namespace Const{
     Q_DECLARE_FLAGS(PreviewHints, PreviewHint)
     Q_FLAGS(PreviewHints)
 
-    class ReportError : public std::runtime_error{
+    class LIMEREPORT_EXPORT ReportError : public std::runtime_error{
     public:
         ReportError(const QString& message);
     };
 
-    class ReportSettings{
+    class LIMEREPORT_EXPORT ReportSettings{
     public:
         ReportSettings():m_suppressAbsentFieldsAndVarsWarnings(false){}
         void setDefaultValues(){m_suppressAbsentFieldsAndVarsWarnings = false;}
@@ -140,13 +140,13 @@ namespace Const{
         bool m_suppressAbsentFieldsAndVarsWarnings;
     };
 
-    class IExternalPainter{
+    class LIMEREPORT_EXPORT IExternalPainter{
     public:
         virtual void paintByExternalPainter(const QString& objectName, QPainter* painter, const QStyleOptionGraphicsItem* options) = 0;
         virtual ~IExternalPainter();
     };
 
-    class IPainterProxy{
+    class LIMEREPORT_EXPORT IPainterProxy{
     public:
         virtual void setExternalPainter(IExternalPainter* externalPainter) = 0;
         virtual ~IPainterProxy();
@@ -157,8 +157,18 @@ namespace Const{
 #else
     typedef QStyleOptionViewItem StyleOptionViewItem;
 #endif
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 1)
+    QRegularExpression getRegEx(QString expression);
+    QRegularExpression getVariableRegEx();
+    QRegularExpression getFieldRegEx();
+    QRegularExpression getScriptRegEx();
+    QRegularExpression getGroupFunctionRegEx(QString functionName);
+    QRegularExpression getGroupFunctionNameRegEx(QString functionName);
+    QRegularExpression getNamedVariableRegEx(QString variableName);
+#endif
 
-    class Enums
+
+    class LIMEREPORT_EXPORT Enums
     {
     public:
         enum VariableDataType {Undefined, String, Bool, Int, Real, Date, Time, DateTime};
diff --git a/limereport/lrgroupfunctions.cpp b/limereport/lrgroupfunctions.cpp
index 3130832..f893d12 100644
--- a/limereport/lrgroupfunctions.cpp
+++ b/limereport/lrgroupfunctions.cpp
@@ -48,8 +48,8 @@ void GroupFunction::slotBandRendered(BandDesignIntf *band)
     QRegExp rxField(Const::FIELD_RX);
     QRegExp rxVar(Const::VARIABLE_RX);
 #else
-    QRegularExpression rxField(Const::FIELD_RX);
-    QRegularExpression rxVar(Const::VARIABLE_RX);
+    QRegularExpression rxField = getFieldRegEx();
+    QRegularExpression rxVar = getVariableRegEx();
 #endif
 
     switch (m_dataType){
@@ -154,9 +154,9 @@ GroupFunction::GroupFunction(const QString &expression, const QString &dataBandN
     QRegExp rxVariable(Const::VARIABLE_RX,Qt::CaseInsensitive);
     QRegExp rxScript(Const::SCRIPT_RX,Qt::CaseInsensitive);
 #else
-    QRegularExpression rxField(Const::FIELD_RX, QRegularExpression::CaseInsensitiveOption);
-    QRegularExpression rxVariable(Const::VARIABLE_RX, QRegularExpression::CaseInsensitiveOption);
-    QRegularExpression rxScript(Const::SCRIPT_RX, QRegularExpression::CaseInsensitiveOption);
+    QRegularExpression rxField = getFieldRegEx();
+    QRegularExpression rxVariable = getVariableRegEx();
+    QRegularExpression rxScript = getScriptRegEx();
 #endif
 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
     if (rxScript.indexIn(expression) != -1){
diff --git a/limereport/lritemscontainerdesignitf.h b/limereport/lritemscontainerdesignitf.h
index 483bf95..5a87532 100644
--- a/limereport/lritemscontainerdesignitf.h
+++ b/limereport/lritemscontainerdesignitf.h
@@ -5,7 +5,7 @@
 
 namespace LimeReport{
 
-class Segment{
+class LIMEREPORT_EXPORT Segment{
 public:
     Segment(qreal segmentStart,qreal segmentEnd):m_begin(segmentStart),m_end(segmentEnd){}
     bool intersect(Segment value);
@@ -15,17 +15,17 @@ private:
     qreal m_end;
 };
 
-class VSegment : public Segment{
+class LIMEREPORT_EXPORT VSegment : public Segment{
 public:
     VSegment(QRectF rect):Segment(rect.top(),rect.bottom()){}
 };
 
-struct HSegment :public Segment{
+struct LIMEREPORT_EXPORT HSegment :public Segment{
 public:
     HSegment(QRectF rect):Segment(rect.left(),rect.right()){}
 };
 
-struct ItemSortContainer {
+struct LIMEREPORT_EXPORT ItemSortContainer {
     QRectF m_rect;
     BaseDesignIntf * m_item;
     ItemSortContainer(BaseDesignIntf *item){
@@ -35,9 +35,9 @@ struct ItemSortContainer {
 };
 
 typedef QSharedPointer< ItemSortContainer > PItemSortContainer;
-bool itemSortContainerLessThen(const PItemSortContainer c1, const PItemSortContainer c2);
+bool LIMEREPORT_EXPORT itemSortContainerLessThen(const PItemSortContainer c1, const PItemSortContainer c2);
 
-class ItemsContainerDesignInft : public BookmarkContainerDesignIntf{
+class LIMEREPORT_EXPORT ItemsContainerDesignInft : public BookmarkContainerDesignIntf{
     Q_OBJECT
 public:
   ItemsContainerDesignInft(const QString& xmlTypeName, QObject* owner = 0, QGraphicsItem* parent=0):
diff --git a/limereport/lrpagedesignintf.cpp b/limereport/lrpagedesignintf.cpp
index 9862663..35323b3 100644
--- a/limereport/lrpagedesignintf.cpp
+++ b/limereport/lrpagedesignintf.cpp
@@ -753,7 +753,6 @@ ReportEnginePrivate *PageDesignIntf::reportEditor()
 
 void PageDesignIntf::dragEnterEvent(QGraphicsSceneDragDropEvent *event)
 {
-
     if (!event->mimeData()->text().isEmpty()){
         event->setDropAction(Qt::CopyAction);
         event->accept();
@@ -782,7 +781,7 @@ void PageDesignIntf::dropEvent(QGraphicsSceneDragDropEvent* event)
 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
         if (isVar) data = data.remove(QRegExp("  \\[.*\\]"));
 #else
-        if (isVar) data = data.remove(QRegularExpression("  \\[.*\\]"));
+        if (isVar) data = data.remove(QRegularExpression("  \\[.*\\]", QRegularExpression::DotMatchesEverythingOption));
 #endif
         ti->setContent(data);
         if (!isVar){
@@ -794,7 +793,7 @@ void PageDesignIntf::dropEvent(QGraphicsSceneDragDropEvent* event)
                     parentBand->setProperty("datasource",dataSource.cap(1));
                 }
 #else
-                QRegularExpression dataSource("(?:\\$D\\{\\s*(.*)\\..*\\})");
+                QRegularExpression dataSource("(?:\\$D\\{\\s*(.*)\\..*\\})", QRegularExpression::DotMatchesEverythingOption);
                 QRegularExpressionMatch match = dataSource.match(data);
                 if(match.hasMatch()){
                     parentBand->setProperty("datasource", match.captured(1));
@@ -1853,6 +1852,20 @@ void PageDesignIntf::setBorders(const BaseDesignIntf::BorderLines& border)
     changeSelectedGroupProperty("borders", (int)border);
 }
 
+void PageDesignIntf::setBordersExt(
+        const BaseDesignIntf::BorderLines& border,
+        const double borderWidth,
+        const LimeReport::BaseDesignIntf::BorderStyle style,
+        const QString color
+
+)
+{
+    changeSelectedGroupProperty("borders", (int)border);
+    changeSelectedGroupProperty("borderLineSize", borderWidth);
+    changeSelectedGroupProperty("borderStyle", style);
+    changeSelectedGroupProperty("borderColor", color);
+}
+
 void PageDesignIntf::lockSelectedItems()
 {
     foreach(QGraphicsItem* graphicItem, selectedItems()){
@@ -2145,12 +2158,11 @@ bool PasteCommand::insertItem(ItemsReaderIntf::Ptr reader)
             reader->readItem(item);
             item->setParent(parentItem);
             item->setParentItem(parentItem);
-            if (page()->reportItemsByName(item->objectName()).size()>1){
+            if (page()->reportItemsByName(item->objectName()).size() > 0){
                 item->setObjectName(objectName);
             }
-
+            else
             foreach (BaseDesignIntf* child, item->childBaseItems()){
-                if (page()->reportItemsByName(child->objectName()).size() == 0)
                 changeName(page(), child);
             };
             m_itemNames.push_back(item->objectName());
diff --git a/limereport/lrpagedesignintf.h b/limereport/lrpagedesignintf.h
index 622593b..1ef209e 100644
--- a/limereport/lrpagedesignintf.h
+++ b/limereport/lrpagedesignintf.h
@@ -254,6 +254,11 @@ namespace LimeReport {
         void setFont(const QFont &font);
         void setTextAlign(const Qt::Alignment& alignment);
         void setBorders(const BaseDesignIntf::BorderLines& border);
+        void setBordersExt(const BaseDesignIntf::BorderLines &border,
+                const double borderWidth,
+                const BaseDesignIntf::BorderStyle style,
+                const QString color
+        );
         void lockSelectedItems();
         void unlockSelectedItems();
         void selectOneLevelItems();
diff --git a/limereport/lrpageitemdesignintf.cpp b/limereport/lrpageitemdesignintf.cpp
index 0311707..57f05ae 100644
--- a/limereport/lrpageitemdesignintf.cpp
+++ b/limereport/lrpageitemdesignintf.cpp
@@ -98,38 +98,10 @@ void PageItemDesignIntf::paint(QPainter *ppainter, const QStyleOptionGraphicsIte
         paintGrid(ppainter, rect);
         ppainter->setPen(gridColor());
         ppainter->drawRect(boundingRect());
-        //Draw shadow
-        qreal shWidth = boundingRect().width()/100;
-        QRectF rshadow(boundingRect().topRight() + QPointF(0, shWidth),
-                       boundingRect().bottomRight() + QPointF(shWidth, 0));
-        QLinearGradient rgrad(rshadow.topLeft(), rshadow.topRight());
-        rgrad.setColorAt(0.0, QColor(0,0,0,255));
-        rgrad.setColorAt(1.0, QColor(0,0,0,0));
-        ppainter->fillRect(rshadow, QBrush(rgrad));
-        QRectF bshadow(boundingRect().bottomLeft() + QPointF(shWidth, 0),
-                       boundingRect().bottomRight() + QPointF(0, shWidth));
-        QLinearGradient bgrad(bshadow.topLeft(), bshadow.bottomLeft());
-        bgrad.setColorAt(0.0, QColor(0,0,0,255));
-        bgrad.setColorAt(1.0, QColor(0,0,0,0));
-        ppainter->fillRect(bshadow, QBrush(bgrad));
-        QRectF cshadow(boundingRect().bottomRight(),
-                       boundingRect().bottomRight() + QPointF(shWidth, shWidth));
-        QRadialGradient cgrad(cshadow.topLeft(), shWidth, cshadow.topLeft());
-        cgrad.setColorAt(0.0, QColor(0,0,0,255));
-        cgrad.setColorAt(1.0, QColor(0,0,0,0));
-        ppainter->fillRect(cshadow, QBrush(cgrad));
-        if (m_isExtendedInDesignMode){
-            QPen pen;
-            pen.setColor(Qt::red);
-            pen.setStyle(Qt::DashLine);
-            pen.setWidth(2);
-            ppainter->setPen(pen);
-            ppainter->drawLine(pageRect().bottomLeft(),pageRect().bottomRight());
-        }
+        drawShadow(ppainter, boundingRect(), 10);
         ppainter->restore();
     }
 
-
     if (itemMode() & PreviewMode) {
         ppainter->save();
         ppainter->fillRect(rect(), Qt::white);
@@ -145,8 +117,6 @@ void PageItemDesignIntf::paint(QPainter *ppainter, const QStyleOptionGraphicsIte
         BaseDesignIntf::paint(ppainter,option,widget);
     }
 
-
-
 }
 
 BaseDesignIntf *PageItemDesignIntf::createSameTypeItem(QObject *owner, QGraphicsItem *parent)
@@ -828,7 +798,7 @@ void PageItemDesignIntf::processPopUpAction(QAction *action)
     }
     if(action->text() == tr("Edit"))
     {
-        lrpageeditor pageEdit(NULL,this);
+        PageEditor pageEdit(NULL,this);
         pageEdit.exec();
     }
 
diff --git a/limereport/lrpageitemdesignintf.h b/limereport/lrpageitemdesignintf.h
index 365c87d..1170a8f 100644
--- a/limereport/lrpageitemdesignintf.h
+++ b/limereport/lrpageitemdesignintf.h
@@ -39,7 +39,7 @@
 namespace LimeReport{
 
 class ReportRender;
-class PageItemDesignIntf : public ItemsContainerDesignInft
+class LIMEREPORT_EXPORT PageItemDesignIntf : public ItemsContainerDesignInft
 {
     Q_OBJECT
     Q_PROPERTY(int topMargin READ topMargin WRITE setTopMargin)
diff --git a/limereport/lrreportdesignwidget.cpp b/limereport/lrreportdesignwidget.cpp
index 19c3a3e..58570bc 100644
--- a/limereport/lrreportdesignwidget.cpp
+++ b/limereport/lrreportdesignwidget.cpp
@@ -704,6 +704,16 @@ void ReportDesignWidget::setBorders(const BaseDesignIntf::BorderLines& borders)
         activePage()->setBorders(borders);
 }
 
+void ReportDesignWidget::setBordersExt(
+    const BaseDesignIntf::BorderLines& border,
+    const double borderWidth,
+    const LimeReport::BaseDesignIntf::BorderStyle style,
+    const QString color
+){
+    if (activePage())
+        activePage()->setBordersExt(border, borderWidth, style, color);
+}
+
 void ReportDesignWidget::prepareReport()
 {
     m_report->scriptContext()->setInitScript(m_scriptEditor->toPlainText());
diff --git a/limereport/lrreportdesignwidget.h b/limereport/lrreportdesignwidget.h
index 8057f13..9a5a68a 100644
--- a/limereport/lrreportdesignwidget.h
+++ b/limereport/lrreportdesignwidget.h
@@ -194,6 +194,8 @@ public slots:
     void setFont(const QFont &font);
     void setTextAlign(const bool &horizontalAlign, const Qt::AlignmentFlag &alignment);
     void setBorders(const BaseDesignIntf::BorderLines& borders);
+    void setBordersExt(const BaseDesignIntf::BorderLines &border, const double borderWidth,
+                       const LimeReport::BaseDesignIntf::BorderStyle style, const QString color);
     void editSetting();
     void setUseGrid(bool value);
     void previewReport();
diff --git a/limereport/lrreportengine.cpp b/limereport/lrreportengine.cpp
index cde40b3..0fc7d08 100644
--- a/limereport/lrreportengine.cpp
+++ b/limereport/lrreportengine.cpp
@@ -468,7 +468,7 @@ bool ReportEnginePrivate::exportReport(QString exporterName, const QString &file
         if (fn.isEmpty()){
             QString defaultFileName = reportName().split(".")[0];
             QString filter = QString("%1 (*.%2)").arg(e->exporterName()).arg(e->exporterFileExt());
-            QString fn = QFileDialog::getSaveFileName(0, tr("%1 file name").arg(e->exporterName()), defaultFileName, filter);
+            fn = QFileDialog::getSaveFileName(0, tr("%1 file name").arg(e->exporterName()), defaultFileName, filter);
         }
         if (!fn.isEmpty()){
             QFileInfo fi(fn);
diff --git a/limereport/lrreportrender.cpp b/limereport/lrreportrender.cpp
index 917bf04..d412b19 100644
--- a/limereport/lrreportrender.cpp
+++ b/limereport/lrreportrender.cpp
@@ -196,13 +196,11 @@ void ReportRender::analizeItem(ContentItemDesignIntf* contentItem, BandDesignInt
         QString content = contentItem->content();
         QVector<QString> functions;
         foreach(const QString &functionName, m_datasources->groupFunctionNames()){
-#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 3)
-            QRegularExpression rx(QString(Const::GROUP_FUNCTION_RX).arg(functionName));
-            rx.setPatternOptions(rx.InvertedGreedinessOption);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 1)
+            QRegularExpression rx = getGroupFunctionRegEx(functionName);
             if(content.indexOf(rx)>=0){
                 functions.append(functionName);
             }
-            // TODO: Qt6 port - done
 #else
             QRegExp rx(QString(Const::GROUP_FUNCTION_RX).arg(functionName));
             rx.setMinimal(true);
@@ -368,13 +366,11 @@ void ReportRender::clearPageMap()
 bool checkContentItem(ContentItemDesignIntf* item, DataSourceManager* datasources){
     QString content = item->content();
     foreach(QString functionName, datasources->groupFunctionNames()){
-#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 3)
-        QRegularExpression rx(QString(Const::GROUP_FUNCTION_RX).arg(functionName));
-        rx.setPatternOptions(rx.InvertedGreedinessOption);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 1)
+        QRegularExpression rx = getGroupFunctionRegEx(functionName);
         if(content.indexOf(rx)>=0){
             return true;
         }
-        // TODO: Qt6 port - done
 #else
         QRegExp rx(QString(Const::GROUP_FUNCTION_RX).arg(functionName));
         if (rx.indexIn(content)>=0){
@@ -400,16 +396,14 @@ bool ReportRender::containsGroupFunctions(BaseDesignIntf *container){
 }
 
 void ReportRender::extractGroupFuntionsFromItem(ContentItemDesignIntf* contentItem, BandDesignIntf* band){
-#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 3)
-
-    if ( contentItem && contentItem->content().contains(QRegularExpression("\\$S\\s*\\{.*\\}"))){
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 1)
+    if ( contentItem && contentItem->content().contains(getScriptRegEx())){
         foreach(const QString &functionName, m_datasources->groupFunctionNames()){
-            QRegularExpression rx(QString(Const::GROUP_FUNCTION_RX).arg(functionName));
-            rx.setPatternOptions(rx.InvertedGreedinessOption);
-            QRegularExpression rxName(QString(Const::GROUP_FUNCTION_NAME_RX).arg(functionName));
-            rxName.setPatternOptions(rx.InvertedGreedinessOption);
 
+            QRegularExpression rx = getGroupFunctionRegEx(functionName);
+            QRegularExpression rxName = getGroupFunctionNameRegEx(functionName);
             QRegularExpressionMatch match = rx.match(contentItem->content());
+
             if (match.hasMatch()){
 
                 QRegularExpressionMatchIterator iter = rx.globalMatch(contentItem->content());
@@ -437,31 +431,7 @@ void ReportRender::extractGroupFuntionsFromItem(ContentItemDesignIntf* contentIt
                         }
                     }
                 }
-//                int pos = 0;
-//                while ( (pos = match.capturedStart()) != -1){
-//                    QVector<QString> captures = normalizeCaptures(match);
-//                    if (captures.size() >= 3){
-//                        int dsIndex = captures.size() == 3 ? Const::DATASOURCE_INDEX - 1 : Const::DATASOURCE_INDEX;
-//                        BandDesignIntf* dataBand = m_patternPageItem->bandByName(captures.at(dsIndex));
-//                        if (dataBand){
-//                            GroupFunction* gf = datasources()->addGroupFunction(
-//                                functionName, captures.at(Const::VALUE_INDEX), band->objectName(), dataBand->objectName()
-//                            );
-//                            if (gf){
-//                                connect(dataBand, SIGNAL(bandRendered(BandDesignIntf*)),
-//                                        gf, SLOT(slotBandRendered(BandDesignIntf*)));
-//                                connect(dataBand, SIGNAL(bandReRendered(BandDesignIntf*, BandDesignIntf*)),
-//                                        gf, SLOT(slotBandReRendered(BandDesignIntf*, BandDesignIntf*)));
-//                            }
-//                        } else {
-//                            GroupFunction* gf = datasources()->addGroupFunction(
-//                                functionName, captures.at(Const::VALUE_INDEX), band->objectName(), captures.at(dsIndex)
-//                            );
-//                            gf->setInvalid(tr("Databand \"%1\" not found").arg(captures.at(dsIndex)));
-//                        }
-//                    }
-//                    match = rx.match(contentItem->content(), pos + match.capturedLength());
-//                }
+
             } else if (contentItem->content().indexOf(rxName)>=0){
                 match = rxName.match(contentItem->content());
                 GroupFunction* gf = datasources()->addGroupFunction(functionName, match.captured(1), band->objectName(), "");
@@ -470,7 +440,6 @@ void ReportRender::extractGroupFuntionsFromItem(ContentItemDesignIntf* contentIt
         }
     }
 
-    // TODO: Qt6 port - done
 #else
     if ( contentItem && contentItem->content().contains(QRegExp("\\$S\\s*\\{.*\\}"))){
         foreach(const QString &functionName, m_datasources->groupFunctionNames()){
@@ -529,10 +498,8 @@ void ReportRender::replaceGroupFunctionsInItem(ContentItemDesignIntf* contentIte
         if (m_groupfunctionItems.contains(contentItem->patternName())){
             QString content = contentItem->content();
             foreach(QString functionName, m_groupfunctionItems.value(contentItem->patternName())){
-#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 3)
-
-                QRegularExpression rx(QString(Const::GROUP_FUNCTION_RX).arg(functionName));
-                rx.setPatternOptions(rx.InvertedGreedinessOption);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 1)
+                QRegularExpression rx = getGroupFunctionRegEx(functionName);
                 QRegularExpressionMatch match = rx.match(content);
 
                 if (match.capturedStart() != -1){
@@ -556,7 +523,6 @@ void ReportRender::replaceGroupFunctionsInItem(ContentItemDesignIntf* contentIte
                         match = rx.match(content, pos + match.capturedLength());
                     }
                 }
-                // TODO: Qt6 port - done
 #else
                 QRegExp rx(QString(Const::GROUP_FUNCTION_RX).arg(functionName));
                 rx.setMinimal(true);
diff --git a/limereport/lrscriptenginemanager.cpp b/limereport/lrscriptenginemanager.cpp
index 7a65a6d..31220d3 100644
--- a/limereport/lrscriptenginemanager.cpp
+++ b/limereport/lrscriptenginemanager.cpp
@@ -398,7 +398,7 @@ QString ScriptEngineManager::expandUserVariables(QString context, RenderPass /*
     }
     return context;
 #else
-    QRegularExpression rx(Const::VARIABLE_RX);
+    QRegularExpression rx = getVariableRegEx();
     if (context.contains(rx)){
         int pos = 0;
         QRegularExpressionMatch match = rx.match(context, pos);
@@ -504,8 +504,7 @@ QString ScriptEngineManager::expandDataFields(QString context, ExpandType expand
 
     return context;
 #else
-    QRegularExpression rx(Const::FIELD_RX);
-
+    QRegularExpression rx = getFieldRegEx();
     if (context.contains(rx)){
         QRegularExpressionMatch match = rx.match(context);
         while (match.hasMatch()){
@@ -520,17 +519,32 @@ QString ScriptEngineManager::expandDataFields(QString context, ExpandType expand
                         fieldValue="\"\"";
                     } else {
                         fieldValue = escapeSimbols(varValue.toString());
-                        switch (dataManager()->fieldData(field).type()) {
-                        case QVariant::Char:
-                        case QVariant::String:
-                        case QVariant::StringList:
-                        case QVariant::Date:
-                        case QVariant::DateTime:
-                            fieldValue = "\""+fieldValue+"\"";
-                            break;
-                        default:
-                            break;
+                        //TODO: Migrate to QMetaType
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+                        switch (dataManager()->fieldData(field).typeId()) {
+                            case QMetaType::QChar:
+                            case QMetaType::QString:
+                            case QMetaType::QStringList:
+                            case QMetaType::QDate:
+                            case QMetaType::QDateTime:
+                                fieldValue = "\""+fieldValue+"\"";
+                                break;
+                            default:
+                                break;
                         }
+#else
+                        switch (dataManager()->fieldData(field).type()) {
+                            case QVariant::Char:
+                            case QVariant::String:
+                            case QVariant::StringList:
+                            case QVariant::Date:
+                            case QVariant::DateTime:
+                                fieldValue = "\""+fieldValue+"\"";
+                                break;
+                            default:
+                                break;
+                        }
+#endif
                     }
                 } else {
                     if (expandType == ReplaceHTMLSymbols)
@@ -567,8 +581,7 @@ QString ScriptEngineManager::expandScripts(QString context, QVariant& varValue,
 
     if (context.contains(rx)){
 #else
-    QRegularExpression rx(Const::SCRIPT_RX, QRegularExpression::DotMatchesEverythingOption);
-
+    QRegularExpression rx = getScriptRegEx();
     if(context.contains(rx)){
 #endif
 
@@ -636,8 +649,8 @@ QVariant ScriptEngineManager::evaluateScript(const QString& script){
     QVariant varValue;
 
     if (script.contains(rx)){
-#else
-    QRegularExpression rx(Const::SCRIPT_RX);
+#else    
+    QRegularExpression rx = getScriptRegEx();
     QVariant varValue;
 
     if (script.contains(rx)){
@@ -694,7 +707,6 @@ int ScriptEngineManager::getPageFreeSpace(PageItemDesignIntf* page){
     if (page){
         int height = 0;
         foreach(BandDesignIntf* band, page->bands()){
-
             if(band->type() == BandDesignIntf::Data)
             {
                 height += band->geometry().height() * m_dataManager->dataSource(band->datasourceName())->model()->rowCount();
@@ -1115,7 +1127,7 @@ bool ScriptExtractor::parse()
 
 bool ScriptExtractor::parse(int &curPos, const State& state, ScriptNode::Ptr scriptNode)
 {
-    while (curPos<m_context.length()){
+    while (curPos < m_context.length()){
         switch (state) {
         case OpenBracketFound:
             if (m_context[curPos]=='}'){
@@ -1431,6 +1443,8 @@ DialogDescriber* ScriptEngineContext::findDialogContainer(const QString& dialogN
     return 0;
 }
 
+#endif
+
 TableOfContents* ScriptEngineContext::tableOfContents() const
 {
     return m_tableOfContents;
@@ -1462,6 +1476,8 @@ void ScriptEngineContext::setCurrentBand(BandDesignIntf* currentBand)
     m_currentBand = currentBand;
 }
 
+#ifdef HAVE_UI_LOADER
+
 QDialog* ScriptEngineContext::getDialog(const QString& dialogName)
 {
     QDialog* dialog = findDialog(dialogName);
@@ -1685,11 +1701,10 @@ QVariant ScriptFunctionsManager::calcGroupFunction(const QString &name, const QS
         if (gf){
             if (gf->isValid()){
                 return gf->calculate(pageItem);
-            }else{
+            } else{
                 return gf->error();
             }
-        }
-        else {
+        } else {
             return QString(QObject::tr("Function %1 not found or have wrong arguments").arg(name));
         }
     } else {
diff --git a/limereport/lrscriptenginemanager.h b/limereport/lrscriptenginemanager.h
index dc75bc5..d027a1a 100644
--- a/limereport/lrscriptenginemanager.h
+++ b/limereport/lrscriptenginemanager.h
@@ -402,7 +402,11 @@ private:
 class ScriptNode{
 public:
     typedef QSharedPointer<ScriptNode> Ptr;
-    QString body(){return m_body;}
+    QString body(){
+        if (m_body.isEmpty() && m_children.count() > 0)
+          return m_children.at(0)->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 + '}';}
diff --git a/limereport/objectinspector/editors/lrcomboboxeditor.cpp b/limereport/objectinspector/editors/lrcomboboxeditor.cpp
index d034c50..3a4748a 100644
--- a/limereport/objectinspector/editors/lrcomboboxeditor.cpp
+++ b/limereport/objectinspector/editors/lrcomboboxeditor.cpp
@@ -56,7 +56,12 @@ ComboBoxEditor::ComboBoxEditor(QWidget *parent, bool clearable) :
         connect(m_buttonClear,SIGNAL(clicked()),this,SLOT(slotClearButtonClicked()));
     }
 
-    connect(m_comboBox,SIGNAL(currentIndexChanged(QString)),this,SLOT(slotCurrentIndexChanged(QString)));
+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+    connect(m_comboBox, SIGNAL(currentTextChanged(QString)), this, SLOT(slotCurrentIndexChanged(QString)));
+#else
+    connect(m_comboBox, SIGNAL(currentIndexChanged(QString)), this, SLOT(slotCurrentIndexChanged(QString)));
+#endif
+
     m_comboBox->installEventFilter(this);
     QHBoxLayout *layout = new QHBoxLayout(this);
     layout->addWidget(m_comboBox);
diff --git a/limereport/objectinspector/propertyItems/lrrectproptem.cpp b/limereport/objectinspector/propertyItems/lrrectproptem.cpp
index 20c2b56..d95e487 100644
--- a/limereport/objectinspector/propertyItems/lrrectproptem.cpp
+++ b/limereport/objectinspector/propertyItems/lrrectproptem.cpp
@@ -85,6 +85,17 @@ LimeReport::RectPropItem::RectPropItem(QObject *object, ObjectsList* objects, co
 
 QString LimeReport::RectPropItem::displayValue() const
 {
+    //TODO: Migrate to QMetaType
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    switch(propertyValue().typeId()){
+        case QMetaType::QRect:
+            return rectToString(propertyValue().toRect());
+        case QMetaType::QRectF:
+            return rectToString(propertyValue().toRect());
+        default :
+            return ObjectPropItem::displayValue();
+    }
+#else
     switch(propertyValue().type()){
         case QVariant::Rect:
             return rectToString(propertyValue().toRect());
@@ -93,6 +104,7 @@ QString LimeReport::RectPropItem::displayValue() const
         default :
             return ObjectPropItem::displayValue();
     }
+#endif
 }
 
 LimeReport::RectUnitPropItem::RectUnitPropItem(QObject *object, ObjectsList* objects, const QString &name, const QString &displayName, const QVariant &value, ObjectPropItem *parent, bool /*readonly*/):
diff --git a/limereport/report.qrc b/limereport/report.qrc
index 89999d9..dc59710 100644
--- a/limereport/report.qrc
+++ b/limereport/report.qrc
@@ -186,5 +186,6 @@
         <file alias="/images/logo32">images/designer.png</file>
         <file alias="/images/lock">images/lock.png</file>
         <file>images/unlock.png</file>
+        <file alias="/images/borderEditor">images/border_settings.png</file>
     </qresource>
 </RCC>
diff --git a/limereport/serializators/lrstorageintf.h b/limereport/serializators/lrstorageintf.h
index e0ec406..c178bd2 100644
--- a/limereport/serializators/lrstorageintf.h
+++ b/limereport/serializators/lrstorageintf.h
@@ -30,6 +30,7 @@
 #ifndef LRSTORAGEINTF_H
 #define LRSTORAGEINTF_H
 
+#include "lrglobal.h"
 #include <QSharedPointer>
 
 class QString;
@@ -37,14 +38,14 @@ class QObject;
 
 namespace LimeReport{
 
-class ObjectLoadingStateIntf{
+class LIMEREPORT_EXPORT ObjectLoadingStateIntf{
 public:
     virtual bool isLoading() = 0;
     virtual void objectLoadStarted() = 0;
     virtual void objectLoadFinished() = 0;
 };
 
-class ItemsWriterIntf
+class LIMEREPORT_EXPORT ItemsWriterIntf
 {
 public:
     virtual void putItem(QObject* item) = 0;
@@ -55,7 +56,7 @@ public:
     virtual ~ItemsWriterIntf(){}
 };
 
-class ItemsReaderIntf
+class LIMEREPORT_EXPORT ItemsReaderIntf
 {
 public:
     typedef QSharedPointer<ItemsReaderIntf> Ptr;
diff --git a/limereport/serializators/lrxmlwriter.cpp b/limereport/serializators/lrxmlwriter.cpp
index 7da6046..fdae62c 100644
--- a/limereport/serializators/lrxmlwriter.cpp
+++ b/limereport/serializators/lrxmlwriter.cpp
@@ -193,13 +193,23 @@ bool XMLWriter::enumOrFlag(QString name, QObject *item)
 bool XMLWriter::isCollection(QString propertyName, QObject* item)
 {
     QMetaProperty prop=item->metaObject()->property(item->metaObject()->indexOfProperty(propertyName.toLatin1()));
-    return QMetaType::type(prop.typeName())==COLLECTION_TYPE_ID;
+    //TODO: Migrate to QMetaType
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    return QMetaType::fromName(prop.typeName()).id() == COLLECTION_TYPE_ID;
+#else
+    return QMetaType::type(prop.typeName()) == COLLECTION_TYPE_ID;
+#endif
 }
 
 bool XMLWriter::isTranslation(QString propertyName, QObject* item)
 {
     QMetaProperty prop=item->metaObject()->property(item->metaObject()->indexOfProperty(propertyName.toLatin1()));
-    return QMetaType::type(prop.typeName())==TRANSLATION_TYPE_ID;
+    //TODO: Migrate to QMetaType
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    return QMetaType::fromName(prop.typeName()).id() == TRANSLATION_TYPE_ID;
+#else
+    return QMetaType::type(prop.typeName()) == TRANSLATION_TYPE_ID;
+#endif
 }
 
 void XMLWriter::saveCollection(QString propertyName, QObject *item, QDomElement *node)
@@ -254,7 +264,13 @@ void XMLWriter::saveTranslation(QString propertyName, QObject* item, QDomElement
 bool XMLWriter::isQObject(QString propertyName, QObject *item)
 {
     QMetaProperty prop=item->metaObject()->property(item->metaObject()->indexOfProperty(propertyName.toLatin1()));
-    return QMetaType::type(prop.typeName())==QMetaType::QObjectStar;
+    //TODO: Migrate to QMetaType
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    return QMetaType::fromName(prop.typeName()).id() == QMetaType::QObjectStar;
+#else
+    return QMetaType::type(prop.typeName()) == QMetaType::QObjectStar;
+#endif
+
 }
 
 bool XMLWriter::replaceNode(QDomElement node, QObject* item)
diff --git a/limereport/translationeditor/languageselectdialog.h b/limereport/translationeditor/languageselectdialog.h
index 0402327..48d53b4 100644
--- a/limereport/translationeditor/languageselectdialog.h
+++ b/limereport/translationeditor/languageselectdialog.h
@@ -8,18 +8,20 @@ namespace Ui {
 class LanguageSelectDialog;
 }
 
-class LanguageSelectDialog : public QDialog
-{
+class LanguageSelectDialog : public QDialog {
     Q_OBJECT
 
-public:
+  public:
     explicit LanguageSelectDialog(QWidget *parent = 0);
     ~LanguageSelectDialog();
     QLocale::Language getSelectedLanguage();
-private:
+
+  private:
     Ui::LanguageSelectDialog *ui;
 };
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 Q_DECLARE_METATYPE(QLocale::Language)
+#endif
 
 #endif // LANGUAGESELECTDIALOG_H
diff --git a/limereport/translationeditor/translationeditor.cpp b/limereport/translationeditor/translationeditor.cpp
index 8006c3b..a2e693e 100644
--- a/limereport/translationeditor/translationeditor.cpp
+++ b/limereport/translationeditor/translationeditor.cpp
@@ -29,7 +29,11 @@ TranslationEditor::TranslationEditor(QWidget *parent) :
     ui->tbStrings->setHorizontalHeaderItem(1,new QTableWidgetItem(tr("Report Item")));
     ui->tbStrings->setHorizontalHeaderItem(2,new QTableWidgetItem(tr("Property")));
     ui->tbStrings->setHorizontalHeaderItem(3,new QTableWidgetItem(tr("Source text")));
-    new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_Return), this, SLOT(slotItemChecked()));
+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+    m_clrReturn = new QShortcut(QKeySequence(Qt::CTRL | Qt::Key_Return), this, SLOT(slotItemChecked()));
+#else
+    m_clrReturn = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_Return), this, SLOT(slotItemChecked()));
+#endif
     //ui->tbStrings->setSortingEnabled(true);
 
 }
@@ -50,6 +54,7 @@ void TranslationEditor::setReportEngine(ITranslationContainer* translationContai
 TranslationEditor::~TranslationEditor()
 {
     delete ui;
+    delete m_clrReturn;
 }
 
 QLocale::Language TranslationEditor::getLanguageByName(const QString& languageName){
diff --git a/limereport/translationeditor/translationeditor.h b/limereport/translationeditor/translationeditor.h
index 48fbb0b..2288b25 100644
--- a/limereport/translationeditor/translationeditor.h
+++ b/limereport/translationeditor/translationeditor.h
@@ -4,6 +4,7 @@
 #include <QWidget>
 #include <QLocale>
 #include <QTreeWidgetItem>
+#include <QShortcut>
 #include "lrreporttranslation.h"
 
 namespace LimeReport {
@@ -46,6 +47,7 @@ private:
     PageTranslation* m_currentPageTranslation;
     PropertyTranslation* m_currentPropertyTranslation;
     bool m_translationChanging;
+    QShortcut* m_clrReturn;
 };
 
 } //namespace LimeReport
diff --git a/translations/limereport_ar.ts b/translations/limereport_ar.ts
index 94cd017..f15e62e 100644
--- a/translations/limereport_ar.ts
+++ b/translations/limereport_ar.ts
@@ -520,6 +520,109 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>LimeReport::BorderEditor</name>
+    <message>
+        <source>Edit border</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Presets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Outline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Border</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Solid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dash</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dash dot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dash dot dot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0.25</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0.5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1.5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>LimeReport::BorderFrameEditor</name>
     <message>
@@ -1366,6 +1469,93 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>LimeReport::PageEditor</name>
+    <message>
+        <source>Page setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paper</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished">الصيغة</translation>
+    </message>
+    <message>
+        <source>Dimension</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> mm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Orientation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Landscape</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop printer margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Height options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Endless Height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Extended Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full page</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>LimeReport::PageFooter</name>
     <message>
@@ -3408,194 +3598,4 @@ This preview is no longer valid.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>lrbordereditor</name>
-    <message>
-        <source>Style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Solid</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Presets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No lines</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Outline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Border</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit border</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0.25</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0.5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1.5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>6</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Color:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dash</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dash dot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dash dot dot</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>lrpageeditor</name>
-    <message>
-        <source>Paper</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format</source>
-        <translation type="unfinished">الصيغة</translation>
-    </message>
-    <message>
-        <source>Dimension</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Height:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Orientation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portrait</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Landscape</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Margins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bottom:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Top:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Right:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Left:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Drop printer margins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Height options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Endless Height</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Extended Height:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Page setup</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 </TS>
diff --git a/translations/limereport_es.ts b/translations/limereport_es.ts
index 7bac4e7..4171599 100644
--- a/translations/limereport_es.ts
+++ b/translations/limereport_es.ts
@@ -648,6 +648,109 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>LimeReport::BorderEditor</name>
+    <message>
+        <source>Edit border</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Presets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Outline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Border</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Solid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dash</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dash dot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dash dot dot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0.25</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0.5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1.5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>LimeReport::BorderFrameEditor</name>
     <message>
@@ -1494,6 +1597,93 @@ p, li { white-space: pre-wrap; }
         <translation>Exportar a PDF</translation>
     </message>
 </context>
+<context>
+    <name>LimeReport::PageEditor</name>
+    <message>
+        <source>Page setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paper</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished">Formato</translation>
+    </message>
+    <message>
+        <source>Dimension</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> mm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Orientation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait</source>
+        <translation type="unfinished">Retrato</translation>
+    </message>
+    <message>
+        <source>Landscape</source>
+        <translation type="unfinished">Apaisado (Horizontal)</translation>
+    </message>
+    <message>
+        <source>Margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop printer margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Height options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Endless Height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Extended Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full page</source>
+        <translation type="unfinished">Página completa</translation>
+    </message>
+</context>
 <context>
     <name>LimeReport::PageFooter</name>
     <message>
@@ -3538,194 +3728,4 @@ Esta vista previa ya no es válida.</translation>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>lrbordereditor</name>
-    <message>
-        <source>Style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Solid</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Presets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No lines</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Outline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Border</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit border</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0.25</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0.5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1.5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>6</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Color:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dash</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dash dot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dash dot dot</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>lrpageeditor</name>
-    <message>
-        <source>Paper</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format</source>
-        <translation type="unfinished">Formato</translation>
-    </message>
-    <message>
-        <source>Dimension</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Height:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Orientation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portrait</source>
-        <translation type="unfinished">Retrato</translation>
-    </message>
-    <message>
-        <source>Landscape</source>
-        <translation type="unfinished">Apaisado (Horizontal)</translation>
-    </message>
-    <message>
-        <source>Margins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bottom:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Top:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Right:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Left:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Drop printer margins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Height options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Endless Height</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Extended Height:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full page</source>
-        <translation type="unfinished">Página completa</translation>
-    </message>
-    <message>
-        <source>Page setup</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 </TS>
diff --git a/translations/limereport_fr.ts b/translations/limereport_fr.ts
index da93d65..28c4a61 100644
--- a/translations/limereport_fr.ts
+++ b/translations/limereport_fr.ts
@@ -567,62 +567,194 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LimeReport::BaseDesignIntf</name>
     <message>
-        <location filename="../limereport/lrbasedesignintf.cpp" line="1447"/>
-        <location filename="../limereport/lrbasedesignintf.cpp" line="1886"/>
+        <location filename="../limereport/lrbasedesignintf.cpp" line="1444"/>
+        <location filename="../limereport/lrbasedesignintf.cpp" line="1889"/>
         <source>Lock item geometry</source>
         <translation>Verrouiller la géométrie d&apos;un élément</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbasedesignintf.cpp" line="1453"/>
+        <location filename="../limereport/lrbasedesignintf.cpp" line="1450"/>
         <source>Copy</source>
         <translation>Copier</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbasedesignintf.cpp" line="1455"/>
+        <location filename="../limereport/lrbasedesignintf.cpp" line="1451"/>
         <source>Cut</source>
         <translation>Couper</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbasedesignintf.cpp" line="1457"/>
+        <location filename="../limereport/lrbasedesignintf.cpp" line="1452"/>
         <source>Paste</source>
         <translation>Coller</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbasedesignintf.cpp" line="1467"/>
+        <location filename="../limereport/lrbasedesignintf.cpp" line="1473"/>
         <source>Bring to top</source>
         <translation>Placer au premier-plan</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbasedesignintf.cpp" line="1468"/>
+        <location filename="../limereport/lrbasedesignintf.cpp" line="1474"/>
         <source>Send to back</source>
         <translation>Placer en arrière-plan</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbasedesignintf.cpp" line="1471"/>
+        <location filename="../limereport/lrbasedesignintf.cpp" line="1477"/>
         <source>Create Horizontal Layout</source>
         <translation>Créer une disposition horizontale</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbasedesignintf.cpp" line="1475"/>
+        <location filename="../limereport/lrbasedesignintf.cpp" line="1481"/>
         <source>Create Vertical Layout</source>
         <translation>Créer une disposition verticale</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbasedesignintf.cpp" line="1478"/>
+        <location filename="../limereport/lrbasedesignintf.cpp" line="1484"/>
         <source>No borders</source>
         <translation>Aucune bordure</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbasedesignintf.cpp" line="1479"/>
+        <location filename="../limereport/lrbasedesignintf.cpp" line="1485"/>
         <source>All borders</source>
         <translation>Toutes les bordures</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbasedesignintf.cpp" line="1480"/>
+        <location filename="../limereport/lrbasedesignintf.cpp" line="1486"/>
         <source>Edit borders...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>LimeReport::BorderEditor</name>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="14"/>
+        <source>Edit border</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="22"/>
+        <source>Presets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="31"/>
+        <source>No lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="51"/>
+        <source>Outline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="68"/>
+        <source>Border</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="81"/>
+        <location filename="../limereport/items/lrbordereditor.ui" line="108"/>
+        <location filename="../limereport/items/lrbordereditor.ui" line="129"/>
+        <location filename="../limereport/items/lrbordereditor.ui" line="156"/>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="191"/>
+        <source>Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="219"/>
+        <source>No style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="224"/>
+        <source>Solid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="229"/>
+        <source>Dash</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="234"/>
+        <source>Dot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="239"/>
+        <source>Dash dot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="244"/>
+        <source>Dash dot dot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="252"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="262"/>
+        <location filename="../limereport/items/lrbordereditor.ui" line="279"/>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="269"/>
+        <source>0.25</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="274"/>
+        <source>0.5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="284"/>
+        <source>1.5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="289"/>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="294"/>
+        <source>3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="299"/>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="304"/>
+        <source>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="309"/>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="317"/>
+        <source>Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="345"/>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>LimeReport::BorderFrameEditor</name>
     <message>
@@ -639,8 +771,8 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LimeReport::ConnectionDesc</name>
     <message>
-        <location filename="../limereport/lrdatadesignintf.cpp" line="372"/>
         <location filename="../limereport/lrdatadesignintf.cpp" line="377"/>
+        <location filename="../limereport/lrdatadesignintf.cpp" line="382"/>
         <source>defaultConnection</source>
         <translation>Connexion par défaut</translation>
     </message>
@@ -967,51 +1099,51 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LimeReport::DataSourceManager</name>
     <message>
-        <location filename="../limereport/lrdatasourcemanager.cpp" line="404"/>
+        <location filename="../limereport/lrdatasourcemanager.cpp" line="410"/>
         <source>Connection &quot;%1&quot; is not open</source>
         <translation>La connexion &quot;%1&quot; n&apos;est pas ouverte</translation>
     </message>
     <message>
-        <location filename="../limereport/lrdatasourcemanager.cpp" line="440"/>
-        <location filename="../limereport/lrdatasourcemanager.cpp" line="460"/>
-        <location filename="../limereport/lrdatasourcemanager.cpp" line="505"/>
-        <location filename="../limereport/lrdatasourcemanager.cpp" line="545"/>
+        <location filename="../limereport/lrdatasourcemanager.cpp" line="446"/>
+        <location filename="../limereport/lrdatasourcemanager.cpp" line="465"/>
+        <location filename="../limereport/lrdatasourcemanager.cpp" line="510"/>
+        <location filename="../limereport/lrdatasourcemanager.cpp" line="549"/>
         <source>Variable &quot;%1&quot; not found!</source>
         <translation>Variable &quot;%1&quot; introuvable!</translation>
     </message>
     <message>
-        <location filename="../limereport/lrdatasourcemanager.cpp" line="499"/>
-        <location filename="../limereport/lrdatasourcemanager.cpp" line="539"/>
+        <location filename="../limereport/lrdatasourcemanager.cpp" line="504"/>
+        <location filename="../limereport/lrdatasourcemanager.cpp" line="543"/>
         <source>Unknown parameter &quot;%1&quot; for variable &quot;%2&quot; found!</source>
         <translation>Paramètre inconnu %1 pour la variable %2 !</translation>
     </message>
     <message>
-        <location filename="../limereport/lrdatasourcemanager.cpp" line="750"/>
-        <location filename="../limereport/lrdatasourcemanager.cpp" line="1146"/>
+        <location filename="../limereport/lrdatasourcemanager.cpp" line="752"/>
+        <location filename="../limereport/lrdatasourcemanager.cpp" line="1148"/>
         <source>Datasource &quot;%1&quot; not found!</source>
         <translation>Source de donnée &quot;%1&quot; introuvable!</translation>
     </message>
     <message>
-        <location filename="../limereport/lrdatasourcemanager.cpp" line="847"/>
+        <location filename="../limereport/lrdatasourcemanager.cpp" line="849"/>
         <source>Connection with name &quot;%1&quot; already exists!</source>
         <translation>La connexion avec le nom &quot;%1&quot; existe déjà!</translation>
     </message>
     <message>
-        <location filename="../limereport/lrdatasourcemanager.cpp" line="872"/>
-        <location filename="../limereport/lrdatasourcemanager.cpp" line="881"/>
-        <location filename="../limereport/lrdatasourcemanager.cpp" line="890"/>
-        <location filename="../limereport/lrdatasourcemanager.cpp" line="897"/>
-        <location filename="../limereport/lrdatasourcemanager.cpp" line="906"/>
+        <location filename="../limereport/lrdatasourcemanager.cpp" line="874"/>
+        <location filename="../limereport/lrdatasourcemanager.cpp" line="883"/>
+        <location filename="../limereport/lrdatasourcemanager.cpp" line="892"/>
+        <location filename="../limereport/lrdatasourcemanager.cpp" line="899"/>
+        <location filename="../limereport/lrdatasourcemanager.cpp" line="908"/>
         <source>Datasource with name &quot;%1&quot; already exists!</source>
         <translation>La source de donnée avec le nom &quot;%1&quot; existe déjà!</translation>
     </message>
     <message>
-        <location filename="../limereport/lrdatasourcemanager.cpp" line="937"/>
+        <location filename="../limereport/lrdatasourcemanager.cpp" line="939"/>
         <source>Database &quot;%1&quot; not found</source>
         <translation>Base de données &quot;%1 introuvable</translation>
     </message>
     <message>
-        <location filename="../limereport/lrdatasourcemanager.cpp" line="1118"/>
+        <location filename="../limereport/lrdatasourcemanager.cpp" line="1120"/>
         <source>invalid connection</source>
         <translation>Connexion invalide</translation>
     </message>
@@ -1516,29 +1648,29 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LimeReport::ImageItem</name>
     <message>
-        <location filename="../limereport/items/lrimageitem.cpp" line="87"/>
-        <location filename="../limereport/items/lrimageitem.cpp" line="103"/>
+        <location filename="../limereport/items/lrimageitem.cpp" line="92"/>
+        <location filename="../limereport/items/lrimageitem.cpp" line="108"/>
         <source>Edit</source>
         <translation>Edition</translation>
     </message>
     <message>
-        <location filename="../limereport/items/lrimageitem.cpp" line="92"/>
-        <location filename="../limereport/items/lrimageitem.cpp" line="100"/>
+        <location filename="../limereport/items/lrimageitem.cpp" line="97"/>
+        <location filename="../limereport/items/lrimageitem.cpp" line="105"/>
         <source>Watermark</source>
         <translation>Filigrane</translation>
     </message>
     <message>
-        <location filename="../limereport/items/lrimageitem.cpp" line="163"/>
+        <location filename="../limereport/items/lrimageitem.cpp" line="168"/>
         <source>Images (*.gif *.icns *.ico *.jpeg *.tga *.tiff *.wbmp *.webp *.png *.jpg *.bmp);;All(*.*)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../limereport/items/lrimageitem.cpp" line="370"/>
+        <location filename="../limereport/items/lrimageitem.cpp" line="386"/>
         <source>Image</source>
         <translation>Image</translation>
     </message>
     <message>
-        <location filename="../limereport/items/lrimageitem.cpp" line="370"/>
+        <location filename="../limereport/items/lrimageitem.cpp" line="386"/>
         <source>Ext.</source>
         <translation>Externe.</translation>
     </message>
@@ -1612,37 +1744,37 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LimeReport::ItemsBordersEditorWidget</name>
     <message>
-        <location filename="../limereport/items/editors/lritemsborderseditorwidget.cpp" line="95"/>
+        <location filename="../limereport/items/editors/lritemsborderseditorwidget.cpp" line="92"/>
         <source>Top line</source>
         <translation>ligne haute</translation>
     </message>
     <message>
-        <location filename="../limereport/items/editors/lritemsborderseditorwidget.cpp" line="101"/>
+        <location filename="../limereport/items/editors/lritemsborderseditorwidget.cpp" line="98"/>
         <source>Bottom line</source>
         <translation>Ligne basse</translation>
     </message>
     <message>
-        <location filename="../limereport/items/editors/lritemsborderseditorwidget.cpp" line="107"/>
+        <location filename="../limereport/items/editors/lritemsborderseditorwidget.cpp" line="104"/>
         <source>Left line</source>
         <translation>Ligne gauche</translation>
     </message>
     <message>
-        <location filename="../limereport/items/editors/lritemsborderseditorwidget.cpp" line="113"/>
+        <location filename="../limereport/items/editors/lritemsborderseditorwidget.cpp" line="110"/>
         <source>Right line</source>
         <translation>Ligne droite</translation>
     </message>
     <message>
-        <location filename="../limereport/items/editors/lritemsborderseditorwidget.cpp" line="121"/>
+        <location filename="../limereport/items/editors/lritemsborderseditorwidget.cpp" line="118"/>
         <source>No borders</source>
         <translation>Aucune bordure</translation>
     </message>
     <message>
-        <location filename="../limereport/items/editors/lritemsborderseditorwidget.cpp" line="126"/>
+        <location filename="../limereport/items/editors/lritemsborderseditorwidget.cpp" line="123"/>
         <source>All borders</source>
         <translation>Toutes les bordures</translation>
     </message>
     <message>
-        <location filename="../limereport/items/editors/lritemsborderseditorwidget.cpp" line="131"/>
+        <location filename="../limereport/items/editors/lritemsborderseditorwidget.cpp" line="128"/>
         <source>Edit border</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1650,12 +1782,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LimeReport::MasterDetailProxyModel</name>
     <message>
-        <location filename="../limereport/lrdatadesignintf.cpp" line="593"/>
+        <location filename="../limereport/lrdatadesignintf.cpp" line="598"/>
         <source>Field: &quot;%1&quot; not found in &quot;%2&quot; child datasource</source>
         <translation>Le champ: &quot;%1&quot;est introuvable dans la source de donnée enfant &quot;%2&quot;</translation>
     </message>
     <message>
-        <location filename="../limereport/lrdatadesignintf.cpp" line="607"/>
+        <location filename="../limereport/lrdatadesignintf.cpp" line="612"/>
         <source>Field: &quot;%1&quot; not found in &quot;%2&quot; master datasource</source>
         <translation>Le champ: &quot;%1&quot;est introuvable dans la source de donnée principale &quot;%2&quot;</translation>
     </message>
@@ -1663,7 +1795,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LimeReport::ModelToDataSource</name>
     <message>
-        <location filename="../limereport/lrdatadesignintf.cpp" line="333"/>
+        <location filename="../limereport/lrdatadesignintf.cpp" line="338"/>
         <source>model is destroyed</source>
         <translation>Le modèle a été supprimé</translation>
     </message>
@@ -1702,6 +1834,119 @@ p, li { white-space: pre-wrap; }
         <translation>Exporter au format PDF</translation>
     </message>
 </context>
+<context>
+    <name>LimeReport::PageEditor</name>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="14"/>
+        <source>Page setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="24"/>
+        <source>Paper</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="32"/>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="44"/>
+        <source>Dimension</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="50"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="66"/>
+        <location filename="../limereport/items/lrpageeditor.ui" line="95"/>
+        <location filename="../limereport/items/lrpageeditor.ui" line="178"/>
+        <location filename="../limereport/items/lrpageeditor.ui" line="185"/>
+        <location filename="../limereport/items/lrpageeditor.ui" line="192"/>
+        <location filename="../limereport/items/lrpageeditor.ui" line="206"/>
+        <source> mm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="79"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="111"/>
+        <source>Orientation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="117"/>
+        <source>Portrait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="127"/>
+        <source>Landscape</source>
+        <translation type="unfinished">Paysage</translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="151"/>
+        <source>Margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="157"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="164"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="171"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="199"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="220"/>
+        <source>Drop printer margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="241"/>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="247"/>
+        <source>Height options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="253"/>
+        <source>Endless Height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="266"/>
+        <source>Extended Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="286"/>
+        <source>Full page</source>
+        <translation type="unfinished">Page entière</translation>
+    </message>
+</context>
 <context>
     <name>LimeReport::PageFooter</name>
     <message>
@@ -1733,43 +1978,43 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LimeReport::PageItemDesignIntf</name>
     <message>
-        <location filename="../limereport/lrpageitemdesignintf.cpp" line="780"/>
-        <location filename="../limereport/lrpageitemdesignintf.cpp" line="829"/>
+        <location filename="../limereport/lrpageitemdesignintf.cpp" line="750"/>
+        <location filename="../limereport/lrpageitemdesignintf.cpp" line="799"/>
         <source>Edit</source>
         <translation type="unfinished">Edition</translation>
     </message>
     <message>
-        <location filename="../limereport/lrpageitemdesignintf.cpp" line="776"/>
+        <location filename="../limereport/lrpageitemdesignintf.cpp" line="746"/>
         <source>Paste</source>
         <translation>Coller</translation>
     </message>
     <message>
-        <location filename="../limereport/lrpageitemdesignintf.cpp" line="785"/>
-        <location filename="../limereport/lrpageitemdesignintf.cpp" line="813"/>
+        <location filename="../limereport/lrpageitemdesignintf.cpp" line="755"/>
+        <location filename="../limereport/lrpageitemdesignintf.cpp" line="783"/>
         <source>Page is TOC</source>
         <translation>Table de contenus</translation>
     </message>
     <message>
-        <location filename="../limereport/lrpageitemdesignintf.cpp" line="789"/>
-        <location filename="../limereport/lrpageitemdesignintf.cpp" line="816"/>
+        <location filename="../limereport/lrpageitemdesignintf.cpp" line="759"/>
+        <location filename="../limereport/lrpageitemdesignintf.cpp" line="786"/>
         <source>Reset page number</source>
         <translation>Réinitialiser le numéro de page</translation>
     </message>
     <message>
-        <location filename="../limereport/lrpageitemdesignintf.cpp" line="793"/>
-        <location filename="../limereport/lrpageitemdesignintf.cpp" line="819"/>
+        <location filename="../limereport/lrpageitemdesignintf.cpp" line="763"/>
+        <location filename="../limereport/lrpageitemdesignintf.cpp" line="789"/>
         <source>Full page</source>
         <translation>Page entière</translation>
     </message>
     <message>
-        <location filename="../limereport/lrpageitemdesignintf.cpp" line="797"/>
-        <location filename="../limereport/lrpageitemdesignintf.cpp" line="822"/>
+        <location filename="../limereport/lrpageitemdesignintf.cpp" line="767"/>
+        <location filename="../limereport/lrpageitemdesignintf.cpp" line="792"/>
         <source>Set page size to printer</source>
         <translation>Adapterr la taille de la page à l&apos;imprimante</translation>
     </message>
     <message>
-        <location filename="../limereport/lrpageitemdesignintf.cpp" line="801"/>
-        <location filename="../limereport/lrpageitemdesignintf.cpp" line="826"/>
+        <location filename="../limereport/lrpageitemdesignintf.cpp" line="771"/>
+        <location filename="../limereport/lrpageitemdesignintf.cpp" line="796"/>
         <source>Mix with prior page</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1989,7 +2234,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LimeReport::ProxyHolder</name>
     <message>
-        <location filename="../limereport/lrdatadesignintf.cpp" line="532"/>
+        <location filename="../limereport/lrdatadesignintf.cpp" line="537"/>
         <source>Datasource has been invalidated</source>
         <translation>La source de donnée n&apos;a pas été validée</translation>
     </message>
@@ -2705,16 +2950,16 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LimeReport::RectUnitPropItem</name>
     <message>
-        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="109"/>
-        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="114"/>
-        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="119"/>
+        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="121"/>
+        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="126"/>
+        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="131"/>
         <source>width</source>
         <translation>Largeur</translation>
     </message>
     <message>
-        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="110"/>
-        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="115"/>
-        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="120"/>
+        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="122"/>
+        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="127"/>
+        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="132"/>
         <source>height</source>
         <translation>Hauteur</translation>
     </message>
@@ -3181,24 +3426,24 @@ Cet aperçu n&apos;est plus valide.</translation>
     <message>
         <location filename="../limereport/lrreportrender.cpp" line="175"/>
         <location filename="../limereport/lrreportrender.cpp" line="188"/>
-        <location filename="../limereport/lrreportrender.cpp" line="267"/>
+        <location filename="../limereport/lrreportrender.cpp" line="265"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="../limereport/lrreportrender.cpp" line="304"/>
+        <location filename="../limereport/lrreportrender.cpp" line="302"/>
         <source>page index out of range</source>
         <translation>Indice de la page dépassé</translation>
     </message>
     <message>
-        <location filename="../limereport/lrreportrender.cpp" line="436"/>
-        <location filename="../limereport/lrreportrender.cpp" line="498"/>
+        <location filename="../limereport/lrreportrender.cpp" line="430"/>
+        <location filename="../limereport/lrreportrender.cpp" line="467"/>
         <source>Databand &quot;%1&quot; not found</source>
         <translation>Bande de données &quot;%1 introuvable</translation>
     </message>
     <message>
-        <location filename="../limereport/lrreportrender.cpp" line="468"/>
-        <location filename="../limereport/lrreportrender.cpp" line="505"/>
+        <location filename="../limereport/lrreportrender.cpp" line="438"/>
+        <location filename="../limereport/lrreportrender.cpp" line="474"/>
         <source>Wrong using function %1</source>
         <translation>Utilisation incorrecte de la fonction &quot;%1&quot;</translation>
     </message>
@@ -3248,7 +3493,7 @@ Cet aperçu n&apos;est plus valide.</translation>
     </message>
     <message>
         <location filename="../limereport/databrowser/lrsqleditdialog.ui" line="601"/>
-        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="372"/>
+        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="349"/>
         <source>Preview</source>
         <translation>Aperçu</translation>
     </message>
@@ -3280,7 +3525,7 @@ Cet aperçu n&apos;est plus valide.</translation>
     </message>
     <message>
         <location filename="../limereport/databrowser/lrsqleditdialog.ui" line="764"/>
-        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="282"/>
+        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="272"/>
         <source>CSV</source>
         <translation></translation>
     </message>
@@ -3310,48 +3555,48 @@ Cet aperçu n&apos;est plus valide.</translation>
         <translation></translation>
     </message>
     <message>
-        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="132"/>
+        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="130"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="155"/>
+        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="146"/>
         <source>Datasource Name is empty!</source>
         <translation>Nom de source de donnée est vide!</translation>
     </message>
     <message>
-        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="156"/>
+        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="148"/>
         <source>SQL is empty!</source>
         <translation>SQL est vide!</translation>
     </message>
     <message>
-        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="159"/>
+        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="152"/>
         <source>Datasource with name: &quot;%1&quot; already exists!</source>
         <translation>La source de donnée avec le nom &quot;%1&quot; existe déja!</translation>
     </message>
     <message>
-        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="172"/>
+        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="165"/>
         <source>defaultConnection</source>
         <translation>Connexion par défaut</translation>
     </message>
     <message>
-        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="232"/>
+        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="225"/>
         <source>Datasource with name %1 already exist</source>
         <translation>La source de donnée avec le nom &quot;%1&quot; existe déja</translation>
     </message>
     <message>
-        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="324"/>
-        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="340"/>
+        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="308"/>
+        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="322"/>
         <source>Attention</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="324"/>
+        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="308"/>
         <source>Connection is not specified</source>
         <translation>La connexion n&apos;est pas spécifiée</translation>
     </message>
     <message>
-        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="335"/>
+        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="317"/>
         <source>Refresh</source>
         <translation>Actualiser</translation>
     </message>
@@ -3464,13 +3709,13 @@ Cet aperçu n&apos;est plus valide.</translation>
 <context>
     <name>LimeReport::ScriptEngineContext</name>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="1293"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="1305"/>
         <source>Dialog with name: %1 can`t be created</source>
         <translation>Le dialogue avec le nom &quot;%1&quot; ne peut pas être crée</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="1581"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="1589"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="1597"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="1605"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
@@ -3483,20 +3728,20 @@ Cet aperçu n&apos;est plus valide.</translation>
         <translation>Fonctions de groupe</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="761"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="782"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="798"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="814"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="831"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="881"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="898"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="915"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="773"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="794"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="810"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="826"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="843"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="893"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="910"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="927"/>
         <source>Value</source>
         <translation>Valeur</translation>
     </message>
     <message>
         <location filename="../limereport/lrscriptenginemanager.cpp" line="339"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="746"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="758"/>
         <source>BandName</source>
         <translation>Nom de la bande</translation>
     </message>
@@ -3507,7 +3752,7 @@ Cet aperçu n&apos;est plus valide.</translation>
     </message>
     <message>
         <location filename="../limereport/lrscriptenginemanager.cpp" line="339"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="979"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="991"/>
         <source>FieldName</source>
         <translation>Nom du champ</translation>
     </message>
@@ -3519,125 +3764,125 @@ Cet aperçu n&apos;est plus valide.</translation>
     </message>
     <message>
         <location filename="../limereport/lrscriptenginemanager.cpp" line="493"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="546"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="560"/>
         <source>Field %1 not found in %2!</source>
         <translation>Champ &quot;%1 introuvable dans %2!</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="744"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="756"/>
         <source>SYSTEM</source>
         <translation>Système</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="759"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="879"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="896"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="771"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="891"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="908"/>
         <source>NUMBER</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="761"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="782"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="798"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="814"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="831"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="773"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="794"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="810"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="826"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="843"/>
         <source>Format</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="762"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="774"/>
         <source>Precision</source>
         <translation>Précision</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="763"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="782"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="814"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="881"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="775"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="794"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="826"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="893"/>
         <source>Locale</source>
         <translation>Local</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="780"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="796"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="812"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="829"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="846"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="863"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="792"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="808"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="824"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="841"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="858"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="875"/>
         <source>DATE&amp;TIME</source>
         <translation>Date&amp;Heure</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="898"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="910"/>
         <source>CurrencySymbol</source>
         <translation>Symbolde de la monnaie</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="913"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="928"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="943"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="958"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="977"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="994"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="1009"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="1024"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="1039"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="1054"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="925"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="940"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="955"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="970"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="989"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="1006"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="1021"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="1036"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="1051"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="1066"/>
         <source>GENERAL</source>
         <translation>General</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="915"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="930"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="945"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="927"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="942"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="957"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="960"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="972"/>
         <source>Datasource</source>
         <translation>Source de donnée</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="961"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="973"/>
         <source>ValueField</source>
         <translation>Valeur</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="962"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="974"/>
         <source>KeyField</source>
         <translation>Clé</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="963"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="975"/>
         <source>KeyFieldValue</source>
         <translation>Valeur de la clé</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="980"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="992"/>
         <source>RowIndex</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="996"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="1011"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="1026"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="1008"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="1023"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="1038"/>
         <source>Unique identifier</source>
         <translation>Identifiant unique</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="996"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="1026"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="1008"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="1038"/>
         <source>Content</source>
         <translation>Contenu</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="1026"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="1038"/>
         <source>Indent</source>
         <translation>Indenter</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="1056"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="1068"/>
         <source>datasourceName</source>
         <translation>Nom de source de donnée</translation>
     </message>
@@ -3832,18 +4077,18 @@ Cet aperçu n&apos;est plus valide.</translation>
         <translation>Masquer si vide</translation>
     </message>
     <message>
-        <location filename="../limereport/items/lrtextitem.cpp" line="669"/>
-        <location filename="../limereport/items/lrtextitem.cpp" line="679"/>
+        <location filename="../limereport/items/lrtextitem.cpp" line="678"/>
+        <location filename="../limereport/items/lrtextitem.cpp" line="688"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="../limereport/items/lrtextitem.cpp" line="670"/>
+        <location filename="../limereport/items/lrtextitem.cpp" line="679"/>
         <source>TextItem &quot; %1 &quot; already has folower &quot; %2 &quot; </source>
         <translation>L&apos;élément texte &quot; %1 &quot; a toujours un copain &quot; %2 &quot; </translation>
     </message>
     <message>
-        <location filename="../limereport/items/lrtextitem.cpp" line="680"/>
+        <location filename="../limereport/items/lrtextitem.cpp" line="689"/>
         <source>TextItem &quot; %1 &quot; not found!</source>
         <translation>Elément &quot;%1&quot; introuvable!</translation>
     </message>
@@ -4086,32 +4331,32 @@ Cet aperçu n&apos;est plus valide.</translation>
     </message>
     <message>
         <location filename="../limereport/lrdatadesignintf.cpp" line="76"/>
-        <location filename="../limereport/lrdatadesignintf.cpp" line="118"/>
+        <location filename="../limereport/lrdatadesignintf.cpp" line="123"/>
         <source>Invalid connection! %1</source>
         <translation>Connexion invalidé %1</translation>
     </message>
     <message>
-        <location filename="../limereport/lrdatadesignintf.cpp" line="420"/>
+        <location filename="../limereport/lrdatadesignintf.cpp" line="425"/>
         <source>Master datasource &quot;%1&quot; not found!</source>
         <translation>Source de donnée principale &quot;%1&quot; introuvable!</translation>
     </message>
     <message>
-        <location filename="../limereport/lrdatadesignintf.cpp" line="503"/>
+        <location filename="../limereport/lrdatadesignintf.cpp" line="508"/>
         <source>Master datasouce &quot;%1&quot; not found!</source>
         <translation>Source de donnée principale &quot;%1&quot; introuvable!</translation>
     </message>
     <message>
-        <location filename="../limereport/lrdatadesignintf.cpp" line="504"/>
+        <location filename="../limereport/lrdatadesignintf.cpp" line="509"/>
         <source>Child</source>
         <translation>Enfant</translation>
     </message>
     <message>
-        <location filename="../limereport/lrdatadesignintf.cpp" line="504"/>
+        <location filename="../limereport/lrdatadesignintf.cpp" line="509"/>
         <source> and child </source>
         <translation> est enfant </translation>
     </message>
     <message>
-        <location filename="../limereport/lrdatadesignintf.cpp" line="505"/>
+        <location filename="../limereport/lrdatadesignintf.cpp" line="510"/>
         <source>datasouce &quot;%1&quot; not found!</source>
         <translation>Source de donnée &quot;%1&quot; introuvable!</translation>
     </message>
@@ -4227,14 +4472,14 @@ Cet aperçu n&apos;est plus valide.</translation>
         <translation></translation>
     </message>
     <message>
-        <location filename="../limereport/lrpagedesignintf.cpp" line="1702"/>
-        <location filename="../limereport/lrpagedesignintf.cpp" line="1744"/>
+        <location filename="../limereport/lrpagedesignintf.cpp" line="1701"/>
+        <location filename="../limereport/lrpagedesignintf.cpp" line="1743"/>
         <source>Attention!</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../limereport/lrpagedesignintf.cpp" line="1702"/>
-        <location filename="../limereport/lrpagedesignintf.cpp" line="1744"/>
+        <location filename="../limereport/lrpagedesignintf.cpp" line="1701"/>
+        <location filename="../limereport/lrpagedesignintf.cpp" line="1743"/>
         <source>Selected elements have different parent containers</source>
         <translation>Les éléments sélectionnés ont un parent différent</translation>
     </message>
@@ -4244,12 +4489,12 @@ Cet aperçu n&apos;est plus valide.</translation>
         <translation>L&apos;objet avec le nom &quot;%1&quot; existe déja!</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="1693"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="1708"/>
         <source>Function %1 not found or have wrong arguments</source>
         <translation>La fonction %1 est introuvable ou contient des paramètres incorrects</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="1696"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="1711"/>
         <source>Datasource manager not found</source>
         <translation>Gestionnaire de source de donnée introuvable</translation>
     </message>
@@ -4264,16 +4509,16 @@ Cet aperçu n&apos;est plus valide.</translation>
     <message>
         <location filename="../limereport/objectinspector/propertyItems/lrmarginpropitem.cpp" line="40"/>
         <location filename="../limereport/objectinspector/propertyItems/lrmarginpropitem.cpp" line="98"/>
-        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="194"/>
-        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="272"/>
+        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="206"/>
+        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="284"/>
         <source>mm</source>
         <translation></translation>
     </message>
     <message>
         <location filename="../limereport/objectinspector/propertyItems/lrmarginpropitem.cpp" line="43"/>
         <location filename="../limereport/objectinspector/propertyItems/lrmarginpropitem.cpp" line="100"/>
-        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="196"/>
-        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="274"/>
+        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="208"/>
+        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="286"/>
         <source>&apos;&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4340,20 +4585,20 @@ Cet aperçu n&apos;est plus valide.</translation>
         <translation>Clair</translation>
     </message>
     <message>
-        <location filename="../limereport/lrreportdesignwidget.cpp" line="789"/>
+        <location filename="../limereport/lrreportdesignwidget.cpp" line="799"/>
         <source>Default</source>
         <translation>par défaut</translation>
     </message>
     <message>
-        <location filename="../limereport/lrreportdesignwidget.cpp" line="798"/>
-        <location filename="../limereport/lrreportdesignwidget.cpp" line="801"/>
         <location filename="../limereport/lrreportdesignwidget.cpp" line="808"/>
+        <location filename="../limereport/lrreportdesignwidget.cpp" line="811"/>
+        <location filename="../limereport/lrreportdesignwidget.cpp" line="818"/>
         <source>Millimeters</source>
         <translation>Millimètres</translation>
     </message>
     <message>
-        <location filename="../limereport/lrreportdesignwidget.cpp" line="798"/>
-        <location filename="../limereport/lrreportdesignwidget.cpp" line="802"/>
+        <location filename="../limereport/lrreportdesignwidget.cpp" line="808"/>
+        <location filename="../limereport/lrreportdesignwidget.cpp" line="812"/>
         <source>Inches</source>
         <translation>Pouces</translation>
     </message>
@@ -4399,249 +4644,4 @@ Cet aperçu n&apos;est plus valide.</translation>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>lrbordereditor</name>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="191"/>
-        <source>Style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="219"/>
-        <source>No style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="224"/>
-        <source>Solid</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="252"/>
-        <source>Width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="262"/>
-        <location filename="../limereport/items/lrbordereditor.ui" line="279"/>
-        <source>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="327"/>
-        <source>Select...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="269"/>
-        <source>0.25</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="229"/>
-        <source>Dash</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="234"/>
-        <source>Dot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="239"/>
-        <source>Dash dot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="244"/>
-        <source>Dash dot dot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="274"/>
-        <source>0.5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="284"/>
-        <source>1.5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="289"/>
-        <source>2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="294"/>
-        <source>3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="299"/>
-        <source>4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="304"/>
-        <source>5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="309"/>
-        <source>6</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="317"/>
-        <source>Color:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="22"/>
-        <source>Presets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="14"/>
-        <source>Edit border</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="31"/>
-        <source>No lines</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="51"/>
-        <source>Outline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="68"/>
-        <source>Border</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="81"/>
-        <location filename="../limereport/items/lrbordereditor.ui" line="108"/>
-        <location filename="../limereport/items/lrbordereditor.ui" line="129"/>
-        <location filename="../limereport/items/lrbordereditor.ui" line="156"/>
-        <source>...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>lrpageeditor</name>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="14"/>
-        <source>Page setup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="24"/>
-        <source>Paper</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="32"/>
-        <source>Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="44"/>
-        <source>Dimension</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="50"/>
-        <source>Width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="66"/>
-        <location filename="../limereport/items/lrpageeditor.ui" line="95"/>
-        <location filename="../limereport/items/lrpageeditor.ui" line="165"/>
-        <location filename="../limereport/items/lrpageeditor.ui" line="172"/>
-        <location filename="../limereport/items/lrpageeditor.ui" line="179"/>
-        <location filename="../limereport/items/lrpageeditor.ui" line="193"/>
-        <source> mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="79"/>
-        <source>Height:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="111"/>
-        <source>Orientation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="117"/>
-        <source>Portrait</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="127"/>
-        <source>Landscape</source>
-        <translation type="unfinished">Paysage</translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="138"/>
-        <source>Margins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="144"/>
-        <source>Bottom:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="151"/>
-        <source>Top:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="158"/>
-        <source>Right:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="186"/>
-        <source>Left:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="207"/>
-        <source>Drop printer margins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="228"/>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="234"/>
-        <source>Height options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="240"/>
-        <source>Endless Height</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="253"/>
-        <source>Extended Height:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="273"/>
-        <source>Full page</source>
-        <translation type="unfinished">Page entière</translation>
-    </message>
-</context>
 </TS>
diff --git a/translations/limereport_pl.ts b/translations/limereport_pl.ts
index 57c25f8..071166e 100644
--- a/translations/limereport_pl.ts
+++ b/translations/limereport_pl.ts
@@ -579,62 +579,194 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LimeReport::BaseDesignIntf</name>
     <message>
-        <location filename="../limereport/lrbasedesignintf.cpp" line="1447"/>
-        <location filename="../limereport/lrbasedesignintf.cpp" line="1886"/>
+        <location filename="../limereport/lrbasedesignintf.cpp" line="1444"/>
+        <location filename="../limereport/lrbasedesignintf.cpp" line="1889"/>
         <source>Lock item geometry</source>
         <translation>Zablokuj geometrię pozycji</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbasedesignintf.cpp" line="1453"/>
+        <location filename="../limereport/lrbasedesignintf.cpp" line="1450"/>
         <source>Copy</source>
         <translation>Kopiuj</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbasedesignintf.cpp" line="1455"/>
+        <location filename="../limereport/lrbasedesignintf.cpp" line="1451"/>
         <source>Cut</source>
         <translation>Wytnij</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbasedesignintf.cpp" line="1457"/>
+        <location filename="../limereport/lrbasedesignintf.cpp" line="1452"/>
         <source>Paste</source>
         <translation>Wklej</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbasedesignintf.cpp" line="1467"/>
+        <location filename="../limereport/lrbasedesignintf.cpp" line="1473"/>
         <source>Bring to top</source>
         <translation>Przenieś na górę</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbasedesignintf.cpp" line="1468"/>
+        <location filename="../limereport/lrbasedesignintf.cpp" line="1474"/>
         <source>Send to back</source>
         <translation>Przenieś na dół</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbasedesignintf.cpp" line="1471"/>
+        <location filename="../limereport/lrbasedesignintf.cpp" line="1477"/>
         <source>Create Horizontal Layout</source>
         <translation>Utwórz układ poziomy</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbasedesignintf.cpp" line="1475"/>
+        <location filename="../limereport/lrbasedesignintf.cpp" line="1481"/>
         <source>Create Vertical Layout</source>
         <translation>Utwórz układ pionowy</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbasedesignintf.cpp" line="1478"/>
+        <location filename="../limereport/lrbasedesignintf.cpp" line="1484"/>
         <source>No borders</source>
         <translation>Bez obramowania</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbasedesignintf.cpp" line="1479"/>
+        <location filename="../limereport/lrbasedesignintf.cpp" line="1485"/>
         <source>All borders</source>
         <translation>Pełne obramowanie</translation>
     </message>
     <message>
-        <location filename="../limereport/lrbasedesignintf.cpp" line="1480"/>
+        <location filename="../limereport/lrbasedesignintf.cpp" line="1486"/>
         <source>Edit borders...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>LimeReport::BorderEditor</name>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="14"/>
+        <source>Edit border</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="22"/>
+        <source>Presets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="31"/>
+        <source>No lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="51"/>
+        <source>Outline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="68"/>
+        <source>Border</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="81"/>
+        <location filename="../limereport/items/lrbordereditor.ui" line="108"/>
+        <location filename="../limereport/items/lrbordereditor.ui" line="129"/>
+        <location filename="../limereport/items/lrbordereditor.ui" line="156"/>
+        <source>...</source>
+        <translation type="unfinished">...</translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="191"/>
+        <source>Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="219"/>
+        <source>No style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="224"/>
+        <source>Solid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="229"/>
+        <source>Dash</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="234"/>
+        <source>Dot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="239"/>
+        <source>Dash dot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="244"/>
+        <source>Dash dot dot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="252"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="262"/>
+        <location filename="../limereport/items/lrbordereditor.ui" line="279"/>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="269"/>
+        <source>0.25</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="274"/>
+        <source>0.5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="284"/>
+        <source>1.5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="289"/>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="294"/>
+        <source>3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="299"/>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="304"/>
+        <source>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="309"/>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="317"/>
+        <source>Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrbordereditor.ui" line="345"/>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>LimeReport::BorderFrameEditor</name>
     <message>
@@ -651,8 +783,8 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LimeReport::ConnectionDesc</name>
     <message>
-        <location filename="../limereport/lrdatadesignintf.cpp" line="372"/>
         <location filename="../limereport/lrdatadesignintf.cpp" line="377"/>
+        <location filename="../limereport/lrdatadesignintf.cpp" line="382"/>
         <source>defaultConnection</source>
         <translation>Domyślne połączenie</translation>
     </message>
@@ -979,51 +1111,51 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LimeReport::DataSourceManager</name>
     <message>
-        <location filename="../limereport/lrdatasourcemanager.cpp" line="404"/>
+        <location filename="../limereport/lrdatasourcemanager.cpp" line="410"/>
         <source>Connection &quot;%1&quot; is not open</source>
         <translation>Połączenie &quot;%1&quot; nie jest otwarte</translation>
     </message>
     <message>
-        <location filename="../limereport/lrdatasourcemanager.cpp" line="440"/>
-        <location filename="../limereport/lrdatasourcemanager.cpp" line="460"/>
-        <location filename="../limereport/lrdatasourcemanager.cpp" line="505"/>
-        <location filename="../limereport/lrdatasourcemanager.cpp" line="545"/>
+        <location filename="../limereport/lrdatasourcemanager.cpp" line="446"/>
+        <location filename="../limereport/lrdatasourcemanager.cpp" line="465"/>
+        <location filename="../limereport/lrdatasourcemanager.cpp" line="510"/>
+        <location filename="../limereport/lrdatasourcemanager.cpp" line="549"/>
         <source>Variable &quot;%1&quot; not found!</source>
         <translation>Zmienna &quot;%1&quot; nie znaleziona!</translation>
     </message>
     <message>
-        <location filename="../limereport/lrdatasourcemanager.cpp" line="499"/>
-        <location filename="../limereport/lrdatasourcemanager.cpp" line="539"/>
+        <location filename="../limereport/lrdatasourcemanager.cpp" line="504"/>
+        <location filename="../limereport/lrdatasourcemanager.cpp" line="543"/>
         <source>Unknown parameter &quot;%1&quot; for variable &quot;%2&quot; found!</source>
         <translation>Nieznany parametr &quot;%1&quot; dla znalezionej zmiennej &quot;%2&quot;!</translation>
     </message>
     <message>
-        <location filename="../limereport/lrdatasourcemanager.cpp" line="750"/>
-        <location filename="../limereport/lrdatasourcemanager.cpp" line="1146"/>
+        <location filename="../limereport/lrdatasourcemanager.cpp" line="752"/>
+        <location filename="../limereport/lrdatasourcemanager.cpp" line="1148"/>
         <source>Datasource &quot;%1&quot; not found!</source>
         <translation>Źródło danych %1&quot; nie znalezione!</translation>
     </message>
     <message>
-        <location filename="../limereport/lrdatasourcemanager.cpp" line="847"/>
+        <location filename="../limereport/lrdatasourcemanager.cpp" line="849"/>
         <source>Connection with name &quot;%1&quot; already exists!</source>
         <translation>Połączenie o nazwie &quot;%1&quot; już istnieje!</translation>
     </message>
     <message>
-        <location filename="../limereport/lrdatasourcemanager.cpp" line="872"/>
-        <location filename="../limereport/lrdatasourcemanager.cpp" line="881"/>
-        <location filename="../limereport/lrdatasourcemanager.cpp" line="890"/>
-        <location filename="../limereport/lrdatasourcemanager.cpp" line="897"/>
-        <location filename="../limereport/lrdatasourcemanager.cpp" line="906"/>
+        <location filename="../limereport/lrdatasourcemanager.cpp" line="874"/>
+        <location filename="../limereport/lrdatasourcemanager.cpp" line="883"/>
+        <location filename="../limereport/lrdatasourcemanager.cpp" line="892"/>
+        <location filename="../limereport/lrdatasourcemanager.cpp" line="899"/>
+        <location filename="../limereport/lrdatasourcemanager.cpp" line="908"/>
         <source>Datasource with name &quot;%1&quot; already exists!</source>
         <translation>Źródło danych o nazwie &quot;%1&quot; już istnieje!</translation>
     </message>
     <message>
-        <location filename="../limereport/lrdatasourcemanager.cpp" line="937"/>
+        <location filename="../limereport/lrdatasourcemanager.cpp" line="939"/>
         <source>Database &quot;%1&quot; not found</source>
         <translation>Baza danych &quot;%1&quot; nie znaleziona</translation>
     </message>
     <message>
-        <location filename="../limereport/lrdatasourcemanager.cpp" line="1118"/>
+        <location filename="../limereport/lrdatasourcemanager.cpp" line="1120"/>
         <source>invalid connection</source>
         <translation>Nieprawidłowe połączenie</translation>
     </message>
@@ -1528,29 +1660,29 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LimeReport::ImageItem</name>
     <message>
-        <location filename="../limereport/items/lrimageitem.cpp" line="87"/>
-        <location filename="../limereport/items/lrimageitem.cpp" line="103"/>
+        <location filename="../limereport/items/lrimageitem.cpp" line="92"/>
+        <location filename="../limereport/items/lrimageitem.cpp" line="108"/>
         <source>Edit</source>
         <translation type="unfinished">Edycja</translation>
     </message>
     <message>
-        <location filename="../limereport/items/lrimageitem.cpp" line="92"/>
-        <location filename="../limereport/items/lrimageitem.cpp" line="100"/>
+        <location filename="../limereport/items/lrimageitem.cpp" line="97"/>
+        <location filename="../limereport/items/lrimageitem.cpp" line="105"/>
         <source>Watermark</source>
         <translation>Znak wodny</translation>
     </message>
     <message>
-        <location filename="../limereport/items/lrimageitem.cpp" line="163"/>
+        <location filename="../limereport/items/lrimageitem.cpp" line="168"/>
         <source>Images (*.gif *.icns *.ico *.jpeg *.tga *.tiff *.wbmp *.webp *.png *.jpg *.bmp);;All(*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../limereport/items/lrimageitem.cpp" line="370"/>
+        <location filename="../limereport/items/lrimageitem.cpp" line="386"/>
         <source>Image</source>
         <translation>Obraz</translation>
     </message>
     <message>
-        <location filename="../limereport/items/lrimageitem.cpp" line="370"/>
+        <location filename="../limereport/items/lrimageitem.cpp" line="386"/>
         <source>Ext.</source>
         <translation>Zewn.</translation>
     </message>
@@ -1624,37 +1756,37 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LimeReport::ItemsBordersEditorWidget</name>
     <message>
-        <location filename="../limereport/items/editors/lritemsborderseditorwidget.cpp" line="95"/>
+        <location filename="../limereport/items/editors/lritemsborderseditorwidget.cpp" line="92"/>
         <source>Top line</source>
         <translation>Górna krawędź</translation>
     </message>
     <message>
-        <location filename="../limereport/items/editors/lritemsborderseditorwidget.cpp" line="101"/>
+        <location filename="../limereport/items/editors/lritemsborderseditorwidget.cpp" line="98"/>
         <source>Bottom line</source>
         <translation>Dolna krawędź</translation>
     </message>
     <message>
-        <location filename="../limereport/items/editors/lritemsborderseditorwidget.cpp" line="107"/>
+        <location filename="../limereport/items/editors/lritemsborderseditorwidget.cpp" line="104"/>
         <source>Left line</source>
         <translation>Lewa krawędź</translation>
     </message>
     <message>
-        <location filename="../limereport/items/editors/lritemsborderseditorwidget.cpp" line="113"/>
+        <location filename="../limereport/items/editors/lritemsborderseditorwidget.cpp" line="110"/>
         <source>Right line</source>
         <translation>Prawa krawędź</translation>
     </message>
     <message>
-        <location filename="../limereport/items/editors/lritemsborderseditorwidget.cpp" line="121"/>
+        <location filename="../limereport/items/editors/lritemsborderseditorwidget.cpp" line="118"/>
         <source>No borders</source>
         <translation>Bez krawędzi</translation>
     </message>
     <message>
-        <location filename="../limereport/items/editors/lritemsborderseditorwidget.cpp" line="126"/>
+        <location filename="../limereport/items/editors/lritemsborderseditorwidget.cpp" line="123"/>
         <source>All borders</source>
         <translation>Wszystkie krawędzie</translation>
     </message>
     <message>
-        <location filename="../limereport/items/editors/lritemsborderseditorwidget.cpp" line="131"/>
+        <location filename="../limereport/items/editors/lritemsborderseditorwidget.cpp" line="128"/>
         <source>Edit border</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1662,12 +1794,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LimeReport::MasterDetailProxyModel</name>
     <message>
-        <location filename="../limereport/lrdatadesignintf.cpp" line="593"/>
+        <location filename="../limereport/lrdatadesignintf.cpp" line="598"/>
         <source>Field: &quot;%1&quot; not found in &quot;%2&quot; child datasource</source>
         <translation>Pole: &quot;%1&quot; nie znalezione w &quot;%2&quot; źródle danch dziecka</translation>
     </message>
     <message>
-        <location filename="../limereport/lrdatadesignintf.cpp" line="607"/>
+        <location filename="../limereport/lrdatadesignintf.cpp" line="612"/>
         <source>Field: &quot;%1&quot; not found in &quot;%2&quot; master datasource</source>
         <translation>Pole: &quot;%1&quot; nie znalezione w &quot;%2&quot; głównym źródle danch</translation>
     </message>
@@ -1675,7 +1807,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LimeReport::ModelToDataSource</name>
     <message>
-        <location filename="../limereport/lrdatadesignintf.cpp" line="333"/>
+        <location filename="../limereport/lrdatadesignintf.cpp" line="338"/>
         <source>model is destroyed</source>
         <translation>Model danych jest zniszczony</translation>
     </message>
@@ -1714,6 +1846,119 @@ p, li { white-space: pre-wrap; }
         <translation>Eksport do PDF</translation>
     </message>
 </context>
+<context>
+    <name>LimeReport::PageEditor</name>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="14"/>
+        <source>Page setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="24"/>
+        <source>Paper</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="32"/>
+        <source>Format</source>
+        <translation type="unfinished">Format</translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="44"/>
+        <source>Dimension</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="50"/>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="66"/>
+        <location filename="../limereport/items/lrpageeditor.ui" line="95"/>
+        <location filename="../limereport/items/lrpageeditor.ui" line="178"/>
+        <location filename="../limereport/items/lrpageeditor.ui" line="185"/>
+        <location filename="../limereport/items/lrpageeditor.ui" line="192"/>
+        <location filename="../limereport/items/lrpageeditor.ui" line="206"/>
+        <source> mm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="79"/>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="111"/>
+        <source>Orientation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="117"/>
+        <source>Portrait</source>
+        <translation type="unfinished">Portret</translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="127"/>
+        <source>Landscape</source>
+        <translation type="unfinished">Pejzaż</translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="151"/>
+        <source>Margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="157"/>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="164"/>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="171"/>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="199"/>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="220"/>
+        <source>Drop printer margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="241"/>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="247"/>
+        <source>Height options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="253"/>
+        <source>Endless Height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="266"/>
+        <source>Extended Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrpageeditor.ui" line="286"/>
+        <source>Full page</source>
+        <translation type="unfinished">Cała strona</translation>
+    </message>
+</context>
 <context>
     <name>LimeReport::PageFooter</name>
     <message>
@@ -1745,43 +1990,43 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LimeReport::PageItemDesignIntf</name>
     <message>
-        <location filename="../limereport/lrpageitemdesignintf.cpp" line="780"/>
-        <location filename="../limereport/lrpageitemdesignintf.cpp" line="829"/>
+        <location filename="../limereport/lrpageitemdesignintf.cpp" line="750"/>
+        <location filename="../limereport/lrpageitemdesignintf.cpp" line="799"/>
         <source>Edit</source>
         <translation type="unfinished">Edycja</translation>
     </message>
     <message>
-        <location filename="../limereport/lrpageitemdesignintf.cpp" line="776"/>
+        <location filename="../limereport/lrpageitemdesignintf.cpp" line="746"/>
         <source>Paste</source>
         <translation>Wklej</translation>
     </message>
     <message>
-        <location filename="../limereport/lrpageitemdesignintf.cpp" line="785"/>
-        <location filename="../limereport/lrpageitemdesignintf.cpp" line="813"/>
+        <location filename="../limereport/lrpageitemdesignintf.cpp" line="755"/>
+        <location filename="../limereport/lrpageitemdesignintf.cpp" line="783"/>
         <source>Page is TOC</source>
         <translation>Strona to spis treści</translation>
     </message>
     <message>
-        <location filename="../limereport/lrpageitemdesignintf.cpp" line="789"/>
-        <location filename="../limereport/lrpageitemdesignintf.cpp" line="816"/>
+        <location filename="../limereport/lrpageitemdesignintf.cpp" line="759"/>
+        <location filename="../limereport/lrpageitemdesignintf.cpp" line="786"/>
         <source>Reset page number</source>
         <translation>Zresetuj numer strony</translation>
     </message>
     <message>
-        <location filename="../limereport/lrpageitemdesignintf.cpp" line="793"/>
-        <location filename="../limereport/lrpageitemdesignintf.cpp" line="819"/>
+        <location filename="../limereport/lrpageitemdesignintf.cpp" line="763"/>
+        <location filename="../limereport/lrpageitemdesignintf.cpp" line="789"/>
         <source>Full page</source>
         <translation>Cała strona</translation>
     </message>
     <message>
-        <location filename="../limereport/lrpageitemdesignintf.cpp" line="797"/>
-        <location filename="../limereport/lrpageitemdesignintf.cpp" line="822"/>
+        <location filename="../limereport/lrpageitemdesignintf.cpp" line="767"/>
+        <location filename="../limereport/lrpageitemdesignintf.cpp" line="792"/>
         <source>Set page size to printer</source>
         <translation>Ustaw rozmiar strony na drukarkę</translation>
     </message>
     <message>
-        <location filename="../limereport/lrpageitemdesignintf.cpp" line="801"/>
-        <location filename="../limereport/lrpageitemdesignintf.cpp" line="826"/>
+        <location filename="../limereport/lrpageitemdesignintf.cpp" line="771"/>
+        <location filename="../limereport/lrpageitemdesignintf.cpp" line="796"/>
         <source>Mix with prior page</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2001,7 +2246,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LimeReport::ProxyHolder</name>
     <message>
-        <location filename="../limereport/lrdatadesignintf.cpp" line="532"/>
+        <location filename="../limereport/lrdatadesignintf.cpp" line="537"/>
         <source>Datasource has been invalidated</source>
         <translation>Źródło danych zostało unieważnione</translation>
     </message>
@@ -2717,16 +2962,16 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LimeReport::RectUnitPropItem</name>
     <message>
-        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="109"/>
-        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="114"/>
-        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="119"/>
+        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="121"/>
+        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="126"/>
+        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="131"/>
         <source>width</source>
         <translation>Szerokość</translation>
     </message>
     <message>
-        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="110"/>
-        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="115"/>
-        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="120"/>
+        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="122"/>
+        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="127"/>
+        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="132"/>
         <source>height</source>
         <translation>Wysokość</translation>
     </message>
@@ -3193,24 +3438,24 @@ Ten podgląd nie jest już prawidłowy.</translation>
     <message>
         <location filename="../limereport/lrreportrender.cpp" line="175"/>
         <location filename="../limereport/lrreportrender.cpp" line="188"/>
-        <location filename="../limereport/lrreportrender.cpp" line="267"/>
+        <location filename="../limereport/lrreportrender.cpp" line="265"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="../limereport/lrreportrender.cpp" line="304"/>
+        <location filename="../limereport/lrreportrender.cpp" line="302"/>
         <source>page index out of range</source>
         <translation>indeks strony poza zakresem</translation>
     </message>
     <message>
-        <location filename="../limereport/lrreportrender.cpp" line="436"/>
-        <location filename="../limereport/lrreportrender.cpp" line="498"/>
+        <location filename="../limereport/lrreportrender.cpp" line="430"/>
+        <location filename="../limereport/lrreportrender.cpp" line="467"/>
         <source>Databand &quot;%1&quot; not found</source>
         <translation>Sekcja danych &quot;%1&quot; nie znaleziona</translation>
     </message>
     <message>
-        <location filename="../limereport/lrreportrender.cpp" line="468"/>
-        <location filename="../limereport/lrreportrender.cpp" line="505"/>
+        <location filename="../limereport/lrreportrender.cpp" line="438"/>
+        <location filename="../limereport/lrreportrender.cpp" line="474"/>
         <source>Wrong using function %1</source>
         <translation>Złe użycie funkcji %1</translation>
     </message>
@@ -3260,7 +3505,7 @@ Ten podgląd nie jest już prawidłowy.</translation>
     </message>
     <message>
         <location filename="../limereport/databrowser/lrsqleditdialog.ui" line="601"/>
-        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="372"/>
+        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="349"/>
         <source>Preview</source>
         <translation>Podgląd</translation>
     </message>
@@ -3292,7 +3537,7 @@ Ten podgląd nie jest już prawidłowy.</translation>
     </message>
     <message>
         <location filename="../limereport/databrowser/lrsqleditdialog.ui" line="764"/>
-        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="282"/>
+        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="272"/>
         <source>CSV</source>
         <translation>CSV</translation>
     </message>
@@ -3322,48 +3567,48 @@ Ten podgląd nie jest już prawidłowy.</translation>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="132"/>
+        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="130"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="155"/>
+        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="146"/>
         <source>Datasource Name is empty!</source>
         <translation>Nazwa źródła danych jest pusta!</translation>
     </message>
     <message>
-        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="156"/>
+        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="148"/>
         <source>SQL is empty!</source>
         <translation>SQL jest pusty!</translation>
     </message>
     <message>
-        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="159"/>
+        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="152"/>
         <source>Datasource with name: &quot;%1&quot; already exists!</source>
         <translation>Źródło danych o nazwie: &quot;%1&quot; już istnieje!</translation>
     </message>
     <message>
-        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="172"/>
+        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="165"/>
         <source>defaultConnection</source>
         <translation>Domyślne połączenie</translation>
     </message>
     <message>
-        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="232"/>
+        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="225"/>
         <source>Datasource with name %1 already exist</source>
         <translation>Źródło danych o nazwie %1 już istnieje</translation>
     </message>
     <message>
-        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="324"/>
-        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="340"/>
+        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="308"/>
+        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="322"/>
         <source>Attention</source>
         <translation>Uwaga</translation>
     </message>
     <message>
-        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="324"/>
+        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="308"/>
         <source>Connection is not specified</source>
         <translation>Połączenie nie zostało określone</translation>
     </message>
     <message>
-        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="335"/>
+        <location filename="../limereport/databrowser/lrsqleditdialog.cpp" line="317"/>
         <source>Refresh</source>
         <translation>Odśwież</translation>
     </message>
@@ -3476,13 +3721,13 @@ Ten podgląd nie jest już prawidłowy.</translation>
 <context>
     <name>LimeReport::ScriptEngineContext</name>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="1293"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="1305"/>
         <source>Dialog with name: %1 can`t be created</source>
         <translation>Okno dialogowe z nazwą:%1 nie można utworzyć</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="1581"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="1589"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="1597"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="1605"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
@@ -3495,20 +3740,20 @@ Ten podgląd nie jest już prawidłowy.</translation>
         <translation>FUNKCJE GRUPUJĄCE</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="761"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="782"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="798"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="814"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="831"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="881"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="898"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="915"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="773"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="794"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="810"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="826"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="843"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="893"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="910"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="927"/>
         <source>Value</source>
         <translation>Wartość</translation>
     </message>
     <message>
         <location filename="../limereport/lrscriptenginemanager.cpp" line="339"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="746"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="758"/>
         <source>BandName</source>
         <translation>Nazwa sekcji</translation>
     </message>
@@ -3519,7 +3764,7 @@ Ten podgląd nie jest już prawidłowy.</translation>
     </message>
     <message>
         <location filename="../limereport/lrscriptenginemanager.cpp" line="339"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="979"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="991"/>
         <source>FieldName</source>
         <translation>Nazwa pola</translation>
     </message>
@@ -3531,125 +3776,125 @@ Ten podgląd nie jest już prawidłowy.</translation>
     </message>
     <message>
         <location filename="../limereport/lrscriptenginemanager.cpp" line="493"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="546"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="560"/>
         <source>Field %1 not found in %2!</source>
         <translation>Pole %1 nie znalezione w %2!</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="744"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="756"/>
         <source>SYSTEM</source>
         <translation>SYSTEM</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="759"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="879"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="896"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="771"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="891"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="908"/>
         <source>NUMBER</source>
         <translation>LICZBA</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="761"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="782"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="798"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="814"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="831"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="773"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="794"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="810"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="826"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="843"/>
         <source>Format</source>
         <translation>Format</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="762"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="774"/>
         <source>Precision</source>
         <translation>Precyzja</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="763"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="782"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="814"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="881"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="775"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="794"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="826"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="893"/>
         <source>Locale</source>
         <translation>Ustawienia lokalne</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="780"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="796"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="812"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="829"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="846"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="863"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="792"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="808"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="824"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="841"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="858"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="875"/>
         <source>DATE&amp;TIME</source>
         <translation>Data i czas</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="960"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="972"/>
         <source>Datasource</source>
         <translation>Źródło danych</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="961"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="973"/>
         <source>ValueField</source>
         <translation>Pole wartości</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="962"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="974"/>
         <source>KeyField</source>
         <translation>Pole klucza</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="963"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="975"/>
         <source>KeyFieldValue</source>
         <translation>Wartość pola klucza</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="980"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="992"/>
         <source>RowIndex</source>
         <translation>Indeks wiersza</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="996"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="1011"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="1026"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="1008"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="1023"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="1038"/>
         <source>Unique identifier</source>
         <translation>Unikalny identyfikator</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="996"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="1026"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="1008"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="1038"/>
         <source>Content</source>
         <translation>Zawartość</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="1026"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="1038"/>
         <source>Indent</source>
         <translation>Akapit</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="1056"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="1068"/>
         <source>datasourceName</source>
         <translation>Nazwa źródła danych</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="898"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="910"/>
         <source>CurrencySymbol</source>
         <translation>Symbol waluty</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="913"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="928"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="943"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="958"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="977"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="994"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="1009"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="1024"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="1039"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="1054"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="925"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="940"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="955"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="970"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="989"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="1006"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="1021"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="1036"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="1051"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="1066"/>
         <source>GENERAL</source>
         <translation>OGÓLNY</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="915"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="930"/>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="945"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="927"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="942"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="957"/>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
@@ -3844,18 +4089,18 @@ Ten podgląd nie jest już prawidłowy.</translation>
         <translation>Ukryj jeśli pusty</translation>
     </message>
     <message>
-        <location filename="../limereport/items/lrtextitem.cpp" line="669"/>
-        <location filename="../limereport/items/lrtextitem.cpp" line="679"/>
+        <location filename="../limereport/items/lrtextitem.cpp" line="678"/>
+        <location filename="../limereport/items/lrtextitem.cpp" line="688"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="../limereport/items/lrtextitem.cpp" line="670"/>
+        <location filename="../limereport/items/lrtextitem.cpp" line="679"/>
         <source>TextItem &quot; %1 &quot; already has folower &quot; %2 &quot; </source>
         <translation>Pole tekstowe &quot; %1 &quot; już ma folower &quot; %2 &quot; </translation>
     </message>
     <message>
-        <location filename="../limereport/items/lrtextitem.cpp" line="680"/>
+        <location filename="../limereport/items/lrtextitem.cpp" line="689"/>
         <source>TextItem &quot; %1 &quot; not found!</source>
         <translation>Nie znaleziono pole tekstowego &quot;%1&quot;!</translation>
     </message>
@@ -4098,32 +4343,32 @@ Ten podgląd nie jest już prawidłowy.</translation>
     </message>
     <message>
         <location filename="../limereport/lrdatadesignintf.cpp" line="76"/>
-        <location filename="../limereport/lrdatadesignintf.cpp" line="118"/>
+        <location filename="../limereport/lrdatadesignintf.cpp" line="123"/>
         <source>Invalid connection! %1</source>
         <translation>Nieprawidłowe połączenie! %1</translation>
     </message>
     <message>
-        <location filename="../limereport/lrdatadesignintf.cpp" line="420"/>
+        <location filename="../limereport/lrdatadesignintf.cpp" line="425"/>
         <source>Master datasource &quot;%1&quot; not found!</source>
         <translation>Nie znaleziono głównego źródła danych &quot;%1&quot;!</translation>
     </message>
     <message>
-        <location filename="../limereport/lrdatadesignintf.cpp" line="503"/>
+        <location filename="../limereport/lrdatadesignintf.cpp" line="508"/>
         <source>Master datasouce &quot;%1&quot; not found!</source>
         <translation>Nie znaleziono głównego źródła danych &quot;%1&quot;!</translation>
     </message>
     <message>
-        <location filename="../limereport/lrdatadesignintf.cpp" line="504"/>
+        <location filename="../limereport/lrdatadesignintf.cpp" line="509"/>
         <source>Child</source>
         <translation>Dziecko</translation>
     </message>
     <message>
-        <location filename="../limereport/lrdatadesignintf.cpp" line="504"/>
+        <location filename="../limereport/lrdatadesignintf.cpp" line="509"/>
         <source> and child </source>
         <translation> i dziecko </translation>
     </message>
     <message>
-        <location filename="../limereport/lrdatadesignintf.cpp" line="505"/>
+        <location filename="../limereport/lrdatadesignintf.cpp" line="510"/>
         <source>datasouce &quot;%1&quot; not found!</source>
         <translation>nie znaleziono źródła danych &quot;%1&quot;!</translation>
     </message>
@@ -4239,14 +4484,14 @@ Ten podgląd nie jest już prawidłowy.</translation>
         <translation>Ciąg znaków</translation>
     </message>
     <message>
-        <location filename="../limereport/lrpagedesignintf.cpp" line="1702"/>
-        <location filename="../limereport/lrpagedesignintf.cpp" line="1744"/>
+        <location filename="../limereport/lrpagedesignintf.cpp" line="1701"/>
+        <location filename="../limereport/lrpagedesignintf.cpp" line="1743"/>
         <source>Attention!</source>
         <translation>Uwaga!</translation>
     </message>
     <message>
-        <location filename="../limereport/lrpagedesignintf.cpp" line="1702"/>
-        <location filename="../limereport/lrpagedesignintf.cpp" line="1744"/>
+        <location filename="../limereport/lrpagedesignintf.cpp" line="1701"/>
+        <location filename="../limereport/lrpagedesignintf.cpp" line="1743"/>
         <source>Selected elements have different parent containers</source>
         <translation>Wybrane elementy mają różne pojemniki nadrzędne</translation>
     </message>
@@ -4256,12 +4501,12 @@ Ten podgląd nie jest już prawidłowy.</translation>
         <translation>Obiekt o nazwie %1 już istnieje!</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="1693"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="1708"/>
         <source>Function %1 not found or have wrong arguments</source>
         <translation>Funkcja %1 nie znaleziona lub ma błędne argumenty</translation>
     </message>
     <message>
-        <location filename="../limereport/lrscriptenginemanager.cpp" line="1696"/>
+        <location filename="../limereport/lrscriptenginemanager.cpp" line="1711"/>
         <source>Datasource manager not found</source>
         <translation>Nie znaleziono menedżera źródła danych</translation>
     </message>
@@ -4276,16 +4521,16 @@ Ten podgląd nie jest już prawidłowy.</translation>
     <message>
         <location filename="../limereport/objectinspector/propertyItems/lrmarginpropitem.cpp" line="40"/>
         <location filename="../limereport/objectinspector/propertyItems/lrmarginpropitem.cpp" line="98"/>
-        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="194"/>
-        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="272"/>
+        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="206"/>
+        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="284"/>
         <source>mm</source>
         <translation>mm</translation>
     </message>
     <message>
         <location filename="../limereport/objectinspector/propertyItems/lrmarginpropitem.cpp" line="43"/>
         <location filename="../limereport/objectinspector/propertyItems/lrmarginpropitem.cpp" line="100"/>
-        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="196"/>
-        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="274"/>
+        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="208"/>
+        <location filename="../limereport/objectinspector/propertyItems/lrrectproptem.cpp" line="286"/>
         <source>&apos;&apos;</source>
         <translation>&quot;</translation>
     </message>
@@ -4352,20 +4597,20 @@ Ten podgląd nie jest już prawidłowy.</translation>
         <translation>Jasny</translation>
     </message>
     <message>
-        <location filename="../limereport/lrreportdesignwidget.cpp" line="789"/>
+        <location filename="../limereport/lrreportdesignwidget.cpp" line="799"/>
         <source>Default</source>
         <translation>Domyślny</translation>
     </message>
     <message>
-        <location filename="../limereport/lrreportdesignwidget.cpp" line="798"/>
-        <location filename="../limereport/lrreportdesignwidget.cpp" line="801"/>
         <location filename="../limereport/lrreportdesignwidget.cpp" line="808"/>
+        <location filename="../limereport/lrreportdesignwidget.cpp" line="811"/>
+        <location filename="../limereport/lrreportdesignwidget.cpp" line="818"/>
         <source>Millimeters</source>
         <translation>Milimetry</translation>
     </message>
     <message>
-        <location filename="../limereport/lrreportdesignwidget.cpp" line="798"/>
-        <location filename="../limereport/lrreportdesignwidget.cpp" line="802"/>
+        <location filename="../limereport/lrreportdesignwidget.cpp" line="808"/>
+        <location filename="../limereport/lrreportdesignwidget.cpp" line="812"/>
         <source>Inches</source>
         <translation>Cale</translation>
     </message>
@@ -4411,249 +4656,4 @@ Ten podgląd nie jest już prawidłowy.</translation>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>lrbordereditor</name>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="191"/>
-        <source>Style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="219"/>
-        <source>No style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="224"/>
-        <source>Solid</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="252"/>
-        <source>Width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="262"/>
-        <location filename="../limereport/items/lrbordereditor.ui" line="279"/>
-        <source>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="327"/>
-        <source>Select...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="269"/>
-        <source>0.25</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="229"/>
-        <source>Dash</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="234"/>
-        <source>Dot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="239"/>
-        <source>Dash dot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="244"/>
-        <source>Dash dot dot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="274"/>
-        <source>0.5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="284"/>
-        <source>1.5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="289"/>
-        <source>2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="294"/>
-        <source>3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="299"/>
-        <source>4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="304"/>
-        <source>5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="309"/>
-        <source>6</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="317"/>
-        <source>Color:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="22"/>
-        <source>Presets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="14"/>
-        <source>Edit border</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="31"/>
-        <source>No lines</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="51"/>
-        <source>Outline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="68"/>
-        <source>Border</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrbordereditor.ui" line="81"/>
-        <location filename="../limereport/items/lrbordereditor.ui" line="108"/>
-        <location filename="../limereport/items/lrbordereditor.ui" line="129"/>
-        <location filename="../limereport/items/lrbordereditor.ui" line="156"/>
-        <source>...</source>
-        <translation type="unfinished">...</translation>
-    </message>
-</context>
-<context>
-    <name>lrpageeditor</name>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="14"/>
-        <source>Page setup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="24"/>
-        <source>Paper</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="32"/>
-        <source>Format</source>
-        <translation type="unfinished">Format</translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="44"/>
-        <source>Dimension</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="50"/>
-        <source>Width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="66"/>
-        <location filename="../limereport/items/lrpageeditor.ui" line="95"/>
-        <location filename="../limereport/items/lrpageeditor.ui" line="165"/>
-        <location filename="../limereport/items/lrpageeditor.ui" line="172"/>
-        <location filename="../limereport/items/lrpageeditor.ui" line="179"/>
-        <location filename="../limereport/items/lrpageeditor.ui" line="193"/>
-        <source> mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="79"/>
-        <source>Height:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="111"/>
-        <source>Orientation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="117"/>
-        <source>Portrait</source>
-        <translation type="unfinished">Portret</translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="127"/>
-        <source>Landscape</source>
-        <translation type="unfinished">Pejzaż</translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="138"/>
-        <source>Margins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="144"/>
-        <source>Bottom:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="151"/>
-        <source>Top:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="158"/>
-        <source>Right:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="186"/>
-        <source>Left:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="207"/>
-        <source>Drop printer margins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="228"/>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="234"/>
-        <source>Height options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="240"/>
-        <source>Endless Height</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="253"/>
-        <source>Extended Height:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../limereport/items/lrpageeditor.ui" line="273"/>
-        <source>Full page</source>
-        <translation type="unfinished">Cała strona</translation>
-    </message>
-</context>
 </TS>
diff --git a/translations/limereport_ru.qm b/translations/limereport_ru.qm
index cbbea89b99e75827f6b2abd20bf44d45d7f2b77e..c90174a99e0f0d9207b58f08444050063480ceef 100644
GIT binary patch
delta 4915
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
G!Tf(idHPZS

delta 4939
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
Wa4Q`Pw4L#zou=KKVL$d0y8IWgMGB|@

diff --git a/translations/limereport_ru.ts b/translations/limereport_ru.ts
index d769de0..ca3444c 100644
--- a/translations/limereport_ru.ts
+++ b/translations/limereport_ru.ts
@@ -525,6 +525,109 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>LimeReport::BorderEditor</name>
+    <message>
+        <source>Edit border</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Presets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Outline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Border</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished">...</translation>
+    </message>
+    <message>
+        <source>Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Solid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dash</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dash dot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dash dot dot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0.25</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0.5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1.5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>LimeReport::BorderFrameEditor</name>
     <message>
@@ -1371,6 +1474,93 @@ p, li { white-space: pre-wrap; }
         <translation>Экспортировать в PDF</translation>
     </message>
 </context>
+<context>
+    <name>LimeReport::PageEditor</name>
+    <message>
+        <source>Page setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paper</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished">Формат</translation>
+    </message>
+    <message>
+        <source>Dimension</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> mm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Orientation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait</source>
+        <translation type="unfinished">Портретная</translation>
+    </message>
+    <message>
+        <source>Landscape</source>
+        <translation type="unfinished">Альбомная</translation>
+    </message>
+    <message>
+        <source>Margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop printer margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Height options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Endless Height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Extended Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full page</source>
+        <translation type="unfinished">На всю страницу</translation>
+    </message>
+</context>
 <context>
     <name>LimeReport::PageFooter</name>
     <message>
@@ -3413,194 +3603,4 @@ This preview is no longer valid.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>lrbordereditor</name>
-    <message>
-        <source>Style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Solid</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Presets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No lines</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Outline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Border</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation type="unfinished">...</translation>
-    </message>
-    <message>
-        <source>Edit border</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0.25</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0.5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1.5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>6</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Color:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dash</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dash dot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dash dot dot</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>lrpageeditor</name>
-    <message>
-        <source>Paper</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format</source>
-        <translation type="unfinished">Формат</translation>
-    </message>
-    <message>
-        <source>Dimension</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Height:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Orientation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portrait</source>
-        <translation type="unfinished">Портретная</translation>
-    </message>
-    <message>
-        <source>Landscape</source>
-        <translation type="unfinished">Альбомная</translation>
-    </message>
-    <message>
-        <source>Margins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bottom:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Top:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Right:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Left:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Drop printer margins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Height options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Endless Height</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Extended Height:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full page</source>
-        <translation type="unfinished">На всю страницу</translation>
-    </message>
-    <message>
-        <source>Page setup</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 </TS>
diff --git a/translations/limereport_zh.ts b/translations/limereport_zh.ts
index bc872a0..264fe9a 100644
--- a/translations/limereport_zh.ts
+++ b/translations/limereport_zh.ts
@@ -532,6 +532,109 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>LimeReport::BorderEditor</name>
+    <message>
+        <source>Edit border</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Presets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Outline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Border</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished">...</translation>
+    </message>
+    <message>
+        <source>Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Solid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dash</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dash dot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dash dot dot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0.25</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0.5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1.5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>LimeReport::BorderFrameEditor</name>
     <message>
@@ -1378,6 +1481,93 @@ p, li { white-space: pre-wrap; }
         <translation>导出为PDF文件</translation>
     </message>
 </context>
+<context>
+    <name>LimeReport::PageEditor</name>
+    <message>
+        <source>Page setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paper</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished">格式</translation>
+    </message>
+    <message>
+        <source>Dimension</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> mm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Orientation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Portrait</source>
+        <translation type="unfinished">纵向</translation>
+    </message>
+    <message>
+        <source>Landscape</source>
+        <translation type="unfinished">横向</translation>
+    </message>
+    <message>
+        <source>Margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottom:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Left:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop printer margins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Height options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Endless Height</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Extended Height:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full page</source>
+        <translation type="unfinished">全页</translation>
+    </message>
+</context>
 <context>
     <name>LimeReport::PageFooter</name>
     <message>
@@ -3422,194 +3612,4 @@ This preview is no longer valid.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>lrbordereditor</name>
-    <message>
-        <source>Style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Solid</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Presets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No lines</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Outline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Border</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation type="unfinished">...</translation>
-    </message>
-    <message>
-        <source>Edit border</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0.25</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0.5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1.5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>6</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Color:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dash</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dash dot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dash dot dot</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>lrpageeditor</name>
-    <message>
-        <source>Paper</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format</source>
-        <translation type="unfinished">格式</translation>
-    </message>
-    <message>
-        <source>Dimension</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Height:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Orientation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portrait</source>
-        <translation type="unfinished">纵向</translation>
-    </message>
-    <message>
-        <source>Landscape</source>
-        <translation type="unfinished">横向</translation>
-    </message>
-    <message>
-        <source>Margins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bottom:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Top:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Right:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Left:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Drop printer margins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Height options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Endless Height</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Extended Height:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full page</source>
-        <translation type="unfinished">全页</translation>
-    </message>
-    <message>
-        <source>Page setup</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 </TS>