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

Update for avatars.

Browse Source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@9080 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Derek DeMoro
2007-09-07 21:45:02 +00:00
committed by derek
parent 386ec6b6e3
commit 7c316dd69a
2 changed files with 9 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/java/org/jivesoftware/spark/ui/ContactItem.java
View File

@ -23,6 +23,7 @@ import org.jivesoftware.spark.PresenceManager;
import org.jivesoftware.spark.SparkManager;
import org.jivesoftware.spark.util.GraphicUtils;
import org.jivesoftware.spark.util.ModelUtil;
import org.jivesoftware.spark.util.log.Log;
import org.jivesoftware.sparkimpl.settings.local.LocalPreferences;
import org.jivesoftware.sparkimpl.settings.local.SettingsManager;
@ -254,7 +255,7 @@ public class ContactItem extends JPanel {
updateAvatar();
}
updateContactItem();
updateAvatarInSideIcon();
}
}
@ -463,7 +464,10 @@ public class ContactItem extends JPanel {
getNicknameLabel().setForeground(Color.red);
}
private void updateContactItem() {
/**
* Update avatar icon.
*/
public void updateAvatarInSideIcon() {
LocalPreferences preferences = SettingsManager.getLocalPreferences();
boolean avatarsShowing = preferences.areAvatarsVisible();
@ -475,13 +479,13 @@ public class ContactItem extends JPanel {
}
else {
ImageIcon icon = new ImageIcon(url);
icon = GraphicUtils.scale(icon, 16, 19);
icon = GraphicUtils.scale(icon, 16, 16);
setSideIcon(icon);
}
}
}
catch (MalformedURLException e) {
e.printStackTrace();
Log.error(e);
}
}

27
src/java/org/jivesoftware/sparkimpl/plugin/chat/ContactListAssistantPlugin.java
View File

@ -20,7 +20,6 @@ import org.jivesoftware.spark.plugin.Plugin;
import org.jivesoftware.spark.ui.ContactGroup;
import org.jivesoftware.spark.ui.ContactItem;
import org.jivesoftware.spark.ui.ContactList;
import org.jivesoftware.spark.util.GraphicUtils;
import org.jivesoftware.spark.util.SwingWorker;
import org.jivesoftware.spark.util.log.Log;
import org.jivesoftware.sparkimpl.settings.local.LocalPreferences;
@ -29,7 +28,6 @@ import org.jivesoftware.sparkimpl.settings.local.SettingsManager;
import javax.swing.AbstractAction;
import javax.swing.Action;
import javax.swing.ImageIcon;
import javax.swing.JMenu;
import javax.swing.JMenuItem;
import javax.swing.JPopupMenu;
@ -38,8 +36,6 @@ import javax.swing.event.PopupMenuListener;
import java.awt.event.ActionEvent;
import java.awt.event.MouseEvent;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
@ -187,31 +183,10 @@ public class ContactListAssistantPlugin implements Plugin {
}
private void updateContactItem(ContactItem contactItem) {
LocalPreferences preferences = SettingsManager.getLocalPreferences();
avatarsShowing = preferences.areAvatarsVisible();
try {
final URL url = contactItem.getAvatarURL();
if (url != null) {
if (!avatarsShowing) {
contactItem.setSideIcon(null);
}
else {
ImageIcon icon = new ImageIcon(url);
icon = GraphicUtils.scale(icon, 16, 19);
contactItem.setSideIcon(icon);
}
}
}
catch (MalformedURLException e) {
e.printStackTrace();
}
contactItem.updateAvatarInSideIcon();
}
private void updateAvatarsInContactList() {
LocalPreferences preferences = SettingsManager.getLocalPreferences();
avatarsShowing = preferences.areAvatarsVisible();
final ContactList contactList = SparkManager.getContactList();
for (ContactGroup contactGroup : contactList.getContactGroups()) {
if (contactGroup.isOfflineGroup()) {