mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-24 00:33:02 +03:00
Code

border width has been improved

Browse Source
This commit is contained in:
yanis60 2022-04-27 21:44:32 +01:00
parent b58ac7c53d
commit cb66b1fd2a
4 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
designer/main.cpp
View File

@ -11,9 +11,9 @@ int main(int argc, char *argv[])
QTranslator limeReportTranslator; QTranslator limeReportTranslator;
QTranslator qtBaseTranslator; QTranslator qtBaseTranslator;
QTranslator qtDesignerTranslator; QTranslator qtDesignerTranslator;
QTranslator qtLinguistTranslator; QTranslator qtLinguistTranslator;
QString translationPath = QApplication::applicationDirPath(); QString translationPath = QApplication::applicationDirPath();
translationPath.append("/translations"); translationPath.append("/translations");
Qt::LayoutDirection layoutDirection = QLocale::system().textDirection(); Qt::LayoutDirection layoutDirection = QLocale::system().textDirection();
@ -22,12 +22,12 @@ int main(int argc, char *argv[])
if (limeReportTranslator.load("limereport_"+designerTranslation, translationPath)){ if (limeReportTranslator.load("limereport_"+designerTranslation, translationPath)){
qtBaseTranslator.load("qtbase_" + designerTranslation, translationPath); qtBaseTranslator.load("qtbase_" + designerTranslation, translationPath);
qtDesignerTranslator.load("designer_"+designerTranslation,translationPath); qtDesignerTranslator.load("designer_"+designerTranslation,translationPath);
a.installTranslator(&qtBaseTranslator); a.installTranslator(&qtBaseTranslator);
a.installTranslator(&qtDesignerTranslator); a.installTranslator(&qtDesignerTranslator);
a.installTranslator(&limeReportTranslator); a.installTranslator(&limeReportTranslator);
Qt::LayoutDirection layoutDirection = QLocale(manager.getCurrentDefaultLanguage()).textDirection(); Qt::LayoutDirection layoutDirection = QLocale(manager.getCurrentDefaultLanguage()).textDirection();
a.setLayoutDirection(layoutDirection); a.setLayoutDirection(layoutDirection);
} }

5
limereport/lrbasedesignintf.cpp
View File

@ -426,6 +426,7 @@ void BaseDesignIntf::paint(QPainter *ppainter, const QStyleOptionGraphicsItem *o
Q_UNUSED(option); Q_UNUSED(option);
Q_UNUSED(widget); Q_UNUSED(widget);
ppainter->save(); ppainter->save();
ppainter->setRenderHint(QPainter::HighQualityAntialiasing);
setupPainter(ppainter); setupPainter(ppainter);
drawBorder(ppainter, rect()); drawBorder(ppainter, rect());
// if (m_joinMarkerOn) { drawMarker(ppainter, Const::JOIN_COLOR);} // if (m_joinMarkerOn) { drawMarker(ppainter, Const::JOIN_COLOR);}
@ -1171,11 +1172,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);
pen.setWidthF(m_borderLineSize * 1.33333333); pen.setWidthF(m_borderLineSize*1.333);
} else { } else {
pen.setColor(Qt::darkGray); pen.setColor(Qt::darkGray);
pen.setStyle(Qt::SolidLine); pen.setStyle(Qt::SolidLine);
pen.setWidthF(1); pen.setWidth(1);
} }
return pen; return pen;
} }

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="1382"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1383"/>
<location filename="../limereport/lrbasedesignintf.cpp" line="1810"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1811"/>
<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="1388"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1389"/>
<source>Copy</source> <source>Copy</source>
<translation>Copier</translation> <translation>Copier</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1390"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1391"/>
<source>Cut</source> <source>Cut</source>
<translation>Couper</translation> <translation>Couper</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1392"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1393"/>
<source>Paste</source> <source>Paste</source>
<translation>Coller</translation> <translation>Coller</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1402"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1403"/>
<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="1403"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1404"/>
<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="1406"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1407"/>
<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="1410"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1411"/>
<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="1413"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1414"/>
<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="1414"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1415"/>
<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="1382"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1383"/>
<location filename="../limereport/lrbasedesignintf.cpp" line="1810"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1811"/>
<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="1388"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1389"/>
<source>Copy</source> <source>Copy</source>
<translation>Kopiuj</translation> <translation>Kopiuj</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1390"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1391"/>
<source>Cut</source> <source>Cut</source>
<translation>Wytnij</translation> <translation>Wytnij</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1392"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1393"/>
<source>Paste</source> <source>Paste</source>
<translation>Wklej</translation> <translation>Wklej</translation>
</message> </message>
<message> <message>
<location filename="../limereport/lrbasedesignintf.cpp" line="1402"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1403"/>
<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="1403"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1404"/>
<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="1406"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1407"/>
<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="1410"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1411"/>
<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="1413"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1414"/>
<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="1414"/> <location filename="../limereport/lrbasedesignintf.cpp" line="1415"/>
<source>All borders</source> <source>All borders</source>
<translation>Pełne obramowanie</translation> <translation>Pełne obramowanie</translation>
</message> </message>