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
@@ -72,16 +72,22 @@ signals:
 
     protected:
         bool eventFilter( QObject*, QEvent* );
 
     private:
         void input( QString );
         friend class PinPlugin;
         QString text;
+
+    private slots:
+       void slotInput();
+       void slotSkip();
+       void slotOK();
+       void slotBackspace();
 };
 
 
 /// Constructs a PinDialog widget, and initializes things
 PinDialog::PinDialog( QWidget* parent,  const char* name, WFlags fl )
     : PinDialogBase( parent, name, fl )
 {
     QRect desk = oApp->desktop()->geometry();
@@ -89,56 +95,91 @@ PinDialog::PinDialog( QWidget* parent,  const char* name, WFlags fl )
     if ( desk.width() < 220 ) {
         QFont f( font() );
         f.setPointSize( 18 );
         setFont( f );
         f.setPointSize( 12 );
         prompt->setFont( f );
     }
 
+    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 );
     button_1->installEventFilter( this );
     button_2->installEventFilter( this );
     button_3->installEventFilter( this );
     button_4->installEventFilter( this );
     button_5->installEventFilter( this );
     button_6->installEventFilter( this );
     button_7->installEventFilter( this );
     button_8->installEventFilter( this );
     button_9->installEventFilter( this );
     button_Skip->installEventFilter( this );
     button_OK->installEventFilter( this );
-    setFocus();
+    button_OK->setFocus();
 }
 
 /// nothing to do
 PinDialog::~PinDialog()
 {
     // no need to delete child widgets, Qt does it all for us
 }
 
-/// 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;
         }
     }
     return FALSE;
 }
 
