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

01/04

Browse Source
This commit is contained in:
yanis60 2022-04-01 12:49:50 +00:00
parent 392b3acdfa
commit 7f879ab4c1
3 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
limereport/lrbasedesignintf.cpp
View File

@ -1170,6 +1170,9 @@ 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.setStyle(Qt::NoPen);
pen.setWidth(m_borderLineSize+1); pen.setWidth(m_borderLineSize+1);
} else { } else {
pen.setColor(Qt::darkGray); pen.setColor(Qt::darkGray);
@ -1741,6 +1744,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="1381"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1384"/>
<location filename="../limereport/lrbasedesignintf.cpp" line="1808"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1812"/>
<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="1387"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1390"/>
<source>Copy</source> <source>Copy</source>
<translation>Copier</translation> <translation>Copier</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1389"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1392"/>
<source>Cut</source> <source>Cut</source>
<translation>Couper</translation> <translation>Couper</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1391"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1394"/>
<source>Paste</source> <source>Paste</source>
<translation>Coller</translation> <translation>Coller</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1401"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1404"/>
<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="1402"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1405"/>
<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="1405"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1408"/>
<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="1409"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1412"/>
<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="1412"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1415"/>
<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="1413"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1416"/>
<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="1381"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1384"/>
<location filename="../limereport/lrbasedesignintf.cpp" line="1808"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1812"/>
<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="1387"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1390"/>
<source>Copy</source> <source>Copy</source>
<translation>Kopiuj</translation> <translation>Kopiuj</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1389"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1392"/>
<source>Cut</source> <source>Cut</source>
<translation>Wytnij</translation> <translation>Wytnij</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1391"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1394"/>
<source>Paste</source> <source>Paste</source>
<translation>Wklej</translation> <translation>Wklej</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1401"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1404"/>
<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="1402"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1405"/>
<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="1405"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1408"/>
<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="1409"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1412"/>
<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="1412"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1415"/>
<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="1413"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1416"/>
<source>All borders</source> <source>All borders</source>
<translation>Pełne obramowanie</translation> <translation>Pełne obramowanie</translation>
</message> </message>