aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix multi line string literals.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2023-10-09 12:45:34 +03:00
parent 55cf9bbad6
commit d913a3bd0d
29 changed files with 123 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/puzzle/vptilefactory.cpp
View File

@ -613,10 +613,10 @@ void VPTileFactory::DrawTextInformation(QPainter *painter, int row, int col, int
QStringLiteral("%1,%2,%3").arg(tileColor->red()).arg(tileColor->green()).arg(tileColor->blue()); QStringLiteral("%1,%2,%3").arg(tileColor->red()).arg(tileColor->green()).arg(tileColor->blue());
td.setHtml(u"<table width='100%' style='color:rgb(%1);'>" td.setHtml(u"<table width='100%' style='color:rgb(%1);'>"
"<tr>" u"<tr>"
"<td align='center'>%2</td>" u"<td align='center'>%2</td>"
"</tr>" u"</tr>"
"</table>"_s.arg(tileColorStr, grid)); u"</table>"_s.arg(tileColorStr, grid));
painter->setPen(PenTileInfos()); painter->setPen(PenTileInfos());
painter->save(); painter->save();
painter->translate(QPointF(UnitConvertor(1, Unit::Cm, Unit::Px), m_drawingAreaHeight - tileStripeWidth / 1.3)); painter->translate(QPointF(UnitConvertor(1, Unit::Cm, Unit::Px), m_drawingAreaHeight - tileStripeWidth / 1.3));

6
src/app/tape/dialogs/dialogmdatabase.cpp
View File

@ -519,9 +519,9 @@ auto DialogMDataBase::ItemFullDescription(QTreeWidgetItem *item, bool showImage)
} }
const QString text = u"<p align=\"center\" style=\"font-variant: normal; font-style: normal; font-weight: " const QString text = u"<p align=\"center\" style=\"font-variant: normal; font-style: normal; font-weight: "
"normal\"> %1 <br clear=\"left\"><b>%2</b>. <i>%3</i></p>" u"normal\"> %1 <br clear=\"left\"><b>%2</b>. <i>%3</i></p>"
"<p align=\"left\" style=\"font-variant: normal; font-style: normal; font-weight: " u"<p align=\"left\" style=\"font-variant: normal; font-style: normal; font-weight: "
"normal\">%4</p>"_s.arg(imgTag, number, VAbstractApplication::VApp()->TrVars()->GuiText(name), u"normal\">%4</p>"_s.arg(imgTag, number, VAbstractApplication::VApp()->TrVars()->GuiText(name),
VAbstractApplication::VApp()->TrVars()->Description(name)); VAbstractApplication::VApp()->TrVars()->Description(name));
return text; return text;

2
src/app/tape/tmainwindow.cpp
View File

@ -1976,7 +1976,7 @@ void TMainWindow::ShowMDiagram(const QString &name)
else else
{ {
ui->labelDiagram->setText(u"<html><head/><body><p align=\"center\">%1</p>" ui->labelDiagram->setText(u"<html><head/><body><p align=\"center\">%1</p>"
"<p align=\"center\"><b>%2</b>. <i>%3</i></p></body></html>"_s.arg( u"<p align=\"center\"><b>%2</b>. <i>%3</i></p></body></html>"_s.arg(
DialogMDataBase::ImgTag(number), number, trv->GuiText(name))); DialogMDataBase::ImgTag(number), number, trv->GuiText(name)));
} }
} }

8
src/libs/vlayout/vposter.cpp
View File

@ -257,10 +257,10 @@ auto VPoster::Borders(QGraphicsItem *parent, const PosterData &img, vsizetype sh
} }
labels->setHtml(u"<table width='100%'>" labels->setHtml(u"<table width='100%'>"
"<tr>" u"<tr>"
"<td>%1</td><td align='center'>%2</td><td align='right'>%3</td>" u"<td>%1</td><td align='center'>%2</td><td align='right'>%3</td>"
"</tr>" u"</tr>"
"</table>"_s.arg(grid, page, sheet)); u"</table>"_s.arg(grid, page, sheet));
data.append(labels); data.append(labels);

8
src/libs/vtools/tools/drawTools/operation/vabstractoperation.cpp
View File

@ -946,10 +946,10 @@ auto VAbstractOperation::ComplexCurveToolTip(quint32 itemId) const -> QString
const QSharedPointer<VAbstractCurve> curve = VAbstractTool::data.GeometricObject<VAbstractCurve>(itemId); const QSharedPointer<VAbstractCurve> curve = VAbstractTool::data.GeometricObject<VAbstractCurve>(itemId);
const QString toolTip = u"<table>" const QString toolTip = u"<table>"
"<tr> <td><b>%1:</b> %2</td> </tr>" u"<tr> <td><b>%1:</b> %2</td> </tr>"
"<tr> <td><b>%3:</b> %4 %5</td> </tr>" u"<tr> <td><b>%3:</b> %4 %5</td> </tr>"
"%6" u"%6"
"</table>"_s.arg(tr("Label"), curve->ObjectName(), tr("Length")) u"</table>"_s.arg(tr("Label"), curve->ObjectName(), tr("Length"))
.arg(VAbstractValApplication::VApp()->fromPixel(curve->GetLength())) .arg(VAbstractValApplication::VApp()->fromPixel(curve->GetLength()))
.arg(UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true), MakeToolTip()); .arg(UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true), MakeToolTip());
return toolTip; return toolTip;

