diff options
| author | Damian Minkov <damencho@jitsi.org> | 2013-12-04 16:33:39 +0200 |
|---|---|---|
| committer | Damian Minkov <damencho@jitsi.org> | 2013-12-04 16:33:39 +0200 |
| commit | 1c173976e3c81bf32734a0cf380409b6a19a4232 (patch) | |
| tree | 41088bfb7852b8d816f84344d1bd30ea6a7006ea /src/net/java/sip/communicator/impl/osdependent | |
| parent | c83f720007e5baa8770d5912c0e281d263adfb6b (diff) | |
| download | jitsi-1c173976e3c81bf32734a0cf380409b6a19a4232.zip jitsi-1c173976e3c81bf32734a0cf380409b6a19a4232.tar.gz jitsi-1c173976e3c81bf32734a0cf380409b6a19a4232.tar.bz2 | |
Adds extended away global status.
Diffstat (limited to 'src/net/java/sip/communicator/impl/osdependent')
| -rw-r--r-- | src/net/java/sip/communicator/impl/osdependent/jdic/StatusSubMenu.java | 6 | ||||
| -rw-r--r-- | src/net/java/sip/communicator/impl/osdependent/jdic/SystrayServiceJdicImpl.java | 17 |
2 files changed, 22 insertions, 1 deletions
diff --git a/src/net/java/sip/communicator/impl/osdependent/jdic/StatusSubMenu.java b/src/net/java/sip/communicator/impl/osdependent/jdic/StatusSubMenu.java index e70a498..fd4faf1 100644 --- a/src/net/java/sip/communicator/impl/osdependent/jdic/StatusSubMenu.java +++ b/src/net/java/sip/communicator/impl/osdependent/jdic/StatusSubMenu.java @@ -408,10 +408,14 @@ public class StatusSubMenu { nameToSelect = GlobalStatusEnum.OFFLINE_STATUS; } - else if(status < PresenceStatus.AWAY_THRESHOLD) + else if(status < PresenceStatus.EXTENDED_AWAY_THRESHOLD) { nameToSelect = GlobalStatusEnum.DO_NOT_DISTURB_STATUS; } + else if(status < PresenceStatus.AWAY_THRESHOLD) + { + nameToSelect = GlobalStatusEnum.EXTENDED_AWAY_STATUS; + } else if(status < PresenceStatus.AVAILABLE_THRESHOLD) { nameToSelect = GlobalStatusEnum.AWAY_STATUS; 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 60d87fe..0e0d7b6 100644 --- a/src/net/java/sip/communicator/impl/osdependent/jdic/SystrayServiceJdicImpl.java +++ b/src/net/java/sip/communicator/impl/osdependent/jdic/SystrayServiceJdicImpl.java @@ -82,6 +82,8 @@ public class SystrayServiceJdicImpl private ImageIcon logoIconAway; + private ImageIcon logoIconExtendedAway; + private ImageIcon logoIconFFC; private ImageIcon logoIconDND; @@ -101,6 +103,8 @@ public class SystrayServiceJdicImpl private URL dockIconAway; + private URL dockIconExtendedAway; + private URL dockIconFFC; private URL dockIconDND; @@ -193,6 +197,8 @@ public class SystrayServiceJdicImpl "service.systray.TRAY_ICON_WINDOWS_OFFLINE"); logoIconAway = Resources.getImage( "service.systray.TRAY_ICON_WINDOWS_AWAY"); + logoIconExtendedAway = Resources.getImage( + "service.systray.TRAY_ICON_WINDOWS_EXTENDED_AWAY"); logoIconFFC = Resources.getImage( "service.systray.TRAY_ICON_WINDOWS_FFC"); logoIconDND = Resources.getImage( @@ -220,6 +226,8 @@ public class SystrayServiceJdicImpl logoIconOffline = Resources.getImage( "service.systray.TRAY_ICON_OFFLINE"); logoIconAway = Resources.getImage("service.systray.TRAY_ICON_AWAY"); + logoIconExtendedAway = Resources.getImage( + "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"); @@ -248,6 +256,8 @@ public class SystrayServiceJdicImpl "service.systray.DOCK_ICON_OFFLINE"); dockIconAway = Resources.getImageURL( "service.systray.DOCK_ICON_AWAY"); + dockIconExtendedAway = Resources.getImageURL( + "service.systray.DOCK_ICON_EXTENDED_AWAY"); dockIconFFC = Resources.getImageURL("service.systray.DOCK_ICON_FFC"); dockIconDND = @@ -377,6 +387,10 @@ public class SystrayServiceJdicImpl if (!isMac) systrayIconToSet = logoIconAway; break; + case SystrayService.SC_IMG_EXTENDED_AWAY_TYPE: + if (!isMac) + systrayIconToSet = logoIconExtendedAway; + break; case SystrayService.SC_IMG_FFC_TYPE: if (!isMac) systrayIconToSet = logoIconFFC; @@ -414,6 +428,9 @@ public class SystrayServiceJdicImpl case SystrayService.SC_IMG_AWAY_TYPE: dockIconURLToSet = dockIconAway; break; + case SystrayService.SC_IMG_EXTENDED_AWAY_TYPE: + dockIconURLToSet = dockIconExtendedAway; + break; case SystrayService.SC_IMG_FFC_TYPE: dockIconURLToSet = dockIconFFC; break; |