Update of /cvsroot/mahogany/M/src/gui
In directory usw-pr-cvs1:/tmp/cvs-serv27724/src/gui
Modified Files:
wxComposeView.cpp wxMDialogs.cpp wxOptionsDlg.cpp
Log Message:
1. added an option to [not] delete drafts automatically
2. more informational messages explaining how the drafts work and
they use M_DLG_DISABLE now
3. adde flags parameter to the 2nd overload of MDialog_Message
Index: wxComposeView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxComposeView.cpp,v
retrieving revision 1.257
retrieving revision 1.258
diff -b -u -2 -r1.257 -r1.258
--- wxComposeView.cpp 17 Mar 2002 17:25:29 -0000 1.257
+++ wxComposeView.cpp 17 Mar 2002 21:45:02 -0000 1.258
@@ -108,4 +108,5 @@
extern const MOption MP_CVIEW_FONT_DESC;
extern const MOption MP_CVIEW_FONT_SIZE;
+extern const MOption MP_DRAFTS_AUTODELETE;
extern const MOption MP_DRAFTS_FOLDER;
extern const MOption MP_EXTERNALEDITOR;
@@ -128,4 +129,5 @@
extern const MPersMsgBox *M_MSGBOX_ASK_VCARD;
extern const MPersMsgBox *M_MSGBOX_CONFIG_NET_FROM_COMPOSE;
+extern const MPersMsgBox *M_MSGBOX_DRAFT_AUTODELETE;
extern const MPersMsgBox *M_MSGBOX_DRAFT_SAVED;
extern const MPersMsgBox *M_MSGBOX_FIX_TEMPLATE;
@@ -1067,4 +1069,23 @@
{
cv->SetDraft(msg);
+
+ // the default value is "on", don't give the message if the user
+ // had already changed it to "off" - this means he knows what he is
+ // doing
+ if ( !READ_CONFIG(profile, MP_DRAFTS_AUTODELETE) )
+ {
+ MDialog_Message
+ (
+ _("You are starting to edit a draft message. When you\n"
+ "send it, the draft will be deleted. If you don't want\n"
+ "this to happen you may either do \"Send and keep\" and\n"
+ "\"Save as draft\" later or change the value of the\n"
+ "corresponding option in the \"Folders\" page of the\n"
+ "preferences dialog."),
+ cv->GetFrame(),
+ M_MSGBOX_DRAFT_AUTODELETE,
+ M_DLG_DISABLE
+ );
+ }
}
else // just another header
@@ -3392,5 +3413,6 @@
),
self->GetFrame(),
- M_MSGBOX_DRAFT_SAVED
+ M_MSGBOX_DRAFT_SAVED,
+ M_DLG_DISABLE
);
Index: wxMDialogs.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMDialogs.cpp,v
retrieving revision 1.360
retrieving revision 1.361
diff -b -u -2 -r1.360 -r1.361
--- wxMDialogs.cpp 16 Mar 2002 23:38:48 -0000 1.360
+++ wxMDialogs.cpp 17 Mar 2002 21:45:02 -0000 1.361
@@ -753,4 +753,5 @@
const wxWindow *parent,
const MPersMsgBox *persMsg,
+ int flags,
char const *title)
{
@@ -760,5 +761,5 @@
MDialog_Message(message, parent, title,
- persMsg ? configPath.c_str() : NULL);
+ persMsg ? configPath.c_str() : NULL, flags);
}
Index: wxOptionsDlg.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxOptionsDlg.cpp,v
retrieving revision 1.321
retrieving revision 1.322
diff -b -u -2 -r1.321 -r1.322
--- wxOptionsDlg.cpp 16 Mar 2002 23:38:48 -0000 1.321
+++ wxOptionsDlg.cpp 17 Mar 2002 21:45:02 -0000 1.322
@@ -306,4 +306,5 @@
ConfigField_TrashName,
ConfigField_DraftsName,
+ ConfigField_DraftsAutoDelete,
ConfigField_FoldersFileFormat,
ConfigField_StatusFormatHelp,
@@ -1187,4 +1188,5 @@
{ gettext_noop("&Trash folder name"), Field_Folder, ConfigField_UseTrash},
{ gettext_noop("&Drafts folder name"), Field_Folder, -1 },
+ { gettext_noop("Delete drafts &automatically"), Field_Bool, -1 },
{ gettext_noop("Default format for mailbox files"
":Unix mbx mailbox:Unix mailbox:MMDF (SCO Unix):Tenex (Unix MM
format)"),
@@ -1705,4 +1707,5 @@
CONFIG_ENTRY(MP_TRASH_FOLDER),
CONFIG_ENTRY(MP_DRAFTS_FOLDER),
+ CONFIG_ENTRY(MP_DRAFTS_AUTODELETE),
CONFIG_ENTRY(MP_FOLDER_FILE_DRIVER),
CONFIG_NONE(),
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
