disppmfirst config file token

cfgs/config/advanced.cfg

@@ -239,7 +239,12 @@ DISPATTACHSIZE KBYTES
 DISPAREANO YES         ; Only shows it if available.
 ;DISPAREANO ALWAYS     ; Will show 0 if there is no board number.
 
-//
+// Display personal mail first (Yes)
+;DispPmFirst No
+DispPmFirst Yes
+
+// Display originator's city in delimiter line 
+// between header and message body. (No)
 ;DispHdrLocation No
 DispHdrLocation Yes
 

cfgs/config/advanced.rus

@@ -210,6 +210,10 @@ DispAreaNo Yes         ;
 ;DispAreaNo Always     ; <20>®ª §ë¢ âì 0 ¥á«¨ ­¥â "board number".
 ;DispAreaNo No         ; <20>¥ ¢ë¢®¤¨âì.
 
+// <20>®ª §ë¢ âì ¨«¨ ­¥â ¯¥àá®­ «ì­ë¥ ¯¨á쬠 ¯¥à¢ë¬¨.
+;DispPmFirst No
+DispPmFirst Yes
+
 // ‚뢮¤ ¢ ¯®«®áª¥ ¯®¤ 奤¥à®¬ ¨¬¥­¨ £®à®¤  ¨§ ­®¤- ¨ ¯®©­â«¨á⮢.
 // …᫨ ¯®¨­â®¢ë©  ¤à¥á ­¥ ­ ©¤¥­, ¡ã¤¥â ¨á¯®«ì§®¢ ­  ¤à¥á ­®¤ë.
 // (¯® 㬮«ç ­¨î: No)

docs/notework.txt

@@ -10,6 +10,9 @@ ______________________________________________________________________
                Notes for GoldED+ 1.1.5, /snapshot/
 ______________________________________________________________________
 
++ Added DISPPMFIRST (yes/no) config file token that enable/disable
+  displaying first the personal mail in areas.
+
 + Stylecodes now may be used in random system groups.
 
 + New color config file item: "COLOR HEADER LOCATION". This is used for define

golded3/gccfgg.cpp

@@ -716,6 +716,7 @@ CfgGed::CfgGed() {
   displistcursor = NO;
   dispmargin = 0;
   dispmsgsize = DISPMSGSIZE_BYTES;
+  disppmfirst = true;
   disptabsize = 8;
   encodeemailheaders = true;
   externoptions = EXTUTIL_CLS | EXTUTIL_CURSOR | EXTUTIL_RELOAD | EXTUTIL_PAUSEONERROR | EXTUTIL_KEEPCTRL;

golded3/gccfgg.h

@@ -132,6 +132,7 @@ const word CRC_DISPLOCALHIGH    = 0x1D8B;
 const word CRC_DISPMARGIN       = 0xC0EC;
 const word CRC_DISPMSGSIZE      = 0xB0E2;
 const word CRC_DISPPAGEBAR      = 0x60A4;
+const word CRC_DISPPMFIRST      = 0x5DFC;
 const word CRC_DISPREALMSGNO    = 0xE30F;
 const word CRC_DISPREPLIESMODE  = 0x0099;
 const word CRC_DISPSOFTCR       = 0x85E9;

golded3/gccfgg0.cpp

@@ -283,6 +283,7 @@ SwitchD:
     case CRC_DISPLISTCURSOR   :  CfgDisplistcursor   ();  break;
     case CRC_DISPMARGIN       :  CfgDispmargin       ();  break;
     case CRC_DISPMSGSIZE      :  CfgDispmsgsize      ();  break;
+    case CRC_DISPPMFIRST      :  CfgDisppmfirst      ();  break;
     case CRC_DISPTABSIZE      :  CfgDisptabsize      ();  break;
     default                   :  found = false;
   }

golded3/gccfgg3.cpp

@@ -62,6 +62,13 @@ void CfgDispareano() {
 
 //  ------------------------------------------------------------------
 
+void CfgDisppmfirst() {
+
+  CFG->disppmfirst = GetYesno(val);
+}
+
+//  ------------------------------------------------------------------
+
 void CfgDisptabsize() {
 
   CFG->disptabsize = atoi(val);

golded3/gcprot.h

@@ -132,6 +132,7 @@ void CfgDisplocalhigh    ();
 void CfgDispmargin       ();
 void CfgDispmsgsize      ();
 void CfgDisppagebar      ();
+void CfgDisppmfirst      ();
 void CfgDisprealmsgno    ();
 void CfgDispsoftcr       ();
 void CfgDispstatusline   ();

golded3/gecfgg.h

@@ -207,6 +207,7 @@ public:
   PosLen      disphdrnodeset;
   int         displistcursor;
   int         dispmargin;           // rightmargin;
+  bool        disppmfirst;
   int         dispmsgsize;
   uint        disptabsize;          // tabsize;
   bool        encodeemailheaders;

golded3/geread.cpp

@@ -236,7 +236,8 @@ void Reader() {
         AA->Play().Play();
 
       // Jump to next message. Go to personal mail if any.
-      if(AA->PMrk.Tags()) {
+      if (CFG->disppmfirst && AA->PMrk.Tags())
+      {
         AA->SetBookmark(AA->lastread());
         AA->isreadpm = false;
         ToggleMarkRead();

golded3/geread2.cpp

@@ -388,7 +388,8 @@ void PrevArea() {
   AA->Open();
   AA->RandomizeData();
   AA->SetBookmark(AA->lastread());
-  if(AA->PMrk.Tags()) {
+  if (CFG->disppmfirst && AA->PMrk.Tags())
+  {
     AA->isreadpm = false;
     ToggleMarkRead();
   }
@@ -419,11 +420,11 @@ void NextArea() {
   AA->Open();
   AA->RandomizeData();
   AA->SetBookmark(AA->lastread());
-  if(AA->PMrk.Tags()) {
+  if (CFG->disppmfirst && AA->PMrk.Tags())
+  {
     AA->isreadpm = false;
     ToggleMarkRead();
   }
-
 }