fix the "Connecting" tooltip for sip accounts

20 years ago · e2c7c5de3a
parent 3b079f4687
commit e2c7c5de3a
1 changed files with 16 additions and 8 deletions
--- a/src/net/java/sip/communicator/impl/gui/main/presence/SimpleStatusSelectorBox.java
+++ b/src/net/java/sip/communicator/impl/gui/main/presence/SimpleStatusSelectorBox.java
@ -79,7 +79,7 @@ public SimpleStatusSelectorBox(MainFrame mainFrame,

        String tooltip = "<html><b>"
            + protocolProvider.getAccountID().getUserID()
-            + "</b><br>Connecting</html>";
+            + "</b><br>Offline</html>";

        this.setToolTipText(tooltip);

@ -158,6 +158,12 @@ public void startConnecting(BufferedImage[] images)
        this.setIcon(new ImageIcon(images[0]));

        this.connecting.start();
+        
+        String tooltip = this.getToolTipText();
+        
+        tooltip = tooltip.substring(0, tooltip.lastIndexOf("<br>"));
+        
+        this.setToolTipText(tooltip.concat("<br>Connecting"));
    }

    /**
@ -167,18 +173,20 @@ public void updateStatus()
    {
        this.connecting.stop();

+        String tooltip = this.getToolTipText();
+        
+        tooltip = tooltip.substring(0, tooltip.lastIndexOf("<br>"));
+        
        if(protocolProvider.isRegistered()) {
            setSelected(onlineItem, onlineIcon);
+        
+            this.setToolTipText(tooltip.concat("<br>" + onlineItem.getText()));
        }
        else {
            setSelected(offlineItem, offlineIcon);
-        }
-
-        String tooltip = this.getToolTipText();
-
-        tooltip = tooltip.substring(0, tooltip.lastIndexOf("<br>"));
-
-        this.setToolTipText(tooltip.concat("<br>" + onlineItem.getText()));
+        
+            this.setToolTipText(tooltip.concat("<br>" + offlineItem.getText()));
+        }        
    }

    /**