set the sip communicator icon to all frames and dialogs

src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommDialog.java

@@ -29,12 +29,7 @@ public SIPCommDialog(Frame owner)
         
         this.initInputMap(); 
     }
-    
-    public SIPCommDialog()
-    {
-        this.initInputMap(); 
-    }
-    
+        
     private void initInputMap()
     {
         amap = this.getRootPane().getActionMap();

src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommFrame.java

@@ -10,6 +10,8 @@
 
 import javax.swing.*;
 
+import net.java.sip.communicator.impl.gui.utils.*;
+
 public abstract class SIPCommFrame extends JFrame
 {
     ActionMap amap;
@@ -17,6 +19,9 @@ public abstract class SIPCommFrame extends JFrame
     
     public SIPCommFrame()
     {
+        this.setIconImage(
+            ImageLoader.getImage(ImageLoader.SIP_COMMUNICATOR_LOGO));
+        
         amap = this.getRootPane().getActionMap();
 
         amap.put("close", new CloseAction());

src/net/java/sip/communicator/impl/gui/customcontrols/wizard/Wizard.java

@@ -110,14 +110,6 @@ public class Wizard extends SIPCommDialog
     
     private Vector wizardListeners = new Vector();    
     
-    /**
-     * Default constructor. This method creates a new WizardModel object and
-     * passes it into the overloaded constructor.
-     */    
-    public Wizard() {
-        this((Frame)null);
-    }
-    
     /**
      * This method accepts a java.awt.Dialog object as the javax.swing.JDialog's
      * parent.

src/net/java/sip/communicator/impl/gui/main/MainFrame.java

@@ -1031,7 +1031,7 @@ public void actionPerformed(ActionEvent e)
             
             if(selectedObject instanceof MetaContact) {
                 RenameContactDialog dialog = new RenameContactDialog(
-                        contactList, (MetaContact)selectedObject);
+                        MainFrame.this, (MetaContact)selectedObject);
 
                 dialog.setLocation(
                         Toolkit.getDefaultToolkit().getScreenSize().width/2
@@ -1047,7 +1047,7 @@ public void actionPerformed(ActionEvent e)
             else if(selectedObject instanceof MetaContactGroup) {
                 
                 RenameGroupDialog dialog = new RenameGroupDialog(
-                        contactList, (MetaContactGroup)selectedObject);
+                        MainFrame.this, (MetaContactGroup)selectedObject);
 
                 dialog.setLocation(
                         Toolkit.getDefaultToolkit().getScreenSize().width/2

src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationHandlerImpl.java

@@ -8,6 +8,7 @@
 
 import javax.swing.*;
 
+import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.service.protocol.*;
 
 /**
@@ -24,8 +25,10 @@
 public class AuthorizationHandlerImpl
     implements AuthorizationHandler {
 
-    public AuthorizationHandlerImpl() {
-        
+    private MainFrame mainFrame;
+    
+    public AuthorizationHandlerImpl(MainFrame mainFrame) {
+        this.mainFrame = mainFrame;
     }
     
     /**
@@ -40,7 +43,7 @@ public AuthorizationResponse processAuthorisationRequest(
         AuthorizationResponse response = null;
         
         AuthorizationRequestedDialog dialog 
-            = new AuthorizationRequestedDialog(sourceContact, req);
+            = new AuthorizationRequestedDialog(mainFrame, sourceContact, req);
         
         int result = dialog.showDialog();
         
@@ -71,7 +74,7 @@ public AuthorizationRequest createAuthorizationRequest(Contact contact) {
         AuthorizationRequest request = new AuthorizationRequest();
         
         RequestAuthorizationDialog dialog 
-            = new RequestAuthorizationDialog(contact, request);
+            = new RequestAuthorizationDialog(mainFrame, contact, request);
 
         int returnCode = dialog.showDialog();
         
@@ -95,7 +98,7 @@ public void processAuthorizationResponse(AuthorizationResponse response,
             Contact sourceContact)
     {
         AuthorizationResponseDialog dialog 
-            = new AuthorizationResponseDialog(sourceContact, response);
+            = new AuthorizationResponseDialog(mainFrame, sourceContact, response);
         
         dialog.setVisible(true);
     }

src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationRequestedDialog.java

@@ -13,6 +13,7 @@
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 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.*;
 
@@ -75,9 +76,11 @@ public class AuthorizationRequestedDialog
      * @param contact The <tt>Contact</tt>, which requires authorisation.
      * @param request The <tt>AuthorizationRequest</tt> that will be sent.
      */
-    public AuthorizationRequestedDialog(Contact contact,
+    public AuthorizationRequestedDialog(MainFrame mainFrame, Contact contact,
             AuthorizationRequest request) {
         
+        super(mainFrame);
+        
         this.setModal(true);
         
         this.setTitle(title);

src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationResponseDialog.java

@@ -14,6 +14,7 @@
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 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.*;
 
@@ -50,8 +51,9 @@ public class AuthorizationResponseDialog extends SIPCommDialog
      * @param response The <tt>AuthorizationResponse</tt> that has been
      * received.
      */
-    public AuthorizationResponseDialog(Contact contact,
+    public AuthorizationResponseDialog(MainFrame mainFrame, Contact contact,
             AuthorizationResponse response) {
+        super(mainFrame);
         
         this.setModal(true);
         

src/net/java/sip/communicator/impl/gui/main/authorization/RequestAuthorizationDialog.java

@@ -13,6 +13,7 @@
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 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.*;
 /**
@@ -64,9 +65,11 @@ public class RequestAuthorizationDialog
      * @param contact The <tt>Contact</tt>, which requires authorisation.
      * @param request The <tt>AuthorizationRequest</tt> that will be sent.
      */
-    public RequestAuthorizationDialog(Contact contact,
+    public RequestAuthorizationDialog(MainFrame mainFrame, Contact contact,
             AuthorizationRequest request)
-    {   
+    {
+        super(mainFrame);
+        
         this.setModal(true);
         
         this.setTitle(title);

src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java

@@ -313,7 +313,7 @@ else if (itemName.equalsIgnoreCase("sendFile")) {
         }
         else if (itemName.equalsIgnoreCase("renameContact")) {
             RenameContactDialog dialog = new RenameContactDialog(
-                    mainFrame.getContactList(), contactItem);
+                    mainFrame, contactItem);
 
             dialog.setLocation(
                     Toolkit.getDefaultToolkit().getScreenSize().width/2

src/net/java/sip/communicator/impl/gui/main/contactlist/GroupRightButtonMenu.java

@@ -110,7 +110,7 @@ public void actionPerformed(ActionEvent e) {
         else if(itemName.equals("renameGroup")) {
             
             RenameGroupDialog dialog = new RenameGroupDialog(
-                    mainFrame.getContactList(), group);
+                    mainFrame, group);
 
             dialog.setLocation(
                     Toolkit.getDefaultToolkit().getScreenSize().width/2

src/net/java/sip/communicator/impl/gui/main/contactlist/RenameContactDialog.java

@@ -13,6 +13,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.*;
 import net.java.sip.communicator.service.contactlist.*;
 
 /**
@@ -46,12 +47,14 @@ public class RenameContactDialog
      * @param clist The <tt>MetaContactListService</tt>.
      * @param metaContact The <tt>MetaContact</tt> to rename.
      */
-    public RenameContactDialog(MetaContactListService clist,
+    public RenameContactDialog(MainFrame mainFrame,
             MetaContact metaContact) {
         
+        super(mainFrame);
+        
         this.setSize(new Dimension(520, 270));
         
-        this.clist = clist;
+        this.clist = mainFrame.getContactList();
         this.metaContact = metaContact;
         
         this.init();

src/net/java/sip/communicator/impl/gui/main/contactlist/RenameGroupDialog.java

@@ -13,6 +13,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.*;
 import net.java.sip.communicator.service.contactlist.*;
 
 /**
@@ -46,12 +47,13 @@ public class RenameGroupDialog
      * @param clist The <tt>MetaContactListService</tt>.
      * @param metaGroup The <tt>MetaContactGroup</tt> to rename.
      */
-    public RenameGroupDialog(MetaContactListService clist,
+    public RenameGroupDialog(MainFrame mainFrame,
             MetaContactGroup metaGroup) {
+        super(mainFrame);
         
         this.setSize(new Dimension(520, 270));
         
-        this.clist = clist;
+        this.clist = mainFrame.getContactList();
         this.metaGroup = metaGroup;
         
         this.init();

src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactDialog.java

@@ -65,6 +65,8 @@ public AddContactDialog(MainFrame mainFrame,
             MetaContact metaContact,
             ProtocolProviderService pps) {
         
+        super(mainFrame);
+        
         this.mainFrame = mainFrame;
         this.clist = mainFrame.getContactList();
         this.metaContact = metaContact;
@@ -86,6 +88,8 @@ public AddContactDialog(MainFrame mainFrame,
             MetaContactGroup group,
             ProtocolProviderService pps) {
         
+        super(mainFrame);
+        
         this.mainFrame = mainFrame;
         this.clist = mainFrame.getContactList();
         this.group = group;

src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactWizard.java

@@ -37,7 +37,9 @@ public class AddContactWizard
     private AddContactWizardPage3 page3;
     
     public AddContactWizard(MainFrame mainFrame)
-    {   
+    {
+        super(mainFrame);
+        
         this.mainFrame = mainFrame;
      
         super.addWizardListener(this);

src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupDialog.java

@@ -49,6 +49,8 @@ public class CreateGroupDialog
      */
     public CreateGroupDialog(MainFrame mainFrame) {
         
+        super(mainFrame);
+        
         this.mainFrame = mainFrame;
         this.clist = mainFrame.getContactList();
         

src/net/java/sip/communicator/impl/gui/main/login/LoginManager.java

@@ -215,7 +215,8 @@ public void registrationStateChanged(RegistrationStateChangeEvent evt)
 
             if (presence != null) {
                 presence
-                    .setAuthorizationHandler(new AuthorizationHandlerImpl());
+                    .setAuthorizationHandler(
+                        new AuthorizationHandlerImpl(mainFrame));
             }
         }
         else if (evt.getNewState().equals(

src/net/java/sip/communicator/impl/gui/main/message/history/HistoryWindow.java

@@ -633,6 +633,11 @@ protected void close()
         if(chatConvPanel.getRightButtonMenu().isVisible()) {
             chatConvPanel.getRightButtonMenu().setVisible(false);
         }
+        else if(historyMenu.isPopupMenuVisible()) {
+            MenuSelectionManager menuSelectionManager
+                = MenuSelectionManager.defaultManager();
+            menuSelectionManager.clearSelectedPath();
+        }
         else {
             this.dispose();
         

src/net/java/sip/communicator/impl/gui/main/presence/PresenceStatusSelectorBox.java

@@ -79,7 +79,11 @@ public PresenceStatusSelectorBox(MainFrame mainFrame,
         
         this.statusIterator = this.presence.getSupportedStatusSet();
         
-        this.setToolTipText(protocolProvider.getAccountID().getUserID());
+        String tooltip = "<html><b>"
+                + protocolProvider.getAccountID().getUserID()
+                + "</b><br>Connecting</html>";
+        
+        this.setToolTipText(tooltip);
                 
         titleLabel = new JLabel(protocolProvider.getAccountID().getUserID());
 
@@ -186,7 +190,8 @@ public void updateStatus(Object presenceStatus) {
         OperationSetPresence presence = mainFrame
             .getProtocolPresence(protocolProvider);
         
-        this.connecting.stop();
+        if(connecting.isRunning())
+            this.connecting.stop();
         
         this.setSelectedStatus(status);
         
@@ -282,6 +287,12 @@ public void setSelectedStatus(PresenceStatus status)
         
         this.setSelected(status.getStatusName(),
                 new ImageIcon(statusImage));
+        
+        String tooltip = this.getToolTipText();
+        
+        tooltip = tooltip.substring(0, tooltip.lastIndexOf("<br>"));
+        
+        this.setToolTipText(tooltip.concat("<br>" + status.getStatusName()));
     }
 
     /**

src/net/java/sip/communicator/impl/gui/main/presence/SimpleStatusSelectorBox.java

@@ -77,7 +77,11 @@ public SimpleStatusSelectorBox(MainFrame mainFrame,
         this.protocolProvider = protocolProvider;
         this.accountIndex = accountIndex;
         
-        this.setToolTipText(protocolProvider.getAccountID().getUserID());
+        String tooltip = "<html><b>"
+            + protocolProvider.getAccountID().getUserID()
+            + "</b><br>Connecting</html>";
+    
+        this.setToolTipText(tooltip);    
                 
         onlineItem.setName("online");
         offlineItem.setName("offline");
@@ -155,6 +159,12 @@ public void updateStatus()
         else {
             setSelected(offlineItem, offlineIcon);
         }
+        
+        String tooltip = this.getToolTipText();
+        
+        tooltip = tooltip.substring(0, tooltip.lastIndexOf("<br>"));
+        
+        this.setToolTipText(tooltip.concat("<br>" + onlineItem.getText()));
     }
 
     /**