Lurkars
/
MUR
1
0
Fork 0
Code Issues Pull Requests Releases 3 Wiki Activity
Browse Source

theming

Lurkars 6 years ago
parent
f4ce5953e4
commit
d5963a187c
9 changed files with 79 additions and 83 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      resources/ui/theme.tres
  2. 9
      scenes/menus/DirectHostMenu.tscn
  3. 16
      scenes/menus/IngameMenu.tscn
  4. 5
      scenes/menus/LobbyMenu.tscn
  5. 30
      scenes/menus/LocalGameMenu.tscn
  6. 35
      scenes/menus/MainMenu.tscn
  7. 21
      scenes/menus/MultiplayerMenu.tscn
  8. 27
      scenes/menus/SettingsMenu.tscn
  9. 10
      scenes/menus/SettingsPlayerMenu.tscn

9
resources/ui/theme.tres
View File

@ -1,7 +1,10 @@
[gd_resource type="Theme" load_steps=2 format=2]
[gd_resource type="Theme" load_steps=3 format=2]
[ext_resource path="res://resources/ui/font.tres" type="DynamicFont" id=1]
[sub_resource type="StyleBoxFlat" id=1]
bg_color = Color( 0.184314, 0.188235, 0.211765, 1 )
[resource]
default_font = ExtResource( 1 )
Button/colors/font_color = Color( 0.878431, 0.878431, 0.878431, 1 )
@ -15,6 +18,8 @@ Button/styles/focus = null
Button/styles/hover = null
Button/styles/normal = null
Button/styles/pressed = null
Icons/icons/close = null
Icons/icons/logo = null
ItemList/colors/font_color = Color( 0.627451, 0.627451, 0.627451, 1 )
ItemList/colors/font_color_selected = Color( 1, 1, 1, 1 )
ItemList/colors/guide_color = Color( 0, 0, 0, 0.1 )
@ -29,6 +34,6 @@ ItemList/styles/cursor = null
ItemList/styles/cursor_unfocused = null
ItemList/styles/selected = null
ItemList/styles/selected_focus = null
Panel/styles/panel = null
Panel/styles/panel = SubResource( 1 )
Panel/styles/panelf = null
Panel/styles/panelnc = null

9
scenes/menus/DirectHostMenu.tscn
View File

@ -30,20 +30,19 @@ margin_bottom = 53.5
grow_horizontal = 2
grow_vertical = 2
[node name="GridContainer" type="GridContainer" parent="menu"]
[node name="HBoxContainer" type="HBoxContainer" parent="menu"]
margin_left = 16.0
margin_top = 12.0
margin_right = 429.0
margin_bottom = 52.0
columns = 3
[node name="port_label" type="Label" parent="menu/GridContainer"]
[node name="port_label" type="Label" parent="menu/HBoxContainer"]
margin_top = 6.0
margin_right = 65.0
margin_bottom = 33.0
text = "PORT"
[node name="port" type="SpinBox" parent="menu/GridContainer"]
[node name="port" type="SpinBox" parent="menu/HBoxContainer"]
margin_left = 69.0
margin_right = 266.0
margin_bottom = 40.0
@ -54,7 +53,7 @@ max_value = 65535.0
value = 8128.0
align = 2
[node name="bots" type="CheckButton" parent="menu/GridContainer"]
[node name="bots" type="CheckButton" parent="menu/HBoxContainer"]
margin_left = 270.0
margin_right = 413.0
margin_bottom = 40.0

16
scenes/menus/IngameMenu.tscn
View File

