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

Some GUI tweaks

Browse Source
This commit is contained in:
Deve 2019-10-05 23:43:41 +02:00
parent 755b8a2f1b
commit 72e364a38d
6 changed files with 43 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/gui/dialogs/confirm_dialog.stkgui
View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<stkgui> <stkgui>
<div x="2%" y="5%" width="96%" height="90%" layout="vertical-row" > <div x="2%" y="5%" width="96%" height="90%" layout="vertical-row" >
<label height="70%" id="title" width="100%" text_align="top" word_wrap="true"/> <label height="65%" id="title" width="100%" text_align="top" word_wrap="true"/>
<spacer height="6%" width="10" /> <spacer height="5%" width="10" />
<buttonbar id="buttons" height="24%" width="30%" align="center"> <buttonbar id="buttons" height="30%" width="30%" align="center">
<icon-button id="confirm" width="128" height="128" icon="gui/icons/green_check.png" <icon-button id="confirm" width="128" height="128" icon="gui/icons/green_check.png"
I18N="In a 'are you sure?' dialog" text="Yes" align="center"/> I18N="In a 'are you sure?' dialog" text="Yes" align="center"/>

24
data/gui/screens/online/create_server.stkgui
View File

@ -25,10 +25,12 @@
<textbox proportion="1" id="password" I18N="In the server creation screen"/> <textbox proportion="1" id="password" I18N="In the server creation screen"/>
</div> </div>
<spacer height="1%" width="20"/> <spacer height="2%" width="20"/>
<label width="100%" height="fit" text_align="left" I18N="In the server creation screen" text="Difficulty"/> <div width="100%" height="19%" layout="horizontal-row" >
<ribbon id="difficulty" height="15%" width="90%" align="center"> <label align="center" text_align="left" I18N="In the server creation screen" text="Difficulty"/>
<spacer width="5%" height="5"/>
<ribbon id="difficulty" height="100%" proportion="1" align="center">
<icon-button id="novice" width="128" height="128" icon="gui/icons/difficulty_easy.png" <icon-button id="novice" width="128" height="128" icon="gui/icons/difficulty_easy.png"
I18N="Difficulty" text="Novice"/> I18N="Difficulty" text="Novice"/>
<icon-button id="intermediate" width="128" height="128" icon="gui/icons/difficulty_medium.png" <icon-button id="intermediate" width="128" height="128" icon="gui/icons/difficulty_medium.png"
@ -38,8 +40,14 @@
<icon-button id="best" width="128" height="128" icon="gui/icons/difficulty_best.png" <icon-button id="best" width="128" height="128" icon="gui/icons/difficulty_best.png"
I18N="Difficulty" text="SuperTux"/> I18N="Difficulty" text="SuperTux"/>
</ribbon> </ribbon>
<label width="100%" height="fit" text_align="left" I18N="In the server creation screen" text="Game mode"/> </div>
<ribbon id="gamemode" height="15%" width="90%" align="center">
<spacer height="2%" width="20"/>
<div width="100%" height="19%" layout="horizontal-row" >
<label align="center" text_align="left" I18N="In the server creation screen" text="Game mode"/>
<spacer width="5%" height="5"/>
<ribbon id="gamemode" height="100%" proportion="1" align="center">
<icon-button id="normal" width="128" height="128" icon="gui/icons/mode_normal.png" <icon-button id="normal" width="128" height="128" icon="gui/icons/mode_normal.png"
I18N="Multiplayer game mode" text="Normal Race"/> I18N="Multiplayer game mode" text="Normal Race"/>
<icon-button id="timetrial" width="128" height="128" icon="gui/icons/mode_tt.png" <icon-button id="timetrial" width="128" height="128" icon="gui/icons/mode_tt.png"
@ -49,8 +57,10 @@
<icon-button id="soccer" width="128" height="128" icon="gui/icons/mode_soccer.png" <icon-button id="soccer" width="128" height="128" icon="gui/icons/mode_soccer.png"
I18N="Multiplayer game mode" text="Soccer"/> I18N="Multiplayer game mode" text="Soccer"/>
</ribbon> </ribbon>
</div>
<spacer height="2%" width="20"/>
<spacer height="1%" width="20"/>
<div width="100%" height="fit" layout="horizontal-row" > <div width="100%" height="fit" layout="horizontal-row" >
<label id="more-options" proportion="1" text_align="left"/> <label id="more-options" proportion="1" text_align="left"/>
<spinner id="more-options-spinner" proportion="1" wrap_around="true"/> <spinner id="more-options-spinner" proportion="1" wrap_around="true"/>
@ -58,7 +68,7 @@
<label id="info" proportion="1" width="100%" align="center" text_align="center" word_wrap="true" text=""/> <label id="info" proportion="1" width="100%" align="center" text_align="center" word_wrap="true" text=""/>
<buttonbar id="options" x="0" y="0" width="40%" height="12%" align="center"> <buttonbar id="options" x="0" y="0" width="40%" height="15%" align="center">
<icon-button id="create" width="64" height="64" icon="gui/icons/green_check.png" <icon-button id="create" width="64" height="64" icon="gui/icons/green_check.png"
I18N="In the server creation screen" text="Create" label_location="bottom"/> I18N="In the server creation screen" text="Create" label_location="bottom"/>
<icon-button id="cancel" width="64" height="64" icon="gui/icons/main_quit.png" <icon-button id="cancel" width="64" height="64" icon="gui/icons/main_quit.png"

