aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Bauersachs <ingo@jitsi.org>2017-02-27 08:10:41 +0100
committerIngo Bauersachs <ingo@jitsi.org>2017-02-27 08:10:41 +0100
commit8aacaf46e1553269e8f19076a33072b148ceb051 (patch)
treefa64d4578b6041ccceae1fedb0c31b4b2f1d3990
parentf6f8783930083e164893721066f4d7299caf8d7e (diff)
downloadjitsi-8aacaf46e1553269e8f19076a33072b148ceb051.zip
jitsi-8aacaf46e1553269e8f19076a33072b148ceb051.tar.gz
jitsi-8aacaf46e1553269e8f19076a33072b148ceb051.tar.bz2
Add UI option to disable Outlook Calendar presence integration
Closes #289
-rw-r--r--resources/languages/resources.properties1
-rw-r--r--src/net/java/sip/communicator/plugin/addrbook/AdvancedConfigForm.java19
2 files changed, 16 insertions, 4 deletions
diff --git a/resources/languages/resources.properties b/resources/languages/resources.properties
index 4897b99..bc39d06 100644
--- a/resources/languages/resources.properties
+++ b/resources/languages/resources.properties
@@ -860,6 +860,7 @@ impl.protocol.jabber.INVALID_ADDRESS=''{0}'' is not a valid XMPP JID.
plugin.addrbook.ADDRESS_BOOKS=Address book
plugin.addrbook.ENABLE_MACOSX_ADDRESSBOOK=Enable MacOSX Address Book search
plugin.addrbook.ENABLE_MICROSOFT_OUTLOOK=Enable Microsoft Outlook search
+plugin.addrbook.ENABLE_OUTLOOK_CALENDAR=Disable setting presence using the Microsoft Outlook Calendar
plugin.addrbook.DESCRIPTION=If enabled everything you type in the search field \
of the contact list will be also searched in your system address book and all \
matching contacts from your address book will appear in your contact list.
diff --git a/src/net/java/sip/communicator/plugin/addrbook/AdvancedConfigForm.java b/src/net/java/sip/communicator/plugin/addrbook/AdvancedConfigForm.java
index 402f549..85ccd76 100644
--- a/src/net/java/sip/communicator/plugin/addrbook/AdvancedConfigForm.java
+++ b/src/net/java/sip/communicator/plugin/addrbook/AdvancedConfigForm.java
@@ -25,6 +25,7 @@ import javax.swing.*;
import net.java.sip.communicator.plugin.addrbook.macosx.*;
import net.java.sip.communicator.plugin.addrbook.msoutlook.*;
import net.java.sip.communicator.plugin.desktoputil.*;
+import net.java.sip.communicator.service.calendar.CalendarService;
import org.jitsi.util.*;
@@ -67,13 +68,16 @@ public class AdvancedConfigForm
if (OSUtils.IS_MAC)
propertiesPanel.add(createEnableCheckBox(
AddrBookActivator.PNAME_ENABLE_MACOSX_ADDRESS_BOOK_SEARCH,
- "plugin.addrbook.ENABLE_MACOSX_ADDRESSBOOK"));
+ "plugin.addrbook.ENABLE_MACOSX_ADDRESSBOOK", true));
if (OSUtils.IS_WINDOWS)
{
propertiesPanel.add(createEnableCheckBox(
AddrBookActivator.PNAME_ENABLE_MICROSOFT_OUTLOOK_SEARCH,
- "plugin.addrbook.ENABLE_MICROSOFT_OUTLOOK"));
+ "plugin.addrbook.ENABLE_MICROSOFT_OUTLOOK", true));
+ propertiesPanel.add(createEnableCheckBox(
+ CalendarService.PNAME_FREE_BUSY_STATUS_DISABLED,
+ "plugin.addrbook.ENABLE_OUTLOOK_CALENDAR", false));
if(AddrBookActivator.getConfigService().getBoolean(
AddrBookActivator.PNAME_ENABLE_DEFAULT_IM_APPLICATION_CHANGE,
true))
@@ -95,13 +99,14 @@ public class AdvancedConfigForm
* @return the created enable check box
*/
private Component createEnableCheckBox(final String configPropName,
- String labelNameKey)
+ String labelNameKey,
+ boolean defaultValue)
{
final JCheckBox checkBox = new SIPCommCheckBox(AddrBookActivator
.getResources().getI18NString(
labelNameKey),
AddrBookActivator.getConfigService().getBoolean(configPropName,
- true));
+ defaultValue));
checkBox.setAlignmentX(Component.LEFT_ALIGNMENT);
checkBox.addActionListener(new ActionListener()
@@ -113,9 +118,15 @@ public class AdvancedConfigForm
new Boolean(checkBox.isSelected()).toString());
if (checkBox.isSelected())
+ {
AddrBookActivator.startService();
+ AddrBookActivator.startCalendarService();
+ }
else
+ {
AddrBookActivator.stopService();
+ AddrBookActivator.stopCalendarService();
+ }
}
});
return checkBox;