sipwise
/
jitsi
mirror of https://github.com/sipwise/jitsi.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Makes OTR menu appear directly for meta contact with only one protocol contact.

Browse Source
cusax-fix
Yana Stamcheva 14 years ago
parent da25b04a56
commit afa430d837
2 changed files with 102 additions and 90 deletions
Show Stats Download Patch File Download Diff File

140
src/net/java/sip/communicator/plugin/otr/OtrContactMenu.java
Unescape View File

@ -9,12 +9,10 @@
import java.awt.event.*;
import javax.swing.*;
import javax.swing.event.*;
import net.java.otr4j.*;
import net.java.otr4j.session.*;
import net.java.sip.communicator.service.protocol.*;
import net.java.sip.communicator.util.swing.*;
/**
* A special {@link JMenu} that holds the menu items for controlling the
@ -25,9 +23,7 @@
*/
@SuppressWarnings("serial")
class OtrContactMenu
extends SIPCommMenu
implements ActionListener,
PopupMenuListener,
ScOtrEngineListener,
ScOtrKeyManagerListener
{
@ -65,32 +61,42 @@ class OtrContactMenu
private SessionStatus sessionStatus;
private final JMenu parentMenu;
private final boolean isSeparateMenu;
private JMenu separateMenu;
/**
* The OtrContactMenu constructor.
*
* @param contact the Contact this menu refers to.
* @param inMacOSXScreenMenuBar <tt>true</tt> if the new menu is to be
* displayed in the Mac OS X screen menu bar; <tt>false</tt>, otherwise
* @param menu the parent menu
*/
public OtrContactMenu(Contact contact, boolean inMacOSXScreenMenuBar)
public OtrContactMenu( Contact contact,
boolean inMacOSXScreenMenuBar,
JMenu menu,
boolean isSeparateMenu)
{
this.contact = contact;
this.inMacOSXScreenMenuBar = inMacOSXScreenMenuBar;
this.parentMenu = menu;
this.isSeparateMenu = isSeparateMenu;
this.setText(contact.getAddress());
/*
* Setup populating this JMenu on demand because it's not always
* necessary.
*/
if (!this.inMacOSXScreenMenuBar)
getPopupMenu().addPopupMenuListener(this);
if (isSeparateMenu)
{
separateMenu = new JMenu(contact.getDisplayName());
}
OtrActivator.scOtrEngine.addListener(this);
OtrActivator.scOtrKeyManager.addListener(this);
setSessionStatus(OtrActivator.scOtrEngine.getSessionStatus(contact));
setOtrPolicy(OtrActivator.scOtrEngine.getContactPolicy(contact));
buildMenu();
}
/*
@ -199,38 +205,12 @@ public void globalPolicyChanged()
.getContactPolicy(OtrContactMenu.this.contact));
}
/*
* Implements PopupMenuListener#popupMenuCanceled(PopupMenuEvent).
*/
public void popupMenuCanceled(PopupMenuEvent e)
{
}
/*
* Implements PopupMenuListener#popupMenuWillBecomeInvisible(
* PopupMenuEvent).
*/
public void popupMenuWillBecomeInvisible(PopupMenuEvent e)
{
popupMenuCanceled(e);
}
/*
* Implements PopupMenuListener#popupMenuWillBecomeVisible(PopupMenuEvent).
*/
public void popupMenuWillBecomeVisible(PopupMenuEvent e)
{
rebuildMenu();
}
/**
* Rebuilds own menuitems according to {@link OtrContactMenu#sessionStatus}
* and the {@link OtrPolicy} for {@link OtrContactMenu#contact}.
*/
private void rebuildMenu()
private void buildMenu()
{
this.removeAll();
OtrPolicy policy = OtrActivator.scOtrEngine.getContactPolicy(contact);
JMenuItem endOtr = new JMenuItem();
@ -262,18 +242,40 @@ private void rebuildMenu()
authBuddy.setActionCommand(ACTION_COMMAND_AUTHENTICATE_BUDDY);
authBuddy.addActionListener(this);
this.add(endOtr);
this.add(refreshOtr);
this.add(authBuddy);
if (isSeparateMenu)
{
separateMenu.add(endOtr);
separateMenu.add(refreshOtr);
separateMenu.add(authBuddy);
}
else
{
parentMenu.add(endOtr);
parentMenu.add(refreshOtr);
parentMenu.add(authBuddy);
}
break;
case FINISHED:
this.add(endOtr);
this.add(startOtr);
if (isSeparateMenu)
{
separateMenu.add(endOtr);
separateMenu.add(startOtr);
}
else
{
parentMenu.add(endOtr);
parentMenu.add(startOtr);
}
break;
case PLAINTEXT:
this.add(startOtr);
if (isSeparateMenu)
separateMenu.add(startOtr);
else
parentMenu.add(startOtr);
break;
}
@ -306,12 +308,26 @@ private void rebuildMenu()
cbReset.setActionCommand(ACTION_COMMAND_CB_RESET);
cbReset.addActionListener(this);
this.addSeparator();
this.add(cbEnable);
this.add(cbAlways);
this.add(cbRequire);
this.addSeparator();
this.add(cbReset);
if (isSeparateMenu)
{
separateMenu.addSeparator();
separateMenu.add(cbEnable);
separateMenu.add(cbAlways);
separateMenu.add(cbRequire);
separateMenu.addSeparator();
separateMenu.add(cbReset);
parentMenu.add(separateMenu);
}
else
{
parentMenu.addSeparator();
parentMenu.add(cbEnable);
parentMenu.add(cbAlways);
parentMenu.add(cbRequire);
parentMenu.addSeparator();
parentMenu.add(cbReset);
}
}
/*
@ -336,9 +352,13 @@ private void setSessionStatus(SessionStatus sessionStatus)
{
this.sessionStatus = sessionStatus;
updateIcon();
if (isPopupMenuVisible() || inMacOSXScreenMenuBar)
rebuildMenu();
if (separateMenu != null)
{
updateIcon();
if (separateMenu.isPopupMenuVisible() || inMacOSXScreenMenuBar)
buildMenu();
}
}
}
@ -354,8 +374,9 @@ private void setOtrPolicy(OtrPolicy otrPolicy)
{
this.otrPolicy = otrPolicy;
if (isPopupMenuVisible() || inMacOSXScreenMenuBar)
rebuildMenu();
if (separateMenu != null
&& (separateMenu.isPopupMenuVisible() || inMacOSXScreenMenuBar))
buildMenu();
}
}
@ -365,6 +386,9 @@ private void setOtrPolicy(OtrPolicy otrPolicy)
*/
private void updateIcon()
{
if (!isSeparateMenu)
return;
String imageID;
switch (sessionStatus)
@ -388,6 +412,6 @@ private void updateIcon()
return;
}
setIcon(OtrActivator.resourceService.getImage(imageID));
separateMenu.setIcon(OtrActivator.resourceService.getImage(imageID));
}
}

