Contact tooltips containing images, protocol contacts and status icons.

3 files changed, 15 insertions, 12 deletions

diff --git a/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDetailsPanel.java b/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDetailsPanel.java
index 41b28f8..5368027 100644
--- a/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDetailsPanel.java
+++ b/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDetailsPanel.java
@@ -174,16 +174,20 @@ public class ContactInfoDetailsPanel
 

         byte[] bytes = this.contact.getImage();

 

-        ImageIcon avatarImage = null;

+        ImageIcon scaledImage = null;

         // If the user has a contact image, let's use it. If not, add the

         // default

         if (bytes != null)

-            avatarImage = new ImageIcon(bytes);

+        {

+            scaledImage = ImageUtils.getScaledRoundedImage(

+                bytes,

+                AVATAR_AREA_WIDTH,

+                AVATAR_AREA_HEIGHT

+                );

+        }

         else

-            avatarImage = Resources.getImage("contactInfoDefaultPersonIcon");

-

-        ImageIcon scaledImage = ImageUtils.scaleIconWithinBounds(

-                avatarImage,

+            scaledImage = ImageUtils.getScaledRoundedImage(

+                Resources.getImage("contactInfoDefaultPersonIcon"),

                 AVATAR_AREA_WIDTH,

                 AVATAR_AREA_HEIGHT

                 );

@@ -506,4 +510,4 @@ public class ContactInfoDetailsPanel
 

         return mainExtendedPanel;

     }

-}

+}
\ No newline at end of file
diff --git a/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoMenuItem.java b/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoMenuItem.java
index 5e3b163..68ea5c6 100644
--- a/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoMenuItem.java
+++ b/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoMenuItem.java
@@ -25,7 +25,7 @@ public class ContactInfoMenuItem
 {

     private JMenuItem menuItem

         = new JMenuItem(Resources.getString("contactInfo"),

-                        Resources.getImage("contactInfoIcon"));

+                        new ImageIcon(Resources.getImage("contactInfoIcon")));

 

     private MetaContact metaContact;

 

diff --git a/src/net/java/sip/communicator/plugin/contactinfo/Resources.java b/src/net/java/sip/communicator/plugin/contactinfo/Resources.java
index 5f72602..bfee23b 100644
--- a/src/net/java/sip/communicator/plugin/contactinfo/Resources.java
+++ b/src/net/java/sip/communicator/plugin/contactinfo/Resources.java
@@ -7,12 +7,11 @@
 

 package net.java.sip.communicator.plugin.contactinfo;

 

+import java.awt.*;

 import java.awt.image.*;

 import java.io.*;

-import java.util.*;

 

 import javax.imageio.*;

-import javax.swing.*;

 

 import net.java.sip.communicator.service.resources.*;

 import net.java.sip.communicator.util.*;

@@ -46,7 +45,7 @@ public class Resources {
      * @param imageID The identifier of the image.

      * @return The image for the given identifier.

      */

-    public static ImageIcon getImage(String imageID)

+    public static Image getImage(String imageID)

     {

         BufferedImage image = null;

 

@@ -65,7 +64,7 @@ public class Resources {
             log.error("Failed to load image:" + imageID, e);

         }

 

-        return new ImageIcon(image);

+        return image;

     }

     

     public static ResourceManagementService getResources()