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

Patch provided by Adam Netocny making all contact list classes skinnable.

Browse Source
cusax-fix
Yana Stamcheva 16 years ago
parent 8f7582b178
commit a4ddb0361e
14 changed files with 342 additions and 95 deletions
Show Stats Download Patch File Download Diff File

32
src/net/java/sip/communicator/impl/gui/UIServiceImpl.java
Unescape View File

@ -1291,6 +1291,9 @@ public void repaintUI()
*/
private void reloadComponents(Window window)
{
if (window instanceof Skinnable)
((Skinnable) window).loadSkin();
reloadComponents((java.awt.Container) window);
}
@ -1308,7 +1311,34 @@ private void reloadComponents(java.awt.Container container)
if (c instanceof Skinnable)
((Skinnable) c).loadSkin();
if (c instanceof java.awt.Container)
if (c instanceof JComponent)
{
JPopupMenu jpm = ((JComponent) c).getComponentPopupMenu();
if(jpm != null && jpm.isVisible()
&& jpm.getInvoker() == (JComponent)c)
{
if (jpm instanceof Skinnable)
((Skinnable) jpm).loadSkin();
if (jpm instanceof java.awt.Container)
reloadComponents((java.awt.Container) jpm);
}
}
if (c instanceof JMenu)
{
Component[] children = null;
children = ((JMenu)c).getMenuComponents();
for(int ii = 0; ii < children.length; ii++)
{
if (children[ii] instanceof Skinnable)
((Skinnable) children[ii]).loadSkin();
if (children[ii] instanceof java.awt.Container)
reloadComponents((java.awt.Container) children[ii]);
}
}
else if (c instanceof java.awt.Container)
reloadComponents((java.awt.Container) c);
}
}

28
src/net/java/sip/communicator/impl/gui/main/contactlist/CommonRightButtonMenu.java
Unescape View File

@ -14,6 +14,7 @@
import net.java.sip.communicator.impl.gui.main.*;
import net.java.sip.communicator.impl.gui.main.contactlist.addgroup.*;
import net.java.sip.communicator.impl.gui.utils.*;
import net.java.sip.communicator.util.skin.*;
/**
* The GroupRightButtonMenu is the menu, opened when user clicks with the
@ -21,18 +22,19 @@
* user could add a contact to a group.
*
* @author Yana Stamcheva
* @author Adam Netocny
*/
public class CommonRightButtonMenu extends JPopupMenu
implements ActionListener
public class CommonRightButtonMenu
extends JPopupMenu
implements ActionListener,
Skinnable
{
private final JMenuItem addContactItem = new JMenuItem(
GuiActivator.getResources()
.getI18NString("service.gui.ADD_CONTACT") + "...",
new ImageIcon(ImageLoader.getImage(ImageLoader.ADD_CONTACT_16x16_ICON)));
.getI18NString("service.gui.ADD_CONTACT") + "...");
private final JMenuItem createGroupItem = new JMenuItem(
GuiActivator.getResources().getI18NString("service.gui.CREATE_GROUP"),
new ImageIcon(ImageLoader.getImage(ImageLoader.GROUPS_16x16_ICON)));
GuiActivator.getResources().getI18NString("service.gui.CREATE_GROUP"));
private MainFrame mainFrame;
@ -55,6 +57,8 @@ public CommonRightButtonMenu(MainFrame mainFrame)
this.addContactItem.addActionListener(this);
this.createGroupItem.addActionListener(this);
loadSkin();
}
/**
@ -81,4 +85,16 @@ else if(item.equals(addContactItem))
dialog.setVisible(true);
}
}
/**
* Reloads icons.
*/
public void loadSkin()
{
addContactItem.setIcon(new ImageIcon(
ImageLoader.getImage(ImageLoader.ADD_CONTACT_16x16_ICON)));
createGroupItem.setIcon(new ImageIcon(
ImageLoader.getImage(ImageLoader.GROUPS_16x16_ICON)));
}
}

33
src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListCellRenderer.java
Unescape View File

