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

Merge pull request #20173 from luzpaz/typos-Mar-2025

Browse Source 
Fix various typos
This commit is contained in:
Chris Hennes
2025-03-16 23:56:47 -05:00
committed by GitHub
parent b8f834415c 17102251e5
commit 269eee4efd
21 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Gui/CommandView.cpp
View File

@@ -3454,7 +3454,7 @@ StdTreePreSelection::StdTreePreSelection()
: Command("Std_TreePreSelection")
{
sGroup = "TreeView";
sMenuText = QT_TR_NOOP("&4 Pre-selection");
sMenuText = QT_TR_NOOP("&4 Preselection");
sToolTipText = QT_TR_NOOP("Preselect the object in 3D view when hovering the cursor over the tree item");
sStatusTip = sToolTipText;
sWhatsThis = "Std_TreePreSelection";

2
src/Gui/Dialogs/DlgMacroExecuteImp.cpp
View File

@@ -807,7 +807,7 @@ Note: your changes will be applied when you next switch workbenches\n"));
commandTreeWidget->topLevelItem(commandTreeWidget->topLevelItemCount() - 1));
commandTreeWidget->scrollToItem(commandTreeWidget->currentItem());
}
else { // pre-select it for the user (will be the macro menu text)
else { // preselect it for the user (will be the macro menu text)
QList<QTreeWidgetItem*> items =
commandTreeWidget->findItems(macroMenuText,
Qt::MatchFixedString | Qt::MatchWrap,

2
src/Gui/Selection/Selection.h
View File

@@ -484,7 +484,7 @@ public:
*/
bool hasSubSelection(const char *doc=nullptr, bool subElement=false) const;
/// Check if there is any pre-selection
/// Check if there is any preselection
bool hasPreselection() const;
/// Size of selected entities for all documents

4
src/Gui/Selection/SoFCUnifiedSelection.cpp
View File

@@ -346,7 +346,7 @@ void SoFCUnifiedSelection::doAction(SoAction *action)
if (action->getTypeId() == SoFCPreselectionAction::getClassTypeId()) {
auto preselectAction = static_cast<SoFCPreselectionAction*>(action);
// Do not clear currently preselected object when setting new pre-selection
// Do not clear currently preselected object when setting new preselection
if (!setPreSelection && preselectAction->SelChange.Type == SelectionChanges::RmvPreselect) {
if (currentHighlightPath) {
SoHighlightElementAction highlightAction;
@@ -1552,7 +1552,7 @@ void SoFCSelectionRoot::doAction(SoAction *action) {
bool SoFCSelectionRoot::doActionPrivate(Stack &stack, SoAction *action) {
// Selection action short-circuit optimization. In case of whole object
// selection/pre-selection, we shall store a SelContext keyed by ourself.
// selection/preselection, we shall store a SelContext keyed by ourself.
// And the action traversal can be short-curcuited once the first targeted
// SoFCSelectionRoot is found here. New function checkSelection() is exposed
// to check for whole object selection. This greatly improve performance on

2
src/Mod/BIM/Resources/ui/dialogImport.ui
View File

@@ -126,7 +126,7 @@
<item>
<widget class="QCheckBox" name="checkLoadMaterials">
<property name="toolTip">
<string>Preload all materials fo the file. It is advised to leave this unchecked and load materials later, only when needed</string>
<string>Preload all materials of the file. It is advised to leave this unchecked and load materials later, only when needed</string>
</property>
<property name="text">
<string>Preload materials</string>

8
src/Mod/BIM/Resources/ui/dialogProjectManager.ui
View File

@@ -111,10 +111,10 @@
<item>
<widget class="QRadioButton" name="radioNative1">
<property name="toolTip">
<string>This will create a new FreeCAD docment that allows you to build a BIM model, but with no specific IFC structure yet. This is the most flexible option when you start working ona BIM project. You can convert this project to IFC anytime later.</string>
<string>This will create a new FreeCAD document that allows you to build a BIM model, but with no specific IFC structure yet. This is the most flexible option when you start working ona BIM project. You can convert this project to IFC anytime later.</string>
</property>
<property name="text">
<string>Create a new document witout IFC support yet</string>
<string>Create a new document without IFC support yet</string>
</property>
<property name="checked">
<bool>false</bool>
@@ -634,7 +634,7 @@
<item>
<widget class="QLabel" name="label_34">
<property name="text">
<string>Default groups to be added to each level. Defautl groups such as walls, windows,... are useful to organize the different building elements inside a level</string>
<string>Default groups to be added to each level. Default groups such as walls, windows,... are useful to organize the different building elements inside a level</string>
</property>
<property name="wordWrap">
<bool>true</bool>
@@ -714,7 +714,7 @@
<item>
<widget class="QPushButton" name="buttonOK">
<property name="toolTip">
<string>Accept the values fo this form</string>
<string>Accept the values of this form</string>
</property>
<property name="text">
<string>OK</string>

2
src/Mod/BIM/importers/exportIFC.py
View File

@@ -2530,7 +2530,7 @@ def create_annotation(anno, ifcfile, context, history, preferences):
axes.append(axis)
if axes:
if len(axes) > 1:
print("DEBUG: exportIFC.create_annotation: Cannot create more thna one axis",anno.Label)
print("DEBUG: exportIFC.create_annotation: Cannot create more than one axis",anno.Label)
return axes[0]
else:
print("Unable to handle object",anno.Label)

12
src/Mod/BIM/importers/importSH3DHelper.py
View File

@@ -197,7 +197,7 @@ class Transaction(object):
if exc_value is None:
self.document.commitTransaction()
elif DEBUG_GEOMETRY:
_err(f"Transactino failed but DEBUG_GEOMETRY is set. Commiting transaction anyway.")
_err(f"Transaction failed but DEBUG_GEOMETRY is set. Committing transaction anyway.")
self.document.commitTransaction()
else:
self.document.abortTransaction()
@@ -933,9 +933,9 @@ class BaseHandler:
def get_faces(self, wall):
"""Returns the name of the left and right face for `wall`
The face names are suitable for selection later on when creating
The face names are suitable for selection later on when creating
the Facebinders and baseboards. Note, that this must be executed
once the wall has been completly been constructued. If a window
once the wall has been completely constructed. If a window
or door is added afterward, this will have an impact on what is
considered the left and right side of the wall
@@ -948,7 +948,7 @@ class BaseHandler:
right side of the wall
"""
# In order to handle curved walls, take the oriented line (from
# start to end) that pass throuh the center of gravity of the wall
# start to end) that pass through the center of gravity of the wall
# Hopefully the COG of the face will always be on the correct side
# of the COG of the wall
wall_spine = self.get_wall_spine(wall)
@@ -1328,7 +1328,7 @@ class RoomHandler(BaseHandler):
def _get_offset_wire(self, wire, inward=True):
"""Return an inward (or outward) offset wire to avoid self intersection.
This will return a non self-intersecting wire offseted either inward
This will return a non self-intersecting wire offsetted either inward
or outward from the original wire.
Args:
@@ -1931,7 +1931,7 @@ class WallHandler(BaseHandler):
by the problem.
Args:
wall (Arch.Wall): the wall for which to create the referene face
wall (Arch.Wall): the wall for which to create the reference face
Returns:
Part.Wire: the wire for the reference face

2
src/Mod/CAM/Path/Main/Gui/Simulator.py
View File

@@ -137,7 +137,7 @@ class PathSimulation:
setJobIdx = jIdx
jIdx += 1
# Pre-select GUI-selected job in the combobox
# Preselect GUI-selected job in the combobox
if jobName or jCnt == 1:
form.comboJobs.setCurrentIndex(setJobIdx)
else:

2
src/Mod/CAM/Path/Main/Gui/SimulatorGL.py
View File

@@ -259,7 +259,7 @@ class CAMSimulation:
setJobIdx = jIdx
jIdx += 1
# Pre-select GUI-selected job in the combobox
# Preselect GUI-selected job in the combobox
if jobName or jCnt == 1:
form.comboJobs.setCurrentIndex(setJobIdx)
else:

2
src/Mod/CAM/Path/Post/UtilsParse.py
View File

@@ -285,7 +285,7 @@ def default_F_parameter(
found = True
if found:
return format_for_feed(values, feed)
# else if any of A, B, or C are in the paramters, the feed is in degrees,
# else if any of A, B, or C are in the parameters, the feed is in degrees,
# which should not be converted when in --inches mode
found = False
for key in ("A", "B", "C"):

4
src/Mod/Draft/draftobjects/patharray.py
View File

@@ -679,14 +679,14 @@ def placements_on_path(shapeRotation, pathwire, count, xlate, align,
segCount = max(segCount, 1)
if useSpacingPattern:
# Available lenth will be non-uniformly divided in proportions from SpacingPattern:
# Available length will be non-uniformly divided in proportions from SpacingPattern:
fullSpacingPattern = [spacingPattern[i % len(spacingPattern)] for i in range(segCount)]
sumWeights = sum(fullSpacingPattern)
distPerWeightUnit = totalDist / sumWeights
steps = [distPerWeightUnit * weigth for weigth in fullSpacingPattern]
else:
# Available lenght will be evenly divided (the original spacing method):
# Available length will be evenly divided (the original spacing method):
steps = [totalDist / segCount]
if useFixedSpacing:

2
src/Mod/Part/Gui/SoBrepFaceSet.cpp
View File

@@ -534,7 +534,7 @@ void SoBrepFaceSet::GLRender(SoGLRenderAction *action)
// There are a few factors affects the rendering order.
//
// 1) For normal case, the highlight (pre-selection) is the top layer. And since
// 1) For normal case, the highlight (preselection) is the top layer. And since
// the depth buffer clipping is on here, we shall draw highlight first, then
// selection, then the rest part.
//

6
src/Mod/Sketcher/App/SketchObject.cpp
View File

@@ -653,7 +653,7 @@ public:
// very forgiving. We should have used Precision::SquareConfisuion(),
// which is 1e-14. However, there is a problem with current
// commandGeoCreate. They create new geometry with initial point of
// the exact mouse position, instead of the pre-selected point
// the exact mouse position, instead of the preselected point
// position, and rely on auto constraint to snap in the new
// geometry. So, we cannot use a very strict threshold here.
double tol = strict?Precision::SquareConfusion()*10:1e-6;
@@ -8350,7 +8350,7 @@ void adjustParameterRange(const TopoDS_Edge &edge,
// lower arc. Because projection orientation may swap the first and last
// parameter of the original curve.
//
// We project the middel point of the original curve to the projected curve
// We project the middle point of the original curve to the projected curve
// to decide whether to flip the parameters.
Handle(Geom_Curve) origCurve = BRepAdaptor_Curve(edge).Curve().Curve();
@@ -8778,7 +8778,7 @@ void processEdge(const TopoDS_Edge& edge,
// projection is an arc of ellipse
auto* aoe = new Part::GeomArcOfEllipse();
double firstParam, lastParam;
// ajust the parameter range to get the correct arc
// adjust the parameter range to get the correct arc
adjustParameterRange(edge, gPlane, mov, projCurve, firstParam, lastParam);
Handle(Geom_TrimmedCurve) trimmedCurve = new Geom_TrimmedCurve(projCurve, firstParam, lastParam);

2
src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
View File

@@ -812,7 +812,7 @@ bool CmdSketcherCreateRectangleCenter::isActive()
}
// Rounded rectange ================================================================
// Rounded rectangle ===============================================================
DEF_STD_CMD_AU(CmdSketcherCreateOblong)

2
src/Mod/Sketcher/Gui/DrawSketchHandlerSplitting.h
View File

@@ -129,7 +129,7 @@ public:
// clang-format on
}
else {
// No curve of interest is pre-selected. Try pre-selected point.
// No curve of interest is preselected. Try preselected point.
int pointGeoId = getPreselectPoint();
if (pointGeoId >= 0) {

4
src/Mod/Sketcher/Gui/EditModeCoinManagerParameters.h
View File

@@ -112,9 +112,9 @@ struct DrawingParameters
static SbColor InternalAlignedGeoColor; // Color for non-fully constrained internal geometry
static SbColor FullyConstraintElementColor; // Color for a fully constrained element
static SbColor CurveColor; // Color for curves
static SbColor PreselectColor; // Color used for pre-selection
static SbColor PreselectColor; // Color used for preselection
static SbColor
PreselectSelectedColor; // Color used for pre-selection when geometry is already selected
PreselectSelectedColor; // Color used for preselection when geometry is already selected
static SbColor SelectColor; // Color used for selected geometry
static SbColor CurveExternalColor; // Color used for external geometry
static SbColor CurveDraftColor; // Color used for construction geometry

2
src/Mod/Sketcher/Gui/SketcherToolDefaultWidget.cpp
View File

@@ -144,7 +144,7 @@ void SketcherToolDefaultWidget::setupConnections()
&SketcherToolDefaultWidget::comboBox3_currentIndexChanged);
}
// pre-select the number of the spinbox when it gets the focus.
// preselect the number of the spinbox when it gets the focus.
bool SketcherToolDefaultWidget::eventFilter(QObject* object, QEvent* event)
{
if (event->type() == QEvent::FocusIn) {

2
src/Mod/TechDraw/Gui/QGIFace.cpp
View File

@@ -162,7 +162,7 @@ void QGIFace::setPrettyNormal() {
QGIPrimPath::setPrettyNormal();
}
/// show the face style & colour in pre-select configuration
/// show the face style & colour in preselect configuration
void QGIFace::setPrettyPre() {
// Base::Console().Message("QGIF::setPrettyPre()\n");
m_fillStyleCurrent = Qt::SolidPattern;

2
tools/build/WindowsInstaller/include/gui.nsh
View File

@@ -58,7 +58,7 @@ BrandingText " "
!insertmacro MUI_PAGE_INSTFILES
# The option to run FreeCAD from the finish page is currently disabled because
# it may run with Administrator priviledges, therefore causing a different
# it may run with Administrator privileges, therefore causing a different
# user directory to be used. This could be fixed by creating a separate
# process without UAC elevation.
#!define MUI_FINISHPAGE_RUN_TEXT "$(FinishPageRun)"

4
tools/build/WindowsInstaller/include/init.nsh
View File

@@ -28,7 +28,7 @@ Function PostMultiUserPageInit
# check if this FreeCAD version is already installed
ReadRegStr $0 SHCTX "${APP_UNINST_KEY}" "UninstallString"
${if} $0 != ""
# check if the uninstaller was acidentally deleted
# check if the uninstaller was accidentally deleted
# if so, don't bother the user if they really want to install a new FreeCAD over an existing one
# because they won't have a chance to deny this
@@ -138,7 +138,7 @@ Function .onInit
StrCpy $CreateFileAssociations "false"
${IfNot} ${Silent}
# Show banner while installer is intializating
# Show banner while installer is initializing
Banner::show /NOUNLOAD "Checking system"
Banner::destroy
${EndIf}