ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modified several screens that used absolute positions and sizes to use the full power of the layout managers

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5558 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2010-06-25 01:29:10 +00:00
parent b0b3faf53a
commit 81282e3464
6 changed files with 22 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
data/gui/options_audio.stkgui
View File

@ -63,11 +63,10 @@
</box>
<spacer width="50" height="40" />
</div>
<button id="back" x="20" y="-40" width="250" height="35" align="left"
<spacer width="50" height="10" />
<button id="back" x="20" width="250" align="left"
I18N="In the options menu, to go back to the main menu or game" text="Back"/>
</div>
</stkgui>

148
data/gui/options_device.stkgui
View File

@ -21,146 +21,6 @@
<spacer height="6" width="10"/>
<label id="title" width="100%" text_align="center" text="[none]" />
<spacer height="16" width="10"/>
<!--
<div width="85%" proportion="1" layout="horizontal-row" align="center">
<label proportion="2" height="100%" I18N="Key binding" text="Accelerate" text_align="right"/>
<spacer proportion="1" height="100%" />
<button id="binding_up" proportion="3" height="100%"
I18N="Unbound key binding" text="[none]"/>
<spacer proportion="1" height="100%" />
</div>
<spacer height="5" width="10"/>
<div width="85%" proportion="1" layout="horizontal-row" align="center">
<label proportion="2" height="100%" I18N="Key binding" text="Brake" text_align="right"/>
<spacer proportion="1" height="100%" />
<button id="binding_down" proportion="3" height="100%"
I18N="Unbound key binding" text="[none]"/>
<spacer proportion="1" height="100%" />
</div>
<spacer height="5" width="10"/>
<div width="85%" proportion="1" layout="horizontal-row" align="center">
<label proportion="2" height="100%" I18N="Key binding" text="Left" text_align="right"/>
<spacer proportion="1" height="100%" />
<button id="binding_left" proportion="3" height="100%"
I18N="Unbound key binding" text="[none]"/>
<spacer proportion="1" height="100%" />
</div>
<spacer height="5" width="10"/>
<div width="85%" proportion="1" layout="horizontal-row" align="center">
<label proportion="2" height="100%" I18N="Key binding" text="Right" text_align="right"/>
<spacer proportion="1" height="100%" />
<button id="binding_right" proportion="3" height="100%"
I18N="Unbound key binding" text="[none]"/>
<spacer proportion="1" height="100%" />
</div>
<spacer height="5" width="10"/>
<div width="85%" proportion="1" layout="horizontal-row" align="center">
<label proportion="2" height="100%" I18N="Key binding" text="Fire" text_align="right"/>
<spacer proportion="1" height="100%" />
<button id="binding_fire" proportion="3" height="100%"
I18N="Unbound key binding" text="[none]"/>
<spacer proportion="1" height="100%" />
</div>
<spacer height="5" width="10"/>
<div width="85%" proportion="1" layout="horizontal-row" align="center" >
<label proportion="2" height="100%" I18N="Key binding" text="Nitro" text_align="right"/>
<spacer proportion="1" height="100%" />
<button id="binding_nitro" proportion="3" height="100%"
I18N="Unbound key binding" text="[none]"/>
<spacer proportion="1" height="100%" />
</div>
<spacer height="5" width="10"/>
<div width="85%" proportion="1" layout="horizontal-row" align="center">
<label proportion="2" height="100%" I18N="Key binding" text="Sharp Turn" text_align="right"/>
<spacer proportion="1" height="100%" />
<button id="binding_drift" proportion="3" height="100%"
I18N="Unbound key binding" text="[none]"/>
<spacer proportion="1" height="100%" />
</div>
<spacer height="5" width="10"/>
<div width="85%" proportion="1" layout="horizontal-row" align="center">
<label proportion="2" height="100%" I18N="Key binding" text="Rescue" text_align="right"/>
<spacer proportion="1" height="100%" />
<button id="binding_rescue" proportion="3" height="100%"
I18N="Unbound key binding" text="[none]"/>
<spacer proportion="1" height="100%" />
</div>
<spacer height="5" width="10"/>
<div width="85%" proportion="1" layout="horizontal-row" align="center">
<label proportion="2" height="100%" I18N="Key binding" text="Look Back" text_align="right"/>
<spacer proportion="1" height="100%" />
<button id="binding_look_back" proportion="3" height="100%"
I18N="Unbound key binding" text="[none]"/>
<spacer proportion="1" height="100%" />
</div>
<spacer height="5" width="10"/>
<label id="subtitle" width="100%" text="Menu Keys" />
<div width="85%" proportion="1" layout="horizontal-row" align="center">
<label proportion="2" height="100%" I18N="Key binding" text="Left" text_align="right"/>
<spacer proportion="1" height="100%" />
<button id="menu_left" proportion="3" height="100%"
I18N="Unbound key binding" text="[none]"/>
<spacer proportion="1" height="100%" />
</div>
<spacer height="5" width="10"/>
<div width="85%" proportion="1" layout="horizontal-row" align="center">
<label proportion="2" height="100%" I18N="Key binding" text="Right" text_align="right"/>
<spacer proportion="1" height="100%" />
<button id="menu_right" proportion="3" height="100%"
I18N="Unbound key binding" text="[none]"/>
<spacer proportion="1" height="100%" />
</div>
<spacer height="5" width="10"/>
<div width="85%" proportion="1" layout="horizontal-row" align="center">
<label proportion="2" height="100%" I18N="Key binding" text="Up" text_align="right"/>
<spacer proportion="1" height="100%" />
<button id="menu_up" proportion="3" height="100%"
I18N="Unbound key binding" text="[none]"/>
<spacer proportion="1" height="100%" />
</div>
<spacer height="5" width="10"/>
<div width="85%" proportion="1" layout="horizontal-row" align="center">
<label proportion="2" height="100%" I18N="Key binding" text="Down" text_align="right"/>
<spacer proportion="1" height="100%" />
<button id="menu_down" proportion="3" height="100%"
I18N="Unbound key binding" text="[none]"/>
<spacer proportion="1" height="100%" />
</div>
<spacer height="5" width="10"/>
<div width="85%" proportion="1" layout="horizontal-row" align="center">
<label proportion="2" height="100%" I18N="Key binding" text="Select" text_align="right"/>
<spacer proportion="1" height="100%" />
<button id="menu_select" proportion="3" height="100%"
I18N="Unbound key binding" text="[none]"/>
<spacer proportion="1" height="100%" />
</div>
<spacer height="5" width="10"/>
<div width="85%" proportion="1" layout="horizontal-row" align="center">
<label proportion="2" height="100%" I18N="Key binding" text="Cancel" text_align="right"/>
<spacer proportion="1" height="100%" />
<button id="menu_cancel" proportion="3" height="100%"
I18N="Unbound key binding" text="[none]"/>
<spacer proportion="1" height="100%" />
</div>
-->
<list id="actions" proportion="5" width="75%" align="center"/>
@ -171,10 +31,10 @@
<spacer width="50" height="10" />
</box>
<spacer width="50" height="40" />
<spacer width="50" height="10" />
<button id="back" x="20" width="250" align="left"
I18N="In the options menu, to go back to the main menu or game" text="Back"/>
</div>
<button id="back" x="20" y="-40" width="250" height="35" align="left"
I18N="In the options menu, to go back to the main menu or game" text="Back"/>
</stkgui>

