diff --git a/addons/gdfxr/editor/EditSlider.gd b/addons/gdfxr/editor/EditSlider.gd index 217a900..b948e88 100644 --- a/addons/gdfxr/editor/EditSlider.gd +++ b/addons/gdfxr/editor/EditSlider.gd @@ -36,8 +36,8 @@ func _init() -> void: _line_edit = LineEdit.new() _line_edit.set_as_toplevel(true) _line_edit.visible = false - _line_edit.add_stylebox_override("normal", style) - _line_edit.add_stylebox_override("focus", StyleBoxEmpty.new()) + _line_edit.add_theme_stylebox_override("normal", style) + _line_edit.add_theme_stylebox_override("focus", StyleBoxEmpty.new()) var _ret: int _ret = _line_edit.connect("focus_exited", self, "_on_line_edit_focus_exited") @@ -48,8 +48,8 @@ func _init() -> void: func _draw() -> void: - var font := get_font("font", "LineEdit") - var color := get_color("highlighted_font_color" if _mouse_hovering else "font_color", "Editor") + var font := get_theme_font("font", "LineEdit") + var color := get_theme_color("highlighted_font_color" if _mouse_hovering else "font_color", "Editor") var number_string := "%.3f" % value var number_size := font.get_string_size(number_string) var pos := Vector2( @@ -70,7 +70,7 @@ func _draw() -> void: func _get_minimum_size() -> Vector2: var ms := _stylebox_normal.get_minimum_size() - ms.y += get_font("font", "LineEdit").get_height() + ms.y += get_theme_font("font", "LineEdit").get_height() return ms @@ -121,13 +121,13 @@ func set_value(v: float) -> void: func _update_stylebox() -> void: - _stylebox_normal = get_stylebox("normal", "LineEdit") + _stylebox_normal = get_theme_stylebox("normal", "LineEdit") _stylebox_hover = StyleBoxFlat.new() - _stylebox_hover.bg_color = get_color("highlight_color", "Editor") + _stylebox_hover.bg_color = get_theme_color("highlight_color", "Editor") _stylebox_editing = StyleBoxFlat.new() - _stylebox_editing.bg_color = get_color("dark_color_2", "Editor") + _stylebox_editing.bg_color = get_theme_color("dark_color_2", "Editor") _stylebox_value = StyleBoxFlat.new() - _stylebox_value.bg_color = get_color("accent_color", "Editor") * Color(1, 1, 1, 0.4) + _stylebox_value.bg_color = get_theme_color("accent_color", "Editor") * Color(1, 1, 1, 0.4) func _drag_prepare(mouse: InputEventMouse) -> void: diff --git a/addons/gdfxr/editor/Editor.gd b/addons/gdfxr/editor/Editor.gd index b6028d3..de8d767 100644 --- a/addons/gdfxr/editor/Editor.gd +++ b/addons/gdfxr/editor/Editor.gd @@ -78,18 +78,18 @@ func _notification(what: int): match what: NOTIFICATION_ENTER_TREE, NOTIFICATION_THEME_CHANGED: - find_node("ScrollContainer").add_stylebox_override("bg", get_stylebox("bg", "Tree")) + find_node("ScrollContainer").add_theme_stylebox_override("bg", get_theme_stylebox("bg", "Tree")) if extra_button: var popup = extra_button.get_popup() - popup.set_item_icon(popup.get_item_index(ExtraOption.COPY), get_icon("ActionCopy", "EditorIcons")) - popup.set_item_icon(popup.get_item_index(ExtraOption.PASTE), get_icon("ActionPaste", "EditorIcons")) + popup.set_item_icon(popup.get_item_index(ExtraOption.COPY), get_theme_icon("ActionCopy", "EditorIcons")) + popup.set_item_icon(popup.get_item_index(ExtraOption.PASTE), get_theme_icon("ActionPaste", "EditorIcons")) func edit(path: String) -> void: if _modified: _popup_confirm( - translator.tr("There are unsaved changes.\nOpen '%s' anyway?") % path, + str(translator.tr("There are unsaved changes.\nOpen '%s' anyway?")) % path, "_set_editing_file", [path] ) else: @@ -176,7 +176,7 @@ func _set_editing_file(path: String) -> int: # Error else: var err := _config.load(path) if err != OK: - _popup_message(translator.tr("'%s' is not a valid SFXR file.") % path) + _popup_message(str(translator.tr("'%s' is not a valid SFXR file.")) % path) return err audio_player.stream = load(path) @@ -189,7 +189,7 @@ func _set_modified(value: bool) -> void: _modified = value var has_file := not _path.empty() - var base = _path if has_file else translator.tr("Unsaved sound") + var base = _path if has_file else str(translator.tr("Unsaved sound")) if _modified: base += "(*)" filename_label.text = base diff --git a/addons/gdfxr/editor/EditorIconButton.gd b/addons/gdfxr/editor/EditorIconButton.gd index 9a16ad0..5f3c596 100644 --- a/addons/gdfxr/editor/EditorIconButton.gd +++ b/addons/gdfxr/editor/EditorIconButton.gd @@ -13,4 +13,4 @@ func _notification(what: int): match what: NOTIFICATION_ENTER_TREE, NOTIFICATION_THEME_CHANGED: if icon_name: - icon = get_icon(icon_name, "EditorIcons") + icon = get_theme_icon(icon_name, "EditorIcons") diff --git a/addons/gdfxr/editor/PluginTranslator.gd b/addons/gdfxr/editor/PluginTranslator.gd index c4f9017..c61266b 100644 --- a/addons/gdfxr/editor/PluginTranslator.gd +++ b/addons/gdfxr/editor/PluginTranslator.gd @@ -25,10 +25,10 @@ func set_plugin(v: EditorPlugin) -> void: _translate_node(get_parent()) -func tr(message: String) -> String: +func tr(message: StringName) -> StringName: if _translation: var translated := _translation.get_message(message) - if not translated.empty(): + if translated != "": return translated return message diff --git a/addons/gdfxr/import_plugin.gd b/addons/gdfxr/import_plugin.gd index 5dce8ff..cbf3a16 100644 --- a/addons/gdfxr/import_plugin.gd +++ b/addons/gdfxr/import_plugin.gd @@ -36,20 +36,20 @@ func get_preset_name(preset): func get_import_options(preset): return [ { - name="loop", - default_value=false, + "name":"loop", + "default_value":false, }, { - name="bit_depth", - property_hint=PROPERTY_HINT_ENUM, - hint_string="8 Bits,16 Bits", - default_value=SFXRGenerator.WavBits.WAV_BITS_8, + "name":"bit_depth", + "property_hint":PROPERTY_HINT_ENUM, + "hint_string":"8 Bits,16 Bits", + "default_value":SFXRGenerator.WavBits.WAV_BITS_8, }, { - name="sample_rate", - property_hint=PROPERTY_HINT_ENUM, - hint_string="44100 Hz,22050 Hz", - default_value=SFXRGenerator.WavFreq.WAV_FREQ_44100, + "name":"sample_rate", + "property_hint":PROPERTY_HINT_ENUM, + "hint_string":"44100 Hz,22050 Hz", + "default_value":SFXRGenerator.WavFreq.WAV_FREQ_44100, }, ] diff --git a/example/Example.tscn b/example/Example.tscn index 1e6c07f..fd0003e 100644 --- a/example/Example.tscn +++ b/example/Example.tscn @@ -10,8 +10,8 @@ anchor_right = 0.5 anchor_bottom = 0.5 grow_horizontal = 2 grow_vertical = 2 -custom_constants/vseparation = 32 custom_constants/hseparation = 32 +custom_constants/vseparation = 32 columns = 2 script = ExtResource( 1 ) diff --git a/project.godot b/project.pandemonium similarity index 100% rename from project.godot rename to project.pandemonium