diff --git a/cfgs/config/advanced.cfg b/cfgs/config/advanced.cfg index eab3a50..91487b4 100644 --- a/cfgs/config/advanced.cfg +++ b/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 diff --git a/cfgs/config/advanced.rus b/cfgs/config/advanced.rus index d6f46e6..08255fb 100644 --- a/cfgs/config/advanced.rus +++ b/cfgs/config/advanced.rus @@ -210,6 +210,10 @@ DispAreaNo Yes ; ;DispAreaNo Always ; Показывать 0 если нет "board number". ;DispAreaNo No ; Не выводить. +// Показывать или нет персональные письма первыми. +;DispPmFirst No +DispPmFirst Yes + // Вывод в полоске под хедером имени города из нод- и пойнтлистов. // Если поинтовый адрес не найден, будет использован адрес ноды. // (по умолчанию: No) diff --git a/docs/notework.txt b/docs/notework.txt index 8964b55..f210d3e 100644 --- a/docs/notework.txt +++ b/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 diff --git a/golded3/gccfgg.cpp b/golded3/gccfgg.cpp index 0016ef5..f8170f6 100644 --- a/golded3/gccfgg.cpp +++ b/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; diff --git a/golded3/gccfgg.h b/golded3/gccfgg.h index d2044f7..e9abc0b 100644 --- a/golded3/gccfgg.h +++ b/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; diff --git a/golded3/gccfgg0.cpp b/golded3/gccfgg0.cpp index bdaf3fb..ff6df47 100644 --- a/golded3/gccfgg0.cpp +++ b/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; } diff --git a/golded3/gccfgg3.cpp b/golded3/gccfgg3.cpp index 1c63762..bbe3058 100644 --- a/golded3/gccfgg3.cpp +++ b/golded3/gccfgg3.cpp @@ -62,6 +62,13 @@ void CfgDispareano() { // ------------------------------------------------------------------ +void CfgDisppmfirst() { + + CFG->disppmfirst = GetYesno(val); +} + +// ------------------------------------------------------------------ + void CfgDisptabsize() { CFG->disptabsize = atoi(val); diff --git a/golded3/gcprot.h b/golded3/gcprot.h index d18de19..d4da527 100644 --- a/golded3/gcprot.h +++ b/golded3/gcprot.h @@ -132,6 +132,7 @@ void CfgDisplocalhigh (); void CfgDispmargin (); void CfgDispmsgsize (); void CfgDisppagebar (); +void CfgDisppmfirst (); void CfgDisprealmsgno (); void CfgDispsoftcr (); void CfgDispstatusline (); diff --git a/golded3/gecfgg.h b/golded3/gecfgg.h index 1d83794..15b3eb2 100644 --- a/golded3/gecfgg.h +++ b/golded3/gecfgg.h @@ -207,6 +207,7 @@ public: PosLen disphdrnodeset; int displistcursor; int dispmargin; // rightmargin; + bool disppmfirst; int dispmsgsize; uint disptabsize; // tabsize; bool encodeemailheaders; diff --git a/golded3/geread.cpp b/golded3/geread.cpp index 91e87eb..e7a75b3 100644 --- a/golded3/geread.cpp +++ b/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(); diff --git a/golded3/geread2.cpp b/golded3/geread2.cpp index 604c5ac..94d996a 100644 --- a/golded3/geread2.cpp +++ b/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(); } - }