Antialiasing moved to the Look&Feel for already implemented UIs.

cusax-fix
Yana Stamcheva 20 years ago
parent 1f32167963
commit 0ab8b1b1af

@ -10,6 +10,8 @@
import java.util.Arrays;
import java.util.List;
import javax.swing.ImageIcon;
import javax.swing.SwingUtilities;
import javax.swing.UIDefaults;
import javax.swing.plaf.ColorUIResource;
import javax.swing.plaf.FontUIResource;
@ -79,8 +81,8 @@ public void addCustomEntriesToTable(UIDefaults table) {
"InternalFrame.activeTitleGradient", buttonGradient,
// "OptionPane.warningIcon",
// ImageLoader.getImage(ImageLoader.WARNING_ICON),
"OptionPane.warningIcon",
new ImageIcon(ImageLoader.getImage(ImageLoader.WARNING_ICON)),
"RadioButton.gradient", buttonGradient,
"RadioButton.rollover", Boolean.TRUE,

@ -49,7 +49,11 @@ protected void initClassDefaults(UIDefaults table) {
"ScrollBarUI", lfPackageName + "SIPCommScrollBarUI",
"ComboBoxUI", lfPackageName + "SIPCommComboBoxUI",
"TextFieldUI", lfPackageName + "SIPCommTextFieldUI",
"PasswordFieldUI", lfPackageName + "SIPCommPasswordFieldUI"
"PasswordFieldUI", lfPackageName + "SIPCommPasswordFieldUI",
"LabelUI", lfPackageName + "SIPCommLabelUI",
"EditorPaneUI", lfPackageName + "SIPCommEditorPaneUI",
"MenuItemUI", lfPackageName + "SIPCommMenuItemUI",
"MenuUI", lfPackageName + "SIPCommMenuUI"
};
table.putDefaults(uiDefaults);
}

@ -0,0 +1,35 @@
/*
* 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.lookandfeel;
import java.awt.Graphics;
import javax.swing.JComponent;
import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.basic.BasicOptionPaneUI;
import net.java.sip.communicator.impl.gui.utils.AntialiasingManager;
/**
* The SIPCommOptionPaneUI implementation.
*
* @author Yana Stamcheva
*/
public class SIPCommOptionPaneUI extends BasicOptionPaneUI {
/**
* Creates a new SIPCommOptionPaneUI instance.
*/
public static ComponentUI createUI(JComponent x) {
return new SIPCommOptionPaneUI();
}
public void paint(Graphics g, JComponent c) {
AntialiasingManager.activateAntialiasing(g);
super.paint(g, c);
}
}

@ -25,9 +25,9 @@
import javax.swing.JLabel;
import javax.swing.JMenuItem;
import javax.swing.JOptionPane;
import javax.swing.JPopupMenu;
import javax.swing.Timer;
import net.java.sip.communicator.impl.gui.main.customcontrols.AntialiasedPopupMenu;
import net.java.sip.communicator.impl.gui.main.i18n.Messages;
import net.java.sip.communicator.impl.gui.utils.AntialiasingManager;
import net.java.sip.communicator.impl.gui.utils.ImageLoader;
@ -41,7 +41,7 @@
public class StatusSelectorBox extends JLabel
implements MouseListener {
private AntialiasedPopupMenu popup;
private JPopupMenu popup;
private Map itemsMap;
@ -73,7 +73,7 @@ public StatusSelectorBox( MainFrame mainFrame,
this.protocolProvider = protocolProvider;
this.popup = new AntialiasedPopupMenu();
this.popup = new JPopupMenu();
this.popup.setInvoker(this);
@ -99,7 +99,7 @@ public StatusSelectorBox( MainFrame mainFrame,
this.protocolProvider = protocolProvider;
this.itemsMap = itemsMap;
this.popup = new AntialiasedPopupMenu();
this.popup = new JPopupMenu();
this.popup.setInvoker(this);

@ -13,13 +13,12 @@
import java.awt.event.ActionListener;
import javax.swing.ImageIcon;
import javax.swing.JMenu;
import javax.swing.JMenuItem;
import javax.swing.JPopupMenu;
import javax.swing.SwingUtilities;
import net.java.sip.communicator.impl.gui.main.MainFrame;
import net.java.sip.communicator.impl.gui.main.customcontrols.AntialiasedMenu;
import net.java.sip.communicator.impl.gui.main.customcontrols.AntialiasedMenuItem;
import net.java.sip.communicator.impl.gui.main.customcontrols.MessageDialog;
import net.java.sip.communicator.impl.gui.main.history.HistoryWindow;
import net.java.sip.communicator.impl.gui.main.i18n.Messages;
@ -29,35 +28,33 @@
public class ContactRightButtonMenu extends JPopupMenu implements
ActionListener {
private AntialiasedMenu moveToMenu = new AntialiasedMenu(
Messages.getString("moveToGroup"),
new ImageIcon(ImageLoader.getImage(ImageLoader.GROUPS_16x16_ICON)));
private JMenu moveToMenu
= new JMenu(Messages.getString("moveToGroup"));
private AntialiasedMenu addSubcontactMenu = new AntialiasedMenu(
Messages.getString("addSubcontact"),
new ImageIcon(ImageLoader.getImage(ImageLoader.ADD_CONTACT_16x16_ICON)));
private JMenu addSubcontactMenu
= new JMenu(Messages.getString("addSubcontact"));
private AntialiasedMenuItem sendMessageItem = new AntialiasedMenuItem(
private JMenuItem sendMessageItem = new JMenuItem(
Messages.getString("sendMessage"),
new ImageIcon(ImageLoader.getImage(ImageLoader.SEND_MESSAGE_16x16_ICON)));
private AntialiasedMenuItem sendFileItem = new AntialiasedMenuItem(
private JMenuItem sendFileItem = new JMenuItem(
Messages.getString("sendFile"),
new ImageIcon(ImageLoader.getImage(ImageLoader.SEND_FILE_16x16_ICON)));
private AntialiasedMenuItem removeContactItem = new AntialiasedMenuItem(
private JMenuItem removeContactItem = new JMenuItem(
Messages.getString("removeContact"),
new ImageIcon(ImageLoader.getImage(ImageLoader.DELETE_16x16_ICON)));
private AntialiasedMenuItem renameContactItem = new AntialiasedMenuItem(
private JMenuItem renameContactItem = new JMenuItem(
Messages.getString("renameContact"),
new ImageIcon(ImageLoader.getImage(ImageLoader.RENAME_16x16_ICON)));
private AntialiasedMenuItem userInfoItem = new AntialiasedMenuItem(
private JMenuItem userInfoItem = new JMenuItem(
Messages.getString("userInfo"),
new ImageIcon(ImageLoader.getImage(ImageLoader.INFO_16x16_ICON)));
private AntialiasedMenuItem viewHistoryItem = new AntialiasedMenuItem(
private JMenuItem viewHistoryItem = new JMenuItem(
Messages.getString("viewHistory"),
new ImageIcon(ImageLoader.getImage(ImageLoader.HISTORY_16x16_ICON)));
@ -85,13 +82,20 @@ private void init() {
for (int i = 0; i < userProtocols.length; i++) {
AntialiasedMenuItem protocolMenuItem = new AntialiasedMenuItem(
JMenuItem protocolMenuItem = new JMenuItem(
userProtocols[i],
new ImageIcon(Constants.getProtocolIcon(userProtocols[i])));
this.addSubcontactMenu.add(protocolMenuItem);
}
*/
this.moveToMenu.setIcon(new ImageIcon
(ImageLoader.getImage(ImageLoader.GROUPS_16x16_ICON)));
this.addSubcontactMenu.setIcon(new ImageIcon
(ImageLoader.getImage(ImageLoader.ADD_CONTACT_16x16_ICON)));
this.add(sendMessageItem);
this.add(sendFileItem);

@ -1,24 +0,0 @@
/*
* 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.customcontrols;
import java.awt.Graphics;
import javax.swing.JEditorPane;
import net.java.sip.communicator.impl.gui.utils.AntialiasingManager;
public class AntialiasedEditorPane extends JEditorPane {
public void paint(Graphics g){
AntialiasingManager.activateAntialiasing(g);
super.paint(g);
}
}

@ -1,37 +0,0 @@
/*
* 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.customcontrols;
import java.awt.Graphics;
import javax.swing.Icon;
import javax.swing.JMenu;
import net.java.sip.communicator.impl.gui.utils.AntialiasingManager;
public class AntialiasedMenu extends JMenu {
public AntialiasedMenu(String text){
super(text);
}
public AntialiasedMenu(String text, Icon icon){
super(text);
this.setIcon(icon);
}
public void paint(Graphics g){
AntialiasingManager.activateAntialiasing(g);
super.paint(g);
}
}

@ -1,33 +0,0 @@
/*
* 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.customcontrols;
import java.awt.Graphics;
import javax.swing.Icon;
import javax.swing.JMenuItem;
import net.java.sip.communicator.impl.gui.utils.AntialiasingManager;
public class AntialiasedMenuItem extends JMenuItem{
public AntialiasedMenuItem(String text){
super(text);
}
public AntialiasedMenuItem(String text, Icon icon){
super(text, icon);
}
public void paint(Graphics g){
AntialiasingManager.activateAntialiasing(g);
super.paint(g);
}
}

@ -1,29 +0,0 @@
/*
* 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.customcontrols;
import java.awt.Graphics;
import java.awt.LayoutManager;
import javax.swing.JPanel;
import net.java.sip.communicator.impl.gui.utils.AntialiasingManager;
public class AntialiasedPanel extends JPanel {
public AntialiasedPanel(LayoutManager layout){
super(layout);
}
public void paint(Graphics g){
AntialiasingManager.activateAntialiasing(g);
super.paint(g);
}
}

@ -1,24 +0,0 @@
/*
* 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.customcontrols;
import java.awt.Graphics;
import javax.swing.JPopupMenu;
import net.java.sip.communicator.impl.gui.utils.AntialiasingManager;
public class AntialiasedPopupMenu extends JPopupMenu {
public void paint(Graphics g){
AntialiasingManager.activateAntialiasing(g);
super.paint(g);
}
}

@ -18,6 +18,7 @@
import javax.swing.JCheckBox;
import javax.swing.JDialog;
import javax.swing.JLabel;
import javax.swing.JPanel;
import net.java.sip.communicator.impl.gui.main.i18n.Messages;
import net.java.sip.communicator.impl.gui.utils.AntialiasingManager;
@ -37,14 +38,14 @@ public class MessageDialog extends JDialog {
private JLabel messageLabel = new JLabel();
private AntialiasedPanel buttonsPanel
= new AntialiasedPanel(new FlowLayout(FlowLayout.CENTER));
private JPanel buttonsPanel
= new JPanel(new FlowLayout(FlowLayout.CENTER));
private AntialiasedPanel checkBoxPanel
= new AntialiasedPanel(new FlowLayout(FlowLayout.LEADING));
private JPanel checkBoxPanel
= new JPanel(new FlowLayout(FlowLayout.LEADING));
private AntialiasedPanel messagePanel
= new AntialiasedPanel(new BorderLayout(5, 5));
private JPanel messagePanel
= new JPanel(new BorderLayout(5, 5));
public MessageDialog(Frame owner){
super(owner);

@ -15,17 +15,16 @@
import javax.swing.JMenu;
import javax.swing.JMenuItem;
import net.java.sip.communicator.impl.gui.main.customcontrols.AntialiasedMenuItem;
import net.java.sip.communicator.impl.gui.main.i18n.Messages;
import net.java.sip.communicator.impl.gui.utils.AntialiasingManager;
public class HistoryMenu extends JMenu implements ActionListener {
private AntialiasedMenuItem emptyMenuItem
= new AntialiasedMenuItem(Messages.getString("emptyHistory"));
private JMenuItem emptyMenuItem
= new JMenuItem(Messages.getString("emptyHistory"));
private AntialiasedMenuItem closeMenuItem
= new AntialiasedMenuItem(Messages.getString("close"));
private JMenuItem closeMenuItem
= new JMenuItem(Messages.getString("close"));
private JFrame parentWindow;

@ -27,7 +27,6 @@
import javax.swing.text.html.HTMLDocument;
import javax.swing.text.html.HTMLEditorKit;
import net.java.sip.communicator.impl.gui.main.customcontrols.AntialiasedEditorPane;
import net.java.sip.communicator.impl.gui.utils.AntialiasingManager;
import net.java.sip.communicator.impl.gui.utils.BrowserLauncher;
import net.java.sip.communicator.impl.gui.utils.Constants;
@ -50,7 +49,7 @@
public class ChatConversationPanel extends JScrollPane
implements HyperlinkListener {
private AntialiasedEditorPane chatEditorPane = new AntialiasedEditorPane();
private JEditorPane chatEditorPane = new JEditorPane();
private HTMLEditorKit editorKit = new MyHTMLEditorKit();

@ -22,7 +22,6 @@
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import net.java.sip.communicator.impl.gui.main.customcontrols.AntialiasedPanel;
import net.java.sip.communicator.impl.gui.main.i18n.Messages;
import net.java.sip.communicator.impl.gui.utils.AntialiasingManager;
import net.java.sip.communicator.impl.gui.utils.Constants;
@ -34,8 +33,8 @@ public class ChatSendPanel extends JPanel
private JButton sendButton = new JButton(Messages.getString("send"));
private AntialiasedPanel statusPanel
= new AntialiasedPanel(new FlowLayout(FlowLayout.LEFT));
private JPanel statusPanel
= new JPanel(new FlowLayout(FlowLayout.LEFT));
private JPanel sendPanel = new JPanel(new BorderLayout(3, 0));

@ -24,14 +24,13 @@
import javax.swing.undo.CannotUndoException;
import javax.swing.undo.UndoManager;
import net.java.sip.communicator.impl.gui.main.customcontrols.AntialiasedEditorPane;
import net.java.sip.communicator.impl.gui.utils.AntialiasingManager;
import net.java.sip.communicator.impl.gui.utils.Constants;
public class ChatWritePanel extends JScrollPane
implements UndoableEditListener {
private AntialiasedEditorPane editorPane = new AntialiasedEditorPane();
private JEditorPane editorPane = new JEditorPane();
private UndoManager undo = new UndoManager();

@ -16,7 +16,6 @@
import javax.swing.JMenu;
import javax.swing.JMenuItem;
import net.java.sip.communicator.impl.gui.main.customcontrols.AntialiasedMenuItem;
import net.java.sip.communicator.impl.gui.main.i18n.Messages;
import net.java.sip.communicator.impl.gui.main.message.ChatWindow;
import net.java.sip.communicator.impl.gui.utils.AntialiasingManager;
@ -25,16 +24,16 @@
public class EditMenu extends JMenu
implements ActionListener{
private AntialiasedMenuItem cutMenuItem
= new AntialiasedMenuItem(Messages.getString("cut")
private JMenuItem cutMenuItem
= new JMenuItem(Messages.getString("cut")
, new ImageIcon(ImageLoader.getImage(ImageLoader.CUT_ICON)));
private AntialiasedMenuItem copyMenuItem
= new AntialiasedMenuItem(Messages.getString("copy")
private JMenuItem copyMenuItem
= new JMenuItem(Messages.getString("copy")
, new ImageIcon(ImageLoader.getImage(ImageLoader.COPY_ICON)));
private AntialiasedMenuItem pasteMenuItem
= new AntialiasedMenuItem(Messages.getString("paste")
private JMenuItem pasteMenuItem
= new JMenuItem(Messages.getString("paste")
, new ImageIcon(ImageLoader.getImage(ImageLoader.PASTE_ICON)));
private ChatWindow chatWindow;

@ -15,7 +15,6 @@
import javax.swing.JMenu;
import javax.swing.JMenuItem;
import net.java.sip.communicator.impl.gui.main.customcontrols.AntialiasedMenuItem;
import net.java.sip.communicator.impl.gui.main.i18n.Messages;
import net.java.sip.communicator.impl.gui.main.message.ChatWindow;
import net.java.sip.communicator.impl.gui.utils.AntialiasingManager;
@ -24,16 +23,16 @@
public class FileMenu extends JMenu
implements ActionListener{
private AntialiasedMenuItem saveMenuItem
= new AntialiasedMenuItem(Messages.getString("save")
private JMenuItem saveMenuItem
= new JMenuItem(Messages.getString("save")
, new ImageIcon(ImageLoader.getImage(ImageLoader.SAVE_ICON)));
private AntialiasedMenuItem printMenuItem
= new AntialiasedMenuItem(Messages.getString("print")
private JMenuItem printMenuItem
= new JMenuItem(Messages.getString("print")
, new ImageIcon(ImageLoader.getImage(ImageLoader.PRINT_ICON)));
private AntialiasedMenuItem closeMenuItem
= new AntialiasedMenuItem(Messages.getString("close")
private JMenuItem closeMenuItem
= new JMenuItem(Messages.getString("close")
, new ImageIcon(ImageLoader.getImage(ImageLoader.CLOSE_ICON)));
private ChatWindow parentWindow;

Loading…
Cancel
Save