diff --git a/.gitignore b/.gitignore index e05bf66..9a987b1 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ /addons/kenyoni/plugin_reloader /addons/explore-editor-theme +/addons/GDQuest_GDScript_formatter addons/screenshots/settings.cfg diff --git a/addons/screenshots/autoload/shutter_window/shutter_window.gd b/addons/screenshots/autoload/shutter_window/shutter_window.gd index 9eb2806..c6c4b84 100644 --- a/addons/screenshots/autoload/shutter_window/shutter_window.gd +++ b/addons/screenshots/autoload/shutter_window/shutter_window.gd @@ -1,5 +1,4 @@ extends Window - ## Godot addon that lets you rapidly take screenshots. Supports taking bursts in multiple resolutions, locales, and formats. @export var _local_data: Node @@ -15,6 +14,7 @@ signal burst_ended var _input_action: String + func _ready() -> void: var saved_position = _local_data.settings.load_value("misc", "ShutterWindowPosition") if saved_position: @@ -22,21 +22,23 @@ func _ready() -> void: old_position = position var only_run_in_editor = _local_data.settings.load_value("misc", "OnlyRunInEditorCheckBox", true) visible = _local_data.settings.load_value("misc", "ShowShutterCheckBox", true) - + if only_run_in_editor and not OS.has_feature("editor"): set_process_input(false) hide() return - + _input_action = _local_data.settings.load_value("misc", "InputActionLineEdit", "") %ShutterButton.pressed.connect(take_burst) close_requested.connect(_on_close_requested) - - + + func _on_close_requested() -> void: hide() - -var old_position : Vector2i + + +var old_position: Vector2i + func _input(event: InputEvent) -> void: if old_position != position: @@ -55,48 +57,46 @@ func take_burst() -> void: burst_starting.emit() var pause_game = _local_data.settings.load_value("misc", "PausesGameCheckBox", true) var shutter_was_visible = visible - + var def_width = ProjectSettings.get_setting("display/window/size/viewport_width") var def_height = ProjectSettings.get_setting("display/window/size/viewport_height") - var sizes = _local_data.settings.load_value("misc", "Sizes", [Vector2i(def_width,def_height)]) + var sizes = _local_data.settings.load_value("misc", "Sizes", [Vector2i(def_width, def_height)]) var locales = _local_data.settings.load_value("misc", "Locales", ["none"]) var previous_locale = TranslationServer.get_locale() hide() - + var tree = get_tree() var game_was_paused = tree.paused if pause_game: tree.paused = true var prev_size = DisplayServer.window_get_size() - - - + # Take screenshots for each configured size for s in sizes: DisplayServer.window_set_size(s) await get_tree().create_timer(0.01).timeout - + for locale in locales: var locale_to_set = locale - + if locale == "none": locale_to_set = previous_locale - + TranslationServer.set_locale(locale_to_set) await get_tree().process_frame save_image() - + TranslationServer.set_locale(previous_locale) DisplayServer.window_set_size(prev_size) - - + tree.paused = game_was_paused visible = shutter_was_visible burst_ended.emit() print_rich("[color=green][Screenshots] Done![/color]") position = old_position + func save_image() -> void: var locale = TranslationServer.get_locale() var timestamp = Time.get_time_string_from_system() @@ -104,13 +104,13 @@ func save_image() -> void: # Save the screenshot var image = get_parent().get_viewport().get_texture().get_image() image_captured.emit(image) - + if play_shutter_sounds: %AudioStreamPlayer.play() var save_folder: String = _local_data.settings.load_value("misc", "PathLineEdit", "user://screenshots") var project_title = ProjectSettings.get_setting("application/config/name") var screenshot_size = image.get_size() - + # Build the save path with optional subfolders var target_folder = save_folder if _local_data.settings.load_value("misc", "UseSubFoldersCheckBox", false): @@ -118,55 +118,55 @@ func save_image() -> void: var timestamp_folder = "%s_%s" % [project_title, timestamp.replace(":", "-")] var locale_folder = locale var resolution_folder = "%dx%d" % [screenshot_size.x, screenshot_size.y] - + target_folder = save_folder.path_join(timestamp_folder).path_join(locale_folder).path_join(resolution_folder) - + # Ensure target folder exists if not DirAccess.dir_exists_absolute(target_folder): DirAccess.make_dir_recursive_absolute(target_folder) - + var formats = { "PNGCheckBox": ["png", image.save_png, true], "JPGCheckBox": ["jpg", image.save_jpg, false], - "WEBPCheckBox": ["webp", image.save_webp, false] + "WEBPCheckBox": ["webp", image.save_webp, false], } - + for setting_key in formats: var default = formats[setting_key][2] if _local_data.settings.load_value("misc", setting_key, default): var extension = formats[setting_key][0] var save_method = formats[setting_key][1] - + var filename: String if _local_data.settings.load_value("misc", "UseSubFoldersCheckBox", false): filename = "%s_%s" % [project_title, timestamp.replace(":", "-")] else: filename = "%s_%s_%s_%dx%d" % [project_title, timestamp.replace(":", "-"), locale, screenshot_size.x, screenshot_size.y] - + var file_path = target_folder.path_join("%s.%s" % [filename, extension]) - + # Get unique filepath to avoid overwriting file_path = get_unique_filepath(file_path) - + save_method.call(file_path) EngineDebugger.send_message("screenshot:taken", [file_path, timestamp, locale]) - + print_rich("[Screenshots] Saved at: [url=%s]%s[/url]" % [ProjectSettings.globalize_path(file_path.get_base_dir()), file_path]) - + + func get_unique_filepath(base_path: String) -> String: if not FileAccess.file_exists(base_path): return base_path - + var dir = base_path.get_base_dir() var filename = base_path.get_file().get_basename() var extension = base_path.get_extension() - + var counter = 1 var new_path = "%s/%s_%d.%s" % [dir, filename, counter, extension] - + while FileAccess.file_exists(new_path): counter += 1 new_path = "%s/%s_%d.%s" % [dir, filename, counter, extension] - + return new_path - diff --git a/addons/screenshots/debugger/bottom_panel/bottom_panel.gd b/addons/screenshots/debugger/bottom_panel/bottom_panel.gd index 778f8aa..7101d71 100644 --- a/addons/screenshots/debugger/bottom_panel/bottom_panel.gd +++ b/addons/screenshots/debugger/bottom_panel/bottom_panel.gd @@ -3,43 +3,49 @@ extends Control @export var nodes_to_save: Array[Node] + func _ready() -> void: load_nodes_from_config(nodes_to_save) setup_auto_save(nodes_to_save) + func save_nodes_to_config(p_nodes_to_save: Array[Node]) -> void: for node in p_nodes_to_save: var key = node.name var value = null - + if node is CheckBox: value = node.button_pressed %LocalData.settings.save("misc", key, value) - + if node is LineEdit: value = node.text %LocalData.settings.save("misc", key, value) + func load_nodes_from_config(p_nodes_to_load: Array[Node]) -> void: for node in p_nodes_to_load: var value = %LocalData.settings.load_value("misc", node.name) if value != null: if node is CheckBox: node.button_pressed = value - + if node is LineEdit: node.text = value + func setup_auto_save(nodes: Array[Node]) -> void: for node in nodes: if node is CheckBox: node.toggled.connect(func(_toggled): save_nodes_to_config([node])) if node is LineEdit: node.text_changed.connect(func(_new_text): save_nodes_to_config([node])) - + + func on_session_started() -> void: pass + func on_editor_debugger_plugin_capture(p_message, p_data) -> bool: if p_message == "screenshot:taken": %CameraRoll.add_preview(p_data[0], p_data[1], p_data[2]) diff --git a/addons/screenshots/debugger/bottom_panel/camera_roll.gd b/addons/screenshots/debugger/bottom_panel/camera_roll.gd index b0d69e7..9ffb5cd 100644 --- a/addons/screenshots/debugger/bottom_panel/camera_roll.gd +++ b/addons/screenshots/debugger/bottom_panel/camera_roll.gd @@ -6,7 +6,9 @@ extends VBoxContainer const SCREENSHOT_PREVIEW = preload("res://addons/screenshots/debugger/bottom_panel/screenshot_preview/screenshot_preview.tscn") -var roll_directory : String +var roll_directory: String + + func _ready() -> void: %RollPanelContainer.add_theme_stylebox_override("panel", get_theme_stylebox("panel", "ItemListSecondary")) %CameraRollIcon.texture = get_theme_icon("CameraTexture", "EditorIcons") @@ -15,33 +17,36 @@ func _ready() -> void: local_data.settings.value_changed.connect(_on_local_data_changed) %DirectoryWatcher.files_deleted.connect(_on_files_deleted) + func _on_files_deleted(files: PackedStringArray) -> void: for file in files: for preview in previews_container.get_children(): if ProjectSettings.globalize_path(preview.path) == ProjectSettings.localize_path(file): preview.queue_free() + func _on_local_data_changed(section: String, key: String, new_value) -> void: if not key == "PathLineEdit": return - + %DirectoryWatcher.remove_scan_directory(roll_directory) roll_directory = new_value %DirectoryWatcher.add_scan_directory(roll_directory) - - + + func add_preview(file_path: String, timestamp: String, locale: String) -> void: var s = SCREENSHOT_PREVIEW.instantiate() var image = Image.load_from_file(file_path) var texture = ImageTexture.create_from_image(image) s.texture = texture - + s.path = file_path s.locale = locale previews_container.add_child(s) - + + func get_all_previews_paths() -> Array[String]: - var arr : Array[String] = [] + var arr: Array[String] = [] for preview in previews_container.get_children(): arr.append(preview.path) return arr diff --git a/addons/screenshots/debugger/bottom_panel/camera_roll_bottom_buttons.gd b/addons/screenshots/debugger/bottom_panel/camera_roll_bottom_buttons.gd index cfcc9d3..c2481ab 100644 --- a/addons/screenshots/debugger/bottom_panel/camera_roll_bottom_buttons.gd +++ b/addons/screenshots/debugger/bottom_panel/camera_roll_bottom_buttons.gd @@ -7,10 +7,12 @@ func _ready() -> void: %DeleteAllButton.pressed.connect(_on_delete_all_button_pressed) %OpenFolderButton.icon = get_theme_icon("Filesystem", "EditorIcons") %OpenFolderButton.pressed.connect(_on_open_folder_button_pressed) - + + func _on_open_folder_button_pressed() -> void: OS.shell_open(ProjectSettings.globalize_path(%PathLineEdit.text)) - + + func _on_delete_all_button_pressed() -> void: for c in %RollHFlowContainer.get_children(): var path = c.path diff --git a/addons/screenshots/debugger/bottom_panel/directory_watcher.gd b/addons/screenshots/debugger/bottom_panel/directory_watcher.gd index 1c2d9bf..41c3e48 100644 --- a/addons/screenshots/debugger/bottom_panel/directory_watcher.gd +++ b/addons/screenshots/debugger/bottom_panel/directory_watcher.gd @@ -29,19 +29,19 @@ @tool extends Node - ## Scans the provided directory (or directories) and informs about file changes. The scan is done periodically with configurable speed. class WatchedDirectory: var first_scan := true var new: PackedStringArray var modified: PackedStringArray - var current: Dictionary#[String, int] - var previous: Dictionary#[String, int] + var current: Dictionary #[String, int] + var previous: Dictionary #[String, int] + var _directory := DirAccess.open(".") -var _directory_list: Dictionary#[String, WatchedDirectory] +var _directory_list: Dictionary #[String, WatchedDirectory] var _directory_cache: Array[String] var _to_delete: Array @@ -62,44 +62,48 @@ signal files_modified(files: PackedStringArray) ## Emitted when files are deleted in the scanned directories. signal files_deleted(files: PackedStringArray) + func _ready() -> void: _current_delay = scan_delay _remaining_steps = scan_step _directory.include_hidden = true + ## Adds a directory that will be scanned. You can add more than 1. Only supports absolute paths and res://, user://. func add_scan_directory(directory: String): directory = ProjectSettings.globalize_path(directory) _directory_list[directory] = WatchedDirectory.new() _directory_cache.assign(_directory_list.keys()) + ## Removes a scanned directory. Does nothing if the directory wasn't added. func remove_scan_directory(directory: String): directory = ProjectSettings.globalize_path(directory) _to_delete.append(directory) + func _process(delta: float) -> void: if _directory_list.is_empty(): push_error("No directory to watch. Please kill me ;_;") return - + if _current_delay > 0: _current_delay -= delta return - + while _remaining_steps > 0: if _current_directory_name.is_empty(): _current_directory_name = _directory_cache[_current_directory_index] _directory.change_dir(_current_directory_name) _directory.list_dir_begin() - + var directory: WatchedDirectory = _directory_list[_current_directory_name] - + var file := _directory.get_next() if file.is_empty(): _current_directory_index += 1 _current_directory_name = "" - + if directory.first_scan: directory.new.clear() directory.modified.clear() @@ -108,41 +112,41 @@ func _process(delta: float) -> void: if not directory.new.is_empty(): files_created.emit(directory.new) directory.new.clear() - + if not directory.modified.is_empty(): files_modified.emit(directory.modified) directory.modified.clear() - + var deleted: PackedStringArray for path in directory.previous: if not path in directory.current: deleted.append(_directory.get_current_dir().path_join(path)) - + if not deleted.is_empty(): files_deleted.emit(deleted) - + directory.previous = directory.current - directory.current = {} - + directory.current = { } + if _current_directory_index == _directory_list.size(): if not _to_delete.is_empty(): for dir in _to_delete: _directory_list.erase(dir) - + _current_directory_index = 0 break else: if _directory.current_is_dir(): continue var full_file := _directory.get_current_dir().path_join(file) - + directory.current[file] = FileAccess.get_modified_time(full_file) if directory.previous.get(file, -1) == -1: directory.new.append(full_file) elif directory.current[file] > directory.previous[file]: directory.modified.append(full_file) - + _remaining_steps -= 1 - + _remaining_steps = scan_step _current_delay = scan_delay diff --git a/addons/screenshots/debugger/bottom_panel/locales.gd b/addons/screenshots/debugger/bottom_panel/locales.gd index 3cabd0f..e8c5b21 100644 --- a/addons/screenshots/debugger/bottom_panel/locales.gd +++ b/addons/screenshots/debugger/bottom_panel/locales.gd @@ -6,6 +6,7 @@ extends FoldableContainer @export var select_all_button: Button @export var deselect_all_button: Button + func _ready() -> void: var saved_locales = local_data.settings.load_value("misc", "Locales", ["none"]) for l in TranslationServer.get_loaded_locales(): @@ -14,26 +15,29 @@ func _ready() -> void: if saved_locales.has(l): n.button_pressed = true locales_container.add_child(n) - - for c : CheckBox in locales_container.get_children(): + + for c: CheckBox in locales_container.get_children(): c.toggled.connect(_on_locale_toggled) - + select_all_button.pressed.connect(_set_all_locales_pressed.bind(true)) deselect_all_button.pressed.connect(_set_all_locales_pressed.bind(false)) select_all_button.icon = get_theme_icon("ThemeSelectAll", "EditorIcons") deselect_all_button.icon = get_theme_icon("ThemeDeselectAll", "EditorIcons") - + + func get_locales() -> Array[String]: var arr: Array[String] = [] - for child : CheckBox in locales_container.get_children(): + for child: CheckBox in locales_container.get_children(): if child.button_pressed: arr.append(child.text) return arr - + + func _set_all_locales_pressed(pressed: bool) -> void: - for l : CheckBox in locales_container.get_children(): + for l: CheckBox in locales_container.get_children(): l.button_pressed = pressed + func _on_locale_toggled(_toggled_on: bool) -> void: var has_pressed := false var has_unpressed := false @@ -48,10 +52,11 @@ func _on_locale_toggled(_toggled_on: bool) -> void: deselect_all_button.disabled = not has_pressed if not has_pressed: %NoneLocaleCheckBox.button_pressed = true - + # "Select all" should only be enabled if at least one is unpressed select_all_button.disabled = not has_unpressed _save_to_config() - + + func _save_to_config() -> void: local_data.settings.save("misc", "Locales", get_locales()) diff --git a/addons/screenshots/debugger/bottom_panel/resolution.gd b/addons/screenshots/debugger/bottom_panel/resolution.gd index 36e236d..f2828b6 100644 --- a/addons/screenshots/debugger/bottom_panel/resolution.gd +++ b/addons/screenshots/debugger/bottom_panel/resolution.gd @@ -1,5 +1,6 @@ @tool extends FoldableContainer + const SIZE = preload("res://addons/screenshots/debugger/bottom_panel/size/size.tscn") @onready var local_data = %LocalData @export var sizes_container: FlowContainer @@ -8,29 +9,29 @@ const SIZE = preload("res://addons/screenshots/debugger/bottom_panel/size/size.t func _ready() -> void: sizes_container.child_exiting_tree.connect(_on_size_removed) sizes_container.child_entered_tree.connect(_on_size_added) - + var def_width = ProjectSettings.get_setting("display/window/size/viewport_width") var def_height = ProjectSettings.get_setting("display/window/size/viewport_height") - - for s in local_data.settings.load_value("misc", "Sizes", [Vector2i(def_width,def_height)]): + + for s in local_data.settings.load_value("misc", "Sizes", [Vector2i(def_width, def_height)]): var new_size = SIZE.instantiate() new_size.set_resolution(s) sizes_container.add_child(new_size) - + func _on_size_removed(node: Node) -> void: await node.tree_exited - + if not sizes_container: return - + if sizes_container.get_child_count() == 1: sizes_container.get_child(0).set_trash_button_disabled(true) - + _save_to_config() sizes_container.get_child(-1).set_add_button_visibility(true) - - + + func _on_size_added(node: Node) -> void: if not node.resolution_edited.is_connected(_save_to_config): node.resolution_edited.connect(_save_to_config) @@ -38,13 +39,15 @@ func _on_size_added(node: Node) -> void: for c in sizes_container.get_children(): c.set_trash_button_disabled(false) c.set_add_button_visibility(false) - + _save_to_config() sizes_container.get_child(-1).set_add_button_visibility(true) - + + func _save_to_config() -> void: local_data.settings.save("misc", "Sizes", get_sizes()) + func get_sizes() -> Array[Vector2i]: var arr: Array[Vector2i] = [] for child in sizes_container.get_children(): diff --git a/addons/screenshots/debugger/bottom_panel/save_folder.gd b/addons/screenshots/debugger/bottom_panel/save_folder.gd index 12f92d7..856c3a8 100644 --- a/addons/screenshots/debugger/bottom_panel/save_folder.gd +++ b/addons/screenshots/debugger/bottom_panel/save_folder.gd @@ -3,18 +3,21 @@ extends FoldableContainer @export var local_data: Node + func _ready() -> void: %PickFolderButton.icon = get_theme_icon("FolderBrowse", "EditorIcons") %PickFolderButton.pressed.connect(func(): %FileDialog.show()) %FileDialog.dir_selected.connect(_on_dir_selected) %FileDialog.current_dir = %PathLineEdit.text - + for c in %FormatsContainers.get_children(): c.toggled.connect(_on_format_toggled) + func _on_dir_selected(path: String) -> void: %PathLineEdit.text = path + func _on_format_toggled(_toggled_on: bool) -> void: var has_pressed := false var has_unpressed := false @@ -24,13 +27,14 @@ func _on_format_toggled(_toggled_on: bool) -> void: has_pressed = true else: has_unpressed = true - + if not has_pressed: %PNGCheckBox.button_pressed = true - + + func get_formats() -> Array[String]: var arr: Array[String] = [] - for child : CheckBox in %FormatsContainers.get_children(): + for child: CheckBox in %FormatsContainers.get_children(): if child.button_pressed: arr.append(child.text) return arr diff --git a/addons/screenshots/debugger/bottom_panel/screenshot_preview/screenshot_preview.gd b/addons/screenshots/debugger/bottom_panel/screenshot_preview/screenshot_preview.gd index 719be8e..2734b07 100644 --- a/addons/screenshots/debugger/bottom_panel/screenshot_preview/screenshot_preview.gd +++ b/addons/screenshots/debugger/bottom_panel/screenshot_preview/screenshot_preview.gd @@ -1,10 +1,11 @@ @tool extends VBoxContainer -@export var texture : Texture2D +@export var texture: Texture2D @export var locale: String @export var path: String + # Called when the node enters the scene tree for the first time. func _ready() -> void: $Button.icon = texture @@ -12,6 +13,6 @@ func _ready() -> void: $Label.text = path.get_file() var globalized_path = ProjectSettings.globalize_path(path) $Button.pressed.connect(func(): OS.shell_open(globalized_path)) - - for c : Control in get_children(): + + for c: Control in get_children(): c.tooltip_text = "%s\n%sx%s\nLocale: %s" % [path.get_file(), resolution.x, resolution.y, locale] diff --git a/addons/screenshots/debugger/bottom_panel/size/size.gd b/addons/screenshots/debugger/bottom_panel/size/size.gd index ac94573..183454c 100644 --- a/addons/screenshots/debugger/bottom_panel/size/size.gd +++ b/addons/screenshots/debugger/bottom_panel/size/size.gd @@ -1,30 +1,31 @@ @tool extends HBoxContainer + signal resolution_edited @export var preset_option_button: OptionButton -var presets : Dictionary[String, Vector2i] = { - "iPhone 6.9\" (portrait)" : Vector2i(1320, 2868), - "iPhone 6.9\" (landscape)" : Vector2i(2868, 1320), - - "iPad 13\" (portrait)" : Vector2i(2064, 2752), - "iPad 13\" (landscape)" : Vector2i(2752, 2064) +var presets: Dictionary[String, Vector2i] = { + "iPhone 6.9\" (portrait)": Vector2i(1320, 2868), + "iPhone 6.9\" (landscape)": Vector2i(2868, 1320), + "iPad 13\" (portrait)": Vector2i(2064, 2752), + "iPad 13\" (landscape)": Vector2i(2752, 2064), } + func _ready() -> void: var i = 0 preset_option_button.clear() for preset in presets: preset_option_button.add_item(preset) preset_option_button.set_item_metadata(i, presets[preset]) - i+=1 + i += 1 preset_option_button.add_item("Custom") preset_option_button.item_selected.connect(_on_preset_selected) - + if preset_option_button.selected == -1: preset_option_button.select(0) _on_preset_selected(0) - + %XLineEdit.text_changed.connect(_on_resolution_edited.bind("x")) %YLineEdit.text_changed.connect(_on_resolution_edited.bind("y")) %AddButton.pressed.connect(_on_add_button_pressed) @@ -36,34 +37,41 @@ func _ready() -> void: %TrashButton.pressed.connect(_on_trash_button_pressed) %TrashButton.icon = get_theme_icon("Remove", "EditorIcons") + func _on_trash_button_pressed() -> void: queue_free() - -func set_trash_button_disabled(p_disabled : bool) -> void: + + +func set_trash_button_disabled(p_disabled: bool) -> void: %TrashButton.disabled = p_disabled + func set_add_button_visibility(p_visible: bool) -> void: %AddButton.visible = p_visible + func _on_add_button_pressed() -> void: var size_panel = load("res://addons/screenshots/debugger/bottom_panel/size/size.tscn") get_parent().add_child(size_panel.instantiate()) $AddButton.hide() - + + func _on_preset_selected(idx: int) -> void: - var resolution : Vector2i = preset_option_button.get_item_metadata(idx) + var resolution: Vector2i = preset_option_button.get_item_metadata(idx) if not resolution: return - + %XLineEdit.text = str(resolution.x) %YLineEdit.text = str(resolution.y) resolution_edited.emit() - + + func set_resolution(p_resolution: Vector2i) -> void: %XLineEdit.text = str(p_resolution.x) %YLineEdit.text = str(p_resolution.y) select_preset_option(p_resolution) - + + func select_preset_option(resolution: Vector2i) -> void: if not is_node_ready(): await ready @@ -74,12 +82,14 @@ func select_preset_option(resolution: Vector2i) -> void: idx = i preset_option_button.select(idx) + func get_resolution() -> Vector2i: - var res : Vector2i + var res: Vector2i res.x = int(%XLineEdit.text) res.y = int(%YLineEdit.text) return res + func _on_resolution_edited(new_text: String, axis: String) -> void: # Remove all non-digit characters var filtered := "" @@ -94,6 +104,6 @@ func _on_resolution_edited(new_text: String, axis: String) -> void: elif axis == "y": if %YLineEdit.text != filtered: %YLineEdit.text = filtered - + select_preset_option(get_resolution()) resolution_edited.emit() diff --git a/addons/screenshots/debugger/editor_debugger_plugin.gd b/addons/screenshots/debugger/editor_debugger_plugin.gd index 71843ad..15a8439 100644 --- a/addons/screenshots/debugger/editor_debugger_plugin.gd +++ b/addons/screenshots/debugger/editor_debugger_plugin.gd @@ -1,19 +1,22 @@ @tool extends EditorDebuggerPlugin -var session_id_to_editor_panel : Dictionary = {} +var session_id_to_editor_panel: Dictionary = { } -func _setup_session(p_session_id : int) -> void: - var editor_panel : Control = preload("res://addons/screenshots/debugger/bottom_panel/bottom_panel.tscn").instantiate() - var editor_debugger_session : EditorDebuggerSession = get_session(p_session_id) - - var _success : int = editor_debugger_session.started.connect(editor_panel.on_session_started) + +func _setup_session(p_session_id: int) -> void: + var editor_panel: Control = preload("res://addons/screenshots/debugger/bottom_panel/bottom_panel.tscn").instantiate() + var editor_debugger_session: EditorDebuggerSession = get_session(p_session_id) + + var _success: int = editor_debugger_session.started.connect(editor_panel.on_session_started) editor_debugger_session.add_session_tab(editor_panel) session_id_to_editor_panel[p_session_id] = editor_panel -func _has_capture(p_prefix : String) -> bool: + +func _has_capture(p_prefix: String) -> bool: return p_prefix == "screenshot" -func _capture(p_message : String, p_data : Array, p_session_id : int) -> bool: - var editor_panel : Control = session_id_to_editor_panel[p_session_id] + +func _capture(p_message: String, p_data: Array, p_session_id: int) -> bool: + var editor_panel: Control = session_id_to_editor_panel[p_session_id] return editor_panel.on_editor_debugger_plugin_capture(p_message, p_data) diff --git a/addons/screenshots/plugin.gd b/addons/screenshots/plugin.gd index 5628e8a..6ccc67b 100644 --- a/addons/screenshots/plugin.gd +++ b/addons/screenshots/plugin.gd @@ -3,8 +3,9 @@ extends EditorPlugin const SHUTTER_WINDOW = "res://addons/screenshots/autoload/shutter_window/shutter_window.tscn" -var m_editor_debugger_plugin : EditorDebuggerPlugin = preload("res://addons/screenshots/debugger/editor_debugger_plugin.gd").new() -var bottom_panel : Control +var m_editor_debugger_plugin: EditorDebuggerPlugin = preload("res://addons/screenshots/debugger/editor_debugger_plugin.gd").new() +var bottom_panel: Control + func _enable_plugin() -> void: add_autoload_singleton("Screenshots", SHUTTER_WINDOW) diff --git a/addons/screenshots/screenshots_local_data.gd b/addons/screenshots/screenshots_local_data.gd index b835e91..9a82ea0 100644 --- a/addons/screenshots/screenshots_local_data.gd +++ b/addons/screenshots/screenshots_local_data.gd @@ -1,35 +1,41 @@ @tool extends Node + var settings: LocalFile + func _ready(): settings = LocalFile.new("res://addons/screenshots/settings.cfg") + class LocalFile: signal value_changed(section: String, key: String, new_value) - + var config: ConfigFile var file_path: String - + + func _init(path: String): file_path = path config = ConfigFile.new() load_config() - + + func load_config(): var err = config.load(file_path) if err != OK: # File doesn't exist or couldn't be loaded, that's fine # We'll create it when we first save pass - + + func save(section: String, key: String, value): var old_value = null var has_existing_key = config.has_section_key(section, key) - + if has_existing_key: old_value = config.get_value(section, key) - + # Only save and emit if the value is different if not has_existing_key or old_value != value: config.set_value(section, key, value) @@ -38,7 +44,8 @@ class LocalFile: push_error("Failed to save config file " + file_path + ": " + str(err)) else: value_changed.emit(section, key, value) - + + func load_value(section: String, key: String, default_value = null): # Check if the key exists first to avoid C++ errors if config.has_section_key(section, key): @@ -48,38 +55,44 @@ class LocalFile: if default_value != null: save(section, key, default_value) return default_value - - + + func has_key(section: String, key: String) -> bool: return config.has_section_key(section, key) - + + func has_section(section: String) -> bool: return config.has_section(section) - + + # Get all values from a section func get_section(section: String) -> Dictionary: if config.has_section(section): return config.get_section_values(section) - return {} - + return { } + + # Get all sections func get_sections() -> PackedStringArray: return config.get_sections() - + + # Remove a key func remove_key(section: String, key: String): config.erase_section_key(section, key) var err = config.save(file_path) if err != OK: push_error("Failed to save config file " + file_path + ": " + str(err)) - + + # Remove an entire section func remove_section(section: String): config.erase_section(section) var err = config.save(file_path) if err != OK: push_error("Failed to save config file " + file_path + ": " + str(err)) - + + # Clear entire file func clear_all(): config.clear() diff --git a/project.godot b/project.godot index ae1f949..0cc4c65 100644 --- a/project.godot +++ b/project.godot @@ -11,13 +11,10 @@ config_version=5 [application] config/name="Screenshots" +run/main_scene="uid://dhxwkyejss1af" config/features=PackedStringArray("4.5", "Forward Plus") config/icon="res://store_assets/icon.svg" [autoload] -Screenshots="*res://addons/screenshots/autoload/shutter_window/shutter_window.tscn" - -[editor_plugins] - -enabled=PackedStringArray("res://addons/kenyoni/plugin_reloader/plugin.cfg", "res://addons/screenshots/plugin.cfg") +Screenshots="*res://addons/screenshots/autoload/shutter_window/shutter_window.tscn" \ No newline at end of file