Adds pressed icons for contact list buttons.

resources/images/images.properties

@@ -119,16 +119,21 @@ service.gui.buttons.MERGE_CALL_BUTTON_BG=resources/images/impl/gui/buttons/merge
 service.gui.buttons.CALL_VIDEO_BUTTON_BG=resources/images/impl/gui/buttons/videoCallButton.png
 service.gui.buttons.CALL_BUTTON_SMALL=resources/images/impl/gui/buttons/callSmall.png
 service.gui.buttons.CALL_BUTTON_SMALL_PRESSED=resources/images/impl/gui/buttons/callSmallPressed.png
+service.gui.buttons.CALL_BUTTON_SMALL_ROLLOVER=resources/images/impl/gui/buttons/callSmallRollover.png
 service.gui.buttons.CALL_VIDEO_BUTTON_SMALL=resources/images/impl/gui/buttons/callVideoSmall.png
 service.gui.buttons.CALL_VIDEO_BUTTON_SMALL_PRESSED=resources/images/impl/gui/buttons/callVideoSmallPressed.png
+service.gui.buttons.CALL_VIDEO_BUTTON_SMALL_ROLLOVER=resources/images/impl/gui/buttons/callVideoSmallRollover.png
 service.gui.buttons.DESKTOP_BUTTON_SMALL=resources/images/impl/gui/buttons/desktopSharingSmall.png
 service.gui.buttons.DESKTOP_BUTTON_SMALL_PRESSED=resources/images/impl/gui/buttons/desktopSharingSmallPressed.png
+service.gui.buttons.DESKTOP_BUTTON_SMALL_ROLLOVER=resources/images/impl/gui/buttons/desktopSharingSmallRollover.png
 service.gui.buttons.CALL_DESKTOP_BUTTON=resources/images/impl/gui/buttons/callDesktopSharing.png
 service.gui.buttons.CHAT_BUTTON_SMALL=resources/images/impl/gui/buttons/chatSmall.png
 service.gui.buttons.CHAT_BUTTON_SMALL_PRESSED=resources/images/impl/gui/buttons/chatSmallPressed.png
+service.gui.buttons.CHAT_BUTTON_SMALL_ROLLOVER=resources/images/impl/gui/buttons/chatSmallRollover.png
 service.gui.buttons.CHAT_BUTTON_SMALL_WHITE=resources/images/impl/gui/buttons/chatSmallWhite.png
 service.gui.buttons.ADD_CONTACT_BUTTON_SMALL=resources/images/impl/gui/buttons/addContactSmall.png
 service.gui.buttons.ADD_CONTACT_BUTTON_SMALL_PRESSED=resources/images/impl/gui/buttons/addContactSmallPressed.png
+service.gui.buttons.ADD_CONTACT_BUTTON_SMALL_ROLLOVER=resources/images/impl/gui/buttons/addContactSmallRollover.png
 service.gui.buttons.HANGUP_BUTTON_BG=resources/images/impl/gui/buttons/hangupButton.png
 service.gui.buttons.ADD_TO_CALL_BUTTON=resources/images/impl/gui/buttons/addToCall.png
 service.gui.buttons.CALL_SETTING_BUTTON_BG=resources/images/impl/gui/buttons/callSettingButton.png
@@ -229,26 +234,26 @@ service.gui.soundlevel.SOUND_SETTING_BUTTON_BG=resources/images/impl/gui/common/
 service.gui.soundlevel.SOUND_SETTING_BUTTON_PRESSED=resources/images/impl/gui/common/soundlevel/volumeButtonPressed.png
 
 # Smileys icons
