Ticket #3397: t3397_v3.patch

Index: trunk/binaries/data/config/default.cfg
===================================================================
--- trunk/binaries/data/config/default.cfg  (revision 17717)
+++ trunk/binaries/data/config/default.cfg  (working copy)
@@ -323,6 +323,7 @@
 attacknotificationmessage = true  ; Show attack notification messages
 camerajump.threshold = 40         ; How close do we have to be to the actual location in order to jump back to the previous one?
 timeelapsedcounter = false        ; Show the game duration in the top right corner
+objectstitle = 2                 ;

 [gui.session.minimap]
 blinkduration = 1.7               ; The blink duration while pinging
Index: trunk/binaries/data/mods/public/gui/common/functions_utility.js
===================================================================
--- trunk/binaries/data/mods/public/gui/common/functions_utility.js (revision 17717)
+++ trunk/binaries/data/mods/public/gui/common/functions_utility.js (working copy)
@@ -55,7 +55,79 @@
        return 0;
 }

+function getTemplateLabels(genericName,specificName)
+{
+   var titleType = Engine.ConfigDB_GetValue("user", "gui.session.objectstitle");
+   if (titleType == "0")
+   {
+       specificName = genericName;
+   }
+   else if (titleType == "1")
+   {
+       genericName = specificName;
+   }
+   else 
+   {
+       //not need to do any changes 
+   }
+   
+   if (specificName == undefined)
+       specificName = "???";   
+   if (genericName == undefined)
+       genericName = "???";
+   
+   return { "primary" : genericName, "secondary" : specificName };
+}
+
Index: trunk/binaries/data/mods/public/gui/common/tooltips.js
===================================================================
--- trunk/binaries/data/mods/public/gui/common/tooltips.js  (revision 17717)
+++ trunk/binaries/data/mods/public/gui/common/tooltips.js  (working copy)
@@ -506,9 +506,12 @@
 function getEntityNamesFormatted(template)
 {
    let names = "";
-   let generic = template.name.generic;
-   let specific = template.name.specific;
-   if (specific)
+   
+   var templates = getTemplateLabels(template.name.generic,template.name.specific);
+   let generic = templates.primary;
+   let specific = templates.secondary;
+   
+   if (specific != generic)
    {
        // drop caps for specific name
        names += '[font="sans-bold-16"]' + specific[0] + '[/font]' +
Index: trunk/binaries/data/mods/public/gui/options/options.json
===================================================================
--- trunk/binaries/data/mods/public/gui/options/options.json    (revision 17717)
+++ trunk/binaries/data/mods/public/gui/options/options.json    (working copy)
@@ -54,6 +54,12 @@
            "label": "Persist Match Settings",
            "tooltip": "Save and restore match settings for quick reuse when hosting another game",
            "parameters": { "config": "persistmatchsettings" }
+       },
+       {
+           "type": "dropdown",
+           "label": "Object title",
+           "tooltip": "Object title",
+           "parameters": { "list": [ "Generic", "Specific", "Both" ], "config": "gui.session.objectstitle" }
        }
    ],
    "graphicsSetting":
Index: trunk/binaries/data/mods/public/gui/session/selection_details.js
===================================================================
--- trunk/binaries/data/mods/public/gui/session/selection_details.js    (revision 17717)
+++ trunk/binaries/data/mods/public/gui/session/selection_details.js    (working copy)
@@ -232,6 +232,10 @@
    }

    // Set Player details
+   var templates = getTemplateLabels(genericName,specificName);
+   genericName = templates.primary;
+   specificName = templates.secondary;
+
    Engine.GetGUIObjectByName("specific").caption = specificName;
    Engine.GetGUIObjectByName("player").caption = playerName;
    Engine.GetGUIObjectByName("playerColorBackground").sprite = "color: " + playerColor;