From 3ca3ffbec63a9da4ee7540e764dfa55a0b7ff0a3 Mon Sep 17 00:00:00 2001 From: Michael Alexsander Date: Fri, 10 Jan 2020 10:49:24 -0300 Subject: [PATCH 1/3] Update Brazilian Portuguese translation --- Translations/pt_BR.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Translations/pt_BR.po b/Translations/pt_BR.po index 0107b75..9589138 100644 --- a/Translations/pt_BR.po +++ b/Translations/pt_BR.po @@ -675,13 +675,13 @@ msgid "Create a new empty palette?" msgstr "Criar uma nova paleta vazia?" msgid "Error: Palette must have a valid name." -msgstr "" +msgstr "Erro: Paleta deve ter um nome válido." msgid "Error: Palette named '%s' already exists!" -msgstr "" +msgstr "Erro: Paleta com o nome '%s' já existe!" msgid "Invalid Palette file!" -msgstr "" +msgstr "Arquivo de Paleta inválido!" msgid "Edit Palette" msgstr "Editar Paleta" From d72bda71ada1eb5d06c4b3da0c0aaf63b004a137 Mon Sep 17 00:00:00 2001 From: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com> Date: Fri, 10 Jan 2020 16:21:46 +0200 Subject: [PATCH 2/3] Closes #114 --- Changelog.md | 3 ++- Main.tscn | 2 +- Scripts/Dialogs/PreferencesDialog.gd | 1 - Scripts/Main.gd | 7 ++++++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Changelog.md b/Changelog.md index c0c6bc8..ec05e59 100644 --- a/Changelog.md +++ b/Changelog.md @@ -10,12 +10,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - In addition to the middle mouse button, you can now use `Space` to pan around the canvas. ### Changed +- When saving a .pxo file, the file path (along with the file name) gets remembered by the Export PNG file dialog path. (Issue #114) - More translatable strings, updates to Greek & Brazilian Portuguese (thanks to YeldhamDev) localizations. - The dark theme button is now pressed by default if the user hasn't saved a theme preference in the config file. - Added a VSplitContainer for Palettes and Layers. - Added a ScrollContainer for the palette buttons on the Edit Palette popup. - Made Palette .json files more readable, and made "comments" on top of the color data. -- The grid options are now being updated realtime when they're being changed from the preferences. +- The grid options are now being updated realtime when they're being changed from the preferences, and they are also being saved in the config cache file. ### Fixed - Fixed crash that occured when trying to delete contents of a selection, that were outside the canvas. diff --git a/Main.tscn b/Main.tscn index c68e43e..6911f85 100644 --- a/Main.tscn +++ b/Main.tscn @@ -1814,4 +1814,4 @@ visible = false [editable path="BrushesPopup/TabContainer/File/FileBrushContainer/CircleBrushButton"] -[editable path="BrushesPopup/TabContainer/File/FileBrushContainer/FilledCircleBrushButton"] \ No newline at end of file +[editable path="BrushesPopup/TabContainer/File/FileBrushContainer/FilledCircleBrushButton"] diff --git a/Scripts/Dialogs/PreferencesDialog.gd b/Scripts/Dialogs/PreferencesDialog.gd index d4b99a0..1e33970 100644 --- a/Scripts/Dialogs/PreferencesDialog.gd +++ b/Scripts/Dialogs/PreferencesDialog.gd @@ -32,7 +32,6 @@ func _ready() -> void: # Set default values for Grid & Guide options if Global.config_cache.has_section_key("preferences", "grid_size"): var grid_size = Global.config_cache.get_value("preferences", "grid_size") - print(Global.grid_width) Global.grid_width = int(grid_size.x) Global.grid_height = int(grid_size.y) grid_width_value.value = grid_size.x diff --git a/Scripts/Main.gd b/Scripts/Main.gd index 40501b0..19e06d2 100644 --- a/Scripts/Main.gd +++ b/Scripts/Main.gd @@ -455,8 +455,12 @@ func _on_OpenSprite_file_selected(path : String) -> void: OS.set_window_title(path.get_file() + " - Pixelorama") -func _on_SaveSprite_file_selected(path) -> void: +func _on_SaveSprite_file_selected(path : String) -> void: current_save_path = path + $ExportSprites.current_export_path = path.trim_suffix(".pxo") + ".png" + $ExportSprites.current_path = $ExportSprites.current_export_path + file_menu.set_item_text(2, tr("Save") + " %s" % path.get_file()) + file_menu.set_item_text(5, tr("Export") + " %s" % $ExportSprites.current_path.get_file()) var file := File.new() var err := file.open(path, File.WRITE) if err == 0: @@ -521,6 +525,7 @@ func clear_canvases() -> void: Global.canvases.clear() current_save_path = "" $ExportSprites.current_export_path = "" + file_menu.set_item_text(2, "Save") file_menu.set_item_text(5, "Export PNG...") OS.set_window_title("(" + tr("untitled") + ") - Pixelorama") Global.undo_redo.clear_history(false) From 60422c01330b7dce4ebd6e1790b6243091dfcf21 Mon Sep 17 00:00:00 2001 From: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com> Date: Fri, 10 Jan 2020 19:11:10 +0200 Subject: [PATCH 3/3] Fixed bug where, if you had a random brush selected and then selected the pencil tool, "brush color from" did not appear Also added our first patron, Mike King, to the donors name, in the "About" dialog. Thank you Mike! --- Changelog.md | 1 + Scripts/Dialogs/AboutDialog.gd | 1 + Scripts/Main.gd | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Changelog.md b/Changelog.md index ec05e59..24c39bd 100644 --- a/Changelog.md +++ b/Changelog.md @@ -22,6 +22,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Fixed crash that occured when trying to delete contents of a selection, that were outside the canvas. - Fixed .gpl palettes not being imported correctly - Issue #112 - Fixed crash that occured when pressing the play buttons on the timeline, on Godot 3.2 - Issue #111 +- Fixed bug where, if you had a random brush selected and then selected the pencil tool, "brush color from" did not appear. ## [v0.6] - 06-01-2020 diff --git a/Scripts/Dialogs/AboutDialog.gd b/Scripts/Dialogs/AboutDialog.gd index 1f98c97..b57fe1c 100644 --- a/Scripts/Dialogs/AboutDialog.gd +++ b/Scripts/Dialogs/AboutDialog.gd @@ -28,6 +28,7 @@ func _ready() -> void: var donors_root := donors.create_item() donors.create_item(donors_root).set_text(0, " pcmxms") + donors.create_item(donors_root).set_text(0, " Mike King") func _on_AboutDialog_about_to_show() -> void: var current_version : String = ProjectSettings.get_setting("application/config/Version") diff --git a/Scripts/Main.gd b/Scripts/Main.gd index 19e06d2..8557073 100644 --- a/Scripts/Main.gd +++ b/Scripts/Main.gd @@ -559,7 +559,7 @@ func _on_Tool_pressed(tool_pressed : BaseButton, mouse_press := true, key_for_le Global.left_brush_type_container.visible = true Global.left_brush_size_container.visible = true Global.left_mirror_container.visible = true - if Global.current_left_brush_type == Global.BRUSH_TYPES.FILE || Global.current_left_brush_type == Global.BRUSH_TYPES.CUSTOM: + if Global.current_left_brush_type == Global.BRUSH_TYPES.FILE || Global.current_left_brush_type == Global.BRUSH_TYPES.CUSTOM || Global.current_left_brush_type == Global.BRUSH_TYPES.RANDOM_FILE: Global.left_color_interpolation_container.visible = true elif current_action == "Eraser": Global.left_brush_type_container.visible = true @@ -584,7 +584,7 @@ func _on_Tool_pressed(tool_pressed : BaseButton, mouse_press := true, key_for_le Global.right_brush_type_container.visible = true Global.right_brush_size_container.visible = true Global.right_mirror_container.visible = true - if Global.current_right_brush_type == Global.BRUSH_TYPES.FILE || Global.current_right_brush_type == Global.BRUSH_TYPES.CUSTOM: + if Global.current_right_brush_type == Global.BRUSH_TYPES.FILE || Global.current_right_brush_type == Global.BRUSH_TYPES.CUSTOM || Global.current_right_brush_type == Global.BRUSH_TYPES.RANDOM_FILE: Global.right_color_interpolation_container.visible = true elif current_action == "Eraser": Global.right_brush_type_container.visible = true