When moving from recyclebin, area from AREA kludge is selected by default.
This commit is contained in:
parent
0fe38ad361
commit
d34238d271
@ -446,6 +446,11 @@ AREAREPLYTO E-MAIL
|
|||||||
// <echoid>
|
// <echoid>
|
||||||
;AREAYOUWROTETO MY_MAILS
|
;AREAYOUWROTETO MY_MAILS
|
||||||
|
|
||||||
|
// If enabled, GoldED+ will move messages to this area.
|
||||||
|
// Press ReadForceDeleteMsg to delete messages without moving to recycle bin.
|
||||||
|
;AreaRecycleBin RECYCLE_BIN Ask
|
||||||
|
;AreaRecycleBin RECYCLE_BIN NoAsk
|
||||||
|
|
||||||
|
|
||||||
----------------------------------------------------------------------
|
----------------------------------------------------------------------
|
||||||
-- STATUSLINE
|
-- STATUSLINE
|
||||||
|
@ -468,6 +468,11 @@ AreaCopyTo ZZZ.MY.ARCHIVE
|
|||||||
// ‚ £à㯯 å íâ®â ¯ à ¬¥âà à ¡®â ¥â á ¢¥àᨨ 3.00.a5.
|
// ‚ £à㯯 å íâ®â ¯ à ¬¥âà à ¡®â ¥â á ¢¥àᨨ 3.00.a5.
|
||||||
AreaCopyAddId No
|
AreaCopyAddId No
|
||||||
|
|
||||||
|
// …᫨ ˘Ş«î祮, â® GoldED+ ŻĄŕĄ¬Ąáâ¨â 㤠«ĄëĄ á®®ˇéĄ¨ď ˘ íâă ŕ¨î.
|
||||||
|
// Ť ¦¬¨âĄ ReadForceDeleteMsg ¤«ď ⮣® ç⮡ë 㤠«¨âě ¬¨ăď Ş®ŕ§¨ă.
|
||||||
|
;AreaRecycleBin RECYCLE_BIN Ask ; áŻŕ 訢 âě Ż®¤â˘Ąŕ¦¤Ą¨Ą
|
||||||
|
;AreaRecycleBin RECYCLE_BIN NoAsk ; Ą áŻŕ 訢 âě
|
||||||
|
|
||||||
|
|
||||||
----------------------------------------------------------------------
|
----------------------------------------------------------------------
|
||||||
-- ‘’<E28098>ŽŠ€ ‘Ž‘’ŽŸ<C5BD>ˆŸ
|
-- ‘’<E28098>ŽŠ€ ‘Ž‘’ŽŸ<C5BD>ˆŸ
|
||||||
|
@ -10,6 +10,8 @@ _____________________________________________________________________________
|
|||||||
‡ ¬¥âª¨ ¤«ï GoldED+ 1.1.5, /snapshot/
|
‡ ¬¥âª¨ ¤«ï GoldED+ 1.1.5, /snapshot/
|
||||||
_____________________________________________________________________________
|
_____________________________________________________________________________
|
||||||
|
|
||||||
|
+ Š®£¤ á®®¡é¥¨¥ ¯¥à¥¬¥é ¥âáï ¨§ ª®à§¨ë, â® ¢ë¡¨à ¥âáï ¯® 㬮«ç ¨î à¨ï
|
||||||
|
¨§ ª«ã¤¦ AREA.
|
||||||
- uudecoder: ⥯¥àì ¡ã¤¥â ¨£®à¨à®¢ ® ¢á¥ ¯®á«¥ áâப¨ çâ® ç¨ ¥âáï
|
- uudecoder: ⥯¥àì ¡ã¤¥â ¨£®à¨à®¢ ® ¢á¥ ¯®á«¥ áâப¨ çâ® ç¨ ¥âáï
|
||||||
"sum -r/size ".
|
"sum -r/size ".
|
||||||
- Win32: ˆá¯à ¢«¥® ç á⮥ ç⥨¥ ॥áâà ª®£¤ ¢ª«îç¥ MCI §¢ãª.
|
- Win32: ˆá¯à ¢«¥® ç á⮥ ç⥨¥ ॥áâà ª®£¤ ¢ª«îç¥ MCI §¢ãª.
|
||||||
|
@ -10,6 +10,8 @@ ______________________________________________________________________
|
|||||||
Notes for GoldED+ 1.1.5, /snapshot/
|
Notes for GoldED+ 1.1.5, /snapshot/
|
||||||
______________________________________________________________________
|
______________________________________________________________________
|
||||||
|
|
||||||
|
+ When moving from recyclebin, area from AREA: kludge is selected by default.
|
||||||
|
|
||||||
- uudecoder: now are skipped all lines which follows line that starts
|
- uudecoder: now are skipped all lines which follows line that starts
|
||||||
with "sum -r/size ".
|
with "sum -r/size ".
|
||||||
|
|
||||||
|
@ -419,24 +419,41 @@ void CmfMsgs(GMsg* msg, bool torecycle)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Pick the destination area
|
// Pick the destination area
|
||||||
|
bool fromrecycle = false;
|
||||||
int destarea = CurrArea;
|
int destarea = CurrArea;
|
||||||
const char* cmfptr;
|
const char* cmfptr;
|
||||||
|
|
||||||
if (torecycle)
|
if (torecycle)
|
||||||
cmfptr = CFG->arearecyclebin;
|
cmfptr = CFG->arearecyclebin;
|
||||||
else
|
else
|
||||||
cmfptr = cmf == MODE_FORWARD ? AA->Areareplyto() : AA->Areacopyto();
|
{
|
||||||
|
if (CFG->arearecyclebin[0])
|
||||||
|
{
|
||||||
|
int areano = AL.AreaEchoToNo(CFG->arearecyclebin);
|
||||||
|
int currno = AL.AreaIdToNo(CurrArea);
|
||||||
|
|
||||||
if(*cmfptr) {
|
if ((areano == currno) && (areano >= 0))
|
||||||
|
fromrecycle = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (fromrecycle)
|
||||||
|
cmfptr = msg->areakludgeid;
|
||||||
|
else
|
||||||
|
cmfptr = (cmf == MODE_FORWARD) ? AA->Areareplyto() : AA->Areacopyto();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (cmfptr[0])
|
||||||
|
{
|
||||||
int a = AL.AreaEchoToNo(cmfptr);
|
int a = AL.AreaEchoToNo(cmfptr);
|
||||||
if(a != -1)
|
if (a != -1)
|
||||||
destarea = AL.AreaNoToId(a);
|
destarea = AL.AreaNoToId(a);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!torecycle && (cmf == MODE_FORWARD ? not AA->Areaforwarddirect() : not AA->Areacopydirect()))
|
if (!torecycle && (cmf == MODE_FORWARD ? not AA->Areaforwarddirect() : not AA->Areacopydirect()))
|
||||||
destarea = AreaPick(pickstr, 6, &destarea);
|
destarea = AreaPick(pickstr, 6, &destarea);
|
||||||
|
|
||||||
if(destarea == -1) {
|
if (destarea == -1)
|
||||||
|
{
|
||||||
GFTRK(0);
|
GFTRK(0);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user