Added ProfileWidget as Tab to show own Profile Details

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

retroshare-gui/src/RetroShare.pro

@@ -186,6 +186,7 @@ HEADERS +=  rshare.h \
             gui/bwgraph/bwgraph.h \
             gui/profile/ProfileView.h \
             gui/profile/ProfileEdit.h \
+            gui/profile/ProfileWidget.h \
             gui/chat/PopupChatDialog.h \
             gui/connect/ConnectDialog.h \
             gui/connect/ConfCertDialog.h \
@@ -299,6 +300,7 @@ FORMS +=    gui/BlogDialog.ui \
             gui/bwgraph/bwgraph.ui \
             gui/profile/ProfileView.ui \
             gui/profile/ProfileEdit.ui \
+            gui/profile/ProfileWidget.ui \
             gui/chat/PopupChatDialog.ui \
             gui/connect/ConnectDialog.ui \
             gui/connect/ConfCertDialog.ui \
@@ -409,6 +411,7 @@ SOURCES +=  main.cpp \
             gui/bwgraph/bwgraph.cpp \
             gui/profile/ProfileView.cpp \
             gui/profile/ProfileEdit.cpp \
+            gui/profile/ProfileWidget.cpp \
             gui/chat/PopupChatDialog.cpp \
             gui/connect/ConnectDialog.cpp \
             gui/connect/ConfCertDialog.cpp \

retroshare-gui/src/gui/PeersDialog.cpp

@@ -35,6 +35,7 @@
 #include "msgs/ChanMsgDialog.h"
 #include "connect/ConfCertDialog.h"
 #include "profile/ProfileView.h"
+#include "profile/ProfileWidget.h"
 #include "GenCertDialog.h"
 #include "gui/connect/ConnectFriendWizard.h"
 #include "gui/Preferences/rsharesettings.h"
@@ -96,6 +97,9 @@ PeersDialog::PeersDialog(QWidget *parent)
   /* hide the Tree +/- */
   ui.peertreeWidget -> setRootIsDecorated( false );
   
+  ui.peertabWidget->addTab(new ProfileWidget(),QString(tr("Profile")));
+
+
   /* Set header resize modes and initial section sizes */
 	QHeaderView * _header = ui.peertreeWidget->header () ;
   _header->setResizeMode (0, QHeaderView::Custom);

retroshare-gui/src/gui/PeersDialog.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>778</width>
+    <width>707</width>
-    <height>523</height>
+    <height>467</height>
    </rect>
   </property>
   <property name="palette">
@@ -482,7 +482,7 @@
   <property name="contextMenuPolicy">
    <enum>Qt::NoContextMenu</enum>
   </property>
-  <layout class="QGridLayout" name="gridLayout_5">
+  <layout class="QGridLayout" name="gridLayout_6">
    <item row="0" column="0">
     <widget class="QSplitter" name="splitter">
      <property name="orientation">
@@ -662,7 +662,10 @@ background: white;}</string>
       </layout>
      </widget>
      <widget class="QWidget" name="layoutWidget">
-      <layout class="QGridLayout" name="gridLayout_3">
+      <layout class="QGridLayout" name="gridLayout_5">
+       <property name="verticalSpacing">
+        <number>1</number>
+       </property>
        <item row="0" column="0">
         <widget class="QFrame" name="frame">
          <property name="sizePolicy">
@@ -787,56 +790,31 @@ p, li { white-space: pre-wrap; }
         </widget>
        </item>
        <item row="1" column="0">
-        <layout class="QGridLayout">
+        <widget class="QTabWidget" name="peertabWidget">
-         <property name="spacing">
+         <property name="currentIndex">
           <number>0</number>
          </property>
+         <widget class="QWidget" name="tab">
+          <attribute name="title">
+           <string>Live Chat</string>
+          </attribute>
+          <layout class="QGridLayout" name="gridLayout_3">
+           <property name="leftMargin">
+            <number>0</number>
+           </property>
+           <property name="topMargin">
+            <number>0</number>
+           </property>
+           <property name="rightMargin">
+            <number>0</number>
+           </property>
+           <property name="bottomMargin">
+            <number>2</number>
+           </property>
+           <property name="verticalSpacing">
+            <number>2</number>
+           </property>
            <item row="0" column="0">
