From 6460bc1e61059fa8094469c8f95238538f981432 Mon Sep 17 00:00:00 2001 From: mguessan Date: Sat, 9 Nov 2013 15:08:49 +0000 Subject: [PATCH] Add davmail.folderSizeLimit to UI and documentation git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@2191 3d1905a2-6b24-0410-a738-b14d5a86fcbd --- src/etc/davmail.properties | 4 +++- src/java/davmail/Settings.java | 1 + src/java/davmail/ui/SettingsFrame.java | 8 +++++++- src/java/davmailmessages.properties | 4 +++- src/java/davmailmessages_fr.properties | 6 ++++-- src/site/xdoc/advanced.xml | 5 +++++ src/site/xdoc/serversetup.xml | 2 ++ 7 files changed, 25 insertions(+), 5 deletions(-) diff --git a/src/etc/davmail.properties b/src/etc/davmail.properties index ff360a92..bc35d2a0 100644 --- a/src/etc/davmail.properties +++ b/src/etc/davmail.properties @@ -55,10 +55,12 @@ davmail.ssl.nosecurepop=false davmail.ssl.nosecuresmtp=false # disable update check -davmail.disableUpdateCheck=true +davmail.disableUpdateCheck=false # Send keepalive character during large folder and messages download davmail.enableKeepalive=false +# Message count limit on folder retrieval +davmail.folderSizeLimit=0 ############################################################# # Caldav settings diff --git a/src/java/davmail/Settings.java b/src/java/davmail/Settings.java index 9bdab43c..50d42b2a 100644 --- a/src/java/davmail/Settings.java +++ b/src/java/davmail/Settings.java @@ -138,6 +138,7 @@ public final class Settings { SETTINGS.put("davmail.sentKeepDelay", "90"); SETTINGS.put("davmail.caldavPastDelay", "90"); SETTINGS.put("davmail.imapIdleDelay", ""); + SETTINGS.put("davmail.folderSizeLimit", ""); SETTINGS.put("davmail.enableKeepAlive", Boolean.FALSE.toString()); SETTINGS.put("davmail.allowRemote", Boolean.FALSE.toString()); SETTINGS.put("davmail.bindAddress", ""); diff --git a/src/java/davmail/ui/SettingsFrame.java b/src/java/davmail/ui/SettingsFrame.java index b231556f..110b5bb0 100644 --- a/src/java/davmail/ui/SettingsFrame.java +++ b/src/java/davmail/ui/SettingsFrame.java @@ -104,6 +104,7 @@ public class SettingsFrame extends JFrame { protected JCheckBox popMarkReadOnRetrCheckBox; protected JComboBox enableEwsComboBox; protected JCheckBox enableKerberosCheckBox; + protected JTextField folderSizeLimitField; protected JCheckBox smtpSaveInSentCheckBox; JCheckBox osxHideFromDockCheckBox; @@ -426,9 +427,10 @@ public class SettingsFrame extends JFrame { } protected JPanel getOtherSettingsPanel() { - JPanel otherSettingsPanel = new JPanel(new GridLayout(12, 2)); + JPanel otherSettingsPanel = new JPanel(new GridLayout(13, 2)); otherSettingsPanel.setBorder(BorderFactory.createTitledBorder(BundleMessage.format("UI_OTHER"))); + folderSizeLimitField = new JTextField(Settings.getProperty("davmail.folderSizeLimit"), 6); enableKerberosCheckBox = new JCheckBox(); enableKerberosCheckBox.setSelected(Settings.getBooleanProperty("davmail.enableKerberos")); caldavEditNotificationsField = new JCheckBox(); @@ -452,6 +454,8 @@ public class SettingsFrame extends JFrame { disableUpdateCheck = new JCheckBox(); disableUpdateCheck.setSelected(Settings.getBooleanProperty("davmail.disableUpdateCheck")); + addSettingComponent(otherSettingsPanel, BundleMessage.format("UI_FOLDER_SIZE_LIMIT"), folderSizeLimitField, + BundleMessage.format("UI_FOLDER_SIZE_LIMIT_HELP")); addSettingComponent(otherSettingsPanel, BundleMessage.format("UI_ENABLE_KERBEROS"), enableKerberosCheckBox, BundleMessage.format("UI_ENABLE_KERBEROS_HELP")); addSettingComponent(otherSettingsPanel, BundleMessage.format("UI_CALDAV_EDIT_NOTIFICATIONS"), caldavEditNotificationsField, @@ -610,6 +614,7 @@ public class SettingsFrame extends JFrame { setEwsModeSelectedItem(Settings.getProperty("davmail.enableEws", "auto")); smtpSaveInSentCheckBox.setSelected(Settings.getBooleanProperty("davmail.smtpSaveInSent", true)); enableKerberosCheckBox.setSelected(Settings.getBooleanProperty("davmail.enableKerberos", false)); + folderSizeLimitField.setText(Settings.getProperty("davmail.folderSizeLimit")); keystoreTypeCombo.setSelectedItem(Settings.getProperty("davmail.ssl.keystoreType")); keystoreFileField.setText(Settings.getProperty("davmail.ssl.keystoreFile")); @@ -780,6 +785,7 @@ public class SettingsFrame extends JFrame { } Settings.setProperty("davmail.enableEws", enableEws); Settings.setProperty("davmail.enableKerberos", String.valueOf(enableKerberosCheckBox.isSelected())); + Settings.setProperty("davmail.folderSizeLimit", folderSizeLimitField.getText()); Settings.setProperty("davmail.smtpSaveInSent", String.valueOf(smtpSaveInSentCheckBox.isSelected())); Settings.setProperty("davmail.ssl.keystoreType", (String) keystoreTypeCombo.getSelectedItem()); diff --git a/src/java/davmailmessages.properties b/src/java/davmailmessages.properties index e85a13ac..c593925e 100644 --- a/src/java/davmailmessages.properties +++ b/src/java/davmailmessages.properties @@ -283,8 +283,10 @@ TENTATIVE=Tentative: DECLINED=Declined: UI_ENABLE_EWS=Exchange Protocol UI_ENABLE_EWS_HELP=Choose EWS on Exchange 2010 or Exchange 2007 with Webdav disabled -UI_ENABLE_KERBEROS=Enable Kerberos +UI_ENABLE_KERBEROS=Enable Kerberos: UI_ENABLE_KERBEROS_HELP=Enable windows single sign on (Kerberos) +UI_FOLDER_SIZE_LIMIT=Folder size limit: +UI_FOLDER_SIZE_LIMIT_HELP=Message count limit on folder retrieval UI_CALDAV_NOTIFICATION=DavMail: Caldav scheduling notification UI_BUTTON_SEND=Send UI_TO=To: diff --git a/src/java/davmailmessages_fr.properties b/src/java/davmailmessages_fr.properties index fa6cf30b..43a29e54 100644 --- a/src/java/davmailmessages_fr.properties +++ b/src/java/davmailmessages_fr.properties @@ -3,7 +3,7 @@ EXCEPTION_AUTHENTICATION_FAILED_PASSWORD_EXPIRED=Echec d''authentification : mot EXCEPTION_AUTHENTICATION_FAILED_RETRY=Echec d''authentification : identifiant ou mot de passe invalide, réessayer avec domaine\\utilisateur ou utiliser le paramètre domaine par défaut EXCEPTION_CONNECTION_FAILED=Connection OWA à {0} impossible, code retour {1}, vérifier la configuration EXCEPTION_DAVMAIL_CONFIGURATION=Erreur de configuration DavMail :\n{0} -EXCEPTION_END_OF_STREAM=Fin de flux âtteint pendant la lecture du contenu +EXCEPTION_END_OF_STREAM=Fin de flux atteint pendant la lecture du contenu EXCEPTION_ITEM_NOT_FOUND=Elément non trouvé EXCEPTION_EXCHANGE_LOGIN_FAILED=Exception lors de la connexion Exchange : {0} EXCEPTION_INVALID_CALDAV_REQUEST=Reuqête Caldav invalide : {0} @@ -284,8 +284,10 @@ TENTATIVE=Provisoire : DECLINED=Refusé : UI_ENABLE_EWS=Protocole Exchange : UI_ENABLE_EWS_HELP=Activer EWS sur Exchange 2010 ou Exchange 2007 sans support Webdav -UI_ENABLE_KERBEROS=Activer Kerberos +UI_ENABLE_KERBEROS=Activer Kerberos : UI_ENABLE_KERBEROS_HELP=Activer l''authentification Kerberos Windows +UI_FOLDER_SIZE_LIMIT=Limite taille dossier : +UI_FOLDER_SIZE_LIMIT_HELP=Nombre maximum de message chargé par dossier UI_CALDAV_NOTIFICATION=DavMail : Notification Caldav UI_BUTTON_SEND=Envoyer UI_SUBJECT=Sujet : diff --git a/src/site/xdoc/advanced.xml b/src/site/xdoc/advanced.xml index d08115f0..7df4d91e 100644 --- a/src/site/xdoc/advanced.xml +++ b/src/site/xdoc/advanced.xml @@ -47,6 +47,11 @@ Disable DavMail check for new version false + + Folder size limit + Message count limit on folder retrieval + 100 + diff --git a/src/site/xdoc/serversetup.xml b/src/site/xdoc/serversetup.xml index ff06fc64..b80e883c 100644 --- a/src/site/xdoc/serversetup.xml +++ b/src/site/xdoc/serversetup.xml @@ -89,6 +89,8 @@ davmail.disableUpdateCheck=true # Send keepalive character during large folder and messages download davmail.enableKeepalive=false +# Message count limit on folder retrieval +davmail.folderSizeLimit=0 ############################################################# # Caldav settings