Added ReadForceDeleteMsg (default is #Del) to the goldkeys.cfg used to delete messages without moving them to AreaRecicleBin.
This commit is contained in:
@@ -227,6 +227,7 @@ CmdKey DefaultKeyset[] = {
|
||||
{ Key_A_Z , KK_ReadFindHeader , KT_R },
|
||||
{ Key_F6 , KK_ReadFindHeader , KT_R },
|
||||
{ Key_A_F6 , KK_ReadFindNext , KT_R },
|
||||
{ Key_S_Del , KK_ReadForceDeleteMsg , KT_R },
|
||||
{ Key_S_Tab , KK_ReadGotoBookMark , KT_R },
|
||||
{ Key_BS , KK_ReadGotoBookMark , KT_R },
|
||||
{ Key_Lsr , KK_ReadGotoFirstMsg , KT_R },
|
||||
@@ -808,6 +809,7 @@ tglobalkey globalkeys[] = {
|
||||
{ CRC_EDITTOUPPER , KK_EditToUpper , KT_E }, // 0xD3DD
|
||||
{ CRC_FILEASKEXIT , KK_FileAskExit , KT_F }, // 0xD40C
|
||||
{ CRC_EDITBLOCKDOWN , KK_EditBlockDown , KT_E }, // 0xD4E4
|
||||
{ CRC_READFORCEDELETEMSG , KK_ReadForceDeleteMsg , KT_R }, // 0xD57A
|
||||
{ CRC_READMESSAGELIST , KK_ReadMessageList , KT_R }, // 0xD5D8
|
||||
{ CRC_EDITGOUP , KK_EditGoUp , KT_E }, // 0xD6BA
|
||||
{ CRC_EDITDOSSHELL , KK_EditDosShell , KT_E }, // 0xD6C5
|
||||
|
@@ -233,6 +233,7 @@ const word CRC_READFILEREQUEST = 0x0A07;
|
||||
const word CRC_READFINDALL = 0xEF19;
|
||||
const word CRC_READFINDHEADER = 0x6343;
|
||||
const word CRC_READFINDNEXT = 0x8082;
|
||||
const word CRC_READFORCEDELETEMSG = 0xD57A;
|
||||
const word CRC_READGOTOBOOKMARK = 0x4383;
|
||||
const word CRC_READGOTOFIRSTMSG = 0x392F;
|
||||
const word CRC_READGOTOLASTMSG = 0x9E72;
|
||||
|
@@ -145,12 +145,12 @@ void Area::DeleteMsg(GMsg* msg, int direction) {
|
||||
|
||||
// ------------------------------------------------------------------
|
||||
|
||||
void Area::DelMsgs(GMsg* msg)
|
||||
void Area::DelMsgs(GMsg* msg, bool force)
|
||||
{
|
||||
GFTRK("DelMsgs");
|
||||
GMenuDelete MenuDelete;
|
||||
|
||||
if (CFG->arearecyclebin[0])
|
||||
if (!force && CFG->arearecyclebin[0])
|
||||
{
|
||||
int areano = AL.AreaEchoToNo(CFG->arearecyclebin);
|
||||
int currno = AL.AreaIdToNo(CurrArea);
|
||||
@@ -287,10 +287,10 @@ void TwitDeleteMsg(GMsg* msg) {
|
||||
|
||||
// ------------------------------------------------------------------
|
||||
|
||||
void Area::DelMsg() {
|
||||
|
||||
void Area::DelMsg(bool force)
|
||||
{
|
||||
if(Msgn.Count())
|
||||
DelMsgs(reader_msg);
|
||||
DelMsgs(reader_msg, force);
|
||||
}
|
||||
|
||||
|
||||
|
@@ -336,7 +336,7 @@ const gkey KK_ReadQuoteMsg = 0xFF8A;
|
||||
const gkey KK_ReadReplyMsg = 0xFF8B;
|
||||
const gkey KK_ReadSearch = 0xFF8C;
|
||||
const gkey KK_ReadSoundkill = 0xFF8D;
|
||||
// = 0xFE8E;
|
||||
const gkey KK_ReadForceDeleteMsg = 0xFF8E;
|
||||
const gkey KK_ReadThreadtree = 0xFF8F;
|
||||
const gkey KK_ReadToggleBookMark = 0xFF90;
|
||||
const gkey KK_ReadToggleHexdump = 0xFF91;
|
||||
|
@@ -884,13 +884,14 @@ void Reader() {
|
||||
CopyMoveForward();
|
||||
break;
|
||||
|
||||
case KK_ReadForceDeleteMsg:
|
||||
case KK_ReadDeleteMsg:
|
||||
if(AA->attr().r_o()) {
|
||||
GMenuReadonly MenuReadonly;
|
||||
if(not MenuReadonly.Run())
|
||||
break;
|
||||
}
|
||||
AA->DelMsg();
|
||||
AA->DelMsg(reader_keycode == KK_ReadForceDeleteMsg);
|
||||
break;
|
||||
|
||||
case KK_ReadMakeUserlist:
|
||||
|
@@ -488,8 +488,8 @@ public:
|
||||
|
||||
void SetBookmark(uint __relno);
|
||||
void DeleteMsg(GMsg* msg, int direction);
|
||||
void DelMsg();
|
||||
void DelMsgs(GMsg* msg);
|
||||
void DelMsg(bool force = false);
|
||||
void DelMsgs(GMsg* msg, bool force = false);
|
||||
void SigExportlistUpdate();
|
||||
void UpdateAreadata();
|
||||
|
||||
|
Reference in New Issue
Block a user