+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 )
 {
     text += c;
     display->setText( text );
 }
 
 void PinDialog::setPrompt( const QString& s )
 {
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
@@ -6,18 +6,18 @@
         <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>
+            <width>257</width>
+            <height>280</height>
         </rect>
     </property>
     <property stdset="1">
         <name>font</name>
         <font>
             <pointsize>24</pointsize>
         </font>
     </property>
@@ -29,80 +29,122 @@
         <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>
+        <widget row="4"  column="0" >
+            <class>QPushButton</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>button_4</cstring>
+                <cstring>button_7</cstring>
             </property>
             <property stdset="1">
                 <name>sizePolicy</name>
                 <sizepolicy>
-                    <hsizetype>5</hsizetype>
-                    <vsizetype>5</vsizetype>
+                    <hsizetype>7</hsizetype>
+                    <vsizetype>7</vsizetype>
                 </sizepolicy>
             </property>
             <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>
             <property stdset="1">
                 <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>
             <property stdset="1">
                 <name>sizePolicy</name>
                 <sizepolicy>
-                    <hsizetype>5</hsizetype>
-                    <vsizetype>5</vsizetype>
+                    <hsizetype>7</hsizetype>
+                    <vsizetype>7</vsizetype>
                 </sizepolicy>
             </property>
             <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>
             <property stdset="1">
                 <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>
         </widget>
         <widget row="0"  column="0"  rowspan="1"  colspan="3" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>prompt</cstring>
             </property>
@@ -348,338 +390,62 @@
                     </inactive>
                 </palette>
             </property>
             <property stdset="1">
                 <name>echoMode</name>
                 <enum>Password</enum>
             </property>
         </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">
                 <name>name</name>
                 <cstring>button_OK</cstring>
             </property>
             <property stdset="1">
                 <name>sizePolicy</name>
                 <sizepolicy>
-                    <hsizetype>5</hsizetype>
-                    <vsizetype>5</vsizetype>
+                    <hsizetype>7</hsizetype>
+                    <vsizetype>7</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>
+                            <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>
                         <color>
                             <red>0</red>
                             <green>0</green>
                             <blue>0</blue>
                         </color>
                         <color>
                             <red>255</red>
@@ -692,66 +458,66 @@
                             <blue>0</blue>
                         </color>
                         <color>
                             <red>255</red>
                             <green>255</green>
                             <blue>255</blue>
                         </color>
                         <color>
-                            <red>0</red>
-                            <green>170</green>
-                            <blue>0</blue>
+                            <red>238</red>
+                            <green>238</green>
+                            <blue>230</blue>
                         </color>
                         <color>
                             <red>0</red>
                             <green>0</green>
                             <blue>0</blue>
                         </color>
                         <color>
+                            <red>255</red>
+                            <green>221</green>
+                            <blue>118</blue>
+                        </color>
+                        <color>
                             <red>0</red>
                             <green>0</green>
                             <blue>0</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>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>
                         <color>
                             <red>0</red>
                             <green>0</green>
                             <blue>0</blue>
                         </color>
                         <color>
                             <red>255</red>
@@ -764,66 +530,66 @@
                             <blue>128</blue>
                         </color>
                         <color>
                             <red>255</red>
                             <green>255</green>
                             <blue>255</blue>
                         </color>
                         <color>
-                            <red>0</red>
-                            <green>170</green>
-                            <blue>0</blue>
+                            <red>238</red>
+                            <green>238</green>
+                            <blue>230</blue>
                         </color>
                         <color>
                             <red>0</red>
                             <green>0</green>
                             <blue>0</blue>
                         </color>
                         <color>
+                            <red>255</red>
+                            <green>221</green>
+                            <blue>118</blue>
+                        </color>
+                        <color>
                             <red>0</red>
                             <green>0</green>
                             <blue>0</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>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>
                         <color>
                             <red>0</red>
                             <green>0</green>
                             <blue>0</blue>
                         </color>
                         <color>
                             <red>255</red>
@@ -836,104 +602,161 @@
                             <blue>0</blue>
                         </color>
                         <color>
                             <red>255</red>
                             <green>255</green>
                             <blue>255</blue>
                         </color>
                         <color>
-                            <red>0</red>
-                            <green>170</green>
-                            <blue>0</blue>
+                            <red>238</red>
+                            <green>238</green>
+                            <blue>230</blue>
                         </color>
                         <color>
                             <red>0</red>
                             <green>0</green>
                             <blue>0</blue>
                         </color>
                         <color>
+                            <red>255</red>
+                            <green>221</green>
+                            <blue>118</blue>
+                        </color>
+                        <color>
                             <red>0</red>
                             <green>0</green>
                             <blue>0</blue>
                         </color>
-                        <color>
-                            <red>255</red>
-                            <green>255</green>
-                            <blue>255</blue>
-                        </color>
                     </inactive>
                 </palette>
             </property>
             <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>
             <property stdset="1">
                 <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>
         </widget>
         <widget row="5"  column="1" >
-            <class>QLabel</class>
+            <class>QPushButton</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>button_Skip</cstring>
             </property>
             <property stdset="1">
                 <name>sizePolicy</name>
                 <sizepolicy>
-                    <hsizetype>5</hsizetype>
-                    <vsizetype>5</vsizetype>
+                    <hsizetype>7</hsizetype>
+                    <vsizetype>7</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>
+                            <red>255</red>
+                            <green>255</green>
+                            <blue>127</blue>
                         </color>
                         <color>
                             <red>255</red>
                             <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>
                         <color>
                             <red>0</red>
                             <green>0</green>
                             <blue>0</blue>
                         </color>
                         <color>
                             <red>255</red>
@@ -946,66 +769,66 @@
                             <blue>0</blue>
                         </color>
                         <color>
                             <red>255</red>
                             <green>255</green>
                             <blue>255</blue>
                         </color>
                         <color>
-                            <red>255</red>
-                            <green>255</green>
-                            <blue>127</blue>
+                            <red>238</red>
+                            <green>238</green>
+                            <blue>230</blue>
                         </color>
                         <color>
                             <red>0</red>
                             <green>0</green>
                             <blue>0</blue>
                         </color>
                         <color>
+                            <red>255</red>
+                            <green>221</green>
+                            <blue>118</blue>
+                        </color>
+                        <color>
                             <red>0</red>
                             <green>0</green>
                             <blue>0</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>192</red>
-                            <green>192</green>
-                            <blue>192</blue>
+                            <red>255</red>
+                            <green>255</green>
+                            <blue>127</blue>
                         </color>
                         <color>
                             <red>255</red>
                             <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>
                         <color>
                             <red>0</red>
                             <green>0</green>
                             <blue>0</blue>
                         </color>
                         <color>
                             <red>255</red>
@@ -1018,66 +841,66 @@
                             <blue>128</blue>
                         </color>
                         <color>
                             <red>255</red>
                             <green>255</green>
                             <blue>255</blue>
                         </color>
                         <color>
-                            <red>255</red>
-                            <green>255</green>
-                            <blue>127</blue>
+                            <red>238</red>
+                            <green>238</green>
+                            <blue>230</blue>
                         </color>
                         <color>
                             <red>0</red>
                             <green>0</green>
                             <blue>0</blue>
                         </color>
                         <color>
+                            <red>255</red>
+                            <green>221</green>
+                            <blue>118</blue>
+                        </color>
+                        <color>
                             <red>0</red>
                             <green>0</green>
                             <blue>0</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>192</red>
-                            <green>192</green>
-                            <blue>192</blue>
+                            <red>255</red>
+                            <green>255</green>
+                            <blue>127</blue>
                         </color>
                         <color>
                             <red>255</red>
                             <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>
                         <color>
                             <red>0</red>
                             <green>0</green>
                             <blue>0</blue>
                         </color>
                         <color>
                             <red>255</red>
@@ -1090,53 +913,79 @@
                             <blue>0</blue>
                         </color>
                         <color>
                             <red>255</red>
                             <green>255</green>
                             <blue>255</blue>
                         </color>
                         <color>
-                            <red>255</red>
-                            <green>255</green>
-                            <blue>127</blue>
+                            <red>238</red>
+                            <green>238</green>
+                            <blue>230</blue>
                         </color>
                         <color>
                             <red>0</red>
                             <green>0</green>
                             <blue>0</blue>
                         </color>
                         <color>
+                            <red>255</red>
+                            <green>221</green>
+                            <blue>118</blue>
+                        </color>
+                        <color>
                             <red>0</red>
                             <green>0</green>
                             <blue>0</blue>
                         </color>
-                        <color>
-                            <red>255</red>
-                            <green>255</green>
-                            <blue>255</blue>
-                        </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>
+                <name>autoResize</name>
+                <bool>false</bool>
             </property>
         </widget>
     </grid>
 </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>