kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

PartDesign: Update UI strings for consistency and correct for new fuctions and typos

Browse Source 
Closes: #22128
This commit is contained in:
Max Wilfinger
2025-06-22 15:09:10 +02:00
committed by Kacper Donat
parent b267203e67
commit bee89d0447
87 changed files with 436 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/PartDesign/App/AppPartDesign.cpp
View File

@@ -78,7 +78,7 @@ PyMOD_INIT_FUNC(_PartDesign)
}
PyObject* mod = PartDesign::initModule();
Base::Console().log("Loading PartDesign module... done\n");
Base::Console().log("Loading Part Design module… done\n");
// NOTE: To finish the initialization of our own type objects we must

6
src/Mod/PartDesign/App/FeatureHole.cpp
View File

@@ -2147,10 +2147,10 @@ App::DocumentObjectExecReturn* Hole::execute()
retry = false;
} catch (Standard_Failure & e) {
FC_WARN(getFullName() << ": boolean operation with compound failed ("
<< e.GetMessageString() << "), retry...");
<< e.GetMessageString() << "), retry…");
} catch (Base::Exception & e) {
FC_WARN(getFullName() << ": boolean operation with compound failed ("
<< e.what() << "), retry...");
FC_WARN(getFullName() << ": boolean operation with compound failed (" << e.what()
<< "), retry…");
}
if (retry) {

2
src/Mod/PartDesign/Gui/AppPartDesignGui.cpp
View File

@@ -116,7 +116,7 @@ PyMOD_INIT_FUNC(PartDesignGui)
}
PyObject* mod = PartDesignGui::initModule();
Base::Console().log("Loading GUI of PartDesign module... done\n");
Base::Console().log("Loading GUI of Part Design module… done\n");
// instantiating the commands
CreatePartDesignCommands();

136
src/Mod/PartDesign/Gui/Command.cpp
View File

