moparisthebest
/
davmail
mirror of https://github.com/moparisthebest/davmail
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
mguessan 2013-11-09 15:08:49 +00:00
parent f47a1b0709
commit 6460bc1e61
7 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/etc/davmail.properties
View File

@ -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

1
src/java/davmail/Settings.java
View File

@ -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", "");

8
src/java/davmail/ui/SettingsFrame.java
View File

@ -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());

4
src/java/davmailmessages.properties
View File

@ -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:

6
src/java/davmailmessages_fr.properties
View File

@ -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 :

5
src/site/xdoc/advanced.xml
View File

@ -47,6 +47,11 @@
<td>Disable DavMail check for new version</td>
<td>false</td>
</tr>
<tr>
<td>Folder size limit</td>
<td>Message count limit on folder retrieval</td>
<td>100</td>
</tr>
</table>
</subsection>
<subsection name="Network">

2
src/site/xdoc/serversetup.xml
View File

@ -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