Moves SIPCommFrame into public visibility out of its defining bundle so that it can be used not only in the main UI but also in the plugins. Though no plugin currently takes advantage of it, I'm committing it because there're a lot of changed files involved and I don't really want to merge.

92 files changed, 349 insertions, 146 deletions

diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/ExtListCellRenderer.java b/src/net/java/sip/communicator/impl/gui/customcontrols/ExtListCellRenderer.java
index 72e2c5d..89867b4 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/ExtListCellRenderer.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/ExtListCellRenderer.java
@@ -11,6 +11,7 @@ import java.awt.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * @author Yana Stamcheva
diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/FramedImage.java b/src/net/java/sip/communicator/impl/gui/customcontrols/FramedImage.java
index b9f5a30..eb0ab09 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/FramedImage.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/FramedImage.java
@@ -10,7 +10,7 @@ import java.awt.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/SCScrollPane.java b/src/net/java/sip/communicator/impl/gui/customcontrols/SCScrollPane.java
index 4fda0e3..35bcf20 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/SCScrollPane.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/SCScrollPane.java
@@ -13,6 +13,7 @@ import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 
 public class SCScrollPane
     extends JScrollPane
diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommButton.java b/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommButton.java
index 57c2073..dea87a1 100755
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommButton.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommButton.java
@@ -14,6 +14,7 @@ import javax.swing.*;
 import org.jvnet.lafwidget.animation.*;
 
 import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * The <tt>SIPCommButton</tt> is a very flexible <tt>JButton</tt> that allows
diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommDialog.java b/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommDialog.java
index 2f6a49f..8389f46 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommDialog.java
@@ -13,8 +13,8 @@ import java.awt.geom.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.configuration.*;
+import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 public abstract class SIPCommDialog extends JDialog
diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommToggleButton.java b/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommToggleButton.java
index 7acb2ab..c2e0f0d 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommToggleButton.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommToggleButton.java
@@ -11,6 +11,7 @@ import java.awt.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * The <tt>SIPCommToggleButton</tt> is a flexible <tt>JToggleButton</tt> that
diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommToolBar.java b/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommToolBar.java
index 7b1c9c8..df8ea96 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommToolBar.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommToolBar.java
@@ -4,15 +4,15 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-
 package net.java.sip.communicator.impl.gui.customcontrols;
 
 import java.awt.*;
 import java.awt.image.*;
+
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.lookandfeel.*;
-import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * The SIPCommToolBar is a <tt>JToolBar</tt>, which has its own drag icon
diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/TransparentBackground.java b/src/net/java/sip/communicator/impl/gui/customcontrols/TransparentBackground.java
index 4a3b9b9..116c395 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/TransparentBackground.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/TransparentBackground.java
@@ -4,14 +4,15 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-
 package net.java.sip.communicator.impl.gui.customcontrols;
 
 import java.awt.*;
 import java.awt.image.*;
+
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * The <tt>TransparentBackground</tt> is a <tt>JComponent</tt>, which is
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommButtonUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommButtonUI.java
index db14e0a..404e77f 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommButtonUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommButtonUI.java
@@ -13,6 +13,7 @@ import javax.swing.plaf.*;
 import javax.swing.plaf.metal.*;
 
 import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * SIPCommButtonUI implementation.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommChatSelectorMenuUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommChatSelectorMenuUI.java
index 729dc9e..1d1778d 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommChatSelectorMenuUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommChatSelectorMenuUI.java
@@ -14,6 +14,7 @@ import javax.swing.plaf.basic.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * The SIPCommChatSelectorMenuUI implementation.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommCheckBoxMenuItemUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommCheckBoxMenuItemUI.java
index 7c14847..b763f5c 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommCheckBoxMenuItemUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommCheckBoxMenuItemUI.java
@@ -12,7 +12,8 @@ import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 
-import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
+
 /**
  * The SIPCommCheckBoxMenuItemUI implementation.
  * 
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommCheckBoxUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommCheckBoxUI.java
index 3ce0e8f..0bbc3a4 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommCheckBoxUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommCheckBoxUI.java
@@ -12,7 +12,7 @@ import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.metal.*;
 
-import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * SIPCommCheckBoxUI implementation.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommComboBoxEditor.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommComboBoxEditor.java
index 66af56f..c31cf74 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommComboBoxEditor.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommComboBoxEditor.java
@@ -8,10 +8,11 @@ package net.java.sip.communicator.impl.gui.lookandfeel;
 
 import java.awt.*;
 import java.awt.geom.*;
+
 import javax.swing.border.*;
 import javax.swing.plaf.metal.*;
 
-import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * The default editor for SIPCommunicator editable combo boxes.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommComboBoxUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommComboBoxUI.java
index f3df29f..7a817fb 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommComboBoxUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommComboBoxUI.java
@@ -11,7 +11,7 @@ import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.metal.*;
 
-import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * SIPCommComboBoxUI implementation.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommDefaultTheme.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommDefaultTheme.java
index 9cbec29..aa0ff79 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommDefaultTheme.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommDefaultTheme.java
@@ -5,10 +5,10 @@
  */
 package net.java.sip.communicator.impl.gui.lookandfeel;
 
+import java.awt.*;
 import java.util.*;
 import java.util.List;
 
-import java.awt.*;
 import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.metal.*;
@@ -16,6 +16,7 @@ import javax.swing.text.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * SipCommunicator default theme.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommEditorPaneUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommEditorPaneUI.java
index c199eec..cf55d0b 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommEditorPaneUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommEditorPaneUI.java
@@ -7,11 +7,12 @@
 package net.java.sip.communicator.impl.gui.lookandfeel;
 
 import java.awt.*;
+
 import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 
-import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * The SIPCommEditorPaneUI implementation.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommLFUtils.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommLFUtils.java
index 7060bc7..e9aef89 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommLFUtils.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommLFUtils.java
@@ -9,6 +9,7 @@ package net.java.sip.communicator.impl.gui.lookandfeel;
 import java.awt.*;
 
 import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * 
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommLabelUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommLabelUI.java
index 0f9388e..d785c86 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommLabelUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommLabelUI.java
@@ -7,11 +7,12 @@
 package net.java.sip.communicator.impl.gui.lookandfeel;
 
 import java.awt.*;
