Skip to content

Commit 5dced9c

Browse files
committed
Move the content of the camera dialog into the camera tab
1 parent 78665b8 commit 5dced9c

File tree

6 files changed

+214
-367
lines changed

6 files changed

+214
-367
lines changed

data/gui/dialogs/custom_camera_settings.stkgui

-87
This file was deleted.

data/gui/screens/options/options_camera.stkgui

+65-3
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,77 @@
3434

3535
<spacer width="5" height="1%"/>
3636

37-
<!-- ************ EXTRA UI ELEMENTS SETTINGS ************ -->
3837
<div width="100%" height="fit" layout="horizontal-row">
3938
<spinner id="camera_preset" width="10f" align="center" />
40-
<label height="100%" x="0" y="0" I18N="In the ui settings" text="Camera"/>
39+
<spacer width="3%" height="100%" />
40+
<label id="camera_name" width="100%" I18N="In the ui/camera settings" text="Player camera"/>
41+
</div>
42+
43+
<spacer width="5" height="2%"/>
44+
45+
<div width="100%" height="fit" layout="horizontal-row">
46+
<spacer width="3%" height="100%" />
47+
<div proportion="1" height="fit" layout="horizontal-row" >
48+
<label width="35%" height="100%" text_align="left" I18N="In the ui/camera screen" text="FOV"/>
49+
<gauge id="fov" proportion="1"/>
50+
</div>
51+
</div>
52+
53+
<spacer width="5" height="2%"/>
54+
55+
<div width="100%" height="fit" layout="horizontal-row">
56+
<spacer width="3%" height="100%" />
57+
<div proportion="1" height="fit" layout="horizontal-row" >
58+
<label width="35%" height="100%" text_align="left" I18N="In the ui/camera screen" text="Distance"/>
59+
<gauge id="camera_distance" proportion="1"/>
60+
</div>
61+
</div>
62+
63+
<spacer width="5" height="2%"/>
64+
65+
<div width="100%" height="fit" layout="horizontal-row">
66+
<spacer width="3%" height="100%" />
67+
<div proportion="1" height="fit" layout="horizontal-row" >
68+
<label width="35%" height="100%" text_align="left" I18N="In the ui/camera screen" text="Angle"/>
69+
<gauge id="camera_angle" proportion="1"/>
70+
</div>
71+
</div>
72+
73+
<spacer width="5" height="2%"/>
74+
75+
<div width="100%" height="fit" layout="horizontal-row">
76+
<spacer width="3%" height="100%" />
77+
<div proportion="1" height="fit" layout="horizontal-row" >
78+
<checkbox id="camera_smoothing"/>
79+
<spacer width="1%" height="100%" />
80+
<label height="100%" text_align="left" I18N="In the ui/camera screen" text="Smooth camera"/>
81+
</div>
82+
</div>
83+
84+
<spacer width="5" height="2%"/>
85+
86+
<label width="100%" I18N="In the ui/camera settings" text="Backward camera"/>
87+
<spacer height="2%" width="100%" />
88+
<div width="100%" height="fit" layout="horizontal-row">
89+
<spacer width="3%" height="100%" />
90+
<label width="fit" height="100%" text_align="left" I18N="In the ui/camera screen" text="Distance"/>
91+
<gauge id="backward_camera_distance" width="35%"/>
4192
<spacer width="2%" height="100%" />
42-
<button id="custom_camera" text="Custom..." I18N="In the ui settings" align="center"/>
93+
<label width="fit" height="100%" text_align="left" I18N="In the ui/camera screen" text="Angle"/>
94+
<gauge id="backward_camera_angle" width="35%"/>
4395
</div>
4496

4597
<spacer width="5" height="2%"/>
98+
99+
<div width="100%" height="fit" layout="horizontal-row">
100+
<spacer width="3%" height="100%" />
101+
<div proportion="1" height="fit" layout="horizontal-row" >
102+
<checkbox id="use_soccer_camera"/>
103+
<spacer width="1%" height="100%" />
104+
<label height="100%" text_align="left" I18N="In the ui/camera screen" text="Follow ball in soccer mode"/>
105+
</div>
106+
</div>
107+
46108
</box>
47109
</div>
48110
</div>

src/states_screens/dialogs/custom_camera_settings.cpp

-190
This file was deleted.

0 commit comments

Comments
 (0)