Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluz paz <luzpaz@users.noreply.github.com>2021-09-07 18:33:54 +0300
committerluz paz <luzpaz@users.noreply.github.com>2021-09-07 18:33:54 +0300
commitd68f375e386049878de69eb0b33aacc3f40cb344 (patch)
tree7c31e3a32ac8b9d2c7328c6de5f300eb4eb15182
parent7eeae4db87f3f6e860c2bc4faab79af50c59e484 (diff)
Fix various typos
Found via `codespell -q 3 -S *.po,*.pot -L childs,initialy,lod,ned,te,slicable,sur,tutoriels,wont`
-rw-r--r--CMakeLists.txt2
-rw-r--r--cmake/CuraTests.cmake2
-rwxr-xr-xcura/CuraApplication.py22
-rw-r--r--cura/CuraView.py2
-rw-r--r--cura/LayerPolygon.py4
-rw-r--r--cura/Machines/MachineErrorChecker.py3
-rw-r--r--cura/Machines/Models/SettingVisibilityPresetsModel.py2
-rw-r--r--cura/OAuth2/AuthorizationService.py2
-rw-r--r--cura/PickingPass.py2
-rw-r--r--cura/PrinterOutput/FirmwareUpdater.py2
-rw-r--r--cura/PrinterOutput/NetworkedPrinterOutputDevice.py2
-rw-r--r--cura/Settings/ContainerManager.py2
-rw-r--r--cura/Settings/CuraStackBuilder.py2
-rwxr-xr-xcura/Settings/MachineManager.py2
-rw-r--r--cura/SingleInstance.py2
-rw-r--r--cura/TaskManagement/OnExitCallbackManager.py4
-rw-r--r--cura/UI/ObjectsModel.py2
-rwxr-xr-xdocker/build.sh2
-rw-r--r--docs/scene/build_volume.md2
-rwxr-xr-xplugins/CuraEngineBackend/CuraEngineBackend.py2
-rw-r--r--plugins/CuraEngineBackend/StartSliceJob.py2
-rw-r--r--plugins/GCodeReader/FlavorParser.py2
-rw-r--r--plugins/GCodeReader/MarlinFlavorParser.py2
-rw-r--r--plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml2
-rw-r--r--plugins/PostProcessingPlugin/PostProcessingPlugin.qml2
-rw-r--r--plugins/PostProcessingPlugin/scripts/ChangeAtZ.py6
-rw-r--r--plugins/PostProcessingPlugin/scripts/DisplayFilenameAndLayerOnLCD.py2
-rw-r--r--plugins/PostProcessingPlugin/scripts/Stretch.py2
-rw-r--r--plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py2
-rw-r--r--plugins/RemovableDriveOutputDevice/RemovableDrivePlugin.py2
-rw-r--r--plugins/SimulationView/LayerSlider.qml2
-rw-r--r--plugins/SimulationView/SimulationSliderLabel.qml2
-rw-r--r--plugins/SimulationView/SimulationViewMainComponent.qml4
-rw-r--r--plugins/Toolbox/src/CloudSync/CloudPackageChecker.py2
-rw-r--r--plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml2
-rw-r--r--plugins/USBPrinting/AvrFirmwareUpdater.py4
-rw-r--r--plugins/USBPrinting/USBPrinterOutputDevice.py2
-rw-r--r--plugins/VersionUpgrade/VersionUpgrade42to43/VersionUpgrade42to43.py2
-rw-r--r--plugins/X3DReader/X3DReader.py2
-rw-r--r--resources/README_resources.txt2
-rw-r--r--resources/definitions/fdmprinter.def.json2
-rw-r--r--resources/definitions/goofoo_base.def.json2
-rw-r--r--resources/definitions/ideagen3D_sapphire_plus.def.json2
-rw-r--r--resources/qml/ActionButton.qml2
-rw-r--r--resources/qml/Cura.qml6
-rw-r--r--resources/qml/IconWithText.qml2
-rw-r--r--resources/qml/MainWindow/MainWindowHeader.qml2
-rw-r--r--resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml2
-rw-r--r--resources/qml/Menus/OpenFilesMenu.qml2
-rw-r--r--resources/qml/MonitorButton.qml2
-rw-r--r--resources/qml/Preferences/GeneralPage.qml2
-rw-r--r--resources/qml/Preferences/Materials/MaterialsBrandSection.qml2
-rw-r--r--resources/qml/PrintSetupSelector/Custom/MenuButton.qml4
-rw-r--r--resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml2
-rw-r--r--resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml4
-rw-r--r--resources/qml/RadioCheckbar.qml2
-rw-r--r--resources/qml/Settings/SettingCategory.qml2
-rw-r--r--resources/qml/Settings/SettingItem.qml2
-rw-r--r--resources/qml/Settings/SettingView.qml4
-rw-r--r--resources/qml/Toolbar.qml2
-rw-r--r--resources/qml/WelcomePages/DropDownWidget.qml2
-rwxr-xr-xscripts/check_gcode_buffer.py4
-rw-r--r--tests/Machines/Models/TestDiscoveredPrintersModel.py2
-rw-r--r--tests/PrinterOutput/TestNetworkedPrinterOutputDevice.py16
-rw-r--r--tests/Settings/TestSettingInheritanceManager.py4
-rw-r--r--tests/Settings/TestSettingVisibilityPresets.py4
-rw-r--r--tests/TestCuraSceneController.py2
-rwxr-xr-xtests/TestMachineAction.py2
68 files changed, 99 insertions, 100 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9bdd48c317..7846e219e3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,7 @@ configure_file(${CMAKE_SOURCE_DIR}/com.ultimaker.cura.desktop.in ${CMAKE_BINARY_
configure_file(cura/CuraVersion.py.in CuraVersion.py @ONLY)
-# FIXME: The new FindPython3 finds the system's Python3.6 reather than the Python3.5 that we built for Cura's environment.
+# FIXME: The new FindPython3 finds the system's Python3.6 rather than the Python3.5 that we built for Cura's environment.
# So we're using the old method here, with FindPythonInterp for now.
find_package(PythonInterp 3 REQUIRED)
diff --git a/cmake/CuraTests.cmake b/cmake/CuraTests.cmake
index babb86f745..b8127a70ec 100644
--- a/cmake/CuraTests.cmake
+++ b/cmake/CuraTests.cmake
@@ -4,7 +4,7 @@
include(CTest)
include(CMakeParseArguments)
-# FIXME: The new FindPython3 finds the system's Python3.6 reather than the Python3.5 that we built for Cura's environment.
+# FIXME: The new FindPython3 finds the system's Python3.6 rather than the Python3.5 that we built for Cura's environment.
# So we're using the old method here, with FindPythonInterp for now.
find_package(PythonInterp 3 REQUIRED)
diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
index e5779f0581..c133657a1f 100755
--- a/cura/CuraApplication.py
+++ b/cura/CuraApplication.py
@@ -1312,9 +1312,9 @@ class CuraApplication(QtApplication):
if not isinstance(node, SceneNode):
continue
if not node.getMeshData() and not node.callDecoration("isGroup"):
- continue # Node that doesnt have a mesh and is not a group.
+ continue # Node that doesn't have a mesh and is not a group.
if node.getParent() and node.getParent().callDecoration("isGroup") or node.getParent().callDecoration("isSliceable"):
- continue # Grouped nodes don't need resetting as their parent (the group) is resetted)
+ continue # Grouped nodes don't need resetting as their parent (the group) is reset)
if not node.isSelectable():
continue # i.e. node with layer data
if not node.callDecoration("isSliceable") and not node.callDecoration("isGroup"):
@@ -1332,9 +1332,9 @@ class CuraApplication(QtApplication):
if not isinstance(node, SceneNode):
continue
if not node.getMeshData() and not node.callDecoration("isGroup"):
- continue # Node that doesnt have a mesh and is not a group.
+ continue # Node that doesn't have a mesh and is not a group.
if node.getParent() and node.getParent().callDecoration("isGroup"):
- continue # Grouped nodes don't need resetting as their parent (the group) is resetted)
+ continue # Grouped nodes don't need resetting as their parent (the group) is reset)
if not node.isSelectable():
continue # i.e. node with layer data
nodes.append(node)
@@ -1361,9 +1361,9 @@ class CuraApplication(QtApplication):
if not isinstance(node, SceneNode):
continue
if not node.getMeshData() and not node.callDecoration("isGroup"):
- continue # Node that doesnt have a mesh and is not a group.
+ continue # Node that doesn't have a mesh and is not a group.
if node.getParent() and node.getParent().callDecoration("isGroup"):
- continue # Grouped nodes don't need resetting as their parent (the group) is resetted)
+ continue # Grouped nodes don't need resetting as their parent (the group) is reset)
if not node.callDecoration("isSliceable") and not node.callDecoration("isGroup"):
continue # i.e. node with layer data
nodes.append(node)
@@ -1390,7 +1390,7 @@ class CuraApplication(QtApplication):
continue
if not node.getMeshData() and not node.callDecoration("isGroup"):
- continue # Node that doesnt have a mesh and is not a group.
+ continue # Node that doesn't have a mesh and is not a group.
parent_node = node.getParent()
if parent_node and parent_node.callDecoration("isGroup"):
@@ -1418,11 +1418,11 @@ class CuraApplication(QtApplication):
continue
if not node.getMeshData() and not node.callDecoration("isGroup"):
- continue # Node that doesnt have a mesh and is not a group.
+ continue # Node that doesn't have a mesh and is not a group.
parent_node = node.getParent()
if parent_node and parent_node.callDecoration("isGroup"):
- continue # Grouped nodes don't need resetting as their parent (the group) is resetted)
+ continue # Grouped nodes don't need resetting as their parent (the group) is reset)
if not node.isSelectable():
continue # i.e. node with layer data
@@ -2039,11 +2039,11 @@ class CuraApplication(QtApplication):
if not node.isEnabled():
continue
if (not node.getMeshData() and not node.callDecoration("getLayerData")) and not node.callDecoration("isGroup"):
- continue # Node that doesnt have a mesh and is not a group.
+ continue # Node that doesn't have a mesh and is not a group.
if only_selectable and not node.isSelectable():
continue # Only remove nodes that are selectable.
if not node.callDecoration("isSliceable") and not node.callDecoration("getLayerData") and not node.callDecoration("isGroup"):
- continue # Grouped nodes don't need resetting as their parent (the group) is resetted)
+ continue # Grouped nodes don't need resetting as their parent (the group) is reset)
nodes.append(node)
if nodes:
from UM.Operations.GroupedOperation import GroupedOperation
diff --git a/cura/CuraView.py b/cura/CuraView.py
index d594ea9571..86d4254a7d 100644
--- a/cura/CuraView.py
+++ b/cura/CuraView.py
@@ -12,7 +12,7 @@ from cura.CuraApplication import CuraApplication
# Since Cura has a few pre-defined "space claims" for the locations of certain components, we've provided some structure
# to indicate this.
# MainComponent works in the same way the MainComponent of a stage.
-# the stageMenuComponent returns an item that should be used somehwere in the stage menu. It's up to the active stage
+# the stageMenuComponent returns an item that should be used somewhere in the stage menu. It's up to the active stage
# to actually do something with this.
class CuraView(View):
def __init__(self, parent = None, use_empty_menu_placeholder: bool = False) -> None:
diff --git a/cura/LayerPolygon.py b/cura/LayerPolygon.py
index 7f62a0a8fa..2c3b432b1d 100644
--- a/cura/LayerPolygon.py
+++ b/cura/LayerPolygon.py
@@ -59,7 +59,7 @@ class LayerPolygon:
self._vertex_count = self._mesh_line_count + numpy.sum(self._types[1:] == self._types[:-1])
# Buffering the colors shouldn't be necessary as it is not
- # re-used and can save alot of memory usage.
+ # re-used and can save a lot of memory usage.
self._color_map = LayerPolygon.getColorMap()
self._colors = self._color_map[self._types] # type: numpy.ndarray
@@ -146,7 +146,7 @@ class LayerPolygon:
# When the line type changes the index needs to be increased by 2.
indices[self._index_begin:self._index_end, :] += numpy.cumsum(needed_points_list[line_mesh_mask.ravel(), 0], dtype = numpy.int32).reshape((-1, 1))
# Each line segment goes from it's starting point p to p+1, offset by the vertex index.
- # The -1 is to compensate for the neccecarily True value of needed_points_list[0,0] which causes an unwanted +1 in cumsum above.
+ # The -1 is to compensate for the necessarily True value of needed_points_list[0,0] which causes an unwanted +1 in cumsum above.
indices[self._index_begin:self._index_end, :] += numpy.array([self._vertex_begin - 1, self._vertex_begin])
self._build_cache_line_mesh_mask = None
diff --git a/cura/Machines/MachineErrorChecker.py b/cura/Machines/MachineErrorChecker.py
index 818d62de7c..8213734348 100644
--- a/cura/Machines/MachineErrorChecker.py
+++ b/cura/Machines/MachineErrorChecker.py
@@ -97,8 +97,7 @@ class MachineErrorChecker(QObject):
def startErrorCheckPropertyChanged(self, key: str, property_name: str) -> None:
"""Start the error check for property changed
-
- this is seperate from the startErrorCheck because it ignores a number property types
+ this is separate from the startErrorCheck because it ignores a number property types
:param key:
:param property_name:
diff --git a/cura/Machines/Models/SettingVisibilityPresetsModel.py b/cura/Machines/Models/SettingVisibilityPresetsModel.py
index d268774850..2ca0960de4 100644
--- a/cura/Machines/Models/SettingVisibilityPresetsModel.py
+++ b/cura/Machines/Models/SettingVisibilityPresetsModel.py
@@ -33,7 +33,7 @@ class SettingVisibilityPresetsModel(QObject):
if basic_item is not None:
basic_visibile_settings = ";".join(basic_item.settings)
else:
- Logger.log("w", "Unable to find the basic visiblity preset.")
+ Logger.log("w", "Unable to find the basic visibility preset.")
basic_visibile_settings = ""
self._preferences = preferences
diff --git a/cura/OAuth2/AuthorizationService.py b/cura/OAuth2/AuthorizationService.py
index 46fe1be656..9bff497c17 100644
--- a/cura/OAuth2/AuthorizationService.py
+++ b/cura/OAuth2/AuthorizationService.py
@@ -120,7 +120,7 @@ class AuthorizationService:
return self._auth_helpers.parseJWT(self._auth_data.access_token)
def getAccessToken(self) -> Optional[str]:
- """Get the access token as provided by the repsonse data."""
+ """Get the access token as provided by the response data."""
if self._auth_data is None:
Logger.log("d", "No auth data to retrieve the access_token from")
diff --git a/cura/PickingPass.py b/cura/PickingPass.py
index eb190be16d..54e886fe62 100644
--- a/cura/PickingPass.py
+++ b/cura/PickingPass.py
@@ -79,7 +79,7 @@ class PickingPass(RenderPass):
return -1
distance = output.pixel(px, py) # distance in micron, from in r, g & b channels
- distance = (distance & 0x00ffffff) / 1000. # drop the alpha channel and covert to mm
+ distance = (distance & 0x00ffffff) / 1000. # drop the alpha channel and convert to mm
return distance
def getPickedPosition(self, x: int, y: int) -> Vector:
diff --git a/cura/PrinterOutput/FirmwareUpdater.py b/cura/PrinterOutput/FirmwareUpdater.py
index c4f3948c20..cfcfb2204f 100644
--- a/cura/PrinterOutput/FirmwareUpdater.py
+++ b/cura/PrinterOutput/FirmwareUpdater.py
@@ -49,7 +49,7 @@ class FirmwareUpdater(QObject):
raise NotImplementedError("_updateFirmware needs to be implemented")
def _cleanupAfterUpdate(self) -> None:
- """Cleanup after a succesful update"""
+ """Cleanup after a successful update"""
# Clean up for next attempt.
self._update_firmware_thread = Thread(target=self._updateFirmware, daemon=True, name = "FirmwareUpdateThread")
diff --git a/cura/PrinterOutput/NetworkedPrinterOutputDevice.py b/cura/PrinterOutput/NetworkedPrinterOutputDevice.py
index 2690c2651f..9979354dba 100644
--- a/cura/PrinterOutput/NetworkedPrinterOutputDevice.py
+++ b/cura/PrinterOutput/NetworkedPrinterOutputDevice.py
@@ -414,6 +414,6 @@ class NetworkedPrinterOutputDevice(PrinterOutputDevice):
@pyqtProperty(str, constant = True)
def ipAddress(self) -> str:
- """IP adress of this printer"""
+ """IP address of this printer"""
return self._address
diff --git a/cura/Settings/ContainerManager.py b/cura/Settings/ContainerManager.py
index 45f2edab20..09c9a7a3dc 100644
--- a/cura/Settings/ContainerManager.py
+++ b/cura/Settings/ContainerManager.py
@@ -319,7 +319,7 @@ class ContainerManager(QObject):
stack.qualityChanges = quality_changes
if not quality_changes or container_registry.isReadOnly(quality_changes.getId()):
- Logger.log("e", "Could not update quality of a nonexistant or read only quality profile in stack %s", stack.getId())
+ Logger.log("e", "Could not update quality of a nonexistent or read only quality profile in stack %s", stack.getId())
continue
self._performMerge(quality_changes, stack.getTop())
diff --git a/cura/Settings/CuraStackBuilder.py b/cura/Settings/CuraStackBuilder.py
index efc447b2cf..7ede6950d7 100644
--- a/cura/Settings/CuraStackBuilder.py
+++ b/cura/Settings/CuraStackBuilder.py
@@ -66,7 +66,7 @@ class CuraStackBuilder:
Logger.logException("e", "Failed to create an extruder stack for position {pos}: {err}".format(pos = position, err = str(e)))
return None
- # If given, set the machine_extruder_count when creating the machine, or else the extruderList used bellow will
+ # If given, set the machine_extruder_count when creating the machine, or else the extruderList used below will
# not return the correct extruder list (since by default, the machine_extruder_count is 1) in machines with
# settable number of extruders.
if machine_extruder_count and 0 <= machine_extruder_count <= len(extruder_dict):
diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py
index 70a8a6aae7..ac9d704afd 100755
--- a/cura/Settings/MachineManager.py
+++ b/cura/Settings/MachineManager.py
@@ -627,7 +627,7 @@ class MachineManager(QObject):
return ""
return global_container_stack.getIntentCategory()
- # Provies a list of extruder positions that have a different intent from the active one.
+ # Provides a list of extruder positions that have a different intent from the active one.
@pyqtProperty("QStringList", notify=activeIntentChanged)
def extruderPositionsWithNonActiveIntent(self):
global_container_stack = self._application.getGlobalContainerStack()
diff --git a/cura/SingleInstance.py b/cura/SingleInstance.py
index 6fcf0da6cf..fa82ceb104 100644
--- a/cura/SingleInstance.py
+++ b/cura/SingleInstance.py
@@ -68,7 +68,7 @@ class SingleInstance:
Logger.log("e", "Single instance server was not created.")
def _onClientConnected(self) -> None:
- Logger.log("i", "New connection recevied on our single-instance server")
+ Logger.log("i", "New connection received on our single-instance server")
connection = None #type: Optional[QLocalSocket]
if self._single_instance_server:
connection = self._single_instance_server.nextPendingConnection()
diff --git a/cura/TaskManagement/OnExitCallbackManager.py b/cura/TaskManagement/OnExitCallbackManager.py
index 2e8e42595b..7894931e9c 100644
--- a/cura/TaskManagement/OnExitCallbackManager.py
+++ b/cura/TaskManagement/OnExitCallbackManager.py
@@ -56,8 +56,8 @@ class OnExitCallbackManager:
self._application.callLater(self._application.closeApplication)
# This is the callback function which an on-exit callback should call when it finishes, it should provide the
- # "should_proceed" flag indicating whether this check has "passed", or in other words, whether quiting the
- # application should be blocked. If the last on-exit callback doesn't block the quiting, it will call the next
+ # "should_proceed" flag indicating whether this check has "passed", or in other words, whether quitting the
+ # application should be blocked. If the last on-exit callback doesn't block the quitting, it will call the next
# registered on-exit callback if available.
def onCurrentCallbackFinished(self, should_proceed: bool = True) -> None:
if not should_proceed:
diff --git a/cura/UI/ObjectsModel.py b/cura/UI/ObjectsModel.py
index 0c109d7a4a..64a6e89054 100644
--- a/cura/UI/ObjectsModel.py
+++ b/cura/UI/ObjectsModel.py
@@ -90,7 +90,7 @@ class ObjectsModel(ListModel):
parent = node.getParent()
if parent and parent.callDecoration("isGroup"):
- return False # Grouped nodes don't need resetting as their parent (the group) is resetted)
+ return False # Grouped nodes don't need resetting as their parent (the group) is reset)
node_build_plate_number = node.callDecoration("getBuildPlateNumber")
if Application.getInstance().getPreferences().getValue("view/filter_current_build_plate") and node_build_plate_number != self._build_plate_number:
diff --git a/docker/build.sh b/docker/build.sh
index 990d28d2e8..9fec21ac50 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -50,7 +50,7 @@ do
echo "Found Uranium branch [${URANIUM_BRANCH}]."
break
else
- echo "Could not find Uranium banch [${URANIUM_BRANCH}], try next."
+ echo "Could not find Uranium branch [${URANIUM_BRANCH}], try next."
fi
done
diff --git a/docs/scene/build_volume.md b/docs/scene/build_volume.md
index eb10e5e60e..8cdecb6d3a 100644
--- a/docs/scene/build_volume.md
+++ b/docs/scene/build_volume.md
@@ -8,7 +8,7 @@ The build volume draws a cube (for rectangular build plates) that represents the
The build volume also draws a grid underneath the build volume. The grid features 1cm lines which allows the user to roughly estimate how big its print is or the distance between prints. It also features a finer 1mm line pattern within that grid. The grid is drawn as a single quad. This quad is then sent to the graphical card with a specialised shader which draws the grid pattern.
-For elliptical build plates, the volume bounds are drawn as two circles, one at the top and one at the bottom of the available height. The build plate grid is drawn as a tesselated circle, but with the same shader.
+For elliptical build plates, the volume bounds are drawn as two circles, one at the top and one at the bottom of the available height. The build plate grid is drawn as a tessellated circle, but with the same shader.
Disallowed areas
----
diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py
index a29fd2ad11..74f564c825 100755
--- a/plugins/CuraEngineBackend/CuraEngineBackend.py
+++ b/plugins/CuraEngineBackend/CuraEngineBackend.py
@@ -647,7 +647,7 @@ class CuraEngineBackend(QObject, Backend):
for node in DepthFirstIterator(self._scene.getRoot()):
if node.callDecoration("getLayerData"):
if not build_plate_numbers or node.callDecoration("getBuildPlateNumber") in build_plate_numbers:
- # We can asume that all nodes have a parent as we're looping through the scene (and filter out root)
+ # We can assume that all nodes have a parent as we're looping through the scene (and filter out root)
cast(SceneNode, node.getParent()).removeChild(node)
def markSliceAll(self) -> None:
diff --git a/plugins/CuraEngineBackend/StartSliceJob.py b/plugins/CuraEngineBackend/StartSliceJob.py
index 453907ffc0..de3b375e28 100644
--- a/plugins/CuraEngineBackend/StartSliceJob.py
+++ b/plugins/CuraEngineBackend/StartSliceJob.py
@@ -195,7 +195,7 @@ class StartSliceJob(Job):
# Remove old layer data.
for node in DepthFirstIterator(self._scene.getRoot()):
if node.callDecoration("getLayerData") and node.callDecoration("getBuildPlateNumber") == self._build_plate_number:
- # Singe we walk through all nodes in the scene, they always have a parent.
+ # Since we walk through all nodes in the scene, they always have a parent.
cast(SceneNode, node.getParent()).removeChild(node)
break
diff --git a/plugins/GCodeReader/FlavorParser.py b/plugins/GCodeReader/FlavorParser.py
index 2b6fa215e0..48a81324f6 100644
--- a/plugins/GCodeReader/FlavorParser.py
+++ b/plugins/GCodeReader/FlavorParser.py
@@ -428,7 +428,7 @@ class FlavorParser:
G = self._getInt(line, "G")
if G is not None:
- # When find a movement, the new posistion is calculated and added to the current_path, but
+ # When find a movement, the new position is calculated and added to the current_path, but
# don't need to create a polygon until the end of the layer
current_position = self.processGCode(G, line, current_position, current_path)
continue
diff --git a/plugins/GCodeReader/MarlinFlavorParser.py b/plugins/GCodeReader/MarlinFlavorParser.py
index 482285a2c9..988070178a 100644
--- a/plugins/GCodeReader/MarlinFlavorParser.py
+++ b/plugins/GCodeReader/MarlinFlavorParser.py
@@ -3,7 +3,7 @@
from . import FlavorParser
-# This parser is intented for interpret the Marlin/Sprinter Firmware flavor
+# This parser is intended to interpret the Marlin/Sprinter Firmware flavor
class MarlinFlavorParser(FlavorParser.FlavorParser):
def __init__(self):
diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
index e96337e6bb..9957171379 100644
--- a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
+++ b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
@@ -312,7 +312,7 @@ Item
}
}
- // Specialty provider that only watches global_inherits (we cant filter on what property changed we get events
+ // Specialty provider that only watches global_inherits (we can't filter on what property changed we get events
// so we bypass that to make a dedicated provider).
UM.SettingPropertyProvider
{
diff --git a/plugins/PostProcessingPlugin/PostProcessingPlugin.qml b/plugins/PostProcessingPlugin/PostProcessingPlugin.qml
index 7397ec8196..bbba2e7621 100644
--- a/plugins/PostProcessingPlugin/PostProcessingPlugin.qml
+++ b/plugins/PostProcessingPlugin/PostProcessingPlugin.qml
@@ -403,7 +403,7 @@ UM.Dialog
storeIndex: 0
}
- // Specialty provider that only watches global_inherits (we cant filter on what property changed we get events
+ // Specialty provider that only watches global_inherits (we can't filter on what property changed we get events
// so we bypass that to make a dedicated provider).
UM.SettingPropertyProvider
{
diff --git a/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py b/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py
index a23e52b750..9e94dd9828 100644
--- a/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py
+++ b/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py
@@ -31,7 +31,7 @@
# V4.9.93: Minor bugfixes (input settings) / documentation
# V4.9.94: Bugfix Combobox-selection; remove logger
# V5.0: Bugfix for fall back after one layer and doubled G0 commands when using print speed tweak, Initial version for Cura 2.x
-# V5.0.1: Bugfix for calling unknown property 'bedTemp' of previous settings storage and unkown variable 'speed'
+# V5.0.1: Bugfix for calling unknown property 'bedTemp' of previous settings storage and unknown variable 'speed'
# V5.1: API Changes included for use with Cura 2.2
# V5.2.0: Wes Hanney. Added support for changing Retract Length and Speed. Removed layer spread option. Fixed issue of cumulative ChangeZ
# mods so they can now properly be stacked on top of each other. Applied code refactoring to clean up various coding styles. Added comments.
@@ -657,7 +657,7 @@ class ChangeAtZProcessor:
# Indicates if the user has opted for linear move retractions or firmware retractions
linearRetraction = True
- # Indicates if we're targetting by layer or height value
+ # Indicates if we're targeting by layer or height value
targetByLayer = True
# Indicates if we have injected our changed values for the given layer yet
@@ -1079,7 +1079,7 @@ class ChangeAtZProcessor:
else:
modified_gcode += line + "\n"
- # if we're targetting by layer we want to add our values just after the layer label
+ # if we're targeting by layer we want to add our values just after the layer label
if ";LAYER:" in line:
modified_gcode += self.getInjectCode()
diff --git a/plugins/PostProcessingPlugin/scripts/DisplayFilenameAndLayerOnLCD.py b/plugins/PostProcessingPlugin/scripts/DisplayFilenameAndLayerOnLCD.py
index d589e63fb3..69489bfcad 100644
--- a/plugins/PostProcessingPlugin/scripts/DisplayFilenameAndLayerOnLCD.py
+++ b/plugins/PostProcessingPlugin/scripts/DisplayFilenameAndLayerOnLCD.py
@@ -5,7 +5,7 @@
# Description: This plugin shows custom messages about your print on the Status bar...
# Please look at the 3 options
-# - Scolling (SCROLL_LONG_FILENAMES) if enabled in Marlin and you arent printing a small item select this option.
+# - Scrolling (SCROLL_LONG_FILENAMES) if enabled in Marlin and you aren't printing a small item select this option.
# - Name: By default it will use the name generated by Cura (EG: TT_Test_Cube) - Type a custom name in here
# - Max Layer: Enabling this will show how many layers are in the entire print (EG: Layer 1 of 265!)
diff --git a/plugins/PostProcessingPlugin/scripts/Stretch.py b/plugins/PostProcessingPlugin/scripts/Stretch.py
index e56a9f48b1..924563d305 100644
--- a/plugins/PostProcessingPlugin/scripts/Stretch.py
+++ b/plugins/PostProcessingPlugin/scripts/Stretch.py
@@ -195,7 +195,7 @@ class Stretcher:
i.e. it is a travel move
"""
if i_pos == 0:
- return True # Begining a layer always breaks filament (for simplicity)
+ return True # Beginning a layer always breaks filament (for simplicity)
step = layer_steps[i_pos]
prev_step = layer_steps[i_pos - 1]
if step.step_e != prev_step.step_e:
diff --git a/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py b/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py
index 05543813db..067773d988 100644
--- a/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py
+++ b/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py
@@ -136,7 +136,7 @@ class RemovableDriveOutputDevice(OutputDevice):
self._stream.close()
self._stream = None
except:
- Logger.logException("w", "An execption occured while trying to write to removable drive.")
+ Logger.logException("w", "An exception occurred while trying to write to removable drive.")
message = Message(catalog.i18nc("@info:status", "Could not save to removable drive {0}: {1}").format(self.getName(),str(job.getError())),
title = catalog.i18nc("@info:title", "Error"),
message_type = Message.MessageType.ERROR)
diff --git a/plugins/RemovableDriveOutputDevice/RemovableDrivePlugin.py b/plugins/RemovableDriveOutputDevice/RemovableDrivePlugin.py
index d59d1296e3..d60e4b34f0 100644
--- a/plugins/RemovableDriveOutputDevice/RemovableDrivePlugin.py
+++ b/plugins/RemovableDriveOutputDevice/RemovableDrivePlugin.py
@@ -48,7 +48,7 @@ class RemovableDrivePlugin(OutputDevicePlugin):
result = False
if result:
- Logger.log("i", "Succesfully ejected the device")
+ Logger.log("i", "Successfully ejected the device")
return result
def performEjectDevice(self, device):
diff --git a/plugins/SimulationView/LayerSlider.qml b/plugins/SimulationView/LayerSlider.qml
index d6de45df9b..e8d5e2f315 100644
--- a/plugins/SimulationView/LayerSlider.qml
+++ b/plugins/SimulationView/LayerSlider.qml
@@ -187,7 +187,7 @@ Item
{
sliderRoot.manuallyChanged = true
- // don't allow the lower handle to be heigher than the upper handle
+ // don't allow the lower handle to be higher than the upper handle
if (lowerHandle.y - (y + height) < sliderRoot.minimumRangeHandleSize)
{
lowerHandle.y = y + height + sliderRoot.minimumRangeHandleSize
diff --git a/plugins/SimulationView/SimulationSliderLabel.qml b/plugins/SimulationView/SimulationSliderLabel.qml
index c1fb0f4de9..afd02069eb 100644
--- a/plugins/SimulationView/SimulationSliderLabel.qml
+++ b/plugins/SimulationView/SimulationSliderLabel.qml
@@ -59,7 +59,7 @@ UM.PointingRectangle {
text: sliderLabelRoot.value + startFrom // the current handle value, add 1 because layers is an array
horizontalAlignment: TextInput.AlignHCenter
- // key bindings, work when label is currenctly focused (active handle in LayerSlider)
+ // key bindings, work when label is currently focused (active handle in LayerSlider)
Keys.onUpPressed: sliderLabelRoot.setValue(sliderLabelRoot.value + ((event.modifiers & Qt.ShiftModifier) ? 10 : 1))
Keys.onDownPressed: sliderLabelRoot.setValue(sliderLabelRoot.value - ((event.modifiers & Qt.ShiftModifier) ? 10 : 1))
diff --git a/plugins/SimulationView/SimulationViewMainComponent.qml b/plugins/SimulationView/SimulationViewMainComponent.qml
index 9232516673..af60692273 100644
--- a/plugins/SimulationView/SimulationViewMainComponent.qml
+++ b/plugins/SimulationView/SimulationViewMainComponent.qml
@@ -190,11 +190,11 @@ Item
}
}
- // Scrolls trough Z layers
+ // Scrolls through Z layers
LayerSlider
{
property var preferredHeight: UM.Theme.getSize("slider_layerview_size").height
- property double heightMargin: UM.Theme.getSize("default_margin").height * 3 // extra margin to accomodate layer number tooltips
+ property double heightMargin: UM.Theme.getSize("default_margin").height * 3 // extra margin to accommodate layer number tooltips
property double layerSliderSafeHeight: layerSliderSafeYMax - layerSliderSafeYMin
id: layerSlider
diff --git a/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py b/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py
index f864e2ee8d..4c1818e4ee 100644
--- a/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py
+++ b/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py
@@ -37,7 +37,7 @@ class CloudPackageChecker(QObject):
self._i18n_catalog = i18nCatalog("cura")
self._sdk_version = ApplicationMetadata.CuraSDKVersion
self._last_notified_packages = set() # type: Set[str]
- """Packages for which a notification has been shown. No need to bother the user twice fo equal content"""
+ """Packages for which a notification has been shown. No need to bother the user twice for equal content"""
# This is a plugin, so most of the components required are not ready when
# this is initialized. Therefore, we wait until the application is ready.
diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml
index 98cd3916fb..5a8a0a42b1 100644
--- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml
+++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml
@@ -16,7 +16,7 @@ Item
{
id: base
- // The print job which all other information is dervied from
+ // The print job which all other information is derived from
property var printJob: null
width: childrenRect.width
diff --git a/plugins/USBPrinting/AvrFirmwareUpdater.py b/plugins/USBPrinting/AvrFirmwareUpdater.py
index 0f7146560d..7023179fea 100644
--- a/plugins/USBPrinting/AvrFirmwareUpdater.py
+++ b/plugins/USBPrinting/AvrFirmwareUpdater.py
@@ -52,11 +52,11 @@ class AvrFirmwareUpdater(FirmwareUpdater):
try:
programmer.programChip(hex_file)
except SerialException as e:
- Logger.log("e", "A serial port exception occured during firmware update: %s" % e)
+ Logger.log("e", "A serial port exception occurred during firmware update: %s" % e)
self._setFirmwareUpdateState(FirmwareUpdateState.io_error)
return
except Exception as e:
- Logger.log("e", "An unknown exception occured during firmware update: %s" % e)
+ Logger.log("e", "An unknown exception occurred during firmware update: %s" % e)
self._setFirmwareUpdateState(FirmwareUpdateState.unknown_error)
return
diff --git a/plugins/USBPrinting/USBPrinterOutputDevice.py b/plugins/USBPrinting/USBPrinterOutputDevice.py
index 92f4bf4e4d..d91be99f46 100644
--- a/plugins/USBPrinting/USBPrinterOutputDevice.py
+++ b/plugins/USBPrinting/USBPrinterOutputDevice.py
@@ -311,7 +311,7 @@ class USBPrinterOutputDevice(PrinterOutputDevice):
if line == b"":
# An empty line means that the firmware is idle
# Multiple empty lines probably means that the firmware and Cura are waiting
- # for eachother due to a missed "ok", so we keep track of empty lines
+ # for each other due to a missed "ok", so we keep track of empty lines
self._firmware_idle_count += 1
else:
self._firmware_idle_count = 0
diff --git a/plugins/VersionUpgrade/VersionUpgrade42to43/VersionUpgrade42to43.py b/plugins/VersionUpgrade/VersionUpgrade42to43/VersionUpgrade42to43.py
index 73d6578c9b..50aa726044 100644
--- a/plugins/VersionUpgrade/VersionUpgrade42to43/VersionUpgrade42to43.py
+++ b/plugins/VersionUpgrade/VersionUpgrade42to43/VersionUpgrade42to43.py
@@ -122,7 +122,7 @@ class VersionUpgrade42to43(VersionUpgrade):
# Update version number.
parser["metadata"]["setting_version"] = "9"
# Handle changes for the imade3d jellybox. The machine was split up into parts (eg; a 2 fan version and a single
- # fan version. Perviously it used variants for this. The only upgrade we can do here is strip that variant.
+ # fan version. Previously it used variants for this. The only upgrade we can do here is strip that variant.
# This is because we only upgrade per stack (and to fully do these changes, we'd need to switch out something
# in the global container based on changes made to the extruder stack)
if parser["containers"]["6"] == "imade3d_jellybox_extruder_0":
diff --git a/plugins/X3DReader/X3DReader.py b/plugins/X3DReader/X3DReader.py
index f693fc1eeb..548c9f44e6 100644
--- a/plugins/X3DReader/X3DReader.py
+++ b/plugins/X3DReader/X3DReader.py
@@ -250,7 +250,7 @@ class X3DReader(MeshReader):
else:
nr = ns = DEFAULT_SUBDIV
- lau = pi / nr # Unit angle of latitude (rings) for the given tesselation
+ lau = pi / nr # Unit angle of latitude (rings) for the given tessellation
lou = 2 * pi / ns # Unit angle of longitude (segments)
self.reserveFaceAndVertexCount(ns*(nr*2 - 2), 2 + (nr - 1)*ns)
diff --git a/resources/README_resources.txt b/resources/README_resources.txt
index 17124bc0d5..d863dd4668 100644
--- a/resources/README_resources.txt
+++ b/resources/README_resources.txt
@@ -3,7 +3,7 @@ any resources here, they will not be seen or upgraded by next versions of Cura.
If you want your (unbundled or altered) resources to work after an upgrade,
please don't put them here, but install them either;
- - for materials: via the Marketplace (recommended if avialable),
+ - for materials: via the Marketplace (recommended if available),
- by dragging a `.curapackage` file onto Cura,
- or place it in the right sub-folder in the configuration folder* for Cura.
diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index abdb03c5b0..35f36df216 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -6249,7 +6249,7 @@
"mold_width":
{
"label": "Minimal Mold Width",
- "description": "The minimal distance between the ouside of the mold and the outside of the model.",
+ "description": "The minimal distance between the outside of the mold and the outside of the model.",
"unit": "mm",
"type": "float",
"minimum_value_warning": "wall_line_width_0 * 2",
diff --git a/resources/definitions/goofoo_base.def.json b/resources/definitions/goofoo_base.def.json
index 6d840438c1..a305cc3229 100644
--- a/resources/definitions/goofoo_base.def.json
+++ b/resources/definitions/goofoo_base.def.json
@@ -26,7 +26,7 @@
},
"overrides": {
- "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract the filament\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG28 X0 Y0 ;Home X and Y\n\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z" },
+ "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract the filament\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positioning\n\nG28 X0 Y0 ;Home X and Y\n\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z" },
"machine_max_feedrate_x": { "value": 500 },
"machine_max_feedrate_y": { "value": 500 },
diff --git a/resources/definitions/ideagen3D_sapphire_plus.def.json b/resources/definitions/ideagen3D_sapphire_plus.def.json
index 55f471793a..a8541401c2 100644
--- a/resources/definitions/ideagen3D_sapphire_plus.def.json
+++ b/resources/definitions/ideagen3D_sapphire_plus.def.json
@@ -27,7 +27,7 @@
[30, 40]
]
},
- "machine_start_gcode": { "default_value": ";Start GCode by ideagen3D\n\nG1 Z15.0 F6000 ;Move the platform down 15mm\n\n;Initialize Temperature\nM140 S{material_bed_temperature_layer_0} ;heat bed and continue\nM104 S{material_print_temperature_layer_0} ;heat nozzle and continue\nM190 S{material_bed_temperature_layer_0} ;wait for bed temperature to reach inital layer temperature\nM109 S{material_print_temperature_layer_0} ;wait for hot end temperature to reach inital layer temperature\n\nG28 M420 S1 ; Home & Enable Bed Levelling\n\n;Prime the extruder\nG92 E0\nG1 X1 Y280 Z0.2 ;Prepare to Purge\nG1 Y20 Z0.2 F1500.0 E15 ;Purge line\nG92 E0" },
+ "machine_start_gcode": { "default_value": ";Start GCode by ideagen3D\n\nG1 Z15.0 F6000 ;Move the platform down 15mm\n\n;Initialize Temperature\nM140 S{material_bed_temperature_layer_0} ;heat bed and continue\nM104 S{material_print_temperature_layer_0} ;heat nozzle and continue\nM190 S{material_bed_temperature_layer_0} ;wait for bed temperature to reach initial layer temperature\nM109 S{material_print_temperature_layer_0} ;wait for hot end temperature to reach initial layer temperature\n\nG28 M420 S1 ; Home & Enable Bed Levelling\n\n;Prime the extruder\nG92 E0\nG1 X1 Y280 Z0.2 ;Prepare to Purge\nG1 Y20 Z0.2 F1500.0 E15 ;Purge line\nG92 E0" },
"machine_end_gcode": { "default_value": ";End GCode by ideagen3D\n\nM104 S0 ;Set nozzle temperature to 0\nM140 S0 ;Set Bed temperature to 0\n\nG92 E1 ;Prepare to retract filament\nG1 E-1 F300 ;Retract filament\nG28 X0 Y0 ;Home X and Y\nM84 ;Disable Steppers" },
"gantry_height": { "value": 65 }
}
diff --git a/resources/qml/ActionButton.qml b/resources/qml/ActionButton.qml
index 582df3d87c..62bea5df3b 100644
--- a/resources/qml/ActionButton.qml
+++ b/resources/qml/ActionButton.qml
@@ -143,7 +143,7 @@ Button
Binding
{
- // When settting width directly, an unjust binding loop warning would be triggered,
+ // When setting width directly, an unjust binding loop warning would be triggered,
// because button.width is part of this expression.
// Using parent.width is fine in fixedWidthMode.
target: buttonText
diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index 7782ace3af..eb78240d64 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -200,7 +200,7 @@ UM.MainWindow
}
}
- // This is a placehoder for adding a pattern in the header
+ // This is a placeholder for adding a pattern in the header
Image
{
id: backgroundPattern
@@ -311,8 +311,8 @@ UM.MainWindow
Toolbar
{
- // The toolbar is the left bar that is populated by all the tools (which are dynamicly populated by
- // plugins)
+ // The toolbar is the left bar that is populated by all the tools
+ // (which are dynamically populated by plugins)
id: toolbar
property int mouseX: base.mouseX
diff --git a/resources/qml/IconWithText.qml b/resources/qml/IconWithText.qml
index b9fe873b25..e582aa5939 100644
--- a/resources/qml/IconWithText.qml
+++ b/resources/qml/IconWithText.qml
@@ -10,7 +10,7 @@ import Cura 1.0 as Cura
// Reusable component that holds an (re-colorable) icon on the left with some text on the right.
// This component is also designed to be used with layouts. It will use the width of the text + icon as preferred width
-// It sets the icon size + half of the content as its minium width (in which case it will elide the text)
+// It sets the icon size + half of the content as its minimum width (in which case it will elide the text)
Item
{
property alias source: icon.source
diff --git a/resources/qml/MainWindow/MainWindowHeader.qml b/resources/qml/MainWindow/MainWindowHeader.qml
index c670abb67a..c27f3b0a24 100644
--- a/resources/qml/MainWindow/MainWindowHeader.qml
+++ b/resources/qml/MainWindow/MainWindowHeader.qml
@@ -70,7 +70,7 @@ Item
// This id is required to find the stage buttons through Squish
property string stageId: model.id
- // This is a trick to assure the activeStage is correctly changed. It doesn't work propertly if done in the onClicked (see CURA-6028)
+ // This is a trick to assure the activeStage is correctly changed. It doesn't work properly if done in the onClicked (see CURA-6028)
MouseArea
{
anchors.fill: parent
diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml
index 75ae18a593..de70b0e0f4 100644
--- a/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml
+++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml
@@ -46,7 +46,7 @@ Item
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
anchors.leftMargin: UM.Theme.getSize("default_margin").width
- // There are two cases that we want to differenciate, one is when Cura is loading the configurations and the
+ // There are two cases that we want to differentiate, one is when Cura is loading the configurations and the
// other when the connection was lost
text: Cura.MachineManager.printerConnected ?
catalog.i18nc("@label", "Loading available configurations from the printer...") :
diff --git a/resources/qml/Menus/OpenFilesMenu.qml b/resources/qml/Menus/OpenFilesMenu.qml
index 3c2b64ee62..25f474c1d6 100644
--- a/resources/qml/Menus/OpenFilesMenu.qml
+++ b/resources/qml/Menus/OpenFilesMenu.qml
@@ -37,7 +37,7 @@ Menu
}
}
// Unassign the shortcuts when the submenu is invisible (i.e. when there is only one file provider) to avoid ambiguous shortcuts.
- // When there is a signle file provider, the openAction is assigned with the Ctrl+O shortcut instead.
+ // When there is a single file provider, the openAction is assigned with the Ctrl+O shortcut instead.
shortcut: openFilesMenu.visible ? model.shortcut : ""
}
onObjectAdded: openFilesMenu.insertItem(index, object)
diff --git a/resources/qml/MonitorButton.qml b/resources/qml/MonitorButton.qml
index e6248f43b4..40da10dc46 100644
--- a/resources/qml/MonitorButton.qml
+++ b/resources/qml/MonitorButton.qml
@@ -37,7 +37,7 @@ Item
}
if(activePrintJob.timeTotal == 0)
{
- return 0 // Prevent devision by 0
+ return 0 // Prevent division by 0
}
return activePrintJob.timeElapsed / activePrintJob.timeTotal * 100
}
diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml
index 5b28396188..98f3266455 100644
--- a/resources/qml/Preferences/GeneralPage.qml
+++ b/resources/qml/Preferences/GeneralPage.qml
@@ -19,7 +19,7 @@ UM.PreferencesPage
function setDefaultLanguage(languageCode)
{
- //loops trough the languageList and sets the language using the languageCode
+ //loops through the languageList and sets the language using the languageCode
for(var i = 0; i < languageList.count; i++)
{
if (languageComboBox.model.get(i).code == languageCode)
diff --git a/resources/qml/Preferences/Materials/MaterialsBrandSection.qml b/resources/qml/Preferences/Materials/MaterialsBrandSection.qml
index dc8be9563b..04e39f33b1 100644
--- a/resources/qml/Preferences/Materials/MaterialsBrandSection.qml
+++ b/resources/qml/Preferences/Materials/MaterialsBrandSection.qml
@@ -18,7 +18,7 @@ Item
property var sectionName: ""
property var elementsModel // This can be a MaterialTypesModel or GenericMaterialsModel or FavoriteMaterialsModel
- property var hasMaterialTypes: true // It indicates wheather it has material types or not
+ property var hasMaterialTypes: true // It indicates whether it has material types or not
property var expanded: materialList.expandedBrands.indexOf(sectionName) > -1
height: childrenRect.height
diff --git a/resources/qml/PrintSetupSelector/Custom/MenuButton.qml b/resources/qml/PrintSetupSelector/Custom/MenuButton.qml
index a012a56056..b637e20d58 100644
--- a/resources/qml/PrintSetupSelector/Custom/MenuButton.qml
+++ b/resources/qml/PrintSetupSelector/Custom/MenuButton.qml
@@ -12,7 +12,7 @@ Button
// This is a work around for a qml issue. Since the default button uses a private implementation for contentItem
// (the so called IconText), which handles the mnemonic conversion (aka; ensuring that &Button) text property
// is rendered with the B underlined. Since we're also forced to mix controls 1.0 and 2.0 actions together,
- // we need a special property for the text of the label if we do want it to be rendered correclty, but don't want
+ // we need a special property for the text of the label if we do want it to be rendered correctly, but don't want
// another shortcut to be added (which will cause for "QQuickAction::event: Ambiguous shortcut overload: " to
// happen.
property string labelText: ""
@@ -29,7 +29,7 @@ Button
radius: UM.Theme.getSize("action_button_radius").width
}
- // Workarround to ensure that the mnemonic highlighting happens correctly
+ // Workaround to ensure that the mnemonic highlighting happens correctly
function replaceText(txt)
{
var index = txt.indexOf("&")
diff --git a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml
index 0a5a466780..046efe8b5b 100644
--- a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml
+++ b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml
@@ -203,7 +203,7 @@ Item
h -= mouse_absolute_y - base.height;
}
// Enforce a minimum size (again).
- // This is a bit of a hackish way to do it, but we've seen some ocasional reports that the size
+ // This is a bit of a hackish way to do it, but we've seen some occasional reports that the size
// could get below the the minimum height.
if(h < absoluteMinimumHeight)
{
diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml
index 705a3e95ef..dd2e0aef2b 100644
--- a/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml
+++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml
@@ -169,8 +169,8 @@ Item
// Update the slider value to represent the rounded value
infillSlider.value = roundedSliderValue
- // Update value only if the Recomended mode is Active,
- // Otherwise if I change the value in the Custom mode the Recomended view will try to repeat
+ // Update value only if the Recommended mode is Active,
+ // Otherwise if I change the value in the Custom mode the Recommended view will try to repeat
// same operation
var active_mode = UM.Preferences.getValue("cura/active_mode")
diff --git a/resources/qml/RadioCheckbar.qml b/resources/qml/RadioCheckbar.qml
index 5aea771a44..50b5d77784 100644
--- a/resources/qml/RadioCheckbar.qml
+++ b/resources/qml/RadioCheckbar.qml
@@ -105,7 +105,7 @@ Item
Rectangle
{
- // This can (and should) be done wiht a verticalCenter. For some reason it does work in QtCreator
+ // This can (and should) be done with a verticalCenter. For some reason it does work in QtCreator
// but not when using the exact same QML in Cura.
anchors.verticalCenter: parent ? parent.verticalCenter : undefined
anchors.horizontalCenter: parent ? parent.horizontalCenter : undefined
diff --git a/resources/qml/Settings/SettingCategory.qml b/resources/qml/Settings/SettingCategory.qml
index 5beb6e209e..d8b9b2c83f 100644
--- a/resources/qml/Settings/SettingCategory.qml
+++ b/resources/qml/Settings/SettingCategory.qml
@@ -12,7 +12,7 @@ Button
id: base
anchors.left: parent.left
anchors.right: parent.right
- // To avoid overlaping with the scrollBars
+ // To avoid overlapping with the scrollBars
anchors.rightMargin: 2 * UM.Theme.getSize("thin_margin").width
hoverEnabled: true
diff --git a/resources/qml/Settings/SettingItem.qml b/resources/qml/Settings/SettingItem.qml
index 35172fc799..98a1601b48 100644
--- a/resources/qml/Settings/SettingItem.qml
+++ b/resources/qml/Settings/SettingItem.qml
@@ -17,7 +17,7 @@ Item
height: UM.Theme.getSize("section").height
anchors.left: parent.left
anchors.right: parent.right
- // To avoid overlaping with the scrollBars
+ // To avoid overlapping with the scrollBars
anchors.rightMargin: 2 * UM.Theme.getSize("thin_margin").width
property alias contents: controlContainer.children
diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml
index d364fba039..074946c6bd 100644
--- a/resources/qml/Settings/SettingView.qml
+++ b/resources/qml/Settings/SettingView.qml
@@ -228,7 +228,7 @@ Item
id: definitionsModel
containerId: Cura.MachineManager.activeMachine !== null ? Cura.MachineManager.activeMachine.definition.id: ""
visibilityHandler: UM.SettingPreferenceVisibilityHandler { }
- exclude: ["machine_settings", "command_line_settings", "infill_mesh", "infill_mesh_order", "cutting_mesh", "support_mesh", "anti_overhang_mesh"] // TODO: infill_mesh settigns are excluded hardcoded, but should be based on the fact that settable_globally, settable_per_meshgroup and settable_per_extruder are false.
+ exclude: ["machine_settings", "command_line_settings", "infill_mesh", "infill_mesh_order", "cutting_mesh", "support_mesh", "anti_overhang_mesh"] // TODO: infill_mesh settings are excluded hardcoded, but should be based on the fact that settable_globally, settable_per_meshgroup and settable_per_extruder are false.
expanded: CuraApplication.expandedCategories
onExpandedChanged:
{
@@ -330,7 +330,7 @@ Item
}
}
- // Specialty provider that only watches global_inherits (we cant filter on what property changed we get events
+ // Specialty provider that only watches global_inherits (we can't filter on what property changed we get events
// so we bypass that to make a dedicated provider).
UM.SettingPropertyProvider
{
diff --git a/resources/qml/Toolbar.qml b/resources/qml/Toolbar.qml
index c948bb8242..66163fed37 100644
--- a/resources/qml/Toolbar.qml
+++ b/resources/qml/Toolbar.qml
@@ -183,7 +183,7 @@ Item
borderColor: UM.Theme.getColor("lining")
borderWidth: UM.Theme.getSize("default_lining").width
- MouseArea //Catch all mouse events (so scene doesnt handle them)
+ MouseArea //Catch all mouse events (so scene doesn't handle them)
{
anchors.fill: parent
acceptedButtons: Qt.AllButtons
diff --git a/resources/qml/WelcomePages/DropDownWidget.qml b/resources/qml/WelcomePages/DropDownWidget.qml
index b129673905..dde1be752b 100644
--- a/resources/qml/WelcomePages/DropDownWidget.qml
+++ b/resources/qml/WelcomePages/DropDownWidget.qml
@@ -56,7 +56,7 @@ Item
Cura.RoundedRectangle
{
id: contentRectangle
- // Move up a bit (exaclty the width of the border) to avoid double line
+ // Move up a bit (exactly the width of the border) to avoid double line
y: header.height - UM.Theme.getSize("default_lining").width
anchors.left: header.left
anchors.right: header.right
diff --git a/scripts/check_gcode_buffer.py b/scripts/check_gcode_buffer.py
index ed093089e4..31ce5a046d 100755
--- a/scripts/check_gcode_buffer.py
+++ b/scripts/check_gcode_buffer.py
@@ -69,9 +69,9 @@ def calc_distance(pos1, pos2):
def calc_acceleration_distance(init_speed: float, target_speed: float, acceleration: float) -> float:
"""Given the initial speed, the target speed, and the acceleration
-
- calculate the distance that's neede for the acceleration to finish.
+ calculate the distance that's needed for the acceleration to finish.
"""
+
if acceleration == 0:
return 0.0
return (target_speed ** 2 - init_speed ** 2) / (2 * acceleration)
diff --git a/tests/Machines/Models/TestDiscoveredPrintersModel.py b/tests/Machines/Models/TestDiscoveredPrintersModel.py
index 1ec777ff88..3407ae575e 100644
--- a/tests/Machines/Models/TestDiscoveredPrintersModel.py
+++ b/tests/Machines/Models/TestDiscoveredPrintersModel.py
@@ -14,7 +14,7 @@ def discovered_printer() -> DiscoveredPrinter:
return DiscoveredPrinter("127.0.0.1", "zomg", "yay", None, "bleep", MagicMock())
-@pytest.mark.skip # TODO: This has some unknown dependency on the applicaiton / registry, which is hard to patch out. (which doesn't mean we shouldn't fix it!)
+@pytest.mark.skip # TODO: This has some unknown dependency on the application / registry, which is hard to patch out. (which doesn't mean we shouldn't fix it!)
def test_discoveredPrinters(discovered_printer_model):
mocked_device = MagicMock()
cluster_size = PropertyMock(return_value = 1)
diff --git a/tests/PrinterOutput/TestNetworkedPrinterOutputDevice.py b/tests/PrinterOutput/TestNetworkedPrinterOutputDevice.py
index 107ed77b51..84ad7f0473 100644
--- a/tests/PrinterOutput/TestNetworkedPrinterOutputDevice.py
+++ b/tests/PrinterOutput/TestNetworkedPrinterOutputDevice.py
@@ -38,7 +38,7 @@ def test_post():
mocked_network_manager = MagicMock()
output_device._manager = mocked_network_manager
- # Create a fake reply (we cant use a QReply, since those are abstract C++)
+ # Create a fake reply (we can't use a QReply, since those are abstract C++)
reply = MagicMock()
reply.operation = MagicMock(return_value=QNetworkAccessManager.PostOperation)
reply.url = MagicMock(return_value=QUrl("127.0.0.1"))
@@ -47,7 +47,7 @@ def test_post():
mocked_callback_handler = MagicMock()
output_device.post("whatever", "omgzomg", on_finished = mocked_callback_handler.onFinished)
- # So we now fake that the request was sucesful.
+ # So we now fake that the request was successful.
output_device._handleOnFinished(reply)
# We expect to get a callback regarding this.
@@ -60,7 +60,7 @@ def test_get():
mocked_network_manager = MagicMock()
output_device._manager = mocked_network_manager
- # Create a fake reply (we cant use a QReply, since those are abstract C++)
+ # Create a fake reply (we can't use a QReply, since those are abstract C++)
reply = MagicMock()
reply.operation = MagicMock(return_value=QNetworkAccessManager.PostOperation)
reply.url = MagicMock(return_value=QUrl("127.0.0.1"))
@@ -69,7 +69,7 @@ def test_get():
mocked_callback_handler = MagicMock()
output_device.get("whatever", on_finished=mocked_callback_handler.onFinished)
- # So we now fake that the request was sucesful.
+ # So we now fake that the request was successful.
output_device._handleOnFinished(reply)
# We expect to get a callback regarding this.
@@ -82,7 +82,7 @@ def test_delete():
mocked_network_manager = MagicMock()
output_device._manager = mocked_network_manager
- # Create a fake reply (we cant use a QReply, since those are abstract C++)
+ # Create a fake reply (we can't use a QReply, since those are abstract C++)
reply = MagicMock()
reply.operation = MagicMock(return_value=QNetworkAccessManager.PostOperation)
reply.url = MagicMock(return_value=QUrl("127.0.0.1"))
@@ -91,7 +91,7 @@ def test_delete():
mocked_callback_handler = MagicMock()
output_device.delete("whatever", on_finished=mocked_callback_handler.onFinished)
- # So we now fake that the request was sucesful.
+ # So we now fake that the request was successful.
output_device._handleOnFinished(reply)
# We expect to get a callback regarding this.
@@ -104,7 +104,7 @@ def test_put():
mocked_network_manager = MagicMock()
output_device._manager = mocked_network_manager
- # Create a fake reply (we cant use a QReply, since those are abstract C++)
+ # Create a fake reply (we can't use a QReply, since those are abstract C++)
reply = MagicMock()
reply.operation = MagicMock(return_value=QNetworkAccessManager.PostOperation)
reply.url = MagicMock(return_value=QUrl("127.0.0.1"))
@@ -113,7 +113,7 @@ def test_put():
mocked_callback_handler = MagicMock()
output_device.put("whatever", "omgzomg", on_finished = mocked_callback_handler.onFinished)
- # So we now fake that the request was sucesful.
+ # So we now fake that the request was successful.
output_device._handleOnFinished(reply)
# We expect to get a callback regarding this.
diff --git a/tests/Settings/TestSettingInheritanceManager.py b/tests/Settings/TestSettingInheritanceManager.py
index 3589d8b91f..8613095a9a 100644
--- a/tests/Settings/TestSettingInheritanceManager.py
+++ b/tests/Settings/TestSettingInheritanceManager.py
@@ -84,12 +84,12 @@ def test_getOverridesForExtruderNoGlobalStack(setting_inheritance_manager):
def test_settingIsOverwritingInheritanceNoUserState(setting_inheritance_manager, mocked_stack):
- # Setting 1 doesn't have a user state, so it cant have an override
+ # Setting 1 doesn't have a user state, so it can't have an override
assert not setting_inheritance_manager._settingIsOverwritingInheritance("setting_1", mocked_stack)
def test_settingIsOverwritingInheritanceNotEnabled(setting_inheritance_manager, mocked_stack):
- # Setting 2 doesn't have a enabled, so it cant have an override
+ # Setting 2 doesn't have a enabled, so it can't have an override
assert not setting_inheritance_manager._settingIsOverwritingInheritance("setting_2", mocked_stack)
diff --git a/tests/Settings/TestSettingVisibilityPresets.py b/tests/Settings/TestSettingVisibilityPresets.py
index 017bb6077a..6b268bca1d 100644
--- a/tests/Settings/TestSettingVisibilityPresets.py
+++ b/tests/Settings/TestSettingVisibilityPresets.py
@@ -15,7 +15,7 @@ Resources.addStorageType(CuraApplication.ResourceTypes.SettingVisibilityPreset,
def test_createVisibilityPresetFromLocalFile():
- # Simple creation test. This is seperated from the visibilityFromPrevious, since we can't check for the contents
+ # Simple creation test. This is separated from the visibilityFromPrevious, since we can't check for the contents
# of the other profiles, since they might change over time.
visibility_preset = SettingVisibilityPreset()
@@ -49,7 +49,7 @@ def test_setActivePreset():
with patch("cura.CuraApplication.CuraApplication.getInstance"):
visibility_model = SettingVisibilityPresetsModel(preferences)
visibility_model.activePresetChanged = MagicMock()
- # Ensure that we start off with basic (since we didn't change anyting just yet!)
+ # Ensure that we start off with basic (since we didn't change anything just yet!)
assert visibility_model.activePreset == "basic"
# Everything should be the same.
diff --git a/tests/TestCuraSceneController.py b/tests/TestCuraSceneController.py
index ffffa8ac2a..634ce89d86 100644
--- a/tests/TestCuraSceneController.py
+++ b/tests/TestCuraSceneController.py
@@ -75,5 +75,5 @@ def test_updateMaxBuildPlate(objects_model, multi_build_plate_model):
# And check what happens if we move down again!
controller._calcMaxBuildPlate = MagicMock(return_value=2)
controller.updateMaxBuildPlate(SceneNode())
- assert controller._active_build_plate == 0 # We don't have any items anywere, so default to 0
+ assert controller._active_build_plate == 0 # We don't have any items anywhere, so default to 0
diff --git a/tests/TestMachineAction.py b/tests/TestMachineAction.py
index 7dbc6b1270..2bc9659e42 100755
--- a/tests/TestMachineAction.py
+++ b/tests/TestMachineAction.py
@@ -38,7 +38,7 @@ def test_addDefaultMachineActions(machine_action_manager, global_stack):
machine_action_manager.addMachineAction(action)
# Only the actions in the definition that were registered first will be added to the machine.
- # For the sake of this test, all the actions were previouly added.
+ # For the sake of this test, all the actions were previously added.
machine_action_manager.addDefaultMachineActions(global_stack)
definition_id = global_stack.getDefinition().getId()