+
 import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.metal.*;
 
-import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * The SIPCommLabelUI implementation.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommListUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommListUI.java
index 3cd0a89..dff8f08 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommListUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommListUI.java
@@ -12,7 +12,7 @@ import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 
-import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * <tt>SIPCommListUI</tt> is an implementation of the <tt>BasicListUI</tt>.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommMenuItemUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommMenuItemUI.java
index 92c30c6..9e164e7 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommMenuItemUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommMenuItemUI.java
@@ -12,7 +12,7 @@ import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 
-import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * The SIPCommMenuItemUI implementation.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommMenuUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommMenuUI.java
index 67139e4..086c6a7 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommMenuUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommMenuUI.java
@@ -11,7 +11,7 @@ import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 
-import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * The SIPCommMenuUI implementation.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommOptionPaneUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommOptionPaneUI.java
index 8c31a5d..f252bbf 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommOptionPaneUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommOptionPaneUI.java
@@ -7,11 +7,12 @@
 package net.java.sip.communicator.impl.gui.lookandfeel;
 
 import java.awt.*;
+
 import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 
-import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * The SIPCommOptionPaneUI implementation.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommPasswordFieldUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommPasswordFieldUI.java
index 16ba175..80bf980 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommPasswordFieldUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommPasswordFieldUI.java
@@ -7,12 +7,14 @@
 package net.java.sip.communicator.impl.gui.lookandfeel;
 
 import java.awt.*;
+
 import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 import javax.swing.text.*;
 
-import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
+
 /**
  * The SIPCommPasswordFieldUI implementation.
  * 
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommPopupMenuUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommPopupMenuUI.java
index b285b9e..8369d95 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommPopupMenuUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommPopupMenuUI.java
@@ -12,7 +12,7 @@ import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 
-import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  *  SIPCommPopupMenuUI implementation.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommSelectorMenuUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommSelectorMenuUI.java
index 8c8dd48..31cf18f 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommSelectorMenuUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommSelectorMenuUI.java
@@ -13,6 +13,7 @@ import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 
 import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * The SIPCommSelectorMenuUI implementation.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommSplitPaneDivider.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommSplitPaneDivider.java
index 3c67faa..5224091 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommSplitPaneDivider.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommSplitPaneDivider.java
@@ -8,12 +8,14 @@ package net.java.sip.communicator.impl.gui.lookandfeel;
 
 import java.awt.*;
 import java.awt.image.*;
+
 import javax.swing.*;
 import javax.swing.border.*;
 import javax.swing.plaf.basic.*;
 import javax.swing.plaf.metal.*;
 
 import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * Divider used by SIPCommSplitPaneUI.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommStatusMenuUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommStatusMenuUI.java
index c98203d..172b21e 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommStatusMenuUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommStatusMenuUI.java
@@ -11,8 +11,7 @@ import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 
-import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * The SIPCommMenuUI implementation.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTabbedPaneEnhancedUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTabbedPaneEnhancedUI.java
index 8c0acc0..0b4cf72 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTabbedPaneEnhancedUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTabbedPaneEnhancedUI.java
@@ -21,6 +21,7 @@ import javax.swing.text.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * This UI displays a different interface, which is independent from the look
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTextAreaUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTextAreaUI.java
index 1bd29c9..d886477 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTextAreaUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTextAreaUI.java
@@ -11,7 +11,7 @@ import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 
-import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * SIPCommTextAreaUI implementation.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTextFieldUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTextFieldUI.java
index cf56ab3..9904e8f 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTextFieldUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTextFieldUI.java
@@ -15,6 +15,7 @@ import javax.swing.text.*;
 
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * SIPCommTextFieldUI implementation.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTextPaneUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTextPaneUI.java
index fd1012a..f7cfac8 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTextPaneUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommTextPaneUI.java
@@ -7,11 +7,12 @@
 package net.java.sip.communicator.impl.gui.lookandfeel;
 
 import java.awt.*;
+
 import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 
-import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * SIPCommTextPaneUI implementation.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToggleButtonUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToggleButtonUI.java
index b6e5ad5..bd33f59 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToggleButtonUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToggleButtonUI.java
@@ -13,6 +13,7 @@ import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 
 import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * SIPCommToggleButtonUI implementation.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToolBarUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToolBarUI.java
index 201d999..7234361 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToolBarUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToolBarUI.java
@@ -1,3 +1,9 @@
+/*
+ * 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.*;
@@ -6,7 +12,7 @@ import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.metal.*;
 
-import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * SIPCommToolBarUI implementation.
diff --git a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToolTipUI.java b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToolTipUI.java
index e872d7e..387b1e0 100644
--- a/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToolTipUI.java
+++ b/src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommToolTipUI.java
@@ -7,11 +7,12 @@
 package net.java.sip.communicator.impl.gui.lookandfeel;
 
 import java.awt.*;
+
 import javax.swing.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 
-import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * SIPCommToolTipUI implementation.
diff --git a/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationRequestedDialog.java b/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationRequestedDialog.java
index 51dfb1b..5fd13df 100644
--- a/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationRequestedDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationRequestedDialog.java
@@ -8,6 +8,7 @@ package net.java.sip.communicator.impl.gui.main.authorization;
 
 import java.awt.*;
 import java.awt.event.*;
+
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.customcontrols.*;
@@ -16,9 +17,9 @@ import net.java.sip.communicator.impl.gui.lookandfeel.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.swing.*;
 
 /**
- * 
  * @author Yana Stamcheva
  */
 public class AuthorizationRequestedDialog
