Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv5975/src/gui
Modified Files:
wxOptionsDlg.cpp
Log Message:
moved 'max size of the msg to download without asking' option to msg view page (bug
814)
Index: wxOptionsDlg.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxOptionsDlg.cpp,v
retrieving revision 1.389
retrieving revision 1.390
diff -b -u -2 -r1.389 -r1.390
--- wxOptionsDlg.cpp 30 Sep 2003 13:46:20 -0000 1.389
+++ wxOptionsDlg.cpp 4 Oct 2003 00:39:22 -0000 1.390
@@ -293,10 +293,4 @@
ConfigField_FolderProgressThreshold,
ConfigField_ShowBusyInfo,
- ConfigField_FolderMaxHelpText,
-#if 0
- ConfigField_FolderMaxHeadersNumHard,
- ConfigField_FolderMaxHeadersNum,
-#endif
- ConfigField_FolderMaxMsgSize,
ConfigField_CloseDelay_HelpText,
ConfigField_FolderCloseDelay,
@@ -364,4 +358,6 @@
ConfigField_MessageViewProgressThresholdSize,
ConfigField_MessageViewProgressThresholdTime,
+ ConfigField_MessageViewMaxHelp,
+ ConfigField_MessageViewMaxMsgSize,
ConfigField_MessageViewInlineGraphicsHelp,
ConfigField_MessageViewInlineGraphics,
@@ -1254,22 +1250,6 @@
{ gettext_noop("&Threshold for displaying progress dialog"), Field_Number, -1},
{ gettext_noop("Show bus&y dialog while sorting/threading"), Field_Bool, -1},
- { gettext_noop("The following setting allows to limit the amount of data\n"
- "retrieved from remote server: if the message size\n"
- "is greater than the value specified here, you\n"
- "will be asked for confirmation before transfering data."),
- Field_Message, -1 },
-#if 0
- { gettext_noop("The following settings allow to limit the amount of data\n"
- "retrieved from remote server: if the message size or\n"
- "number is greater than the value specified here, you\n"
- "will be asked for confirmation before transfering data.\n"
- "Additionally, if you set the hard limit, only that many\n"
- "messages will be downloaded without asking."),
- Field_Message, -1 },
- { gettext_noop("&Hard message limit"), Field_Number, -1 },
- { gettext_noop("Ask if &number of messages >"), Field_Number, -1 },
-#endif
- { gettext_noop("Ask if size of &message (in Kb) >"), Field_Number, -1 },
- { gettext_noop("Mahogany may keep the folder open after closing it\n"
+ { gettext_noop("\n"
+ "Mahogany may keep the folder open after closing it\n"
"for some time to make reopening the same folder faster.\n"
"It also can close the folder but keep the connection to\n"
@@ -1377,4 +1357,11 @@
{ gettext_noop("Dialog minimal size t&hreshold (kb)"), Field_Number,
-1 },
{ gettext_noop("Progress dialog &delay (seconds)"), Field_Number,
-1 },
+ { gettext_noop("The following setting allows to limit the amount of data\n"
+ "retrieved from remote server: if the message size\n"
+ "is greater than the value specified here, you\n"
+ "will be asked for confirmation before transfering data"
+ "(set to 0 to disable)"),
+ Field_Message, -1 },
+ { gettext_noop("Ask if size of &message (in Kb) >"), Field_Number, -1 },
{ gettext_noop("Some of the Mahogany text viewers may show the images\n"
"included with the message inline, i.e. directly in the\n"
@@ -1872,10 +1859,4 @@
CONFIG_ENTRY(MP_FOLDERPROGRESS_THRESHOLD),
CONFIG_ENTRY(MP_SHOWBUSY_DURING_SORT),
- CONFIG_NONE(),
-#if 0
- CONFIG_ENTRY(MP_MAX_HEADERS_NUM_HARD),
- CONFIG_ENTRY(MP_MAX_HEADERS_NUM),
-#endif
- CONFIG_ENTRY(MP_MAX_MESSAGE_SIZE),
CONFIG_NONE(), // keep alive help
CONFIG_ENTRY(MP_FOLDER_CLOSE_DELAY),
@@ -1937,4 +1918,6 @@
CONFIG_ENTRY(MP_MESSAGEPROGRESS_THRESHOLD_SIZE),
CONFIG_ENTRY(MP_MESSAGEPROGRESS_THRESHOLD_TIME),
+ CONFIG_NONE(), // max msg size help
+ CONFIG_ENTRY(MP_MAX_MESSAGE_SIZE),
CONFIG_NONE(), // inline images help
CONFIG_ENTRY(MP_INLINE_GFX),
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