6
src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp
View File

@ -188,9 +188,9 @@ auto VAbstractSpline::MakeToolTip() const -> QString
const QString toolTip = const QString toolTip =
u"<table>" u"<table>"
"<tr> <td><b>%4:</b> %5</td> </tr>" u"<tr> <td><b>%4:</b> %5</td> </tr>"
"<tr> <td><b>%1:</b> %2 %3</td> </tr>" u"<tr> <td><b>%1:</b> %2 %3</td> </tr>"
"</table>"_s.arg(tr("Length")) u"</table>"_s.arg(tr("Length"))
.arg(VAbstractValApplication::VApp()->fromPixel(curve->GetLength())) .arg(VAbstractValApplication::VApp()->fromPixel(curve->GetLength()))
.arg(UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true), tr("Label"), curve->ObjectName()); .arg(UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true), tr("Label"), curve->ObjectName());
return toolTip; return toolTip;

12
src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp
View File

@ -392,12 +392,12 @@ auto VToolArc::MakeToolTip() const -> QString
const QSharedPointer<VArc> arc = VAbstractTool::data.GeometricObject<VArc>(m_id); const QSharedPointer<VArc> arc = VAbstractTool::data.GeometricObject<VArc>(m_id);
const QString toolTip = u"<table>" const QString toolTip = u"<table>"
"<tr> <td><b>%10:</b> %11</td> </tr>" u"<tr> <td><b>%10:</b> %11</td> </tr>"
"<tr> <td><b>%1:</b> %2 %3</td> </tr>" u"<tr> <td><b>%1:</b> %2 %3</td> </tr>"
"<tr> <td><b>%4:</b> %5 %3</td> </tr>" u"<tr> <td><b>%4:</b> %5 %3</td> </tr>"
"<tr> <td><b>%6:</b> %7°</td> </tr>" u"<tr> <td><b>%6:</b> %7°</td> </tr>"
"<tr> <td><b>%8:</b> %9°</td> </tr>" u"<tr> <td><b>%8:</b> %9°</td> </tr>"
"</table>"_s.arg(tr("Length")) u"</table>"_s.arg(tr("Length"))
.arg(VAbstractValApplication::VApp()->fromPixel(arc->GetLength())) .arg(VAbstractValApplication::VApp()->fromPixel(arc->GetLength()))
.arg(UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true), tr("Radius")) .arg(UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true), tr("Radius"))
.arg(VAbstractValApplication::VApp()->fromPixel(arc->GetRadius())) .arg(VAbstractValApplication::VApp()->fromPixel(arc->GetRadius()))

12
src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp
View File

@ -372,12 +372,12 @@ auto VToolArcWithLength::MakeToolTip() const -> QString
const QSharedPointer<VArc> arc = VAbstractTool::data.GeometricObject<VArc>(m_id); const QSharedPointer<VArc> arc = VAbstractTool::data.GeometricObject<VArc>(m_id);
const QString toolTip = u"<table>" const QString toolTip = u"<table>"
"<tr> <td><b>%10:</b> %11</td> </tr>" u"<tr> <td><b>%10:</b> %11</td> </tr>"
"<tr> <td><b>%1:</b> %2 %3</td> </tr>" u"<tr> <td><b>%1:</b> %2 %3</td> </tr>"
"<tr> <td><b>%4:</b> %5 %3</td> </tr>" u"<tr> <td><b>%4:</b> %5 %3</td> </tr>"
"<tr> <td><b>%6:</b> %7°</td> </tr>" u"<tr> <td><b>%6:</b> %7°</td> </tr>"
"<tr> <td><b>%8:</b> %9°</td> </tr>" u"<tr> <td><b>%8:</b> %9°</td> </tr>"
"</table>"_s.arg(tr("Length")) u"</table>"_s.arg(tr("Length"))
.arg(VAbstractValApplication::VApp()->fromPixel(arc->GetLength())) .arg(VAbstractValApplication::VApp()->fromPixel(arc->GetLength()))
.arg(UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true), tr("Radius")) .arg(UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true), tr("Radius"))
.arg(VAbstractValApplication::VApp()->fromPixel(arc->GetRadius())) .arg(VAbstractValApplication::VApp()->fromPixel(arc->GetRadius()))

