[vidalia-svn] r2081: A slightly different layout for telling users their bridge's (in trunk: . src/gui/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-10-24 01:22:43 -0400 (Wed, 24 Oct 2007)
New Revision: 2081

Modified:
   trunk/
   trunk/src/gui/config/serverpage.ui
Log:
 r2220@lysithea:  edmanm | 2007-10-24 01:22:36 -0400
 A slightly different layout for telling users their bridge's identity.
 (This feature is not implemented yet.)



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r2220] on dc66be73-d13e-47ba-a267-8dc7cda68c65

Modified: trunk/src/gui/config/serverpage.ui
===================================================================
--- trunk/src/gui/config/serverpage.ui	2007-10-24 04:31:40 UTC (rev 2080)
+++ trunk/src/gui/config/serverpage.ui	2007-10-24 05:22:43 UTC (rev 2081)
@@ -60,6 +60,14 @@
       </property>
       <item>
        <widget class="QTabWidget" name="tabsMenu" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>7</hsizetype>
+          <vsizetype>7</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
         <property name="currentIndex" >
          <number>0</number>
         </property>
@@ -239,13 +247,6 @@
             </property>
            </spacer>
           </item>
-          <item row="5" column="0" colspan="4" >
-           <widget class="QLabel" name="lblBridgeIdentity" >
-            <property name="text" >
-             <string>Your bridge relay is:</string>
-            </property>
-           </widget>
-          </item>
           <item row="3" column="5" colspan="2" >
            <spacer>
             <property name="orientation" >
@@ -327,43 +328,6 @@
             </property>
            </widget>
           </item>
-          <item row="4" column="0" colspan="8" >
-           <widget class="Line" name="lineBridgeSeparator" >
-            <property name="orientation" >
-             <enum>Qt::Horizontal</enum>
-            </property>
-           </widget>
-          </item>
-          <item row="6" column="0" colspan="8" >
-           <layout class="QHBoxLayout" >
-            <property name="margin" >
-             <number>0</number>
-            </property>
-            <property name="spacing" >
-             <number>6</number>
-            </property>
-            <item>
-             <widget class="QLineEdit" name="lineBridgeIdentity" >
-              <property name="text" >
-               <string/>
-              </property>
-              <property name="readOnly" >
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QToolButton" name="btnCopyBridgeIdentity" >
-              <property name="text" >
-               <string>...</string>
-              </property>
-              <property name="icon" >
-               <iconset resource="../res/vidalia_common.qrc" >:/images/22x22/edit-copy.png</iconset>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
          </layout>
         </widget>
         <widget class="QWidget" name="BandwidthLimits" >
@@ -999,6 +963,67 @@
     </widget>
    </item>
    <item>
+    <widget class="QLabel" name="lblYourBridgeRelayIs" >
+     <property name="cursor" >
+      <cursor>0</cursor>
+     </property>
+     <property name="frameShape" >
+      <enum>QFrame::NoFrame</enum>
+     </property>
+     <property name="text" >
+      <string>Your bridge relay is:</string>
+     </property>
+     <property name="textInteractionFlags" >
+      <enum>Qt::TextSelectableByMouse</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="lblBridgeIdentity" >
+       <property name="cursor" >
+        <cursor>4</cursor>
+       </property>
+       <property name="toolTip" >
+        <string>This is the identity of your bridge relay that you can give to other people</string>
+       </property>
+       <property name="frameShape" >
+        <enum>QFrame::StyledPanel</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Sunken</enum>
+       </property>
+       <property name="text" >
+        <string/>
+       </property>
+       <property name="textInteractionFlags" >
+        <enum>Qt::TextSelectableByMouse</enum>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="btnCopyBridgeIdentity" >
+       <property name="toolTip" >
+        <string>Copy your bridge relay's identity to the clipboard</string>
+       </property>
+       <property name="text" >
+        <string/>
+       </property>
+       <property name="icon" >
+        <iconset resource="../res/vidalia_common.qrc" >:/images/22x22/edit-copy.png</iconset>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
     <spacer>
      <property name="orientation" >
       <enum>Qt::Vertical</enum>