-          <layout class="QGridLayout">
-           <item row="0" column="1">
-            <spacer>
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>181</width>
-               <height>20</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item row="0" column="0">
-            <layout class="QGridLayout">
-             <item row="0" column="0">
-              <widget class="QLabel" name="label_3">
-               <property name="text">
-                <string/>
-               </property>
-               <property name="pixmap">
-                <pixmap resource="images.qrc">:/images/user/agt_forum24.png</pixmap>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="1">
-              <widget class="QLabel" name="label_12">
-               <property name="font">
-                <font>
-                 <pointsize>10</pointsize>
-                 <weight>75</weight>
-                 <bold>true</bold>
-                </font>
-               </property>
-               <property name="text">
-                <string>Live Group Chat:</string>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
-          </layout>
-         </item>
-         <item row="1" column="0">
             <widget class="QTextBrowser" name="msgText">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@@ -859,11 +837,7 @@ background: white;}</string>
              </property>
             </widget>
            </item>
-        </layout>
+           <item row="1" column="0">
-       </item>
-       <item row="2" column="0">
-        <layout class="QGridLayout">
-         <item row="0" column="0">
             <layout class="QGridLayout">
              <item row="0" column="0">
               <spacer>
@@ -1059,10 +1033,10 @@ background: white;}</string>
              </item>
             </layout>
            </item>
-         <item row="1" column="0">
+           <item row="2" column="0">
             <widget class="QTextEdit" name="lineEdit">
              <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Maximum">
+              <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -1070,7 +1044,7 @@ background: white;}</string>
              <property name="maximumSize">
               <size>
                <width>16777215</width>
-             <height>100</height>
+               <height>60</height>
               </size>
              </property>
              <property name="sizeIncrement">
@@ -1091,8 +1065,6 @@ background: white;}</string>
              </property>
             </widget>
            </item>
-        </layout>
-       </item>
            <item row="3" column="0">
             <layout class="QGridLayout">
              <item row="0" column="0">
@@ -1118,6 +1090,14 @@ background: white;}</string>
             </layout>
            </item>
           </layout>
+          <zorder>msgText</zorder>
+          <zorder></zorder>
+          <zorder>lineEdit</zorder>
+          <zorder></zorder>
+         </widget>
+        </widget>
+       </item>
+      </layout>
      </widget>
     </widget>
    </item>
@@ -1149,6 +1129,7 @@ background: white;}</string>
  <resources>
   <include location="images.qrc"/>
   <include location="images.qrc"/>
+  <include location="images.qrc"/>
  </resources>
  <connections/>
 </ui>

retroshare-gui/src/gui/profile/ProfileWidget.cpp

@@ -0,0 +1,99 @@
+/****************************************************************
+ *  RetroShare is distributed under the following license:
+ *
+ *  Copyright (C) 2006 - 2009,  RetroShre Team
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version 2
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA  02110-1301, USA.
+ ****************************************************************/
+#include "ProfileWidget.h"
+
+#include "rsiface/rsiface.h"
+#include "rsiface/rspeers.h"
+#include "rsiface/rsdisc.h"
+
+#include <QTime>
+
+#include <sstream>
+#include <iomanip>
+
+/* Define the format used for displaying the date and time */
+#define DATETIME_FMT  "MMM dd hh:mm:ss"
+
+/** Default constructor */
+ProfileWidget::ProfileWidget(QWidget *parent, Qt::WFlags flags)
+  : QWidget(parent, flags)
+{
+  /* Invoke Qt Designer generated QObject setup routine */
+  ui.setupUi(this);
+
+  loadDialog();
+}
+
+void ProfileWidget::closeEvent (QCloseEvent * event)
+{
+ QWidget::closeEvent(event);
+}
+
+void ProfileWidget::loadDialog()
+{
+
+	RsPeerDetails detail;
+  if (rsPeers->getPeerDetails(rsPeers->getOwnId(),detail)) 	
+  {	
+
+	ui.name->setText(QString::fromStdString(detail.name));
+	ui.orgloc->setText(QString::fromStdString(detail.org));
+	ui.country->setText(QString::fromStdString(detail.location));
+  
+  ui.peerid->setText(QString::fromStdString(detail.id));
+        
+	// Dont Show a timestamp in RS calculate the day
+	QDateTime date = QDateTime::fromTime_t(detail.lastConnect);
+	QString stime = date.toString(Qt::LocalDate);
+  ui.lastcontact-> setText(stime);
+
+    /* set retroshare version */
+    std::map<std::string, std::string>::iterator vit;
+    std::map<std::string, std::string> versions;
+	bool retv = rsDisc->getDiscVersions(versions);
+	if (retv && versions.end() != (vit = versions.find(detail.id)))
+	{
+		ui.version->setText(QString::fromStdString(vit->second));
+	}
+
+	/* set local address */
+	ui.localAddress->setText(QString::fromStdString(detail.localAddr));
+	ui.localPort -> setValue(detail.localPort);
+	/* set the server address */
+	ui.extAddress->setText(QString::fromStdString(detail.extAddr));
+	ui.extPort -> setValue(detail.extPort);
+	
+	  std::list<std::string> ids;
+	  ids.clear();
+    rsPeers->getFriendList(ids);
+    int friends = ids.size();
+    
+    std::ostringstream out;
+    out << friends << "";
+    ui.friendsEdit->setText(QString::fromStdString(out.str()));
+	
+  }
+
+}
+
+
+
+

