birdulon/ChocolateBird
birdulon
/
ChocolateBird
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve ROM selection menu 

Add greyed out buttons for deeper paths you just came up from
Fix edge cases with root path
Make .bin files show as a binary icon until identified as a valid CD image, then cache the filename for future visits in this session
This commit is contained in:
Luke Hubmayer-Werner 2023-08-02 13:33:37 +09:30
parent 5acc618852
commit c1d8b5d3fd
4 changed files with 219 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
theme/ThemeElements.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 816 B

After

Width:  |  Height:  |  Size: 775 B

7
theme/icon_binary.tres Normal file
View File

@ -0,0 +1,7 @@
[gd_resource type="AtlasTexture" load_steps=2 format=2]
[ext_resource path="res://theme/ThemeElements.png" type="Texture" id=1]
[resource]
atlas = ExtResource( 1 )
region = Rect2( 54, 36, 9, 9 )

122
widgets/RomSelect.gd
View File

@ -1,13 +1,24 @@
extends PanelContainer extends PanelContainer
#warning-ignore-all:return_value_discarded
const folder_icon := preload('res://theme/icon_folder.tres') const FOLDER_ICON := preload('res://theme/icon_folder.tres')
const allowed_exts := PoolStringArray(['bin', 'iso', 'sfc', 'srm', 'gba']) const ALLOWED_EXTS := PoolStringArray(['bin', 'iso', 'sfc', 'srm', 'gba'])
var ext_icons := { const CD_EXTS := PoolStringArray(['bin', 'iso']) # If you have a weird disc image format, you can mount it yourself, leave me out of it
'bin': preload('res://theme/icon_disc.tres'), var EXT_ICONS := { # Dicts can't be const
'bin': preload('res://theme/icon_binary.tres'),
'iso': preload('res://theme/icon_disc.tres'), 'iso': preload('res://theme/icon_disc.tres'),
'sfc': preload('res://theme/icon_cart.tres'), 'sfc': preload('res://theme/icon_cart.tres'),
'gba': preload('res://theme/icon_cart.tres'), 'gba': preload('res://theme/icon_cart.tres'),
} }
var TYPE_DESCS := { # Dicts can't be const
'bin': 'Binary',
'iso': 'CD-ROM Image',
'sfc': 'SNES ROM',
'gba': 'GBA ROM',
'srm': 'SNES Savefile'
}
var cached_cd_bin_paths := {}
var dir := Directory.new() var dir := Directory.new()
var home_path := '' var home_path := ''
onready var itemlist: ItemList = $VBoxContainer/HBoxContainer/PanelContainer/ItemList onready var itemlist: ItemList = $VBoxContainer/HBoxContainer/PanelContainer/ItemList
@ -15,7 +26,17 @@ onready var vscroller: VScrollBar = itemlist.get_child(0)
onready var folder_buttons_scroller: ScrollContainer = $VBoxContainer/ScrollContainer onready var folder_buttons_scroller: ScrollContainer = $VBoxContainer/ScrollContainer
onready var folder_buttons: HBoxContainer = $VBoxContainer/ScrollContainer/folder_buttons onready var folder_buttons: HBoxContainer = $VBoxContainer/ScrollContainer/folder_buttons
onready var btn_ok: Button = $VBoxContainer/HBoxContainer/VBoxContainer/btn_ok onready var btn_ok: Button = $VBoxContainer/HBoxContainer/VBoxContainer/btn_ok
onready var file_info: Label = $VBoxContainer/HBoxContainer/VBoxContainer/file_info onready var lbl_filename_header: Label = $VBoxContainer/HBoxContainer/VBoxContainer/lbl_filename
onready var lbl_filename_content: Label = $VBoxContainer/HBoxContainer/VBoxContainer/mc/filename
onready var lbl_filetype_header: Label = $VBoxContainer/HBoxContainer/VBoxContainer/lbl_type
onready var lbl_filetype_content: Label = $VBoxContainer/HBoxContainer/VBoxContainer/mc2/filetype
onready var lbl_filesize_header: Label = $VBoxContainer/HBoxContainer/VBoxContainer/lbl_size
onready var lbl_filesize_content: Label = $VBoxContainer/HBoxContainer/VBoxContainer/mc3/filesize
onready var lbl_fileinfo_header: Label = $VBoxContainer/HBoxContainer/VBoxContainer/lbl_info
onready var lbl_fileinfo_content: Label = $VBoxContainer/HBoxContainer/VBoxContainer/mc4/fileinfo
const inactive_modulate_color := Color(0.5, 0.5, 0.5)
const active_modulate_color := Color.white
var last_dir := ''
static func get_human_size(n: int) -> String: static func get_human_size(n: int) -> String:
if n > 0x100000000: if n > 0x100000000:
@ -26,6 +47,13 @@ static func get_human_size(n: int) -> String:
return '%.1f KiB' % (n/float(0x400)) return '%.1f KiB' % (n/float(0x400))
return '%d B' % n return '%d B' % n
static func tokenize_path(path: String) -> PoolStringArray:
return path.rstrip('/').split('/', true) # Allow empty means '/' will return ['']
static func join_path(tokens) -> String:
var path = '/'.join(tokens)
return path if path else '/'
func update_view(): func update_view():
var error = dir.list_dir_begin(true, true) var error = dir.list_dir_begin(true, true)
if error != OK: if error != OK:
@ -35,44 +63,59 @@ func update_view():
for child in folder_buttons.get_children(): for child in folder_buttons.get_children():
child.queue_free() child.queue_free()
var path = ProjectSettings.globalize_path(dir.get_current_dir()) var path = ProjectSettings.globalize_path(dir.get_current_dir())
var cur_path: Array = path.split('/') var cur_path: Array = tokenize_path(path)
var l := len(cur_path) var l := len(cur_path)
for i in l: for i in l:
var subpath = '/'.join(cur_path.slice(0, i))
var btn := Button.new() var btn := Button.new()
btn.connect('pressed', self, 'activate_entry', [subpath]) btn.connect('pressed', self, 'activate_entry', [join_path(cur_path.slice(0, i))])
btn.text = cur_path[i] btn.text = cur_path[i]
folder_buttons.add_child(btn) folder_buttons.add_child(btn)
if i == 0: if i == 0:
btn.text += '/' btn.text += '/'
if i == l-1: if i == l-1:
btn.icon = folder_icon btn.icon = FOLDER_ICON
folder_buttons_scroller.set_h_scroll(9999) if last_dir.begins_with(path): # i.e. we jumped up a level or more
folder_buttons_scroller.ensure_control_visible(folder_buttons_scroller.get_h_scrollbar()) var last_path: Array = tokenize_path(last_dir)
folder_buttons_scroller.get_h_scrollbar().update() var l2 := len(last_path)
for i in range(l, l2):
var btn := Button.new()
btn.connect('pressed', self, 'activate_entry', [join_path(last_path.slice(0, i))])
btn.text = last_path[i]
btn.modulate = inactive_modulate_color
folder_buttons.add_child(btn)
# Doesn't work thanks to frame delay
# folder_buttons_scroller.set_h_scroll(9999)
# folder_buttons_scroller.ensure_control_visible(folder_buttons_scroller.get_h_scrollbar())
# folder_buttons_scroller.get_h_scrollbar().update()
itemlist.clear() itemlist.clear()
var directories := PoolStringArray() var directories := PoolStringArray()
var current_dir := dir.get_current_dir()
var files := [] var files := []
while true: while true:
var entry := dir.get_next() var entry := dir.get_next()
if len(entry) == 0: if len(entry) == 0:
break break
if dir.current_is_dir(): var filename := current_dir + '/' + entry
if filename in cached_cd_bin_paths:
files.append([entry, EXT_ICONS.iso])
elif dir.current_is_dir():
directories.append(entry) directories.append(entry)
elif '.' in entry: elif '.' in entry:
var extension = entry.rsplit('.', true, 1)[1] var extension = entry.rsplit('.', true, 1)[1]
if extension in allowed_exts: if extension in ALLOWED_EXTS:
files.append([entry, ext_icons.get(extension)]) files.append([entry, EXT_ICONS.get(extension)])
directories.sort() directories.sort()
files.sort() files.sort()
for entry in directories: for entry in directories:
itemlist.add_item(entry, folder_icon) itemlist.add_item(entry, FOLDER_ICON)
for entry in files: for entry in files:
itemlist.add_item(entry[0], entry[1]) itemlist.add_item(entry[0], entry[1])
# itemlist.sort_items_by_text()
func activate_entry(entry: String): func activate_entry(entry: String, _index: int = -1):
var curr_dir := dir.get_current_dir()
if not self.last_dir.begins_with(curr_dir):
self.last_dir = curr_dir
if dir.dir_exists(entry): if dir.dir_exists(entry):
var error := dir.change_dir(entry) var error := dir.change_dir(entry)
if error == OK: if error == OK:
@ -82,21 +125,26 @@ func activate_entry(entry: String):
elif dir.file_exists(entry): elif dir.file_exists(entry):
pass # Load the file pass # Load the file
func view_entry(entry: String): func view_entry(entry: String, index: int = -1):
init_labels()
lbl_filename_header.modulate = active_modulate_color
lbl_filename_content.text = entry
lbl_filetype_header.modulate = active_modulate_color
if dir.dir_exists(entry): if dir.dir_exists(entry):
file_info.text = 'Filename:\n %s/\nType: Folder' % entry lbl_filetype_content.text = 'Folder'
elif dir.file_exists(entry): elif dir.file_exists(entry):
var file := File.new() var file := File.new()
var error := file.open(dir.get_current_dir() + '/' + entry, File.READ) var filename := dir.get_current_dir() + '/' + entry
var error := file.open(filename, File.READ)
if error != OK: if error != OK:
print_debug(error) print_debug(error)
return return
var size = file.get_len() var size = file.get_len()
var human_size = get_human_size(size) var human_size = get_human_size(size)
var ext = entry.rsplit('.', true, 1)[1].to_lower() var ext = entry.rsplit('.', true, 1)[1].to_lower()
var type = {'iso': 'CD-ROM Image', 'bin': 'Binary', 'sfc': 'SNES ROM', 'gba': 'GBA ROM', 'srm': 'SNES Savefile'}.get(ext, 'Unknown') var type = TYPE_DESCS.get(ext, 'Unknown')
var prodcode := '' var prodcode := ''
if ext in ['iso', 'bin']: if ext in CD_EXTS:
var cd := RomLoader.loader_cd_image.new(file) var cd := RomLoader.loader_cd_image.new(file)
for key in cd.directory: for key in cd.directory:
var s = key.trim_prefix('./') var s = key.trim_prefix('./')
@ -104,11 +152,29 @@ func view_entry(entry: String):
if re_match: if re_match:
prodcode = '%s\n %s\n %s' % [cd.pvd.system_identifier.strip_edges(), cd.pvd.volume_identifier.strip_edges(), re_match.get_string(1)] prodcode = '%s\n %s\n %s' % [cd.pvd.system_identifier.strip_edges(), cd.pvd.volume_identifier.strip_edges(), re_match.get_string(1)]
type = 'PSX CD-ROM Image' type = 'PSX CD-ROM Image'
cached_cd_bin_paths[filename] = prodcode
if index >= 0:
itemlist.set_item_icon(index, EXT_ICONS.iso)
break break
var info = ('Info:\n %s' % prodcode) if prodcode else '' var info = ('Info:\n %s' % prodcode) if prodcode else ''
file_info.text = 'Filename:\n %s\nType:\n %s\nSize:\n %s\n%s' % [entry, type, human_size, info] lbl_filetype_content.text = type
lbl_filesize_header.modulate = active_modulate_color
lbl_filesize_content.text = human_size
lbl_fileinfo_header.modulate = active_modulate_color if prodcode else inactive_modulate_color
lbl_fileinfo_content.text = prodcode
func init_labels():
lbl_filename_header.modulate = inactive_modulate_color
lbl_filename_content.text = ''
lbl_filetype_header.modulate = inactive_modulate_color
lbl_filetype_content.text = ''
lbl_filesize_header.modulate = inactive_modulate_color
lbl_filesize_content.text = ''
lbl_fileinfo_header.modulate = inactive_modulate_color
lbl_fileinfo_content.text = ''
func _ready() -> void: func _ready() -> void:
init_labels()
if OS.has_feature('windows'): if OS.has_feature('windows'):
home_path = OS.get_environment('USERPROFILE') home_path = OS.get_environment('USERPROFILE')
else: else:
@ -120,14 +186,10 @@ func _ready() -> void:
print(ProjectSettings.globalize_path('user://')) print(ProjectSettings.globalize_path('user://'))
print(ProjectSettings.globalize_path(dir.get_current_dir())) print(ProjectSettings.globalize_path(dir.get_current_dir()))
#func _process(_delta):
#vscroller.set_margin(MARGIN_TOP, 4)
#vscroller.set_margin(MARGIN_BOTTOM, -4)
func _on_ItemList_item_activated(index: int) -> void: func _on_ItemList_item_activated(index: int) -> void:
activate_entry(itemlist.get_item_text(index)) activate_entry(itemlist.get_item_text(index), index)
func _on_ItemList_item_selected(index: int) -> void: func _on_ItemList_item_selected(index: int) -> void:
view_entry(itemlist.get_item_text(index)) view_entry(itemlist.get_item_text(index), index)

