diff options
author | Yana Stamcheva <yana@jitsi.org> | 2010-11-03 17:56:48 +0000 |
---|---|---|
committer | Yana Stamcheva <yana@jitsi.org> | 2010-11-03 17:56:48 +0000 |
commit | a8910a5467b26aec69e63c93f9127907f343ce20 (patch) | |
tree | 3eb83ade14e82da310bfe4be010692e50a05c98f /src/net/java/sip/communicator/impl/resources/ResourceManagementServiceImpl.java | |
parent | b9fc07f65c85e6ca8172fa1aa123cbdffc2fc139 (diff) | |
download | jitsi-a8910a5467b26aec69e63c93f9127907f343ce20.zip jitsi-a8910a5467b26aec69e63c93f9127907f343ce20.tar.gz jitsi-a8910a5467b26aec69e63c93f9127907f343ce20.tar.bz2 |
Skin support patch provided by Adam Netocny. Adding skin support in the SIP Communicator look&feel.
Diffstat (limited to 'src/net/java/sip/communicator/impl/resources/ResourceManagementServiceImpl.java')
-rw-r--r-- | src/net/java/sip/communicator/impl/resources/ResourceManagementServiceImpl.java | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/net/java/sip/communicator/impl/resources/ResourceManagementServiceImpl.java b/src/net/java/sip/communicator/impl/resources/ResourceManagementServiceImpl.java index 4bfaceb..586b1e9 100644 --- a/src/net/java/sip/communicator/impl/resources/ResourceManagementServiceImpl.java +++ b/src/net/java/sip/communicator/impl/resources/ResourceManagementServiceImpl.java @@ -171,6 +171,7 @@ public class ResourceManagementServiceImpl skinResources = getResources(skinPack); imageResources.putAll(skinPack.getImageResources()); colorResources.putAll(skinPack.getColorResources()); + settingsResources.putAll(skinPack.getSettingsResources()); } UIService serv = getUIService(); @@ -331,9 +332,15 @@ public class ResourceManagementServiceImpl colorResources = getResources(colorPack); } + if(settingsPack != null) + { + settingsResources = getResources(settingsPack); + } + skinResources = resources; imageResources.putAll(skinPack.getImageResources()); colorResources.putAll(skinPack.getColorResources()); + settingsResources.putAll(skinPack.getSettingsResources()); UIService serv = getUIService(); if (serv != null) @@ -405,6 +412,11 @@ public class ResourceManagementServiceImpl colorResources = getResources(colorPack); } + if(settingsPack!=null) + { + settingsResources = getResources(settingsPack); + } + skinPack = (SkinPack) getDefaultResourcePack( SkinPack.class.getName(), SkinPack.RESOURCE_NAME_DEFAULT_VALUE); @@ -414,6 +426,7 @@ public class ResourceManagementServiceImpl skinResources = getResources(skinPack); imageResources.putAll(skinPack.getImageResources()); colorResources.putAll(skinPack.getColorResources()); + settingsResources.putAll(skinPack.getSettingsResources()); } UIService serv = getUIService(); |