python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2025-10-01 11:40:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Border editor little bit refactored

Browse Source
This commit is contained in:
Alexander Arin
2022-11-01 11:48:47 +03:00
parent 7bf0ce51e6 b1c67651c8
commit 44d31243ab
64 changed files with 31582 additions and 1742 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
limereport/items/lrbordereditor.h
View File

@@ -3,13 +3,15 @@
#include <QDialog>
#include "lrbasedesignintf.h"
namespace LimeReport{
namespace Ui {
class BorderEditor;
class BorderEditor;
}
class BorderEditor : public QDialog
class LIMEREPORT_EXPORT BorderEditor : public QDialog
{
Q_OBJECT

19
limereport/items/lrbordereditor.ui
View File

@@ -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">
@@ -51,7 +51,7 @@
<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">
@@ -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">
@@ -364,14 +364,11 @@
<customwidget>
<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>

9
limereport/items/lrpageeditor.cpp
View File

@@ -5,9 +5,11 @@
#include <QPushButton>
#include <QPageSize>
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;
@@ -59,7 +61,7 @@ void PageEditor::applyChanges()
QSizeF PageEditor::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))
@@ -78,6 +80,7 @@ QSizeF PageEditor::getRectByPageSize(const LimeReport::PageItemDesignIntf::PageS
return QSizeF(m_page->getItemWidth(), m_page->getItemHeight());
}
}
void PageEditor::on_format_currentIndexChanged(int index)
{
QPageSize ps = *new QPageSize();
@@ -102,6 +105,6 @@ void PageEditor::on_buttonBox_clicked(QAbstractButton *button)
accept();
}
}
} // namespace

10
limereport/items/lrpageeditor.h
View File

@@ -4,11 +4,13 @@
#include <QDialog>
#include "lrpageitemdesignintf.h"
#include <QPushButton>
namespace LimeReport{
namespace Ui {
class lrpageeditor;
class PageEditor;
}
class PageEditor : public QDialog
class LIMEREPORT_EXPORT PageEditor : public QDialog
{
Q_OBJECT
@@ -22,11 +24,13 @@ private slots:
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

35
limereport/items/lrpageeditor.ui
View File

@@ -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>350</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">
@@ -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>296</x>
<y>340</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>endlessHeight</sender>
<signal>clicked(bool)</signal>