lots of stuff added to menu, been forgetting to push

This commit is contained in:
BassS0ul 2023-10-08 12:27:00 -05:00
parent 34030a6bfc
commit 81ed1d7c03
12 changed files with 65 additions and 42 deletions

View File

@ -1,9 +1,9 @@
Button
VBoxContainer
OptionButton OptionButton
Label Label
HBoxContainer HBoxContainer
TextEdit TextEdit
VBoxContainer
Button
ScrollContainer ScrollContainer
VScrollBar VScrollBar
CheckBox CheckBox

View File

@ -16,11 +16,11 @@ dock_5="Inspector,Node,History"
[EditorNode] [EditorNode]
open_scenes=["res://top_toolbar/TopToolbar.tscn"] open_scenes=["res://top_toolbar/TopToolbar.tscn", "res://genre_dialog_container.tscn"]
[ScriptEditor] [ScriptEditor]
open_scripts=["res://top_toolbar/DialogMenu.gd", "res://top_toolbar/GenreDialogManager.gd", "res://GenreSettings.gd", "res://MenuManager.gd"] open_scripts=["res://top_toolbar/DialogMenu.gd", "res://top_toolbar/GenreDialogManager.gd", "res://GenreSettings.gd", "res://genre_dialog_container.gd", "res://MenuManager.gd"]
open_help=[] open_help=[]
script_split_offset=70 script_split_offset=70
list_split_offset=0 list_split_offset=0

View File

@ -1,13 +1,18 @@
2a60927148abd1d33b818b535e306557 2a60927148abd1d33b818b535e306557
::res://::1692385278 ::res://::1696749243
Cabin-VariableFont_wdth,wght.ttf::FontFile::6071708341937432371::1691364683::1691364683::1::::<><>:: Cabin-VariableFont_wdth,wght.ttf::FontFile::6071708341937432371::1691364683::1691364683::1::::<><>::
default_env.tres::Environment::-1::1691364683::0::1::::<><>:: default_env.tres::Environment::-1::1691364683::0::1::::<><>::
GenreSettings.gd::GDScript::-1::1691903482::0::1::::<>Node<>:: GenreSettings.gd::GDScript::-1::1695443926::0::1::::<>Node<>::
genre_dialog_container.gd::GDScript::-1::1693705495::0::1::::<>ScrollContainer<>::
genre_dialog_container.tscn::PackedScene::153944638127573795::1695854807::0::1::::<><>::uid://cl7q0snsncynm<>res://genre_dialog_container.gd
icon.png::CompressedTexture2D::6683631437730026850::1691364683::1691364683::1::::<><>:: icon.png::CompressedTexture2D::6683631437730026850::1691364683::1691364683::1::::<><>::
MenuManager.gd::GDScript::-1::1691948501::0::1::::<>Node<>:: MenuManager.gd::GDScript::-1::1691948501::0::1::::<>Node<>::
new_genre.tscn::PackedScene::4691503272014395181::1691803163::0::1::::<><>:: new_genre.tscn::PackedScene::4691503272014395181::1692393850::0::1::::<><>::
README.md::TextFile::-1::1691364683::0::1::::<><>:: README.md::TextFile::-1::1691364683::0::1::::<><>::
term_container.tscn::PackedScene::5611995818604433798::1693156714::0::1::::<><>::
::res://index_screen/::1691364683 ::res://index_screen/::1691364683
index.tscn::PackedScene::1801527253264693182::1691364683::0::1::::<><>:: index.tscn::PackedScene::1801527253264693182::1691364683::0::1::::<><>::
::res://top_toolbar/::1691950434 ::res://top_toolbar/::1695854807
TopToolbar.tscn::PackedScene::5079673781919012116::1691950434::0::1::::<><>::res://MenuManager.gd<>res://GenreSettings.gd DialogMenu.gd::GDScript::-1::1693705495::0::1::::<>Label<>::
GenreDialogManager.gd::GDScript::-1::1693446726::0::1::::<>OptionButton<>::
TopToolbar.tscn::PackedScene::5079673781919012116::1695854807::0::1::::<><>::res://MenuManager.gd<>res://GenreSettings.gd<>res://top_toolbar/DialogMenu.gd<>res://top_toolbar/GenreDialogManager.gd<>uid://cgtpfhy1ler0

