diff --git a/tools/configurator/main.tscn b/tools/configurator/main.tscn index 08dd6534..e986084b 100644 --- a/tools/configurator/main.tscn +++ b/tools/configurator/main.tscn @@ -253,7 +253,7 @@ unique_name_in_owner = true layout_mode = 2 theme_override_styles/tab_selected = SubResource("StyleBoxFlat_co0k7") tab_alignment = 1 -current_tab = 3 +current_tab = 4 script = ExtResource("3_id6l4") [node name="GLOBALS" type="MarginContainer" parent="Background/SplitContainer/MarginContainer/TabContainer"] @@ -381,6 +381,7 @@ alignment = 1 icon_alignment = 1 vertical_icon_alignment = 0 expand_icon = true +metadata/description = "Testing 1,2,3 .." [node name="quick_rewind_button" type="CheckButton" parent="Background/SplitContainer/MarginContainer/TabContainer/GLOBALS/ScrollContainer/VBoxContainer/globals_gridcontainer"] unique_name_in_owner = true @@ -919,6 +920,7 @@ disabled = true text = "TK_MULTIFILE" [node name="SETTINGS" type="MarginContainer" parent="Background/SplitContainer/MarginContainer/TabContainer"] +visible = false layout_mode = 2 script = ExtResource("54_bxhvn") metadata/_tab_index = 3 @@ -1013,6 +1015,7 @@ expand_icon = true unique_name_in_owner = true custom_minimum_size = Vector2(0, 100) layout_mode = 2 +alignment = 1 selected = 0 fit_to_longest_item = false item_count = 7 @@ -1197,7 +1200,6 @@ disabled = true text = "TK_FTPBTN" [node name="ABOUT" type="MarginContainer" parent="Background/SplitContainer/MarginContainer/TabContainer"] -visible = false layout_mode = 2 script = ExtResource("4_m4rto") metadata/_tab_index = 4 @@ -1209,15 +1211,12 @@ layout_mode = 2 layout_mode = 2 alignment = 1 -[node name="rd_title" type="RichTextLabel" parent="Background/SplitContainer/MarginContainer/TabContainer/ABOUT/ScrollContainer/about_container"] +[node name="rd_title" type="Label" parent="Background/SplitContainer/MarginContainer/TabContainer/ABOUT/ScrollContainer/about_container"] unique_name_in_owner = true -clip_contents = false custom_minimum_size = Vector2(300, 150) layout_mode = 2 text = "RetroDECK" -scroll_active = false autowrap_mode = 2 -tab_size = 2 [node name="logo" type="TextureRect" parent="Background/SplitContainer/MarginContainer/TabContainer/ABOUT/ScrollContainer/about_container/rd_title"] custom_minimum_size = Vector2(128, 128) @@ -1679,6 +1678,7 @@ volume_db = -11.243 [node name="pop_rtl" type="Label" parent="Background"] unique_name_in_owner = true +visible = false z_index = 2 layout_mode = 2 offset_left = 6.0 diff --git a/tools/configurator/scripts/TabAbout.gd b/tools/configurator/scripts/TabAbout.gd index 98f752bf..7e036425 100644 --- a/tools/configurator/scripts/TabAbout.gd +++ b/tools/configurator/scripts/TabAbout.gd @@ -25,7 +25,7 @@ func _about_button_pressed(id: String, button: Button) -> void: var tmp_txt = button.text if class_functions.desktop_mode != "gamescope": class_functions.logger("i","Loading website for " + id) - class_functions.launch_help(button.editor_description) + class_functions.launch_help(button.get_meta("url")) else: button.text = "Help only in Desktop Mode" await class_functions.wait(3.0) @@ -42,8 +42,10 @@ func create_buttons() -> void: func _setup_button(button: Button, web_data: Link) -> void: button.text = web_data.name - button.tooltip_text = web_data.description + #button.tooltip_text = web_data.description button.icon = ResourceLoader.load(web_data.icon) - button.editor_description = web_data.url + #button.editor_description = web_data.url + button.set_meta("url", web_data.url) + button.set_meta("description", web_data.description) button.icon_alignment = HORIZONTAL_ALIGNMENT_LEFT button.vertical_icon_alignment = VERTICAL_ALIGNMENT_CENTER diff --git a/tools/configurator/scripts/main.gd b/tools/configurator/scripts/main.gd index acb97229..beb1b2b7 100644 --- a/tools/configurator/scripts/main.gd +++ b/tools/configurator/scripts/main.gd @@ -185,7 +185,7 @@ func _on_exit_button_pressed(): func _set_up_globals(state: Array) -> void: #TODO on initial run pass array date? - print (state) + #print (state) %update_notification_button.button_pressed = class_functions.update_check %quick_resume_button.button_pressed = class_functions.quick_resume_status %retroarch_quick_resume_button.button_pressed = class_functions.quick_resume_status