Updates chat room button icons and chat room file menu icon.

resources/images/images.properties

@@ -74,6 +74,7 @@ service.gui.icons.EXCLAMATION_MARK=resources/images/impl/gui/common/exclamationM
 service.gui.icons.OPENED_GROUP=resources/images/impl/gui/common/openedGroup.png
 service.gui.icons.CLOSED_GROUP=resources/images/impl/gui/common/closedGroup.png
 service.gui.icons.CHAT_ROOM_16x16_ICON=resources/images/impl/gui/common/chatRoom16x16.png
+service.gui.icons.CHAT_ROOM_ICON=resources/images/impl/gui/common/chatRoom.png
 service.gui.icons.CHAT_ROOM_JOINED_ICON=resources/images/impl/gui/common/chatRoomJoined.png
 service.gui.icons.CHAT_SERVER_16x16_ICON=resources/images/impl/gui/common/multiUserChatServer16x16.png
 service.gui.icons.MESSAGE_RECEIVED_ICON=resources/images/impl/gui/common/envelope.png
@@ -263,10 +264,13 @@ service.gui.buttons.CALL_INFO=resources/images/impl/gui/buttons/callInfo.png
 service.gui.buttons.ZRTP_ID_BUTTON=resources/images/impl/gui/buttons/zrtpEditId.png
 service.gui.icons.LEAVE_ICON_BUTTON=resources/images/impl/gui/buttons/leaveRoom.png
 service.gui.icons.LEAVE_ICON_ROLLOVER_BUTTON=resources/images/impl/gui/buttons/leaveRoomOver.png
-service.gui.icons.LEAVE_ICON_PRESSED_BUTTON=resources/images/impl/gui/buttons/leaveRoomOverPressed.png
+service.gui.icons.LEAVE_ICON_PRESSED_BUTTON=resources/images/impl/gui/buttons/leaveRoomPressed.png
-service.gui.icons.AUTOJOIN_ICON_BUTTON=resources/images/impl/gui/buttons/autoJoin.png
+service.gui.icons.AUTOJOIN_ON_ICON_BUTTON=resources/images/impl/gui/buttons/autoJoinOn.png
-service.gui.icons.AUTOJOIN_ICON_ROLLOVER_BUTTON=resources/images/impl/gui/buttons/autoJoinOver.png
+service.gui.icons.AUTOJOIN_ON_ICON_ROLLOVER_BUTTON=resources/images/impl/gui/buttons/autoJoinOnOver.png
-service.gui.icons.AUTOJOIN_ICON_PRESSED_BUTTON=resources/images/impl/gui/buttons/autoJoinPressed.png
+service.gui.icons.AUTOJOIN_ON_ICON_PRESSED_BUTTON=resources/images/impl/gui/buttons/autoJoinOnPressed.png
+service.gui.icons.AUTOJOIN_OFF_ICON_BUTTON=resources/images/impl/gui/buttons/autoJoinOff.png
+service.gui.icons.AUTOJOIN_OFF_ICON_ROLLOVER_BUTTON=resources/images/impl/gui/buttons/autoJoinOffOver.png
+service.gui.icons.AUTOJOIN_OFF_ICON_PRESSED_BUTTON=resources/images/impl/gui/buttons/autoJoinOffPressed.png
 
 # Sound level icons
 service.gui.soundlevel.SOUND_LEVEL_ACTIVE_LEFT=resources/images/impl/gui/common/soundlevel/soundActiveLeft.png

src/net/java/sip/communicator/impl/gui/main/menus/FileMenu.java

@@ -221,7 +221,7 @@ public void loadSkin()
                 ImageLoader.GROUPS_16x16_ICON)));
         myChatRoomsItem.setIcon(
             new ImageIcon(ImageLoader.getImage(
-                ImageLoader.CHAT_ROOM_OFFLINE_ICON)));
+                ImageLoader.CHAT_ROOM_MENU_ICON)));
 
         if(closeMenuItem != null)
         {

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

@@ -958,9 +958,15 @@ public class ImageLoader
         = new ImageID("service.gui.icons.CLOSED_GROUP");
 
     /**
-     * The image used for chat rooms.
+     * The image used for chat rooms presence status.
      */
     public static final ImageID CHAT_ROOM_OFFLINE_ICON
+        = new ImageID("service.gui.icons.CHAT_ROOM_ICON");
+    
+    /**
+     * The image used for chat rooms presence status.
+     */
+    public static final ImageID CHAT_ROOM_MENU_ICON
         = new ImageID("service.gui.icons.CHAT_ROOM_16x16_ICON");
     
     /**

src/net/java/sip/communicator/impl/muc/MUCCustomContactActionService.java

@@ -58,8 +58,8 @@ public class MUCCustomContactActionService
      */
     private String[] actionsIcons = {
         "service.gui.icons.LEAVE_ICON_BUTTON", 
-        "service.gui.icons.AUTOJOIN_ICON_BUTTON",
+        "service.gui.icons.AUTOJOIN_ON_ICON_BUTTON",
-        "service.gui.icons.AUTOJOIN_ICON_PRESSED_BUTTON"
+        "service.gui.icons.AUTOJOIN_OFF_ICON_BUTTON"
       };
     
     /**
@@ -67,8 +67,8 @@ public class MUCCustomContactActionService
      */
     private String[] actionsIconsRollover = {
         "service.gui.icons.LEAVE_ICON_ROLLOVER_BUTTON", 
-        "service.gui.icons.AUTOJOIN_ICON_ROLLOVER_BUTTON",
+        "service.gui.icons.AUTOJOIN_ON_ICON_ROLLOVER_BUTTON",
-        "service.gui.icons.AUTOJOIN_ICON_ROLLOVER_BUTTON"
+        "service.gui.icons.AUTOJOIN_OFF_ICON_ROLLOVER_BUTTON"
       };
     
     /**
@@ -76,8 +76,8 @@ public class MUCCustomContactActionService
      */
     private String[] actionsIconsPressed = {
         "service.gui.icons.LEAVE_ICON_PRESSED_BUTTON", 
-        "service.gui.icons.AUTOJOIN_ICON_PRESSED_BUTTON",
+        "service.gui.icons.AUTOJOIN_ON_ICON_PRESSED_BUTTON",
-        "service.gui.icons.AUTOJOIN_ICON_BUTTON",
+        "service.gui.icons.AUTOJOIN_OFF_ICON_PRESSED_BUTTON",
       };
     
     /**
@@ -477,10 +477,9 @@ public boolean isVisible(SourceContact actionSource)
                         return false;
                     
                     if(name.equals("autojoin"))
-                        return !room.isAutojoin();
-                    
-                    if(name.equals("autojoin_pressed"))
                         return room.isAutojoin();
+                    else if(name.equals("autojoin_pressed"))
+                        return !room.isAutojoin();
                 }
             }
             return false;