weird commit number 2 to fix issues

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13120 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hilnius 2013-07-08 14:36:39 +00:00
parent fd0e627906
commit c3bf8a0358
27 changed files with 418 additions and 335 deletions

View File

@ -5,22 +5,22 @@
<div x="0" y="0" width="100%" layout="horizontal-row" height="8%"> <div x="0" y="0" width="100%" layout="horizontal-row" height="8%">
<icon-button id="back" height="100%" icon="gui/back.png"/> <icon-button id="back" height="100%" icon="gui/back.png"/>
<header text_align="center" proportion="1" text="SuperTuxKart Addons" align="center"/> <header text_align="center" proportion="1" text="SuperTuxKart Addons" align="center"/>
<button id="reload" I18N="Reload button to reload addon data" text="Reload" /> <icon-button id="reload" height="90%" icon="gui/restart.png"/>
</div> </div>
<box id="filter_box" width="97%" height="75" layout="vertical-row" align="center"> <box id="filter_box" width="97%" height="75" layout="vertical-row" align="center">
<div x="0" y="0" width="98%" height="100%" layout="horizontal-row" align="center"> <div x="0" y="0" width="98%" height="100%" layout="horizontal-row" align="center">
<textbox id="filter_name" proportion="9" align="center" /> <textbox id="filter_name" proportion="9" align="center" />
<spacer width="10" /> <spacer width="10" />
<label text="Updated" align="center" /> <label text="Updated" align="center" I18N="In addons screen, in the filtering bar, to enable a filter that will show only recently updated items"/>
<spinner id="filter_date" proportion="5" align="center" min_value="0" wrap_around="true"/> <spinner id="filter_date" proportion="5" align="center" min_value="0" wrap_around="true"/>
<label text="Rating >=" align="center"/> <label text="Rating >=" align="center" I18N="In addons screen, in the filtering bar, to enable a filter that will show only recently items with good rating"/>
<spinner id="filter_rating" proportion="3" align="center" min_value="0" wrap_around="true"/> <spinner id="filter_rating" proportion="3" align="center" min_value="0" wrap_around="true"/>
<icon-button id="filter_search" height="100%" icon="gui/search.png"/> <icon-button id="filter_search" height="100%" icon="gui/search.png"/>
</div> </div>
</box> </box>
<spacer height="25" width="10"/> <spacer height="15" width="10"/>
<tabs id="category" height="10%" max_height="110" width="90%" align="center"> <tabs id="category" height="10%" max_height="110" width="90%" align="center">
<icon-button id="tab_kart" width="128" height="128" icon="gui/karts.png" <icon-button id="tab_kart" width="128" height="128" icon="gui/karts.png"
@ -30,12 +30,11 @@
<icon-button id="tab_arena" width="128" height="128" icon="gui/mode_normal.png" <icon-button id="tab_arena" width="128" height="128" icon="gui/mode_normal.png"
I18N="Section in the addons menu" text="Arenas"/> I18N="Section in the addons menu" text="Arenas"/>
</tabs> </tabs>
<spacer height="5" width="10"/>
<box proportion="1" width="98%" align="center" layout="vertical-row" padding="6">
<list id="list_addons" proportion="1" width="97%" align="center"/> <list id="list_addons" x="0" y="0" width="100%" height="100%"/>
</box>
<spacer width="1" height="8" />
</div> </div>
</stkgui> </stkgui>

View File

@ -9,7 +9,7 @@
<spacer width="20" height="5" /> <spacer width="20" height="5" />
<box proportion="1" width="100%" layout="vertical-row"> <box proportion="1" width="100%" layout="vertical-row" padding="2">
<ribbon_grid id="tracks" proportion="1" width="100%" square_items="true" <ribbon_grid id="tracks" proportion="1" width="100%" square_items="true"
label_location="bottom" align="center" child_width="160" child_height="120" /> label_location="bottom" align="center" child_width="160" child_height="120" />
<spacer width="20" height="13" /> <spacer width="20" height="13" />

View File

