mirror of
https://github.com/fralx/LimeReport.git
synced 2024-12-25 00:54:39 +03:00
Finish 1.4.115
# Conflicts: # limereport/lrpagedesignintf.h
This commit is contained in:
commit
a73791ce2f
@ -120,7 +120,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
|
|||||||
|
|
||||||
LIMEREPORT_VERSION_MAJOR = 1
|
LIMEREPORT_VERSION_MAJOR = 1
|
||||||
LIMEREPORT_VERSION_MINOR = 4
|
LIMEREPORT_VERSION_MINOR = 4
|
||||||
LIMEREPORT_VERSION_RELEASE = 113
|
LIMEREPORT_VERSION_RELEASE = 114
|
||||||
|
|
||||||
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
|
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
|
||||||
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"
|
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"
|
||||||
|
@ -68,8 +68,6 @@ bool bandSortBandLessThen(const BandDesignIntf *c1, const BandDesignIntf *c2)
|
|||||||
|
|
||||||
PageDesignIntf::PageDesignIntf(QObject *parent):
|
PageDesignIntf::PageDesignIntf(QObject *parent):
|
||||||
QGraphicsScene(parent),
|
QGraphicsScene(parent),
|
||||||
m_pageSize(A4),
|
|
||||||
m_orientation(Portrait),
|
|
||||||
m_pageItem(0),
|
m_pageItem(0),
|
||||||
m_insertMode(false),
|
m_insertMode(false),
|
||||||
m_itemInsertRect(0),
|
m_itemInsertRect(0),
|
||||||
@ -85,8 +83,6 @@ PageDesignIntf::PageDesignIntf(QObject *parent):
|
|||||||
m_executingGroupCommand(false),
|
m_executingGroupCommand(false),
|
||||||
m_settings(0),
|
m_settings(0),
|
||||||
m_selectionRect(0),
|
m_selectionRect(0),
|
||||||
//m_verticalGridStep(1*Const::mmFACTOR),
|
|
||||||
//m_horizontalGridStep(1*Const::mmFACTOR)
|
|
||||||
m_verticalGridStep(2),
|
m_verticalGridStep(2),
|
||||||
m_horizontalGridStep(2),
|
m_horizontalGridStep(2),
|
||||||
m_updating(false),
|
m_updating(false),
|
||||||
@ -135,22 +131,22 @@ void PageDesignIntf::updatePageRect()
|
|||||||
emit sceneRectChanged(sceneRect());
|
emit sceneRectChanged(sceneRect());
|
||||||
}
|
}
|
||||||
|
|
||||||
PageDesignIntf::Orientation PageDesignIntf::getOrientation()
|
//PageDesignIntf::Orientation PageDesignIntf::getOrientation()
|
||||||
{
|
//{
|
||||||
return m_orientation;
|
// return m_orientation;
|
||||||
}
|
//}
|
||||||
|
|
||||||
void PageDesignIntf::setPageSize(PageDesignIntf::PageSize sizeType, QSizeF sizeValue)
|
//void PageDesignIntf::setPageSize(PageDesignIntf::PageSize sizeType, QSizeF sizeValue)
|
||||||
{
|
//{
|
||||||
m_pageSize = sizeType;
|
// m_pageSize = sizeType;
|
||||||
m_pageSizeValue = sizeValue;
|
// m_pageSizeValue = sizeValue;
|
||||||
updatePageRect();
|
// updatePageRect();
|
||||||
}
|
//}
|
||||||
|
|
||||||
PageDesignIntf::PageSize PageDesignIntf::pageSize() const
|
//PageDesignIntf::PageSize PageDesignIntf::pageSize() const
|
||||||
{
|
//{
|
||||||
return m_pageSize;
|
// return m_pageSize;
|
||||||
}
|
//}
|
||||||
|
|
||||||
void PageDesignIntf::keyPressEvent(QKeyEvent *event)
|
void PageDesignIntf::keyPressEvent(QKeyEvent *event)
|
||||||
{
|
{
|
||||||
@ -668,22 +664,22 @@ bool PageDesignIntf::isExistsObjectName(const QString &objectName, QList<QGraphi
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
QRectF PageDesignIntf::getRectByPageSize(PageDesignIntf::PageSize pageSize)
|
//QRectF PageDesignIntf::getRectByPageSize(PageDesignIntf::PageSize pageSize)
|
||||||
{
|
//{
|
||||||
if (m_pageSize != Custom) {
|
// if (m_pageSize != PageSize::Custom) {
|
||||||
QPrinter printer;
|
// QPrinter printer;
|
||||||
printer.setOutputFormat(QPrinter::PdfFormat);
|
// printer.setOutputFormat(QPrinter::PdfFormat);
|
||||||
printer.setOrientation((QPrinter::Orientation)getOrientation());
|
// printer.setOrientation((QPrinter::Orientation)getOrientation());
|
||||||
printer.setPageSize((QPrinter::PageSize)pageSize);
|
// printer.setPageSize((QPrinter::PageSize)pageSize);
|
||||||
return QRectF(0, 0, printer.paperRect(QPrinter::Millimeter).width() * 10,
|
// return QRectF(0, 0, printer.paperRect(QPrinter::Millimeter).width() * 10,
|
||||||
printer.paperSize(QPrinter::Millimeter).height() * 10);
|
// printer.paperSize(QPrinter::Millimeter).height() * 10);
|
||||||
}
|
// }
|
||||||
|
|
||||||
else {
|
// else {
|
||||||
return QRectF(0, 0, m_pageSizeValue.width() * 10,
|
// return QRectF(0, 0, m_pageSizeValue.width() * 10,
|
||||||
m_pageSizeValue.height() * 10);
|
// m_pageSizeValue.height() * 10);
|
||||||
}
|
// }
|
||||||
}
|
//}
|
||||||
|
|
||||||
bool PageDesignIntf::isLoading()
|
bool PageDesignIntf::isLoading()
|
||||||
{
|
{
|
||||||
|
@ -104,21 +104,9 @@ namespace LimeReport {
|
|||||||
friend class PropertyChangedCommand;
|
friend class PropertyChangedCommand;
|
||||||
friend class InsertHLayoutCommand;
|
friend class InsertHLayoutCommand;
|
||||||
friend class InsertVLayoutCommand;
|
friend class InsertVLayoutCommand;
|
||||||
enum Orientation {Portrait, Landscape};
|
|
||||||
enum PageSize {A4, B5, Letter, Legal, Executive,
|
|
||||||
A0, A1, A2, A3, A5, A6, A7, A8, A9, B0, B1,
|
|
||||||
B10, B2, B3, B4, B6, B7, B8, B9, C5E, Comm10E,
|
|
||||||
DLE, Folio, Ledger, Tabloid, Custom, NPageSize = Custom
|
|
||||||
};
|
|
||||||
|
|
||||||
explicit PageDesignIntf(QObject* parent = 0);
|
explicit PageDesignIntf(QObject* parent = 0);
|
||||||
~PageDesignIntf();
|
~PageDesignIntf();
|
||||||
void updatePageRect();
|
void updatePageRect();
|
||||||
Orientation getOrientation();
|
|
||||||
|
|
||||||
void setPageSize(PageSize sizeType, QSizeF sizeValue=QSizeF());
|
|
||||||
PageSize pageSize() const;
|
|
||||||
|
|
||||||
void startInsertMode(const QString& ItemType);
|
void startInsertMode(const QString& ItemType);
|
||||||
void startEditMode();
|
void startEditMode();
|
||||||
|
|
||||||
@ -204,7 +192,6 @@ namespace LimeReport {
|
|||||||
BaseDesignIntf *findDestObject(BaseDesignIntf *item);
|
BaseDesignIntf *findDestObject(BaseDesignIntf *item);
|
||||||
|
|
||||||
bool isExistsObjectName (const QString& objectName, QList<QGraphicsItem *> &itemsList) const;
|
bool isExistsObjectName (const QString& objectName, QList<QGraphicsItem *> &itemsList) const;
|
||||||
QRectF getRectByPageSize(PageSize pageSize);
|
|
||||||
|
|
||||||
bool isLoading();
|
bool isLoading();
|
||||||
void objectLoadStarted();
|
void objectLoadStarted();
|
||||||
@ -280,10 +267,6 @@ namespace LimeReport {
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
enum JoinType{Width, Height};
|
enum JoinType{Width, Height};
|
||||||
PageSize m_pageSize;
|
|
||||||
QSizeF m_pageSizeValue;
|
|
||||||
Orientation m_orientation;
|
|
||||||
QRectF m_geometry;
|
|
||||||
LimeReport::PageItemDesignIntf::Ptr m_pageItem;
|
LimeReport::PageItemDesignIntf::Ptr m_pageItem;
|
||||||
QList<PageItemDesignIntf::Ptr> m_reportPages;
|
QList<PageItemDesignIntf::Ptr> m_reportPages;
|
||||||
ReportEnginePrivate* m_reportEditor;
|
ReportEnginePrivate* m_reportEditor;
|
||||||
|
Loading…
Reference in New Issue
Block a user