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

Move "Recent projects" up, just below "Open last project" in the File menu

Browse source
This commit is contained in:
Manolis Papadeas 2020-10-29 22:33:15 +02:00
parent 00a4722966
commit 7dd9b36cdc
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Autoload/Export.gd
View file

@ -196,7 +196,7 @@ func export_processed_images(ignore_overwrites: bool, export_dialog: AcceptDialo
# Store settings for quick export and when the dialog is opened again # Store settings for quick export and when the dialog is opened again
was_exported = true was_exported = true
Global.current_project.was_exported = true Global.current_project.was_exported = true
Global.file_menu.get_popup().set_item_text(5, tr("Export") + " %s" % (file_name + file_format_string(file_format))) Global.file_menu.get_popup().set_item_text(6, tr("Export") + " %s" % (file_name + file_format_string(file_format)))
# Only show when not exporting gif - gif export finishes in thread # Only show when not exporting gif - gif export finishes in thread
if not (current_tab == ExportTab.ANIMATION and animation_type == AnimationType.ANIMATED): if not (current_tab == ExportTab.ANIMATION and animation_type == AnimationType.ANIMATED):

6
src/Autoload/OpenSave.gd
View file

@ -117,8 +117,8 @@ func open_pxo_file(path : String, untitled_backup : bool = false) -> void:
Export.file_name = path.get_file().trim_suffix(".pxo") Export.file_name = path.get_file().trim_suffix(".pxo")
Export.directory_path = path.get_base_dir() Export.directory_path = path.get_base_dir()
Export.was_exported = false Export.was_exported = false
Global.file_menu.get_popup().set_item_text(3, tr("Save") + " %s" % path.get_file()) Global.file_menu.get_popup().set_item_text(4, tr("Save") + " %s" % path.get_file())
Global.file_menu.get_popup().set_item_text(5, tr("Export")) Global.file_menu.get_popup().set_item_text(6, tr("Export"))
Global.save_project_to_recent_list(path) Global.save_project_to_recent_list(path)
@ -337,7 +337,7 @@ func save_pxo_file(path : String, autosave : bool, use_zstd_compression := true,
Export.directory_path = path.get_base_dir() Export.directory_path = path.get_base_dir()
Export.was_exported = false Export.was_exported = false
project.was_exported = false project.was_exported = false
Global.file_menu.get_popup().set_item_text(3, tr("Save") + " %s" % path.get_file()) Global.file_menu.get_popup().set_item_text(4, tr("Save") + " %s" % path.get_file())
Global.save_project_to_recent_list(path) Global.save_project_to_recent_list(path)

8
src/Classes/Project.gd
View file

@ -191,9 +191,9 @@ func change_project() -> void:
if save_path != "": if save_path != "":
Global.open_sprites_dialog.current_path = save_path Global.open_sprites_dialog.current_path = save_path
Global.save_sprites_dialog.current_path = save_path Global.save_sprites_dialog.current_path = save_path
Global.file_menu.get_popup().set_item_text(3, tr("Save") + " %s" % save_path.get_file()) Global.file_menu.get_popup().set_item_text(4, tr("Save") + " %s" % save_path.get_file())
else: else:
Global.file_menu.get_popup().set_item_text(3, tr("Save")) Global.file_menu.get_popup().set_item_text(4, tr("Save"))
Export.directory_path = directory_path Export.directory_path = directory_path
Export.file_name = file_name Export.file_name = file_name
@ -201,9 +201,9 @@ func change_project() -> void:
Export.was_exported = was_exported Export.was_exported = was_exported
if !was_exported: if !was_exported:
Global.file_menu.get_popup().set_item_text(5, tr("Export")) Global.file_menu.get_popup().set_item_text(6, tr("Export"))
else: else:
Global.file_menu.get_popup().set_item_text(5, tr("Export") + " %s" % (file_name + Export.file_format_string(file_format))) Global.file_menu.get_popup().set_item_text(6, tr("Export") + " %s" % (file_name + Export.file_format_string(file_format)))
func serialize() -> Dictionary: func serialize() -> Dictionary:

4
src/Main.gd
View file

@ -217,8 +217,8 @@ func _on_BackupConfirmation_confirmed(project_paths : Array, backup_paths : Arra
Export.file_name = OpenSave.current_save_paths[0].get_file().trim_suffix(".pxo") Export.file_name = OpenSave.current_save_paths[0].get_file().trim_suffix(".pxo")
Export.directory_path = OpenSave.current_save_paths[0].get_base_dir() Export.directory_path = OpenSave.current_save_paths[0].get_base_dir()
Export.was_exported = false Export.was_exported = false
Global.file_menu.get_popup().set_item_text(3, tr("Save") + " %s" % OpenSave.current_save_paths[0].get_file()) Global.file_menu.get_popup().set_item_text(4, tr("Save") + " %s" % OpenSave.current_save_paths[0].get_file())
Global.file_menu.get_popup().set_item_text(5, tr("Export")) Global.file_menu.get_popup().set_item_text(6, tr("Export"))
func _on_BackupConfirmation_delete(project_paths : Array, backup_paths : Array) -> void: func _on_BackupConfirmation_delete(project_paths : Array, backup_paths : Array) -> void:

2
src/UI/TopMenuContainer.gd
View file

@ -19,11 +19,11 @@ func setup_file_menu() -> void:
"New..." : InputMap.get_action_list("new_file")[0].get_scancode_with_modifiers(), "New..." : InputMap.get_action_list("new_file")[0].get_scancode_with_modifiers(),
"Open..." : InputMap.get_action_list("open_file")[0].get_scancode_with_modifiers(), "Open..." : InputMap.get_action_list("open_file")[0].get_scancode_with_modifiers(),
'Open last project...' : 0, 'Open last project...' : 0,
"Recent projects": 0,
"Save..." : InputMap.get_action_list("save_file")[0].get_scancode_with_modifiers(), "Save..." : InputMap.get_action_list("save_file")[0].get_scancode_with_modifiers(),
"Save as..." : InputMap.get_action_list("save_file_as")[0].get_scancode_with_modifiers(), "Save as..." : InputMap.get_action_list("save_file_as")[0].get_scancode_with_modifiers(),
"Export..." : InputMap.get_action_list("export_file")[0].get_scancode_with_modifiers(), "Export..." : InputMap.get_action_list("export_file")[0].get_scancode_with_modifiers(),
"Export as..." : InputMap.get_action_list("export_file_as")[0].get_scancode_with_modifiers(), "Export as..." : InputMap.get_action_list("export_file_as")[0].get_scancode_with_modifiers(),
"Recent projects": 0,
"Quit" : InputMap.get_action_list("quit")[0].get_scancode_with_modifiers(), "Quit" : InputMap.get_action_list("quit")[0].get_scancode_with_modifiers(),
} }
file_menu = Global.file_menu.get_popup() file_menu = Global.file_menu.get_popup()