Update of /cvsroot/mahogany/M/src/gui
In directory usw-pr-cvs1:/tmp/cvs-serv11694/src/gui
Modified Files:
wxOptionsDlg.cpp
Log Message:
don't show the help text for the Outbox if the Outbox setting itself is not shown; do
show the help text for the Trash setting
Index: wxOptionsDlg.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxOptionsDlg.cpp,v
retrieving revision 1.330
retrieving revision 1.331
diff -b -u -2 -r1.330 -r1.331
--- wxOptionsDlg.cpp 27 Apr 2002 23:00:21 -0000 1.330
+++ wxOptionsDlg.cpp 17 May 2002 19:03:49 -0000 1.331
@@ -305,4 +305,5 @@
ConfigField_UseOutbox,
ConfigField_OutboxName,
+ ConfigField_TrashHelp,
ConfigField_UseTrash,
ConfigField_TrashName,
@@ -1187,7 +1188,9 @@
{ gettext_noop("&Keep folder open for (seconds)"), Field_Number, -1},
{ gettext_noop("Keep &connection alive for (seconds)"), Field_Number, -1},
+
{ gettext_noop("\nThe outgoing messages may be sent out immediately\n"
"or just stored in an \"Outbox\" and sent later. Choose\n"
- "the sending mode here:"), Field_Message, -1 },
+ "the sending mode here:"), Field_Message |
+ Field_AppWide, -1 },
{ gettext_noop("Send outgoing messages later"), Field_Bool |
Field_Restart |
@@ -1196,4 +1199,12 @@
Field_Restart |
Field_AppWide,
ConfigField_UseOutbox },
+
+ { gettext_noop("\n"
+ "When you delete a message in the folder it can be\n"
+ "either just marked as deleted (and you will need to\n"
+ "use the \"Expunge\" command later to physically\n"
+ "delete it) or moved to another folder, customarily\n"
+ "called \"Trash\".\n"
+ "Which operation mode would you like to use?"), Field_Message, -1 },
{ gettext_noop("Use &Trash folder"), Field_Bool, -1},
{ gettext_noop("&Trash folder name"), Field_Folder, ConfigField_UseTrash},
@@ -1723,4 +1734,5 @@
CONFIG_ENTRY(MP_USE_OUTBOX),
CONFIG_ENTRY(MP_OUTBOX_NAME),
+ CONFIG_NONE(), // trash help
CONFIG_ENTRY(MP_USE_TRASH_FOLDER),
CONFIG_ENTRY(MP_TRASH_FOLDER),
_______________________________________________________________
Hundreds of nodes, one monster rendering program.
Now that�s a super model! Visit http://clustering.foundries.sf.net/
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
