automatic conversion of dtmfform.ui

4 files changed, 448 insertions, 496 deletions

diff --git a/src/gui/dtmfform.ui.h b/src/gui/dtmfform.cpp
index 08639dc..bd61830 100644
--- a/src/gui/dtmfform.ui.h
+++ b/src/gui/dtmfform.cpp
@@ -1,30 +1,26 @@
-//Added by qt3to4:
-#include <QKeyEvent>
-/****************************************************************************
-** ui.h extension file, included from the uic-generated form implementation.
-**
-** If you wish to add, delete or rename functions or slots use
-** Qt Designer which will update this file, preserving your code. Create an
-** init() function in place of a constructor, and a destroy() function in
-** place of a destructor.
-*****************************************************************************/
+#include "dtmfform.h"
+
+/*
+ *  Constructs a DtmfForm which is a child of 'parent', with the
+ *  name 'name' and widget flags set to 'f'
+ *
+ *  The dialog will by default be modeless, unless you set 'modal' to
+ *  true to construct a modal dialog.
+ */
+DtmfForm::DtmfForm(QWidget* parent)
+	: QDialog(parent)
+{
+	setupUi(this);
+}
+
 /*
-    Copyright (C) 2005-2009  Michel de Boer <michel@twinklephone.com>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+ *  Destroys the object and frees any allocated resources
+ */
+DtmfForm::~DtmfForm()
+{
+    // no need to delete child widgets, Qt does it all for us
+}
+
 
 void DtmfForm::dtmf1()
 {
diff --git a/src/gui/dtmfform.h b/src/gui/dtmfform.h
new file mode 100644
index 0000000..a9c6b45
--- /dev/null
+++ b/src/gui/dtmfform.h
@@ -0,0 +1,39 @@
+#ifndef DTMFFORM_H
+#define DTMFFORM_H
+
+#include <QDialog>
+#include <QKeyEvent>
+#include "ui_dtmfform.h"
+
+class DtmfForm : public QDialog, private Ui::DtmfForm
+{
+    Q_OBJECT
+
+public:
+    explicit DtmfForm(QWidget *parent = 0);
+    ~DtmfForm();
+
+public slots:
+    void dtmf1();
+    void dtmf2();
+    void dtmf3();
+    void dtmf4();
+    void dtmf5();
+    void dtmf6();
+    void dtmf7();
+    void dtmf8();
+    void dtmf9();
+    void dtmf0();
+    void dtmfStar();
+    void dtmfPound();
+    void dtmfA();
+    void dtmfB();
+    void dtmfC();
+    void dtmfD();
+    void keyPressEvent(QKeyEvent* e);
+
+signals:
+    void digits(const QString&);
+};
+
+#endif // DTMFFORM_H
diff --git a/src/gui/dtmfform.ui b/src/gui/dtmfform.ui
index d0e683d..6526992 100644
--- a/src/gui/dtmfform.ui
+++ b/src/gui/dtmfform.ui
@@ -1,509 +1,423 @@
-<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>DtmfForm</class>
-<widget class="QDialog">
-    <property name="name">
-        <cstring>DtmfForm</cstring>
-    </property>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0" stdsetdef="1">
+  <author></author>
+  <comment></comment>
+  <exportmacro></exportmacro>
+  <class>DtmfForm</class>
+  <widget class="QDialog" name="DtmfForm">
     <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>350</width>
-            <height>302</height>
-        </rect>
+      <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>350</width>
+        <height>302</height>
+      </rect>
     </property>
     <property name="sizePolicy">
-        <sizepolicy>
-            <hsizetype>5</hsizetype>
-            <vsizetype>5</vsizetype>
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-        </sizepolicy>
+      <sizepolicy>
+        <hsizetype>5</hsizetype>
+        <vsizetype>5</vsizetype>
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+      </sizepolicy>
     </property>
-    <property name="caption">
-        <string>Twinkle - DTMF</string>
+    <property name="windowTitle">
+      <string>Twinkle - DTMF</string>
     </property>
-    <vbox>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <widget class="QGroupBox">
-            <property name="name">
-                <cstring>keypadGroupBox</cstring>
-            </property>
-            <property name="title">
-                <string>Keypad</string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <widget class="QPushButton" row="0" column="1">
-                    <property name="name">
-                        <cstring>twoPushButton</cstring>
-                    </property>
-                    <property name="font">
-                        <font>
-                            <pointsize>10</pointsize>
-                        </font>
-                    </property>
-                    <property name="text">
-                        <string></string>
-                    </property>
-                    <property name="pixmap">
-                        <pixmap>dtmf-2.png</pixmap>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>2</string>
-                    </property>
-                </widget>
-                <widget class="QPushButton" row="0" column="2">
-                    <property name="name">
-                        <cstring>threePushButton</cstring>
-                    </property>
-                    <property name="font">
-                        <font>
-                            <pointsize>10</pointsize>
-                        </font>
-                    </property>
-                    <property name="text">
-                        <string></string>
-                    </property>
-                    <property name="pixmap">
-                        <pixmap>dtmf-3.png</pixmap>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>3</string>
-                    </property>
-                </widget>
-                <widget class="QPushButton" row="0" column="3">
-                    <property name="name">
-                        <cstring>aPushButton</cstring>
-                    </property>
-                    <property name="paletteBackgroundColor">
-                        <color>
-                            <red>194</red>
-                            <green>202</green>
-                            <blue>210</blue>
-                        </color>
-                    </property>
-                    <property name="text">
-                        <string></string>
-                    </property>
-                    <property name="pixmap">
-                        <pixmap>dtmf-a.png</pixmap>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>Over decadic A. Normally not needed.</string>
-                    </property>
-                </widget>
-                <widget class="QPushButton" row="1" column="0">
-                    <property name="name">
-                        <cstring>fourPushButton</cstring>
-                    </property>
-                    <property name="text">
-                        <string></string>
-                    </property>
-                    <property name="pixmap">
-                        <pixmap>dtmf-4.png</pixmap>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>4</string>
-                    </property>
-                </widget>
-                <widget class="QPushButton" row="1" column="1">
-                    <property name="name">
-                        <cstring>fivePushButton</cstring>
-                    </property>
-                    <property name="text">
-                        <string></string>
-                    </property>
-                    <property name="pixmap">
-                        <pixmap>dtmf-5.png</pixmap>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>5</string>
-                    </property>
-                </widget>
-                <widget class="QPushButton" row="1" column="2">
-                    <property name="name">
-                        <cstring>sixPushButton</cstring>
-                    </property>
-                    <property name="text">
-                        <string></string>
-                    </property>
-                    <property name="pixmap">
-                        <pixmap>dtmf-6.png</pixmap>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>6</string>
-                    </property>
-                </widget>
-                <widget class="QPushButton" row="1" column="3">
-                    <property name="name">
-                        <cstring>bPushButton</cstring>
-                    </property>
-                    <property name="paletteBackgroundColor">
-                        <color>
-                            <red>194</red>
-                            <green>202</green>
-                            <blue>210</blue>
-                        </color>
-                    </property>
-                    <property name="text">
-                        <string></string>
-                    </property>
-                    <property name="pixmap">
-                        <pixmap>dtmf-b.png</pixmap>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>Over decadic B. Normally not needed.</string>
-                    </property>
-                </widget>
-                <widget class="QPushButton" row="2" column="0">
-                    <property name="name">
-                        <cstring>sevenPushButton</cstring>
-                    </property>
-                    <property name="text">
-                        <string></string>
-                    </property>
-                    <property name="pixmap">
-                        <pixmap>dtmf-7.png</pixmap>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>7</string>
-                    </property>
-                </widget>
-                <widget class="QPushButton" row="2" column="1">
-                    <property name="name">
-                        <cstring>eightPushButton</cstring>
-                    </property>
-                    <property name="text">
-                        <string></string>
-                    </property>
-                    <property name="pixmap">
-                        <pixmap>dtmf-8.png</pixmap>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>8</string>
-                    </property>
-                </widget>
-                <widget class="QPushButton" row="2" column="2">
-                    <property name="name">
-                        <cstring>ninePushButton</cstring>
-                    </property>
-                    <property name="text">
-                        <string></string>
-                    </property>
-                    <property name="pixmap">
-                        <pixmap>dtmf-9.png</pixmap>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>9</string>
-                    </property>
-                </widget>
-                <widget class="QPushButton" row="2" column="3">
-                    <property name="name">
-                        <cstring>cPushButton</cstring>
-                    </property>
-                    <property name="paletteBackgroundColor">
-                        <color>
-                            <red>194</red>
-                            <green>202</green>
-                            <blue>210</blue>
-                        </color>
-                    </property>
-                    <property name="text">
-                        <string></string>
-                    </property>
-                    <property name="pixmap">
-                        <pixmap>dtmf-c.png</pixmap>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>Over decadic C. Normally not needed.</string>
-                    </property>
-                </widget>
-                <widget class="QPushButton" row="3" column="0">
-                    <property name="name">
-                        <cstring>starPushButton</cstring>
-                    </property>
-                    <property name="text">
-                        <string></string>
-                    </property>
-                    <property name="pixmap">
-                        <pixmap>dtmf-star.png</pixmap>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>Star (*)</string>
-                    </property>
-                </widget>
-                <widget class="QPushButton" row="3" column="1">
-                    <property name="name">
-                        <cstring>zeroPushButton</cstring>
-                    </property>
-                    <property name="text">
-                        <string></string>
-                    </property>
-                    <property name="pixmap">
-                        <pixmap>dtmf-0.png</pixmap>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>0</string>
-                    </property>
-                </widget>
-                <widget class="QPushButton" row="3" column="2">
-                    <property name="name">
-                        <cstring>poundPushButton</cstring>
-                    </property>
-                    <property name="text">
-                        <string></string>
-                    </property>
-                    <property name="pixmap">
-                        <pixmap>dtmf-pound.png</pixmap>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>Pound (#)</string>
-                    </property>
-                </widget>
-                <widget class="QPushButton" row="3" column="3">
-                    <property name="name">
-                        <cstring>dPushButton</cstring>
-                    </property>
-                    <property name="paletteBackgroundColor">
-                        <color>
-                            <red>194</red>
-                            <green>202</green>
-                            <blue>210</blue>
-                        </color>
-                    </property>
-                    <property name="text">
-                        <string></string>
-                    </property>
-                    <property name="pixmap">
-                        <pixmap>dtmf-d.png</pixmap>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>Over decadic D. Normally not needed.</string>
-                    </property>
-                </widget>
-                <widget class="QPushButton" row="0" column="0">
-                    <property name="name">
-                        <cstring>onePushButton</cstring>
-                    </property>
-                    <property name="font">
-                        <font>
-                            <pointsize>10</pointsize>
-                        </font>
-                    </property>
-                    <property name="text">
-                        <string></string>
-                    </property>
-                    <property name="pixmap">
-                        <pixmap>dtmf-1.png</pixmap>
-                    </property>
-                    <property name="autoDefault">
-                        <bool>true</bool>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>1</string>
-                    </property>
-                </widget>
-            </grid>
-        </widget>
-        <widget class="QLayoutWidget">
-            <property name="name">
-                <cstring>layout24</cstring>
-            </property>
-            <hbox>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <spacer>
-                    <property name="name">
-                        <cstring>spacer20</cstring>
-                    </property>
-                    <property name="orientation">
-                        <enum>Horizontal</enum>
-                    </property>
-                    <property name="sizeType">
-                        <enum>Expanding</enum>
-                    </property>
-                    <property name="sizeHint">
-                        <size>
-                            <width>291</width>
-                            <height>20</height>
-                        </size>
-                    </property>
-                </spacer>
-                <widget class="QPushButton">
-                    <property name="name">
-                        <cstring>closePushButton</cstring>
-                    </property>
-                    <property name="text">
-                        <string>&amp;Close</string>
-                    </property>
-                    <property name="accel">
-                        <string>Alt+C</string>
-                    </property>
-                    <property name="default">
-                        <bool>true</bool>
-                    </property>
-                </widget>
-            </hbox>
+    <layout class="QVBoxLayout">
+      <item>
+        <widget class="Q3GroupBox" name="keypadGroupBox">
+          <property name="title">
+            <string>Keypad</string>
+          </property>
+          <layout class="QGridLayout">
+            <item row="0" column="1">
+              <widget class="QPushButton" name="twoPushButton">
+                <property name="font">
+                  <font>
+                    <pointsize>10</pointsize>
+                  </font>
+                </property>
+                <property name="text">
+                  <string/>
+                </property>
+                <property name="icon">
+                  <pixmap>dtmf-2.png</pixmap>
+                </property>
+                <property name="whatsThis" stdset="0">
+                  <string>2</string>
+                </property>
+              </widget>
+            </item>
+            <item row="0" column="2">
+              <widget class="QPushButton" name="threePushButton">
+                <property name="font">
+                  <font>
+                    <pointsize>10</pointsize>
+                  </font>
+                </property>
+                <property name="text">
+                  <string/>
+                </property>
+                <property name="icon">
+                  <pixmap>dtmf-3.png</pixmap>
+                </property>
+                <property name="whatsThis" stdset="0">
+                  <string>3</string>
+                </property>
+              </widget>
+            </item>
+            <item row="0" column="3">
+              <widget class="QPushButton" name="aPushButton">
+                <property name="text">
+                  <string/>
+                </property>
+                <property name="icon">
+                  <pixmap>dtmf-a.png</pixmap>
+                </property>
+                <property name="whatsThis" stdset="0">
+                  <string>Over decadic A. Normally not needed.</string>
+                </property>
+              </widget>
+            </item>
+            <item row="1" column="0">
+              <widget class="QPushButton" name="fourPushButton">
+                <property name="text">
+                  <string/>
+                </property>
+                <property name="icon">
+                  <pixmap>dtmf-4.png</pixmap>
+                </property>
+                <property name="whatsThis" stdset="0">
+                  <string>4</string>
+                </property>
+              </widget>
+            </item>
+            <item row="1" column="1">
+              <widget class="QPushButton" name="fivePushButton">
+                <property name="text">
+                  <string/>
+                </property>
+                <property name="icon">
+                  <pixmap>dtmf-5.png</pixmap>
+                </property>
+                <property name="whatsThis" stdset="0">
+                  <string>5</string>
+                </property>
+              </widget>
+            </item>
+            <item row="1" column="2">
+              <widget class="QPushButton" name="sixPushButton">
+                <property name="text">
+                  <string/>
+                </property>
+                <property name="icon">
+                  <pixmap>dtmf-6.png</pixmap>
+                </property>
+                <property name="whatsThis" stdset="0">
+                  <string>6</string>
+                </property>
+              </widget>
+            </item>
+            <item row="1" column="3">
+              <widget class="QPushButton" name="bPushButton">
+                <property name="text">
+                  <string/>
+                </property>
+                <property name="icon">
+                  <pixmap>dtmf-b.png</pixmap>
+                </property>
+                <property name="whatsThis" stdset="0">
+                  <string>Over decadic B. Normally not needed.</string>
+                </property>
+              </widget>
+            </item>
+            <item row="2" column="0">
+              <widget class="QPushButton" name="sevenPushButton">
+                <property name="text">
+                  <string/>
+                </property>
+                <property name="icon">
+                  <pixmap>dtmf-7.png</pixmap>
+                </property>
+                <property name="whatsThis" stdset="0">
+                  <string>7</string>
+                </property>
+              </widget>
+            </item>
+            <item row="2" column="1">
+              <widget class="QPushButton" name="eightPushButton">
+                <property name="text">
+                  <string/>
+                </property>
+                <property name="icon">
+                  <pixmap>dtmf-8.png</pixmap>
+                </property>
+                <property name="whatsThis" stdset="0">
+                  <string>8</string>
+                </property>
+              </widget>
+            </item>
+            <item row="2" column="2">
+              <widget class="QPushButton" name="ninePushButton">
+                <property name="text">
+                  <string/>
+                </property>
+                <property name="icon">
+                  <pixmap>dtmf-9.png</pixmap>
+                </property>
+                <property name="whatsThis" stdset="0">
+                  <string>9</string>
+                </property>
+              </widget>
+            </item>
+            <item row="2" column="3">
+              <widget class="QPushButton" name="cPushButton">
+                <property name="text">
+                  <string/>
+                </property>
+                <property name="icon">
+                  <pixmap>dtmf-c.png</pixmap>
+                </property>
+                <property name="whatsThis" stdset="0">
+                  <string>Over decadic C. Normally not needed.</string>
+                </property>
+              </widget>
+            </item>
+            <item row="3" column="0">
+              <widget class="QPushButton" name="starPushButton">
+                <property name="text">
+                  <string/>
+                </property>
+                <property name="icon">
+                  <pixmap>dtmf-star.png</pixmap>
+                </property>
+                <property name="whatsThis" stdset="0">
+                  <string>Star (*)</string>
+                </property>
+              </widget>
+            </item>
+            <item row="3" column="1">
+              <widget class="QPushButton" name="zeroPushButton">
+                <property name="text">
+                  <string/>
+                </property>
+                <property name="icon">
+                  <pixmap>dtmf-0.png</pixmap>
+                </property>
+                <property name="whatsThis" stdset="0">
+                  <string>0</string>
+                </property>
+              </widget>
+            </item>
+            <item row="3" column="2">
+              <widget class="QPushButton" name="poundPushButton">
+                <property name="text">
+                  <string/>
+                </property>
+                <property name="icon">
+                  <pixmap>dtmf-pound.png</pixmap>
+                </property>
+                <property name="whatsThis" stdset="0">
+                  <string>Pound (#)</string>
+                </property>
+              </widget>
+            </item>
+            <item row="3" column="3">
+              <widget class="QPushButton" name="dPushButton">
+                <property name="text">
+                  <string/>
+                </property>
+                <property name="icon">
+                  <pixmap>dtmf-d.png</pixmap>
+                </property>
+                <property name="whatsThis" stdset="0">
+                  <string>Over decadic D. Normally not needed.</string>
+                </property>
+              </widget>
+            </item>
+            <item row="0" column="0">
+              <widget class="QPushButton" name="onePushButton">
+                <property name="font">
+                  <font>
+                    <pointsize>10</pointsize>
+                  </font>
+                </property>
+                <property name="text">
+                  <string/>
+                </property>
+                <property name="icon">
+                  <pixmap>dtmf-1.png</pixmap>
+                </property>
+                <property name="autoDefault">
+                  <bool>true</bool>
+                </property>
+                <property name="whatsThis" stdset="0">
+                  <string>1</string>
+                </property>
+              </widget>
+            </item>
+          </layout>
         </widget>
-    </vbox>
-</widget>
-<connections>
+      </item>
+      <item>
+        <layout class="QHBoxLayout">
+          <item>
+            <spacer name="spacer20">
+              <property name="sizeHint">
+                <size>
+                  <width>291</width>
+                  <height>20</height>
+                </size>
+              </property>
+              <property name="sizeType">
+                <enum>QSizePolicy::Expanding</enum>
+              </property>
+              <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+              </property>
+            </spacer>
+          </item>
+          <item>
+            <widget class="QPushButton" name="closePushButton">
+              <property name="text">
+                <string>&amp;Close</string>
+              </property>
+              <property name="shortcut">
+                <string>Alt+C</string>
+              </property>
+              <property name="default">
+                <bool>true</bool>
+              </property>
+            </widget>
+          </item>
+        </layout>
+      </item>
+    </layout>
+  </widget>
+  <layoutdefault spacing="6" margin="11"/>
+  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+  <tabstops>
+    <tabstop>onePushButton</tabstop>
+    <tabstop>twoPushButton</tabstop>
+    <tabstop>threePushButton</tabstop>
+    <tabstop>aPushButton</tabstop>
+    <tabstop>fourPushButton</tabstop>
+    <tabstop>fivePushButton</tabstop>
+    <tabstop>sixPushButton</tabstop>
+    <tabstop>bPushButton</tabstop>
+    <tabstop>sevenPushButton</tabstop>
+    <tabstop>eightPushButton</tabstop>
+    <tabstop>ninePushButton</tabstop>
+    <tabstop>cPushButton</tabstop>
+    <tabstop>starPushButton</tabstop>
+    <tabstop>zeroPushButton</tabstop>
+    <tabstop>poundPushButton</tabstop>
+    <tabstop>dPushButton</tabstop>
+    <tabstop>closePushButton</tabstop>
+  </tabstops>
+  <connections>
     <connection>
-        <sender>closePushButton</sender>
-        <signal>clicked()</signal>
-        <receiver>DtmfForm</receiver>
-        <slot>accept()</slot>
+      <sender>closePushButton</sender>
+      <signal>clicked()</signal>
+      <receiver>DtmfForm</receiver>
+      <slot>accept()</slot>
     </connection>
     <connection>
-        <sender>onePushButton</sender>
-        <signal>clicked()</signal>
-        <receiver>DtmfForm</receiver>
-        <slot>dtmf1()</slot>
+      <sender>onePushButton</sender>
+      <signal>clicked()</signal>
+      <receiver>DtmfForm</receiver>
+      <slot>dtmf1()</slot>
     </connection>
     <connection>
-        <sender>twoPushButton</sender>
-        <signal>clicked()</signal>
-        <receiver>DtmfForm</receiver>
-        <slot>dtmf2()</slot>
+      <sender>twoPushButton</sender>
+      <signal>clicked()</signal>
+      <receiver>DtmfForm</receiver>
+      <slot>dtmf2()</slot>
     </connection>
     <connection>
-        <sender>threePushButton</sender>
-        <signal>clicked()</signal>
-        <receiver>DtmfForm</receiver>
-        <slot>dtmf3()</slot>
+      <sender>threePushButton</sender>
+      <signal>clicked()</signal>
+      <receiver>DtmfForm</receiver>
+      <slot>dtmf3()</slot>
     </connection>
     <connection>
-        <sender>fourPushButton</sender>
-        <signal>clicked()</signal>
-        <receiver>DtmfForm</receiver>
-        <slot>dtmf4()</slot>
+      <sender>fourPushButton</sender>
+      <signal>clicked()</signal>
+      <receiver>DtmfForm</receiver>
+      <slot>dtmf4()</slot>
     </connection>
     <connection>
-        <sender>fivePushButton</sender>
-        <signal>clicked()</signal>
-        <receiver>DtmfForm</receiver>
-        <slot>dtmf5()</slot>
+      <sender>fivePushButton</sender>
+      <signal>clicked()</signal>
+      <receiver>DtmfForm</receiver>
+      <slot>dtmf5()</slot>
     </connection>
     <connection>
-        <sender>sixPushButton</sender>
-        <signal>clicked()</signal>
-        <receiver>DtmfForm</receiver>
-        <slot>dtmf6()</slot>
+      <sender>sixPushButton</sender>
+      <signal>clicked()</signal>
+      <receiver>DtmfForm</receiver>
+      <slot>dtmf6()</slot>
     </connection>
     <connection>
-        <sender>sevenPushButton</sender>
-        <signal>clicked()</signal>
-        <receiver>DtmfForm</receiver>
-        <slot>dtmf7()</slot>
+      <sender>sevenPushButton</sender>
+      <signal>clicked()</signal>
+      <receiver>DtmfForm</receiver>
+      <slot>dtmf7()</slot>
     </connection>
     <connection>
-        <sender>eightPushButton</sender>
-        <signal>clicked()</signal>
-        <receiver>DtmfForm</receiver>
-        <slot>dtmf8()</slot>
+      <sender>eightPushButton</sender>
+      <signal>clicked()</signal>
+      <receiver>DtmfForm</receiver>
+      <slot>dtmf8()</slot>
     </connection>
     <connection>
-        <sender>ninePushButton</sender>
-        <signal>clicked()</signal>
-        <receiver>DtmfForm</receiver>
-        <slot>dtmf9()</slot>
+      <sender>ninePushButton</sender>
+      <signal>clicked()</signal>
+      <receiver>DtmfForm</receiver>
+      <slot>dtmf9()</slot>
     </connection>
     <connection>
-        <sender>zeroPushButton</sender>
-        <signal>clicked()</signal>
-        <receiver>DtmfForm</receiver>
-        <slot>dtmf0()</slot>
+      <sender>zeroPushButton</sender>
+      <signal>clicked()</signal>
+      <receiver>DtmfForm</receiver>
+      <slot>dtmf0()</slot>
     </connection>
     <connection>
-        <sender>starPushButton</sender>
-        <signal>clicked()</signal>
-        <receiver>DtmfForm</receiver>
-        <slot>dtmfStar()</slot>
+      <sender>starPushButton</sender>
+      <signal>clicked()</signal>
+      <receiver>DtmfForm</receiver>
+      <slot>dtmfStar()</slot>
     </connection>
     <connection>
-        <sender>poundPushButton</sender>
-        <signal>clicked()</signal>
-        <receiver>DtmfForm</receiver>
-        <slot>dtmfPound()</slot>
+      <sender>poundPushButton</sender>
+      <signal>clicked()</signal>
+      <receiver>DtmfForm</receiver>
+      <slot>dtmfPound()</slot>
     </connection>
     <connection>
-        <sender>aPushButton</sender>
-        <signal>clicked()</signal>
-        <receiver>DtmfForm</receiver>
-        <slot>dtmfA()</slot>
+      <sender>aPushButton</sender>
+      <signal>clicked()</signal>
+      <receiver>DtmfForm</receiver>
+      <slot>dtmfA()</slot>
     </connection>
     <connection>
-        <sender>bPushButton</sender>
-        <signal>clicked()</signal>
-        <receiver>DtmfForm</receiver>
-        <slot>dtmfB()</slot>
+      <sender>bPushButton</sender>
+      <signal>clicked()</signal>
+      <receiver>DtmfForm</receiver>
+      <slot>dtmfB()</slot>
     </connection>
     <connection>
-        <sender>cPushButton</sender>
-        <signal>clicked()</signal>
-        <receiver>DtmfForm</receiver>
-        <slot>dtmfC()</slot>
+      <sender>cPushButton</sender>
+      <signal>clicked()</signal>
+      <receiver>DtmfForm</receiver>
+      <slot>dtmfC()</slot>
     </connection>
     <connection>
-        <sender>dPushButton</sender>
-        <signal>clicked()</signal>
-        <receiver>DtmfForm</receiver>
-        <slot>dtmfD()</slot>
+      <sender>dPushButton</sender>
+      <signal>clicked()</signal>
+      <receiver>DtmfForm</receiver>
+      <slot>dtmfD()</slot>
     </connection>
-</connections>
-<tabstops>
-    <tabstop>onePushButton</tabstop>
-    <tabstop>twoPushButton</tabstop>
-    <tabstop>threePushButton</tabstop>
-    <tabstop>aPushButton</tabstop>
-    <tabstop>fourPushButton</tabstop>
-    <tabstop>fivePushButton</tabstop>
-    <tabstop>sixPushButton</tabstop>
-    <tabstop>bPushButton</tabstop>
-    <tabstop>sevenPushButton</tabstop>
-    <tabstop>eightPushButton</tabstop>
-    <tabstop>ninePushButton</tabstop>
-    <tabstop>cPushButton</tabstop>
-    <tabstop>starPushButton</tabstop>
-    <tabstop>zeroPushButton</tabstop>
-    <tabstop>poundPushButton</tabstop>
-    <tabstop>dPushButton</tabstop>
-    <tabstop>closePushButton</tabstop>
-</tabstops>
-<includes>
-    <include location="local" impldecl="in implementation">qregexp.h</include>
-    <include location="local" impldecl="in implementation">qvalidator.h</include>
-    <include location="local" impldecl="in implementation">qlineedit.h</include>
-    <include location="local" impldecl="in implementation">dtmfform.ui.h</include>
-</includes>
-<signals>
-    <signal>digits(const QString &amp;)</signal>
-</signals>
-<slots>
-    <slot>dtmf1()</slot>
-    <slot>dtmf2()</slot>
-    <slot>dtmf3()</slot>
-    <slot>dtmf4()</slot>
-    <slot>dtmf5()</slot>
-    <slot>dtmf6()</slot>
-    <slot>dtmf7()</slot>
-    <slot>dtmf8()</slot>
-    <slot>dtmf9()</slot>
-    <slot>dtmf0()</slot>
-    <slot>dtmfStar()</slot>
-    <slot>dtmfPound()</slot>
-    <slot>dtmfA()</slot>
-    <slot>dtmfB()</slot>
-    <slot>dtmfC()</slot>
-    <slot>dtmfD()</slot>
-    <slot>keyPressEvent( QKeyEvent * e )</slot>
-</slots>
-<pixmapinproject/>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
+  </connections>
+</ui>
diff --git a/src/gui/twinkle.pro b/src/gui/twinkle.pro
index 01624c3..ba9b51b 100644
--- a/src/gui/twinkle.pro
+++ b/src/gui/twinkle.pro
@@ -10,6 +10,7 @@ DEFINES	+= QT_NO_STL
 INCLUDEPATH	+= ..
 
 HEADERS	+= gui.h \
+	dtmfform.h \
 	historylistview.h \
 	freedesksystray.h \
 	twinklesystray.h \
@@ -26,6 +27,7 @@ HEADERS	+= gui.h \
 
 SOURCES	+= main.cpp \
 	gui.cpp \
+	dtmfform.cpp \
 	historylistview.cpp \
 	freedesksystray.cpp \
 	twinklesystray.cpp \
@@ -36,13 +38,14 @@ SOURCES	+= main.cpp \
 	buddylistview.cpp \
 	twinkleapplication.cpp
 
+FORMS	= dtmfform.ui
+
 #The following line was changed from FORMS to FORMS3 by qt3to4
 FORMS3	= mphoneform.ui \
 	inviteform.ui \
 	deregisterform.ui \
 	redirectform.ui \
 	termcapform.ui \
-	dtmfform.ui \
 	selectnicform.ui \
 	srvredirectform.ui \
 	authenticationform.ui \