16
src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp
View File

@ -463,14 +463,14 @@ auto VToolEllipticalArc::MakeToolTip() const -> QString
const QSharedPointer<VEllipticalArc> elArc = VAbstractTool::data.GeometricObject<VEllipticalArc>(m_id); const QSharedPointer<VEllipticalArc> elArc = VAbstractTool::data.GeometricObject<VEllipticalArc>(m_id);
const QString toolTip = u"<table>" const QString toolTip = u"<table>"
"<tr> <td><b>%12:</b> %13</td> </tr>" u"<tr> <td><b>%12:</b> %13</td> </tr>"
"<tr> <td><b>%1:</b> %2 %3</td> </tr>" u"<tr> <td><b>%1:</b> %2 %3</td> </tr>"
"<tr> <td><b>%4:</b> %5 %3</td> </tr>" u"<tr> <td><b>%4:</b> %5 %3</td> </tr>"
"<tr> <td><b>%6:</b> %7 %3</td> </tr>" u"<tr> <td><b>%6:</b> %7 %3</td> </tr>"
"<tr> <td><b>%8:</b> %9°</td> </tr>" u"<tr> <td><b>%8:</b> %9°</td> </tr>"
"<tr> <td><b>%10:</b> %11°</td> </tr>" u"<tr> <td><b>%10:</b> %11°</td> </tr>"
"<tr> <td><b>%14:</b> %15°</td> </tr>" u"<tr> <td><b>%14:</b> %15°</td> </tr>"
"</table>"_s u"</table>"_s
.arg(tr("Length")) // 1 .arg(tr("Length")) // 1
.arg(VAbstractValApplication::VApp()->fromPixel(elArc->GetLength())) // 2 .arg(VAbstractValApplication::VApp()->fromPixel(elArc->GetLength())) // 2
.arg(UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true), // 3 .arg(UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true), // 3

6
src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.cpp
View File

@ -452,8 +452,8 @@ auto VToolDoublePoint::ComplexToolTip(quint32 itemId) const -> QString
const QSharedPointer<VPointF> point = VAbstractTool::data.GeometricObject<VPointF>(itemId); const QSharedPointer<VPointF> point = VAbstractTool::data.GeometricObject<VPointF>(itemId);
const QString toolTip = u"<table>" const QString toolTip = u"<table>"
"<tr> <td><b>%1:</b> %2</td> </tr>" u"<tr> <td><b>%1:</b> %2</td> </tr>"
"%3" u"%3"
"</table>"_s.arg(tr("Label"), point->name(), MakeToolTip()); u"</table>"_s.arg(tr("Label"), point->name(), MakeToolTip());
return toolTip; return toolTip;
} }

8
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp
View File

@ -316,10 +316,10 @@ auto VToolCutArc::MakeToolTip() const -> QString
{ {
toolTip += toolTip +=
u"<tr> <td><b>%10:</b> %11</td> </tr>" u"<tr> <td><b>%10:</b> %11</td> </tr>"
"<tr> <td><b>%1:</b> %2 %3</td> </tr>" u"<tr> <td><b>%1:</b> %2 %3</td> </tr>"
"<tr> <td><b>%4:</b> %5 %3</td> </tr>" u"<tr> <td><b>%4:</b> %5 %3</td> </tr>"
"<tr> <td><b>%6:</b> %7°</td> </tr>" u"<tr> <td><b>%6:</b> %7°</td> </tr>"
"<tr> <td><b>%8:</b> %9°</td> </tr>"_s.arg(arcStr + arcNumber + QChar(QChar::Space) + lengthStr) u"<tr> <td><b>%8:</b> %9°</td> </tr>"_s.arg(arcStr + arcNumber + QChar(QChar::Space) + lengthStr)
.arg(VAbstractValApplication::VApp()->fromPixel(arc.GetLength())) .arg(VAbstractValApplication::VApp()->fromPixel(arc.GetLength()))
.arg(UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true), .arg(UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true),
arcStr + arcNumber + QChar(QChar::Space) + radiusStr) arcStr + arcNumber + QChar(QChar::Space) + radiusStr)

10
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp
View File

@ -310,11 +310,11 @@ auto VToolCutSpline::MakeToolTip() const -> QString
const QString toolTip = const QString toolTip =
u"<table>" u"<table>"
"<tr> <td><b>%6:</b> %7</td> </tr>" u"<tr> <td><b>%6:</b> %7</td> </tr>"
"<tr> <td><b>%1:</b> %2 %3</td> </tr>" u"<tr> <td><b>%1:</b> %2 %3</td> </tr>"
"<tr> <td><b>%8:</b> %9</td> </tr>" u"<tr> <td><b>%8:</b> %9</td> </tr>"
"<tr> <td><b>%4:</b> %5 %3</td> </tr>" u"<tr> <td><b>%4:</b> %5 %3</td> </tr>"
"</table>"_s.arg(curveStr + QStringLiteral("1 ") + lengthStr) u"</table>"_s.arg(curveStr + QStringLiteral("1 ") + lengthStr)
.arg(VAbstractValApplication::VApp()->fromPixel(spline1.GetLength())) .arg(VAbstractValApplication::VApp()->fromPixel(spline1.GetLength()))
.arg(UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true), .arg(UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true),
curveStr + QStringLiteral("2 ") + lengthStr) curveStr + QStringLiteral("2 ") + lengthStr)

