fixed conflicts

limereport/items/lrbordereditor.cpp

@@ -16,12 +16,14 @@ BorderEditor::BorderEditor(QWidget *parent) :
         ui->borderFrame, SIGNAL(borderSideClicked(LimeReport::BaseDesignIntf::BorderSide, bool)),
         this, SLOT(checkToolButtons(LimeReport::BaseDesignIntf::BorderSide, bool))
         );
+
+
 }
 
 void BorderEditor::loadItem(LimeReport::BaseDesignIntf *item)
 {
     m_item = item;
-    qDebug()<<item->metaObject()->className();
+
     emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::TopLine,
                                             item->borderLines() & LimeReport::BaseDesignIntf::TopLine);
     emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::LeftLine,
@@ -69,11 +71,13 @@ double BorderEditor::borderWidth()
     return m_borderWidth;
 }
 
+
 bool BorderEditor::isPage()
 {
     return QString(m_item->metaObject()->className()) == "LimeReport::PageItemDesignIntf";
 }
 
+
 BorderEditor::~BorderEditor()
 {
     delete ui;
@@ -99,18 +103,22 @@ void BorderEditor::checkToolButtons(LimeReport::BaseDesignIntf::BorderSide side,
 {
     switch(side)
     {
-    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;
+
+
+
+        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;
+
     }
 }
 

limereport/items/lrbordereditor_BACKUP_426.cpp

@@ -0,0 +1,170 @@
+#include "lrbordereditor.h"
+#include "ui_lrbordereditor.h"
+#include <QColorDialog>
+#include "lrbasedesignintf.h"
+
+namespace LimeReport{
+
+BorderEditor::BorderEditor(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::BorderEditor),
+    m_borderStyle(1),
+    m_borderWidth(1)
+{
+    ui->setupUi(this);
+    connect(
+        ui->borderFrame, SIGNAL(borderSideClicked(LimeReport::BaseDesignIntf::BorderSide, bool)),
+        this, SLOT(checkToolButtons(LimeReport::BaseDesignIntf::BorderSide, bool))
+        );
+
+
+}
+
+void BorderEditor::loadItem(LimeReport::BaseDesignIntf *item)
+{
+    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);
+
+    QPen pen;
+    pen.setWidthF(item->borderLineSize());
+    pen.setColor(item->borderColor());
+    pen.setStyle((Qt::PenStyle)item->borderStyle());
+    ui->borderFrame->setPen(pen);
+    m_borderColor = item->borderColor().name();
+    ui->listWidget->setCurrentRow((Qt::PenStyle)item->borderStyle());
+    ui->comboBox->setCurrentText(QString::number(item->borderLineSize()));
+    m_borderWidth = ui->comboBox->currentText().toDouble();
+    m_borderStyle =ui->listWidget->currentRow();
+    ui->colorIndicator->setStyleSheet(QString("background-color:%1;").arg(m_borderColor));
+}
+
+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;
+}
+
+LimeReport::BaseDesignIntf::BorderStyle BorderEditor::borderStyle()
+{
+    return (LimeReport::BaseDesignIntf::BorderStyle) m_borderStyle;
+}
+
+QString BorderEditor::borderColor()
+{
+    return m_borderColor;
+}
+
+double BorderEditor::borderWidth()
+{
+    return m_borderWidth;
+}
+
+
+bool BorderEditor::isPage()
+{
+    return QString(m_item->metaObject()->className()) == "LimeReport::PageItemDesignIntf";
+}
+
+
+BorderEditor::~BorderEditor()
+{
+    delete ui;
+}
+
+void BorderEditor::on_listWidget_currentRowChanged(int currentRow)
+{
+    QPen pen = ui->borderFrame->pen();
+    pen.setStyle((Qt::PenStyle)currentRow);
+    m_borderStyle = currentRow;
+    ui->borderFrame->setPen(pen);
+}
+
+void BorderEditor::on_comboBox_currentTextChanged(const QString &arg1)
+{
+    QPen pen = ui->borderFrame->pen();
+    pen.setWidthF(arg1.toDouble());
+    ui->borderFrame->setPen(pen);
+    m_borderWidth = arg1.toDouble();
+}
+
+void BorderEditor::checkToolButtons(LimeReport::BaseDesignIntf::BorderSide side, bool check)
+{
+    switch(side)
+    {
+
+
+
+        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 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 BorderEditor::on_allLines_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);
+}
+
+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 BorderEditor::on_selectColor_clicked()
+{
+    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

limereport/items/lrbordereditor_BASE_426.cpp

@@ -0,0 +1,182 @@
+#include "lrbordereditor.h"
+#include "ui_lrbordereditor.h"
+#include <QColorDialog>
+#include "lrbasedesignintf.h"
+lrbordereditor::lrbordereditor(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::lrbordereditor)
+{
+    ui->setupUi(this);
+
+    connect(ui->borderFrame,SIGNAL(borderSideClicked(int, bool)), this, SLOT(checkToolButtons(int, bool)));
+}
+
+void lrbordereditor::loadItem(LimeReport::BaseDesignIntf *i)
+{
+    item = i;
+    if(item->borderLines() & LimeReport::BaseDesignIntf::TopLine)
+    {
+        emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::TopLine,true);
+
+    }
+    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();
+    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));
+}
+
+LimeReport::BaseDesignIntf::BorderLines lrbordereditor::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;
+}
+
+LimeReport::BaseDesignIntf::BorderStyle lrbordereditor::border_style()
+{
+    return (LimeReport::BaseDesignIntf::BorderStyle)borderStyle;
+}
+
+QString lrbordereditor::borderColor()
+{
+    return border_color;
+}
+
+double lrbordereditor::border_width()
+{
+    return borderWidth;
+}
+
+lrbordereditor::~lrbordereditor()
+{
+    delete ui;
+}
+
+void lrbordereditor::on_listWidget_currentRowChanged(int currentRow)
+{
+    QPen pen = ui->borderFrame->pen();
+    pen.setStyle((Qt::PenStyle)currentRow);
+    borderStyle = currentRow;
+    ui->borderFrame->setPen(pen);
+
+
+}
+
+
+void lrbordereditor::on_comboBox_currentTextChanged(const QString &arg1)
+{
+    QPen pen = ui->borderFrame->pen();
+    pen.setWidthF(arg1.toDouble());
+    ui->borderFrame->setPen(pen);
+    borderWidth = arg1.toDouble();
+}
+
+
+void lrbordereditor::on_pushButton_clicked()
+{
+    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;
+    }
+}
+
+
+void lrbordereditor::on_bottomLine_clicked()
+{
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::BottomLine,ui->bottomLine->isChecked());
+}
+
+
+void lrbordereditor::on_leftLine_clicked()
+{
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::LeftLine,ui->leftLine->isChecked());
+}
+
+
+void lrbordereditor::on_toolButton_3_clicked()
+{
+    emit ui->borderFrame->borderSideClicked(LimeReport::BaseDesignIntf::BorderSide::RightLine,ui->rightLine->isChecked());
+}
+

