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
@@ -4,178 +4,151 @@
     <class>QWidget</class>
     <property stdset="1">
         <name>name</name>
         <cstring>PinDialogBase</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
             <width>231</width>
             <height>293</height>
         </rect>
     </property>
     <property stdset="1">
         <name>font</name>
         <font>
             <pointsize>24</pointsize>
         </font>
     </property>
     <property stdset="1">
         <name>caption</name>
         <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">
             <name>name</name>
             <cstring>button_4</cstring>
         </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>
                 <hsizetype>5</hsizetype>
                 <vsizetype>5</vsizetype>
             </sizepolicy>
         </property>
         <property stdset="1">
             <name>frameShape</name>
             <enum>Box</enum>
         </property>
         <property stdset="1">
             <name>frameShadow</name>
             <enum>Raised</enum>
         </property>
         <property stdset="1">
             <name>text</name>
             <string>4</string>
         </property>
         <property stdset="1">
             <name>alignment</name>
             <set>AlignCenter</set>
         </property>
         <property>
             <name>hAlign</name>
         </property>
     </widget>
-    <widget>
+        <widget row="4"  column="0" >
         <class>QLabel</class>
         <property stdset="1">
             <name>name</name>
             <cstring>button_7</cstring>
         </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>
                 <hsizetype>5</hsizetype>
                 <vsizetype>5</vsizetype>
             </sizepolicy>
         </property>
         <property stdset="1">
             <name>frameShape</name>
             <enum>Box</enum>
         </property>
         <property stdset="1">
             <name>frameShadow</name>
             <enum>Raised</enum>
         </property>
         <property stdset="1">
             <name>text</name>
             <string>7</string>
         </property>
         <property stdset="1">
             <name>alignment</name>
             <set>AlignCenter</set>
         </property>
         <property>
             <name>hAlign</name>
         </property>
     </widget>
-    <widget>
+        <widget row="0"  column="0"  rowspan="1"  colspan="3" >
         <class>QLabel</class>
         <property stdset="1">
             <name>name</name>
             <cstring>prompt</cstring>
         </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>
                 <pointsize>18</pointsize>
             </font>
         </property>
         <property stdset="1">
             <name>text</name>
             <string>Enter your PIN</string>
         </property>
     </widget>
-    <widget>
+        <widget row="1"  column="0"  rowspan="1"  colspan="3" >
         <class>QLineEdit</class>
         <property stdset="1">
             <name>name</name>
             <cstring>display</cstring>
         </property>
         <property stdset="1">
             <name>enabled</name>
             <bool>false</bool>
         </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>
                 <active>
                     <color>
                         <red>0</red>
                         <green>0</green>
                         <blue>0</blue>
                     </color>
                     <color>
                         <red>228</red>
                         <green>228</green>
                         <blue>228</blue>
                     </color>
                     <color>
                         <red>255</red>
                         <green>255</green>
                         <blue>255</blue>
                     </color>
                     <color>
                         <red>242</red>
                         <green>242</green>
                         <blue>242</blue>
                     </color>
                     <color>
@@ -359,412 +332,331 @@
                     </color>
                     <color>
                         <red>0</red>
                         <green>0</green>
                         <blue>0</blue>
                     </color>
                     <color>
                         <red>10</red>
                         <green>95</green>
                         <blue>137</blue>
                     </color>
                     <color>
                         <red>255</red>
                         <green>255</green>
                         <blue>255</blue>
                     </color>
                 </inactive>
             </palette>
         </property>
         <property stdset="1">
             <name>echoMode</name>
             <enum>Password</enum>
         </property>
     </widget>
-    <widget>
+        <widget row="2"  column="0" >
         <class>QLabel</class>
         <property stdset="1">
             <name>name</name>
             <cstring>button_1</cstring>
         </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>
                 <hsizetype>5</hsizetype>
                 <vsizetype>5</vsizetype>
             </sizepolicy>
         </property>
         <property stdset="1">
             <name>frameShape</name>
             <enum>Box</enum>
         </property>
         <property stdset="1">
             <name>frameShadow</name>
             <enum>Raised</enum>
         </property>
         <property stdset="1">
             <name>text</name>
             <string>1</string>
         </property>
         <property stdset="1">
             <name>alignment</name>
             <set>AlignCenter</set>
         </property>
         <property>
             <name>hAlign</name>
         </property>
     </widget>
