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

UI/UX: Put OK/Confirm/Yes on the right

Browse Source 
In UX, back/cancel/etc buttons usually go on the left, while forward/confirm/etc go on the right.  (Note that even the icon for "Back" is a leftwards-pointing arrow.)  STK put the Back arrow button on general screens in the upper left corner, but before this commit, put back/cancel/etc on the right in dialogs and such.  This commit fixes things to be in line with standard UX conventions, and also in line with the pre-existing upper-left corner Back button placement on screens in STK.

https://ux.stackexchange.com/a/63239
This commit is contained in:
QwertyChouskie 2023-04-22 01:36:52 -07:00
parent 4cabef6879
commit 935c6b2191
31 changed files with 123 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,15 +29,15 @@
<div width="80%" proportion="4" align="center">
<buttonbar id="actions" x="0" y="0" height="100%" width="100%" align="center">
<icon-button id="back" width="128" height="128"
icon="gui/icons/back.png"
I18N="Add-on screen action" text="Back" />
<icon-button id="install" width="128" height="128"
icon="gui/icons/package-update.png"
I18N="Add-on screen action" text="Install" />
<icon-button id="uninstall" width="128" height="128"
icon="gui/icons/package-uninstall.png"
I18N="Add-on screen action" text="Uninstall" />
<icon-button id="back" width="128" height="128"
icon="gui/icons/back.png"
I18N="Add-on screen action" text="Back" />
</buttonbar>
</div>
</div>

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

@ -7,12 +7,12 @@
<buttonbar id="buttons" height="30%" width="70%" align="center">
<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"/>
<icon-button id="cancel" width="128" height="128" icon="gui/icons/remove.png"
I18N="In a 'are you sure?' dialog" text="Cancel" align="center"/>
<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"/>
</buttonbar>
</div>
</stkgui>

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

@ -7,12 +7,12 @@
<buttonbar id="buttons" height="30%" width="30%" align="center">
<icon-button id="accept" width="128" height="128" icon="gui/icons/green_check.png"
I18N="In the 'confirm resolution' dialog, that's shown when switching resoluton" text="Accept" align="center"/>
<icon-button id="cancel" width="128" height="128" icon="gui/icons/restart.png"
I18N="In the 'confirm resolution' dialog, that's shown when switching resoluton" text="Revert" align="center"/>
<icon-button id="accept" width="128" height="128" icon="gui/icons/green_check.png"
I18N="In the 'confirm resolution' dialog, that's shown when switching resoluton" text="Accept" align="center"/>
</buttonbar>
</div>
</stkgui>

4
data/gui/dialogs/custom_camera_settings.stkgui
View File

@ -75,12 +75,12 @@
<spacer height="2%" width="100%" />
<buttonbar id="buttons" height="20%" width="90%" align="center">
<icon-button id="apply" width="128" height="128" icon="gui/icons/green_check.png"
I18N="In the ui/camera screen" text="Apply" align="center"/>
<icon-button id="reset" width="128" height="128" icon="gui/icons/restart.png"
I18N="In the ui/camera screen" text="Reset" align="center"/>
<icon-button id="cancel" width="128" height="128" icon="gui/icons/main_quit.png"
I18N="In the ui/camera screen" text="Cancel" align="center"/>
<icon-button id="apply" width="128" height="128" icon="gui/icons/green_check.png"
I18N="In the ui/camera screen" text="Apply" align="center"/>
</buttonbar>
</div>
</div>

4
data/gui/dialogs/custom_video_settings.stkgui
View File

@ -174,10 +174,10 @@
<spacer height="4" width="10"/>
<buttonbar id="buttons" height="15%" width="30%" align="center">
<icon-button id="apply" width="128" height="128" icon="gui/icons/green_check.png"
I18N="Video settings" text="Apply" align="center"/>
<icon-button id="cancel" width="128" height="128" icon="gui/icons/main_quit.png"
I18N="Video settings" text="Cancel" align="center"/>
<icon-button id="apply" width="128" height="128" icon="gui/icons/green_check.png"
I18N="Video settings" text="Apply" align="center"/>
</buttonbar>
</div>
</stkgui>

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

