[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [vidalia/alpha] Fix some layouts and add en/disable lblDirPort



commit 615efa38e5a57f02ce7bbdebdc58c2c90aae0031
Author: Tomás Touceda <chiiph@xxxxxxxxxxxxxx>
Date:   Tue May 31 19:18:17 2011 -0300

    Fix some layouts and add en/disable lblDirPort
---
 src/vidalia/config/AdvancedPage.ui |  110 +++++++++++++++------------------
 src/vidalia/config/ServerPage.cpp  |    1 +
 src/vidalia/config/ServerPage.ui   |   89 +++++++++++---------------
 src/vidalia/config/TorrcDialog.ui  |  120 +++++++++++++++++++++++-------------
 4 files changed, 167 insertions(+), 153 deletions(-)

diff --git a/src/vidalia/config/AdvancedPage.ui b/src/vidalia/config/AdvancedPage.ui
index 2d06162..ed17c1d 100644
--- a/src/vidalia/config/AdvancedPage.ui
+++ b/src/vidalia/config/AdvancedPage.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>573</width>
+    <width>578</width>
     <height>543</height>
    </rect>
   </property>
@@ -14,14 +14,14 @@
    <enum>Qt::NoContextMenu</enum>
   </property>
   <layout class="QVBoxLayout">
-   <property name="spacing">
-    <number>6</number>
-   </property>
-   <property name="margin">
-    <number>9</number>
-   </property>
    <item>
     <widget class="QGroupBox" name="grpControlPort">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="contextMenuPolicy">
       <enum>Qt::NoContextMenu</enum>
      </property>
@@ -29,19 +29,13 @@
       <string>Tor Control</string>
      </property>
      <layout class="QVBoxLayout">
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <property name="margin">
-       <number>9</number>
-      </property>
       <item>
        <layout class="QGridLayout">
-        <property name="margin">
+        <property name="horizontalSpacing">
          <number>0</number>
         </property>
-        <property name="spacing">
-         <number>2</number>
+        <property name="verticalSpacing">
+         <number>5</number>
         </property>
         <item row="5" column="0">
          <widget class="QLabel" name="lblAuth">
@@ -68,9 +62,6 @@
           <property name="spacing">
            <number>2</number>
           </property>
-          <property name="margin">
-           <number>0</number>
-          </property>
           <item>
            <widget class="QComboBox" name="cmbAuthMethod">
             <property name="minimumSize">
@@ -118,7 +109,7 @@
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeHint">
+            <property name="sizeHint" stdset="0">
              <size>
               <width>0</width>
               <height>20</height>
@@ -130,12 +121,6 @@
         </item>
         <item row="2" column="2">
          <layout class="QHBoxLayout">
-          <property name="spacing">
-           <number>6</number>
-          </property>
-          <property name="margin">
-           <number>0</number>
-          </property>
           <item>
            <widget class="QLineEdit" name="lineControlAddress">
             <property name="maximumSize">
@@ -186,28 +171,24 @@
             <property name="sizeType">
              <enum>QSizePolicy::Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="sizeHint" stdset="0">
              <size>
               <width>40</width>
-              <height>20</height>
+              <height>0</height>
              </size>
             </property>
            </spacer>
           </item>
          </layout>
         </item>
-        <item row="2" column="3">
-         <layout class="QHBoxLayout">
-          <property name="spacing">
-           <number>6</number>
-          </property>
-          <property name="margin">
-           <number>0</number>
-          </property>
-         </layout>
-        </item>
         <item row="0" column="2">
          <widget class="QRadioButton" name="rdoControlPort">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="text">
            <string>Use TCP connection (ControlPort)</string>
           </property>
@@ -238,6 +219,12 @@
         </item>
         <item row="3" column="2">
          <widget class="QRadioButton" name="rdoControlSocket">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="text">
            <string>Use Unix domain socket (ControlSocket)</string>
           </property>
@@ -260,6 +247,12 @@
    </item>
    <item>
     <widget class="QGroupBox" name="grpTorConfigFile">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="contextMenuPolicy">
       <enum>Qt::NoContextMenu</enum>
      </property>
@@ -267,9 +260,6 @@
       <string>Tor Configuration File</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_3">
-      <property name="margin">
-       <number>9</number>
-      </property>
       <item row="0" column="1">
        <layout class="QGridLayout" name="gridLayout_2">
         <item row="0" column="0" colspan="2">
@@ -316,13 +306,6 @@
           </property>
          </widget>
         </item>
-        <item row="2" column="0">
-         <widget class="QPushButton" name="btnEditTorConfig">
-          <property name="text">
-           <string>Edit current torrc</string>
-          </property>
-         </widget>
-        </item>
         <item row="2" column="1" colspan="2">
          <widget class="QLabel" name="lblNotice">
           <property name="text">
@@ -338,14 +321,21 @@
           <property name="sizeType">
            <enum>QSizePolicy::MinimumExpanding</enum>
           </property>
-          <property name="sizeHint">
+          <property name="sizeHint" stdset="0">
            <size>
             <width>100</width>
-            <height>20</height>
+            <height>0</height>
            </size>
           </property>
          </spacer>
         </item>
+        <item row="2" column="0">
+         <widget class="QPushButton" name="btnEditTorConfig">
+          <property name="text">
+           <string>Edit current torrc</string>
+          </property>
+         </widget>
+        </item>
        </layout>
       </item>
      </layout>
@@ -353,6 +343,12 @@
    </item>
    <item>
     <widget class="QGroupBox" name="grpTorDataDirectory">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="contextMenuPolicy">
       <enum>Qt::NoContextMenu</enum>
      </property>
@@ -360,12 +356,6 @@
       <string>Data Directory</string>
      </property>
      <layout class="QHBoxLayout">
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <property name="margin">
-       <number>9</number>
-      </property>
       <item>
        <widget class="QLineEdit" name="lineTorDataDirectory">
         <property name="enabled">
@@ -408,14 +398,14 @@
     </widget>
    </item>
    <item>
-    <spacer>
+    <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint">
+     <property name="sizeHint" stdset="0">
       <size>
-       <width>489</width>
-       <height>141</height>
+       <width>20</width>
+       <height>40</height>
       </size>
      </property>
     </spacer>
diff --git a/src/vidalia/config/ServerPage.cpp b/src/vidalia/config/ServerPage.cpp
index f15268f..e026435 100644
--- a/src/vidalia/config/ServerPage.cpp
+++ b/src/vidalia/config/ServerPage.cpp
@@ -236,6 +236,7 @@ ServerPage::serverModeChanged(bool enabled)
                                   && Vidalia::torControl()->isConnected());
 
   ui.lineDirPort->setEnabled(!bridgeEnabled);