150
widgets/RomSelect.tscn
View File

@ -4,26 +4,27 @@
[ext_resource path="res://widgets/RomSelect.gd" type="Script" id=2] [ext_resource path="res://widgets/RomSelect.gd" type="Script" id=2]
[node name="RomSelect" type="PanelContainer"] [node name="RomSelect" type="PanelContainer"]
margin_right = 8.0 margin_right = 480.0
margin_bottom = 8.0 margin_bottom = 360.0
rect_min_size = Vector2( 360, 360 )
theme = ExtResource( 1 ) theme = ExtResource( 1 )
script = ExtResource( 2 ) script = ExtResource( 2 )
[node name="VBoxContainer" type="VBoxContainer" parent="."] [node name="VBoxContainer" type="VBoxContainer" parent="."]
margin_left = 4.0 margin_left = 4.0
margin_top = 4.0 margin_top = 4.0
margin_right = 352.0 margin_right = 476.0
margin_bottom = 225.0 margin_bottom = 356.0
custom_constants/separation = 4 custom_constants/separation = 4
[node name="Label" type="Label" parent="VBoxContainer"] [node name="Label" type="Label" parent="VBoxContainer"]
margin_right = 348.0 margin_right = 472.0
margin_bottom = 14.0 margin_bottom = 14.0
text = "Select a ROM from your device's storage" text = "Select a ROM from your device's storage"
[node name="ScrollContainer" type="ScrollContainer" parent="VBoxContainer"] [node name="ScrollContainer" type="ScrollContainer" parent="VBoxContainer"]
margin_top = 18.0 margin_top = 18.0
margin_right = 348.0 margin_right = 472.0
margin_bottom = 49.0 margin_bottom = 49.0
rect_min_size = Vector2( 0, 31 ) rect_min_size = Vector2( 0, 31 )
scroll_vertical_enabled = false scroll_vertical_enabled = false
@ -33,46 +34,135 @@ custom_constants/separation = 4
[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"] [node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]
margin_top = 53.0 margin_top = 53.0
margin_right = 348.0 margin_right = 472.0
margin_bottom = 221.0 margin_bottom = 352.0
size_flags_vertical = 3
[node name="PanelContainer" type="PanelContainer" parent="VBoxContainer/HBoxContainer"] [node name="PanelContainer" type="PanelContainer" parent="VBoxContainer/HBoxContainer"]
margin_right = 200.0 margin_right = 278.0
margin_bottom = 168.0 margin_bottom = 299.0
rect_min_size = Vector2( 200, 0 ) rect_min_size = Vector2( 200, 0 )
size_flags_horizontal = 3
size_flags_stretch_ratio = 1.5
[node name="ItemList" type="ItemList" parent="VBoxContainer/HBoxContainer/PanelContainer"] [node name="ItemList" type="ItemList" parent="VBoxContainer/HBoxContainer/PanelContainer"]
margin_left = 4.0 margin_left = 4.0
margin_top = 4.0 margin_top = 4.0
margin_right = 196.0 margin_right = 274.0
margin_bottom = 164.0 margin_bottom = 295.0
rect_min_size = Vector2( 120, 160 ) rect_min_size = Vector2( 120, 160 )
[node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer/HBoxContainer"] [node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer/HBoxContainer"]
margin_left = 208.0 margin_left = 286.0
margin_right = 348.0 margin_right = 472.0
margin_bottom = 168.0 margin_bottom = 299.0
size_flags_horizontal = 3
[node name="file_info" type="Label" parent="VBoxContainer/HBoxContainer/VBoxContainer"] [node name="lbl_filename" type="Label" parent="VBoxContainer/HBoxContainer/VBoxContainer"]
margin_right = 140.0 margin_right = 186.0
margin_bottom = 138.0 margin_bottom = 14.0
rect_min_size = Vector2( 140, 0 )
size_flags_vertical = 1
text = "Filename:"
[node name="mc" type="MarginContainer" parent="VBoxContainer/HBoxContainer/VBoxContainer"]
margin_top = 22.0
margin_right = 186.0
margin_bottom = 36.0
custom_constants/margin_top = 0
custom_constants/margin_left = 24
custom_constants/margin_bottom = 0
[node name="filename" type="Label" parent="VBoxContainer/HBoxContainer/VBoxContainer/mc"]
margin_left = 24.0
margin_right = 186.0
margin_bottom = 14.0
rect_min_size = Vector2( 140, 0 ) rect_min_size = Vector2( 140, 0 )
size_flags_vertical = 3 size_flags_vertical = 3
text = "Filename: text = "Test"
myfile.iso autowrap = true
Size:
400 KiB
Type:
CD-ROM image
PLAYSTATION [node name="lbl_type" type="Label" parent="VBoxContainer/HBoxContainer/VBoxContainer"]
SCEA_000.00" margin_top = 44.0
margin_right = 186.0
margin_bottom = 58.0
rect_min_size = Vector2( 140, 0 )
size_flags_vertical = 1
text = "Type:"
[node name="mc2" type="MarginContainer" parent="VBoxContainer/HBoxContainer/VBoxContainer"]
margin_top = 66.0
margin_right = 186.0
margin_bottom = 80.0
custom_constants/margin_top = 0
custom_constants/margin_left = 24
custom_constants/margin_bottom = 0
[node name="filetype" type="Label" parent="VBoxContainer/HBoxContainer/VBoxContainer/mc2"]
margin_left = 24.0
margin_right = 186.0
margin_bottom = 14.0
rect_min_size = Vector2( 140, 0 )
size_flags_vertical = 1
text = "Test"
autowrap = true
[node name="lbl_size" type="Label" parent="VBoxContainer/HBoxContainer/VBoxContainer"]
margin_top = 88.0
margin_right = 186.0
margin_bottom = 102.0
rect_min_size = Vector2( 140, 0 )
size_flags_vertical = 1
text = "Size:"
[node name="mc3" type="MarginContainer" parent="VBoxContainer/HBoxContainer/VBoxContainer"]
margin_top = 110.0
margin_right = 186.0
margin_bottom = 124.0
custom_constants/margin_top = 0
custom_constants/margin_left = 24
custom_constants/margin_bottom = 0
[node name="filesize" type="Label" parent="VBoxContainer/HBoxContainer/VBoxContainer/mc3"]
margin_left = 24.0
margin_right = 186.0
margin_bottom = 14.0
rect_min_size = Vector2( 140, 0 )
size_flags_vertical = 1
text = "Test"
autowrap = true
[node name="lbl_info" type="Label" parent="VBoxContainer/HBoxContainer/VBoxContainer"]
margin_top = 132.0
margin_right = 186.0
margin_bottom = 146.0
rect_min_size = Vector2( 140, 0 )
size_flags_vertical = 1
text = "Info:"
[node name="mc4" type="MarginContainer" parent="VBoxContainer/HBoxContainer/VBoxContainer"]
margin_top = 154.0
margin_right = 186.0
margin_bottom = 269.0
size_flags_vertical = 3
custom_constants/margin_top = 0
custom_constants/margin_left = 24
custom_constants/margin_bottom = 0
[node name="fileinfo" type="Label" parent="VBoxContainer/HBoxContainer/VBoxContainer/mc4"]
margin_left = 24.0
margin_right = 186.0
margin_bottom = 115.0
rect_min_size = Vector2( 140, 0 )
size_flags_vertical = 3
text = "Test"
autowrap = true
[node name="btn_ok" type="Button" parent="VBoxContainer/HBoxContainer/VBoxContainer"] [node name="btn_ok" type="Button" parent="VBoxContainer/HBoxContainer/VBoxContainer"]
margin_left = 57.0 margin_left = 80.0
margin_top = 146.0 margin_top = 277.0
margin_right = 82.0 margin_right = 105.0
margin_bottom = 168.0 margin_bottom = 299.0
size_flags_horizontal = 4 size_flags_horizontal = 4
size_flags_vertical = 8 size_flags_vertical = 8
disabled = true disabled = true