added to Friends own Avatar and own nick labels

changed to ShareManager Title Background 

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

retroshare-gui/src/gui/PeersDialog.cpp

@@ -91,6 +91,8 @@ PeersDialog::PeersDialog(QWidget *parent)
   connect( ui.peertreeWidget, SIGNAL( customContextMenuRequested( QPoint ) ), this, SLOT( peertreeWidgetCostumPopupMenu( QPoint ) ) );
   connect( ui.peertreeWidget, SIGNAL( itemDoubleClicked ( QTreeWidgetItem *, int)), this, SLOT(chatfriend()));
 
+  connect( ui.avatartoolButton, SIGNAL(clicked()), SLOT(getAvatar()));
+
   /* hide the Tree +/- */
   ui.peertreeWidget -> setRootIsDecorated( false );
 
@@ -171,7 +173,9 @@ PeersDialog::PeersDialog(QWidget *parent)
   timer->connect(timer, SIGNAL(timeout()), this, SLOT(insertChat()));
   timer->start(500); /* half a second */
 
-	ui.peertreeWidget->sortItems( 1, Qt::AscendingOrder );
+  ui.peertreeWidget->sortItems( 1, Qt::AscendingOrder );
+
+  updateAvatar();
 
 
   /* Hide platform specific features */
@@ -219,6 +223,8 @@ void PeersDialog::peertreeWidgetCostumPopupMenu( QPoint point )
       contextMnu.addAction( exportfriendAct);
       contextMnu.addAction( removefriendAct);
       contextMnu.exec( mevent->globalPos() );
+
+      updateAvatar();
 }
 
 
@@ -253,6 +259,17 @@ void  PeersDialog::insertPeers()
 	peerWidget->clear();
 	peerWidget->setColumnCount(3);
 
+	// add self nick and Avatar to Friends.
+	RsPeerDetails pd ;
+
+		if (rsPeers->getPeerDetails(rsPeers->getOwnId(),pd)) 
+		{
+			QString titleStr("<span style=\"font-size:16pt; font-weight:500;"
+                               "color:#32cd32;\">%1</span>");             
+			ui.nicklabel->setText(titleStr.arg(QString::fromStdString(pd.name) + tr(" (me)"))) ;
+
+		}
+
 
         QList<QTreeWidgetItem *> items;
 	for(it = peers.begin(); it != peers.end(); it++)
@@ -1185,3 +1202,52 @@ void PeersDialog::viewprofile()
 	profileview -> setPeerId(id);
 	profileview -> show();
 }
+
+void PeersDialog::updateAvatar()
+{
+	unsigned char *data = NULL;
+	int size = 0 ;
+
+	rsMsgs->getOwnAvatarData(data,size); 
+
+	std::cerr << "Image size = " << size << std::endl ;
+
+	if(size == 0)
+	   std::cerr << "Got no image" << std::endl ;
+
+	// set the image
+	QPixmap pix ;
+	pix.loadFromData(data,size,"JPG") ;
+	ui.avatartoolButton->setIcon(pix); // writes image into ba in JPG format
+
+	delete[] data ;
+}
+
+void PeersDialog::getAvatar()
+{
+	QString fileName = QFileDialog::getOpenFileName(this, "Load File", QDir::homePath(), "Pictures (*.png *.xpm *.jpg)");
+	if(!fileName.isEmpty())
+	{
+		picture = QPixmap(fileName).scaled(82,82, Qt::IgnoreAspectRatio);
+
+		std::cerr << "Sending avatar image down the pipe" << std::endl ;
+
+		// send avatar down the pipe for other peers to get it.
+		QByteArray ba;
+		QBuffer buffer(&ba);
+		buffer.open(QIODevice::WriteOnly);
+		picture.save(&buffer, "JPG"); // writes image into ba in JPG format
+
+		std::cerr << "Image size = " << ba.size() << std::endl ;
+
+		rsMsgs->setOwnAvatarData((unsigned char *)(ba.data()),ba.size()) ;	// last char 0 included.
+
+		updateAvatar() ;
+	}
+}
+
+void PeersDialog::changeAvatarClicked() 
+{
+
+	updateAvatar();
+}

