tonytins/CozyPixelStudio
1
0
Fork 0
mirror of https://github.com/tonytins/CozyPixelStudio.git synced 2025-06-26 13:34:42 -04:00
Code Issues Projects Releases Wiki Activity

Asset renaming (#225)

Browse source 
* 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
Download patch file Download diff file Expand all files Collapse all files

11
src/UI/Dialogs/AboutDialog.tscn
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

4
src/UI/Dialogs/FrameTagDialog.tscn
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

44
src/UI/Dialogs/PreferencesDialog.gd
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

6
src/UI/Dialogs/PreferencesDialog.tscn
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

16
src/UI/Dialogs/SplashDialog.gd
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:

23
src/UI/Dialogs/SplashDialog.tscn
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