Asset renaming (#225)

* Renamed the Asset folder and subfolders to lowercase

* Fixed font loading issue

Co-authored-by: OverloadedOrama <manoschool@yahoo.com>
This commit is contained in:
Manolis Papadeas 2020-05-05 03:53:58 +03:00 committed by GitHub
parent a056a87492
commit 1ad1ecb960
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
429 changed files with 2490 additions and 2443 deletions

View file

@ -45,7 +45,7 @@ var has_focus := false
var pressure_sensitivity_mode = Pressure_Sensitivity.NONE
var open_last_project := true
var smooth_zoom := true
var cursor_image = preload("res://Assets/Graphics/cursor_icons/cursor.png")
var cursor_image = preload("res://assets/graphics/cursor_icons/cursor.png")
var left_cursor_tool_texture : ImageTexture
var right_cursor_tool_texture : ImageTexture
@ -289,9 +289,9 @@ func _ready() -> void:
canvas = find_node_by_name(root, "Canvas")
canvases.append(canvas)
left_cursor_tool_texture = ImageTexture.new()
left_cursor_tool_texture.create_from_image(preload("res://Assets/Graphics/cursor_icons/pencil_cursor.png"))
left_cursor_tool_texture.create_from_image(preload("res://assets/graphics/cursor_icons/pencil_cursor.png"))
right_cursor_tool_texture = ImageTexture.new()
right_cursor_tool_texture.create_from_image(preload("res://Assets/Graphics/cursor_icons/eraser_cursor.png"))
right_cursor_tool_texture.create_from_image(preload("res://assets/graphics/cursor_icons/eraser_cursor.png"))
canvas_parent = canvas.get_parent()
main_viewport = find_node_by_name(root, "ViewportContainer")
second_viewport = find_node_by_name(root, "ViewportContainer2")
@ -708,9 +708,9 @@ func disable_button(button : BaseButton, disable : bool) -> void:
var button_category = c.texture.resource_path.get_base_dir().right(last_backslash + 1)
var normal_file_name = c.texture.resource_path.get_file().trim_suffix(".png").replace("_disabled", "")
if disable:
c.texture = load("res://Assets/Graphics/%s_themes/%s/%s_disabled.png" % [theme.to_lower(), button_category, normal_file_name])
c.texture = load("res://assets/graphics/%s_themes/%s/%s_disabled.png" % [theme.to_lower(), button_category, normal_file_name])
else:
c.texture = load("res://Assets/Graphics/%s_themes/%s/%s.png" % [theme.to_lower(), button_category, normal_file_name])
c.texture = load("res://assets/graphics/%s_themes/%s/%s.png" % [theme.to_lower(), button_category, normal_file_name])
break
@ -873,16 +873,16 @@ func redo_custom_brush(_brush_button : BaseButton = null) -> void:
func update_left_custom_brush() -> void:
if current_left_brush_type == Brush_Types.PIXEL:
var pixel := Image.new()
pixel = preload("res://Assets/Graphics/pixel_image.png")
pixel = preload("res://assets/graphics/pixel_image.png")
left_brush_type_button.get_child(0).texture.create_from_image(pixel, 0)
elif current_left_brush_type == Brush_Types.CIRCLE:
var pixel := Image.new()
pixel = preload("res://Assets/Graphics/circle_9x9.png")
pixel = preload("res://assets/graphics/circle_9x9.png")
left_brush_type_button.get_child(0).texture.create_from_image(pixel, 0)
left_circle_points = plot_circle(left_brush_size)
elif current_left_brush_type == Brush_Types.FILLED_CIRCLE:
var pixel := Image.new()
pixel = preload("res://Assets/Graphics/circle_filled_9x9.png")
pixel = preload("res://assets/graphics/circle_filled_9x9.png")
left_brush_type_button.get_child(0).texture.create_from_image(pixel, 0)
left_circle_points = plot_circle(left_brush_size)
else:
@ -899,16 +899,16 @@ func update_left_custom_brush() -> void:
func update_right_custom_brush() -> void:
if current_right_brush_type == Brush_Types.PIXEL:
var pixel := Image.new()
pixel = preload("res://Assets/Graphics/pixel_image.png")
pixel = preload("res://assets/graphics/pixel_image.png")
right_brush_type_button.get_child(0).texture.create_from_image(pixel, 0)
elif current_right_brush_type == Brush_Types.CIRCLE:
var pixel := Image.new()
pixel = preload("res://Assets/Graphics/circle_9x9.png")
pixel = preload("res://assets/graphics/circle_9x9.png")
right_brush_type_button.get_child(0).texture.create_from_image(pixel, 0)
right_circle_points = plot_circle(right_brush_size)
elif current_right_brush_type == Brush_Types.FILLED_CIRCLE:
var pixel := Image.new()
pixel = preload("res://Assets/Graphics/circle_filled_9x9.png")
pixel = preload("res://assets/graphics/circle_filled_9x9.png")
right_brush_type_button.get_child(0).texture.create_from_image(pixel, 0)
right_circle_points = plot_circle(right_brush_size)
else:

View file

@ -96,9 +96,9 @@ func _ready() -> void:
TranslationServer.set_locale(OS.get_locale())
if "zh" in TranslationServer.get_locale():
theme.default_font = preload("res://Assets/Fonts/CJK/NotoSansCJKtc-Regular.tres")
theme.default_font = preload("res://assets/fonts/CJK/NotoSansCJKtc-Regular.tres")
else:
theme.default_font = preload("res://Assets/Fonts/Roboto-Regular.tres")
theme.default_font = preload("res://assets/fonts/Roboto-Regular.tres")
file_menu = Global.file_menu.get_popup()
@ -609,16 +609,16 @@ func _on_Tool_pressed(tool_pressed : BaseButton, mouse_press := true, key_for_le
theme_type = "Dark"
if tool_name == Global.current_left_tool and tool_name == Global.current_right_tool:
t[0].get_child(0).texture = load("res://Assets/Graphics/%s_themes/tools/%s_l_r.png" % [theme_type.to_lower(), tool_name.to_lower()])
t[0].get_child(0).texture = load("res://assets/graphics/%s_themes/tools/%s_l_r.png" % [theme_type.to_lower(), tool_name.to_lower()])
elif tool_name == Global.current_left_tool:
t[0].get_child(0).texture = load("res://Assets/Graphics/%s_themes/tools/%s_l.png" % [theme_type.to_lower(), tool_name.to_lower()])
t[0].get_child(0).texture = load("res://assets/graphics/%s_themes/tools/%s_l.png" % [theme_type.to_lower(), tool_name.to_lower()])
elif tool_name == Global.current_right_tool:
t[0].get_child(0).texture = load("res://Assets/Graphics/%s_themes/tools/%s_r.png" % [theme_type.to_lower(), tool_name.to_lower()])
t[0].get_child(0).texture = load("res://assets/graphics/%s_themes/tools/%s_r.png" % [theme_type.to_lower(), tool_name.to_lower()])
else:
t[0].get_child(0).texture = load("res://Assets/Graphics/%s_themes/tools/%s.png" % [theme_type.to_lower(), tool_name.to_lower()])
t[0].get_child(0).texture = load("res://assets/graphics/%s_themes/tools/%s.png" % [theme_type.to_lower(), tool_name.to_lower()])
Global.left_cursor_tool_texture.create_from_image(load("res://Assets/Graphics/cursor_icons/%s_cursor.png" % Global.current_left_tool.to_lower()), 0)
Global.right_cursor_tool_texture.create_from_image(load("res://Assets/Graphics/cursor_icons/%s_cursor.png" % Global.current_right_tool.to_lower()), 0)
Global.left_cursor_tool_texture.create_from_image(load("res://assets/graphics/cursor_icons/%s_cursor.png" % Global.current_left_tool.to_lower()), 0)
Global.right_cursor_tool_texture.create_from_image(load("res://assets/graphics/cursor_icons/%s_cursor.png" % Global.current_right_tool.to_lower()), 0)
func _on_LeftBrushTypeButton_pressed() -> void:

View file

@ -1,18 +1,18 @@
[gd_scene load_steps=57 format=2]
[ext_resource path="res://Assets/themes/dark/theme.tres" type="Theme" id=1]
[ext_resource path="res://assets/themes/dark/theme.tres" type="Theme" id=1]
[ext_resource path="res://src/Main.gd" type="Script" id=2]
[ext_resource path="res://Assets/themes/dark/top_menu_style.tres" type="StyleBox" id=3]
[ext_resource path="res://Assets/Graphics/dark_themes/tools/rectselect.png" type="Texture" id=4]
[ext_resource path="res://Assets/Graphics/dark_themes/tools/eraser_r.png" type="Texture" id=5]
[ext_resource path="res://Assets/Graphics/dark_themes/tools/pencil_l.png" type="Texture" id=6]
[ext_resource path="res://Assets/Graphics/dark_themes/tools/lightendarken.png" type="Texture" id=7]
[ext_resource path="res://Assets/Graphics/dark_themes/tools/colorpicker.png" type="Texture" id=8]
[ext_resource path="res://Assets/Graphics/dark_themes/tools/bucket.png" type="Texture" id=9]
[ext_resource path="res://Assets/Graphics/dark_themes/misc/color_switch.png" type="Texture" id=10]
[ext_resource path="res://Assets/Graphics/dark_themes/misc/color_defaults.png" type="Texture" id=11]
[ext_resource path="res://Assets/Graphics/Brush_button.png" type="Texture" id=12]
[ext_resource path="res://Assets/themes/dark/ruler_style.tres" type="StyleBox" id=13]
[ext_resource path="res://assets/themes/dark/top_menu_style.tres" type="StyleBox" id=3]
[ext_resource path="res://assets/graphics/dark_themes/tools/rectselect.png" type="Texture" id=4]
[ext_resource path="res://assets/graphics/dark_themes/tools/eraser_r.png" type="Texture" id=5]
[ext_resource path="res://assets/graphics/dark_themes/tools/pencil_l.png" type="Texture" id=6]
[ext_resource path="res://assets/graphics/dark_themes/tools/lightendarken.png" type="Texture" id=7]
[ext_resource path="res://assets/graphics/dark_themes/tools/colorpicker.png" type="Texture" id=8]
[ext_resource path="res://assets/graphics/dark_themes/tools/bucket.png" type="Texture" id=9]
[ext_resource path="res://assets/graphics/dark_themes/misc/color_switch.png" type="Texture" id=10]
[ext_resource path="res://assets/graphics/dark_themes/misc/color_defaults.png" type="Texture" id=11]
[ext_resource path="res://assets/graphics/brush_button.png" type="Texture" id=12]
[ext_resource path="res://assets/themes/dark/ruler_style.tres" type="StyleBox" id=13]
[ext_resource path="res://src/UI/Rulers/HorizontalRuler.gd" type="Script" id=14]
[ext_resource path="res://src/UI/Rulers/VerticalRuler.gd" type="Script" id=15]
[ext_resource path="res://src/Canvas.tscn" type="PackedScene" id=16]
@ -20,16 +20,16 @@
[ext_resource path="res://src/SelectionRectangle.gd" type="Script" id=18]
[ext_resource path="res://src/UI/SecondViewport.gd" type="Script" id=19]
[ext_resource path="res://src/UI/Timeline/AnimationTimeline.tscn" type="PackedScene" id=20]
[ext_resource path="res://Assets/Graphics/dark_themes/palette/edit_palette.png" type="Texture" id=21]
[ext_resource path="res://Assets/Graphics/dark_themes/palette/add_palette.png" type="Texture" id=22]
[ext_resource path="res://Assets/Graphics/dark_themes/tools/zoom.png" type="Texture" id=23]
[ext_resource path="res://Assets/Graphics/dark_themes/tools/horizontal_mirror_on.png" type="Texture" id=24]
[ext_resource path="res://assets/graphics/dark_themes/palette/edit_palette.png" type="Texture" id=21]
[ext_resource path="res://assets/graphics/dark_themes/palette/add_palette.png" type="Texture" id=22]
[ext_resource path="res://assets/graphics/dark_themes/tools/zoom.png" type="Texture" id=23]
[ext_resource path="res://assets/graphics/dark_themes/tools/horizontal_mirror_on.png" type="Texture" id=24]
[ext_resource path="res://src/Palette/PaletteContainer.gd" type="Script" id=25]
[ext_resource path="res://src/UI/BrushButton.tscn" type="PackedScene" id=26]
[ext_resource path="res://src/UI/Dialogs/SplashDialog.tscn" type="PackedScene" id=27]
[ext_resource path="res://src/UI/Dialogs/CreateNewImage.tscn" type="PackedScene" id=28]
[ext_resource path="res://src/UI/Dialogs/ImportSprites.tscn" type="PackedScene" id=29]
[ext_resource path="res://Assets/Graphics/dark_themes/tools/horizontal_mirror_off.png" type="Texture" id=30]
[ext_resource path="res://assets/graphics/dark_themes/tools/horizontal_mirror_off.png" type="Texture" id=30]
[ext_resource path="res://src/UI/Dialogs/ScaleImage.tscn" type="PackedScene" id=31]
[ext_resource path="res://src/UI/Dialogs/PreferencesDialog.tscn" type="PackedScene" id=32]
[ext_resource path="res://src/UI/Dialogs/OutlineDialog.tscn" type="PackedScene" id=33]
@ -39,8 +39,8 @@
[ext_resource path="res://src/Palette/PaletteImportFileDialog.tscn" type="PackedScene" id=37]
[ext_resource path="res://src/UI/Dialogs/RotateImage.tscn" type="PackedScene" id=38]
[ext_resource path="res://src/UI/Dialogs/ExportDialog.tscn" type="PackedScene" id=39]
[ext_resource path="res://Assets/Graphics/dark_themes/tools/vertical_mirror_off.png" type="Texture" id=40]
[ext_resource path="res://Assets/Graphics/dark_themes/tools/vertical_mirror_on.png" type="Texture" id=41]
[ext_resource path="res://assets/graphics/dark_themes/tools/vertical_mirror_off.png" type="Texture" id=40]
[ext_resource path="res://assets/graphics/dark_themes/tools/vertical_mirror_on.png" type="Texture" id=41]
[ext_resource path="res://src/Shaders/TransparentChecker.shader" type="Shader" id=42]
[ext_resource path="res://src/UI/Dialogs/HSVDialog.tscn" type="PackedScene" id=44]
[ext_resource path="res://src/UI/TransparentChecker.gd" type="Script" id=45]
@ -1653,8 +1653,8 @@ resizable = true
mode = 0
access = 2
filters = PoolStringArray( "*.pxo ; Pixelorama Project" )
current_dir = "C:/Users/Overloaded/Dropbox/Orama Founding Members/εταιρικα αρχεια/Godot Projects/Pixelorama"
current_path = "C:/Users/Overloaded/Dropbox/Orama Founding Members/εταιρικα αρχεια/Godot Projects/Pixelorama/"
current_dir = "/home/overloaded/Documents/Pixelorama"
current_path = "/home/overloaded/Documents/Pixelorama/"
[node name="SaveSprite" type="FileDialog" parent="."]
anchor_left = 0.5
@ -1669,10 +1669,12 @@ window_title = "Save Sprite as .pxo"
resizable = true
access = 2
filters = PoolStringArray( "*.pxo ; Pixelorama Project" )
current_dir = "C:/Users/Overloaded/Dropbox/Orama Founding Members/εταιρικα αρχεια/Godot Projects/Pixelorama"
current_path = "C:/Users/Overloaded/Dropbox/Orama Founding Members/εταιρικα αρχεια/Godot Projects/Pixelorama/"
current_dir = "/home/overloaded/Documents/Pixelorama"
current_path = "/home/overloaded/Documents/Pixelorama/"
[node name="ImportSprites" parent="." instance=ExtResource( 29 )]
current_dir = "/home/overloaded/Documents/Pixelorama"
current_path = "/home/overloaded/Documents/Pixelorama/"
[node name="ExportDialog" parent="." instance=ExtResource( 39 )]
@ -1721,8 +1723,8 @@ dialog_text = "This is an error message!"
[node name="PaletteImportFileDialog" parent="." instance=ExtResource( 37 )]
filters = PoolStringArray( "*.json ; JavaScript Object Notation", "*.gpl ; Gimp Palette Library", "*.png; Portable Network Graphics" )
current_dir = "C:/Users/Overloaded/Dropbox/Orama Founding Members/εταιρικα αρχεια/Godot Projects/Pixelorama"
current_path = "C:/Users/Overloaded/Dropbox/Orama Founding Members/εταιρικα αρχεια/Godot Projects/Pixelorama/"
current_dir = "/home/overloaded/Documents/Pixelorama"
current_path = "/home/overloaded/Documents/Pixelorama/"
[node name="HSVDialog" parent="." instance=ExtResource( 44 )]

View file

@ -1,9 +1,12 @@
[gd_scene load_steps=5 format=2]
[ext_resource path="res://src/Palette/EditPalettePopup.gd" type="Script" id=1]
[ext_resource path="res://Assets/Graphics/dark_themes/timeline/new_frame.png" type="Texture" id=2]
[ext_resource path="res://Assets/Graphics/dark_themes/timeline/remove_frame.png" type="Texture" id=3]
[ext_resource path="res://Assets/Graphics/Palette/palette_button_fill.png" type="Texture" id=6]
[ext_resource path="res://assets/graphics/dark_themes/timeline/new_frame.png" type="Texture" id=2]
[ext_resource path="res://assets/graphics/dark_themes/timeline/remove_frame.png" type="Texture" id=3]
[ext_resource path="res://assets/graphics/palette/palette_button_fill.png" type="Texture" id=6]
[node name="EditPalettePopup" type="WindowDialog"]
margin_right = 600.0

View file

@ -5,7 +5,7 @@ export var index := 0;
export var color : Color = Color.white
export var draggable := false
var drag_preview_texture = preload("res://Assets/Graphics/Palette/swatch_drag_preview.png")
var drag_preview_texture = preload("res://assets/graphics/palette/swatch_drag_preview.png")
func get_drag_data(_position):

View file

@ -1,11 +1,14 @@
[gd_scene load_steps=8 format=2]
[ext_resource path="res://Assets/themes/palette_styleboxes/palette_stylebox_pressedr.tres" type="StyleBox" id=1]
[ext_resource path="res://Assets/themes/palette_styleboxes/palette_stylebox_hover.tres" type="StyleBox" id=2]
[ext_resource path="res://assets/themes/palette_styleboxes/palette_stylebox_pressedr.tres" type="StyleBox" id=1]
[ext_resource path="res://assets/themes/palette_styleboxes/palette_stylebox_hover.tres" type="StyleBox" id=2]
[ext_resource path="res://src/Palette/PaletteButton.gd" type="Script" id=3]
[ext_resource path="res://Assets/themes/palette_styleboxes/palette_stylebox_focus.tres" type="StyleBox" id=4]
[ext_resource path="res://Assets/themes/palette_styleboxes/palette_stylebox_normal.tres" type="StyleBox" id=5]
[ext_resource path="res://Assets/Graphics/Palette/palette_button_fill.png" type="Texture" id=6]
[ext_resource path="res://assets/themes/palette_styleboxes/palette_stylebox_focus.tres" type="StyleBox" id=4]
[ext_resource path="res://assets/themes/palette_styleboxes/palette_stylebox_normal.tres" type="StyleBox" id=5]
[ext_resource path="res://assets/graphics/palette/palette_button_fill.png" type="Texture" id=6]
[sub_resource type="ImageTexture" id=1]

File diff suppressed because one or more lines are too long

View file

@ -1,10 +1,13 @@
[gd_scene load_steps=6 format=2]
[ext_resource path="res://src/UI/Dialogs/AboutDialog.gd" type="Script" id=1]
[ext_resource path="res://Assets/Graphics/icons/icon_64x64.png" type="Texture" id=2]
[ext_resource path="res://Assets/Fonts/Roboto-Italic.tres" type="DynamicFont" id=3]
[ext_resource path="res://Assets/Graphics/splash_screen/orama_64x64.png" type="Texture" id=4]
[ext_resource path="res://Assets/Fonts/Roboto-Small.tres" type="DynamicFont" id=5]
[ext_resource path="res://assets/graphics/icons/icon_64x64.png" type="Texture" id=2]
[ext_resource path="res://assets/fonts/Roboto-Italic.tres" type="DynamicFont" id=3]
[ext_resource path="res://assets/graphics/splash_screen/orama_64x64.png" type="Texture" id=4]
[ext_resource path="res://assets/fonts/Roboto-Small.tres" type="DynamicFont" id=5]
[node name="AboutDialog" type="WindowDialog"]
margin_right = 512.0

View file

@ -1,7 +1,9 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://src/UI/Dialogs/FrameTagDialog.gd" type="Script" id=1]
[ext_resource path="res://Assets/Graphics/dark_themes/timeline/new_frame.png" type="Texture" id=2]
[ext_resource path="res://assets/graphics/dark_themes/timeline/new_frame.png" type="Texture" id=2]
[node name="FrameTagDialog" type="AcceptDialog"]
margin_right = 83.0

View file

@ -276,9 +276,9 @@ func _on_Language_pressed(button : Button) -> void:
TranslationServer.set_locale(Global.loaded_locales[index])
if "zh" in TranslationServer.get_locale():
Global.control.theme.default_font = preload("res://Assets/Fonts/CJK/NotoSansCJKtc-Regular.tres")
Global.control.theme.default_font = preload("res://assets/fonts/CJK/NotoSansCJKtc-Regular.tres")
else:
Global.control.theme.default_font = preload("res://Assets/Fonts/Roboto-Regular.tres")
Global.control.theme.default_font = preload("res://assets/fonts/Roboto-Regular.tres")
Global.config_cache.set_value("preferences", "locale", TranslationServer.get_locale())
Global.config_cache.save("user://cache.ini")
@ -315,33 +315,33 @@ func change_theme(ID : int) -> void:
if ID == 0: # Dark Theme
Global.theme_type = "Dark"
VisualServer.set_default_clear_color(Color(0.247059, 0.25098, 0.247059))
main_theme = preload("res://Assets/themes/dark/theme.tres")
top_menu_style = preload("res://Assets/themes/dark/top_menu_style.tres")
ruler_style = preload("res://Assets/themes/dark/ruler_style.tres")
main_theme = preload("res://assets/themes/dark/theme.tres")
top_menu_style = preload("res://assets/themes/dark/top_menu_style.tres")
ruler_style = preload("res://assets/themes/dark/ruler_style.tres")
elif ID == 1: # Gray Theme
Global.theme_type = "Dark"
VisualServer.set_default_clear_color(Color(0.301961, 0.301961, 0.301961))
main_theme = preload("res://Assets/themes/gray/theme.tres")
top_menu_style = preload("res://Assets/themes/gray/top_menu_style.tres")
ruler_style = preload("res://Assets/themes/dark/ruler_style.tres")
main_theme = preload("res://assets/themes/gray/theme.tres")
top_menu_style = preload("res://assets/themes/gray/top_menu_style.tres")
ruler_style = preload("res://assets/themes/dark/ruler_style.tres")
elif ID == 2: # Godot's Theme
Global.theme_type = "Dark"
VisualServer.set_default_clear_color(Color("3c465d"))
main_theme = preload("res://Assets/themes/godot/theme.tres")
top_menu_style = preload("res://Assets/themes/godot/top_menu_style.tres")
ruler_style = preload("res://Assets/themes/godot/ruler_style.tres")
main_theme = preload("res://assets/themes/godot/theme.tres")
top_menu_style = preload("res://assets/themes/godot/top_menu_style.tres")
ruler_style = preload("res://assets/themes/godot/ruler_style.tres")
elif ID == 3: # Gold Theme
Global.theme_type = "Gold"
VisualServer.set_default_clear_color(Color(0.694118, 0.619608, 0.458824))
main_theme = preload("res://Assets/themes/gold/theme.tres")
top_menu_style = preload("res://Assets/themes/gold/top_menu_style.tres")
ruler_style = preload("res://Assets/themes/gold/ruler_style.tres")
main_theme = preload("res://assets/themes/gold/theme.tres")
top_menu_style = preload("res://assets/themes/gold/top_menu_style.tres")
ruler_style = preload("res://assets/themes/gold/ruler_style.tres")
elif ID == 4: # Light Theme
Global.theme_type = "Light"
VisualServer.set_default_clear_color(Color(0.705882, 0.705882, 0.705882))
main_theme = preload("res://Assets/themes/light/theme.tres")
top_menu_style = preload("res://Assets/themes/light/top_menu_style.tres")
ruler_style = preload("res://Assets/themes/light/ruler_style.tres")
main_theme = preload("res://assets/themes/light/theme.tres")
top_menu_style = preload("res://assets/themes/light/top_menu_style.tres")
ruler_style = preload("res://assets/themes/light/ruler_style.tres")
Global.control.theme = main_theme
Global.control.theme.default_font = font
@ -360,16 +360,16 @@ func change_theme(ID : int) -> void:
var last_backslash = button.texture_normal.resource_path.get_base_dir().find_last("/")
var button_category = button.texture_normal.resource_path.get_base_dir().right(last_backslash + 1)
var normal_file_name = button.texture_normal.resource_path.get_file()
button.texture_normal = load("res://Assets/Graphics/%s_themes/%s/%s" % [Global.theme_type.to_lower(), button_category, normal_file_name])
button.texture_normal = load("res://assets/graphics/%s_themes/%s/%s" % [Global.theme_type.to_lower(), button_category, normal_file_name])
if button.texture_pressed:
var pressed_file_name = button.texture_pressed.resource_path.get_file()
button.texture_pressed = load("res://Assets/Graphics/%s_themes/%s/%s" % [Global.theme_type.to_lower(), button_category, pressed_file_name])
button.texture_pressed = load("res://assets/graphics/%s_themes/%s/%s" % [Global.theme_type.to_lower(), button_category, pressed_file_name])
if button.texture_hover:
var hover_file_name = button.texture_hover.resource_path.get_file()
button.texture_hover = load("res://Assets/Graphics/%s_themes/%s/%s" % [Global.theme_type.to_lower(), button_category, hover_file_name])
button.texture_hover = load("res://assets/graphics/%s_themes/%s/%s" % [Global.theme_type.to_lower(), button_category, hover_file_name])
if button.texture_disabled:
var disabled_file_name = button.texture_disabled.resource_path.get_file()
button.texture_disabled = load("res://Assets/Graphics/%s_themes/%s/%s" % [Global.theme_type.to_lower(), button_category, disabled_file_name])
button.texture_disabled = load("res://assets/graphics/%s_themes/%s/%s" % [Global.theme_type.to_lower(), button_category, disabled_file_name])
elif button is Button:
var theme_type := Global.theme_type
if theme_type == "Gold":
@ -385,7 +385,7 @@ func change_theme(ID : int) -> void:
var last_backslash = texture.texture.resource_path.get_base_dir().find_last("/")
var button_category = texture.texture.resource_path.get_base_dir().right(last_backslash + 1)
var normal_file_name = texture.texture.resource_path.get_file()
texture.texture = load("res://Assets/Graphics/%s_themes/%s/%s" % [theme_type.to_lower(), button_category, normal_file_name])
texture.texture = load("res://assets/graphics/%s_themes/%s/%s" % [theme_type.to_lower(), button_category, normal_file_name])
# Make sure the frame text gets updated
Global.current_frame = Global.current_frame

View file

@ -1,8 +1,10 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://src/UI/Dialogs/PreferencesDialog.gd" type="Script" id=1]
[ext_resource path="res://Assets/Fonts/Roboto-Regular.tres" type="DynamicFont" id=2]
[ext_resource path="res://Assets/Fonts/CJK/NotoSansCJKtc-Regular.tres" type="DynamicFont" id=3]
[ext_resource path="res://assets/fonts/Roboto-Regular.tres" type="DynamicFont" id=2]
[ext_resource path="res://assets/fonts/CJK/NotoSansCJKtc-Regular.tres" type="DynamicFont" id=3]
[node name="PreferencesDialog" type="AcceptDialog"]
margin_left = -3.0

View file

@ -16,15 +16,15 @@ func _on_SplashDialog_about_to_show() -> void:
art_by_label.text = tr("Art by") + ": Erevos"
if "zh" in TranslationServer.get_locale():
show_on_startup_button.add_font_override("font", preload("res://Assets/Fonts/CJK/NotoSansCJKtc-Small.tres"))
developed_by_label.add_font_override("font", preload("res://Assets/Fonts/CJK/NotoSansCJKtc-Small.tres"))
platinum_placeholder_label.add_font_override("font", preload("res://Assets/Fonts/CJK/NotoSansCJKtc-Regular.tres"))
gold_placeholder_label.add_font_override("font", preload("res://Assets/Fonts/CJK/NotoSansCJKtc-Regular.tres"))
show_on_startup_button.add_font_override("font", preload("res://assets/fonts/CJK/NotoSansCJKtc-Small.tres"))
developed_by_label.add_font_override("font", preload("res://assets/fonts/CJK/NotoSansCJKtc-Small.tres"))
platinum_placeholder_label.add_font_override("font", preload("res://assets/fonts/CJK/NotoSansCJKtc-Regular.tres"))
gold_placeholder_label.add_font_override("font", preload("res://assets/fonts/CJK/NotoSansCJKtc-Regular.tres"))
else:
show_on_startup_button.add_font_override("font", preload("res://Assets/Fonts/Roboto-Small.tres"))
developed_by_label.add_font_override("font", preload("res://Assets/Fonts/Roboto-Small.tres"))
platinum_placeholder_label.add_font_override("font", preload("res://Assets/Fonts/Roboto-Bold.tres"))
gold_placeholder_label.add_font_override("font", preload("res://Assets/Fonts/Roboto-Bold.tres"))
show_on_startup_button.add_font_override("font", preload("res://assets/fonts/Roboto-Small.tres"))
developed_by_label.add_font_override("font", preload("res://assets/fonts/Roboto-Small.tres"))
platinum_placeholder_label.add_font_override("font", preload("res://assets/fonts/Roboto-Bold.tres"))
gold_placeholder_label.add_font_override("font", preload("res://assets/fonts/Roboto-Bold.tres"))
func _on_ArtCredits_pressed() -> void:

View file

@ -1,16 +1,19 @@
[gd_scene load_steps=12 format=2]
[ext_resource path="res://src/UI/Dialogs/SplashDialog.gd" type="Script" id=1]
[ext_resource path="res://Assets/Graphics/splash_screen/pixelorama_logo.png" type="Texture" id=2]
[ext_resource path="res://Assets/Graphics/splash_screen/become_a_patron.png" type="Texture" id=3]
[ext_resource path="res://Assets/Graphics/splash_screen/become_a_patron_hover.png" type="Texture" id=4]
[ext_resource path="res://Assets/Graphics/splash_screen/splash_art.png" type="Texture" id=5]
[ext_resource path="res://Assets/Fonts/Roboto-Bold.tres" type="DynamicFont" id=6]
[ext_resource path="res://Assets/Fonts/Roboto-Small.tres" type="DynamicFont" id=7]
[ext_resource path="res://Assets/Graphics/splash_screen/orama_64x64.png" type="Texture" id=8]
[ext_resource path="res://Assets/Graphics/splash_screen/discord.png" type="Texture" id=9]
[ext_resource path="res://Assets/Graphics/splash_screen/github_32px.png" type="Texture" id=10]
[ext_resource path="res://Assets/Graphics/splash_screen/patreon_mark_white.png" type="Texture" id=11]
[ext_resource path="res://assets/graphics/splash_screen/pixelorama_logo.png" type="Texture" id=2]
[ext_resource path="res://assets/graphics/splash_screen/become_a_patron.png" type="Texture" id=3]
[ext_resource path="res://assets/graphics/splash_screen/become_a_patron_hover.png" type="Texture" id=4]
[ext_resource path="res://assets/graphics/splash_screen/splash_art.png" type="Texture" id=5]
[ext_resource path="res://assets/fonts/Roboto-Bold.tres" type="DynamicFont" id=6]
[ext_resource path="res://assets/fonts/Roboto-Small.tres" type="DynamicFont" id=7]
[ext_resource path="res://assets/graphics/splash_screen/orama_64x64.png" type="Texture" id=8]
[ext_resource path="res://assets/graphics/splash_screen/discord.png" type="Texture" id=9]
[ext_resource path="res://assets/graphics/splash_screen/github_32px.png" type="Texture" id=10]
[ext_resource path="res://assets/graphics/splash_screen/patreon_mark_white.png" type="Texture" id=11]
[node name="SplashDialog" type="WindowDialog"]
margin_right = 614.0

View file

@ -1,10 +1,13 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://Assets/Graphics/Brush_button.png" type="Texture" id=1]
[ext_resource path="res://assets/graphics/brush_button.png" type="Texture" id=1]
[ext_resource path="res://src/UI/PatternButton.gd" type="Script" id=2]
[node name="PatternButton" type="TextureButton"]
margin_right = 32.0
margin_bottom = 32.0

View file

@ -3,7 +3,7 @@ extends Line2D
enum Types {HORIZONTAL, VERTICAL}
var font := preload("res://Assets/Fonts/Roboto-Regular.tres")
var font := preload("res://assets/fonts/Roboto-Regular.tres")
var has_focus := true
var mouse_pos := Vector2.ZERO
var previous_points := points

View file

@ -2,7 +2,7 @@ extends Button
const RULER_WIDTH := 16
var font := preload("res://Assets/Fonts/Roboto-Small.tres")
var font := preload("res://assets/fonts/Roboto-Small.tres")
var major_subdivision := 2
var minor_subdivision := 4

View file

@ -2,7 +2,7 @@ extends Button
const RULER_WIDTH := 16
var font := preload("res://Assets/Fonts/Roboto-Small.tres")
var font := preload("res://assets/fonts/Roboto-Small.tres")
var major_subdivision := 2
var minor_subdivision := 4

View file

@ -181,9 +181,9 @@ func _on_OnionSkinning_pressed() -> void:
theme_type = "Dark"
var texture_button : TextureRect = Global.onion_skinning_button.get_child(0)
if Global.onion_skinning:
texture_button.texture = load("res://Assets/Graphics/%s_themes/timeline/onion_skinning.png" % theme_type.to_lower())
texture_button.texture = load("res://assets/graphics/%s_themes/timeline/onion_skinning.png" % theme_type.to_lower())
else:
texture_button.texture = load("res://Assets/Graphics/%s_themes/timeline/onion_skinning_off.png" % theme_type.to_lower())
texture_button.texture = load("res://assets/graphics/%s_themes/timeline/onion_skinning_off.png" % theme_type.to_lower())
func _on_OnionSkinningSettings_pressed() -> void:
@ -198,15 +198,15 @@ func _on_LoopAnim_pressed() -> void:
match animation_loop:
0: # Make it loop
animation_loop = 1
texture_button.texture = load("res://Assets/Graphics/%s_themes/timeline/loop.png" % theme_type.to_lower())
texture_button.texture = load("res://assets/graphics/%s_themes/timeline/loop.png" % theme_type.to_lower())
Global.loop_animation_button.hint_tooltip = "Cycle loop"
1: # Make it ping-pong
animation_loop = 2
texture_button.texture = load("res://Assets/Graphics/%s_themes/timeline/loop_pingpong.png" % theme_type.to_lower())
texture_button.texture = load("res://assets/graphics/%s_themes/timeline/loop_pingpong.png" % theme_type.to_lower())
Global.loop_animation_button.hint_tooltip = "Ping-pong loop"
2: # Make it stop
animation_loop = 0
texture_button.texture = load("res://Assets/Graphics/%s_themes/timeline/loop_none.png" % theme_type.to_lower())
texture_button.texture = load("res://assets/graphics/%s_themes/timeline/loop_none.png" % theme_type.to_lower())
Global.loop_animation_button.hint_tooltip = "No loop"
@ -215,9 +215,9 @@ func _on_PlayForward_toggled(button_pressed : bool) -> void:
if theme_type == "Gold":
theme_type = "Dark"
if button_pressed:
Global.play_forward.get_child(0).texture = load("res://Assets/Graphics/%s_themes/timeline/pause.png" % theme_type.to_lower())
Global.play_forward.get_child(0).texture = load("res://assets/graphics/%s_themes/timeline/pause.png" % theme_type.to_lower())
else:
Global.play_forward.get_child(0).texture = load("res://Assets/Graphics/%s_themes/timeline/play.png" % theme_type.to_lower())
Global.play_forward.get_child(0).texture = load("res://assets/graphics/%s_themes/timeline/play.png" % theme_type.to_lower())
play_animation(button_pressed, true)
@ -227,9 +227,9 @@ func _on_PlayBackwards_toggled(button_pressed : bool) -> void:
if theme_type == "Gold":
theme_type = "Dark"
if button_pressed:
Global.play_backwards.get_child(0).texture = load("res://Assets/Graphics/%s_themes/timeline/pause.png" % theme_type.to_lower())
Global.play_backwards.get_child(0).texture = load("res://assets/graphics/%s_themes/timeline/pause.png" % theme_type.to_lower())
else:
Global.play_backwards.get_child(0).texture = load("res://Assets/Graphics/%s_themes/timeline/play_backwards.png" % theme_type.to_lower())
Global.play_backwards.get_child(0).texture = load("res://assets/graphics/%s_themes/timeline/play_backwards.png" % theme_type.to_lower())
play_animation(button_pressed, false)
@ -274,12 +274,12 @@ func play_animation(play : bool, forward_dir : bool) -> void:
if forward_dir:
Global.play_backwards.disconnect("toggled", self, "_on_PlayBackwards_toggled")
Global.play_backwards.pressed = false
Global.play_backwards.get_child(0).texture = load("res://Assets/Graphics/%s_themes/timeline/play_backwards.png" % theme_type.to_lower())
Global.play_backwards.get_child(0).texture = load("res://assets/graphics/%s_themes/timeline/play_backwards.png" % theme_type.to_lower())
Global.play_backwards.connect("toggled", self, "_on_PlayBackwards_toggled")
else:
Global.play_forward.disconnect("toggled", self, "_on_PlayForward_toggled")
Global.play_forward.pressed = false
Global.play_forward.get_child(0).texture = load("res://Assets/Graphics/%s_themes/timeline/play.png" % theme_type.to_lower())
Global.play_forward.get_child(0).texture = load("res://assets/graphics/%s_themes/timeline/play.png" % theme_type.to_lower())
Global.play_forward.connect("toggled", self, "_on_PlayForward_toggled")
if Global.canvases.size() == 1:
if forward_dir:

View file

@ -1,28 +1,30 @@
[gd_scene load_steps=41 format=2]
[ext_resource path="res://src/UI/Timeline/AnimationTimeline.gd" type="Script" id=1]
[ext_resource path="res://Assets/Graphics/dark_themes/layers/new_layer.png" type="Texture" id=2]
[ext_resource path="res://Assets/Graphics/dark_themes/layers/delete_layer_disabled.png" type="Texture" id=3]
[ext_resource path="res://Assets/Graphics/dark_themes/layers/move_up_disabled.png" type="Texture" id=4]
[ext_resource path="res://Assets/Graphics/dark_themes/layers/move_down_disabled.png" type="Texture" id=5]
[ext_resource path="res://Assets/Graphics/dark_themes/layers/merge_down_disabled.png" type="Texture" id=6]
[ext_resource path="res://Assets/Graphics/dark_themes/layers/clone_layer.png" type="Texture" id=7]
[ext_resource path="res://assets/graphics/dark_themes/layers/new_layer.png" type="Texture" id=2]
[ext_resource path="res://assets/graphics/dark_themes/layers/delete_layer_disabled.png" type="Texture" id=3]
[ext_resource path="res://assets/graphics/dark_themes/layers/move_up_disabled.png" type="Texture" id=4]
[ext_resource path="res://assets/graphics/dark_themes/layers/move_down_disabled.png" type="Texture" id=5]
[ext_resource path="res://assets/graphics/dark_themes/layers/merge_down_disabled.png" type="Texture" id=6]
[ext_resource path="res://assets/graphics/dark_themes/layers/clone_layer.png" type="Texture" id=7]
[ext_resource path="res://src/UI/Timeline/LayerButton.tscn" type="PackedScene" id=18]
[ext_resource path="res://Assets/Graphics/dark_themes/timeline/new_frame.png" type="Texture" id=19]
[ext_resource path="res://Assets/Graphics/dark_themes/timeline/remove_frame.png" type="Texture" id=20]
[ext_resource path="res://Assets/Graphics/dark_themes/timeline/go_to_first_frame.png" type="Texture" id=21]
[ext_resource path="res://Assets/Graphics/dark_themes/timeline/play.png" type="Texture" id=22]
[ext_resource path="res://Assets/Graphics/dark_themes/timeline/previous_frame.png" type="Texture" id=23]
[ext_resource path="res://Assets/Graphics/dark_themes/timeline/play_backwards.png" type="Texture" id=24]
[ext_resource path="res://Assets/Graphics/dark_themes/timeline/go_to_last_frame.png" type="Texture" id=25]
[ext_resource path="res://Assets/Graphics/dark_themes/timeline/next_frame.png" type="Texture" id=26]
[ext_resource path="res://Assets/Graphics/dark_themes/timeline/copy_frame.png" type="Texture" id=27]
[ext_resource path="res://Assets/Graphics/dark_themes/timeline/tag.png" type="Texture" id=28]
[ext_resource path="res://Assets/Graphics/dark_themes/timeline/onion_skinning_off.png" type="Texture" id=29]
[ext_resource path="res://Assets/Graphics/dark_themes/timeline/expandable.png" type="Texture" id=30]
[ext_resource path="res://Assets/Graphics/dark_themes/timeline/loop.png" type="Texture" id=31]
[ext_resource path="res://assets/graphics/dark_themes/timeline/new_frame.png" type="Texture" id=19]
[ext_resource path="res://assets/graphics/dark_themes/timeline/remove_frame.png" type="Texture" id=20]
[ext_resource path="res://assets/graphics/dark_themes/timeline/go_to_first_frame.png" type="Texture" id=21]
[ext_resource path="res://assets/graphics/dark_themes/timeline/play.png" type="Texture" id=22]
[ext_resource path="res://assets/graphics/dark_themes/timeline/previous_frame.png" type="Texture" id=23]
[ext_resource path="res://assets/graphics/dark_themes/timeline/play_backwards.png" type="Texture" id=24]
[ext_resource path="res://assets/graphics/dark_themes/timeline/go_to_last_frame.png" type="Texture" id=25]
[ext_resource path="res://assets/graphics/dark_themes/timeline/next_frame.png" type="Texture" id=26]
[ext_resource path="res://assets/graphics/dark_themes/timeline/copy_frame.png" type="Texture" id=27]
[ext_resource path="res://assets/graphics/dark_themes/timeline/tag.png" type="Texture" id=28]
[ext_resource path="res://assets/graphics/dark_themes/timeline/onion_skinning_off.png" type="Texture" id=29]
[ext_resource path="res://assets/graphics/dark_themes/timeline/expandable.png" type="Texture" id=30]
[ext_resource path="res://assets/graphics/dark_themes/timeline/loop.png" type="Texture" id=31]
[ext_resource path="res://src/UI/Dialogs/FrameTagDialog.tscn" type="PackedScene" id=42]
[sub_resource type="InputEventKey" id=1]
control = true
command = true

View file

@ -20,23 +20,23 @@ func _ready() -> void:
theme_type = "Dark"
if Global.layers[i][1]:
visibility_button.get_child(0).texture = load("res://Assets/Graphics/%s_themes/layers/layer_visible.png" % theme_type.to_lower())
visibility_button.get_child(0).texture = load("res://assets/graphics/%s_themes/layers/layer_visible.png" % theme_type.to_lower())
visibility_button.get_child(0).rect_size = Vector2(24, 14)
visibility_button.get_child(0).rect_position = Vector2(4, 9)
else:
visibility_button.get_child(0).texture = load("res://Assets/Graphics/%s_themes/layers/layer_invisible.png" % theme_type.to_lower())
visibility_button.get_child(0).texture = load("res://assets/graphics/%s_themes/layers/layer_invisible.png" % theme_type.to_lower())
visibility_button.get_child(0).rect_size = Vector2(24, 8)
visibility_button.get_child(0).rect_position = Vector2(4, 12)
if Global.layers[i][2]:
lock_button.get_child(0).texture = load("res://Assets/Graphics/%s_themes/layers/lock.png" % theme_type.to_lower())
lock_button.get_child(0).texture = load("res://assets/graphics/%s_themes/layers/lock.png" % theme_type.to_lower())
else:
lock_button.get_child(0).texture = load("res://Assets/Graphics/%s_themes/layers/unlock.png" % theme_type.to_lower())
lock_button.get_child(0).texture = load("res://assets/graphics/%s_themes/layers/unlock.png" % theme_type.to_lower())
if Global.layers[i][4]: # If new layers will be linked
linked_button.get_child(0).texture = load("res://Assets/Graphics/%s_themes/layers/linked_layer.png" % theme_type.to_lower())
linked_button.get_child(0).texture = load("res://assets/graphics/%s_themes/layers/linked_layer.png" % theme_type.to_lower())
else:
linked_button.get_child(0).texture = load("res://Assets/Graphics/%s_themes/layers/unlinked_layer.png" % theme_type.to_lower())
linked_button.get_child(0).texture = load("res://assets/graphics/%s_themes/layers/unlinked_layer.png" % theme_type.to_lower())
func _input(event : InputEvent) -> void:

View file

@ -1,9 +1,11 @@
[gd_scene load_steps=5 format=2]
[ext_resource path="res://src/UI/Timeline/LayerButton.gd" type="Script" id=1]
[ext_resource path="res://Assets/Graphics/dark_themes/layers/layer_visible.png" type="Texture" id=2]
[ext_resource path="res://Assets/Graphics/dark_themes/layers/unlock.png" type="Texture" id=3]
[ext_resource path="res://Assets/Graphics/dark_themes/layers/unlinked_layer.png" type="Texture" id=4]
[ext_resource path="res://assets/graphics/dark_themes/layers/layer_visible.png" type="Texture" id=2]
[ext_resource path="res://assets/graphics/dark_themes/layers/unlock.png" type="Texture" id=3]
[ext_resource path="res://assets/graphics/dark_themes/layers/unlinked_layer.png" type="Texture" id=4]
[node name="LayerContainer" type="Button"]
margin_right = 210.0