diff options
| author | Yana Stamcheva <yana@jitsi.org> | 2010-09-29 19:21:56 +0000 |
|---|---|---|
| committer | Yana Stamcheva <yana@jitsi.org> | 2010-09-29 19:21:56 +0000 |
| commit | a509c8291d10f29a0e705ba6bb7fa1a33b73cc57 (patch) | |
| tree | c761d7806447763bfdaa5165c8784c5dd6d71fbf /src/net/java/sip/communicator/impl | |
| parent | 73eb6b22b00fa15e97f2b71516df26251d0311c6 (diff) | |
| download | jitsi-a509c8291d10f29a0e705ba6bb7fa1a33b73cc57.zip jitsi-a509c8291d10f29a0e705ba6bb7fa1a33b73cc57.tar.gz jitsi-a509c8291d10f29a0e705ba6bb7fa1a33b73cc57.tar.bz2 | |
Hide the new account menu if the SHOW_ACCOUNT_CONFIG is set to false.
Diffstat (limited to 'src/net/java/sip/communicator/impl')
5 files changed, 14 insertions, 6 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/ExtendedMainToolBar.java b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/ExtendedMainToolBar.java index ecdd6a6..bea80a3 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/ExtendedMainToolBar.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/ExtendedMainToolBar.java @@ -116,7 +116,8 @@ public class ExtendedMainToolBar Boolean showOptionsProp = GuiActivator.getConfigurationService() - .getBoolean(ConfigurationFrame.SHOW_OPTIONS_WINDOW, true); + .getBoolean(ConfigurationFrame.SHOW_OPTIONS_WINDOW_PROPERTY, + true); if (showOptionsProp.booleanValue()) { diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java index c9d1647..1558905 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java @@ -136,7 +136,8 @@ public class MainToolBar // specifies so or if it's not set. Boolean showOptionsProp = GuiActivator.getConfigurationService() - .getBoolean(ConfigurationFrame.SHOW_OPTIONS_WINDOW, true); + .getBoolean(ConfigurationFrame.SHOW_OPTIONS_WINDOW_PROPERTY, + true); if (showOptionsProp.booleanValue()) { diff --git a/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigurationFrame.java b/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigurationFrame.java index 2926041..b75402b 100644 --- a/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigurationFrame.java +++ b/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigurationFrame.java @@ -46,14 +46,14 @@ public class ConfigurationFrame /** * Indicates if the account config form should be shown. */ - private static final String SHOW_ACCOUNT_CONFIG_PROPERTY + public static final String SHOW_ACCOUNT_CONFIG_PROPERTY = "net.java.sip.communicator.impl.gui.main." + "configforms.SHOW_ACCOUNT_CONFIG"; /** * Indicates if the configuration window should be shown. */ - public static final String SHOW_OPTIONS_WINDOW + public static final String SHOW_OPTIONS_WINDOW_PROPERTY = "net.java.sip.communicator.impl.gui.main." + "configforms.SHOW_OPTIONS_WINDOW"; diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/FileMenu.java b/src/net/java/sip/communicator/impl/gui/main/menus/FileMenu.java index 8e7db0e..9ab3489 100644 --- a/src/net/java/sip/communicator/impl/gui/main/menus/FileMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/menus/FileMenu.java @@ -15,6 +15,7 @@ import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.impl.gui.main.account.*; import net.java.sip.communicator.impl.gui.main.chatroomslist.*; +import net.java.sip.communicator.impl.gui.main.configforms.*; import net.java.sip.communicator.impl.gui.main.contactlist.*; import net.java.sip.communicator.impl.gui.main.contactlist.addgroup.*; import net.java.sip.communicator.impl.gui.utils.*; @@ -92,7 +93,11 @@ public class FileMenu this.parentWindow = parentWindow; - this.add(newAccountMenuItem); + Boolean showAccountConfig = GuiActivator.getConfigurationService() + .getBoolean(ConfigurationFrame.SHOW_ACCOUNT_CONFIG_PROPERTY, true); + + if (showAccountConfig.booleanValue()) + this.add(newAccountMenuItem); this.addSeparator(); diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/ToolsMenu.java b/src/net/java/sip/communicator/impl/gui/main/menus/ToolsMenu.java index 955833a..675c314 100644 --- a/src/net/java/sip/communicator/impl/gui/main/menus/ToolsMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/menus/ToolsMenu.java @@ -218,7 +218,8 @@ public class ToolsMenu // specifies so or if it's not set. Boolean showOptionsProp = GuiActivator.getConfigurationService() - .getBoolean(ConfigurationFrame.SHOW_OPTIONS_WINDOW, true); + .getBoolean(ConfigurationFrame.SHOW_OPTIONS_WINDOW_PROPERTY, + true); if (showOptionsProp.booleanValue()) { |