10
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp
View File

@ -401,11 +401,11 @@ auto VToolCutSplinePath::MakeToolTip() const -> QString
const QString toolTip = const QString toolTip =
u"<table>" u"<table>"
"<tr> <td><b>%6:</b> %7</td> </tr>" u"<tr> <td><b>%6:</b> %7</td> </tr>"
"<tr> <td><b>%1:</b> %2 %3</td> </tr>" u"<tr> <td><b>%1:</b> %2 %3</td> </tr>"
"<tr> <td><b>%8:</b> %9</td> </tr>" u"<tr> <td><b>%8:</b> %9</td> </tr>"
"<tr> <td><b>%4:</b> %5 %3</td> </tr>" u"<tr> <td><b>%4:</b> %5 %3</td> </tr>"
"</table>"_s.arg(curveStr + "1 "_L1 + lengthStr) u"</table>"_s.arg(curveStr + "1 "_L1 + lengthStr)
.arg(VAbstractValApplication::VApp()->fromPixel(splPath1->GetLength())) .arg(VAbstractValApplication::VApp()->fromPixel(splPath1->GetLength()))
.arg(UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true), curveStr + "2 "_L1 + lengthStr) .arg(UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true), curveStr + "2 "_L1 + lengthStr)
.arg(VAbstractValApplication::VApp()->fromPixel(splPath2->GetLength())) .arg(VAbstractValApplication::VApp()->fromPixel(splPath2->GetLength()))

12
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp
View File

@ -165,12 +165,12 @@ auto VToolAlongLine::MakeToolTip() const -> QString
const QLineF curToSecond(static_cast<QPointF>(*current), static_cast<QPointF>(*secondPoint)); const QLineF curToSecond(static_cast<QPointF>(*current), static_cast<QPointF>(*secondPoint));
const QString toolTip = u"<table>" const QString toolTip = u"<table>"
"<tr> <td><b>%9:</b> %10</td> </tr>" u"<tr> <td><b>%9:</b> %10</td> </tr>"
"<tr> <td><b>%1:</b> %2 %3</td> </tr>" u"<tr> <td><b>%1:</b> %2 %3</td> </tr>"
"<tr> <td><b>%4:</b> %5°</td> </tr>" u"<tr> <td><b>%4:</b> %5°</td> </tr>"
"<tr> <td><b>%6:</b> %2 %3</td> </tr>" u"<tr> <td><b>%6:</b> %2 %3</td> </tr>"
"<tr> <td><b>%7:</b> %8 %3</td> </tr>" u"<tr> <td><b>%7:</b> %8 %3</td> </tr>"
"</table>"_s.arg(tr("Length")) u"</table>"_s.arg(tr("Length"))
.arg(VAbstractValApplication::VApp()->fromPixel(curLine.length())) .arg(VAbstractValApplication::VApp()->fromPixel(curLine.length()))
.arg(UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true), tr("Angle")) .arg(UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true), tr("Angle"))
.arg(curLine.angle()) .arg(curLine.angle())

12
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp
View File

@ -344,12 +344,12 @@ auto VToolCurveIntersectAxis::MakeToolTip() const -> QString
const QString toolTip = const QString toolTip =
u"<table>" u"<table>"
"<tr> <td><b>%6:</b> %7</td> </tr>" u"<tr> <td><b>%6:</b> %7</td> </tr>"
"<tr> <td><b>%1:</b> %2 %3</td> </tr>" u"<tr> <td><b>%1:</b> %2 %3</td> </tr>"
"<tr> <td><b>%4:</b> %5°</td> </tr>" u"<tr> <td><b>%4:</b> %5°</td> </tr>"
"<tr> <td><b>%8:</b> %9</td> </tr>" u"<tr> <td><b>%8:</b> %9</td> </tr>"
"<tr> <td><b>%10:</b> %11</td> </tr>" u"<tr> <td><b>%10:</b> %11</td> </tr>"
"</table>"_s u"</table>"_s
.arg(tr("Length")) // 1 .arg(tr("Length")) // 1
.arg(VAbstractValApplication::VApp()->fromPixel(line.length())) // 2 .arg(VAbstractValApplication::VApp()->fromPixel(line.length())) // 2
.arg(UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true), tr("Angle")) // 3, 4 .arg(UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true), tr("Angle")) // 3, 4

