diff --git a/cfgs/config/advanced.cfg b/cfgs/config/advanced.cfg index 91487b4..8b09e9c 100644 --- a/cfgs/config/advanced.cfg +++ b/cfgs/config/advanced.cfg @@ -550,6 +550,10 @@ EDITUNDELETE 100 // Do not forget to set DISPSOFTCR to YES! ;EDITSOFTCRXLAT H ; Example for Russians. +// Enable EditSoftCrxLat (Yes). May be used in random system groups. +;UseSoftCrxLat No +UseSoftCrxLat Yes + // Right margin for editing quotes in the internal editor. // EDITQUOTEMARGIN 78 diff --git a/cfgs/config/advanced.rus b/cfgs/config/advanced.rus index 08255fb..f04378b 100644 --- a/cfgs/config/advanced.rus +++ b/cfgs/config/advanced.rus @@ -577,6 +577,10 @@ EditUnDelete 50 // символ ASCII 141 на другой. EditSoftCrxLat H ; Обязательно для R50! +// EditSoftCrxLat может быть отключено глобально или в группах. +;UseSoftCrxLat No +UseSoftCrxLat Yes + // Ширина поля вывода для редактирования цитируемых строк. EditQuoteMargin 75 @@ -2298,6 +2302,7 @@ EndGroup // TwitMode // UseFwd // UserName +// UseSoftCrxLat // ViewHidden // ViewKludge // ViewQuote diff --git a/docs/notework.txt b/docs/notework.txt index f210d3e..2fe1ab3 100644 --- a/docs/notework.txt +++ b/docs/notework.txt @@ -10,6 +10,9 @@ ______________________________________________________________________ Notes for GoldED+ 1.1.5, /snapshot/ ______________________________________________________________________ ++ Added EditSoftCrxLat (yes/no) config file token that enable/disable + usage of EditSoftCrxLat. May be used in random system groups. + + Added DISPPMFIRST (yes/no) config file token that enable/disable displaying first the personal mail in areas. diff --git a/golded3/gccfgg.cpp b/golded3/gccfgg.cpp index f8170f6..500939d 100644 --- a/golded3/gccfgg.cpp +++ b/golded3/gccfgg.cpp @@ -787,6 +787,7 @@ CfgGed::CfgGed() { useintl = true; usepid = true; usernameno = 0; + usesoftcrxlat = true; usestylies = true; usetzutc = false; viewhidden = false; diff --git a/golded3/gccfgg.h b/golded3/gccfgg.h index e9abc0b..d458e3e 100644 --- a/golded3/gccfgg.h +++ b/golded3/gccfgg.h @@ -382,6 +382,7 @@ const word CRC_USEPID = 0x2F68; const word CRC_USERLIST = 0xE81A; const word CRC_USERLISTFILE = 0xB749; const word CRC_USERNAME = 0x1161; +const word CRC_USESOFTCRXLAT = 0x4285; const word CRC_USETZUTC = 0x27C5; const word CRC_UUDECODEPATH = 0x82A2; const word CRC_VIEWHIDDEN = 0x021D; diff --git a/golded3/gccfgg0.cpp b/golded3/gccfgg0.cpp index ff6df47..deb9b78 100644 --- a/golded3/gccfgg0.cpp +++ b/golded3/gccfgg0.cpp @@ -577,6 +577,7 @@ SwitchU: case CRC_USERLIST : CfgUserlist (); break; case CRC_USERLISTFILE : CfgUserlistfile (); break; case CRC_USERNAME : CfgUsername (); break; + case CRC_USESOFTCRXLAT : CfgUsesoftcrxlat (); break; case CRC_USETZUTC : CfgUsetzutc (); break; case CRC_UUDECODEPATH : CfgUudecodepath (); break; default : found = false; diff --git a/golded3/gccfgg8.cpp b/golded3/gccfgg8.cpp index c6c9715..f51a980 100644 --- a/golded3/gccfgg8.cpp +++ b/golded3/gccfgg8.cpp @@ -442,6 +442,17 @@ void CfgUsername() { // ------------------------------------------------------------------ +void CfgUsesoftcrxlat() +{ + bool flag = GetYesno(val); + if (cfgingroup) + CFG->grp.AddItm(GRP_USESOFTCRXLAT, flag); + else + CFG->usesoftcrxlat = flag; +} + +// ------------------------------------------------------------------ + void CfgUsetzutc() { bool flag = GetYesno(val); diff --git a/golded3/gcprot.h b/golded3/gcprot.h index d4da527..70ba6f3 100644 --- a/golded3/gcprot.h +++ b/golded3/gcprot.h @@ -364,6 +364,7 @@ void CfgUsepid (); void CfgUserlist (); void CfgUserlistfile (); void CfgUsername (); +void CfgUsesoftcrxlat (); void CfgUsetzutc (); void CfgUudecodepath (); void CfgViewhidden (); diff --git a/golded3/gecfgg.h b/golded3/gecfgg.h index 15b3eb2..c6f18a3 100644 --- a/golded3/gecfgg.h +++ b/golded3/gecfgg.h @@ -358,6 +358,7 @@ public: Path userlistfile; // goldedlst; std::vector username; int usernameno; + bool usesoftcrxlat; bool usestylies; bool usetzutc; Path uudecodepath; diff --git a/golded3/gelmsg.cpp b/golded3/gelmsg.cpp index 6bc5fc5..8dab56d 100644 --- a/golded3/gelmsg.cpp +++ b/golded3/gelmsg.cpp @@ -119,7 +119,8 @@ int Area::LoadMsg(GMsg* msg, ulong msgno, int margin, int mode) { void Area::SaveHdr(int mode, GMsg* msg) { // Translate softcr to configured char - if(EDIT->SoftCrXlat()) { + if (adat->usesoftcrxlat && EDIT->SoftCrXlat()) + { strchg(msg->by, SOFTCR, EDIT->SoftCrXlat()); strchg(msg->to, SOFTCR, EDIT->SoftCrXlat()); strchg(msg->realby, SOFTCR, EDIT->SoftCrXlat()); diff --git a/golded3/gerand.cpp b/golded3/gerand.cpp index b699f15..5381c3b 100644 --- a/golded3/gerand.cpp +++ b/golded3/gerand.cpp @@ -178,6 +178,7 @@ void Area::InitData() { adat->usefwd = CFG->usefwd; strcpy(adat->username.name, CFG->username.empty() ? "" : CFG->username[CFG->usernameno].name); adat->username.addr = adat->aka.addr; + adat->usesoftcrxlat = CFG->usesoftcrxlat; adat->usetzutc = CFG->usetzutc; adat->viewhidden = CFG->viewhidden; adat->viewkludge = CFG->viewkludge; @@ -405,6 +406,7 @@ void Area::RandomizeData(int mode) { SetAka(tmp); } + CFG->grp.GetItm(GRP_USESOFTCRXLAT, adat->usesoftcrxlat); CFG->grp.GetItm(GRP_USETZUTC, adat->usetzutc); if(not mode) { diff --git a/golded3/gmarea.cpp b/golded3/gmarea.cpp index c00bdd6..18214bf 100644 --- a/golded3/gmarea.cpp +++ b/golded3/gmarea.cpp @@ -262,7 +262,8 @@ void Area::SaveMsg(int mode, GMsg* msg) { } // Translate softcr to configured char - if(EDIT->SoftCrXlat()) { + if (adat->usesoftcrxlat && EDIT->SoftCrXlat()) + { strchg(msg->by, SOFTCR, EDIT->SoftCrXlat()); strchg(msg->to, SOFTCR, EDIT->SoftCrXlat()); strchg(msg->realby, SOFTCR, EDIT->SoftCrXlat()); diff --git a/golded3/gmarea.h b/golded3/gmarea.h index 750b3d7..17cb857 100644 --- a/golded3/gmarea.h +++ b/golded3/gmarea.h @@ -311,6 +311,7 @@ struct AreaData { bool usearea; int usefwd; Node username; + bool usesoftcrxlat; bool usetzutc; IAdr whoto; Path wtpl; diff --git a/goldlib/gall/gutlgrp.h b/goldlib/gall/gutlgrp.h index 4b51b29..b09cfeb 100644 --- a/goldlib/gall/gutlgrp.h +++ b/goldlib/gall/gutlgrp.h @@ -99,6 +99,7 @@ enum { GRP_USEAREA, GRP_USEFWD, GRP_USERNAME, + GRP_USESOFTCRXLAT, GRP_USETZUTC, GRP_VIEWHIDDEN, GRP_VIEWKLUDGE,