From 7bf0ce51e6ddf1450fcedf264b916103213043a4 Mon Sep 17 00:00:00 2001
From: Alexander Arin <arin_a@bk.ru>
Date: Mon, 31 Oct 2022 21:20:24 +0300
Subject: [PATCH] Border editor refactoring

---
 limereport/images/border_settings.png         | Bin 0 -> 5843 bytes
 limereport/items/borderframeeditor.cpp        | 287 ------------------
 .../editors/lritemsborderseditorwidget.cpp    |  54 ++--
 .../editors/lritemsborderseditorwidget.h      |   6 +-
 limereport/items/images/border_settings.png   | Bin 0 -> 5788 bytes
 limereport/items/lrbordereditor.cpp           | 206 ++++++-------
 limereport/items/lrbordereditor.h             |  53 ++--
 limereport/items/lrbordereditor.ui            |  68 +++--
 limereport/items/lrborderframeeditor.cpp      | 181 +++++++++++
 ...derframeeditor.h => lrborderframeeditor.h} |  20 +-
 ...rframeeditor.ui => lrborderframeeditor.ui} |   4 +-
 limereport/items/lrpageeditor.cpp             |  77 ++---
 limereport/items/lrpageeditor.h               |   9 +-
 limereport/items/lrpageeditor.ui              |  16 +-
 limereport/limereport.pri                     |   6 +-
 limereport/lrbasedesignintf.cpp               |  22 +-
 limereport/lrbasedesignintf.h                 |   2 +-
 limereport/lrpagedesignintf.cpp               |  14 +
 limereport/lrpagedesignintf.h                 |   5 +
 limereport/lrpageitemdesignintf.cpp           |  34 +--
 limereport/lrreportdesignwidget.cpp           |  10 +
 limereport/lrreportdesignwidget.h             |   2 +
 limereport/report.qrc                         |   1 +
 23 files changed, 487 insertions(+), 590 deletions(-)
 create mode 100644 limereport/images/border_settings.png
 delete mode 100644 limereport/items/borderframeeditor.cpp
 create mode 100644 limereport/items/images/border_settings.png
 create mode 100644 limereport/items/lrborderframeeditor.cpp
 rename limereport/items/{borderframeeditor.h => lrborderframeeditor.h} (61%)
 rename limereport/items/{borderframeeditor.ui => lrborderframeeditor.ui} (94%)

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/borderframeeditor.cpp b/limereport/items/borderframeeditor.cpp
deleted file mode 100644
index a864550..0000000
--- a/limereport/items/borderframeeditor.cpp
+++ /dev/null
@@ -1,287 +0,0 @@
-#include "borderframeeditor.h"
-#include "ui_borderframeeditor.h"
-#include <QPainter>
-#include <QGraphicsLineItem>
-#include <QDebug>
-#include <QMouseEvent>
-#include "lrbasedesignintf.h"
-#include "lrbordereditor.h"
-using 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(int, bool)),this,SLOT(SlotBorderSideClicked(int,bool)));
-
-}
-
-BorderFrameEditor::~BorderFrameEditor()
-{
-    delete ui;
-}
-
-void BorderFrameEditor::setPen(QPen pen)
-{
-    m_pen = pen;
-    updateBorders();
-
-}
-
-QPen BorderFrameEditor::pen()
-{
-    return m_pen;
-}
-
-void BorderFrameEditor::setAllLines()
-{
-
-        topLine = scene->addLine(QLineF(10,10,rect().width() - 10,10),m_pen);
-
-
-        leftLine = scene->addLine(QLineF(10,10,10,rect().height() - 10),m_pen);
-
-        bottomLine = scene->addLine(QLineF(10,rect().bottom() -10,rect().width() - 10
-                                           ,rect().bottom() - 10),m_pen);
-
-
-
-        rightLine = scene->addLine(QLineF(rect().width() - 10,10
-                                          ,rect().width() - 10,rect().height() - 10),m_pen);
-
-
-}
-
-void BorderFrameEditor::unSetAllLines()
-{
-    if(topLine)
-    {
-        scene->removeItem(topLine);
-
-    }
-    if(leftLine)
-    {
-        scene->removeItem(leftLine);
-
-    }
-    if(bottomLine)
-    {
-        scene->removeItem(bottomLine);
-
-
-
-    }
-    if(rightLine)
-    {
-        scene->removeItem(rightLine);
-
-    }
-
-}
-
-void BorderFrameEditor::mousePressEvent(QMouseEvent *event)
-{
-
-    if(event->x() >= 10 && event->y() <30)//Draw top border
-    {
-
-        if(!topLine)
-        {
-
-            emit borderSideClicked(1,true);
-
-        }
-        else
-        {
-
-            emit borderSideClicked(1,false);
-        }
-    }
-
-    if((event->x() >= 10 && event->x() < 30) && (event->y() > 10)) //Draw border left
-    {
-        if(!leftLine)
-        {
-
-            emit borderSideClicked(4,true);
-
-        }
-        else
-        {
-
-            emit borderSideClicked(4,false);
-
-        }
-    }
-
-    if(event->x() >= 10 && (event->y() >80 && event->y() < rect().bottom())) //Draw bottom border
-    {
-        if(!bottomLine)
-        {
-
-            emit borderSideClicked(2,true);
-        }
-
-        else
-        {
-
-            emit borderSideClicked(2,false);
-
-        }
-    }
-
-    if((event->x() >= 130 && event->x() < rect().width()) && event->y() > 10) //Draw border right
-    {
-        if(!rightLine)
-        {
-
-            emit borderSideClicked(8,true);
-
-        }
-        else
-        {
-
-            emit borderSideClicked(8,false);
-
-        }
-
-    }
-
-
-}
-
-void BorderFrameEditor::SlotBorderSideClicked(int side, bool show)
-{
-
-    switch(side)
-    {
-    case BaseDesignIntf::BorderSide::TopLine:
-    {
-        if(show)
-        {
-            topLine = scene->addLine(QLineF(10,10,rect().width() - 10,10),m_pen);
-
-
-        }
-        else
-        {
-            scene->removeItem(topLine);
-            topLine = NULL;
-
-        }
-    }break;
-    case BaseDesignIntf::LeftLine:
-    {
-        if(show)
-        {
-            leftLine = scene->addLine(QLineF(10,10,10,rect().height() - 10),m_pen);
-
-
-        }
-        else
-        {
-            scene->removeItem(leftLine);
-            leftLine = NULL;
-
-
-        }
-    }break;
-    case BaseDesignIntf::BottomLine:
-    {
-        if(show)
-        {
-            bottomLine = scene->addLine(QLineF(10,rect().bottom() -10,rect().width() - 10
-                                               ,rect().bottom() - 10),m_pen);
-
-        }
-
-        else
-        {
-            scene->removeItem(bottomLine);
-            bottomLine = NULL;
-
-
-        }
-    }break;
-    case BaseDesignIntf::RightLine:
-    {
-        if(show)
-        {
-            rightLine = scene->addLine(QLineF(rect().width() - 10,10
-                                              ,rect().width() - 10,rect().height() - 10),m_pen);
-
-        }
-        else
-        {
-            scene->removeItem(rightLine);
-            rightLine = NULL;
-
-        }
-
-    }
-
-    }
-    updateBorders();
-}
-
-void BorderFrameEditor::updateBorders()
-{
-    //if a line is set we redraw it
-    if(topLine)
-    {
-        scene->removeItem(topLine);
-        topLine = scene->addLine(QLineF(10,10,rect().width() - 10,10),m_pen);
-
-    }
-    if(leftLine)
-    {
-        scene->removeItem(leftLine);
-        leftLine = scene->addLine(QLineF(10,10,10,rect().height() - 10),m_pen);
-
-    }
-    if(bottomLine)
-    {
-        scene->removeItem(bottomLine);
-
-        bottomLine = scene->addLine(QLineF(10,rect().bottom() -10,rect().width() - 10
-                                           ,rect().bottom() - 10),m_pen);
-
-    }
-    if(rightLine)
-    {
-        scene->removeItem(rightLine);
-
-        rightLine = scene->addLine(QLineF(rect().width() - 10,10
-                                          ,rect().width() - 10,rect().height() - 10),m_pen);
-
-    }
-
-}
-
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/images/border_settings.png b/limereport/items/images/border_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..a74087414c9377b8499b89525b322e1246f61ed2
GIT binary patch
literal 5788
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