12
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp
View File

@ -284,12 +284,12 @@ auto VToolHeight::MakeToolTip() const -> QString
const QLineF p2ToCur(static_cast<QPointF>(*p2Line), static_cast<QPointF>(*current)); const QLineF p2ToCur(static_cast<QPointF>(*p2Line), static_cast<QPointF>(*current));
const QString toolTip = u"<table>" const QString toolTip = u"<table>"
"<tr> <td><b>%10:</b> %11</td> </tr>" u"<tr> <td><b>%10:</b> %11</td> </tr>"
"<tr> <td><b>%1:</b> %2 %3</td> </tr>" u"<tr> <td><b>%1:</b> %2 %3</td> </tr>"
"<tr> <td><b>%4:</b> %5°</td> </tr>" u"<tr> <td><b>%4:</b> %5°</td> </tr>"
"<tr> <td><b>%6:</b> %7 %3</td> </tr>" u"<tr> <td><b>%6:</b> %7 %3</td> </tr>"
"<tr> <td><b>%8:</b> %9 %3</td> </tr>" u"<tr> <td><b>%8:</b> %9 %3</td> </tr>"
"</table>"_s.arg(tr("Length")) u"</table>"_s.arg(tr("Length"))
.arg(VAbstractValApplication::VApp()->fromPixel(curLine.length())) .arg(VAbstractValApplication::VApp()->fromPixel(curLine.length()))
.arg(UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true), tr("Angle")) .arg(UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true), tr("Angle"))
.arg(curLine.angle()) .arg(curLine.angle())

12
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp
View File

@ -343,12 +343,12 @@ auto VToolLineIntersectAxis::MakeToolTip() const -> QString
const QLineF curToSecond(static_cast<QPointF>(*current), static_cast<QPointF>(*secondPoint)); const QLineF curToSecond(static_cast<QPointF>(*current), static_cast<QPointF>(*secondPoint));
const QString toolTip = u"<table>" const QString toolTip = u"<table>"
"<tr> <td><b>%10:</b> %11</td> </tr>" u"<tr> <td><b>%10:</b> %11</td> </tr>"
"<tr> <td><b>%1:</b> %2 %3</td> </tr>" u"<tr> <td><b>%1:</b> %2 %3</td> </tr>"
"<tr> <td><b>%4:</b> %5°</td> </tr>" u"<tr> <td><b>%4:</b> %5°</td> </tr>"
"<tr> <td><b>%6:</b> %7 %3</td> </tr>" u"<tr> <td><b>%6:</b> %7 %3</td> </tr>"
"<tr> <td><b>%8:</b> %9 %3</td> </tr>" u"<tr> <td><b>%8:</b> %9 %3</td> </tr>"
"</table>"_s.arg(tr("Length")) u"</table>"_s.arg(tr("Length"))
.arg(VAbstractValApplication::VApp()->fromPixel(curLine.length())) .arg(VAbstractValApplication::VApp()->fromPixel(curLine.length()))
.arg(UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true), tr("Angle")) .arg(UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true), tr("Angle"))
.arg(curLine.angle()) .arg(curLine.angle())

8
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp
View File

@ -164,10 +164,10 @@ auto VToolLinePoint::MakeToolTip() const -> QString
const QLineF line(static_cast<QPointF>(*first), static_cast<QPointF>(*second)); const QLineF line(static_cast<QPointF>(*first), static_cast<QPointF>(*second));
const QString toolTip = u"<table>" const QString toolTip = u"<table>"
"<tr> <td><b>%6:</b> %7</td> </tr>" u"<tr> <td><b>%6:</b> %7</td> </tr>"
"<tr> <td><b>%1:</b> %2 %3</td> </tr>" u"<tr> <td><b>%1:</b> %2 %3</td> </tr>"
"<tr> <td><b>%4:</b> %5°</td> </tr>" u"<tr> <td><b>%4:</b> %5°</td> </tr>"
"</table>"_s.arg(tr("Length")) u"</table>"_s.arg(tr("Length"))
.arg(VAbstractValApplication::VApp()->fromPixel(line.length())) .arg(VAbstractValApplication::VApp()->fromPixel(line.length()))
.arg(UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true), tr("Angle")) .arg(UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true), tr("Angle"))
.arg(line.angle()) .arg(line.angle())

10
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp
View File