diff --git a/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationResponseDialog.java b/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationResponseDialog.java
index 0ca0366..a5d1c6b 100644
--- a/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationResponseDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationResponseDialog.java
@@ -17,6 +17,7 @@ import net.java.sip.communicator.impl.gui.lookandfeel.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.swing.*;
 
 public class AuthorizationResponseDialog extends SIPCommDialog
     implements ActionListener {
diff --git a/src/net/java/sip/communicator/impl/gui/main/authorization/RequestAuthorizationDialog.java b/src/net/java/sip/communicator/impl/gui/main/authorization/RequestAuthorizationDialog.java
index 3bf582c..356555a 100644
--- a/src/net/java/sip/communicator/impl/gui/main/authorization/RequestAuthorizationDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/authorization/RequestAuthorizationDialog.java
@@ -16,6 +16,8 @@ import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.swing.*;
+
 /**
  * The <tt>RequestAuthorisationDialog</tt> is a <tt>JDialog</tt> that is
  * shown when user is trying to add a contact, which requires authorization.
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/AccountSelectorBox.java b/src/net/java/sip/communicator/impl/gui/main/call/AccountSelectorBox.java
index dc508b0..f0e3375 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/AccountSelectorBox.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/AccountSelectorBox.java
@@ -16,6 +16,7 @@ import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.lookandfeel.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/DialPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/DialPanel.java
index ef017ac..6df6d21 100755
--- a/src/net/java/sip/communicator/impl/gui/main/call/DialPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/DialPanel.java
@@ -20,6 +20,7 @@ import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.audionotifier.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.resources.*;
+import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/HoldButton.java b/src/net/java/sip/communicator/impl/gui/main/call/HoldButton.java
index 28b97dd..a11445c 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/HoldButton.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/HoldButton.java
@@ -10,9 +10,9 @@ import java.awt.event.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * Represents an UI means to put an associated <tt>CallPariticant</tt> on/off
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/MuteButton.java b/src/net/java/sip/communicator/impl/gui/main/call/MuteButton.java
index 4e3a138..ef08b78 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/MuteButton.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/MuteButton.java
@@ -10,8 +10,8 @@ import java.awt.event.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * Represents an UI means to mute the audio stream sent to an associated
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/SecureButton.java b/src/net/java/sip/communicator/impl/gui/main/call/SecureButton.java
index 394bd48..d6d4231 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/SecureButton.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/SecureButton.java
@@ -10,9 +10,9 @@ import java.awt.event.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * The UI button used to toggle on or off call securing
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/TransferCallButton.java b/src/net/java/sip/communicator/impl/gui/main/call/TransferCallButton.java
index d0d3d32..a98517c 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/TransferCallButton.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/TransferCallButton.java
@@ -15,9 +15,9 @@ import javax.swing.*;
 import org.osgi.framework.*;
 
 import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
+import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/ZrtpPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/ZrtpPanel.java
index e95932e..6fb2f8b 100755
--- a/src/net/java/sip/communicator/impl/gui/main/call/ZrtpPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/ZrtpPanel.java
@@ -4,26 +4,17 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-
 package net.java.sip.communicator.impl.gui.main.call;
 
-import java.awt.Dimension;
-import java.awt.GridLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.HashMap;
-
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JLabel;
+import java.awt.*;
+import java.awt.event.*;
+import java.util.*;
 
-import net.java.sip.communicator.impl.gui.utils.ImageLoader;
-import net.java.sip.communicator.service.protocol.Call;
-import net.java.sip.communicator.service.protocol.CallParticipant;
-import net.java.sip.communicator.service.protocol.OperationSetSecureTelephony;
-import net.java.sip.communicator.service.protocol.event.SecurityGUIEventZrtp;
-import net.java.sip.communicator.swing.TransparentPanel;
+import javax.swing.*;
 
+import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.service.protocol.event.*;
+import net.java.sip.communicator.swing.*;
 
 public class ZrtpPanel extends TransparentPanel {
     /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatContactRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatContactRightButtonMenu.java
index e0b45b7..586ab31 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatContactRightButtonMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatContactRightButtonMenu.java
@@ -4,7 +4,6 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-
 package net.java.sip.communicator.impl.gui.main.chat;
 
 import java.awt.*;
@@ -15,8 +14,8 @@ import javax.swing.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
-import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java
index e6a3a88..3271504 100755
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java
@@ -24,6 +24,7 @@ import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.history.*;
 import net.java.sip.communicator.impl.gui.main.chat.menus.*;
 import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatTransportSelectorBox.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatTransportSelectorBox.java
index f9c6636..56114c4 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatTransportSelectorBox.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatTransportSelectorBox.java
@@ -17,6 +17,7 @@ import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.lookandfeel.*;
 import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java
index 58030c9..8fb6956 100755
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java
@@ -25,6 +25,7 @@ import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.gui.Container;
 import net.java.sip.communicator.service.keybindings.*;
+import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 import org.osgi.framework.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/SmiliesSelectorBox.java b/src/net/java/sip/communicator/impl/gui/main/chat/SmiliesSelectorBox.java
index 31471c0..1b5630e 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/SmiliesSelectorBox.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/SmiliesSelectorBox.java
@@ -14,6 +14,7 @@ import javax.swing.*;
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * The <tt>SmiliesSelectorBox</tt> is the component where user could choose a
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatRoomConfigurationWindow.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatRoomConfigurationWindow.java
index 6bff4eb..25528c2 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatRoomConfigurationWindow.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatRoomConfigurationWindow.java
@@ -16,6 +16,7 @@ import javax.swing.text.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * The configuration window for the chat room.
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatRoomSubjectPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatRoomSubjectPanel.java
index 2ac73ca..6417f34 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatRoomSubjectPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatRoomSubjectPanel.java
@@ -14,8 +14,8 @@ import javax.swing.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
-import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/InvitationReceivedDialog.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/InvitationReceivedDialog.java
index 1311c35..84073a1 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/InvitationReceivedDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/InvitationReceivedDialog.java
@@ -16,6 +16,7 @@ import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * The dialog that pops up when a chat room invitation is received.
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/history/DatesListRenderer.java b/src/net/java/sip/communicator/impl/gui/main/chat/history/DatesListRenderer.java
index 501141a..9f67906 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/history/DatesListRenderer.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/history/DatesListRenderer.java
@@ -12,6 +12,7 @@ import java.util.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/menus/ChatRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/chat/menus/ChatRightButtonMenu.java
index 34593b9..31baa49 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/menus/ChatRightButtonMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/menus/ChatRightButtonMenu.java
@@ -13,7 +13,7 @@ import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
-import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * The <tt>ChatRightButtonMenu</tt> appears when the user makes a right button
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/menus/EditMenu.java b/src/net/java/sip/communicator/impl/gui/main/chat/menus/EditMenu.java
index d3f1845..fc2e761 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/menus/EditMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/menus/EditMenu.java
@@ -4,7 +4,6 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-
 package net.java.sip.communicator.impl.gui.main.chat.menus;
 
 import java.awt.*;
@@ -16,7 +15,8 @@ import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
-import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
+
 /**
  * The <tt>EditMenu</tt> is the menu in the chat window menu bar, which contains
  * cut, copy and paste.
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/menus/FileMenu.java b/src/net/java/sip/communicator/impl/gui/main/chat/menus/FileMenu.java
index dbaed5f..1ee5233 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/menus/FileMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/menus/FileMenu.java
@@ -4,7 +4,6 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-
 package net.java.sip.communicator.impl.gui.main.chat.menus;
 
 import java.awt.*;
@@ -18,6 +17,8 @@ import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
 import net.java.sip.communicator.impl.gui.main.chatroomslist.*;
 import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
+
 /**
  * The <tt>FileMenu</tt> is the menu in the chat window menu bar that contains
  * save, print and close.
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/menus/MessageWindowMenuBar.java b/src/net/java/sip/communicator/impl/gui/main/chat/menus/MessageWindowMenuBar.java
index c7e3b90..9600c09 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/menus/MessageWindowMenuBar.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/menus/MessageWindowMenuBar.java
@@ -3,7 +3,6 @@
  * 
  * Distributable under LGPL license. See terms of license at gnu.org.
  */
-
 package net.java.sip.communicator.impl.gui.main.chat.menus;
 
 import java.awt.*;
@@ -16,9 +15,9 @@ import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.event.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
-import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.gui.Container;
+import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/menus/WritePanelRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/chat/menus/WritePanelRightButtonMenu.java
index 9749659..3858977 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/menus/WritePanelRightButtonMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/menus/WritePanelRightButtonMenu.java
@@ -12,7 +12,7 @@ import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
-import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * The <tt>WritePanelRightButtonMenu</tt> appears when the user makes a right
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomCommonRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomCommonRightButtonMenu.java
index 93b18c6..b3a934c 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomCommonRightButtonMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomCommonRightButtonMenu.java
@@ -4,12 +4,10 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-
 package net.java.sip.communicator.impl.gui.main.chatroomslist;
 
 import java.awt.*;
 import java.awt.event.*;
-import java.util.*;
 
 import javax.swing.*;
 
@@ -22,10 +20,9 @@ import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
 import net.java.sip.communicator.impl.gui.main.chatroomslist.createforms.*;
 import net.java.sip.communicator.impl.gui.main.chatroomslist.joinforms.*;
-import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.gui.Container;
-import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomRightButtonMenu.java
index 432052c..63ac119 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomRightButtonMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomRightButtonMenu.java
@@ -4,10 +4,8 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-
 package net.java.sip.communicator.impl.gui.main.chatroomslist;
 
-import java.awt.*;
 import java.awt.event.*;
 
 import javax.swing.*;
@@ -16,7 +14,7 @@ import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
 import net.java.sip.communicator.impl.gui.main.chatroomslist.joinforms.*;
-import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomServerRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomServerRightButtonMenu.java
index 8644213..129a714 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomServerRightButtonMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomServerRightButtonMenu.java
@@ -4,7 +4,6 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-
 package net.java.sip.communicator.impl.gui.main.chatroomslist;
 
 import java.awt.*;
@@ -16,7 +15,7 @@ import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
 import net.java.sip.communicator.impl.gui.main.chatroomslist.createforms.*;
 import net.java.sip.communicator.impl.gui.main.chatroomslist.joinforms.*;
-import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * The <tt>ChatRoomsListRightButtonMenu</tt> is the menu, opened when user clicks
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomsListCellRenderer.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomsListCellRenderer.java
index 69abdaa..c6d2ecd 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomsListCellRenderer.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomsListCellRenderer.java
@@ -4,7 +4,6 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-
 package net.java.sip.communicator.impl.gui.main.chatroomslist;
 
 import java.awt.*;
@@ -14,6 +13,7 @@ import javax.swing.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * The <tt>ChatRoomsListCellRenderer</tt> is the custom cell renderer used in the
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/ChatRoomNamePanel.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/ChatRoomNamePanel.java
index 34d2ab0..62d0562 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/ChatRoomNamePanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/ChatRoomNamePanel.java
@@ -4,12 +4,9 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-
 package net.java.sip.communicator.impl.gui.main.chatroomslist.createforms;
 
 import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 
 import javax.swing.*;
 import javax.swing.event.*;
@@ -18,6 +15,7 @@ import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.gui.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * The <tt>ChatRoomNamePanel</tt> is the form, where we should enter the chat
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/SelectAccountPanel.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/SelectAccountPanel.java
index 568da5b..619429b 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/SelectAccountPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/SelectAccountPanel.java
@@ -6,10 +6,9 @@
  */
 package net.java.sip.communicator.impl.gui.main.chatroomslist.createforms;
 
-import java.util.*;
-
 import java.awt.*;
 import java.io.*;
+import java.util.*;
 
 import javax.imageio.*;
 import javax.swing.*;
@@ -20,6 +19,7 @@ import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomAuthenticationWindow.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomAuthenticationWindow.java
index d425a5f..3d794a5 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomAuthenticationWindow.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomAuthenticationWindow.java
@@ -4,7 +4,6 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-
 package net.java.sip.communicator.impl.gui.main.chatroomslist.joinforms;
 
 import java.awt.*;
@@ -13,11 +12,11 @@ import java.awt.event.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.swing.*;
+
 /**
  * The <tt>ChatRoomAuthenticationWindow</tt> is the the authentication window
  * for chat rooms that require password.
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/JoinChatRoomDialog.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/JoinChatRoomDialog.java
index a5f47d3..4de1fa6 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/JoinChatRoomDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/JoinChatRoomDialog.java
@@ -15,7 +15,7 @@ import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
-import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/SelectAccountPanel.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/SelectAccountPanel.java
index a10d77d..b3d2077 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/SelectAccountPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/SelectAccountPanel.java
@@ -6,12 +6,9 @@
  */
 package net.java.sip.communicator.impl.gui.main.chatroomslist.joinforms;
 
-import java.util.*;
-
 import java.awt.*;
-import java.io.*;
+import java.util.*;
 
-import javax.imageio.*;
 import javax.swing.*;
 import javax.swing.event.*;
 import javax.swing.table.*;
@@ -20,7 +17,7 @@ import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigFormDescriptor.java b/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigFormDescriptor.java
index 795d067..18797d1 100644
--- a/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigFormDescriptor.java
+++ b/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigFormDescriptor.java
@@ -10,8 +10,8 @@ import java.awt.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.gui.*;
+import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/CommonRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/CommonRightButtonMenu.java
index ef892df..ce9c999 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/CommonRightButtonMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/CommonRightButtonMenu.java
@@ -14,7 +14,7 @@ import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.main.contactlist.addcontact.*;
 import net.java.sip.communicator.impl.gui.main.contactlist.addgroup.*;
-import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * The GroupRightButtonMenu is the menu, opened when user clicks with the
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactInfoDialog.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactInfoDialog.java
index 51d965e..f9ee824 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactInfoDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactInfoDialog.java
@@ -4,15 +4,16 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-
 package net.java.sip.communicator.impl.gui.main.contactlist;
 
 import java.awt.*;
 import java.awt.event.*;
+
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.service.contactlist.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * The <tt>ContactInfoPanel</tt> is a popup dialog containing the contact
@@ -21,11 +22,11 @@ import net.java.sip.communicator.service.contactlist.*;
  * @author Yana Stamcheva
  */
 public class ContactInfoDialog
-    extends JDialog
+    extends SIPCommDialog
     implements WindowFocusListener
 {
 
-    private JPanel protocolsPanel = new JPanel(new GridLayout(0, 1));
+    private JPanel protocolsPanel = new TransparentPanel(new GridLayout(0, 1));
 
     private MetaContact contactItem;
 
@@ -47,8 +48,6 @@ public class ContactInfoDialog
 
         this.setModal(true);
 
-        this.protocolsPanel.setOpaque(false);
-
         // Create the transparent background component
         this.bg = new TransparentBackground(this);
 
@@ -106,8 +105,7 @@ public class ContactInfoDialog
 
     public void windowLostFocus(WindowEvent e)
     {
-        this.setVisible(false);
-        this.dispose();
+        close(false);
     }
 
     public void setPopupLocation(int x, int y)
@@ -116,4 +114,10 @@ public class ContactInfoDialog
 
         this.bg.updateBackground(x, y);
     }
+
+    protected void close(boolean isEscaped)
+    {
+        this.setVisible(false);
+        this.dispose();
+    }
 }
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 0607ee3..4677c0d 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
@@ -4,7 +4,6 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-
 package net.java.sip.communicator.impl.gui.main.contactlist;
 
 import java.awt.*;
