[vidalia-svn] r2075: Back out r2074, because it seems to have included some Qt 4. (trunk/src/gui/bwgraph)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-10-23 01:46:12 -0400 (Tue, 23 Oct 2007)
New Revision: 2075

Modified:
   trunk/src/gui/bwgraph/bwgraph.ui
Log:
Back out r2074, because it seems to have included some Qt 4.3-specific
options and we're not ready to break compatibility with older Qts yet.


Modified: trunk/src/gui/bwgraph/bwgraph.ui
===================================================================
--- trunk/src/gui/bwgraph/bwgraph.ui	2007-10-23 05:28:16 UTC (rev 2074)
+++ trunk/src/gui/bwgraph/bwgraph.ui	2007-10-23 05:46:12 UTC (rev 2075)
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>379</width>
-    <height>266</height>
+    <width>283</width>
+    <height>138</height>
    </rect>
   </property>
   <property name="contextMenuPolicy" >
@@ -20,8 +20,20 @@
   </property>
   <widget class="QWidget" name="centralwidget" >
    <layout class="QGridLayout" >
+    <property name="margin" >
+     <number>9</number>
+    </property>
+    <property name="spacing" >
+     <number>6</number>
+    </property>
     <item row="1" column="0" >
      <layout class="QHBoxLayout" >
+      <property name="margin" >
+       <number>0</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
       <item>
        <widget class="QPushButton" name="btnToggleSettings" >
         <property name="text" >
@@ -81,7 +93,9 @@
     <item row="2" column="0" >
      <widget class="QFrame" name="frmSettings" >
       <property name="sizePolicy" >
-       <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+       <sizepolicy>
+        <hsizetype>0</hsizetype>
+        <vsizetype>0</vsizetype>
         <horstretch>0</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
@@ -108,35 +122,20 @@
        <enum>QFrame::Raised</enum>
       </property>
       <layout class="QHBoxLayout" >
+       <property name="margin" >
+        <number>9</number>
+       </property>
        <property name="spacing" >
-        <number>0</number>
+        <number>6</number>
        </property>
-       <property name="leftMargin" >
-        <number>5</number>
-       </property>
-       <property name="topMargin" >
-        <number>5</number>
-       </property>
-       <property name="rightMargin" >
-        <number>5</number>
-       </property>
-       <property name="bottomMargin" >
-        <number>5</number>
-       </property>
        <item>
         <layout class="QVBoxLayout" >
-         <property name="leftMargin" >
+         <property name="margin" >
           <number>3</number>
          </property>
-         <property name="topMargin" >
-          <number>3</number>
+         <property name="spacing" >
+          <number>6</number>
          </property>
-         <property name="rightMargin" >
-          <number>3</number>
-         </property>
-         <property name="bottomMargin" >
-          <number>3</number>
-         </property>
          <item>
           <widget class="QCheckBox" name="chkReceiveRate" >
            <property name="contextMenuPolicy" >
@@ -202,11 +201,20 @@
        </item>
        <item>
         <layout class="QVBoxLayout" >
+         <property name="margin" >
+          <number>0</number>
+         </property>
          <property name="spacing" >
           <number>1</number>
          </property>
          <item>
           <layout class="QHBoxLayout" >
+           <property name="margin" >
+            <number>0</number>
+           </property>
+           <property name="spacing" >
+            <number>6</number>
+           </property>
            <item>
             <spacer>
              <property name="orientation" >
@@ -261,21 +269,12 @@
             <enum>QFrame::Plain</enum>
            </property>
            <layout class="QVBoxLayout" >
+            <property name="margin" >
+             <number>0</number>
+            </property>
             <property name="spacing" >
              <number>3</number>
             </property>
-            <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>0</number>
-            </property>
             <item>
              <widget class="QSlider" name="sldrOpacity" >
               <property name="contextMenuPolicy" >
@@ -328,6 +327,9 @@
             </item>
             <item>
              <layout class="QHBoxLayout" >
+              <property name="margin" >
+               <number>0</number>
+              </property>
               <property name="spacing" >
                <number>0</number>
               </property>
@@ -339,7 +341,6 @@
                 <property name="sizeHint" >
                  <size>
                   <width>21</width>
-                  <height>0</height>
                  </size>
                 </property>
                </spacer>
@@ -391,7 +392,6 @@
                 <property name="sizeHint" >
                  <size>
                   <width>21</width>
-                  <height>0</height>
                  </size>
                 </property>
                </spacer>
@@ -431,6 +431,9 @@
        </item>
        <item>
         <layout class="QVBoxLayout" >
+         <property name="margin" >
+          <number>0</number>
+         </property>
          <property name="spacing" >
           <number>1</number>
          </property>
@@ -462,9 +465,11 @@
    <class>GraphFrame</class>
    <extends>QFrame</extends>
    <header>gui/bwgraph/graphframe.h</header>
-   <container>1</container>
   </customwidget>
  </customwidgets>
+ <resources>
+  <include location="../res/vidalia_common.qrc" />
+ </resources>
  <tabstops>
   <tabstop>btnToggleSettings</tabstop>
   <tabstop>btnReset</tabstop>
@@ -476,8 +481,5 @@
   <tabstop>btnSaveSettings</tabstop>
   <tabstop>btnCancelSettings</tabstop>
  </tabstops>
- <resources>
-  <include location="../res/vidalia_common.qrc" />
- </resources>
  <connections/>
 </ui>