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

Removed the need to specify an empty label on buttons/labels when a label needs to be set programatically at runtime, this avoids empty strings appearing in translation catalog

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5853 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2010-09-01 16:09:09 +00:00
parent 3304c5af6f
commit cdea5f6a72
4 changed files with 423 additions and 420 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/gui/race_result.stkgui
View File

@ -12,10 +12,10 @@
bottom: 'Abort GP', 'Back to the menu' (or invisible)
Setting text=" " is important, otherwise the height of the
widget is incorrect. -->
<button id="top" align="center" width="60%" text=" "/>
<button id="top" align="center" width="60%"/>
<spacer height="10" width="96%"/>
<button id="middle" align="center" width="60%" text=" "/>
<button id="middle" align="center" width="60%"/>
<spacer height="10" width="96%"/>
<button id="bottom" align="center" width="60%" text=" "/>
<button id="bottom" align="center" width="60%"/>
</div>
</stkgui>

801
data/po/fr.po
View File

File diff suppressed because it is too large Load Diff

20
data/po/supertuxkart.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: supertuxkart\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-09-01 11:53-0400\n"
"POT-Creation-Date: 2010-09-01 12:02-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -16,12 +16,6 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
#. I18N: ./data/gui/race_result.stkgui
#: data/po/gui_strings.h:536 data/po/gui_strings.h:539
#: data/po/gui_strings.h:542
msgid " "
msgstr ""
#: src/states_screens/options_screen_input.cpp:92
#, c-format
msgid " Keyboard %i"
@ -633,7 +627,7 @@ msgid ""
msgstr ""
#. I18N: Shown at the end of a race
#: src/states_screens/race_gui.cpp:93
#: src/states_screens/race_gui.cpp:89
msgid "Finished"
msgstr ""
@ -725,7 +719,7 @@ msgstr ""
msgid "Gnu"
msgstr ""
#: src/states_screens/race_gui.cpp:98
#: src/states_screens/race_gui.cpp:94
msgid "Go!"
msgstr ""
@ -822,7 +816,7 @@ msgstr ""
msgid "Keep this resolution"
msgstr ""
#: src/states_screens/race_gui.cpp:94
#: src/states_screens/race_gui.cpp:90
msgid "Lap"
msgstr ""
@ -1126,7 +1120,7 @@ msgid "Random Track"
msgstr ""
#. I18N: as in "ready, set, go", shown at the beginning of the race
#: src/states_screens/race_gui.cpp:96
#: src/states_screens/race_gui.cpp:92
msgid "Ready!"
msgstr ""
@ -1201,7 +1195,7 @@ msgstr ""
msgid "Select a game mode"
msgstr ""
#: src/states_screens/race_gui.cpp:97
#: src/states_screens/race_gui.cpp:93
msgid "Set!"
msgstr ""
@ -1426,7 +1420,7 @@ msgid "Weapons"
msgstr ""
#. I18N: ./data/karts/wilber/kart.xml
#: data/po/gui_strings.h:719
#: data/po/gui_strings.h:716
msgid "Wilber"
msgstr ""

16
src/guiengine/layout_manager.cpp
View File

@ -145,14 +145,18 @@ void LayoutManager::readCoords(Widget* self, AbstractTopLevelContainer* topLevel
// lines are required, we need to specify a height explicitely
label_h = dim.Height + self->getHeightNeededAroundLabel();
}
if (self->getType() == WTYPE_TEXTBOX)
if (label_h == -1)
{
IGUIFont* font = (self->m_title_font ? GUIEngine::getTitleFont() : GUIEngine::getFont());
// get text height, a text box is always as high as the text it could contain
core::dimension2d< u32 > dim = font->getDimension( L"X" );
label_h = dim.Height + self->getHeightNeededAroundLabel();
if (self->getType() == WTYPE_TEXTBOX ||
self->getType() == WTYPE_BUTTON ||
self->getType() == WTYPE_LABEL)
{
IGUIFont* font = (self->m_title_font ? GUIEngine::getTitleFont() : GUIEngine::getFont());
// get text height, a text box, button or label is always as high as the text it could contain
core::dimension2d< u32 > dim = font->getDimension( L"X" );
label_h = dim.Height + self->getHeightNeededAroundLabel();
}
}
// ---- read dimension