retroshare-gui/src/gui/profile/ProfileWidget.h

@@ -0,0 +1,57 @@
+/****************************************************************
+ *  RetroShare is distributed under the following license:
+ *
+ *  Copyright (C) 2006 - 2009, RetroShare Team
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version 2
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ *  Boston, MA  02110-1301, USA.
+ ****************************************************************/
+
+
+#ifndef _PROFILEWIDGET_H
+#define _PROFILEWIDGET_H
+
+#include <QWidget>
+
+#include "ui_ProfileWidget.h"
+
+class ProfileWidget : public QWidget
+{
+  Q_OBJECT
+
+	public:
+  /** Default constructor */
+  ProfileWidget(QWidget *parent = 0, Qt::WFlags flags = 0);
+  /** Default destructor */
+
+
+protected:
+  void closeEvent (QCloseEvent * event);
+  
+private slots:
+
+  
+private:
+
+ void 	loadDialog();
+
+
+  /** Qt Designer generated object */
+  Ui::ProfileWidget ui;
+
+};
+
+#endif
+

retroshare-gui/src/gui/profile/ProfileWidget.ui

@@ -0,0 +1,262 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ProfileWidget</class>
+ <widget class="QWidget" name="ProfileWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>460</width>
+    <height>370</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_2">
+   <item row="0" column="0">
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="title">
+      <string>Public Information</string>
+     </property>
+     <layout class="QGridLayout">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_10">
+        <property name="text">
+         <string>Name:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QLineEdit" name="name">
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_11">
+        <property name="text">
+         <string>Org / Loc:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="orgloc">
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_8">
+        <property name="text">
+         <string>Country/State:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QLineEdit" name="country">
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="label_6">
+        <property name="text">
+         <string>Peer ID</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="QLineEdit" name="peerid">
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0">
+       <widget class="QLabel" name="label_7">
+        <property name="text">
+         <string>Last Contact</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1">
+       <widget class="QLineEdit" name="lastcontact">
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QGroupBox" name="groupBox_3">
+     <property name="title">
+      <string>Other Information</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_9">
+        <property name="text">
+         <string>Number of Friends:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QLineEdit" name="friendsEdit">
+        <property name="enabled">
+         <bool>true</bool>
+        </property>
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_3">
+        <property name="text">
+         <string>Version</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="version">
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>My Address</string>
+     </property>
+     <layout class="QVBoxLayout" name="_2">
+      <item>
+       <layout class="QHBoxLayout" name="_3">
+        <item>
+         <layout class="QVBoxLayout" name="_4">
+          <item>
+           <widget class="QLabel" name="label">
+            <property name="layoutDirection">
+             <enum>Qt::LeftToRight</enum>
+            </property>
+            <property name="text">
+             <string>Local Address:</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="label_2">
+            <property name="text">
+             <string>External Address:</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <layout class="QVBoxLayout" name="_5">
+          <item>
+           <widget class="QLineEdit" name="localAddress">
+            <property name="readOnly">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLineEdit" name="extAddress">
+            <property name="readOnly">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <layout class="QVBoxLayout" name="_6">
+          <item>
+           <widget class="QLabel" name="label_5">
+            <property name="text">
+             <string>Port:</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="label_4">
+            <property name="text">
+             <string>Port:</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <layout class="QVBoxLayout" name="_7">
+          <item>
+           <widget class="QSpinBox" name="localPort">
+            <property name="readOnly">
+             <bool>true</bool>
+            </property>
+            <property name="minimum">
+             <number>0</number>
+            </property>
+            <property name="maximum">
+             <number>65535</number>
+            </property>
+            <property name="value">
+             <number>7812</number>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QSpinBox" name="extPort">
+            <property name="readOnly">
+             <bool>true</bool>
+            </property>
+            <property name="minimum">
+             <number>0</number>
+            </property>
+            <property name="maximum">
+             <number>65535</number>
+            </property>
+            <property name="value">
+             <number>7812</number>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <spacer name="verticalSpacer">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>