[vidalia-svn] r3138: Last changes to dialog size hints, for realsies this time (u (vidalia/trunk/src/vidalia)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-09-22 00:53:42 -0400 (Mon, 22 Sep 2008)
New Revision: 3138

Modified:
   vidalia/trunk/src/vidalia/controlpasswordinputdialog.cpp
   vidalia/trunk/src/vidalia/controlpasswordinputdialog.ui
Log:
Last changes to dialog size hints, for realsies this time (until I find out
it looks crappy on Linux or something).


Modified: vidalia/trunk/src/vidalia/controlpasswordinputdialog.cpp
===================================================================
--- vidalia/trunk/src/vidalia/controlpasswordinputdialog.cpp	2008-09-22 03:16:11 UTC (rev 3137)
+++ vidalia/trunk/src/vidalia/controlpasswordinputdialog.cpp	2008-09-22 04:53:42 UTC (rev 3138)
@@ -98,7 +98,7 @@
 ControlPasswordInputDialog::setVisible(bool visible)
 {
   if (visible)
-    adjustSize();
+    resize(minimumSizeHint());
   QDialog::setVisible(visible);
 }
 

Modified: vidalia/trunk/src/vidalia/controlpasswordinputdialog.ui
===================================================================
--- vidalia/trunk/src/vidalia/controlpasswordinputdialog.ui	2008-09-22 03:16:11 UTC (rev 3137)
+++ vidalia/trunk/src/vidalia/controlpasswordinputdialog.ui	2008-09-22 04:53:42 UTC (rev 3138)
@@ -8,8 +8,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>366</width>
-    <height>212</height>
+    <width>350</width>
+    <height>192</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -20,7 +20,7 @@
   </property>
   <property name="minimumSize" >
    <size>
-    <width>0</width>
+    <width>350</width>
     <height>0</height>
    </size>
   </property>
@@ -41,16 +41,28 @@
    <item row="0" column="0" >
     <layout class="QGridLayout" name="gridLayout" >
      <property name="sizeConstraint" >
-      <enum>QLayout::SetNoConstraint</enum>
+      <enum>QLayout::SetDefaultConstraint</enum>
      </property>
+     <property name="verticalSpacing" >
+      <number>12</number>
+     </property>
      <item row="0" column="0" >
       <widget class="QLabel" name="lblIcon" >
+       <property name="minimumSize" >
+        <size>
+         <width>48</width>
+         <height>48</height>
+        </size>
+       </property>
        <property name="text" >
         <string/>
        </property>
        <property name="pixmap" >
         <pixmap resource="res/vidalia.qrc" >:/images/48x48/dialog-password.png</pixmap>
        </property>
+       <property name="alignment" >
+        <set>Qt::AlignHCenter|Qt::AlignTop</set>
+       </property>
       </widget>
      </item>
      <item row="0" column="1" >
@@ -61,6 +73,12 @@
          <verstretch>1</verstretch>
         </sizepolicy>
        </property>
+       <property name="minimumSize" >
+        <size>
+         <width>0</width>
+         <height>0</height>
+        </size>
+       </property>
        <property name="text" >
         <string>Vidalia has connected to a running Tor process that requires a password. Please enter your control password: </string>
        </property>
@@ -78,26 +96,6 @@
        </property>
       </widget>
      </item>
-     <item row="1" column="0" >
-      <spacer name="verticalSpacer" >
-       <property name="orientation" >
-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="sizeHint" stdset="0" >
-        <size>
-         <width>20</width>
-         <height>40</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item row="1" column="1" >
-      <widget class="QLineEdit" name="linePassword" >
-       <property name="echoMode" >
-        <enum>QLineEdit::Password</enum>
-       </property>
-      </widget>
-     </item>
      <item row="2" column="1" >
       <widget class="QCheckBox" name="chkSavePassword" >
        <property name="text" >
@@ -115,18 +113,12 @@
        </property>
       </widget>
      </item>
-     <item row="4" column="0" >
-      <spacer name="verticalSpacer_2" >
-       <property name="orientation" >
-        <enum>Qt::Vertical</enum>
+     <item row="1" column="1" >
+      <widget class="QLineEdit" name="linePassword" >
+       <property name="echoMode" >
+        <enum>QLineEdit::Password</enum>
        </property>
-       <property name="sizeHint" stdset="0" >
-        <size>
-         <width>20</width>
-         <height>5</height>
-        </size>
-       </property>
-      </spacer>
+      </widget>
      </item>
     </layout>
    </item>