@ -26,11 +26,11 @@ margin_bottom = 100.5
grow_horizontal = 2
grow_vertical = 2
[node name="GridContainer" type="GridContainer" parent="menu"]
[node name="VBoxContainer" type="VBoxContainer" parent="menu"]
anchor_right = 1.0
anchor_bottom = 1.0
[node name="resume" type="Button" parent="menu/GridContainer"]
[node name="resume" type="Button" parent="menu/VBoxContainer"]
margin_right = 310.0
margin_bottom = 64.0
focus_neighbour_top = NodePath("../end")
@ -41,7 +41,7 @@ text = "RESUME"
icon = ExtResource( 3 )
flat = true
[node name="settings" type="Button" parent="menu/GridContainer"]
[node name="settings" type="Button" parent="menu/VBoxContainer"]
margin_top = 68.0
margin_right = 310.0
margin_bottom = 132.0
@ -53,10 +53,10 @@ text = "SETTINGS"
icon = ExtResource( 4 )
flat = true
[node name="end" type="Button" parent="menu/GridContainer"]
[node name="end" type="Button" parent="menu/VBoxContainer"]
margin_top = 136.0
margin_right = 310.0
margin_bottom = 200.0
margin_bottom = 201.0
focus_neighbour_top = NodePath("../settings")
focus_neighbour_bottom = NodePath(".")
size_flags_horizontal = 3
@ -64,6 +64,6 @@ size_flags_vertical = 3
text = "END_GAME"
icon = ExtResource( 5 )
flat = true
[connection signal="pressed" from="menu/GridContainer/resume" to="." method="_on_resume_pressed"]
[connection signal="pressed" from="menu/GridContainer/settings" to="." method="_on_settings_pressed"]
[connection signal="pressed" from="menu/GridContainer/end" to="." method="_on_end_pressed"]
[connection signal="pressed" from="menu/VBoxContainer/resume" to="." method="_on_resume_pressed"]
[connection signal="pressed" from="menu/VBoxContainer/settings" to="." method="_on_settings_pressed"]
[connection signal="pressed" from="menu/VBoxContainer/end" to="." method="_on_end_pressed"]

5
scenes/menus/LobbyMenu.tscn
View File

@ -27,12 +27,11 @@ script = ExtResource( 2 )
[node name="back" parent="menu" index="0"]
focus_neighbour_right = NodePath("../ready")
[node name="top_bar" type="GridContainer" parent="menu"]
[node name="top_bar" type="HBoxContainer" parent="menu"]
margin_left = 14.0
margin_top = 12.0
margin_right = 940.0
margin_bottom = 52.0
columns = 2
[node name="server_name" type="Label" parent="menu/top_bar"]
margin_right = 779.0
@ -59,6 +58,7 @@ margin_bottom = 397.0
columns = 3
[node name="players" type="ItemList" parent="menu/mid"]
editor/display_folded = true
margin_right = 456.0
margin_bottom = 340.0
size_flags_horizontal = 3
@ -81,6 +81,7 @@ margin_right = 464.0
margin_bottom = 340.0
[node name="player_settings" parent="menu/mid" instance=ExtResource( 6 )]
editor/display_folded = true
margin_left = 468.0
margin_top = 0.0
margin_right = 924.0

30
scenes/menus/LocalGameMenu.tscn
View File

@ -29,41 +29,19 @@ margin_bottom = 130.5
grow_horizontal = 2
grow_vertical = 2
[node name="GridContainer" type="GridContainer" parent="menu"]
[node name="VBoxContainer" type="VBoxContainer" parent="menu"]
margin_left = 19.0
margin_top = 21.0
margin_right = 418.0
margin_bottom = 197.0
[node name="player_settings" parent="menu/GridContainer" instance=ExtResource( 3 )]
[node name="player_settings" parent="menu/VBoxContainer" instance=ExtResource( 3 )]
margin_left = 0.0
margin_top = 0.0
margin_right = 399.0
margin_bottom = 132.0
[node name="name_label" parent="menu/GridContainer/player_settings/GridContainer" index="0"]
margin_right = 399.0
margin_bottom = 27.0
[node name="name" parent="menu/GridContainer/player_settings/GridContainer" index="1"]
margin_top = 31.0
margin_right = 399.0
margin_bottom = 68.0
focus_neighbour_bottom = NodePath("../color")
[node name="color_label" parent="menu/GridContainer/player_settings/GridContainer" index="2"]
margin_top = 72.0
margin_right = 399.0
margin_bottom = 99.0
[node name="color" parent="menu/GridContainer/player_settings/GridContainer" index="3"]
margin_top = 103.0
margin_right = 399.0
margin_bottom = 136.0
focus_neighbour_top = NodePath("../name")
focus_neighbour_bottom = NodePath("../../../bots")
[node name="bots" type="CheckButton" parent="menu/GridContainer"]
[node name="bots" type="CheckButton" parent="menu/VBoxContainer"]
margin_top = 136.0
margin_right = 143.0
margin_bottom = 176.0
@ -104,5 +82,3 @@ icon = ExtResource( 6 )
flat = true
[connection signal="pressed" from="menu/start" to="." method="_on_start_pressed"]
[connection signal="pressed" from="menu/back" to="." method="_on_back_pressed"]
[editable path="menu/GridContainer/player_settings"]

