protocol presence

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

@@ -175,7 +175,8 @@ public void setSupportedOperationSets(
                     .addProviderPresenceStatusListener
                         (new ProviderPresenceStatusAdapter());
                                 
-                try {            
+                try {
+                    
                     persistentPresence
                         .publishPresenceStatus(IcqStatusEnum.ONLINE, "");                    
                                        
@@ -210,4 +211,8 @@ private class ProviderPresenceStatusAdapter
         }
     
     }
+
+    public StatusPanel getStatusPanel() {
+        return statusPanel;
+    }
 }

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

@@ -17,6 +17,7 @@
 import javax.swing.JPanel;
 
 import net.java.sip.communicator.impl.gui.main.utils.Constants;
+import net.java.sip.communicator.impl.gui.main.utils.ImageLoader;
 import net.java.sip.communicator.service.protocol.OperationFailedException;
 import net.java.sip.communicator.service.protocol.OperationSetPresence;
 import net.java.sip.communicator.service.protocol.PresenceStatus;
@@ -72,6 +73,19 @@ public void setSelectedStatus(String protocol, Object status){
         
         selectorBox.repaint();
     }
+    
+    public void setConnecting(String protocol){
+        
+        Map protocolStatusMap = Constants
+            .getProtocolStatusIcons(protocol);
+        
+        StatusSelectorBox selectorBox
+            = (StatusSelectorBox)protocolStatusCombos.get(protocol);
+        
+        selectorBox.setIconImage(ImageLoader.getImage(ImageLoader.ICQ_CONNECTING));
+        
+        selectorBox.repaint();
+    }
 
     public Hashtable getProtocolStatusCombos() {
         return protocolStatusCombos;

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

@@ -17,6 +17,7 @@
 
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
+import javax.swing.JLabel;
 import javax.swing.JMenuItem;
 
 import net.java.sip.communicator.impl.gui.main.customcontrols.AntialiasedPopupMenu;
@@ -27,7 +28,7 @@
 import net.java.sip.communicator.service.protocol.PresenceStatus;
 import net.java.sip.communicator.service.protocol.icqconstants.IcqStatusEnum;
 
-public class StatusSelectorBox extends SIPCommButton
+public class StatusSelectorBox extends JLabel
     implements ActionListener{
 
     private AntialiasedPopupMenu popup;
@@ -37,23 +38,28 @@ public class StatusSelectorBox extends SIPCommButton
     private OperationSetPresence presence;
     
     public StatusSelectorBox() {
-        
+        /*
         super(  ImageLoader.getImage(ImageLoader.STATUS_SELECTOR_BOX),
                 ImageLoader.getImage(ImageLoader.STATUS_SELECTOR_BOX),
                 null);
+        */
+        super(new ImageIcon(ImageLoader.getImage(ImageLoader.STATUS_SELECTOR_BOX)));
         
         this.popup = new AntialiasedPopupMenu();
         
         this.popup.setInvoker(this);
         
-        this.addActionListener(this);
+        //this.addActionListener(this);
     }
     
     public StatusSelectorBox(Map itemsMap, Image selectedItem) {
-        
+        /*
         super(  ImageLoader.getImage(ImageLoader.STATUS_SELECTOR_BOX),
                 ImageLoader.getImage(ImageLoader.STATUS_SELECTOR_BOX),
                 selectedItem);
+        */
+        super(new ImageIcon(ImageLoader.getImage(
+                    ImageLoader.STATUS_SELECTOR_BOX)));
         
         this.itemsMap = itemsMap;
         
@@ -61,7 +67,7 @@ public StatusSelectorBox(Map itemsMap, Image selectedItem) {
         
         this.popup.setInvoker(this);
         
-        this.addActionListener(this);
+        //this.addActionListener(this);
         
         this.init();
     }
@@ -115,10 +121,13 @@ else if (e.getSource() instanceof JMenuItem){
                 PresenceStatus status 
                     = ((PresenceStatus)statusSet.next());
                 
-                if(status.getStatusName().equals(menuItem.getText())){
+                if(status.getStatusName().equals(menuItem.getText())
+                        && !this.presence.getPresenceStatus().equals(status)){
                     
                     try {
-                        this.presence.publishPresenceStatus(status, "");
+                        if(!status.equals(IcqStatusEnum.OFFLINE))
+                            this.presence.publishPresenceStatus(status, "");
+                    
                     } catch (IllegalArgumentException e1) {
                         // TODO Auto-generated catch block
                         e1.printStackTrace();
@@ -139,6 +148,11 @@ else if (e.getSource() instanceof JMenuItem){
         }
     }
     
+    public void setIconImage(Image image){
+        
+        this.setIcon(new ImageIcon (image));
+    }
+    
     public Point calculatePopupLocation(){
         
         Component component = this;
@@ -167,6 +181,4 @@ public OperationSetPresence getPresence() {
     public void setPresence(OperationSetPresence presence) {
         this.presence = presence;
     }
-    
-
 }