From f1f8fefe0efb39e0954913c44414bc3bda495f91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robin=20H=C3=BCbner?= Date: Sat, 22 Sep 2018 21:42:03 +0200 Subject: [PATCH] add game options tab to options --- menus/main_menu.tscn | 2 +- menus/options_menu.tscn | 219 +++++++++++++++++++++++++++++++++++----- 2 files changed, 195 insertions(+), 26 deletions(-) diff --git a/menus/main_menu.tscn b/menus/main_menu.tscn index f4cf046..ad097a8 100644 --- a/menus/main_menu.tscn +++ b/menus/main_menu.tscn @@ -9,7 +9,7 @@ content_margin_right = -1.0 content_margin_top = -1.0 content_margin_bottom = -1.0 -[node name="main_menu" type="Control" index="0"] +[node name="main_menu" type="Control"] anchor_left = 0.0 anchor_top = 0.0 diff --git a/menus/options_menu.tscn b/menus/options_menu.tscn index 937fb0e..2bcef4d 100644 --- a/menus/options_menu.tscn +++ b/menus/options_menu.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=7 format=2] [ext_resource path="res://menus/options_menu.gd" type="Script" id=1] -[ext_resource path="res://menus/menu_button_normal.tres" type="StyleBox" id=2] +[ext_resource path="res://ui/dialog_box.tscn" type="PackedScene" id=2] +[ext_resource path="res://menus/menu_button_normal.tres" type="StyleBox" id=3] [sub_resource type="StyleBoxEmpty" id=1] @@ -10,6 +11,13 @@ content_margin_right = -1.0 content_margin_top = -1.0 content_margin_bottom = -1.0 +[sub_resource type="StyleBoxEmpty" id=3] + +content_margin_left = -1.0 +content_margin_right = -1.0 +content_margin_top = -1.0 +content_margin_bottom = -1.0 + [sub_resource type="StyleBoxFlat" id=2] content_margin_left = -1.0 @@ -39,13 +47,6 @@ anti_aliasing = true anti_aliasing_size = 1 _sections_unfolded = [ "Border", "Border Width", "Corner Radius", "Expand Margin" ] -[sub_resource type="StyleBoxEmpty" id=3] - -content_margin_left = -1.0 -content_margin_right = -1.0 -content_margin_top = -1.0 -content_margin_bottom = -1.0 - [node name="options_menu" type="Control" index="0"] anchor_left = 0.0 @@ -60,7 +61,9 @@ size_flags_horizontal = 1 size_flags_vertical = 1 script = ExtResource( 1 ) -[node name="split" type="VSplitContainer" parent="." index="0"] +[node name="dialog_box_test" parent="." index="0" instance=ExtResource( 2 )] + +[node name="split" type="VSplitContainer" parent="." index="1"] anchor_left = 0.0 anchor_top = 0.0 @@ -123,24 +126,174 @@ anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 margin_right = 1024.0 -margin_bottom = 342.0 +margin_bottom = 136.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 1 +mouse_default_cursor_shape = 0 +size_flags_horizontal = 1 +size_flags_vertical = 0 +alignment = 1 +_sections_unfolded = [ "Size Flags" ] + +[node name="game_opts" type="VBoxContainer" parent="split/opts_panel/panels" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 358.0 +margin_right = 448.0 +margin_bottom = 136.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 -alignment = 1 +alignment = 0 +_sections_unfolded = [ "Size Flags" ] -[node name="display_opts" type="VBoxContainer" parent="split/opts_panel/panels" index="0"] +[node name="game_title" type="Label" parent="split/opts_panel/panels/game_opts" index="0"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 413.0 -margin_right = 510.0 -margin_bottom = 342.0 +margin_right = 90.0 +margin_bottom = 14.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 2 +mouse_default_cursor_shape = 0 +size_flags_horizontal = 1 +size_flags_vertical = 4 +text = "game options" +percent_visible = 1.0 +lines_skipped = 0 +max_lines_visible = -1 + +[node name="game_sep" type="HSeparator" parent="split/opts_panel/panels/game_opts" index="1"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 18.0 +margin_right = 90.0 +margin_bottom = 22.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 0 +mouse_default_cursor_shape = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 + +[node name="read_speed_title" type="Label" parent="split/opts_panel/panels/game_opts" index="2"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 26.0 +margin_right = 90.0 +margin_bottom = 40.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 2 +mouse_default_cursor_shape = 0 +size_flags_horizontal = 1 +size_flags_vertical = 4 +text = "reading speed" +align = 1 +percent_visible = 1.0 +lines_skipped = 0 +max_lines_visible = -1 + +[node name="read_speed_slider" type="HSlider" parent="split/opts_panel/panels/game_opts" index="3"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 44.0 +margin_right = 90.0 +margin_bottom = 60.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +focus_mode = 2 +mouse_filter = 0 +mouse_default_cursor_shape = 0 +size_flags_horizontal = 1 +size_flags_vertical = 0 +min_value = 0.0 +max_value = 100.0 +step = 1.0 +page = 0.0 +value = 0.0 +exp_edit = false +rounded = false +editable = true +tick_count = 0 +ticks_on_borders = false +focus_mode = 2 + +[node name="read_speed_test" type="Button" parent="split/opts_panel/panels/game_opts" index="4"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 64.0 +margin_right = 90.0 +margin_bottom = 84.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +focus_mode = 2 +mouse_filter = 0 +mouse_default_cursor_shape = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 +custom_styles/focus = SubResource( 3 ) +custom_colors/font_color_disabled = Color( 0.472656, 0.472656, 0.472656, 1 ) +custom_colors/font_color = Color( 1, 1, 1, 1 ) +custom_colors/font_color_hover = Color( 0, 0, 0, 1 ) +custom_colors/font_color_pressed = Color( 1, 0.647059, 0, 1 ) +toggle_mode = false +enabled_focus_mode = 2 +shortcut = null +group = null +text = "test?" +flat = true +align = 0 +_sections_unfolded = [ "Rect", "Size Flags", "custom_colors", "custom_styles" ] + +[node name="vsep1" type="VSeparator" parent="split/opts_panel/panels" index="1"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 452.0 +margin_right = 456.0 +margin_bottom = 136.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 0 +mouse_default_cursor_shape = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 + +[node name="display_opts" type="VBoxContainer" parent="split/opts_panel/panels" index="2"] + +editor/display_folded = true +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 460.0 +margin_right = 557.0 +margin_bottom = 136.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 @@ -222,10 +375,10 @@ mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 custom_styles/hover = SubResource( 2 ) -custom_styles/pressed = ExtResource( 2 ) -custom_styles/focus = ExtResource( 2 ) -custom_styles/disabled = ExtResource( 2 ) -custom_styles/normal = ExtResource( 2 ) +custom_styles/pressed = ExtResource( 3 ) +custom_styles/focus = ExtResource( 3 ) +custom_styles/disabled = ExtResource( 3 ) +custom_styles/normal = ExtResource( 3 ) toggle_mode = false action_mode = 0 enabled_focus_mode = 0 @@ -237,15 +390,31 @@ align = 1 items = [ "1920x1080", null, 0, false, false, -1, 0, null, "", false ] _sections_unfolded = [ "custom_colors", "custom_constants", "custom_fonts", "custom_styles" ] -[node name="sound_opts" type="VBoxContainer" parent="split/opts_panel/panels" index="1"] +[node name="vsep2" type="VSeparator" parent="split/opts_panel/panels" index="3"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 514.0 -margin_right = 611.0 -margin_bottom = 342.0 +margin_left = 561.0 +margin_right = 565.0 +margin_bottom = 136.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 0 +mouse_default_cursor_shape = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 + +[node name="sound_opts" type="VBoxContainer" parent="split/opts_panel/panels" index="4"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 569.0 +margin_right = 666.0 +margin_bottom = 136.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 @@ -436,7 +605,7 @@ tick_count = 0 ticks_on_borders = false focus_mode = 2 -[node name="back_btn" type="Button" parent="." index="1"] +[node name="back_btn" type="Button" parent="." index="2"] anchor_left = 0.5 anchor_top = 0.5