mirror of
https://github.com/python-LimeReport/LimeReport.git
synced 2025-03-13 22:03:54 +03:00
Finish 1.4.117
This commit is contained in:
commit
925cbf0956
@ -120,7 +120,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
|
||||
|
||||
LIMEREPORT_VERSION_MAJOR = 1
|
||||
LIMEREPORT_VERSION_MINOR = 4
|
||||
LIMEREPORT_VERSION_RELEASE = 116
|
||||
LIMEREPORT_VERSION_RELEASE = 117
|
||||
|
||||
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
|
||||
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"
|
||||
|
@ -127,17 +127,19 @@ void TextItem::processPopUpAction(QAction *action)
|
||||
if (action->text().compare(tr("Edit")) == 0){
|
||||
this->showEditorDialog();
|
||||
}
|
||||
if (action->text().compare(tr("Auto height")) == 0){
|
||||
page()->setPropertyToSelectedItems("autoHeight",action->isChecked());
|
||||
}
|
||||
if (action->text().compare(tr("Allow HTML")) == 0){
|
||||
page()->setPropertyToSelectedItems("allowHTML",action->isChecked());
|
||||
}
|
||||
if (action->text().compare(tr("Allow HTML in fields")) == 0){
|
||||
page()->setPropertyToSelectedItems("allowHTMLInFields",action->isChecked());
|
||||
}
|
||||
if (action->text().compare(tr("Stretch to max height")) == 0){
|
||||
page()->setPropertyToSelectedItems("stretchToMaxHeight",action->isChecked());
|
||||
if (page()){
|
||||
if (action->text().compare(tr("Auto height")) == 0){
|
||||
page()->setPropertyToSelectedItems("autoHeight",action->isChecked());
|
||||
}
|
||||
if (action->text().compare(tr("Allow HTML")) == 0){
|
||||
page()->setPropertyToSelectedItems("allowHTML",action->isChecked());
|
||||
}
|
||||
if (action->text().compare(tr("Allow HTML in fields")) == 0){
|
||||
page()->setPropertyToSelectedItems("allowHTMLInFields",action->isChecked());
|
||||
}
|
||||
if (action->text().compare(tr("Stretch to max height")) == 0){
|
||||
page()->setPropertyToSelectedItems("stretchToMaxHeight",action->isChecked());
|
||||
}
|
||||
}
|
||||
if (action->text().compare(tr("Transparent")) == 0){
|
||||
if (action->isChecked()){
|
||||
|
@ -556,10 +556,12 @@ void BaseDesignIntf::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
|
||||
|
||||
setItemPos(QPointF(div(m_startPos.x(), hStep).quot * hStep, div(m_startPos.y(), vStep).quot * vStep) - delta);
|
||||
|
||||
if (!isBand() && scene()->selectedItems().count()>1)
|
||||
moveSelectedItems(tmpPos - pos());
|
||||
if (scene()->selectedItems().count()==1 && (page()->magneticMovement()))
|
||||
page()->itemMoved(this);
|
||||
if (page()){
|
||||
if (!isBand() && page()->selectedItems().count()>1)
|
||||
moveSelectedItems(tmpPos - pos());
|
||||
if (page()->selectedItems().count()==1 && (page()->magneticMovement()))
|
||||
page()->itemMoved(this);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -843,29 +845,29 @@ void BaseDesignIntf::setBorderLineSize(int value)
|
||||
|
||||
void BaseDesignIntf::moveRight()
|
||||
{
|
||||
if (!m_fixedPos) setItemPos(pos().x() + page()->horizontalGridStep(), pos().y());
|
||||
if (!m_fixedPos && page()) setItemPos(pos().x() + page()->horizontalGridStep(), pos().y());
|
||||
}
|
||||
|
||||
void BaseDesignIntf::moveLeft()
|
||||
{
|
||||
if (!m_fixedPos) setItemPos(pos().x() - page()->horizontalGridStep(), pos().y());
|
||||
if (!m_fixedPos && page()) setItemPos(pos().x() - page()->horizontalGridStep(), pos().y());
|
||||
}
|
||||
|
||||
void BaseDesignIntf::moveDown()
|
||||
{
|
||||
if (!m_fixedPos) setItemPos(pos().x(), pos().y() + page()->verticalGridStep());
|
||||
if (!m_fixedPos && page()) setItemPos(pos().x(), pos().y() + page()->verticalGridStep());
|
||||
}
|
||||
|
||||
void BaseDesignIntf::moveUp()
|
||||
{
|
||||
if (!m_fixedPos) setItemPos(pos().x(), pos().y() - page()->verticalGridStep());
|
||||
if (!m_fixedPos && page()) setItemPos(pos().x(), pos().y() - page()->verticalGridStep());
|
||||
}
|
||||
|
||||
void BaseDesignIntf::sizeRight()
|
||||
{
|
||||
if ((m_possibleResizeDirectionFlags & ResizeLeft) ||
|
||||
(m_possibleResizeDirectionFlags & ResizeRight)) {
|
||||
setWidth(width() + page()->horizontalGridStep());
|
||||
if (page()) setWidth(width() + page()->horizontalGridStep());
|
||||
}
|
||||
}
|
||||
|
||||
@ -873,7 +875,7 @@ void BaseDesignIntf::sizeLeft()
|
||||
{
|
||||
if ((m_possibleResizeDirectionFlags & ResizeLeft) ||
|
||||
(m_possibleResizeDirectionFlags & ResizeRight)) {
|
||||
setWidth(width() - page()->horizontalGridStep());
|
||||
if(page()) setWidth(width() - page()->horizontalGridStep());
|
||||
}
|
||||
}
|
||||
|
||||
@ -881,7 +883,7 @@ void BaseDesignIntf::sizeUp()
|
||||
{
|
||||
if ((m_possibleResizeDirectionFlags & ResizeTop) ||
|
||||
(m_possibleResizeDirectionFlags & ResizeBottom)) {
|
||||
setHeight(height() - page()->verticalGridStep());
|
||||
if (page()) setHeight(height() - page()->verticalGridStep());
|
||||
}
|
||||
}
|
||||
|
||||
@ -889,7 +891,7 @@ void BaseDesignIntf::sizeDown()
|
||||
{
|
||||
if ((m_possibleResizeDirectionFlags & ResizeTop) ||
|
||||
(m_possibleResizeDirectionFlags & ResizeBottom)) {
|
||||
setHeight(height() + page()->verticalGridStep());
|
||||
if (page()) setHeight(height() + page()->verticalGridStep());
|
||||
}
|
||||
}
|
||||
|
||||
@ -1384,7 +1386,7 @@ void BaseDesignIntf::collectionLoadFinished(const QString &collectionName)
|
||||
foreach(QObject * obj, QObject::children()) {
|
||||
#endif
|
||||
BaseDesignIntf *item = dynamic_cast<BaseDesignIntf *>(obj);
|
||||
if (item) {
|
||||
if (item && page()) {
|
||||
page()->registerItem(item);
|
||||
}
|
||||
}
|
||||
|
@ -824,10 +824,9 @@ void PageItemDesignIntf::bandGeometryChanged(QObject* object, QRectF newGeometry
|
||||
}
|
||||
}
|
||||
}
|
||||
if (curIndex != band->bandIndex()){
|
||||
//swapBands(band, bandToSwap);
|
||||
//page()->saveCommand(BandSwapCommand::create(page(), band->objectName(), bandToSwap->objectName()), true);
|
||||
page()->saveCommand(BandMoveFromToCommand::create(page(), band->bandIndex(), bandToSwap->bandIndex()), true);
|
||||
if (curIndex != band->bandIndex() && itemMode() == DesignMode){
|
||||
if (page())
|
||||
page()->saveCommand(BandMoveFromToCommand::create(page(), band->bandIndex(), bandToSwap->bandIndex()), true);
|
||||
}
|
||||
relocateBands();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user