8
data/gui/options_input.stkgui
View File

@ -35,10 +35,10 @@
proportion="2" word_wrap="true"/>
</box>
<spacer width="50" height="40" />
<spacer width="50" height="10" />
<button id="back" x="20" width="250" align="left"
I18N="In the options menu, to go back to the main menu or game" text="Back"/>
</div>
<button id="back" x="20" y="-40" width="250" height="35" align="left"
I18N="In the options menu, to go back to the main menu or game" text="Back"/>
</stkgui>

10
data/gui/options_players.stkgui
View File

@ -29,7 +29,7 @@
<list id="players" proportion="5" width="75%" align="center"/>
<spacer width="20" height="25"/>
<button id="addplayer" x="20" height="35"
<button id="addplayer" x="20"
I18N="In players configuration menu"
text="Add Player" align="center"/>
<!--
@ -42,12 +42,10 @@
<spacer width="20" height="15"/>
</box>
<spacer width="50" height="40" />
<spacer width="50" height="10" />
<button id="back" x="20" width="250" align="left"
I18N="In the options menu, to go back to the main menu or game" text="Back"/>
</div>
<button id="back" x="20" y="-40" width="250" height="35" align="left"
I18N="In the options menu, to go back to the main menu or game" text="Back"/>
</stkgui>

11
data/gui/options_video.stkgui
View File

@ -42,16 +42,15 @@
<spacer height="10" width="10"/>
<button id="apply_resolution" height="35"
<button id="apply_resolution"
I18N="In the video settings menu" text="Apply video changes" />
</box>
<spacer width="50" height="40" />
<spacer width="50" height="10" />
<button id="back" x="20" width="250" align="left"
I18N="In the options menu, to go back to the main menu or game" text="Back"/>
</div>
<button id="back" x="20" y="-40" width="250" height="35" align="left"
I18N="In the options menu, to go back to the main menu or game" text="Back"/>
</stkgui>

2
src/guiengine/widgets/button_widget.hpp
View File

@ -43,7 +43,7 @@ namespace GUIEngine
/** When inferring widget size from its label length, this method will be called to
* if/how much space must be added to the raw label's size for the widget to be large enough */
virtual int getHeightNeededAroundLabel() const { return 8; }
virtual int getHeightNeededAroundLabel() const { return 4; }
public:
ButtonWidget();