Skip to content

Commit

Permalink
Use label with word_wrap instead of list for terms. See #1812
Browse files Browse the repository at this point in the history
  • Loading branch information
auriamg authored and Vincent Lejeune committed Feb 12, 2015
1 parent 40f21c9 commit 54cb448
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 13 deletions.
2 changes: 1 addition & 1 deletion data/gui/online/registration_terms.stkgui
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<spacer height="25" width="50"/>

<box proportion="5" width="90%" align="center" layout="vertical-row" padding="8">
<list id="terms" x="0" y="0" width="100%" height="100%"/>
<label word_wrap="true" id="terms" x="0" y="0" width="100%" height="100%"/>
</box>

<div align="center" width="fit" height="fit" layout="horizontal-row" >
Expand Down
19 changes: 7 additions & 12 deletions src/states_screens/dialogs/registration_dialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,14 @@ RegistrationDialog::RegistrationDialog() :
ModalDialog(0.8f,0.9f)
{
loadFromFile("online/registration_terms.stkgui");
ListWidget * terms_widget = getWidget<ListWidget>("terms");
LabelWidget* terms_widget = getWidget<LabelWidget>("terms");


terms_widget->addItem("title", "=== STK Terms and Conditions ===", -1 , true );
terms_widget->addItem("par1", "You must agree to these terms in order to register an account for STK.", -1 , false );
terms_widget->addItem("par2",
"Still needs actual content. Preferably in an XML document which can then be parsed to be put here."
, -1 , false );
terms_widget->addItem("par3",
"By checking the box below, you are confirming that you understand these terms."
"If you have any questions or comments regarding these terms,"
"one of the members of the development team would gladly assist you."
, -1 , false );
core::stringw terms = core::stringw(L"You must agree to these terms in order to register an account for STK."
L"Still needs actual content. Preferably in an XML document which can then be parsed to be put here."
L"By checking the box below, you are confirming that you understand these terms."
L"If you have any questions or comments regarding these terms,"
L"one of the members of the development team would gladly assist you.");
terms_widget->setText(terms, false);

// showRegistrationTerms();
}
Expand Down

0 comments on commit 54cb448

Please sign in to comment.