0
0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-23 16:22:58 +03:00
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

View File

@ -1170,6 +1170,9 @@ QPen BaseDesignIntf::borderPen(BorderSide side/*, bool selected*/) const
if (m_borderLinesFlags & side) {
pen.setColor(m_borderColor);
pen.setStyle(m_borderStyle);
if(m_borderLineSize == 0)
pen.setStyle(Qt::NoPen);
pen.setWidth(m_borderLineSize+1);
} else {
pen.setColor(Qt::darkGray);
@ -1741,6 +1744,7 @@ void Marker::paint(QPainter* painter, const QStyleOptionGraphicsItem*, QWidget*)
painter->drawRect(rect());
painter->setBrush(color());
painter->setPen(Qt::transparent);
painter->setRenderHint(QPainter::HighQualityAntialiasing);
painter->setOpacity(1);
painter->drawRect(QRectF(-markerSize,-markerSize,markerSize*2,markerSize*2));
painter->drawRect(QRectF(rect().right()-markerSize,rect().bottom()-markerSize,markerSize*2,markerSize*2));

View File

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

View File

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