@ -11,12 +11,12 @@
<buttonbar id="buttons" height="50%" width="54%" align="center">
<icon-button id="ok" width="128" height="128" icon="gui/icons/green_check.png"
I18N="In the enter address dialog" text="OK" align="center"/>
<icon-button id="cancel" width="128" height="128" icon="gui/icons/remove.png"
I18N="In the enter address dialog" text="Cancel" align="center"/>
<icon-button id="ok" width="128" height="128" icon="gui/icons/green_check.png"
I18N="In the enter address dialog" text="OK" align="center"/>
</buttonbar>
</div>
</stkgui>

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

@ -9,12 +9,12 @@
<buttonbar id="buttons" height="36%" width="30%" align="center">
<icon-button id="ok" width="128" height="128" icon="gui/icons/green_check.png"
I18N="In the general textfield dialog" text="OK" align="center"/>
<icon-button id="cancel" width="128" height="128" icon="gui/icons/remove.png"
I18N="In the general textfield dialog" text="Cancel" align="center"/>
<icon-button id="ok" width="128" height="128" icon="gui/icons/green_check.png"
I18N="In the general textfield dialog" text="OK" align="center"/>
</buttonbar>
</div>
</stkgui>

18
data/gui/dialogs/ghost_replay_info_dialog.stkgui
View File

@ -38,18 +38,18 @@
<div width="95%" height="40%" align="center">
<buttonbar id="actions" x="0" y="0" height="100%" width="100%" align="center">
<icon-button id="start" width="128" height="128"
icon="gui/icons/green_check.png"
I18N="Ghost replay info screen action" text="Start Race" word_wrap="true" />
<icon-button id="add-ghost-to-compare" width="128" height="128"
icon="gui/icons/ghost_plus.png"
I18N="Ghost replay info screen action" text="Compare ghost" word_wrap="true" />
<icon-button id="remove" width="128" height="128"
icon="gui/icons/remove.png"
I18N="Ghost replay info action" text="Remove" word_wrap="true" />
<icon-button id="back" width="128" height="128"
icon="gui/icons/back.png"
I18N="Ghost replay info action" text="Back" word_wrap="true" />
<icon-button id="remove" width="128" height="128"
icon="gui/icons/remove.png"
I18N="Ghost replay info action" text="Remove" word_wrap="true" />
<icon-button id="add-ghost-to-compare" width="128" height="128"
icon="gui/icons/ghost_plus.png"
I18N="Ghost replay info screen action" text="Compare ghost" word_wrap="true" />
<icon-button id="start" width="128" height="128"
icon="gui/icons/green_check.png"
I18N="Ghost replay info screen action" text="Start Race" word_wrap="true" />
</buttonbar>
</div>
<spacer width="10" height="10%"/>

12
data/gui/dialogs/high_score_info_dialog.stkgui
View File

@ -39,15 +39,15 @@
<spacer width="5" height="45%"/>
<div width="95%" height="100%" align="center">
<buttonbar id="actions" x="0" y="0" height="100%" width="100%" align="center">
<icon-button id="start" width="128" height="128"
icon="gui/icons/green_check.png"
I18N="High score info screen action" text="Start Race" word_wrap="true" />
<icon-button id="remove" width="128" height="128"
icon="gui/icons/remove.png"
I18N="High score info screen action" text="Remove" word_wrap="true" />
<icon-button id="back" width="128" height="128"
icon="gui/icons/back.png"
I18N="High score info screen action" text="Back" word_wrap="true" />
<icon-button id="remove" width="128" height="128"
icon="gui/icons/remove.png"
I18N="High score info screen action" text="Remove" word_wrap="true" />
<icon-button id="start" width="128" height="128"
icon="gui/icons/green_check.png"
I18N="High score info screen action" text="Start Race" word_wrap="true" />
</buttonbar>
</div>
<spacer width="10" height="10%"/>

