Commit f329a00c authored by Tomas Touceda's avatar Tomas Touceda
Browse files

Merge branch 'bug4656_squeeze_backport'

parents 7955f0c7 0ddabf48

changes/bug4656

0 → 100644
+2 −0
Original line number Diff line number Diff line 
  o Sets the preferred size for the GUI layout so it doesn't squeeze

    widges when the size isn't big enough. Fixes bug 4656.
 
 No newline at end of file

src/vidalia/config/ServerPage.ui

+8 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
    <x>0</x>

    <y>0</y>

    <width>548</width>

    <height>507</height>

    <height>578</height>

   </rect>

  </property>

  <property name="contextMenuPolicy">
@@ -90,7 +90,7 @@ 
         </sizepolicy>

        </property>

        <property name="currentIndex">

         <number>0</number>

         <number>1</number>

        </property>

        <widget class="QWidget" name="ServerConfig">

         <attribute name="title">
@@ -520,6 +520,12 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st 
          </item>

          <item>

           <widget class="QFrame" name="frmCustomRate">

            <property name="sizePolicy">

             <sizepolicy hsizetype="Minimum" vsizetype="Minimum">

              <horstretch>0</horstretch>

              <verstretch>0</verstretch>

             </sizepolicy>

            </property>

            <property name="contextMenuPolicy">

             <enum>Qt::NoContextMenu</enum>

            </property>