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

Finish 1.4.57

Browse Source 
# Conflicts:
#	translations/limereport_ru.qm
This commit is contained in:
Arin Alexander 2017-12-11 01:02:52 +03:00
commit 76edb45543
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.pri
View File

@ -70,7 +70,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}\\\"

4
limereport/lrbasedesignintf.cpp
View File

@ -630,10 +630,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);

8
translations/limereport_ru.ts
View File

@ -862,7 +862,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>
@ -874,11 +874,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>
@ -890,7 +890,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>