Fix typos.
This commit is contained in:
parent
250fa436c0
commit
2402bfaf9e
|
@ -244,9 +244,9 @@ auto VPUndoPieceZValueMove::Levels(const QList<VPPiecePtr> &pieces, bool skip) c
|
||||||
|
|
||||||
if (levels.contains(p->ZValue()))
|
if (levels.contains(p->ZValue()))
|
||||||
{
|
{
|
||||||
QVector<QString> lavel_images = levels.value(p->ZValue());
|
QVector<QString> level_images = levels.value(p->ZValue());
|
||||||
lavel_images.append(p->GetUniqueID());
|
level_images.append(p->GetUniqueID());
|
||||||
levels[p->ZValue()] = lavel_images;
|
levels[p->ZValue()] = level_images;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -487,9 +487,9 @@ auto VPUndoPiecesZValueMove::Levels(const QList<VPPiecePtr> &allPieces, const QV
|
||||||
|
|
||||||
if (levels.contains(p->ZValue()))
|
if (levels.contains(p->ZValue()))
|
||||||
{
|
{
|
||||||
QVector<QString> lavel_images = levels.value(p->ZValue());
|
QVector<QString> level_images = levels.value(p->ZValue());
|
||||||
lavel_images.append(p->GetUniqueID());
|
level_images.append(p->GetUniqueID());
|
||||||
levels[p->ZValue()] = lavel_images;
|
levels[p->ZValue()] = level_images;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -511,14 +511,14 @@ void VPApplication::ProcessArguments(const VPCommandLinePtr &cmd)
|
||||||
{
|
{
|
||||||
if (not cmd->IsGuiEnabled() && args.count() > 1)
|
if (not cmd->IsGuiEnabled() && args.count() > 1)
|
||||||
{
|
{
|
||||||
qCCritical(pApp, "%s\n", qPrintable(tr("Export mode doesn't support openning several files.")));
|
qCCritical(pApp, "%s\n", qPrintable(tr("Export mode doesn't support opening several files.")));
|
||||||
cmd.get()->parser.showHelp(V_EX_USAGE);
|
cmd.get()->parser.showHelp(V_EX_USAGE);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (args.count() > 1 && not rawLayouts.isEmpty())
|
if (args.count() > 1 && not rawLayouts.isEmpty())
|
||||||
{
|
{
|
||||||
qCCritical(pApp, "%s\n",
|
qCCritical(pApp, "%s\n",
|
||||||
qPrintable(tr("Import raw layout data does not support openning several layout files.")));
|
qPrintable(tr("Import raw layout data does not support opening several layout files.")));
|
||||||
cmd.get()->parser.showHelp(V_EX_USAGE);
|
cmd.get()->parser.showHelp(V_EX_USAGE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -144,7 +144,7 @@ void VPCommandLine::InitCommandLineOptions()
|
||||||
translate("VCommandLine", "The filename of exported layout file. Use it to enable console export mode."),
|
translate("VCommandLine", "The filename of exported layout file. Use it to enable console export mode."),
|
||||||
translate("VCommandLine", "The filename of layout file")},
|
translate("VCommandLine", "The filename of layout file")},
|
||||||
{{SINGLE_OPTION_RAW_LAYOUT, LONG_OPTION_RAW_LAYOUT},
|
{{SINGLE_OPTION_RAW_LAYOUT, LONG_OPTION_RAW_LAYOUT},
|
||||||
translate("VCommandLine", "Load pattern pieces form the raw layout data file."),
|
translate("VCommandLine", "Load pattern pieces from the raw layout data file."),
|
||||||
translate("VCommandLine", "The raw layout data file")},
|
translate("VCommandLine", "The raw layout data file")},
|
||||||
{{SINGLE_OPTION_EXP2FORMAT, LONG_OPTION_EXP2FORMAT},
|
{{SINGLE_OPTION_EXP2FORMAT, LONG_OPTION_EXP2FORMAT},
|
||||||
translate("VCommandLine", "Number corresponding to output format (default = 0, export mode): <not defined>"),
|
translate("VCommandLine", "Number corresponding to output format (default = 0, export mode): <not defined>"),
|
||||||
|
|
|
@ -705,7 +705,7 @@ void MApplication::ParseCommandLine(const SocketConnection &connection, const QS
|
||||||
{
|
{
|
||||||
if (testMode && args.count() > 1)
|
if (testMode && args.count() > 1)
|
||||||
{
|
{
|
||||||
qCCritical(mApp, "%s\n", qPrintable(tr("Test mode doesn't support openning several files.")));
|
qCCritical(mApp, "%s\n", qPrintable(tr("Test mode doesn't support opening several files.")));
|
||||||
parser.showHelp(V_EX_USAGE);
|
parser.showHelp(V_EX_USAGE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3834,7 +3834,7 @@ QString TMainWindow::CheckMName(const QString &name, const QSet<QString> &import
|
||||||
{
|
{
|
||||||
if (name.isEmpty())
|
if (name.isEmpty())
|
||||||
{
|
{
|
||||||
throw VException(tr("Measurement name in is empty."));
|
throw VException(tr("Measurement name is empty."));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (importedNames.contains(name))
|
if (importedNames.contains(name))
|
||||||
|
@ -3847,24 +3847,24 @@ QString TMainWindow::CheckMName(const QString &name, const QSet<QString> &import
|
||||||
QRegularExpression rx(NameRegExp());
|
QRegularExpression rx(NameRegExp());
|
||||||
if (not rx.match(name).hasMatch())
|
if (not rx.match(name).hasMatch())
|
||||||
{
|
{
|
||||||
throw VException(tr("Merasurement '%1' doesn't match regex pattern.").arg(name));
|
throw VException(tr("Measurement '%1' doesn't match regex pattern.").arg(name));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (not data->IsUnique(name))
|
if (not data->IsUnique(name))
|
||||||
{
|
{
|
||||||
throw VException(tr("Merasurement '%1' already used in file.").arg(name));
|
throw VException(tr("Measurement '%1' already used in the file.").arg(name));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (not ConvertToSet<QString>(AllGroupNames()).contains(name))
|
if (not ConvertToSet<QString>(AllGroupNames()).contains(name))
|
||||||
{
|
{
|
||||||
throw VException(tr("Measurement '%1' is not one of known measurements.").arg(name));
|
throw VException(tr("Measurement '%1' is not one of the known measurements.").arg(name));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (not data->IsUnique(name))
|
if (not data->IsUnique(name))
|
||||||
{
|
{
|
||||||
throw VException(tr("Merasurement '%1' already used in file.").arg(name));
|
throw VException(tr("Measurement '%1' already used in file.").arg(name));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3933,7 +3933,7 @@ void TMainWindow::ImportIndividualMeasurements(const QxtCsvModel &csv, const QVe
|
||||||
const QString name = csv.text(i, nameColumn).simplified();
|
const QString name = csv.text(i, nameColumn).simplified();
|
||||||
if (name.isEmpty())
|
if (name.isEmpty())
|
||||||
{
|
{
|
||||||
ShowError(tr("Error in row %1. Measurement name is empty.").arg(i));
|
ShowError(tr("Error in row %1. The measurement name is empty.").arg(i));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4049,7 +4049,7 @@ void TMainWindow::ImportMultisizeMeasurements(const QxtCsvModel &csv, const QVec
|
||||||
const QString name = csv.text(i, nameColumn).simplified();
|
const QString name = csv.text(i, nameColumn).simplified();
|
||||||
if (name.isEmpty())
|
if (name.isEmpty())
|
||||||
{
|
{
|
||||||
ShowError(tr("Error in row %1. Measurement name is empty.").arg(i));
|
ShowError(tr("Error in row %1. The measurement name is empty.").arg(i));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -781,7 +781,7 @@ void VCommandLine::InitCommandLineOptions()
|
||||||
translate("VCommandLine", "The measure unit")},
|
translate("VCommandLine", "The measure unit")},
|
||||||
{{SINGLE_OPTION_IGNORE_MARGINS, LONG_OPTION_IGNORE_MARGINS},
|
{{SINGLE_OPTION_IGNORE_MARGINS, LONG_OPTION_IGNORE_MARGINS},
|
||||||
translate("VCommandLine", "Ignore printer margins (export mode). Use if need full paper space. In case of "
|
translate("VCommandLine", "Ignore printer margins (export mode). Use if need full paper space. In case of "
|
||||||
"later printing you must account for the margins himself.")},
|
"later printing you must account for the margins themselves.")},
|
||||||
{{SINGLE_OPTION_LEFT_MARGIN, LONG_OPTION_LEFT_MARGIN},
|
{{SINGLE_OPTION_LEFT_MARGIN, LONG_OPTION_LEFT_MARGIN},
|
||||||
translate("VCommandLine", "Page left margin in current units like 3.0 (export mode). If not set will be used "
|
translate("VCommandLine", "Page left margin in current units like 3.0 (export mode). If not set will be used "
|
||||||
"value from default printer. Or 0 if none printers was found."),
|
"value from default printer. Or 0 if none printers was found."),
|
||||||
|
|
|
@ -1973,13 +1973,13 @@ void VPattern::ParsePlaceLabel(QDomElement &domElement, const Document &parse)
|
||||||
}
|
}
|
||||||
catch (const VExceptionBadId &e)
|
catch (const VExceptionBadId &e)
|
||||||
{
|
{
|
||||||
VExceptionObjectError excep(tr("Error creating or updating place lavel"), domElement);
|
VExceptionObjectError excep(tr("Error creating or updating place label"), domElement);
|
||||||
excep.AddMoreInformation(e.ErrorMessage());
|
excep.AddMoreInformation(e.ErrorMessage());
|
||||||
throw excep;
|
throw excep;
|
||||||
}
|
}
|
||||||
catch (qmu::QmuParserError &e)
|
catch (qmu::QmuParserError &e)
|
||||||
{
|
{
|
||||||
VExceptionObjectError excep(tr("Error creating or updating place lavel"), domElement);
|
VExceptionObjectError excep(tr("Error creating or updating place label"), domElement);
|
||||||
excep.AddMoreInformation(QString("Message: " + e.GetMsg() + "\n"+ "Expression: " + e.GetExpr()));
|
excep.AddMoreInformation(QString("Message: " + e.GetMsg() + "\n"+ "Expression: " + e.GetExpr()));
|
||||||
throw excep;
|
throw excep;
|
||||||
}
|
}
|
||||||
|
|
|
@ -137,7 +137,7 @@ QString VAbstractConverter::Convert()
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
throw VException(tr("Error openning a temp file: %1.").arg(m_tmpFile.errorString()));
|
throw VException(tr("Error opening a temp file: %1.").arg(m_tmpFile.errorString()));
|
||||||
}
|
}
|
||||||
|
|
||||||
m_ver < MaxVer() ? ApplyPatches() : DowngradeToCurrentMaxVersion();
|
m_ver < MaxVer() ? ApplyPatches() : DowngradeToCurrentMaxVersion();
|
||||||
|
|
|
@ -169,7 +169,7 @@ auto VBackgroundPatternImage::IsValid() const -> bool
|
||||||
|
|
||||||
if (not aliases.contains(m_contentType))
|
if (not aliases.contains(m_contentType))
|
||||||
{
|
{
|
||||||
m_errorString = tr("Content type mistmatch.");
|
m_errorString = tr("Content type mismatch.");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -117,7 +117,7 @@ auto VPatternImage::IsValid() const -> bool
|
||||||
|
|
||||||
if (not aliases.contains(m_contentType))
|
if (not aliases.contains(m_contentType))
|
||||||
{
|
{
|
||||||
m_errorString = tr("Content type mistmatch.");
|
m_errorString = tr("Content type mismatch.");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -399,7 +399,7 @@ bool WatermarkWindow::on_actionSave_triggered()
|
||||||
QMessageBox messageBox(this);
|
QMessageBox messageBox(this);
|
||||||
messageBox.setIcon(QMessageBox::Question);
|
messageBox.setIcon(QMessageBox::Question);
|
||||||
messageBox.setText(tr("The document has no write permissions."));
|
messageBox.setText(tr("The document has no write permissions."));
|
||||||
messageBox.setInformativeText(tr("Do you want to change the premissions?"));
|
messageBox.setInformativeText(tr("Do you want to change the permissions?"));
|
||||||
messageBox.setStandardButtons(QMessageBox::Yes | QMessageBox::Cancel);
|
messageBox.setStandardButtons(QMessageBox::Yes | QMessageBox::Cancel);
|
||||||
messageBox.setDefaultButton(QMessageBox::Yes);
|
messageBox.setDefaultButton(QMessageBox::Yes);
|
||||||
|
|
||||||
|
|
|
@ -336,7 +336,7 @@ bool VBank::PrepareUnsorted()
|
||||||
if (square <= 0)
|
if (square <= 0)
|
||||||
{
|
{
|
||||||
qCCritical(lBank) << VAbstractValApplication::warningMessageSignature +
|
qCCritical(lBank) << VAbstractValApplication::warningMessageSignature +
|
||||||
tr("Preparing data for layout error: Detail '%1' square <= 0")
|
tr("Error of preparing data for layout: Detail '%1' square <= 0")
|
||||||
.arg(details.at(i).GetName());
|
.arg(details.at(i).GetName());
|
||||||
prepare = false;
|
prepare = false;
|
||||||
return prepare;
|
return prepare;
|
||||||
|
@ -361,7 +361,7 @@ bool VBank::PrepareDetails()
|
||||||
if (layoutWidth <= 0)
|
if (layoutWidth <= 0)
|
||||||
{
|
{
|
||||||
qCCritical(lBank) << VAbstractValApplication::warningMessageSignature +
|
qCCritical(lBank) << VAbstractValApplication::warningMessageSignature +
|
||||||
tr("Preparing data for layout error: Layout paper sheet <= 0");
|
tr("Error of preparing data for layout: Layout paper sheet <= 0");
|
||||||
prepare = false;
|
prepare = false;
|
||||||
return prepare;
|
return prepare;
|
||||||
}
|
}
|
||||||
|
@ -369,7 +369,7 @@ bool VBank::PrepareDetails()
|
||||||
if (details.isEmpty())
|
if (details.isEmpty())
|
||||||
{
|
{
|
||||||
qCCritical(lBank) << VAbstractValApplication::warningMessageSignature +
|
qCCritical(lBank) << VAbstractValApplication::warningMessageSignature +
|
||||||
tr("Preparing data for layout error: List of details is empty");
|
tr("Error of preparing data for layout: List of details is empty");
|
||||||
prepare = false;
|
prepare = false;
|
||||||
return prepare;
|
return prepare;
|
||||||
}
|
}
|
||||||
|
|
|
@ -265,7 +265,7 @@ void VLayoutExporter::ExportToFlatDXF(QGraphicsScene *scene, const QList<QGraphi
|
||||||
scene->render(&painter, m_imageRect, m_imageRect, Qt::IgnoreAspectRatio);
|
scene->render(&painter, m_imageRect, m_imageRect, Qt::IgnoreAspectRatio);
|
||||||
if (not painter.end())
|
if (not painter.end())
|
||||||
{
|
{
|
||||||
qCritical() << tr("Can't create an flat dxf file.")
|
qCritical() << tr("Can't create a flat dxf file.")
|
||||||
<< generator.ErrorString();
|
<< generator.ErrorString();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -97,9 +97,9 @@ void ZValueMoveBackgroundImage::redo()
|
||||||
|
|
||||||
if (levels.contains(image.ZValue()))
|
if (levels.contains(image.ZValue()))
|
||||||
{
|
{
|
||||||
QVector<QUuid> lavel_images = levels.value(image.ZValue());
|
QVector<QUuid> level_images = levels.value(image.ZValue());
|
||||||
lavel_images.append(image.Id());
|
level_images.append(image.Id());
|
||||||
levels[image.ZValue()] = lavel_images;
|
levels[image.ZValue()] = level_images;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -280,7 +280,7 @@ auto VAbstractMainWindow::CheckFilePermissions(const QString &path, QWidget *mes
|
||||||
QMessageBox messageBox(messageBoxParent);
|
QMessageBox messageBox(messageBoxParent);
|
||||||
messageBox.setIcon(QMessageBox::Question);
|
messageBox.setIcon(QMessageBox::Question);
|
||||||
messageBox.setText(tr("The file has no write permissions."));
|
messageBox.setText(tr("The file has no write permissions."));
|
||||||
messageBox.setInformativeText(tr("Do you want to change the premissions?"));
|
messageBox.setInformativeText(tr("Do you want to change the permissions?"));
|
||||||
messageBox.setStandardButtons(QMessageBox::Yes | QMessageBox::Cancel);
|
messageBox.setStandardButtons(QMessageBox::Yes | QMessageBox::Cancel);
|
||||||
messageBox.setDefaultButton(QMessageBox::Yes);
|
messageBox.setDefaultButton(QMessageBox::Yes);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user