Updates icons for In a meeting status and adds In a meeting icon for the contact list.

resources/images/images.properties

@@ -130,6 +130,7 @@ service.gui.statusicons.USER_EXTENDED_AWAY_ICON=resources/images/impl/gui/common
 service.gui.statusicons.USER_DND_ICON=resources/images/impl/gui/common/statusicons/dnd.png
 service.gui.statusicons.USER_FFC_ICON=resources/images/impl/gui/common/statusicons/freeForChat.png
 service.gui.statusicons.USER_ON_THE_PHONE_ICON=resources/images/impl/gui/common/statusicons/onThePhone.png
+service.gui.statusicons.USER_IN_MEETING_ICON=resources/images/impl/gui/common/statusicons/inMeeting.png
 
 # service gui buttons
 service.gui.buttons.ACCOUNT_EDIT_ICON=resources/images/impl/gui/buttons/accountEditIcon.png

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

@@ -10,6 +10,7 @@
 import java.awt.event.*;
 import java.awt.image.*;
 import java.io.*;
+import java.util.regex.*;
 
 import javax.swing.*;
 import javax.swing.text.html.*;
@@ -58,7 +59,7 @@ public class Constants
     public static Color CALL_HISTORY_EVEN_ROW_COLOR
         = new Color(GuiActivator.getResources().
             getColor("service.gui.CALL_HISTORY_EVEN_ROW_COLOR"));
-    
+
     /**
      * Background color for chat room contact rows.
      */
@@ -239,17 +240,21 @@ else if(connectivity < PresenceStatus.EXTENDED_AWAY_THRESHOLD)
                 return ImageLoader
                     .getImage(ImageLoader.USER_DND_ICON);
             }
-            else if(connectivity == PresenceStatus.EXTENDED_AWAY_THRESHOLD)
+            else if(connectivity  < PresenceStatus.AWAY_THRESHOLD)
             {
-                // the special status On The Phone is state
-                // between DND and EXTENDED AWAY states.
-                return ImageLoader
-                    .getImage(ImageLoader.USER_USER_ON_THE_PHONE_ICON);
-            }
-            else if(connectivity < PresenceStatus.AWAY_THRESHOLD)
-            {
-                return ImageLoader
-                    .getImage(ImageLoader.USER_EXTENDED_AWAY_ICON);
+                String statusName = "";
+                if(status.getStatusName() != null)
+                    statusName = Pattern.compile("\\p{Space}").matcher(
+                            status.getStatusName()).replaceAll("");
+                if(statusName.equalsIgnoreCase("OnThePhone"))
+                    return ImageLoader
+                        .getImage(ImageLoader.USER_USER_ON_THE_PHONE_ICON);
+                else if(statusName.equalsIgnoreCase("InAMeeting"))
+                    return ImageLoader
+                        .getImage(ImageLoader.USER_USER_IN_A_MEETING_ICON);
+                else
+                    return ImageLoader
+                        .getImage(ImageLoader.USER_EXTENDED_AWAY_ICON);
             }
             else if(connectivity < PresenceStatus.AVAILABLE_THRESHOLD)
             {
@@ -262,13 +267,13 @@ else if(connectivity
                 return ImageLoader
                     .getImage(ImageLoader.USER_ONLINE_ICON);
             }
-            else if(connectivity < 
+            else if(connectivity <
                 ChatRoomPresenceStatus.CHAT_ROOM_ONLINE_THRESHOLD)
             {
                 return ImageLoader
                     .getImage(ImageLoader.USER_FFC_ICON);
             }
-            else if(connectivity < 
+            else if(connectivity <
                 ChatRoomPresenceStatus.CHAT_ROOM_OFFLINE_THRESHOLD)
             {
                 return ImageLoader

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

@@ -388,7 +388,7 @@ public class ImageLoader
      */
     public static final ImageID CHAT_CALL
         = new ImageID("service.gui.buttons.CHAT_CALL");
-    
+
     /**
      * The chat room call button image.
      */
@@ -400,7 +400,7 @@ public class ImageLoader
      */
     public static final ImageID CHAT_VIDEO_CALL
         = new ImageID("service.gui.buttons.CHAT_VIDEO_CALL");
-    
+
     /**
      * The chat room video call button image.
      */
@@ -982,7 +982,7 @@ public class ImageLoader
      */
     public static final ImageID CHAT_ROOM_OFFLINE_ICON
         = new ImageID("service.gui.icons.CHAT_ROOM_ICON");
-    
+
     /**
      * The image used for chat rooms presence status.
      */
@@ -1381,6 +1381,13 @@ public class ImageLoader
     public static final ImageID USER_USER_ON_THE_PHONE_ICON
         = new ImageID("service.gui.statusicons.USER_ON_THE_PHONE_ICON");
 
+    /**
+     * Contact "In a meeting" icon.
+     */
+    public static final ImageID USER_USER_IN_A_MEETING_ICON
+        = new ImageID("service.gui.statusicons.USER_IN_MEETING_ICON");
+
+
     /**
      * Chat button "online" icon.
      */