Count the friends (gpg id's) instead of the locations (ssl id's) in the statusbar.

Moved update of the friends from QTimer to signals.
Combined p3LinkMgr::getFriendCount and p3LinkMgr::getOnlineCount and moved to p3PeerMgr.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4986 b45a01b8-16f6-495d-af2f-9b41ad6348cc

retroshare-gui/src/gui/MainWindow.cpp

@@ -57,6 +57,7 @@
 #include "chat/ChatDialog.h"
 #include "RetroShareLink.h"
 #include "SoundManager.h"
+#include "notifyqt.h"
 
 #ifdef UNFINISHED
 #include "unfinished/ApplicationWindow.h"
@@ -176,6 +177,7 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
 
     m_bStatusLoadDone = false;
     isIdle = false;
+    onlineCount = 0;
 
     notifyMenu = NULL;
     trayIconMessages = NULL;
@@ -197,7 +199,6 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
 
     setWindowTitle(tr("RetroShare %1 a secure decentralised communication platform").arg(retroshareVersion()) + " - " + nameAndLocation);
 
-
     /* WORK OUT IF WE"RE IN ADVANCED MODE OR NOT */
     bool advancedMode = false;
     std::string advsetting;
@@ -360,6 +361,11 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
     /* Creates a tray icon with a context menu and adds it to the system's * notification area. */
     createTrayIcon();
 
+    /* caclulate friend count */
+    updateFriends();
+    connect(NotifyQt::getInstance(), SIGNAL(peerStatusChanged(QString,int)), this, SLOT(updateFriends()));
+    connect(NotifyQt::getInstance(), SIGNAL(friendsChanged()), this, SLOT(updateFriends()));
+
     loadOwnStatus();
 
     /* Set focus to the current page */
@@ -803,10 +809,6 @@ void MainWindow::updateStatus()
     if(RsAutoUpdatePage::eventsLocked())
         return;
 
-    unsigned int nFriendCount = 0;
-    unsigned int nOnlineCount = 0;
-    rsPeers->getPeerCount (&nFriendCount, &nOnlineCount, false);
-    
     float downKb = 0;
     float upKb = 0;
     rsicontrol -> ConfigGetDataRates(downKb, upKb);
@@ -814,9 +816,6 @@ void MainWindow::updateStatus()
     if (ratesstatus)
         ratesstatus->getRatesStatus(downKb, upKb);
 
-    if (peerstatus)
-        peerstatus->getPeerStatus(nFriendCount, nOnlineCount);
-
     if (natstatus)
         natstatus->getNATStatus();
         
@@ -827,22 +826,40 @@ void MainWindow::updateStatus()
         discstatus->update();
     }
 
+    QString tray = "RetroShare\n" + tr("Down: %1 (kB/s)").arg(downKb, 0, 'f', 2) + " | " + tr("Up: %1 (kB/s)").arg(upKb, 0, 'f', 2) + "\n";
+
+    if (onlineCount == 1) {
+        tray += tr("%1 friend connected").arg(onlineCount);
+    } else {
+        tray += tr("%1 friends connected").arg(onlineCount);
+    }
+
+    tray += "\n" + nameAndLocation;
+
+    if (!notifyToolTip.isEmpty()) {
+        tray += "\n";
+        tray += notifyToolTip;
+    }
+    trayIcon->setToolTip(tray);
+}
+
+void MainWindow::updateFriends()
+{
+    unsigned int friendCount = 0;
+    rsPeers->getPeerCount (&friendCount, &onlineCount, false);
+
+    if (peerstatus)
+        peerstatus->getPeerStatus(friendCount, onlineCount);
+
     QString trayIconResource;
 
-    if (nOnlineCount == 0)
-    {
+    if (onlineCount == 0) {
         trayIconResource = IMAGE_NOONLINE;
-    }
-    else if (nOnlineCount < 2)
-    {
+    } else if (onlineCount < 2) {
         trayIconResource = IMAGE_ONEONLINE;
-    }
-    else if (nOnlineCount < 3)
-    {
+    } else if (onlineCount < 3) {
         trayIconResource = IMAGE_TWOONLINE;
-    }
-    else
-    {
+    } else {
         trayIconResource = IMAGE_RETROSHARE;
     }
 
@@ -860,22 +877,6 @@ void MainWindow::updateStatus()
     }
 
     trayIcon->setIcon(icon);
-
-    QString tray = "RetroShare\n" + tr("Down: %1 (kB/s)").arg(downKb, 0, 'f', 2) + " | " + tr("Up: %1 (kB/s)").arg(upKb, 0, 'f', 2) + "\n";
-
-    if (nOnlineCount == 1) {
-        tray += tr("%1 friend connected").arg(nOnlineCount);
-    } else {
-        tray += tr("%1 friends connected").arg(nOnlineCount);
-    }
-
-    tray += "\n" + nameAndLocation;
-
-    if (!notifyToolTip.isEmpty()) {
-        tray += "\n";
-        tray += notifyToolTip;
-    }
-    trayIcon->setToolTip(tray);
 }
 
 void MainWindow::privateChatChanged(int list, int type)

retroshare-gui/src/gui/MainWindow.h

@@ -165,6 +165,7 @@ private slots:
 
     void updateMenu();
     void updateStatus();
+    void updateFriends();
 
     void toggleVisibility(QSystemTrayIcon::ActivationReason e);
     void toggleVisibilitycontextmenu();
@@ -256,6 +257,7 @@ private:
     /* Status */
     std::set <QObject*> m_apStatusObjects; // added objects for status
     bool m_bStatusLoadDone;
+    unsigned int onlineCount;
 
     void loadOwnStatus();
 

retroshare-gui/src/gui/notifyqt.cpp

@@ -183,11 +183,11 @@ void NotifyQt::notifyDiskFull(uint32_t loc,uint32_t size_in_mb)
 /* peer has changed the state */
 void NotifyQt::notifyPeerStatusChanged(const std::string& peer_id, uint32_t state)
 {
-        #ifdef NOTIFY_DEBUG
+#ifdef NOTIFY_DEBUG
 	std::cerr << "Notifyqt:: notified that peer " << peer_id << " has changed the state to " << state << std::endl;
-        #endif
+#endif
 
-        emit peerStatusChanged(QString::fromStdString(peer_id), state);
+	emit peerStatusChanged(QString::fromStdString(peer_id), state);
 }
 
 /* one or more peers has changed the states */