@@ -25,6 +24,7 @@ import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.contactlist.event.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.systray.*;
+import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 /**
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 fdef61a..1f4c051 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
@@ -14,6 +14,7 @@ import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.contactlist.*;
+import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 /**
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 614ba78..62b0403 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
@@ -4,7 +4,6 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-
 package net.java.sip.communicator.impl.gui.main.contactlist;
 
 import java.awt.*;
@@ -28,6 +27,7 @@ import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.gui.Container;
 import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 import org.osgi.framework.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/GroupRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/GroupRightButtonMenu.java
index c6bee90..ea0533c 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/GroupRightButtonMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/GroupRightButtonMenu.java
@@ -27,8 +27,8 @@ import net.java.sip.communicator.impl.gui.utils.Constants;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.gui.Container;
-import net.java.sip.communicator.service.gui.event.*;
 import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/AboutWindow.java b/src/net/java/sip/communicator/impl/gui/main/menus/AboutWindow.java
index 71dff24..489a4cf 100644
--- a/src/net/java/sip/communicator/impl/gui/main/menus/AboutWindow.java
+++ b/src/net/java/sip/communicator/impl/gui/main/menus/AboutWindow.java
@@ -15,6 +15,7 @@ import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.i18n.*;

 import net.java.sip.communicator.impl.gui.utils.*;

 import net.java.sip.communicator.service.gui.*;

+import net.java.sip.communicator.swing.*;

 

 public class AboutWindow

     extends JDialog

diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/ExtendedQuickMenu.java b/src/net/java/sip/communicator/impl/gui/main/menus/ExtendedQuickMenu.java
index b37322b..18f4120 100644
--- a/src/net/java/sip/communicator/impl/gui/main/menus/ExtendedQuickMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/menus/ExtendedQuickMenu.java
@@ -4,7 +4,6 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-
 package net.java.sip.communicator.impl.gui.main.menus;
 
 import java.awt.*;
@@ -28,6 +27,7 @@ import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.gui.Container;
 import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 import org.osgi.framework.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/FileMenu.java b/src/net/java/sip/communicator/impl/gui/main/menus/FileMenu.java
index d845bcd..54203e9 100644
--- a/src/net/java/sip/communicator/impl/gui/main/menus/FileMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/menus/FileMenu.java
@@ -4,7 +4,6 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-
 package net.java.sip.communicator.impl.gui.main.menus;
 
 import java.awt.*;
@@ -20,10 +19,11 @@ import net.java.sip.communicator.impl.gui.main.account.*;
 import net.java.sip.communicator.impl.gui.main.chatroomslist.*;
 import net.java.sip.communicator.impl.gui.main.contactlist.addcontact.*;
 import net.java.sip.communicator.impl.gui.main.contactlist.addgroup.*;
-import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 import org.osgi.framework.*;
+
 /**
  * The <tt>FileMenu</tt> is a menu in the main application menu bar that
  * contains "New account".
diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/MainMenu.java b/src/net/java/sip/communicator/impl/gui/main/menus/MainMenu.java
index f9a37b7..e693d64 100755
--- a/src/net/java/sip/communicator/impl/gui/main/menus/MainMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/menus/MainMenu.java
@@ -4,7 +4,6 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-
 package net.java.sip.communicator.impl.gui.main.menus;
 
 import java.awt.*;
@@ -14,7 +13,7 @@ import javax.swing.*;
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
-import net.java.sip.communicator.impl.gui.utils.*;
+import net.java.sip.communicator.swing.*;
 
 /**
  * The main menu bar. This is the menu bar that appears on top of the main
diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/MoreButton.java b/src/net/java/sip/communicator/impl/gui/main/menus/MoreButton.java
index b2802bf..5a4a8ce 100644
--- a/src/net/java/sip/communicator/impl/gui/main/menus/MoreButton.java
+++ b/src/net/java/sip/communicator/impl/gui/main/menus/MoreButton.java
@@ -13,10 +13,10 @@ import java.util.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.i18n.*;
-import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.gui.Container;
+import net.java.sip.communicator.swing.*;
 
 public class MoreButton
     extends JLabel
diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java b/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java
index 3f28577..f1249de5 100644
--- a/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java
+++ b/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java
@@ -22,6 +22,7 @@ import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.configuration.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.systray.*;
+import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/PresenceStatusMenu.java b/src/net/java/sip/communicator/impl/gui/main/presence/PresenceStatusMenu.java
index 0dc66c0..4b9f4d5 100644
--- a/src/net/java/sip/communicator/impl/gui/main/presence/PresenceStatusMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/presence/PresenceStatusMenu.java
@@ -3,7 +3,6 @@
  * 
  * Distributable under LGPL license. See terms of license at gnu.org.
  */
