From 70a17007b684171a445a528bf5ba960f47c05b5c Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Fri, 14 Jun 2019 21:57:56 +0800
Subject: [PATCH] Use separate info in server dialog

---
 .../dialogs/online/server_info_dialog.stkgui  | 16 +++++---
 .../dialogs/server_info_dialog.cpp            | 41 ++++++-------------
 2 files changed, 23 insertions(+), 34 deletions(-)

diff --git a/data/gui/dialogs/online/server_info_dialog.stkgui b/data/gui/dialogs/online/server_info_dialog.stkgui
index 1c8cacbac..efc8eea8e 100644
--- a/data/gui/dialogs/online/server_info_dialog.stkgui
+++ b/data/gui/dialogs/online/server_info_dialog.stkgui
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
     <div x="2%" y="0%" width="96%" height="100%" layout="vertical-row" >
-        <header id="title" width="96%" proportion="4" text_align="center" word_wrap="true"/>
-        <spacer height="1f" width="5"/>
-        <div width="90%" height="fit" layout="horizontal-row">
-            <label id="server-info-1" align="top" proportion="2" text_align="left" word_wrap="true" text=""/>
-            <label id="server-info-2" align="top" proportion="2" text_align="left" word_wrap="true" text=""/>
+        <header id="title" width="96%" proportion="2" text_align="center" word_wrap="true"/>
+        <div width="100%" proportion="3" layout="horizontal-row" >
+            <div width="48%" height="100%" layout="vertical-row" >
+                <label id="server-info-1" text_align="left" width="100%" text=""/>
+                <label id="server-info-2" text_align="left" width="100%" text=""/>
+            </div>
+            <spacer width="2%"/>
+            <div width="48%" height="100%" layout="vertical-row" >
+                <label id="server-info-3" text_align="left" width="100%" text=""/>
+                <label id="server-info-4" text_align="left" width="100%" text=""/>
+            </div>
         </div>
 
         <spacer height="1%"/>
diff --git a/src/states_screens/dialogs/server_info_dialog.cpp b/src/states_screens/dialogs/server_info_dialog.cpp
index 637a736d3..d01e46d0d 100644
--- a/src/states_screens/dialogs/server_info_dialog.cpp
+++ b/src/states_screens/dialogs/server_info_dialog.cpp
@@ -76,37 +76,15 @@ ServerInfoDialog::ServerInfoDialog(std::shared_ptr<Server> server)
         password_box->setCollapsed(true); // FIXME Doesn't reuse free space for other widgets
     }
 
-    auto& players = m_server->getPlayers();
-    core::stringw server_info;
     core::stringw difficulty = race_manager->getDifficultyName(
         server->getDifficulty());
-
-    core::stringw each_line = _("Difficulty: %s", difficulty);
     //I18N: In server info dialog
-    server_info += each_line;
-    server_info += L"\n";
+    getWidget<LabelWidget>("server-info-1")->setText(_("Difficulty: %s", difficulty), false);
 
     core::stringw mode = ServerConfig::getModeName(server->getServerMode());
     //I18N: In server info dialog
-    each_line = _("Game mode: %s", mode);
-    server_info += each_line;
-    server_info += L"\n";
+    getWidget<LabelWidget>("server-info-2")->setText(_("Game mode: %s", mode), false);
 
-    Track* t = server->getCurrentTrack();
-    if (t)
-    {
-        core::stringw track_name = t->getName();
-        //I18N: In server info dialog, showing the current track playing in
-        //server
-        each_line = _("Current track: %s", track_name);
-        server_info += each_line;
-        server_info += L"\n";
-    }
-    getWidget("server-info-1")->setVisible(true);
-    getWidget<LabelWidget>("server-info-1")->setText(server_info, true);
-
-    server_info = L"";
-    each_line = L"";
 #ifndef SERVER_ONLY
     if (!server->getCountryCode().empty())
     {
@@ -114,14 +92,19 @@ ServerInfoDialog::ServerInfoDialog(std::shared_ptr<Server> server)
             translations->getLocalizedCountryName(server->getCountryCode());
         //I18N: In the server info dialog, show the server location with
         //country name (based on IP geolocation)
-        each_line = _("Server location: %s", country_name);
-        server_info += each_line;
-        server_info += L"\n";
+        getWidget<LabelWidget>("server-info-3")->setText(_("Server location: %s", country_name), false);
     }
 #endif
-    getWidget("server-info-2")->setVisible(true);
-    getWidget<LabelWidget>("server-info-2")->setText(server_info, true);
 
+    Track* t = server->getCurrentTrack();
+    if (t)
+    {
+        core::stringw track_name = t->getName();
+        //I18N: In server info dialog, showing the current track playing in server
+        getWidget<LabelWidget>("server-info-4")->setText(_("Current track: %s", track_name), false);
+    }
+
+    auto& players = m_server->getPlayers();
     if (!players.empty())
     {
         // I18N: Show above the player list in server info dialog to