@ -345,11 +345,11 @@ auto VToolShoulderPoint::MakeToolTip() const -> QString
const QLineF secondToCur(static_cast<QPointF>(*second), static_cast<QPointF>(*current)); const QLineF secondToCur(static_cast<QPointF>(*second), static_cast<QPointF>(*current));
const QString toolTip = u"<table>" const QString toolTip = u"<table>"
"<tr> <td><b>%8:</b> %9</td> </tr>" u"<tr> <td><b>%8:</b> %9</td> </tr>"
"<tr> <td><b>%1:</b> %2 %3</td> </tr>" u"<tr> <td><b>%1:</b> %2 %3</td> </tr>"
"<tr> <td><b>%4:</b> %5°</td> </tr>" u"<tr> <td><b>%4:</b> %5°</td> </tr>"
"<tr> <td><b>%6:</b> %7 %3</td> </tr>" u"<tr> <td><b>%6:</b> %7 %3</td> </tr>"
"</table>"_s.arg(tr("Length")) u"</table>"_s.arg(tr("Length"))
.arg(VAbstractValApplication::VApp()->fromPixel(firstToCur.length())) .arg(VAbstractValApplication::VApp()->fromPixel(firstToCur.length()))
.arg(UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true), tr("Angle")) .arg(UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true), tr("Angle"))
.arg(firstToCur.angle()) .arg(firstToCur.angle())

4
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp
View File

@ -338,8 +338,8 @@ auto VToolBasePoint::MakeToolTip() const -> QString
const QSharedPointer<VPointF> point = VAbstractTool::data.GeometricObject<VPointF>(m_id); const QSharedPointer<VPointF> point = VAbstractTool::data.GeometricObject<VPointF>(m_id);
const QString toolTip = u"<table>" const QString toolTip = u"<table>"
"<tr> <td><b>%1:</b> %2</td> </tr>" u"<tr> <td><b>%1:</b> %2</td> </tr>"
"</table>"_s.arg(tr("Label"), point->name()); u"</table>"_s.arg(tr("Label"), point->name());
return toolTip; return toolTip;
} }

12
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp
View File

@ -321,12 +321,12 @@ auto VToolLineIntersect::MakeToolTip() const -> QString
const QLineF curToP2L2(static_cast<QPointF>(*current), static_cast<QPointF>(*p2L2)); const QLineF curToP2L2(static_cast<QPointF>(*current), static_cast<QPointF>(*p2L2));
const QString toolTip = u"<table>" const QString toolTip = u"<table>"
"<tr> <td><b>%10:</b> %11</td> </tr>" u"<tr> <td><b>%10:</b> %11</td> </tr>"
"<tr> <td><b>%1:</b> %2 %3</td> </tr>" u"<tr> <td><b>%1:</b> %2 %3</td> </tr>"
"<tr> <td><b>%4:</b> %5 %3</td> </tr>" u"<tr> <td><b>%4:</b> %5 %3</td> </tr>"
"<tr> <td><b>%6:</b> %7 %3</td> </tr>" u"<tr> <td><b>%6:</b> %7 %3</td> </tr>"
"<tr> <td><b>%8:</b> %9 %3</td> </tr>" u"<tr> <td><b>%8:</b> %9 %3</td> </tr>"
"</table>"_s.arg(u"%1->%2"_s.arg(p1L1->name(), current->name())) u"</table>"_s.arg(u"%1->%2"_s.arg(p1L1->name(), current->name()))
.arg(VAbstractValApplication::VApp()->fromPixel(p1L1ToCur.length())) .arg(VAbstractValApplication::VApp()->fromPixel(p1L1ToCur.length()))
.arg(UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true), .arg(UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true),
u"%1->%2"_s.arg(current->name(), p2L1->name())) u"%1->%2"_s.arg(current->name(), p2L1->name()))

12
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp
View File

@ -375,12 +375,12 @@ auto VToolPointOfContact::MakeToolTip() const -> QString
const QLineF centerToCur(static_cast<QPointF>(*centerP), static_cast<QPointF>(*current)); const QLineF centerToCur(static_cast<QPointF>(*centerP), static_cast<QPointF>(*current));
const QString toolTip = u"<table>" const QString toolTip = u"<table>"
"<tr> <td><b>%10:</b> %11</td> </tr>" u"<tr> <td><b>%10:</b> %11</td> </tr>"
"<tr> <td><b>%1:</b> %2 %3</td> </tr>" u"<tr> <td><b>%1:</b> %2 %3</td> </tr>"
"<tr> <td><b>%4:</b> %5 %3</td> </tr>" u"<tr> <td><b>%4:</b> %5 %3</td> </tr>"
"<tr> <td><b>%6:</b> %7 %3</td> </tr>" u"<tr> <td><b>%6:</b> %7 %3</td> </tr>"
"<tr> <td><b>%8:</b> %9°</td> </tr>" u"<tr> <td><b>%8:</b> %9°</td> </tr>"
"</table>"_s.arg(u"%1->%2"_s.arg(p1->name(), current->name())) u"</table>"_s.arg(u"%1->%2"_s.arg(p1->name(), current->name()))
.arg(VAbstractValApplication::VApp()->fromPixel(p1ToCur.length())) .arg(VAbstractValApplication::VApp()->fromPixel(p1ToCur.length()))
.arg(UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true), .arg(UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true),
u"%1->%2"_s.arg(p2->name(), current->name())) u"%1->%2"_s.arg(p2->name(), current->name()))

