* Moved to Display the Video Widget on the right side

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

plugins/VOIP/gui/QVideoDevice.cpp

@@ -101,7 +101,7 @@ QVideoOutputDevice::QVideoOutputDevice(QWidget *parent)
 
 void QVideoOutputDevice::showFrameOff()
 {
-	setPixmap(QPixmap(":/images/video-icon-big.png").scaled(170,128,Qt::KeepAspectRatio,Qt::SmoothTransformation)) ;
+	setPixmap(QPixmap(":/images/video-icon-big.png").scaled(320,256,Qt::KeepAspectRatio,Qt::SmoothTransformation)) ;
 }
 
 void QVideoOutputDevice::showFrame(const QImage& img)

plugins/VOIP/gui/VOIPChatWidgetHolder.cpp

@@ -107,15 +107,18 @@ VOIPChatWidgetHolder::VOIPChatWidgetHolder(ChatWidget *chatWidget)
 
 	// Make a widget with two video devices, one for echo, and one for the talking peer.
 	videoWidget = new QWidget(mChatWidget) ;
-	videoWidget->setLayout(new QHBoxLayout()) ;
+	videoWidget->setLayout(new QVBoxLayout()) ;
 	videoWidget->layout()->addWidget(echoVideoDevice = new QVideoOutputDevice(videoWidget)) ;
 	videoWidget->layout()->addWidget(outputVideoDevice = new QVideoOutputDevice(videoWidget)) ;
 	videoWidget->hide();
 
 	connect(inputVideoDevice, SIGNAL(networkPacketReady()), this, SLOT(sendVideoData()));
 
-	echoVideoDevice->setMinimumSize(128,95) ;
-	outputVideoDevice->setMinimumSize(128,95) ;
+	echoVideoDevice->setMinimumSize(320,256) ;
+	outputVideoDevice->setMinimumSize(320,256) ;
+	
+	echoVideoDevice->setStyleSheet("border: 1px solid #CCCCCC;");
+	outputVideoDevice->setStyleSheet("border: 1px solid #CCCCCC;");
 
 	mChatWidget->addChatHorizontalWidget(videoWidget) ;
 

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

@@ -200,7 +200,7 @@ void ChatWidget::setDefaultExtraFileFlags(TransferRequestFlags fl)
 
 void ChatWidget::addChatHorizontalWidget(QWidget *w)
 {
-	ui->verticalLayout->addWidget(w) ;
+	ui->verticalLayout_2->addWidget(w) ;
 	update() ;
 }
 

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

@@ -6,77 +6,19 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>646</width>
-    <height>296</height>
+    <width>667</width>
+    <height>323</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
-   <property name="spacing">
-    <number>2</number>
-   </property>
+  <layout class="QGridLayout" name="gridLayout">
    <property name="margin">
     <number>0</number>
    </property>
-   <item>
+   <item row="0" column="1" rowspan="5">
+    <layout class="QVBoxLayout" name="verticalLayout_2"/>
+   </item>
+   <item row="0" column="0">
     <layout class="QHBoxLayout" name="hTitleLayout">
-     <item>
-      <layout class="QVBoxLayout" name="titleLayout">
-       <property name="spacing">
-        <number>3</number>
-       </property>
-       <property name="leftMargin">
-        <number>2</number>
-       </property>
-       <property name="topMargin">
-        <number>0</number>
-       </property>
-       <property name="rightMargin">
-        <number>3</number>
-       </property>
-       <property name="bottomMargin">
-        <number>3</number>
-       </property>
-       <item>
-        <widget class="QLabel" name="titleLabel">
-         <property name="font">
-          <font>
-           <pointsize>11</pointsize>
-           <weight>75</weight>
-           <bold>true</bold>
-          </font>
-         </property>
-         <property name="text">
-          <string notr="true">Title</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="statusMessageLabel">
-         <property name="font">
-          <font>
-           <pointsize>9</pointsize>
-          </font>
-         </property>
-         <property name="text">
-          <string notr="true">Status</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>190</width>
-         <height>25</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
      <item>
       <widget class="QFrame" name="titleBarFrame">
        <property name="frameShape">
@@ -89,6 +31,64 @@
         <property name="margin">
          <number>2</number>
         </property>
+        <item>
+         <layout class="QVBoxLayout" name="titleLayout">
+          <property name="spacing">
+           <number>3</number>
+          </property>
+          <property name="leftMargin">
+           <number>2</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>3</number>
+          </property>
+          <property name="bottomMargin">
+           <number>3</number>
+          </property>
+          <item>
+           <widget class="QLabel" name="titleLabel">
+            <property name="font">
+             <font>
+              <pointsize>11</pointsize>
+              <weight>75</weight>
+              <bold>true</bold>
+             </font>
+            </property>
+            <property name="text">
+             <string notr="true">Title</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="statusMessageLabel">
+            <property name="font">
+             <font>
+              <pointsize>9</pointsize>
+             </font>
+            </property>
+            <property name="text">
+             <string notr="true">Status</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
         <item>
          <widget class="QToolButton" name="markButton">
           <property name="sizePolicy">
@@ -234,7 +234,14 @@
      </item>
     </layout>
    </item>
-   <item>
+   <item row="4" column="0">
+    <widget class="HashBox" name="hashBox">
+     <property name="widgetResizable">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
     <widget class="QFrame" name="infoFrame">
      <property name="palette">
       <palette>
@@ -373,7 +380,7 @@ border-image: url(:/images/closepressed.png)
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="2" column="0">
     <widget class="QSplitter" name="chatsplitter">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -465,7 +472,7 @@ border-image: url(:/images/closepressed.png)
      </widget>
     </widget>
    </item>
-   <item>
+   <item row="3" column="0">
     <widget class="QFrame" name="toolBarFrame">
      <property name="frameShape">
       <enum>QFrame::Box</enum>
@@ -709,13 +716,6 @@ border-image: url(:/images/closepressed.png)
      </layout>
     </widget>
    </item>
-   <item>
-    <widget class="HashBox" name="hashBox">
-     <property name="widgetResizable">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
   </layout>
   <action name="actionBold">
    <property name="text">