Skip to content

Commit

Permalink
change settings page to script only
Browse files Browse the repository at this point in the history
  • Loading branch information
@Murph9
Murph9 committed Sep 2, 2023
1 parent 02ecc7c commit 9a9b603
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 60 deletions.
2 changes: 1 addition & 1 deletion MainScene.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ private void LoadStartMenu() {
AddChild(infoMenu);
};
_startMenu.SettingsOpened += () => {
var settingsMenu = GD.Load<PackedScene>("res://scenes/SettingsPage.tscn").Instantiate<SettingsPage>();
var settingsMenu = GD.Load<CSharpScript>("res://scenes/SettingsPage.cs").New().As<SettingsPage>();
RemoveChild(_startMenu);
settingsMenu.Closed += () => {
RemoveChild(settingsMenu);
Expand Down
32 changes: 25 additions & 7 deletions scenes/SettingsPage.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace murph9.TabPlayer.scenes;

public partial class SettingsPage : Node
public partial class SettingsPage : CenterContainer
{
[Signal]
public delegate void ClosedEventHandler();
Expand All @@ -15,9 +15,31 @@ public partial class SettingsPage : Node
public override void _Ready() {
_settings = SettingsService.Settings();

var vboxContainer = GetNode<VBoxContainer>("StringVBoxContainer");
LayoutMode = 3;
AnchorsPreset = 15;

var vboxContainer = new VBoxContainer() {
};
AddChild(vboxContainer);

var hBoxContainer = new HBoxContainer();
hBoxContainer.AddChild(new Label() {
Text = "Settings ", // its for cheap spacing
LabelSettings = new LabelSettings() {
FontSize = 24
}
});
var exitButton = new Button() {
Text = "Save and Close"
};
exitButton.Pressed += () => {
EmitSignal(SignalName.Closed);
};
hBoxContainer.AddChild(exitButton);

vboxContainer.AddChild(hBoxContainer);
vboxContainer.AddChild(new Label() {
Text = "Select Your String Colours (high to low):"
Text = "Set String Colours (low to high):"
});

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

public override void _Process(double delta) { }

public void BackButton_Pressed() {
EmitSignal(SignalName.Closed);
}
}
34 changes: 0 additions & 34 deletions scenes/SettingsPage.tscn
View file

This file was deleted.

38 changes: 20 additions & 18 deletions scenes/StartMenu.tscn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,59 +16,61 @@ size_flags_horizontal = 3
size_flags_vertical = 3
script = ExtResource("1_wbodt")

[node name="VBoxContainer_FullPage" type="VBoxContainer" parent="."]
[node name="CenterContainer" type="CenterContainer" parent="."]
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
alignment = 1

[node name="Title" type="Label" parent="VBoxContainer_FullPage"]
[node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer"]
layout_mode = 2

[node name="Title" type="Label" parent="CenterContainer/VBoxContainer"]
layout_mode = 2
size_flags_horizontal = 4
text = "Tab Player"
label_settings = SubResource("LabelSettings_f02ew")

[node name="Credits" type="Label" parent="VBoxContainer_FullPage"]
[node name="Credits" type="Label" parent="CenterContainer/VBoxContainer"]
layout_mode = 2
size_flags_horizontal = 4
text = "Made by murph9"

[node name="VBoxContainer_Buttons" type="VBoxContainer" parent="VBoxContainer_FullPage"]
[node name="VBoxContainer_Buttons" type="VBoxContainer" parent="CenterContainer/VBoxContainer"]
layout_mode = 2
size_flags_horizontal = 4

[node name="StartButton" type="Button" parent="VBoxContainer_FullPage/VBoxContainer_Buttons"]
[node name="StartButton" type="Button" parent="CenterContainer/VBoxContainer/VBoxContainer_Buttons"]
unique_name_in_owner = true
custom_minimum_size = Vector2(150, 0)
layout_mode = 2
text = "Start"

[node name="HBoxContainer_Convert" type="HBoxContainer" parent="VBoxContainer_FullPage/VBoxContainer_Buttons"]
[node name="HBoxContainer_Convert" type="HBoxContainer" parent="CenterContainer/VBoxContainer/VBoxContainer_Buttons"]
layout_mode = 2

[node name="ConvertButton" type="Button" parent="VBoxContainer_FullPage/VBoxContainer_Buttons/HBoxContainer_Convert"]
[node name="ConvertButton" type="Button" parent="CenterContainer/VBoxContainer/VBoxContainer_Buttons/HBoxContainer_Convert"]
unique_name_in_owner = true
layout_mode = 2
text = "Convert Songs"

[node name="ReloadButton" type="Button" parent="VBoxContainer_FullPage/VBoxContainer_Buttons/HBoxContainer_Convert"]
[node name="ReloadButton" type="Button" parent="CenterContainer/VBoxContainer/VBoxContainer_Buttons/HBoxContainer_Convert"]
unique_name_in_owner = true
layout_mode = 2
text = "Reload Song List"

[node name="InfoButton" type="Button" parent="VBoxContainer_FullPage/VBoxContainer_Buttons/HBoxContainer_Convert"]
[node name="InfoButton" type="Button" parent="CenterContainer/VBoxContainer/VBoxContainer_Buttons/HBoxContainer_Convert"]
layout_mode = 2
size_flags_horizontal = 3
text = "Info"

[node name="SettingsButton" type="Button" parent="VBoxContainer_FullPage/VBoxContainer_Buttons/HBoxContainer_Convert"]
[node name="SettingsButton" type="Button" parent="CenterContainer/VBoxContainer/VBoxContainer_Buttons/HBoxContainer_Convert"]
layout_mode = 2
text = "Settings"

[node name="QuitButton" type="Button" parent="VBoxContainer_FullPage/VBoxContainer_Buttons/HBoxContainer_Convert"]
[node name="QuitButton" type="Button" parent="CenterContainer/VBoxContainer/VBoxContainer_Buttons/HBoxContainer_Convert"]
layout_mode = 2
text = "Quit
"
Expand All @@ -82,9 +84,9 @@ offset_top = -23.0
offset_right = 258.0
grow_vertical = 0

[connection signal="pressed" from="VBoxContainer_FullPage/VBoxContainer_Buttons/StartButton" to="." method="StartButton_Pressed"]
[connection signal="pressed" from="VBoxContainer_FullPage/VBoxContainer_Buttons/HBoxContainer_Convert/ConvertButton" to="." method="ConvertButton_Pressed"]
[connection signal="pressed" from="VBoxContainer_FullPage/VBoxContainer_Buttons/HBoxContainer_Convert/ReloadButton" to="." method="ReloadButton_Pressed"]
[connection signal="pressed" from="VBoxContainer_FullPage/VBoxContainer_Buttons/HBoxContainer_Convert/InfoButton" to="." method="InfoButton_Pressed"]
[connection signal="pressed" from="VBoxContainer_FullPage/VBoxContainer_Buttons/HBoxContainer_Convert/SettingsButton" to="." method="SettingsButton_Pressed"]
[connection signal="pressed" from="VBoxContainer_FullPage/VBoxContainer_Buttons/HBoxContainer_Convert/QuitButton" to="." method="QuitButton_Pressed"]
[connection signal="pressed" from="CenterContainer/VBoxContainer/VBoxContainer_Buttons/StartButton" to="." method="StartButton_Pressed"]
[connection signal="pressed" from="CenterContainer/VBoxContainer/VBoxContainer_Buttons/HBoxContainer_Convert/ConvertButton" to="." method="ConvertButton_Pressed"]
[connection signal="pressed" from="CenterContainer/VBoxContainer/VBoxContainer_Buttons/HBoxContainer_Convert/ReloadButton" to="." method="ReloadButton_Pressed"]
[connection signal="pressed" from="CenterContainer/VBoxContainer/VBoxContainer_Buttons/HBoxContainer_Convert/InfoButton" to="." method="InfoButton_Pressed"]
[connection signal="pressed" from="CenterContainer/VBoxContainer/VBoxContainer_Buttons/HBoxContainer_Convert/SettingsButton" to="." method="SettingsButton_Pressed"]
[connection signal="pressed" from="CenterContainer/VBoxContainer/VBoxContainer_Buttons/HBoxContainer_Convert/QuitButton" to="." method="QuitButton_Pressed"]

0 comments on commit 9a9b603

Please sign in to comment.