Configured theme file and made small changes to UI

2 files changed, 53 insertions, 57 deletions

diff --git a/scenes/mainmenu.tscn b/scenes/mainmenu.tscn
index 492435a..428593f 100644
--- a/scenes/mainmenu.tscn
+++ b/scenes/mainmenu.tscn
@@ -8,12 +8,13 @@
 [node name="Menu" type="Control"]
 margin_right = 214.0
 margin_bottom = 120.0
+theme = ExtResource( 4 )
 script = ExtResource( 1 )
 
 [node name="ColorRect" type="ColorRect" parent="."]
 margin_right = 214.0
 margin_bottom = 120.0
-color = Color( 0, 0, 0, 1 )
+color = Color( 0.0823529, 0.0745098, 0.117647, 1 )
 
 [node name="Label" type="Label" parent="."]
 anchor_left = 0.5
@@ -21,7 +22,6 @@ anchor_right = 0.5
 margin_left = -48.0
 margin_right = 48.0
 margin_bottom = 16.0
-custom_colors/font_color_shadow = Color( 0.894118, 0.313726, 0, 1 )
 text = "BasketBALLAZ"
 
 [node name="Control" type="Control" parent="."]
@@ -41,40 +41,40 @@ margin_bottom = 76.0
 
 [node name="StartButton" type="Button" parent="Control/VBoxContainer"]
 margin_right = 100.0
-margin_bottom = 22.0
+margin_bottom = 18.0
 text = "Start"
 
 [node name="LeaderboardButton" type="Button" parent="Control/VBoxContainer"]
-margin_top = 26.0
+margin_top = 22.0
 margin_right = 100.0
-margin_bottom = 48.0
+margin_bottom = 40.0
 disabled = true
 text = "Leaderboard"
 
 [node name="HelpButton" type="Button" parent="Control/VBoxContainer"]
-margin_top = 52.0
+margin_top = 44.0
 margin_right = 100.0
-margin_bottom = 74.0
+margin_bottom = 62.0
 disabled = true
 text = "Help"
 
 [node name="OptionsButton" type="Button" parent="Control/VBoxContainer"]
-margin_top = 78.0
+margin_top = 66.0
 margin_right = 100.0
-margin_bottom = 100.0
+margin_bottom = 84.0
 text = "Options"
 
 [node name="CreditsButton" type="Button" parent="Control/VBoxContainer"]
-margin_top = 104.0
+margin_top = 88.0
 margin_right = 100.0
-margin_bottom = 126.0
+margin_bottom = 106.0
 disabled = true
 text = "Credits"
 
 [node name="QuitButton" type="Button" parent="Control/VBoxContainer"]
-margin_top = 130.0
+margin_top = 110.0
 margin_right = 100.0
-margin_bottom = 152.0
+margin_bottom = 128.0
 text = "Quit"
 
 [node name="MusicAudio" type="AudioStreamPlayer" parent="."]
diff --git a/scenes/optionsmenu.tscn b/scenes/optionsmenu.tscn
index bbd813c..c3f7338 100644
--- a/scenes/optionsmenu.tscn
+++ b/scenes/optionsmenu.tscn
@@ -1,17 +1,14 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://textures/release_indicator.png" type="Texture" id=1]
 [ext_resource path="res://scripts/optionsmenu.gd" type="Script" id=2]
+[ext_resource path="res://theme_data/interface_theme.tres" type="Theme" id=3]
 
 [node name="OptionsMenu" type="Control"]
 margin_right = 214.0
 margin_bottom = 120.0
+theme = ExtResource( 3 )
 script = ExtResource( 2 )
 
-[node name="Panel" type="Panel" parent="."]
-margin_right = 214.0
-margin_bottom = 120.0
-
 [node name="Control" type="Control" parent="."]
 anchor_right = 1.0
 anchor_bottom = 1.0
@@ -19,124 +16,123 @@ margin_right = 321.0
 margin_bottom = 180.0
 rect_scale = Vector2( 0.4, 0.4 )
 
