bbs/deb-goldedplus
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Token AreaRecycleBin changed to AreaRecycleBin <area> [NoAsk/Ask]

Browse Source
This commit is contained in:
Ianos Gnatiuc
2006-06-15 01:55:34 +00:00
parent 77444fa135
commit 39d38bfdb2
6 changed files with 43 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
golded3/gccfgg.cpp
View File

@@ -708,6 +708,7 @@ CfgGed::CfgGed() {
arealistechomax = 0;
arealisttype = AL_TOTNEW;
areareadonly = READONLY_SOFT;
arearecyclebinask = false;
areareplydirect = false;
beepfactor = 1000;
beepyourmail = true;

14
golded3/gccfgg1.cpp
View File

@@ -424,7 +424,19 @@ void CfgAreareadonly() {
void CfgArearecyclebin()
{
strupr(strxcpy(CFG->arearecyclebin, val, sizeof(Echo)));
char* key;
getkeyval(&key, &val);
strupr(strxcpy(CFG->arearecyclebin, key, sizeof(Echo)));
if (*val)
{
if (strieql(val, "NoAsk"))
CFG->arearecyclebinask = false;
else if (strieql(val, "Ask"))
CFG->arearecyclebinask = true;
else
CFG->arearecyclebinask = make_bool(GetYesno(val));
}
}
// ------------------------------------------------------------------

1
golded3/gecfgg.h
View File

@@ -252,6 +252,7 @@ public:
gstrarray areapmscanincl;
int areareadonly;
Echo arearecyclebin;
bool arearecyclebinask;
std::vector<EchoRen> arearename;
bool areareplydirect;
Echo areareplyto;

32
golded3/gecmfd.cpp
View File

@@ -145,17 +145,24 @@ void Area::DeleteMsg(GMsg* msg, int direction) {
// ------------------------------------------------------------------
void Area::DelMsgs(GMsg* msg) {
void Area::DelMsgs(GMsg* msg)
{
GFTRK("DelMsgs");
GMenuDelete MenuDelete;
if (CFG->arearecyclebin[0])
{
int areano = AL.AreaEchoToNo(CFG->arearecyclebin);
int currno = AL.AreaIdToNo(CurrArea);
if ((areano != currno) && (areano >= 0))
{
CopyMoveForward(true);
bool del = true;
if(CFG->arearecyclebinask && (NO == MenuDelete.Run(NO, msg)))
del = false;
if (del) CopyMoveForward(true);
GFTRK(0);
return;
}
@@ -197,8 +204,9 @@ void Area::DelMsgs(GMsg* msg) {
HeaderView->Paint();
BodyView->Use(AA, msg, topline);
BodyView->Paint();
GMenuDelete MenuDelete;
switch(MenuDelete.Run(YES, msg)) {
switch(MenuDelete.Run(YES, msg))
{
case YES: // Yes, delete
deletethis = true;
break;
@@ -218,8 +226,9 @@ void Area::DelMsgs(GMsg* msg) {
HeaderView->Paint();
BodyView->Use(AA, msg, topline);
BodyView->Paint();
GMenuDelete MenuDelete;
switch(MenuDelete.Run(YES, msg)) {
switch (MenuDelete.Run(YES, msg))
{
case YES: // Yes, delete
break;
case NO: // No, dont delete
@@ -241,11 +250,14 @@ void Area::DelMsgs(GMsg* msg) {
w_progress(MODE_QUIT, BLACK_|_BLACK, 0, 0, NULL);
}
}
if(n == 0) {
if (n == 0)
{
Mark.Del(msg->msgno);
PMrk.Del(msg->msgno);
GMenuDelete MenuDelete;
if(Mark.Count() or MenuDelete.Run(NO, msg)) {
if (Mark.Count() or MenuDelete.Run(NO, msg))
{
HandleGEvent(EVTT_MSGDELETING);
DeleteMsg(msg, reader_direction);
}