@ -16,6 +16,7 @@
import net.java.sip.communicator.service.contactlist.*;
import net.java.sip.communicator.service.protocol.*;
import net.java.sip.communicator.util.*;
import net.java.sip.communicator.util.skin.*;
import net.java.sip.communicator.util.swing.*;
/**
@ -26,11 +27,13 @@
*
* @author Yana Stamcheva
* @author Lubomir Marinov
* @author Adam Netocny
*/
public class ContactListCellRenderer
extends JPanel
implements ListCellRenderer,
Icon
Icon,
Skinnable
{
/**
* The avatar icon height.
@ -52,13 +55,13 @@ public class ContactListCellRenderer
/**
* The icon indicating an open group.
*/
private final ImageIcon openedGroupIcon =
private ImageIcon openedGroupIcon =
new ImageIcon(ImageLoader.getImage(ImageLoader.DOWN_ARROW_ICON));
/**
* The icon indicating a closed group.
*/
private final ImageIcon closedGroupIcon =
private ImageIcon closedGroupIcon =
new ImageIcon(ImageLoader.getImage(ImageLoader.RIGHT_ARROW_ICON));
/**
@ -470,4 +473,28 @@ public void paintIcon(Component c, Graphics g, int x, int y)
g.dispose();
}
}
/**
* Reloads skin information for this render class.
*/
public void loadSkin()
{
openedGroupIcon
= new ImageIcon(ImageLoader.getImage(ImageLoader.DOWN_ARROW_ICON));
closedGroupIcon
= new ImageIcon(ImageLoader.getImage(ImageLoader.RIGHT_ARROW_ICON));
int groupForegroundProperty = GuiActivator.getResources()
.getColor("service.gui.CONTACT_LIST_GROUP_FOREGROUND");
if (groupForegroundProperty > -1)
groupForegroundColor = new Color (groupForegroundProperty);
int contactForegroundProperty = GuiActivator.getResources()
.getColor("service.gui.CONTACT_LIST_CONTACT_FOREGROUND");
if (contactForegroundProperty > -1)
contactForegroundColor = new Color(contactForegroundProperty);
}
}

18
src/net/java/sip/communicator/impl/gui/main/contactlist/DefaultContactList.java
Unescape View File

@ -18,15 +18,18 @@
import net.java.sip.communicator.impl.gui.utils.*;
import net.java.sip.communicator.service.contactlist.*;
import net.java.sip.communicator.service.protocol.*;
import net.java.sip.communicator.util.skin.*;
/**
* DeafultContactlist used to display <code>JList</code>s with contacts.
*
* @author Damian Minkov
* @author Yana Stamcheva
* @author Adam Netocny
*/
public class DefaultContactList
extends JList
implements Skinnable
{
private static final long serialVersionUID = 0L;
@ -35,6 +38,11 @@ public class DefaultContactList
*/
private MouseEvent cachedMouseEvent;
/**
* List cell renderer.
*/
ContactListCellRenderer renderer = new ContactListCellRenderer();
/**
* Creates an instance of <tt>DefaultContactList</tt>.
*/
@ -47,7 +55,7 @@ public DefaultContactList()
this.setDragEnabled(true);
// this.setTransferHandler(new ContactListTransferHandler(this));
this.setCellRenderer(new ContactListCellRenderer());
this.setCellRenderer(renderer);
}
/**
@ -345,4 +353,12 @@ protected void processMouseEvent(MouseEvent event)
cachedMouseEvent= event;
super.processMouseEvent(event);
}
/**
* Reloads skin information stored in render class.
*/
public void loadSkin()
{
renderer.loadSkin();
}
}

46
src/net/java/sip/communicator/impl/gui/main/contactlist/GroupRightButtonMenu.java
Unescape View File

