diff options
86 files changed, 1066 insertions, 392 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommBorders.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommBorders.java new file mode 100644 index 0000000..eb88474 --- /dev/null +++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommBorders.java @@ -0,0 +1,6 @@ +package net.java.sip.communicator.impl.gui.lookandfeel; + + +public class SIPCommBorders { + +} diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommButtonUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommButtonUI.java new file mode 100644 index 0000000..cc33263 --- /dev/null +++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommButtonUI.java @@ -0,0 +1,152 @@ +/* + * 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.BasicStroke; +import java.awt.Color; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.Image; +import java.awt.Rectangle; + +import javax.swing.AbstractButton; +import javax.swing.ButtonModel; +import javax.swing.JComponent; +import javax.swing.plaf.ComponentUI; +import javax.swing.plaf.metal.MetalButtonUI; + +import net.java.sip.communicator.impl.gui.utils.ImageLoader; + +/** + * SIPCommButtonUI implementation. + * + * @author Yana Stamcheva + */ +public class SIPCommButtonUI extends MetalButtonUI { + + private final static Image buttonLeft + = ImageLoader.getImage(ImageLoader.BUTTON_LEFT); + + private final static Image buttonMiddle + = ImageLoader.getImage(ImageLoader.BUTTON_MIDDLE); + + private final static Image buttonRight + = ImageLoader.getImage(ImageLoader.BUTTON_RIGHT); + + private final static Image buttonRolloverLeft + = ImageLoader.getImage(ImageLoader.BUTTON_ROLLOVER_LEFT); + + private final static Image buttonRolloverMiddle + = ImageLoader.getImage(ImageLoader.BUTTON_ROLLOVER_MIDDLE); + + private final static Image buttonRolloverRight + = ImageLoader.getImage(ImageLoader.BUTTON_ROLLOVER_RIGHT); + + private final static SIPCommButtonUI sipCommButtonUI = new SIPCommButtonUI(); + +// ******************************** + // Create PLAF + // ******************************** + public static ComponentUI createUI(JComponent c) { + return sipCommButtonUI; + } + + // ******************************** + // Install + // ******************************** + public void installDefaults(AbstractButton b) { + super.installDefaults(b); + + b.setOpaque(false); + b.setBorderPainted(false); + b.setFocusPainted(true); + b.setRolloverEnabled(true); + } + + public void uninstallDefaults(AbstractButton b) { + super.uninstallDefaults(b); + + b.setBorderPainted(true); + b.setFocusPainted(false); + b.setOpaque(true); + b.setRolloverEnabled(false); + } + + public void paint(Graphics g, JComponent c) { + + AbstractButton button = (AbstractButton)c; + ButtonModel model = button.getModel(); + + Image leftImg; + Image middleImg; + Image rightImg; + + if(model.isRollover()){ + + leftImg = buttonRolloverLeft; + middleImg = buttonRolloverMiddle; + rightImg = buttonRolloverRight; + } + else{ + leftImg = buttonLeft; + middleImg = buttonMiddle; + rightImg = buttonRight; + } + + int indentWidth = leftImg.getWidth(null); + g.drawImage(leftImg, 0, 0, indentWidth, c.getHeight(), null); + g.drawImage(middleImg, indentWidth, 0, + c.getWidth()-2*indentWidth, c.getHeight(), null); + g.drawImage(rightImg, c.getWidth()-indentWidth, 0, + indentWidth, c.getHeight(), null); + + super.paint(g, c); + } + + + protected void paintFocus(Graphics g, AbstractButton b, + Rectangle viewRect, Rectangle textRect, Rectangle iconRect){ + + Graphics2D g2 = (Graphics2D)g; + + Rectangle focusRect = new Rectangle(); + String text = b.getText(); + boolean isIcon = b.getIcon() != null; + + // If there is text + if ( text != null && !text.equals( "" ) ) { + if ( !isIcon ) { + focusRect.setBounds( textRect ); + } + else { + focusRect.setBounds( iconRect.union( textRect ) ); + } + } + // If there is an icon and no text + else if ( isIcon ) { + focusRect.setBounds( iconRect ); + } + + g2.setStroke(new BasicStroke(0.5f,// Width + BasicStroke.CAP_ROUND, // End cap + BasicStroke.JOIN_ROUND, // Join style + 10.0f, // Miter limit + new float[] {1.0f,1.0f},// Dash pattern + 2.0f)); + g2.setColor(Color.GRAY); + g2.drawRoundRect((focusRect.x-3), (focusRect.y-3), + focusRect.width+4, focusRect.height+4, 5, 5); + } + + /** + * Overriden to do nothing. + */ + protected void paintButtonPressed(Graphics g, AbstractButton b){ + } + + +} diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommComboBoxUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommComboBoxUI.java new file mode 100644 index 0000000..e7bbf86 --- /dev/null +++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommComboBoxUI.java @@ -0,0 +1,18 @@ +/* + * 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 javax.swing.plaf.metal.MetalComboBoxUI; + +/** + * SIPCommComboBoxUI implementation. + * + * @author Yana Stamcheva + */ +public class SIPCommComboBoxUI extends MetalComboBoxUI { + +} diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommDefaultTheme.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommDefaultTheme.java new file mode 100644 index 0000000..b2a0669 --- /dev/null +++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommDefaultTheme.java @@ -0,0 +1,212 @@ +/* + * 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.Insets; +import java.util.Arrays; +import java.util.List; + +import javax.swing.UIDefaults; +import javax.swing.plaf.ColorUIResource; +import javax.swing.plaf.FontUIResource; +import javax.swing.plaf.metal.DefaultMetalTheme; + +import net.java.sip.communicator.impl.gui.utils.Constants; +import net.java.sip.communicator.impl.gui.utils.ImageLoader; + +/** + * SipCommunicator default theme. + * + * @author Yana Stamcheva + */ + +public class SIPCommDefaultTheme + extends DefaultMetalTheme +{ + private static final ColorUIResource DARK_BLUE + = new ColorUIResource(0x3f6296); + private static final ColorUIResource LIGHT_BLUE + = new ColorUIResource(0x96A9C6); + private static final ColorUIResource LIGHT_BLUE_GRAY + = new ColorUIResource(0xD3DDED); + private static final ColorUIResource LIGHT_GRAY + = new ColorUIResource(0xEEEEEE); + private static final ColorUIResource GRAY + = new ColorUIResource(0xC0C0C0); + private static final ColorUIResource VERY_LIGHT_GRAY + = new ColorUIResource(0xFAFAFA); + + private static final ColorUIResource CONTROL_TEXT_COLOR + = new ColorUIResource(0x333333); + private static final ColorUIResource INACTIVE_CONTROL_TEXT_COLOR + = new ColorUIResource(0x999999); + private static final ColorUIResource MENU_DISABLED_FOREGROUND + = new ColorUIResource(0x999999); + private static final ColorUIResource OCEAN_BLACK + = new ColorUIResource(0x333333); + + private static final FontUIResource BASIC_FONT + = new FontUIResource(Constants.FONT); + + public SIPCommDefaultTheme() { + } + + public void addCustomEntriesToTable(UIDefaults table) { + + List buttonGradient = Arrays.asList( + new Object[] {new Float(.3f), new Float(0f), + DARK_BLUE, getWhite(), getSecondary2()}); + + List sliderGradient = Arrays.asList(new Object[] { + new Float(.3f), new Float(.2f), + DARK_BLUE, getWhite(), new ColorUIResource(LIGHT_BLUE_GRAY) }); + + Object[] defaults = new Object[] { + "Button.rollover", Boolean.TRUE, + + "CheckBox.rollover", Boolean.TRUE, + "CheckBox.gradient", buttonGradient, + + "CheckBoxMenuItem.gradient", buttonGradient, + + "Menu.opaque", Boolean.FALSE, + + "MenuBar.gradient", Arrays.asList(new Object[] { + new Float(1f), new Float(0f), + getWhite(), DARK_BLUE, + new ColorUIResource(DARK_BLUE) }), + + "InternalFrame.activeTitleGradient", buttonGradient, + + "OptionPane.warningIcon", + ImageLoader.getImage(ImageLoader.WARNING_ICON), + + "RadioButton.gradient", buttonGradient, + "RadioButton.rollover", Boolean.TRUE, + + "RadioButtonMenuItem.gradient", buttonGradient, + + "ScrollBar.gradient", buttonGradient, + + "Slider.altTrackColor", new ColorUIResource(0xD2E2EF), + "Slider.gradient", sliderGradient, + "Slider.focusGradient", sliderGradient, + + "SplitPane.oneTouchButtonsOpaque", Boolean.FALSE, + "SplitPane.dividerFocusColor", LIGHT_BLUE_GRAY, + "SplitPane.dividerSize", new Integer(5), + + "TabbedPane.borderHightlightColor", LIGHT_BLUE, + "TabbedPane.contentBorderInsets", new Insets(2, 2, 3, 3), + "TabbedPane.selected", LIGHT_GRAY, + "TabbedPane.tabAreaInsets", new Insets(2, 2, 0, 6), + "TabbedPane.unselectedBackground", LIGHT_GRAY, + + "Table.gridColor", LIGHT_BLUE_GRAY, + + "ToggleButton.gradient", buttonGradient, + + "ToolBar.isRollover", Boolean.TRUE, + + "ToolTip.background", LIGHT_GRAY, + "ToolTip.backgroundInactive", LIGHT_GRAY, + "ToolTip.hideAccelerator", Boolean.FALSE + }; + table.putDefaults(defaults); + } + + /** + * Overriden to enable picking up the system fonts, if applicable. + */ + boolean isSystemTheme() { + return true; + } + + public String getName() { + return "SipCommunicator"; + } + + protected ColorUIResource getPrimary1() { + return DARK_BLUE; + } + + protected ColorUIResource getPrimary2() { + return LIGHT_BLUE; + } + + protected ColorUIResource getPrimary3() { + return GRAY; + } + + protected ColorUIResource getSecondary1() { + return DARK_BLUE; + } + + protected ColorUIResource getSecondary2() { + return GRAY; + } + + protected ColorUIResource getSecondary3() { + return LIGHT_GRAY; + } + + protected ColorUIResource getBlack() { + return OCEAN_BLACK; + } + + public ColorUIResource getDesktopColor() { + return new ColorUIResource( 255, 255, 255 ); + } + + public ColorUIResource getWindowBackground() { + return new ColorUIResource( 255, 255, 255 ); + } + + public ColorUIResource getControl(){ + return VERY_LIGHT_GRAY; + } + + public ColorUIResource getMenuBackground(){ + return VERY_LIGHT_GRAY; + } + + public ColorUIResource getInactiveControlTextColor() { + return INACTIVE_CONTROL_TEXT_COLOR; + } + + public ColorUIResource getControlTextColor() { + return CONTROL_TEXT_COLOR; + } + + public ColorUIResource getMenuDisabledForeground() { + return MENU_DISABLED_FOREGROUND; + } + + public FontUIResource getControlTextFont() { + return BASIC_FONT; + } + + public FontUIResource getSystemTextFont() { + return BASIC_FONT; + } + + public FontUIResource getUserTextFont() { + return BASIC_FONT; + } + + public FontUIResource getMenuTextFont() { + return BASIC_FONT; + } + + public FontUIResource getWindowTitleFont() { + return BASIC_FONT; + } + + public FontUIResource getSubTextFont() { + return BASIC_FONT; + } +} diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommLFUtils.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommLFUtils.java new file mode 100644 index 0000000..a6beb64 --- /dev/null +++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommLFUtils.java @@ -0,0 +1,18 @@ +/* + * 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.Color; +import java.awt.Graphics; + +/** + * + * @author Yana Stamcheva + */ +public class SIPCommLFUtils { + +} diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommLookAndFeel.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommLookAndFeel.java new file mode 100644 index 0000000..b9cfb09 --- /dev/null +++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommLookAndFeel.java @@ -0,0 +1,51 @@ +/* + * 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 javax.swing.UIDefaults; +import javax.swing.plaf.metal.MetalLookAndFeel; + +/** + * The default SIP-Communicator look&feel. + * + * @author Yana Stamcheva + */ +public class SIPCommLookAndFeel extends MetalLookAndFeel { + + public boolean isNativeLookAndFeel() { + return false; + } + + public boolean isSupportedLookAndFeel() { + return true; + } + + public String getDescription() { + return "The SIP-Communicator look and feel."; + } + + public String getID() { + return "SIPCommunicator"; + } + + public String getName() { + return "SIPCommLookAndFeel"; + } + + + protected void initClassDefaults(UIDefaults table) { + super.initClassDefaults(table); + + String lfPackageName = "net.java.sip.communicator.impl.gui.lookandfeel."; + + Object[] uiDefaults = { + "ButtonUI", lfPackageName + "SIPCommButtonUI", + "SplitPaneUI", lfPackageName + "SIPCommSplitPaneUI" + }; + table.putDefaults(uiDefaults); + } +} diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommSplitPaneDivider.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommSplitPaneDivider.java new file mode 100644 index 0000000..9ff83f4 --- /dev/null +++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommSplitPaneDivider.java @@ -0,0 +1,344 @@ +/* + * 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.Color; +import java.awt.Component; +import java.awt.Container; +import java.awt.Cursor; +import java.awt.Dimension; +import java.awt.Graphics; +import java.awt.Image; +import java.awt.Insets; +import java.awt.LayoutManager; +import java.awt.Rectangle; + +import javax.swing.JButton; +import javax.swing.JSplitPane; +import javax.swing.border.Border; +import javax.swing.plaf.basic.BasicSplitPaneDivider; +import javax.swing.plaf.basic.BasicSplitPaneUI; +import javax.swing.plaf.metal.MetalLookAndFeel; + +import net.java.sip.communicator.impl.gui.utils.ImageLoader; + +/** + * Divider used by SIPCommSplitPaneUI. + * + * @author Yana Stamcheva + */ +class SIPCommSplitPaneDivider extends BasicSplitPaneDivider { + + private Image horizontalDivider = ImageLoader.getImage(ImageLoader.SPLITPANE_HORIZONTAL); + private Image verticalDivider = ImageLoader.getImage(ImageLoader.SPLITPANE_VERTICAL); + + public SIPCommSplitPaneDivider(BasicSplitPaneUI ui) { + super(ui); + setLayout(new DividerLayout()); + } + + public void paint(Graphics g) { + Rectangle clip = g.getClipBounds(); + + if(getOrientationFromSuper() == JSplitPane.VERTICAL_SPLIT) + g.drawImage(horizontalDivider, + (getSize().width - horizontalDivider.getWidth(null))/2 , + clip.y + (getSize().height - horizontalDivider.getHeight(null))/2, + horizontalDivider.getWidth(null), + horizontalDivider.getHeight(null), + null); + else + g.drawImage(verticalDivider, + clip.x + (getSize().width - verticalDivider.getWidth(null))/2 , + (getSize().height - verticalDivider.getHeight(null))/2, + verticalDivider.getWidth(null), + verticalDivider.getHeight(null), + null); + + super.paint(g); + } + + /** + * Creates and return an instance of JButton that can be used to + * collapse the left component in the metal split pane. + */ + protected JButton createLeftOneTouchButton() { + JButton b = new JButton() { + // Sprite buffer for the arrow image of the left button + int[][] buffer = {{0, 0, 0, 2, 2, 0, 0, 0, 0}, + {0, 0, 2, 1, 1, 1, 0, 0, 0}, + {0, 2, 1, 1, 1, 1, 1, 0, 0}, + {2, 1, 1, 1, 1, 1, 1, 1, 0}, + {0, 3, 3, 3, 3, 3, 3, 3, 3}}; + + public void setBorder(Border b) { + } + + public void paint(Graphics g) { + JSplitPane splitPane = getSplitPaneFromSuper(); + if(splitPane != null) { + int oneTouchSize = getOneTouchSizeFromSuper(); + int orientation = getOrientationFromSuper(); + int blockSize = Math.min(getDividerSize(), + oneTouchSize); + + // Initialize the color array + Color[] colors = { + this.getBackground(), + MetalLookAndFeel.getPrimaryControlDarkShadow(), + MetalLookAndFeel.getPrimaryControlInfo(), + MetalLookAndFeel.getPrimaryControlHighlight()}; + + // Fill the background first ... + g.setColor(this.getBackground()); + g.fillRect(0, 0, this.getWidth(), + this.getHeight()); + + // ... then draw the arrow. + if (getModel().isPressed()) { + // Adjust color mapping for pressed button state + colors[1] = colors[2]; + } + if(orientation == JSplitPane.VERTICAL_SPLIT) { + // Draw the image for a vertical split + for (int i=1; i<=buffer[0].length; i++) { + for (int j=1; j<blockSize; j++) { + if (buffer[j-1][i-1] == 0) { + continue; + } + else { + g.setColor( + colors[buffer[j-1][i-1]]); + } + g.drawLine(i, j, i, j); + } + } + } + else { + // Draw the image for a horizontal split + // by simply swaping the i and j axis. + // Except the drawLine() call this code is + // identical to the code block above. This was done + // in order to remove the additional orientation + // check for each pixel. + for (int i=1; i<=buffer[0].length; i++) { + for (int j=1; j<blockSize; j++) { + if (buffer[j-1][i-1] == 0) { + // Nothing needs + // to be drawn + continue; + } + else { + // Set the color from the + // color map + g.setColor( + colors[buffer[j-1][i-1]]); + } + // Draw a pixel + g.drawLine(j, i, j, i); + } + } + } + } + } + + // Don't want the button to participate in focus traversable. + public boolean isFocusTraversable() { + return false; + } + }; + + b.setRequestFocusEnabled(false); + b.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); + b.setFocusPainted(false); + b.setBorderPainted(false); + return b; + } + + /** + * Creates and return an instance of JButton that can be used to + * collapse the right component in the metal split pane. + */ + protected JButton createRightOneTouchButton() { + JButton b = new JButton() { + // Sprite buffer for the arrow image of the right button + int[][] buffer = {{2, 2, 2, 2, 2, 2, 2, 2}, + {0, 1, 1, 1, 1, 1, 1, 3}, + {0, 0, 1, 1, 1, 1, 3, 0}, + {0, 0, 0, 1, 1, 3, 0, 0}, + {0, 0, 0, 0, 3, 0, 0, 0}}; + + public void setBorder(Border border) { + } + + public void paint(Graphics g) { + JSplitPane splitPane = getSplitPaneFromSuper(); + if(splitPane != null) { + int oneTouchSize = getOneTouchSizeFromSuper(); + int orientation = getOrientationFromSuper(); + int blockSize = Math.min(getDividerSize(), + oneTouchSize); + + // Initialize the color array + Color[] colors = { + this.getBackground(), + MetalLookAndFeel.getPrimaryControlDarkShadow(), + MetalLookAndFeel.getPrimaryControlInfo(), + MetalLookAndFeel.getPrimaryControlHighlight()}; + + // Fill the background first ... + g.setColor(this.getBackground()); + g.fillRect(0, 0, this.getWidth(), + this.getHeight()); + + // ... then draw the arrow. + if (getModel().isPressed()) { + // Adjust color mapping for pressed button state + colors[1] = colors[2]; + } + if(orientation == JSplitPane.VERTICAL_SPLIT) { + // Draw the image for a vertical split + for (int i=1; i<=buffer[0].length; i++) { + for (int j=1; j<blockSize; j++) { + if (buffer[j-1][i-1] == 0) { + continue; + } + else { + g.setColor( + colors[buffer[j-1][i-1]]); + } + g.drawLine(i, j, i, j); + } + } + } + else { + // Draw the image for a horizontal split + // by simply swaping the i and j axis. + // Except the drawLine() call this code is + // identical to the code block above. This was done + // in order to remove the additional orientation + // check for each pixel. + for (int i=1; i<=buffer[0].length; i++) { + for (int j=1; j<blockSize; j++) { + if (buffer[j-1][i-1] == 0) { + // Nothing needs + // to be drawn + continue; + } + else { + // Set the color from the + // color map + g.setColor( + colors[buffer[j-1][i-1]]); + } + // Draw a pixel + g.drawLine(j, i, j, i); + } + } + } + } + } + + // Don't want the button to participate in focus traversable. + public boolean isFocusTraversable() { + return false; + } + }; + + b.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); + b.setFocusPainted(false); + b.setBorderPainted(false); + b.setRequestFocusEnabled(false); + return b; + } + + /** + * Used to layout a SIPCommSplitPaneDivider. Layout for the divider + * involves appropriately moving the left/right buttons around. + * <p> + * This inner class is marked "public" due to a compiler bug. + * This class should be treated as a "protected" inner class. + * Instantiate it only within subclasses of MetalSplitPaneDivider. + */ + public class DividerLayout implements LayoutManager { + public void layoutContainer(Container c) { + if (leftButton != null && rightButton != null && + c == SIPCommSplitPaneDivider.this) { + + Dimension leftSize = leftButton.getPreferredSize(); + Dimension rightSize = rightButton.getPreferredSize(); + + if (splitPane.isOneTouchExpandable()) { + Insets insets = getInsets(); + if (insets == null) { + insets = new Insets(0 , 0, 0, 0); + } + if (orientation == JSplitPane.VERTICAL_SPLIT) { + int blockSize = getDividerSize() - (insets.left + insets.right); + int y = (c.getSize().height - blockSize) / 2; + leftButton.setBounds(insets.left + leftSize.width, y, leftSize.width, leftSize.height); + rightButton.setBounds((insets.left * 2) + leftSize.width + + rightSize.width, y, rightSize.width, rightSize.height); + } + else { + int blockSize = getDividerSize() - (insets.top + insets.bottom); + int x = (c.getSize().width - blockSize) / 2; + leftButton.setBounds(x, insets.top + leftSize.height, leftSize.width, leftSize.height); + rightButton.setBounds(x, (insets.top * 2) + leftSize.height + + rightSize.height, rightSize.width, rightSize.height); + } + } + else { + leftButton.setBounds(-5, -5, 1, 1); + rightButton.setBounds(-5, -5, 1, 1); + } + } + } + + public Dimension minimumLayoutSize(Container c) { + return new Dimension(0,0); + } + + public Dimension preferredLayoutSize(Container c) { + return new Dimension(0, 0); + } + + public void removeLayoutComponent(Component c) {} + + public void addLayoutComponent(String string, Component c) {} + } + + /* + * The following methods only exist in order to be able to access protected + * members in the superclass, because these are otherwise not available + * in any inner class. + */ + + int getOneTouchSizeFromSuper() { + return super.ONE_TOUCH_SIZE; + } + + int getOneTouchOffsetFromSuper() { + return super.ONE_TOUCH_OFFSET; + } + + int getOrientationFromSuper() { + return super.orientation; + } + + JSplitPane getSplitPaneFromSuper() { + return super.splitPane; + } + + JButton getLeftButtonFromSuper() { + return super.leftButton; + } + + JButton getRightButtonFromSuper() { + return super.rightButton; + } +} diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommSplitPaneUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommSplitPaneUI.java new file mode 100644 index 0000000..adab671 --- /dev/null +++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommSplitPaneUI.java @@ -0,0 +1,32 @@ +/* + * 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 javax.swing.JComponent; +import javax.swing.plaf.ComponentUI; +import javax.swing.plaf.basic.BasicSplitPaneDivider; +import javax.swing.plaf.metal.MetalSplitPaneUI; + +/** + * SIP-Communicator split pane. + * + * @author Yana Stamcheva + */ +public class SIPCommSplitPaneUI extends MetalSplitPaneUI { + /** + * Creates a new MetalSplitPaneUI instance + */ + public static ComponentUI createUI(JComponent x) { + return new SIPCommSplitPaneUI(); + } + /** + * Creates the default divider. + */ + public BasicSplitPaneDivider createDefaultDivider() { + return new SIPCommSplitPaneDivider(this); + } +} diff --git a/src/net/java/sip/communicator/impl/gui/main/CallPanel.java b/src/net/java/sip/communicator/impl/gui/main/CallPanel.java index 51f04c4..08f23eb 100644 --- a/src/net/java/sip/communicator/impl/gui/main/CallPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/CallPanel.java @@ -18,7 +18,7 @@ import javax.swing.JComboBox; import javax.swing.JPanel; import net.java.sip.communicator.impl.gui.main.customcontrols.SIPCommButton; -import net.java.sip.communicator.impl.gui.main.utils.ImageLoader; +import net.java.sip.communicator.impl.gui.utils.ImageLoader; /** * @author Yana Stamcheva @@ -35,15 +35,11 @@ public class CallPanel extends JPanel implements ActionListener{ private SIPCommButton callButton = new SIPCommButton (ImageLoader.getImage(ImageLoader.CALL_BUTTON_BG), - ImageLoader.getImage(ImageLoader.CALL_ROLLOVER_BUTTON_BG), - ImageLoader.getImage(ImageLoader.CALL_PRESSED_BUTTON_BG), - null); + ImageLoader.getImage(ImageLoader.CALL_ROLLOVER_BUTTON_BG)); private SIPCommButton hangupButton = new SIPCommButton (ImageLoader.getImage(ImageLoader.HANGUP_BUTTON_BG), - ImageLoader.getImage(ImageLoader.HANGUP_ROLLOVER_BUTTON_BG), - ImageLoader.getImage(ImageLoader.HANGUP_PRESSED_BUTTON_BG), - null); + ImageLoader.getImage(ImageLoader.HANGUP_ROLLOVER_BUTTON_BG)); private SIPCommButton minimizeButton = new SIPCommButton( diff --git a/src/net/java/sip/communicator/impl/gui/main/CallReceivePanel.java b/src/net/java/sip/communicator/impl/gui/main/CallReceivePanel.java index 3dc081a..ed5f3d4 100644 --- a/src/net/java/sip/communicator/impl/gui/main/CallReceivePanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/CallReceivePanel.java @@ -20,16 +20,10 @@ import javax.swing.JLabel; import javax.swing.JPanel; import net.java.sip.communicator.impl.gui.main.customcontrols.SIPCommButton; -import net.java.sip.communicator.impl.gui.main.utils.ImageLoader; +import net.java.sip.communicator.impl.gui.utils.ImageLoader; public class CallReceivePanel extends JDialog{ - private Image callButtonPressedIcon - = ImageLoader.getImage(ImageLoader.CALL_PRESSED_BUTTON_BG); - - private Image hangupButtonPressedIcon - = ImageLoader.getImage(ImageLoader.HANGUP_PRESSED_BUTTON_BG); - private Image callButtonBG = ImageLoader.getImage(ImageLoader.CALL_BUTTON_BG); private Image callButtonRolloverBG @@ -71,11 +65,9 @@ public class CallReceivePanel extends JDialog{ this.getContentPane().setLayout(new BorderLayout()); - callButton = new SIPCommButton(callButtonBG, callButtonRolloverBG, - callButtonPressedIcon, null); + callButton = new SIPCommButton(callButtonBG, callButtonRolloverBG); - hangupButton = new SIPCommButton(hangupButtonBG, - hangupButtonRolloverBG, hangupButtonPressedIcon, null); + hangupButton = new SIPCommButton(hangupButtonBG, hangupButtonRolloverBG); diff --git a/src/net/java/sip/communicator/impl/gui/main/CommunicatorMain.java b/src/net/java/sip/communicator/impl/gui/main/CommunicatorMain.java index 9da8b68..0522a11 100755 --- a/src/net/java/sip/communicator/impl/gui/main/CommunicatorMain.java +++ b/src/net/java/sip/communicator/impl/gui/main/CommunicatorMain.java @@ -15,8 +15,10 @@ import javax.swing.UIManager; import javax.swing.plaf.metal.MetalLookAndFeel; import javax.swing.plaf.metal.MetalTheme; +import net.java.sip.communicator.impl.gui.lookandfeel.SIPCommDefaultTheme; +import net.java.sip.communicator.impl.gui.lookandfeel.SIPCommLookAndFeel; import net.java.sip.communicator.impl.gui.main.configforms.ConfigurationFrame; -import net.java.sip.communicator.impl.gui.main.utils.ImageLoader; +import net.java.sip.communicator.impl.gui.utils.ImageLoader; import com.l2fprod.gui.plaf.skin.Skin; import com.l2fprod.gui.plaf.skin.SkinLookAndFeel; @@ -49,86 +51,22 @@ public class CommunicatorMain { public void setDefaultThemePack() { - try { - // Instantiate the look and feel locally so that it gets loaded - // through the OSGI class loader and not the system one. Setting - // the UIDefaults "ClassLoader" property does not seem to do the - // trick and it looks like it is only being used when loading - // resources. - SkinLookAndFeel slnf = new SkinLookAndFeel(); - - SkinLookAndFeel.setSkin(SkinLookAndFeel - .loadThemePackDefinition(getClass() - .getClassLoader() - .getResource( - "net/java/sip/communicator/impl/gui/themepacks/" - + "aquathemepack/skinlf-themepack.xml"))); - + try { + SIPCommLookAndFeel lf = new SIPCommLookAndFeel(); + SIPCommLookAndFeel.setCurrentTheme(new SIPCommDefaultTheme()); + // we need to set the UIDefaults class loader so that it may access // resources packed inside OSGI bundles UIManager.put("ClassLoader", getClass() .getClassLoader()); - UIManager.setLookAndFeel(slnf); - } catch (MalformedURLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - - public void setThemePack(String themePack) { - - try { - if (themePack.endsWith(".xml")) { - - SkinLookAndFeel.setSkin(SkinLookAndFeel - .loadThemePackDefinition(new File( - themePack).toURL())); - - UIManager.put("ClassLoader", getClass() - .getClassLoader()); - UIManager.setLookAndFeel - ("com.l2fprod.gui.plaf.skin.SkinLookAndFeel"); - - } else if (themePack.startsWith("class:")) { - - String classname = themePack - .substring("class:".length()); - SkinLookAndFeel.setSkin((Skin) Class.forName( - classname).newInstance()); - UIManager.setLookAndFeel - ("com.l2fprod.gui.plaf.skin.SkinLookAndFeel"); - - } else if (themePack.startsWith("theme:")) { - - String classname = themePack - .substring("theme:".length()); - MetalTheme theme = (MetalTheme) Class.forName( - classname).newInstance(); - MetalLookAndFeel metal = new MetalLookAndFeel(); - MetalLookAndFeel.setCurrentTheme(theme); - UIManager.setLookAndFeel(metal); - - } else { - - SkinLookAndFeel.setSkin(SkinLookAndFeel - .loadThemePack(themePack)); - UIManager.setLookAndFeel - ("com.l2fprod.gui.plaf.skin.SkinLookAndFeel"); - } - - } catch (MalformedURLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + UIManager.setLookAndFeel(lf); } catch (Exception e) { // TODO Auto-generated catch block e.printStackTrace(); } } - + public void showCommunicator(boolean isVisible) { this.mainFrame.pack(); this.mainFrame.setVisible(isVisible); diff --git a/src/net/java/sip/communicator/impl/gui/main/DialPanel.java b/src/net/java/sip/communicator/impl/gui/main/DialPanel.java index c9102ae..38c512d 100755 --- a/src/net/java/sip/communicator/impl/gui/main/DialPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/DialPanel.java @@ -19,8 +19,8 @@ import javax.swing.JComboBox; import javax.swing.JPanel; import net.java.sip.communicator.impl.gui.main.customcontrols.SIPCommButton; -import net.java.sip.communicator.impl.gui.main.utils.Constants; -import net.java.sip.communicator.impl.gui.main.utils.ImageLoader; +import net.java.sip.communicator.impl.gui.utils.Constants; +import net.java.sip.communicator.impl.gui.utils.ImageLoader; /** * @author Yana Stamcheva diff --git a/src/net/java/sip/communicator/impl/gui/main/MainFrame.java b/src/net/java/sip/communicator/impl/gui/main/MainFrame.java index 38bce73..b31b55e 100755 --- a/src/net/java/sip/communicator/impl/gui/main/MainFrame.java +++ b/src/net/java/sip/communicator/impl/gui/main/MainFrame.java @@ -11,7 +11,6 @@ import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.Toolkit; import java.beans.PropertyChangeEvent; -import java.util.ArrayList; import java.util.Hashtable; import java.util.Iterator; import java.util.Map; @@ -24,8 +23,8 @@ import net.java.sip.communicator.impl.gui.main.contactlist.CListKeySearchListene import net.java.sip.communicator.impl.gui.main.contactlist.ContactListModel; import net.java.sip.communicator.impl.gui.main.contactlist.ContactListPanel; import net.java.sip.communicator.impl.gui.main.i18n.Messages; -import net.java.sip.communicator.impl.gui.main.utils.Constants; -import net.java.sip.communicator.impl.gui.main.utils.ImageLoader; +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; import net.java.sip.communicator.service.contactlist.MetaContactListService; import net.java.sip.communicator.service.protocol.Contact; 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 d384de0..8b583ff 100755 --- a/src/net/java/sip/communicator/impl/gui/main/MainTabbedPane.java +++ b/src/net/java/sip/communicator/impl/gui/main/MainTabbedPane.java @@ -7,20 +7,11 @@ package net.java.sip.communicator.impl.gui.main; -import java.awt.Graphics; -import java.awt.event.KeyEvent; -import java.awt.event.KeyListener; - import javax.swing.JPanel; -import javax.swing.JTabbedPane; -import javax.swing.text.Position; -import net.java.sip.communicator.impl.gui.main.contactlist.CListKeySearchListener; -import net.java.sip.communicator.impl.gui.main.contactlist.ContactList; 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.i18n.Messages; -import net.java.sip.communicator.impl.gui.main.utils.AntialiasingManager; /** * @author Yana Stamcheva diff --git a/src/net/java/sip/communicator/impl/gui/main/Menu.java b/src/net/java/sip/communicator/impl/gui/main/Menu.java index 0be0480..12ced01 100755 --- a/src/net/java/sip/communicator/impl/gui/main/Menu.java +++ b/src/net/java/sip/communicator/impl/gui/main/Menu.java @@ -13,7 +13,7 @@ import javax.swing.JMenu; import javax.swing.JMenuBar; import net.java.sip.communicator.impl.gui.main.i18n.Messages; -import net.java.sip.communicator.impl.gui.main.utils.AntialiasingManager; +import net.java.sip.communicator.impl.gui.utils.AntialiasingManager; /** * The main menu. 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 91aff38..e76ac7e 100755 --- a/src/net/java/sip/communicator/impl/gui/main/QuickMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/QuickMenu.java @@ -11,7 +11,6 @@ import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.event.ContainerEvent; import javax.swing.BorderFactory; import javax.swing.ImageIcon; @@ -19,11 +18,11 @@ import javax.swing.JButton; 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.ContactList; 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.main.utils.ImageLoader; +import net.java.sip.communicator.impl.gui.utils.ImageLoader; /** * @author Yana Stamcheva * @@ -32,19 +31,19 @@ import net.java.sip.communicator.impl.gui.main.utils.ImageLoader; public class QuickMenu extends SIPCommToolBar implements ActionListener, ContainerPluginListener { - JButton infoButton = new JButton + RolloverButton infoButton = new RolloverButton (new ImageIcon(ImageLoader.getImage (ImageLoader.QUICK_MENU_INFO_ICON))); - JButton configureButton = new JButton + RolloverButton configureButton = new RolloverButton (new ImageIcon(ImageLoader.getImage (ImageLoader.QUICK_MENU_CONFIGURE_ICON))); - JButton searchButton = new JButton + RolloverButton searchButton = new RolloverButton (new ImageIcon(ImageLoader.getImage (ImageLoader.QUICK_MENU_SEARCH_ICON))); - JButton addButton = new JButton + RolloverButton addButton = new RolloverButton (new ImageIcon(ImageLoader.getImage (ImageLoader.QUICK_MENU_ADD_ICON))); diff --git a/src/net/java/sip/communicator/impl/gui/main/StatusPanel.java b/src/net/java/sip/communicator/impl/gui/main/StatusPanel.java index f727325..6e3d70c 100644 --- a/src/net/java/sip/communicator/impl/gui/main/StatusPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/StatusPanel.java @@ -16,8 +16,8 @@ import javax.swing.BorderFactory; import javax.swing.ImageIcon; import javax.swing.JPanel; -import net.java.sip.communicator.impl.gui.main.utils.Constants; -import net.java.sip.communicator.impl.gui.main.utils.ImageLoader; +import net.java.sip.communicator.impl.gui.utils.Constants; +import net.java.sip.communicator.impl.gui.utils.ImageLoader; import net.java.sip.communicator.service.protocol.ProtocolProviderService; /** diff --git a/src/net/java/sip/communicator/impl/gui/main/StatusSelectorBox.java b/src/net/java/sip/communicator/impl/gui/main/StatusSelectorBox.java index 50c8891..8261b99 100644 --- a/src/net/java/sip/communicator/impl/gui/main/StatusSelectorBox.java +++ b/src/net/java/sip/communicator/impl/gui/main/StatusSelectorBox.java @@ -29,8 +29,8 @@ 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.main.utils.AntialiasingManager; -import net.java.sip.communicator.impl.gui.main.utils.ImageLoader; +import net.java.sip.communicator.impl.gui.utils.AntialiasingManager; +import net.java.sip.communicator.impl.gui.utils.ImageLoader; import net.java.sip.communicator.service.protocol.OperationFailedException; import net.java.sip.communicator.service.protocol.OperationSetPresence; import net.java.sip.communicator.service.protocol.PresenceStatus; 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 bd94ed1..0f48fc4 100644 --- a/src/net/java/sip/communicator/impl/gui/main/WelcomeWindow.java +++ b/src/net/java/sip/communicator/impl/gui/main/WelcomeWindow.java @@ -10,31 +10,24 @@ import java.awt.Image; import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.net.URL; import javax.swing.BorderFactory; import javax.swing.JButton; import javax.swing.JDialog; import javax.swing.JLabel; import javax.swing.JPanel; -import javax.swing.JViewport; -import javax.swing.JWindow; import javax.swing.SwingUtilities; -import javax.swing.event.HyperlinkEvent; -import javax.swing.event.HyperlinkListener; -import org.osgi.framework.BundleContext; -import org.osgi.framework.BundleException; - -import net.java.sip.communicator.impl.gui.GuiActivator; +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.main.login.LoginWindow; -import net.java.sip.communicator.impl.gui.main.utils.AntialiasingManager; -import net.java.sip.communicator.impl.gui.main.utils.BrowserLauncher; -import net.java.sip.communicator.impl.gui.main.utils.ImageLoader; +import net.java.sip.communicator.impl.gui.utils.AntialiasingManager; +import net.java.sip.communicator.impl.gui.utils.ImageLoader; import net.java.sip.communicator.util.Logger; +import org.osgi.framework.BundleContext; +import org.osgi.framework.BundleException; + public class WelcomeWindow extends JDialog implements ActionListener{ diff --git a/src/net/java/sip/communicator/impl/gui/main/configforms/AccountsConfigurationForm.java b/src/net/java/sip/communicator/impl/gui/main/configforms/AccountsConfigurationForm.java index 4c8a763..0efd3f3 100644 --- a/src/net/java/sip/communicator/impl/gui/main/configforms/AccountsConfigurationForm.java +++ b/src/net/java/sip/communicator/impl/gui/main/configforms/AccountsConfigurationForm.java @@ -15,7 +15,7 @@ import javax.swing.ImageIcon; import javax.swing.JPanel; import net.java.sip.communicator.impl.gui.main.i18n.Messages; -import net.java.sip.communicator.impl.gui.main.utils.ImageLoader; +import net.java.sip.communicator.impl.gui.utils.ImageLoader; public class AccountsConfigurationForm extends JPanel diff --git a/src/net/java/sip/communicator/impl/gui/main/configforms/AppearanceConfigurationForm.java b/src/net/java/sip/communicator/impl/gui/main/configforms/AppearanceConfigurationForm.java index 9f0e91e..92eb23f 100644 --- a/src/net/java/sip/communicator/impl/gui/main/configforms/AppearanceConfigurationForm.java +++ b/src/net/java/sip/communicator/impl/gui/main/configforms/AppearanceConfigurationForm.java @@ -19,8 +19,8 @@ import javax.swing.JCheckBox; import javax.swing.JPanel; import net.java.sip.communicator.impl.gui.main.i18n.Messages; -import net.java.sip.communicator.impl.gui.main.utils.AntialiasingManager; -import net.java.sip.communicator.impl.gui.main.utils.ImageLoader; +import net.java.sip.communicator.impl.gui.utils.AntialiasingManager; +import net.java.sip.communicator.impl.gui.utils.ImageLoader; public class AppearanceConfigurationForm extends JPanel diff --git a/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigMenuItemPanel.java b/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigMenuItemPanel.java index d64dedc..9a939b6 100644 --- a/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigMenuItemPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigMenuItemPanel.java @@ -19,7 +19,7 @@ import javax.swing.Icon; import javax.swing.JLabel; import net.java.sip.communicator.impl.gui.main.customcontrols.ListCellPanel; -import net.java.sip.communicator.impl.gui.main.utils.Constants; +import net.java.sip.communicator.impl.gui.utils.Constants; public class ConfigMenuItemPanel extends ListCellPanel implements MouseListener { diff --git a/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigurationFrame.java b/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigurationFrame.java index 3ef289b..e7b70f7 100644 --- a/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigurationFrame.java +++ b/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigurationFrame.java @@ -20,9 +20,8 @@ import javax.swing.JScrollPane; import net.java.sip.communicator.impl.gui.main.customcontrols.SIPCommList; import net.java.sip.communicator.impl.gui.main.customcontrols.TitlePanel; -import net.java.sip.communicator.impl.gui.main.utils.AntialiasingManager; -import net.java.sip.communicator.impl.gui.main.utils.Constants; -import net.java.sip.communicator.impl.gui.main.configforms.ConfigurationForm; +import net.java.sip.communicator.impl.gui.utils.AntialiasingManager; +import net.java.sip.communicator.impl.gui.utils.Constants; /** * @author Yana Stamcheva diff --git a/src/net/java/sip/communicator/impl/gui/main/configforms/GeneralConfigurationForm.java b/src/net/java/sip/communicator/impl/gui/main/configforms/GeneralConfigurationForm.java index 889151e..109cf03 100644 --- a/src/net/java/sip/communicator/impl/gui/main/configforms/GeneralConfigurationForm.java +++ b/src/net/java/sip/communicator/impl/gui/main/configforms/GeneralConfigurationForm.java @@ -19,8 +19,8 @@ import javax.swing.JCheckBox; import javax.swing.JPanel; import net.java.sip.communicator.impl.gui.main.i18n.Messages; -import net.java.sip.communicator.impl.gui.main.utils.AntialiasingManager; -import net.java.sip.communicator.impl.gui.main.utils.ImageLoader; +import net.java.sip.communicator.impl.gui.utils.AntialiasingManager; +import net.java.sip.communicator.impl.gui.utils.ImageLoader; /** * @author Yana Stamcheva diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java index 8db7a99..f00140f 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java @@ -8,25 +8,15 @@ package net.java.sip.communicator.impl.gui.main.contactlist; import java.awt.Cursor; -import java.util.Enumeration; -import java.util.Hashtable; import java.util.Iterator; -import java.util.Map; import javax.swing.BorderFactory; -import javax.swing.DefaultListModel; import javax.swing.JList; -import javax.swing.JTree; -import javax.swing.ListModel; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; -import javax.swing.plaf.basic.BasicTreeUI; import javax.swing.text.Position; -import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; -import net.java.sip.communicator.impl.gui.main.ui.SIPCommTreeUI; -import net.java.sip.communicator.impl.gui.main.utils.Constants; import net.java.sip.communicator.service.contactlist.MetaContact; import net.java.sip.communicator.service.contactlist.MetaContactGroup; import net.java.sip.communicator.service.contactlist.MetaContactListService; @@ -36,8 +26,6 @@ import net.java.sip.communicator.service.contactlist.event.MetaContactListListen import net.java.sip.communicator.service.contactlist.event.MetaContactMovedEvent; import net.java.sip.communicator.service.contactlist.event.MetaContactRenamedEvent; import net.java.sip.communicator.service.contactlist.event.ProtoContactEvent; -import net.java.sip.communicator.service.protocol.Contact; -import net.java.sip.communicator.service.protocol.PresenceStatus; public class ContactList extends JList implements MetaContactListListener { diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListCellRenderer.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListCellRenderer.java index 07871fa..9386311 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListCellRenderer.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListCellRenderer.java @@ -12,35 +12,27 @@ import java.awt.BorderLayout; import java.awt.Color; import java.awt.Component; import java.awt.Cursor; -import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Font; import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.Image; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.util.Iterator; -import java.util.Map; -import java.util.Set; import javax.swing.BorderFactory; import javax.swing.ImageIcon; import javax.swing.JLabel; import javax.swing.JList; import javax.swing.JPanel; -import javax.swing.JTree; import javax.swing.ListCellRenderer; -import javax.swing.tree.TreeCellRenderer; import net.java.sip.communicator.impl.gui.main.customcontrols.SIPCommButton; -import net.java.sip.communicator.impl.gui.main.utils.AntialiasingManager; -import net.java.sip.communicator.impl.gui.main.utils.Constants; -import net.java.sip.communicator.impl.gui.main.utils.ImageLoader; +import net.java.sip.communicator.impl.gui.utils.AntialiasingManager; +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; import net.java.sip.communicator.service.contactlist.MetaContactGroup; import net.java.sip.communicator.service.protocol.Contact; -import net.kano.joscar.ssiitem.GroupItem; public class ContactListCellRenderer extends JPanel implements ListCellRenderer { diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListModel.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListModel.java index f8a25fc..6483740 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListModel.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListModel.java @@ -14,7 +14,7 @@ import javax.swing.AbstractListModel; import javax.swing.ImageIcon; import javax.swing.SwingUtilities; -import net.java.sip.communicator.impl.gui.main.utils.Constants; +import net.java.sip.communicator.impl.gui.utils.Constants; import net.java.sip.communicator.service.contactlist.MetaContact; import net.java.sip.communicator.service.contactlist.MetaContactGroup; import net.java.sip.communicator.service.contactlist.MetaContactListService; diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListPanel.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListPanel.java index 1fa9481..0516008 100755 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListPanel.java @@ -30,21 +30,29 @@ import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JOptionPane; import javax.swing.JPanel; -import javax.swing.JScrollBar; import javax.swing.JScrollPane; import javax.swing.KeyStroke; import javax.swing.SwingUtilities; import net.java.sip.communicator.impl.gui.main.MainFrame; import net.java.sip.communicator.impl.gui.main.i18n.Messages; -import net.java.sip.communicator.impl.gui.main.message.*; -import net.java.sip.communicator.impl.gui.main.utils.Constants; -import net.java.sip.communicator.service.contactlist.*; +import net.java.sip.communicator.impl.gui.main.message.ChatMessage; +import net.java.sip.communicator.impl.gui.main.message.ChatPanel; +import net.java.sip.communicator.impl.gui.main.message.ChatWindow; +import net.java.sip.communicator.impl.gui.utils.Constants; +import net.java.sip.communicator.service.contactlist.MetaContact; +import net.java.sip.communicator.service.contactlist.MetaContactGroup; +import net.java.sip.communicator.service.contactlist.MetaContactListService; import net.java.sip.communicator.service.protocol.Message; import net.java.sip.communicator.service.protocol.OperationSetTypingNotifications; import net.java.sip.communicator.service.protocol.PresenceStatus; import net.java.sip.communicator.service.protocol.ProtocolProviderService; -import net.java.sip.communicator.service.protocol.event.*; +import net.java.sip.communicator.service.protocol.event.MessageDeliveredEvent; +import net.java.sip.communicator.service.protocol.event.MessageDeliveryFailedEvent; +import net.java.sip.communicator.service.protocol.event.MessageListener; +import net.java.sip.communicator.service.protocol.event.MessageReceivedEvent; +import net.java.sip.communicator.service.protocol.event.TypingNotificationEvent; +import net.java.sip.communicator.service.protocol.event.TypingNotificationsListener; /** * The contactlist panel not only contains the contact diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java index 0203d52..189f633 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java @@ -18,15 +18,12 @@ 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.contactlist.ContactListPanel.RunMessageWindow; 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; -import net.java.sip.communicator.impl.gui.main.message.ChatWindow; -import net.java.sip.communicator.impl.gui.main.utils.Constants; -import net.java.sip.communicator.impl.gui.main.utils.ImageLoader; +import net.java.sip.communicator.impl.gui.utils.ImageLoader; import net.java.sip.communicator.service.contactlist.MetaContact; public class ContactRightButtonMenu extends JPopupMenu implements diff --git a/src/net/java/sip/communicator/impl/gui/main/customcontrols/AntialiasedEditorPane.java b/src/net/java/sip/communicator/impl/gui/main/customcontrols/AntialiasedEditorPane.java index 00d73ce..f0de062 100644 --- a/src/net/java/sip/communicator/impl/gui/main/customcontrols/AntialiasedEditorPane.java +++ b/src/net/java/sip/communicator/impl/gui/main/customcontrols/AntialiasedEditorPane.java @@ -11,7 +11,7 @@ import java.awt.Graphics; import javax.swing.JEditorPane; -import net.java.sip.communicator.impl.gui.main.utils.AntialiasingManager; +import net.java.sip.communicator.impl.gui.utils.AntialiasingManager; public class AntialiasedEditorPane extends JEditorPane { diff --git a/src/net/java/sip/communicator/impl/gui/main/customcontrols/AntialiasedMenu.java b/src/net/java/sip/communicator/impl/gui/main/customcontrols/AntialiasedMenu.java index d0935a9..c6e0cd4 100644 --- a/src/net/java/sip/communicator/impl/gui/main/customcontrols/AntialiasedMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/customcontrols/AntialiasedMenu.java @@ -12,7 +12,7 @@ import java.awt.Graphics; import javax.swing.Icon; import javax.swing.JMenu; -import net.java.sip.communicator.impl.gui.main.utils.AntialiasingManager; +import net.java.sip.communicator.impl.gui.utils.AntialiasingManager; public class AntialiasedMenu extends JMenu { diff --git a/src/net/java/sip/communicator/impl/gui/main/customcontrols/AntialiasedMenuItem.java b/src/net/java/sip/communicator/impl/gui/main/customcontrols/AntialiasedMenuItem.java index bb3eadf..ac45fab 100644 --- a/src/net/java/sip/communicator/impl/gui/main/customcontrols/AntialiasedMenuItem.java +++ b/src/net/java/sip/communicator/impl/gui/main/customcontrols/AntialiasedMenuItem.java @@ -12,7 +12,7 @@ import java.awt.Graphics; import javax.swing.Icon; import javax.swing.JMenuItem; -import net.java.sip.communicator.impl.gui.main.utils.AntialiasingManager; +import net.java.sip.communicator.impl.gui.utils.AntialiasingManager; public class AntialiasedMenuItem extends JMenuItem{ diff --git a/src/net/java/sip/communicator/impl/gui/main/customcontrols/AntialiasedPanel.java b/src/net/java/sip/communicator/impl/gui/main/customcontrols/AntialiasedPanel.java index f0c4bc0..8771b45 100644 --- a/src/net/java/sip/communicator/impl/gui/main/customcontrols/AntialiasedPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/customcontrols/AntialiasedPanel.java @@ -12,7 +12,7 @@ import java.awt.LayoutManager; import javax.swing.JPanel; -import net.java.sip.communicator.impl.gui.main.utils.AntialiasingManager; +import net.java.sip.communicator.impl.gui.utils.AntialiasingManager; public class AntialiasedPanel extends JPanel { diff --git a/src/net/java/sip/communicator/impl/gui/main/customcontrols/AntialiasedPopupMenu.java b/src/net/java/sip/communicator/impl/gui/main/customcontrols/AntialiasedPopupMenu.java index c7fab14..69bde43 100644 --- a/src/net/java/sip/communicator/impl/gui/main/customcontrols/AntialiasedPopupMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/customcontrols/AntialiasedPopupMenu.java @@ -11,7 +11,7 @@ import java.awt.Graphics; import javax.swing.JPopupMenu; -import net.java.sip.communicator.impl.gui.main.utils.AntialiasingManager; +import net.java.sip.communicator.impl.gui.utils.AntialiasingManager; public class AntialiasedPopupMenu extends JPopupMenu { 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 441bf33..3cab765 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 @@ -17,8 +17,8 @@ import java.awt.event.MouseListener; import javax.swing.JPanel; -import net.java.sip.communicator.impl.gui.main.utils.AntialiasingManager; -import net.java.sip.communicator.impl.gui.main.utils.Constants; +import net.java.sip.communicator.impl.gui.utils.AntialiasingManager; +import net.java.sip.communicator.impl.gui.utils.Constants; public class ListCellPanel extends JPanel implements MouseListener { diff --git a/src/net/java/sip/communicator/impl/gui/main/customcontrols/MessageDialog.java b/src/net/java/sip/communicator/impl/gui/main/customcontrols/MessageDialog.java index 1dee594..1fb5a51 100644 --- a/src/net/java/sip/communicator/impl/gui/main/customcontrols/MessageDialog.java +++ b/src/net/java/sip/communicator/impl/gui/main/customcontrols/MessageDialog.java @@ -20,9 +20,9 @@ import javax.swing.JDialog; import javax.swing.JLabel; import net.java.sip.communicator.impl.gui.main.i18n.Messages; -import net.java.sip.communicator.impl.gui.main.utils.AntialiasingManager; -import net.java.sip.communicator.impl.gui.main.utils.Constants; -import net.java.sip.communicator.impl.gui.main.utils.ImageLoader; +import net.java.sip.communicator.impl.gui.utils.AntialiasingManager; +import net.java.sip.communicator.impl.gui.utils.Constants; +import net.java.sip.communicator.impl.gui.utils.ImageLoader; public class MessageDialog extends JDialog { 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 83af078..bbdf2da 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 @@ -9,8 +9,7 @@ package net.java.sip.communicator.impl.gui.main.customcontrols; import java.awt.Image; -import net.java.sip.communicator.impl.gui.main.utils.Constants; -import net.java.sip.communicator.impl.gui.main.utils.ImageLoader; +import net.java.sip.communicator.impl.gui.utils.ImageLoader; public class MsgToolbarButton extends SIPCommButton { 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 new file mode 100644 index 0000000..e94334a --- /dev/null +++ b/src/net/java/sip/communicator/impl/gui/main/customcontrols/RolloverButton.java @@ -0,0 +1,19 @@ +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/SIPCommButton.java b/src/net/java/sip/communicator/impl/gui/main/customcontrols/SIPCommButton.java index 9b7f173..69ac981 100755 --- a/src/net/java/sip/communicator/impl/gui/main/customcontrols/SIPCommButton.java +++ b/src/net/java/sip/communicator/impl/gui/main/customcontrols/SIPCommButton.java @@ -12,12 +12,14 @@ import java.awt.Dimension; import java.awt.Graphics; import java.awt.Image; +import javax.swing.GrayFilter; import javax.swing.ImageIcon; import javax.swing.JButton; +import javax.swing.plaf.IconUIResource; -import net.java.sip.communicator.impl.gui.main.utils.AntialiasingManager; -import net.java.sip.communicator.impl.gui.main.utils.Constants; -import net.java.sip.communicator.impl.gui.main.utils.ImageLoader; +import net.java.sip.communicator.impl.gui.utils.AntialiasingManager; +import net.java.sip.communicator.impl.gui.utils.Constants; +import net.java.sip.communicator.impl.gui.utils.ImageLoader; /** * @author Yana Stamcheva @@ -41,60 +43,8 @@ public class SIPCommButton extends JButton { private Image pressedImage; private String iconLayout = SIPCommButton.CENTER_ICON_LAYOUT; - - - /** - * Default constructor - */ - - public SIPCommButton() { - super(); - - this.bgImage = ImageLoader.getImage(ImageLoader.BUTTON_BG); - this.bgRolloverImage - = ImageLoader.getImage(ImageLoader.BUTTON_ROLLOVER_BG); - this.setIcon(new ImageIcon(this.bgImage)); - - this.setPreferredSize(new Dimension(this.bgImage.getWidth(null), - this.bgImage.getHeight(null))); - } - - /** - * Button with text. - * - * @param text - */ - public SIPCommButton(String text) { - super(text); - - this.bgImage = ImageLoader.getImage(ImageLoader.BUTTON_BG); - this.bgRolloverImage - = ImageLoader.getImage(ImageLoader.BUTTON_ROLLOVER_BG); - - this.setPreferredSize(new Dimension(this.bgImage.getWidth(null), - this.bgImage.getHeight(null))); - } - - - /** - * Button with icon. - * - * @param iconImage - */ - public SIPCommButton(Image iconImage) { - super(); - - this.iconImage = iconImage; - this.bgImage = ImageLoader.getImage(ImageLoader.BUTTON_BG); - this.bgRolloverImage - = ImageLoader.getImage(ImageLoader.BUTTON_ROLLOVER_BG); - - this.setPreferredSize(new Dimension(this.bgImage.getWidth(null), - this.bgImage.getHeight(null))); - - this.setIcon(new ImageIcon(this.bgImage)); - } + /** * Button with icon. * @@ -102,17 +52,10 @@ public class SIPCommButton extends JButton { */ public SIPCommButton(Image iconImage, String iconLayout) { super(); - - this.iconImage = iconImage; + this.iconLayout = iconLayout; - this.bgImage = ImageLoader.getImage(ImageLoader.BUTTON_BG); - this.bgRolloverImage - = ImageLoader.getImage(ImageLoader.BUTTON_ROLLOVER_BG); - this.setPreferredSize(new Dimension(this.bgImage.getWidth(null), - this.bgImage.getHeight(null))); - - this.setIcon(new ImageIcon(this.bgImage)); + this.setIcon(new ImageIcon(iconImage)); } /** @@ -122,44 +65,20 @@ public class SIPCommButton extends JButton { * @param rolloverImage The rollover image * @param iconImage The icon. */ - public SIPCommButton - (Image bgImage, Image rolloverImage, Image iconImage) { + public SIPCommButton ( Image bgImage, + Image rolloverImage, + Image iconImage) { super(); - this.iconImage = iconImage; this.bgImage = bgImage; this.bgRolloverImage = rolloverImage; + this.iconImage = iconImage; this.setPreferredSize(new Dimension(this.bgImage.getWidth(null), this.bgImage.getHeight(null))); this.setIcon(new ImageIcon(this.bgImage)); } - - /** - * Custom button. - * - * @param bgImage The background image. - * @param rolloverImage The rollover image - * @param iconImage The button icon. - * @param pressedImage The image when button is pressed. - */ - public SIPCommButton ( Image bgImage, - Image rolloverImage, - Image pressedImage, - Image iconImage) { - super(); - - this.iconImage = iconImage; - this.bgImage = bgImage; - this.bgRolloverImage = rolloverImage; - this.pressedImage = pressedImage; - - this.setPreferredSize(new Dimension(this.bgImage.getWidth(null), - this.bgImage.getHeight(null))); - - this.setIcon(new ImageIcon(this.bgImage)); - } public SIPCommButton(Image bgImage, Image rolloverImage) { super(); @@ -169,60 +88,47 @@ public class SIPCommButton extends JButton { this.setPreferredSize(new Dimension(this.bgImage.getWidth(null), this.bgImage.getHeight(null))); - - this.setIcon(new ImageIcon(this.bgImage)); } - - - public SIPCommButton - (String text, Image bgImage, Image rolloverImage) { - super(text); - this.bgImage = bgImage; - this.bgRolloverImage = rolloverImage; - - this.setPreferredSize(new Dimension(this.bgImage.getWidth(null) - + 80, this.bgImage.getHeight(null))); - } - /** * Paint the SIPCommButton. */ - public void paint(Graphics g) { + public void paintComponent(Graphics g) { AntialiasingManager.activateAntialiasing(g); - g.drawImage(this.bgImage, 0, 0, this); + if(this.bgImage != null) + g.drawImage(this.bgImage, 0, 0, this); if (this.iconImage != null) { + if(!isEnabled()){ - Graphics gImg = this.iconImage.getGraphics(); - gImg.setColor(new Color(150, 150, 150, 200)); - gImg.drawRect(0, 0, this.iconImage.getWidth(null), this.iconImage.getHeight(null)); + this.iconImage = new ImageIcon( + GrayFilter.createDisabledImage(iconImage)).getImage(); } - //draw the button icon depending the current layout - if (this.iconLayout.equals(SIPCommButton.CENTER_ICON_LAYOUT)) - g.drawImage(this.iconImage, - (this.bgImage.getWidth(null) - - this.iconImage.getWidth(null)) / 2, - (this.bgImage.getHeight(null) - - this.iconImage.getHeight(null)) / 2, this); - - else if (this.iconLayout.equals(SIPCommButton.LEFT_ICON_LAYOUT)) - g.drawImage(this.iconImage, - 7, - (this.bgImage.getHeight(null) - - this.iconImage.getHeight(null)) / 2, - this); - - else if (this.iconLayout.equals(SIPCommButton.LEFT_ICON_LAYOUT)) - g.drawImage(this.iconImage, - this.bgImage.getWidth(null) - 3, - (this.bgImage.getHeight(null) - - this.iconImage.getHeight(null)) / 2, - this); + // draw the button icon depending the current button layout + if (this.iconLayout.equals(SIPCommButton.CENTER_ICON_LAYOUT)) + g.drawImage(this.iconImage, + (this.bgImage.getWidth(null) - + this.iconImage.getWidth(null)) / 2, + (this.bgImage.getHeight(null) - + this.iconImage.getHeight(null)) / 2, this); + + else if (this.iconLayout.equals(SIPCommButton.LEFT_ICON_LAYOUT)) + g.drawImage(this.iconImage, + 7, + (this.bgImage.getHeight(null) - + this.iconImage.getHeight(null)) / 2, + this); + + else if (this.iconLayout.equals(SIPCommButton.LEFT_ICON_LAYOUT)) + g.drawImage(this.iconImage, + this.bgImage.getWidth(null) - 3, + (this.bgImage.getHeight(null) - + this.iconImage.getHeight(null)) / 2, + this); } - if (this.getModel().isRollover()) { + if (this.bgRolloverImage != null && this.getModel().isRollover()) { g.setColor(Constants.CONTACTPANEL_LINES_COLOR); g.drawImage(this.bgRolloverImage, 0, 0, this); @@ -292,9 +198,6 @@ public class SIPCommButton extends JButton { } } } - - if(this.getText() != null) - g.drawString(this.getText(), 12, 10); } public Image getBgImage () { diff --git a/src/net/java/sip/communicator/impl/gui/main/customcontrols/SIPCommPasswordField.java b/src/net/java/sip/communicator/impl/gui/main/customcontrols/SIPCommPasswordField.java index 935839d..2a27d1b 100644 --- a/src/net/java/sip/communicator/impl/gui/main/customcontrols/SIPCommPasswordField.java +++ b/src/net/java/sip/communicator/impl/gui/main/customcontrols/SIPCommPasswordField.java @@ -13,8 +13,8 @@ import java.awt.Graphics2D; import javax.swing.JPasswordField; -import net.java.sip.communicator.impl.gui.main.utils.AntialiasingManager; -import net.java.sip.communicator.impl.gui.main.utils.Constants; +import net.java.sip.communicator.impl.gui.utils.AntialiasingManager; +import net.java.sip.communicator.impl.gui.utils.Constants; public class SIPCommPasswordField extends JPasswordField { diff --git a/src/net/java/sip/communicator/impl/gui/main/customcontrols/SIPCommTextField.java b/src/net/java/sip/communicator/impl/gui/main/customcontrols/SIPCommTextField.java index 6490b5a..94cc4ae 100644 --- a/src/net/java/sip/communicator/impl/gui/main/customcontrols/SIPCommTextField.java +++ b/src/net/java/sip/communicator/impl/gui/main/customcontrols/SIPCommTextField.java @@ -13,8 +13,8 @@ import java.awt.Graphics2D; import javax.swing.JTextField; -import net.java.sip.communicator.impl.gui.main.utils.AntialiasingManager; -import net.java.sip.communicator.impl.gui.main.utils.Constants; +import net.java.sip.communicator.impl.gui.utils.AntialiasingManager; +import net.java.sip.communicator.impl.gui.utils.Constants; public class SIPCommTextField extends JTextField { 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 f5b47a5..8f00bab 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.main.utils.ImageLoader; +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/TitlePanel.java b/src/net/java/sip/communicator/impl/gui/main/customcontrols/TitlePanel.java index ebb2e99..e715f84 100644 --- a/src/net/java/sip/communicator/impl/gui/main/customcontrols/TitlePanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/customcontrols/TitlePanel.java @@ -17,8 +17,8 @@ import java.awt.Graphics2D; import javax.swing.JLabel; import javax.swing.JPanel; -import net.java.sip.communicator.impl.gui.main.utils.AntialiasingManager; -import net.java.sip.communicator.impl.gui.main.utils.Constants; +import net.java.sip.communicator.impl.gui.utils.AntialiasingManager; +import net.java.sip.communicator.impl.gui.utils.Constants; public class TitlePanel extends JPanel { diff --git a/src/net/java/sip/communicator/impl/gui/main/customcontrols/TransparentBackground.java b/src/net/java/sip/communicator/impl/gui/main/customcontrols/TransparentBackground.java index 9e7d4b7..8d83396 100644 --- a/src/net/java/sip/communicator/impl/gui/main/customcontrols/TransparentBackground.java +++ b/src/net/java/sip/communicator/impl/gui/main/customcontrols/TransparentBackground.java @@ -18,8 +18,8 @@ import java.awt.image.BufferedImage; import javax.swing.JComponent; -import net.java.sip.communicator.impl.gui.main.utils.AntialiasingManager; -import net.java.sip.communicator.impl.gui.main.utils.Constants; +import net.java.sip.communicator.impl.gui.utils.AntialiasingManager; +import net.java.sip.communicator.impl.gui.utils.Constants; diff --git a/src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/CloseTabPaneEnhancedUI.java b/src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/CloseTabPaneEnhancedUI.java index d397470..781799b 100644 --- a/src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/CloseTabPaneEnhancedUI.java +++ b/src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/CloseTabPaneEnhancedUI.java @@ -20,7 +20,6 @@ import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.Image; import java.awt.Rectangle; -import java.util.Vector; import javax.swing.JComponent; import javax.swing.SwingUtilities; @@ -28,8 +27,8 @@ import javax.swing.plaf.ComponentUI; import javax.swing.plaf.basic.BasicGraphicsUtils; import javax.swing.text.View; -import net.java.sip.communicator.impl.gui.main.utils.AntialiasingManager; -import net.java.sip.communicator.impl.gui.main.utils.ImageLoader; +import net.java.sip.communicator.impl.gui.utils.AntialiasingManager; +import net.java.sip.communicator.impl.gui.utils.ImageLoader; /** * This UI displays a different interface, which is independent from the look diff --git a/src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/CloseTabPaneUI.java b/src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/CloseTabPaneUI.java index 6c7e92d..4537603 100644 --- a/src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/CloseTabPaneUI.java +++ b/src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/CloseTabPaneUI.java @@ -11,14 +11,48 @@ package net.java.sip.communicator.impl.gui.main.customcontrols.tabbedPane; * Intern, SETLabs, Infosys Technologies Ltd. May 2004 - Jul 2004 * Ecole des Mines de Nantes, France */ -import java.awt.*; -import javax.swing.*; -import java.awt.event.*; +import java.awt.Component; +import java.awt.Container; +import java.awt.Dimension; +import java.awt.Event; +import java.awt.Font; +import java.awt.FontMetrics; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.Image; +import java.awt.Insets; +import java.awt.KeyboardFocusManager; +import java.awt.LayoutManager; +import java.awt.Point; +import java.awt.Rectangle; +import java.awt.Shape; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.ContainerEvent; +import java.awt.event.ContainerListener; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; +import java.awt.event.MouseMotionListener; import java.awt.image.BufferedImage; import java.util.Enumeration; import java.util.Hashtable; import java.util.Vector; +import javax.swing.AbstractAction; +import javax.swing.ActionMap; +import javax.swing.Icon; +import javax.swing.InputMap; +import javax.swing.JButton; +import javax.swing.JComponent; +import javax.swing.JMenuItem; +import javax.swing.JPanel; +import javax.swing.JPopupMenu; +import javax.swing.JTabbedPane; +import javax.swing.JViewport; +import javax.swing.KeyStroke; +import javax.swing.SwingConstants; +import javax.swing.SwingUtilities; +import javax.swing.UIManager; import javax.swing.border.Border; import javax.swing.border.SoftBevelBorder; import javax.swing.event.ChangeEvent; @@ -33,7 +67,7 @@ import javax.swing.plaf.basic.BasicTabbedPaneUI; import javax.swing.text.View; import net.java.sip.communicator.impl.gui.main.customcontrols.SIPCommButton; -import net.java.sip.communicator.impl.gui.main.utils.ImageLoader; +import net.java.sip.communicator.impl.gui.utils.ImageLoader; /** * UI for <code>CloseAndMaxTabbedPane</code>. 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/tabbedPane/SIPCommTabbedPane.java index 9e5d6a0..b333d65 100644 --- a/src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/SIPCommTabbedPane.java +++ b/src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/SIPCommTabbedPane.java @@ -26,6 +26,8 @@ import javax.swing.SwingUtilities; import javax.swing.border.Border; import javax.swing.event.EventListenerList; import javax.swing.plaf.TabbedPaneUI; +import javax.swing.plaf.basic.BasicTabbedPaneUI; +import javax.swing.plaf.metal.MetalTabbedPaneUI; /** * A JTabbedPane with some added UI functionalities. A close and max/detach @@ -402,7 +404,7 @@ public class SIPCommTabbedPane extends JTabbedPane { * Overrides setSelectedIndex in JTabbedPane in order to remove the * hightlight if the tab which is selected. */ - public void setSelectedIndex(int tabIndex){ + public void setSelectedIndex(int tabIndex){ if(paneUI.isTabHighlighted(tabIndex)){ paneUI.tabRemoveHighlight(tabIndex); } diff --git a/src/net/java/sip/communicator/impl/gui/main/history/HistoryMenu.java b/src/net/java/sip/communicator/impl/gui/main/history/HistoryMenu.java index 5a75b4f..f0917af 100644 --- a/src/net/java/sip/communicator/impl/gui/main/history/HistoryMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/history/HistoryMenu.java @@ -17,7 +17,7 @@ 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.utils.AntialiasingManager; +import net.java.sip.communicator.impl.gui.utils.AntialiasingManager; public class HistoryMenu extends JMenu implements ActionListener { diff --git a/src/net/java/sip/communicator/impl/gui/main/history/HistoryWindow.java b/src/net/java/sip/communicator/impl/gui/main/history/HistoryWindow.java index af3bc44..4a9d511 100644 --- a/src/net/java/sip/communicator/impl/gui/main/history/HistoryWindow.java +++ b/src/net/java/sip/communicator/impl/gui/main/history/HistoryWindow.java @@ -17,8 +17,8 @@ import javax.swing.JPanel; import javax.swing.JScrollPane; import net.java.sip.communicator.impl.gui.main.i18n.Messages; -import net.java.sip.communicator.impl.gui.main.utils.Constants; -import net.java.sip.communicator.impl.gui.main.utils.ImageLoader; +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; public class HistoryWindow extends JFrame { diff --git a/src/net/java/sip/communicator/impl/gui/main/history/NavigationPanel.java b/src/net/java/sip/communicator/impl/gui/main/history/NavigationPanel.java index 28e281a..1bd5af3 100644 --- a/src/net/java/sip/communicator/impl/gui/main/history/NavigationPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/history/NavigationPanel.java @@ -14,7 +14,7 @@ import javax.swing.JButton; import javax.swing.JPanel; import net.java.sip.communicator.impl.gui.main.i18n.Messages; -import net.java.sip.communicator.impl.gui.main.utils.AntialiasingManager; +import net.java.sip.communicator.impl.gui.utils.AntialiasingManager; public class NavigationPanel extends JPanel { diff --git a/src/net/java/sip/communicator/impl/gui/main/history/SearchPanel.java b/src/net/java/sip/communicator/impl/gui/main/history/SearchPanel.java index 74df505..e632e96 100644 --- a/src/net/java/sip/communicator/impl/gui/main/history/SearchPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/history/SearchPanel.java @@ -24,8 +24,8 @@ import javax.swing.JRadioButton; import javax.swing.JTextField; import net.java.sip.communicator.impl.gui.main.i18n.Messages; -import net.java.sip.communicator.impl.gui.main.utils.AntialiasingManager; -import net.java.sip.communicator.impl.gui.main.utils.ImageLoader; +import net.java.sip.communicator.impl.gui.utils.AntialiasingManager; +import net.java.sip.communicator.impl.gui.utils.ImageLoader; public class SearchPanel extends JPanel implements ActionListener { diff --git a/src/net/java/sip/communicator/impl/gui/main/login/LoginManager.java b/src/net/java/sip/communicator/impl/gui/main/login/LoginManager.java index 5d5c193..f718fe4 100644 --- a/src/net/java/sip/communicator/impl/gui/main/login/LoginManager.java +++ b/src/net/java/sip/communicator/impl/gui/main/login/LoginManager.java @@ -14,11 +14,10 @@ import java.util.Set; import javax.swing.JOptionPane; -import net.java.sip.communicator.impl.gui.main.Account; import net.java.sip.communicator.impl.gui.main.MainFrame; import net.java.sip.communicator.impl.gui.main.StatusPanel; import net.java.sip.communicator.impl.gui.main.i18n.Messages; -import net.java.sip.communicator.impl.gui.main.utils.Constants; +import net.java.sip.communicator.impl.gui.utils.Constants; import net.java.sip.communicator.service.protocol.AccountID; import net.java.sip.communicator.service.protocol.AccountManager; import net.java.sip.communicator.service.protocol.AccountProperties; @@ -135,8 +134,6 @@ public class LoginManager implements RegistrationStateChangeListener { if(evt.getNewState().equals(RegistrationState.REGISTERED)){ - ((LoginWindow)this.loginWindows.get(protocolName)).dispose(); - Map supportedOpSets = evt.getProvider().getSupportedOperationSets(); @@ -178,10 +175,12 @@ public class LoginManager implements RegistrationStateChangeListener { JOptionPane.ERROR_MESSAGE); } else if(evt.getNewState() - .equals(RegistrationState.EXPIRED)){ - - //TODO: Registration state changed listener: EXPIRED - } + .equals(RegistrationState.EXPIRED)){ + //TODO: Implement registration state changed to: EXPIRED + } + else if(evt.getNewState().equals(RegistrationState.UNREGISTERED)){ + //TODO: Implement registration state changed to UNREGISTERED + } } public MainFrame getMainFrame() { 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 65c64dc..a608fcb 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 @@ -17,7 +17,6 @@ import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.KeyEvent; -import java.awt.event.KeyListener; import javax.swing.AbstractAction; import javax.swing.BorderFactory; @@ -30,15 +29,12 @@ import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.KeyStroke; -import net.java.sip.communicator.impl.gui.main.Account; 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.customcontrols.SIPCommPasswordField; -import net.java.sip.communicator.impl.gui.main.customcontrols.SIPCommTextField; import net.java.sip.communicator.impl.gui.main.i18n.Messages; -import net.java.sip.communicator.impl.gui.main.utils.AntialiasingManager; -import net.java.sip.communicator.impl.gui.main.utils.Constants; -import net.java.sip.communicator.impl.gui.main.utils.ImageLoader; -import net.java.sip.communicator.service.protocol.AccountID; +import net.java.sip.communicator.impl.gui.utils.AntialiasingManager; +import net.java.sip.communicator.impl.gui.utils.ImageLoader; import net.java.sip.communicator.service.protocol.AccountManager; public class LoginWindow extends JDialog @@ -172,6 +168,8 @@ public class LoginWindow extends JDialog if(buttonName.equals("login")){ + this.dispose(); + this.loginManager.login(accountManager, uinComboBox.getSelectedItem().toString(), new String(passwdField.getPassword())); diff --git a/src/net/java/sip/communicator/impl/gui/main/message/ChatBuffer.java b/src/net/java/sip/communicator/impl/gui/main/message/ChatBuffer.java index fd92bae..b376ce3 100644 --- a/src/net/java/sip/communicator/impl/gui/main/message/ChatBuffer.java +++ b/src/net/java/sip/communicator/impl/gui/main/message/ChatBuffer.java @@ -9,7 +9,7 @@ package net.java.sip.communicator.impl.gui.main.message; import java.util.ArrayList; -import net.java.sip.communicator.impl.gui.main.utils.Constants; +import net.java.sip.communicator.impl.gui.utils.Constants; public class ChatBuffer extends ArrayList{ diff --git a/src/net/java/sip/communicator/impl/gui/main/message/ChatConferencePanel.java b/src/net/java/sip/communicator/impl/gui/main/message/ChatConferencePanel.java index 3871718..fa141fa 100644 --- a/src/net/java/sip/communicator/impl/gui/main/message/ChatConferencePanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/message/ChatConferencePanel.java @@ -16,7 +16,7 @@ import javax.swing.JPanel; import javax.swing.JScrollPane; import net.java.sip.communicator.impl.gui.main.customcontrols.SIPCommButton; -import net.java.sip.communicator.impl.gui.main.utils.ImageLoader; +import net.java.sip.communicator.impl.gui.utils.ImageLoader; import net.java.sip.communicator.service.contactlist.MetaContact; import net.java.sip.communicator.service.protocol.PresenceStatus; diff --git a/src/net/java/sip/communicator/impl/gui/main/message/ChatContactPanel.java b/src/net/java/sip/communicator/impl/gui/main/message/ChatContactPanel.java index 53eda4a..d32948b 100644 --- a/src/net/java/sip/communicator/impl/gui/main/message/ChatContactPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/message/ChatContactPanel.java @@ -23,9 +23,9 @@ import javax.swing.border.BevelBorder; import net.java.sip.communicator.impl.gui.main.customcontrols.SIPCommButton; import net.java.sip.communicator.impl.gui.main.i18n.Messages; -import net.java.sip.communicator.impl.gui.main.utils.AntialiasingManager; -import net.java.sip.communicator.impl.gui.main.utils.Constants; -import net.java.sip.communicator.impl.gui.main.utils.ImageLoader; +import net.java.sip.communicator.impl.gui.utils.AntialiasingManager; +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; import net.java.sip.communicator.service.protocol.PresenceStatus; diff --git a/src/net/java/sip/communicator/impl/gui/main/message/ChatConversationPanel.java b/src/net/java/sip/communicator/impl/gui/main/message/ChatConversationPanel.java index 02aeaea..035396c 100755 --- a/src/net/java/sip/communicator/impl/gui/main/message/ChatConversationPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/message/ChatConversationPanel.java @@ -28,13 +28,13 @@ 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.main.utils.AntialiasingManager; -import net.java.sip.communicator.impl.gui.main.utils.BrowserLauncher; -import net.java.sip.communicator.impl.gui.main.utils.Constants; -import net.java.sip.communicator.impl.gui.main.utils.ImageLoader; -import net.java.sip.communicator.impl.gui.main.utils.MyHTMLEditorKit; -import net.java.sip.communicator.impl.gui.main.utils.Smily; -import net.java.sip.communicator.impl.gui.main.utils.StringUtils; +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; +import net.java.sip.communicator.impl.gui.utils.ImageLoader; +import net.java.sip.communicator.impl.gui.utils.MyHTMLEditorKit; +import net.java.sip.communicator.impl.gui.utils.Smily; +import net.java.sip.communicator.impl.gui.utils.StringUtils; /** * This is the panel, where all sent and received diff --git a/src/net/java/sip/communicator/impl/gui/main/message/ChatPanel.java b/src/net/java/sip/communicator/impl/gui/main/message/ChatPanel.java index a55c11d..fbf1856 100644 --- a/src/net/java/sip/communicator/impl/gui/main/message/ChatPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/message/ChatPanel.java @@ -263,7 +263,7 @@ public class ChatPanel extends JPanel { } public void componentShown(ComponentEvent e) { - Component component = e.getComponent(); + /*Component component = e.getComponent(); Container parent = component.getParent(); if ( parent instanceof JTabbedPane ) { JTabbedPane tabbedPane = (JTabbedPane)parent; @@ -280,7 +280,7 @@ public class ChatPanel extends JPanel { } }); } - } + }*/ } public void componentHidden(ComponentEvent e) { diff --git a/src/net/java/sip/communicator/impl/gui/main/message/ChatSendPanel.java b/src/net/java/sip/communicator/impl/gui/main/message/ChatSendPanel.java index d24dcdf..b7af7f8 100755 --- a/src/net/java/sip/communicator/impl/gui/main/message/ChatSendPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/message/ChatSendPanel.java @@ -14,6 +14,7 @@ import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; + import javax.swing.BorderFactory; import javax.swing.JButton; import javax.swing.JEditorPane; @@ -23,8 +24,8 @@ 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.main.utils.AntialiasingManager; -import net.java.sip.communicator.impl.gui.main.utils.Constants; +import net.java.sip.communicator.impl.gui.utils.AntialiasingManager; +import net.java.sip.communicator.impl.gui.utils.Constants; import net.java.sip.communicator.service.protocol.Message; import net.java.sip.communicator.service.protocol.OperationSetBasicInstantMessaging; 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 4d93e51..77762bb 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 @@ -8,7 +8,6 @@ package net.java.sip.communicator.impl.gui.main.message; import java.awt.BorderLayout; -import java.awt.EventQueue; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; @@ -22,15 +21,12 @@ import javax.swing.InputMap; import javax.swing.JComponent; import javax.swing.JFrame; import javax.swing.KeyStroke; -import javax.swing.SwingUtilities; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; 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.utils.Constants; -import net.java.sip.communicator.impl.gui.main.utils.ImageLoader; +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; import net.java.sip.communicator.service.protocol.OperationSetBasicInstantMessaging; import net.java.sip.communicator.service.protocol.PresenceStatus; diff --git a/src/net/java/sip/communicator/impl/gui/main/message/ChatWritePanel.java b/src/net/java/sip/communicator/impl/gui/main/message/ChatWritePanel.java index 19da58f..56e2e75 100755 --- a/src/net/java/sip/communicator/impl/gui/main/message/ChatWritePanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/message/ChatWritePanel.java @@ -25,8 +25,8 @@ 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.main.utils.AntialiasingManager; -import net.java.sip.communicator.impl.gui.main.utils.Constants; +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 { diff --git a/src/net/java/sip/communicator/impl/gui/main/message/SmiliesSelectorBox.java b/src/net/java/sip/communicator/impl/gui/main/message/SmiliesSelectorBox.java index 8486b60..48406c6 100644 --- a/src/net/java/sip/communicator/impl/gui/main/message/SmiliesSelectorBox.java +++ b/src/net/java/sip/communicator/impl/gui/main/message/SmiliesSelectorBox.java @@ -16,8 +16,8 @@ import javax.swing.JEditorPane; import net.java.sip.communicator.impl.gui.main.customcontrols.BoxPopupMenu; import net.java.sip.communicator.impl.gui.main.customcontrols.MsgToolbarButton; -import net.java.sip.communicator.impl.gui.main.utils.ImageLoader; -import net.java.sip.communicator.impl.gui.main.utils.Smily; +import net.java.sip.communicator.impl.gui.utils.ImageLoader; +import net.java.sip.communicator.impl.gui.utils.Smily; public class SmiliesSelectorBox extends BoxPopupMenu implements ActionListener { diff --git a/src/net/java/sip/communicator/impl/gui/main/message/menu/EditMenu.java b/src/net/java/sip/communicator/impl/gui/main/message/menu/EditMenu.java index 009baf0..b2d8f12 100644 --- a/src/net/java/sip/communicator/impl/gui/main/message/menu/EditMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/message/menu/EditMenu.java @@ -17,11 +17,10 @@ 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.customcontrols.MsgToolbarButton; 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.main.utils.AntialiasingManager; -import net.java.sip.communicator.impl.gui.main.utils.ImageLoader; +import net.java.sip.communicator.impl.gui.utils.AntialiasingManager; +import net.java.sip.communicator.impl.gui.utils.ImageLoader; public class EditMenu extends JMenu implements ActionListener{ diff --git a/src/net/java/sip/communicator/impl/gui/main/message/menu/FileMenu.java b/src/net/java/sip/communicator/impl/gui/main/message/menu/FileMenu.java index 8219205..dd00f88 100644 --- a/src/net/java/sip/communicator/impl/gui/main/message/menu/FileMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/message/menu/FileMenu.java @@ -18,8 +18,8 @@ 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.main.utils.AntialiasingManager; -import net.java.sip.communicator.impl.gui.main.utils.ImageLoader; +import net.java.sip.communicator.impl.gui.utils.AntialiasingManager; +import net.java.sip.communicator.impl.gui.utils.ImageLoader; public class FileMenu extends JMenu implements ActionListener{ diff --git a/src/net/java/sip/communicator/impl/gui/main/message/menu/MessageWindowMenuBar.java b/src/net/java/sip/communicator/impl/gui/main/message/menu/MessageWindowMenuBar.java index 61e8f65..9256897 100644 --- a/src/net/java/sip/communicator/impl/gui/main/message/menu/MessageWindowMenuBar.java +++ b/src/net/java/sip/communicator/impl/gui/main/message/menu/MessageWindowMenuBar.java @@ -14,7 +14,7 @@ import javax.swing.JMenuBar; 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.main.utils.AntialiasingManager; +import net.java.sip.communicator.impl.gui.utils.AntialiasingManager; public class MessageWindowMenuBar extends JMenuBar { diff --git a/src/net/java/sip/communicator/impl/gui/main/message/toolBars/EditTextToolBar.java b/src/net/java/sip/communicator/impl/gui/main/message/toolBars/EditTextToolBar.java index f4bdb00..fb52a41 100644 --- a/src/net/java/sip/communicator/impl/gui/main/message/toolBars/EditTextToolBar.java +++ b/src/net/java/sip/communicator/impl/gui/main/message/toolBars/EditTextToolBar.java @@ -15,7 +15,7 @@ import javax.swing.JComboBox; import net.java.sip.communicator.impl.gui.main.customcontrols.SIPCommButton; import net.java.sip.communicator.impl.gui.main.customcontrols.SIPCommToolBar; -import net.java.sip.communicator.impl.gui.main.utils.ImageLoader; +import net.java.sip.communicator.impl.gui.utils.ImageLoader; public class EditTextToolBar extends SIPCommToolBar { diff --git a/src/net/java/sip/communicator/impl/gui/main/message/toolBars/MainToolBar.java b/src/net/java/sip/communicator/impl/gui/main/message/toolBars/MainToolBar.java index a836e58..e73de77 100644 --- a/src/net/java/sip/communicator/impl/gui/main/message/toolBars/MainToolBar.java +++ b/src/net/java/sip/communicator/impl/gui/main/message/toolBars/MainToolBar.java @@ -24,7 +24,7 @@ import net.java.sip.communicator.impl.gui.main.history.HistoryWindow; 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.main.message.SmiliesSelectorBox; -import net.java.sip.communicator.impl.gui.main.utils.ImageLoader; +import net.java.sip.communicator.impl.gui.utils.ImageLoader; public class MainToolBar extends SIPCommToolBar implements ActionListener { 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 index 37946f7..4df6792 100644 --- a/src/net/java/sip/communicator/impl/gui/main/ui/SIPCommToolBarSeparatorUI.java +++ b/src/net/java/sip/communicator/impl/gui/main/ui/SIPCommToolBarSeparatorUI.java @@ -13,7 +13,7 @@ import java.awt.Graphics2D; import javax.swing.JComponent; import javax.swing.plaf.basic.BasicToolBarSeparatorUI; -import net.java.sip.communicator.impl.gui.main.utils.Constants; +import net.java.sip.communicator.impl.gui.utils.Constants; public class SIPCommToolBarSeparatorUI extends BasicToolBarSeparatorUI { diff --git a/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/button1.png b/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/button1.png Binary files differnew file mode 100644 index 0000000..6b97008 --- /dev/null +++ b/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/button1.png diff --git a/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/button2.png b/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/button2.png Binary files differnew file mode 100644 index 0000000..b3fed59 --- /dev/null +++ b/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/button2.png diff --git a/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/buttonBGLeft.png b/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/buttonBGLeft.png Binary files differnew file mode 100644 index 0000000..8f31eb6 --- /dev/null +++ b/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/buttonBGLeft.png diff --git a/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/buttonBGMiddle.png b/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/buttonBGMiddle.png Binary files differnew file mode 100644 index 0000000..ed65230 --- /dev/null +++ b/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/buttonBGMiddle.png diff --git a/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/buttonBGRight.png b/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/buttonBGRight.png Binary files differnew file mode 100644 index 0000000..a341ef1 --- /dev/null +++ b/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/buttonBGRight.png diff --git a/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/buttonRolloverBgLeft.png b/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/buttonRolloverBgLeft.png Binary files differnew file mode 100644 index 0000000..f0363f8 --- /dev/null +++ b/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/buttonRolloverBgLeft.png diff --git a/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/buttonRolloverBgMiddle.png b/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/buttonRolloverBgMiddle.png Binary files differnew file mode 100644 index 0000000..a285167 --- /dev/null +++ b/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/buttonRolloverBgMiddle.png diff --git a/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/buttonRolloverBgRight.png b/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/buttonRolloverBgRight.png Binary files differnew file mode 100644 index 0000000..e9c90b7 --- /dev/null +++ b/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/buttonRolloverBgRight.png diff --git a/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/check1.png b/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/check1.png Binary files differnew file mode 100644 index 0000000..f16dcdc --- /dev/null +++ b/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/check1.png diff --git a/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/check2.png b/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/check2.png Binary files differnew file mode 100644 index 0000000..5f4a018 --- /dev/null +++ b/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/check2.png diff --git a/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/combobox.png b/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/combobox.png Binary files differnew file mode 100644 index 0000000..e460bb1 --- /dev/null +++ b/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/combobox.png diff --git a/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/menu_selected.png b/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/menu_selected.png Binary files differnew file mode 100644 index 0000000..698a13c --- /dev/null +++ b/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/menu_selected.png diff --git a/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/option1.png b/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/option1.png Binary files differnew file mode 100644 index 0000000..11f9ecb --- /dev/null +++ b/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/option1.png diff --git a/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/option2.png b/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/option2.png Binary files differnew file mode 100644 index 0000000..1b3e025 --- /dev/null +++ b/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/option2.png diff --git a/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/scrollbar_horiz2.png b/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/scrollbar_horiz2.png Binary files differnew file mode 100644 index 0000000..47257f1 --- /dev/null +++ b/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/scrollbar_horiz2.png diff --git a/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/scrollbar_vert1.png b/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/scrollbar_vert1.png Binary files differnew file mode 100644 index 0000000..12ac33a --- /dev/null +++ b/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/scrollbar_vert1.png diff --git a/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/splitpaneHorizontal.png b/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/splitpaneHorizontal.png Binary files differnew file mode 100644 index 0000000..85b6ab1 --- /dev/null +++ b/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/splitpaneHorizontal.png diff --git a/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/splitpaneVertical.png b/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/splitpaneVertical.png Binary files differnew file mode 100644 index 0000000..d503cc7 --- /dev/null +++ b/src/net/java/sip/communicator/impl/gui/resources/lookandfeel/splitpaneVertical.png |
