Merge pull request #672 from luzpaz/typos

Fix various typos in the codebase

CHANGELOG.md

@@ -34,7 +34,7 @@
 - [#689] Grainline default values swapped around.
 - [#688] Difficult to enter numbers in SeamlyMe.
 - Fixed bug in SeamlyMe app. SeamlyMe showed birth date in wrong locale.
-- Fixed bug in dialog Internal Piece Path. Value from the field After rewrited data in the field Before.
+- Fixed bug in dialog Internal Piece Path. Value from the field After rewritten data in the field Before.
 - Tab Pins moved to be second in the list after tab Paths. 
 - Added tooltip for tab Passmark. Explained meaning of check box "Show the second passmark on seam line". 
 - [#696] Wrong grainline position on layout.
@@ -45,7 +45,7 @@
 - [#703] Seamly2D warns about format rewriting for unsaved files.
 - [#704] Seamly2D crashes if click on detail.
 - [#706] Default unit in preferences not changing new file unit.
-- Fix bug. Seamly2D overrids exported file even if a user said no.
+- Fix bug. Seamly2D overrides exported file even if a user said no.
 - Fix bug. Date on label doesn't obey GUI language locale.
 - Tool Seam allowance's bounding box should not include passmarks.
 - Fix grainline position on layout.
@@ -151,7 +151,7 @@
 ## Version 0.4.4 April 12, 2016
 - Updated measurement templates with all measurements. Added new template Aldrich/Women measurements.
 - Updated description measurements N06 and N07. Add new measurements A23 and J10.
-- Fixed GUI issue. After full parse some widgets was incorrectly reseted.
+- Fixed GUI issue. After full parse some widgets was incorrectly reset.
 - [#464] Crash. Issue with modeling node objects.
 - [#463] Wrong export to DXF format.
 - Fixed issue with deleting detail nodes.
@@ -178,7 +178,7 @@
 - Regesign dialogs tool 'Spline' and 'Spline Path' for avoiding text squeeze.
 - Fixed getting correct reversed segment for single in the list curve.
 - Fixed triggering validation a detail. Two new cases: has been changed Reverse option and the list 
-has been scrolled. Fixed validation when the list conatains only curve.
+has been scrolled. Fixed validation when the list contains only curve.
 - Fixed broken path to measurements after using Save As option.
 - Tool line. Block selecting the same point twice.
 - [#443] Not valid dxf file. libdxf updated to version 3.12.2.0. Fixed drawing subpaths.

common.pri

@@ -49,7 +49,7 @@ macx{
 CONFIG(release, debug|release){
     !noDebugSymbols:win32:!*msvc*{
         unset(QMAKE_STRIP)
-        QMAKE_STRIP = echo # we do striping manualy
+        QMAKE_STRIP = echo # we do stripping manually
     }
 }
 
@@ -220,8 +220,8 @@ CONFIG(debug, debug|release){
 # Default prefix. Use for creation install path.
 DEFAULT_PREFIX = /usr
 
-# In debug mode on Unix system we use all usefull for us compilers keys for checking errors.
-# Also trying make all possible for speed up build time.
+# In debug mode on Unix systems we use all useful compilers keys for checking errors.
+# Also trying make it as possible to speed-up build time.
 unix {
 
 !macx{
@@ -265,12 +265,12 @@ ISYSTEM += \
     -isystem "$$[QT_INSTALL_LIBS]/QtOpenGL.framework/Versions/5/Headers/"
 }
 
-# Usefull GCC warnings keys.
+# Useful GCC warnings keys.
 GCC_DEBUG_CXXFLAGS += \
-    -O0 \ # Turn off oprimization.
+    -O0 \ # Turn off optimization.
     $$ISYSTEM \ # Ignore warnings Qt headers.
     # Last gdb doesn't show debug symbols with Qt Creator (issue with Python 3 and debug scripts that use Python 2.7).
-    # Solution to use older version gdb, that's why we use old standard of debug information.
+    # Solution to use an older version of gdb, that's why we use older formatting of debug information.
     -gdwarf-3 \
     -Wall \
     -Wextra \
@@ -343,12 +343,12 @@ g++7:GCC_DEBUG_CXXFLAGS += \
     -Walloc-zero \
     -Wnonnull
 
-# Usefull Clang warnings keys.
+# Useful Clang warnings keys.
 CLANG_DEBUG_CXXFLAGS += \
-    -O0 \ # Turn off oprimization.
+    -O0 \ # Turn off optimization.
     $$ISYSTEM \ # Ignore warnings in Qt headers.
     # Last gdb doesn't show debug symbols with Qt Creator (issue with Python 3 and debug scripts that use Python 2.7).
-    # Solution to use older version gdb, that's why we use old standard of debug information.
+    # Solution to use older version gdb, that's why we use older formatting of debug information.
     -gdwarf-3 \
     -fparse-all-comments \
     -Wabi \

dist/Launchpad_README

@@ -53,7 +53,7 @@ If all goes well, you can leave your pbuilder environment by typing:
 	exit
 - Tell the pbuilder environment that it is going to act just like the Launchpad build farm
 Still in our terminal:
-    sudo pbuilder create --debootstrapopts --variant=buildd
+    sudo pbuilder create --debootstrapopts --variant=build
 -  Update our environment with these new packages
 Still in our terminal, type:
 	sudo pbuilder --update --override-config
@@ -86,7 +86,7 @@ DEBEMAIL="<Your email address>"
         lp:seamly2d
         merge packaging lp:~dismine/seamly2d/debian
 
-	Next command usefull for local testing creation recipe.
+	Next command useful for local testing creation recipe.
 - Run command
     cd bzr
     bzr dailydeb --allow-fallback-to-native seamly2d.recipe working-dir

dist/OBS_debian/debian.seamly2d.1

@@ -179,7 +179,7 @@ The path to output destination folder. By default the directory at which the app
 .IP "-G, --gapwidth <The gap width>"
 .RB "The layout gap width x2, measured in layout units (" "export mode" "). Set distance between details and a detail and a sheet."
 .IP "-g, --groups <Grouping type>"
-.RB "Sets layout groupping cases (" "export mode" "):"
+.RB "Sets layout grouping cases (" "export mode" "):"
 .RS
 .BR "*" " Three groups: big, middle, small = 0,"
 .RE

dist/appimage-builder-recipe-test.yml

@@ -57,7 +57,7 @@ script:
   - sudo cp share/img/Seamly2D_logo_256x256.png AppDir/usr/share/icons/hicolor/256x256/seamly2d.png
   - sudo ls AppDir/usr/share/icons/hicolor/256x256/seamly2d.png
 
-  # assign ownership of AppDir and subdirs & files to onwer 'runner' and group 'docker'
+  # assign ownership of AppDir and subdirs & files to owner 'runner' and group 'docker'
   - sudo chown -R runner:docker AppDir && ls -al AppDir
 
   - echo "=== END APPIMAGE RECIPE 'BEFORE' SCRIPT ==================================="

dist/debian/seamly2d.1

@@ -179,7 +179,7 @@ The path to output destination folder. By default the directory at which the app
 .IP "-G, --gapwidth <The gap width>"
 .RB "The layout gap width x2, measured in layout units (" "export mode" "). Set distance between details and a detail and a sheet."
 .IP "-g, --groups <Grouping type>"
-.RB "Sets layout groupping cases (" "export mode" "):"
+.RB "Sets layout grouping cases (" "export mode" "):"
 .RS
 .BR "*" " Three groups: big, middle, small = 0,"
 .RE

scripts/generate_tool_cursor.sh

@@ -25,7 +25,7 @@ do
 	basename=${var##*/} # remove the path from a path-string
 	basename=${basename%.png} # remove the extension from a path-string
 	basename=${basename%@2x} # remove optional @2x suffix
-	if [ ! -f $basename@2x.png ]; then # always prefere hidpi version
+	if [ ! -f $basename@2x.png ]; then # always prefer hidpi version
 		sed "s/<<basename>>/$basename@2x/" $OUTPATH/template_cursor.svg > $OUTPATH/${basename}_cursor.svg
 	else
 		sed "s/<<basename>>/$basename/" $OUTPATH/template_cursor.svg > $OUTPATH/${basename}_cursor.svg

scripts/make_install.bat

@@ -8,7 +8,7 @@ if %ARCHITECTURE%==32BIT set nsis_path="C:/Program Files/Inno Setup 5/iscc.exe"
 if %ARCHITECTURE%==64BIT set nsis_path="C:/Program Files (x86)/Inno Setup 5/iscc.exe"
 
 if not exist %nsis_path% (
-  echo Coudn't find Inno Setup. Package will not be created.
+  echo Couldn't find Inno Setup. Package will not be created.
 )
 
 :CONTINUE

src/libs/fervor/fervor.pri

@@ -1,5 +1,5 @@
 # ADD TO EACH PATH $$PWD VARIABLE!!!!!!
-# This need for corect working file translations.pro
+# This need for correct working file translations.pro
 
 SOURCES += \
     $$PWD/fvupdater.cpp

src/libs/fervor/fervor.pro

@@ -38,7 +38,7 @@ DESTDIR = bin
 # files created moc
 MOC_DIR = moc
 
-# objecs files
+# objects files
 OBJECTS_DIR = obj
 
 # Directory for files created uic

src/libs/ifc/exception/exception.pri

@@ -1,5 +1,5 @@
 # ADD TO EACH PATH $$PWD VARIABLE!!!!!!
-# This need for corect working file translations.pro
+# This need for correct working file translations.pro
 
 HEADERS += \
     $$PWD/vexceptionobjecterror.h \

src/libs/ifc/exception/vexceptionconversionerror.cpp

@@ -59,7 +59,7 @@
 /**
  * @brief VExceptionConversionError exception conversion error
  * @param error string with error
- * @param str string, where happend error
+ * @param str string, where the error happened
  */
 VExceptionConversionError::VExceptionConversionError(const QString &error, const QString &str)
     :VException(error), str(str)

src/libs/ifc/exception/vexceptionconversionerror.h

@@ -71,13 +71,13 @@ class VExceptionConversionError : public VException
     virtual QString ErrorMessage() const Q_DECL_OVERRIDE;
     QString         String() const;
 protected:
-    /** @brief str string, where happend error */
+    /** @brief str string, where the error happened */
     QString         str;
 };
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
- * @brief String return string, where happend error
+ * @brief String return string, where the error happened
  * @return string
  */
 inline QString VExceptionConversionError::String() const

src/libs/ifc/ifc.pri

@@ -1,9 +1,9 @@
-# Suport subdirectories. Just better project code tree.
+# Support subdirectories. Just better project code tree.
 include(exception/exception.pri)
 include(xml/xml.pri)
 
 # ADD TO EACH PATH $$PWD VARIABLE!!!!!!
-# This need for corect working file translations.pro
+# This need for correct working file translations.pro
 
 HEADERS += \
     $$PWD/stable.h \

src/libs/ifc/ifc.pro

@@ -42,7 +42,7 @@ DESTDIR = bin
 # files created moc
 MOC_DIR = moc
 
-# objecs files
+# objects files
 OBJECTS_DIR = obj
 
 # Directory for files created rcc

src/libs/ifc/xml/vabstractconverter.cpp

@@ -221,7 +221,7 @@ void VAbstractConverter::ReserveFile() const
 
         if (not IsReadOnly() && isFileWritable)
         {
-            const QString errorMsg(tr("Error creating a reserv copy: %1.").arg(error));
+            const QString errorMsg(tr("Error creating a reserve copy: %1.").arg(error));
             throw VException(errorMsg);
         }
     }

src/libs/ifc/xml/vabstractpattern.cpp

@@ -569,7 +569,7 @@ bool VAbstractPattern::ChangeNamePP(const QString &oldName, const QString &newNa
  * @brief appendPP add new pattern piece.
  *
  * Method check if not exist pattern piece with the same name and change name active pattern piece name, send signal
- * about change pattern piece. Doen't add pattern piece to file structure. This task make SPoint tool.
+ * about change pattern piece. Doesn't add pattern piece to file structure. This task make SPoint tool.
  * @param name pattern peace name.
  * @return true if success.
  */

src/libs/ifc/xml/vabstractpattern.h

@@ -403,7 +403,7 @@ public slots:
     void           SelectedDetail(quint32 id);
 
 protected:
-    /** @brief nameActivDraw name current pattern peace. */
+    /** @brief nameActivDraw name current pattern piece. */
     QString        activeDraftBlock;
 
     QString        lastSavedExportFormat;
@@ -416,7 +416,7 @@ public slots:
     /** @brief history history records. */
     QVector<VToolRecord> history;
 
-    /** @brief patternPieces list of patern pieces names for combobox*/
+    /** @brief patternPieces list of pattern pieces names for combobox*/
     QStringList    patternPieces;
 
     /** @brief modified keep state of the document for cases that do not cover QUndoStack*/

src/libs/ifc/xml/vdomdocument.cpp

@@ -948,7 +948,7 @@ bool VDomDocument::SafeCopy(const QString &source, const QString &destination, Q
 //---------------------------------------------------------------------------------------------------------------------
 QVector<VLabelTemplateLine> VDomDocument::GetLabelTemplate(const QDomElement &element) const
 {
-    // We use implicit conversion. That's why check if values are still the same as excpected.
+    // We use implicit conversion. That's why check if values are still the same as expected.
     Q_STATIC_ASSERT(Qt::AlignLeft == 1);
     Q_STATIC_ASSERT(Qt::AlignRight == 2);
     Q_STATIC_ASSERT(Qt::AlignHCenter == 4);

src/libs/ifc/xml/xml.pri

@@ -1,5 +1,5 @@
 # ADD TO EACH PATH $$PWD VARIABLE!!!!!!
-# This need for corect working file translations.pro
+# This need for correct working file translations.pro
 
 HEADERS += \
     $$PWD/vabstractconverter.h \

src/libs/vformat/vformat.pri

@@ -1,5 +1,5 @@
 # ADD TO EACH PATH $$PWD VARIABLE!!!!!!
-# This need for corect working file translations.pro
+# This need for correct working file translations.pro
 
 SOURCES += \
     $$PWD/vmeasurements.cpp \

src/libs/vformat/vformat.pro

@@ -41,7 +41,7 @@ DESTDIR = bin
 # files created moc
 MOC_DIR = moc
 
-# objecs files
+# objects files
 OBJECTS_DIR = obj
 
 # Set using ccache. Function enable_ccache() defined in common.pri.

src/libs/vgeometry/vabstractcubicbezierpath.cpp

@@ -89,7 +89,7 @@ VAbstractCubicBezierPath::~VAbstractCubicBezierPath()
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
- * @brief GetPath return QPainterPath which reprezent spline path.
+ * @brief GetPath return QPainterPath which represents spline path.
  * @return path.
  */
 QPainterPath VAbstractCubicBezierPath::GetPath() const

src/libs/vgeometry/vabstractcurve.cpp

@@ -363,7 +363,7 @@ QVector<DirectionArrow> VAbstractCurve::DirectionArrows() const
         for (qint32 i = 1; i <= points.size()-1; ++i)
         {
             arrow = QLineF(points.at(i-1), points.at(i));
-            found_length += arrow.length();//Length that we aready find
+            found_length += arrow.length();//Length that we already found
 
             if (seek_length <= found_length)// if have found more that need stop.
             {

src/libs/vgeometry/varc.cpp

@@ -274,7 +274,7 @@ QVector<QPointF> VArc::GetPoints() const
         }
 
         if (angle > 360 || angle < 0)
-        {// Filter incorect value
+        {// Filter incorrect value
             QLineF dummy(0,0, 100, 0);
             dummy.setAngle(angle);
             angle = dummy.angle();

src/libs/vgeometry/vgeometry.pri

@@ -1,5 +1,5 @@
 # ADD TO EACH PATH $$PWD VARIABLE!!!!!!
-# This need for corect working file translations.pro
+# This need for correct working file translations.pro
 
 SOURCES += \
         $$PWD/vgobject.cpp \

src/libs/vgeometry/vgeometry.pro

@@ -37,7 +37,7 @@ DESTDIR = bin
 # files created moc
 MOC_DIR = moc
 
-# objecs files
+# objects files
 OBJECTS_DIR = obj
 
 # Set using ccache. Function enable_ccache() defined in common.pri.

src/libs/vgeometry/vgobject.cpp

@@ -517,7 +517,7 @@ bool VGObject::IsPointOnLineviaPDP(const QPointF &t, const QPointF &p1, const QP
 {
     const double p = qAbs(PerpDotProduct(p1, p2, t));
     const double e = GetEpsilon(p1, p2);
-    // We can't use common "<=" here because of the floating-point accuraccy problem
+    // We can't use common "<=" here because of the floating-point accuracy problem
     return p < e || VFuzzyComparePossibleNulls(p, e);
 }
 
@@ -534,13 +534,13 @@ double VGObject::PerpDotProduct(const QPointF &p1, const QPointF &p2, const QPoi
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
- * @brief GetEpsilon solve the floating-point accuraccy problem.
+ * @brief GetEpsilon solve the floating-point accuracy problem.
  *
- * There is the floating-point accuraccy problem, so instead of checking against zero, some epsilon value has to be
+ * There is the floating-point accuracy problem, so instead of checking against zero, some epsilon value has to be
  * used. Because the size of the pdp value depends on the length of the vectors, no static value can be used. One
  * approach is to compare the pdp/area value to the fraction of another area which also depends on the length of the
- * line e1=(p1, p2), e.g. the minimal area calucalted with PerpDotProduc() if point still not on the line. This distance
- * is controled by variable accuracyPointOnLine
+ * line e1=(p1, p2), e.g. the minimal area calculated with PerpDotProduc() if point still isn't on the line. This
+ * distance is controlled by variable accuracyPointOnLine
  */
 double VGObject::GetEpsilon(const QPointF &p1, const QPointF &p2)
 {
@@ -570,7 +570,7 @@ int VGObject::PointInCircle(const QPointF &p, const QPointF &center, qreal radiu
 /**
  * @brief GetLengthContour return length of contour.
  * @param contour container with points of contour.
- * @param newPoints point whos we try to add to contour.
+ * @param newPoints point we try to add to contour.
  * @return length length of contour.
  */
 // cppcheck-suppress unusedFunction

src/libs/vgeometry/vgobject_p.h

@@ -78,7 +78,7 @@ class VGObjectData : public QSharedData
 
     virtual ~VGObjectData();
 
-    /** @brief _id id in container. Ned for arcs, spline and spline paths. */
+    /** @brief _id id in container. Needed for arcs, spline and spline paths. */
     quint32 _id;
 
     /** @brief type type of graphical object */

src/libs/vgeometry/vspline.cpp

@@ -527,12 +527,12 @@ QVector<qreal> VSpline::CalcT (qreal curveCoord1, qreal curveCoord2, qreal curve
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
- * @brief VSpline::ParamT calculate t coeffient that reprezent point on curve.
+ * @brief VSpline::ParamT calculate t coefficient that represents point on curve.
  *
  * Each point that belongs to Cubic Bézier curve can be shown by coefficient in interval [0; 1].
  *
  * @param pBt point on curve
- * @return t coeffient that reprezent this point on curve. Return -1 if point doesn't belongs to curve.
+ * @return t coefficient that represents this point on curve. Return -1 if point doesn't belongs to curve.
  */
 qreal VSpline::ParamT (const QPointF &pBt) const
 {

src/libs/vlayout/vabstractpiece.h

@@ -280,7 +280,7 @@ QVector<T> VAbstractPiece::CorrectEquidistantPoints(const QVector<T> &points, bo
     //Remove point on line
     for (qint32 i = 0; i < buf1.size(); ++i)
     {// In this case we alwayse will have bounded intersection, so all is need is to check if point i is on line.
-     // Unfortunatelly QLineF::intersect can't be used in this case because of the floating-point accuraccy problem.
+     // Unfortunately QLineF::intersect can't be used in this case because of the floating-point accuracy problem.
         if (prev == -1)
         {
             i == 0 ? prev = buf1.size() - 1 : prev = i-1;