added QGrid to make PIN dialog resizable - works ok on 640x480 and 480x640 - closes bug#1679

1 files changed, 24 insertions, 140 deletions

diff --git a/noncore/securityplugins/pin/pinDialogBase.ui b/noncore/securityplugins/pin/pinDialogBase.ui
index 79e7a55..f84587b 100644
--- a/noncore/securityplugins/pin/pinDialogBase.ui
+++ b/noncore/securityplugins/pin/pinDialogBase.ui
@@ -26,5 +26,14 @@
         <string>PinDialogBase</string>
     </property>
-    <widget>
+    <grid>
+        <property stdset="1">
+            <name>margin</name>
+            <number>11</number>
+        </property>
+        <property stdset="1">
+            <name>spacing</name>
+            <number>6</number>
+        </property>
+        <widget row="3"  column="0" >
         <class>QLabel</class>
         <property stdset="1">
@@ -33,13 +42,4 @@
         </property>
         <property stdset="1">
-            <name>geometry</name>
-            <rect>
-                <x>11</x>
-                <y>138</y>
-                <width>68</width>
-                <height>44</height>
-            </rect>
-        </property>
-        <property stdset="1">
             <name>sizePolicy</name>
             <sizepolicy>
@@ -68,5 +68,5 @@
         </property>
     </widget>
-    <widget>
+        <widget row="4"  column="0" >
         <class>QLabel</class>
         <property stdset="1">
@@ -75,13 +75,4 @@
         </property>
         <property stdset="1">
-            <name>geometry</name>
-            <rect>
-                <x>11</x>
-                <y>188</y>
-                <width>68</width>
-                <height>44</height>
-            </rect>
-        </property>
-        <property stdset="1">
             <name>sizePolicy</name>
             <sizepolicy>
@@ -110,5 +101,5 @@
         </property>
     </widget>
-    <widget>
+        <widget row="0"  column="0"  rowspan="1"  colspan="3" >
         <class>QLabel</class>
         <property stdset="1">
@@ -117,13 +108,4 @@
         </property>
         <property stdset="1">
-            <name>geometry</name>
-            <rect>
-                <x>11</x>
-                <y>11</y>
-                <width>217</width>
-                <height>25</height>
-            </rect>
-        </property>
-        <property stdset="1">
             <name>font</name>
             <font>
@@ -136,5 +118,5 @@
         </property>
     </widget>
-    <widget>
+        <widget row="1"  column="0"  rowspan="1"  colspan="3" >
         <class>QLineEdit</class>
         <property stdset="1">
@@ -147,13 +129,4 @@
         </property>
         <property stdset="1">
-            <name>geometry</name>
-            <rect>
-                <x>11</x>
-                <y>42</y>
-                <width>217</width>
-                <height>40</height>
-            </rect>
-        </property>
-        <property stdset="1">
             <name>palette</name>
             <palette>
@@ -381,5 +354,5 @@
         </property>
     </widget>
-    <widget>
+        <widget row="2"  column="0" >
         <class>QLabel</class>
         <property stdset="1">
@@ -388,13 +361,4 @@
         </property>
         <property stdset="1">
-            <name>geometry</name>
-            <rect>
-                <x>11</x>
-                <y>88</y>
-                <width>68</width>
-                <height>44</height>
-            </rect>
-        </property>
-        <property stdset="1">
             <name>sizePolicy</name>
             <sizepolicy>
@@ -423,5 +387,5 @@
         </property>
     </widget>
-    <widget>
+        <widget row="2"  column="1" >
         <class>QLabel</class>
         <property stdset="1">
@@ -430,13 +394,4 @@
         </property>
         <property stdset="1">
-            <name>geometry</name>
-            <rect>
-                <x>85</x>
-                <y>88</y>
-                <width>69</width>
-                <height>44</height>
-            </rect>
-        </property>
-        <property stdset="1">
             <name>sizePolicy</name>
             <sizepolicy>
@@ -465,5 +420,5 @@
         </property>
     </widget>
-    <widget>
+        <widget row="3"  column="1" >
         <class>QLabel</class>
         <property stdset="1">