@ -18,6 +18,7 @@
import net.java.sip.communicator.service.gui.*;
import net.java.sip.communicator.service.gui.Container;
import net.java.sip.communicator.util.*;
import net.java.sip.communicator.util.skin.*;
import org.osgi.framework.*;
@ -25,29 +26,29 @@
* The GroupRightButtonMenu is the menu, opened when user clicks with the right
* mouse button on a group in the contact list. Through this menu the user could
* add a contact to a group.
*
*
* @author Yana Stamcheva
* @author Adam Netocny
*/
public class GroupRightButtonMenu
extends JPopupMenu
implements ActionListener, PluginComponentListener
implements ActionListener,
PluginComponentListener,
Skinnable
{
private final Logger logger = Logger.getLogger(GroupRightButtonMenu.class);
private final JMenuItem addContactItem =
new JMenuItem(GuiActivator.getResources().getI18NString(
"service.gui.ADD_CONTACT") + "...", new ImageIcon(ImageLoader
.getImage(ImageLoader.ADD_CONTACT_16x16_ICON)));
private final JMenuItem addContactItem
= new JMenuItem(GuiActivator.getResources().getI18NString(
"service.gui.ADD_CONTACT") + "...");
private final JMenuItem removeGroupItem =
new JMenuItem(GuiActivator.getResources().getI18NString(
"service.gui.REMOVE_GROUP"), new ImageIcon(ImageLoader
.getImage(ImageLoader.DELETE_16x16_ICON)));
private final JMenuItem removeGroupItem
= new JMenuItem(GuiActivator.getResources().getI18NString(
"service.gui.REMOVE_GROUP"));
private final JMenuItem renameGroupItem =
new JMenuItem(GuiActivator.getResources().getI18NString(
"service.gui.RENAME_GROUP"), new ImageIcon(ImageLoader
.getImage(ImageLoader.RENAME_16x16_ICON)));
private final JMenuItem renameGroupItem
= new JMenuItem(GuiActivator.getResources().getI18NString(
"service.gui.RENAME_GROUP"));
private final MetaContactGroup group;
@ -84,6 +85,8 @@ public GroupRightButtonMenu(MainFrame mainFrame, MetaContactGroup group)
this.renameGroupItem.addActionListener(this);
this.removeGroupItem.addActionListener(this);
loadSkin();
this.initPluginComponents();
}
@ -214,4 +217,19 @@ public void pluginComponentRemoved(PluginComponentEvent event)
this.remove((Component) c.getComponent());
}
}
/**
* Reloads label icons.
*/
public void loadSkin()
{
addContactItem.setIcon(new ImageIcon(ImageLoader
.getImage(ImageLoader.ADD_CONTACT_16x16_ICON)));
removeGroupItem.setIcon(new ImageIcon(ImageLoader
.getImage(ImageLoader.DELETE_16x16_ICON)));
renameGroupItem.setIcon(new ImageIcon(ImageLoader
.getImage(ImageLoader.RENAME_16x16_ICON)));
}
}

86
src/net/java/sip/communicator/impl/gui/main/contactlist/MetaContactRightButtonMenu.java
Unescape View File

