mirror of
https://github.com/fralx/LimeReport.git
synced 2024-12-25 17:14:40 +03:00
Finish 1.4.57
This commit is contained in:
commit
9a4b4a734c
@ -62,7 +62,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 = 56
|
LIMEREPORT_VERSION_RELEASE = 57
|
||||||
|
|
||||||
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}\"
|
||||||
|
@ -628,10 +628,10 @@ QPointF BaseDesignIntf::modifyPosForAlignedItem(const QPointF& pos){
|
|||||||
result.setX(leftBorder);
|
result.setX(leftBorder);
|
||||||
break;
|
break;
|
||||||
case RightItemAlign:
|
case RightItemAlign:
|
||||||
result.setX(parent->width()-rightBorder);
|
result.setX(parent->width() - (rightBorder + width()));
|
||||||
break;
|
break;
|
||||||
case CenterItemAlign:
|
case CenterItemAlign:
|
||||||
result.setX((avaibleSpace-width())/2);
|
result.setX((avaibleSpace-width()) / 2 + leftBorder);
|
||||||
break;
|
break;
|
||||||
case ParentWidthItemAlign:
|
case ParentWidthItemAlign:
|
||||||
result.setX(leftBorder);
|
result.setX(leftBorder);
|
||||||
|
Binary file not shown.
@ -789,7 +789,7 @@ p, li { white-space: pre-wrap; }
|
|||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>LeftToRight</source>
|
<source>LeftToRight</source>
|
||||||
<translation>С лева на право</translation>
|
<translation>Слева на право</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>RightToLeft</source>
|
<source>RightToLeft</source>
|
||||||
@ -801,11 +801,11 @@ p, li { white-space: pre-wrap; }
|
|||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>LeftItemAlign</source>
|
<source>LeftItemAlign</source>
|
||||||
<translation>С лева</translation>
|
<translation>Слева</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>RightItemAlign</source>
|
<source>RightItemAlign</source>
|
||||||
<translation>С права</translation>
|
<translation>Справа</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>CenterItemAlign</source>
|
<source>CenterItemAlign</source>
|
||||||
@ -817,7 +817,7 @@ p, li { white-space: pre-wrap; }
|
|||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>DesignedItemAlign</source>
|
<source>DesignedItemAlign</source>
|
||||||
<translation>Заданный положение</translation>
|
<translation>Заданное положение</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>HorizontalLine</source>
|
<source>HorizontalLine</source>
|
||||||
|
Loading…
Reference in New Issue
Block a user