Add enable Kerberos checkbox to DavMail GUI
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@2079 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
parent
94b10b3fda
commit
511dcd0574
|
@ -143,6 +143,7 @@ public final class Settings {
|
||||||
SETTINGS.put("davmail.useSystemProxies", Boolean.FALSE.toString());
|
SETTINGS.put("davmail.useSystemProxies", Boolean.FALSE.toString());
|
||||||
SETTINGS.put("davmail.enableProxy", Boolean.FALSE.toString());
|
SETTINGS.put("davmail.enableProxy", Boolean.FALSE.toString());
|
||||||
SETTINGS.put("davmail.enableEws", "auto");
|
SETTINGS.put("davmail.enableEws", "auto");
|
||||||
|
SETTINGS.put("davmail.enableKerberos", "false");
|
||||||
SETTINGS.put("davmail.proxyHost", "");
|
SETTINGS.put("davmail.proxyHost", "");
|
||||||
SETTINGS.put("davmail.proxyPort", "");
|
SETTINGS.put("davmail.proxyPort", "");
|
||||||
SETTINGS.put("davmail.proxyUser", "");
|
SETTINGS.put("davmail.proxyUser", "");
|
||||||
|
@ -270,7 +271,7 @@ public final class Settings {
|
||||||
if (!Settings.getBooleanProperty("davmail.server")) {
|
if (!Settings.getBooleanProperty("davmail.server")) {
|
||||||
ConsoleAppender consoleAppender = (ConsoleAppender) rootLogger.getAppender("ConsoleAppender");
|
ConsoleAppender consoleAppender = (ConsoleAppender) rootLogger.getAppender("ConsoleAppender");
|
||||||
if (consoleAppender != null) {
|
if (consoleAppender != null) {
|
||||||
consoleAppender.setThreshold(Level.OFF);
|
//consoleAppender.setThreshold(Level.OFF);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -102,6 +102,7 @@ public class SettingsFrame extends JFrame {
|
||||||
JCheckBox imapAutoExpungeCheckBox;
|
JCheckBox imapAutoExpungeCheckBox;
|
||||||
JCheckBox popMarkReadOnRetrCheckBox;
|
JCheckBox popMarkReadOnRetrCheckBox;
|
||||||
JComboBox enableEwsComboBox;
|
JComboBox enableEwsComboBox;
|
||||||
|
JCheckBox enableKerberosCheckBox;
|
||||||
JCheckBox smtpSaveInSentCheckBox;
|
JCheckBox smtpSaveInSentCheckBox;
|
||||||
|
|
||||||
JCheckBox osxHideFromDockCheckBox;
|
JCheckBox osxHideFromDockCheckBox;
|
||||||
|
@ -145,10 +146,12 @@ public class SettingsFrame extends JFrame {
|
||||||
}
|
}
|
||||||
|
|
||||||
protected JPanel getSettingsPanel() {
|
protected JPanel getSettingsPanel() {
|
||||||
JPanel settingsPanel = new JPanel(new GridLayout(6, 2));
|
JPanel settingsPanel = new JPanel(new GridLayout(7, 2));
|
||||||
settingsPanel.setBorder(BorderFactory.createTitledBorder(BundleMessage.format("UI_GATEWAY")));
|
settingsPanel.setBorder(BorderFactory.createTitledBorder(BundleMessage.format("UI_GATEWAY")));
|
||||||
|
|
||||||
urlField = new JTextField(Settings.getProperty("davmail.url"), 17);
|
enableEwsComboBox = new JComboBox(new String[]{WEBDAV, EWS, AUTO});
|
||||||
|
setEwsModeSelectedItem(Settings.getProperty("davmail.enableEws", "auto"));
|
||||||
|
urlField = new JTextField(Settings.getProperty("davmail.url"), 20);
|
||||||
popPortField = new JTextField(Settings.getProperty("davmail.popPort"), 4);
|
popPortField = new JTextField(Settings.getProperty("davmail.popPort"), 4);
|
||||||
popPortCheckBox = new JCheckBox();
|
popPortCheckBox = new JCheckBox();
|
||||||
popNoSSLCheckBox = new JCheckBox(BundleMessage.format("UI_NO_SSL"), Settings.getBooleanProperty("davmail.ssl.nosecurepop"));
|
popNoSSLCheckBox = new JCheckBox(BundleMessage.format("UI_NO_SSL"), Settings.getBooleanProperty("davmail.ssl.nosecurepop"));
|
||||||
|
@ -214,6 +217,8 @@ public class SettingsFrame extends JFrame {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
addSettingComponent(settingsPanel, BundleMessage.format("UI_ENABLE_EWS"), enableEwsComboBox,
|
||||||
|
BundleMessage.format("UI_ENABLE_EWS_HELP"));
|
||||||
addSettingComponent(settingsPanel, BundleMessage.format("UI_OWA_URL"), urlField, BundleMessage.format("UI_OWA_URL_HELP"));
|
addSettingComponent(settingsPanel, BundleMessage.format("UI_OWA_URL"), urlField, BundleMessage.format("UI_OWA_URL_HELP"));
|
||||||
addPortSettingComponent(settingsPanel, BundleMessage.format("UI_POP_PORT"), popPortField, popPortCheckBox,
|
addPortSettingComponent(settingsPanel, BundleMessage.format("UI_POP_PORT"), popPortField, popPortCheckBox,
|
||||||
popNoSSLCheckBox, BundleMessage.format("UI_POP_PORT_HELP"));
|
popNoSSLCheckBox, BundleMessage.format("UI_POP_PORT_HELP"));
|
||||||
|
@ -423,8 +428,8 @@ public class SettingsFrame extends JFrame {
|
||||||
JPanel otherSettingsPanel = new JPanel(new GridLayout(11, 2));
|
JPanel otherSettingsPanel = new JPanel(new GridLayout(11, 2));
|
||||||
otherSettingsPanel.setBorder(BorderFactory.createTitledBorder(BundleMessage.format("UI_OTHER")));
|
otherSettingsPanel.setBorder(BorderFactory.createTitledBorder(BundleMessage.format("UI_OTHER")));
|
||||||
|
|
||||||
enableEwsComboBox = new JComboBox(new String[]{WEBDAV, EWS, AUTO});
|
enableKerberosCheckBox = new JCheckBox();
|
||||||
setEwsModeSelectedItem(Settings.getProperty("davmail.enableEws", "auto"));
|
enableKerberosCheckBox.setSelected(Settings.getBooleanProperty("davmail.enableKerberos"));
|
||||||
caldavEditNotificationsField = new JCheckBox();
|
caldavEditNotificationsField = new JCheckBox();
|
||||||
caldavEditNotificationsField.setSelected(Settings.getBooleanProperty("davmail.caldavEditNotifications"));
|
caldavEditNotificationsField.setSelected(Settings.getBooleanProperty("davmail.caldavEditNotifications"));
|
||||||
caldavAlarmSoundField = new JTextField(Settings.getProperty("davmail.caldavAlarmSound"), 15);
|
caldavAlarmSoundField = new JTextField(Settings.getProperty("davmail.caldavAlarmSound"), 15);
|
||||||
|
@ -444,8 +449,8 @@ public class SettingsFrame extends JFrame {
|
||||||
disableUpdateCheck = new JCheckBox();
|
disableUpdateCheck = new JCheckBox();
|
||||||
disableUpdateCheck.setSelected(Settings.getBooleanProperty("davmail.disableUpdateCheck"));
|
disableUpdateCheck.setSelected(Settings.getBooleanProperty("davmail.disableUpdateCheck"));
|
||||||
|
|
||||||
addSettingComponent(otherSettingsPanel, BundleMessage.format("UI_ENABLE_EWS"), enableEwsComboBox,
|
addSettingComponent(otherSettingsPanel, BundleMessage.format("UI_ENABLE_KERBEROS"), enableKerberosCheckBox,
|
||||||
BundleMessage.format("UI_ENABLE_EWS_HELP"));
|
BundleMessage.format("UI_ENABLE_KERBEROS_HELP"));
|
||||||
addSettingComponent(otherSettingsPanel, BundleMessage.format("UI_CALDAV_EDIT_NOTIFICATIONS"), caldavEditNotificationsField,
|
addSettingComponent(otherSettingsPanel, BundleMessage.format("UI_CALDAV_EDIT_NOTIFICATIONS"), caldavEditNotificationsField,
|
||||||
BundleMessage.format("UI_CALDAV_EDIT_NOTIFICATIONS_HELP"));
|
BundleMessage.format("UI_CALDAV_EDIT_NOTIFICATIONS_HELP"));
|
||||||
addSettingComponent(otherSettingsPanel, BundleMessage.format("UI_CALDAV_ALARM_SOUND"), caldavAlarmSoundField,
|
addSettingComponent(otherSettingsPanel, BundleMessage.format("UI_CALDAV_ALARM_SOUND"), caldavAlarmSoundField,
|
||||||
|
@ -598,6 +603,7 @@ public class SettingsFrame extends JFrame {
|
||||||
popMarkReadOnRetrCheckBox.setSelected(Settings.getBooleanProperty("davmail.popMarkReadOnRetrCheckBox", false));
|
popMarkReadOnRetrCheckBox.setSelected(Settings.getBooleanProperty("davmail.popMarkReadOnRetrCheckBox", false));
|
||||||
setEwsModeSelectedItem(Settings.getProperty("davmail.enableEws", "auto"));
|
setEwsModeSelectedItem(Settings.getProperty("davmail.enableEws", "auto"));
|
||||||
smtpSaveInSentCheckBox.setSelected(Settings.getBooleanProperty("davmail.smtpSaveInSent", true));
|
smtpSaveInSentCheckBox.setSelected(Settings.getBooleanProperty("davmail.smtpSaveInSent", true));
|
||||||
|
enableKerberosCheckBox.setSelected(Settings.getBooleanProperty("davmail.enableKerberos", false));
|
||||||
|
|
||||||
keystoreTypeCombo.setSelectedItem(Settings.getProperty("davmail.ssl.keystoreType"));
|
keystoreTypeCombo.setSelectedItem(Settings.getProperty("davmail.ssl.keystoreType"));
|
||||||
keystoreFileField.setText(Settings.getProperty("davmail.ssl.keystoreFile"));
|
keystoreFileField.setText(Settings.getProperty("davmail.ssl.keystoreFile"));
|
||||||
|
@ -766,6 +772,7 @@ public class SettingsFrame extends JFrame {
|
||||||
enableEws = "auto";
|
enableEws = "auto";
|
||||||
}
|
}
|
||||||
Settings.setProperty("davmail.enableEws", enableEws);
|
Settings.setProperty("davmail.enableEws", enableEws);
|
||||||
|
Settings.setProperty("davmail.enableKerberos", String.valueOf(enableKerberosCheckBox.isSelected()));
|
||||||
Settings.setProperty("davmail.smtpSaveInSent", String.valueOf(smtpSaveInSentCheckBox.isSelected()));
|
Settings.setProperty("davmail.smtpSaveInSent", String.valueOf(smtpSaveInSentCheckBox.isSelected()));
|
||||||
|
|
||||||
Settings.setProperty("davmail.ssl.keystoreType", (String) keystoreTypeCombo.getSelectedItem());
|
Settings.setProperty("davmail.ssl.keystoreType", (String) keystoreTypeCombo.getSelectedItem());
|
||||||
|
|
|
@ -281,6 +281,8 @@ TENTATIVE=Tentative:
|
||||||
DECLINED=Declined:
|
DECLINED=Declined:
|
||||||
UI_ENABLE_EWS=Exchange Protocol
|
UI_ENABLE_EWS=Exchange Protocol
|
||||||
UI_ENABLE_EWS_HELP=Choose EWS on Exchange 2010 or Exchange 2007 with Webdav disabled
|
UI_ENABLE_EWS_HELP=Choose EWS on Exchange 2010 or Exchange 2007 with Webdav disabled
|
||||||
|
UI_ENABLE_KERBEROS=Enable Kerberos
|
||||||
|
UI_ENABLE_KERBEROS_HELP=Enable windows single sign on (Kerberos)
|
||||||
UI_CALDAV_NOTIFICATION=DavMail: Caldav scheduling notification
|
UI_CALDAV_NOTIFICATION=DavMail: Caldav scheduling notification
|
||||||
UI_BUTTON_SEND=Send
|
UI_BUTTON_SEND=Send
|
||||||
UI_TO=To:
|
UI_TO=To:
|
||||||
|
|
|
@ -281,6 +281,8 @@ TENTATIVE=Provisoire :
|
||||||
DECLINED=Refusé :
|
DECLINED=Refusé :
|
||||||
UI_ENABLE_EWS=Protocole Exchange :
|
UI_ENABLE_EWS=Protocole Exchange :
|
||||||
UI_ENABLE_EWS_HELP=Activer EWS sur Exchange 2010 ou Exchange 2007 sans support Webdav
|
UI_ENABLE_EWS_HELP=Activer EWS sur Exchange 2010 ou Exchange 2007 sans support Webdav
|
||||||
|
UI_ENABLE_KERBEROS=Activer Kerberos
|
||||||
|
UI_ENABLE_KERBEROS_HELP=Activer l''authentification Kerberos Windows
|
||||||
UI_CALDAV_NOTIFICATION=DavMail : Notification Caldav
|
UI_CALDAV_NOTIFICATION=DavMail : Notification Caldav
|
||||||
UI_BUTTON_SEND=Envoyer
|
UI_BUTTON_SEND=Envoyer
|
||||||
UI_SUBJECT=Sujet :
|
UI_SUBJECT=Sujet :
|
||||||
|
|
Loading…
Reference in New Issue