View File

@ -1,5 +1,2 @@
res://top_toolbar/TopToolbar.tscn res://top_toolbar/TopToolbar.tscn
res://new_genre.tscn
res://GenreSettings.gd res://GenreSettings.gd
res://top_toolbar/DialogMenu.gd
res://top_toolbar/GenreDialogManager.gd

View File

@ -1,3 +1,5 @@
[folding] [folding]
sections_unfolded=PackedStringArray() node_unfolds=[]
resource_unfolds=[]
nodes_folded=[]

View File

@ -10,8 +10,8 @@ run_reload_scripts=true
[recent_files] [recent_files]
scenes=["res://new_genre.tscn", "res://top_toolbar/TopToolbar.tscn", "res://index_screen/index.tscn", "res://toolset_test_tabbed_merged/tabbed_merged_test_interface.tscn", "res://toolset_test_tabbed_merged/draggable_assets.tscn", "res://toolset_test/drag_and_drop_demo_final.tscn"] scenes=["res://genre_dialog_container.tscn", "res://top_toolbar/TopToolbar.tscn", "res://new_genre.tscn", "res://index_screen/index.tscn", "res://toolset_test_tabbed_merged/tabbed_merged_test_interface.tscn", "res://toolset_test_tabbed_merged/draggable_assets.tscn", "res://toolset_test/drag_and_drop_demo_final.tscn"]
scripts=["res://top_toolbar/GenreDialogManager.gd", "res://top_toolbar/DialogMenu.gd", "res://GenreSettings.gd", "res://RadioButtonManager.gd", "res://MenuManager.gd", "res://toolset_test_tabbed_merged/target_container_final.gd", "res://toolset_test_tabbed_merged/toolset_test_tabbed_merged.gd", "res://toolset_test/draggable_final.gd", "res://toolset_test_tabbed_merged/PanelCanvas_Temp.gd", "res://toolset_test_tabbed_merged/source_container.gd"] scripts=["res://genre_dialog_container.gd", "res://top_toolbar/GenreDialogManager.gd", "res://top_toolbar/DialogMenu.gd", "res://GenreSettings.gd", "res://RadioButtonManager.gd", "res://MenuManager.gd", "res://toolset_test_tabbed_merged/target_container_final.gd", "res://toolset_test_tabbed_merged/toolset_test_tabbed_merged.gd", "res://toolset_test/draggable_final.gd", "res://toolset_test_tabbed_merged/PanelCanvas_Temp.gd"]
[dialog_bounds] [dialog_bounds]

View File