-service.gui.smileys.SMILEY1=resources/images/impl/gui/common/smileys/default/smiley1.gif
-service.gui.smileys.SMILEY2=resources/images/impl/gui/common/smileys/default/smiley2.gif
-service.gui.smileys.SMILEY3=resources/images/impl/gui/common/smileys/default/smiley3.gif
-service.gui.smileys.SMILEY4=resources/images/impl/gui/common/smileys/default/smiley4.gif
-service.gui.smileys.SMILEY5=resources/images/impl/gui/common/smileys/default/smiley5.gif
-service.gui.smileys.SMILEY6=resources/images/impl/gui/common/smileys/default/smiley6.gif
-service.gui.smileys.SMILEY7=resources/images/impl/gui/common/smileys/default/smiley7.gif
-service.gui.smileys.SMILEY8=resources/images/impl/gui/common/smileys/default/smiley8.gif
-service.gui.smileys.SMILEY9=resources/images/impl/gui/common/smileys/default/smiley9.gif
-service.gui.smileys.SMILEY10=resources/images/impl/gui/common/smileys/default/smiley10.gif
-service.gui.smileys.SMILEY11=resources/images/impl/gui/common/smileys/default/smiley11.gif
-service.gui.smileys.SMILEY12=resources/images/impl/gui/common/smileys/default/smiley12.gif
-service.gui.smileys.SMILEY13=resources/images/impl/gui/common/smileys/default/smiley13.gif
-service.gui.smileys.SMILEY14=resources/images/impl/gui/common/smileys/default/smiley14.gif
-service.gui.smileys.SMILEY15=resources/images/impl/gui/common/smileys/default/smiley15.gif
-service.gui.smileys.SMILEY16=resources/images/impl/gui/common/smileys/default/smiley16.gif
-service.gui.smileys.SMILEY17=resources/images/impl/gui/common/smileys/default/smiley17.gif
-service.gui.smileys.SMILEY18=resources/images/impl/gui/common/smileys/default/smiley18.gif
-service.gui.smileys.SMILEY19=resources/images/impl/gui/common/smileys/default/smiley19.gif
-service.gui.smileys.SMILEY20=resources/images/impl/gui/common/smileys/default/smiley20.gif
+service.gui.smileys.SMILEY1=resources/images/impl/gui/common/smileys/simple/smiley1.png
+service.gui.smileys.SMILEY2=resources/images/impl/gui/common/smileys/simple/smiley2.png
+service.gui.smileys.SMILEY3=resources/images/impl/gui/common/smileys/simple/smiley3.png
+service.gui.smileys.SMILEY4=resources/images/impl/gui/common/smileys/simple/smiley4.png
+service.gui.smileys.SMILEY5=resources/images/impl/gui/common/smileys/simple/smiley5.png
+service.gui.smileys.SMILEY6=resources/images/impl/gui/common/smileys/simple/smiley6.png
+service.gui.smileys.SMILEY7=resources/images/impl/gui/common/smileys/simple/smiley7.png
+service.gui.smileys.SMILEY8=resources/images/impl/gui/common/smileys/simple/smiley8.png
+service.gui.smileys.SMILEY9=resources/images/impl/gui/common/smileys/simple/smiley9.png
+service.gui.smileys.SMILEY10=resources/images/impl/gui/common/smileys/simple/smiley10.png
+service.gui.smileys.SMILEY11=resources/images/impl/gui/common/smileys/simple/smiley11.png
+service.gui.smileys.SMILEY12=resources/images/impl/gui/common/smileys/simple/smiley12.png
+service.gui.smileys.SMILEY13=resources/images/impl/gui/common/smileys/simple/smiley13.png
+service.gui.smileys.SMILEY14=resources/images/impl/gui/common/smileys/simple/smiley14.png
+service.gui.smileys.SMILEY15=resources/images/impl/gui/common/smileys/simple/smiley15.png
+service.gui.smileys.SMILEY16=resources/images/impl/gui/common/smileys/simple/smiley16.png
+service.gui.smileys.SMILEY17=resources/images/impl/gui/common/smileys/simple/smiley17.png
+service.gui.smileys.SMILEY18=resources/images/impl/gui/common/smileys/simple/smiley18.png
+service.gui.smileys.SMILEY19=resources/images/impl/gui/common/smileys/simple/smiley19.png
+service.gui.smileys.SMILEY20=resources/images/impl/gui/common/smileys/simple/smiley20.png
 
 # Look and Feel images
 service.gui.lookandfeel.CLOSE_TAB_ICON=resources/images/impl/gui/buttons/closeTab.png

src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeCellRenderer.java

@@ -1460,15 +1460,15 @@ public void loadSkin()
         callButton.setIconImage(ImageLoader.getImage(
                 ImageLoader.CALL_BUTTON_SMALL));
         callButton.setRolloverImage(ImageLoader.getImage(
-                ImageLoader.CALL_BUTTON_SMALL_PRESSED));
+                ImageLoader.CALL_BUTTON_SMALL_ROLLOVER));
         callButton.setPressedImage(ImageLoader.getImage(
                 ImageLoader.CALL_BUTTON_SMALL_PRESSED));
 
         chatButton.setIconImage(ImageLoader.getImage(
                 ImageLoader.CHAT_BUTTON_SMALL));
-        chatButton.setPressedImage(ImageLoader.getImage(
-                ImageLoader.CHAT_BUTTON_SMALL_PRESSED));
         chatButton.setRolloverImage(ImageLoader.getImage(
+            ImageLoader.CHAT_BUTTON_SMALL_ROLLOVER));
+        chatButton.setPressedImage(ImageLoader.getImage(
                 ImageLoader.CHAT_BUTTON_SMALL_PRESSED));
 
         msgReceivedImage
@@ -1486,38 +1486,24 @@ public void loadSkin()
         if (contactForegroundProperty > -1)
             contactForegroundColor = new Color(contactForegroundProperty);
 