12
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp
View File

@ -487,12 +487,12 @@ auto VToolPointOfIntersectionCurves::MakeToolTip() const -> QString
const QSharedPointer<VPointF> p = VAbstractTool::data.GeometricObject<VPointF>(m_id); const QSharedPointer<VPointF> p = VAbstractTool::data.GeometricObject<VPointF>(m_id);
const QString toolTip = u"<table>" const QString toolTip = u"<table>"
"<tr> <td><b>%1:</b> %2</td> </tr>" u"<tr> <td><b>%1:</b> %2</td> </tr>"
"<tr> <td><b>%3:</b> %4</td> </tr>" u"<tr> <td><b>%3:</b> %4</td> </tr>"
"<tr> <td><b>%5:</b> %6</td> </tr>" u"<tr> <td><b>%5:</b> %6</td> </tr>"
"<tr> <td><b>%7:</b> %8</td> </tr>" u"<tr> <td><b>%7:</b> %8</td> </tr>"
"<tr> <td><b>%9:</b> %10</td> </tr>" u"<tr> <td><b>%9:</b> %10</td> </tr>"
"</table>"_s u"</table>"_s
.arg(tr("Label"), p->name(), /* 1, 2 */ .arg(tr("Label"), p->name(), /* 1, 2 */
tr("Curve 1 segment 1"), m_curve1Segments.first, /* 3, 4 */ tr("Curve 1 segment 1"), m_curve1Segments.first, /* 3, 4 */
tr("Curve 1 segment 2"), m_curve1Segments.second) /* 5, 6 */ tr("Curve 1 segment 2"), m_curve1Segments.second) /* 5, 6 */

6
src/libs/vtools/tools/drawTools/vtoolline.cpp
View File

@ -448,9 +448,9 @@ auto VToolLine::MakeToolTip() const -> QString
const QLineF line(static_cast<QPointF>(*first), static_cast<QPointF>(*second)); const QLineF line(static_cast<QPointF>(*first), static_cast<QPointF>(*second));
const QString toolTip = u"<table>" const QString toolTip = u"<table>"
"<tr> <td><b>%1:</b> %2 %3</td> </tr>" u"<tr> <td><b>%1:</b> %2 %3</td> </tr>"
"<tr> <td><b>%4:</b> %5°</td> </tr>" u"<tr> <td><b>%4:</b> %5°</td> </tr>"
"</table>"_s.arg(tr("Length")) u"</table>"_s.arg(tr("Length"))
.arg(VAbstractValApplication::VApp()->fromPixel(line.length())) .arg(VAbstractValApplication::VApp()->fromPixel(line.length()))
.arg(UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true), tr("Angle")) .arg(UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true), tr("Angle"))
.arg(line.angle()); .arg(line.angle());

2
src/test/TranslationsTest/tst_tslocaletranslation.cpp
View File

@ -250,7 +250,7 @@ void TST_TSLocaleTranslation::TestPunctuation()
if (testFail) if (testFail)
{ {
const QString message = u"Translation string does not end with the same punctuation character '%1' or " const QString message = u"Translation string does not end with the same punctuation character '%1' or "
"vice versa. "_s.arg(cPunctuation) + u"vice versa. "_s.arg(cPunctuation) +
u"Original name:'%1'"_s.arg(source) + u", translated name:'%1'"_s.arg(translation); u"Original name:'%1'"_s.arg(source) + u", translated name:'%1'"_s.arg(translation);
QFAIL(qUtf8Printable(message)); QFAIL(qUtf8Printable(message));
} }

2
src/test/TranslationsTest/tst_tstranslation.cpp
View File

@ -220,7 +220,7 @@ void TST_TSTranslation::CheckInvalidCharacter()
const QString contextName = context.firstChildElement(TagName).text(); const QString contextName = context.firstChildElement(TagName).text();
const QString error = u"String contains invalid character '%1' in context '%2'. It should not be " const QString error = u"String contains invalid character '%1' in context '%2'. It should not be "
"marked for translation."_s.arg(source, contextName); u"marked for translation."_s.arg(source, contextName);
QFAIL(qUtf8Printable(error)); QFAIL(qUtf8Printable(error));
} }
} }

2
src/test/ValentinaTest/tst_varc.cpp
View File

@ -217,7 +217,7 @@ void TST_VArc::TestGetPoints()
const qreal value = qAbs(rLine.length() - radius); const qreal value = qAbs(rLine.length() - radius);
// cppcheck-suppress unreadVariable // cppcheck-suppress unreadVariable
const QString errorMsg = u"Broken the first rule. All points should be on the same distance from " const QString errorMsg = u"Broken the first rule. All points should be on the same distance from "
"the center. Error ='%1'."_s.arg(value); u"the center. Error ='%1'."_s.arg(value);
QVERIFY2(value <= epsRadius, qUtf8Printable(errorMsg)); QVERIFY2(value <= epsRadius, qUtf8Printable(errorMsg));
} }
} }

