mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-01-11 17:18:10 +03:00
Code

08/04

Browse Source
This commit is contained in:
yanis60 2022-04-08 10:26:58 +00:00
parent 7f879ab4c1
commit b58ac7c53d
3 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
limereport/lrbasedesignintf.cpp
View File

@ -1067,6 +1067,7 @@ void BaseDesignIntf::drawRightLine(QPainter *painter, QRectF rect) const
if(isShapeItem()) if(isShapeItem())
return; return;
painter->setPen(borderPen(RightLine)); painter->setPen(borderPen(RightLine));
painter->drawLine(rect.width(), rect.y(), rect.width(), rect.height()); painter->drawLine(rect.width(), rect.y(), rect.width(), rect.height());
} }
@ -1170,14 +1171,11 @@ QPen BaseDesignIntf::borderPen(BorderSide side/*, bool selected*/) const
if (m_borderLinesFlags & side) { if (m_borderLinesFlags & side) {
pen.setColor(m_borderColor); pen.setColor(m_borderColor);
pen.setStyle(m_borderStyle); pen.setStyle(m_borderStyle);
if(m_borderLineSize == 0) pen.setWidthF(m_borderLineSize * 1.33333333);
pen.setStyle(Qt::NoPen);
pen.setWidth(m_borderLineSize+1);
} else { } else {
pen.setColor(Qt::darkGray); pen.setColor(Qt::darkGray);
pen.setStyle(Qt::SolidLine); pen.setStyle(Qt::SolidLine);
pen.setWidth(1); pen.setWidthF(1);
} }
return pen; return pen;
} }
@ -1744,7 +1742,7 @@ void Marker::paint(QPainter* painter, const QStyleOptionGraphicsItem*, QWidget*)
painter->drawRect(rect()); painter->drawRect(rect());
painter->setBrush(color()); painter->setBrush(color());
painter->setPen(Qt::transparent); painter->setPen(Qt::transparent);
painter->setRenderHint(QPainter::HighQualityAntialiasing);
painter->setOpacity(1); painter->setOpacity(1);
painter->drawRect(QRectF(-markerSize,-markerSize,markerSize*2,markerSize*2)); painter->drawRect(QRectF(-markerSize,-markerSize,markerSize*2,markerSize*2));
painter->drawRect(QRectF(rect().right()-markerSize,rect().bottom()-markerSize,markerSize*2,markerSize*2)); painter->drawRect(QRectF(rect().right()-markerSize,rect().bottom()-markerSize,markerSize*2,markerSize*2));

22
translations/limereport_fr.ts
View File

@ -554,53 +554,53 @@ p, li { white-space: pre-wrap; }
<context> <context>
<name>LimeReport::BaseDesignIntf</name> <name>LimeReport::BaseDesignIntf</name>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1384"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1382"/>
<location filename="../limereport/lrbasedesignintf.cpp" line="1812"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1810"/>
<source>Lock item geometry</source> <source>Lock item geometry</source>
<translation>Verrouiller la géométrie d&apos;un élément</translation> <translation>Verrouiller la géométrie d&apos;un élément</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1390"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1388"/>
<source>Copy</source> <source>Copy</source>
<translation>Copier</translation> <translation>Copier</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1392"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1390"/>
<source>Cut</source> <source>Cut</source>
<translation>Couper</translation> <translation>Couper</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1394"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1392"/>
<source>Paste</source> <source>Paste</source>
<translation>Coller</translation> <translation>Coller</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1404"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1402"/>
<source>Bring to top</source> <source>Bring to top</source>
<translation>Placer au premier-plan</translation> <translation>Placer au premier-plan</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1405"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1403"/>
<source>Send to back</source> <source>Send to back</source>
<translation>Placer en arrière-plan</translation> <translation>Placer en arrière-plan</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1408"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1406"/>
<source>Create Horizontal Layout</source> <source>Create Horizontal Layout</source>
<translation>Créer une disposition horizontale</translation> <translation>Créer une disposition horizontale</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1412"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1410"/>
<source>Create Vertical Layout</source> <source>Create Vertical Layout</source>
<translation>Créer une disposition verticale</translation> <translation>Créer une disposition verticale</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1415"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1413"/>
<source>No borders</source> <source>No borders</source>
<translation>Aucune bordure</translation> <translation>Aucune bordure</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1416"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1414"/>
<source>All borders</source> <source>All borders</source>
<translation>Toutes les bordures</translation> <translation>Toutes les bordures</translation>
</message> </message>

22
translations/limereport_pl.ts
View File

@ -566,53 +566,53 @@ p, li { white-space: pre-wrap; }
<context> <context>
<name>LimeReport::BaseDesignIntf</name> <name>LimeReport::BaseDesignIntf</name>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1384"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1382"/>
<location filename="../limereport/lrbasedesignintf.cpp" line="1812"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1810"/>
<source>Lock item geometry</source> <source>Lock item geometry</source>
<translation>Zablokuj geometrię pozycji</translation> <translation>Zablokuj geometrię pozycji</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1390"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1388"/>
<source>Copy</source> <source>Copy</source>
<translation>Kopiuj</translation> <translation>Kopiuj</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1392"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1390"/>
<source>Cut</source> <source>Cut</source>
<translation>Wytnij</translation> <translation>Wytnij</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1394"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1392"/>
<source>Paste</source> <source>Paste</source>
<translation>Wklej</translation> <translation>Wklej</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1404"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1402"/>
<source>Bring to top</source> <source>Bring to top</source>
<translation>Przenieś na górę</translation> <translation>Przenieś na górę</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1405"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1403"/>
<source>Send to back</source> <source>Send to back</source>
<translation>Przenieś na dół</translation> <translation>Przenieś na dół</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1408"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1406"/>
<source>Create Horizontal Layout</source> <source>Create Horizontal Layout</source>
<translation>Utwórz układ poziomy</translation> <translation>Utwórz układ poziomy</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1412"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1410"/>
<source>Create Vertical Layout</source> <source>Create Vertical Layout</source>
<translation>Utwórz układ pionowy</translation> <translation>Utwórz układ pionowy</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1415"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1413"/>
<source>No borders</source> <source>No borders</source>
<translation>Bez obramowania</translation> <translation>Bez obramowania</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1416"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1414"/>
<source>All borders</source> <source>All borders</source>
<translation>Pełne obramowanie</translation> <translation>Pełne obramowanie</translation>
</message> </message>