+[node name="Panel" type="Panel" parent="Control"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+
 [node name="VBoxContainer" type="VBoxContainer" parent="Control"]
 anchor_left = 0.5
 anchor_top = 0.5
 anchor_right = 0.5
 anchor_bottom = 0.5
 margin_left = -165.5
-margin_top = -55.0
+margin_top = -49.0
 margin_right = 165.5
-margin_bottom = 55.0
+margin_bottom = 49.0
 
 [node name="GridContainer" type="GridContainer" parent="Control/VBoxContainer"]
 margin_right = 331.0
-margin_bottom = 84.0
+margin_bottom = 76.0
 columns = 2
 
 [node name="FullscreenLabel" type="Label" parent="Control/VBoxContainer/GridContainer"]
-margin_top = 4.0
 margin_right = 127.0
-margin_bottom = 20.0
+margin_bottom = 16.0
 text = "Fullscreen"
 
-[node name="FullscreenCheckBox" type="CheckBox" parent="Control/VBoxContainer/GridContainer"]
-margin_left = 307.0
+[node name="FullscreenCheckButton" type="CheckButton" parent="Control/VBoxContainer/GridContainer"]
+margin_left = 299.0
 margin_right = 331.0
-margin_bottom = 24.0
+margin_bottom = 16.0
 size_flags_horizontal = 10
-icon_align = 2
 
 [node name="VolumeMasterLabel" type="Label" parent="Control/VBoxContainer/GridContainer"]
-margin_top = 28.0
+margin_top = 20.0
 margin_right = 104.0
-margin_bottom = 44.0
+margin_bottom = 36.0
 size_flags_horizontal = 2
 text = "Master Volume"
 
 [node name="VolumeMasterContainer" type="HBoxContainer" parent="Control/VBoxContainer/GridContainer"]
 margin_left = 131.0
-margin_top = 28.0
+margin_top = 20.0
 margin_right = 331.0
-margin_bottom = 44.0
+margin_bottom = 36.0
 rect_min_size = Vector2( 200, 0 )
 
 [node name="VolumeMasterSlider" type="HSlider" parent="Control/VBoxContainer/GridContainer/VolumeMasterContainer"]
 margin_right = 150.0
 margin_bottom = 16.0
 rect_min_size = Vector2( 150, 0 )
-custom_icons/grabber_highlight = ExtResource( 1 )
-custom_icons/grabber = ExtResource( 1 )
-value = 50.0
+min_value = -50.0
+max_value = 50.0
 
 [node name="VolumeMasterValue" type="Label" parent="Control/VBoxContainer/GridContainer/VolumeMasterContainer"]
-margin_left = 168.0
+margin_left = 176.0
 margin_right = 200.0
 margin_bottom = 16.0
 size_flags_horizontal = 10
-text = "100%"
+text = "50%"
 
 [node name="VolumeMusicLabel" type="Label" parent="Control/VBoxContainer/GridContainer"]
-margin_top = 48.0
+margin_top = 40.0
 margin_right = 127.0
-margin_bottom = 64.0
+margin_bottom = 56.0
 text = "Music Volume"
 
 [node name="VolumeMusicContainer" type="HBoxContainer" parent="Control/VBoxContainer/GridContainer"]
 margin_left = 131.0
-margin_top = 48.0
+margin_top = 40.0
 margin_right = 331.0
-margin_bottom = 64.0
+margin_bottom = 56.0
 
 [node name="VolumeMusicSlider" type="HSlider" parent="Control/VBoxContainer/GridContainer/VolumeMusicContainer"]
 margin_right = 150.0
 margin_bottom = 16.0
 rect_min_size = Vector2( 150, 0 )
-custom_icons/grabber_highlight = ExtResource( 1 )
-custom_icons/grabber = ExtResource( 1 )
-value = 50.0
+min_value = -50.0
+max_value = 50.0
 
 [node name="VolumeMusicValue" type="Label" parent="Control/VBoxContainer/GridContainer/VolumeMusicContainer"]
-margin_left = 168.0
+margin_left = 176.0
 margin_right = 200.0
 margin_bottom = 16.0
 size_flags_horizontal = 10
-text = "100%"
+text = "50%"
 
 [node name="VolumeSFXLabel" type="Label" parent="Control/VBoxContainer/GridContainer"]
-margin_top = 68.0
+margin_top = 60.0
 margin_right = 127.0
-margin_bottom = 84.0
+margin_bottom = 76.0
 text = "SFX Volume"
 
 [node name="VolumeSFXContainer" type="HBoxContainer" parent="Control/VBoxContainer/GridContainer"]
 margin_left = 131.0
-margin_top = 68.0
+margin_top = 60.0
 margin_right = 331.0
-margin_bottom = 84.0
+margin_bottom = 76.0
 
 [node name="VolumeSFXSlider" type="HSlider" parent="Control/VBoxContainer/GridContainer/VolumeSFXContainer"]
 margin_right = 150.0
 margin_bottom = 16.0
 rect_min_size = Vector2( 150, 0 )
-custom_icons/grabber_highlight = ExtResource( 1 )
-custom_icons/grabber = ExtResource( 1 )
-value = 50.0
+min_value = -50.0
+max_value = 50.0
 
 [node name="VolumeSFXValue" type="Label" parent="Control/VBoxContainer/GridContainer/VolumeSFXContainer"]
-margin_left = 168.0
+margin_left = 176.0
 margin_right = 200.0
 margin_bottom = 16.0
 size_flags_horizontal = 10
-text = "100%"
+text = "50%"
 
 [node name="ReturnButton" type="Button" parent="Control/VBoxContainer"]
-margin_top = 88.0
+margin_top = 80.0
 margin_right = 331.0
-margin_bottom = 110.0
+margin_bottom = 98.0
 text = "Return"
 
-[connection signal="pressed" from="Control/VBoxContainer/GridContainer/FullscreenCheckBox" to="." method="_on_FullscreenCheckBox_pressed"]
+[connection signal="toggled" from="Control/VBoxContainer/GridContainer/FullscreenCheckButton" to="." method="_on_FullscreenCheckButton_toggled"]
 [connection signal="value_changed" from="Control/VBoxContainer/GridContainer/VolumeMasterContainer/VolumeMasterSlider" to="." method="_on_VolumeMasterSlider_value_changed"]
 [connection signal="value_changed" from="Control/VBoxContainer/GridContainer/VolumeMusicContainer/VolumeMusicSlider" to="." method="_on_VolumeMusicSlider_value_changed"]
 [connection signal="value_changed" from="Control/VBoxContainer/GridContainer/VolumeSFXContainer/VolumeSFXSlider" to="." method="_on_VolumeSFXSlider_value_changed"]