From f8ce41bb2f87a317c35fd05bb8b58009cc896892 Mon Sep 17 00:00:00 2001 From: Yana Stamcheva Date: Fri, 24 Apr 2009 09:41:14 +0000 Subject: [PATCH] Rename two configuration properties in order to avoid confusion. --- resources/config/defaults.properties | 4 ++-- .../impl/gui/customcontrols/SCScrollPane.java | 9 +++++---- .../sip/communicator/impl/gui/main/call/DialPanel.java | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/resources/config/defaults.properties b/resources/config/defaults.properties index c4995a250..12f6fd290 100644 --- a/resources/config/defaults.properties +++ b/resources/config/defaults.properties @@ -36,11 +36,11 @@ impl.gui.MAIN_WINDOW_BORDER_SIZE=0 impl.gui.CONTACT_LIST_TRANSPARENCY=200 impl.gui.IS_TRANSPARENT_WINDOW_ENABLED=false impl.gui.WINDOW_TRANSPARENCY=180 +impl.gui.IS_CONTACT_LIST_IMG_BG_ENABLED=false +impl.gui.IS_CONTACT_LIST_TEXTURE_BG_ENABLED=false impl.gui.IS_WINDOW_DECORATED=true -impl.gui.IS_WINDOW_BACKGROUND_ENABLED=false impl.gui.IS_WINDOW_COLOR_BACKGROUND_ENABLED=true impl.gui.IS_WINDOW_IMAGE_BACKGROUND_ENABLED=false -impl.gui.IS_TEXTURE_BACKGROUND=false impl.gui.GREY_HISTORY_ENABLED=false # impl.msghistory diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/SCScrollPane.java b/src/net/java/sip/communicator/impl/gui/customcontrols/SCScrollPane.java index 63edd13f6..bff81a65c 100644 --- a/src/net/java/sip/communicator/impl/gui/customcontrols/SCScrollPane.java +++ b/src/net/java/sip/communicator/impl/gui/customcontrols/SCScrollPane.java @@ -18,8 +18,8 @@ /** * The SCScrollPane is a JScrollPane with a custom viewport that allows to * set an image as a background. Depending on the - * "impl.gui.IS_TEXTURE_BACKGROUND" property we'll be setting a single image or - * a texture of images. + * "impl.gui.IS_CONTACT_LIST_TEXTURE_BG_ENABLED" property we'll be setting a + * single image or a texture of images. * * @author Yana Stamcheva */ @@ -66,12 +66,13 @@ public SCViewport() { this.setBackground(Color.WHITE); - if (getSettingsBoolean("impl.gui.IS_WINDOW_BACKGROUND_ENABLED")) + if (getSettingsBoolean("impl.gui.IS_CONTACT_LIST_IMG_BG_ENABLED")) { bgImage = ImageLoader.getImage(ImageLoader.MAIN_WINDOW_BACKGROUND); - if (getSettingsBoolean("impl.gui.IS_TEXTURE_BACKGROUND") + if (getSettingsBoolean( + "impl.gui.IS_CONTACT_LIST_TEXTURE_BG_ENABLED") && (bgImage != null)) { texture = diff --git a/src/net/java/sip/communicator/impl/gui/main/call/DialPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/DialPanel.java index d4ff3e116..fb2ff44e6 100755 --- a/src/net/java/sip/communicator/impl/gui/main/call/DialPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/call/DialPanel.java @@ -340,7 +340,7 @@ public void paintComponent(Graphics g) Graphics2D g2 = (Graphics2D) g; boolean isTextureBackground = Boolean.parseBoolean(GuiActivator.getResources() - .getSettingsString("impl.gui.IS_TEXTURE_BACKGROUND")); + .getSettingsString("impl.gui.IS_CONTACT_LIST_TEXTURE_BG_ENABLED")); BufferedImage bgImage = ImageLoader.getImage(ImageLoader.MAIN_WINDOW_BACKGROUND);