4
data/gui/dialogs/kart_color_slider.stkgui
View File

@ -17,10 +17,10 @@
</div>
<spacer height="10" width="10"/>
<buttonbar id="buttons" height="20%" width="30%" align="center">
<icon-button id="apply" width="128" height="128" icon="gui/icons/green_check.png"
I18N="In the kart color slider dialog" text="Apply" align="center"/>
<icon-button id="cancel" width="128" height="128" icon="gui/icons/main_quit.png"
I18N="In the kart color slider dialog" text="Cancel" align="center"/>
<icon-button id="apply" width="128" height="128" icon="gui/icons/green_check.png"
I18N="In the kart color slider dialog" text="Apply" align="center"/>
</buttonbar>
</div>
</stkgui>

4
data/gui/dialogs/online/change_password.stkgui
View File

@ -35,10 +35,10 @@
<spacer height="2%" width="50"/>
<buttonbar id="options" width="90%" height="16%" align="center">
<icon-button id="submit" width="64" height="64" icon="gui/icons/green_check.png"
I18N="In the change password dialog" text="Submit" label_location="bottom"/>
<icon-button id="cancel" width="64" height="64" icon="gui/icons/main_quit.png"
I18N="In the change password dialog" text="Close" label_location="bottom"/>
<icon-button id="submit" width="64" height="64" icon="gui/icons/green_check.png"
I18N="In the change password dialog" text="Submit" label_location="bottom"/>
</buttonbar>
<spacer height="1f" width="20"/>
</div>

6
data/gui/dialogs/online/network_ingame_dialog.stkgui
View File

@ -24,6 +24,9 @@
<buttonbar id="choiceribbon" proportion="4" width="100%" align="center">
<icon-button id="exit" width="128" height="128" icon="gui/icons/main_quit.png"
I18N="Race paused button" text="Quit Server" word_wrap="true"/>
<icon-button id="newrace" width="128" height="128" icon="gui/icons/main_race.png"
I18N="Show in network ingame dialog to allow user to go back to lobby to end spectating (for example)"
text="Back to lobby" word_wrap="true"/>
@ -40,9 +43,6 @@
<icon-button id="help" width="128" height="128" icon="gui/icons/main_help.png"
I18N="Race paused button" text="Help" word_wrap="true"/>
<icon-button id="exit" width="128" height="128" icon="gui/icons/main_quit.png"
I18N="Race paused button" text="Quit Server" word_wrap="true"/>
</buttonbar>
<spacer width="20" height="5%" />

6
data/gui/dialogs/online/player_rankings_dialog.stkgui
View File

@ -18,12 +18,12 @@
<spacer height="1%" width="20" />
<buttonbar id="options" width="90%" height="14%" align="center">
<icon-button id="ok" width="128" height="128"
icon="gui/icons/green_check.png" text="OK"
label_location="bottom"/>
<icon-button id="refresh" width="128" height="128"
icon="gui/icons/restart.png"
text="Refresh" label_location="bottom"/>
<icon-button id="ok" width="128" height="128"
icon="gui/icons/green_check.png" text="OK"
label_location="bottom"/>
</buttonbar>
<spacer height="1f" width="20"/>
</div>

4
data/gui/dialogs/online/recovery_input.stkgui
View File

@ -34,10 +34,10 @@
<spacer height="2%" width="50"/>
<buttonbar id="options" width="25%" proportion="1" align="center">
<icon-button id="submit" width="64" height="64" icon="gui/icons/green_check.png"
I18N="In the recovery dialog" text="Submit" label_location="none"/>
<icon-button id="cancel" width="64" height="64" icon="gui/icons/main_quit.png"
I18N="In the recovery dialog" text="Cancel" label_location="none"/>
<icon-button id="submit" width="64" height="64" icon="gui/icons/green_check.png"
I18N="In the recovery dialog" text="Submit" label_location="none"/>
</buttonbar>
<spacer height="1f" width="20"/>
</div>

