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

UI fix bundle VII (#3949)

Browse Source 
* Smarter size

* Better size

* Smarter row size

* Smarter size

* Fix #3792

* Bigger title && use 4 spaces

* Fix #3792

* Better credits

* Smarter size

* Less lines to preserve space

* Smarter icon size

* Better size

* Completely fix #3792

Using buttonbar in every line can avoid scaling problems

* Completely fix #3792

* Completely fix #3792

* Add space under the screen

* Make space smaller

* Smarter ratingbar size

* Better size

* More reasonable size for powerup texts

* Better spacer under the screen

* Sparter space under buttons

* Smarter space under buttons

* Smarter space

* Smaeter space under icons

* Smarter space under buttons

* Smarter space

* Smarter space under butons

* Smarter space

* Smarter space under buttons

* Smarter space

* Smarter space under buttons

* Smarter space

* Smarter stars size

* Fix an extra line

* change buttonbar back into ribbon

* dont declare the width of the buttons

It may cause some characters partly showed or hidden in some lang
This commit is contained in:
dumaosen 2019-06-09 04:01:54 +08:00 committed by Deve
parent 08c61bfb91
commit 6cc75a106b
30 changed files with 207 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
data/CREDITS
View File

@ -78,6 +78,9 @@ Google Summer of Code Students
- Lauri Kasanen
- Daniel Butum
- Bart Cools
Google Summer of Code Students
- Csaba Molnar
- Sachith Seneviratne
- Akshay Singhvi
@ -90,6 +93,9 @@ Bug fixes & misc contributions
- David (Work on flying items)
- Stephen Dunn (Work on audio)
- Patrick Ammann
Bug fixes & misc contributions
- Ward Muylaert
- Fantasmos
- QwertyChouskie
@ -159,6 +165,8 @@ GUI Icons and Other Art
- The Tango icon project, the Gnome icon set
- Dakal : textures
- Andy (Needer)
GUI Icons and Other Art
- Paul Elms (scifly)
- Elisee : Checker background
- Mariam Lamrani (may-panda): wallpaper and poster
@ -242,6 +250,8 @@ Software used
- curl
- freetype2
- OpenAL
Software used
- ogg
- vorbis
- fribidi
@ -258,23 +268,28 @@ Donations
- M J Angove, Florian Lehebel, David E Scourfield, Michael Laube
- Merlin Juusola, Matthias Wiege, Matthew Toppenberg, Martin Rejman
- Mark Gannon, Lukas Palme, Lennart Mellqvist, Joshua Dye, Jan Havran
- Jacqueline Brown, Igor Murzich, Guido Stehr, Gisela Ehresmann
- Evaldas Granickas, Elisabeth Lambert, Edith Muijsers, DC Jaeger
Donations
- Jacqueline Brown, Igor Murzich, Guido Stehr, Gisela Ehresmann
- Evaldas Granickas, Elisabeth Lambert, Edith Muijsers, DC Jaeger
- Damian Fajfer, Chase Williamson, Carsten Timm, Baptiste Dagneaux
- Alexander Olkhovsky, Aleix Casamitjana, Adrián Chaves Fernández
- Georgi Stoychev, Nuno Ferreira, Steven Anderson, Charalabos Frouzakis
- Richard Qian, William Nakamura, Maree Glynn, David Carlier
Donations
- Alistair Findlay, James Tobin, Ursula Belting, Stephan van den Akker
- Ken McCall, Arnaud Maurin, James Tobin, Stefan Kiehne, David Efflandt
- Gary Shearer, Stuart Gibb, Fran Casal, Piotr Karczemski, Florian Lehébel
- Dominik Müller, Saverio Brancaccio, Florian Lehébel, Pietro Pizzo
Donations
- Alvaro Castañeda Mendoza, Simón Llinares Riestra, Radu Sofian
- Yevgeny Slusorenko, Joshua Dye, Chris Lukas, Gary Shearer, Gary Shearer
Donations
- Martin Lankes, Muchlis Polin, Peter Estes, Nuno Ferreira, Duncan Steele
- Michael Kleinhans, Atomic Monks, Aleksandar Sokolovski, Brandon Hoeksema
- Victor Gabillon, Tristan Reitter, Lupe Aguilar, Florian Pelz
@ -282,6 +297,7 @@ Donations
- Csongor Ballay, Csongor Ballay, William Youstra, Peter Estes
- Régis Hamann, Régis Hamann, Yuri Sucupira, Lucien Greefkes, Frank Sapone
Donations
- Peter Cundall, Michael Richards, Franz Ernst, Florian Lehébel
- Jörg Orlowski, Lukasz Szczekocki, Bjarni Kristinsson, David Carlier
@ -289,74 +305,86 @@ Donations
- Guillaume Pointet, Dennis Holierhoek, Daniel Nelson, David Hibshman
- Thomas Belvin, Erik Jahn, Susen Skotnik, Dennis McLaughlin, Bert De Mets
- Jean-Gabriel Kammerer, Stefan Lukits, Martin Steigerwald
- Adam Williamson, A Anton, Ville Kauppila, Gary Shearer
- Peter Hausleitner, Philip Pfeifer, Christoph Baldauf, Jane Middlebrooke
Donations
- Adam Williamson, A Anton, Ville Kauppila, Gary Shearer
- Peter Hausleitner, Philip Pfeifer, Christoph Baldauf, Jane Middlebrooke
- roundof.org, Roman Marschall, Gary Shearer, Jonathan Banks
- Nicolas Affolter, Mahendra Tallur, David Behnke, Mark Supper
- Eric Cheminot, Jason Speechley, Michael Martin, Andrew Gilbert
- Fabian Schach, michael orosov, Wendell Glick, Eugene Lemaitre
Donations
- Gerald Angus, Andrea De Angelis, Antonio Sala, Joshua Dye, roundof.org
- Andreas Müller, Jose Miguel Bolorino Manzano, Troy Smith, Bernhard Motel
- Bernhard Motel, Alexandre Bouhier, Thomas Preissler, Lubomír Saji
- Eric Pedersen, Fabrice SAILLY-SIRGUE, Simon Dalsgaard, Joshua Dye
Donations
- Detlef Olp, João Pedro de Lima, Christopher Sweeney, Ryan Gervais
- Laszlo Ast, Robert Yerke, Nuno Ferreira, Lachand Valentin, Arne Bernin
- Carsten Carulli, Jeremy Kenny, Francisco Monteagudo, Marlow Marlow
Donations
- Kong Chun Ho, Jonathan Lee, Dominik Rösner, Andreas Frankl
- Didier Delhaye, Gianluca Bonato, Ferdinand Ihringer, Mark Dougherty
- Топоров Константин, Georges-Mickael Seguin, Jason Grindlay
- Gordon Macleod, Anders Jonsson, Peter Estes, Marius Gripsgård,
- FoosterNET, Daniel Sandman, David Ault, Matt DeVillier, Chris Leutwyler
- Anthony Waxman, Rémi Verschelde, Alessandro Vitali, Katherine Freeman
Donations
- Anthony Waxman, Rémi Verschelde, Alessandro Vitali, Katherine Freeman
- Roy Akselsen, Ingrid Becke, Jonathan Lee, Christoph Baldauf
- Victor Gabillon, Yves Fourneau, Rubén Leal Coba, Andreas Müller
- Santiago Hoyos Zea, Tobias Wenig, Nuno Ferreira, Fran Casal
- Alexey Горохов, Luka Vievsky, Nathan Dykhuis, David , David Leschinsky
- Sam Tygier, Алексей Казаков, Matthew Golliher
- Karl Ove Hufthammer, Richard Stoltenberg, Niklas Anderson, Alfred Turner
- Adrian Spirgi, Frank Abrignani, Lukasz Korpalski, Andea De Angelis
Donations
- Adrian Spirgi, Frank Abrignani, Lukasz Korpalski, Andea De Angelis
- Pedro Freitas Fleck, Lachand Valentin, Cyrille Giquello, FoosterNet
- Olivier C. Pageau, Bérenger Ossete Gombe, Michael Schönitzer
- Daniel Martínez García, Joe Westcott, Patrik Nilsson, Will Hennegan
- Philip Whitfield, Markus Hedetoft, Walt Zwierzycki, Jake Jarrett
- Kyle Maggio, Richárd Ráthgéber, Gilles Wittezaele, Daniel Sandman
Donations
- Haldor Zaake-Hertling, Elvis Kandler, OPE Beckman Lapre
- Esteban Monge Marin, Marcos Schnalke, Maximilian Rüdiger, Glenn Geenen
- Michael Biller, Vincent Bermel, John Cordray, Jannik Heller
Donations
- Vincent Stavleu, Jairo Estefania Vilumbrales, Michal Klaus, Josh Dye
- Carlos Solís Róger, James Vandermark, Wouter Reckman, Nuno Ferreira
- Crefelean Nicolae, Mark Saliers, Issa Gorissen, Tom Reynolds
Donations
- James Dearing, Collin Blatt, Vincent Bermel, Nuno Ferreira
- Jarl Frode Arntzen, Vladimir Tuboltsev, Attila Cseman
- Frank Lauterbach, Mahendra Tallur, Matthijs Harmsen, Dietmar Wolf
- Suwannee Massage, Fabio Molinari, Christian Ritzer
- Gerard Vaas, Edgar Klenske, Georgi Stoychev, Daniel Reimann
- Tibor Grasser, Robert Forster, Kelonye Mitchel, Dennis Shewmaker,
Donations
- Tibor Grasser, Robert Forster, Kelonye Mitchel, Dennis Shewmaker,
- ProMission Projects, Inc., Ken McCall, Peter Estes, Markus Valkeapää
- Victor Gabillon, Franz Schmid, Austin Williamson, Artūras Norkus
- Roland Schoof, Borisenkov Alexey, Edvin Djupvik, Mikel Crespo,
- Trevor Robertson, Sergej Engbrecht, Dylan Mahoney,
- Joel Schaerer, Stephanie Theisz, Mokimoke, George Angelopoulos
- Kharlamov Ivan, Cedric Briand, Christoph Baldauf, Marco Caiazza,
- Volkov Alexandr, Evelyne Tenaerts, Thomas Salmhofer, Ralfe Gomes Ecard
Donations
- Volkov Alexandr, Evelyne Tenaerts, Thomas Salmhofer, Ralfe Gomes Ecard
- Carlos Alonso Pena Osorio, Philip Delaney, Giorgio Cantoni,
- Gabriel Stedtler, Alexander Sauter, Robert Premuž, Antonín Pilát
- Sylvain St-Amand, Apostolos Apostolidis, E. Cole, David Ault
- Vinzenz Vietzke,Edgar Bennet, Ryan Lei, Sergey Spiridonov
- Carsten Carulli, Jeremy Kenny, Francisco Monteagudo, Marlow Marlow
Donations
- Michal Sladek, Peter Lebbing, Roland Schoof, Lars Peter Mathiassen
- Benjamin Gronke, Marc Coll, Peter Estes, John Yewell, Josh Dye
- Sebastian Rode, OpenGameArt.org, Tux_penguin, Magne Djupvik
@ -372,14 +400,16 @@ No longer active
- Sam Clarke : Windows Installer
- Hans "the farmer" Dzaack : Physics tuning
- Maik Semder (Ikework) : Bug fixes
- Xapantu : add-ons website
No longer active
- Xapantu : add-ons website
- Lionel Fuentes (Funto) : Soccer mode and other contributions
- Mohammad Al-Ghannam (Yasin) : Soccer mode
- Johannesr1 : Bubble gum shield
- Glenn De Jonghe (Unitraxx) : Grand Prix progress saving
- MCMic : reverse mode
No longer active
- Yann Leprince (sciyann)
- Xenux : Add-Ons filtering
- jmimu

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

@ -14,9 +14,7 @@
<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>
<ratingbar id="rating" height="1f" width="100%" />
</div>
<spacer height="10"/>
<label id="flags" width="100%" text="" word_wrap="true" />

19
data/gui/dialogs/android/init_android.stkgui
View File

@ -8,12 +8,12 @@
<spacer height="7%" width="10"/>
<ribbon id="control_type" proportion="1" width="100%" align="center">
<icon-button id="accelerometer" width="fit" height="fit" icon="gui/icons/difficulty_medium.png"
I18N="Control type" text="Accelerometer"/>
<icon-button id="gyroscope" width="fit" height="fit" icon="gui/icons/difficulty_best.png"
I18N="Control type" text="Gyroscope"/>
<icon-button id="steering_wheel" width="fit" height="fit" icon="gui/icons/difficulty_hard.png"
I18N="Control type" text="Steering wheel"/>
<icon-button id="accelerometer" width="128" height="128"
icon="gui/icons/difficulty_medium.png" I18N="Control type" text="Accelerometer"/>
<icon-button id="gyroscope" width="128" height="128"
icon="gui/icons/difficulty_best.png" I18N="Control type" text="Gyroscope"/>
<icon-button id="steering_wheel" width="128" height="128"
icon="gui/icons/difficulty_hard.png" I18N="Control type" text="Steering wheel"/>
</ribbon>
<spacer height="12%" width="10"/>
@ -23,9 +23,8 @@
<spacer height="7%" width="10"/>
<div width="25%" height="10%" layout="horizontal-row" align="center">
<button id="close" text="Apply" width="100%" height="100%" align="center"/>
</div>
<button id="close" text="Apply" align="center"/>
</div>
</stkgui>

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

@ -1,20 +1,19 @@
<?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="top" word_wrap="true" proportion="1" />
<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"/>
<spacer height="25" width="10" />
<spacer height="6%" width="10" />
<buttonbar id="buttons" height="30%" width="30%" align="center">
<buttonbar id="buttons" height="24%" width="30%" align="center">
<icon-button id="confirm" icon="gui/icons/green_check.png" I18N="In a 'are you sure?' dialog"
text="Yes" 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" icon="gui/icons/remove.png" I18N="In a 'are you sure?' dialog"
text="Cancel" 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"/>
</buttonbar>
<spacer height="10" width="10" />
<spacer width="20" height="1f" />
</div>
</stkgui>

20
data/gui/dialogs/debug_slider.stkgui
View File

@ -1,39 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<stkgui>
<div x="2%" y="10%" width="96%" height="80%" layout="vertical-row" >
<div x="2%" y="6%" width="96%" height="88%" layout="vertical-row" >
<div proportion="1" width="100%" layout="horizontal-row">
<label id="Red" raw_text="Red" width="200"/>
<spacer width="25"/>
<label id="Red" raw_text="Red" width="7f"/>
<gauge id="red_slider" min_value="0" max_value="100" proportion="1"/>
</div>
<div proportion="1" width="100%" layout="horizontal-row">
<label id="Green" raw_text="Green" width="200"/>
<spacer width="25"/>
<label id="Green" raw_text="Green" width="7f"/>
<gauge id="green_slider" min_value="0" max_value="100" proportion="1"/>
</div>
<div proportion="1" width="100%" layout="horizontal-row">
<label id="Blue" raw_text="Blue" width="200"/>
<spacer width="25"/>
<label id="Blue" raw_text="Blue" width="7f"/>
<gauge id="blue_slider" min_value="0" max_value="100" proportion="1"/>
</div>
<div proportion="1" width="100%" layout="horizontal-row">
<label id="SSAO radius" raw_text="SSAO Radius" width="200"/>
<spacer width="50"/>
<label id="SSAO radius" raw_text="SSAO Radius" width="7f"/>
<gauge id="ssao_radius" min_value="0" max_value="100" proportion="1" />
</div>
<div proportion="1" width="100%" layout="horizontal-row">
<label id="SSAO k" raw_text="SSAO K" width="200"/>
<spacer width="25"/>
<label id="SSAO k" raw_text="SSAO K" width="7f"/>
<gauge id="ssao_k" min_value="0" max_value="100" proportion="1"/>
</div>
<div proportion="1" width="100%" layout="horizontal-row">
<label id="SSAO Sigma" raw_text="SSAO sigma" width="200"/>
<spacer width="50"/>
<label id="SSAO Sigma" raw_text="SSAO sigma" width="7f"/>
<gauge id="ssao_sigma" min_value="0" max_value="100" proportion="1"/>
</div>
</div>

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

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<stkgui>
<div x="2%" y="6%" width="96%" height="88%" layout="vertical-row" >
<div x="2%" y="5%" width="96%" height="90%" layout="vertical-row" >
<label id="title" raw_text="Text" height="36%"/>
<spacer height="7%" width="10" />
@ -16,5 +16,6 @@
I18N="In the general textfield dialog" text="Cancel" align="center"/>
</buttonbar>
<spacer height="1f" width="20" />
</div>
</stkgui>

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

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<stkgui>
<div x="1%" y="2%" width="98%" height="96%" layout="vertical-row">
<div x="1%" y="4%" width="98%" height="92%" layout="vertical-row">
<div width="100%" height="40%" layout="vertical-row">
<div width="100%" height="25%" layout="vertical-row" >
@ -21,17 +21,17 @@
<div width="95%" align="center" layout="vertical-row" height="50%">
<div width="100%" height="fit" layout="horizontal-row" >
<checkbox width="fit" id="record-race" I18N="Ghost replay info action" text_align="left"/>
<spacer width="10"/>
<spacer width="1%"/>
<label proportion="1" id="record-race-text" height="100%" text_align="left" I18N="Ghost replay info action" text="Record the race for ghost replay"/>
</div>
<div width="100%" height="fit" layout="horizontal-row" >
<checkbox width="fit" id="watch-only" I18N="Ghost replay info action" text_align="left"/>
<spacer width="10"/>
<spacer width="1%"/>
<label proportion="1" id="watch-only-text" height="100%" text_align="left" I18N="Ghost replay info action" text="Watch replay only"/>
</div>
<div width="100%" height="fit" layout="horizontal-row" >
<checkbox width="fit" id="compare-ghost" I18N="Ghost replay info action" text_align="left"/>
<spacer width="10"/>
<spacer width="1%"/>
<label proportion="1" id="compare-ghost-text" height="100%" text_align="left" I18N="Ghost replay info action" text="Compare to another ghost"/>
</div>
</div>

2
data/gui/dialogs/online/achievement_progress_dialog.stkgui
View File

@ -39,6 +39,6 @@
icon="gui/icons/green_check.png" text="OK"
label_location="bottom"/>
</buttonbar>
<spacer width="20" height="3%" />
<spacer width="20" height="1f" />
</div>
</stkgui>

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

@ -5,7 +5,7 @@
<header id="title" width="96%" height="fit" text_align="center" word_wrap="true"
I18N="In the change password dialog" text="Password Change"/>
<spacer height="40" width="50"/>
<spacer height="4%" width="50"/>
<div width="80%" align="center" layout="vertical-row" height="fit" >
<div width="100%" height="fit" layout="horizontal-row" >
@ -13,14 +13,14 @@
<textbox proportion="2" height="fit" id="current_password" I18N="In the change password dialog"/>
</div>
<spacer height="20" width="20"/>
<spacer height="12%" width="20"/>
<div width="100%" height="fit" layout="horizontal-row" >
<label proportion="1" height="100%" text_align="left" I18N="In the change password dialog" text="New Password"/>
<textbox proportion="2" height="fit" id="new_password1" I18N="In the change password dialog"/>
</div>
<spacer height="20" width="20"/>
<spacer height="12%" width="20"/>
<div width="100%" height="fit" layout="horizontal-row" >
<label proportion="1" height="100%" text_align="left" I18N="In the change password dialog" text="Confirm"/>
@ -28,11 +28,11 @@
</div>
</div>
<spacer height="20" width="50"/>
<spacer height="2%" width="50"/>
<label id="info" proportion="1" width="90%" align="center" text_align="center" word_wrap="true" text=""/>
<spacer height="20" width="50"/>
<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"
@ -40,5 +40,6 @@
<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"/>
</buttonbar>
<spacer height="1f" width="20" />
</div>
</stkgui>

5
data/gui/dialogs/online/notification_dialog.stkgui
View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<stkgui>
<div x="2%" y="5%" width="96%" height="85%" layout="vertical-row" >
<div x="2%" y="5%" width="96%" height="90%" layout="vertical-row" >
<label id="info" proportion="1" width="90%" align="center" text_align="center" word_wrap="true" text=""/>
<spacer height="20" width="50"/>
<spacer height="2%" width="50"/>
<buttonbar id="options" width="90%" height="30%" align="center">
<icon-button id="view" width="64" height="64" icon="gui/icons/difficulty_medium.png"
@ -12,5 +12,6 @@
<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 width="20" height="1f" />
</div>
</stkgui>

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

@ -21,6 +21,6 @@
icon="gui/icons/restart.png"
text="Refresh" label_location="bottom"/>
</buttonbar>
<spacer width="20" height="2%" />
<spacer width="20" height="1f" />
</div>
</stkgui>

5
data/gui/dialogs/online/recovery_info.stkgui
View File

@ -4,16 +4,17 @@
<header id="title" width="96%" height="fit" text_align="center" word_wrap="true"
I18N="In the recovery dialog" text="Account Recovery"/>
<spacer height="20" width="50"/>
<spacer height="2%" width="50"/>
<label id="info" proportion="1" width="90%" align="center" text_align="center" word_wrap="true" I18N="In the recovery dialog"
text="You will receive an email with further instructions on how to reset your password. Please be patient and be sure to check your spam folder." />
<spacer height="20" width="50"/>
<spacer height="2%" width="50"/>
<buttonbar id="options" width="25%" height="15%" align="center">
<icon-button id="cancel" width="64" height="64" icon="gui/icons/green_check.png"
I18N="In the recovery dialog" text="Close" label_location="none"/>
</buttonbar>
<spacer width="20" height="1f" />
</div>
</stkgui>

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

@ -4,12 +4,12 @@
<header id="title" width="96%" height="fit" text_align="center" word_wrap="true"
I18N="In the recovery dialog" text="Account Recovery"/>
<spacer height="20" width="50"/>
<spacer height="2%" width="50"/>
<label id="message" proportion="2" width="90%" align="center" text_align="left" word_wrap="true"
text="Fill in the username and email address you supplied at registration to be able to reset your password."/>
<spacer height="40" width="50"/>
<spacer height="4%" width="50"/>
<div width="80%" align="center" layout="vertical-row" height="fit">
<div width="100%" height="fit" layout="horizontal-row" >
@ -17,7 +17,7 @@
<textbox proportion="2" id="username" I18N="In the recovery dialog"/>
</div>
<spacer height="20" width="20"/>
<spacer height="10%" width="20"/>
<div width="100%" height="fit" layout="horizontal-row" >
<label proportion="1" text_align="left" I18N="In the recovery dialog" text="Email"/>
@ -26,12 +26,12 @@
</div>
<spacer height="20" width="50"/>
<spacer height="2%" width="50"/>
<label id="info" proportion="1" width="90%" align="center" text_align="center" word_wrap="true"
I18N="In the recovery dialog" text=""/>
<spacer height="20" width="50"/>
<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"
@ -39,5 +39,6 @@
<icon-button id="cancel" width="64" height="64" icon="gui/icons/main_quit.png"
I18N="In the recovery dialog" text="Cancel" label_location="none"/>
</buttonbar>
<spacer width="20" height="1f" />
</div>
</stkgui>

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

@ -4,7 +4,7 @@
<header id="title" width="96%" height="fit" text_align="center" word_wrap="true"
I18N="In the registration dialog" text="Terms and Agreement"/>
<spacer height="25" width="50"/>
<spacer height="3%" width="50"/>
<box proportion="5" width="90%" align="center" layout="vertical-row" padding="8">
<label word_wrap="true" id="terms" x="0" y="0" width="100%" height="100%"/>
@ -15,12 +15,12 @@
text="I agree to the above terms and am 13 years or older. "/>
</div>
<spacer height="20" width="50"/>
<spacer height="2%" width="50"/>
<label id="info" proportion="1" width="90%" align="center" text_align="center" word_wrap="true"
I18N="In the registration dialog" text=""/>
<spacer height="20" width="50"/>
<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"
@ -28,5 +28,6 @@
<icon-button id="cancel" width="64" height="64" icon="gui/icons/main_quit.png"
I18N="In the registration dialog" text="Cancel" label_location="bottom"/>
</buttonbar>
<spacer height="1f" width="5"/>
</div>
</stkgui>

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

@ -46,7 +46,7 @@
I18N="In the server configuration screen" text="Cancel" label_location="bottom"/>
</buttonbar>
<spacer height="3%" width="20"/>
<spacer height="1f" width="20"/>
</box>
</div>
</stkgui>

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

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<stkgui>
<div x="2%" y="5%" width="96%" height="85%" layout="vertical-row" >
<div x="2%" y="5%" width="96%" height="90%" layout="vertical-row" >
<header id="title" width="96%" height="fit" text_align="center" word_wrap="true"
I18N="Splitscreen player in network" text="Add player"/>
@ -54,6 +54,6 @@
I18N="Splitscreen player in network" text="Clear players" label_location="bottom"/>
</buttonbar>
<spacer height="2%" width="10"/>
<spacer height="1f" width="10"/>
</div>
</stkgui>

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

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<stkgui>
<div x="2%" y="5%" width="96%" height="85%" layout="vertical-row" >
<div x="2%" y="5%" width="96%" height="90%" layout="vertical-row" >
<header id="title" width="96%" height="fit" text_align="center" word_wrap="true"
I18N="User info dialog" text="User Info"/>
@ -32,5 +32,7 @@
<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 width="20" height="1f" />
</div>
</stkgui>

11
data/gui/dialogs/online/vote_dialog.stkgui
View File

@ -4,21 +4,20 @@
<header id="title" width="96%" height="fit" text_align="center" word_wrap="true"
I18N="In the vote dialog" text="Vote"/>
<spacer height="20" width="50"/>
<spacer height="2%" width="50"/>
<label id="info" proportion="1" width="90%" align="center" text_align="center" word_wrap="true" text=""/>
<spacer height="20" width="50"/>
<spacer height="2%" width="50"/>
<div width="90%" height="64" align="center" layout="vertical-row" >
<ratingbar id="rating" align="center" height="64" width="192"/>
</div>
<ratingbar id="rating" align="center" height="1f" width="3f"/>
<spacer height="40" width="50"/>
<spacer height="4%" width="50"/>
<buttonbar id="options" width="25%" height="20%" align="center">
<icon-button id="cancel" width="64" height="64" icon="gui/icons/main_quit.png"
I18N="Vote dialog" text="Close" label_location="none"/>
</buttonbar>
<spacer height="1f" width="10"/>
</div>
</stkgui>

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

@ -4,12 +4,12 @@
<label id="title" width="100%" text_align="center" text="Press fully and release..." proportion="1" I18N="When changing input configurations" word_wrap="true"/>
<spacer height="25" width="10" />
<spacer height="4%" width="10" />
<button id="assignEsc" I18N="When configuring input" text="Assign to ESC key" align="center"/>
<spacer height="10" width="10" />
<spacer height="2%" width="10" />
<button id="assignNone" I18N="When configuring input" text="Assign nothing" align="center"/>
<spacer height="10" width="10" />
<spacer height="2%" width="10" />
<button id="cancel" I18N="When configuring input" text="Press ESC to cancel" align="center"/>
</div>

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

@ -3,8 +3,13 @@
<div x="5%" y="5%" width="90%" height="90%" layout="vertical-row" >
<div width="100%" layout="horizontal-row" height="12%">
<icon-button id="back" width="12%" align="left" icon="gui/icons/back.png"/>
<div width="8%" layout="vertical-row" height="100%">
<spacer height="5%" width="1"/>
<icon-button id="back" width="100%" height="60%" align="left" icon="gui/icons/back.png"/>
</div>
<header id="title" width="80%" text="Race Setup" align="center" text_align="center" />
<spacer height="1" width="12%"/>
@ -15,46 +20,51 @@
<div width="100%" layout="horizontal-row" height="fit">
<label id="race_type" text="Type:" I18N="Type of race, in a challenge"/>
<spacer width="5" height="1"/>
<label id="race_type_val" proportion="1"/>
<label id="race_type_val"/>
</div>
<spacer height="2%" width="1"/>
<spacer height="4%" width="1"/>
<div width="100%" proportion="1" layout="horizontal-row">
<icon-button id="novice" icon="gui/icons/difficulty_easy.png"
I18N="Difficulty" text="Novice" height="100%"/>
<spacer width="5%" height="1"/>
<label id="novice_label" proportion="1" height="100%"/>
<div width="100%" height="16%" layout="horizontal-row">
<buttonbar id="icon_novice" height="100%" width="8%" align="center">
<icon-button id="novice" icon="gui/icons/difficulty_easy.png"
width="128" height="128" I18N="Difficulty" text="Novice"/>
</buttonbar>
<spacer width="1f" height="1"/>
<label id="novice_label" height="100%"/>
</div>
<spacer height="6%" width="1"/>
<spacer height="4%" width="1"/>
<div width="100%" proportion="1" layout="horizontal-row">
<icon-button id="intermediate" icon="gui/icons/difficulty_medium.png"
I18N="Difficulty" text="Intermediate" height="100%"/>
<spacer width="5%" height="1"/>
<label id="intermediate_label" proportion="1" height="100%"/>
<div width="100%" height="16%" layout="horizontal-row">
<buttonbar id="icon_intermediate" height="100%" width="8%" align="center">
<icon-button id="intermediate" icon="gui/icons/difficulty_medium.png"
width="128" height="128" I18N="Difficulty" text="Intermediate"/>
</buttonbar>
<spacer width="1f" height="1"/>
<label id="intermediate_label" height="100%"/>
</div>
<spacer height="6%" width="1"/>
<spacer height="4%" width="1"/>
<div width="100%" proportion="1" layout="horizontal-row">
<icon-button id="expert" icon="gui/icons/difficulty_hard.png"
I18N="Difficulty" text="Expert" height="100%"/>
<spacer width="5%" height="1"/>
<label id="difficult_label" proportion="1" height="100%"/>
<div width="100%" height="16%" layout="horizontal-row">
<buttonbar id="icon_expert" height="100%" width="8%" align="center">
<icon-button id="expert" icon="gui/icons/difficulty_hard.png"
width="128" height="128" I18N="Difficulty" text="Expert"/>
</buttonbar>
<spacer width="1f" height="1"/>
<label id="difficult_label" height="100%"/>
</div>
<spacer height="6%" width="1"/>
<spacer height="4%" width="1"/>
<div width="100%" proportion="1" layout="horizontal-row">
<icon-button id="supertux" icon="gui/icons/difficulty_best.png"
I18N="Difficulty" text="SuperTux" height="100%"/>
<spacer width="5%" height="1"/>
<label id="supertux_label" proportion="1" height="100%"/>
<div width="100%" height="16%" layout="horizontal-row">
<buttonbar id="icon_supertux" height="100%" width="8%" align="center">
<icon-button id="supertux" icon="gui/icons/difficulty_best.png"
width="128" height="128" I18N="Difficulty" text="SuperTux"/>
</buttonbar>
<spacer width="1f" height="1"/>
<label id="supertux_label" height="100%"/>
</div>
<spacer height="2%" width="1"/>
</div>
</stkgui>

53
data/gui/dialogs/select_challenge_nobest.stkgui
View File

@ -3,7 +3,12 @@
<div x="5%" y="5%" width="90%" height="90%" layout="vertical-row" >
<div width="100%" layout="horizontal-row" height="12%">
<icon-button id="back" width="12%" align="left" icon="gui/icons/back.png"/>
<div width="8%" layout="vertical-row" height="100%">
<spacer height="5%" width="1"/>
<icon-button id="back" width="100%" height="60%" align="left" icon="gui/icons/back.png"/>
</div>
<header id="title" width="80%" text="Race Setup" align="center" text_align="center" />
@ -18,35 +23,37 @@
<label id="race_type_val" proportion="1"/>
</div>
<spacer height="2%" width="1"/>
<spacer height="6%" width="1"/>
<div width="100%" proportion="1" layout="horizontal-row">
<icon-button id="novice" icon="gui/icons/difficulty_easy.png"
I18N="Difficulty" text="Novice" height="100%"/>
<spacer width="5%" height="1"/>
<label id="novice_label" proportion="1" height="100%"/>
<div width="100%" height="20%" layout="horizontal-row">
<buttonbar id="icon_novice" height="100%" width="10%" align="center">
<icon-button id="novice" icon="gui/icons/difficulty_easy.png"
width="128" height="128" I18N="Difficulty" text="Novice"/>
</buttonbar>
<spacer width="1f" height="1"/>
<label id="novice_label" height="100%"/>
</div>
<spacer height="8%" width="1"/>
<spacer height="6%" width="1"/>
<div width="100%" proportion="1" layout="horizontal-row">
<icon-button id="intermediate" icon="gui/icons/difficulty_medium.png"
I18N="Difficulty" text="Intermediate" height="100%"/>
<spacer width="5%" height="1"/>
<label id="intermediate_label" proportion="1" height="100%"/>
<div width="100%" height="20%" layout="horizontal-row">
<buttonbar id="icon_intermediate" height="100%" width="10%" align="center">
<icon-button id="intermediate" icon="gui/icons/difficulty_medium.png"
width="128" height="128" I18N="Difficulty" text="Intermediate"/>
</buttonbar>
<spacer width="1f" height="1"/>
<label id="intermediate_label" height="100%"/>
</div>
<spacer height="8%" width="1"/>
<spacer height="6%" width="1"/>
<div width="100%" proportion="1" layout="horizontal-row">
<icon-button id="expert" icon="gui/icons/difficulty_hard.png"
I18N="Difficulty" text="Expert" height="100%"/>
<spacer width="5%" height="1"/>
<label id="difficult_label" proportion="1" height="100%"/>
<div width="100%" height="20%" layout="horizontal-row">
<buttonbar id="icon_expert" height="100%" width="10%" align="center">
<icon-button id="expert" icon="gui/icons/difficulty_hard.png"
width="128" height="128" I18N="Difficulty" text="Expert"/>
</buttonbar>
<spacer width="1f" height="1"/>
<label id="difficult_label" height="100%"/>
</div>
<spacer height="8%" width="1"/>
</div>
</stkgui>

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

@ -10,13 +10,13 @@
<box id="filter_box" width="97%" height="2f" 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="1f" />
<spacer width="2%" />
<label text="Updated" align="center" I18N="In addons screen, in the filtering bar, to enable a filter that will show only recently updated items"/>
<spacer width="1f" />
<spacer width="1%" />
<spinner id="filter_date" proportion="8" align="center" min_value="0" wrap_around="true"/>
<spacer width="1f" />
<spacer width="1%" />
<label text="Rating >=" align="center" I18N="In addons screen, in the filtering bar, to enable a filter that will show only items with good rating"/>
<spacer width="1f" />
<spacer width="1%" />
<spinner id="filter_rating" proportion="5" align="center" min_value="0" wrap_around="true"/>
<icon-button id="filter_search" height="100%" icon="gui/icons/search.png"/>
</div>

2
data/gui/screens/feature_unlocked.stkgui
View File

@ -2,6 +2,6 @@
<stkgui>
<div x="2%" y="2%" width="96%" height="96%" layout="vertical-row">
<spacer width="10" proportion="1"/>
<button id="continue" x="20" width="250" align="left" text="Continue"/>
<button id="continue" x="20" align="left" text="Continue"/>
</div>
</stkgui>

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

@ -20,5 +20,6 @@
<button id="middle" align="center" width="60%"/>
<spacer height="1%" width="96%"/>
<button id="bottom" align="center" width="60%"/>
<spacer height="1%" width="96%"/>
</div>
</stkgui>

8
src/states_screens/credits.cpp
View File

@ -310,7 +310,7 @@ void CreditsScreen::onUpdate(float elapsed_time)
color.setAlpha( alpha );
text_offset = (int)((1.0f - fade_in) * 100);
text_offset = (int)((1.0f - fade_in) * GUIEngine::getFontHeight());
}
// fade out
else if (time_before_next_step >= m_time_element - ENTRIES_FADE_TIME)
@ -324,7 +324,7 @@ void CreditsScreen::onUpdate(float elapsed_time)
else if(alpha > 255) alpha = 255;
color.setAlpha( alpha );
text_offset = -(int)(fade_out * 100);
text_offset = -(int)(fade_out * GUIEngine::getFontHeight());
}
@ -347,9 +347,9 @@ void CreditsScreen::onUpdate(float elapsed_time)
GUIEngine::getFont()->draw(m_sections[m_curr_section]
.m_entries[m_curr_element]
.m_subentries[i].c_str(),
core::recti( m_x + 32,
core::recti( m_x + GUIEngine::getFontHeight()/2,
suby + text_offset/(1+1),
m_x + m_w + 32,
m_x + m_w + GUIEngine::getFontHeight()/2,
suby + m_h/8
+ text_offset/(1+1) ),
color, false/* center h */,

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

@ -32,7 +32,7 @@ using namespace GUIEngine;
// ------------------------------------------------------------------------------------------------------
DebugSliderDialog::DebugSliderDialog() : ModalDialog(0.85f, 0.25f, MODAL_DIALOG_LOCATION_BOTTOM)
DebugSliderDialog::DebugSliderDialog() : ModalDialog(0.85f, 0.4f, MODAL_DIALOG_LOCATION_BOTTOM)
{
m_fade_background = false;

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

@ -75,7 +75,7 @@ GhostReplayInfoDialog::GhostReplayInfoDialog(unsigned int replay_id,
/* Used to display kart icons for the selected replay(s) */
irr::gui::STKModifiedSpriteBank *icon_bank = GhostReplaySelection::getInstance()->getIconBank();
int icon_height = getHeight()/18;
int icon_height = GUIEngine::getFontHeight() * 3 / 2;
m_replay_info_widget->setIcons(icon_bank, (int)icon_height);
updateReplayDisplayedInfo();

12
src/states_screens/dialogs/select_challenge.cpp
View File

@ -215,8 +215,8 @@ GUIEngine::EventPropagation SelectChallengeDialog::processEvent(const std::strin
return GUIEngine::EVENT_BLOCK;
}
if (eventSource == "novice" || eventSource == "intermediate" ||
eventSource == "expert" || eventSource == "supertux")
if (eventSource == "icon_novice" || eventSource == "icon_intermediate" ||
eventSource == "icon_expert" || eventSource == "icon_supertux")
{
const ChallengeData* challenge = unlock_manager->getChallengeData(m_challenge_id);
@ -263,22 +263,22 @@ GUIEngine::EventPropagation SelectChallengeDialog::processEvent(const std::strin
// network_manager->initCharacterDataStructures();
// Launch challenge
if (eventSource == "novice")
if (eventSource == "icon_novice")
{
challenge->setRace(RaceManager::DIFFICULTY_EASY);
UserConfigParams::m_difficulty = 0;
}
else if (eventSource == "intermediate")
else if (eventSource == "icon_intermediate")
{
challenge->setRace(RaceManager::DIFFICULTY_MEDIUM);
UserConfigParams::m_difficulty = 1;
}
else if (eventSource == "expert")
else if (eventSource == "icon_expert")
{
challenge->setRace(RaceManager::DIFFICULTY_HARD);
UserConfigParams::m_difficulty = 2;
}
else if (eventSource == "supertux")
else if (eventSource == "icon_supertux")
{
challenge->setRace(RaceManager::DIFFICULTY_BEST);
UserConfigParams::m_difficulty = 3;

4
src/states_screens/edit_gp_screen.cpp
View File

@ -233,8 +233,8 @@ void EditGPScreen::loadList(const int selected)
m_list->clear();
m_icons.clear();
m_icon_bank->clear();
m_icon_bank->scaleToHeight (64);
m_list->setIcons(m_icon_bank, 64);
m_icon_bank->scaleToHeight (GUIEngine::getFontHeight() * 3 / 2);
m_list->setIcons(m_icon_bank, GUIEngine::getFontHeight() * 3 / 2);
for (unsigned int i = 0; i < m_gp->getNumberOfTracks(true); i++)
{

2
src/states_screens/race_gui_base.cpp
View File

@ -415,7 +415,7 @@ void RaceGUIBase::drawPowerupIcons(const AbstractKart* kart,
{
gui::ScalableFont* font = GUIEngine::getHighresDigitFont();
core::rect<s32> pos(x2+nSize, y1, x2+nSize+nSize, y1+nSize);
font->setScale(scale);
font->setScale(scale / (float)font->getDimension(L"X").Height * 64.0f);
font->draw(core::stringw(L"x")+StringUtils::toWString(many_powerups),
pos, video::SColor(255, 255, 255, 255));
font->setScale(1.0f);