Localized strings for object names; #377

Assets/Base/ActivatedSensor.cs

@@ -7,6 +7,7 @@ public abstract class ActivatedSensor : Sensor
     public interface Filter
     {
         bool EntityMatches(EntityComponent entityComponent);
+        string ToString(GUIStringSet s);
     }
 
     public class EntityFilter : Filter
@@ -27,12 +28,12 @@ public bool EntityMatches(EntityComponent entityComponent)
             return entityComponent.entity == entityRef.entity; // also matches clones
         }
 
-        public override string ToString()
+        public string ToString(GUIStringSet s)
         {
             Entity e = entityRef.entity;
             if (e == null)
-                return GUIPanel.StringSet.EntityRefNone;
-            return e.ToString();
+                return s.EntityRefNone;
+            return e.ToString(s);
         }
     }
 
@@ -105,7 +106,7 @@ public bool EntityMatches(EntityComponent entityComponent)
             return false;
         }
 
-        public override string ToString() => entityType.fullName;
+        public string ToString(GUIStringSet s) => entityType.displayName(s);
     }
 
     // for maps before version 10
@@ -127,8 +128,7 @@ public bool EntityMatches(EntityComponent entityComponent)
             return entityComponent.entity.tag == tag;
         }
 
-        public override string ToString() =>
-            GUIPanel.StringSet.FilterWithTag(Entity.TagToString(tag));
+        public string ToString(GUIStringSet s) => s.FilterWithTag(Entity.TagToString(tag));
     }
 
     public class MultipleTagFilter : Filter
@@ -149,12 +149,12 @@ public bool EntityMatches(EntityComponent entityComponent)
             return ((1 << entityComponent.entity.tag) & tagBits) != 0;
         }
 
-        public override string ToString()
+        public string ToString(GUIStringSet s)
         {
             if (tagBits == 0)
-                return GUIPanel.StringSet.FilterNothing;
+                return s.FilterNothing;
             else if (tagBits == 255)
-                return GUIPanel.StringSet.FilterAnything;
+                return s.AnythingName;
             string str = "";
             int count = 0;
             for (byte i = 0; i < 8; i++)
@@ -166,9 +166,9 @@ public override string ToString()
                 }
             }
             if (count == 1)
-                return GUIPanel.StringSet.FilterWithTag(str);
+                return s.FilterWithTag(str);
             else
-                return GUIPanel.StringSet.FilterMultipleTags(str);
+                return s.FilterMultipleTags(str);
         }
     }
 

Assets/Base/CustomTexture.cs

@@ -7,6 +7,7 @@ public class CustomTexture : PropertiesObject
     public static PropertiesObjectType objectType = new PropertiesObjectType(
         "Custom Texture", typeof(CustomTexture))
     {
+        displayName = s => s.CustomTextureName,
         description = s => s.CustomTextureDesc,
         iconName = "image",
     };

Assets/Base/Entity.cs

@@ -48,7 +48,10 @@ public object value
 public class PropertiesObjectType
 {
     public static readonly PropertiesObjectType NONE = new PropertiesObjectType("None", null)
-        { iconName = "cancel" };
+    {
+        displayName = s => s.NoneName,
+        iconName = "cancel",
+    };
 
     // This name is used for identifying types and for error messages if a type is not recognized.
     // It is always in English (not localized) and can never change.
@@ -59,6 +62,8 @@ public class PropertiesObjectType
     [XmlIgnore]
     public Func<PropertiesObject> constructor;
 
+    [XmlIgnore]
+    public Localizer displayName;
     [XmlIgnore]
     public Localizer description = GUIStringSet.Empty;
     [XmlIgnore]
@@ -81,25 +86,30 @@ public Texture icon
     public PropertiesObjectType()
     {
         constructor = DefaultConstructor;
+        displayName = DefaultDisplayName;
     }
 
     public PropertiesObjectType(string fullName, Type type)
     {
         this.fullName = fullName;
         this.type = type;
         constructor = DefaultConstructor;
+        displayName = DefaultDisplayName;
     }
 
     public PropertiesObjectType(PropertiesObjectType baseType, Func<PropertiesObject> newConstructor)
     {
         fullName = baseType.fullName;
+        displayName = baseType.displayName;
         description = baseType.description;
         longDescription = baseType.longDescription;
         iconName = baseType.iconName;
         type = baseType.type;
         constructor = newConstructor;
     }
 
+    private string DefaultDisplayName(GUIStringSet s) => fullName;
+
     private PropertiesObject DefaultConstructor()
     {
         if (type == null)
@@ -174,7 +184,10 @@ public abstract class Entity : PropertiesObject
 {
     public static PropertiesObjectType objectType = new PropertiesObjectType(
         "Anything", typeof(Entity))
-        { iconName = "circle-outline" };
+    {
+        displayName = s => s.AnythingName,
+        iconName = "circle-outline",
+    };
 
     public EntityComponent component;
     public Sensor sensor;
@@ -192,6 +205,8 @@ public static string TagToString(byte tag)
     }
 
     public override string ToString() => TagToString(tag) + " " + ObjectType.fullName;
+    public string ToString(GUIStringSet s) =>
+        TagToString(tag) + " " + ObjectType.displayName(s);
 
     public virtual PropertiesObjectType ObjectType => objectType;
 

Assets/Base/EntityReference.cs

@@ -192,39 +192,39 @@ public bool MatchesDirection(Transform transform, Vector3 direction)
         return Vector3.Angle(targetDirection, direction) < 45;
     }
 
-    public override string ToString()
+    public string ToString(GUIStringSet s)
     {
         if (entityRef.entity != null)
-            return entityRef.entity.ToString();
+            return entityRef.entity.ToString(s);
         else
         {
-            string dirStr = GUIPanel.StringSet.EntityRefNone;
+            string dirStr = s.EntityRefNone;
             switch (direction & ~LOCAL_BIT)
             {
                 case WEST:
-                    dirStr = GUIPanel.StringSet.West;
+                    dirStr = s.West;
                     break;
                 case EAST:
-                    dirStr = GUIPanel.StringSet.East;
+                    dirStr = s.East;
                     break;
                 case DOWN:
-                    dirStr = GUIPanel.StringSet.Down;
+                    dirStr = s.Down;
                     break;
                 case UP:
-                    dirStr = GUIPanel.StringSet.Up;
+                    dirStr = s.Up;
                     break;
                 case SOUTH:
-                    dirStr = GUIPanel.StringSet.South;
+                    dirStr = s.South;
                     break;
                 case NORTH:
-                    dirStr = GUIPanel.StringSet.North;
+                    dirStr = s.North;
                     break;
                 case RANDOM:
-                    dirStr = GUIPanel.StringSet.TargetRandom;
+                    dirStr = s.TargetRandom;
                     break;
             }
             if ((direction & LOCAL_BIT) != 0 && direction != NO_DIRECTION)
-                return GUIPanel.StringSet.TargetLocalDirection(dirStr);
+                return s.TargetLocalDirection(dirStr);
             else
                 return dirStr;
         }

Assets/Base/Object.cs

@@ -6,6 +6,7 @@ public abstract class ObjectEntity : DynamicEntity
     public static new PropertiesObjectType objectType = new PropertiesObjectType(
         "Object", typeof(ObjectEntity))
     {
+        displayName = s => s.ObjectName,
         description = s => s.ObjectDesc,
         iconName = "circle",
     };

Assets/Base/Substance.cs

@@ -12,6 +12,7 @@ public class Substance : DynamicEntity
     public static new PropertiesObjectType objectType = new PropertiesObjectType(
         "Substance", typeof(Substance))
     {
+        displayName = s => s.SubstanceName,
         description = s => s.SubstanceDesc,
         longDescription = s => s.SubstanceLongDesc,
         iconName = "cube-outline",

Assets/Base/WorldProperties.cs

@@ -15,6 +15,7 @@ public class WorldProperties : PropertiesObject
     public static PropertiesObjectType objectType = new PropertiesObjectType(
         "World", typeof(WorldProperties))
     {
+        displayName = s => s.WorldName,
         description = s => s.WorldDesc,
         iconName = "earth",
     };

Assets/Behaviors/Carryable.cs

@@ -7,6 +7,7 @@ public class CarryableBehavior : GenericEntityBehavior<CarryableBehavior, Carrya
     public static new BehaviorType objectType = new BehaviorType(
         "Carryable", typeof(CarryableBehavior))
     {
+        displayName = s => s.CarryableName,
         description = s => s.CarryableDesc,
         longDescription = s => s.CarryableLongDesc,
         iconName = "coffee",

Assets/Behaviors/CharacterComponent.cs

@@ -6,6 +6,7 @@ public class CharacterBehavior : BasePhysicsBehavior
     public static new BehaviorType objectType = new BehaviorType(
         "Character", typeof(CharacterBehavior))
     {
+        displayName = s => s.CharacterName,
         description = s => s.CharacterDesc,
         longDescription = s => s.CharacterLongDesc,
         iconName = "human",

Assets/Behaviors/Clone.cs

@@ -4,6 +4,7 @@ public class CloneBehavior : TeleportBehavior
 {
     public static new BehaviorType objectType = new BehaviorType("Clone", typeof(CloneBehavior))
     {
+        displayName = s => s.CloneName,
         description = s => s.CloneDesc,
         longDescription = s => s.CloneLongDesc,
         iconName = "content-copy",

Assets/Behaviors/Force.cs

@@ -10,6 +10,7 @@ public enum ForceBehaviorMode
 
     public static new BehaviorType objectType = new BehaviorType("Force", typeof(ForceBehavior))
     {
+        displayName = s => s.ForceName,
         description = s => s.ForceDesc,
         longDescription = s => s.ForceLongDesc,
         iconName = "rocket",

Assets/Behaviors/HaloComponent.cs

@@ -6,6 +6,7 @@ public class HaloBehavior : GenericEntityBehavior<HaloBehavior, HaloComponent>
 {
     public static new BehaviorType objectType = new BehaviorType("Halo", typeof(HaloBehavior))
     {
+        displayName = s => s.HaloName,
         description = s => s.HaloDesc,
         longDescription = s => s.HaloLongDesc,
         iconName = "blur",

Assets/Behaviors/HurtHeal.cs

@@ -6,6 +6,7 @@ public class HurtHealBehavior : GenericEntityBehavior<HurtHealBehavior, HurtHeal
     public static new BehaviorType objectType = new BehaviorType(
         "Hurt/Heal", typeof(HurtHealBehavior))
     {
+        displayName = s => s.HurtHealName,
         description = s => s.HurtHealDesc,
         longDescription = s => s.HurtHealLongDesc,
         iconName = "heart",

Assets/Behaviors/Joystick.cs

@@ -10,6 +10,7 @@ public enum JoystickAlignment { HORIZONTAL, VERTICAL }
     public static new BehaviorType objectType = new BehaviorType(
         "Joystick", typeof(JoystickBehavior))
     {
+        displayName = s => s.JoystickName,
         description = s => s.JoystickDesc,
         iconName = "joystick",
         rule = BehaviorType.AndRule(

Assets/Behaviors/LightComponent.cs

@@ -6,6 +6,7 @@ public class LightBehavior : GenericEntityBehavior<LightBehavior, LightComponent
 {
     public static new BehaviorType objectType = new BehaviorType("Light", typeof(LightBehavior))
     {
+        displayName = s => s.LightName,
         description = s => s.LightDesc,
         longDescription = s => s.LightLongDesc,
         iconName = "lightbulb-on",

Assets/Behaviors/LookAt.cs

@@ -5,6 +5,7 @@ public class LookAtBehavior : GenericEntityBehavior<LookAtBehavior, LookAtCompon
 {
     public static new BehaviorType objectType = new BehaviorType("Look At", typeof(LookAtBehavior))
     {
+        displayName = s => s.LookAtName,
         description = s => s.LookAtDesc,
         longDescription =  s => s.LookAtLongDesc,
         iconName = "compass",

Assets/Behaviors/Move.cs

@@ -6,6 +6,7 @@ public class MoveBehavior : GenericEntityBehavior<MoveBehavior, MoveComponent>
     public static new BehaviorType objectType = new BehaviorType(
         "Move", typeof(MoveBehavior))
     {
+        displayName = s => s.MoveName,
         description = s => s.MoveDesc,
         longDescription = s => s.MoveLongDesc,
         iconName = "arrow-right-bold-box-outline",

Assets/Behaviors/MoveWith.cs

@@ -6,6 +6,7 @@ public class MoveWithBehavior : GenericEntityBehavior<MoveWithBehavior, MoveWith
     public static new BehaviorType objectType = new BehaviorType(
         "Move With", typeof(MoveWithBehavior))
     {
+        displayName = s => s.MoveWithName,
         description = s => s.MoveWithDesc,
         longDescription = s => s.MoveWithLongDesc,
         iconName = "move-resize-variant",

Assets/Behaviors/PhysicsComponent.cs

@@ -12,6 +12,7 @@ public class PhysicsBehavior : BasePhysicsBehavior
     public static new BehaviorType objectType = new BehaviorType(
         "Physics", typeof(PhysicsBehavior))
     {
+        displayName = s => s.PhysicsName,
         description = s => s.PhysicsDesc,
         longDescription = s => s.PhysicsLongDesc,
         iconName = "soccer",

Assets/Behaviors/Reflector.cs

@@ -8,6 +8,7 @@ public class ReflectorBehavior : GenericEntityBehavior<ReflectorBehavior, Reflec
     public static new BehaviorType objectType = new BehaviorType(
         "Reflector", typeof(ReflectorBehavior))
     {
+        displayName = s => s.ReflectorName,
         description = s => s.ReflectorDesc,
         longDescription = s => s.ReflectorLongDesc,
         iconName = "mirror",

Assets/Behaviors/Scale.cs

@@ -6,6 +6,7 @@ public class ScaleBehavior : GenericEntityBehavior<ScaleBehavior, ScaleComponent
     public static new BehaviorType objectType = new BehaviorType(
         "Scale", typeof(ScaleBehavior))
     {
+        displayName = s => s.ScaleName,
         description = s => s.ScaleDesc,
         longDescription = s => s.ScaleLongDesc,
         iconName = "resize",

Assets/Behaviors/Score.cs

@@ -4,6 +4,7 @@ public class ScoreBehavior : GenericEntityBehavior<ScoreBehavior, ScoreComponent
 {
     public static new BehaviorType objectType = new BehaviorType("Score", typeof(ScoreBehavior))
     {
+        displayName = s => s.ScoreName,
         description = s => s.ScoreDesc,
         iconName = "counter"
     };

Assets/Behaviors/Solid.cs

@@ -4,6 +4,7 @@ public class SolidBehavior : GenericEntityBehavior<SolidBehavior, SolidComponent
 {
     public static new BehaviorType objectType = new BehaviorType("Solid", typeof(SolidBehavior))
     {
+        displayName = s => s.SolidName,
         description = s => s.SolidDesc,
         iconName = "wall",
         rule = BehaviorType.AndRule(

Assets/Behaviors/Sound.cs

@@ -18,6 +18,7 @@ public class SoundBehavior : BaseSoundBehavior
 {
     public static new BehaviorType objectType = new BehaviorType("Sound", typeof(SoundBehavior))
     {
+        displayName = s => s.SoundName,
         description = s => s.SoundDesc,
         longDescription = s => s.SoundLongDesc,
         iconName = "volume-high",

Assets/Behaviors/Sound3D.cs

@@ -11,6 +11,7 @@ public class Sound3DBehavior : BaseSoundBehavior
     public static new BehaviorType objectType = new BehaviorType(
         "3D Sound", typeof(Sound3DBehavior))
     {
+        displayName = s => s.Sound3DName,
         description = s => s.Sound3DDesc,
         longDescription = s => s.Sound3DLongDesc,
         iconName = "headphones",

Assets/Behaviors/Spin.cs

@@ -5,6 +5,7 @@ public class SpinBehavior : GenericEntityBehavior<SpinBehavior, SpinComponent>
 {
     public static new BehaviorType objectType = new BehaviorType("Spin", typeof(SpinBehavior))
     {
+        displayName = s => s.SpinName,
         description = s => s.SpinDesc,
         longDescription = s => s.SpinLongDesc,
         iconName = "format-rotate-90",

Assets/Behaviors/Teleport.cs

@@ -6,6 +6,7 @@ public class TeleportBehavior : GenericEntityBehavior<TeleportBehavior, Teleport
     public static new BehaviorType objectType = new BehaviorType(
         "Teleport", typeof(TeleportBehavior))
     {
+        displayName = s => s.TeleportName,
         description = s => s.TeleportDesc,
         longDescription = s => s.TeleportLongDesc,
         iconName = "send",

Assets/Behaviors/Visible.cs

@@ -5,6 +5,7 @@ public class VisibleBehavior : GenericEntityBehavior<VisibleBehavior, VisibleCom
 {
     public static new BehaviorType objectType = new BehaviorType("Visible", typeof(VisibleBehavior))
     {
+        displayName = s => s.VisibleName,
         description = s => s.VisibleDesc,
         iconName = "eye",
         rule = BehaviorType.AndRule(