huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-18 17:19:50 +00:00
Code Issues Wiki Activity

On quit, make "Save & Exit" the focused button by default

Browse source
This commit is contained in:
Emmanouil Papadeas 2022-06-16 00:15:54 +03:00
parent 3c7691ffa1
commit c508b554d0
2 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/Main.gd
View file

@ -31,8 +31,8 @@ func _ready() -> void:
Import.import_brushes(Global.directory_module.get_brushes_search_path_in_order()) Import.import_brushes(Global.directory_module.get_brushes_search_path_in_order())
Import.import_patterns(Global.directory_module.get_patterns_search_path_in_order()) Import.import_patterns(Global.directory_module.get_patterns_search_path_in_order())
quit_and_save_dialog.add_button("Save & Exit", false, "Save") quit_and_save_dialog.add_button("Exit without saving", false, "ExitWithoutSaving")
quit_and_save_dialog.get_ok().text = "Exit without saving" quit_and_save_dialog.get_ok().text = "Save & Exit"
Global.open_sprites_dialog.current_dir = Global.config_cache.get_value( Global.open_sprites_dialog.current_dir = Global.config_cache.get_value(
"data", "current_dir", OS.get_system_dir(OS.SYSTEM_DIR_DESKTOP) "data", "current_dir", OS.get_system_dir(OS.SYSTEM_DIR_DESKTOP)
@ -268,7 +268,7 @@ func save_project(path: String) -> void:
Global.config_cache.set_value("data", "current_dir", path.get_base_dir()) Global.config_cache.set_value("data", "current_dir", path.get_base_dir())
if is_quitting_on_save: if is_quitting_on_save:
_on_QuitDialog_confirmed() _quit()
func _on_SaveSpriteHTML5_confirmed() -> void: func _on_SaveSpriteHTML5_confirmed() -> void:
@ -301,22 +301,30 @@ func show_quit_dialog() -> void:
if Global.quit_confirmation: if Global.quit_confirmation:
quit_dialog.call_deferred("popup_centered") quit_dialog.call_deferred("popup_centered")
else: else:
_on_QuitDialog_confirmed() _quit()
else: else:
quit_and_save_dialog.call_deferred("popup_centered") quit_and_save_dialog.call_deferred("popup_centered")
Global.dialog_open(true) Global.dialog_open(true)
func _on_QuitAndSaveDialog_custom_action(action: String) -> void:
if action == "Save":
is_quitting_on_save = true
Global.save_sprites_dialog.popup_centered()
quit_dialog.hide()
Global.dialog_open(true)
func _on_QuitDialog_confirmed() -> void: func _on_QuitDialog_confirmed() -> void:
_quit()
func _on_QuitAndSaveDialog_custom_action(action: String) -> void:
if action == "ExitWithoutSaving":
_quit()
func _on_QuitAndSaveDialog_confirmed() -> void:
is_quitting_on_save = true
Global.save_sprites_dialog.popup_centered()
quit_dialog.hide()
Global.dialog_open(true)
func _quit() -> void:
# Darken the UI to denote that the application is currently exiting # Darken the UI to denote that the application is currently exiting
# (it won't respond to user input in this state). # (it won't respond to user input in this state).
modulate = Color(0.5, 0.5, 0.5) modulate = Color(0.5, 0.5, 0.5)

2
src/Main.tscn
View file

@ -148,7 +148,7 @@ visible = false
[connection signal="popup_hide" from="Dialogs/UnsavedCanvasDialog" to="." method="_can_draw_true"] [connection signal="popup_hide" from="Dialogs/UnsavedCanvasDialog" to="." method="_can_draw_true"]
[connection signal="confirmed" from="Dialogs/QuitDialog" to="." method="_on_QuitDialog_confirmed"] [connection signal="confirmed" from="Dialogs/QuitDialog" to="." method="_on_QuitDialog_confirmed"]
[connection signal="popup_hide" from="Dialogs/QuitDialog" to="." method="_can_draw_true"] [connection signal="popup_hide" from="Dialogs/QuitDialog" to="." method="_can_draw_true"]
[connection signal="confirmed" from="Dialogs/QuitAndSaveDialog" to="." method="_on_QuitDialog_confirmed"] [connection signal="confirmed" from="Dialogs/QuitAndSaveDialog" to="." method="_on_QuitAndSaveDialog_confirmed"]
[connection signal="custom_action" from="Dialogs/QuitAndSaveDialog" to="." method="_on_QuitAndSaveDialog_custom_action"] [connection signal="custom_action" from="Dialogs/QuitAndSaveDialog" to="." method="_on_QuitAndSaveDialog_custom_action"]
[connection signal="popup_hide" from="Dialogs/QuitAndSaveDialog" to="." method="_can_draw_true"] [connection signal="popup_hide" from="Dialogs/QuitAndSaveDialog" to="." method="_can_draw_true"]
[connection signal="popup_hide" from="Dialogs/ErrorDialog" to="." method="_can_draw_true"] [connection signal="popup_hide" from="Dialogs/ErrorDialog" to="." method="_can_draw_true"]