35
scenes/menus/MainMenu.tscn
View File

@ -1,4 +1,4 @@
[gd_scene load_steps=7 format=2]
[gd_scene load_steps=8 format=2]
[ext_resource path="res://resources/ui/theme.tres" type="Theme" id=1]
[ext_resource path="res://scripts/menus/main.gd" type="Script" id=2]
@ -6,6 +6,7 @@
[ext_resource path="res://assets/icons/singleplayer.png" type="Texture" id=4]
[ext_resource path="res://assets/icons/wrench.png" type="Texture" id=5]
[ext_resource path="res://assets/icons/power.png" type="Texture" id=6]
[ext_resource path="res://assets/icons/question.png" type="Texture" id=7]
[node name="main_menu" type="Control"]
anchor_right = 1.0
@ -27,11 +28,11 @@ margin_bottom = 132.5
grow_horizontal = 2
grow_vertical = 2
[node name="GridContainer" type="GridContainer" parent="menu"]
[node name="VBoxContainer" type="VBoxContainer" parent="menu"]
anchor_right = 1.0
anchor_bottom = 1.0
[node name="multiplayer" type="Button" parent="menu/GridContainer"]
[node name="multiplayer" type="Button" parent="menu/VBoxContainer"]
margin_right = 310.0
margin_bottom = 63.0
focus_neighbour_top = NodePath("../quit")
@ -42,7 +43,7 @@ text = "MULTIPLAYER"
icon = ExtResource( 3 )
flat = true
[node name="practice" type="Button" parent="menu/GridContainer"]
[node name="practice" type="Button" parent="menu/VBoxContainer"]
margin_top = 67.0
margin_right = 310.0
margin_bottom = 130.0
@ -54,7 +55,7 @@ text = "PRACTISE"
icon = ExtResource( 4 )
flat = true
[node name="settings" type="Button" parent="menu/GridContainer"]
[node name="settings" type="Button" parent="menu/VBoxContainer"]
margin_top = 134.0
margin_right = 310.0
margin_bottom = 197.0
@ -66,10 +67,10 @@ text = "SETTINGS"
icon = ExtResource( 5 )
flat = true
[node name="quit" type="Button" parent="menu/GridContainer"]
[node name="quit" type="Button" parent="menu/VBoxContainer"]
margin_top = 201.0
margin_right = 310.0
margin_bottom = 264.0
margin_bottom = 265.0
focus_neighbour_top = NodePath("../settings")
focus_neighbour_bottom = NodePath("../multiplayer")
size_flags_horizontal = 3
@ -83,8 +84,18 @@ margin_right = 138.0
margin_bottom = 84.0
window_title = "ALERT"
dialog_text = "Server disconnected!"
[connection signal="pressed" from="menu/GridContainer/multiplayer" to="." method="_on_multiplayer_pressed"]
[connection signal="pressed" from="menu/GridContainer/multiplayer" to="." method="_on_online_pressed"]
[connection signal="pressed" from="menu/GridContainer/practice" to="." method="_on_practice_pressed"]
[connection signal="pressed" from="menu/GridContainer/settings" to="." method="_on_settings_pressed"]
[connection signal="pressed" from="menu/GridContainer/quit" to="." method="_on_quit_pressed"]
[node name="Button" type="Button" parent="."]
anchor_left = 1.0
anchor_top = 1.0
anchor_right = 1.0
anchor_bottom = 1.0
margin_left = -62.0
margin_top = -56.0
icon = ExtResource( 7 )
flat = true
[connection signal="pressed" from="menu/VBoxContainer/multiplayer" to="." method="_on_multiplayer_pressed"]
[connection signal="pressed" from="menu/VBoxContainer/multiplayer" to="." method="_on_online_pressed"]
[connection signal="pressed" from="menu/VBoxContainer/practice" to="." method="_on_practice_pressed"]
[connection signal="pressed" from="menu/VBoxContainer/settings" to="." method="_on_settings_pressed"]
[connection signal="pressed" from="menu/VBoxContainer/quit" to="." method="_on_quit_pressed"]

21
scenes/menus/MultiplayerMenu.tscn
View File

