Merge PR #2235 by @BdeBock - new subtitle.

MovingBlocks · Mar 16, 2016 · a16aa63 · a16aa63
2 parents ebd9117 + eb48570
commit a16aa63
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 1 deletion.
diff --git a/engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/CreateGameScreen.java b/engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/CreateGameScreen.java
@@ -28,6 +28,7 @@
 import org.terasology.engine.module.ModuleManager;
 import org.terasology.engine.module.StandardModuleExtension;
 import org.terasology.game.GameManifest;
+import org.terasology.i18n.TranslationSystem;
 import org.terasology.module.DependencyInfo;
 import org.terasology.module.DependencyResolver;
 import org.terasology.module.Module;
@@ -75,6 +76,9 @@ public class CreateGameScreen extends CoreScreenLayer {
     @In
     private GameEngine gameEngine;
 
+    @In
+    private TranslationSystem translationSystem;
+
     @In
     private Config config;
 
@@ -83,6 +87,23 @@ public class CreateGameScreen extends CoreScreenLayer {
     @Override
     @SuppressWarnings("unchecked")
     public void initialise() {
+
+
+        UILabel gameTypeTitle = find("gameTypeTitle", UILabel.class);
+        if (gameTypeTitle != null) {
+            gameTypeTitle.bindText(new ReadOnlyBinding<String>() {
+                @Override
+                public String get() {
+                    if (loadingAsServer) {
+                        return translationSystem.translate("${engine:menu#select-multiplayer-game-sub-title}");
+                    } else {
+                        return translationSystem.translate("${engine:menu#select-singleplayer-game-sub-title}");
+                    }
+                }
+            });
+        }
+
+
         final UIText worldName = find("worldName", UIText.class);
         if (worldName != null) {
             int gameNum = 1;

diff --git a/engine/src/main/resources/assets/ui/menu/createGameScreen.ui b/engine/src/main/resources/assets/ui/menu/createGameScreen.ui
@@ -32,6 +32,20 @@
                     }
                 }
             },
+            {
+                "type" : "UILabel",
+                "id" : "gameTypeTitle",
+                "family" : "subtitle",
+                "text": "${engine:menu#select-singleplayer-game-sub-title}",
+                "layoutInfo" : {
+                    "height" : 30,
+                    "position-horizontal-center" : {},
+                    "position-top" : {
+                        "target" : "BOTTOM",
+                        "widget" : "subtitle"
+                    }
+                }
+            },
             {
                 "type" : "UIBox",
                 "content" : {
@@ -148,7 +162,7 @@
                     "position-top" : {
                         "target" : "BOTTOM",
                         "offset" : 16,
-                        "widget" : "subtitle"
+                        "widget" : "gameTypeTitle"
                     }
                 }
             },