retroshare-gui/src/gui/PeersDialog.h

@@ -52,6 +52,8 @@ public:
   void loadEmoticonsgroupchat();
 //  void setChatDialog(ChatDialog *cd);
 
+  QPixmap picture;
+
 public slots:
 
   void  insertPeers();
@@ -104,6 +106,11 @@ private slots:
   void getFont();
   void underline(); 
 
+  void changeAvatarClicked();
+  void updateAvatar();
+  void getAvatar();
+
+
 signals:
   void friendsUpdated() ;
   void notifyGroupChat(const QString&,const QString&) ;

retroshare-gui/src/gui/ShareManager.ui

@@ -17,53 +17,62 @@
    <iconset resource="images.qrc">
     <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
   </property>
-  <layout class="QGridLayout">
+  <layout class="QGridLayout" name="gridLayout_2">
    <item row="0" column="0" colspan="4">
-    <layout class="QGridLayout">
+    <widget class="QFrame" name="frame">
-     <property name="horizontalSpacing">
+     <property name="styleSheet">
-      <number>0</number>
+      <string notr="true">background-image: url(:/images/connect/connectFriendBanner.png)
+</string>
      </property>
-     <item row="0" column="0">
+     <property name="frameShape">
-      <widget class="QLabel" name="piclabel">
+      <enum>QFrame::StyledPanel</enum>
-       <property name="minimumSize">
+     </property>
-        <size>
+     <property name="frameShadow">
-         <width>48</width>
+      <enum>QFrame::Raised</enum>
-         <height>48</height>
+     </property>
-        </size>
+     <layout class="QGridLayout" name="gridLayout">
-       </property>
+      <item row="0" column="0">
-       <property name="maximumSize">
+       <widget class="QLabel" name="piclabel">
-        <size>
+        <property name="minimumSize">
-         <width>48</width>
+         <size>
-         <height>48</height>
+          <width>48</width>
-        </size>
+          <height>48</height>
-       </property>
+         </size>
-       <property name="styleSheet">
+        </property>
-        <string notr="true">background-image: url(:/images/connect/connectFriendBanner.png)v</string>
+        <property name="maximumSize">
-       </property>
+         <size>
-       <property name="text">
+          <width>48</width>
-        <string/>
+          <height>48</height>
-       </property>
+         </size>
-       <property name="pixmap">
+        </property>
-        <pixmap resource="images.qrc">:/images/fileshare48.png</pixmap>
+        <property name="styleSheet">
-       </property>
+         <string notr="true"/>
-      </widget>
+        </property>
-     </item>
+        <property name="text">
-     <item row="0" column="1">
+         <string/>
-      <widget class="QLabel" name="label_2">
+        </property>
-       <property name="styleSheet">
+        <property name="pixmap">
-        <string notr="true">background-image: url(:/images/connect/connectFriendBanner.png)</string>
+         <pixmap resource="images.qrc">:/images/fileshare48.png</pixmap>
-       </property>
+        </property>
-       <property name="text">
+       </widget>
-        <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+      </item>
+      <item row="0" column="1">
+       <widget class="QLabel" name="label_2">
+        <property name="styleSheet">
+         <string notr="true"/>
+        </property>
+        <property name="text">
+         <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; font-size:16pt; font-weight:600; color:#32cd32;&quot;&gt; Share Manager&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; font-size:10pt;&quot;&gt; Add a new Folder to Share with your Friends or remove a Shared Folder.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-       </property>
+        </property>
-      </widget>
+       </widget>
-     </item>
+      </item>
-    </layout>
+     </layout>
+    </widget>
    </item>
    <item row="1" column="0" colspan="4">
     <widget class="QGroupBox" name="groupBox">