Compare commits

...

2 Commits

Author SHA1 Message Date
Roman Telezhynskyi 4b19565d4e Lupdate. 2024-02-14 09:38:00 +02:00
Roman Telezhynskyi 2bbd678c8d Fix missing dependencies. 2024-02-13 22:04:13 +02:00
28 changed files with 12372 additions and 12108 deletions

View File

@ -23,7 +23,7 @@ Module {
property bool update: false
// Build with legacy way though .pro file
property bool buildWithPro: true
property bool buildWithPro: false
property string lupdateName: "lupdate"
@ -135,9 +135,13 @@ Module {
// It seems all we need are projectFile, sources and translations options.
var sources = [];
var includePaths = [];
if (inputs["i18n.hpp"] !== undefined)
for (var i = 0; i < inputs["i18n.hpp"].length; i++)
for (var i = 0; i < inputs["i18n.hpp"].length; i++) {
sources.push(inputs["i18n.hpp"][i].filePath);
if (!includePaths.includes(FileInfo.path(inputs["i18n.hpp"][i].filePath)))
includePaths.push(FileInfo.path(inputs["i18n.hpp"][i].filePath));
}
if (inputs["i18n.src"] !== undefined)
for (var i = 0; i < inputs["i18n.src"].length; i++)
@ -166,6 +170,7 @@ Module {
var project = {
projectFile: "", // Looks like can be empty
includePaths: includePaths.sort(),
sources: sources.sort(),
translations: translations.sort()
};

View File

@ -19,10 +19,12 @@ wait
cp -r ./share/translations/* ../share/translations
rm -r ./share
QMAKEPATH=$HOME/Qt6.6/6.6.0/gcc_64/bin/qmake
# Resolve any changes to config
qbs resolve -d ../../build_translations modules.i18n.update:true moduleProviders.Qt.qmakeFilePaths:$HOME/Qt6.5/6.5.0/gcc_64/bin/qmake
qbs resolve -d ../../build_translations -f ../valentina.qbs modules.i18n.update:true moduleProviders.Qt.qmakeFilePaths:${QMAKEPATH}
# Update local strings
qbs -d ../../build_translations -f ../valentina.qbs -p 'Translations' modules.i18n.update:true moduleProviders.Qt.qmakeFilePaths:$HOME/Qt6.6/6.6.0/gcc_64/bin/qmake
qbs -d ../../build_translations -f ../valentina.qbs -p 'Translations' modules.i18n.update:true moduleProviders.Qt.qmakeFilePaths:${QMAKEPATH}
end=$(date +%s)
runtime=$(python3 -c "print('Time passed %u:%02u seconds' % ((${end} - ${start})/60, (${end} - ${start})%60))")

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -163,15 +163,16 @@ QString DialogKnownMeasurementsCSVColumns::ColumnHeader(int column) const
switch (individualColumn)
{
case KnownMeasurementsColumns::Name:
return tr("Name", "measurement column");
return QCoreApplication::translate("DialogKnownMeasurementsCSVColumns", "Name", "measurement column");
case KnownMeasurementsColumns::Group:
return tr("Group", "measurement column");
return QCoreApplication::translate("DialogKnownMeasurementsCSVColumns", "Group", "measurement column");
case KnownMeasurementsColumns::FullName:
return tr("Full name", "measurement column");
return QCoreApplication::translate("DialogKnownMeasurementsCSVColumns", "Full name", "measurement column");
case KnownMeasurementsColumns::Formula:
return tr("Formula", "measurement column");
return QCoreApplication::translate("DialogKnownMeasurementsCSVColumns", "Formula", "measurement column");
case KnownMeasurementsColumns::Description:
return tr("Description", "measurement column");
return QCoreApplication::translate("DialogKnownMeasurementsCSVColumns", "Description",
"measurement column");
default:
return {};
}
@ -284,7 +285,7 @@ void DialogKnownMeasurementsCSVColumns::InitColumnsControls()
if (not ColumnMandatory(column))
{
control->addItem(tr("Skip"), -1);
control->addItem(QCoreApplication::translate("DialogKnownMeasurementsCSVColumns", "Skip"), -1);
}
control->setCurrentIndex(-1);
@ -444,7 +445,7 @@ void DialogKnownMeasurementsCSVColumns::ShowImportPreview()
//---------------------------------------------------------------------------------------------------------------------
void DialogKnownMeasurementsCSVColumns::RetranslateLabels()
{
ui->labelName->setText(tr("Name") + "*:"_L1);
ui->labelName->setText(QCoreApplication::translate("DialogKnownMeasurementsCSVColumns", "Name") + "*:"_L1);
}
//---------------------------------------------------------------------------------------------------------------------
@ -482,7 +483,8 @@ void DialogKnownMeasurementsCSVColumns::CheckStatus()
if (m_fileName.isEmpty())
{
SetStatus(false);
ui->labelStatus->setText(tr("File path is empty"));
ui->labelStatus->setText(
QCoreApplication::translate("DialogKnownMeasurementsCSVColumns", "File path is empty"));
return;
}
@ -492,7 +494,8 @@ void DialogKnownMeasurementsCSVColumns::CheckStatus()
if (columns < MinimumColumns())
{
SetStatus(false);
ui->labelStatus->setText(tr("Not enough columns"));
ui->labelStatus->setText(
QCoreApplication::translate("DialogKnownMeasurementsCSVColumns", "Not enough columns"));
return;
}
@ -500,19 +503,21 @@ void DialogKnownMeasurementsCSVColumns::CheckStatus()
if (rows < 1)
{
SetStatus(false);
ui->labelStatus->setText(tr("Not enough data to import"));
ui->labelStatus->setText(
QCoreApplication::translate("DialogKnownMeasurementsCSVColumns", "Not enough data to import"));
return;
}
if (not ColumnsValid())
{
SetStatus(false);
ui->labelStatus->setText(tr("Please, select unique number for each column"));
ui->labelStatus->setText(QCoreApplication::translate("DialogKnownMeasurementsCSVColumns",
"Please, select unique number for each column"));
return;
}
SetStatus(true);
ui->labelStatus->setText(tr("Ready"));
ui->labelStatus->setText(QCoreApplication::translate("DialogKnownMeasurementsCSVColumns", "Ready"));
}
//---------------------------------------------------------------------------------------------------------------------

View File

@ -240,13 +240,13 @@ auto DialogMeasurementsCSVColumns::ColumnHeader(int column) const -> QString
switch (individualColumn)
{
case IndividualMeasurementsColumns::Name:
return tr("Name", "measurement column");
return QCoreApplication::translate("DialogMeasurementsCSVColumns", "Name", "measurement column");
case IndividualMeasurementsColumns::Value:
return tr("Value", "measurement column");
return QCoreApplication::translate("DialogMeasurementsCSVColumns", "Value", "measurement column");
case IndividualMeasurementsColumns::FullName:
return tr("Full name", "measurement column");
return QCoreApplication::translate("DialogMeasurementsCSVColumns", "Full name", "measurement column");
case IndividualMeasurementsColumns::Description:
return tr("Description", "measurement column");
return QCoreApplication::translate("DialogMeasurementsCSVColumns", "Description", "measurement column");
default:
return {};
}
@ -258,14 +258,15 @@ auto DialogMeasurementsCSVColumns::ColumnHeader(int column) const -> QString
switch (multisizeColumn)
{
case MultisizeMeasurementsColumns::Name:
return tr("Name", "measurement column");
return QCoreApplication::translate("DialogMeasurementsCSVColumns", "Name", "measurement column");
case MultisizeMeasurementsColumns::BaseValue:
return tr("Base value", "measurement column");
return QCoreApplication::translate("DialogMeasurementsCSVColumns", "Base value", "measurement column");
case MultisizeMeasurementsColumns::ShiftA:
if (not m_dimensions.empty())
{
MeasurementDimension_p dimension = m_dimensions.at(0);
return tr("Shift", "measurement column") + suffix.arg(dimension->Name());
return QCoreApplication::translate("DialogMeasurementsCSVColumns", "Shift", "measurement column") +
suffix.arg(dimension->Name());
}
else
{
@ -275,7 +276,8 @@ auto DialogMeasurementsCSVColumns::ColumnHeader(int column) const -> QString
if (m_dimensions.size() > 1)
{
MeasurementDimension_p dimension = m_dimensions.at(1);
return tr("Shift", "measurement column") + suffix.arg(dimension->Name());
return QCoreApplication::translate("DialogMeasurementsCSVColumns", "Shift", "measurement column") +
suffix.arg(dimension->Name());
}
else
{
@ -285,16 +287,17 @@ auto DialogMeasurementsCSVColumns::ColumnHeader(int column) const -> QString
if (m_dimensions.size() > 2)
{
MeasurementDimension_p dimension = m_dimensions.at(2);
return tr("Shift", "measurement column") + suffix.arg(dimension->Name());
return QCoreApplication::translate("DialogMeasurementsCSVColumns", "Shift", "measurement column") +
suffix.arg(dimension->Name());
}
else
{
return QStringLiteral("Shift C");
}
case MultisizeMeasurementsColumns::FullName:
return tr("Full name", "measurement column");
return QCoreApplication::translate("DialogMeasurementsCSVColumns", "Full name", "measurement column");
case MultisizeMeasurementsColumns::Description:
return tr("Description", "measurement column");
return QCoreApplication::translate("DialogMeasurementsCSVColumns", "Description", "measurement column");
default:
return {};
}
@ -504,7 +507,7 @@ void DialogMeasurementsCSVColumns::InitColumnsControls()
if (not ColumnMandatory(column))
{
control->addItem(tr("Skip"), -1);
control->addItem(QCoreApplication::translate("DialogMeasurementsCSVColumns", "Skip"), -1);
}
control->setCurrentIndex(-1);
@ -730,34 +733,43 @@ void DialogMeasurementsCSVColumns::HackColumnControls()
//---------------------------------------------------------------------------------------------------------------------
void DialogMeasurementsCSVColumns::RetranslateLabels()
{
ui->labelName->setText(tr("Name", "measurement column") + "*:"_L1);
ui->labelName->setText(QCoreApplication::translate("DialogMeasurementsCSVColumns", "Name", "measurement column") +
"*:"_L1);
if (m_type == MeasurementsType::Individual)
{
ui->labelValue->setText(tr("Value", "measurement column") + "*:"_L1);
ui->labelValue->setText(
QCoreApplication::translate("DialogMeasurementsCSVColumns", "Value", "measurement column") + "*:"_L1);
}
else
{
ui->labelValue->setText(tr("Base value", "measurement column") + "*:"_L1);
ui->labelValue->setText(
QCoreApplication::translate("DialogMeasurementsCSVColumns", "Base value", "measurement column") + "*:"_L1);
const QString suffix = QStringLiteral(" (%1)");
if (not m_dimensions.empty())
{
MeasurementDimension_p dimension = m_dimensions.at(0);
ui->labelShiftA->setText(tr("Shift", "measurement column") + suffix.arg(dimension->Name()));
ui->labelShiftA->setText(
QCoreApplication::translate("DialogMeasurementsCSVColumns", "Shift", "measurement column") +
suffix.arg(dimension->Name()));
}
if (m_dimensions.size() > 1)
{
MeasurementDimension_p dimension = m_dimensions.at(1);
ui->labelShiftB->setText(tr("Shift", "measurement column") + suffix.arg(dimension->Name()));
ui->labelShiftB->setText(
QCoreApplication::translate("DialogMeasurementsCSVColumns", "Shift", "measurement column") +
suffix.arg(dimension->Name()));
}
if (m_dimensions.size() > 2)
{
MeasurementDimension_p dimension = m_dimensions.at(2);
ui->labelShiftC->setText(tr("Shift", "measurement column") + suffix.arg(dimension->Name()));
ui->labelShiftC->setText(
QCoreApplication::translate("DialogMeasurementsCSVColumns", "Shift", "measurement column") +
suffix.arg(dimension->Name()));
}
}
}
@ -822,7 +834,7 @@ void DialogMeasurementsCSVColumns::CheckStatus()
if (m_fileName.isEmpty())
{
SetStatus(false);
ui->labelStatus->setText(tr("File path is empty"));
ui->labelStatus->setText(QCoreApplication::translate("DialogMeasurementsCSVColumns", "File path is empty"));
return;
}
@ -832,7 +844,7 @@ void DialogMeasurementsCSVColumns::CheckStatus()
if (columns < MinimumColumns())
{
SetStatus(false);
ui->labelStatus->setText(tr("Not enough columns"));
ui->labelStatus->setText(QCoreApplication::translate("DialogMeasurementsCSVColumns", "Not enough columns"));
return;
}
@ -840,19 +852,21 @@ void DialogMeasurementsCSVColumns::CheckStatus()
if (rows < 1)
{
SetStatus(false);
ui->labelStatus->setText(tr("Not enough data to import"));
ui->labelStatus->setText(
QCoreApplication::translate("DialogMeasurementsCSVColumns", "Not enough data to import"));
return;
}
if (not ColumnsValid())
{
SetStatus(false);
ui->labelStatus->setText(tr("Please, select unique number for each column"));
ui->labelStatus->setText(QCoreApplication::translate("DialogMeasurementsCSVColumns",
"Please, select unique number for each column"));
return;
}
SetStatus(true);
ui->labelStatus->setText(tr("Ready"));
ui->labelStatus->setText(QCoreApplication::translate("DialogMeasurementsCSVColumns", "Ready"));
}
//---------------------------------------------------------------------------------------------------------------------

View File

@ -127,7 +127,7 @@ TKMMainWindow::TKMMainWindow(QWidget *parent)
ReadSettings();
#if defined(Q_OS_MAC)
ui->pushButtonShowInExplorer->setText(tr("Show in Finder"));
ui->pushButtonShowInExplorer->setText(QCoreApplication::translate("TKMMainWindow", "Show in Finder"));
#endif // defined(Q_OS_MAC)
if (MApplication::VApp()->IsAppInGUIMode())

View File

@ -857,7 +857,7 @@ auto VAbstractPattern::ParseSANode(const QDomElement &domElement) -> VPieceNode
tool = Tool::NodeElArc;
break;
default:
throw VException(tr("Wrong tag name '%1'.").arg(t));
throw VException(QCoreApplication::translate("VAbstractPattern", "Wrong tag name '%1'.").arg(t));
}
VPieceNode node(id, tool, reverse);
node.SetFormulaSABefore(saBefore);
@ -1597,7 +1597,7 @@ void VAbstractPattern::ToolExists(const quint32 &id)
{
if (tools.contains(id) == false)
{
throw VExceptionBadId(tr("Can't find tool in table."), id);
throw VExceptionBadId(QCoreApplication::translate("VAbstractPattern", "Can't find tool in table."), id);
}
}
@ -2447,7 +2447,7 @@ auto VAbstractPattern::GroupLinkedToTool(vidtype toolId) const -> vidtype
//---------------------------------------------------------------------------------------------------------------------
auto VAbstractPattern::GetGroupName(quint32 id) -> QString
{
QString name = tr("New group");
QString name = QCoreApplication::translate("VAbstractPattern", "New group");
QDomElement group = elementById(id, TagGroup);
if (group.isElement())
{

View File

@ -305,17 +305,19 @@ void VBoundary::InsertPassmark(const VBoundarySequenceItemData &item, QList<VBou
QString pieceName;
if (!m_pieceName.isEmpty())
{
pieceName = tr("Piece '%1'.").arg(m_pieceName) + ' '_L1;
pieceName = QCoreApplication::translate("VBoundary", "Piece '%1'.").arg(m_pieceName) + ' '_L1;
}
QString errorMsg;
if (!passmark.label.isEmpty())
{
errorMsg = pieceName + tr("Unable to insert notch for point '%1'.").arg(passmark.label);
errorMsg =
pieceName +
QCoreApplication::translate("VBoundary", "Unable to insert notch for point '%1'.").arg(passmark.label);
}
else
{
errorMsg = pieceName + tr("Unable to insert notch.");
errorMsg = pieceName + QCoreApplication::translate("VBoundary", "Unable to insert notch.");
}
VAbstractApplication::VApp()->IsPedantic()

View File

@ -750,17 +750,19 @@ auto VPassmark::PassmarkIntersection(const QVector<QPointF> &path, QLineF line,
return line;
}
const QString errorMsg = QObject::tr("Cannot calculate a notch for point '%1' in piece '%2'. Notch "
"collapse.")
.arg(m_data.nodeName, m_data.pieceName);
const QString errorMsg =
QCoreApplication::translate("VPassmark", "Cannot calculate a notch for point '%1' in piece '%2'. Notch "
"collapse.")
.arg(m_data.nodeName, m_data.pieceName);
VAbstractApplication::VApp()->IsPedantic()
? throw VExceptionInvalidNotch(errorMsg)
: qWarning() << VAbstractValApplication::warningMessageSignature + errorMsg;
}
else
{
const QString errorMsg = QObject::tr("Cannot calculate a notch for point '%1' in piece '%2'. Cannot find "
"intersection.")
const QString errorMsg = QCoreApplication::translate(
"VPassmark", "Cannot calculate a notch for point '%1' in piece '%2'. Cannot find "
"intersection.")
.arg(m_data.nodeName, m_data.pieceName);
VAbstractApplication::VApp()->IsPedantic()
? throw VExceptionInvalidNotch(errorMsg)
@ -937,9 +939,11 @@ auto VPassmark::BuiltInSAPassmarkBaseLine(const VPiece &piece) const -> QVector<
}
else
{
const QString errorMsg = QObject::tr("Cannot calculate a notch for point '%1' in piece '%2' with built "
"in seam allowance. User must manually provide length.")
.arg(m_data.nodeName, m_data.pieceName);
const QString errorMsg =
QCoreApplication::translate("VPassmark",
"Cannot calculate a notch for point '%1' in piece '%2' with built "
"in seam allowance. User must manually provide length.")
.arg(m_data.nodeName, m_data.pieceName);
VAbstractApplication::VApp()->IsPedantic()
? throw VExceptionInvalidNotch(errorMsg)
: qWarning() << VAbstractValApplication::warningMessageSignature + errorMsg;
@ -992,9 +996,11 @@ auto VPassmark::SAPassmarkBaseLine(const QVector<QPointF> &seamAllowance, const
if (rotatedSeamAllowance.size() < 2)
{
const QString errorMsg = QObject::tr("Cannot calculate a notch for point '%1' in piece '%2'. Seam allowance is "
"empty.")
.arg(m_data.nodeName, m_data.pieceName);
const QString errorMsg =
QCoreApplication::translate("VPassmark",
"Cannot calculate a notch for point '%1' in piece '%2'. Seam allowance is "
"empty.")
.arg(m_data.nodeName, m_data.pieceName);
VAbstractApplication::VApp()->IsPedantic()
? throw VExceptionInvalidNotch(errorMsg)
: qWarning() << VAbstractValApplication::warningMessageSignature + errorMsg;
@ -1005,8 +1011,9 @@ auto VPassmark::SAPassmarkBaseLine(const QVector<QPointF> &seamAllowance, const
const PassmarkStatus seamPassmarkType = GetSeamPassmarkSAPoint(m_data, rotatedSeamAllowance, seamPassmarkSAPoint);
if (seamPassmarkType == PassmarkStatus::Error)
{
const QString errorMsg = QObject::tr("Cannot calculate a notch for point '%1' in piece '%2'. Cannot find "
"position for a notch.")
const QString errorMsg = QCoreApplication::translate(
"VPassmark", "Cannot calculate a notch for point '%1' in piece '%2'. Cannot find "
"position for a notch.")
.arg(m_data.nodeName, m_data.pieceName);
VAbstractApplication::VApp()->IsPedantic()
? throw VExceptionInvalidNotch(errorMsg)
@ -1021,9 +1028,11 @@ auto VPassmark::SAPassmarkBaseLine(const QVector<QPointF> &seamAllowance, const
if (not FixNotchPoint(path, m_data, &seamPassmarkSAPoint))
{
const QString errorMsg = QObject::tr("Cannot calculate a notch for point '%1' in piece '%2'. Unable to fix a "
"notch position.")
.arg(m_data.nodeName, m_data.pieceName);
const QString errorMsg =
QCoreApplication::translate("VPassmark",
"Cannot calculate a notch for point '%1' in piece '%2'. Unable to fix a "
"notch position.")
.arg(m_data.nodeName, m_data.pieceName);
VAbstractApplication::VApp()->IsPedantic()
? throw VExceptionInvalidNotch(errorMsg)
: qWarning() << VAbstractValApplication::warningMessageSignature + errorMsg;

View File

@ -186,8 +186,9 @@ void DialogPiecePath::ChosenObject(quint32 id, const SceneObject &type)
if (p.CountNodes() == 1)
{
emit ToolTip(tr("Select main path objects, <b>%1</b> - reverse direction curve, "
"<b>%2</b> - finish creation")
emit ToolTip(QCoreApplication::translate(
"DialogPiecePath", "Select main path objects, <b>%1</b> - reverse direction curve, "
"<b>%2</b> - finish creation")
.arg(VModifierKey::Shift(), VModifierKey::EnterKey()));
if (not VAbstractValApplication::VApp()->getCurrentScene()->items().contains(visPath))

View File

@ -4,7 +4,7 @@ import qbs.Utilities
VTestApp {
Depends { name: "buildconfig" }
Depends { name: "Qt"; submodules: ["testlib", "gui", "printsupport"] }
Depends { name: "Qt"; submodules: ["core", "testlib", "gui", "printsupport"] }
Depends { name: "VTestLib" }
Depends { name: "autotest" }

View File

@ -4,7 +4,7 @@ import qbs.Utilities
VTestApp {
Depends { name: "buildconfig" }
Depends { name: "VTestLib" }
Depends { name: "Qt"; submodules: ["testlib", "xml", "gui", "printsupport"] }
Depends { name: "Qt"; submodules: ["core", "testlib", "xml", "gui", "printsupport"] }
Depends { name: "autotest" }
Depends {