Qtopia1-6 merge

still to test
bic changes to be resolved
more changes to be made?

1 files changed, 79 insertions, 2 deletions

diff --git a/library/passwordbase_p.ui b/library/passwordbase_p.ui
index e79777b..a5eed87 100644
--- a/library/passwordbase_p.ui
+++ b/library/passwordbase_p.ui
@@ -1,571 +1,648 @@
 <!DOCTYPE UI><UI>
 <class>PasswordBase</class>
 <widget>
     <class>QWidget</class>
     <property stdset="1">
         <name>name</name>
         <cstring>PasswordBase</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>251</width>
-            <height>443</height>
+            <width>243</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>Form1</string>
     </property>
     <grid>
         <property stdset="1">
             <name>margin</name>
             <number>11</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
             <number>6</number>
         </property>
         <widget row="2"  column="0" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>button_1</cstring>
             </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 row="2"  column="1" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>button_2</cstring>
             </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 row="2"  column="2" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>button_3</cstring>
             </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 row="3"  column="0" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>button_4</cstring>
             </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 row="3"  column="1" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>button_5</cstring>
             </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 row="3"  column="2" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>button_6</cstring>
             </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 row="4"  column="0" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>button_7</cstring>
             </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 row="4"  column="1" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>button_8</cstring>
             </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 row="4"  column="2" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>button_9</cstring>
             </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 row="5"  column="0" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>button_0</cstring>
             </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 row="5"  column="1"  rowspan="1"  colspan="2" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>button_OK</cstring>
             </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>OK</string>
             </property>
             <property stdset="1">
                 <name>alignment</name>
                 <set>AlignCenter</set>
             </property>
             <property>
                 <name>hAlign</name>
             </property>
         </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>font</name>
                 <font>
                     <pointsize>18</pointsize>
                 </font>
             </property>
             <property stdset="1">
                 <name>text</name>
                 <string>Enter passcode</string>
             </property>
         </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>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>
                             <red>78</red>
                             <green>78</green>
                             <blue>78</blue>
                         </color>
                         <color>
                             <red>183</red>
                             <green>183</green>
                             <blue>183</blue>
                         </color>
                         <color>
                             <red>0</red>
                             <green>0</green>
                             <blue>0</blue>
                         </color>
                         <color>
                             <red>255</red>
                             <green>255</green>
                             <blue>255</blue>
                         </color>
                         <color>
                             <red>0</red>
                             <green>0</green>
                             <blue>0</blue>
                         </color>
                         <color>
                             <red>255</red>
                             <green>255</green>
                             <blue>255</blue>
                         </color>
                         <color>
                             <red>220</red>
                             <green>220</green>
                             <blue>220</blue>
                         </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>
                     </active>
                     <disabled>
                         <color>
                             <red>128</red>
                             <green>128</green>
                             <blue>128</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>255</red>
                             <green>255</green>
                             <blue>255</blue>
                         </color>
                         <color>
                             <red>114</red>
                             <green>114</green>
                             <blue>114</blue>
                         </color>
                         <color>
                             <red>152</red>
                             <green>152</green>
                             <blue>152</blue>
                         </color>
                         <color>
                             <red>0</red>
                             <green>0</green>
                             <blue>0</blue>
                         </color>
                         <color>
                             <red>255</red>
                             <green>255</green>
                             <blue>255</blue>
                         </color>
                         <color>
                             <red>0</red>
                             <green>0</green>
                             <blue>0</blue>
                         </color>
                         <color>
                             <red>255</red>
                             <green>255</green>
                             <blue>255</blue>
                         </color>
                         <color>
                             <red>220</red>
                             <green>220</green>
                             <blue>220</blue>
                         </color>
                         <color>
                             <red>0</red>
                             <green>0</green>
                             <blue>0</blue>
                         </color>
                         <color>
                             <red>0</red>
                             <green>0</green>
                             <blue>128</blue>
                         </color>
                         <color>
                             <red>255</red>
                             <green>255</green>
                             <blue>255</blue>
                         </color>
                     </disabled>
                     <inactive>
                         <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>
                             <red>78</red>
                             <green>78</green>
                             <blue>78</blue>
                         </color>
                         <color>
                             <red>183</red>
                             <green>183</green>
                             <blue>183</blue>
                         </color>
                         <color>
                             <red>0</red>
                             <green>0</green>
                             <blue>0</blue>
                         </color>
                         <color>
                             <red>255</red>
                             <green>255</green>
                             <blue>255</blue>
                         </color>
                         <color>
                             <red>0</red>
                             <green>0</green>
                             <blue>0</blue>
                         </color>
                         <color>
                             <red>255</red>
                             <green>255</green>
                             <blue>255</blue>
                         </color>
                         <color>
                             <red>220</red>
                             <green>220</green>
                             <blue>220</blue>
                         </color>
                         <color>
                             <red>0</red>
                             <green>0</green>
                             <blue>0</blue>
                         </color>
                         <color>
                             <red>10</red>