Issue #2837 collaboration icon changes

changed add/remove group icon colors
created icons for add/remove contact, alias contact and rename group


Former-commit-id: 3f7cfbbf1c60cffa0aa31f53b29521b78774042e
This commit is contained in:
Brian Clements 2014-03-05 08:59:06 -06:00
parent 7c02ab6b66
commit c0e4615967
9 changed files with 24 additions and 7 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 349 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 595 B

After

Width:  |  Height:  |  Size: 616 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 343 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 325 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 599 B

After

Width:  |  Height:  |  Size: 392 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 400 B

View file

@ -145,6 +145,7 @@ import com.raytheon.viz.ui.views.CaveFloatingView;
* removed unneeded subscription for nickname changed events
* Feb 12, 2014 2799 bclement fixed double click chat not working for roster entries
* Feb 24, 2014 2632 mpduff Add Notifier actions.
* Mar 05, 2014 2837 bclement separate rename action for groups, added more icons
*
* </pre>
*
@ -165,6 +166,8 @@ public class CollaborationGroupView extends CaveFloatingView implements
private Action aliasAction;
private Action renameAction;
private DisplayFeedAction displayFeedAction;
private Action collapseAllAction;
@ -267,7 +270,16 @@ public class CollaborationGroupView extends CaveFloatingView implements
createSessionAction = new CreateSessionAction(userSelector);
aliasAction = new Action("Alias") {
aliasAction = new Action("Alias", IconUtil.getImageDescriptor(Activator
.getDefault().getBundle(), "alias.gif")) {
@Override
public void run() {
aliasItem(getId());
};
};
renameAction = new Action("Rename Group", IconUtil.getImageDescriptor(
Activator.getDefault().getBundle(), "rename_group.gif")) {
@Override
public void run() {
aliasItem(getId());
@ -432,9 +444,8 @@ public class CollaborationGroupView extends CaveFloatingView implements
if (o instanceof RosterGroup) {
RosterGroup group = (RosterGroup) o;
manager.add(new DeleteGroupAction(group.getName()));
aliasAction.setId(group.getName());
aliasAction.setText("Rename Group");
manager.add(aliasAction);
renameAction.setId(group.getName());
manager.add(renameAction);
}
}
}
@ -478,7 +489,6 @@ public class CollaborationGroupView extends CaveFloatingView implements
.getConnection();
String name = connection.getContactsManager().getDisplayName(user);
aliasAction.setId(name);
aliasAction.setText("Alias");
manager.add(aliasAction);
}

View file

@ -26,6 +26,8 @@ import com.raytheon.uf.viz.collaboration.comm.identity.event.RosterChangeType;
import com.raytheon.uf.viz.collaboration.comm.provider.event.RosterChangeEvent;
import com.raytheon.uf.viz.collaboration.comm.provider.session.CollaborationConnection;
import com.raytheon.uf.viz.collaboration.comm.provider.user.ContactsManager;
import com.raytheon.uf.viz.collaboration.ui.Activator;
import com.raytheon.uf.viz.core.icon.IconUtil;
/**
* Action to remove entry from roster on server
@ -37,6 +39,7 @@ import com.raytheon.uf.viz.collaboration.comm.provider.user.ContactsManager;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Dec 20, 2013 2563 bclement Initial creation
* Mar 05, 2014 2837 bclement changed wording from Roster to Contacts, added image
*
* </pre>
*
@ -49,7 +52,8 @@ public class RemoveFromRosterAction extends Action {
private final RosterEntry entry;
public RemoveFromRosterAction(RosterEntry entry) {
super("Remove From Roster");
super("Remove From Contacts", IconUtil.getImageDescriptor(Activator
.getDefault().getBundle(), "remove_contact.gif"));
this.entry = entry;
}

View file

@ -29,6 +29,7 @@ import com.raytheon.uf.viz.collaboration.comm.identity.IAccountManager;
import com.raytheon.uf.viz.collaboration.comm.provider.session.CollaborationConnection;
import com.raytheon.uf.viz.collaboration.comm.provider.user.IDConverter;
import com.raytheon.uf.viz.collaboration.ui.Activator;
import com.raytheon.uf.viz.core.icon.IconUtil;
/**
* Action to send a subscription request to a user
@ -40,6 +41,7 @@ import com.raytheon.uf.viz.collaboration.ui.Activator;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Jan 24, 2014 bclement Initial creation
* Mar 05, 2014 2837 bclement added image
*
* </pre>
*
@ -56,7 +58,8 @@ public class SendSubReqAction extends Action {
* roster entry to request a subscription to
*/
public SendSubReqAction(RosterEntry entry) {
super("Send Contact Request");
super("Send Contact Request", IconUtil.getImageDescriptor(Activator
.getDefault().getBundle(), "add_contact.gif"));
this.entry = entry;
}