@ -1,14 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<stkgui> <stkgui>
<icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/> <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
<div x="5%" y="2%" width="90%" height="96%" layout="vertical-row" > <div x="2%" y="2%" width="98%" height="96%" layout="vertical-row" >
<icon id="logo" align="center" proportion="4" width="100%" icon="gui/logo_slim.png"/> <icon id="logo" align="center" proportion="4" width="100%" icon="gui/logo_slim.png"/>
<header I18N="Title in credits screen" text="Credits" width="100%" /> <header I18N="Title in credits screen" text="Credits" width="100%" />
<box id="animated_area" width="100%" proportion="10"> <box id="animated_area" width="100%" proportion="10" padding="0">
</box> </box>

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1,6 +1,6 @@
<stkgui> <stkgui>
<div x="2%" y="1%" width="96%" height="99%" layout="vertical-row" > <div x="1%" y="1%" width="98%" height="99%" layout="vertical-row" >
<header width="80%" <header width="80%"
I18N="In the kart selection (player setup) screen" I18N="In the kart selection (player setup) screen"
@ -13,13 +13,13 @@
<spacer height="15" width="25"/> <spacer height="15" width="25"/>
<box proportion="2" width="100%" layout="vertical-row"> <box proportion="2" width="100%" layout="vertical-row" padding="2">
<ribbon_grid id="karts" proportion="1" square_items="true" width="100%" align="center" <ribbon_grid id="karts" proportion="1" square_items="true" width="100%" align="center"
child_width="90" child_height="90" max_rows="3"/> child_width="90" child_height="90" max_rows="3"/>
</box> </box>
<!-- Groups will be added dynamically at runtime --> <!-- Groups will be added dynamically at runtime -->
<tabs width="100%" height="25" id="kartgroups"> <tabs width="98%" x="1%" height="25" id="kartgroups">
</tabs> </tabs>
<spacer width="100%" height="2%"/> <spacer width="100%" height="2%"/>
</div> </div>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

View File

@ -10,13 +10,17 @@
align="center" text-align="center"/> align="center" text-align="center"/>
</box> </box>
<spacer width="20" height="20"/> <spacer width="20" height="20"/>
<list id="players" proportion="1" height="100%"/> <box proportion="1" height="100%" layout="vertical-row">
<list id="players" width="100%" height="100%"/>
</box>
</div> </div>
<spacer width="20" height="20"/> <spacer width="20" height="20"/>
<div width="100%" proportion="1" layout="horizontal-row"> <div width="100%" proportion="1" layout="horizontal-row">
<list id="chat" proportion="2" height="100%"/> <box proportion="2" height="100%" layout="vertical-row">
<list id="chat" width="100%" height="100%"/>
</box>
<spacer width="20" height="20"/> <spacer width="20" height="20"/>
<box id="actions" proportion="1" height="100%" layout="vertical-row"> <box id="actions" proportion="1" height="100%" layout="vertical-row">
<label I18N="In networking lobby" word_wrap="true" text="actions" align="center" text-align="center"/> <label I18N="In networking lobby" word_wrap="true" text="actions" align="center" text-align="center"/>
@ -36,7 +40,7 @@
I18N="Main menu button" text="Sign In" label_location="hover"/> I18N="Main menu button" text="Sign In" label_location="hover"/>
<icon-button id="register" width="64" height="64" icon="gui/tutorial.png" extend_label="75" <icon-button id="register" width="64" height="64" icon="gui/tutorial.png" extend_label="75"
I18N="Main menu button" text="Register" label_location="hover"/> I18N="Main menu button" text="Register" label_location="hover"/>
<icon-button id="sign_out" width="64" height="64" icon="gui/main_quit.png" extend_label="50" <icon-button id="sign_out" width="64" height="64" icon="gui/main_quit.png" extend_label="70"
I18N="Main menu button" text="Sign Out" label_location="hover"/> I18N="Main menu button" text="Sign Out" label_location="hover"/>
</buttonbar> </buttonbar>

View File

@ -36,7 +36,7 @@
I18N="Main menu button" text="Sign In" label_location="hover"/> I18N="Main menu button" text="Sign In" label_location="hover"/>
<icon-button id="register" width="64" height="64" icon="gui/tutorial.png" extend_label="75" <icon-button id="register" width="64" height="64" icon="gui/tutorial.png" extend_label="75"
I18N="Main menu button" text="Register" label_location="hover"/> I18N="Main menu button" text="Register" label_location="hover"/>
<icon-button id="sign_out" width="64" height="64" icon="gui/main_quit.png" extend_label="50" <icon-button id="sign_out" width="64" height="64" icon="gui/main_quit.png" extend_label="70"
I18N="Main menu button" text="Sign Out" label_location="hover"/> I18N="Main menu button" text="Sign Out" label_location="hover"/>
</buttonbar> </buttonbar>

View File