@ -7,7 +7,7 @@ state={
"folded_lines": Array[int]([]), "folded_lines": Array[int]([]),
"h_scroll_position": 0, "h_scroll_position": 0,
"row": 29, "row": 29,
"scroll_position": 2.0, "scroll_position": 0.0,
"selection": false, "selection": false,
"syntax_highlighter": "GDScript" "syntax_highlighter": "GDScript"
} }
@ -17,16 +17,12 @@ state={
state={ state={
"bookmarks": PackedInt32Array(), "bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(), "breakpoints": PackedInt32Array(),
"column": 43, "column": 84,
"folded_lines": Array[int]([]), "folded_lines": Array[int]([]),
"h_scroll_position": 768, "h_scroll_position": 0,
"row": 15, "row": 25,
"scroll_position": 0.0, "scroll_position": 0.0,
"selection": true, "selection": false,
"selection_from_column": 1,
"selection_from_line": 15,
"selection_to_column": 43,
"selection_to_line": 15,
"syntax_highlighter": "GDScript" "syntax_highlighter": "GDScript"
} }
@ -35,10 +31,10 @@ state={
state={ state={
"bookmarks": PackedInt32Array(), "bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(), "breakpoints": PackedInt32Array(),
"column": 215, "column": 0,
"folded_lines": Array[int]([]), "folded_lines": Array[int]([]),
"h_scroll_position": 0, "h_scroll_position": 0,
"row": 17, "row": 2,
"scroll_position": 0.0, "scroll_position": 0.0,
"selection": false, "selection": false,
"syntax_highlighter": "GDScript" "syntax_highlighter": "GDScript"
@ -49,7 +45,21 @@ state={
state={ state={
"bookmarks": PackedInt32Array(), "bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(), "breakpoints": PackedInt32Array(),
"column": 19, "column": 34,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
"row": 14,
"scroll_position": 0.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
[res://genre_dialog_container.gd]
state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
"column": 64,
"folded_lines": Array[int]([]), "folded_lines": Array[int]([]),
"h_scroll_position": 0, "h_scroll_position": 0,
"row": 16, "row": 16,

View File

@ -18,5 +18,13 @@ func _on_new_genre_button_up():
$HBoxContainer/Default/ScrollContainer/GenreContainer.move_child($HBoxContainer/Default/ScrollContainer/GenreContainer/NewGenre, $HBoxContainer/Default/ScrollContainer/GenreContainer.get_child_count() - 1) $HBoxContainer/Default/ScrollContainer/GenreContainer.move_child($HBoxContainer/Default/ScrollContainer/GenreContainer/NewGenre, $HBoxContainer/Default/ScrollContainer/GenreContainer.get_child_count() - 1)
func _on_v_scroll_bar_scrolling():
$HboxContainer
func _on_save_button_pressed():
var file = FileAccess.open("user://test.xml", FileAccess.WRITE)
if file:
file.store_string("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<genresettings>\n")
#for each genre container
#add name and what it's based on. skip based on if first three.
file.store_string("</genresettings>")
file.close()

View File

@ -1,6 +1,7 @@
[gd_scene load_steps=2 format=3 uid="uid://cgtpfhy1ler0"] [gd_scene load_steps=3 format=3 uid="uid://cgtpfhy1ler0"]
[ext_resource type="PackedScene" uid="uid://cl7q0snsncynm" path="res://term_container.tscn" id="1_g7lmq"] [ext_resource type="PackedScene" uid="uid://cl7q0snsncynm" path="res://term_container.tscn" id="1_g7lmq"]
[ext_resource type="Script" path="res://genre_dialog_container.gd" id="1_pfbcu"]
[node name="GenreDialogContainer" type="ScrollContainer"] [node name="GenreDialogContainer" type="ScrollContainer"]
anchors_preset = -1 anchors_preset = -1
@ -12,6 +13,7 @@ offset_left = 0.034
offset_top = 0.0039978 offset_top = 0.0039978
offset_right = 728.034 offset_right = 728.034
offset_bottom = 539.004 offset_bottom = 539.004
script = ExtResource("1_pfbcu")
[node name="VBoxContainer" type="VBoxContainer" parent="."] [node name="VBoxContainer" type="VBoxContainer" parent="."]
layout_mode = 2 layout_mode = 2
@ -22,3 +24,5 @@ layout_mode = 2
[node name="Button" type="Button" parent="VBoxContainer"] [node name="Button" type="Button" parent="VBoxContainer"]
layout_mode = 2 layout_mode = 2
text = "New Term" text = "New Term"
[connection signal="pressed" from="VBoxContainer/Button" to="." method="_on_button_pressed"]

View File

@ -1,6 +1,6 @@
extends Label extends Label
var newTerm = load("res://term_container.tscn")
# Called when the node enters the scene tree for the first time. # Called when the node enters the scene tree for the first time.
func _ready(): func _ready():
@ -10,10 +10,3 @@ func _ready():
# Called every frame. 'delta' is the elapsed time since the previous frame. # Called every frame. 'delta' is the elapsed time since the previous frame.
func _process(delta): func _process(delta):
pass pass
func _on_button_button_up():
var termInstance = newTerm.instantiate()
$VBoxContainer/OptionButton/ScrollContainer/VBoxContainer.add_child(termInstance)
$VBoxContainer/OptionButton/ScrollContainer/VBoxContainer.move_child($VBoxContainer/OptionButton/ScrollContainer/VBoxContainer/Button, $VBoxContainer/OptionButton/ScrollContainer/VBoxContainer.get_child_count() - 1)

View File

@ -75,7 +75,6 @@ layout_mode = 2
script = ExtResource("1_l6hds") script = ExtResource("1_l6hds")
[node name="GenreMenu" type="Label" parent="HBoxContainer/VBoxContainer3"] [node name="GenreMenu" type="Label" parent="HBoxContainer/VBoxContainer3"]
visible = false
layout_mode = 2 layout_mode = 2
text = "Genre Menu" text = "Genre Menu"
script = ExtResource("2_kvqsl") script = ExtResource("2_kvqsl")
@ -152,6 +151,10 @@ text = "Genre Name:"
layout_mode = 2 layout_mode = 2
text = "Initial Settings:" text = "Initial Settings:"
[node name="SaveButton" type="Button" parent="HBoxContainer/VBoxContainer3/GenreMenu/HBoxContainer"]
layout_mode = 2
text = "Save"
[node name="DialogMenu" type="Label" parent="HBoxContainer/VBoxContainer3"] [node name="DialogMenu" type="Label" parent="HBoxContainer/VBoxContainer3"]
visible = false visible = false
layout_mode = 2 layout_mode = 2
@ -183,17 +186,17 @@ script = ExtResource("4_vxa5e")
[node name="GenreDialogContainer" parent="HBoxContainer/VBoxContainer3/DialogMenu/VBoxContainer/OptionButton" instance=ExtResource("5_pyfae")] [node name="GenreDialogContainer" parent="HBoxContainer/VBoxContainer3/DialogMenu/VBoxContainer/OptionButton" instance=ExtResource("5_pyfae")]
visible = false visible = false
layout_mode = 0 layout_mode = 2
anchors_preset = 0 anchors_preset = 0
[node name="GenreDialogContainer2" parent="HBoxContainer/VBoxContainer3/DialogMenu/VBoxContainer/OptionButton" instance=ExtResource("5_pyfae")] [node name="GenreDialogContainer2" parent="HBoxContainer/VBoxContainer3/DialogMenu/VBoxContainer/OptionButton" instance=ExtResource("5_pyfae")]
visible = false visible = false
layout_mode = 0 layout_mode = 2
anchors_preset = 0 anchors_preset = 0
[node name="GenreDialogContainer3" parent="HBoxContainer/VBoxContainer3/DialogMenu/VBoxContainer/OptionButton" instance=ExtResource("5_pyfae")] [node name="GenreDialogContainer3" parent="HBoxContainer/VBoxContainer3/DialogMenu/VBoxContainer/OptionButton" instance=ExtResource("5_pyfae")]
visible = false visible = false
layout_mode = 0 layout_mode = 2
anchors_preset = 0 anchors_preset = 0
[node name="CharacterMenu" type="Label" parent="HBoxContainer/VBoxContainer3"] [node name="CharacterMenu" type="Label" parent="HBoxContainer/VBoxContainer3"]
@ -762,4 +765,5 @@ layout_mode = 2
[connection signal="item_selected" from="HBoxContainer/VBoxContainer2/OptionButton_Wizards" to="HBoxContainer/VBoxContainer3" method="_on_option_button_wizards_item_selected"] [connection signal="item_selected" from="HBoxContainer/VBoxContainer2/OptionButton_Wizards" to="HBoxContainer/VBoxContainer3" method="_on_option_button_wizards_item_selected"]
[connection signal="button_up" from="HBoxContainer/VBoxContainer3/GenreMenu/HBoxContainer/Default/ScrollContainer/GenreContainer/NewGenre" to="HBoxContainer/VBoxContainer3/GenreMenu" method="_on_new_genre_button_up"] [connection signal="button_up" from="HBoxContainer/VBoxContainer3/GenreMenu/HBoxContainer/Default/ScrollContainer/GenreContainer/NewGenre" to="HBoxContainer/VBoxContainer3/GenreMenu" method="_on_new_genre_button_up"]
[connection signal="pressed" from="HBoxContainer/VBoxContainer3/GenreMenu/HBoxContainer/SaveButton" to="HBoxContainer/VBoxContainer3/GenreMenu" method="_on_save_button_pressed"]
[connection signal="item_selected" from="HBoxContainer/VBoxContainer3/DialogMenu/VBoxContainer/OptionButton" to="HBoxContainer/VBoxContainer3/DialogMenu/VBoxContainer/OptionButton" method="_on_item_selected"] [connection signal="item_selected" from="HBoxContainer/VBoxContainer3/DialogMenu/VBoxContainer/OptionButton" to="HBoxContainer/VBoxContainer3/DialogMenu/VBoxContainer/OptionButton" method="_on_item_selected"]