@@ -472,13 +427,4 @@
         </property>
         <property stdset="1">
-            <name>geometry</name>
-            <rect>
-                <x>85</x>
-                <y>138</y>
-                <width>69</width>
-                <height>44</height>
-            </rect>
-        </property>
-        <property stdset="1">
             <name>sizePolicy</name>
             <sizepolicy>
@@ -507,5 +453,5 @@
         </property>
     </widget>
-    <widget>
+        <widget row="3"  column="2" >
         <class>QLabel</class>
         <property stdset="1">
@@ -514,13 +460,4 @@
         </property>
         <property stdset="1">
-            <name>geometry</name>
-            <rect>
-                <x>160</x>
-                <y>138</y>
-                <width>68</width>
-                <height>44</height>
-            </rect>
-        </property>
-        <property stdset="1">
             <name>sizePolicy</name>
             <sizepolicy>
@@ -549,5 +486,5 @@
         </property>
     </widget>
-    <widget>
+        <widget row="2"  column="2" >
         <class>QLabel</class>
         <property stdset="1">
@@ -556,13 +493,4 @@
         </property>
         <property stdset="1">
-            <name>geometry</name>
-            <rect>
-                <x>160</x>
-                <y>88</y>
-                <width>68</width>
-                <height>44</height>
-            </rect>
-        </property>
-        <property stdset="1">
             <name>sizePolicy</name>
             <sizepolicy>
@@ -591,5 +519,5 @@
         </property>
     </widget>
-    <widget>
+        <widget row="5"  column="0" >
         <class>QLabel</class>
         <property stdset="1">
@@ -598,13 +526,4 @@
         </property>
         <property stdset="1">
-            <name>geometry</name>
-            <rect>
-                <x>11</x>
-                <y>238</y>
-                <width>68</width>
-                <height>44</height>
-            </rect>
-        </property>
-        <property stdset="1">
             <name>sizePolicy</name>
             <sizepolicy>
@@ -639,5 +558,5 @@
         </property>
     </widget>
-    <widget>
+        <widget row="4"  column="1" >
         <class>QLabel</class>
         <property stdset="1">
@@ -646,13 +565,4 @@
         </property>
         <property stdset="1">
-            <name>geometry</name>
-            <rect>
-                <x>85</x>
-                <y>188</y>
-                <width>69</width>
-                <height>44</height>
-            </rect>
-        </property>
-        <property stdset="1">
             <name>sizePolicy</name>
             <sizepolicy>
@@ -681,5 +591,5 @@
         </property>
     </widget>
-    <widget>
+        <widget row="4"  column="2" >
         <class>QLabel</class>
         <property stdset="1">
@@ -688,13 +598,4 @@
         </property>
         <property stdset="1">
-            <name>geometry</name>
-            <rect>
-                <x>160</x>
-                <y>188</y>
-                <width>68</width>
-                <height>44</height>
-            </rect>
-        </property>
-        <property stdset="1">
             <name>sizePolicy</name>
             <sizepolicy>
@@ -729,5 +630,5 @@
         </property>
     </widget>
-    <widget>
+        <widget row="5"  column="2" >
         <class>QLabel</class>
         <property stdset="1">
@@ -736,13 +637,4 @@
         </property>
         <property stdset="1">
-            <name>geometry</name>
-            <rect>
-                <x>160</x>
-                <y>238</y>
-                <width>68</width>
-                <height>44</height>
-            </rect>
-        </property>
-        <property stdset="1">
             <name>sizePolicy</name>
             <sizepolicy>
@@ -992,5 +884,5 @@
         </property>
     </widget>
-    <widget>
+        <widget row="5"  column="1" >
         <class>QLabel</class>
         <property stdset="1">
@@ -999,13 +891,4 @@
         </property>
         <property stdset="1">
-            <name>geometry</name>
-            <rect>
-                <x>85</x>
-                <y>238</y>
-                <width>69</width>
-                <height>44</height>
-            </rect>
-        </property>
-        <property stdset="1">
             <name>sizePolicy</name>
             <sizepolicy>
@@ -1255,4 +1138,5 @@
         </property>
     </widget>
+    </grid>
 </widget>
 </UI>