-    <widget>
+        <widget row="2"  column="1" >
         <class>QLabel</class>
         <property stdset="1">
             <name>name</name>
             <cstring>button_2</cstring>
         </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>
                 <hsizetype>5</hsizetype>
                 <vsizetype>5</vsizetype>
             </sizepolicy>
         </property>
         <property stdset="1">
             <name>frameShape</name>
             <enum>Box</enum>
         </property>
         <property stdset="1">
             <name>frameShadow</name>
             <enum>Raised</enum>
         </property>
         <property stdset="1">
             <name>text</name>
             <string>2</string>
         </property>
         <property stdset="1">
             <name>alignment</name>
             <set>AlignCenter</set>
         </property>
         <property>
             <name>hAlign</name>
         </property>
     </widget>
-    <widget>
+        <widget row="3"  column="1" >
         <class>QLabel</class>
         <property stdset="1">
             <name>name</name>
             <cstring>button_5</cstring>
         </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>
                 <hsizetype>5</hsizetype>
                 <vsizetype>5</vsizetype>
             </sizepolicy>
         </property>
         <property stdset="1">
             <name>frameShape</name>
             <enum>Box</enum>
         </property>
         <property stdset="1">
             <name>frameShadow</name>
             <enum>Raised</enum>
         </property>
         <property stdset="1">
             <name>text</name>
             <string>5</string>
         </property>
         <property stdset="1">
             <name>alignment</name>
             <set>AlignCenter</set>
         </property>
         <property>
             <name>hAlign</name>
         </property>
     </widget>
-    <widget>
+        <widget row="3"  column="2" >
         <class>QLabel</class>
         <property stdset="1">
             <name>name</name>
             <cstring>button_6</cstring>
         </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>
                 <hsizetype>5</hsizetype>
                 <vsizetype>5</vsizetype>
             </sizepolicy>
         </property>
         <property stdset="1">
             <name>frameShape</name>
             <enum>Box</enum>
         </property>
         <property stdset="1">
             <name>frameShadow</name>
             <enum>Raised</enum>
         </property>
         <property stdset="1">
             <name>text</name>
             <string>6</string>
         </property>
         <property stdset="1">
             <name>alignment</name>
             <set>AlignCenter</set>
         </property>
         <property>
             <name>hAlign</name>
         </property>
     </widget>
-    <widget>
+        <widget row="2"  column="2" >
         <class>QLabel</class>
         <property stdset="1">
             <name>name</name>
             <cstring>button_3</cstring>
         </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>
                 <hsizetype>5</hsizetype>
                 <vsizetype>5</vsizetype>
             </sizepolicy>
         </property>
         <property stdset="1">
             <name>frameShape</name>
             <enum>Box</enum>
         </property>
         <property stdset="1">
             <name>frameShadow</name>
             <enum>Raised</enum>
         </property>
         <property stdset="1">
             <name>text</name>
             <string>3</string>
         </property>
         <property stdset="1">
             <name>alignment</name>
             <set>AlignCenter</set>
         </property>
         <property>
             <name>hAlign</name>
         </property>
     </widget>
-    <widget>
+        <widget row="5"  column="0" >
         <class>QLabel</class>
         <property stdset="1">
             <name>name</name>
             <cstring>button_0</cstring>
         </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>
                 <hsizetype>5</hsizetype>
                 <vsizetype>5</vsizetype>
             </sizepolicy>
         </property>
         <property stdset="1">
             <name>frameShape</name>
             <enum>Box</enum>
         </property>
         <property stdset="1">
             <name>frameShadow</name>
             <enum>Raised</enum>
         </property>
         <property stdset="1">
             <name>text</name>
             <string>0</string>
         </property>
         <property stdset="1">
             <name>alignment</name>
             <set>AlignCenter</set>
         </property>
         <property>
             <name>hAlign</name>
         </property>
         <property>
             <name>layoutMargin</name>
         </property>
         <property>
             <name>layoutSpacing</name>
         </property>
     </widget>
