From f362daea0b4d13066de962ec862ed290290202e8 Mon Sep 17 00:00:00 2001
From: joss17 <joss17@users.sourceforge.net>
Date: Sat, 6 Mar 2010 21:30:00 +0000
Subject: [PATCH] small design change of confcertdialog

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2491 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 .../src/gui/connect/ConfCertDialog.ui         | 116 +++++++++++-------
 retroshare-gui/src/gui/images.qrc             |   1 +
 .../gui/images/view-certificate-sign-48.png   | Bin 0 -> 4847 bytes
 3 files changed, 71 insertions(+), 46 deletions(-)
 create mode 100644 retroshare-gui/src/gui/images/view-certificate-sign-48.png

diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.ui b/retroshare-gui/src/gui/connect/ConfCertDialog.ui
index ffe9fbb94..7bc25a3d8 100644
--- a/retroshare-gui/src/gui/connect/ConfCertDialog.ui
+++ b/retroshare-gui/src/gui/connect/ConfCertDialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>560</width>
-    <height>497</height>
+    <width>505</width>
+    <height>527</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -41,7 +41,7 @@
           <item row="0" column="0">
            <widget class="QLabel" name="label_name">
             <property name="text">
-             <string>Name:</string>
+             <string>Name</string>
             </property>
            </widget>
           </item>
@@ -97,7 +97,7 @@
           <item row="4" column="0">
            <widget class="QLabel" name="label_loc">
             <property name="text">
-             <string>Loc:</string>
+             <string>Loc</string>
             </property>
            </widget>
           </item>
@@ -127,7 +127,7 @@
                  <enum>Qt::LeftToRight</enum>
                 </property>
                 <property name="text">
-                 <string>Local Address:</string>
+                 <string>Local Address</string>
                 </property>
                 <property name="alignment">
                  <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -137,7 +137,7 @@
               <item>
                <widget class="QLabel" name="label_2">
                 <property name="text">
-                 <string>External Address:</string>
+                 <string>External Address</string>
                 </property>
                </widget>
               </item>
@@ -158,14 +158,14 @@
               <item>
                <widget class="QLabel" name="label_5">
                 <property name="text">
-                 <string>Port:</string>
+                 <string>Port</string>
                 </property>
                </widget>
               </item>
               <item>
                <widget class="QLabel" name="label_4">
                 <property name="text">
-                 <string>Port:</string>
+                 <string>Port</string>
                 </property>
                </widget>
               </item>
@@ -258,12 +258,21 @@
          <item>
           <widget class="QLabel" name="web_of_trust_label">
            <property name="text">
-            <string>Your trust in this peer is :</string>
+            <string>Your trust in this peer is:</string>
+           </property>
+           <property name="wordWrap">
+            <bool>true</bool>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QRadioButton" name="radioButton_trust_never">
+           <property name="maximumSize">
+            <size>
+             <width>125</width>
+             <height>16777215</height>
+            </size>
+           </property>
            <property name="text">
             <string>None</string>
            </property>
@@ -281,6 +290,12 @@
          </item>
          <item>
           <widget class="QRadioButton" name="radioButton_trust_marginnaly">
+           <property name="maximumSize">
+            <size>
+             <width>140</width>
+             <height>16777215</height>
+            </size>
+           </property>
            <property name="text">
             <string>Marginal</string>
            </property>
@@ -298,6 +313,12 @@
          </item>
          <item>
           <widget class="QRadioButton" name="radioButton_trust_fully">
+           <property name="maximumSize">
+            <size>
+             <width>130</width>
+             <height>16777215</height>
+            </size>
+           </property>
            <property name="text">
             <string>Full</string>
            </property>
@@ -366,36 +387,6 @@
          <property name="margin">
           <number>6</number>
          </property>
-         <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="signKeyButton">
-           <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">
-            <size>
-             <width>48</width>
-             <height>48</height>
-            </size>
-           </property>
-          </widget>
-         </item>
          <item>
           <widget class="QCheckBox" name="signGPGKeyCheckBox">
            <property name="text">
@@ -416,6 +407,39 @@
            </property>
           </widget>
          </item>
+         <item>
+          <widget class="QToolButton" name="signKeyButton">
+           <property name="text">
+            <string>SignGPG Key</string>
+           </property>
+           <property name="icon">
+            <iconset resource="../images.qrc">
+             <normaloff>:/images/view-certificate-sign-48.png</normaloff>:/images/view-certificate-sign-48.png</iconset>
+           </property>
+           <property name="iconSize">
+            <size>
+             <width>48</width>
+             <height>48</height>
+            </size>
+           </property>
+           <property name="toolButtonStyle">
+            <enum>Qt::ToolButtonTextUnderIcon</enum>
+           </property>
+          </widget>
+         </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="denyFriendButton">
            <property name="text">
@@ -489,13 +513,6 @@
        </property>
       </spacer>
      </item>
-     <item row="0" column="1">
-      <widget class="QPushButton" name="cancelButton">
-       <property name="text">
-        <string>Cancel</string>
-       </property>
-      </widget>
-     </item>
      <item row="0" column="2">
       <widget class="QPushButton" name="applyButton">
        <property name="text">
@@ -509,6 +526,13 @@
        </property>
       </widget>
      </item>
+     <item row="0" column="1">
+      <widget class="QPushButton" name="cancelButton">
+       <property name="text">
+        <string>Cancel</string>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
   </layout>
diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc
index a0aa9b855..196c9550b 100644
--- a/retroshare-gui/src/gui/images.qrc
+++ b/retroshare-gui/src/gui/images.qrc
@@ -482,5 +482,6 @@
         <file>images/connect/info16.png</file>
         <file>images/connect/mail_send.png</file>
         <file>help/version.html</file>
+        <file>images/view-certificate-sign-48.png</file>
     </qresource>
 </RCC>
diff --git a/retroshare-gui/src/gui/images/view-certificate-sign-48.png b/retroshare-gui/src/gui/images/view-certificate-sign-48.png
new file mode 100644
index 0000000000000000000000000000000000000000..012e8aea8d5ed349db11c855122e93af3f787569
GIT binary patch
literal 4847
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
VMX@W=I1B&)002ovPDHLkV1mT}b=v>{

literal 0
HcmV?d00001