huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-02-07 10:59:49 +00:00
Code Issues Wiki Activity

Saved is false after any action and is true at the beginning

Browse source 
Also hide QuitDialog after saving
This commit is contained in:
OverloadedOrama 2020-02-22 17:14:32 +02:00
parent 3ea3bd7b40
commit 52fa460876
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Scripts/Global.gd
View file

@ -8,8 +8,8 @@ var config_cache := ConfigFile.new()
# warning-ignore:unused_class_variable # warning-ignore:unused_class_variable
var loaded_locales : Array var loaded_locales : Array
var undo_redo : UndoRedo var undo_redo : UndoRedo
var undos := 0 #The number of times we added undo properties var undos := 0 # The number of times we added undo properties
var saved := false #Checks if the user has saved var saved := true # Checks if the user has saved
# Canvas related stuff # Canvas related stuff
var current_frame := 0 setget frame_changed var current_frame := 0 setget frame_changed
@ -426,6 +426,7 @@ func undo(_canvases : Array, layer_index : int = -1) -> void:
canvas_parent.move_child(_canvases[0], _canvases[0].frame) canvas_parent.move_child(_canvases[0], _canvases[0].frame)
canvas.update() canvas.update()
saved = false
notification_label("Undo: %s" % action_name) notification_label("Undo: %s" % action_name)
@ -466,6 +467,7 @@ func redo(_canvases : Array, layer_index : int = -1) -> void:
canvas_parent.move_child(_canvases[0], _canvases[0].frame) canvas_parent.move_child(_canvases[0], _canvases[0].frame)
canvas.update() canvas.update()
saved = false
if control.redone: if control.redone:
notification_label("Redo: %s" % action_name) notification_label("Redo: %s" % action_name)

13
Scripts/Main.gd
View file

@ -167,10 +167,10 @@ func _ready() -> void:
Global.canvas.generate_layer_panels() Global.canvas.generate_layer_panels()
Import.import_brushes("Brushes") Import.import_brushes("Brushes")
$MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ColorButtonsVertical/ColorPickersCenter/ColorPickersHorizontal/LeftColorPickerButton.get_picker().presets_visible = false $MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ColorButtonsVertical/ColorPickersCenter/ColorPickersHorizontal/LeftColorPickerButton.get_picker().presets_visible = false
$MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ColorButtonsVertical/ColorPickersCenter/ColorPickersHorizontal/RightColorPickerButton.get_picker().presets_visible = false $MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ColorButtonsVertical/ColorPickersCenter/ColorPickersHorizontal/RightColorPickerButton.get_picker().presets_visible = false
if not Global.config_cache.has_section_key("preferences", "startup"): if not Global.config_cache.has_section_key("preferences", "startup"):
Global.config_cache.set_value("preferences", "startup", true) Global.config_cache.set_value("preferences", "startup", true)
if Global.config_cache.get_value("preferences", "startup"): if Global.config_cache.get_value("preferences", "startup"):
@ -476,14 +476,14 @@ func _on_OpenSprite_file_selected(path : String) -> void:
brush_line = file.get_line() brush_line = file.get_line()
file.close() file.close()
current_save_path = path current_save_path = path
$SaveSprite.current_path = path $SaveSprite.current_path = path
$ExportSprites.current_export_path = path.trim_suffix(".pxo") + ".png" $ExportSprites.current_export_path = path.trim_suffix(".pxo") + ".png"
$ExportSprites.current_path = $ExportSprites.current_export_path $ExportSprites.current_path = $ExportSprites.current_export_path
file_menu.set_item_text(2, tr("Save") + " %s" % path.get_file()) 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()) file_menu.set_item_text(5, tr("Export") + " %s" % $ExportSprites.current_path.get_file())
OS.set_window_title(path.get_file() + " - Pixelorama") OS.set_window_title(path.get_file() + " - Pixelorama")
@ -861,11 +861,12 @@ func _on_QuitDialog_confirmed() -> void:
get_tree().quit() get_tree().quit()
func _on_QuitDialog_custom_action(action): func _on_QuitDialog_custom_action(action : String) -> void:
if action == "Save": if action == "Save":
$SaveSprite.popup_centered() $SaveSprite.popup_centered()
$QuitDialog.hide()
Global.can_draw = false Global.can_draw = false
func _on_QuitDialog_popup_hide(): func _on_QuitDialog_popup_hide() -> void:
if !Global.saved: if !Global.saved:
SaveButton.queue_free() SaveButton.queue_free()