@ -27,6 +27,7 @@
import net.java.sip.communicator.service.gui.Container;
import net.java.sip.communicator.service.protocol.*;
import net.java.sip.communicator.util.*;
import net.java.sip.communicator.util.skin.*;
import net.java.sip.communicator.util.swing.*;
import org.osgi.framework.*;
@ -36,12 +37,14 @@
* user could add a subcontact, remove a contact, send message, etc.
*
* @author Yana Stamcheva
* @author Adam Netocny
*/
public class MetaContactRightButtonMenu
extends JPopupMenu
implements ActionListener,
PluginComponentListener,
ContactListListener
ContactListListener,
Skinnable
{
/**
* An eclipse generated serial version unique ID
@ -96,31 +99,18 @@ public class MetaContactRightButtonMenu
private final JMenuItem addContactItem = new JMenuItem();
private final JMenuItem callItem = new JMenuItem(
callString,
new ImageIcon(ImageLoader.getImage(ImageLoader.CALL_16x16_ICON)));
private final JMenuItem callItem = new JMenuItem(callString);
private final JMenuItem sendMessageItem = new JMenuItem(
sendMessageString,
new ImageIcon(ImageLoader
.getImage(ImageLoader.SEND_MESSAGE_16x16_ICON)));
private final JMenuItem sendMessageItem = new JMenuItem(sendMessageString);
private final JMenuItem sendFileItem = new JMenuItem(
sendFileString,
new ImageIcon(ImageLoader.getImage(ImageLoader.SEND_FILE_16x16_ICON)));
private final JMenuItem sendFileItem = new JMenuItem(sendFileString);
private final JMenuItem sendSmsItem = new JMenuItem(
sendSmsString,
new ImageIcon(ImageLoader
.getImage(ImageLoader.SEND_MESSAGE_16x16_ICON)));
private final JMenuItem sendSmsItem = new JMenuItem(sendSmsString);
private final JMenuItem renameContactItem = new JMenuItem(
renameContactString,
new ImageIcon(ImageLoader.getImage(ImageLoader.RENAME_16x16_ICON)));
renameContactString);
private final JMenuItem viewHistoryItem = new JMenuItem(
viewHistoryString,
new ImageIcon(ImageLoader.getImage(ImageLoader.HISTORY_16x16_ICON)));
private final JMenuItem viewHistoryItem = new JMenuItem(viewHistoryString);
private final MetaContact contactItem;
@ -160,6 +150,8 @@ public MetaContactRightButtonMenu( MetaContact contactItem)
this.init();
this.initMnemonics();
loadSkin();
}
/**
@ -171,21 +163,6 @@ private void init()
.getI18NString("service.gui.ADD_CONTACT_TO")
+ " " + contactItem.getDisplayName());
this.moveToMenu.setIcon(new ImageIcon(ImageLoader
.getImage(ImageLoader.GROUPS_16x16_ICON)));
this.addContactItem.setIcon(new ImageIcon(ImageLoader
.getImage(ImageLoader.ADD_CONTACT_16x16_ICON)));
this.removeContactMenu.setIcon(new ImageIcon(ImageLoader
.getImage(ImageLoader.DELETE_16x16_ICON)));
this.moveSubcontactMenu.setIcon(new ImageIcon(ImageLoader
.getImage(ImageLoader.MOVE_CONTACT_ICON)));
this.callContactMenu.setIcon(new ImageIcon(ImageLoader
.getImage(ImageLoader.CALL_16x16_ICON)));
//Initialize moveTo menu.
Iterator<MetaContactGroup> groups
= GuiActivator.getContactListService().getRoot().getSubgroups();
@ -780,4 +757,43 @@ public Image createContactStatusImage(Contact protoContact)
protoContact.getPresenceStatus().getStatusIcon()),
protoContact.getProtocolProvider());
}
/**
* Reloads skin related information.
*/
public void loadSkin()
{
callItem.setIcon(new ImageIcon(
ImageLoader.getImage(ImageLoader.CALL_16x16_ICON)));
sendMessageItem.setIcon(new ImageIcon(
ImageLoader.getImage(ImageLoader.SEND_MESSAGE_16x16_ICON)));
sendFileItem.setIcon(new ImageIcon(
ImageLoader.getImage(ImageLoader.SEND_FILE_16x16_ICON)));
sendSmsItem.setIcon(new ImageIcon(
ImageLoader.getImage(ImageLoader.SEND_MESSAGE_16x16_ICON)));
renameContactItem.setIcon(new ImageIcon(
ImageLoader.getImage(ImageLoader.RENAME_16x16_ICON)));
viewHistoryItem.setIcon(new ImageIcon(
ImageLoader.getImage(ImageLoader.HISTORY_16x16_ICON)));
moveToMenu.setIcon(new ImageIcon(
ImageLoader.getImage(ImageLoader.GROUPS_16x16_ICON)));
addContactItem.setIcon(new ImageIcon(
ImageLoader.getImage(ImageLoader.ADD_CONTACT_16x16_ICON)));
removeContactMenu.setIcon(new ImageIcon(
ImageLoader.getImage(ImageLoader.DELETE_16x16_ICON)));
moveSubcontactMenu.setIcon(new ImageIcon(
ImageLoader.getImage(ImageLoader.MOVE_CONTACT_ICON)));
callContactMenu.setIcon(new ImageIcon(
ImageLoader.getImage(ImageLoader.CALL_16x16_ICON)));
}
}

