From 54cb44873eb10bca0c9071dea741071be4893a55 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Fri, 6 Feb 2015 20:11:15 -0500
Subject: [PATCH] Use label with word_wrap instead of list for terms. See #1812

---
 data/gui/online/registration_terms.stkgui     |  2 +-
 .../dialogs/registration_dialog.cpp           | 19 +++++++------------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/data/gui/online/registration_terms.stkgui b/data/gui/online/registration_terms.stkgui
index cf6d202a41a..1447495be45 100644
--- a/data/gui/online/registration_terms.stkgui
+++ b/data/gui/online/registration_terms.stkgui
@@ -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" >
diff --git a/src/states_screens/dialogs/registration_dialog.cpp b/src/states_screens/dialogs/registration_dialog.cpp
index 13acc1959da..653a8586d3c 100644
--- a/src/states_screens/dialogs/registration_dialog.cpp
+++ b/src/states_screens/dialogs/registration_dialog.cpp
@@ -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();
 }