4
data/gui/dialogs/online/registration_terms.stkgui
View File

@ -23,10 +23,10 @@
<spacer height="2%" width="50"/>
<buttonbar id="options" width="45%" height="14%" align="center">
<icon-button id="accept" width="64" height="64" icon="gui/icons/green_check.png"
I18N="In the registration dialog" text="Accept" label_location="bottom"/>
<icon-button id="cancel" width="64" height="64" icon="gui/icons/main_quit.png"
I18N="In the registration dialog" text="Cancel" label_location="bottom"/>
<icon-button id="accept" width="64" height="64" icon="gui/icons/green_check.png"
I18N="In the registration dialog" text="Accept" label_location="bottom"/>
</buttonbar>
<spacer height="1f" width="5"/>
</div>

4
data/gui/dialogs/online/server_configuration_dialog.stkgui
View File

@ -41,10 +41,10 @@
<spacer height="1%" width="20"/>
<buttonbar id="options" x="0" y="0" width="40%" height="18%" align="center">
<icon-button id="ok" width="64" height="64" icon="gui/icons/green_check.png"
I18N="In the server configuration screen" text="OK" label_location="bottom"/>
<icon-button id="cancel" width="64" height="64" icon="gui/icons/main_quit.png"
I18N="In the server configuration screen" text="Cancel" label_location="bottom"/>
<icon-button id="ok" width="64" height="64" icon="gui/icons/green_check.png"
I18N="In the server configuration screen" text="OK" label_location="bottom"/>
</buttonbar>
<spacer height="1f" width="20"/>

8
data/gui/dialogs/online/server_info_dialog.stkgui
View File

@ -27,12 +27,12 @@
</div>
<spacer height="1%" width="5"/>
<buttonbar id="options" width="90%" proportion="4" align="center">
<icon-button id="join" width="128" height="128" icon="gui/icons/green_check.png"
I18N="In the server info dialog" text="Join" label_location="bottom"/>
<icon-button id="bookmark" width="128" height="128" icon="gui/icons/story_mode_book.png"
I18N="In the server info dialog" text="Bookmark this server" label_location="bottom"/>
<icon-button id="cancel" width="128" height="128" icon="gui/icons/main_quit.png"
I18N="In the server info dialog" text="Cancel" label_location="bottom"/>
<icon-button id="bookmark" width="128" height="128" icon="gui/icons/story_mode_book.png"
I18N="In the server info dialog" text="Bookmark this server" label_location="bottom"/>
<icon-button id="join" width="128" height="128" icon="gui/icons/green_check.png"
I18N="In the server info dialog" text="Join" label_location="bottom"/>
</buttonbar>
<spacer height="1f" width="5"/>
</div>

8
data/gui/dialogs/online/splitscreen_player_dialog.stkgui
View File

@ -44,14 +44,14 @@
<spacer proportion="3" width="10"/>
<buttonbar id="options" width="90%" height="20%" align="center">
<icon-button id="add" width="64" height="64" icon="gui/icons/blue_plus.png"
I18N="Splitscreen player in network" text="Add player" label_location="bottom"/>
<icon-button id="connect" width="64" height="64" icon="gui/icons/green_check.png"
I18N="Splitscreen player in network" text="All players ready" label_location="bottom"/>
<icon-button id="cancel" width="64" height="64" icon="gui/icons/main_quit.png"
I18N="Splitscreen player in network" text="Cancel" label_location="bottom"/>
<icon-button id="reset" width="64" height="64" icon="gui/icons/remove.png"
I18N="Splitscreen player in network" text="Clear players" label_location="bottom"/>
<icon-button id="add" width="64" height="64" icon="gui/icons/blue_plus.png"
I18N="Splitscreen player in network" text="Add player" label_location="bottom"/>
<icon-button id="connect" width="64" height="64" icon="gui/icons/green_check.png"
I18N="Splitscreen player in network" text="All players ready" label_location="bottom"/>
</buttonbar>
<spacer height="1f" width="10"/>

4
data/gui/dialogs/online/user_info_dialog.stkgui
View File

@ -19,6 +19,8 @@
<spacer height="3%" width="50"/>
<buttonbar id="options" width="90%" height="20%" align="center">
<icon-button id="cancel" width="64" height="64" icon="gui/icons/main_quit.png"
I18N="User info dialog" text="Close" label_location="bottom"/>
<icon-button id="remove" width="64" height="64" icon="gui/icons/package-uninstall.png"
I18N="User info dialog" text="Remove" label_location="bottom"/>
<icon-button id="friend" width="64" height="64" icon="gui/icons/blue_plus.png"
@ -29,8 +31,6 @@
I18N="User info dialog" text="Decline" label_location="bottom"/>
<icon-button id="enter" width="64" height="64" icon="gui/icons/difficulty_medium.png"
I18N="User info dialog" text="View" label_location="bottom"/>
<icon-button id="cancel" width="64" height="64" icon="gui/icons/main_quit.png"
I18N="User info dialog" text="Close" label_location="bottom"/>
</buttonbar>
<spacer height="1f" width="20"/>
</div>

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

@ -16,6 +16,9 @@
<buttonbar id="choiceribbon" proportion="4" width="100%" align="center">
<icon-button id="exit" width="128" height="128" icon="gui/icons/main_quit.png"
I18N="In the in-game dialog" text="Back to menu" word_wrap="true"/>
<icon-button id="selectkart" width="128" height="128" icon="gui/icons/random_kart.png"
I18N="In the in-game dialog" text="Select kart" word_wrap="true"/>
@ -25,9 +28,6 @@
<icon-button id="help" width="128" height="128" icon="gui/icons/main_help.png"
I18N="In the in-game dialog" text="Help" word_wrap="true"/>
<icon-button id="exit" width="128" height="128" icon="gui/icons/main_quit.png"
I18N="In the in-game dialog" text="Back to menu" word_wrap="true"/>
</buttonbar>
<spacer width="20" height="35" />

4
data/gui/dialogs/press_a_key_dialog.stkgui
View File

@ -9,12 +9,12 @@
<spacer proportion="1" />
<buttonbar id="buttons" height="45%" width="100%" align="center">
<icon-button id="cancel" width="128" height="128" icon="gui/icons/main_quit.png"
I18N="When configuring input" text="Cancel" align="center"/>
<icon-button id="assignEsc" width="128" height="128" icon="gui/icons/back.png"
I18N="When configuring input" text="Assign to ESC key" align="center"/>
<icon-button id="assignNone" width="128" height="128" icon="gui/icons/remove.png"
I18N="When configuring input" text="Assign nothing" align="center"/>
<icon-button id="cancel" width="128" height="128" icon="gui/icons/main_quit.png"
I18N="When configuring input" text="Cancel" align="center"/>
</buttonbar>
</div>
</stkgui>

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

@ -16,6 +16,9 @@
<buttonbar id="choiceribbon" proportion="4" width="100%" align="center">
<icon-button id="exit" width="128" height="128" icon="gui/icons/main_quit.png"
I18N="Race paused button" raw_text="Text" word_wrap="true"/>
<icon-button id="newrace" width="128" height="128" icon="gui/icons/main_race.png"
I18N="Race paused button" raw_text="Text" word_wrap="true"/>
@ -31,9 +34,6 @@
<icon-button id="help" width="128" height="128" icon="gui/icons/main_help.png"
I18N="Race paused button" text="Help" word_wrap="true"/>
<icon-button id="exit" width="128" height="128" icon="gui/icons/main_quit.png"
I18N="Race paused button" raw_text="Text" word_wrap="true"/>
</buttonbar>
<spacer width="20" height="5%" />

4
data/gui/dialogs/select_challenge.stkgui
View File

@ -24,10 +24,10 @@
<spacer height="3%" width="1"/>
<buttonbar id="actions" height="20%" width="30%" align="center">
<icon-button id="back" icon="gui/icons/back.png"
width="128" height="128" text="Back"/>
<icon-button id="start" icon="gui/icons/green_check.png"
width="128" height="128" text="Start Race"/>
<icon-button id="back" icon="gui/icons/back.png"
width="128" height="128" text="Back"/>
</buttonbar>
</div>

6
data/gui/screens/gp_info.stkgui
View File

@ -71,11 +71,11 @@
<spacer width="1" height="1%"/>
<buttonbar id="buttons" height="17%" width="100%" align="center">
<icon-button id="start" width="64" height="64" icon="gui/icons/green_check.png"
I18N="In the grand prix info screen" text="Start Race"/>
<icon-button id="continue" width="64" height="64" icon="gui/icons/green_check.png"
I18N="In the grand prix info screen" text="Continue saved GP"/>
<icon-button id="start" width="64" height="64" icon="gui/icons/green_check.png"
I18N="In the grand prix info screen" text="Start Race"/>
</buttonbar>
</div>

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

@ -70,10 +70,10 @@
<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="15%" align="center">
<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"/>
<icon-button id="cancel" width="64" height="64" icon="gui/icons/main_quit.png"
I18N="In the server creation screen" text="Cancel" label_location="bottom"/>
<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"/>
</buttonbar>
<spacer width="10" height="1f"/>

4
data/gui/screens/online/networking_lobby.stkgui
View File

@ -31,10 +31,10 @@
<div proportion="1" height="100%" layout="vertical-row">
<spacer height="20%" width="10"/>
<div width="100%" proportion="1" layout="horizontal-row">
<icon-button id="start" proportion="1" height="60%" icon="gui/icons/green_check.png" align="top"
I18N="In the network lobby" text="Start race"/>
<icon-button id="config" proportion="1" height="60%" icon="gui/icons/main_options.png" align="top"
I18N="In the network lobby" text="Configuration"/>
<icon-button id="start" proportion="1" height="60%" icon="gui/icons/green_check.png" align="top"
I18N="In the network lobby" text="Start race"/>
</div>
</div>
</div>

6
data/gui/screens/online/register.stkgui
View File

@ -57,14 +57,14 @@
<label id="info" height="20%" width="100%" align="center" text_align="center" word_wrap="true"
I18N="In the registration dialog"
text="You can play without creating an online account by selecting an offline account. Though then you can not connect to friends, vote for addons etc. Please read our privacy statement at http://privacy.supertuxkart.net"/>
text="You can play without creating an online account by selecting an offline account. Though then you can not connect to friends, vote for addons etc. Please read our privacy statement at https://privacy.supertuxkart.net"/>
</div>
<buttonbar id="options" width="40%" height="15%" align="center">
<icon-button id="next" width="50%" height="90%" icon="gui/icons/green_check.png"
I18N="In the registration dialog" text="OK" label_location="none"/>
<icon-button id="cancel" width="50%" height="90%" icon="gui/icons/main_quit.png"
I18N="In the registration dialog" text="Cancel" label_location="none"/>
<icon-button id="next" width="50%" height="90%" icon="gui/icons/green_check.png"
I18N="In the registration dialog" text="OK" label_location="none"/>
</buttonbar>
</box>
</div>

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

@ -9,10 +9,10 @@
<spacer height="2%" width="100%"/>
<!-- The actual button texts will vary depending on what type of race
was being run, and if something was unlocked etc. So we don't
specify a text here, and label the buttons :
top : 'See unlocked feature(s)', 'Continue', 'Setup new race'
middle: 'Restart' (or invisible)
bottom: 'Abort GP', 'Back to the menu' (or invisible)
specify a text here, and label the buttons:
right: 'Continue', 'Setup new race' (or invisible)
middle: 'Restart', 'Continue' (or invisible)
left: 'Abort GP', 'Back to the menu' (or invisible)
Setting text=" " is important, otherwise the height of the
widget is incorrect. -->
<buttonbar id="operations" width="65%" height="18%" align="center">

4
data/gui/screens/user_screen.stkgui
View File

@ -57,8 +57,6 @@
<div width="90%" align="center" layout="vertical-row" height="13%">
<buttonbar id="options" width="100%" height="100%" align="center">
<icon-button id="ok" width="128" height="128" icon="gui/icons/green_check.png"
I18N="In the user screen" text="OK" label_location="bottom"/>
<icon-button id="new_user" width="128" height="128" icon="gui/icons/blue_plus.png"
I18N="In the user screen" text="Add" label_location="bottom"/>
<icon-button id="delete" width="128" height="128" icon="gui/icons/remove.png"
@ -69,6 +67,8 @@
I18N="In the user screen" text="Kart color" label_location="bottom"/>
<icon-button id="cancel" width="128" height="128" icon="gui/icons/main_quit.png"
I18N="In the user screen" text="Cancel" label_location="bottom"/>
<icon-button id="ok" width="128" height="128" icon="gui/icons/green_check.png"
I18N="In the user screen" text="OK" label_location="bottom"/>
</buttonbar>
</div>
<spacer width="20" height="5%"/>

4
data/gui/screens/user_screen_tab.stkgui
View File

@ -79,8 +79,6 @@
<div width="100%" align="center" layout="vertical-row" height="13%">
<buttonbar id="options" width="100%" height="100%" align="center">
<icon-button id="ok" width="128" height="128" icon="gui/icons/green_check.png"
I18N="In the user screen" text="OK" label_location="bottom"/>
<icon-button id="new_user" width="128" height="128" icon="gui/icons/blue_plus.png"
I18N="In the user screen" text="Add" label_location="bottom"/>
<icon-button id="delete" width="128" height="128" icon="gui/icons/remove.png"
@ -91,6 +89,8 @@
I18N="In the user screen" text="Kart color" label_location="bottom"/>
<icon-button id="cancel" width="128" height="128" icon="gui/icons/main_quit.png"
I18N="In the user screen" text="Cancel" label_location="bottom"/>
<icon-button id="ok" width="128" height="128" icon="gui/icons/green_check.png"
I18N="In the user screen" text="OK" label_location="bottom"/>
</buttonbar>
</div>
<spacer width="20" height="5%"/>

70
src/states_screens/race_result_gui.cpp
View File

@ -261,14 +261,14 @@ void RaceResultGUI::enableAllButtons()
// If we're in a network world, change the buttons text
if (World::getWorld()->isNetworkWorld())
{
left->setLabel(_("Continue"));
left->setImage("gui/icons/green_check.png");
left->setVisible(true);
operations->select("left", PLAYER_ID_GAME_MASTER);
middle->setVisible(false);
right->setLabel(_("Quit the server"));
right->setImage("gui/icons/main_quit.png");
right->setLabel(_("Continue"));
right->setImage("gui/icons/green_check.png");
right->setVisible(true);
operations->select("right", PLAYER_ID_GAME_MASTER);
middle->setVisible(false);
left->setLabel(_("Quit the server"));
left->setImage("gui/icons/main_quit.png");
left->setVisible(true);
return;
}
@ -297,26 +297,26 @@ void RaceResultGUI::enableAllButtons()
middle->setImage("gui/icons/green_check.png");
middle->setVisible(false);
middle->setFocusable(false);
right->setVisible(false);
right->setFocusable(false);
left->setVisible(false);
left->setFocusable(false);
// Two continue buttons to make sure the buttons in the bar is balanced
left->setLabel(_("Continue"));
left->setImage("gui/icons/green_check.png");
left->setVisible(true);
right->setLabel(_("Continue"));
right->setImage("gui/icons/green_check.png");
right->setVisible(true);
if (RaceManager::get()->getTrackNumber() + 1 < RaceManager::get()->getNumOfTracks())
{
right->setLabel(_("Abort Grand Prix"));
right->setImage("gui/icons/race_giveup.png");
right->setVisible(true);
right->setFocusable(true);
operations->select("left", PLAYER_ID_GAME_MASTER);
left->setLabel(_("Abort Grand Prix"));
left->setImage("gui/icons/race_giveup.png");
left->setVisible(true);
left->setFocusable(true);
operations->select("right", PLAYER_ID_GAME_MASTER);
}
else
{
left->setVisible(false);
left->setFocusable(false);
right->setVisible(false);
right->setFocusable(false);
middle->setVisible(true);
operations->select("middle", PLAYER_ID_GAME_MASTER);
}
@ -327,15 +327,15 @@ void RaceResultGUI::enableAllButtons()
// Normal race
// -----------
left->setLabel(_("Restart"));
left->setImage("gui/icons/restart.png");
left->setVisible(true);
operations->select("left", PLAYER_ID_GAME_MASTER);
right->setLabel(_("Restart"));
right->setImage("gui/icons/restart.png");
right->setVisible(true);
operations->select("right", PLAYER_ID_GAME_MASTER);
if (RaceManager::get()->raceWasStartedFromOverworld())
{
middle->setVisible(false);
right->setLabel(_("Back to challenge selection"));
right->setImage("gui/icons/back.png");
left->setLabel(_("Back to challenge selection"));
left->setImage("gui/icons/back.png");
}
else
{
@ -350,10 +350,10 @@ void RaceResultGUI::enableAllButtons()
middle->setLabel(_("Setup New Race"));
middle->setVisible(true);
}
right->setLabel(_("Back to the menu"));
right->setImage("gui/icons/back.png");
left->setLabel(_("Back to the menu"));
left->setImage("gui/icons/back.png");
}
right->setVisible(true);
left->setVisible(true);
}
} // enableAllButtons
@ -400,15 +400,15 @@ void RaceResultGUI::eventCallback(GUIEngine::Widget* widget,
// If we're playing online :
if (World::getWorld()->isNetworkWorld())
{
if (action == "left") // Continue button (return to server lobby)
if (action == "right") // Continue button (return to server lobby)
{
// Signal to the server that this client is back in the lobby now.
auto cl = LobbyProtocol::get<ClientLobby>();
if (cl)
cl->doneWithResults();
getWidget<GUIEngine::IconButtonWidget>("left")->setLabel(_("Waiting for others"));
getWidget<GUIEngine::IconButtonWidget>("right")->setLabel(_("Waiting for others"));
}
if (action == "right") // Quit server (return to online lan / wan menu)
if (action == "left") // Quit server (return to online lan / wan menu)
{
RaceManager::get()->clearNetworkGrandPrixResult();
if (STKHost::existHost())
@ -525,13 +525,13 @@ void RaceResultGUI::eventCallback(GUIEngine::Widget* widget,
// -----------------
if (RaceManager::get()->getMajorMode() == RaceManager::MAJOR_MODE_GRAND_PRIX)
{
if (action == "left" || action == "middle") // Next GP
if (action == "right" || action == "middle") // Next GP
{
cleanupGPProgress();
StateManager::get()->popMenu();
RaceManager::get()->next();
}
else if (action == "right") // Abort
else if (action == "left") // Abort
{
new MessageDialog(_("Do you really want to abort the Grand Prix?"),
MessageDialog::MESSAGE_DIALOG_CONFIRM, this,
@ -547,7 +547,7 @@ void RaceResultGUI::eventCallback(GUIEngine::Widget* widget,
}
StateManager::get()->popMenu();
if (action == "left") // Restart
if (action == "right") // Restart
{
RaceManager::get()->rerunRace();
}
@ -594,7 +594,7 @@ void RaceResultGUI::eventCallback(GUIEngine::Widget* widget,
StateManager::get()->resetAndSetStack(newStack);
}
}
else if (action == "right") // Back to main
else if (action == "left") // Back to main
{
RaceManager::get()->exitRace();
RaceManager::get()->setAIKartOverride("");