mirror of
https://github.com/moparisthebest/davmail
synced 2024-12-13 03:02:22 -05:00
EWS: add enableEws flag in UI settings frame
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1511 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
parent
8126642f15
commit
a18bd99b59
@ -95,6 +95,7 @@ public class SettingsFrame extends JFrame {
|
|||||||
JTextField defaultDomainField;
|
JTextField defaultDomainField;
|
||||||
JCheckBox showStartupBannerCheckBox;
|
JCheckBox showStartupBannerCheckBox;
|
||||||
JCheckBox imapAutoExpungeCheckBox;
|
JCheckBox imapAutoExpungeCheckBox;
|
||||||
|
JCheckBox enableEwsCheckBox;
|
||||||
|
|
||||||
protected void addSettingComponent(JPanel panel, String label, JComponent component) {
|
protected void addSettingComponent(JPanel panel, String label, JComponent component) {
|
||||||
addSettingComponent(panel, label, component, null);
|
addSettingComponent(panel, label, component, null);
|
||||||
@ -393,7 +394,7 @@ public class SettingsFrame extends JFrame {
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected JPanel getOtherSettingsPanel() {
|
protected JPanel getOtherSettingsPanel() {
|
||||||
JPanel otherSettingsPanel = new JPanel(new GridLayout(5, 2));
|
JPanel otherSettingsPanel = new JPanel(new GridLayout(6, 2));
|
||||||
otherSettingsPanel.setBorder(BorderFactory.createTitledBorder(BundleMessage.format("UI_OTHER")));
|
otherSettingsPanel.setBorder(BorderFactory.createTitledBorder(BundleMessage.format("UI_OTHER")));
|
||||||
|
|
||||||
caldavAlarmSoundField = new JTextField(Settings.getProperty("davmail.caldavAlarmSound"), 15);
|
caldavAlarmSoundField = new JTextField(Settings.getProperty("davmail.caldavAlarmSound"), 15);
|
||||||
@ -404,6 +405,8 @@ public class SettingsFrame extends JFrame {
|
|||||||
showStartupBannerCheckBox.setSelected(Settings.getBooleanProperty("davmail.showStartupBanner", true));
|
showStartupBannerCheckBox.setSelected(Settings.getBooleanProperty("davmail.showStartupBanner", true));
|
||||||
imapAutoExpungeCheckBox = new JCheckBox();
|
imapAutoExpungeCheckBox = new JCheckBox();
|
||||||
imapAutoExpungeCheckBox.setSelected(Settings.getBooleanProperty("davmail.imapAutoExpunge", true));
|
imapAutoExpungeCheckBox.setSelected(Settings.getBooleanProperty("davmail.imapAutoExpunge", true));
|
||||||
|
enableEwsCheckBox = new JCheckBox();
|
||||||
|
enableEwsCheckBox.setSelected(Settings.getBooleanProperty("davmail.enableEws", false));
|
||||||
|
|
||||||
addSettingComponent(otherSettingsPanel, BundleMessage.format("UI_CALDAV_ALARM_SOUND"), caldavAlarmSoundField,
|
addSettingComponent(otherSettingsPanel, BundleMessage.format("UI_CALDAV_ALARM_SOUND"), caldavAlarmSoundField,
|
||||||
BundleMessage.format("UI_CALDAV_ALARM_SOUND_HELP"));
|
BundleMessage.format("UI_CALDAV_ALARM_SOUND_HELP"));
|
||||||
@ -415,6 +418,8 @@ public class SettingsFrame extends JFrame {
|
|||||||
BundleMessage.format("UI_SHOW_STARTUP_BANNER_HELP"));
|
BundleMessage.format("UI_SHOW_STARTUP_BANNER_HELP"));
|
||||||
addSettingComponent(otherSettingsPanel, BundleMessage.format("UI_IMAP_AUTO_EXPUNGE"), imapAutoExpungeCheckBox,
|
addSettingComponent(otherSettingsPanel, BundleMessage.format("UI_IMAP_AUTO_EXPUNGE"), imapAutoExpungeCheckBox,
|
||||||
BundleMessage.format("UI_IMAP_AUTO_EXPUNGE_HELP"));
|
BundleMessage.format("UI_IMAP_AUTO_EXPUNGE_HELP"));
|
||||||
|
addSettingComponent(otherSettingsPanel, BundleMessage.format("UI_ENABLE_EWS"), enableEwsCheckBox,
|
||||||
|
BundleMessage.format("UI_ENABLE_EWS_HELP"));
|
||||||
|
|
||||||
Dimension preferredSize = otherSettingsPanel.getPreferredSize();
|
Dimension preferredSize = otherSettingsPanel.getPreferredSize();
|
||||||
preferredSize.width = Integer.MAX_VALUE;
|
preferredSize.width = Integer.MAX_VALUE;
|
||||||
@ -513,6 +518,7 @@ public class SettingsFrame extends JFrame {
|
|||||||
defaultDomainField.setText(Settings.getProperty("davmail.defaultDomain"));
|
defaultDomainField.setText(Settings.getProperty("davmail.defaultDomain"));
|
||||||
showStartupBannerCheckBox.setSelected(Settings.getBooleanProperty("davmail.showStartupBanner", true));
|
showStartupBannerCheckBox.setSelected(Settings.getBooleanProperty("davmail.showStartupBanner", true));
|
||||||
imapAutoExpungeCheckBox.setSelected(Settings.getBooleanProperty("davmail.imapAutoExpunge", true));
|
imapAutoExpungeCheckBox.setSelected(Settings.getBooleanProperty("davmail.imapAutoExpunge", true));
|
||||||
|
enableEwsCheckBox.setSelected(Settings.getBooleanProperty("davmail.enableEws", 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"));
|
||||||
@ -649,6 +655,7 @@ public class SettingsFrame extends JFrame {
|
|||||||
Settings.setProperty("davmail.defaultDomain", String.valueOf(defaultDomainField.getText()));
|
Settings.setProperty("davmail.defaultDomain", String.valueOf(defaultDomainField.getText()));
|
||||||
Settings.setProperty("davmail.showStartupBanner", String.valueOf(showStartupBannerCheckBox.isSelected()));
|
Settings.setProperty("davmail.showStartupBanner", String.valueOf(showStartupBannerCheckBox.isSelected()));
|
||||||
Settings.setProperty("davmail.imapAutoExpunge", String.valueOf(imapAutoExpungeCheckBox.isSelected()));
|
Settings.setProperty("davmail.imapAutoExpunge", String.valueOf(imapAutoExpungeCheckBox.isSelected()));
|
||||||
|
Settings.setProperty("davmail.enableEws", String.valueOf(enableEwsCheckBox.isSelected()));
|
||||||
|
|
||||||
Settings.setProperty("davmail.ssl.keystoreType", (String) keystoreTypeCombo.getSelectedItem());
|
Settings.setProperty("davmail.ssl.keystoreType", (String) keystoreTypeCombo.getSelectedItem());
|
||||||
Settings.setProperty("davmail.ssl.keystoreFile", keystoreFileField.getText());
|
Settings.setProperty("davmail.ssl.keystoreFile", keystoreFileField.getText());
|
||||||
|
@ -260,3 +260,5 @@ NEEDS-ACTION=
|
|||||||
ACCEPTED=Accepted:
|
ACCEPTED=Accepted:
|
||||||
TENTATIVE=Tentative:
|
TENTATIVE=Tentative:
|
||||||
DECLINED=Declined:
|
DECLINED=Declined:
|
||||||
|
UI_ENABLE_EWS=Enable EWS
|
||||||
|
UI_ENABLE_EWS_HELP=Enable EWS mode on Exchange 2010 or Exchange 2007 with Webdav disabled
|
||||||
|
@ -259,3 +259,5 @@ UNKNOWN_ATTRIBUTE=Attribut inconnu: {0}
|
|||||||
ACCEPTED=Accepté :
|
ACCEPTED=Accepté :
|
||||||
TENTATIVE=Provisoire :
|
TENTATIVE=Provisoire :
|
||||||
DECLINED=Refusé :
|
DECLINED=Refusé :
|
||||||
|
UI_ENABLE_EWS=Activer EWS
|
||||||
|
UI_ENABLE_EWS_HELP=Activer le mode EWS sur Exchange 2010 ou Exchange 2007 sans support Webdav
|
||||||
|
@ -96,6 +96,11 @@
|
|||||||
<td>Delete messages immediately on the server over IMAP</td>
|
<td>Delete messages immediately on the server over IMAP</td>
|
||||||
<td>true</td>
|
<td>true</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>Enable EWS</td>
|
||||||
|
<td>Enable EWS mode on Exchange 2010 or Exchange 2007 with Webdav disabled</td>
|
||||||
|
<td>false</td>
|
||||||
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Display startup banner</td>
|
<td>Display startup banner</td>
|
||||||
<td>Whether to show the initial startup notification window or not</td>
|
<td>Whether to show the initial startup notification window or not</td>
|
||||||
|
Loading…
Reference in New Issue
Block a user