Added LocationDelimiter config file token

cfgs/config/advanced.cfg

@@ -248,6 +248,9 @@ DispPmFirst Yes
 ;DispHdrLocation No
 DispHdrLocation Yes
 
+// This separate sity names in netmail areas
+;LocationDelimiter " | "
+
 // Substitutions for the city name retrieved from nodelist to display in
 // message header delimeter line. May be used to show national-language
 // names of the nodes cities.

cfgs/config/advanced.rus

@@ -220,6 +220,10 @@ DispPmFirst Yes
 ;DispHdrLocation No
 DispHdrLocation Yes
 
+// <20>⨬ ¬®¦­® § ¤ âì à §¤¥«¨â¥«ì ¬¥¦¤ã £®à®¤ ¬¨ ®â¯à ¢¨â¥«ï ¨ ¯®«ãç â¥«ï
+// ¢ ­¥â¬¥©« ®¡« áâïå.
+;LocationDelimiter " | "
+
 // <20>®¤áâ ­®¢ª  ­ §¢ ­¨© £®à®¤®¢ ¤«ï ¯®ª §  ¢ áâப¥-à §¤¥«¨â¥«¥ § £®«®¢ª 
 // ¨ ⥫  á®®¡é¥­¨ï. Œ®¦­® ¨á¯®«ì§®¢ âì ¤«ï ¯®ª §  àãááª¨å ­ §¢ ­¨© £®à®¤®¢.
 // ˆ¬¥¥â á¬ë᫠⮫쪮 ¯à¨ 㪠§ ­¨¨ DispHdrLocation Yes.

docs/notework.txt

@@ -10,6 +10,9 @@ ______________________________________________________________________
                Notes for GoldED+ 1.1.5, /snapshot/
 ______________________________________________________________________
 
++ Added LocationDelimiter "delim" config file token that separate
+  city names in netmail areas.
+
 + LocationAlias is case insensitive now.
 
 + Macro '@widepid' contains platform ID again.

golded3/gccfgg.cpp

@@ -739,6 +739,7 @@ CfgGed::CfgGed() {
   internetviagate = false;
   keybmode = KEYB_POLL;
   logformat = 0;
+  locationdelimiter = " \x1A ";
   menumarked = MODE_DONT;
   menunextarea = YES;
   msglistdate = MSGLISTDATE_WRITTEN;

golded3/gccfgg.h

@@ -240,6 +240,7 @@ const word CRC_KLUDGE           = 0xA600;
 const word CRC_KLUDGECHRS       = 0x0EEF;
 const word CRC_LOADLANGUAGE     = 0x9F1B;
 const word CRC_LOCATIONALIAS    = 0x1B5F;
+const word CRC_LOCATIONDELIMITER= 0x5083;
 const word CRC_LOGFILE          = 0x8ACE;
 const word CRC_LOGFORMAT        = 0x9E51;
 const word CRC_LOGLEVEL         = 0xCF59;

golded3/gccfgg0.cpp

@@ -412,6 +412,7 @@ SwitchL:
   switch(crc) {
     case CRC_LOADLANGUAGE     :  CfgLoadlanguage     ();  break;
     case CRC_LOCATIONALIAS    :  CfgLocationalias    ();  break;
+    case CRC_LOCATIONDELIMITER:  CfgLocationdelimiter();  break;
     case CRC_LOGFILE          :  CfgLogfile          ();  break;
     case CRC_LOGFORMAT        :  CfgLogformat        ();  break;
     default                   :  found = false;

golded3/gccfgg5.cpp

@@ -331,6 +331,14 @@ void CfgLocationalias()
 
 //  ------------------------------------------------------------------
 
+void CfgLocationdelimiter()
+{
+  StripQuotes(val);
+  CFG->locationdelimiter = val;
+}
+
+//  ------------------------------------------------------------------
+
 void CfgLogfile() {
 
   strcpy(CFG->logfile, val);

golded3/gcprot.h

@@ -230,6 +230,7 @@ void CfgKludge           ();
 void CfgKludgechrs       ();
 void CfgLoadlanguage     ();
 void CfgLocationalias    ();
+void CfgLocationdelimiter();
 void CfgLogfile          ();
 void CfgLogformat        ();
 void CfgLookupecho       ();

golded3/gecfgg.h

@@ -256,6 +256,7 @@ public:
   gstrarray   kludge;
   Path        loadlanguage;
   GStrBag2    locationalias;
+  std::string locationdelimiter;
   Path        logfile;              // goldedlog;
   int         logformat;
   std::vector<MailList> mailinglist;

golded3/geview.cpp

@@ -335,7 +335,7 @@ void GMsgHeaderView::Paint() {
     {
       std::string loc2;
       LookupNodeLocation(msg, loc2, LOOK_CITY2);
-      if (loc.length()) loc += " | " + loc2;
+      if (loc.length()) loc += CFG->locationdelimiter + loc2;
     }
 
     if (loc.length())