@ -1,11 +1,11 @@
<stkgui> <stkgui>
<div x="2%" y="2%" width="96%" height="97%" layout="vertical-row" > <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
<header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/> <header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/>
<spacer height="15" width="10"/> <spacer height="15" width="10"/>
<tabs id="options_choice" height="10%" max_height="110" width="100%" align="center"> <tabs id="options_choice" height="10%" max_height="110" x="2%" width="98%"" align="center">
<icon-button id="tab_video" width="128" height="128" icon="gui/options_video.png"/> <icon-button id="tab_video" width="128" height="128" icon="gui/options_video.png"/>
<icon-button id="tab_audio" width="128" height="128" icon="gui/options_audio.png" <icon-button id="tab_audio" width="128" height="128" icon="gui/options_audio.png"
I18N="Section in the settings menu" text="Audio"/> I18N="Section in the settings menu" text="Audio"/>
@ -16,7 +16,7 @@
<box proportion="1" width="100%" layout="vertical-row"> <box proportion="1" width="100%" layout="vertical-row">
<spacer height="15" width="10"/> <spacer height="5" width="10"/>
<!-- ******** Music ******** --> <!-- ******** Music ******** -->
<label width="100%" I18N="Section in the audio/video settings submenu" text="Music"/> <label width="100%" I18N="Section in the audio/video settings submenu" text="Music"/>

View File

@ -1,11 +1,11 @@
<stkgui> <stkgui>
<div x="2%" y="2%" width="96%" height="97%" layout="vertical-row" > <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
<header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/> <header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/>
<spacer height="15" width="10"/> <spacer height="15" width="10"/>
<tabs id="options_choice" height="10%" max_height="110" width="100%" align="center"> <tabs id="options_choice" height="10%" max_height="110" x="2%" width="98%" align="center">
<icon-button id="tab_video" width="128" height="128" icon="gui/options_video.png"/> <icon-button id="tab_video" width="128" height="128" icon="gui/options_video.png"/>
<icon-button id="tab_audio" width="128" height="128" icon="gui/options_audio.png"/> <icon-button id="tab_audio" width="128" height="128" icon="gui/options_audio.png"/>
<icon-button id="tab_ui" width="128" height="128" icon="gui/options_ui.png"/> <icon-button id="tab_ui" width="128" height="128" icon="gui/options_ui.png"/>
@ -22,12 +22,15 @@
<spacer height="16" width="10"/> <spacer height="16" width="10"/>
<!-- List of key bindings --> <!-- List of key bindings -->
<list id="actions" proportion="8" width="75%" align="center"/> <box proportion="8" width="75%" align="center" layout="vertical-row" padding="8">
<list id="actions" x="0" y="0" width="100%" height="100%"/>
<!-- Bottom buttons --> </box>
<!-- Bottom buttons -->
<spacer width="50" height="20" /> <spacer width="50" height="20" />
<div proportion="2" width="100%" layout="horizontal-row"> <div proportion="2" width="100%" layout="horizontal-row">
<spacer width="7" height="5"/>
<div height="100%" width="fit" layout="vertical-row"> <div height="100%" width="fit" layout="vertical-row">
<button id="delete" <button id="delete"
I18N="To delete a keyboard configuration" text="Delete Configuration"/> I18N="To delete a keyboard configuration" text="Delete Configuration"/>

View File

@ -1,11 +1,11 @@
<stkgui> <stkgui>
<div x="2%" y="2%" width="96%" height="97%" layout="vertical-row" > <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
<header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/> <header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/>
<spacer height="15" width="10"/> <spacer height="15" width="10"/>
<tabs id="options_choice" height="10%" max_height="110" width="100%" align="center"> <tabs id="options_choice" height="10%" max_height="110" x="2%" width="98%" align="center">
<icon-button id="tab_video" width="128" height="128" icon="gui/options_video.png"/> <icon-button id="tab_video" width="128" height="128" icon="gui/options_video.png"/>
<icon-button id="tab_audio" width="128" height="128" icon="gui/options_audio.png"/> <icon-button id="tab_audio" width="128" height="128" icon="gui/options_audio.png"/>
<icon-button id="tab_ui" width="128" height="128" icon="gui/options_ui.png"/> <icon-button id="tab_ui" width="128" height="128" icon="gui/options_ui.png"/>
@ -15,16 +15,17 @@
</tabs> </tabs>
<box proportion="1" width="100%" layout="vertical-row"> <box proportion="1" width="100%" layout="vertical-row">
<spacer width="5" height="5"/>
<label width="100%" <label width="100%"
I18N="In key bindings configuration menu" I18N="In key bindings configuration menu"
text="Press enter or double-click on a device to configure it" text="Press enter or double-click on a device to configure it"
text_align="center" /> text_align="center" />
<spacer width="5" height="20"/> <spacer width="5" height="20"/>
<list id="devices" proportion="5" width="75%" align="center"/>
<box proportion="5" width="75%" align="center" layout="vertical-row" padding="8">
<list id="devices" x="0" y="0" width="100%" height="100%"/>
</box>
<spacer width="50" height="25" /> <spacer width="50" height="25" />
<button id="add_device" I18N="In the input configuration screen" text="Add a device" align="center"/> <button id="add_device" I18N="In the input configuration screen" text="Add a device" align="center"/>