30
src/net/java/sip/communicator/impl/gui/main/contactlist/MoveSubcontactMessageDialog.java
Unescape View File

@ -15,6 +15,7 @@
import net.java.sip.communicator.impl.gui.customcontrols.*;
import net.java.sip.communicator.impl.gui.main.*;
import net.java.sip.communicator.impl.gui.utils.*;
import net.java.sip.communicator.util.skin.*;
import net.java.sip.communicator.util.swing.*;
/**
@ -24,9 +25,11 @@
* choosen contact will be moved.
*
* @author Yana Stamcheva
* @author Adam Netocny
*/
public class MoveSubcontactMessageDialog
extends SIPCommDialog
implements Skinnable
{
private SIPCommMsgTextArea infoArea = new SIPCommMsgTextArea(
GuiActivator.getResources()
@ -36,8 +39,7 @@ public class MoveSubcontactMessageDialog
GuiActivator.getResources()
.getI18NString("service.gui.MOVE_SUBCONTACT"));
private JLabel iconLabel = new JLabel(
new ImageIcon(ImageLoader.getImage(ImageLoader.INFO_ICON)));
private JLabel iconLabel = new JLabel();
private JButton cancelButton = new JButton(
GuiActivator.getResources().getI18NString("service.gui.CANCEL"));
@ -113,6 +115,9 @@ public void actionPerformed(ActionEvent e)
this.mainPanel.add(buttonsPanel, BorderLayout.SOUTH);
this.getContentPane().add(mainPanel);
loadSkin();
this.pack();
}
@ -138,15 +143,36 @@ private void setDialogLocation(JFrame parentWindow)
}
}
/**
* Automatically clicks the cancel button when the dialog is closed.
*
* @param isEscaped indicates if the dialog has been closed by pressing the
* Esc key
*/
protected void close(boolean isEscaped)
{
this.cancelButton.doClick();
}
/**
* In addition to setVisible this method would also set the dialog location
* to fit the main frame.
*
* @param isVisible indicates if the component should be visible or not
*/
public void setVisible(boolean isVisible)
{
super.setVisible(isVisible);
this.setDialogLocation(mainFrame);
}
/**
* Reloads the icon.
*/
public void loadSkin()
{
iconLabel.setIcon(new ImageIcon(
ImageLoader.getImage(ImageLoader.INFO_ICON)));
}
}

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

@ -12,6 +12,7 @@
import net.java.sip.communicator.impl.gui.*;
import net.java.sip.communicator.impl.gui.customcontrols.*;
import net.java.sip.communicator.impl.gui.utils.*;
import net.java.sip.communicator.util.skin.*;
import net.java.sip.communicator.util.swing.*;
/**
@ -19,9 +20,11 @@
* meta contact.
*
* @author Yana Stamcheva
* @author Adam Netocny
*/
public class RenameContactPanel
extends TransparentPanel
implements Skinnable
{
private JLabel uinLabel = new JLabel(
GuiActivator.getResources().getI18NString("service.gui.NEW_NAME"));
@ -38,9 +41,7 @@ public class RenameContactPanel
private JLabel infoTitleLabel = new JLabel(
GuiActivator.getResources().getI18NString("service.gui.RENAME_CONTACT"));
private JLabel iconLabel
= new JLabel(new ImageIcon(ImageLoader
.getImage(ImageLoader.RENAME_DIALOG_ICON)));
private JLabel iconLabel = new JLabel();
private TransparentPanel labelsPanel
= new TransparentPanel(new GridLayout(0, 1));
@ -50,6 +51,8 @@ public class RenameContactPanel
/**
* Creates an instance of <tt>RenameContactPanel</tt> and initializes it.
*
* @param oldName the old name of the contact to rename
*/
public RenameContactPanel(String oldName)
{
@ -81,6 +84,8 @@ public RenameContactPanel(String oldName)
this.add(iconLabel, BorderLayout.WEST);
this.add(rightPanel, BorderLayout.CENTER);
loadSkin();
}
/**
@ -100,4 +105,13 @@ public void requestFocusInField()
{
this.textField.requestFocus();
}
/**
* Reloads the icon.
*/
public void loadSkin()
{
iconLabel.setIcon(new ImageIcon(ImageLoader
.getImage(ImageLoader.RENAME_DIALOG_ICON)));
}
}

