Merge branch 'master' of https://github.com/Orama-Interactive/Pixelorama

Changelog.md

@@ -10,17 +10,19 @@ 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.
 - 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
 

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")

Scripts/Dialogs/PreferencesDialog.gd

@@ -36,7 +36,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

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)
@@ -554,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
@@ -579,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

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"