View File

@ -1,11 +1,11 @@
<stkgui> <stkgui>
<div x="2%" y="2%" width="96%" height="97%" layout="vertical-row" > <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
<header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/> <header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/>
<spacer height="15" width="10"/> <spacer height="15" width="10"/>
<tabs id="options_choice" height="10%" max_height="110" width="100%" align="center"> <tabs id="options_choice" height="10%" max_height="110" x="2%" width="98%" align="center">
<icon-button id="tab_video" width="128" height="128" icon="gui/options_video.png"/> <icon-button id="tab_video" width="128" height="128" icon="gui/options_video.png"/>
<icon-button id="tab_audio" width="128" height="128" icon="gui/options_audio.png"/> <icon-button id="tab_audio" width="128" height="128" icon="gui/options_audio.png"/>
<icon-button id="tab_ui" width="128" height="128" icon="gui/options_ui.png"/> <icon-button id="tab_ui" width="128" height="128" icon="gui/options_ui.png"/>
@ -34,7 +34,9 @@
text_align="center" /> text_align="center" />
<spacer width="5" height="20"/> <spacer width="5" height="20"/>
<list id="players" proportion="5" width="75%" align="center"/> <box proportion="5" width="75%" align="center" layout="vertical-row" padding="8">
<list id="players" x="0" y="0" width="100%" height="100%"/>
</box>
<spacer width="20" height="25"/> <spacer width="20" height="25"/>
<button id="addplayer" x="20" <button id="addplayer" x="20"

View File

@ -1,11 +1,11 @@
<stkgui> <stkgui>
<div x="2%" y="2%" width="96%" height="97%" layout="vertical-row" > <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
<header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/> <header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/>
<spacer height="15" width="10"/> <spacer height="15" width="10"/>
<tabs id="options_choice" height="10%" max_height="110" width="100%" align="center"> <tabs id="options_choice" height="10%" max_height="110" x="2%" width="98%" align="center">
<icon-button id="tab_video" width="128" height="128" icon="gui/options_video.png"/> <icon-button id="tab_video" width="128" height="128" icon="gui/options_video.png"/>
<icon-button id="tab_audio" width="128" height="128" icon="gui/options_audio.png"/> <icon-button id="tab_audio" width="128" height="128" icon="gui/options_audio.png"/>
<icon-button id="tab_ui" width="128" height="128" icon="gui/options_ui.png" <icon-button id="tab_ui" width="128" height="128" icon="gui/options_ui.png"
@ -16,7 +16,7 @@
<box proportion="1" width="100%" layout="vertical-row"> <box proportion="1" width="100%" layout="vertical-row">
<spacer height="18" width="10"/> <spacer height="5" width="10"/>
<!-- ************ SKIN CHOICE ************ --> <!-- ************ SKIN CHOICE ************ -->
<div layout="horizontal-row" width="100%" height="fit"> <div layout="horizontal-row" width="100%" height="fit">
@ -49,7 +49,9 @@
<!-- ************ LANGUAGE CHOICE ************ --> <!-- ************ LANGUAGE CHOICE ************ -->
<list id="language" proportion="1" width="75%" align="center"/> <box proportion="1" width="75%" align="center" layout="vertical-row" padding="8">
<list id="language" x="0" y="0" width="100%" height="100%"/>
</box>
<spacer height="18" width="4"/> <spacer height="18" width="4"/>

View File