18
src/net/java/sip/communicator/impl/gui/main/contactlist/RenameGroupPanel.java
Unescape View File

@ -12,6 +12,7 @@
import net.java.sip.communicator.impl.gui.*;
import net.java.sip.communicator.impl.gui.customcontrols.*;
import net.java.sip.communicator.impl.gui.utils.*;
import net.java.sip.communicator.util.skin.*;
import net.java.sip.communicator.util.swing.*;
/**
@ -19,9 +20,11 @@
* meta contact group.
*
* @author Yana Stamcheva
* @author Adam Netocny
*/
public class RenameGroupPanel
extends TransparentPanel
implements Skinnable
{
private JLabel uinLabel = new JLabel(
GuiActivator.getResources().getI18NString("service.gui.NEW_NAME"));
@ -38,9 +41,7 @@ public class RenameGroupPanel
private JLabel infoTitleLabel = new JLabel(
GuiActivator.getResources().getI18NString("service.gui.RENAME_GROUP"));
private JLabel iconLabel
= new JLabel(new ImageIcon(ImageLoader.getImage(
ImageLoader.RENAME_DIALOG_ICON)));
private JLabel iconLabel = new JLabel();
private TransparentPanel labelsPanel
= new TransparentPanel(new GridLayout(0, 1));
@ -81,6 +82,8 @@ public RenameGroupPanel(String groupName)
this.add(iconLabel, BorderLayout.WEST);
this.add(rightPanel, BorderLayout.CENTER);
loadSkin();
}
/**
@ -100,4 +103,13 @@ public void requestFocusInField()
{
this.textField.requestFocus();
}
/**
* Reloads the icon.
*/
public void loadSkin()
{
iconLabel.setIcon(new ImageIcon(ImageLoader.getImage(
ImageLoader.RENAME_DIALOG_ICON)));
}
}

21
src/net/java/sip/communicator/impl/gui/main/contactlist/SearchField.java
Unescape View File

@ -8,24 +8,33 @@
import net.java.sip.communicator.impl.gui.*;
import net.java.sip.communicator.impl.gui.main.*;
import net.java.sip.communicator.util.skin.*;
import net.java.sip.communicator.util.swing.*;
import net.java.sip.communicator.util.swing.event.*;
/**
* The field shown on the top of the main window, which allows the user to
* search for users.
*
* @author Yana Stamcheva
* @author Adam Netocny
*/
public class SearchField
extends SIPCommTextField
implements TextFieldChangeListener,
FilterQueryListener
FilterQueryListener,
Skinnable
{
/**
* The main application window.
*/
private final MainFrame mainFrame;
/**
* SearchFieldUI defs.
*/
private final SearchFieldUI textFieldUI;
/**
* Creates the <tt>SearchField</tt>.
* @param frame the main application window
@ -37,7 +46,7 @@ public SearchField(MainFrame frame)
this.mainFrame = frame;
SearchFieldUI textFieldUI = new SearchFieldUI();
textFieldUI = new SearchFieldUI();
textFieldUI.setDeleteButtonEnabled(true);
this.setUI(textFieldUI);
this.setBorder(null);
@ -179,4 +188,12 @@ public void filterQuerySucceeded(FilterQuery query)
query.setQueryListener(null);
}
/**
* Reloads text field UI defs.
*/
public void loadSkin()
{
textFieldUI.loadSkin();
}
}

29
src/net/java/sip/communicator/impl/gui/main/contactlist/SearchFieldUI.java
Unescape View File

@ -11,6 +11,7 @@
import net.java.sip.communicator.impl.gui.main.call.*;
import net.java.sip.communicator.service.protocol.*;
import net.java.sip.communicator.util.*;
import net.java.sip.communicator.util.skin.*;
import net.java.sip.communicator.util.swing.*;
import net.java.sip.communicator.util.swing.plaf.*;
@ -20,9 +21,11 @@
* of the editor rectangle according to it.
*
* @author Yana Stamcheva
* @author Adam Netocny
*/
public class SearchFieldUI
extends SIPCommTextFieldUI
implements Skinnable
{
/**
* The icon indicating that this is a search field.
@ -60,15 +63,7 @@ public class SearchFieldUI
*/
public SearchFieldUI()
{
searchIcon = UtilActivator.getResources()
.getImage("service.gui.icons.SEARCH_ICON");
callIcon = UtilActivator.getResources()
.getImage("service.gui.buttons.SEARCH_CALL_ICON").getImage();
callRolloverIcon = UtilActivator.getResources()
.getImage("service.gui.buttons.SEARCH_CALL_ROLLOVER_ICON")
.getImage();
loadSkin();
}
/**
@ -318,4 +313,20 @@ protected Rectangle getCallButtonRect()
callRolloverIcon.getWidth(null),
callRolloverIcon.getHeight(null));
}
/**
* Reloads UI icons.
*/
public void loadSkin()
{
searchIcon = UtilActivator.getResources()
.getImage("service.gui.icons.SEARCH_ICON");
callIcon = UtilActivator.getResources()
.getImage("service.gui.buttons.SEARCH_CALL_ICON").getImage();
callRolloverIcon = UtilActivator.getResources()
.getImage("service.gui.buttons.SEARCH_CALL_ROLLOVER_ICON")
.getImage();
}
}

48
src/net/java/sip/communicator/impl/gui/main/contactlist/SourceContactRightButtonMenu.java
Unescape View File

