Skip to content

Commit 9a9b603

Browse files
Murph9Murph9
committed
change settings page to script only
1 parent 02ecc7c commit 9a9b603

File tree

4 files changed

+46
-60
lines changed

4 files changed

+46
-60
lines changed

‎MainScene.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ private void LoadStartMenu() {
6060
AddChild(infoMenu);
6161
};
6262
_startMenu.SettingsOpened += () => {
63-
var settingsMenu = GD.Load<PackedScene>("res://scenes/SettingsPage.tscn").Instantiate<SettingsPage>();
63+
var settingsMenu = GD.Load<CSharpScript>("res://scenes/SettingsPage.cs").New().As<SettingsPage>();
6464
RemoveChild(_startMenu);
6565
settingsMenu.Closed += () => {
6666
RemoveChild(settingsMenu);

‎scenes/SettingsPage.cs

+25-7
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
namespace murph9.TabPlayer.scenes;
77

8-
public partial class SettingsPage : Node
8+
public partial class SettingsPage : CenterContainer
99
{
1010
[Signal]
1111
public delegate void ClosedEventHandler();
@@ -15,9 +15,31 @@ public partial class SettingsPage : Node
1515
public override void _Ready() {
1616
_settings = SettingsService.Settings();
1717

18-
var vboxContainer = GetNode<VBoxContainer>("StringVBoxContainer");
18+
LayoutMode = 3;
19+
AnchorsPreset = 15;
20+
21+
var vboxContainer = new VBoxContainer() {
22+
};
23+
AddChild(vboxContainer);
24+
25+
var hBoxContainer = new HBoxContainer();
26+
hBoxContainer.AddChild(new Label() {
27+
Text = "Settings ", // its for cheap spacing
28+
LabelSettings = new LabelSettings() {
29+
FontSize = 24
30+
}
31+
});
32+
var exitButton = new Button() {
33+
Text = "Save and Close"
34+
};
35+
exitButton.Pressed += () => {
36+
EmitSignal(SignalName.Closed);
37+
};
38+
hBoxContainer.AddChild(exitButton);
39+
40+
vboxContainer.AddChild(hBoxContainer);
1941
vboxContainer.AddChild(new Label() {
20-
Text = "Select Your String Colours (high to low):"
42+
Text = "Set String Colours (low to high):"
2143
});
2244

2345
foreach (var i in Enumerable.Range(0, 6)) {
@@ -65,8 +87,4 @@ public override void _Ready() {
6587
}
6688

6789
public override void _Process(double delta) { }
68-
69-
public void BackButton_Pressed() {
70-
EmitSignal(SignalName.Closed);
71-
}
7290
}

‎scenes/SettingsPage.tscn

-34
This file was deleted.

‎scenes/StartMenu.tscn

+20-18
Original file line numberDiff line numberDiff line change
@@ -16,59 +16,61 @@ size_flags_horizontal = 3
1616
size_flags_vertical = 3
1717
script = ExtResource("1_wbodt")
1818

19-
[node name="VBoxContainer_FullPage" type="VBoxContainer" parent="."]
19+
[node name="CenterContainer" type="CenterContainer" parent="."]
2020
layout_mode = 1
2121
anchors_preset = 15
2222
anchor_right = 1.0
2323
anchor_bottom = 1.0
2424
grow_horizontal = 2
2525
grow_vertical = 2
26-
alignment = 1
2726

28-
[node name="Title" type="Label" parent="VBoxContainer_FullPage"]
27+
[node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer"]
28+
layout_mode = 2
29+
30+
[node name="Title" type="Label" parent="CenterContainer/VBoxContainer"]
2931
layout_mode = 2
3032
size_flags_horizontal = 4
3133
text = "Tab Player"
3234
label_settings = SubResource("LabelSettings_f02ew")
3335

34-
[node name="Credits" type="Label" parent="VBoxContainer_FullPage"]
36+
[node name="Credits" type="Label" parent="CenterContainer/VBoxContainer"]
3537
layout_mode = 2
3638
size_flags_horizontal = 4
3739
text = "Made by murph9"
3840

39-
[node name="VBoxContainer_Buttons" type="VBoxContainer" parent="VBoxContainer_FullPage"]
41+
[node name="VBoxContainer_Buttons" type="VBoxContainer" parent="CenterContainer/VBoxContainer"]
4042
layout_mode = 2
4143
size_flags_horizontal = 4
4244

43-
[node name="StartButton" type="Button" parent="VBoxContainer_FullPage/VBoxContainer_Buttons"]
45+
[node name="StartButton" type="Button" parent="CenterContainer/VBoxContainer/VBoxContainer_Buttons"]
4446
unique_name_in_owner = true
4547
custom_minimum_size = Vector2(150, 0)
4648
layout_mode = 2
4749
text = "Start"
4850

49-
[node name="HBoxContainer_Convert" type="HBoxContainer" parent="VBoxContainer_FullPage/VBoxContainer_Buttons"]
51+
[node name="HBoxContainer_Convert" type="HBoxContainer" parent="CenterContainer/VBoxContainer/VBoxContainer_Buttons"]
5052
layout_mode = 2
5153

52-
[node name="ConvertButton" type="Button" parent="VBoxContainer_FullPage/VBoxContainer_Buttons/HBoxContainer_Convert"]
54+
[node name="ConvertButton" type="Button" parent="CenterContainer/VBoxContainer/VBoxContainer_Buttons/HBoxContainer_Convert"]
5355
unique_name_in_owner = true
5456
layout_mode = 2
5557
text = "Convert Songs"
5658

57-
[node name="ReloadButton" type="Button" parent="VBoxContainer_FullPage/VBoxContainer_Buttons/HBoxContainer_Convert"]
59+
[node name="ReloadButton" type="Button" parent="CenterContainer/VBoxContainer/VBoxContainer_Buttons/HBoxContainer_Convert"]
5860
unique_name_in_owner = true
5961
layout_mode = 2
6062
text = "Reload Song List"
6163

62-
[node name="InfoButton" type="Button" parent="VBoxContainer_FullPage/VBoxContainer_Buttons/HBoxContainer_Convert"]
64+
[node name="InfoButton" type="Button" parent="CenterContainer/VBoxContainer/VBoxContainer_Buttons/HBoxContainer_Convert"]
6365
layout_mode = 2
6466
size_flags_horizontal = 3
6567
text = "Info"
6668

67-
[node name="SettingsButton" type="Button" parent="VBoxContainer_FullPage/VBoxContainer_Buttons/HBoxContainer_Convert"]
69+
[node name="SettingsButton" type="Button" parent="CenterContainer/VBoxContainer/VBoxContainer_Buttons/HBoxContainer_Convert"]
6870
layout_mode = 2
6971
text = "Settings"
7072

71-
[node name="QuitButton" type="Button" parent="VBoxContainer_FullPage/VBoxContainer_Buttons/HBoxContainer_Convert"]
73+
[node name="QuitButton" type="Button" parent="CenterContainer/VBoxContainer/VBoxContainer_Buttons/HBoxContainer_Convert"]
7274
layout_mode = 2
7375
text = "Quit
7476
"
@@ -82,9 +84,9 @@ offset_top = -23.0
8284
offset_right = 258.0
8385
grow_vertical = 0
8486

85-
[connection signal="pressed" from="VBoxContainer_FullPage/VBoxContainer_Buttons/StartButton" to="." method="StartButton_Pressed"]
86-
[connection signal="pressed" from="VBoxContainer_FullPage/VBoxContainer_Buttons/HBoxContainer_Convert/ConvertButton" to="." method="ConvertButton_Pressed"]
87-
[connection signal="pressed" from="VBoxContainer_FullPage/VBoxContainer_Buttons/HBoxContainer_Convert/ReloadButton" to="." method="ReloadButton_Pressed"]
88-
[connection signal="pressed" from="VBoxContainer_FullPage/VBoxContainer_Buttons/HBoxContainer_Convert/InfoButton" to="." method="InfoButton_Pressed"]
89-
[connection signal="pressed" from="VBoxContainer_FullPage/VBoxContainer_Buttons/HBoxContainer_Convert/SettingsButton" to="." method="SettingsButton_Pressed"]
90-
[connection signal="pressed" from="VBoxContainer_FullPage/VBoxContainer_Buttons/HBoxContainer_Convert/QuitButton" to="." method="QuitButton_Pressed"]
87+
[connection signal="pressed" from="CenterContainer/VBoxContainer/VBoxContainer_Buttons/StartButton" to="." method="StartButton_Pressed"]
88+
[connection signal="pressed" from="CenterContainer/VBoxContainer/VBoxContainer_Buttons/HBoxContainer_Convert/ConvertButton" to="." method="ConvertButton_Pressed"]
89+
[connection signal="pressed" from="CenterContainer/VBoxContainer/VBoxContainer_Buttons/HBoxContainer_Convert/ReloadButton" to="." method="ReloadButton_Pressed"]
90+
[connection signal="pressed" from="CenterContainer/VBoxContainer/VBoxContainer_Buttons/HBoxContainer_Convert/InfoButton" to="." method="InfoButton_Pressed"]
91+
[connection signal="pressed" from="CenterContainer/VBoxContainer/VBoxContainer_Buttons/HBoxContainer_Convert/SettingsButton" to="." method="SettingsButton_Pressed"]
92+
[connection signal="pressed" from="CenterContainer/VBoxContainer/VBoxContainer_Buttons/HBoxContainer_Convert/QuitButton" to="." method="QuitButton_Pressed"]

0 commit comments

Comments
 (0)