Added Status service interface to retroshare-gui.

PeersDialog now displays additional status info from Status service (if any).


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

retroshare-gui/src/gui/PeersDialog.cpp

@@ -27,6 +27,7 @@
 #include "PeersDialog.h"
 #include "rsiface/rsiface.h"
 #include "rsiface/rspeers.h"
+#include "rsiface/rsstatus.h"
 
 #include "chat/PopupChatDialog.h"
 #include "msgs/ChanMsgDialog.h"
@@ -191,8 +192,16 @@ void  PeersDialog::insertPeers()
 		item -> setText(0, "");
 		
 		/* (0) Status */		
-		item -> setText(1, 
+		QString status = QString::fromStdString(RsPeerStateString(detail.state));
-			QString::fromStdString(RsPeerStateString(detail.state)));
+
+		/* Append additional status info from status service */
+		StatusInfo statusInfo;
+		if (rsStatus->getStatus(*it, statusInfo))
+		{
+			status.append(QString::fromStdString("/" + RsStatusString(statusInfo.status)));
+		}
+
+		item -> setText(1, status);
 
 		/* (1) Person */
 		item -> setText(2, QString::fromStdString(detail.name));

retroshare-gui/src/rsiface/rsstatus.h

@@ -0,0 +1,61 @@
+#ifndef RS_STATUS_INTERFACE_H
+#define RS_STATUS_INTERFACE_H
+
+/*
+ * libretroshare/src/rsiface: rsstatus.h
+ *
+ * RetroShare C++ .
+ *
+ * Copyright 2007-2008 by Vinny Do.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License Version 2 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA.
+ *
+ * Please report all bugs and problems to "retroshare@lunamutt.com".
+ *
+ */
+
+class RsStatus;
+
+extern RsStatus *rsStatus;
+
+#include <iostream>
+#include <string>
+#include <inttypes.h>
+
+const uint32_t RS_STATUS_OFFLINE = 0x0001;
+const uint32_t RS_STATUS_AWAY    = 0x0002;
+const uint32_t RS_STATUS_BUSY    = 0x0003;
+const uint32_t RS_STATUS_ONLINE  = 0x0004;
+
+std::string RsStatusString(uint32_t status);
+
+class StatusInfo
+{
+	public:
+	std::string id;
+	uint32_t status;
+};
+
+class RsStatus
+{
+	public:
+virtual bool getStatus(std::string id, StatusInfo& statusInfo) = 0;
+virtual bool setStatus(StatusInfo& statusInfo)                 = 0;
+
+};
+
+std::ostream& operator<<(std::ostream& out, const StatusInfo& statusInfo);
+
+#endif