From 665b7fbf47156424697e4acc8c8eb48419c2cd67 Mon Sep 17 00:00:00 2001
From: defnax <retroshare.project@gmail.com>
Date: Sat, 7 Apr 2012 11:19:42 +0000
Subject: [PATCH] removed not needed button

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5083 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 .../src/gui/connect/FriendRequest.cpp         | 20 -------
 .../src/gui/connect/FriendRequest.ui          | 52 +++++--------------
 2 files changed, 13 insertions(+), 59 deletions(-)

diff --git a/retroshare-gui/src/gui/connect/FriendRequest.cpp b/retroshare-gui/src/gui/connect/FriendRequest.cpp
index 7d83f0ac7..a64f98843 100644
--- a/retroshare-gui/src/gui/connect/FriendRequest.cpp
+++ b/retroshare-gui/src/gui/connect/FriendRequest.cpp
@@ -57,7 +57,6 @@ FriendRequest::FriendRequest(const std::string& id, QWidget *parent, Qt::WFlags
 
     connect(ui.applyButton, SIGNAL(clicked()), this, SLOT(applyDialog()));
     connect(ui.cancelButton, SIGNAL(clicked()), this, SLOT(close()));
-    connect(ui.signKeyButton, SIGNAL(clicked()), this, SLOT(signGPGKey()));
 
     load();
 }
@@ -90,25 +89,6 @@ void FriendRequest::load()
 
     ui.avatar->setId(mId, false);
 
-
-        if (detail.accept_connection) {
-            ui.signGPGKeyCheckBox->hide();
-            //connection already accepted, propose to sign gpg key
-            if (!detail.ownsign) {
-                ui.signKeyButton->show();
-            } else {
-                ui.signKeyButton->hide();
-            }
-        } else {
-            ui.signKeyButton->hide();
-            if (!detail.ownsign) {
-                ui.signGPGKeyCheckBox->show();
-                ui.signGPGKeyCheckBox->setChecked(false);
-            } else {
-                ui.signGPGKeyCheckBox->hide();
-            }
-        }
-
         //web of trust
         if (detail.trustLvl == GPGME_VALIDITY_ULTIMATE) {
             //trust is ultimate, it means it's one of our own keys
diff --git a/retroshare-gui/src/gui/connect/FriendRequest.ui b/retroshare-gui/src/gui/connect/FriendRequest.ui
index 1d91f1ced..518138f99 100644
--- a/retroshare-gui/src/gui/connect/FriendRequest.ui
+++ b/retroshare-gui/src/gui/connect/FriendRequest.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>414</width>
-    <height>367</height>
+    <width>372</width>
+    <height>328</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -106,6 +106,9 @@ p, li { white-space: pre-wrap; }
       <enum>QFrame::Raised</enum>
      </property>
      <layout class="QGridLayout" name="gridLayout_4">
+      <property name="topMargin">
+       <number>6</number>
+      </property>
       <item row="1" column="0">
        <spacer name="horizontalSpacer_2">
         <property name="orientation">
@@ -381,40 +384,18 @@ border-image: url(:/images/btn_blue_hover.png) 4;
         </item>
        </layout>
       </item>
-      <item row="2" column="0" rowspan="2">
-       <widget class="QToolButton" name="signKeyButton">
-        <property name="toolTip">
-         <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:'Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Signing a friend's key is a way to express your trust into this friend, to your other friends. Besides, only signed peers will receive information about your other trusted friends.&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Signing a key cannot be undone, so do it wisely.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <item row="2" column="0" colspan="3">
+       <spacer name="verticalSpacer">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
         </property>
-        <property name="text">
-         <string>Sign GPG key</string>
-        </property>
-        <property name="icon">
-         <iconset resource="../images.qrc">
-          <normaloff>:/images/view-certificate-sign-32.png</normaloff>:/images/view-certificate-sign-32.png</iconset>
-        </property>
-        <property name="iconSize">
+        <property name="sizeHint" stdset="0">
          <size>
-          <width>32</width>
-          <height>32</height>
+          <width>20</width>
+          <height>2</height>
          </size>
         </property>
-        <property name="checked">
-         <bool>false</bool>
-        </property>
-        <property name="toolButtonStyle">
-         <enum>Qt::ToolButtonIconOnly</enum>
-        </property>
-        <property name="autoRaise">
-         <bool>true</bool>
-        </property>
-       </widget>
+       </spacer>
       </item>
      </layout>
     </widget>
@@ -436,13 +417,6 @@ p, li { white-space: pre-wrap; }
  </customwidgets>
  <resources>
   <include location="../images.qrc"/>
-  <include location="../images.qrc"/>
-  <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>