@ -1,11 +1,11 @@
<stkgui> <stkgui>
<div x="2%" y="2%" width="96%" height="97%" layout="vertical-row" > <div x="1%" y="1%" width="98%" height="98%" layout="vertical-row" >
<header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/> <header text_align="center" width="80%" align="center" text="SuperTuxKart Options"/>
<spacer height="15" width="10"/> <spacer height="15" width="10"/>
<tabs id="options_choice" height="10%" max_height="110" width="100%" align="center"> <tabs id="options_choice" height="10%" max_height="110" x="2%" width="98%" align="center">
<icon-button id="tab_video" width="128" height="128" icon="gui/options_video.png" <icon-button id="tab_video" width="128" height="128" icon="gui/options_video.png"
I18N="Section in the settings menu" text="Graphics"/> I18N="Section in the settings menu" text="Graphics"/>
<icon-button id="tab_audio" width="128" height="128" icon="gui/options_audio.png"/> <icon-button id="tab_audio" width="128" height="128" icon="gui/options_audio.png"/>

View File

@ -152,7 +152,7 @@ when the border that intersect at this corner are enabled.
<!-- Lists are always in neutral state for now --> <!-- Lists are always in neutral state for now -->
<element type="list" image="glass/glass_section.png" <element type="list" image="glass/glass_section.png"
left_border="15" right_border="15" top_border="15" bottom_border="15" left_border="15" right_border="15" top_border="15" bottom_border="15"
hborder_out_portion="0.5" vborder_out_portion="1.0" /> hborder_out_portion="0.0" vborder_out_portion="0.0" />
<element type="listitem" state="focused" image="glass/glasssgauge_fill.png" <element type="listitem" state="focused" image="glass/glasssgauge_fill.png"
left_border="0" right_border="0" top_border="0" bottom_border="0" left_border="0" right_border="0" top_border="0" bottom_border="0"
@ -181,12 +181,12 @@ when the border that intersect at this corner are enabled.
<!-- Stateless --> <!-- Stateless -->
<element type="section" image="glass/glass_section.png" <element type="section" image="glass/glass_section.png"
left_border="15" right_border="15" top_border="15" bottom_border="15" left_border="15" right_border="15" top_border="15" bottom_border="15"
hborder_out_portion="1.0" vborder_out_portion="0.2" /> hborder_out_portion="0.0" vborder_out_portion="0.0" />
<!-- Stateless --> <!-- Stateless -->
<element type="rounded_section" image="glass/glass_rsection.png" <element type="rounded_section" image="glass/glass_rsection.png"
left_border="15" right_border="15" top_border="15" bottom_border="15" left_border="15" right_border="15" top_border="15" bottom_border="15"
hborder_out_portion="1.0" vborder_out_portion="0.2" /> hborder_out_portion="0.0" vborder_out_portion="0.0" />
<!-- Stateless --> <!-- Stateless -->
<element type="window" image="glass/dialog.png" <element type="window" image="glass/dialog.png"

View File

@ -151,7 +151,7 @@ when the border that intersect at this corner are enabled.
<!-- Lists are always in neutral state for now --> <!-- Lists are always in neutral state for now -->
<element type="list" image="ocean/glass_section.png" <element type="list" image="ocean/glass_section.png"
left_border="15" right_border="15" top_border="7" bottom_border="7" left_border="15" right_border="15" top_border="7" bottom_border="7"
hborder_out_portion="0.5" vborder_out_portion="1.0" /> hborder_out_portion="0.0" vborder_out_portion="0.0" />
<element type="listitem" state="focused" image="ocean/select.png" <element type="listitem" state="focused" image="ocean/select.png"
left_border="0" right_border="0" top_border="0" bottom_border="0" left_border="0" right_border="0" top_border="0" bottom_border="0"
@ -181,12 +181,12 @@ when the border that intersect at this corner are enabled.
<!-- Stateless --> <!-- Stateless -->
<element type="section" image="ocean/glass_section.png" <element type="section" image="ocean/glass_section.png"
left_border="15" right_border="15" top_border="15" bottom_border="15" left_border="15" right_border="15" top_border="15" bottom_border="15"
hborder_out_portion="1.0" vborder_out_portion="0.2" /> hborder_out_portion="0.0" vborder_out_portion="0.0" />
<!-- Stateless --> <!-- Stateless -->
<element type="rounded_section" image="glass/glass_rsection.png" <element type="rounded_section" image="glass/glass_rsection.png"
left_border="15" right_border="15" top_border="15" bottom_border="15" left_border="15" right_border="15" top_border="15" bottom_border="15"
hborder_out_portion="1.0" vborder_out_portion="0.2" /> hborder_out_portion="0.0" vborder_out_portion="0.0" />
<!-- Stateless --> <!-- Stateless -->
<element type="window" image="ocean/dialog.png" <element type="window" image="ocean/dialog.png"

