From 1b9c7f7126c0487628827f3a9997d60cc87f8c9c Mon Sep 17 00:00:00 2001 From: mguessan Date: Thu, 6 Nov 2008 00:03:19 +0000 Subject: [PATCH] Added an option to let user disable update check git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@170 3d1905a2-6b24-0410-a738-b14d5a86fcbd --- src/java/davmail/ui/SettingsFrame.java | 21 +++++++++++++++------ src/site/xdoc/gettingstarted.xml | 5 +++++ src/site/xdoc/serversetup.xml | 3 ++- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/src/java/davmail/ui/SettingsFrame.java b/src/java/davmail/ui/SettingsFrame.java index 8922e65e..015790a8 100644 --- a/src/java/davmail/ui/SettingsFrame.java +++ b/src/java/davmail/ui/SettingsFrame.java @@ -6,7 +6,6 @@ import davmail.tray.DavGatewayTray; import org.apache.log4j.Level; import javax.swing.*; -import javax.swing.border.Border; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -31,6 +30,7 @@ public class SettingsFrame extends JFrame { JCheckBox allowRemoteField; JTextField bindAddressField; JTextField certHashField; + JCheckBox disableUpdateCheck; JComboBox rootLoggingLevelField; JComboBox davmailLoggingLevelField; @@ -102,7 +102,7 @@ public class SettingsFrame extends JFrame { } public JPanel getNetworkSettingsPanel() { - JPanel networkSettingsPanel = new JPanel(new GridLayout(3, 2)); + JPanel networkSettingsPanel = new JPanel(new GridLayout(4, 2)); networkSettingsPanel.setBorder(BorderFactory.createTitledBorder("Network")); allowRemoteField = new JCheckBox(); @@ -115,9 +115,14 @@ public class SettingsFrame extends JFrame { certHashField = new JTextField(Settings.getProperty("davmail.server.certificate.hash"), 15); certHashField.setToolTipText("Manually accepted server certificate hash"); + disableUpdateCheck = new JCheckBox(); + disableUpdateCheck.setSelected(Settings.getBooleanProperty("davmail.disableUpdateCheck")); + disableUpdateCheck.setToolTipText("Disable DavMail check for new version"); + addSettingComponent(networkSettingsPanel, "Bind address: ", bindAddressField); addSettingComponent(networkSettingsPanel, "Allow Remote Connections: ", allowRemoteField); addSettingComponent(networkSettingsPanel, "Server certificate hash: ", certHashField); + addSettingComponent(networkSettingsPanel, "Disable update check: ", disableUpdateCheck); return networkSettingsPanel; } @@ -144,8 +149,6 @@ public class SettingsFrame extends JFrame { popPortField.setText(Settings.getProperty("davmail.popPort")); smtpPortField.setText(Settings.getProperty("davmail.smtpPort")); keepDelayField.setText(Settings.getProperty("davmail.keepDelay")); - allowRemoteField.setSelected(Settings.getBooleanProperty(("davmail.allowRemote"))); - bindAddressField.setText(Settings.getProperty("davmail.bindAddress")); boolean enableProxy = Settings.getBooleanProperty("davmail.enableProxy"); enableProxyField.setSelected(enableProxy); httpProxyField.setEnabled(enableProxy); @@ -156,7 +159,11 @@ public class SettingsFrame extends JFrame { httpProxyPortField.setText(Settings.getProperty("davmail.proxyPort")); httpProxyUserField.setText(Settings.getProperty("davmail.proxyUser")); httpProxyPasswordField.setText(Settings.getProperty("davmail.proxyPassword")); + + bindAddressField.setText(Settings.getProperty("davmail.bindAddress")); + allowRemoteField.setSelected(Settings.getBooleanProperty(("davmail.allowRemote"))); certHashField.setText(Settings.getProperty("davmail.server.certificate.hash")); + disableUpdateCheck.setSelected(Settings.getBooleanProperty(("davmail.disableUpdateCheck"))); rootLoggingLevelField.setSelectedItem(Settings.getLoggingLevel("rootLogger")); davmailLoggingLevelField.setSelectedItem(Settings.getLoggingLevel("davmail")); @@ -199,14 +206,16 @@ public class SettingsFrame extends JFrame { Settings.setProperty("davmail.popPort", popPortField.getText()); Settings.setProperty("davmail.smtpPort", smtpPortField.getText()); Settings.setProperty("davmail.keepDelay", keepDelayField.getText()); - Settings.setProperty("davmail.allowRemote", String.valueOf(allowRemoteField.isSelected())); - Settings.setProperty("davmail.bindAddress", bindAddressField.getText()); Settings.setProperty("davmail.enableProxy", String.valueOf(enableProxyField.isSelected())); Settings.setProperty("davmail.proxyHost", httpProxyField.getText()); Settings.setProperty("davmail.proxyPort", httpProxyPortField.getText()); Settings.setProperty("davmail.proxyUser", httpProxyUserField.getText()); Settings.setProperty("davmail.proxyPassword", httpProxyPasswordField.getText()); + + Settings.setProperty("davmail.bindAddress", bindAddressField.getText()); + Settings.setProperty("davmail.allowRemote", String.valueOf(allowRemoteField.isSelected())); Settings.setProperty("davmail.server.certificate.hash", certHashField.getText()); + Settings.setProperty("davmail.disableUpdateCheck", String.valueOf(disableUpdateCheck.isSelected())); Settings.setLoggingLevel("rootLogger", (Level) rootLoggingLevelField.getSelectedItem()); Settings.setLoggingLevel("davmail", (Level) davmailLoggingLevelField.getSelectedItem()); diff --git a/src/site/xdoc/gettingstarted.xml b/src/site/xdoc/gettingstarted.xml index 016bc2b4..279832a6 100644 --- a/src/site/xdoc/gettingstarted.xml +++ b/src/site/xdoc/gettingstarted.xml @@ -61,6 +61,11 @@ a manually accepted certificate (invalid or self signed) 9F:CC:59:82:1F:C:CD:29:7C:70:F0:D8:37:B1:77:3F:48:84:AE:C4 + + Disable update check + Disable DavMail check for new version + false + Logging levels Default, DavMail and HttpClient logging levels, see Log4J documentation for more details diff --git a/src/site/xdoc/serversetup.xml b/src/site/xdoc/serversetup.xml index 207406f2..44952bdf 100644 --- a/src/site/xdoc/serversetup.xml +++ b/src/site/xdoc/serversetup.xml @@ -32,7 +32,6 @@ davmail.url=http://exchangeServer/exchange/ davmail.popPort=1110 davmail.smtpPort=1025 davmail.keepDelay=30 -davmail.allowRemote=true davmail.enableProxy=false davmail.proxyHost= davmail.proxyPort= @@ -40,7 +39,9 @@ davmail.proxyUser= davmail.proxyPassword= davmail.server=true davmail.bindAddress= +davmail.allowRemote=true davmail.server.certificate.hash= +davmail.disableUpdateCheck=false log4j.rootLogger=WARN log4j.logger.davmail=DEBUG log4j.logger.org.apache.commons.httpclient=WARN