-    <widget>
+        <widget row="4"  column="1" >
         <class>QLabel</class>
         <property stdset="1">
             <name>name</name>
             <cstring>button_8</cstring>
         </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>
                 <hsizetype>5</hsizetype>
                 <vsizetype>5</vsizetype>
             </sizepolicy>
         </property>
         <property stdset="1">
             <name>frameShape</name>
             <enum>Box</enum>
         </property>
         <property stdset="1">
             <name>frameShadow</name>
             <enum>Raised</enum>
         </property>
         <property stdset="1">
             <name>text</name>
             <string>8</string>
         </property>
         <property stdset="1">
             <name>alignment</name>
             <set>AlignCenter</set>
         </property>
         <property>
             <name>hAlign</name>
         </property>
     </widget>
-    <widget>
+        <widget row="4"  column="2" >
         <class>QLabel</class>
         <property stdset="1">
             <name>name</name>
             <cstring>button_9</cstring>
         </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>
                 <hsizetype>5</hsizetype>
                 <vsizetype>5</vsizetype>
             </sizepolicy>
         </property>
         <property stdset="1">
             <name>frameShape</name>
             <enum>Box</enum>
         </property>
         <property stdset="1">
             <name>frameShadow</name>
             <enum>Raised</enum>
         </property>
         <property stdset="1">
             <name>text</name>
             <string>9</string>
         </property>
         <property stdset="1">
             <name>alignment</name>
             <set>AlignCenter</set>
         </property>
         <property>
             <name>hAlign</name>
         </property>
         <property>
             <name>layoutMargin</name>
         </property>
         <property>
             <name>layoutSpacing</name>
         </property>
     </widget>
-    <widget>
+        <widget row="5"  column="2" >
         <class>QLabel</class>
         <property stdset="1">
             <name>name</name>
             <cstring>button_OK</cstring>
         </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>
                 <hsizetype>5</hsizetype>
                 <vsizetype>5</vsizetype>
             </sizepolicy>
         </property>
         <property stdset="1">
             <name>palette</name>
             <palette>
                 <active>
                     <color>
                         <red>0</red>
                         <green>0</green>
                         <blue>0</blue>
                     </color>
                     <color>
                         <red>192</red>
                         <green>192</green>
                         <blue>192</blue>
                     </color>
                     <color>
                         <red>255</red>
                         <green>255</green>
                         <blue>255</blue>
@@ -970,64 +862,55 @@
                     </color>
                 </inactive>
             </palette>
         </property>
         <property stdset="1">
             <name>frameShape</name>
             <enum>Box</enum>
         </property>
         <property stdset="1">
             <name>frameShadow</name>
             <enum>Raised</enum>
         </property>
         <property stdset="1">
             <name>text</name>
             <string>Enter</string>
         </property>
         <property stdset="1">
             <name>alignment</name>
             <set>AlignCenter</set>
         </property>
         <property>
             <name>hAlign</name>
         </property>
     </widget>
-    <widget>
+        <widget row="5"  column="1" >
         <class>QLabel</class>
         <property stdset="1">
             <name>name</name>
             <cstring>button_Skip</cstring>
         </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>
                 <hsizetype>5</hsizetype>
                 <vsizetype>5</vsizetype>
             </sizepolicy>
         </property>
         <property stdset="1">
             <name>palette</name>
             <palette>
                 <active>
                     <color>
                         <red>0</red>
                         <green>0</green>
                         <blue>0</blue>
                     </color>
                     <color>
                         <red>192</red>
                         <green>192</green>
                         <blue>192</blue>
                     </color>
                     <color>
                         <red>255</red>
                         <green>255</green>
                         <blue>255</blue>
@@ -1233,26 +1116,27 @@
                     </color>
                 </inactive>
             </palette>
         </property>
         <property stdset="1">
             <name>frameShape</name>
             <enum>Box</enum>
         </property>
         <property stdset="1">
             <name>frameShadow</name>
             <enum>Raised</enum>
         </property>
         <property stdset="1">
             <name>text</name>
             <string>Skip</string>
         </property>
         <property stdset="1">
             <name>alignment</name>
             <set>AlignCenter</set>
         </property>
         <property>
             <name>hAlign</name>
         </property>
     </widget>
+    </grid>
 </widget>
 </UI>