On branch feat/godot-configurator

Changes to be committed:
	deleted:    tools/configurator/components/logs.tscn
	modified:   tools/configurator/components/logs_view/logs_popup_content.tscn
	deleted:    tools/configurator/components/logs_view/view_log.gd
	modified:   tools/configurator/components/popup.tscn
	modified:   tools/configurator/main.gd
	modified:   tools/configurator/main.tscn
	modified:   tools/configurator/res/pixel_ui_theme/RetroDECKTheme.tres
This commit is contained in:
monkeyx-net 2024-08-04 20:43:16 +01:00
parent e47b3116b8
commit a1773a1b41
7 changed files with 55 additions and 62 deletions

View file

@ -1,3 +0,0 @@
[gd_scene format=3 uid="uid://bysbnp1spj1s1"]
[node name="Logs" type="Node2D"]

View file

@ -1,6 +1,4 @@
[gd_scene load_steps=2 format=3 uid="uid://db4ibvxq5wnxe"] [gd_scene format=3 uid="uid://b0ts52bsu7cpb"]
[ext_resource type="Script" path="res://components/logs_view/view_log.gd" id="1_kk2pw"]
[node name="PopupContent" type="Control"] [node name="PopupContent" type="Control"]
layout_mode = 3 layout_mode = 3
@ -9,10 +7,8 @@ anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
grow_horizontal = 2 grow_horizontal = 2
grow_vertical = 2 grow_vertical = 2
script = ExtResource("1_kk2pw")
[node name="RichTextLabel" type="RichTextLabel" parent="."] [node name="RichTextLabel" type="RichTextLabel" parent="."]
unique_name_in_owner = true
layout_mode = 1 layout_mode = 1
anchors_preset = 15 anchors_preset = 15
anchor_right = 1.0 anchor_right = 1.0

View file

@ -1,5 +0,0 @@
extends Control
func _ready():
pass

View file

@ -71,7 +71,6 @@ theme_override_constants/margin_bottom = 6
[node name="RichTextLabel" type="RichTextLabel" parent="Panel/MarginContainer/VBoxContainer/ContentContainer/MarginContainer"] [node name="RichTextLabel" type="RichTextLabel" parent="Panel/MarginContainer/VBoxContainer/ContentContainer/MarginContainer"]
layout_mode = 2 layout_mode = 2
focus_mode = 2 focus_mode = 2
scroll_active = false
scroll_following = true scroll_following = true
context_menu_enabled = true context_menu_enabled = true
selection_enabled = true selection_enabled = true

View file

@ -94,7 +94,11 @@ func _load_log(index: int) -> void:
log_content = class_functions.import_text_file(rd_logs +"/retrodeck.log") log_content = class_functions.import_text_file(rd_logs +"/retrodeck.log")
load_popup("RetroDeck Log", "res://components/logs_view/logs_popup_content.tscn", log_content) load_popup("RetroDeck Log", "res://components/logs_view/logs_popup_content.tscn", log_content)
2: 2:
load_popup("ES-DE Log", "res://components/logs_view/logs_popup_content.tscn","") log_content = class_functions.import_text_file(rd_logs +"/ES-DE/es_log.txt")
load_popup("ES-DE Log", "res://components/logs_view/logs_popup_content.tscn",log_content)
3:
log_content = class_functions.import_text_file(rd_logs +"/retroarch/logs/log.txt")
load_popup("Retroarch Log", "res://components/logs_view/logs_popup_content.tscn",log_content)
func _play_main_animations() -> void: func _play_main_animations() -> void:
anim_logo.play() anim_logo.play()

View file

@ -650,7 +650,7 @@ text = "TK_CHECKCONN"
unique_name_in_owner = true unique_name_in_owner = true
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 4 size_flags_horizontal = 4
item_count = 3 item_count = 4
selected = 0 selected = 0
popup/item_0/text = "TK_LOGSBTN" popup/item_0/text = "TK_LOGSBTN"
popup/item_0/id = 0 popup/item_0/id = 0
@ -660,6 +660,8 @@ popup/item_1/text = "RetroDECK Log"
popup/item_1/id = 1 popup/item_1/id = 1
popup/item_2/text = "ES_DE Log" popup/item_2/text = "ES_DE Log"
popup/item_2/id = 2 popup/item_2/id = 2
popup/item_3/text = "Retroarch"
popup/item_3/id = 3
[node name="reset_container" type="VBoxContainer" parent="Background/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer"] [node name="reset_container" type="VBoxContainer" parent="Background/MarginContainer/TabContainer/TK_TROUBLESHOOT/VBoxContainer"]
layout_mode = 2 layout_mode = 2

File diff suppressed because one or more lines are too long