@ -19,17 +19,32 @@
import net.java.sip.communicator.impl.gui.utils.*;
import net.java.sip.communicator.service.contactsource.*;
import net.java.sip.communicator.service.protocol.*;
import net.java.sip.communicator.util.skin.*;
import net.java.sip.communicator.util.swing.*;
/**
* The right button menu for external contact sources.
* @see ExternalContactSource
*
* @author Yana Stamcheva
* @author Adam Netocny
*/
public class SourceContactRightButtonMenu
extends JPopupMenu
implements Skinnable
{
private final SourceContact sourceContact;
/**
* Call contact menu.
*/
private SIPCommMenu callContactMenu;
/**
* Add contact component.
*/
private Component addContactComponent;
/**
* Creates an instance of <tt>SourceContactRightButtonMenu</tt> by
* specifying the <tt>SourceContact</tt>, for which this menu is created.
@ -55,7 +70,8 @@ private void initItems()
if (cDetail != null)
add(initCallMenu());
Component addContactComponent = initAddContactMenu();
addContactComponent = initAddContactMenu();
if (addContactComponent != null)
add(addContactComponent);
}
@ -66,7 +82,7 @@ private void initItems()
*/
private Component initCallMenu()
{
SIPCommMenu callContactMenu = new SIPCommMenu(
callContactMenu = new SIPCommMenu(
GuiActivator.getResources().getI18NString("service.gui.CALL"));
callContactMenu.setIcon(new ImageIcon(ImageLoader
.getImage(ImageLoader.CALL_16x16_ICON)));
@ -107,13 +123,13 @@ public void actionPerformed(ActionEvent e)
*/
private Component initAddContactMenu()
{
Component addContactComponent = null;
Component addContactComponentTmp = null;
List<ContactDetail> details = sourceContact.getContactDetails();
if (details.size() == 1)
{
addContactComponent
addContactComponentTmp
= new JMenuItem(GuiActivator.getResources().getI18NString(
"service.gui.ADD_CONTACT"),
new ImageIcon(ImageLoader
@ -121,7 +137,7 @@ private Component initAddContactMenu()
final ContactDetail detail = details.get(0);
((JMenuItem) addContactComponent)
((JMenuItem) addContactComponentTmp)
.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
@ -134,7 +150,7 @@ public void actionPerformed(ActionEvent e)
// item for each one of them.
else if (details.size() > 1)
{
addContactComponent
addContactComponentTmp
= new JMenu(GuiActivator.getResources().getI18NString(
"service.gui.ADD_CONTACT"));
@ -146,7 +162,7 @@ else if (details.size() > 1)
JMenuItem addMenuItem
= new JMenuItem(detail.getContactAddress());
((JMenu) addContactComponent).add(addMenuItem);
((JMenu) addContactComponentTmp).add(addMenuItem);
addMenuItem.addActionListener(new ActionListener()
{
@ -157,7 +173,8 @@ public void actionPerformed(ActionEvent e)
});
}
}
return addContactComponent;
return addContactComponentTmp;
}
/**
@ -226,4 +243,19 @@ private void showAddContactDialog(ContactDetail contactDetail)
// }
// return callContactMenu;
// }
/**
* Reloads icons for menu items.
*/
public void loadSkin()
{
callContactMenu.setIcon(new ImageIcon(ImageLoader
.getImage(ImageLoader.CALL_16x16_ICON)));
if(addContactComponent instanceof JMenuItem)
{
((JMenuItem) addContactComponent).setIcon(new ImageIcon(ImageLoader
.getImage(ImageLoader.ADD_CONTACT_16x16_ICON)));
}
}
}

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

@ -17,6 +17,7 @@
import net.java.sip.communicator.impl.gui.main.*;
import net.java.sip.communicator.impl.gui.main.call.*;
import net.java.sip.communicator.service.protocol.*;
import net.java.sip.communicator.util.skin.*;
import net.java.sip.communicator.util.swing.*;
import net.java.sip.communicator.util.swing.event.*;
@ -27,20 +28,18 @@
* the contact list.
*
* @author Yana Stamcheva
* @author Adam Netocny
*/
public class UnknownContactPanel
extends TransparentPanel
implements TextFieldChangeListener
implements TextFieldChangeListener,
Skinnable
{
private final JButton addContact = new JButton(
GuiActivator.getResources().getI18NString("service.gui.ADD_CONTACT"),
GuiActivator.getResources()
.getImage("service.gui.icons.ADD_CONTACT_16x16_ICON"));
GuiActivator.getResources().getI18NString("service.gui.ADD_CONTACT"));
private final JButton callContact = new JButton(
GuiActivator.getResources().getI18NString("service.gui.CALL_CONTACT"),
GuiActivator.getResources()
.getImage("service.gui.icons.CALL_16x16_ICON"));
GuiActivator.getResources().getI18NString("service.gui.CALL_CONTACT"));
private final JTextPane textArea = new JTextPane();
@ -128,6 +127,8 @@ else if (telephonyProviders.size() > 1)
}
}
});
loadSkin();
}
/**
@ -197,4 +198,15 @@ private void updateTextArea(String searchText)
this.revalidate();
this.repaint();
}
/**
* Reloads button resources.
*/
public void loadSkin()
{
addContact.setIcon(GuiActivator.getResources()
.getImage("service.gui.icons.ADD_CONTACT_16x16_ICON"));
callContact.setIcon(GuiActivator.getResources()
.getImage("service.gui.icons.CALL_16x16_ICON"));
}
}

2
src/net/java/sip/communicator/plugin/skinmanager/SkinManagerPanel.java
Unescape View File

@ -35,7 +35,7 @@ public class SkinManagerPanel
*/
public SkinManagerPanel()
{
super(new FlowLayout(FlowLayout.CENTER));
super(new BorderLayout());
JPanel selectorPanel = new TransparentPanel();
selectorPanel.setLayout(new BoxLayout(selectorPanel, BoxLayout.Y_AXIS));

Write Preview
Loading…
Cancel
Save