mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-12-01 12:27:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #241 from igniterealtime/revert-238-SPARK-1520

Browse Source 
Revert "SPARK-1520"
This commit is contained in:
wroot
2016-10-27 19:40:24 +03:00
committed by GitHub
parent 3b2b2c76fd 651db73626
commit 74e6a4783a
1 changed files with 11 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/java/org/jivesoftware/sparkimpl/plugin/systray/SysTrayPlugin.java
View File

@ -49,7 +49,6 @@ import org.jivesoftware.smackx.chatstates.ChatState;
import org.jivesoftware.spark.ChatManager; import org.jivesoftware.spark.ChatManager;
import org.jivesoftware.spark.NativeHandler; import org.jivesoftware.spark.NativeHandler;
import org.jivesoftware.spark.SparkManager; import org.jivesoftware.spark.SparkManager;
import org.jivesoftware.spark.Workspace;
import org.jivesoftware.spark.plugin.Plugin; import org.jivesoftware.spark.plugin.Plugin;
import org.jivesoftware.spark.ui.status.CustomStatusItem; import org.jivesoftware.spark.ui.status.CustomStatusItem;
import org.jivesoftware.spark.ui.status.StatusBar; import org.jivesoftware.spark.ui.status.StatusBar;
@ -59,7 +58,7 @@ import org.jivesoftware.sparkimpl.settings.local.LocalPreferences;
import org.jivesoftware.sparkimpl.settings.local.SettingsManager; import org.jivesoftware.sparkimpl.settings.local.SettingsManager;
import org.jivesoftware.smack.chat.ChatManagerListener; import org.jivesoftware.smack.chat.ChatManagerListener;
import org.jivesoftware.smackx.chatstates.ChatStateListener; import org.jivesoftware.smackx.chatstates.ChatStateListener;

public class SysTrayPlugin implements Plugin, NativeHandler, ChatManagerListener, ChatStateListener { public class SysTrayPlugin implements Plugin, NativeHandler, ChatManagerListener, ChatStateListener {
private JPopupMenu popupMenu = new JPopupMenu(); private JPopupMenu popupMenu = new JPopupMenu();
@ -75,7 +74,6 @@ public class SysTrayPlugin implements Plugin, NativeHandler, ChatManagerListener
private ImageIcon typingIcon; private ImageIcon typingIcon;
private TrayIcon trayIcon; private TrayIcon trayIcon;
private boolean newMessage = false; private boolean newMessage = false;
private Presence presence;
ChatMessageHandlerImpl chatMessageHandler = new ChatMessageHandlerImpl(); ChatMessageHandlerImpl chatMessageHandler = new ChatMessageHandlerImpl();
@Override @Override
@ -476,18 +474,7 @@ public class SysTrayPlugin implements Plugin, NativeHandler, ChatManagerListener
@Override @Override
public void flashWindowStopWhenFocused(Window window) { public void flashWindowStopWhenFocused(Window window) {
presence = Workspace.getInstance().getStatusBar().getPresence(); trayIcon.setImage(availableIcon.getImage());
if (presence.getMode() == Presence.Mode.available) {
trayIcon.setImage(availableIcon.getImage());
} else if (presence.getMode() == Presence.Mode.away
|| presence.getMode() == Presence.Mode.xa) {
trayIcon.setImage(awayIcon.getImage());
} else if (presence.getMode() == Presence.Mode.dnd) {
trayIcon.setImage(dndIcon.getImage());
} else {
trayIcon.setImage(availableIcon.getImage());
}
newMessage = false; newMessage = false;
chatMessageHandler.clearUnreadMessages(); chatMessageHandler.clearUnreadMessages();
} }
@ -499,17 +486,7 @@ public class SysTrayPlugin implements Plugin, NativeHandler, ChatManagerListener
@Override @Override
public void stopFlashing(Window window) { public void stopFlashing(Window window) {
presence = Workspace.getInstance().getStatusBar().getPresence(); trayIcon.setImage(availableIcon.getImage());
if (presence.getMode() == Presence.Mode.available) {
trayIcon.setImage(availableIcon.getImage());
} else if (presence.getMode() == Presence.Mode.away
|| presence.getMode() == Presence.Mode.xa) {
trayIcon.setImage(awayIcon.getImage());
} else if (presence.getMode() == Presence.Mode.dnd) {
trayIcon.setImage(dndIcon.getImage());
} else {
trayIcon.setImage(availableIcon.getImage());
}
newMessage = false; newMessage = false;
chatMessageHandler.clearUnreadMessages(); chatMessageHandler.clearUnreadMessages();
} }
@ -522,25 +499,17 @@ public class SysTrayPlugin implements Plugin, NativeHandler, ChatManagerListener
} }
@Override @Override
public void stateChanged(Chat chat, ChatState state) { public void stateChanged(Chat chat, ChatState state) {
presence = Workspace.getInstance().getStatusBar().getPresence();
if (ChatState.composing.equals(state)) { if (ChatState.composing.equals(state)) {
changeSysTrayIcon(); changeSysTrayIcon();
} else { } else {
if (!newMessage) { if (!newMessage)
if (presence.getMode() == Presence.Mode.available) { trayIcon.setImage(availableIcon.getImage());
trayIcon.setImage(availableIcon.getImage()); else {
} else if (presence.getMode() == Presence.Mode.away trayIcon.setImage(newMessageIcon.getImage());
|| presence.getMode() == Presence.Mode.xa) { }
trayIcon.setImage(awayIcon.getImage());
} else if (presence.getMode() == Presence.Mode.dnd) {
trayIcon.setImage(dndIcon.getImage());
} else {
trayIcon.setImage(newMessageIcon.getImage());
}
}
} }
} }
@Override @Override
public void chatCreated(Chat chat, boolean isLocal) { public void chatCreated(Chat chat, boolean isLocal) {