diff --git a/resources/images/images.properties b/resources/images/images.properties index 482dc8505..736cb541c 100644 --- a/resources/images/images.properties +++ b/resources/images/images.properties @@ -408,10 +408,6 @@ service.systray.DOCK_ICON_EXTENDED_AWAY=resources/images/impl/systray/dock-exten service.systray.DOCK_ICON_FFC=resources/images/impl/systray/dock-chatty.png service.systray.DOCK_ICON_DND=resources/images/impl/systray/dock-dnd.png service.systray.STATUS_MENU_ICON=resources/images/impl/systray/statusIcon.png -service.systray.MESSAGE_ICON=resources/images/impl/systray/envelope.png -service.systray.MESSAGE_ICON_WINDOWS=resources/images/impl/systray/envelopeWindows.png -service.systray.MESSAGE_ICON_MACOSX=resources/images/impl/systray/envelopeMacOSX.png -service.systray.MESSAGE_ICON_MACOSX_WHITE=resources/images/impl/systray/envelopeMacOSXWhite.png service.systray.QUIT_MENU_ICON=resources/images/impl/gui/common/quit16x16.png service.systray.CONFIGURE_ICON=resources/images/impl/gui/common/configureIcon.png diff --git a/resources/images/impl/systray/envelope.png b/resources/images/impl/systray/envelope.png deleted file mode 100644 index 1d6b70adc..000000000 Binary files a/resources/images/impl/systray/envelope.png and /dev/null differ diff --git a/resources/images/impl/systray/envelopeMacOSX.png b/resources/images/impl/systray/envelopeMacOSX.png deleted file mode 100644 index a19704bea..000000000 Binary files a/resources/images/impl/systray/envelopeMacOSX.png and /dev/null differ diff --git a/resources/images/impl/systray/envelopeMacOSXWhite.png b/resources/images/impl/systray/envelopeMacOSXWhite.png deleted file mode 100644 index 2a11957f1..000000000 Binary files a/resources/images/impl/systray/envelopeMacOSXWhite.png and /dev/null differ diff --git a/resources/images/impl/systray/envelopeWindows.png b/resources/images/impl/systray/envelopeWindows.png deleted file mode 100644 index c0886c2e5..000000000 Binary files a/resources/images/impl/systray/envelopeWindows.png and /dev/null differ diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/TreeContactList.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/TreeContactList.java index a916b2b9b..119e00028 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/TreeContactList.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/TreeContactList.java @@ -565,10 +565,6 @@ public void setActiveContact(MetaContact metaContact, boolean isActive) if (isActive) { activeContacts.add(contactNode); -// SystrayService stray = GuiActivator.getSystrayService(); -// -// if (stray != null) -// stray.setSystrayIcon(SystrayService.ENVELOPE_IMG_TYPE); } else activeContacts.remove(contactNode); diff --git a/src/net/java/sip/communicator/impl/osdependent/jdic/SystrayServiceJdicImpl.java b/src/net/java/sip/communicator/impl/osdependent/jdic/SystrayServiceJdicImpl.java index f1a744d40..48d0f8c70 100644 --- a/src/net/java/sip/communicator/impl/osdependent/jdic/SystrayServiceJdicImpl.java +++ b/src/net/java/sip/communicator/impl/osdependent/jdic/SystrayServiceJdicImpl.java @@ -93,10 +93,6 @@ public class SystrayServiceJdicImpl private ImageIcon logoIconWhite; - private ImageIcon envelopeIcon; - - private ImageIcon envelopeIconWhite; - /** * The dock Icons used only in Mac version */ @@ -206,8 +202,6 @@ private void initSystray() "service.systray.TRAY_ICON_WINDOWS_FFC"); logoIconDND = Resources.getImage( "service.systray.TRAY_ICON_WINDOWS_DND"); - envelopeIcon = Resources.getImage( - "service.systray.MESSAGE_ICON_WINDOWS"); } /* * If we're running under Mac OS X, we use special black and white icons @@ -218,10 +212,6 @@ else if (isMac) logoIcon = Resources.getImage("service.systray.TRAY_ICON_MACOSX"); logoIconWhite = Resources.getImage( "service.systray.TRAY_ICON_MACOSX_WHITE"); - envelopeIcon = Resources.getImage( - "service.systray.MESSAGE_ICON_MACOSX"); - envelopeIconWhite = Resources.getImage( - "service.systray.MESSAGE_ICON_MACOSX_WHITE"); } else { @@ -233,7 +223,6 @@ else if (isMac) "service.systray.TRAY_ICON_EXTENDED_AWAY"); logoIconFFC = Resources.getImage("service.systray.TRAY_ICON_FFC"); logoIconDND = Resources.getImage("service.systray.TRAY_ICON_DND"); - envelopeIcon = Resources.getImage("service.systray.MESSAGE_ICON"); } /* @@ -296,11 +285,7 @@ public void actionPerformed(ActionEvent e) { public void popupMenuWillBecomeVisible(PopupMenuEvent e) { - ImageIcon newIcon - = (currentIcon == envelopeIcon) - ? envelopeIconWhite - : logoIconWhite; - + ImageIcon newIcon = logoIconWhite; trayIcon.setIcon(newIcon); currentIcon = newIcon; } @@ -308,11 +293,7 @@ public void popupMenuWillBecomeVisible(PopupMenuEvent e) public void popupMenuWillBecomeInvisible( PopupMenuEvent e) { - ImageIcon newIcon - = (currentIcon == envelopeIconWhite) - ? envelopeIcon - : logoIcon; - + ImageIcon newIcon = logoIcon; getTrayIcon().setIcon(newIcon); currentIcon = newIcon; } @@ -402,12 +383,6 @@ public void setSystrayIcon(int imageType) if (!isMac) systrayIconToSet = logoIconDND; break; - case SystrayService.ENVELOPE_IMG_TYPE: - systrayIconToSet - = (isMac && TrayMenuFactory.isVisible(menu)) - ? envelopeIconWhite - : envelopeIcon; - break; } if (systrayIconToSet != null) diff --git a/src/net/java/sip/communicator/service/systray/SystrayService.java b/src/net/java/sip/communicator/service/systray/SystrayService.java index 751abc6af..4cabe2dc4 100644 --- a/src/net/java/sip/communicator/service/systray/SystrayService.java +++ b/src/net/java/sip/communicator/service/systray/SystrayService.java @@ -77,11 +77,6 @@ public interface SystrayService */ public static final int SC_IMG_EXTENDED_AWAY_TYPE = 6; - /** - * Image type corresponding to the envelope icon - */ - public static final int ENVELOPE_IMG_TYPE = 1; - /** * Shows the given PopupMessage *