literal 0
HcmV?d00001

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..443cb63 100644
--- a/limereport/items/lrbordereditor.h
+++ b/limereport/items/lrbordereditor.h
@@ -3,54 +3,45 @@
 
 #include <QDialog>
 #include "lrbasedesignintf.h"
+namespace LimeReport{
+
 namespace Ui {
-class lrbordereditor;
+class BorderEditor;
 }
 
-class lrbordereditor : public QDialog
+class 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..00c4108 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">
@@ -46,7 +46,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QToolButton" name="toolButton_4">
+         <widget class="QToolButton" name="allLines">
           <property name="text">
            <string>Outline</string>
           </property>
@@ -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">
@@ -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,7 +362,7 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BorderFrameEditor</class>
+   <class>LimeReport::BorderFrameEditor</class>
    <extends>QWidget</extends>
    <header>borderframeeditor.h</header>
    <container>1</container>
@@ -356,32 +376,32 @@
   <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/borderframeeditor.h b/limereport/items/lrborderframeeditor.h
similarity index 61%
rename from limereport/items/borderframeeditor.h
rename to limereport/items/lrborderframeeditor.h
index f0beae8..9333677 100644
--- a/limereport/items/borderframeeditor.h
+++ b/limereport/items/lrborderframeeditor.h
@@ -5,9 +5,9 @@
 #include <QGraphicsScene>
 #include <QGraphicsLineItem>
 #include "lrbasedesignintf.h"
-QT_BEGIN_NAMESPACE
+namespace LimeReport{
+
 namespace Ui { class BorderFrameEditor; }
-QT_END_NAMESPACE
 
 class BorderFrameEditor : public QWidget
 {
@@ -23,20 +23,24 @@ public:
 protected:
     void mousePressEvent(QMouseEvent *event);
 signals:
-    void borderSideClicked(int side,bool show);
+    void borderSideClicked(LimeReport::BaseDesignIntf::BorderSide side, bool show);
 private slots:
-    void SlotBorderSideClicked(int side, bool show);
+    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
+    QGraphicsScene *scene;
+    QGraphicsLineItem *topLine = NULL
                 ,*bottomLine = NULL
                 ,*leftLine = NULL
                 ,*rightLine = NULL;
-        QPen m_pen;
-        void updateBorders();
+    QPen m_pen;
+
 
 
 };
+} // namespace LimeReport
 #endif // WIDGET
diff --git a/limereport/items/borderframeeditor.ui b/limereport/items/lrborderframeeditor.ui
similarity index 94%
rename from limereport/items/borderframeeditor.ui
rename to limereport/items/lrborderframeeditor.ui
index 3324d90..3f70f12 100644
--- a/limereport/items/borderframeeditor.ui
+++ b/limereport/items/lrborderframeeditor.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>BorderFrameEditor</class>
- <widget class="QWidget" name="BorderFrameEditor">
+ <class>LimeReport::BorderFrameEditor</class>
+ <widget class="QWidget" name="LimeReport::BorderFrameEditor">
   <property name="geometry">
    <rect>
     <x>0</x>
diff --git a/limereport/items/lrpageeditor.cpp b/limereport/items/lrpageeditor.cpp
index d0c2f46..6f4c4e3 100644
--- a/limereport/items/lrpageeditor.cpp
+++ b/limereport/items/lrpageeditor.cpp
@@ -1,9 +1,11 @@
 #include "lrpageeditor.h"
 #include "ui_lrpageeditor.h"
 #include "lrpagedesignintf.h"
+#include "lrpageitemdesignintf.h"
 #include <QPushButton>
 #include <QPageSize>
-lrpageeditor::lrpageeditor(QWidget *parent, LimeReport::PageItemDesignIntf *page) :
+
+PageEditor::PageEditor(QWidget *parent, LimeReport::PageItemDesignIntf *page) :
     QDialog(parent),
     ui(new Ui::lrpageeditor)
 {
@@ -16,8 +18,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 +35,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 +53,55 @@ 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()
-{
-    applyChanges();
-    accept();
-
-}
-
-QSizeF lrpageeditor::getRectByPageSize(const LimeReport::PageItemDesignIntf::PageSize& size)
+QSizeF PageEditor::getRectByPageSize(const LimeReport::PageItemDesignIntf::PageSize& size)
 {
     if (size != LimeReport::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();
+    }
+
+
+}
+
diff --git a/limereport/items/lrpageeditor.h b/limereport/items/lrpageeditor.h
index 545ca3e..1adf97b 100644
--- a/limereport/items/lrpageeditor.h
+++ b/limereport/items/lrpageeditor.h
@@ -8,17 +8,18 @@ namespace Ui {
 class lrpageeditor;
 }
 
-class lrpageeditor : public QDialog
+class 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;
diff --git a/limereport/items/lrpageeditor.ui b/limereport/items/lrpageeditor.ui
index 70ca440..af2f735 100644
--- a/limereport/items/lrpageeditor.ui
+++ b/limereport/items/lrpageeditor.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>306</width>
-    <height>322</height>
+    <height>350</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -297,7 +297,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>
@@ -312,8 +312,8 @@
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>325</x>
-     <y>312</y>
+     <x>296</x>
+     <y>340</y>
     </hint>
     <hint type="destinationlabel">
      <x>286</x>
@@ -328,12 +328,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/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/lrbasedesignintf.cpp b/limereport/lrbasedesignintf.cpp
index d31165f..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)
@@ -1486,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){
@@ -1507,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..89f68d2 100644
--- a/limereport/lrbasedesignintf.h
+++ b/limereport/lrbasedesignintf.h
@@ -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*);
diff --git a/limereport/lrpagedesignintf.cpp b/limereport/lrpagedesignintf.cpp
index 55907b4..bd0e583 100644
--- a/limereport/lrpagedesignintf.cpp
+++ b/limereport/lrpagedesignintf.cpp
@@ -1826,6 +1826,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()){
diff --git a/limereport/lrpagedesignintf.h b/limereport/lrpagedesignintf.h
index 0a49b4d..c64b501 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/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/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>