View File

@ -151,7 +151,7 @@ when the border that intersect at this corner are enabled.
<!-- Lists are always in neutral state for now --> <!-- Lists are always in neutral state for now -->
<element type="list" image="peach/glass_section.png" <element type="list" image="peach/glass_section.png"
left_border="15" right_border="15" top_border="7" bottom_border="7" left_border="15" right_border="15" top_border="7" bottom_border="7"
hborder_out_portion="0.5" vborder_out_portion="1.0" /> hborder_out_portion="0.0" vborder_out_portion="0.0" />
<element type="listitem" state="focused" image="peach/select.png" <element type="listitem" state="focused" image="peach/select.png"
left_border="0" right_border="0" top_border="0" bottom_border="0" left_border="0" right_border="0" top_border="0" bottom_border="0"
@ -180,12 +180,12 @@ when the border that intersect at this corner are enabled.
<!-- Stateless --> <!-- Stateless -->
<element type="section" image="peach/glass_section.png" <element type="section" image="peach/glass_section.png"
left_border="15" right_border="15" top_border="15" bottom_border="15" left_border="15" right_border="15" top_border="15" bottom_border="15"
hborder_out_portion="1.0" vborder_out_portion="0.2" /> hborder_out_portion="0.0" vborder_out_portion="0.0" />
<!-- Stateless --> <!-- Stateless -->
<element type="rounded_section" image="glass/glass_rsection.png" <element type="rounded_section" image="glass/glass_rsection.png"
left_border="15" right_border="15" top_border="15" bottom_border="15" left_border="15" right_border="15" top_border="15" bottom_border="15"
hborder_out_portion="1.0" vborder_out_portion="0.2" /> hborder_out_portion="0.0" vborder_out_portion="0.0" />
<!-- Stateless --> <!-- Stateless -->
<element type="window" image="peach/dialog.png" <element type="window" image="peach/dialog.png"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

View File

@ -5,7 +5,10 @@
<header text_align="center" width="80%" align="center" text="Select a Player"/> <header text_align="center" width="80%" align="center" text="Select a Player"/>
<spacer height="15" width="10"/> <spacer height="15" width="10"/>
<list id="gameslots" proportion="5" width="75%" align="center"/> <box proportion="6" width="75%" align="center" layout="vertical-row" padding="8">
<list id="gameslots" x="0" y="0" width="100%" height="100%"/>
</box>
<spacer width="20" height="25"/> <spacer width="20" height="25"/>
<div layout="horizontal-row" align="center" width="70%" height="fit"> <div layout="horizontal-row" align="center" width="70%" height="fit">

View File

