Change buttons from QLabel to QPushButton, which enables entering the PIN using directional buttons and space/enter (which is all that is available on some PDAs if the screen is uncalibrated). In addition, you can now enter numbers using number keys if your device has them.

2 files changed, 366 insertions, 476 deletions

diff --git a/noncore/securityplugins/pin/pin.cpp b/noncore/securityplugins/pin/pin.cpp
index 2accb9c..f1c52c5 100644
--- a/noncore/securityplugins/pin/pin.cpp
+++ b/noncore/securityplugins/pin/pin.cpp
@@ -79,2 +79,8 @@ signals:
         QString text;
+
+    private slots:
+       void slotInput();
+       void slotSkip();
+       void slotOK();
+       void slotBackspace();
 };
@@ -96,2 +102,15 @@ PinDialog::PinDialog( QWidget* parent,  const char* name, WFlags fl )
 
+    connect ( button_0, SIGNAL( clicked()), SLOT( slotInput()));
+    connect ( button_1, SIGNAL( clicked()), SLOT( slotInput()));
+    connect ( button_2, SIGNAL( clicked()), SLOT( slotInput()));
+    connect ( button_3, SIGNAL( clicked()), SLOT( slotInput()));
+    connect ( button_4, SIGNAL( clicked()), SLOT( slotInput()));
+    connect ( button_5, SIGNAL( clicked()), SLOT( slotInput()));
+    connect ( button_6, SIGNAL( clicked()), SLOT( slotInput()));
+    connect ( button_7, SIGNAL( clicked()), SLOT( slotInput()));
+    connect ( button_8, SIGNAL( clicked()), SLOT( slotInput()));
+    connect ( button_9, SIGNAL( clicked()), SLOT( slotInput()));
+    connect ( button_Skip, SIGNAL( clicked()), SLOT( slotSkip()));
+    connect ( button_OK, SIGNAL( clicked()), SLOT( slotOK()));
+
     button_0->installEventFilter( this );
@@ -108,3 +127,3 @@ PinDialog::PinDialog( QWidget* parent,  const char* name, WFlags fl )
     button_OK->installEventFilter( this );
-    setFocus();
+    button_OK->setFocus();
 }
@@ -117,16 +136,13 @@ PinDialog::~PinDialog()
 