-
 package net.java.sip.communicator.impl.gui.main.presence;
 
 import java.awt.*;
@@ -20,6 +19,7 @@ import net.java.sip.communicator.impl.gui.main.login.*;
 import net.java.sip.communicator.impl.gui.main.presence.message.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/SimpleStatusMenu.java b/src/net/java/sip/communicator/impl/gui/main/presence/SimpleStatusMenu.java
index 4856a8e..9f5cc28 100644
--- a/src/net/java/sip/communicator/impl/gui/main/presence/SimpleStatusMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/presence/SimpleStatusMenu.java
@@ -4,7 +4,6 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-
 package net.java.sip.communicator.impl.gui.main.presence;
 
 import java.awt.*;
@@ -18,6 +17,7 @@ import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/message/NewStatusMessageDialog.java b/src/net/java/sip/communicator/impl/gui/main/presence/message/NewStatusMessageDialog.java
index e1107fc..dcd3bb7 100644
--- a/src/net/java/sip/communicator/impl/gui/main/presence/message/NewStatusMessageDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/presence/message/NewStatusMessageDialog.java
@@ -11,9 +11,11 @@ import java.awt.event.*;
 
 import javax.swing.*;
 
+import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 /**
@@ -23,19 +25,17 @@ import net.java.sip.communicator.util.*;
  * @author Yana Stamcheva
  */
 public class NewStatusMessageDialog