@@ -143,7 +143,7 @@ void UnifiedDatumCommand(Gui::Command &cmd, Base::Type type, std::string name)
cmd.doCommand(Gui::Command::Doc,"App.activeDocument().recompute()"); // recompute the feature based on its references
PartDesignGui::setEdit(Feat,pcActiveBody);
} else {
QMessageBox::warning(Gui::getMainWindow(),QObject::tr("Error"), QObject::tr("There is no active body. Please make a body active before inserting a datum entity."));
QMessageBox::warning(Gui::getMainWindow(),QObject::tr("Error"), QObject::tr("There is no active body. Please activate a body before inserting a datum entity."));
}
} catch (Base::Exception &e) {
QMessageBox::warning(Gui::getMainWindow(),QObject::tr("Error"),QApplication::translate("Exception", e.what()));
@@ -161,8 +161,8 @@ CmdPartDesignPlane::CmdPartDesignPlane()
{
sAppModule = "PartDesign";
sGroup = QT_TR_NOOP("PartDesign");
sMenuText = QT_TR_NOOP("Create a datum plane");
sToolTipText = QT_TR_NOOP("Create a new datum plane");
sMenuText = QT_TR_NOOP("Datum Plane");
sToolTipText = QT_TR_NOOP("Creates a new datum plane");
sWhatsThis = "PartDesign_Plane";
sStatusTip = sToolTipText;
sPixmap = "PartDesign_Plane";
@@ -189,8 +189,8 @@ CmdPartDesignLine::CmdPartDesignLine()
{
sAppModule = "PartDesign";
sGroup = QT_TR_NOOP("PartDesign");
sMenuText = QT_TR_NOOP("Create a datum line");
sToolTipText = QT_TR_NOOP("Create a new datum line");
sMenuText = QT_TR_NOOP("Datum Line");
sToolTipText = QT_TR_NOOP("Creates a new datum line");
sWhatsThis = "PartDesign_Line";
sStatusTip = sToolTipText;
sPixmap = "PartDesign_Line";
@@ -217,8 +217,8 @@ CmdPartDesignPoint::CmdPartDesignPoint()
{
sAppModule = "PartDesign";
sGroup = QT_TR_NOOP("PartDesign");
sMenuText = QT_TR_NOOP("Create a datum point");
sToolTipText = QT_TR_NOOP("Create a new datum point");
sMenuText = QT_TR_NOOP("Datum Point");
sToolTipText = QT_TR_NOOP("Creates a new datum point");
sWhatsThis = "PartDesign_Point";
sStatusTip = sToolTipText;
sPixmap = "PartDesign_Point";
@@ -245,8 +245,8 @@ CmdPartDesignCS::CmdPartDesignCS()
{
sAppModule = "PartDesign";
sGroup = QT_TR_NOOP("PartDesign");
sMenuText = QT_TR_NOOP("Create a local coordinate system");
sToolTipText = QT_TR_NOOP("Create a new local coordinate system");
sMenuText = QT_TR_NOOP("Local Coordinate System");
sToolTipText = QT_TR_NOOP("Creates a new local coordinate system");
sWhatsThis = "PartDesign_CoordinateSystem";
sStatusTip = sToolTipText;
sPixmap = "PartDesign_CoordinateSystem";
@@ -277,8 +277,8 @@ CmdPartDesignShapeBinder::CmdPartDesignShapeBinder()
{
sAppModule = "PartDesign";
sGroup = QT_TR_NOOP("PartDesign");
sMenuText = QT_TR_NOOP("Create a shape binder");
sToolTipText = QT_TR_NOOP("Create a new shape binder");
sMenuText = QT_TR_NOOP("Shape Binder");
sToolTipText = QT_TR_NOOP("Creates a new shape binder");
sWhatsThis = "PartDesign_ShapeBinder";
sStatusTip = sToolTipText;
sPixmap = "PartDesign_ShapeBinder";
@@ -297,7 +297,7 @@ void CmdPartDesignShapeBinder::activated(int iMsg)
}
if (bEditSelected) {
openCommand(QT_TRANSLATE_NOOP("Command", "Edit ShapeBinder"));
openCommand(QT_TRANSLATE_NOOP("Command", "Edit Shape Binder"));
PartDesignGui::setEdit(support.getValue());
} else {
PartDesign::Body *pcActiveBody = PartDesignGui::getBody(/*messageIfNot = */true);
@@ -306,7 +306,7 @@ void CmdPartDesignShapeBinder::activated(int iMsg)
std::string FeatName = getUniqueObjectName("ShapeBinder",pcActiveBody);
openCommand(QT_TRANSLATE_NOOP("Command", "Create ShapeBinder"));
openCommand(QT_TRANSLATE_NOOP("Command", "Create Shape Binder"));
FCMD_OBJ_CMD(pcActiveBody,"newObject('PartDesign::ShapeBinder','" << FeatName << "')");
// remove the body from links in case it's selected as
@@ -343,8 +343,8 @@ CmdPartDesignSubShapeBinder::CmdPartDesignSubShapeBinder()
{
sAppModule = "PartDesign";
sGroup = QT_TR_NOOP("PartDesign");
sMenuText = QT_TR_NOOP("Create a sub-object(s) shape binder");
sToolTipText = QT_TR_NOOP("Create a reference to geometry from one or more objects, allowing it to be used inside or outside a PartDesign Body. It tracks relative placements, supports multiple geometry types (solids, faces, edges, vertices), and can work with objects in the same or external documents.");
sMenuText = QT_TR_NOOP("Sub-Shape Binder");
sToolTipText = QT_TR_NOOP("Creates a reference to geometry from one or more objects, allowing it to be used inside or outside a body. It tracks relative placements, supports multiple geometry types (solids, faces, edges, vertices), and can work with objects in the same or external documents.");
sWhatsThis = "PartDesign_SubShapeBinder";
sStatusTip = sToolTipText;
sPixmap = "PartDesign_SubShapeBinder";
@@ -389,7 +389,7 @@ void CmdPartDesignSubShapeBinder::activated(int iMsg)
PartDesign::SubShapeBinder *binder = nullptr;
try {
openCommand(QT_TRANSLATE_NOOP("Command", "Create SubShapeBinder"));
openCommand(QT_TRANSLATE_NOOP("Command", "Create Sub-Shape Binder"));
if (pcActiveBody) {
FCMD_OBJ_CMD(pcActiveBody,"newObject('PartDesign::SubShapeBinder','" << FeatName << "')");
binder = dynamic_cast<PartDesign::SubShapeBinder*>(pcActiveBody->getObject(FeatName.c_str()));
@@ -407,7 +407,7 @@ void CmdPartDesignSubShapeBinder::activated(int iMsg)
} catch (Base::Exception &e) {
e.reportException();
QMessageBox::critical(Gui::getMainWindow(),
QObject::tr("Sub-Shape Binder"), QApplication::translate("Exception", e.what()));
QObject::tr("Sub-shape binder"), QApplication::translate("Exception", e.what()));
abortCommand();
}
}
@@ -427,8 +427,8 @@ CmdPartDesignClone::CmdPartDesignClone()
{
sAppModule = "PartDesign";
sGroup = QT_TR_NOOP("PartDesign");
sMenuText = QT_TR_NOOP("Create a clone");
sToolTipText = QT_TR_NOOP("Create a parametric copy of a solid object as the base feature of a new body");
sMenuText = QT_TR_NOOP("Clone");
sToolTipText = QT_TR_NOOP("Copies a solid object parametrically as the base feature of a new body");
sWhatsThis = "PartDesign_Clone";
sStatusTip = sToolTipText;
sPixmap = "PartDesign_Clone";
@@ -501,8 +501,8 @@ CmdPartDesignNewSketch::CmdPartDesignNewSketch()
{
sAppModule = "PartDesign";
sGroup = QT_TR_NOOP("PartDesign");
sMenuText = QT_TR_NOOP("Create sketch");
sToolTipText = QT_TR_NOOP("Create a new sketch");
sMenuText = QT_TR_NOOP("New Sketch");
sToolTipText = QT_TR_NOOP("Creates a new sketch");
sWhatsThis = "PartDesign_NewSketch";
sStatusTip = sToolTipText;
sPixmap = "Sketcher_NewSketch";
@@ -914,7 +914,7 @@ void prepareProfileBased(PartDesign::Body *pcActiveBody, Gui::Command* cmd, cons
if (!onlyAllowed) {
QMessageBox msgBox(Gui::getMainWindow());
msgBox.setText(QObject::tr("Cannot use selected object. Selected object must belong to the active body"));
msgBox.setInformativeText(QObject::tr("Consider using a ShapeBinder or a BaseFeature to reference external geometry in a body."));
msgBox.setInformativeText(QObject::tr("Consider using a sape binder or a base feature to reference external geometry in a body"));
msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.setDefaultButton(QMessageBox::Ok);
msgBox.exec();
@@ -990,7 +990,7 @@ void prepareProfileBased(PartDesign::Body *pcActiveBody, Gui::Command* cmd, cons
return;
if (!dlg.radioXRef->isChecked()) {
Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Make copy"));
Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Make Copy"));
auto copy = PartDesignGui::TaskFeaturePick::makeCopy(sketches[0], "", dlg.radioIndependent->isChecked());
auto oBody = PartDesignGui::getBodyFor(sketches[0], false);
if (oBody)
@@ -1012,7 +1012,7 @@ void prepareProfileBased(PartDesign::Body *pcActiveBody, Gui::Command* cmd, cons
if (dlg && !pickDlg) {
QMessageBox msgBox(Gui::getMainWindow());
msgBox.setText(QObject::tr("A dialog is already open in the task panel"));
msgBox.setInformativeText(QObject::tr("Do you want to close this dialog?"));
msgBox.setInformativeText(QObject::tr("Close this dialog?"));
msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
msgBox.setDefaultButton(QMessageBox::Yes);
int ret = msgBox.exec();
@@ -1091,7 +1091,7 @@ CmdPartDesignPad::CmdPartDesignPad()
sAppModule = "PartDesign";
sGroup = QT_TR_NOOP("PartDesign");
sMenuText = QT_TR_NOOP("Pad");
sToolTipText = QT_TR_NOOP("Pad a selected sketch");
sToolTipText = QT_TR_NOOP("Extrudes the selected sketch or profile and adds it to the body");
sWhatsThis = "PartDesign_Pad";
sStatusTip = sToolTipText;
sPixmap = "PartDesign_Pad";
@@ -1120,7 +1120,7 @@ CmdPartDesignPocket::CmdPartDesignPocket()
sAppModule = "PartDesign";
sGroup = QT_TR_NOOP("PartDesign");
sMenuText = QT_TR_NOOP("Pocket");
sToolTipText = QT_TR_NOOP("Create a pocket with the selected sketch");
sToolTipText = QT_TR_NOOP("Extrudes the selected sketch or profile and removes it from the body");
sWhatsThis = "PartDesign_Pocket";
sStatusTip = sToolTipText;
sPixmap = "PartDesign_Pocket";
@@ -1149,7 +1149,7 @@ CmdPartDesignHole::CmdPartDesignHole()
sAppModule = "PartDesign";
sGroup = QT_TR_NOOP("PartDesign");
sMenuText = QT_TR_NOOP("Hole");
sToolTipText = QT_TR_NOOP("Create a hole with the selected sketch");
sToolTipText = QT_TR_NOOP("Creates holes in the active body at the center points of circles or arcs of the selected sketch or profile");
sWhatsThis = "PartDesign_Hole";
sStatusTip = sToolTipText;
sPixmap = "PartDesign_Hole";
@@ -1191,8 +1191,8 @@ CmdPartDesignRevolution::CmdPartDesignRevolution()
{
sAppModule = "PartDesign";
sGroup = QT_TR_NOOP("PartDesign");
sMenuText = QT_TR_NOOP("Revolution");
sToolTipText = QT_TR_NOOP("Revolve a selected sketch");
sMenuText = QT_TR_NOOP("Revolve");
sToolTipText = QT_TR_NOOP("Revolves the selected sketch or profile around a line or axis and adds it to the body");
sWhatsThis = "PartDesign_Revolution";
sStatusTip = sToolTipText;
sPixmap = "PartDesign_Revolution";
@@ -1247,7 +1247,7 @@ CmdPartDesignGroove::CmdPartDesignGroove()
sAppModule = "PartDesign";
sGroup = QT_TR_NOOP("PartDesign");
sMenuText = QT_TR_NOOP("Groove");
sToolTipText = QT_TR_NOOP("Groove a selected sketch");
sToolTipText = QT_TR_NOOP("Revolves the sketch or profile around a line or axis and removes it from the body");
sWhatsThis = "PartDesign_Groove";
sStatusTip = sToolTipText;
sPixmap = "PartDesign_Groove";
@@ -1309,8 +1309,8 @@ CmdPartDesignAdditivePipe::CmdPartDesignAdditivePipe()
{
sAppModule = "PartDesign";
sGroup = QT_TR_NOOP("PartDesign");
sMenuText = QT_TR_NOOP("Additive pipe");
sToolTipText = QT_TR_NOOP("Sweep a selected sketch along a path or to other profiles");
sMenuText = QT_TR_NOOP("Additive Pipe");
sToolTipText = QT_TR_NOOP("Sweeps the selected sketch or profile along a path and adds it to the body");
sWhatsThis = "PartDesign_AdditivePipe";
sStatusTip = sToolTipText;
sPixmap = "PartDesign_AdditivePipe";
@@ -1356,8 +1356,8 @@ CmdPartDesignSubtractivePipe::CmdPartDesignSubtractivePipe()
{
sAppModule = "PartDesign";
sGroup = QT_TR_NOOP("PartDesign");
sMenuText = QT_TR_NOOP("Subtractive pipe");
sToolTipText = QT_TR_NOOP("Sweep a selected sketch along a path or to other profiles and remove it from the body");
sMenuText = QT_TR_NOOP("Subtractive Pipe");
sToolTipText = QT_TR_NOOP("Sweeps the selected sketch or profile along a path and removes it from the body");
sWhatsThis = "PartDesign_SubtractivePipe";
sStatusTip = sToolTipText;
sPixmap = "PartDesign_SubtractivePipe";
@@ -1403,8 +1403,8 @@ CmdPartDesignAdditiveLoft::CmdPartDesignAdditiveLoft()
{
sAppModule = "PartDesign";
sGroup = QT_TR_NOOP("PartDesign");
sMenuText = QT_TR_NOOP("Additive loft");
sToolTipText = QT_TR_NOOP("Loft a selected profile through other profile sections");
sMenuText = QT_TR_NOOP("Additive Loft");
sToolTipText = QT_TR_NOOP("Lofts the selected sketch or profile along a path and adds it to the body");
sWhatsThis = "PartDesign_AdditiveLoft";
sStatusTip = sToolTipText;
sPixmap = "PartDesign_AdditiveLoft";
@@ -1450,8 +1450,8 @@ CmdPartDesignSubtractiveLoft::CmdPartDesignSubtractiveLoft()
{
sAppModule = "PartDesign";
sGroup = QT_TR_NOOP("PartDesign");
sMenuText = QT_TR_NOOP("Subtractive loft");
sToolTipText = QT_TR_NOOP("Loft a selected profile through other profile sections and remove it from the body");
sMenuText = QT_TR_NOOP("Subtractive Loft");
sToolTipText = QT_TR_NOOP("Lofts the selected sketch or profile along a path and removes it from the body");
sWhatsThis = "PartDesign_SubtractiveLoft";
sStatusTip = sToolTipText;
sPixmap = "PartDesign_SubtractiveLoft";
@@ -1496,8 +1496,8 @@ CmdPartDesignAdditiveHelix::CmdPartDesignAdditiveHelix()
{
sAppModule = "PartDesign";
sGroup = QT_TR_NOOP("PartDesign");
sMenuText = QT_TR_NOOP("Additive helix");
sToolTipText = QT_TR_NOOP("Sweep a selected sketch along a helix");
sMenuText = QT_TR_NOOP("Additive Helix");
sToolTipText = QT_TR_NOOP("Sweeps the selected sketch or profile along a helix and adds it to the body");
sWhatsThis = "PartDesign_AdditiveHelix";
sStatusTip = sToolTipText;
sPixmap = "PartDesign_AdditiveHelix";
@@ -1568,8 +1568,8 @@ CmdPartDesignSubtractiveHelix::CmdPartDesignSubtractiveHelix()
{
sAppModule = "PartDesign";
sGroup = QT_TR_NOOP("PartDesign");
sMenuText = QT_TR_NOOP("Subtractive helix");
sToolTipText = QT_TR_NOOP("Sweep a selected sketch along a helix and remove it from the body");
sMenuText = QT_TR_NOOP("Subtractive Helix");
sToolTipText = QT_TR_NOOP("Sweeps the selected sketch or profile along a helix and removes it from the body");
sWhatsThis = "PartDesign_SubtractiveHelix";
sStatusTip = sToolTipText;
sPixmap = "PartDesign_SubtractiveHelix";
@@ -1635,7 +1635,7 @@ bool dressupGetSelected(Gui::Command* cmd, const std::string& which,
return false;
}
else if (pcActiveBody != PartDesignGui::getBodyFor(selection[0].getObject(), false)) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Selection is not in Active Body"),
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Selection is not in the active body"),
QObject::tr("Select an edge, face, or body from an active body."));
return false;
}
@@ -1657,7 +1657,7 @@ bool dressupGetSelected(Gui::Command* cmd, const std::string& which,
if (TopShape.getShape().IsNull()){
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Shape of the selected Part is empty"));
QObject::tr("Shape of the selected part is empty"));
return false;
}
@@ -1749,7 +1749,7 @@ CmdPartDesignFillet::CmdPartDesignFillet()
sAppModule = "PartDesign";
sGroup = QT_TR_NOOP("PartDesign");
sMenuText = QT_TR_NOOP("Fillet");
sToolTipText = QT_TR_NOOP("Make a fillet on an edge, face or body");
sToolTipText = QT_TR_NOOP("Applies a fillet to the selected edges or faces");
sWhatsThis = "PartDesign_Fillet";
sStatusTip = sToolTipText;
sPixmap = "PartDesign_Fillet";
@@ -1777,7 +1777,7 @@ CmdPartDesignChamfer::CmdPartDesignChamfer()
sAppModule = "PartDesign";
sGroup = QT_TR_NOOP("PartDesign");
sMenuText = QT_TR_NOOP("Chamfer");
sToolTipText = QT_TR_NOOP("Chamfer the selected edges of a shape");
sToolTipText = QT_TR_NOOP("Applies a chamfer to the selected edges or faces");
sWhatsThis = "PartDesign_Chamfer";
sStatusTip = sToolTipText;
sPixmap = "PartDesign_Chamfer";
@@ -1806,7 +1806,7 @@ CmdPartDesignDraft::CmdPartDesignDraft()
sAppModule = "PartDesign";
sGroup = QT_TR_NOOP("PartDesign");
sMenuText = QT_TR_NOOP("Draft");
sToolTipText = QT_TR_NOOP("Make a draft on a face");
sToolTipText = QT_TR_NOOP("Applies a draft to the selected faces");
sWhatsThis = "PartDesign_Draft";
sStatusTip = sToolTipText;
sPixmap = "PartDesign_Draft";
@@ -1874,7 +1874,7 @@ CmdPartDesignThickness::CmdPartDesignThickness()
sAppModule = "PartDesign";
sGroup = QT_TR_NOOP("PartDesign");
sMenuText = QT_TR_NOOP("Thickness");
sToolTipText = QT_TR_NOOP("Make a thick solid");
sToolTipText = QT_TR_NOOP("Applies thickness and removes the selected faces");
sWhatsThis = "PartDesign_Thickness";
sStatusTip = sToolTipText;
sPixmap = "PartDesign_Thickness";
@@ -1967,7 +1967,7 @@ void prepareTransformed(PartDesign::Body *pcActiveBody, Gui::Command* cmd, const
PartDesign::Body* activeBody = PartDesignGui::getBody(true);
for (auto feature : features) {
if (activeBody != PartDesignGui::getBodyFor(feature, false)) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Selection is not in Active Body"),
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Selection is not in the active body"),
QObject::tr("Please select only one feature in an active body."));
return;
}
@@ -1990,8 +1990,8 @@ CmdPartDesignMirrored::CmdPartDesignMirrored()
{
sAppModule = "PartDesign";
sGroup = QT_TR_NOOP("PartDesign");
sMenuText = QT_TR_NOOP("Mirrored");
sToolTipText = QT_TR_NOOP("Create a mirrored feature");
sMenuText = QT_TR_NOOP("Mirror");
sToolTipText = QT_TR_NOOP("Mirrors the selected features or active body");
sWhatsThis = "PartDesign_Mirrored";
sStatusTip = sToolTipText;
sPixmap = "PartDesign_Mirrored";
@@ -2023,7 +2023,7 @@ void CmdPartDesignMirrored::activated(int iMsg)
finishTransformed(cmd, Feat);
};
prepareTransformed(pcActiveBody, this, "Mirrored", worker);
prepareTransformed(pcActiveBody, this, "Mirror", worker);
}
bool CmdPartDesignMirrored::isActive()
@@ -2041,8 +2041,8 @@ CmdPartDesignLinearPattern::CmdPartDesignLinearPattern()
{
sAppModule = "PartDesign";
sGroup = QT_TR_NOOP("PartDesign");
sMenuText = QT_TR_NOOP("LinearPattern");
sToolTipText = QT_TR_NOOP("Create a linear pattern feature");
sMenuText = QT_TR_NOOP("Linear Pattern");
sToolTipText = QT_TR_NOOP("Duplicates the selected features or the active body in a linear pattern");
sWhatsThis = "PartDesign_LinearPattern";
sStatusTip = sToolTipText;
sPixmap = "PartDesign_LinearPattern";
@@ -2094,8 +2094,8 @@ CmdPartDesignPolarPattern::CmdPartDesignPolarPattern()
{
sAppModule = "PartDesign";
sGroup = QT_TR_NOOP("PartDesign");
sMenuText = QT_TR_NOOP("PolarPattern");
sToolTipText = QT_TR_NOOP("Create a polar pattern feature");
sMenuText = QT_TR_NOOP("Polar Pattern");
sToolTipText = QT_TR_NOOP("Duplicates the selected features or the active body in a circular pattern");
sWhatsThis = "PartDesign_PolarPattern";
sStatusTip = sToolTipText;
sPixmap = "PartDesign_PolarPattern";
@@ -2149,8 +2149,8 @@ CmdPartDesignScaled::CmdPartDesignScaled()
{
sAppModule = "PartDesign";
sGroup = QT_TR_NOOP("PartDesign");
sMenuText = QT_TR_NOOP("Scaled");
sToolTipText = QT_TR_NOOP("Create a scaled feature");
sMenuText = QT_TR_NOOP("Scale");
sToolTipText = QT_TR_NOOP("Scales the selected features or the active body");
sWhatsThis = "PartDesign_Scaled";
sStatusTip = sToolTipText;
sPixmap = "PartDesign_Scaled";
@@ -2173,7 +2173,7 @@ void CmdPartDesignScaled::activated(int iMsg)
finishTransformed(cmd, Feat);
};
prepareTransformed(pcActiveBody, this, "Scaled", worker);
prepareTransformed(pcActiveBody, this, "Scale", worker);
}
bool CmdPartDesignScaled::isActive()
@@ -2191,8 +2191,8 @@ CmdPartDesignMultiTransform::CmdPartDesignMultiTransform()
{
sAppModule = "PartDesign";
sGroup = QT_TR_NOOP("PartDesign");
sMenuText = QT_TR_NOOP("Create MultiTransform");
sToolTipText = QT_TR_NOOP("Create a multitransform feature");
sMenuText = QT_TR_NOOP("Multi-Transform");
sToolTipText = QT_TR_NOOP("Applies multiple transformations to the selected features or active body");
sWhatsThis = "PartDesign_MultiTransform";
sStatusTip = sToolTipText;
sPixmap = "PartDesign_MultiTransform";
@@ -2235,7 +2235,7 @@ void CmdPartDesignMultiTransform::activated(int iMsg)
if (prevFeature)
Gui::Selection().addSelection(prevFeature->getDocument()->getName(), prevFeature->getNameInDocument());
openCommand(QT_TRANSLATE_NOOP("Command", "Convert to MultiTransform feature"));
openCommand(QT_TRANSLATE_NOOP("Command", "Convert to Multi-Transform feature"));
Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager();
rcCmdMgr.runCommandByName("PartDesign_MoveTip");
@@ -2306,8 +2306,8 @@ CmdPartDesignBoolean::CmdPartDesignBoolean()
{
sAppModule = "PartDesign";
sGroup = QT_TR_NOOP("PartDesign");
sMenuText = QT_TR_NOOP("Boolean operation");
sToolTipText = QT_TR_NOOP("Boolean operation with two or more bodies");
sMenuText = QT_TR_NOOP("Boolean Operation");
sToolTipText = QT_TR_NOOP("Applies boolean operations with the selected objects and the active body");
sWhatsThis = "PartDesign_Boolean";
sStatusTip = sToolTipText;
sPixmap = "PartDesign_Boolean";
@@ -2368,8 +2368,8 @@ public:
{
sAppModule = "PartDesign";
sGroup = "PartDesign";
sMenuText = QT_TR_NOOP("Create datum");
sToolTipText = QT_TR_NOOP("Create a datum object or local coordinate system");
sMenuText = QT_TR_NOOP("Create Datum");
sToolTipText = QT_TR_NOOP("Creates a datum object or local coordinate system");
sWhatsThis = "PartDesign_CompDatums";
sStatusTip = sToolTipText;
eType = ForEdit;
@@ -2403,8 +2403,8 @@ public:
{
sAppModule = "PartDesign";
sGroup = "PartDesign";
sMenuText = QT_TR_NOOP("Create datum");
sToolTipText = QT_TR_NOOP("Create a datum object or local coordinate system");
sMenuText = QT_TR_NOOP("Create Datum");
sToolTipText = QT_TR_NOOP("Creates a datum object or local coordinate system");
sWhatsThis = "PartDesign_CompDatums";
sStatusTip = sToolTipText;
eType = ForEdit;

51
src/Mod/PartDesign/Gui/CommandBody.cpp
View File

@@ -85,8 +85,8 @@ CmdPartDesignBody::CmdPartDesignBody()
{
sAppModule = "PartDesign";
sGroup = QT_TR_NOOP("PartDesign");
sMenuText = QT_TR_NOOP("Create body");
sToolTipText = QT_TR_NOOP("Create a new body and make it active");
sMenuText = QT_TR_NOOP("New Body");
sToolTipText = QT_TR_NOOP("Creates a new body and activtes it");
sWhatsThis = "PartDesign_Body";
sStatusTip = sToolTipText;
sPixmap = "PartDesign_Body";
@@ -112,12 +112,12 @@ void CmdPartDesignBody::activated(int iMsg)
PartDesign::Body::findBodyOf ( baseFeature ) ) {
// Prevent creating bodies based on features already belonging to other bodies
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Bad base feature"),
QObject::tr("Body can't be based on a PartDesign feature."));
QObject::tr("A body cannot be based on a Part Design feature."));
baseFeature = nullptr;
}
else if (PartDesign::Body::findBodyOf ( baseFeature )){
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Bad base feature"),
QObject::tr("%1 already belongs to a body, can't use it as base feature for another body.")
QObject::tr("%1 already belongs to a body and cannot be used as a base feature for another body.")
.arg(QString::fromUtf8(baseFeature->Label.getValue())));
baseFeature = nullptr;
}
@@ -313,7 +313,7 @@ CmdPartDesignMigrate::CmdPartDesignMigrate()
sAppModule = "PartDesign";
sGroup = QT_TR_NOOP("PartDesign");
sMenuText = QT_TR_NOOP("Migrate");
sToolTipText = QT_TR_NOOP("Migrate document to the modern PartDesign workflow");
sToolTipText = QT_TR_NOOP("Migrates the document to the modern Part Design workflow");
sWhatsThis = "PartDesign_Migrate";
sStatusTip = sToolTipText;
sPixmap = "PartDesign_Migrate";
@@ -343,7 +343,7 @@ void CmdPartDesignMigrate::activated(int iMsg)
} else {
// Huh? nothing to migrate?
QMessageBox::warning ( nullptr, QObject::tr ( "Nothing to migrate" ),
QObject::tr ( "No PartDesign features found that don't belong to a body."
QObject::tr ( "No Part Design features found that do not belong to a body."
" Nothing to migrate." ) );
}
return;
@@ -429,7 +429,7 @@ void CmdPartDesignMigrate::activated(int iMsg)
}
// do the actual migration
Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Migrate legacy Part Design features to Bodies"));
Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Migrate legacy Part Design features to bodies"));
for ( auto chainIt = featureChains.begin(); !featureChains.empty();
featureChains.erase (chainIt), chainIt = featureChains.begin () ) {
@@ -527,8 +527,8 @@ CmdPartDesignMoveTip::CmdPartDesignMoveTip()
{
sAppModule = "PartDesign";
sGroup = QT_TR_NOOP("PartDesign");
sMenuText = QT_TR_NOOP("Set tip");
sToolTipText = QT_TR_NOOP("Move the tip of the body");
sMenuText = QT_TR_NOOP("Set Tip");
sToolTipText = QT_TR_NOOP("Moves the tip of the body to the selected feature");
sWhatsThis = "PartDesign_MoveTip";
sStatusTip = sToolTipText;
sPixmap = "PartDesign_MoveTip";
@@ -555,11 +555,11 @@ void CmdPartDesignMoveTip::activated(int iMsg)
if (!selFeature) {
QMessageBox::warning (nullptr, QObject::tr( "Selection error" ),
QObject::tr( "Select exactly one PartDesign feature or a body." ) );
QObject::tr( "Select exactly one Part Design feature or a body." ) );
return;
} else if (!body) {
QMessageBox::warning (nullptr, QObject::tr( "Selection error" ),
QObject::tr( "Couldn't determine a body for the selected feature '%s'.", selFeature->Label.getValue() ) );
QObject::tr( "Could not determine a body for the selected feature '%s'.", selFeature->Label.getValue() ) );
return;
} else if ( !selFeature->isDerivedFrom(PartDesign::Feature::getClassTypeId () ) &&
selFeature != body && body->BaseFeature.getValue() != selFeature ) {
@@ -606,7 +606,7 @@ CmdPartDesignDuplicateSelection::CmdPartDesignDuplicateSelection()
{
sAppModule = "PartDesign";
sGroup = QT_TR_NOOP("PartDesign");
sMenuText = QT_TR_NOOP("Duplicate selected &object");
sMenuText = QT_TR_NOOP("Duplicate &Object");
sToolTipText = QT_TR_NOOP("Duplicates the selected object and adds it to the active body");
sWhatsThis = "PartDesign_DuplicateSelection";
sStatusTip = sToolTipText;
@@ -619,7 +619,7 @@ void CmdPartDesignDuplicateSelection::activated(int iMsg)
std::vector<App::DocumentObject*> beforeFeatures = getDocument()->getObjects();
openCommand(QT_TRANSLATE_NOOP("Command", "Duplicate a PartDesign object"));
openCommand(QT_TRANSLATE_NOOP("Command", "Duplicate a Part Design object"));
doCommand(Doc,"FreeCADGui.runCommand('Std_DuplicateSelection')");
if (pcActiveBody) {
@@ -666,7 +666,7 @@ CmdPartDesignMoveFeature::CmdPartDesignMoveFeature()
{
sAppModule = "PartDesign";
sGroup = QT_TR_NOOP("PartDesign");
sMenuText = QT_TR_NOOP("Move object to other body");
sMenuText = QT_TR_NOOP("Move Object To…");
sToolTipText = QT_TR_NOOP("Moves the selected object to another body");
sWhatsThis = "PartDesign_MoveFeature";
sStatusTip = sToolTipText;
@@ -709,7 +709,7 @@ void CmdPartDesignMoveFeature::activated(int iMsg)
if (source_bodies.size() != 1) {
//show messagebox and cancel
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Features cannot be moved"),
QObject::tr("Only features of a single source Body can be moved"));
QObject::tr("Only features of a single source body can be moved"));
return;
}
@@ -833,8 +833,8 @@ CmdPartDesignMoveFeatureInTree::CmdPartDesignMoveFeatureInTree()
{
sAppModule = "PartDesign";
sGroup = QT_TR_NOOP("PartDesign");
sMenuText = QT_TR_NOOP("Move object after other object");
sToolTipText = QT_TR_NOOP("Moves the selected object and insert it after another object");
sMenuText = QT_TR_NOOP("Move Feature After…");
sToolTipText = QT_TR_NOOP("Moves the selected feature after another feature in the same body");
sWhatsThis = "PartDesign_MoveFeatureInTree";
sStatusTip = sToolTipText;
sPixmap = "PartDesign_MoveFeatureInTree";
@@ -887,17 +887,22 @@ void CmdPartDesignMoveFeatureInTree::activated(int iMsg)
items.push_back( QString::fromUtf8 ( feat->Label.getValue() ) );
}
QString text = QInputDialog::getItem(Gui::getMainWindow(),
qApp->translate("PartDesign_MoveFeatureInTree", "Select feature"),
QString text = QInputDialog::getItem(
Gui::getMainWindow(),
qApp->translate("PartDesign_MoveFeatureInTree", "Move Feature After…"),
qApp->translate("PartDesign_MoveFeatureInTree", "Select a feature from the list"),
items, 0, false, &ok, Qt::MSWindowsFixedSizeDialogHint);
items,
0,
false,
&ok,
Qt::MSWindowsFixedSizeDialogHint);
if (!ok)
return;
int index = items.indexOf(text);
// first object is the beginning of the body
App::DocumentObject* target = index != 0 ? model[index-1] : nullptr;
openCommand(QT_TRANSLATE_NOOP("Command", "Move an object inside tree"));
openCommand(QT_TRANSLATE_NOOP("Command", "Move a feature inside body"));
App::DocumentObject* lastObject = target;
for ( auto feat: features ) {
@@ -959,9 +964,9 @@ void CmdPartDesignMoveFeatureInTree::activated(int iMsg)
&& lastObject->isDerivedFrom<PartDesign::Feature>() ) {
QMessageBox msgBox(Gui::getMainWindow());
msgBox.setIcon(QMessageBox::Question);
msgBox.setWindowTitle(qApp->translate("PartDesign_MoveFeatureInTree", "Move tip"));
msgBox.setWindowTitle(qApp->translate("PartDesign_MoveFeatureInTree", "Move Tip"));
msgBox.setText(qApp->translate("PartDesign_MoveFeatureInTree", "The moved feature appears after the currently set tip."));
msgBox.setInformativeText(qApp->translate("PartDesign_MoveFeatureInTree", "Do you want the last feature to be the new tip?"));
msgBox.setInformativeText(qApp->translate("PartDesign_MoveFeatureInTree", "Set tip to last feature?"));
msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
msgBox.setDefaultButton(QMessageBox::No);
int ret = msgBox.exec();

40
src/Mod/PartDesign/Gui/CommandPrimitive.cpp
View File

@@ -66,8 +66,8 @@ CmdPrimtiveCompAdditive::CmdPrimtiveCompAdditive()
{
sAppModule = "PartDesign";
sGroup = QT_TR_NOOP("PartDesign");
sMenuText = QT_TR_NOOP("Create an additive primitive");
sToolTipText = QT_TR_NOOP("Create an additive primitive");
sMenuText = QT_TR_NOOP("Additive Primitive");
sToolTipText = QT_TR_NOOP("Creates an additive primitive");
sWhatsThis = "PartDesign_CompPrimitiveAdditive";
sStatusTip = sToolTipText;
eType = ForEdit;
@@ -195,35 +195,35 @@ void CmdPrimtiveCompAdditive::languageChange()
QAction* arc1 = a[0];
arc1->setText(QApplication::translate("CmdPrimtiveCompAdditive","Additive Box"));
arc1->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Create an additive box by its width, height, and length"));
arc1->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Creates an additive box by its width, height, and length"));
arc1->setStatusTip(arc1->toolTip());
QAction* arc2 = a[1];
arc2->setText(QApplication::translate("CmdPrimtiveCompAdditive","Additive Cylinder"));
arc2->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Create an additive cylinder by its radius, height, and angle"));
arc2->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Creates an additive cylinder by its radius, height, and angle"));
arc2->setStatusTip(arc2->toolTip());
QAction* arc3 = a[2];
arc3->setText(QApplication::translate("CmdPrimtiveCompAdditive","Additive Sphere"));
arc3->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Create an additive sphere by its radius and various angles"));
arc3->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Creates an additive sphere by its radius and various angles"));
arc3->setStatusTip(arc3->toolTip());
QAction* arc4 = a[3];
arc4->setText(QApplication::translate("CmdPrimtiveCompAdditive","Additive Cone"));
arc4->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Create an additive cone"));
arc4->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Creates an additive cone"));
arc4->setStatusTip(arc4->toolTip());
QAction* arc5 = a[4];
arc5->setText(QApplication::translate("CmdPrimtiveCompAdditive","Additive Ellipsoid"));
arc5->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Create an additive ellipsoid"));
arc5->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Creates an additive ellipsoid"));
arc5->setStatusTip(arc5->toolTip());
QAction* arc6 = a[5];
arc6->setText(QApplication::translate("CmdPrimtiveCompAdditive","Additive Torus"));
arc6->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Create an additive torus"));
arc6->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Creates an additive torus"));
arc6->setStatusTip(arc6->toolTip());
QAction* arc7 = a[6];
arc7->setText(QApplication::translate("CmdPrimtiveCompAdditive","Additive Prism"));
arc7->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Create an additive prism"));
arc7->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Creates an additive prism"));
arc7->setStatusTip(arc7->toolTip());
QAction* arc8 = a[7];
arc8->setText(QApplication::translate("CmdPrimtiveCompAdditive","Additive Wedge"));
arc8->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Create an additive wedge"));
arc8->setToolTip(QApplication::translate("PartDesign_CompPrimitiveAdditive","Creates an additive wedge"));
arc8->setStatusTip(arc8->toolTip());
}
@@ -239,8 +239,8 @@ CmdPrimtiveCompSubtractive::CmdPrimtiveCompSubtractive()
{
sAppModule = "PartDesign";
sGroup = QT_TR_NOOP("PartDesign");
sMenuText = QT_TR_NOOP("Create a subtractive primitive");
sToolTipText = QT_TR_NOOP("Create a subtractive primitive");
sMenuText = QT_TR_NOOP("Subtractive Primitive");
sToolTipText = QT_TR_NOOP("Creates a subtractive primitive");
sWhatsThis = "PartDesign_CompPrimitiveSubtractive";
sStatusTip = sToolTipText;
eType = ForEdit;
@@ -347,35 +347,35 @@ void CmdPrimtiveCompSubtractive::languageChange()
QAction* arc1 = a[0];
arc1->setText(QApplication::translate("CmdPrimtiveCompSubtractive","Subtractive Box"));
arc1->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Create a subtractive box by its width, height and length"));
arc1->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Creates a subtractive box by its width, height and length"));
arc1->setStatusTip(arc1->toolTip());
QAction* arc2 = a[1];
arc2->setText(QApplication::translate("CmdPrimtiveCompSubtractive","Subtractive Cylinder"));
arc2->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Create a subtractive cylinder by its radius, height and angle"));
arc2->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Creates a subtractive cylinder by its radius, height and angle"));
arc2->setStatusTip(arc2->toolTip());
QAction* arc3 = a[2];
arc3->setText(QApplication::translate("CmdPrimtiveCompSubtractive","Subtractive Sphere"));
arc3->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Create a subtractive sphere by its radius and various angles"));
arc3->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Creates a subtractive sphere by its radius and various angles"));
arc3->setStatusTip(arc3->toolTip());
QAction* arc4 = a[3];
arc4->setText(QApplication::translate("CmdPrimtiveCompSubtractive","Subtractive Cone"));
arc4->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Create a subtractive cone"));
arc4->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Creates a subtractive cone"));
arc4->setStatusTip(arc4->toolTip());
QAction* arc5 = a[4];
arc5->setText(QApplication::translate("CmdPrimtiveCompSubtractive","Subtractive Ellipsoid"));
arc5->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Create a subtractive ellipsoid"));
arc5->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Creates a subtractive ellipsoid"));
arc5->setStatusTip(arc5->toolTip());
QAction* arc6 = a[5];
arc6->setText(QApplication::translate("CmdPrimtiveCompSubtractive","Subtractive Torus"));
arc6->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Create a subtractive torus"));
arc6->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Creates a subtractive torus"));
arc6->setStatusTip(arc6->toolTip());
QAction* arc7 = a[6];
arc7->setText(QApplication::translate("CmdPrimtiveCompSubtractive","Subtractive Prism"));
arc7->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Create a subtractive prism"));
arc7->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Creates a subtractive prism"));
arc7->setStatusTip(arc7->toolTip());
QAction* arc8 = a[7];
arc8->setText(QApplication::translate("CmdPrimtiveCompSubtractive","Subtractive Wedge"));
arc8->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Create a subtractive wedge"));
arc8->setToolTip(QApplication::translate("PartDesign_CompPrimitiveSubtractive","Creates a subtractive wedge"));
arc8->setStatusTip(arc8->toolTip());
}

7
src/Mod/PartDesign/Gui/DlgActiveBody.ui
View File

@@ -17,9 +17,8 @@
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>To create a new PartDesign object, there must be an active Body object in the document.
Please select a body from below, or create a new body.</string>
<string>To create a new Part Design object, there must be an active body object in the document.
Select a body from below, or create a new body.</string>
</property>
<property name="scaledContents">
<bool>true</bool>
@@ -33,7 +32,7 @@ Please select a body from below, or create a new body.</string>
<widget class="QListWidget" name="bodySelect">
<item>
<property name="text">
<string>Create new body</string>
<string>Create New Body</string>
</property>
</item>
</widget>

4
src/Mod/PartDesign/Gui/FeaturePickDialog.cpp
View File

@@ -43,9 +43,9 @@ const QString FeaturePickDialog::getFeatureStatusString(const featureStatus st)
case invalidShape: return tr("Invalid shape");
case noWire: return tr("No wire in sketch");
case isUsed: return tr("Sketch already used by other feature");
case otherBody: return tr("Sketch belongs to another Body feature");
case otherBody: return tr("Sketch belongs to another body feature");
case basePlane: return tr("Base plane");
case afterTip: return tr("Feature is located after the Tip feature");
case afterTip: return tr("Feature is located after the tip of the body");
}
return tr("");

16
src/Mod/PartDesign/Gui/SketchWorkflow.cpp
View File

@@ -246,7 +246,7 @@ public:
App::Document* appdocument = guidocument->getDocument();
std::string FeatName = appdocument->getUniqueObjectName("Sketch");
guidocument->openCommand(QT_TRANSLATE_NOOP("Command", "Create a Sketch on Face"));
guidocument->openCommand(QT_TRANSLATE_NOOP("Command", "Sketch on Face"));
FCMD_OBJ_CMD(activeBody, "newObject('Sketcher::SketchObject','" << FeatName << "')");
auto Feat = activeBody->getDocument()->getObject(FeatName.c_str());
FCMD_OBJ_CMD(Feat, "AttachmentSupport = " << supportString);
@@ -492,7 +492,7 @@ public:
{
try {
// Start command early, so undo will undo any Body creation
guidocument->openCommand(QT_TRANSLATE_NOOP("Command", "Create a new Sketch"));
guidocument->openCommand(QT_TRANSLATE_NOOP("Command", "New Sketch"));
tryFindSupport();
}
catch (const RejectException&) {
@@ -659,7 +659,7 @@ private:
if (dlg && !pickDlg) {
QMessageBox msgBox(Gui::getMainWindow());
msgBox.setText(QObject::tr("A dialog is already open in the task panel"));
msgBox.setInformativeText(QObject::tr("Do you want to close this dialog?"));
msgBox.setInformativeText(QObject::tr("Close this dialog?"));
msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
msgBox.setDefaultButton(QMessageBox::Yes);
int ret = msgBox.exec();
@@ -698,7 +698,7 @@ private:
App::Document* doc = partDesignBody->getDocument();
if (!doc->hasPendingTransaction()) {
doc->openTransaction(QT_TRANSLATE_NOOP("Command", "Create a new Sketch"));
doc->openTransaction(QT_TRANSLATE_NOOP("Command", "New Sketch"));
}
FCMD_OBJ_CMD(partDesignBody,"newObject('Sketcher::SketchObject','" << FeatName << "')");
@@ -732,19 +732,19 @@ void SketchWorkflow::createSketch()
}
catch (const WrongSelectionException&) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Several sub-elements selected"),
QObject::tr("You have to select a single face as support for a sketch!"));
QObject::tr("Select a single face as support for a sketch!"));
}
catch (const WrongSupportException&) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("No support face selected"),
QObject::tr("You have to select a face as support for a sketch!"));
QObject::tr("Select a face as support for a sketch!"));
}
catch (const SupportNotPlanarException&) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("No planar support"),
QObject::tr("You need a planar face as support for a sketch!"));
QObject::tr("Need a planar face as support for a sketch!"));
}
catch (const MissingPlanesException&) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("No valid planes in this document"),
QObject::tr("Please create a plane first or select a face to sketch on"));
QObject::tr("Create a plane first or select a face to sketch on"));
}
}

2
src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp
View File

@@ -51,7 +51,7 @@ using namespace Gui;
TaskBooleanParameters::TaskBooleanParameters(ViewProviderBoolean* BooleanView, QWidget* parent)
: TaskBox(Gui::BitmapFactory().pixmap("PartDesign_Boolean"),
tr("Boolean parameters"),
tr("Boolean Parameters"),
true,
parent)
, ui(new Ui_TaskBooleanParameters)

4
src/Mod/PartDesign/Gui/TaskBooleanParameters.ui
View File

@@ -19,7 +19,7 @@
<item>
<widget class="QToolButton" name="buttonBodyAdd">
<property name="text">
<string>Add body</string>
<string>Add Body</string>
</property>
<property name="checkable">
<bool>true</bool>
@@ -29,7 +29,7 @@
<item>
<widget class="QToolButton" name="buttonBodyRemove">
<property name="text">
<string>Remove body</string>
<string>Remove Body</string>
</property>
<property name="checkable">
<bool>true</bool>

7
src/Mod/PartDesign/Gui/TaskChamferParameters.ui
View File

@@ -17,8 +17,7 @@
<item>
<widget class="QToolButton" name="buttonRefSel">
<property name="toolTip">
<string>Click button to enter selection mode,
click again to end selection</string>
<string>Toggles between selection and preview mode</string>
</property>
<property name="text">
<string>Select</string>
@@ -77,7 +76,7 @@ click again to end selection</string>
<bool>false</bool>
</property>
<property name="toolTip">
<string>Flip direction</string>
<string>Flips the direction</string>
</property>
<property name="text">
<string/>
@@ -117,7 +116,7 @@ click again to end selection</string>
<item>
<widget class="QCheckBox" name="checkBoxUseAllEdges">
<property name="text">
<string>Use All Edges</string>
<string>Use all edges</string>
</property>
</widget>
</item>

2
src/Mod/PartDesign/Gui/TaskDatumParameters.cpp
View File

@@ -98,7 +98,7 @@ bool TaskDlgDatumParameters::accept() {
//see if we are able to assign a mode
if (parameter->getActiveMapMode() == mmDeactivated) {
QMessageBox msg(Gui::getMainWindow());
msg.setWindowTitle(tr("Incompatible reference set"));
msg.setWindowTitle(tr("Incompatible Reference Set"));
msg.setText(tr("There is no attachment mode that fits the current set"
" of references. If you choose to continue, the feature will remain where"
" it is now, and will not be moved as the references change."

7
src/Mod/PartDesign/Gui/TaskDraftParameters.ui
View File

@@ -17,8 +17,7 @@
<item>
<widget class="QToolButton" name="buttonRefSel">
<property name="toolTip">
<string>Click button to enter selection mode,
click again to end selection</string>
<string>Toggles between selection and preview mode</string>
</property>
<property name="text">
<string>Select</string>
@@ -77,7 +76,7 @@ click again to end selection</string>
<item>
<widget class="QToolButton" name="buttonPlane">
<property name="text">
<string>Neutral plane</string>
<string>Neutral Plane</string>
</property>
<property name="checkable">
<bool>true</bool>
@@ -94,7 +93,7 @@ click again to end selection</string>
<item>
<widget class="QToolButton" name="buttonLine">
<property name="text">
<string>Pull direction</string>
<string>Pull Direction</string>
</property>
<property name="checkable">
<bool>true</bool>

4
src/Mod/PartDesign/Gui/TaskDressUpParameters.cpp
View File

@@ -291,12 +291,12 @@ void TaskDressUpParameters::createAddAllEdgesAction(QListWidget* parentList)
{
// creates a context menu, a shortcut for it and connects it to a slot function
addAllEdgesAction = new QAction(tr("Add all edges"), this);
addAllEdgesAction = new QAction(tr("Add All Edges"), this);
addAllEdgesAction->setShortcut(QKeySequence(QStringLiteral("Ctrl+Shift+A")));
// display shortcut behind the context menu entry
addAllEdgesAction->setShortcutVisibleInContextMenu(true);
parentList->addAction(addAllEdgesAction);
addAllEdgesAction->setStatusTip(tr("Adds all edges to the list box (active only when in add selection mode)."));
addAllEdgesAction->setStatusTip(tr("Adds all edges to the list box (only when in add selection mode)"));
parentList->setContextMenuPolicy(Qt::ActionsContextMenu);
}

4
src/Mod/PartDesign/Gui/TaskExtrudeParameters.cpp
View File

@@ -264,7 +264,7 @@ void TaskExtrudeParameters::onSelectShapeFacesToggle(bool checked)
}
else {
setSelectionMode(None);
ui->buttonShapeFace->setText(tr("Select faces"));
ui->buttonShapeFace->setText(tr("Select Faces"));
}
}
@@ -602,7 +602,7 @@ void TaskExtrudeParameters::fillDirectionCombo()
}
// add the other entries
addAxisToCombo(nullptr, std::string(), tr("Select reference..."));
addAxisToCombo(nullptr, std::string(), tr("Select reference…"));
// we start with the sketch normal as proposal for the custom direction
if (pcSketch) {

2
src/Mod/PartDesign/Gui/TaskFeaturePick.cpp
View File

@@ -80,7 +80,7 @@ const QString TaskFeaturePick::getFeatureStatusString(const featureStatus st)
case basePlane:
return tr("Base plane");
case afterTip:
return tr("Feature is located after the tip feature");
return tr("Feature is located after the tip of the body");
}
return QString();

2
src/Mod/PartDesign/Gui/TaskFeaturePick.ui
View File

@@ -27,7 +27,7 @@
<item>
<widget class="QGroupBox" name="checkExternal">
<property name="title">
<string>Allow external features</string>
<string>Allow External Features</string>
</property>
<property name="checkable">
<bool>false</bool>

7
src/Mod/PartDesign/Gui/TaskFilletParameters.ui
View File

@@ -17,8 +17,7 @@
<item>
<widget class="QToolButton" name="buttonRefSel">
<property name="toolTip">
<string>Click button to enter selection mode,
click again to end selection</string>
<string>Toggles between selection and preview mode</string>
</property>
<property name="text">
<string>Select</string>
@@ -44,7 +43,7 @@ click again to end selection</string>
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Radius:</string>
<string>Radius</string>
</property>
</widget>
</item>
@@ -60,7 +59,7 @@ click again to end selection</string>
<item>
<widget class="QCheckBox" name="checkBoxUseAllEdges">
<property name="text">
<string>Use All Edges</string>
<string>Use all edges</string>
</property>
</widget>
</item>

12
src/Mod/PartDesign/Gui/TaskHelixParameters.cpp
View File

@@ -53,7 +53,7 @@ TaskHelixParameters::TaskHelixParameters(PartDesignGui::ViewProviderHelix* Helix
: TaskSketchBasedParameters(HelixView,
parent,
"PartDesign_AdditiveHelix",
tr("Helix parameters"))
tr("Helix Parameters"))
, ui(new Ui_TaskHelixParameters)
{
// we need a separate container widget to add all controls to
@@ -201,7 +201,7 @@ void TaskHelixParameters::fillAxisCombo(bool forceRefill)
addPartAxes();
// add "Select reference"
addAxisToCombo(nullptr, std::string(), tr("Select reference..."));
addAxisToCombo(nullptr, std::string(), tr("Select reference…"));
}
// add current link, if not in list and highlight it
@@ -234,9 +234,9 @@ void TaskHelixParameters::addPartAxes()
if (PartDesign::Body* body = PartDesign::Body::findBodyOf(profile)) {
try {
App::Origin* orig = body->getOrigin();
addAxisToCombo(orig->getX(), "", tr("Base X axis"));
addAxisToCombo(orig->getY(), "", tr("Base Y axis"));
addAxisToCombo(orig->getZ(), "", tr("Base Z axis"));
addAxisToCombo(orig->getX(), "", tr("Base x-axis"));
addAxisToCombo(orig->getY(), "", tr("Base y-axis"));
addAxisToCombo(orig->getZ(), "", tr("Base z-axis"));
}
catch (const Base::Exception& ex) {
ex.reportException();
@@ -625,7 +625,7 @@ void TaskHelixParameters::getReferenceAxis(App::DocumentObject*& obj,
const App::PropertyLinkSub& lnk = *(axesInList.at(num));
if (!lnk.getValue()) {
throw Base::RuntimeError(
"Still in reference selection mode; reference wasn't selected yet");
"Still in reference selection mode; reference was not selected yet");
}
else {
auto revolution = getObject<PartDesign::ProfileBased>();

24
src/Mod/PartDesign/Gui/TaskHelixParameters.ui
View File

@@ -19,7 +19,7 @@
<item>
<widget class="QLabel" name="labelStatus">
<property name="text">
<string>Status:</string>
<string>Status</string>
</property>
</widget>
</item>
@@ -37,7 +37,7 @@
<item>
<widget class="QLabel" name="labelAxis">
<property name="text">
<string>Axis:</string>
<string>Axis</string>
</property>
</widget>
</item>
@@ -45,17 +45,17 @@
<widget class="QComboBox" name="axis">
<item>
<property name="text">
<string>Base X axis</string>
<string>Base x-axis</string>
</property>
</item>
<item>
<property name="text">
<string>Base Y axis</string>
<string>Base y-axis</string>
</property>
</item>
<item>
<property name="text">
<string>Base Z axis</string>
<string>Base z-axis</string>
</property>
</item>
<item>
@@ -75,7 +75,7 @@
</item>
<item>
<property name="text">
<string>Select reference...</string>
<string>Select reference…</string>
</property>
</item>
</widget>
@@ -87,7 +87,7 @@
<item>
<widget class="QLabel" name="labelInputMode">
<property name="text">
<string>Mode:</string>
<string>Mode</string>
</property>
</widget>
</item>
@@ -122,7 +122,7 @@
<item>
<widget class="QLabel" name="labelPitch">
<property name="text">
<string>Pitch:</string>
<string>Pitch</string>
</property>
</widget>
</item>
@@ -149,7 +149,7 @@
<item>
<widget class="QLabel" name="labelHeight">
<property name="text">
<string>Height:</string>
<string>Height</string>
</property>
</widget>
</item>
@@ -176,7 +176,7 @@
<item>
<widget class="QLabel" name="labelTurns">
<property name="text">
<string>Turns:</string>
<string>Turns</string>
</property>
</widget>
</item>
@@ -200,7 +200,7 @@
<item>
<widget class="QLabel" name="labelConeAngle">
<property name="text">
<string>Cone angle:</string>
<string>Cone angle</string>
</property>
</widget>
</item>
@@ -230,7 +230,7 @@
<item>
<widget class="QLabel" name="labelGrowth">
<property name="text">
<string>Radial growth:</string>
<string>Radial growth</string>
</property>
</widget>
</item>

2
src/Mod/PartDesign/Gui/TaskHoleParameters.cpp
View File

@@ -50,7 +50,7 @@ namespace sp = std::placeholders;
#endif
TaskHoleParameters::TaskHoleParameters(ViewProviderHole* HoleView, QWidget* parent)
: TaskSketchBasedParameters(HoleView, parent, "PartDesign_Hole", tr("Hole parameters"))
: TaskSketchBasedParameters(HoleView, parent, "PartDesign_Hole", tr("Hole Parameters"))
, observer(new Observer(this, getObject<PartDesign::Hole>()))
, isApplying(false)
, ui(new Ui_TaskHoleParameters)

16
src/Mod/PartDesign/Gui/TaskHoleParameters.ui
View File

@@ -17,7 +17,7 @@
</sizepolicy>
</property>
<property name="windowTitle">
<string>Task Hole Parameters</string>
<string>Hole Parameters</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="leftMargin">
@@ -75,7 +75,7 @@
<enum>Qt::LayoutDirection::RightToLeft</enum>
</property>
<property name="text">
<string>Head Type</string>
<string>Head type</string>
</property>
</widget>
</item>
@@ -114,7 +114,7 @@
<enum>Qt::LayoutDirection::LeftToRight</enum>
</property>
<property name="text">
<string>Depth Type</string>
<string>Depth type</string>
</property>
</widget>
</item>
@@ -196,7 +196,7 @@
</sizepolicy>
</property>
<property name="text">
<string>Head Diameter</string>
<string>Head diameter</string>
</property>
</widget>
</item>
@@ -244,7 +244,7 @@
</sizepolicy>
</property>
<property name="text">
<string>Head Depth</string>
<string>Head depth</string>
</property>
</widget>
</item>
@@ -670,12 +670,12 @@ over 90: larger hole radius at the bottom</string>
</item>
<item>
<property name="text">
<string>Tap Drill (To Be Threaded)</string>
<string>Tap drill (to be threaded)</string>
</property>
</item>
<item>
<property name="text">
<string>Modeled Thread</string>
<string>Modeled thread</string>
</property>
</item>
</widget>
@@ -683,7 +683,7 @@ over 90: larger hole radius at the bottom</string>
<item row="2" column="0">
<widget class="Gui::ElideLabel" name="labelHoleType">
<property name="text">
<string>Hole Type</string>
<string>Hole type</string>
</property>
</widget>
</item>

2
src/Mod/PartDesign/Gui/TaskLinearPatternParameters.ui
View File

@@ -60,7 +60,7 @@
<widget class="QComboBox" name="comboMode">
<item>
<property name="text">
<string>Overall Length</string>
<string>Overall length</string>
</property>
</item>
<item>

2
src/Mod/PartDesign/Gui/TaskLoftParameters.cpp
View File

@@ -48,7 +48,7 @@ using namespace Gui;
/* TRANSLATOR PartDesignGui::TaskLoftParameters */
TaskLoftParameters::TaskLoftParameters(ViewProviderLoft* LoftView, bool /*newObj*/, QWidget* parent)
: TaskSketchBasedParameters(LoftView, parent, "PartDesign_AdditiveLoft", tr("Loft parameters"))
: TaskSketchBasedParameters(LoftView, parent, "PartDesign_AdditiveLoft", tr("Loft Parameters"))
, ui(new Ui_TaskLoftParameters)
{
// we need a separate container widget to add all controls to

30
src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp
View File

@@ -80,34 +80,34 @@ void TaskMultiTransformParameters::setupParameterUI(QWidget* widget)
this,
&TaskMultiTransformParameters::onTransformDelete);
ui->listTransformFeatures->addAction(action);
action = new QAction(tr("Add mirrored transformation"), ui->listTransformFeatures);
action = new QAction(tr("Add Mirror Transformation"), ui->listTransformFeatures);
action->connect(action,
&QAction::triggered,
this,
&TaskMultiTransformParameters::onTransformAddMirrored);
ui->listTransformFeatures->addAction(action);
action = new QAction(tr("Add linear pattern"), ui->listTransformFeatures);
action = new QAction(tr("Add Linear Pattern"), ui->listTransformFeatures);
action->connect(action,
&QAction::triggered,
this,
&TaskMultiTransformParameters::onTransformAddLinearPattern);
ui->listTransformFeatures->addAction(action);
action = new QAction(tr("Add polar pattern"), ui->listTransformFeatures);
action = new QAction(tr("Add Polar Pattern"), ui->listTransformFeatures);
action->connect(action,
&QAction::triggered,
this,
&TaskMultiTransformParameters::onTransformAddPolarPattern);
ui->listTransformFeatures->addAction(action);
action = new QAction(tr("Add scaled transformation"), ui->listTransformFeatures);
action = new QAction(tr("Add Scale Transformation"), ui->listTransformFeatures);
action->connect(action,
&QAction::triggered,
this,
&TaskMultiTransformParameters::onTransformAddScaled);
ui->listTransformFeatures->addAction(action);
action = new QAction(tr("Move up"), ui->listTransformFeatures);
action = new QAction(tr("Move Up"), ui->listTransformFeatures);
action->connect(action, &QAction::triggered, this, &TaskMultiTransformParameters::onMoveUp);
ui->listTransformFeatures->addAction(action);
action = new QAction(tr("Move down"), ui->listTransformFeatures);
action = new QAction(tr("Move Down"), ui->listTransformFeatures);
action->connect(action, &QAction::triggered, this, &TaskMultiTransformParameters::onMoveDown);
ui->listTransformFeatures->addAction(action);
ui->listTransformFeatures->setContextMenuPolicy(Qt::ActionsContextMenu);
@@ -141,7 +141,7 @@ void TaskMultiTransformParameters::setupParameterUI(QWidget* widget)
editHint = false;
}
else {
ui->listTransformFeatures->addItem(tr("Right-click to add"));
ui->listTransformFeatures->addItem(tr("Right-click to add a transformation"));
editHint = true;
}
}
@@ -257,14 +257,14 @@ void TaskMultiTransformParameters::onTransformActivated(const QModelIndex& index
void TaskMultiTransformParameters::onTransformAddMirrored()
{
closeSubTask();
std::string newFeatName = TransformedView->getObject()->getDocument()->getUniqueObjectName("Mirrored");
std::string newFeatName = TransformedView->getObject()->getDocument()->getUniqueObjectName("Mirror");
auto pcBody = dynamic_cast<PartDesign::Body*>(Part::BodyBase::findBodyOf(getTopTransformedObject()));
if (!pcBody) {
return;
}
if (isEnabledTransaction()) {
Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Mirrored"));
Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Mirror"));
}
FCMD_OBJ_CMD(pcBody, "newObject('PartDesign::Mirrored','"<<newFeatName<<"')");
@@ -294,14 +294,14 @@ void TaskMultiTransformParameters::onTransformAddLinearPattern()
// See CmdPartDesignLinearPattern
//
closeSubTask();
std::string newFeatName = TransformedView->getObject()->getDocument()->getUniqueObjectName("LinearPattern");
std::string newFeatName = TransformedView->getObject()->getDocument()->getUniqueObjectName("Linear Pattern");
auto pcBody = dynamic_cast<PartDesign::Body*>(Part::BodyBase::findBodyOf(getTopTransformedObject()));
if (!pcBody) {
return;
}
if (isEnabledTransaction()) {
Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Make LinearPattern"));
Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Linear Pattern"));
}
FCMD_OBJ_CMD(pcBody, "newObject('PartDesign::LinearPattern','"<<newFeatName<<"')");
@@ -338,14 +338,14 @@ void TaskMultiTransformParameters::onTransformAddLinearPattern()
void TaskMultiTransformParameters::onTransformAddPolarPattern()
{
closeSubTask();
std::string newFeatName = TransformedView->getObject()->getDocument()->getUniqueObjectName("PolarPattern");
std::string newFeatName = TransformedView->getObject()->getDocument()->getUniqueObjectName("Polar Pattern");
auto pcBody = dynamic_cast<PartDesign::Body*>(Part::BodyBase::findBodyOf(getTopTransformedObject()));
if (!pcBody) {
return;
}
if (isEnabledTransaction()) {
Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "PolarPattern"));
Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Polar Pattern"));
}
FCMD_OBJ_CMD(pcBody, "newObject('PartDesign::PolarPattern','"<<newFeatName<<"')");
@@ -375,14 +375,14 @@ void TaskMultiTransformParameters::onTransformAddPolarPattern()
void TaskMultiTransformParameters::onTransformAddScaled()
{
closeSubTask();
std::string newFeatName = TransformedView->getObject()->getDocument()->getUniqueObjectName("Scaled");
std::string newFeatName = TransformedView->getObject()->getDocument()->getUniqueObjectName("Scale");
auto pcBody = dynamic_cast<PartDesign::Body*>(Part::BodyBase::findBodyOf(getTopTransformedObject()));
if (!pcBody) {
return;
}
if (isEnabledTransaction()) {
Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Scaled"));
Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Scale"));
}
FCMD_OBJ_CMD(pcBody, "newObject('PartDesign::Scaled','"<<newFeatName<<"')");

4
src/Mod/PartDesign/Gui/TaskPadParameters.cpp
View File

@@ -37,9 +37,9 @@ using namespace Gui;
/* TRANSLATOR PartDesignGui::TaskPadParameters */
TaskPadParameters::TaskPadParameters(ViewProviderPad *PadView, QWidget *parent, bool newObj)
: TaskExtrudeParameters(PadView, parent, "PartDesign_Pad", tr("Pad parameters"))
: TaskExtrudeParameters(PadView, parent, "PartDesign_Pad", tr("Pad Parameters"))
{
ui->offsetEdit->setToolTip(tr("Offset from face at which pad will end"));
ui->offsetEdit->setToolTip(tr("Offsets the pad from the face at which the pad will end"));
ui->checkBoxReversed->setToolTip(tr("Reverses pad direction"));
// set the history path

19
src/Mod/PartDesign/Gui/TaskPadPocketParameters.ui
View File

@@ -167,8 +167,7 @@
<item>
<widget class="QToolButton" name="buttonShapeFace">
<property name="toolTip">
<string>Click button to enter selection mode,
click again to end selection</string>
<string>Toggles between selection and preview mode</string>
</property>
<property name="text">
<string>Select</string>
@@ -249,7 +248,7 @@
<item row="0" column="0">
<widget class="QLabel" name="labelEdge">
<property name="text">
<string>Direction/edge:</string>
<string>Direction/edge</string>
</property>
</widget>
</item>
@@ -266,7 +265,7 @@ from the model as reference</string>
</item>
<item>
<property name="text">
<string>Select reference...</string>
<string>Select reference…</string>
</property>
</item>
<item>
@@ -304,14 +303,14 @@ the sketch plane's normal vector will be used</string>
<item row="0" column="0">
<widget class="QLabel" name="labelXSkew">
<property name="text">
<string>x</string>
<string>X</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="Gui::DoubleSpinBox" name="XDirectionEdit">
<property name="toolTip">
<string>x-component of direction vector</string>
<string>X-component of direction vector</string>
</property>
<property name="keyboardTracking">
<bool>false</bool>
@@ -333,14 +332,14 @@ the sketch plane's normal vector will be used</string>
<item row="1" column="0">
<widget class="QLabel" name="labelYSkew">
<property name="text">
<string>y</string>
<string>Y</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="Gui::DoubleSpinBox" name="YDirectionEdit">
<property name="toolTip">
<string>y-component of direction vector</string>
<string>Y-component of direction vector</string>
</property>
<property name="keyboardTracking">
<bool>false</bool>
@@ -362,14 +361,14 @@ the sketch plane's normal vector will be used</string>
<item row="2" column="0">
<widget class="QLabel" name="labelZSkew">
<property name="text">
<string>z</string>
<string>Z</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="Gui::DoubleSpinBox" name="ZDirectionEdit">
<property name="toolTip">
<string>z-component of direction vector</string>
<string>Z-component of direction vector</string>
</property>
<property name="keyboardTracking">
<bool>false</bool>

6
src/Mod/PartDesign/Gui/TaskPipeParameters.cpp
View File

@@ -66,7 +66,7 @@ using namespace Gui;
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
TaskPipeParameters::TaskPipeParameters(ViewProviderPipe* PipeView, bool /*newObj*/, QWidget* parent)
: TaskSketchBasedParameters(PipeView, parent, "PartDesign_AdditivePipe", tr("Pipe parameters"))
: TaskSketchBasedParameters(PipeView, parent, "PartDesign_AdditivePipe", tr("Pipe Parameters"))
, ui(new Ui_TaskPipeParameters)
, stateHandler(nullptr)
{
@@ -577,7 +577,7 @@ TaskPipeOrientation::TaskPipeOrientation(ViewProviderPipe* PipeView,
: TaskSketchBasedParameters(PipeView,
parent,
"PartDesign_AdditivePipe",
tr("Section orientation"))
tr("Section Orientation"))
, ui(new Ui_TaskPipeOrientation)
, stateHandler(nullptr)
{
@@ -876,7 +876,7 @@ TaskPipeScaling::TaskPipeScaling(ViewProviderPipe* PipeView, bool /*newObj*/, QW
: TaskSketchBasedParameters(PipeView,
parent,
"PartDesign_AdditivePipe",
tr("Section transformation"))
tr("Section Transformation"))
, ui(new Ui_TaskPipeScaling)
, stateHandler(nullptr)
{

12
src/Mod/PartDesign/Gui/TaskPipeParameters.ui
View File

@@ -48,7 +48,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Corner Transition</string>
<string>Corner transition</string>
</property>
</widget>
</item>
@@ -67,12 +67,12 @@
</item>
<item>
<property name="text">
<string>Right Corner</string>
<string>Right corner</string>
</property>
</item>
<item>
<property name="text">
<string>Round Corner</string>
<string>Round corner</string>
</property>
</item>
</widget>
@@ -82,7 +82,7 @@
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Path to sweep along</string>
<string>Path to Sweep Along</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
@@ -116,7 +116,7 @@
</sizepolicy>
</property>
<property name="text">
<string>Add Edge</string>
<string>Add edge</string>
</property>
<property name="checkable">
<bool>true</bool>
@@ -135,7 +135,7 @@
</sizepolicy>
</property>
<property name="text">
<string>Remove Edge</string>
<string>Remove edge</string>
</property>
<property name="checkable">
<bool>true</bool>

2
src/Mod/PartDesign/Gui/TaskPocketParameters.cpp
View File

@@ -37,7 +37,7 @@ using namespace Gui;
/* TRANSLATOR PartDesignGui::TaskPocketParameters */
TaskPocketParameters::TaskPocketParameters(ViewProviderPocket *PocketView,QWidget *parent, bool newObj)
: TaskExtrudeParameters(PocketView, parent, "PartDesign_Pocket", tr("Pocket parameters"))
: TaskExtrudeParameters(PocketView, parent, "PartDesign_Pocket", tr("Pocket Parameters"))
, oldLength(0)
{
ui->offsetEdit->setToolTip(tr("Offset from face at which pocket will end"));

4
src/Mod/PartDesign/Gui/TaskPolarPatternParameters.ui
View File

@@ -60,12 +60,12 @@
<widget class="QComboBox" name="comboMode">
<item>
<property name="text">
<string>Overall Angle</string>
<string>Overall angle</string>
</property>
</item>
<item>
<property name="text">
<string>Offset Angle</string>
<string>Offset angle</string>
</property>
</item>
</widget>

2
src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp
View File

@@ -48,7 +48,7 @@ using namespace PartDesignGui;
// clang-format off
TaskBoxPrimitives::TaskBoxPrimitives(ViewProviderPrimitive* vp, QWidget* parent)
: TaskBox(QPixmap(),tr("Primitive parameters"), true, parent)
: TaskBox(QPixmap(),tr("Primitive Parameters"), true, parent)
, ui(new Ui_DlgPrimitives)
, vp(vp)
{

126
src/Mod/PartDesign/Gui/TaskPrimitiveParameters.ui
View File

@@ -59,7 +59,7 @@
<item row="0" column="0">
<widget class="QLabel" name="textLabel2_2">
<property name="text">
<string>Length:</string>
<string>Length</string>
</property>
</widget>
</item>
@@ -79,7 +79,7 @@
<item row="1" column="0">
<widget class="QLabel" name="textLabel3_2">
<property name="text">
<string>Width:</string>
<string>Width</string>
</property>
</widget>
</item>
@@ -150,7 +150,7 @@
<item row="0" column="0">
<widget class="QLabel" name="textLabel2">
<property name="text">
<string>Length:</string>
<string>Length</string>
</property>
</widget>
</item>
@@ -170,7 +170,7 @@
<item row="1" column="0">
<widget class="QLabel" name="textLabel3">
<property name="text">
<string>Width:</string>
<string>Width</string>
</property>
</widget>
</item>
@@ -190,7 +190,7 @@
<item row="2" column="0">
<widget class="QLabel" name="textLabel4">
<property name="text">
<string>Height:</string>
<string>Height</string>
</property>
</widget>
</item>
@@ -264,7 +264,7 @@
<item row="0" column="0">
<widget class="QLabel" name="textLabel5">
<property name="text">
<string>Radius:</string>
<string>Radius</string>
</property>
</widget>
</item>
@@ -284,7 +284,7 @@
<item row="1" column="0">
<widget class="QLabel" name="textLabel6">
<property name="text">
<string>Height:</string>
<string>Height</string>
</property>
</widget>
</item>
@@ -304,7 +304,7 @@
<item row="2" column="0">
<widget class="QLabel" name="labelCylinderXSkew">
<property name="text">
<string>Angle in first direction:</string>
<string>Angle in first direction</string>
</property>
</widget>
</item>
@@ -330,7 +330,7 @@
<item row="3" column="0">
<widget class="QLabel" name="labelCylinderYSkew">
<property name="text">
<string>Angle in second direction:</string>
<string>Angle in second direction</string>
</property>
</widget>
</item>
@@ -388,7 +388,7 @@
</size>
</property>
<property name="text">
<string>Rotation angle:</string>
<string>Rotation angle</string>
</property>
</widget>
</item>
@@ -462,7 +462,7 @@
<item row="0" column="0">
<widget class="QLabel" name="textLabel9">
<property name="text">
<string>Radius 1:</string>
<string>Radius 1</string>
</property>
</widget>
</item>
@@ -482,7 +482,7 @@
<item row="1" column="0">
<widget class="QLabel" name="textLabel10">
<property name="text">
<string>Radius 2:</string>
<string>Radius 2</string>
</property>
</widget>
</item>
@@ -502,7 +502,7 @@
<item row="2" column="0" rowspan="2">
<widget class="QLabel" name="textLabel11">
<property name="text">
<string>Height:</string>
<string>Height</string>
</property>
</widget>
</item>
@@ -548,7 +548,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Angle:</string>
<string>Angle</string>
</property>
</widget>
</item>
@@ -622,7 +622,7 @@
<item>
<widget class="QLabel" name="textLabel14">
<property name="text">
<string>Radius:</string>
<string>Radius</string>
</property>
</widget>
</item>
@@ -671,7 +671,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>U parameter:</string>
<string>U parameter</string>
</property>
</widget>
</item>
@@ -691,7 +691,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>V parameters:</string>
<string>V parameters</string>
</property>
</widget>
</item>
@@ -794,7 +794,7 @@
<item row="0" column="0">
<widget class="QLabel" name="textLabel21">
<property name="text">
<string>Radius 1:</string>
<string>Radius 1</string>
</property>
</widget>
</item>
@@ -817,7 +817,7 @@
<item row="1" column="0">
<widget class="QLabel" name="textLabel22">
<property name="text">
<string>Radius 2:</string>
<string>Radius 2</string>
</property>
</widget>
</item>
@@ -840,7 +840,7 @@
<item row="2" column="0">
<widget class="QLabel" name="textLabel23">
<property name="text">
<string>Radius 3:</string>
<string>Radius 3</string>
</property>
</widget>
</item>
@@ -893,7 +893,7 @@ If zero, it is equal to Radius2</string>
<item row="0" column="0">
<widget class="QLabel" name="label23">
<property name="text">
<string>U parameter:</string>
<string>U parameter</string>
</property>
</widget>
</item>
@@ -913,7 +913,7 @@ If zero, it is equal to Radius2</string>
<item row="1" column="0">
<widget class="QLabel" name="label24">
<property name="text">
<string>V parameter:</string>
<string>V parameter</string>
</property>
</widget>
</item>
@@ -1013,7 +1013,7 @@ If zero, it is equal to Radius2</string>
<item row="0" column="0">
<widget class="QLabel" name="textLabel19">
<property name="text">
<string>Radius 1:</string>
<string>Radius 1</string>
</property>
</widget>
</item>
@@ -1036,7 +1036,7 @@ If zero, it is equal to Radius2</string>
<item row="1" column="0">
<widget class="QLabel" name="textLabel20">
<property name="text">
<string>Radius 2:</string>
<string>Radius 2</string>
</property>
</widget>
</item>
@@ -1088,7 +1088,7 @@ If zero, it is equal to Radius2</string>
<item row="0" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>U Parameter:</string>
<string>U parameter</string>
</property>
</widget>
</item>
@@ -1108,7 +1108,7 @@ If zero, it is equal to Radius2</string>
<item row="1" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>V parameter:</string>
<string>V parameter</string>
</property>
</widget>
</item>
@@ -1211,7 +1211,7 @@ If zero, it is equal to Radius2</string>
<item row="0" column="0">
<widget class="QLabel" name="labelPrismPolygon">
<property name="text">
<string>Polygon:</string>
<string>Polygon</string>
</property>
</widget>
</item>
@@ -1231,7 +1231,7 @@ If zero, it is equal to Radius2</string>
<item row="1" column="0">
<widget class="QLabel" name="labelPrismCircumradius">
<property name="text">
<string>Circumradius:</string>
<string>Circumradius</string>
</property>
</widget>
</item>
@@ -1251,7 +1251,7 @@ If zero, it is equal to Radius2</string>
<item row="2" column="0">
<widget class="QLabel" name="labelPrismHeight">
<property name="text">
<string>Height:</string>
<string>Height</string>
</property>
</widget>
</item>
@@ -1271,7 +1271,7 @@ If zero, it is equal to Radius2</string>
<item row="3" column="0">
<widget class="QLabel" name="labelPrismXSkew">
<property name="text">
<string>Angle in first direction:</string>
<string>Angle in first direction</string>
</property>
</widget>
</item>
@@ -1297,7 +1297,7 @@ If zero, it is equal to Radius2</string>
<item row="4" column="0">
<widget class="QLabel" name="labelPrismYSkew">
<property name="text">
<string>Angle in second direction:</string>
<string>Angle in second direction</string>
</property>
</widget>
</item>
@@ -1350,7 +1350,7 @@ If zero, it is equal to Radius2</string>
<item row="0" column="0">
<widget class="QLabel" name="label_10">
<property name="text">
<string>X min/max:</string>
<string>X min/max</string>
</property>
</widget>
</item>
@@ -1380,7 +1380,7 @@ If zero, it is equal to Radius2</string>
<item row="1" column="0">
<widget class="QLabel" name="label_11">
<property name="text">
<string>Y min/max:</string>
<string>Y min/max</string>
</property>
</widget>
</item>
@@ -1410,7 +1410,7 @@ If zero, it is equal to Radius2</string>
<item row="2" column="0">
<widget class="QLabel" name="label_12">
<property name="text">
<string>Z min/max:</string>
<string>Z min/max</string>
</property>
</widget>
</item>
@@ -1440,7 +1440,7 @@ If zero, it is equal to Radius2</string>
<item row="3" column="0">
<widget class="QLabel" name="label_13">
<property name="text">
<string>X2 min/max:</string>
<string>X2 min/max</string>
</property>
</widget>
</item>
@@ -1473,7 +1473,7 @@ If zero, it is equal to Radius2</string>
<item row="4" column="0">
<widget class="QLabel" name="label_14">
<property name="text">
<string>Z2 min/max:</string>
<string>Z2 min/max</string>
</property>
</widget>
</item>
@@ -1557,7 +1557,7 @@ If zero, it is equal to Radius2</string>
<item row="0" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Pitch:</string>
<string>Pitch</string>
</property>
</widget>
</item>
@@ -1577,7 +1577,7 @@ If zero, it is equal to Radius2</string>
<item row="1" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Height:</string>
<string>Height</string>
</property>
</widget>
</item>
@@ -1597,7 +1597,7 @@ If zero, it is equal to Radius2</string>
<item row="2" column="0">
<widget class="QLabel" name="label_9">
<property name="text">
<string>Radius:</string>
<string>Radius</string>
</property>
</widget>
</item>
@@ -1617,7 +1617,7 @@ If zero, it is equal to Radius2</string>
<item row="3" column="0">
<widget class="QLabel" name="label_20">
<property name="text">
<string>Angle:</string>
<string>Angle</string>
</property>
</widget>
</item>
@@ -1634,7 +1634,7 @@ If zero, it is equal to Radius2</string>
<item row="4" column="0">
<widget class="QLabel" name="label_15">
<property name="text">
<string>Coordinate system:</string>
<string>Coordinate system</string>
</property>
</widget>
</item>
@@ -1706,7 +1706,7 @@ If zero, it is equal to Radius2</string>
<item row="0" column="0">
<widget class="QLabel" name="label_spiral_growth">
<property name="text">
<string>Growth:</string>
<string>Growth</string>
</property>
</widget>
</item>
@@ -1726,7 +1726,7 @@ If zero, it is equal to Radius2</string>
<item row="1" column="0">
<widget class="QLabel" name="label_spiral_rotation">
<property name="text">
<string>Number of rotations:</string>
<string>Number of rotations</string>
</property>
</widget>
</item>
@@ -1746,7 +1746,7 @@ If zero, it is equal to Radius2</string>
<item row="2" column="0">
<widget class="QLabel" name="label_spiral_radius">
<property name="text">
<string>Radius:</string>
<string>Radius</string>
</property>
</widget>
</item>
@@ -1802,7 +1802,7 @@ If zero, it is equal to Radius2</string>
<item row="0" column="0">
<widget class="QLabel" name="Radius">
<property name="text">
<string>Radius:</string>
<string>Radius</string>
</property>
</widget>
</item>
@@ -1822,7 +1822,7 @@ If zero, it is equal to Radius2</string>
<item row="1" column="0">
<widget class="QLabel" name="Angle1">
<property name="text">
<string>Angle 1:</string>
<string>Angle 1</string>
</property>
</widget>
</item>
@@ -1839,7 +1839,7 @@ If zero, it is equal to Radius2</string>
<item row="2" column="0">
<widget class="QLabel" name="Angle2">
<property name="text">
<string>Angle 2:</string>
<string>Angle 2</string>
</property>
</widget>
</item>
@@ -1876,7 +1876,7 @@ If zero, it is equal to Radius2</string>
<item>
<widget class="QPushButton" name="buttonCircleFromThreePoints">
<property name="text">
<string>From three points</string>
<string>From 3 Points</string>
</property>
</widget>
</item>
@@ -1904,7 +1904,7 @@ If zero, it is equal to Radius2</string>
<item row="0" column="0">
<widget class="QLabel" name="labelEllMajorRadius">
<property name="text">
<string>Major radius:</string>
<string>Major radius</string>
</property>
</widget>
</item>
@@ -1924,7 +1924,7 @@ If zero, it is equal to Radius2</string>
<item row="1" column="0">
<widget class="QLabel" name="labelEllMinorRadius">
<property name="text">
<string>Minor radius:</string>
<string>Minor radius</string>
</property>
</widget>
</item>
@@ -1944,7 +1944,7 @@ If zero, it is equal to Radius2</string>
<item row="2" column="0">
<widget class="QLabel" name="labelEllAngle1">
<property name="text">
<string>Angle 1:</string>
<string>Angle 1</string>
</property>
</widget>
</item>
@@ -1961,7 +1961,7 @@ If zero, it is equal to Radius2</string>
<item row="3" column="0">
<widget class="QLabel" name="labelEllAngle2">
<property name="text">
<string>Angle 2:</string>
<string>Angle 2</string>
</property>
</widget>
</item>
@@ -2002,7 +2002,7 @@ If zero, it is equal to Radius2</string>
<item row="0" column="0">
<widget class="QLabel" name="label_X_Axis">
<property name="text">
<string>X:</string>
<string>X</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -2022,7 +2022,7 @@ If zero, it is equal to Radius2</string>
<item row="1" column="0">
<widget class="QLabel" name="label_Y_Axis">
<property name="text">
<string>Y:</string>
<string>Y</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -2042,7 +2042,7 @@ If zero, it is equal to Radius2</string>
<item row="2" column="0">
<widget class="QLabel" name="label_Z_Axis">
<property name="text">
<string>Z:</string>
<string>Z</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -2090,7 +2090,7 @@ If zero, it is equal to Radius2</string>
<item row="1" column="0">
<widget class="QLabel" name="X1">
<property name="text">
<string>X:</string>
<string>X</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -2110,7 +2110,7 @@ If zero, it is equal to Radius2</string>
<item row="2" column="0">
<widget class="QLabel" name="Y1">
<property name="text">
<string>Y:</string>
<string>Y</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -2130,7 +2130,7 @@ If zero, it is equal to Radius2</string>
<item row="3" column="0">
<widget class="QLabel" name="Z1">
<property name="text">
<string>Z:</string>
<string>Z</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -2167,7 +2167,7 @@ If zero, it is equal to Radius2</string>
<item row="6" column="0">
<widget class="QLabel" name="X2">
<property name="text">
<string>X:</string>
<string>X</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -2190,7 +2190,7 @@ If zero, it is equal to Radius2</string>
<item row="7" column="0">
<widget class="QLabel" name="Y2">
<property name="text">
<string>Y:</string>
<string>Y</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -2213,7 +2213,7 @@ If zero, it is equal to Radius2</string>
<item row="8" column="0">
<widget class="QLabel" name="Z2">
<property name="text">
<string>Z:</string>
<string>Z</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -2287,7 +2287,7 @@ If zero, it is equal to Radius2</string>
<item row="0" column="0">
<widget class="QLabel" name="labelRegularPolygonPolygon">
<property name="text">
<string>Polygon:</string>
<string>Polygon</string>
</property>
</widget>
</item>
@@ -2310,7 +2310,7 @@ If zero, it is equal to Radius2</string>
<item row="1" column="0">
<widget class="QLabel" name="labelRegularPolygonCircumradius">
<property name="text">
<string>Circumradius:</string>
<string>Circumradius</string>
</property>
</widget>
</item>

16
src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp
View File

@@ -86,7 +86,7 @@ TaskRevolutionParameters::TaskRevolutionParameters(PartDesignGui::ViewProvider*
ui->revolveAngle2->bind(rev->Angle2);
}
else {
throw Base::TypeError("The object is neither a Groove nor a Revolution.");
throw Base::TypeError("The object is neither a groove nor a revolution.");
}
setupDialog();
@@ -213,7 +213,7 @@ void TaskRevolutionParameters::fillAxisCombo(bool forceRefill)
auto *pcFeat = getObject<PartDesign::ProfileBased>();
if (!pcFeat) {
throw Base::TypeError("The object is not ProfileBased.");
throw Base::TypeError("The object is not profile-based.");
}
//add sketch axes
@@ -232,16 +232,16 @@ void TaskRevolutionParameters::fillAxisCombo(bool forceRefill)
if (PartDesign::Body * body = PartDesign::Body::findBodyOf(pcFeat)) {
try {
App::Origin* orig = body->getOrigin();
addAxisToCombo(orig->getX(), std::string(), tr("Base X axis"));
addAxisToCombo(orig->getY(), std::string(), tr("Base Y axis"));
addAxisToCombo(orig->getZ(), std::string(), tr("Base Z axis"));
addAxisToCombo(orig->getX(), std::string(), tr("Base x-axis"));
addAxisToCombo(orig->getY(), std::string(), tr("Base y-axis"));
addAxisToCombo(orig->getZ(), std::string(), tr("Base z-axis"));
} catch (const Base::Exception &ex) {
ex.reportException();
}
}
//add "Select reference"
addAxisToCombo(nullptr, std::string(), tr("Select reference..."));
addAxisToCombo(nullptr, std::string(), tr("Select reference…"));
}//endif forceRefill
//add current link, if not in list
@@ -712,14 +712,14 @@ TaskDlgRevolutionParameters::TaskDlgRevolutionParameters(ViewProviderRevolution
: TaskDlgSketchBasedParameters(RevolutionView)
{
assert(RevolutionView);
Content.push_back(new TaskRevolutionParameters(RevolutionView, "PartDesign_Revolution", tr("Revolution parameters")));
Content.push_back(new TaskRevolutionParameters(RevolutionView, "PartDesign_Revolution", tr("Revolution Parameters")));
}
TaskDlgGrooveParameters::TaskDlgGrooveParameters(ViewProviderGroove *GrooveView)
: TaskDlgSketchBasedParameters(GrooveView)
{
assert(GrooveView);
Content.push_back(new TaskRevolutionParameters(GrooveView, "PartDesign_Groove", tr("Groove parameters")));
Content.push_back(new TaskRevolutionParameters(GrooveView, "PartDesign_Groove", tr("Groove Parameters")));
}

12
src/Mod/PartDesign/Gui/TaskRevolutionParameters.ui
View File

@@ -39,7 +39,7 @@
<item>
<widget class="QLabel" name="textLabel1">
<property name="text">
<string>Axis:</string>
<string>Axis</string>
</property>
</widget>
</item>
@@ -47,17 +47,17 @@
<widget class="QComboBox" name="axis">
<item>
<property name="text">
<string>Base X axis</string>
<string>Base x-axis</string>
</property>
</item>
<item>
<property name="text">
<string>Base Y axis</string>
<string>Base y-axis</string>
</property>
</item>
<item>
<property name="text">
<string>Base Z axis</string>
<string>Base z-xis</string>
</property>
</item>
<item>
@@ -72,7 +72,7 @@
</item>
<item>
<property name="text">
<string>Select reference...</string>
<string>Select reference…</string>
</property>
</item>
</widget>
@@ -84,7 +84,7 @@
<item>
<widget class="QLabel" name="labelAngle">
<property name="text">
<string>Angle:</string>
<string>Angle</string>
</property>
</widget>
</item>

2
src/Mod/PartDesign/Gui/TaskShapeBinder.cpp
View File

@@ -58,7 +58,7 @@ using namespace Gui;
TaskShapeBinder::TaskShapeBinder(ViewProviderShapeBinder* view, bool newObj, QWidget* parent)
: Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("PartDesign_ShapeBinder"),
tr("Datum shape parameters"), true, parent)
tr("Datum Shape Parameters"), true, parent)
, SelectionObserver(view)
, ui(new Ui_TaskShapeBinder)
, vp(view)

2
src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp
View File

@@ -257,7 +257,7 @@ void TaskThicknessParameters::apply()
{
// Alert user if he created an empty feature
if (ui->listWidgetReferences->count() == 0) {
Base::Console().warning(tr("Empty thickness created !\n").toStdString().c_str());
Base::Console().warning(tr("Empty thickness created!\n").toStdString().c_str());
}
}

7
src/Mod/PartDesign/Gui/TaskThicknessParameters.ui
View File

@@ -17,8 +17,7 @@
<item>
<widget class="QToolButton" name="buttonRefSel">
<property name="toolTip">
<string>Click button to enter selection mode,
click again to end selection</string>
<string>Toggles between selection and preview mode</string>
</property>
<property name="text">
<string>Select</string>
@@ -91,7 +90,7 @@ click again to end selection</string>
</item>
<item>
<property name="text">
<string>Recto Verso</string>
<string>Recto verso</string>
</property>
</item>
</widget>
@@ -99,7 +98,7 @@ click again to end selection</string>
<item row="2" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Join Type</string>
<string>Join type</string>
</property>
</widget>
</item>

2
src/Mod/PartDesign/Gui/TaskTransformedMessages.cpp
View File

@@ -34,7 +34,7 @@ using namespace Gui::TaskView;
namespace sp = std::placeholders;
TaskTransformedMessages::TaskTransformedMessages(ViewProviderTransformed *transformedView_)
: TaskBox(Gui::BitmapFactory().pixmap("Part_Transformed_Copy"), tr("Transformed feature messages"), true, nullptr)
: TaskBox(Gui::BitmapFactory().pixmap("Part_Transformed_Copy"), tr("Transformed Feature Messages"), true, nullptr)
, transformedView(transformedView_)
, ui(new Ui_TaskTransformedMessages)
{

10
src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp
View File

@@ -417,9 +417,9 @@ void TaskTransformedParameters::fillAxisCombo(ComboLinks& combolinks, Part::Part
if (body) {
try {
App::Origin* orig = body->getOrigin();
combolinks.addLink(orig->getX(), "", tr("Base X axis"));
combolinks.addLink(orig->getY(), "", tr("Base Y axis"));
combolinks.addLink(orig->getZ(), "", tr("Base Z axis"));
combolinks.addLink(orig->getX(), "", tr("Base x-axis"));
combolinks.addLink(orig->getY(), "", tr("Base y-axis"));
combolinks.addLink(orig->getZ(), "", tr("Base z-axis"));
}
catch (const Base::Exception& ex) {
Base::Console().error("%s\n", ex.what());
@@ -427,7 +427,7 @@ void TaskTransformedParameters::fillAxisCombo(ComboLinks& combolinks, Part::Part
}
// add "Select reference"
combolinks.addLink(nullptr, std::string(), tr("Select reference..."));
combolinks.addLink(nullptr, std::string(), tr("Select reference…"));
}
void TaskTransformedParameters::fillPlanesCombo(ComboLinks& combolinks, Part::Part2DObject* sketch)
@@ -463,7 +463,7 @@ void TaskTransformedParameters::fillPlanesCombo(ComboLinks& combolinks, Part::Pa
}
// add "Select reference"
combolinks.addLink(nullptr, std::string(), tr("Select reference..."));
combolinks.addLink(nullptr, std::string(), tr("Select reference…"));
}
void TaskTransformedParameters::recomputeFeature()

4
src/Mod/PartDesign/Gui/TaskTransformedParameters.ui
View File

@@ -75,7 +75,7 @@
<item>
<widget class="QPushButton" name="buttonAddFeature">
<property name="text">
<string>Add feature</string>
<string>Add Feature</string>
</property>
<property name="checkable">
<bool>true</bool>
@@ -85,7 +85,7 @@
<item>
<widget class="QPushButton" name="buttonRemoveFeature">
<property name="text">
<string>Remove feature</string>
<string>Remove Feature</string>
</property>
<property name="checkable">
<bool>true</bool>

18
src/Mod/PartDesign/Gui/Utils.cpp
View File

@@ -137,11 +137,10 @@ PartDesign::Body *getBody(bool messageIfNot, bool autoActivate, bool assertModer
DlgActiveBody dia(
Gui::getMainWindow(),
doc,
QObject::tr("In order to use PartDesign you need an active Body object in the document. "
"Please make one active (double click) or create one."
"\n\nIf you have a legacy document with PartDesign objects without Body, "
"use the migrate function in PartDesign to put them into a Body."
));
QObject::tr("To use Part Design, an active body object is required in the document. "
"Activate a body (double-click) or create a new one."
"\n\nFor legacy documents with Part Design objects lacking a body, "
"use the migrate function in Part Design to place them into a body."));
if (dia.exec() == QDialog::DialogCode::Accepted)
activeBody = dia.getActiveBody();
}
@@ -186,9 +185,8 @@ void needActiveBodyError()
{
QMessageBox::warning( Gui::getMainWindow(),
QObject::tr("Active Body Required"),
QObject::tr("To create a new PartDesign object, there must be "
"an active Body object in the document. Please make "
"one active (double click) or create a new Body.") );
QObject::tr("To create a new Part Design object, an active body is required in the document. "
"Activate an existing body (double-click) or create a new one."));
}
PartDesign::Body * makeBody(App::Document *doc)
@@ -283,7 +281,7 @@ void fixSketchSupport (Sketcher::SketchObject* sketch)
const App::Document* doc = sketch->getDocument();
PartDesign::Body *body = getBodyFor(sketch, /*messageIfNot*/ false);
if (!body) {
throw Base::RuntimeError ("Couldn't find body for the sketch");
throw Base::RuntimeError ("Could not find a body for the sketch");
}
// Get the Origin for the body
@@ -393,7 +391,7 @@ void relinkToBody (PartDesign::Feature *feature) {
PartDesign::Body *body = PartDesign::Body::findBodyOf ( feature );
if (!body) {
throw Base::RuntimeError ("Couldn't find body for the feature");
throw Base::RuntimeError ("Could not find a body for the feature");
}
for ( const auto & obj: doc->getObjects () ) {

5
src/Mod/PartDesign/Gui/ViewProvider.cpp
View File

@@ -74,7 +74,8 @@ bool ViewProvider::doubleClicked()
void ViewProvider::setupContextMenu(QMenu* menu, QObject* receiver, const char* member)
{
QIcon iconObject = mergeGreyableOverlayIcons(Gui::BitmapFactory().pixmap("Part_ColorFace.svg"));
QAction* act = menu->addAction(iconObject, QObject::tr("Set colors..."), receiver, member);
QAction* act = menu->addAction(iconObject, QObject::tr("Set Face Colors"), receiver, member);
act->setData(QVariant((int)ViewProvider::Color));
// Call the extensions
Gui::ViewProvider::setupContextMenu(menu, receiver, member);
@@ -104,7 +105,7 @@ bool ViewProvider::setEdit(int ModNum)
if (dlg && !featureDlg) {
QMessageBox msgBox(Gui::getMainWindow());
msgBox.setText(QObject::tr("A dialog is already open in the task panel"));
msgBox.setInformativeText(QObject::tr("Do you want to close this dialog?"));
msgBox.setInformativeText(QObject::tr("Close this dialog?"));
msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
msgBox.setDefaultButton(QMessageBox::Yes);
int ret = msgBox.exec();

2
src/Mod/PartDesign/Gui/ViewProviderBody.cpp
View File

@@ -118,7 +118,7 @@ void ViewProviderBody::setupContextMenu(QMenu* menu, QObject* receiver, const ch
Q_UNUSED(member);
Gui::ActionFunction* func = new Gui::ActionFunction(menu);
QAction* act = menu->addAction(tr("Active body"));
QAction* act = menu->addAction(tr("Active Body"));
act->setCheckable(true);
act->setChecked(isActiveBody());
func->trigger(act, [this]() {

4
src/Mod/PartDesign/Gui/ViewProviderBoolean.cpp
View File

@@ -60,7 +60,7 @@ ViewProviderBoolean::~ViewProviderBoolean() = default;
void ViewProviderBoolean::setupContextMenu(QMenu* menu, QObject* receiver, const char* member)
{
addDefaultAction(menu, QObject::tr("Edit boolean"));
addDefaultAction(menu, QObject::tr("Edit Boolean"));
PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member);
}
@@ -77,7 +77,7 @@ bool ViewProviderBoolean::setEdit(int ModNum)
if (dlg && !booleanDlg) {
QMessageBox msgBox(Gui::getMainWindow());
msgBox.setText(QObject::tr("A dialog is already open in the task panel"));
msgBox.setInformativeText(QObject::tr("Do you want to close this dialog?"));
msgBox.setInformativeText(QObject::tr("Close this dialog?"));
msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
msgBox.setDefaultButton(QMessageBox::Yes);
int ret = msgBox.exec();

2
src/Mod/PartDesign/Gui/ViewProviderChamfer.cpp
View File

@@ -38,7 +38,7 @@ const std::string & ViewProviderChamfer::featureName() const {
void ViewProviderChamfer::setupContextMenu(QMenu* menu, QObject* receiver, const char* member)
{
addDefaultAction(menu, QObject::tr("Edit chamfer"));
addDefaultAction(menu, QObject::tr("Edit Chamfer"));
PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member);
}

2
src/Mod/PartDesign/Gui/ViewProviderChamfer.h
View File

@@ -38,7 +38,7 @@ public:
/// constructor
ViewProviderChamfer()
{ sPixmap = "PartDesign_Chamfer.svg";
menuName = tr("Chamfer parameters");}
menuName = tr("Chamfer Parameters");}
/// return "Chamfer"
const std::string & featureName() const override;

12
src/Mod/PartDesign/Gui/ViewProviderDatum.cpp
View File

@@ -112,22 +112,22 @@ void ViewProviderDatum::attach(App::DocumentObject *obj)
if (o->is<PartDesign::Plane>()) {
datumType = QStringLiteral("Plane");
datumText = QObject::tr("Plane");
datumMenuText = tr("Datum Plane parameters");
datumMenuText = tr("Datum Plane Parameters");
}
else if (o->is<PartDesign::Line>()) {
datumType = QStringLiteral("Line");
datumText = QObject::tr("Line");
datumMenuText = tr("Datum Line parameters");
datumMenuText = tr("Datum Line Parameters");
}
else if (o->is<PartDesign::Point>()) {
datumType = QStringLiteral("Point");
datumText = QObject::tr("Point");
datumMenuText = tr("Datum Point parameters");
datumMenuText = tr("Datum Point Parameters");
}
else if (o->is<PartDesign::CoordinateSystem>()) {
datumType = QStringLiteral("CoordinateSystem");
datumText = QObject::tr("Coordinate System");
datumMenuText = tr("Local Coordinate System parameters");
datumMenuText = tr("Local Coordinate System Parameters");
}
SoShapeHints* hints = new SoShapeHints();
@@ -226,7 +226,7 @@ bool ViewProviderDatum::isSelectable() const
void ViewProviderDatum::setupContextMenu(QMenu* menu, QObject* receiver, const char* member)
{
QAction* act;
act = menu->addAction(QObject::tr("Edit datum"), receiver, member);
act = menu->addAction(QObject::tr("Edit Datum"), receiver, member);
act->setData(QVariant((int)ViewProvider::Default));
// Call the extensions
Gui::ViewProvider::setupContextMenu(menu, receiver, member);
@@ -248,7 +248,7 @@ bool ViewProviderDatum::setEdit(int ModNum)
if (dlg && !datumDlg) {
QMessageBox msgBox(Gui::getMainWindow());
msgBox.setText(QObject::tr("A dialog is already open in the task panel"));
msgBox.setInformativeText(QObject::tr("Do you want to close this dialog?"));
msgBox.setInformativeText(QObject::tr("Close this dialog?"));
msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
msgBox.setDefaultButton(QMessageBox::Yes);
int ret = msgBox.exec();

2
src/Mod/PartDesign/Gui/ViewProviderDraft.cpp
View File

@@ -39,7 +39,7 @@ const std::string & ViewProviderDraft::featureName() const {
void ViewProviderDraft::setupContextMenu(QMenu* menu, QObject* receiver, const char* member)
{
addDefaultAction(menu, QObject::tr("Edit draft"));
addDefaultAction(menu, QObject::tr("Edit Draft"));
PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member);
}

2
src/Mod/PartDesign/Gui/ViewProviderDraft.h
View File

@@ -39,7 +39,7 @@ public:
/// constructor
ViewProviderDraft()
{ sPixmap = "PartDesign_Draft.svg";
menuName = tr("Draft parameters"); }
menuName = tr("Draft Parameters"); }
/// return "Draft"
const std::string & featureName() const override;

2
src/Mod/PartDesign/Gui/ViewProviderDressUp.cpp
View File

@@ -73,7 +73,7 @@ bool ViewProviderDressUp::setEdit(int ModNum) {
} else {
QMessageBox::warning ( nullptr, QObject::tr("Feature error"),
QObject::tr("%1 misses a base feature.\n"
"This feature is broken and can't be edited.")
"This feature is broken and cannot be edited.")
.arg( QString::fromLatin1(dressUp->getNameInDocument()) )
);
return false;

2
src/Mod/PartDesign/Gui/ViewProviderFillet.cpp
View File

@@ -38,7 +38,7 @@ const std::string & ViewProviderFillet::featureName() const {
void ViewProviderFillet::setupContextMenu(QMenu* menu, QObject* receiver, const char* member)
{
addDefaultAction(menu, QObject::tr("Edit fillet"));
addDefaultAction(menu, QObject::tr("Edit Fillet"));
PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member);
}

2
src/Mod/PartDesign/Gui/ViewProviderFillet.h
View File

@@ -38,7 +38,7 @@ public:
/// constructor
ViewProviderFillet()
{ sPixmap = "PartDesign_Fillet.svg";
menuName = tr("Fillet parameters"); }
menuName = tr("Fillet Parameters"); }
/// return "Fillet"
const std::string & featureName() const override;

2
src/Mod/PartDesign/Gui/ViewProviderGroove.cpp
View File

@@ -43,7 +43,7 @@ ViewProviderGroove::~ViewProviderGroove() = default;
void ViewProviderGroove::setupContextMenu(QMenu* menu, QObject* receiver, const char* member)
{
addDefaultAction(menu, QObject::tr("Edit groove"));
addDefaultAction(menu, QObject::tr("Edit Groove"));
PartDesignGui::ViewProviderSketchBased::setupContextMenu(menu, receiver, member);
}

2
src/Mod/PartDesign/Gui/ViewProviderHelix.cpp
View File

@@ -48,7 +48,7 @@ ViewProviderHelix::~ViewProviderHelix() = default;
void ViewProviderHelix::setupContextMenu(QMenu* menu, QObject* receiver, const char* member)
{
addDefaultAction(menu, QObject::tr("Edit helix"));
addDefaultAction(menu, QObject::tr("Edit Helix"));
PartDesignGui::ViewProviderAddSub::setupContextMenu(menu, receiver, member);
}

4
src/Mod/PartDesign/Gui/ViewProviderHole.cpp
View File

@@ -59,7 +59,7 @@ std::vector<App::DocumentObject*> ViewProviderHole::claimChildren()const
void ViewProviderHole::setupContextMenu(QMenu* menu, QObject* receiver, const char* member)
{
addDefaultAction(menu, QObject::tr("Edit hole"));
addDefaultAction(menu, QObject::tr("Edit Hole"));
PartGui::ViewProviderPart::setupContextMenu(menu, receiver, member); // clazy:exclude=skipped-base-method
}
@@ -76,7 +76,7 @@ bool ViewProviderHole::setEdit(int ModNum)
if (dlg && !holeDlg) {
QMessageBox msgBox(Gui::getMainWindow());
msgBox.setText(QObject::tr("A dialog is already open in the task panel"));
msgBox.setInformativeText(QObject::tr("Do you want to close this dialog?"));
msgBox.setInformativeText(QObject::tr("Close this dialog?"));
msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
msgBox.setDefaultButton(QMessageBox::Yes);
int ret = msgBox.exec();

2
src/Mod/PartDesign/Gui/ViewProviderLinearPattern.cpp
View File

@@ -36,7 +36,7 @@ TaskDlgFeatureParameters *ViewProviderLinearPattern::getEditDialog() {
void ViewProviderLinearPattern::setupContextMenu(QMenu* menu, QObject* receiver, const char* member)
{
addDefaultAction(menu, QObject::tr("Edit linear pattern"));
addDefaultAction(menu, QObject::tr("Edit Linear Pattern"));
PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member);
}

2
src/Mod/PartDesign/Gui/ViewProviderLinearPattern.h
View File

@@ -34,7 +34,7 @@ class PartDesignGuiExport ViewProviderLinearPattern : public ViewProviderTransfo
PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderLinearPattern);
public:
ViewProviderLinearPattern()
{ menuName = tr("LinearPattern parameters");
{ menuName = tr("Linear Pattern Parameters");
sPixmap = "PartDesign_LinearPattern.svg"; }
const std::string & featureName() const override;

2
src/Mod/PartDesign/Gui/ViewProviderLoft.cpp
View File

@@ -63,7 +63,7 @@ std::vector<App::DocumentObject*> ViewProviderLoft::claimChildren()const
void ViewProviderLoft::setupContextMenu(QMenu* menu, QObject* receiver, const char* member)
{
addDefaultAction(menu, QObject::tr("Edit loft"));
addDefaultAction(menu, QObject::tr("Edit Loft"));
PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member);
}

2
src/Mod/PartDesign/Gui/ViewProviderMirrored.cpp
View File

@@ -36,7 +36,7 @@ TaskDlgFeatureParameters *ViewProviderMirrored::getEditDialog() {
void ViewProviderMirrored::setupContextMenu(QMenu* menu, QObject* receiver, const char* member)
{
addDefaultAction(menu, QObject::tr("Edit mirrored"));
addDefaultAction(menu, QObject::tr("Edit Mirror"));
PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member);
}

2
src/Mod/PartDesign/Gui/ViewProviderMirrored.h
View File

@@ -34,7 +34,7 @@ class PartDesignGuiExport ViewProviderMirrored : public ViewProviderTransformed
PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderMirrored);
public:
ViewProviderMirrored() {
menuName = tr("Mirrored parameters");
menuName = tr("Mirror Parameters");
sPixmap = "PartDesign_Mirrored.svg";
}

2
src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp
View File

@@ -45,7 +45,7 @@ const std::string & ViewProviderMultiTransform::featureName() const
void ViewProviderMultiTransform::setupContextMenu(QMenu* menu, QObject* receiver, const char* member)
{
addDefaultAction(menu, QObject::tr("Edit multi-transform"));
addDefaultAction(menu, QObject::tr("Edit Multi-Transform"));
PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member); // clazy:exclude=skipped-base-method
}

2
src/Mod/PartDesign/Gui/ViewProviderMultiTransform.h
View File

@@ -34,7 +34,7 @@ class PartDesignGuiExport ViewProviderMultiTransform : public ViewProviderTransf
PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderMultiTransform);
public:
ViewProviderMultiTransform() {
menuName = tr("MultiTransform parameters");
menuName = tr("Multi-Transform Parameters");
sPixmap = "PartDesign_MultiTransform.svg";
}

2
src/Mod/PartDesign/Gui/ViewProviderPad.cpp
View File

@@ -43,7 +43,7 @@ ViewProviderPad::~ViewProviderPad() = default;
void ViewProviderPad::setupContextMenu(QMenu* menu, QObject* receiver, const char* member)
{
addDefaultAction(menu, QObject::tr("Edit pad"));
addDefaultAction(menu, QObject::tr("Edit Pad"));
PartDesignGui::ViewProviderSketchBased::setupContextMenu(menu, receiver, member);
}

2
src/Mod/PartDesign/Gui/ViewProviderPipe.cpp
View File

@@ -71,7 +71,7 @@ std::vector<App::DocumentObject*> ViewProviderPipe::claimChildren()const
void ViewProviderPipe::setupContextMenu(QMenu* menu, QObject* receiver, const char* member)
{
addDefaultAction(menu, QObject::tr("Edit pipe"));
addDefaultAction(menu, QObject::tr("Edit Pipe"));
PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member);
}

2
src/Mod/PartDesign/Gui/ViewProviderPocket.cpp
View File

@@ -45,7 +45,7 @@ ViewProviderPocket::~ViewProviderPocket() = default;
void ViewProviderPocket::setupContextMenu(QMenu* menu, QObject* receiver, const char* member)
{
addDefaultAction(menu, QObject::tr("Edit pocket"));
addDefaultAction(menu, QObject::tr("Edit Pocket"));
PartDesignGui::ViewProviderSketchBased::setupContextMenu(menu, receiver, member);
}

2
src/Mod/PartDesign/Gui/ViewProviderPolarPattern.cpp
View File

@@ -35,7 +35,7 @@ TaskDlgFeatureParameters *ViewProviderPolarPattern::getEditDialog() {
void ViewProviderPolarPattern::setupContextMenu(QMenu* menu, QObject* receiver, const char* member)
{
addDefaultAction(menu, QObject::tr("Edit polar pattern"));
addDefaultAction(menu, QObject::tr("Edit Polar Pattern"));
PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member);
}

2
src/Mod/PartDesign/Gui/ViewProviderPolarPattern.h
View File

@@ -34,7 +34,7 @@ class PartDesignGuiExport ViewProviderPolarPattern : public ViewProviderTransfor
PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderPolarPattern);
public:
ViewProviderPolarPattern() {
menuName = tr("PolarPattern parameters");
menuName = tr("Polar Pattern Parameters");
sPixmap = "PartDesign_PolarPattern.svg";
}

4
src/Mod/PartDesign/Gui/ViewProviderPrimitive.cpp
View File

@@ -52,7 +52,7 @@ void ViewProviderPrimitive::attach(App::DocumentObject* obj) {
void ViewProviderPrimitive::setupContextMenu(QMenu* menu, QObject* receiver, const char* member)
{
addDefaultAction(menu, QObject::tr("Edit primitive"));
addDefaultAction(menu, QObject::tr("Edit Primitive"));
PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member);
}
@@ -67,7 +67,7 @@ bool ViewProviderPrimitive::setEdit(int ModNum)
if (dlg && !primitiveDlg) {
QMessageBox msgBox(Gui::getMainWindow());
msgBox.setText(QObject::tr("A dialog is already open in the task panel"));
msgBox.setInformativeText(QObject::tr("Do you want to close this dialog?"));
msgBox.setInformativeText(QObject::tr("Close this dialog?"));
msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
msgBox.setDefaultButton(QMessageBox::Yes);
int ret = msgBox.exec();

2
src/Mod/PartDesign/Gui/ViewProviderRevolution.cpp
View File

@@ -43,7 +43,7 @@ ViewProviderRevolution::~ViewProviderRevolution() = default;
void ViewProviderRevolution::setupContextMenu(QMenu* menu, QObject* receiver, const char* member)
{
addDefaultAction(menu, QObject::tr("Edit revolution"));
addDefaultAction(menu, QObject::tr("Edit Revolution"));
PartDesignGui::ViewProviderSketchBased::setupContextMenu(menu, receiver, member);
}

2
src/Mod/PartDesign/Gui/ViewProviderScaled.cpp
View File

@@ -36,7 +36,7 @@ TaskDlgFeatureParameters *ViewProviderScaled::getEditDialog() {
void ViewProviderScaled::setupContextMenu(QMenu* menu, QObject* receiver, const char* member)
{
addDefaultAction(menu, QObject::tr("Edit scaled"));
addDefaultAction(menu, QObject::tr("Edit Scale"));
PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member);
}

2
src/Mod/PartDesign/Gui/ViewProviderScaled.h
View File

@@ -34,7 +34,7 @@ class PartDesignGuiExport ViewProviderScaled : public ViewProviderTransformed
PROPERTY_HEADER_WITH_OVERRIDE(PartDesignGui::ViewProviderScaled);
public:
ViewProviderScaled() {
menuName = tr("Scaled parameters");
menuName = tr("Scale Parameters");
sPixmap = "PartDesign_Scaled.svg";
}

6
src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp
View File

@@ -94,7 +94,7 @@ bool ViewProviderShapeBinder::setEdit(int ModNum) {
if (dlg && !sbDlg) {
QMessageBox msgBox(Gui::getMainWindow());
msgBox.setText(QObject::tr("A dialog is already open in the task panel"));
msgBox.setInformativeText(QObject::tr("Do you want to close this dialog?"));
msgBox.setInformativeText(QObject::tr("Close this dialog?"));
msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
msgBox.setDefaultButton(QMessageBox::Yes);
int ret = msgBox.exec();
@@ -202,7 +202,7 @@ void ViewProviderShapeBinder::setupContextMenu(QMenu* menu, QObject* receiver, c
Q_UNUSED(member)
QAction* act;
act = menu->addAction(QObject::tr("Edit shape binder"));
act = menu->addAction(QObject::tr("Edit Shape Binder"));
act->setData(QVariant((int)ViewProvider::Default));
Gui::ActionFunction* func = new Gui::ActionFunction(menu);
@@ -316,7 +316,7 @@ void ViewProviderSubShapeBinder::setupContextMenu(QMenu* menu, QObject* receiver
QAction* act;
act = menu->addAction(QObject::tr("Synchronize"), receiver, member);
act->setData(QVariant((int)Synchronize));
act = menu->addAction(QObject::tr("Select bound object"), receiver, member);
act = menu->addAction(QObject::tr("Select Bound Object"), receiver, member);
act->setData(QVariant((int)SelectObject));
ViewProviderPart::setupContextMenu(menu, receiver, member);
}

2
src/Mod/PartDesign/Gui/ViewProviderThickness.cpp
View File

@@ -38,7 +38,7 @@ const std::string & ViewProviderThickness::featureName() const {
void ViewProviderThickness::setupContextMenu(QMenu* menu, QObject* receiver, const char* member)
{
addDefaultAction(menu, QObject::tr("Edit thickness"));
addDefaultAction(menu, QObject::tr("Edit Thickness"));
PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member);
}

2
src/Mod/PartDesign/Gui/ViewProviderThickness.h
View File

@@ -38,7 +38,7 @@ public:
/// constructor
ViewProviderThickness()
{ sPixmap = "PartDesign_Thickness.svg";
menuName = tr("Thickness parameters"); }
menuName = tr("Thickness Parameters"); }
/// return "Thickness"
const std::string & featureName() const override;

73
src/Mod/PartDesign/Gui/Workbench.cpp
View File

@@ -43,19 +43,20 @@ namespace sp = std::placeholders;
qApp->translate("Workbench", "&Sketch");
//
qApp->translate("Workbench", "&Part Design");
qApp->translate("Workbench", "Create a datum");
qApp->translate("Workbench", "Create an additive feature");
qApp->translate("Workbench", "Create a subtractive feature");
qApp->translate("Workbench", "Apply a pattern");
qApp->translate("Workbench", "Apply a dress-up feature");
qApp->translate("Workbench", "Sprocket...");
qApp->translate("Workbench", "Involute gear...");
qApp->translate("Workbench", "Shaft design wizard");
qApp->translate("Gui::TaskView::TaskWatcherCommands", "Face tools");
qApp->translate("Gui::TaskView::TaskWatcherCommands", "Edge tools");
qApp->translate("Gui::TaskView::TaskWatcherCommands", "Boolean tools");
qApp->translate("Gui::TaskView::TaskWatcherCommands", "Helper tools");
qApp->translate("Gui::TaskView::TaskWatcherCommands", "Modeling tools");
qApp->translate("Workbench", "Datums");
qApp->translate("Workbench", "Additive Features");
qApp->translate("Workbench", "Subtractive Features");
qApp->translate("Workbench", "Dress-Up Features");
qApp->translate("Workbench", "Transformation Features");
qApp->translate("Workbench", "Sprocket…");
qApp->translate("Workbench", "Involute Gear");
qApp->translate("Workbench", "Shaft Design Wizard");
qApp->translate("Gui::TaskView::TaskWatcherCommands", "Face Tools");
qApp->translate("Gui::TaskView::TaskWatcherCommands", "Edge Tools");
qApp->translate("Gui::TaskView::TaskWatcherCommands", "Boolean Tools");
qApp->translate("Gui::TaskView::TaskWatcherCommands", "Helper Tools");
qApp->translate("Gui::TaskView::TaskWatcherCommands", "Modeling Tools");
qApp->translate("Gui::TaskView::TaskWatcherCommands", "Create Geometry");
//
qApp->translate("Workbench", "Measure");
@@ -158,7 +159,7 @@ void Workbench::activated()
Watcher.push_back(new Gui::TaskView::TaskWatcherCommands(
"SELECT Part::Feature SUBELEMENT Vertex COUNT 1..",
Vertex,
"Vertex tools",
"Vertex Tools",
"PartDesign_Body"
));
@@ -173,7 +174,7 @@ void Workbench::activated()
Watcher.push_back(new Gui::TaskView::TaskWatcherCommands(
"SELECT Part::Feature SUBELEMENT Edge COUNT 1..",
Edge,
"Edge tools",
"Edge Tools",
"PartDesign_Body"
));
@@ -191,7 +192,7 @@ void Workbench::activated()
Watcher.push_back(new Gui::TaskView::TaskWatcherCommands(
"SELECT Part::Feature SUBELEMENT Face COUNT 1",
Face,
"Face tools",
"Face Tools",
"PartDesign_Body"
));
@@ -201,7 +202,7 @@ void Workbench::activated()
Watcher.push_back(new Gui::TaskView::TaskWatcherCommands(
"SELECT PartDesign::Body COUNT 1",
Body,
"Helper tools",
"Helper Tools",
"PartDesign_Body"
));
@@ -211,7 +212,7 @@ void Workbench::activated()
Watcher.push_back(new Gui::TaskView::TaskWatcherCommands(
"SELECT PartDesign::Body COUNT 1..",
Body2,
"Boolean tools",
"Boolean Tools",
"PartDesign_Body"
));
@@ -225,7 +226,7 @@ void Workbench::activated()
Watcher.push_back(new Gui::TaskView::TaskWatcherCommands(
"SELECT App::Plane COUNT 1",
Plane1,
"Helper tools",
"Helper Tools",
"PartDesign_Body"
));
const char* Plane2[] = {
@@ -238,7 +239,7 @@ void Workbench::activated()
Watcher.push_back(new Gui::TaskView::TaskWatcherCommands(
"SELECT PartDesign::Plane COUNT 1",
Plane2,
"Helper tools",
"Helper Tools",
"PartDesign_Body"
));
@@ -250,7 +251,7 @@ void Workbench::activated()
Watcher.push_back(new Gui::TaskView::TaskWatcherCommands(
"SELECT PartDesign::Line COUNT 1",
Line,
"Helper tools",
"Helper Tools",
"PartDesign_Body"
));
@@ -263,7 +264,7 @@ void Workbench::activated()
Watcher.push_back(new Gui::TaskView::TaskWatcherCommands(
"SELECT PartDesign::Point COUNT 1",
Point,
"Helper tools",
"Helper Tools",
"PartDesign_Body"
));
@@ -285,7 +286,7 @@ void Workbench::activated()
Watcher.push_back(new Gui::TaskView::TaskWatcherCommands(
"SELECT Part::Feature SUBELEMENT Face COUNT 2..",
Faces,
"Face tools",
"Face Tools",
"PartDesign_Body"
));
@@ -306,7 +307,7 @@ void Workbench::activated()
Watcher.push_back(new Gui::TaskView::TaskWatcherCommands(
"SELECT Sketcher::SketchObject COUNT 1",
Sketch,
"Modeling tools",
"Modeling Tools",
"PartDesign_Body"
));
@@ -319,7 +320,7 @@ void Workbench::activated()
Watcher.push_back(new Gui::TaskView::TaskWatcherCommands(
"SELECT PartDesign::SketchBased",
Transformed,
"Transformation tools",
"Transformation Tools",
"PartDesign_MultiTransform"
));
@@ -361,7 +362,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const
// additives
Gui::MenuItem* additives = new Gui::MenuItem;
additives->setCommand("Create an additive feature");
additives->setCommand("Additive Features");
*additives << "PartDesign_Pad"
<< "PartDesign_Revolution"
@@ -371,7 +372,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const
// subtractives
Gui::MenuItem* subtractives = new Gui::MenuItem;
subtractives->setCommand("Create a subtractive feature");
subtractives->setCommand("Subtractive Features");
*subtractives << "PartDesign_Pocket"
<< "PartDesign_Hole"
@@ -382,7 +383,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const
// transformations
Gui::MenuItem* transformations = new Gui::MenuItem;
transformations->setCommand("Apply a pattern");
transformations->setCommand("Transformation Features");
*transformations << "PartDesign_Mirrored"
<< "PartDesign_LinearPattern"
@@ -391,7 +392,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const
// dressups
Gui::MenuItem* dressups = new Gui::MenuItem;
dressups->setCommand("Apply a dress-up feature");
dressups->setCommand("Dress-Up Features");
*dressups << "PartDesign_Fillet"
<< "PartDesign_Chamfer"
@@ -410,15 +411,15 @@ Gui::MenuItem* Workbench::setupMenuBar() const
<< subtractives
<< "PartDesign_CompPrimitiveSubtractive"
<< "Separator"
<< dressups
<< "Separator"
<< transformations
<< "Separator"
<< dressups
<< "PartDesign_Boolean"
<< "Separator"
<< "Materials_InspectAppearance"
<< "Materials_InspectMaterial"
<< "Separator"
<< "PartDesign_Boolean"
<< "Separator"
<< "Part_CheckGeometry"
<< "Separator"
<< "PartDesign_InvoluteGear"
@@ -452,7 +453,7 @@ Gui::ToolBarItem* Workbench::setupToolBars() const
{
Gui::ToolBarItem* root = StdWorkbench::setupToolBars();
Gui::ToolBarItem* part = new Gui::ToolBarItem(root);
part->setCommand("Part Design Helper");
part->setCommand("Part Design Helper Features");
*part << "PartDesign_Body"
<< "PartDesign_CompSketches"
@@ -462,7 +463,7 @@ Gui::ToolBarItem* Workbench::setupToolBars() const
<< "PartDesign_Clone";
part = new Gui::ToolBarItem(root);
part->setCommand("Part Design Modeling");
part->setCommand("Part Design Modeling Features");
*part << "PartDesign_Pad"
<< "PartDesign_Revolution"
@@ -483,14 +484,14 @@ Gui::ToolBarItem* Workbench::setupToolBars() const
part = new Gui::ToolBarItem(root);
part->setCommand("Part Design Dressup");
part->setCommand("Part Design Dress-Up Features");
*part << "PartDesign_Fillet"
<< "PartDesign_Chamfer"
<< "PartDesign_Draft"
<< "PartDesign_Thickness";
part = new Gui::ToolBarItem(root);
part->setCommand("Part Design Patterns");
part->setCommand("Part Design Transformation Features");
*part << "PartDesign_Mirrored"
<< "PartDesign_LinearPattern"

10
src/Mod/PartDesign/Gui/WorkflowManager.cpp
View File

@@ -138,16 +138,16 @@ Workflow WorkflowManager::determineWorkflow(App::Document *doc) {
if ( rv == Workflow::Legacy ) { // legacy messages
msgBox.setText( QObject::tr( "The document \"%1\" you are editing was designed with an old version of "
"PartDesign workbench." ).arg( QString::fromStdString ( doc->getName()) ) );
"Part Design workbench." ).arg( QString::fromStdString ( doc->getName()) ) );
msgBox.setInformativeText (
QObject::tr( "Do you want to migrate in order to use modern PartDesign features?" ) );
QObject::tr( "Migrate in order to use modern Part Design features?" ) );
}
else { // The document is already in the middle of migration
msgBox.setText( QObject::tr( "The document \"%1\" seems to be either in the middle of"
" the migration process from legacy PartDesign or have a slightly broken structure."
" the migration process from legacy Part Design or have a slightly broken structure."
).arg( QString::fromStdString ( doc->getName()) ) );
msgBox.setInformativeText (
QObject::tr( "Do you want to make the migration automatically?" ) );
QObject::tr( "Make the migration automatically?" ) );
}
msgBox.setDetailedText( QObject::tr( "Note: If you choose to migrate you won't be able to edit"
" the file with an older FreeCAD version.\n"
@@ -158,7 +158,7 @@ Workflow WorkflowManager::determineWorkflow(App::Document *doc) {
msgBox.setIcon( QMessageBox::Question );
QPushButton * yesBtn = msgBox.addButton ( QMessageBox::Yes );
QPushButton * manuallyBtn = msgBox.addButton (
QObject::tr ( "Migrate manually" ), QMessageBox::YesRole );
QObject::tr ( "Migrate Manually" ), QMessageBox::YesRole );
// If it is already a document in the middle of the migration the user shouldn't refuse to migrate
if ( rv != Workflow::Undetermined ) {

4
src/Mod/PartDesign/InvoluteGearFeature.py
View File

@@ -55,9 +55,9 @@ class CommandInvoluteGear:
"GUI command to create an InvoluteGear"
def GetResources(self):
return {'Pixmap' : 'PartDesign_InternalExternalGear',
'MenuText': QtCore.QT_TRANSLATE_NOOP("PartDesign_InvoluteGear","Involute gear..."),
'MenuText': QtCore.QT_TRANSLATE_NOOP("PartDesign_InvoluteGear","Involute Gear"),
'Accel': "",
'ToolTip': QtCore.QT_TRANSLATE_NOOP("PartDesign_InvoluteGear","Creates or edit the involute gear definition.")}
'ToolTip': QtCore.QT_TRANSLATE_NOOP("PartDesign_InvoluteGear","Creates or edits the involute gear definition")}
def Activated(self):
FreeCAD.ActiveDocument.openTransaction("Create involute gear")

20
src/Mod/PartDesign/InvoluteGearFeature.ui
View File

@@ -11,13 +11,13 @@
</rect>
</property>
<property name="windowTitle">
<string>Involute parameter</string>
<string>Involute Parameter</string>
</property>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="label_NumberOfTeeth">
<property name="text">
<string>Number of teeth:</string>
<string>Number of teeth</string>
</property>
</widget>
</item>
@@ -37,7 +37,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label_Modules">
<property name="text">
<string>Module:</string>
<string>Module</string>
</property>
</widget>
</item>
@@ -81,7 +81,7 @@
<item row="2" column="0">
<widget class="QLabel" name="label_PressureAngle">
<property name="text">
<string>Pressure angle:</string>
<string>Pressure angle</string>
</property>
</widget>
</item>
@@ -122,7 +122,7 @@
<item row="3" column="0">
<widget class="QLabel" name="label_HighPrecision">
<property name="text">
<string>High precision:</string>
<string>High precision</string>
</property>
</widget>
</item>
@@ -149,7 +149,7 @@
<item row="4" column="0">
<widget class="QLabel" name="label_ExternalGear">
<property name="text">
<string>External gear:</string>
<string>External gear</string>
</property>
</widget>
</item>
@@ -176,7 +176,7 @@
<item row="5" column="0">
<widget class="QLabel" name="label_Addendum">
<property name="text">
<string>Addendum Coefficient</string>
<string>Addendum coefficient</string>
</property>
</widget>
</item>
@@ -196,7 +196,7 @@
<item row="6" column="0">
<widget class="QLabel" name="label_Dedendum">
<property name="text">
<string>Dedendum Coefficient</string>
<string>Dedendum coefficient</string>
</property>
</widget>
</item>
@@ -216,7 +216,7 @@
<item row="7" column="0">
<widget class="QLabel" name="label_RootFillet">
<property name="text">
<string>Root Fillet Coefficient</string>
<string>Root fillet coefficient</string>
</property>
</widget>
</item>
@@ -236,7 +236,7 @@
<item row="8" column="0">
<widget class="QLabel" name="label_ProfileShift">
<property name="text">
<string>Profile Shift Coefficient</string>
<string>Profile shift coefficient</string>
</property>
</widget>
</item>

2
src/Mod/PartDesign/Scripts/Gear.py
View File

@@ -42,7 +42,7 @@ def compute():
j = float(l6.text())*m # standard value 0,015 - 0,04*m
width = float(l7.text()) # gear width
except ValueError:
FreeCAD.Console.PrintError("Wrong input! Only numbers allowed...\n")
FreeCAD.Console.PrintError("Wrong input! Only numbers allowed.\n")
# tooth height

4
src/Mod/PartDesign/SprocketFeature.py
View File

@@ -59,9 +59,9 @@ class CommandSprocket:
def GetResources(self):
return {'Pixmap' : 'PartDesign_Sprocket',
'MenuText': QtCore.QT_TRANSLATE_NOOP("PartDesign_Sprocket","Sprocket..."),
'MenuText': QtCore.QT_TRANSLATE_NOOP("PartDesign_Sprocket","Sprocket"),
'Accel': "",
'ToolTip': QtCore.QT_TRANSLATE_NOOP("PartDesign_Sprocket","Creates or edit the sprocket definition.")}
'ToolTip': QtCore.QT_TRANSLATE_NOOP("PartDesign_Sprocket","Creates or edits the sprocket definition.")}
def Activated(self):

16
src/Mod/PartDesign/SprocketFeature.ui
View File

@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Sprocket parameters</string>
<string>Sprocket Parameters</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
@@ -23,7 +23,7 @@
</sizepolicy>
</property>
<property name="text">
<string>Number of teeth:</string>
<string>Number of teeth</string>
</property>
</widget>
</item>
@@ -49,7 +49,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label_10">
<property name="text">
<string>Sprocket Reference</string>
<string>Sprocket reference</string>
</property>
</widget>
</item>
@@ -133,12 +133,12 @@
</item>
<item>
<property name="text">
<string>Bicycle with Derailleur</string>
<string>Bicycle with derailleur</string>
</property>
</item>
<item>
<property name="text">
<string>Bicycle without Derailleur</string>
<string>Bicycle without derailleur</string>
</property>
</item>
<item>
@@ -216,7 +216,7 @@
<item row="2" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Chain Pitch:</string>
<string>Chain pitch</string>
</property>
</widget>
</item>
@@ -263,7 +263,7 @@
<item row="3" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Chain Roller Diameter:</string>
<string>Chain roller diameter</string>
</property>
</widget>
</item>
@@ -307,7 +307,7 @@
<item row="4" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Tooth Width:</string>
<string>Tooth width</string>
</property>
</widget>
</item>

2
src/Mod/PartDesign/WizardShaft/Shaft.py
View File

@@ -160,7 +160,7 @@ class Shaft:
return self.segments[index].constraint
def updateEdge(self, column, start):
App.Console.PrintMessage("Not implemented yet - waiting for robust references...")
App.Console.PrintMessage("Not implemented yet - waiting for robust references…")
return
"""
if self.sketchClosed is not True:

8
src/Mod/PartDesign/WizardShaft/WizardShaft.py
View File

@@ -101,8 +101,8 @@ class TaskWizardShaft:
except ImportError as e:
msgBox = QtGui.QMessageBox()
msgBox.setIcon(msgBox.Information)
msgBox.setWindowTitle(translate("TaskWizardShaft", "Missing module"))
msgBox.setText(translate("TaskWizardShaft", "You may have to install the Plot add-on"))
msgBox.setWindowTitle(translate("TaskWizardShaft", "Missing Module"))
msgBox.setText(translate("TaskWizardShaft", "The Plot add-on is not installed. Install it to enable this feature."))
msgBox.setDetailedText(traceback.format_exc())
msgBox.exec_()
def slotAllx(self):
@@ -185,8 +185,8 @@ class WizardShaftGui:
def GetResources(self):
IconPath = FreeCAD.ConfigGet("AppHomePath") + "Mod/PartDesign/WizardShaft/WizardShaft.svg"
MenuText = QtCore.QT_TRANSLATE_NOOP("PartDesign_WizardShaft", "Shaft design wizard...")
ToolTip = QtCore.QT_TRANSLATE_NOOP("PartDesign_WizardShaft", "Start the shaft design wizard")
MenuText = QtCore.QT_TRANSLATE_NOOP("PartDesign_WizardShaft", "Shaft Design Wizard")
ToolTip = QtCore.QT_TRANSLATE_NOOP("PartDesign_WizardShaft", "Starts the shaft design wizard")
return {'Pixmap': IconPath,
'MenuText': MenuText,
'ToolTip': ToolTip}

2
src/Mod/PartDesign/WizardShaft/WizardShaftTable.py
View File

@@ -61,7 +61,7 @@ class WizardShaftTable:
# Create table widget
self.widget = QtGui.QTableWidget(len(self.rowDict), 0)
self.widget.setObjectName("ShaftWizardTable") # Do not change or translate: Used in ViewProviderFemConstraintXXX
self.widget.setWindowTitle(translate("WizardShaftTable", "Shaft wizard"))
self.widget.setWindowTitle(translate("WizardShaftTable", "Shaft Wizard"))
self.widget.resize(QtCore.QSize(300,200))
self.editedRow = None
self.editedColumn = None

2
src/Mod/PartDesign/fcsprocket/fcsprocketdialog.py
View File

@@ -44,7 +44,7 @@ class SprocketDialog(qt.QDialog):
l = qt.QVBoxLayout(self)
l.addWidget(self.gc)
l.addWidget(buttonBox)
self.setWindowTitle('Sprocket creation dialog')
self.setWindowTitle('Sprocket Creation Dialog')
def accept(self):
if FreeCAD.ActiveDocument is None: