diff options
| author | hristoterezov <hristo@jitsi.org> | 2013-11-28 19:16:58 +0200 |
|---|---|---|
| committer | hristoterezov <hristo@jitsi.org> | 2013-11-28 19:16:58 +0200 |
| commit | b3e888d582caa84d0ddf4425c73415a23e0f9cf3 (patch) | |
| tree | 17244c40eee4f93c82e9a7470c135b68529c74e7 /src/net/java/sip | |
| parent | 82666676ee6d4368be792eb14b0caf2a2663eed3 (diff) | |
| download | jitsi-b3e888d582caa84d0ddf4425c73415a23e0f9cf3.zip jitsi-b3e888d582caa84d0ddf4425c73415a23e0f9cf3.tar.gz jitsi-b3e888d582caa84d0ddf4425c73415a23e0f9cf3.tar.bz2 | |
Updates chat room button icons and chat room file menu icon.
Diffstat (limited to 'src/net/java/sip')
3 files changed, 16 insertions, 11 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/FileMenu.java b/src/net/java/sip/communicator/impl/gui/main/menus/FileMenu.java index 74e4136..1003183 100644 --- a/src/net/java/sip/communicator/impl/gui/main/menus/FileMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/menus/FileMenu.java @@ -221,7 +221,7 @@ public class FileMenu ImageLoader.GROUPS_16x16_ICON))); myChatRoomsItem.setIcon( new ImageIcon(ImageLoader.getImage( - ImageLoader.CHAT_ROOM_OFFLINE_ICON))); + ImageLoader.CHAT_ROOM_MENU_ICON))); if(closeMenuItem != null) { diff --git a/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java b/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java index 51af8c6..256ba91 100644 --- a/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java +++ b/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"); /** diff --git a/src/net/java/sip/communicator/impl/muc/MUCCustomContactActionService.java b/src/net/java/sip/communicator/impl/muc/MUCCustomContactActionService.java index 6b560fb..34e6e70 100644 --- a/src/net/java/sip/communicator/impl/muc/MUCCustomContactActionService.java +++ b/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_ICON_PRESSED_BUTTON"
+ "service.gui.icons.AUTOJOIN_ON_ICON_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_ICON_ROLLOVER_BUTTON"
+ "service.gui.icons.AUTOJOIN_ON_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_ICON_BUTTON",
+ "service.gui.icons.AUTOJOIN_ON_ICON_PRESSED_BUTTON",
+ "service.gui.icons.AUTOJOIN_OFF_ICON_PRESSED_BUTTON",
};
/**
@@ -477,10 +477,9 @@ public class MUCCustomContactActionService 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;
|