-    extends JDialog
+    extends SIPCommDialog
     implements ActionListener
 {
     private Logger logger = Logger.getLogger(NewStatusMessageDialog.class);
 
-    private JPanel messagePanel = new JPanel(new BorderLayout());
-
     private JLabel messageLabel = new JLabel(
         Messages.getI18NString("newStatusMessage").getText());
 
     private JTextField messageTextField = new JTextField();
 
-    private JPanel dataPanel = new JPanel(new BorderLayout(5, 5));
+    private JPanel dataPanel = new TransparentPanel(new BorderLayout(5, 5));
 
     private JTextArea infoArea = new JTextArea(
         Messages.getI18NString("statusMessageInfo").getText());
@@ -43,12 +43,7 @@ public class NewStatusMessageDialog
     private JLabel infoTitleLabel = new JLabel(
         Messages.getI18NString("newStatusMessage").getText());
 
-    private JLabel iconLabel = new JLabel(new ImageIcon(
-        ImageLoader.getImage(ImageLoader.RENAME_DIALOG_ICON)));
-
-    private JPanel labelsPanel = new JPanel(new GridLayout(0, 1));
-
-    private JPanel rightPanel = new JPanel(new BorderLayout());
+    private JPanel labelsPanel = new TransparentPanel(new GridLayout(0, 1));
 
     private JButton okButton
         = new JButton(Messages.getI18NString("ok").getText());
@@ -56,9 +51,7 @@ public class NewStatusMessageDialog
     private JButton cancelButton
         = new JButton(Messages.getI18NString("cancel").getText());
 
-    private JPanel buttonsPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
-
-    private JPanel mainPanel = new JPanel(new BorderLayout());
+    private JPanel buttonsPanel = new TransparentPanel(new FlowLayout(FlowLayout.RIGHT));
 
     private ProtocolProviderService protocolProvider;
 
@@ -71,9 +64,8 @@ public class NewStatusMessageDialog
     {
         this.protocolProvider = protocolProvider;
 
-        this.setSize(new Dimension(520, 270));
-
         this.init();
+        pack();
     }
     
     /**
@@ -88,8 +80,6 @@ public class NewStatusMessageDialog
 
         this.setPreferredSize(new Dimension(500, 200));
 
-        this.iconLabel.setBorder(BorderFactory.createEmptyBorder(5, 0, 5, 10));
-
         this.infoArea.setEditable(false);
         this.infoArea.setLineWrap(true);
         this.infoArea.setWrapStyleWord(true);
@@ -106,10 +96,25 @@ public class NewStatusMessageDialog
         this.labelsPanel.add(infoArea);
         this.labelsPanel.add(dataPanel);
 
-        this.rightPanel.add(labelsPanel, BorderLayout.NORTH);
-
-        this.messagePanel.add(iconLabel, BorderLayout.WEST);
-        this.messagePanel.add(rightPanel, BorderLayout.CENTER);
+        JPanel messagePanel = new TransparentPanel(new GridBagLayout());
+        GridBagConstraints messagePanelConstraints = new GridBagConstraints();
+        messagePanelConstraints.anchor = GridBagConstraints.NORTHWEST;
+        messagePanelConstraints.fill = GridBagConstraints.NONE;
+        messagePanelConstraints.gridx = 0;
+        messagePanelConstraints.gridy = 0;
+        messagePanelConstraints.insets = new Insets(5, 0, 5, 10);
+        messagePanelConstraints.weightx = 0;
+        messagePanelConstraints.weighty = 0;
+        messagePanel
+            .add(new ImageCanvas(ImageLoader
+                .getImage(ImageLoader.RENAME_DIALOG_ICON)),
+                messagePanelConstraints);
+        messagePanelConstraints.anchor = GridBagConstraints.NORTH;
+        messagePanelConstraints.fill = GridBagConstraints.HORIZONTAL;
+        messagePanelConstraints.gridx = 1;
+        messagePanelConstraints.insets = new Insets(0, 0, 0, 0);
+        messagePanelConstraints.weightx = 1;
+        messagePanel.add(labelsPanel, messagePanelConstraints);
 
         this.okButton.setName("ok");
         this.cancelButton.setName("cancel");
@@ -125,10 +130,23 @@ public class NewStatusMessageDialog
         this.buttonsPanel.add(okButton);
         this.buttonsPanel.add(cancelButton);
 
-        this.mainPanel.setBorder(BorderFactory.createEmptyBorder(5, 10, 0, 10));
-
-        this.mainPanel.add(messagePanel, BorderLayout.NORTH);
-        this.mainPanel.add(buttonsPanel, BorderLayout.SOUTH);
+        JPanel mainPanel = new TransparentPanel(new GridBagLayout());
+        mainPanel.setBorder(BorderFactory.createEmptyBorder(5, 10, 0, 10));
+
+        GridBagConstraints mainPanelConstraints = new GridBagConstraints();
+        mainPanelConstraints.anchor = GridBagConstraints.NORTH;
+        mainPanelConstraints.fill = GridBagConstraints.BOTH;
+        mainPanelConstraints.gridx = 0;
+        mainPanelConstraints.gridy = 0;
+        mainPanelConstraints.weightx = 1;
+        mainPanelConstraints.weighty = 1;
+        mainPanel.add(messagePanel, mainPanelConstraints);
+        mainPanelConstraints.anchor = GridBagConstraints.SOUTHEAST;
+        mainPanelConstraints.fill = GridBagConstraints.NONE;
+        mainPanelConstraints.gridy = 1;
+        mainPanelConstraints.weightx = 0;
+        mainPanelConstraints.weighty = 0;
+        mainPanel.add(buttonsPanel, mainPanelConstraints);
 
         this.getContentPane().add(mainPanel);
     }
@@ -229,4 +247,9 @@ public class NewStatusMessageDialog
             }
         }
     }
+
+    protected void close(boolean isEscaped)
+    {
+        cancelButton.doClick();
+    }
 }
diff --git a/src/net/java/sip/communicator/impl/gui/utils/Constants.java b/src/net/java/sip/communicator/impl/gui/utils/Constants.java
index ad318f6..12407dc 100755
--- a/src/net/java/sip/communicator/impl/gui/utils/Constants.java
+++ b/src/net/java/sip/communicator/impl/gui/utils/Constants.java
@@ -4,7 +4,6 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-
 package net.java.sip.communicator.impl.gui.utils;
 
 import java.awt.*;
@@ -17,6 +16,7 @@ import javax.swing.text.html.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.swing.*;
 import net.java.sip.communicator.util.*;
 
 /**
diff --git a/src/net/java/sip/communicator/impl/gui/utils/AntialiasingManager.java b/src/net/java/sip/communicator/swing/AntialiasingManager.java
index 17651af..1577159 100644
--- a/src/net/java/sip/communicator/impl/gui/utils/AntialiasingManager.java
+++ b/src/net/java/sip/communicator/swing/AntialiasingManager.java
@@ -4,8 +4,7 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-
-package net.java.sip.communicator.impl.gui.utils;
+package net.java.sip.communicator.swing;
 
 import java.awt.*;
 
diff --git a/src/net/java/sip/communicator/swing/ImageCanvas.java b/src/net/java/sip/communicator/swing/ImageCanvas.java
new file mode 100644
index 0000000..6c90c79
--- /dev/null
+++ b/src/net/java/sip/communicator/swing/ImageCanvas.java
@@ -0,0 +1,72 @@
+/*
+ * 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.swing;
+
+import java.awt.*;
+
+import javax.swing.*;
+
+/**
+ * @author Lubomir Marinov
+ */
+public class ImageCanvas
+    extends TransparentPanel
+{
+    private final ImageIcon icon;
+
+    public ImageCanvas(Image image)
+    {
+        icon = (image == null) ? null : new ImageIcon(image);
+
+        if (icon != null)
+        {
+            final int preferredWidth = icon.getIconWidth();
+            final int preferredHeight = icon.getIconHeight();
+            setMinimumSize(new Dimension(preferredWidth / 2,
+                preferredHeight / 2));
+            setPreferredSize(new Dimension(preferredWidth, preferredHeight));
+        }
+    }
+
+    protected void paintComponent(Graphics g)
+    {
+        super.paintComponent(g);
+
+        if (icon == null)
+            return;
+
+        int imageWidth = icon.getIconWidth();
+        if (imageWidth < 1)
+            return;
+        int imageHeight = icon.getIconHeight();
+        if (imageHeight < 1)
+            return;
+
+        int width = getWidth();
+        boolean scale = false;
+        float scaleFactor = 1;
+        if (imageWidth > width)
+        {
+            scale = true;
+            scaleFactor = width / (float) imageWidth;
+        }
+        int height = getHeight();
+        if (imageHeight > height)
+        {
+            scale = true;
+            scaleFactor = Math.min(scaleFactor, height / (float) imageHeight);
+        }
+        if (scale)
+        {
+            imageWidth = Math.round(imageWidth * scaleFactor);
+            imageHeight = Math.round(imageHeight * scaleFactor);
+        }
+
+        g.drawImage(icon.getImage(), (width - imageWidth) / 2,
+            (height - imageHeight) / 2, imageWidth, imageHeight, null);
+    }
+}
diff --git a/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java b/src/net/java/sip/communicator/swing/ImageLoader.java
index b32e9f5..e6ccb20 100644
--- a/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java
+++ b/src/net/java/sip/communicator/swing/ImageLoader.java
@@ -4,7 +4,7 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-package net.java.sip.communicator.impl.gui.utils;
+package net.java.sip.communicator.swing;
 
 import java.awt.*;
 import java.awt.image.*;
@@ -16,7 +16,6 @@ import java.util.List;
 import javax.imageio.*;
 import javax.imageio.stream.*;
 
-import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
 
@@ -1148,7 +1147,9 @@ public class ImageLoader {
         }
         else
         {
-            URL path = GuiActivator.getResources().getImageURL(imageID.getId());
+            URL path =
+                SwingCommonActivator.getResources()
+                    .getImageURL(imageID.getId());
 
             if (path == null)
             {
@@ -1201,8 +1202,9 @@ public class ImageLoader {
      */
     public static byte[] getImageInBytes(ImageID imageID)
     {
-        InputStream in = GuiActivator.getResources().
-            getImageInputStream(imageID.getId());
+        InputStream in =
+            SwingCommonActivator.getResources().getImageInputStream(
+                imageID.getId());
 
         if (in == null)
             return null;
@@ -1301,8 +1303,8 @@ public class ImageLoader {
 
                 try
                 {
-                    return GuiActivator.getResources().
-                        getImageURL(imageID).toURI().toString();
+                    return SwingCommonActivator.getResources().getImageURL(
+                        imageID).toURI().toString();
                 }
                 catch(URISyntaxException ex)
                 {
diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommFrame.java b/src/net/java/sip/communicator/swing/SIPCommFrame.java
index 9c2e97e..7967ef0 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommFrame.java
+++ b/src/net/java/sip/communicator/swing/SIPCommFrame.java
@@ -4,7 +4,7 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-package net.java.sip.communicator.impl.gui.customcontrols;
+package net.java.sip.communicator.swing;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -13,8 +13,6 @@ import java.util.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.configuration.*;
 import net.java.sip.communicator.service.keybindings.*;
 import net.java.sip.communicator.service.resources.*;
@@ -89,7 +87,7 @@ public abstract class SIPCommFrame
 
         // Adds new bindings to input map
         this.bindings =
-            GuiActivator.getKeybindingsService().getBindings(category);
+            SwingCommonActivator.getKeybindingsService().getBindings(category);
 
         for (Map.Entry<KeyStroke, String> key2action : this.bindings
             .getBindings().entrySet())
@@ -135,7 +133,7 @@ public abstract class SIPCommFrame
     private void saveSizeAndLocation()
     {
         ConfigurationService configService =
-            GuiActivator.getConfigurationService();
+            SwingCommonActivator.getConfigurationService();
 
         String className = this.getClass().getName();
 
@@ -164,7 +162,7 @@ public abstract class SIPCommFrame
     public void setSizeAndLocation()
     {
         ConfigurationService configService =
-            GuiActivator.getConfigurationService();
+            SwingCommonActivator.getConfigurationService();
 
         String className = this.getClass().getName();
 
@@ -407,7 +405,8 @@ public abstract class SIPCommFrame
         {
             super(new BorderLayout());
 
-            ResourceManagementService resources = GuiActivator.getResources();
+            ResourceManagementService resources =
+                SwingCommonActivator.getResources();
 
             isColorBgEnabled =
                 new Boolean(resources.getSettingsString(
diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/ScreenInformation.java b/src/net/java/sip/communicator/swing/ScreenInformation.java
index 2953704..f8cd6ee 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/ScreenInformation.java
+++ b/src/net/java/sip/communicator/swing/ScreenInformation.java
@@ -4,7 +4,7 @@
  * Distributable under LGPL license.

  * See terms of license at gnu.org.

  */

-package net.java.sip.communicator.impl.gui.customcontrols;

+package net.java.sip.communicator.swing;

 

 import java.awt.*;

 

diff --git a/src/net/java/sip/communicator/impl/gui/utils/Smiley.java b/src/net/java/sip/communicator/swing/Smiley.java
index 955a475..c84ccfe 100644
--- a/src/net/java/sip/communicator/impl/gui/utils/Smiley.java
+++ b/src/net/java/sip/communicator/swing/Smiley.java
@@ -4,11 +4,10 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-package net.java.sip.communicator.impl.gui.utils;
+package net.java.sip.communicator.swing;
 
 import java.net.*;
 
-import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.service.resources.*;
 
 /**
@@ -80,7 +79,7 @@ public class Smiley {
      */
     public String getImagePath() 
     {
-        URL url = GuiActivator.getResources().
+        URL url = SwingCommonActivator.getResources().
             getImageURL(this.getImageID().getId());
         
         if(url == null)
diff --git a/src/net/java/sip/communicator/swing/SwingCommonActivator.java b/src/net/java/sip/communicator/swing/SwingCommonActivator.java
new file mode 100644
index 0000000..2ff0296
--- /dev/null
+++ b/src/net/java/sip/communicator/swing/SwingCommonActivator.java
@@ -0,0 +1,76 @@
+/*
+ * 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.swing;
+
+import net.java.sip.communicator.service.configuration.*;
+import net.java.sip.communicator.service.keybindings.*;
+import net.java.sip.communicator.service.resources.*;
+
+import org.osgi.framework.*;
+
+public class SwingCommonActivator
+    implements BundleActivator
+{
+    private static BundleContext bundleContext;
+
+    private static ConfigurationService configurationService;
+
+    private static KeybindingsService keybindingsService;
+
+    private static ResourceManagementService resources;
+
+    public static ConfigurationService getConfigurationService()
+    {
+        if (configurationService == null)
+        {
+            ServiceReference serviceReference =
+                bundleContext.getServiceReference(ConfigurationService.class
+                    .getName());
+
+            if (serviceReference != null)
+                configurationService =
+                    (ConfigurationService) bundleContext
+                        .getService(serviceReference);
+        }
+        return configurationService;
+    }
+
+    public static KeybindingsService getKeybindingsService()
+    {
+        if (keybindingsService == null)
+        {
+            ServiceReference serviceReference =
+                bundleContext.getServiceReference(KeybindingsService.class
+                    .getName());
+
+            if (serviceReference != null)
+                keybindingsService =
+                    (KeybindingsService) bundleContext
+                        .getService(serviceReference);
+        }
+        return keybindingsService;
+    }
+
+    public static ResourceManagementService getResources()
+    {
+        if (resources == null)
+            resources =
+                ResourceManagementServiceUtils.getService(bundleContext);
+        return resources;
+    }
+
+    public void start(BundleContext bundleContext)
+    {
+        SwingCommonActivator.bundleContext = bundleContext;
+    }
+
+    public void stop(BundleContext bundleContext)
+    {
+        if (SwingCommonActivator.bundleContext == bundleContext)
+            SwingCommonActivator.bundleContext = null;
+    }
+}
diff --git a/src/net/java/sip/communicator/swing/swing.common.manifest.mf b/src/net/java/sip/communicator/swing/swing.common.manifest.mf
index f98555e..2f500d6 100644
--- a/src/net/java/sip/communicator/swing/swing.common.manifest.mf
+++ b/src/net/java/sip/communicator/swing/swing.common.manifest.mf
@@ -1,6 +1,13 @@
+Bundle-Activator: net.java.sip.communicator.swing.SwingCommonActivator

 Bundle-Name: Swing Common

 Bundle-Description: Common/generic Swing additions not specific to SIP Communicator

 Bundle-Vendor: sip-communicator.org

 Bundle-Version: 0.0.1

-Import-Package: javax.swing

+Import-Package: javax.imageio,

+ javax.swing,

+ net.java.sip.communicator.service.configuration,

+ net.java.sip.communicator.service.keybindings,

+ net.java.sip.communicator.service.resources,

+ net.java.sip.communicator.util,

+ org.osgi.framework

 Export-Package: net.java.sip.communicator.swing