changed Avatar pixel size, and added for Privat Chat's Avatar background new images.

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

retroshare-gui/src/gui/MessengerWindow.cpp

@@ -1015,7 +1015,7 @@ void MessengerWindow::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,Qt::SmoothTransformation);
+		picture = QPixmap(fileName).scaled(96,96, Qt::IgnoreAspectRatio,Qt::SmoothTransformation);
 
 		std::cerr << "Sending avatar image down the pipe" << std::endl ;
 

retroshare-gui/src/gui/PeersDialog.cpp

@@ -1567,7 +1567,7 @@ void PeersDialog::getAvatar()
 	if(!fileName.isEmpty())
 	{
 		QPixmap picture;
-		picture = QPixmap(fileName).scaled(82,82, Qt::IgnoreAspectRatio,Qt::SmoothTransformation);
+		picture = QPixmap(fileName).scaled(96,96, Qt::IgnoreAspectRatio,Qt::SmoothTransformation);
 
                 #ifdef PEERS_DEBUG
 		std::cerr << "Sending avatar image down the pipe" << std::endl ;

retroshare-gui/src/gui/chat/PopupChatDialog.cpp

@@ -910,7 +910,7 @@ void PopupChatDialog::getAvatar()
 
 	if(!fileName.isEmpty())
 	{
-		picture = QPixmap(fileName).scaled(82,82, Qt::IgnoreAspectRatio,Qt::SmoothTransformation);
+		picture = QPixmap(fileName).scaled(96,96, Qt::IgnoreAspectRatio,Qt::SmoothTransformation);
 
 		std::cerr << "Sending avatar image down the pipe" << std::endl ;
 
@@ -1170,34 +1170,34 @@ void PopupChatDialog::updateStatus(const QString &peer_id, int status)
 
     switch (status) {
     case RS_STATUS_OFFLINE:
-        ui.avatarlabel->setStyleSheet("QLabel#avatarlabel{ border-image:url(:/images/mystatus_bg_offline.png); }");
+        ui.avatarlabel->setStyleSheet("QLabel#avatarlabel{ border-image:url(:/images/avatarstatus_bg_offline.png); }");
         ui.avatarlabel->setEnabled(false);
         ui.infoframe->setVisible(true);
         ui.infolabel->setText( QString::fromStdString(dialogName) + " " + tr("apears to be Offline.") +"\n" + tr("Messages you send will be lost and not delivered, rs-Mail this contact instead."));
         break;
 
     case RS_STATUS_INACTIVE:
-        ui.avatarlabel->setStyleSheet("QLabel#avatarlabel{ border-image:url(:/images/mystatus_bg_idle.png); }");
+        ui.avatarlabel->setStyleSheet("QLabel#avatarlabel{ border-image:url(:/images/avatarstatus_bg_away.png); }");
         ui.avatarlabel->setEnabled(true);
         ui.infoframe->setVisible(true);
         ui.infolabel->setText( QString::fromStdString(dialogName) + " " + tr("is Idle and may not reply"));
         break;
 
     case RS_STATUS_ONLINE:
-        ui.avatarlabel->setStyleSheet("QLabel#avatarlabel{ border-image:url(:/images/mystatus_bg_online.png); }");
+        ui.avatarlabel->setStyleSheet("QLabel#avatarlabel{ border-image:url(:/images/avatarstatus_bg_online.png); }");
         ui.avatarlabel->setEnabled(true);
         ui.infoframe->setVisible(false);
         break;
 
     case RS_STATUS_AWAY:
-        ui.avatarlabel->setStyleSheet("QLabel#avatarlabel{ border-image:url(:/images/mystatus_bg_idle.png); }");
+        ui.avatarlabel->setStyleSheet("QLabel#avatarlabel{ border-image:url(:/images/avatarstatus_bg_away.png); }");
         ui.avatarlabel->setEnabled(true);
         ui.infolabel->setText( QString::fromStdString(dialogName) + " " + tr("is Away and may not reply"));
         ui.infoframe->setVisible(true);
         break;
 
     case RS_STATUS_BUSY:
-        ui.avatarlabel->setStyleSheet("QLabel#avatarlabel{ border-image:url(:/images/mystatus_bg_busy.png); }");
+        ui.avatarlabel->setStyleSheet("QLabel#avatarlabel{ border-image:url(:/images/avatarstatus_bg_busy.png); }");
         ui.avatarlabel->setEnabled(true);
         ui.infolabel->setText( QString::fromStdString(dialogName) + " " + tr("is Busy and may not reply"));
         ui.infoframe->setVisible(true);

retroshare-gui/src/gui/chat/PopupChatDialog.ui

@@ -9,7 +9,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>558</width>
+    <width>504</width>
     <height>430</height>
    </rect>
   </property>
@@ -102,7 +102,7 @@
      <widget class="QFrame" name="avatarframe">
       <property name="maximumSize">
        <size>
-        <width>120</width>
+        <width>132</width>
         <height>16777215</height>
        </size>
       </property>
@@ -140,8 +140,8 @@
           </size>
          </property>
          <property name="styleSheet">
-          <string>QLabel{
+          <string notr="true">QLabel{
-border-image: url(:/images/mystatus_bg.png);
+border-image: url(:/images/avatarstatus_bg.png);
 
 }</string>
          </property>
@@ -181,8 +181,8 @@ border-image: url(:/images/mystatus_bg.png);
           </size>
          </property>
          <property name="styleSheet">
-          <string>QLabel{
+          <string notr="true">QLabel{
-border-image: url(:/images/mystatus_bg.png);
+border-image: url(:/images/avatarstatus_bg.png);
 
 }</string>
          </property>
@@ -328,7 +328,7 @@ p, li { white-space: pre-wrap; }
         <bool>false</bool>
        </property>
       </widget>
-      <widget class="QWidget" name="">
+      <widget class="QWidget" name="layoutWidget">
        <layout class="QVBoxLayout" name="verticalLayout_2">
         <property name="spacing">
          <number>1</number>
@@ -375,7 +375,7 @@ background: white;}</string>
      <widget class="QFrame" name="Chatbuttonframe">
       <property name="minimumSize">
        <size>
-        <width>16</width>
+        <width>347</width>
         <height>46</height>
        </size>
       </property>
@@ -830,6 +830,9 @@ border: 1px solid #CCCCCC;
   <include location="../images.qrc"/>
   <include location="../images.qrc"/>
   <include location="../images.qrc"/>
+  <include location="../images.qrc"/>
+  <include location="../images.qrc"/>
+  <include location="../images.qrc"/>
  </resources>
  <connections/>
 </ui>

retroshare-gui/src/gui/images.qrc

@@ -33,6 +33,11 @@
         <file>images/add_channel64.png</file>
         <file>images/add_channel24.png</file>
         <file>images/add_channel32.png</file>
+        <file>images/avatarstatus_bg.png</file>
+        <file>images/avatarstatus_bg_online.png</file>
+        <file>images/avatarstatus_bg_away.png</file>    
+        <file>images/avatarstatus_bg_busy.png</file>
+        <file>images/avatarstatus_bg_offline.png</file>
         <file>images/browse-looking.gif</file>
         <file>images/back.png</file>
         <file>images/backgroundl.png</file>