+  ui.lblDirPort->setEnabled(!bridgeEnabled);
   ui.chkMirrorDirectory->setEnabled(!bridgeEnabled);
 
   /* Disable the Exit Policies tab when bridge or non-exit relay mode is 
diff --git a/src/vidalia/config/ServerPage.ui b/src/vidalia/config/ServerPage.ui
index c922710..01a7840 100644
--- a/src/vidalia/config/ServerPage.ui
+++ b/src/vidalia/config/ServerPage.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>546</width>
-    <height>463</height>
+    <width>639</width>
+    <height>538</height>
    </rect>
   </property>
   <property name="contextMenuPolicy">
@@ -15,54 +15,41 @@
   </property>
   <layout class="QVBoxLayout">
    <item>
-    <widget class="QRadioButton" name="rdoClientMode">
-     <property name="text">
-      <string>Run as a client only</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QRadioButton" name="rdoNonExitMode">
-     <property name="text">
-      <string>Relay traffic inside the Tor network (non-exit relay)</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QRadioButton" name="rdoServerMode">
-     <property name="text">
-      <string>Relay traffic for the Tor network (exit relay)</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="1" column="0">
+      <widget class="QRadioButton" name="rdoClientMode">
+       <property name="text">
+        <string>Run as a client only</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0">
+      <widget class="QRadioButton" name="rdoServerMode">
+       <property name="text">
+        <string>Relay traffic for the Tor network (exit relay)</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="0">
       <widget class="QRadioButton" name="rdoBridgeMode">
        <property name="text">
         <string>Help censored users reach the Tor network</string>
        </property>
       </widget>
      </item>
-     <item>
+     <item row="4" column="1">
       <widget class="QLabel" name="lblWhatsThis">
        <property name="text">
         <string>&lt;a href=&quot;#bridgeHelp&quot;&gt;What's this?&lt;/a&gt;</string>
        </property>
       </widget>
      </item>
-     <item>
-      <spacer name="horizontalSpacer_2">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" >
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
+     <item row="2" column="0" colspan="2">
+      <widget class="QRadioButton" name="rdoNonExitMode">
+       <property name="text">
+        <string>Relay traffic inside the Tor network (non-exit relay)</string>
        </property>
-      </spacer>
+      </widget>
      </item>
     </layout>
    </item>
@@ -134,7 +121,7 @@
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeHint" >
+            <property name="sizeHint" stdset="0">
              <size>
               <width>40</width>
               <height>20</height>
@@ -195,7 +182,7 @@
               <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
-              <property name="sizeHint" >
+              <property name="sizeHint" stdset="0">
                <size>
                 <width>40</width>
                 <height>20</height>
@@ -294,7 +281,7 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeHint" >
+            <property name="sizeHint" stdset="0">
              <size>
               <width>321</width>
               <height>20</height>
@@ -307,7 +294,7 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st
             <property name="orientation">
              <enum>Qt::Vertical</enum>
             </property>
-            <property name="sizeHint" >
+            <property name="sizeHint" stdset="0">
              <size>
               <width>20</width>
               <height>40</height>
@@ -320,7 +307,7 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeHint" >
+            <property name="sizeHint" stdset="0">
              <size>
               <width>41</width>
               <height>20</height>
@@ -508,7 +495,7 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st
               <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
-              <property name="sizeHint" >
+              <property name="sizeHint" stdset="0">
                <size>
                 <width>40</width>
                 <height>20</height>
@@ -535,7 +522,7 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st
                <property name="orientation">
                 <enum>Qt::Vertical</enum>
                </property>
-               <property name="sizeHint" >
+               <property name="sizeHint" stdset="0">
                 <size>
                  <width>20</width>
                  <height>40</height>
@@ -661,7 +648,7 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st
                      <property name="sizeType">
                       <enum>QSizePolicy::Expanding</enum>
                      </property>
-                     <property name="sizeHint" >
+                     <property name="sizeHint" stdset="0">
                       <size>
                        <width>71</width>
                        <height>20</height>
@@ -693,7 +680,7 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st
             <property name="orientation">
              <enum>Qt::Vertical</enum>
             </property>
-            <property name="sizeHint" >
+            <property name="sizeHint" stdset="0">
              <size>
               <width>20</width>
               <height>40</height>
@@ -835,7 +822,7 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st
                  <property name="orientation">
                   <enum>Qt::Vertical</enum>
                  </property>
-                 <property name="sizeHint" >
+                 <property name="sizeHint" stdset="0">
                   <size>
                    <width>20</width>
                    <height>42</height>
@@ -850,7 +837,7 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st
                <property name="orientation">
                 <enum>Qt::Horizontal</enum>
                </property>
-               <property name="sizeHint" >
+               <property name="sizeHint" stdset="0">
                 <size>
                  <width>40</width>
                  <height>20</height>
@@ -907,7 +894,7 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st
             <property name="orientation">
              <enum>Qt::Vertical</enum>
             </property>
-            <property name="sizeHint" >
+            <property name="sizeHint" stdset="0">
              <size>
               <width>20</width>
               <height>40</height>
@@ -998,7 +985,7 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
@@ -1023,7 +1010,7 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>420</width>
        <height>16</height>
diff --git a/src/vidalia/config/TorrcDialog.ui b/src/vidalia/config/TorrcDialog.ui
index 42971b4..46ac151 100644
--- a/src/vidalia/config/TorrcDialog.ui
+++ b/src/vidalia/config/TorrcDialog.ui
@@ -10,6 +10,12 @@
     <height>582</height>
    </rect>
   </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
   <property name="windowTitle">
    <string>Editing torrc</string>
   </property>
@@ -17,46 +23,76 @@
    <iconset resource="../res/vidalia.qrc">
     <normaloff>:/images/16x16/system-run.png</normaloff>:/images/16x16/system-run.png</iconset>
   </property>
-  <layout class="QGridLayout" name="gridLayout_2">
-   <item row="0" column="0">
-    <layout class="QVBoxLayout" name="verticalLayout">
-     <item>
-      <widget class="QTextEdit" name="teditTorrc"/>
-     </item>
-     <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_2">
-       <item>
-        <widget class="QRadioButton" name="rdoAll">
-         <property name="text">
-          <string>Apply all</string>
-         </property>
-         <property name="checked">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QRadioButton" name="rdoSelection">
-         <property name="text">
-          <string>Apply selection only</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>12</number>
+   </property>
+   <item>
+    <widget class="QTextEdit" name="teditTorrc">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Sunken</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="hLayout">
      <item>
-      <widget class="QCheckBox" name="chkSave">
+      <widget class="QRadioButton" name="rdoAll">
        <property name="text">
-        <string>Save settings. If unchecked it will only apply settings to the current Tor instance.</string>
+        <string>Apply all</string>
        </property>
        <property name="checked">
         <bool>true</bool>
        </property>
       </widget>
      </item>
+     <item>
+      <widget class="QRadioButton" name="rdoSelection">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>Apply selection only</string>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
-   <item row="1" column="0">
+   <item>
+    <widget class="QCheckBox" name="chkSave">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>Save settings. If unchecked it will only apply settings to the current Tor instance.</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -167,8 +203,8 @@
    <slot>undo()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>35</x>
-     <y>17</y>
+     <x>-1</x>
+     <y>-1</y>
     </hint>
     <hint type="destinationlabel">
      <x>300</x>
@@ -183,8 +219,8 @@
    <slot>redo()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>97</x>
-     <y>17</y>
+     <x>-1</x>
+     <y>-1</y>
     </hint>
     <hint type="destinationlabel">
      <x>300</x>
@@ -199,8 +235,8 @@
    <slot>selectAll()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>171</x>
-     <y>17</y>
+     <x>-1</x>
+     <y>-1</y>
     </hint>
     <hint type="destinationlabel">
      <x>300</x>
@@ -215,8 +251,8 @@
    <slot>copy()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>85</x>
-     <y>17</y>
+     <x>-1</x>
+     <y>-1</y>
     </hint>
     <hint type="destinationlabel">
      <x>300</x>
@@ -231,8 +267,8 @@
    <slot>paste()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>149</x>
-     <y>17</y>
+     <x>-1</x>
+     <y>-1</y>
     </hint>
     <hint type="destinationlabel">
      <x>300</x>
@@ -247,8 +283,8 @@
    <slot>cut()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>29</x>
-     <y>17</y>
+     <x>-1</x>
+     <y>-1</y>
     </hint>
     <hint type="destinationlabel">
      <x>300</x>



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits