Permalink
Browse files

Merge pull request #1371 from Flakebi/master

Change xml style of screens and fix some issues with screens
  • Loading branch information...
2 parents 76b76c6 + e16a7de commit 17511d7d32b02d336806a9e53282ce4082a3a1f7 @auriamg auriamg committed Jun 20, 2014
Showing with 1,394 additions and 1,473 deletions.
  1. +45 −45 data/gui/addons_loading.stkgui
  2. +32 −33 data/gui/addons_screen.stkgui
  3. +20 −21 data/gui/arenas.stkgui
  4. +9 −9 data/gui/challenges.stkgui
  5. +9 −12 data/gui/confirm_dialog.stkgui
  6. +11 −14 data/gui/confirm_resolution_dialog.stkgui
  7. +4 −8 data/gui/credits.stkgui
  8. +155 −157 data/gui/custom_video_settings.stkgui
  9. +1 −0 data/gui/debug_slider.stkgui
  10. +19 −20 data/gui/easter_egg.stkgui
  11. +38 −39 data/gui/edit_track.stkgui
  12. +12 −13 data/gui/enter_gp_name_dialog.stkgui
  13. +13 −14 data/gui/enter_player_name_dialog.stkgui
  14. +2 −6 data/gui/feature_unlocked.stkgui
  15. +32 −34 data/gui/gpedit.stkgui
  16. +43 −44 data/gui/gpeditor.stkgui
  17. +2 −1 data/gui/grand_prix_lose.stkgui
  18. +2 −1 data/gui/grand_prix_win.stkgui
  19. BIN data/gui/help1.stkgui
  20. BIN data/gui/help2.stkgui
  21. BIN data/gui/help3.stkgui
  22. BIN data/gui/help4.stkgui
  23. +23 −24 data/gui/karts.stkgui
  24. +23 −24 data/gui/karts_online.stkgui
  25. +1 −5 data/gui/main.stkgui
  26. +13 −16 data/gui/online/change_password.stkgui
  27. +26 −27 data/gui/online/create_server.stkgui
  28. +35 −37 data/gui/online/guest_login.stkgui
  29. +14 −14 data/gui/online/lobby.stkgui
  30. +8 −9 data/gui/online/lobby_settings.stkgui
  31. +13 −13 data/gui/online/main.stkgui
  32. +5 −8 data/gui/online/notification_dialog.stkgui
  33. +16 −17 data/gui/online/profile_achievements.stkgui
  34. +29 −31 data/gui/online/profile_friends.stkgui
  35. +17 −18 data/gui/online/profile_overview.stkgui
  36. +22 −23 data/gui/online/profile_settings.stkgui
  37. +10 −13 data/gui/online/recovery_info.stkgui
  38. +19 −21 data/gui/online/recovery_input.stkgui
  39. +73 −75 data/gui/online/register.stkgui
  40. +12 −15 data/gui/online/registration_terms.stkgui
  41. +10 −13 data/gui/online/server_info_dialog.stkgui
  42. +10 −12 data/gui/online/server_selection.stkgui
  43. +13 −17 data/gui/online/user_info_dialog.stkgui
  44. +20 −22 data/gui/online/user_search.stkgui
  45. +9 −12 data/gui/online/vote_dialog.stkgui
  46. +59 −60 data/gui/options_audio.stkgui
  47. +44 −45 data/gui/options_device.stkgui
  48. +34 −35 data/gui/options_input.stkgui
  49. +45 −46 data/gui/options_players.stkgui
  50. +56 −57 data/gui/options_ui.stkgui
  51. +76 −77 data/gui/options_video.stkgui
  52. +1 −2 data/gui/overworld_dialog.stkgui
  53. +8 −9 data/gui/press_a_key_dialog.stkgui
  54. +1 −3 data/gui/race_paused_dialog.stkgui
  55. +1 −0 data/gui/race_result.stkgui
  56. +37 −38 data/gui/racesetup.stkgui
  57. +39 −40 data/gui/select_challenge.stkgui
  58. +7 −9 data/gui/soccer_setup.stkgui
  59. +55 −59 data/gui/track_info_dialog.stkgui
  60. +23 −24 data/gui/tracks.stkgui
  61. +8 −10 data/gui/tutorial.stkgui
  62. +6 −8 data/gui/tutorial_message_dialog.stkgui
  63. +2 −1 data/gui/user_screen.stkgui
  64. +4 −4 data/gui/user_screen_tab.stkgui
  65. +18 −9 src/states_screens/options_screen_input2.cpp
@@ -1,45 +1,45 @@
-<stkgui>
-
-<div x="5%" y="5%" width="90%" height="90%" layout="vertical-row">
-
-
- <div x="5%" y="0%" width="90%" proportion="6" layout="horizontal-row" >
- <div width="40%" height="100%" layout="vertical-row" >
- <icon id="icon" align="center" proportion="8" width="100%" icon="gui/loading.png"/>
- <spacer proportion="1" />
- </div>
- <spacer proportion="1" />
- <div width="60%" height="50%" layout="vertical-row" >
- <label id="name" width="100%" text_align="left"/>
- <div width="100%" height="100%" layout="horizontal-row" >
- <div width="50%" height="100%" layout="vertical-row" >
- <label id="size" width="100%" text=""/>
- <label id="revision" width="100%" text=""/>
- </div>
- <div width="50%" height="32" layout="vertical-row" >
- <ratingbar id="rating" height="64" width="100%" />
- </div>
- </div>
- <spacer height="10"/>
- <label id="flags" width="100%" text="" word_wrap="true"/>
- </div>
- </div>
-
- <bubble word_wrap="true" id="description" height="100%" width="90%" proportion="5" align="center" />
-
- <div width="80%" proportion="5" align="center">
- <buttonbar id="actions" x="0" y="0" height="100%" width="100%" align="center">
- <icon-button id="install" width="128" height="128"
- icon="gui/package-update.png"
- I18N="Add-on screen action" text="Install"/>
- <icon-button id="uninstall" width="128" height="128"
- icon="gui/package-uninstall.png"
- I18N="Add-on screen action" text="Uninstall"/>
- <icon-button id="back" width="128" height="128"
- icon="gui/back.png"
- I18N="Add-ons screen action" text="Back"/>
- </buttonbar>
- <progressbar id="progress" x="0" y="20%" width="100%" height="30%" />
- </div>
-</div>
-</stkgui>
+<?xml version="1.0" encoding="UTF-8"?>
+<stkgui>
+ <div x="5%" y="5%" width="90%" height="90%" layout="vertical-row">
+
+
+ <div x="5%" y="0%" width="90%" proportion="6" layout="horizontal-row" >
+ <div width="40%" height="100%" layout="vertical-row" >
+ <icon id="icon" align="center" proportion="8" width="100%" icon="gui/loading.png"/>
+ <spacer proportion="1" />
+ </div>
+ <spacer proportion="1" />
+ <div width="60%" height="50%" layout="vertical-row" >
+ <label id="name" width="100%" text_align="left"/>
+ <div width="100%" height="100%" layout="horizontal-row" >
+ <div width="50%" height="100%" layout="vertical-row" >
+ <label id="size" width="100%" text=""/>
+ <label id="revision" width="100%" text=""/>
+ </div>
+ <div width="50%" height="32" layout="vertical-row" >
+ <ratingbar id="rating" height="64" width="100%" />
+ </div>
+ </div>
+ <spacer height="10"/>
+ <label id="flags" width="100%" text="" word_wrap="true"/>
+ </div>
+ </div>
+
+ <bubble word_wrap="true" id="description" height="100%" width="90%" proportion="5" align="center" />
+
+ <div width="80%" proportion="5" align="center">
+ <buttonbar id="actions" x="0" y="0" height="100%" width="100%" align="center">
+ <icon-button id="install" width="128" height="128"
+ icon="gui/package-update.png"
+ I18N="Add-on screen action" text="Install"/>
+ <icon-button id="uninstall" width="128" height="128"
+ icon="gui/package-uninstall.png"
+ I18N="Add-on screen action" text="Uninstall"/>
+ <icon-button id="back" width="128" height="128"
+ icon="gui/back.png"
+ I18N="Add-ons screen action" text="Back"/>
+ </buttonbar>
+ <progressbar id="progress" x="0" y="20%" width="100%" height="30%" />
+ </div>
+ </div>
+</stkgui>
@@ -1,40 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
<stkgui>
+ <div x="0%" y="0%" width="100%" height="98%" layout="vertical-row" >
-<div x="0%" y="0%" width="100%" height="98%" layout="vertical-row" >
-
- <div x="0" y="0" width="100%" layout="horizontal-row" height="8%">
- <icon-button id="back" height="100%" icon="gui/back.png"/>
- <header text_align="center" proportion="1" text="SuperTuxKart Addons" align="center"/>
- <icon-button id="reload" height="90%" icon="gui/restart.png"/>
- </div>
-
- <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">
- <textbox id="filter_name" proportion="7" align="center" />
- <spacer width="10" />
- <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="8" align="center" min_value="0" wrap_around="true"/>
- <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"/>
- <icon-button id="filter_search" height="100%" icon="gui/search.png"/>
+ <div x="0" y="0" width="100%" layout="horizontal-row" height="8%">
+ <icon-button id="back" height="100%" icon="gui/back.png"/>
+ <header text_align="center" proportion="1" text="SuperTuxKart Addons" align="center"/>
+ <icon-button id="reload" height="90%" icon="gui/restart.png"/>
</div>
- </box>
-
- <spacer height="15" width="10"/>
- <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"
- I18N="Section in the addons menu" text="Karts"/>
- <icon-button id="tab_track" width="128" height="128" icon="gui/mode_normal.png"
- I18N="Section in the addons menu" text="Tracks"/>
- <icon-button id="tab_arena" width="128" height="128" icon="gui/mode_normal.png"
- I18N="Section in the addons menu" text="Arenas"/>
- </tabs>
+ <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">
+ <textbox id="filter_name" proportion="7" align="center" />
+ <spacer width="10" />
+ <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="8" align="center" min_value="0" wrap_around="true"/>
+ <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"/>
+ <icon-button id="filter_search" height="100%" icon="gui/search.png"/>
+ </div>
+ </box>
+
+ <spacer height="15" width="10"/>
- <box proportion="1" width="98%" align="center" layout="vertical-row" padding="6">
- <list id="list_addons" x="0" y="0" width="100%" height="100%"/>
- </box>
-
-</div>
+ <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"
+ I18N="Section in the addons menu" text="Karts"/>
+ <icon-button id="tab_track" width="128" height="128" icon="gui/mode_normal.png"
+ I18N="Section in the addons menu" text="Tracks"/>
+ <icon-button id="tab_arena" width="128" height="128" icon="gui/mode_normal.png"
+ I18N="Section in the addons menu" text="Arenas"/>
+ </tabs>
+ <box proportion="1" width="98%" align="center" layout="vertical-row" padding="6">
+ <list id="list_addons" x="0" y="0" width="100%" height="100%"/>
+ </box>
+
+ </div>
</stkgui>
View
@@ -1,28 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
<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="2%" y="1%" width="96%" height="99%" layout="vertical-row" >
-<div x="2%" y="1%" width="96%" height="99%" layout="vertical-row" >
+ <header width="80%" I18N="Section in arena tracks selection screen" text="Arenas"
+ align="center" text_align="center" />
- <header width="80%" I18N="Section in arena tracks selection screen" text="Arenas"
- align="center" text_align="center" />
-
- <spacer width="20" height="5" />
-
- <box proportion="1" width="100%" layout="vertical-row" padding="2">
- <ribbon_grid id="tracks" proportion="1" width="100%" square_items="true"
- label_location="bottom" align="center" child_width="160" child_height="120" />
- <spacer width="20" height="13" />
- </box>
+ <spacer width="20" height="5" />
- <tabs width="100%" height="25" id="trackgroups">
- <button id="standard" I18N="track group" text="Standard"/>
- <button id="addons" I18N="track group" text="Add-Ons"/>
- <button id="all" I18N="track group" text="All"/>
- </tabs>
+ <box proportion="1" width="100%" layout="vertical-row" padding="2">
+ <ribbon_grid id="tracks" proportion="1" width="100%" square_items="true"
+ label_location="bottom" align="center" child_width="160" child_height="120" />
+ <spacer width="20" height="13" />
+ </box>
- <spacer width="20" height="3%" />
-
-</div>
+ <tabs width="100%" height="25" id="trackgroups">
+ <button id="standard" I18N="track group" text="Standard"/>
+ <button id="addons" I18N="track group" text="Add-Ons"/>
+ <button id="all" I18N="track group" text="All"/>
+ </tabs>
-</stkgui>
+ <spacer width="20" height="3%" />
+
+ </div>
+</stkgui>
View
@@ -1,20 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
<stkgui>
-
<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" >
-
+
<header I18N="Title for challenges screen" text="Challenges : Trophy Room" text_align="center" align="center" width="80%" />
-
+
<spacer height="5" width="100%"/>
-
+
<box width="100%" proportion="5" layout="vertical-row">
-
+
<ribbon_grid id="challenges" proportion="8" width="100%"
label_location="bottom" align="center" child_width="128" child_height="128" />
-
-
+
+
<spacer proportion="1" width="100%"/>
</box>
</div>
-</stkgui>
+</stkgui>
@@ -1,19 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
<stkgui>
+ <div x="2%" y="10%" width="96%" height="80%" layout="vertical-row" >
+ <label id="title" width="100%" text_align="center" word_wrap="true" proportion="1" />
-<div x="2%" y="10%" width="96%" height="80%" layout="vertical-row" >
+ <spacer height="25" width="10" />
- <label id="title" width="100%" text_align="center" word_wrap="true" proportion="1" />
+ <button id="confirm" I18N="In a 'are you sure?' dialog" text="Yes" align="center"/>
- <spacer height="25" width="10" />
+ <spacer height="15" width="10" />
- <button id="confirm" I18N="In a 'are you sure?' dialog" text="Yes" align="center"/>
-
- <spacer height="15" width="10" />
-
- <button id="cancel" I18N="In a 'are you sure?' dialog" text="Cancel" align="center"/>
-
- <spacer height="10" width="10" />
-
-</div>
+ <button id="cancel" I18N="In a 'are you sure?' dialog" text="Cancel" align="center"/>
+ <spacer height="10" width="10" />
+ </div>
</stkgui>
@@ -1,21 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
<stkgui>
+ <div x="2%" y="10%" width="96%" height="80%" layout="vertical-row" >
+ <label id="title" width="100%" text_align="center" word_wrap="true" proportion="1" />
-<div x="2%" y="10%" width="96%" height="80%" layout="vertical-row" >
+ <spacer height="25" width="10" />
- <label id="title" width="100%" text_align="center" word_wrap="true" proportion="1" />
+ <button id="accept" I18N="In the 'confirm resolution' dialog, that's shown when switching resoluton"
+ text="Keep this resolution" align="center"/>
- <spacer height="25" width="10" />
+ <spacer height="15" width="10" />
- <button id="accept" I18N="In the 'confirm resolution' dialog, that's shown when switching resoluton"
- text="Keep this resolution" align="center"/>
-
- <spacer height="15" width="10" />
-
- <button id="cancel" I18N="In the 'confirm resolution' dialog, that's shown when switching resoluton"
- text="Cancel" align="center"/>
-
- <spacer height="10" width="10" />
-
-</div>
+ <button id="cancel" I18N="In the 'confirm resolution' dialog, that's shown when switching resoluton"
+ text="Cancel" align="center"/>
+ <spacer height="10" width="10" />
+ </div>
</stkgui>
View
@@ -1,18 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<stkgui>
-
<icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
<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"/>
-
+
<header I18N="Title in credits screen" text="Credits" width="100%" />
-
+
<box id="animated_area" width="100%" proportion="10" padding="0">
-
</box>
-
</div>
-
-</stkgui>
+</stkgui>
Oops, something went wrong.

0 comments on commit 17511d7

Please sign in to comment.