@ -27,12 +27,11 @@ script = ExtResource( 2 )
focus_neighbour_top = NodePath("../games")
focus_neighbour_right = NodePath("../bottom_bar/refresh")
[node name="top_bar" type="GridContainer" parent="menu"]
[node name="HBoxContainer" type="HBoxContainer" parent="menu"]
anchor_right = 1.0
margin_bottom = 56.0
columns = 3
[node name="direct_host" type="Button" parent="menu/top_bar"]
[node name="direct_host" type="Button" parent="menu/HBoxContainer"]
margin_right = 239.0
margin_bottom = 56.0
focus_neighbour_right = NodePath("../direct_join")
@ -41,7 +40,7 @@ text = "DIRECT_HOST"
icon = ExtResource( 4 )
flat = true
[node name="direct_join" type="Button" parent="menu/top_bar"]
[node name="direct_join" type="Button" parent="menu/HBoxContainer"]
margin_left = 243.0
margin_right = 473.0
margin_bottom = 56.0
@ -52,7 +51,7 @@ text = "DIRECT_JOIN"
icon = ExtResource( 5 )
flat = true
[node name="open" type="CheckButton" parent="menu/top_bar"]
[node name="open" type="CheckButton" parent="menu/HBoxContainer"]
margin_left = 477.0
margin_right = 945.0
margin_bottom = 56.0
@ -90,14 +89,16 @@ margin_right = 12.0
margin_bottom = 33.0
icon = ExtResource( 8 )
[node name="bottom_bar" type="GridContainer" parent="menu"]
[node name="bottom_bar" type="HBoxContainer" parent="menu"]
anchor_top = 1.0
anchor_right = 1.0
anchor_bottom = 1.0
margin_left = 380.0
margin_top = -56.0
grow_horizontal = 0
columns = 3
size_flags_horizontal = 6
size_flags_vertical = 6
alignment = 2
[node name="refresh" type="Button" parent="menu/bottom_bar"]
margin_right = 183.0
@ -146,9 +147,9 @@ wait_time = 5.0
autostart = true
[connection signal="draw" from="." to="." method="_on_multiplayer_menu_draw"]
[connection signal="hide" from="." to="." method="_on_multiplayer_menu_hide"]
[connection signal="pressed" from="menu/top_bar/direct_host" to="." method="_on_direct_host_pressed"]
[connection signal="pressed" from="menu/top_bar/direct_join" to="." method="_on_direct_join_pressed"]
[connection signal="toggled" from="menu/top_bar/open" to="." method="_on_open_toggled"]
[connection signal="pressed" from="menu/HBoxContainer/direct_host" to="." method="_on_direct_host_pressed"]
[connection signal="pressed" from="menu/HBoxContainer/direct_join" to="." method="_on_direct_join_pressed"]
[connection signal="toggled" from="menu/HBoxContainer/open" to="." method="_on_open_toggled"]
[connection signal="item_selected" from="menu/games" to="." method="_on_games_item_selected"]
[connection signal="nothing_selected" from="menu/games" to="." method="_on_games_nothing_selected"]
[connection signal="pressed" from="menu/bottom_bar/refresh" to="." method="_on_refresh_pressed"]

27
scenes/menus/SettingsMenu.tscn
View File