-        callVideoButton.setIconImage(ImageLoader.getImage(
-                ImageLoader.CALL_VIDEO_BUTTON_SMALL));
-        callVideoButton.setRolloverImage(ImageLoader.getImage(
-            ImageLoader.CALL_VIDEO_BUTTON_SMALL_PRESSED));
-        callVideoButton.setPressedImage(ImageLoader.getImage(
-                ImageLoader.CALL_VIDEO_BUTTON_SMALL_PRESSED));
-
-        desktopSharingButton.setIconImage(ImageLoader.getImage(
-                ImageLoader.DESKTOP_BUTTON_SMALL));
-        desktopSharingButton.setRolloverImage(ImageLoader.getImage(
-            ImageLoader.DESKTOP_BUTTON_SMALL_PRESSED));
-        desktopSharingButton.setPressedImage(ImageLoader.getImage(
-                ImageLoader.DESKTOP_BUTTON_SMALL_PRESSED));
-
         callVideoButton.setIconImage(
             ImageLoader.getImage(ImageLoader.CALL_VIDEO_BUTTON_SMALL));
         callVideoButton.setRolloverImage(
-            ImageLoader.getImage(ImageLoader.CALL_VIDEO_BUTTON_SMALL_PRESSED));
+            ImageLoader.getImage(ImageLoader.CALL_VIDEO_BUTTON_SMALL_ROLLOVER));
         callVideoButton.setPressedImage(
             ImageLoader.getImage(ImageLoader.CALL_VIDEO_BUTTON_SMALL_PRESSED));
 
         desktopSharingButton.setIconImage(
             ImageLoader.getImage(ImageLoader.DESKTOP_BUTTON_SMALL));
         desktopSharingButton.setRolloverImage(
-            ImageLoader.getImage(ImageLoader.DESKTOP_BUTTON_SMALL_PRESSED));
+            ImageLoader.getImage(ImageLoader.DESKTOP_BUTTON_SMALL_ROLLOVER));
         desktopSharingButton.setPressedImage(
             ImageLoader.getImage(ImageLoader.DESKTOP_BUTTON_SMALL_PRESSED));
 
         addContactButton.setIconImage(
             ImageLoader.getImage(ImageLoader.ADD_CONTACT_BUTTON_SMALL));
         addContactButton.setRolloverImage(
-            ImageLoader.getImage(ImageLoader.ADD_CONTACT_BUTTON_SMALL_PRESSED));
+            ImageLoader.getImage(ImageLoader.ADD_CONTACT_BUTTON_SMALL_ROLLOVER));
         addContactButton.setPressedImage(
             ImageLoader.getImage(ImageLoader.ADD_CONTACT_BUTTON_SMALL_PRESSED));
     }

src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java

@@ -213,6 +213,12 @@ public class ImageLoader
     public static final ImageID CALL_BUTTON_SMALL
         = new ImageID("service.gui.buttons.CALL_BUTTON_SMALL");
 
+    /**
+     * The call button small pressed image.
+     */
+    public static final ImageID CALL_BUTTON_SMALL_ROLLOVER
+        = new ImageID("service.gui.buttons.CALL_BUTTON_SMALL_ROLLOVER");
+
     /**
      * The call button small pressed image.
      */
@@ -225,6 +231,12 @@ public class ImageLoader
     public static final ImageID DESKTOP_BUTTON_SMALL
         = new ImageID("service.gui.buttons.DESKTOP_BUTTON_SMALL");
 
+    /**
+     * The desktop sharing button small pressed image.
+     */
+    public static final ImageID DESKTOP_BUTTON_SMALL_ROLLOVER
+        = new ImageID("service.gui.buttons.DESKTOP_BUTTON_SMALL_ROLLOVER");
+
     /**
      * The desktop sharing button small pressed image.
      */
@@ -243,6 +255,12 @@ public class ImageLoader
     public static final ImageID CALL_VIDEO_BUTTON_SMALL
         = new ImageID("service.gui.buttons.CALL_VIDEO_BUTTON_SMALL");
 
+    /**
+     * The call button small pressed image.
+     */
+    public static final ImageID CALL_VIDEO_BUTTON_SMALL_ROLLOVER
+        = new ImageID("service.gui.buttons.CALL_VIDEO_BUTTON_SMALL_ROLLOVER");
+
     /**
      * The call button small pressed image.
      */
@@ -256,6 +274,13 @@ public class ImageLoader
     public static final ImageID ADD_CONTACT_BUTTON_SMALL
         = new ImageID("service.gui.buttons.ADD_CONTACT_BUTTON_SMALL");
 
+    /**
+     * The add contact button small pressed image, shown when an external source
+     * contact is selected and add contact button is pressed.
+     */
+    public static final ImageID ADD_CONTACT_BUTTON_SMALL_ROLLOVER
+        = new ImageID("service.gui.buttons.ADD_CONTACT_BUTTON_SMALL_ROLLOVER");
+
     /**
      * The add contact button small pressed image, shown when an external source
      * contact is selected and add contact button is pressed.
@@ -323,6 +348,12 @@ public class ImageLoader
     public static final ImageID CHAT_BUTTON_SMALL_PRESSED
         = new ImageID("service.gui.buttons.CHAT_BUTTON_SMALL_PRESSED");
 
+    /**
+     * The chat button small pressed image.
+     */
+    public static final ImageID CHAT_BUTTON_SMALL_ROLLOVER
+        = new ImageID("service.gui.buttons.CHAT_BUTTON_SMALL_ROLLOVER");
+
     /**
      * The hangup button image.
      */