52
src/net/java/sip/communicator/plugin/otr/OtrMetaContactMenu.java
Unescape View File

@ -84,33 +84,24 @@ private void createOtrContactMenus(MetaContact metaContact)
JMenu menu = getMenu();
// Remove any existing OtrContactMenu items.
for (int itemIndex = 0, itemCount = menu.getItemCount();
itemIndex < itemCount;)
{
JMenuItem menuItem = menu.getItem(itemIndex);
if (menuItem instanceof OtrContactMenu)
{
menu.remove(itemIndex);
itemCount--;
((OtrContactMenu) menuItem).dispose();
}
else
itemIndex++;
}
menu.removeAll();
// Create the new OtrContactMenu items.
if (metaContact != null)
{
Iterator<Contact> contacts = metaContact.getContacts();
int itemIndex = 0;
while (contacts.hasNext())
if (metaContact.getContactCount() == 1)
{
menu.insert(new OtrContactMenu(contacts.next(),
inMacOSXScreenMenuBar), itemIndex);
itemIndex++;
new OtrContactMenu(
contacts.next(), inMacOSXScreenMenuBar, menu, false);
}
else
while (contacts.hasNext())
{
new OtrContactMenu(
contacts.next(), inMacOSXScreenMenuBar, menu, true);
}
}
}
@ -186,20 +177,17 @@ public void popupMenuWillBecomeVisible(PopupMenuEvent e)
{
createOtrContactMenus(currentContact);
if (whatsThis == null)
{
JMenu menu = getMenu();
JMenu menu = getMenu();
menu.addSeparator();
menu.addSeparator();
whatsThis = new JMenuItem();
whatsThis.setIcon(OtrActivator.resourceService
.getImage("plugin.otr.HELP_ICON_15x15"));
whatsThis.setText(OtrActivator.resourceService
.getI18NString("plugin.otr.menu.WHATS_THIS"));
whatsThis.addActionListener(this);
menu.add(whatsThis);
}
whatsThis = new JMenuItem();
whatsThis.setIcon(OtrActivator.resourceService
.getImage("plugin.otr.HELP_ICON_15x15"));
whatsThis.setText(OtrActivator.resourceService
.getI18NString("plugin.otr.menu.WHATS_THIS"));
whatsThis.addActionListener(this);
menu.add(whatsThis);
}
/*

Write Preview
Loading…
Cancel
Save