12
src/test/ValentinaTest/tst_vellipticalarc.cpp
View File

@ -300,7 +300,7 @@ void TST_VEllipticalArc::TestGetPoints1()
const qreal diff = qAbs(equationRes - 1); const qreal diff = qAbs(equationRes - 1);
// cppcheck-suppress unreadVariable // cppcheck-suppress unreadVariable
const QString errorMsg = u"Broken the first rule. Any point must satisfy the equation of ellipse." const QString errorMsg = u"Broken the first rule. Any point must satisfy the equation of ellipse."
"diff = '%1' > eps = '%2'"_s.number(diff) u"diff = '%1' > eps = '%2'"_s.number(diff)
.number(eps); .number(eps);
QVERIFY2(diff <= eps, qUtf8Printable(errorMsg)); QVERIFY2(diff <= eps, qUtf8Printable(errorMsg));
} }
@ -372,9 +372,9 @@ void TST_VEllipticalArc::TestGetPoints2()
const qreal diff = qAbs(resultingDistance - distance); const qreal diff = qAbs(resultingDistance - distance);
// cppcheck-suppress unreadVariable // cppcheck-suppress unreadVariable
const QString errorMsg = u"Broken the first rule, part 2. Distance from the any point to the focus1" const QString errorMsg = u"Broken the first rule, part 2. Distance from the any point to the focus1"
" plus distance from this point to the focus2 should be the same. Problem" u" plus distance from this point to the focus2 should be the same. Problem"
" with point '%1'. The disired distance is '%2', but resulting distance" u" with point '%1'. The disired distance is '%2', but resulting distance"
" is '%3'. Difference is '%4' and it biggest than eps '%5')"_s.number(i) u" is '%3'. Difference is '%4' and it biggest than eps '%5')"_s.number(i)
.number(distance) .number(distance)
.number(resultingDistance) .number(resultingDistance)
.number(diff) .number(diff)
@ -407,7 +407,7 @@ void TST_VEllipticalArc::TestGetPoints3()
const qreal diffSquare = qAbs(ellipseSquare - arcSquare); const qreal diffSquare = qAbs(ellipseSquare - arcSquare);
// cppcheck-suppress unreadVariable // cppcheck-suppress unreadVariable
const QString errorMsg1 = u"Broken the second rule. Interpolation has too big computing error. " const QString errorMsg1 = u"Broken the second rule. Interpolation has too big computing error. "
"Difference ='%1' bigger than eps = '%2'."_s.arg(diffSquare) u"Difference ='%1' bigger than eps = '%2'."_s.arg(diffSquare)
.arg(epsSquare); .arg(epsSquare);
QVERIFY2(diffSquare <= epsSquare, qUtf8Printable(errorMsg1)); QVERIFY2(diffSquare <= epsSquare, qUtf8Printable(errorMsg1));
} }
@ -437,7 +437,7 @@ void TST_VEllipticalArc::TestGetPoints4()
const qreal diffLength = qAbs(arcLength - ellipseLength); const qreal diffLength = qAbs(arcLength - ellipseLength);
// cppcheck-suppress unreadVariable // cppcheck-suppress unreadVariable
const QString errorMsg2 = u"Difference between real and computing lengthes " const QString errorMsg2 = u"Difference between real and computing lengthes "
"(diff = '%1') bigger than eps = '%2'."_s.arg(diffLength) u"(diff = '%1') bigger than eps = '%2'."_s.arg(diffLength)
.arg(epsLength); .arg(epsLength);
QVERIFY2(diffLength <= epsLength, qUtf8Printable(errorMsg2)); QVERIFY2(diffLength <= epsLength, qUtf8Printable(errorMsg2));
} }

2
src/test/ValentinaTest/tst_vtooluniondetails.cpp
View File

@ -169,7 +169,7 @@ void TST_VToolUnionDetails::TestUnitingMainPaths()
// cppcheck-suppress unreadVariable // cppcheck-suppress unreadVariable
const QString msg = u"Index: %1. Got item with id = %2, type = %3; Expected item with id = %4, " const QString msg = u"Index: %1. Got item with id = %2, type = %3; Expected item with id = %4, "
"type = %5."_s.arg(i) u"type = %5."_s.arg(i)
.arg(outP.GetId()) .arg(outP.GetId())
.arg(static_cast<ToolVisHolderType>(outP.GetTypeTool())) .arg(static_cast<ToolVisHolderType>(outP.GetTypeTool()))
.arg(resP.GetId()) .arg(resP.GetId())