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

rename contact dialog changed to show an icon

Browse Source
cusax-fix
Yana Stamcheva 20 years ago
parent ecc7a1a2bb
commit c727ca4fda
4 changed files with 111 additions and 18 deletions
Show Stats Download Patch File Download Diff File

26
src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java
Unescape View File

@ -7,6 +7,7 @@
package net.java.sip.communicator.impl.gui.main.contactlist;
import java.awt.Font;
import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@ -14,7 +15,9 @@
import java.util.Hashtable;
import java.util.Iterator;
import javax.swing.BorderFactory;
import javax.swing.ImageIcon;
import javax.swing.JLabel;
import javax.swing.JMenu;
import javax.swing.JMenuItem;
import javax.swing.JPopupMenu;
@ -107,6 +110,17 @@ private void init() {
//Initialize the addSubcontact menu.
Iterator providers = this.mainFrame.getProtocolProviders();
if(providers.hasNext()) {
JLabel infoLabel = new JLabel(Messages.getString("selectAccount"));
infoLabel.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
infoLabel.setFont(Constants.FONT.deriveFont(Font.BOLD));
this.addSubcontactMenu.add(infoLabel);
this.addSubcontactMenu.addSeparator();
}
while (providers.hasNext()) {
ProtocolProviderService pps
= (ProtocolProviderService)providers.next();
@ -125,7 +139,17 @@ private void init() {
//Initialize moveTo menu.
Iterator groups = this.mainFrame.getAllGroups();
if(groups.hasNext()) {
JLabel infoLabel = new JLabel(Messages.getString("selectGroup"));
infoLabel.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
infoLabel.setFont(Constants.FONT.deriveFont(Font.BOLD));
this.moveToMenu.add(infoLabel);
this.moveToMenu.addSeparator();
}
while (groups.hasNext()) {
MetaContactGroup group = (MetaContactGroup)groups.next();

26
src/net/java/sip/communicator/impl/gui/main/contactlist/RenameContactDialog.java
Unescape View File

@ -7,6 +7,7 @@
package net.java.sip.communicator.impl.gui.main.contactlist;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@ -21,6 +22,7 @@
import com.ibm.media.bean.multiplayer.ImageLabel;
import net.java.sip.communicator.impl.gui.main.contactlist.addcontact.RenameContactPanel;
import net.java.sip.communicator.impl.gui.main.i18n.Messages;
import net.java.sip.communicator.impl.gui.utils.ImageLoader;
import net.java.sip.communicator.service.contactlist.MetaContact;
@ -31,11 +33,8 @@
public class RenameContactDialog extends JDialog
implements ActionListener {
private JPanel renameContactPanel = new JPanel(new BorderLayout());
private JLabel nameLabel = new JLabel(Messages.getString("newName"));
private JTextField nameField = new JTextField();
private RenameContactPanel renameContactPanel
= new RenameContactPanel();
private JButton renameButton = new JButton(Messages.getString("rename"));
@ -45,9 +44,6 @@ public class RenameContactDialog extends JDialog
private JPanel mainPanel = new JPanel(new BorderLayout());
//private JLabel iconLabel = new JLabel(new ImageIcon(
// ImageLoader.getImage(ImageLoader.RENAME_DIALOG_ICON)));
private MetaContactListService clist;
private MetaContact metaContact;
@ -55,6 +51,8 @@ public class RenameContactDialog extends JDialog
public RenameContactDialog(MetaContactListService clist,
MetaContact metaContact) {
this.setSize(new Dimension(520, 270));
this.clist = clist;
this.metaContact = metaContact;
@ -64,13 +62,8 @@ public RenameContactDialog(MetaContactListService clist,
private void init() {
this.setTitle(Messages.getString("renameContact"));
this.setSize(400, 100);
this.setModal(true);
this.renameContactPanel.add(nameLabel, BorderLayout.WEST);
this.renameContactPanel.add(nameField, BorderLayout.CENTER);
this.renameButton.setName("rename");
this.cancelButton.setName("cancel");
@ -85,9 +78,7 @@ private void init() {
this.mainPanel.add(renameContactPanel, BorderLayout.NORTH);
this.mainPanel.add(buttonsPanel, BorderLayout.SOUTH);
this.getContentPane().setLayout(new BorderLayout());
this.getContentPane().add(mainPanel, BorderLayout.CENTER);
//this.getContentPane().add(iconLabel, BorderLayout.WEST);
this.getContentPane().add(mainPanel);
}
public void actionPerformed(ActionEvent e) {
@ -96,7 +87,8 @@ public void actionPerformed(ActionEvent e) {
if (name.equals("rename")) {
if (metaContact != null) {
this.clist.renameMetaContact(metaContact, nameField.getText());
this.clist.renameMetaContact(
metaContact, renameContactPanel.getName());
}
this.dispose();
}

74
src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/RenameContactPanel.java
Unescape View File

@ -0,0 +1,74 @@
/*
* SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
*
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package net.java.sip.communicator.impl.gui.main.contactlist.addcontact;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.GridLayout;
import javax.swing.BorderFactory;
import javax.swing.ImageIcon;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JTextField;
import net.java.sip.communicator.impl.gui.main.customcontrols.SIPCommTranspTextPane;
import net.java.sip.communicator.impl.gui.main.i18n.Messages;
import net.java.sip.communicator.impl.gui.utils.Constants;
import net.java.sip.communicator.impl.gui.utils.ImageLoader;
public class RenameContactPanel extends JPanel {
private JLabel uinLabel = new JLabel(Messages.getString("newName"));
private JTextField textField = new JTextField();
private JPanel dataPanel = new JPanel(new BorderLayout(5, 5));
private SIPCommTranspTextPane infoLabel
= new SIPCommTranspTextPane(Messages.getString("renameContactWizard"));
private JLabel infoTitleLabel = new JLabel(Messages.getString("renameContact"));
private JLabel iconLabel = new JLabel(new ImageIcon(ImageLoader
.getImage(ImageLoader.RENAME_DIALOG_ICON)));
private JPanel labelsPanel = new JPanel(new GridLayout(0, 1));
private JPanel rightPanel = new JPanel(new BorderLayout());
public RenameContactPanel() {
super(new BorderLayout());
this.setPreferredSize(new Dimension(500, 200));
this.iconLabel.setBorder(BorderFactory.createEmptyBorder(5, 0, 5, 10));
this.infoLabel.setEditable(false);
this.dataPanel.add(uinLabel, BorderLayout.WEST);
this.dataPanel.add(textField, BorderLayout.CENTER);
this.infoTitleLabel.setHorizontalAlignment(JLabel.CENTER);
this.infoTitleLabel.setFont(Constants.FONT.deriveFont(Font.BOLD, 18));
this.labelsPanel.add(infoTitleLabel);
this.labelsPanel.add(infoLabel);
this.labelsPanel.add(dataPanel);
this.rightPanel.add(labelsPanel, BorderLayout.NORTH);
this.add(iconLabel, BorderLayout.WEST);
this.add(rightPanel, BorderLayout.CENTER);
}
public String getNewName(){
return textField.getText();
}
}

3
src/net/java/sip/communicator/impl/gui/main/i18n/messages.properties
Unescape View File

@ -78,12 +78,15 @@ remove=Remove
removeContact=Remove contact
rename=Rename
renameContact=Rename contact
renameContactWizard=In the field below you can specify the name you would like to use for the given contact.
request=Request
requestAuthorization=Request authorization
requestAuthorizationInfo=Can't add ? to your Contact List. ? must authorize your request to add him/her.
requestAuthReason=Enter request reason
save=Save
search=Search
selectAccount=Select account
selectGroup=Select group
selectGroupWizard=The list below contains all groups in your Contact List. Select these one, where you would like to add the new contact.
selectGroupWizardTitle=Select group(s)
selectProvidersWizard=The list below contains all registered accounts. Select these one you would like to use to communicate with the new contact.

Write Preview
Loading…
Cancel
Save