limereport/items/lrbordereditor_LOCAL_426.cpp

@@ -0,0 +1,162 @@
+#include "lrbordereditor.h"
+#include "ui_lrbordereditor.h"
+#include <QColorDialog>
+#include "lrbasedesignintf.h"
+
+namespace LimeReport{
+
+BorderEditor::BorderEditor(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::BorderEditor),
+    m_borderStyle(1),
+    m_borderWidth(1)
+{
+    ui->setupUi(this);
+    connect(
+        ui->borderFrame, SIGNAL(borderSideClicked(LimeReport::BaseDesignIntf::BorderSide, bool)),
+        this, SLOT(checkToolButtons(LimeReport::BaseDesignIntf::BorderSide, bool))
+        );
+}
+
+void BorderEditor::loadItem(LimeReport::BaseDesignIntf *item)
+{
+    m_item = item;
+    qDebug()<<item->metaObject()->className();
+    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);
+
+    QPen pen;
+    pen.setWidthF(item->borderLineSize());
+    pen.setColor(item->borderColor());
+    pen.setStyle((Qt::PenStyle)item->borderStyle());
+    ui->borderFrame->setPen(pen);
+    m_borderColor = item->borderColor().name();
+    ui->listWidget->setCurrentRow((Qt::PenStyle)item->borderStyle());
+    ui->comboBox->setCurrentText(QString::number(item->borderLineSize()));
+    m_borderWidth = ui->comboBox->currentText().toDouble();
+    m_borderStyle =ui->listWidget->currentRow();
+    ui->colorIndicator->setStyleSheet(QString("background-color:%1;").arg(m_borderColor));
+}
+
+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;
+}
+
+LimeReport::BaseDesignIntf::BorderStyle BorderEditor::borderStyle()
+{
+    return (LimeReport::BaseDesignIntf::BorderStyle) m_borderStyle;
+}
+
+QString BorderEditor::borderColor()
+{
+    return m_borderColor;
+}
+
+double BorderEditor::borderWidth()
+{
+    return m_borderWidth;
+}
+
+bool BorderEditor::isPage()
+{
+    return QString(m_item->metaObject()->className()) == "LimeReport::PageItemDesignIntf";
+}
+
+BorderEditor::~BorderEditor()
+{
+    delete ui;
+}
+
+void BorderEditor::on_listWidget_currentRowChanged(int currentRow)
+{
+    QPen pen = ui->borderFrame->pen();
+    pen.setStyle((Qt::PenStyle)currentRow);
+    m_borderStyle = currentRow;
+    ui->borderFrame->setPen(pen);
+}
+
+void BorderEditor::on_comboBox_currentTextChanged(const QString &arg1)
+{
+    QPen pen = ui->borderFrame->pen();
+    pen.setWidthF(arg1.toDouble());
+    ui->borderFrame->setPen(pen);
+    m_borderWidth = arg1.toDouble();
+}
+
+void BorderEditor::checkToolButtons(LimeReport::BaseDesignIntf::BorderSide side, bool check)
+{
+    switch(side)
+    {
+    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 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 BorderEditor::on_allLines_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);
+}
+
+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 BorderEditor::on_selectColor_clicked()
+{
+    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

limereport/items/lrbordereditor_REMOTE_426.cpp

@@ -0,0 +1,156 @@
+#include "lrbordereditor.h"
+#include "ui_lrbordereditor.h"
+#include <QColorDialog>
+#include "lrbasedesignintf.h"
+
+namespace LimeReport{
+
+BorderEditor::BorderEditor(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::BorderEditor),
+    m_borderStyle(1),
+    m_borderWidth(1)
+{
+    ui->setupUi(this);
+    connect(
+        ui->borderFrame, SIGNAL(borderSideClicked(LimeReport::BaseDesignIntf::BorderSide, bool)),
+        this, SLOT(checkToolButtons(LimeReport::BaseDesignIntf::BorderSide, bool))
+    );
+}
+
+void BorderEditor::loadItem(LimeReport::BaseDesignIntf *item)
+{
+    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);
+
+    QPen pen;
+    pen.setWidthF(item->borderLineSize());
+    pen.setColor(item->borderColor());
+    pen.setStyle((Qt::PenStyle)item->borderStyle());
+    ui->borderFrame->setPen(pen);
+    m_borderColor = item->borderColor().name();
+    ui->listWidget->setCurrentRow((Qt::PenStyle)item->borderStyle());
+    ui->comboBox->setCurrentText(QString::number(item->borderLineSize()));
+    m_borderWidth = ui->comboBox->currentText().toDouble();
+    m_borderStyle =ui->listWidget->currentRow();
+    ui->colorIndicator->setStyleSheet(QString("background-color:%1;").arg(m_borderColor));
+}
+
+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;
+}
+
+LimeReport::BaseDesignIntf::BorderStyle BorderEditor::borderStyle()
+{
+    return (LimeReport::BaseDesignIntf::BorderStyle) m_borderStyle;
+}
+
+QString BorderEditor::borderColor()
+{
+    return m_borderColor;
+}
+
+double BorderEditor::borderWidth()
+{
+    return m_borderWidth;
+}
+
+BorderEditor::~BorderEditor()
+{
+    delete ui;
+}
+
+void BorderEditor::on_listWidget_currentRowChanged(int currentRow)
+{
+    QPen pen = ui->borderFrame->pen();
+    pen.setStyle((Qt::PenStyle)currentRow);
+    m_borderStyle = currentRow;
+    ui->borderFrame->setPen(pen);
+}
+
+void BorderEditor::on_comboBox_currentTextChanged(const QString &arg1)
+{
+    QPen pen = ui->borderFrame->pen();
+    pen.setWidthF(arg1.toDouble());
+    ui->borderFrame->setPen(pen);
+    m_borderWidth = arg1.toDouble();
+}
+
+void BorderEditor::checkToolButtons(LimeReport::BaseDesignIntf::BorderSide side, bool check)
+{
+    switch(side)
+    {
+        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 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 BorderEditor::on_allLines_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);
+}
+
+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 BorderEditor::on_selectColor_clicked()
+{
+    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

limereport/items/lrtextitem.cpp

@@ -175,21 +175,25 @@ void TextItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* style, Q
 
     qreal hOffset = 0, vOffset = 0;
     switch (m_angle){
-    case Angle0:
-        hOffset = marginSize();
-        if ((tmpSize.height() > 0) && (m_alignment & Qt::AlignVCenter)){
-            vOffset = tmpSize.height() / 2;
-        }
-        if ((tmpSize.height() > 0) && (m_alignment & Qt::AlignBottom)) // allow html
-            vOffset = tmpSize.height();
-        painter->translate(hOffset,vOffset);
+
+
+
+        case Angle0:
+            hOffset = marginSize();
+            if ((tmpSize.height() > 0) && (m_alignment & Qt::AlignVCenter)){
+                vOffset = tmpSize.height() / 2;
+            }
+            if ((tmpSize.height() > 0) && (m_alignment & Qt::AlignBottom)) // allow html
+                vOffset = tmpSize.height();
+            painter->translate(hOffset,vOffset);
         break;
-    case Angle90:
-        hOffset = width() - marginSize();
-        vOffset = marginSize();
-        if (m_alignment & Qt::AlignVCenter){
-            hOffset = (width() - text->size().height()) / 2 + text->size().height();
-        }
+        case Angle90:
+            hOffset = width() - marginSize();
+            vOffset = marginSize();
+            if (m_alignment & Qt::AlignVCenter){
+                hOffset = (width() - text->size().height()) / 2 + text->size().height();
+            }
+
 
         if (m_alignment & Qt::AlignBottom){
             hOffset = (text->size().height());
@@ -197,6 +201,7 @@ void TextItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* style, Q
         painter->translate(hOffset,vOffset);
         painter->rotate(90);
         break;
+
     case Angle180:
         hOffset = width() - marginSize();
         vOffset = height() - marginSize();
@@ -216,6 +221,7 @@ void TextItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* style, Q
             hOffset = (width() - text->size().height())/2;
         }
 
+
         if (m_alignment & Qt::AlignBottom){
             hOffset = (width() - text->size().height());
         }
@@ -385,7 +391,11 @@ void TextItem::setTextFont(TextPtr text, const QFont& value) const {
 void TextItem::adaptFontSize(TextPtr text) const{
     QFont _font = transformToSceneFont(font());
     do{
+
         //        qApp->processEvents();
+
+//        qApp->processEvents();
+
         setTextFont(text,_font);
         if (_font.pixelSize()>2)
             _font.setPixelSize(_font.pixelSize()-1);
@@ -486,23 +496,25 @@ 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();
+
+        case QMetaType::QDate:
+        case QMetaType::QDateTime:
+            return formatDateTime(value.toDateTime());
+        case QMetaType::Double:
+            return formatNumber(value.toDouble());
+        default:
+            return value.toString();
+
     }
 #endif