-/// Record the pressed numbers, and the Skip and Enter commands
+/// Handle keyboard events
 bool PinDialog::eventFilter( QObject*o, QEvent*e )
 {
-    if ( e->type() == QEvent::MouseButtonRelease ) {
-        if ( o == button_OK ) {
-            emit passwordEntered( text );
-        }
-        else if ( o == button_Skip ) {
-            isSkip = TRUE;
-            emit skip();
-        }
-        else {
-            QLabel *l = (QLabel*)o;
-            input(l->text());
+    if(e->type() == QEvent::KeyPress) {
+        switch(((QKeyEvent *)e)->key()) {
+            case Key_0...Key_9:
+                input(((QKeyEvent *)e)->text());
+                return TRUE;
+            case Key_Backspace:
+                slotBackspace();
+                return TRUE;
         }
@@ -136,2 +152,27 @@ bool PinDialog::eventFilter( QObject*o, QEvent*e )
 
+void PinDialog::slotInput()
+{
+    QPushButton *l = (QPushButton*)sender();
+    input(l->text().stripWhiteSpace());
+}
+
+void PinDialog::slotSkip()
+{
+    isSkip = TRUE;
+    emit skip();
+}
+
+void PinDialog::slotOK()
+{
+    emit passwordEntered( text );
+}
+
+void PinDialog::slotBackspace()
+{
+    if(text.length() > 0) {
+        text.truncate( text.length() - 1 );
+        display->setText( text );
+    }
+}
+
 void PinDialog::input( QString c )
diff --git a/noncore/securityplugins/pin/pinDialogBase.ui b/noncore/securityplugins/pin/pinDialogBase.ui
index f84587b..7fde488 100644
--- a/noncore/securityplugins/pin/pinDialogBase.ui
+++ b/noncore/securityplugins/pin/pinDialogBase.ui
@@ -13,4 +13,4 @@
             <y>0</y>
-            <width>231</width>
-            <height>293</height>
+            <width>257</width>
+            <height>280</height>
         </rect>
@@ -36,7 +36,7 @@
         </property>
-        <widget row="3"  column="0" >
-            <class>QLabel</class>
+        <widget row="4"  column="0" >
+            <class>QPushButton</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>button_4</cstring>
+                <cstring>button_7</cstring>
             </property>
@@ -45,4 +45,4 @@
                 <sizepolicy>
-                    <hsizetype>5</hsizetype>
-                    <vsizetype>5</vsizetype>
+                    <hsizetype>7</hsizetype>
+                    <vsizetype>7</vsizetype>
                 </sizepolicy>
@@ -50,8 +50,18 @@
             <property stdset="1">
-                <name>frameShape</name>
-                <enum>Box</enum>
+                <name>text</name>
+                <string>7</string>
             </property>
+        </widget>
+        <widget row="2"  column="0" >
+            <class>QPushButton</class>
             <property stdset="1">
-                <name>frameShadow</name>
-                <enum>Raised</enum>
+                <name>name</name>
+                <cstring>button_1</cstring>
+            </property>
+            <property stdset="1">
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>7</hsizetype>
+                    <vsizetype>7</vsizetype>
+                </sizepolicy>
             </property>
@@ -59,17 +69,28 @@
                 <name>text</name>
-                <string>4</string>
+                <string>1</string>
             </property>
+        </widget>
+        <widget row="2"  column="2" >
+            <class>QPushButton</class>
             <property stdset="1">
-                <name>alignment</name>
-                <set>AlignCenter</set>
+                <name>name</name>
+                <cstring>button_3</cstring>
             </property>
-            <property>
-                <name>hAlign</name>
+            <property stdset="1">
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>7</hsizetype>
+                    <vsizetype>7</vsizetype>
+                </sizepolicy>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>3</string>
             </property>
         </widget>
-        <widget row="4"  column="0" >
-            <class>QLabel</class>
+        <widget row="4"  column="2" >
+            <class>QPushButton</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>button_7</cstring>
+                <cstring>button_9</cstring>
             </property>
@@ -78,4 +99,4 @@
                 <sizepolicy>
-                    <hsizetype>5</hsizetype>
-                    <vsizetype>5</vsizetype>
+                    <hsizetype>7</hsizetype>
+                    <vsizetype>7</vsizetype>
                 </sizepolicy>
@@ -83,8 +104,18 @@
             <property stdset="1">
-                <name>frameShape</name>
-                <enum>Box</enum>
+                <name>text</name>
+                <string>  9  </string>
+            </property>
+        </widget>
+        <widget row="3"  column="2" >
+            <class>QPushButton</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>button_6</cstring>
             </property>
             <property stdset="1">
-                <name>frameShadow</name>
-                <enum>Raised</enum>
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>7</hsizetype>
+                    <vsizetype>7</vsizetype>
+                </sizepolicy>
             </property>
@@ -92,10 +123,21 @@
                 <name>text</name>
-                <string>7</string>
+                <string>6</string>
             </property>
+        </widget>
+        <widget row="5"  column="0" >
+            <class>QPushButton</class>
             <property stdset="1">
-                <name>alignment</name>
-                <set>AlignCenter</set>
+                <name>name</name>
+                <cstring>button_0</cstring>
             </property>
-            <property>
-                <name>hAlign</name>
+            <property stdset="1">
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>7</hsizetype>
+                    <vsizetype>7</vsizetype>
+                </sizepolicy>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>  0  </string>
             </property>
@@ -355,280 +397,4 @@
         </widget>
-        <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="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="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="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="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="2" >
-            <class>QLabel</class>
+            <class>QPushButton</class>
             <property stdset="1">
@@ -640,4 +406,4 @@
                 <sizepolicy>
-                    <hsizetype>5</hsizetype>
-                    <vsizetype>5</vsizetype>
+                    <hsizetype>7</hsizetype>
+                    <vsizetype>7</vsizetype>
                 </sizepolicy>
@@ -654,25 +420,25 @@
                         <color>
-                            <red>192</red>
-                            <green>192</green>
-                            <blue>192</blue>
+                            <red>170</red>
+                            <green>255</green>
+                            <blue>0</blue>
                         </color>
                         <color>
-                            <red>255</red>
+                            <red>212</red>
                             <green>255</green>
-                            <blue>255</blue>
+                            <blue>127</blue>
                         </color>
                         <color>
-                            <red>223</red>
-                            <green>223</green>
-                            <blue>223</blue>
+                            <red>191</red>
+                            <green>255</green>
+                            <blue>63</blue>
                         </color>
                         <color>
-                            <red>96</red>
-                            <green>96</green>
-                            <blue>96</blue>
+                            <red>85</red>
+                            <green>127</green>
+                            <blue>0</blue>
                         </color>
                         <color>
-                            <red>128</red>
-                            <green>128</green>
-                            <blue>128</blue>
+                            <red>113</red>
+                            <green>170</green>
+                            <blue>0</blue>
                         </color>
@@ -699,5 +465,5 @@
                         <color>
-                            <red>0</red>
-                            <green>170</green>
-                            <blue>0</blue>
+                            <red>238</red>
+                            <green>238</green>
+                            <blue>230</blue>
                         </color>
@@ -709,2 +475,7 @@
                         <color>
+                            <red>255</red>
+                            <green>221</green>
+                            <blue>118</blue>
+                        </color>
+                        <color>
                             <red>0</red>
@@ -713,7 +484,2 @@
                         </color>
-                        <color>
-                            <red>255</red>
-                            <green>255</green>
-                            <blue>255</blue>
-                        </color>
                     </active>
@@ -726,25 +492,25 @@
                         <color>
-                            <red>192</red>
-                            <green>192</green>
-                            <blue>192</blue>
+                            <red>170</red>
+                            <green>255</green>
+                            <blue>0</blue>
                         </color>
                         <color>
-                            <red>255</red>
+                            <red>212</red>
                             <green>255</green>
-                            <blue>255</blue>
+                            <blue>127</blue>
                         </color>
                         <color>
-                            <red>220</red>
-                            <green>220</green>
-                            <blue>220</blue>
+                            <red>183</red>
+                            <green>255</green>
+                            <blue>38</blue>
                         </color>
                         <color>
-                            <red>96</red>
-                            <green>96</green>
-                            <blue>96</blue>
+                            <red>85</red>
+                            <green>127</green>
+                            <blue>0</blue>
                         </color>
                         <color>
-                            <red>128</red>
-                            <green>128</green>
-                            <blue>128</blue>
+                            <red>113</red>
+                            <green>170</green>
+                            <blue>0</blue>
                         </color>
@@ -771,5 +537,5 @@
                         <color>
-                            <red>0</red>
-                            <green>170</green>
-                            <blue>0</blue>
+                            <red>238</red>
+                            <green>238</green>
+                            <blue>230</blue>
                         </color>
@@ -781,2 +547,7 @@
                         <color>
+                            <red>255</red>
+                            <green>221</green>
+                            <blue>118</blue>
+                        </color>
+                        <color>
                             <red>0</red>
@@ -785,7 +556,2 @@
                         </color>
-                        <color>
-                            <red>255</red>
-                            <green>255</green>
-                            <blue>255</blue>
-                        </color>
                     </disabled>
@@ -798,25 +564,25 @@
                         <color>
-                            <red>192</red>
-                            <green>192</green>
-                            <blue>192</blue>
+                            <red>170</red>
+                            <green>255</green>
+                            <blue>0</blue>
                         </color>
                         <color>
-                            <red>255</red>
+                            <red>212</red>
                             <green>255</green>
-                            <blue>255</blue>
+                            <blue>127</blue>
                         </color>
                         <color>
-                            <red>220</red>
-                            <green>220</green>
-                            <blue>220</blue>
+                            <red>183</red>
+                            <green>255</green>
+                            <blue>38</blue>
                         </color>
                         <color>
-                            <red>96</red>
-                            <green>96</green>
-                            <blue>96</blue>
+                            <red>85</red>
+                            <green>127</green>
+                            <blue>0</blue>
                         </color>
                         <color>
-                            <red>128</red>
-                            <green>128</green>
-                            <blue>128</blue>
+                            <red>113</red>
+                            <green>170</green>
+                            <blue>0</blue>
                         </color>
@@ -843,5 +609,5 @@
                         <color>
-                            <red>0</red>
-                            <green>170</green>
-                            <blue>0</blue>
+                            <red>238</red>
+                            <green>238</green>
+                            <blue>230</blue>
                         </color>
@@ -853,2 +619,7 @@
                         <color>
+                            <red>255</red>
+                            <green>221</green>
+                            <blue>118</blue>
+                        </color>
+                        <color>
                             <red>0</red>
@@ -857,7 +628,2 @@
                         </color>
-                        <color>
-                            <red>255</red>
-                            <green>255</green>
-                            <blue>255</blue>
-                        </color>
                     </inactive>
@@ -866,8 +632,18 @@
             <property stdset="1">
-                <name>frameShape</name>
-                <enum>Box</enum>
+                <name>text</name>
+                <string>OK</string>
+            </property>
+        </widget>
+        <widget row="3"  column="0" >
+            <class>QPushButton</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>button_4</cstring>
             </property>
             <property stdset="1">
-                <name>frameShadow</name>
-                <enum>Raised</enum>
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>7</hsizetype>
+                    <vsizetype>7</vsizetype>
+                </sizepolicy>
             </property>
@@ -875,10 +651,57 @@
                 <name>text</name>
-                <string>Enter</string>
+                <string>4</string>
             </property>
+        </widget>
+        <widget row="2"  column="1" >
+            <class>QPushButton</class>
             <property stdset="1">
-                <name>alignment</name>
-                <set>AlignCenter</set>
+                <name>name</name>
+                <cstring>button_2</cstring>
             </property>
-            <property>
-                <name>hAlign</name>
+            <property stdset="1">
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>7</hsizetype>
+                    <vsizetype>7</vsizetype>
+                </sizepolicy>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>2</string>
+            </property>
+        </widget>
+        <widget row="3"  column="1" >
+            <class>QPushButton</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>button_5</cstring>
+            </property>
+            <property stdset="1">
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>7</hsizetype>
+                    <vsizetype>7</vsizetype>
+                </sizepolicy>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>5</string>
+            </property>
+        </widget>
+        <widget row="4"  column="1" >
+            <class>QPushButton</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>button_8</cstring>
+            </property>
+            <property stdset="1">
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>7</hsizetype>
+                    <vsizetype>7</vsizetype>
+                </sizepolicy>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>8</string>
             </property>
@@ -886,3 +709,3 @@
         <widget row="5"  column="1" >
-            <class>QLabel</class>
+            <class>QPushButton</class>
             <property stdset="1">
@@ -894,4 +717,4 @@
                 <sizepolicy>
-                    <hsizetype>5</hsizetype>
-                    <vsizetype>5</vsizetype>
+                    <hsizetype>7</hsizetype>
+                    <vsizetype>7</vsizetype>
                 </sizepolicy>
@@ -908,5 +731,5 @@
                         <color>
-                            <red>192</red>
-                            <green>192</green>
-                            <blue>192</blue>
+                            <red>255</red>
+                            <green>255</green>
+                            <blue>127</blue>
                         </color>
@@ -915,18 +738,18 @@
                             <green>255</green>
-                            <blue>255</blue>
+                            <blue>254</blue>
                         </color>
                         <color>
-                            <red>223</red>
-                            <green>223</green>
-                            <blue>223</blue>
+                            <red>255</red>
+                            <green>255</green>
+                            <blue>190</blue>
                         </color>
                         <color>
-                            <red>96</red>
-                            <green>96</green>
-                            <blue>96</blue>
+                            <red>127</red>
+                            <green>127</green>
+                            <blue>63</blue>
                         </color>
                         <color>
-                            <red>128</red>
-                            <green>128</green>
-                            <blue>128</blue>
+                            <red>170</red>
+                            <green>170</green>
+                            <blue>85</blue>
                         </color>
@@ -953,5 +776,5 @@
                         <color>
-                            <red>255</red>
-                            <green>255</green>
-                            <blue>127</blue>
+                            <red>238</red>
+                            <green>238</green>
+                            <blue>230</blue>
                         </color>
@@ -963,2 +786,7 @@
                         <color>
+                            <red>255</red>
+                            <green>221</green>
+                            <blue>118</blue>
+                        </color>
+                        <color>
                             <red>0</red>
@@ -967,7 +795,2 @@
                         </color>
-                        <color>
-                            <red>255</red>
-                            <green>255</green>
-                            <blue>255</blue>
-                        </color>
                     </active>
@@ -980,5 +803,5 @@
                         <color>
-                            <red>192</red>
-                            <green>192</green>
-                            <blue>192</blue>
+                            <red>255</red>
+                            <green>255</green>
+                            <blue>127</blue>
                         </color>
@@ -987,18 +810,18 @@
                             <green>255</green>
-                            <blue>255</blue>
+                            <blue>254</blue>
                         </color>
                         <color>
-                            <red>220</red>
-                            <green>220</green>
-                            <blue>220</blue>
+                            <red>255</red>
+                            <green>255</green>
+                            <blue>165</blue>
                         </color>
                         <color>
-                            <red>96</red>
-                            <green>96</green>
-                            <blue>96</blue>
+                            <red>127</red>
+                            <green>127</green>
+                            <blue>63</blue>
                         </color>
                         <color>
-                            <red>128</red>
-                            <green>128</green>
-                            <blue>128</blue>
+                            <red>170</red>
+                            <green>170</green>
+                            <blue>85</blue>
                         </color>
@@ -1025,5 +848,5 @@
                         <color>
-                            <red>255</red>
-                            <green>255</green>
-                            <blue>127</blue>
+                            <red>238</red>
+                            <green>238</green>
+                            <blue>230</blue>
                         </color>
@@ -1035,2 +858,7 @@
                         <color>
+                            <red>255</red>
+                            <green>221</green>
+                            <blue>118</blue>
+                        </color>
+                        <color>
                             <red>0</red>
@@ -1039,7 +867,2 @@
                         </color>
-                        <color>
-                            <red>255</red>
-                            <green>255</green>
-                            <blue>255</blue>
-                        </color>
                     </disabled>
@@ -1052,5 +875,5 @@
                         <color>
-                            <red>192</red>
-                            <green>192</green>
-                            <blue>192</blue>
+                            <red>255</red>
+                            <green>255</green>
+                            <blue>127</blue>
                         </color>
@@ -1059,18 +882,18 @@
                             <green>255</green>
-                            <blue>255</blue>
+                            <blue>254</blue>
                         </color>
                         <color>
-                            <red>220</red>
-                            <green>220</green>
-                            <blue>220</blue>
+                            <red>255</red>
+                            <green>255</green>
+                            <blue>165</blue>
                         </color>
                         <color>
-                            <red>96</red>
-                            <green>96</green>
-                            <blue>96</blue>
+                            <red>127</red>
+                            <green>127</green>
+                            <blue>63</blue>
                         </color>
                         <color>
-                            <red>128</red>
-                            <green>128</green>
-                            <blue>128</blue>
+                            <red>170</red>
+                            <green>170</green>
+                            <blue>85</blue>
                         </color>
@@ -1097,5 +920,5 @@
                         <color>
-                            <red>255</red>
-                            <green>255</green>
-                            <blue>127</blue>
+                            <red>238</red>
+                            <green>238</green>
+                            <blue>230</blue>
                         </color>
@@ -1107,2 +930,7 @@
                         <color>
+                            <red>255</red>
+                            <green>221</green>
+                            <blue>118</blue>
+                        </color>
+                        <color>
                             <red>0</red>
@@ -1111,7 +939,2 @@
                         </color>
-                        <color>
-                            <red>255</red>
-                            <green>255</green>
-                            <blue>255</blue>
-                        </color>
                     </inactive>
@@ -1120,10 +943,2 @@
             <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>
@@ -1132,7 +947,4 @@
             <property stdset="1">
-                <name>alignment</name>
-                <set>AlignCenter</set>
-            </property>
-            <property>
-                <name>hAlign</name>
+                <name>autoResize</name>
+                <bool>false</bool>
             </property>
@@ -1141,2 +953,39 @@
 </widget>
+<customwidgets>
+    <customwidget>
+        <class>QWidget</class>
+        <header location="global">qwidget.h</header>
+        <sizehint>
+            <width>-1</width>
+            <height>-1</height>
+        </sizehint>
+        <container>0</container>
+        <sizepolicy>
+            <hordata>5</hordata>
+            <verdata>5</verdata>
+        </sizepolicy>
+        <pixmap>image0</pixmap>
+    </customwidget>
+</customwidgets>
+<images>
+    <image>
+        <name>image0</name>
+        <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
+    </image>
+</images>
+<tabstops>
+    <tabstop>display</tabstop>
+    <tabstop>button_1</tabstop>
+    <tabstop>button_2</tabstop>
+    <tabstop>button_3</tabstop>
+    <tabstop>button_4</tabstop>
+    <tabstop>button_5</tabstop>
+    <tabstop>button_6</tabstop>
+    <tabstop>button_7</tabstop>
+    <tabstop>button_8</tabstop>
+    <tabstop>button_9</tabstop>
+    <tabstop>button_0</tabstop>
+    <tabstop>button_Skip</tabstop>
+    <tabstop>button_OK</tabstop>
+</tabstops>
 </UI>