2
data/gui/screens/online/lan.stkgui
View File

@ -24,7 +24,7 @@
--> -->
</buttonbar> </buttonbar>
<spacer height="10%" width="10"/> <spacer height="5%" width="10"/>
</div> </div>
</stkgui> </stkgui>

8
data/gui/screens/online/online.stkgui
View File

@ -3,8 +3,9 @@
<div x="0" y="1%" width="100%" height="98%" layout="vertical-row" > <div x="0" y="1%" width="100%" height="98%" layout="vertical-row" >
<header text_align="center" height="8%" width="80%" align="center" text="Online"/> <header text_align="center" height="8%" width="80%" align="center" text="Online"/>
<spacer height="1%" width="10"/> <spacer height="1%" width="10"/>
<button id="user-id" width="12f" height="fit" align="center"/> <button id="user-id" width="12f" height="fit" align="center"/>
<spacer height="20"/> <spacer height="2%" width="10"/>
<box width="fit" height="fit" layout="horizontal-row" align="center" valign="center"> <box width="fit" height="fit" layout="horizontal-row" align="center" valign="center">
<spacer width="25"/> <spacer width="25"/>
@ -15,11 +16,8 @@
<spacer width="25"/> <spacer width="25"/>
</box> </box>
<spacer height="15" width="10"/>
<icon id="logo" align="center" proportion="4" width="100%" icon="gui/icons/logo.png"/> <icon id="logo" align="center" proportion="4" width="100%" icon="gui/icons/logo.png"/>
<spacer height="15" width="10"/>
<buttonbar id="menu_toprow" proportion="3" width="90%" align="center"> <buttonbar id="menu_toprow" proportion="3" width="90%" align="center">
<icon-button id="lan" width="128" height="128" <icon-button id="lan" width="128" height="128"
icon="gui/icons/menu_multi.png" focus_icon="gui/icons/menu_multi_focus.png" icon="gui/icons/menu_multi.png" focus_icon="gui/icons/menu_multi_focus.png"
@ -35,7 +33,7 @@
I18N="Networking menu button" text="Your profile"/> I18N="Networking menu button" text="Your profile"/>
</buttonbar> </buttonbar>
<spacer height="10%" width="10"/> <spacer height="5%" width="10"/>
</div> </div>

2
data/gui/screens/online/profile_servers.stkgui
View File

@ -22,7 +22,7 @@
I18N="In the online multiplayer screen" text="Quick Play"/> I18N="In the online multiplayer screen" text="Quick Play"/>
</buttonbar> </buttonbar>
<spacer height="10%" width="10"/> <spacer height="5%" width="10"/>
</div> </div>
</stkgui> </stkgui>

2
src/states_screens/dialogs/general_text_field_dialog.cpp
View File

@ -34,7 +34,7 @@ using namespace irr::core;
GeneralTextFieldDialog::GeneralTextFieldDialog(const core::stringw& title, GeneralTextFieldDialog::GeneralTextFieldDialog(const core::stringw& title,
DismissCallback dm_cb, DismissCallback dm_cb,
ValidationCallback val_cb) ValidationCallback val_cb)
: ModalDialog(0.95f, 0.4f, : ModalDialog(0.95f, 0.5f,
GUIEngine::MODAL_DIALOG_LOCATION_BOTTOM), GUIEngine::MODAL_DIALOG_LOCATION_BOTTOM),
m_dm_cb(dm_cb), m_val_cb(val_cb), m_self_destroy(false) m_dm_cb(dm_cb), m_val_cb(val_cb), m_self_destroy(false)
{ {