@ -36,6 +36,7 @@ size_flags_vertical = 3
tab_align = 0
[node name="game" type="Tabs" parent="menu/tabs"]
editor/display_folded = true
anchor_right = 1.0
anchor_bottom = 1.0
margin_left = 4.0
@ -55,21 +56,21 @@ margin_top = 0.0
margin_right = 407.0
margin_bottom = 146.0
[node name="name_label" parent="menu/tabs/game/GridContainer/settings_player/GridContainer" index="0"]
[node name="name_label" parent="menu/tabs/game/GridContainer/settings_player/VBoxContainer" index="0"]
margin_right = 407.0
margin_bottom = 27.0
[node name="name" parent="menu/tabs/game/GridContainer/settings_player/GridContainer" index="1"]
[node name="name" parent="menu/tabs/game/GridContainer/settings_player/VBoxContainer" index="1"]
margin_top = 31.0
margin_right = 407.0
margin_bottom = 68.0
[node name="color_label" parent="menu/tabs/game/GridContainer/settings_player/GridContainer" index="2"]
[node name="color_label" parent="menu/tabs/game/GridContainer/settings_player/VBoxContainer" index="2"]
margin_top = 72.0
margin_right = 407.0
margin_bottom = 99.0
[node name="color" parent="menu/tabs/game/GridContainer/settings_player/GridContainer" index="3"]
[node name="color" parent="menu/tabs/game/GridContainer/settings_player/VBoxContainer" index="3"]
margin_top = 103.0
margin_right = 407.0
margin_bottom = 136.0
@ -83,6 +84,7 @@ size_flags_vertical = 0
text = "Bots"
[node name="controls" type="Tabs" parent="menu/tabs"]
editor/display_folded = true
visible = false
anchor_right = 1.0
anchor_bottom = 1.0
@ -113,6 +115,7 @@ margin_right = -4.0
margin_bottom = -4.0
[node name="system" type="Tabs" parent="menu/tabs"]
editor/display_folded = true
visible = false
anchor_right = 1.0
anchor_bottom = 1.0
@ -167,7 +170,7 @@ margin_top = 72.0
margin_right = 895.0
margin_bottom = 109.0
[node name="GridContainer" type="GridContainer" parent="menu"]
[node name="HBoxContainer" type="HBoxContainer" parent="menu"]
anchor_left = 1.0
anchor_top = 1.0
anchor_right = 1.0
@ -176,11 +179,11 @@ margin_left = -286.0
margin_top = -56.0
grow_horizontal = 0
grow_vertical = 0
size_flags_horizontal = 10
size_flags_vertical = 10
columns = 2
size_flags_horizontal = 8
size_flags_vertical = 8
alignment = 2
[node name="apply" type="Button" parent="menu/GridContainer"]
[node name="apply" type="Button" parent="menu/HBoxContainer"]
margin_right = 150.0
margin_bottom = 56.0
grow_horizontal = 0
@ -192,7 +195,7 @@ icon = ExtResource( 6 )
flat = true
align = 0
[node name="save" type="Button" parent="menu/GridContainer"]
[node name="save" type="Button" parent="menu/HBoxContainer"]
margin_left = 154.0
margin_right = 286.0
margin_bottom = 56.0
@ -207,8 +210,8 @@ align = 0
[connection signal="item_selected" from="menu/tabs/system/GridContainer/locales" to="." method="_on_locales_item_selected"]
[connection signal="tree_exiting" from="menu/tabs/system/GridContainer/locales" to="." method="_on_locales_tree_exiting"]
[connection signal="visibility_changed" from="menu/tabs/system/GridContainer/locales" to="." method="_init_locales"]
[connection signal="pressed" from="menu/GridContainer/apply" to="." method="_on_apply_pressed"]
[connection signal="pressed" from="menu/GridContainer/save" to="." method="_on_save_pressed"]
[connection signal="pressed" from="menu/HBoxContainer/apply" to="." method="_on_apply_pressed"]
[connection signal="pressed" from="menu/HBoxContainer/save" to="." method="_on_save_pressed"]
[editable path="menu"]

10
scenes/menus/SettingsPlayerMenu.tscn
View File

@ -11,28 +11,28 @@ size_flags_horizontal = 3
size_flags_vertical = 3
script = ExtResource( 1 )
[node name="GridContainer" type="GridContainer" parent="."]
[node name="VBoxContainer" type="VBoxContainer" parent="."]
anchor_right = 1.0
anchor_bottom = 1.0
[node name="name_label" type="Label" parent="GridContainer"]
[node name="name_label" type="Label" parent="VBoxContainer"]
margin_right = 365.0
margin_bottom = 14.0
text = "PLAYER_NAME"
[node name="name" type="LineEdit" parent="GridContainer"]
[node name="name" type="LineEdit" parent="VBoxContainer"]
margin_top = 18.0
margin_right = 365.0
margin_bottom = 42.0
size_flags_horizontal = 3
[node name="color_label" type="Label" parent="GridContainer"]
[node name="color_label" type="Label" parent="VBoxContainer"]
margin_top = 46.0
margin_right = 365.0
margin_bottom = 60.0
text = "PLAYER_COLOR"
[node name="color" type="ColorPickerButton" parent="GridContainer"]
[node name="color" type="ColorPickerButton" parent="VBoxContainer"]
margin_top = 64.0
margin_right = 365.0
margin_bottom = 84.0

Write Preview
Loading…
Cancel
Save