@ -1,69 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<stkgui> <stkgui>
<div x="5%" y="5%" width="90%" height="90%" layout="vertical-row"> <div x="1%" y="1%" width="99%" height="99%">
<label id="name" width="100%" text_align="center"/>
<spacer width="1" height="5%"/> <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row">
<div width="95%" proportion="5" layout="horizontal-row"> <label id="name" width="100%" text_align="center"/>
<!-- Left pane --> <spacer width="1" height="5%"/>
<div proportion="1" height="100%" layout="vertical-row">
<label id="highscores" width="100%" text_align="center" text="= Highscores ="/> <div width="95%" proportion="5" layout="horizontal-row">
<spacer width="1" height="2%"/> <!-- Left pane -->
<div proportion="1" height="100%" layout="vertical-row">
<div width="95%" height="fit" layout="horizontal-row"> <label id="highscores" width="100%" text_align="center" text="= Highscores ="/>
<icon id="iconscore1" icon="gui/random_kart.png" width="font" height="font"/>
<spacer width="2%" height="1"/> <spacer width="1" height="2%"/>
<label id="highscore1" proportion="1" text="(Empty)"/>
</div> <div width="95%" height="fit" layout="horizontal-row">
<icon id="iconscore1" icon="gui/random_kart.png" width="font" height="font"/>
<spacer width="1" height="2%"/> <spacer width="2%" height="1"/>
<label id="highscore1" proportion="1" text="(Empty)"/>
<div width="95%" height="fit" layout="horizontal-row"> </div>
<icon id="iconscore2" icon="gui/random_kart.png" width="font" height="font"/>
<spacer width="2%" height="1"/> <spacer width="1" height="2%"/>
<label id="highscore2" proportion="1" text="(Empty)"/>
</div> <div width="95%" height="fit" layout="horizontal-row">
<icon id="iconscore2" icon="gui/random_kart.png" width="font" height="font"/>
<spacer width="1" height="2%"/> <spacer width="2%" height="1"/>
<label id="highscore2" proportion="1" text="(Empty)"/>
<div width="95%" height="fit" layout="horizontal-row"> </div>
<icon id="iconscore3" icon="gui/random_kart.png" width="font" height="font"/>
<spacer width="2%" height="1"/> <spacer width="1" height="2%"/>
<label id="highscore3" proportion="1" text="(Empty)"/>
</div> <div width="95%" height="fit" layout="horizontal-row">
<icon id="iconscore3" icon="gui/random_kart.png" width="font" height="font"/>
<spacer width="1" proportion="1"/> <spacer width="2%" height="1"/>
<label id="highscore3" proportion="1" text="(Empty)"/>
<label id="author" width="100%" text_align="center" word_wrap="true"/> </div>
<spacer width="1" proportion="1"/>
<label id="author" width="100%" text_align="center" word_wrap="true"/>
</div>
<!-- Right pane -->
<div proportion="1" height="100%" layout="vertical-row">
<placeholder proportion="1" width="100%" height="100%" id="screenshot_div">
</placeholder>
<div width="75%" height="fit" layout="horizontal-row" >
<spacer proportion="1" height="2" />
<checkbox id="reverse"/>
<spacer width="20" height="2" />
<label id="reverse-text" height="100%" I18N="Drive the track reverse" text="Reverse"/>
<spacer proportion="1" height="2" />
</div>
</div>
</div>
<spacer width="1" height="5%"/>
<spinner id="lapcountspinner" width="50%" min_value="1" max_value="20" align="center" wrap_around="true"
I18N="In the track setup screen (number of laps choice, where %i is the number)" text="%i laps"/>
<spacer width="1" height="5%"/>
<button id="start" text="Start Race" align="center"/>
<spacer width="1" height="2%"/>
</div> </div>
<!-- Right pane --> <icon-button id="closePopup" x="0" y="0" width="8%" height="8%" icon="gui/back.png"/>
<div proportion="1" height="100%" layout="vertical-row">
<placeholder proportion="1" width="100%" height="100%" id="screenshot_div">
</placeholder>
<div width="75%" height="fit" layout="horizontal-row" >
<spacer width="40" height="2" />
<checkbox id="reverse"/>
<spacer width="20" height="2" />
<label id="reverse-text" height="100%" I18N="Drive the track reverse" text="Reverse"/>
</div>
</div>
</div>
<spacer width="1" height="5%"/>
<spinner id="lapcountspinner" width="50%" min_value="1" max_value="20" align="center" wrap_around="true"
I18N="In the track setup screen (number of laps choice, where %i is the number)" text="%i laps"/>
<spacer width="1" height="5%"/>
<button id="start" text="Start Race" align="center"/>
<spacer width="1" height="1%"/>
</div> </div>
</stkgui> </stkgui>

View File

@ -7,7 +7,7 @@
<header width="80%" I18N="Section in track selection screen" text="Grand Prix" <header width="80%" I18N="Section in track selection screen" text="Grand Prix"
align="center" text_align="center" /> align="center" text_align="center" />
<box width="100%" height="195"> <box width="100%" height="195" padding="0">
<scrollable_toolbar id="gps" height="175" y="10" x="10" width="98%" align="center" label_location="each" <scrollable_toolbar id="gps" height="175" y="10" x="10" width="98%" align="center" label_location="each"
square_items="true" child_width="160" child_height="120" /> square_items="true" child_width="160" child_height="120" />
</box> </box>
@ -15,7 +15,7 @@
<header width="100%" I18N="Section in track selection screen" text="All Tracks" <header width="100%" I18N="Section in track selection screen" text="All Tracks"
align="center" text_align="center" /> align="center" text_align="center" />
<box proportion="1" width="100%" layout="vertical-row"> <box proportion="1" width="100%" layout="vertical-row" padding="1">
<ribbon_grid id="tracks" proportion="1" width="100%" square_items="true" <ribbon_grid id="tracks" proportion="1" width="100%" square_items="true"
label_location="bottom" align="center" max_rows="4" label_location="bottom" align="center" max_rows="4"
child_width="160" child_height="120" /> child_width="160" child_height="120" />

File diff suppressed because it is too large Load Diff

View File

