From dda61b5e440598ab084fb49efd4285e1a8d05c73 Mon Sep 17 00:00:00 2001 From: Yana Stamcheva Date: Mon, 15 May 2006 13:25:53 +0000 Subject: [PATCH] UI related methods and classes moved to the lookandfeel package. --- .cvsignore | 1 + .../gui/lookandfeel/SIPCommDefaultTheme.java | 6 ++- .../gui/lookandfeel/SIPCommLookAndFeel.java | 4 +- .../SIPCommTabbedPaneEnhancedUI.java} | 10 ++-- .../SIPCommTabbedPaneUI.java} | 47 +++++++---------- .../SIPCommToolBarSeparatorUI.java | 42 +++++++++++++++ .../gui/lookandfeel/SIPCommToolBarUI.java | 7 +++ .../impl/gui/lookandfeel/SIPCommTreeUI.java | 33 ++++++++++++ .../impl/gui/main/MainTabbedPane.java | 2 +- .../communicator/impl/gui/main/QuickMenu.java | 9 ++-- .../impl/gui/main/WelcomeWindow.java | 1 - .../main/customcontrols/ListCellPanel.java | 7 --- .../main/customcontrols/MsgToolbarButton.java | 1 - .../main/customcontrols/RolloverButton.java | 19 ------- .../{tabbedPane => }/SIPCommTabbedPane.java | 52 ++++++++++--------- .../main/customcontrols/SIPCommToolBar.java | 2 +- .../{tabbedPane => events}/CloseListener.java | 2 +- .../CloseTabbedPaneEvent.java | 2 +- .../DoubleClickListener.java | 2 +- .../{tabbedPane => events}/MaxListener.java | 2 +- .../PopupOutsideListener.java | 2 +- .../impl/gui/main/login/LoginWindow.java | 1 - .../impl/gui/main/message/ChatWindow.java | 4 +- .../main/ui/SIPCommToolBarSeparatorUI.java | 28 ---------- .../impl/gui/main/ui/SIPCommTreeUI.java | 31 ----------- 25 files changed, 157 insertions(+), 160 deletions(-) rename src/net/java/sip/communicator/impl/gui/{main/customcontrols/tabbedPane/CloseTabPaneEnhancedUI.java => lookandfeel/SIPCommTabbedPaneEnhancedUI.java} (96%) rename src/net/java/sip/communicator/impl/gui/{main/customcontrols/tabbedPane/CloseTabPaneUI.java => lookandfeel/SIPCommTabbedPaneUI.java} (97%) create mode 100644 src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToolBarSeparatorUI.java create mode 100644 src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToolBarUI.java create mode 100644 src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTreeUI.java delete mode 100644 src/net/java/sip/communicator/impl/gui/main/customcontrols/RolloverButton.java rename src/net/java/sip/communicator/impl/gui/main/customcontrols/{tabbedPane => }/SIPCommTabbedPane.java (89%) rename src/net/java/sip/communicator/impl/gui/main/customcontrols/{tabbedPane => events}/CloseListener.java (87%) rename src/net/java/sip/communicator/impl/gui/main/customcontrols/{tabbedPane => events}/CloseTabbedPaneEvent.java (93%) rename src/net/java/sip/communicator/impl/gui/main/customcontrols/{tabbedPane => events}/DoubleClickListener.java (87%) rename src/net/java/sip/communicator/impl/gui/main/customcontrols/{tabbedPane => events}/MaxListener.java (87%) rename src/net/java/sip/communicator/impl/gui/main/customcontrols/{tabbedPane => events}/PopupOutsideListener.java (87%) delete mode 100644 src/net/java/sip/communicator/impl/gui/main/ui/SIPCommToolBarSeparatorUI.java delete mode 100644 src/net/java/sip/communicator/impl/gui/main/ui/SIPCommTreeUI.java diff --git a/.cvsignore b/.cvsignore index 4608126e8..d6d3d19b8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -8,3 +8,4 @@ test-reports nbproject bak project.libs.library +sip-communicator.bin diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommDefaultTheme.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommDefaultTheme.java index 1dc084b94..dbd428484 100644 --- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommDefaultTheme.java +++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommDefaultTheme.java @@ -6,6 +6,7 @@ */ package net.java.sip.communicator.impl.gui.lookandfeel; +import java.awt.Dimension; import java.awt.Insets; import java.util.Arrays; import java.util.List; @@ -14,6 +15,7 @@ import javax.swing.SwingUtilities; import javax.swing.UIDefaults; import javax.swing.plaf.ColorUIResource; +import javax.swing.plaf.DimensionUIResource; import javax.swing.plaf.FontUIResource; import javax.swing.plaf.metal.DefaultMetalTheme; @@ -125,7 +127,9 @@ public void addCustomEntriesToTable(UIDefaults table) { "ToggleButton.gradient", buttonGradient, "ToolBar.isRollover", Boolean.TRUE, - + "ToolBar.separatorColor", Constants.TOOLBAR_SEPARATOR_COLOR, + "ToolBar.separatorSize", new DimensionUIResource(8, 22), + "ToolTip.background", LIGHT_GRAY, "ToolTip.backgroundInactive", LIGHT_GRAY, "ToolTip.hideAccelerator", Boolean.FALSE diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommLookAndFeel.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommLookAndFeel.java index ee5760900..5d6aaee11 100644 --- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommLookAndFeel.java +++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommLookAndFeel.java @@ -53,7 +53,9 @@ protected void initClassDefaults(UIDefaults table) { "LabelUI", lfPackageName + "SIPCommLabelUI", "EditorPaneUI", lfPackageName + "SIPCommEditorPaneUI", "MenuItemUI", lfPackageName + "SIPCommMenuItemUI", - "MenuUI", lfPackageName + "SIPCommMenuUI" + "MenuUI", lfPackageName + "SIPCommMenuUI", + "ToolBarSeparatorUI", lfPackageName + "SIPCommToolBarSeparatorUI", + "TabbedPaneUI", lfPackageName + "SIPCommTabbedPaneUI" }; table.putDefaults(uiDefaults); } diff --git a/src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/CloseTabPaneEnhancedUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTabbedPaneEnhancedUI.java similarity index 96% rename from src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/CloseTabPaneEnhancedUI.java rename to src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTabbedPaneEnhancedUI.java index fbf541cf3..c0ac36b6c 100644 --- a/src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/CloseTabPaneEnhancedUI.java +++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTabbedPaneEnhancedUI.java @@ -4,7 +4,7 @@ * Distributable under LGPL license. * See terms of license at gnu.org. */ -package net.java.sip.communicator.impl.gui.main.customcontrols.tabbedPane; +package net.java.sip.communicator.impl.gui.lookandfeel; /* * The content of this file was based on code borrowed from * David Bismut, davidou@mageos.com @@ -39,7 +39,7 @@ * @author David Bismut, davidou@mageos.com * */ -public class CloseTabPaneEnhancedUI extends CloseTabPaneUI { +public class SIPCommTabbedPaneEnhancedUI extends SIPCommTabbedPaneUI { private static final Color whiteColor = Color.white; @@ -52,7 +52,7 @@ public class CloseTabPaneEnhancedUI extends CloseTabPaneUI { public static ComponentUI createUI(JComponent c) { - return new CloseTabPaneEnhancedUI(); + return new SIPCommTabbedPaneEnhancedUI(); } protected void paintFocusIndicator(Graphics g, int tabPlacement, @@ -225,7 +225,7 @@ protected void paintText(Graphics g, int tabPlacement, Font font, } protected class ScrollableTabButton extends - CloseTabPaneUI.ScrollableTabButton { + SIPCommTabbedPaneUI.ScrollableTabButton { public ScrollableTabButton(int direction) { super(direction); @@ -319,7 +319,7 @@ public void paint(Graphics g) { } - protected CloseTabPaneUI.ScrollableTabButton createScrollableTabButton( + protected SIPCommTabbedPaneUI.ScrollableTabButton createScrollableTabButton( int direction) { return new ScrollableTabButton(direction); } diff --git a/src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/CloseTabPaneUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTabbedPaneUI.java similarity index 97% rename from src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/CloseTabPaneUI.java rename to src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTabbedPaneUI.java index 453760323..401874ec5 100644 --- a/src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/CloseTabPaneUI.java +++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTabbedPaneUI.java @@ -4,7 +4,7 @@ * Distributable under LGPL license. * See terms of license at gnu.org. */ -package net.java.sip.communicator.impl.gui.main.customcontrols.tabbedPane; +package net.java.sip.communicator.impl.gui.lookandfeel; /* * The content of this file was based on code borrowed from * David Bismut, davidou@mageos.com @@ -67,20 +67,13 @@ import javax.swing.text.View; import net.java.sip.communicator.impl.gui.main.customcontrols.SIPCommButton; +import net.java.sip.communicator.impl.gui.main.customcontrols.SIPCommTabbedPane; import net.java.sip.communicator.impl.gui.utils.ImageLoader; /** - * UI for CloseAndMaxTabbedPane. - *

- * Credits to: - * - * @author Amy Fowler - * @author Philip Milne - * @author Steve Wilson - * @author Tom Santos - * @author Dave Moore + * SIPCommTabbedPaneUI implementation. */ -public class CloseTabPaneUI extends BasicTabbedPaneUI { +public class SIPCommTabbedPaneUI extends BasicTabbedPaneUI { // Instance variables initialized at installation @@ -153,7 +146,7 @@ public class CloseTabPaneUI extends BasicTabbedPaneUI { protected Vector highlightedTabs = new Vector(); - public CloseTabPaneUI() { + public SIPCommTabbedPaneUI() { super(); @@ -344,7 +337,7 @@ private void setTabIcons(int x, int y) { } public static ComponentUI createUI(JComponent c) { - return new CloseTabPaneUI(); + return new SIPCommTabbedPaneUI(); } /** @@ -877,7 +870,7 @@ boolean requestMyFocusForVisibleComponent() { private static class RightAction extends AbstractAction { public void actionPerformed(ActionEvent e) { JTabbedPane pane = (JTabbedPane) e.getSource(); - CloseTabPaneUI ui = (CloseTabPaneUI) pane.getUI(); + SIPCommTabbedPaneUI ui = (SIPCommTabbedPaneUI) pane.getUI(); ui.navigateSelectedTab(EAST); } }; @@ -885,7 +878,7 @@ public void actionPerformed(ActionEvent e) { private static class LeftAction extends AbstractAction { public void actionPerformed(ActionEvent e) { JTabbedPane pane = (JTabbedPane) e.getSource(); - CloseTabPaneUI ui = (CloseTabPaneUI) pane.getUI(); + SIPCommTabbedPaneUI ui = (SIPCommTabbedPaneUI) pane.getUI(); ui.navigateSelectedTab(WEST); } }; @@ -893,7 +886,7 @@ public void actionPerformed(ActionEvent e) { private static class UpAction extends AbstractAction { public void actionPerformed(ActionEvent e) { JTabbedPane pane = (JTabbedPane) e.getSource(); - CloseTabPaneUI ui = (CloseTabPaneUI) pane.getUI(); + SIPCommTabbedPaneUI ui = (SIPCommTabbedPaneUI) pane.getUI(); ui.navigateSelectedTab(NORTH); } }; @@ -901,7 +894,7 @@ public void actionPerformed(ActionEvent e) { private static class DownAction extends AbstractAction { public void actionPerformed(ActionEvent e) { JTabbedPane pane = (JTabbedPane) e.getSource(); - CloseTabPaneUI ui = (CloseTabPaneUI) pane.getUI(); + SIPCommTabbedPaneUI ui = (SIPCommTabbedPaneUI) pane.getUI(); ui.navigateSelectedTab(SOUTH); } }; @@ -909,7 +902,7 @@ public void actionPerformed(ActionEvent e) { private static class NextAction extends AbstractAction { public void actionPerformed(ActionEvent e) { JTabbedPane pane = (JTabbedPane) e.getSource(); - CloseTabPaneUI ui = (CloseTabPaneUI) pane.getUI(); + SIPCommTabbedPaneUI ui = (SIPCommTabbedPaneUI) pane.getUI(); ui.navigateSelectedTab(NEXT); } }; @@ -917,7 +910,7 @@ public void actionPerformed(ActionEvent e) { private static class PreviousAction extends AbstractAction { public void actionPerformed(ActionEvent e) { JTabbedPane pane = (JTabbedPane) e.getSource(); - CloseTabPaneUI ui = (CloseTabPaneUI) pane.getUI(); + SIPCommTabbedPaneUI ui = (SIPCommTabbedPaneUI) pane.getUI(); ui.navigateSelectedTab(PREVIOUS); } }; @@ -925,7 +918,7 @@ public void actionPerformed(ActionEvent e) { private static class PageUpAction extends AbstractAction { public void actionPerformed(ActionEvent e) { JTabbedPane pane = (JTabbedPane) e.getSource(); - CloseTabPaneUI ui = (CloseTabPaneUI) pane.getUI(); + SIPCommTabbedPaneUI ui = (SIPCommTabbedPaneUI) pane.getUI(); int tabPlacement = pane.getTabPlacement(); if (tabPlacement == TOP || tabPlacement == BOTTOM) { ui.navigateSelectedTab(WEST); @@ -938,7 +931,7 @@ public void actionPerformed(ActionEvent e) { private static class PageDownAction extends AbstractAction { public void actionPerformed(ActionEvent e) { JTabbedPane pane = (JTabbedPane) e.getSource(); - CloseTabPaneUI ui = (CloseTabPaneUI) pane.getUI(); + SIPCommTabbedPaneUI ui = (SIPCommTabbedPaneUI) pane.getUI(); int tabPlacement = pane.getTabPlacement(); if (tabPlacement == TOP || tabPlacement == BOTTOM) { ui.navigateSelectedTab(EAST); @@ -958,7 +951,7 @@ public void actionPerformed(ActionEvent e) { private static class RequestFocusForVisibleAction extends AbstractAction { public void actionPerformed(ActionEvent e) { JTabbedPane pane = (JTabbedPane) e.getSource(); - CloseTabPaneUI ui = (CloseTabPaneUI) pane.getUI(); + SIPCommTabbedPaneUI ui = (SIPCommTabbedPaneUI) pane.getUI(); ui.requestMyFocusForVisibleComponent(); } }; @@ -972,8 +965,8 @@ private static class SetSelectedIndexAction extends AbstractAction { public void actionPerformed(ActionEvent e) { JTabbedPane pane = (JTabbedPane) e.getSource(); - if (pane != null && (pane.getUI() instanceof CloseTabPaneUI)) { - CloseTabPaneUI ui = (CloseTabPaneUI) pane.getUI(); + if (pane != null && (pane.getUI() instanceof SIPCommTabbedPaneUI)) { + SIPCommTabbedPaneUI ui = (SIPCommTabbedPaneUI) pane.getUI(); String command = e.getActionCommand(); if (command != null && command.length() > 0) { @@ -1002,7 +995,7 @@ public void actionPerformed(ActionEvent e) { } else { return; // shouldn't happen } - CloseTabPaneUI ui = (CloseTabPaneUI) pane.getUI(); + SIPCommTabbedPaneUI ui = (SIPCommTabbedPaneUI) pane.getUI(); ui.tabScroller.scrollForward(pane.getTabPlacement()); @@ -1020,7 +1013,7 @@ public void actionPerformed(ActionEvent e) { } else { return; // shouldn't happen } - CloseTabPaneUI ui = (CloseTabPaneUI) pane.getUI(); + SIPCommTabbedPaneUI ui = (SIPCommTabbedPaneUI) pane.getUI(); ui.tabScroller.scrollBackward(pane.getTabPlacement()); @@ -1347,7 +1340,7 @@ public ScrollableTabPanel() { public void paintComponent(Graphics g) { super.paintComponent(g); - CloseTabPaneUI.this.paintTabArea(g, tabPane.getTabPlacement(), + SIPCommTabbedPaneUI.this.paintTabArea(g, tabPane.getTabPlacement(), tabPane.getSelectedIndex()); } diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToolBarSeparatorUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToolBarSeparatorUI.java new file mode 100644 index 000000000..9aef15969 --- /dev/null +++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToolBarSeparatorUI.java @@ -0,0 +1,42 @@ +/* + * 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.Container; +import java.awt.Dimension; +import java.awt.Graphics; +import java.awt.Graphics2D; + +import javax.swing.JComponent; +import javax.swing.JSeparator; +import javax.swing.JToolBar; +import javax.swing.UIManager; +import javax.swing.plaf.ComponentUI; +import javax.swing.plaf.UIResource; +import javax.swing.plaf.basic.BasicToolBarSeparatorUI; + +import net.java.sip.communicator.impl.gui.utils.AntialiasingManager; +import net.java.sip.communicator.impl.gui.utils.Constants; + +/** + * SIPCommToolBarSeparatorUI implementation. + * + * @author Yana Stamcheva + */ +public class SIPCommToolBarSeparatorUI extends BasicToolBarSeparatorUI { + + public static ComponentUI createUI(JComponent c) { + return new SIPCommToolBarSeparatorUI(); + } + + public void paint(Graphics g, JComponent c) { + Graphics2D g2 = (Graphics2D)g; + + g2.setColor(UIManager.getColor("ToolBar.separatorColor")); + g2.drawLine(c.getWidth()/2, 0, c.getWidth()/2, c.getHeight()); + } +} diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToolBarUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToolBarUI.java new file mode 100644 index 000000000..874d0a62f --- /dev/null +++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToolBarUI.java @@ -0,0 +1,7 @@ +package net.java.sip.communicator.impl.gui.lookandfeel; + +import javax.swing.plaf.metal.MetalToolBarUI; + +public class SIPCommToolBarUI extends MetalToolBarUI { + +} diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTreeUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTreeUI.java new file mode 100644 index 000000000..b2a361801 --- /dev/null +++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTreeUI.java @@ -0,0 +1,33 @@ +/* + * 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.BasicTreeUI; + +/** + * SIPCommTreeUI implementation. + * + * @author Yana Stamcheva + */ +public class SIPCommTreeUI extends BasicTreeUI { + + public static ComponentUI createUI(JComponent c) { + return new SIPCommTreeUI(); + } + + protected void paintHorizontalLine(Graphics g, JComponent c, int y, + int left, int right) { + } + + protected void paintVerticalLine(Graphics g, JComponent c, int x, int top, + int bottom) { + } +} diff --git a/src/net/java/sip/communicator/impl/gui/main/MainTabbedPane.java b/src/net/java/sip/communicator/impl/gui/main/MainTabbedPane.java index 8b583ff35..739d0c996 100755 --- a/src/net/java/sip/communicator/impl/gui/main/MainTabbedPane.java +++ b/src/net/java/sip/communicator/impl/gui/main/MainTabbedPane.java @@ -10,7 +10,7 @@ import javax.swing.JPanel; import net.java.sip.communicator.impl.gui.main.contactlist.ContactListPanel; -import net.java.sip.communicator.impl.gui.main.customcontrols.tabbedPane.SIPCommTabbedPane; +import net.java.sip.communicator.impl.gui.main.customcontrols.SIPCommTabbedPane; import net.java.sip.communicator.impl.gui.main.i18n.Messages; /** diff --git a/src/net/java/sip/communicator/impl/gui/main/QuickMenu.java b/src/net/java/sip/communicator/impl/gui/main/QuickMenu.java index e76ac7eb9..d8755b6e2 100755 --- a/src/net/java/sip/communicator/impl/gui/main/QuickMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/QuickMenu.java @@ -19,7 +19,6 @@ import net.java.sip.communicator.impl.gui.events.ContainerPluginListener; import net.java.sip.communicator.impl.gui.events.PluginComponentEvent; import net.java.sip.communicator.impl.gui.main.contactlist.ContactListModel; -import net.java.sip.communicator.impl.gui.main.customcontrols.RolloverButton; import net.java.sip.communicator.impl.gui.main.customcontrols.SIPCommToolBar; import net.java.sip.communicator.impl.gui.main.i18n.Messages; import net.java.sip.communicator.impl.gui.utils.ImageLoader; @@ -31,19 +30,19 @@ public class QuickMenu extends SIPCommToolBar implements ActionListener, ContainerPluginListener { - RolloverButton infoButton = new RolloverButton + JButton infoButton = new JButton (new ImageIcon(ImageLoader.getImage (ImageLoader.QUICK_MENU_INFO_ICON))); - RolloverButton configureButton = new RolloverButton + JButton configureButton = new JButton (new ImageIcon(ImageLoader.getImage (ImageLoader.QUICK_MENU_CONFIGURE_ICON))); - RolloverButton searchButton = new RolloverButton + JButton searchButton = new JButton (new ImageIcon(ImageLoader.getImage (ImageLoader.QUICK_MENU_SEARCH_ICON))); - RolloverButton addButton = new RolloverButton + JButton addButton = new JButton (new ImageIcon(ImageLoader.getImage (ImageLoader.QUICK_MENU_ADD_ICON))); diff --git a/src/net/java/sip/communicator/impl/gui/main/WelcomeWindow.java b/src/net/java/sip/communicator/impl/gui/main/WelcomeWindow.java index 0f48fc496..cfa3e3f5a 100644 --- a/src/net/java/sip/communicator/impl/gui/main/WelcomeWindow.java +++ b/src/net/java/sip/communicator/impl/gui/main/WelcomeWindow.java @@ -18,7 +18,6 @@ import javax.swing.JPanel; import javax.swing.SwingUtilities; -import net.java.sip.communicator.impl.gui.main.customcontrols.RolloverButton; import net.java.sip.communicator.impl.gui.main.i18n.Messages; import net.java.sip.communicator.impl.gui.main.login.LoginManager; import net.java.sip.communicator.impl.gui.utils.AntialiasingManager; diff --git a/src/net/java/sip/communicator/impl/gui/main/customcontrols/ListCellPanel.java b/src/net/java/sip/communicator/impl/gui/main/customcontrols/ListCellPanel.java index 3cab76566..2f364969c 100644 --- a/src/net/java/sip/communicator/impl/gui/main/customcontrols/ListCellPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/customcontrols/ListCellPanel.java @@ -126,13 +126,6 @@ public void setSelected(boolean isSelected) { } } - public void paint(Graphics g) { - - AntialiasingManager.activateAntialiasing(g); - - super.paint(g); - } - public void mouseClicked(MouseEvent e) { this.setSelected(true); diff --git a/src/net/java/sip/communicator/impl/gui/main/customcontrols/MsgToolbarButton.java b/src/net/java/sip/communicator/impl/gui/main/customcontrols/MsgToolbarButton.java index bbdf2da8f..3718ffb2f 100644 --- a/src/net/java/sip/communicator/impl/gui/main/customcontrols/MsgToolbarButton.java +++ b/src/net/java/sip/communicator/impl/gui/main/customcontrols/MsgToolbarButton.java @@ -12,7 +12,6 @@ import net.java.sip.communicator.impl.gui.utils.ImageLoader; public class MsgToolbarButton extends SIPCommButton { - public MsgToolbarButton(Image iconImage){ super( ImageLoader.getImage(ImageLoader.MSG_TOOLBAR_BUTTON_BG), diff --git a/src/net/java/sip/communicator/impl/gui/main/customcontrols/RolloverButton.java b/src/net/java/sip/communicator/impl/gui/main/customcontrols/RolloverButton.java deleted file mode 100644 index e94334ad0..000000000 --- a/src/net/java/sip/communicator/impl/gui/main/customcontrols/RolloverButton.java +++ /dev/null @@ -1,19 +0,0 @@ -package net.java.sip.communicator.impl.gui.main.customcontrols; - -import javax.swing.ImageIcon; -import javax.swing.JButton; - -public class RolloverButton extends JButton { - - public RolloverButton(String text){ - super(text); - - this.setRolloverEnabled(true); - } - - public RolloverButton(ImageIcon icon){ - super(icon); - - this.setRolloverEnabled(true); - } -} diff --git a/src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/SIPCommTabbedPane.java b/src/net/java/sip/communicator/impl/gui/main/customcontrols/SIPCommTabbedPane.java similarity index 89% rename from src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/SIPCommTabbedPane.java rename to src/net/java/sip/communicator/impl/gui/main/customcontrols/SIPCommTabbedPane.java index b333d652d..9c5d2cfeb 100644 --- a/src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/SIPCommTabbedPane.java +++ b/src/net/java/sip/communicator/impl/gui/main/customcontrols/SIPCommTabbedPane.java @@ -4,7 +4,7 @@ * Distributable under LGPL license. * See terms of license at gnu.org. */ -package net.java.sip.communicator.impl.gui.main.customcontrols.tabbedPane; +package net.java.sip.communicator.impl.gui.main.customcontrols; /* * The following code borrowed from * David Bismut, davidou@mageos.com @@ -29,6 +29,13 @@ import javax.swing.plaf.basic.BasicTabbedPaneUI; import javax.swing.plaf.metal.MetalTabbedPaneUI; +import net.java.sip.communicator.impl.gui.lookandfeel.SIPCommTabbedPaneEnhancedUI; +import net.java.sip.communicator.impl.gui.lookandfeel.SIPCommTabbedPaneUI; +import net.java.sip.communicator.impl.gui.main.customcontrols.events.CloseListener; +import net.java.sip.communicator.impl.gui.main.customcontrols.events.DoubleClickListener; +import net.java.sip.communicator.impl.gui.main.customcontrols.events.MaxListener; +import net.java.sip.communicator.impl.gui.main.customcontrols.events.PopupOutsideListener; + /** * A JTabbedPane with some added UI functionalities. A close and max/detach * icons are added to every tab, typically to let the user close or detach the @@ -41,8 +48,7 @@ public class SIPCommTabbedPane extends JTabbedPane { private int overTabIndex = -1; - private CloseTabPaneUI paneUI; - + /** * Creates the CloseAndMaxTabbedPane with an enhanced UI if * enhancedUI parameter is set to true. @@ -52,13 +58,9 @@ public class SIPCommTabbedPane extends JTabbedPane { */ public SIPCommTabbedPane(boolean enhancedUI) { super.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT); - - if (enhancedUI) - paneUI = new CloseTabPaneEnhancedUI(); - else - paneUI = new CloseTabPaneUI(); - - super.setUI(paneUI); + + if(enhancedUI) + this.setUI(new SIPCommTabbedPaneEnhancedUI()); this.setMaxIcon(false); } @@ -74,14 +76,16 @@ public int getOverTabIndex() { * Returns true if the close icon is enabled. */ public boolean isCloseEnabled() { - return paneUI.isCloseEnabled(); + SIPCommTabbedPaneUI ui = (SIPCommTabbedPaneUI)this.getUI(); + return ui.isCloseEnabled(); } /** * Returns true if the max/detach icon is enabled. */ public boolean isMaxEnabled() { - return paneUI.isMaxEnabled(); + SIPCommTabbedPaneUI ui = (SIPCommTabbedPaneUI)this.getUI(); + return ui.isMaxEnabled(); } /** @@ -96,11 +100,7 @@ public void setTabLayoutPolicy(int tabLayoutPolicy) { public void setTabPlacement(int tabPlacement) { } - /** - * Override JTabbedPane method. Does nothing. - */ - public void setUI(TabbedPaneUI ui) { - } + /** * Sets whether the tabbedPane should have a close icon or not. @@ -109,7 +109,8 @@ public void setUI(TabbedPaneUI ui) { * whether the tabbedPane should have a close icon or not */ public void setCloseIcon(boolean b) { - paneUI.setCloseIcon(b); + SIPCommTabbedPaneUI ui = (SIPCommTabbedPaneUI)this.getUI(); + ui.setCloseIcon(b); } /** @@ -119,7 +120,8 @@ public void setCloseIcon(boolean b) { * whether the tabbedPane should have a max/detach icon or not */ public void setMaxIcon(boolean b) { - paneUI.setMaxIcon(b); + SIPCommTabbedPaneUI ui = (SIPCommTabbedPaneUI)this.getUI(); + ui.setMaxIcon(b); } /** @@ -404,9 +406,10 @@ public void firePopupOutsideTabEvent(MouseEvent e) { * Overrides setSelectedIndex in JTabbedPane in order to remove the * hightlight if the tab which is selected. */ - public void setSelectedIndex(int tabIndex){ - if(paneUI.isTabHighlighted(tabIndex)){ - paneUI.tabRemoveHighlight(tabIndex); + public void setSelectedIndex(int tabIndex){ + SIPCommTabbedPaneUI ui = (SIPCommTabbedPaneUI)this.getUI(); + if(ui.isTabHighlighted(tabIndex)){ + ui.tabRemoveHighlight(tabIndex); } super.setSelectedIndex(tabIndex); } @@ -417,9 +420,10 @@ public void setSelectedIndex(int tabIndex){ * @param tabIndex The tab index. */ public void highlightTab(int tabIndex){ - if(!paneUI.isTabHighlighted(tabIndex) + SIPCommTabbedPaneUI ui = (SIPCommTabbedPaneUI)this.getUI(); + if(!ui.isTabHighlighted(tabIndex) && this.getSelectedIndex() != tabIndex) - this.paneUI.tabAddHightlight(tabIndex); + ui.tabAddHightlight(tabIndex); this.repaint(); } diff --git a/src/net/java/sip/communicator/impl/gui/main/customcontrols/SIPCommToolBar.java b/src/net/java/sip/communicator/impl/gui/main/customcontrols/SIPCommToolBar.java index f8eb043f3..7a9c30718 100644 --- a/src/net/java/sip/communicator/impl/gui/main/customcontrols/SIPCommToolBar.java +++ b/src/net/java/sip/communicator/impl/gui/main/customcontrols/SIPCommToolBar.java @@ -17,7 +17,7 @@ import javax.swing.JSeparator; import javax.swing.JToolBar; -import net.java.sip.communicator.impl.gui.main.ui.SIPCommToolBarSeparatorUI; +import net.java.sip.communicator.impl.gui.lookandfeel.SIPCommToolBarSeparatorUI; import net.java.sip.communicator.impl.gui.utils.ImageLoader; public class SIPCommToolBar extends JToolBar { diff --git a/src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/CloseListener.java b/src/net/java/sip/communicator/impl/gui/main/customcontrols/events/CloseListener.java similarity index 87% rename from src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/CloseListener.java rename to src/net/java/sip/communicator/impl/gui/main/customcontrols/events/CloseListener.java index 3f962eb16..1876aaa30 100644 --- a/src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/CloseListener.java +++ b/src/net/java/sip/communicator/impl/gui/main/customcontrols/events/CloseListener.java @@ -4,7 +4,7 @@ * Distributable under LGPL license. * See terms of license at gnu.org. */ -package net.java.sip.communicator.impl.gui.main.customcontrols.tabbedPane; +package net.java.sip.communicator.impl.gui.main.customcontrols.events; /* * The content of this file was based on code borrowed from * David Bismut, davidou@mageos.com diff --git a/src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/CloseTabbedPaneEvent.java b/src/net/java/sip/communicator/impl/gui/main/customcontrols/events/CloseTabbedPaneEvent.java similarity index 93% rename from src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/CloseTabbedPaneEvent.java rename to src/net/java/sip/communicator/impl/gui/main/customcontrols/events/CloseTabbedPaneEvent.java index 821009a80..06c66fdc4 100644 --- a/src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/CloseTabbedPaneEvent.java +++ b/src/net/java/sip/communicator/impl/gui/main/customcontrols/events/CloseTabbedPaneEvent.java @@ -4,7 +4,7 @@ * Distributable under LGPL license. * See terms of license at gnu.org. */ -package net.java.sip.communicator.impl.gui.main.customcontrols.tabbedPane; +package net.java.sip.communicator.impl.gui.main.customcontrols.events; /* * The following code is borrowed from * David Bismut, davidou@mageos.com diff --git a/src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/DoubleClickListener.java b/src/net/java/sip/communicator/impl/gui/main/customcontrols/events/DoubleClickListener.java similarity index 87% rename from src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/DoubleClickListener.java rename to src/net/java/sip/communicator/impl/gui/main/customcontrols/events/DoubleClickListener.java index f816706fc..a18fa2d49 100644 --- a/src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/DoubleClickListener.java +++ b/src/net/java/sip/communicator/impl/gui/main/customcontrols/events/DoubleClickListener.java @@ -4,7 +4,7 @@ * Distributable under LGPL license. * See terms of license at gnu.org. */ -package net.java.sip.communicator.impl.gui.main.customcontrols.tabbedPane; +package net.java.sip.communicator.impl.gui.main.customcontrols.events; /* * The following code borrowed from * David Bismut, davidou@mageos.com diff --git a/src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/MaxListener.java b/src/net/java/sip/communicator/impl/gui/main/customcontrols/events/MaxListener.java similarity index 87% rename from src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/MaxListener.java rename to src/net/java/sip/communicator/impl/gui/main/customcontrols/events/MaxListener.java index 2dbab61a1..5722bd139 100644 --- a/src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/MaxListener.java +++ b/src/net/java/sip/communicator/impl/gui/main/customcontrols/events/MaxListener.java @@ -4,7 +4,7 @@ * Distributable under LGPL license. * See terms of license at gnu.org. */ -package net.java.sip.communicator.impl.gui.main.customcontrols.tabbedPane; +package net.java.sip.communicator.impl.gui.main.customcontrols.events; /* * The following code borrowed from * David Bismut, davidou@mageos.com diff --git a/src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/PopupOutsideListener.java b/src/net/java/sip/communicator/impl/gui/main/customcontrols/events/PopupOutsideListener.java similarity index 87% rename from src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/PopupOutsideListener.java rename to src/net/java/sip/communicator/impl/gui/main/customcontrols/events/PopupOutsideListener.java index e2aa79bfb..7712f4d3f 100644 --- a/src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/PopupOutsideListener.java +++ b/src/net/java/sip/communicator/impl/gui/main/customcontrols/events/PopupOutsideListener.java @@ -4,7 +4,7 @@ * Distributable under LGPL license. * See terms of license at gnu.org. */ -package net.java.sip.communicator.impl.gui.main.customcontrols.tabbedPane; +package net.java.sip.communicator.impl.gui.main.customcontrols.events; /* * The following code borrowed from * David Bismut, davidou@mageos.com diff --git a/src/net/java/sip/communicator/impl/gui/main/login/LoginWindow.java b/src/net/java/sip/communicator/impl/gui/main/login/LoginWindow.java index 9490df04a..4ee237b22 100644 --- a/src/net/java/sip/communicator/impl/gui/main/login/LoginWindow.java +++ b/src/net/java/sip/communicator/impl/gui/main/login/LoginWindow.java @@ -32,7 +32,6 @@ import javax.swing.KeyStroke; import net.java.sip.communicator.impl.gui.main.MainFrame; -import net.java.sip.communicator.impl.gui.main.customcontrols.RolloverButton; 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; diff --git a/src/net/java/sip/communicator/impl/gui/main/message/ChatWindow.java b/src/net/java/sip/communicator/impl/gui/main/message/ChatWindow.java index 77762bbeb..e53a9a2c5 100755 --- a/src/net/java/sip/communicator/impl/gui/main/message/ChatWindow.java +++ b/src/net/java/sip/communicator/impl/gui/main/message/ChatWindow.java @@ -23,8 +23,8 @@ import javax.swing.KeyStroke; import net.java.sip.communicator.impl.gui.main.MainFrame; -import net.java.sip.communicator.impl.gui.main.customcontrols.tabbedPane.CloseListener; -import net.java.sip.communicator.impl.gui.main.customcontrols.tabbedPane.SIPCommTabbedPane; +import net.java.sip.communicator.impl.gui.main.customcontrols.SIPCommTabbedPane; +import net.java.sip.communicator.impl.gui.main.customcontrols.events.CloseListener; import net.java.sip.communicator.impl.gui.utils.Constants; import net.java.sip.communicator.impl.gui.utils.ImageLoader; import net.java.sip.communicator.service.contactlist.MetaContact; diff --git a/src/net/java/sip/communicator/impl/gui/main/ui/SIPCommToolBarSeparatorUI.java b/src/net/java/sip/communicator/impl/gui/main/ui/SIPCommToolBarSeparatorUI.java deleted file mode 100644 index 4df67922e..000000000 --- a/src/net/java/sip/communicator/impl/gui/main/ui/SIPCommToolBarSeparatorUI.java +++ /dev/null @@ -1,28 +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.ui; - -import java.awt.Graphics; -import java.awt.Graphics2D; - -import javax.swing.JComponent; -import javax.swing.plaf.basic.BasicToolBarSeparatorUI; - -import net.java.sip.communicator.impl.gui.utils.Constants; - -public class SIPCommToolBarSeparatorUI extends BasicToolBarSeparatorUI { - - public void paint(Graphics g, - JComponent c){ - - Graphics2D g2 = (Graphics2D)g; - - g2.setColor(Constants.TOOLBAR_SEPARATOR_COLOR); - g2.drawLine(c.getWidth()/2, 0, c.getWidth()/2, c.getHeight()); - } -} diff --git a/src/net/java/sip/communicator/impl/gui/main/ui/SIPCommTreeUI.java b/src/net/java/sip/communicator/impl/gui/main/ui/SIPCommTreeUI.java deleted file mode 100644 index e379e11b5..000000000 --- a/src/net/java/sip/communicator/impl/gui/main/ui/SIPCommTreeUI.java +++ /dev/null @@ -1,31 +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.ui; - -import java.awt.Graphics; - -import javax.swing.JComponent; -import javax.swing.plaf.basic.BasicTreeUI; - -public class SIPCommTreeUI extends BasicTreeUI { - - public SIPCommTreeUI() { - - } - - protected void paintHorizontalLine(Graphics g, JComponent c, int y, - int left, int right) { - - } - - protected void paintVerticalLine(Graphics g, JComponent c, int x, int top, - int bottom) { - - } - -}