moparisthebest/davmail
1
0
Fork 0
mirror of https://github.com/moparisthebest/davmail synced 2024-12-14 11:42:23 -05:00
Code Issues Releases Wiki Activity

Caldav: add davmail.forceActiveSyncUpdate option to the settings frame

Browse Source 
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@919 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2010-01-20 20:58:25 +00:00
parent 35c754939a
commit 49afb4b02a
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,6 +126,7 @@ public final class Settings {
SETTINGS.put("davmail.server", Boolean.FALSE.toString()); SETTINGS.put("davmail.server", Boolean.FALSE.toString());
SETTINGS.put("davmail.server.certificate.hash", ""); SETTINGS.put("davmail.server.certificate.hash", "");
SETTINGS.put("davmail.caldavAlarmSound", ""); SETTINGS.put("davmail.caldavAlarmSound", "");
SETTINGS.put("davmail.forceActiveSyncUpdate", "Boolean.FALSE.toString()");
SETTINGS.put("davmail.ssl.keystoreType", ""); SETTINGS.put("davmail.ssl.keystoreType", "");
SETTINGS.put("davmail.ssl.keystoreFile", ""); SETTINGS.put("davmail.ssl.keystoreFile", "");
SETTINGS.put("davmail.ssl.keystorePass", ""); SETTINGS.put("davmail.ssl.keystorePass", "");

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

@ -82,6 +82,7 @@ public class SettingsFrame extends JFrame {
JTextField logFilePathField; JTextField logFilePathField;
JTextField caldavAlarmSoundField; JTextField caldavAlarmSoundField;
JCheckBox forceActiveSyncUpdateField;
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);
@ -342,13 +343,18 @@ public class SettingsFrame extends JFrame {
} }
protected JPanel getOtherSettingsPanel() { protected JPanel getOtherSettingsPanel() {
JPanel otherSettingsPanel = new JPanel(new GridLayout(1, 2)); JPanel otherSettingsPanel = new JPanel(new GridLayout(2, 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);
forceActiveSyncUpdateField = new JCheckBox();
forceActiveSyncUpdateField.setSelected(Settings.getBooleanProperty("davmail.forceActiveSyncUpdate"));
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"));
addSettingComponent(otherSettingsPanel, BundleMessage.format("UI_FORCE_ACTIVESYNC_UPDATE"), forceActiveSyncUpdateField,
BundleMessage.format("UI_FORCE_ACTIVESYNC_UPDATE_HELP"));
Dimension preferredSize = otherSettingsPanel.getPreferredSize(); Dimension preferredSize = otherSettingsPanel.getPreferredSize();
preferredSize.width = Integer.MAX_VALUE; preferredSize.width = Integer.MAX_VALUE;
updateMaximumSize(otherSettingsPanel); updateMaximumSize(otherSettingsPanel);
@ -433,6 +439,7 @@ public class SettingsFrame extends JFrame {
disableUpdateCheck.setSelected(Settings.getBooleanProperty(("davmail.disableUpdateCheck"))); disableUpdateCheck.setSelected(Settings.getBooleanProperty(("davmail.disableUpdateCheck")));
caldavAlarmSoundField.setText(Settings.getProperty("davmail.caldavAlarmSound")); caldavAlarmSoundField.setText(Settings.getProperty("davmail.caldavAlarmSound"));
forceActiveSyncUpdateField.setSelected(Settings.getBooleanProperty("davmail.forceActiveSyncUpdate"));
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"));
@ -537,7 +544,9 @@ public class SettingsFrame extends JFrame {
Settings.setProperty("davmail.allowRemote", String.valueOf(allowRemoteField.isSelected())); Settings.setProperty("davmail.allowRemote", String.valueOf(allowRemoteField.isSelected()));
Settings.setProperty("davmail.server.certificate.hash", certHashField.getText()); Settings.setProperty("davmail.server.certificate.hash", certHashField.getText());
Settings.setProperty("davmail.disableUpdateCheck", String.valueOf(disableUpdateCheck.isSelected())); Settings.setProperty("davmail.disableUpdateCheck", String.valueOf(disableUpdateCheck.isSelected()));
Settings.setProperty("davmail.caldavAlarmSound", String.valueOf(caldavAlarmSoundField.getText())); Settings.setProperty("davmail.caldavAlarmSound", String.valueOf(caldavAlarmSoundField.getText()));
Settings.setProperty("davmail.forceActiveSyncUpdate", String.valueOf(forceActiveSyncUpdateField.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());

2
src/java/davmailmessages.properties
View File

@ -242,3 +242,5 @@ UI_TAB_LOGGING=Logging
UI_OTHER=Other UI_OTHER=Other
UI_CALDAV_ALARM_SOUND=Caldav alarm sound: UI_CALDAV_ALARM_SOUND=Caldav alarm sound:
UI_CALDAV_ALARM_SOUND_HELP=Convert Caldav alarm to sound alarm supported by iCal, e.g. Basso UI_CALDAV_ALARM_SOUND_HELP=Convert Caldav alarm to sound alarm supported by iCal, e.g. Basso
UI_FORCE_ACTIVESYNC_UPDATE=Force ActiveSync update:
UI_FORCE_ACTIVESYNC_UPDATE_HELP=Force update of Caldav events for ActiveSync connected devices

4
src/java/davmailmessages_fr.properties
View File

@ -240,5 +240,7 @@ UI_CLIENT_KEY_STORE_PASSWORD=Mot de passe certificat client :
UI_CLIENT_KEY_STORE_PASSWORD_HELP=Mot de passe du certificat client, laisser vide pour fournir le mot de passe mode interactif UI_CLIENT_KEY_STORE_PASSWORD_HELP=Mot de passe du certificat client, laisser vide pour fournir le mot de passe mode interactif
UI_TAB_LOGGING=Traces UI_TAB_LOGGING=Traces
UI_OTHER=Autres UI_OTHER=Autres
UI_CALDAV_ALARM_SOUND=Son des alarmes Caldav: UI_CALDAV_ALARM_SOUND=Son des alarmes Caldav :
UI_CALDAV_ALARM_SOUND_HELP=Convertir les alarmes Caldav en alarmes sonores supportées par iCal, par exemple Basso UI_CALDAV_ALARM_SOUND_HELP=Convertir les alarmes Caldav en alarmes sonores supportées par iCal, par exemple Basso
UI_FORCE_ACTIVESYNC_UPDATE=Forcer ActiveSync :
UI_FORCE_ACTIVESYNC_UPDATE_HELP=Forcer la mise à jour des évènements Caldav pour les appareils connectés via ActiveSync