From 8a38eef30d4dc98258fbd1f5a76653d5ab4e1253 Mon Sep 17 00:00:00 2001 From: Emmanouil Papadeas Date: Thu, 2 Feb 2023 03:06:23 +0200 Subject: [PATCH] [skip ci] Fix various typos --- CHANGELOG.md | 10 +++++----- Misc/Clickable/README.md | 2 +- Translations/Translations.pot | 3 --- src/Autoload/ExtensionsAPI.gd | 2 +- src/Autoload/OpenSave.gd | 8 ++++---- src/Autoload/Palettes.gd | 4 ++-- src/Classes/BaseCel.gd | 2 +- src/Classes/BaseLayer.gd | 2 +- src/Classes/Project.gd | 4 ++-- src/Palette/PaletteGrid.gd | 2 +- src/Preferences/HandleExtensions.gd | 2 +- src/Shaders/ColorReplace.shader | 6 +++--- src/Shaders/Rotation/OmniScale.gdshader | 4 ++-- src/Shaders/Rotation/cleanEdge.gdshader | 2 +- src/Tools/Bucket.gd | 2 +- src/Tools/Move.gd | 8 ++++---- src/Tools/SelectionTools/MagicWand.gd | 2 +- src/UI/Timeline/FrameScrollContainer.gd | 2 +- src/UI/Timeline/LayerButton.gd | 2 +- 19 files changed, 33 insertions(+), 36 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 328107a81..2c4cfa1ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,7 +29,7 @@ This update has been brought to you by the contributions of: - Slider + SpinBox combinations have been replaced by a custom slider, made by [@mrtripie](https://github.com/mrtripie). (Ongoing) - The color picker now picks any visible color on the canvas, regardless of layer. A toggle has also been added in the tool options to let the user change back to the previous behavior of only picking a color on the selected layer. [#816](https://github.com/Orama-Interactive/Pixelorama/pull/816) - A single popup appears when exporting multiple files that already exist, instead of showing one popup for each file to overwrite. [#585](https://github.com/Orama-Interactive/Pixelorama/discussions/585) -- Most dialogs received some UI changes, such as making their elments expand vertically, and making their Cancel and OK buttons a little bigger. +- Most dialogs received some UI changes, such as making their elements expand vertically, and making their Cancel and OK buttons a little bigger. - The look of the brushes popup has been improved. [#815](https://github.com/Orama-Interactive/Pixelorama/pull/815) - The manage layout dialog now has a preview for the selected layout. [#787](https://github.com/Orama-Interactive/Pixelorama/pull/787) - Layer adding behavior has been changed. [#767](https://github.com/Orama-Interactive/Pixelorama/pull/767) @@ -93,7 +93,7 @@ Fayez Akhtar ([@Variable-ind](https://github.com/Variable-ind)), [@GrantMoyer](h - A new rotation type, Rotxel with smear. Thanks to [azagaya](https://github.com/azagaya) for the shader code. - The pivot in the rotate image dialog can now be changed by the user. [#720](https://github.com/Orama-Interactive/Pixelorama/pull/720) - New offset options in tile mode that allow for non-rectangular tiling. [#707](https://github.com/Orama-Interactive/Pixelorama/pull/707) -- A basic API for Extensions. Has not been documented yet and is stil experimental. +- A basic API for Extensions. Has not been documented yet and is still experimental. - A similarity option in the Select by Color tool. [#710](https://github.com/Orama-Interactive/Pixelorama/pull/710) - The left and right tool colors in the background of the tool buttons and the indicators on the canvas can now be changed from the Preferences. - Added Danish translations. @@ -376,12 +376,12 @@ Laurenz Reinthaler (Schweini07), kleonc, Fayez Akhtar (Variable), THWLF, Gamespl - Keyboard shortcut conflicts between tool shortcuts and other shortcuts that use the "Control" key, like menu shortcuts, have been resolved. ([#407](https://github.com/Orama-Interactive/Pixelorama/pull/407)) - The opacity of a cel and the tile mode opacity are now multiplicative. ([#414](https://github.com/Orama-Interactive/Pixelorama/pull/414)) - Fixed an issue where adding a new layer did not select it, rather it was selecting the above layer of the previously selected layer. ([#424](https://github.com/Orama-Interactive/Pixelorama/pull/424)) -- Fixed issue that occurred when the application window regained focus and the tool was immediatly activated. ([35f97eb](https://github.com/Orama-Interactive/Pixelorama/commit/35f97ebe6f90bd2a5994b294231738ef4a6b998c)) +- Fixed issue that occurred when the application window regained focus and the tool was immediately activated. ([35f97eb](https://github.com/Orama-Interactive/Pixelorama/commit/35f97ebe6f90bd2a5994b294231738ef4a6b998c)) - Fixed cel opacity not always being updated on the UI. ([#420](https://github.com/Orama-Interactive/Pixelorama/pull/420)) - Loading empty backed up projects no longer result in a crash. ([#445](https://github.com/Orama-Interactive/Pixelorama/issues/445)) - Fixed potential index out of bounds error when loading backup files. ([#446](https://github.com/Orama-Interactive/Pixelorama/pull/446)) - Mirroring view should now work on all tools. -- Fixed hue and saturation getting reset when draging value slider to zero. ([#473](https://github.com/Orama-Interactive/Pixelorama/pull/473)) +- Fixed hue and saturation getting reset when dragging value slider to zero. ([#473](https://github.com/Orama-Interactive/Pixelorama/pull/473)) - Image effects will not longer get applied to locked and/or hidden layers. - Fixed memory leaks when opening and closing Pixelorama. ([#387](https://github.com/Orama-Interactive/Pixelorama/issues/387)) - The color picker now displays "HSV" and "Raw" next to the respective CheckButtons - thanks to Godot 3.3. @@ -507,7 +507,7 @@ Darshan Phaldesai (luiq54), Igor Santarek (jegor377), rob-a-bolton, Kinwailo, Mi - Re-organized preferences dialog. - The "create new image" dialog now remembers the last created canvas size. The default image settings are being used only when Pixelorama first launches. ([#178](https://github.com/Orama-Interactive/Pixelorama/issues/178)) - Language and theme checkboxes are now radio buttons. -- The Blue theme has more similar margins and seperations with the rest of the themes. +- The Blue theme has more similar margins and separations with the rest of the themes. - Fullscreen can be toggled on and off from the View menu. - Multi-threaded rendering has been enabled. ([#294](https://github.com/Orama-Interactive/Pixelorama/pull/294)) - Use the Dummy audio driver since Pixelorama doesn't play any sounds. ([#312](https://github.com/Orama-Interactive/Pixelorama/pull/312)) diff --git a/Misc/Clickable/README.md b/Misc/Clickable/README.md index e0b8fcf12..bc903962a 100644 --- a/Misc/Clickable/README.md +++ b/Misc/Clickable/README.md @@ -31,4 +31,4 @@ $ CLICKABLE_ARCH=arm64 clickable build ### Important gotcha: File loading and saving -Due to AppArmor policy restrictions, you are not able to save to anywhere outside of the user data directroy. \ No newline at end of file +Due to AppArmor policy restrictions, you are not able to save to anywhere outside of the user data directory. diff --git a/Translations/Translations.pot b/Translations/Translations.pot index fa0d930ef..cc1b8fa0f 100644 --- a/Translations/Translations.pot +++ b/Translations/Translations.pot @@ -2033,9 +2033,6 @@ msgstr "" msgid "Cannot remove the palette, because it doesn't exist!" msgstr "" -msgid "An error occured while removing the palette! Error code: %s" -msgstr "" - msgid "and" msgstr "" diff --git a/src/Autoload/ExtensionsAPI.gd b/src/Autoload/ExtensionsAPI.gd index f1a750886..d47fb79c4 100644 --- a/src/Autoload/ExtensionsAPI.gd +++ b/src/Autoload/ExtensionsAPI.gd @@ -39,7 +39,7 @@ func add_action(action: String): if extension_name in _action_history.keys(): var extension_history: Array = _action_history[extension_name] extension_history.append(action) - else: # If the extension history does'nt exist yet then creat it + else: # If the extension history doesn't exist yet, create it _action_history[extension_name] = [action] diff --git a/src/Autoload/OpenSave.gd b/src/Autoload/OpenSave.gd index c627f9b56..3e6be8939 100644 --- a/src/Autoload/OpenSave.gd +++ b/src/Autoload/OpenSave.gd @@ -61,7 +61,7 @@ func handle_loading_file(file: String) -> void: # Attempt to load as a regular image. var image := Image.new() var err := image.load(file) - if err != OK: # An error occured + if err != OK: # An error occurred var file_name: String = file.get_file() Global.error_dialog.set_text( tr("Can't load file '%s'.\nError code: %s") % [file_name, str(err)] @@ -210,8 +210,8 @@ func open_old_pxo_file(file: File, new_project: Project, first_line: String) -> # In the above example, the major version would return "0", # the minor version would return "7", the patch "10" # and the status would return "beta" - var file_major_version = int(file_ver_splitted_numbers[0].replace("v", "")) - var file_minor_version = int(file_ver_splitted_numbers[1]) + var file_major_version := int(file_ver_splitted_numbers[0].replace("v", "")) + var file_minor_version := int(file_ver_splitted_numbers[1]) var file_patch_version := 0 if file_ver_splitted_numbers.size() > 2: @@ -744,7 +744,7 @@ func remove_backup_by_path(project_path: String, backup_path: String) -> void: func reload_backup_file(project_paths: Array, backup_paths: Array) -> void: assert(project_paths.size() == backup_paths.size()) - # Clear non-existant backups + # Clear non-existent backups var existing_backups_count := 0 var dir := Directory.new() for i in range(backup_paths.size()): diff --git a/src/Autoload/Palettes.gd b/src/Autoload/Palettes.gd index fffd7c7a9..d5c46a86d 100644 --- a/src/Autoload/Palettes.gd +++ b/src/Autoload/Palettes.gd @@ -510,7 +510,7 @@ func _import_gpl(path: String, text: String) -> Palette: elif line.begins_with("Name: "): palette_name = line.replace("Name: ", "") elif line.begins_with("Columns: "): - # Number of colors in this palette. Unecessary and often wrong + # Number of colors in this palette. Unnecessary and often wrong continue elif line_number > 0 && line.length() >= 9: line = line.replace("\t", " ") @@ -567,7 +567,7 @@ func _import_image_palette(path: String, image: Image) -> Palette: var height: int = image.get_height() var width: int = image.get_width() - # Iterate all pixels and store unique colors to palete + # Iterate all pixels and store unique colors to palette image.lock() for y in range(0, height): for x in range(0, width): diff --git a/src/Classes/BaseCel.gd b/src/Classes/BaseCel.gd index c02e471bf..fa4ff7b5f 100644 --- a/src/Classes/BaseCel.gd +++ b/src/Classes/BaseCel.gd @@ -14,7 +14,7 @@ var transformed_content: Image # Used in transformations (moving, scaling etc w # The content methods deal with the unique content of each cel type. For example, an Image for # PixelLayers, or a Dictionary of settings for a procedural layer type, and null for Groups. -# Can be used fo linking/unlinking cels, copying, and deleting content +# Can be used for linking/unlinking cels, copying, and deleting content func get_content(): return null diff --git a/src/Classes/BaseLayer.gd b/src/Classes/BaseLayer.gd index 05a2e7ad7..a081db803 100644 --- a/src/Classes/BaseLayer.gd +++ b/src/Classes/BaseLayer.gd @@ -84,7 +84,7 @@ func get_layer_path() -> String: # Links a cel to link_set if its a Dictionary, or unlinks if null. -# Content/image_texture are handled seperately for undo related reasons +# Content/image_texture are handled separately for undo related reasons func link_cel(cel: BaseCel, link_set = null) -> void: # Erase from the cel's current link_set if cel.link_set != null: diff --git a/src/Classes/Project.gd b/src/Classes/Project.gd index 0da9da7ed..44be487f9 100644 --- a/src/Classes/Project.gd +++ b/src/Classes/Project.gd @@ -12,7 +12,7 @@ var can_undo = true var fill_color := Color(0) var has_changed := false setget _has_changed_changed # frames and layers Arrays should generally only be modified directly when -# opening/creating a project. When modifiying the current project, use +# opening/creating a project. When modifying the current project, use # the add/remove/move/swap_frames/layers methods var frames := [] # Array of Frames (that contain Cels) var layers := [] # Array of Layers @@ -636,7 +636,7 @@ func can_pixel_get_drawn( # through these methods. # These allow you to add/remove/move/swap frames/layers/cels. It updates the Animation Timeline # UI, and updates indices. These are designed to be reversible, meaning that to undo an add, you -# use remove, and vise versa. To undo a move or swap, use move or swap with the paramaters swapped. +# use remove, and vice versa. To undo a move or swap, use move or swap with the parameters swapped. func add_frames(new_frames: Array, indices: Array) -> void: # indices should be in ascending order diff --git a/src/Palette/PaletteGrid.gd b/src/Palette/PaletteGrid.gd index e5cca13a1..1b46baf66 100644 --- a/src/Palette/PaletteGrid.gd +++ b/src/Palette/PaletteGrid.gd @@ -31,7 +31,7 @@ func set_palette(new_palette: Palette) -> void: func setup_swatches() -> void: - # Colums cannot be 0 + # Columns cannot be 0 columns = 1.0 if grid_size.x == 0.0 else grid_size.x if grid_size.x * grid_size.y > swatches.size(): for i in range(swatches.size(), grid_size.x * grid_size.y): diff --git a/src/Preferences/HandleExtensions.gd b/src/Preferences/HandleExtensions.gd index fb787dbee..0cacbb3af 100644 --- a/src/Preferences/HandleExtensions.gd +++ b/src/Preferences/HandleExtensions.gd @@ -206,7 +206,7 @@ func _enable_extension(extension: Extension, save_to_config := true) -> void: print("Failed to load extension %s" % id) else: for ext_node in extension_parent.get_children(): - if ext_node.is_in_group(id): # Node for extention found + if ext_node.is_in_group(id): # Node for extension found extension_parent.remove_child(ext_node) ext_node.queue_free() ExtensionsApi.check_sanity(extension.file_name) diff --git a/src/Shaders/ColorReplace.shader b/src/Shaders/ColorReplace.shader index 99f9cb6ff..28d343b71 100644 --- a/src/Shaders/ColorReplace.shader +++ b/src/Shaders/ColorReplace.shader @@ -16,17 +16,17 @@ uniform sampler2D pattern; uniform vec2 pattern_size; uniform vec2 pattern_uv_offset; -void fragment() { // applies on each pixel seperately +void fragment() { // applies on each pixel separately vec4 original_color = texture(TEXTURE, UV); // The drawing we have to use on vec4 selection_color = texture(selection, UV); // use its alpha to get portion we can ignore - vec4 col = original_color; // Innocent till proven Guilty + vec4 col = original_color; // Innocent till proven guilty float max_diff = distance(original_color, old_color); // How much this pixel matches our description float similarity = abs(2.0 - ((similarity_percent/100.0) * 2.0)); - if (max_diff <= similarity) // We found our match and pixel is proven Guilty (small is precise) + if (max_diff <= similarity) // We found our match and pixel is proven guilty (small is precise) if (has_pattern) col = textureLod(pattern, UV * (size / pattern_size) + pattern_uv_offset, 0.0); else diff --git a/src/Shaders/Rotation/OmniScale.gdshader b/src/Shaders/Rotation/OmniScale.gdshader index 6a293e6f8..aeffc5c34 100644 --- a/src/Shaders/Rotation/OmniScale.gdshader +++ b/src/Shaders/Rotation/OmniScale.gdshader @@ -53,7 +53,7 @@ bool is_different(vec4 a, vec4 b) } // This define could've made code a ton more readable if godot shaders supported it, but it doesn't. -// 55 occurances of this in code; use regexp to turn it back once supported? +// 55 occurrences of this in code; use regexp to turn it back once supported? // #define P(m, r) ((pattern & (m)) == (r)) @@ -66,7 +66,7 @@ vec4 scale(sampler2D image, vec2 coord, vec2 pxSize) { vec2 o = pxSize; vec2 texCoord = coord; - // We always calculate the top left quarter. If we need a different quarter, we flip our co-ordinates */ + // We always calculate the top left quarter. If we need a different quarter, we flip our coordinates */ // p = the position within a pixel [0...1] vec2 p = fract(texCoord / pxSize); diff --git a/src/Shaders/Rotation/cleanEdge.gdshader b/src/Shaders/Rotation/cleanEdge.gdshader index 69761ed77..5bf201216 100644 --- a/src/Shaders/Rotation/cleanEdge.gdshader +++ b/src/Shaders/Rotation/cleanEdge.gdshader @@ -29,7 +29,7 @@ shader_type canvas_item; //enables 2:1 slopes. otherwise only uses 45 degree slopes //#define SLOPE //cleans up small detail slope transitions (if SLOPE is enabled) -//if only using for rotation, CLEANUP has negligable effect and should be disabled for speed +//if only using for rotation, CLEANUP has negligible effect and should be disabled for speed //#define CLEANUP // The commented out defines exposed as uniforms uniform bool slope; diff --git a/src/Tools/Bucket.gd b/src/Tools/Bucket.gd index 60c334206..71dd4b10b 100644 --- a/src/Tools/Bucket.gd +++ b/src/Tools/Bucket.gd @@ -306,7 +306,7 @@ func _add_new_segment(y: int = 0) -> void: _allegro_flood_segments.append(segment) -# fill an horizontal segment around the specifid position, and adds it to the +# fill an horizontal segment around the specified position, and adds it to the # list of segments filled. Returns the first x coordinate after the part of the # line that has been filled. func _flood_line_around_point( diff --git a/src/Tools/Move.gd b/src/Tools/Move.gd index 98e3f9ab0..ff9521582 100644 --- a/src/Tools/Move.gd +++ b/src/Tools/Move.gd @@ -20,11 +20,11 @@ func _input(event: InputEvent) -> void: _offset = _offset.snapped(grid_size) if Global.current_project.has_selection: if selection_node.is_moving_content: - var prev_pos = selection_node.big_bounding_rectangle.position + var prev_pos: Vector2 = selection_node.big_bounding_rectangle.position selection_node.big_bounding_rectangle.position = prev_pos.snapped(grid_size) - # The First time transform_snap_grid is enabled then _snap_position() is not called - # and selection had wrong offset so i chose to do selection offsetting here - var grid_offset = Vector2(Global.grid_offset_x, Global.grid_offset_y) + # The first time transform_snap_grid is enabled then _snap_position() is not called + # and the selection had wrong offset, so do selection offsetting here + var grid_offset := Vector2(Global.grid_offset_x, Global.grid_offset_y) grid_offset = Vector2( fmod(grid_offset.x, grid_size.x), fmod(grid_offset.y, grid_size.y) ) diff --git a/src/Tools/SelectionTools/MagicWand.gd b/src/Tools/SelectionTools/MagicWand.gd index 210e49789..2bfc9abae 100644 --- a/src/Tools/SelectionTools/MagicWand.gd +++ b/src/Tools/SelectionTools/MagicWand.gd @@ -57,7 +57,7 @@ func _add_new_segment(y: int = 0) -> void: _allegro_flood_segments.append(segment) -# fill an horizontal segment around the specifid position, and adds it to the +# fill an horizontal segment around the specified position, and adds it to the # list of segments filled. Returns the first x coordinate after the part of the # line that has been filled. func _flood_line_around_point( diff --git a/src/UI/Timeline/FrameScrollContainer.gd b/src/UI/Timeline/FrameScrollContainer.gd index cf609f108..16034bb49 100644 --- a/src/UI/Timeline/FrameScrollContainer.gd +++ b/src/UI/Timeline/FrameScrollContainer.gd @@ -39,7 +39,7 @@ func _update_scroll() -> void: func ensure_control_visible(control: Control): if not is_instance_valid(control): return - # Based on Godot's implemenation in ScrollContainer + # Based on Godot's implementation in ScrollContainer var global_rect := get_global_rect() var other_rect := control.get_global_rect() var diff: float = max( diff --git a/src/UI/Timeline/LayerButton.gd b/src/UI/Timeline/LayerButton.gd index ab28673c2..c963b25c0 100644 --- a/src/UI/Timeline/LayerButton.gd +++ b/src/UI/Timeline/LayerButton.gd @@ -229,7 +229,7 @@ func can_drop_data(_pos, data) -> bool: Global.current_project.layers[layer].accepts_child(data[1]) and _get_region_rect(0.25, 0.75).has_point(get_global_mouse_position()) ): - # Drawn regions are adusted a bit from actual to clearify drop position + # Drawn regions are adjusted a bit from actual to clarify drop position region = _get_region_rect(0.15, 0.85) depth += 1 else: