DispHdrLocation settings changed

cfgs/config/advanced.cfg

@@ -243,12 +243,13 @@ DISPAREANO YES         ; Only shows it if available.
 ;DispPmFirst No
 DispPmFirst Yes
 
+// DISPHDRLOCATION <no/yes/always> <right/center> (no right)
 // Display originator's city in delimiter line between header and message body.
 // Nodelist is required for this feature. If some nodelist is omitted then
 // Golded+ will display warning at reading each message.
-// (Default:No)
+DispHdrLocation No
-;DispHdrLocation No/Yes/Right/Center
+;DispHdrLocation Yes
-DispHdrLocation Yes
+;DispHdrLocation Always Center
 
 // This separate sity names in netmail areas
 ;LocationDelimiter " | "

cfgs/config/advanced.rus

@@ -214,14 +214,15 @@ DispAreaNo Yes         ;
 ;DispPmFirst No
 DispPmFirst Yes
 
+// DISPHDRLOCATION <no/yes/always> <right/center> (no right)
 // <20>뢮<EFBFBD> <20> <20><><EFBFBD><EFBFBD>᪥ <20><><EFBFBD> 奤<>஬ <20><><EFBFBD><EFBFBD><EFBFBD> <20><>த<EFBFBD> <20><> <20><><EFBFBD>- <20> <20><><EFBFBD><EFBFBD>⫨<EFBFBD>⮢.
 // <20>᫨ <20><><EFBFBD><EFBFBD>⮢<EFBFBD><E2AEA2> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20>㤥<EFBFBD> <20>ᯮ<EFBFBD>짮<EFBFBD><ECA7AE><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>.
 // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ⮫쪮 <20><><EFBFBD> <20><><EFBFBD><EFBFBD>稨 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20>᫨ <20><><EFBFBD><EFBFBD> <20><> 㪠<><E3AAA0><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD>ன<EFBFBD><E0AEA9>
 // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⮢/<2F><><EFBFBD><EFBFBD>⫨<EFBFBD>⮢ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, Golded+ <20>㤥<EFBFBD> <20><><EFBFBD> <20><><EFBFBD>ᬮ<EFBFBD><E1ACAE><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 // ᮮ<>饭<EFBFBD><E9A5AD> <20>뢮<EFBFBD><EBA2AE><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>ଠ<EFBFBD><E0ACA0><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>ᢨ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
-// (<28><><EFBFBD>祭<EFBFBD><E7A5AD> <20><> 㬮<>砭<EFBFBD><E7A0AD>: No)
+DispHdrLocation No
-;DispHdrLocation No/Yes/Right/Center
+;DispHdrLocation Yes
-DispHdrLocation Yes
+;DispHdrLocation Always Center
 
 // <20>⨬ <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ࠧ<><E0A0A7><EFBFBD><EFBFBD>⥫<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><>த<EFBFBD><E0AEA4><EFBFBD> <20><><EFBFBD>ࠢ<EFBFBD>⥫<EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⥫<EFBFBD>
 // <20> <20><>⬥<EFBFBD><E2ACA5> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.

docs/notework.txt

@@ -10,6 +10,10 @@ ______________________________________________________________________
                Notes for GoldED+ 1.1.5, /snapshot/
 ______________________________________________________________________
 
+! DispHdrLocation settings changed to <No/Yes/Always> <Right/Center>.
+  When MsgListHeader is on, location will be shown in lists only if
+  DispHdrLocation is 'Always'.
+
 + Improved ColorName matching. Case insensitive wildcard matching will be
   used for ColorName names. Also, search will be stopped on first matched
   name or address.

golded3/gccfgg2.cpp

@@ -487,12 +487,18 @@ void CfgDisphdrdateset() {
 
 void CfgDisphdrlocation()
 {
-  if (strieql("RIGHT", val))
+  char* key;
-    CFG->disphdrlocation = TRIGHT;
+  getkeyval(&key, &val);
-  else if (strieql("CENTER", val))
+
-    CFG->disphdrlocation = TCENTER;
+  CFG->disphdrlocation = GetYesno(key);
-  else
+
-    CFG->disphdrlocation = GetYesno(val) ? TRIGHT : NO;
+  if (CFG->disphdrlocation != NO)
+  {
+    if (strieql("CENTER", val))
+      CFG->disphdrlocation = CFG->disphdrlocation + (TCENTER << 16);
+    else
+      CFG->disphdrlocation = CFG->disphdrlocation + (TRIGHT << 16);
+  }
 }
 
 //  ------------------------------------------------------------------

golded3/gemlst.cpp

@@ -219,7 +219,12 @@ void GMsgList::ReadMlst(int n) {
 void GMsgList::do_delayed() {
 
   // Update header and statusline
-  if(AA->Msglistheader()) {
+  if(AA->Msglistheader())
+  {
+    int disphdrlocation = CFG->disphdrlocation;
+    if ((CFG->disphdrlocation & 0xFFFF) == YES)
+      CFG->disphdrlocation = NO;
+
     ReadMlst(index);
     AA->LoadMsg(&msg, mlst[index]->msgno, CFG->dispmargin-(int)CFG->switches.get(disppagebar));
     mlst[index]->goldmark = goldmark;
@@ -231,6 +236,8 @@ void GMsgList::do_delayed() {
     HeaderView->Use(AA, &msg);
     HeaderView->Paint();
     wactiv_(mlstwh);
+
+    CFG->disphdrlocation = disphdrlocation;
   }
 
   if(CFG->switches.get(msglistviewsubj)) {
@@ -750,7 +757,12 @@ void GThreadlist::update_title() {
 void GThreadlist::do_delayed() {
 
   // Update header and statusline
-  if(AA->Msglistheader()) {
+  if(AA->Msglistheader())
+  {
+    int disphdrlocation = CFG->disphdrlocation;
+    if ((CFG->disphdrlocation & 0xFFFF) == YES)
+      CFG->disphdrlocation = NO;
+
     AA->LoadMsg(&msg, list[index].msgno, CFG->dispmargin-(int)CFG->switches.get(disppagebar));
     for(std::vector<Node>::iterator x = CFG->username.begin(); x != CFG->username.end(); x++) {
       if(strieql(msg.By(), x->name)) {
@@ -767,6 +779,8 @@ void GThreadlist::do_delayed() {
     HeaderView->Use(AA, &msg);
     HeaderView->Paint();
     wactiv_(mlstwh);
+
+    CFG->disphdrlocation = disphdrlocation;
   }
 
   if(CFG->switches.get(msglistviewsubj)) {

golded3/geview.cpp

@@ -350,7 +350,7 @@ void GMsgHeaderView::Paint() {
     {
       loc += " ";
       int pos = window.width() - loc.length();
-      pos = (CFG->disphdrlocation == TCENTER) ? pos/2 : pos-1;
+      pos = ((CFG->disphdrlocation >> 16) == TCENTER) ? pos/2 : pos-1;
       window.prints(5, pos, location_color, loc.c_str());
     }
   }