Skip to content

Commit 3ebf874

Browse files
Updated UIv3
1 parent db44097 commit 3ebf874

11 files changed

+261
-32
lines changed

StatusBar.gd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ var _quick_access_config: Array = [
1717
{
1818
"panel": Interface.panels.Programmer,
1919
"icon": load("res://assets/icons/Programmer.svg"),
20-
"size": Vector2.ZERO
20+
"size": Vector2.ZERO,
2121
},
2222
{
2323
"panel": Interface.panels.Fixtures,

UIv3.tscn

Lines changed: 128 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,139 @@
1-
[gd_scene load_steps=5 format=3 uid="uid://d00fmrh7nbaua"]
1+
[gd_scene load_steps=15 format=3 uid="uid://d00fmrh7nbaua"]
22

3+
[ext_resource type="Texture2D" uid="uid://cvungxgp24msc" path="res://assets/other/Screen Shot 2025-07-18 at 3.17.51 PM.png" id="1_7y6be"]
4+
[ext_resource type="Texture2D" uid="uid://rqf8w11gk6ud" path="res://assets/icons/Edit.svg" id="1_aoeir"]
35
[ext_resource type="PackedScene" uid="uid://bsxgp5g0jmyke" path="res://panels/Desk/Desk.tscn" id="1_mfxly"]
46
[ext_resource type="Script" uid="uid://5twbcqrk7as1" path="res://StatusBar.gd" id="2_pj23w"]
7+
[ext_resource type="FontFile" uid="uid://cn86ussko5res" path="res://assets/font/IntelOneMono-VariableFont_wght.ttf" id="3_opnnr"]
58
[ext_resource type="LabelSettings" uid="uid://ci6veq1d2x5c4" path="res://assets/styles/DimText.tres" id="3_pj23w"]
69

7-
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_pj23w"]
8-
content_margin_left = 5.0
9-
content_margin_top = 5.0
10-
content_margin_right = 5.0
11-
content_margin_bottom = 5.0
10+
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_opnnr"]
1211
bg_color = Color(0.140447, 0.140447, 0.140447, 1)
1312
border_color = Color(0.309804, 0.309804, 0.309804, 1)
1413
corner_radius_top_left = 5
1514
corner_radius_top_right = 5
1615
corner_radius_bottom_right = 5
1716
corner_radius_bottom_left = 5
1817

18+
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_aoeir"]
19+
content_margin_top = 12.0
20+
content_margin_bottom = 12.0
21+
bg_color = Color(0.188067, 0.188067, 0.188067, 1)
22+
border_color = Color(0.309804, 0.309804, 0.309804, 1)
23+
corner_radius_top_left = 5
24+
corner_radius_top_right = 5
25+
corner_radius_bottom_right = 5
26+
corner_radius_bottom_left = 5
27+
28+
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_7y6be"]
29+
content_margin_left = 0.0
30+
content_margin_top = 0.0
31+
content_margin_right = 0.0
32+
content_margin_bottom = 0.0
33+
bg_color = Color(0.136826, 0.136826, 0.136826, 1)
34+
border_color = Color(0.309804, 0.309804, 0.309804, 1)
35+
corner_radius_top_left = 5
36+
corner_radius_top_right = 5
37+
corner_radius_bottom_right = 5
38+
corner_radius_bottom_left = 5
39+
40+
[sub_resource type="LabelSettings" id="LabelSettings_17i08"]
41+
font_size = 11
42+
43+
[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_aoeir"]
44+
45+
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_pj23w"]
46+
content_margin_left = 12.0
47+
content_margin_top = 12.0
48+
content_margin_right = 12.0
49+
content_margin_bottom = 12.0
50+
bg_color = Color(0.188067, 0.188067, 0.188067, 1)
51+
border_color = Color(0.309804, 0.309804, 0.309804, 1)
52+
corner_radius_top_left = 5
53+
corner_radius_top_right = 5
54+
corner_radius_bottom_right = 5
55+
corner_radius_bottom_left = 5
56+
57+
[sub_resource type="FontVariation" id="FontVariation_aoeir"]
58+
base_font = ExtResource("3_opnnr")
59+
variation_embolden = 0.94
60+
61+
[sub_resource type="LabelSettings" id="LabelSettings_7y6be"]
62+
font = SubResource("FontVariation_aoeir")
63+
font_color = Color(0.789062, 0.789062, 0.789062, 1)
64+
1965
[node name="UIv3" type="PanelContainer"]
2066
anchors_preset = 15
2167
anchor_right = 1.0
2268
anchor_bottom = 1.0
2369
grow_horizontal = 2
2470
grow_vertical = 2
25-
theme_override_styles/panel = SubResource("StyleBoxFlat_pj23w")
71+
theme_override_styles/panel = SubResource("StyleBoxFlat_opnnr")
2672

2773
[node name="VBoxContainer" type="VBoxContainer" parent="."]
2874
layout_mode = 2
75+
size_flags_horizontal = 3
2976

30-
[node name="Desk" parent="VBoxContainer" instance=ExtResource("1_mfxly")]
77+
[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]
3178
layout_mode = 2
3279
size_flags_vertical = 3
3380

81+
[node name="PanelContainer" type="PanelContainer" parent="VBoxContainer/HBoxContainer"]
82+
custom_minimum_size = Vector2(64, 0)
83+
layout_mode = 2
84+
theme_override_styles/panel = SubResource("StyleBoxFlat_aoeir")
85+
86+
[node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer/HBoxContainer/PanelContainer"]
87+
layout_mode = 2
88+
89+
[node name="PanelContainer" type="PanelContainer" parent="VBoxContainer/HBoxContainer/PanelContainer/VBoxContainer"]
90+
layout_mode = 2
91+
size_flags_vertical = 3
92+
93+
[node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer/HBoxContainer/PanelContainer/VBoxContainer/PanelContainer"]
94+
layout_mode = 2
95+
96+
[node name="PanelContainer" type="PanelContainer" parent="VBoxContainer/HBoxContainer/PanelContainer/VBoxContainer/PanelContainer/VBoxContainer"]
97+
clip_children = 2
98+
layout_mode = 2
99+
theme_override_styles/panel = SubResource("StyleBoxFlat_7y6be")
100+
101+
[node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer/HBoxContainer/PanelContainer/VBoxContainer/PanelContainer/VBoxContainer/PanelContainer"]
102+
layout_mode = 2
103+
104+
[node name="TextureRect" type="TextureRect" parent="VBoxContainer/HBoxContainer/PanelContainer/VBoxContainer/PanelContainer/VBoxContainer/PanelContainer/VBoxContainer"]
105+
custom_minimum_size = Vector2(0, 26.06)
106+
layout_mode = 2
107+
texture = ExtResource("1_7y6be")
108+
expand_mode = 1
109+
stretch_mode = 6
110+
111+
[node name="Label" type="Label" parent="VBoxContainer/HBoxContainer/PanelContainer/VBoxContainer/PanelContainer/VBoxContainer/PanelContainer/VBoxContainer"]
112+
layout_mode = 2
113+
text = "TAB1"
114+
label_settings = SubResource("LabelSettings_17i08")
115+
horizontal_alignment = 1
116+
vertical_alignment = 1
117+
118+
[node name="Edit" type="Button" parent="VBoxContainer/HBoxContainer/PanelContainer/VBoxContainer"]
119+
layout_mode = 2
120+
size_flags_horizontal = 4
121+
size_flags_vertical = 8
122+
toggle_mode = true
123+
icon = ExtResource("1_aoeir")
124+
125+
[node name="Desk" parent="VBoxContainer/HBoxContainer" instance=ExtResource("1_mfxly")]
126+
layout_mode = 2
127+
size_flags_horizontal = 3
128+
size_flags_vertical = 3
129+
theme_override_styles/panel = SubResource("StyleBoxEmpty_aoeir")
130+
131+
[node name="PanelContainer" parent="VBoxContainer/HBoxContainer/Desk/VBoxContainer" index="0"]
132+
visible = false
133+
34134
[node name="StatusBar" type="PanelContainer" parent="VBoxContainer" node_paths=PackedStringArray("_version_label", "_quick_access_container")]
35135
layout_mode = 2
136+
theme_override_styles/panel = SubResource("StyleBoxFlat_pj23w")
36137
script = ExtResource("2_pj23w")
37138
_version_label = NodePath("HBoxContainer/VersionLabel")
38139
_quick_access_container = NodePath("HBoxContainer/QuickAccessContainer")
@@ -42,9 +143,27 @@ layout_mode = 2
42143

43144
[node name="QuickAccessContainer" type="HBoxContainer" parent="VBoxContainer/StatusBar/HBoxContainer"]
44145
layout_mode = 2
146+
theme_override_constants/separation = 6
45147

46-
[node name="VersionLabel" type="Label" parent="VBoxContainer/StatusBar/HBoxContainer"]
148+
[node name="PanelContainer" type="PanelContainer" parent="VBoxContainer/StatusBar/HBoxContainer"]
149+
custom_minimum_size = Vector2(700, 0)
47150
layout_mode = 2
48151
size_flags_horizontal = 10
152+
153+
[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer/StatusBar/HBoxContainer/PanelContainer"]
154+
layout_mode = 2
155+
156+
[node name="Label" type="Label" parent="VBoxContainer/StatusBar/HBoxContainer/PanelContainer/HBoxContainer"]
157+
layout_mode = 2
158+
text = "Info: Set ActiveMode on \"NGH Show\""
159+
label_settings = SubResource("LabelSettings_7y6be")
160+
161+
[node name="VersionLabel" type="Label" parent="VBoxContainer/StatusBar/HBoxContainer"]
162+
layout_mode = 2
163+
size_flags_horizontal = 8
49164
text = "dasdasd"
50165
label_settings = ExtResource("3_pj23w")
166+
167+
[connection signal="toggled" from="VBoxContainer/HBoxContainer/PanelContainer/VBoxContainer/Edit" to="VBoxContainer/HBoxContainer/Desk" method="set_edit_mode"]
168+
169+
[editable path="VBoxContainer/HBoxContainer/Desk"]
150 KB
Binary file not shown.
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
[remap]
2+
3+
importer="font_data_dynamic"
4+
type="FontFile"
5+
uid="uid://cn86ussko5res"
6+
path="res://.godot/imported/IntelOneMono-VariableFont_wght.ttf-88b62c1403ced30f04319b6b253e0da7.fontdata"
7+
8+
[deps]
9+
10+
source_file="res://assets/font/IntelOneMono-VariableFont_wght.ttf"
11+
dest_files=["res://.godot/imported/IntelOneMono-VariableFont_wght.ttf-88b62c1403ced30f04319b6b253e0da7.fontdata"]
12+
13+
[params]
14+
15+
Rendering=null
16+
antialiasing=1
17+
generate_mipmaps=false
18+
disable_embedded_bitmaps=true
19+
multichannel_signed_distance_field=false
20+
msdf_pixel_range=8
21+
msdf_size=48
22+
allow_system_fallback=true
23+
force_autohinter=false
24+
hinting=1
25+
subpixel_positioning=4
26+
keep_rounding_remainders=true
27+
oversampling=0.0
28+
Fallbacks=null
29+
fallbacks=[]
30+
Compress=null
31+
compress=true
32+
preload=[]
33+
language_support={}
34+
script_support={}
35+
opentype_features={}
204 KB
Binary file not shown.
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
[remap]
2+
3+
importer="font_data_dynamic"
4+
type="FontFile"
5+
uid="uid://bp0rn6rs2chy1"
6+
path="res://.godot/imported/SourceCodePro-VariableFont_wght.ttf-660a8b39808daa6fa4e7d4d38c4324e2.fontdata"
7+
8+
[deps]
9+
10+
source_file="res://assets/font/SourceCodePro-VariableFont_wght.ttf"
11+
dest_files=["res://.godot/imported/SourceCodePro-VariableFont_wght.ttf-660a8b39808daa6fa4e7d4d38c4324e2.fontdata"]
12+
13+
[params]
14+
15+
Rendering=null
16+
antialiasing=1
17+
generate_mipmaps=false
18+
disable_embedded_bitmaps=true
19+
multichannel_signed_distance_field=false
20+
msdf_pixel_range=8
21+
msdf_size=48
22+
allow_system_fallback=true
23+
force_autohinter=false
24+
hinting=1
25+
subpixel_positioning=4
26+
keep_rounding_remainders=true
27+
oversampling=0.0
28+
Fallbacks=null
29+
fallbacks=[]
30+
Compress=null
31+
compress=true
32+
preload=[]
33+
language_support={}
34+
script_support={}
35+
opentype_features={}
169 KB
Loading
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
[remap]
2+
3+
importer="texture"
4+
type="CompressedTexture2D"
5+
uid="uid://cvungxgp24msc"
6+
path="res://.godot/imported/Screen Shot 2025-07-18 at 3.17.51 PM.png-f50e73774e18d11963f677854a589b0f.ctex"
7+
metadata={
8+
"vram_texture": false
9+
}
10+
11+
[deps]
12+
13+
source_file="res://assets/other/Screen Shot 2025-07-18 at 3.17.51 PM.png"
14+
dest_files=["res://.godot/imported/Screen Shot 2025-07-18 at 3.17.51 PM.png-f50e73774e18d11963f677854a589b0f.ctex"]
15+
16+
[params]
17+
18+
compress/mode=0
19+
compress/high_quality=false
20+
compress/lossy_quality=0.7
21+
compress/hdr_compression=1
22+
compress/normal_map=0
23+
compress/channel_pack=0
24+
mipmaps/generate=false
25+
mipmaps/limit=-1
26+
roughness/mode=0
27+
roughness/src_normal=""
28+
process/fix_alpha_border=true
29+
process/premult_alpha=false
30+
process/normal_map_invert_y=false
31+
process/hdr_as_srgb=false
32+
process/hdr_clamp_exposure=false
33+
process/size_limit=0
34+
detect_3d/compress_to=1

panels/Programmer/Programmer.tscn

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ _control_tab_button = NodePath("VBoxContainer/PanelContainer/HBoxContainer/Panel
4343
_parameter_container = NodePath("VBoxContainer/ScrollContainer/HBoxContainer")
4444
button_group = SubResource("ButtonGroup_alch7")
4545
save_to_scene = NodePath("VBoxContainer/PanelContainer2/HBoxContainer/SaveToScene")
46-
zone_select = NodePath("VBoxContainer/PanelContainer2/HBoxContainer/ZoneSelect")
46+
zone_select = NodePath("VBoxContainer/PanelContainer/HBoxContainer/PanelContainer2/HBoxContainer/ZoneSelect")
4747
edit_controls = NodePath("VBoxContainer/PanelContainer/HBoxContainer/EditControls")
4848

4949
[node name="VBoxContainer" type="VBoxContainer" parent="."]
@@ -141,14 +141,35 @@ layout_mode = 2
141141
[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer/PanelContainer/HBoxContainer/PanelContainer2"]
142142
layout_mode = 2
143143

144+
[node name="ZoneSelect" type="OptionButton" parent="VBoxContainer/PanelContainer/HBoxContainer/PanelContainer2/HBoxContainer"]
145+
custom_minimum_size = Vector2(150, 0)
146+
layout_mode = 2
147+
size_flags_horizontal = 10
148+
tooltip_text = "Zone Select"
149+
selected = 0
150+
item_count = 1
151+
popup/item_0/text = "Zone"
152+
popup/item_0/id = 0
153+
popup/item_0/separator = true
154+
155+
[node name="RandomMode" type="OptionButton" parent="VBoxContainer/PanelContainer/HBoxContainer/PanelContainer2/HBoxContainer"]
156+
layout_mode = 2
157+
size_flags_horizontal = 8
158+
tooltip_text = "Random Mode"
159+
selected = 0
160+
item_count = 2
161+
popup/item_0/text = "All"
162+
popup/item_0/id = 0
163+
popup/item_1/text = "Individual"
164+
popup/item_1/id = 1
165+
144166
[node name="Erace" type="Button" parent="VBoxContainer/PanelContainer/HBoxContainer/PanelContainer2/HBoxContainer"]
145167
layout_mode = 2
146168
icon = ExtResource("5_rgg0j")
147169

148170
[node name="EditControls" parent="VBoxContainer/PanelContainer/HBoxContainer" instance=ExtResource("5_uwux3")]
149171
layout_mode = 2
150172
show_edit = false
151-
show_settings = false
152173

153174
[node name="ScrollContainer" type="ScrollContainer" parent="VBoxContainer"]
154175
layout_mode = 2
@@ -159,6 +180,7 @@ layout_mode = 2
159180
size_flags_vertical = 3
160181

161182
[node name="PanelContainer2" type="PanelContainer" parent="VBoxContainer"]
183+
visible = false
162184
layout_mode = 2
163185
theme_override_styles/panel = ExtResource("7_recjq")
164186

@@ -172,24 +194,7 @@ tooltip_text = "Save To Scene
172194
disabled = true
173195
icon = ExtResource("8_aimxs")
174196

175-
[node name="ZoneSelect" type="OptionButton" parent="VBoxContainer/PanelContainer2/HBoxContainer"]
176-
custom_minimum_size = Vector2(150, 0)
177-
layout_mode = 2
178-
size_flags_horizontal = 10
179-
tooltip_text = "Zone Select"
180-
181-
[node name="RandomMode" type="OptionButton" parent="VBoxContainer/PanelContainer2/HBoxContainer"]
182-
layout_mode = 2
183-
size_flags_horizontal = 8
184-
tooltip_text = "Random Mode"
185-
selected = 0
186-
item_count = 2
187-
popup/item_0/text = "All"
188-
popup/item_0/id = 0
189-
popup/item_1/text = "Individual"
190-
popup/item_1/id = 1
191-
197+
[connection signal="item_selected" from="VBoxContainer/PanelContainer/HBoxContainer/PanelContainer2/HBoxContainer/ZoneSelect" to="." method="_on_zone_select_item_selected"]
198+
[connection signal="item_selected" from="VBoxContainer/PanelContainer/HBoxContainer/PanelContainer2/HBoxContainer/RandomMode" to="." method="_on_random_mode_item_selected"]
192199
[connection signal="pressed" from="VBoxContainer/PanelContainer/HBoxContainer/PanelContainer2/HBoxContainer/Erace" to="." method="_on_erace_pressed"]
193200
[connection signal="pressed" from="VBoxContainer/PanelContainer2/HBoxContainer/SaveToScene" to="." method="_on_save_to_scene_pressed"]
194-
[connection signal="item_selected" from="VBoxContainer/PanelContainer2/HBoxContainer/ZoneSelect" to="." method="_on_zone_select_item_selected"]
195-
[connection signal="item_selected" from="VBoxContainer/PanelContainer2/HBoxContainer/RandomMode" to="." method="_on_random_mode_item_selected"]

project.godot

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ gdscript/warnings/confusable_local_declaration=0
6161
window/size/viewport_width=1920
6262
window/size/viewport_height=1080
6363
window/size/initial_position_type=4
64+
window/stretch/scale=1.5
6465
window/per_pixel_transparency/allowed=true
6566
window/vsync/vsync_mode=0
6667
window/ios/hide_home_indicator=false

0 commit comments

Comments
 (0)