@ -137,16 +137,21 @@ src/modes/world_status.cpp
src/modes/world_with_rank.cpp src/modes/world_with_rank.cpp
src/network/client_network_manager.cpp src/network/client_network_manager.cpp
src/network/event.cpp src/network/event.cpp
src/network/game_setup.cpp
src/network/http_functions.cpp src/network/http_functions.cpp
src/network/network_interface.cpp src/network/network_interface.cpp
src/network/network_manager.cpp src/network/network_manager.cpp
src/network/network_string.cpp
src/network/protocol.cpp src/network/protocol.cpp
src/network/protocol_manager.cpp src/network/protocol_manager.cpp
src/network/protocols/connect_to_peer.cpp
src/network/protocols/connect_to_server.cpp src/network/protocols/connect_to_server.cpp
src/network/protocols/get_peer_address.cpp src/network/protocols/get_peer_address.cpp
src/network/protocols/get_public_address.cpp src/network/protocols/get_public_address.cpp
src/network/protocols/hide_public_address.cpp src/network/protocols/hide_public_address.cpp
src/network/protocols/lobby_room_protocol.cpp src/network/protocols/lobby_room_protocol.cpp
src/network/protocols/ping_protocol.cpp
src/network/protocols/request_connection.cpp
src/network/protocols/show_public_address.cpp src/network/protocols/show_public_address.cpp
src/network/server_network_manager.cpp src/network/server_network_manager.cpp
src/network/stk_host.cpp src/network/stk_host.cpp
@ -198,7 +203,8 @@ src/states_screens/help_screen_3.cpp
src/states_screens/help_screen_4.cpp src/states_screens/help_screen_4.cpp
src/states_screens/kart_selection.cpp src/states_screens/kart_selection.cpp
src/states_screens/main_menu_screen.cpp src/states_screens/main_menu_screen.cpp
src/states_screens/minimal_race_gui.cpp src/states_screens/networking_lobby.cpp
src/states_screens/networking_lobby_settings.cpp
src/states_screens/online_screen.cpp src/states_screens/online_screen.cpp
src/states_screens/options_screen_audio.cpp src/states_screens/options_screen_audio.cpp
src/states_screens/options_screen_input2.cpp src/states_screens/options_screen_input2.cpp
@ -398,16 +404,21 @@ src/modes/world_status.hpp
src/modes/world_with_rank.hpp src/modes/world_with_rank.hpp
src/network/client_network_manager.hpp src/network/client_network_manager.hpp
src/network/event.hpp src/network/event.hpp
src/network/game_setup.hpp
src/network/http_functions.hpp src/network/http_functions.hpp
src/network/network_interface.hpp src/network/network_interface.hpp
src/network/network_manager.hpp src/network/network_manager.hpp
src/network/network_string.hpp
src/network/protocol.hpp src/network/protocol.hpp
src/network/protocol_manager.hpp src/network/protocol_manager.hpp
src/network/protocols/connect_to_peer.hpp
src/network/protocols/connect_to_server.hpp src/network/protocols/connect_to_server.hpp
src/network/protocols/get_peer_address.hpp src/network/protocols/get_peer_address.hpp
src/network/protocols/get_public_address.hpp src/network/protocols/get_public_address.hpp
src/network/protocols/hide_public_address.hpp src/network/protocols/hide_public_address.hpp
src/network/protocols/lobby_room_protocol.hpp src/network/protocols/lobby_room_protocol.hpp
src/network/protocols/ping_protocol.hpp
src/network/protocols/request_connection.hpp
src/network/protocols/show_public_address.hpp src/network/protocols/show_public_address.hpp
src/network/remote_kart_info.hpp src/network/remote_kart_info.hpp
src/network/server_network_manager.hpp src/network/server_network_manager.hpp
@ -465,7 +476,8 @@ src/states_screens/help_screen_3.hpp
src/states_screens/help_screen_4.hpp src/states_screens/help_screen_4.hpp
src/states_screens/kart_selection.hpp src/states_screens/kart_selection.hpp
src/states_screens/main_menu_screen.hpp src/states_screens/main_menu_screen.hpp
src/states_screens/minimal_race_gui.hpp src/states_screens/networking_lobby.hpp
src/states_screens/networking_lobby_settings.hpp
src/states_screens/online_screen.hpp src/states_screens/online_screen.hpp
src/states_screens/options_screen_audio.hpp src/states_screens/options_screen_audio.hpp
src/states_screens/options_screen_input2.hpp src/states_screens/options_screen_input2.hpp