Renamed controls in qtconfig's MainWindow

All the controls are ensured to be named according to a Qt Coding Style.
The code is much more readable now. Also, the html code inserts and
tab stops in UI was fixed.

Merge-request: 2286
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>

2 files changed, 357 insertions, 346 deletions

diff --git a/tools/qtconfig/mainwindow.cpp b/tools/qtconfig/mainwindow.cpp
index 7301bab..266d9e4 100644
--- a/tools/qtconfig/mainwindow.cpp
+++ b/tools/qtconfig/mainwindow.cpp
@@ -188,70 +188,70 @@ MainWindow::MainWindow()
     statusBar();
 
     // signals and slots connections
-    connect(ui->fontpathlineedit, SIGNAL(returnPressed()), SLOT(addFontpath()));
-    connect(ui->PushButton15, SIGNAL(clicked()), SLOT(addFontpath()));
-    connect(ui->PushButton1, SIGNAL(clicked()), SLOT(addSubstitute()));
-    connect(ui->PushButton14, SIGNAL(clicked()), SLOT(browseFontpath()));
-    connect(ui->stylecombo, SIGNAL(activated(int)), SLOT(buildFont()));
-    connect(ui->psizecombo, SIGNAL(activated(int)), SLOT(buildFont()));
-    connect(ui->PushButton12, SIGNAL(clicked()), SLOT(downFontpath()));
-    connect(ui->PushButton3, SIGNAL(clicked()), SLOT(downSubstitute()));
-    connect(ui->familycombo, SIGNAL(activated(QString)), SLOT(familySelected(QString)));
+    connect(ui->fontPathLineEdit, SIGNAL(returnPressed()), SLOT(addFontpath()));
+    connect(ui->addFontPathButton, SIGNAL(clicked()), SLOT(addFontpath()));
+    connect(ui->addSubstitutionButton, SIGNAL(clicked()), SLOT(addSubstitute()));
+    connect(ui->browseFontPathButton, SIGNAL(clicked()), SLOT(browseFontpath()));
+    connect(ui->fontStyleCombo, SIGNAL(activated(int)), SLOT(buildFont()));
+    connect(ui->pointSizeCombo, SIGNAL(activated(int)), SLOT(buildFont()));
+    connect(ui->downFontpathButton, SIGNAL(clicked()), SLOT(downFontpath()));
+    connect(ui->downSubstitutionButton, SIGNAL(clicked()), SLOT(downSubstitute()));
+    connect(ui->fontFamilyCombo, SIGNAL(activated(QString)), SLOT(familySelected(QString)));
     connect(ui->fileExitAction, SIGNAL(activated()), SLOT(fileExit()));
     connect(ui->fileSaveAction, SIGNAL(activated()), SLOT(fileSave()));
     connect(ui->helpAboutAction, SIGNAL(activated()), SLOT(helpAbout()));
     connect(ui->helpAboutQtAction, SIGNAL(activated()), SLOT(helpAboutQt()));
-    connect(ui->TabWidget3, SIGNAL(currentChanged(QWidget*)), SLOT(pageChanged(QWidget*)));
+    connect(ui->mainTabWidget, SIGNAL(currentChanged(QWidget*)), SLOT(pageChanged(QWidget*)));
     connect(ui->paletteCombo, SIGNAL(activated(int)), SLOT(paletteSelected(int)));
-    connect(ui->PushButton13, SIGNAL(clicked()), SLOT(removeFontpath()));
-    connect(ui->PushButton4, SIGNAL(clicked()), SLOT(removeSubstitute()));
-    connect(ui->toolboxeffect, SIGNAL(activated(int)), SLOT(somethingModified()));
-    connect(ui->dcispin, SIGNAL(valueChanged(int)), SLOT(somethingModified()));
-    connect(ui->cfispin, SIGNAL(valueChanged(int)), SLOT(somethingModified()));
-    connect(ui->wslspin, SIGNAL(valueChanged(int)), SLOT(somethingModified()));
-    connect(ui->menueffect, SIGNAL(activated(int)), SLOT(somethingModified()));
-    connect(ui->comboeffect, SIGNAL(activated(int)), SLOT(somethingModified()));
+    connect(ui->removeFontpathButton, SIGNAL(clicked()), SLOT(removeFontpath()));
+    connect(ui->removeSubstitutionButton, SIGNAL(clicked()), SLOT(removeSubstitute()));
+    connect(ui->toolBoxEffectCombo, SIGNAL(activated(int)), SLOT(somethingModified()));
+    connect(ui->doubleClickIntervalSpinBox, SIGNAL(valueChanged(int)), SLOT(somethingModified()));
+    connect(ui->cursorFlashTimeSpinBox, SIGNAL(valueChanged(int)), SLOT(somethingModified()));
+    connect(ui->wheelScrollLinesSpinBox, SIGNAL(valueChanged(int)), SLOT(somethingModified()));
+    connect(ui->menuEffectCombo, SIGNAL(activated(int)), SLOT(somethingModified()));
+    connect(ui->comboEffectCombo, SIGNAL(activated(int)), SLOT(somethingModified()));
     connect(ui->audiosinkCombo, SIGNAL(activated(int)), SLOT(somethingModified()));
     connect(ui->videomodeCombo, SIGNAL(activated(int)), SLOT(somethingModified()));
-    connect(ui->tooltipeffect, SIGNAL(activated(int)), SLOT(somethingModified()));
-    connect(ui->strutwidth, SIGNAL(valueChanged(int)), SLOT(somethingModified()));
-    connect(ui->strutheight, SIGNAL(valueChanged(int)), SLOT(somethingModified()));
-    connect(ui->effectcheckbox, SIGNAL(toggled(bool)), SLOT(somethingModified()));
-    connect(ui->resolvelinks, SIGNAL(toggled(bool)), SLOT(somethingModified()));
-    connect(ui->fontembeddingcheckbox, SIGNAL(clicked()), SLOT(somethingModified()));
-    connect(ui->rtlExtensions, SIGNAL(toggled(bool)), SLOT(somethingModified()));
-    connect(ui->inputStyle, SIGNAL(activated(int)), SLOT(somethingModified()));
-    connect(ui->inputMethod, SIGNAL(activated(int)), SLOT(somethingModified()));
-    connect(ui->gstylecombo, SIGNAL(activated(QString)), SLOT(styleSelected(QString)));
-    connect(ui->familysubcombo, SIGNAL(activated(QString)), SLOT(substituteSelected(QString)));
-    connect(ui->btnAdvanced, SIGNAL(clicked()), SLOT(tunePalette()));
-    connect(ui->PushButton11, SIGNAL(clicked()), SLOT(upFontpath()));
-    connect(ui->PushButton2, SIGNAL(clicked()), SLOT(upSubstitute()));
+    connect(ui->toolTipEffectCombo, SIGNAL(activated(int)), SLOT(somethingModified()));
+    connect(ui->strutWidthSpinBox, SIGNAL(valueChanged(int)), SLOT(somethingModified()));
+    connect(ui->strutHeightSpinBox, SIGNAL(valueChanged(int)), SLOT(somethingModified()));
+    connect(ui->effectsCheckBox, SIGNAL(toggled(bool)), SLOT(somethingModified()));
+    connect(ui->resolveLinksCheckBox, SIGNAL(toggled(bool)), SLOT(somethingModified()));
+    connect(ui->fontEmbeddingCheckBox, SIGNAL(clicked()), SLOT(somethingModified()));
+    connect(ui->rtlExtensionsCheckBox, SIGNAL(toggled(bool)), SLOT(somethingModified()));
+    connect(ui->inputStyleCombo, SIGNAL(activated(int)), SLOT(somethingModified()));
+    connect(ui->inputMethodCombo, SIGNAL(activated(int)), SLOT(somethingModified()));
+    connect(ui->guiStyleCombo, SIGNAL(activated(QString)), SLOT(styleSelected(QString)));
+    connect(ui->familySubstitutionCombo, SIGNAL(activated(QString)), SLOT(substituteSelected(QString)));
+    connect(ui->tunePaletteButton, SIGNAL(clicked()), SLOT(tunePalette()));
+    connect(ui->upFontpathButton, SIGNAL(clicked()), SLOT(upFontpath()));
+    connect(ui->upSubstitutionButton, SIGNAL(clicked()), SLOT(upSubstitute()));
 
     modified = true;
     desktopThemeName = tr("Desktop Settings (Default)");
     QStringList gstyles = QStyleFactory::keys();
     gstyles.sort();
-    ui->gstylecombo->addItem(desktopThemeName);
-    ui->gstylecombo->setItemData(ui->gstylecombo->findText(desktopThemeName),
-                                 tr("Choose style and palette based on your desktop settings."),
-                                 Qt::ToolTipRole);
-    ui->gstylecombo->addItems(gstyles);
+    ui->guiStyleCombo->addItem(desktopThemeName);
+    ui->guiStyleCombo->setItemData(ui->guiStyleCombo->findText(desktopThemeName),
+                                   tr("Choose style and palette based on your desktop settings."),
+                                   Qt::ToolTipRole);
+    ui->guiStyleCombo->addItems(gstyles);
 
     QSettings settings(QLatin1String("Trolltech"));
     settings.beginGroup(QLatin1String("Qt"));
 
     QString currentstyle = settings.value(QLatin1String("style")).toString();
     if (currentstyle.isEmpty()) {
-        ui->gstylecombo->setCurrentIndex(ui->gstylecombo->findText(desktopThemeName));
+        ui->guiStyleCombo->setCurrentIndex(ui->guiStyleCombo->findText(desktopThemeName));
         currentstyle = QApplication::style()->objectName();
     } else {
-        int index = ui->gstylecombo->findText(currentstyle, Qt::MatchFixedString);
+        int index = ui->guiStyleCombo->findText(currentstyle, Qt::MatchFixedString);
         if (index != -1) {
-            ui->gstylecombo->setCurrentIndex(index);
+            ui->guiStyleCombo->setCurrentIndex(index);
         } else { // we give up
-            ui->gstylecombo->addItem(tr("Unknown"));
-            ui->gstylecombo->setCurrentIndex(ui->gstylecombo->count() - 1);
+            ui->guiStyleCombo->addItem(tr("Unknown"));
+            ui->guiStyleCombo->setCurrentIndex(ui->guiStyleCombo->count() - 1);
         }
     }
     ui->buttonMainColor->setColor(palette().color(QPalette::Active, QPalette::Button));
@@ -262,11 +262,11 @@ MainWindow::MainWindow()
     if (X11->desktopEnvironment == DE_KDE)
         ui->colorConfig->hide();
     else
-        ui->labelKDENote->hide();
+        ui->kdeNoteLabel->hide();
 
     QFontDatabase db;
     QStringList families = db.families();
-    ui->familycombo->addItems(families);
+    ui->fontFamilyCombo->addItems(families);
 
     QStringList fs = families;
     QStringList fs2 = QFont::substitutions();
@@ -277,41 +277,41 @@ MainWindow::MainWindow()
         fsit++;
     }
     fs.sort();
-    ui->familysubcombo->addItems(fs);
+    ui->familySubstitutionCombo->addItems(fs);
 
-    ui->choosesubcombo->addItems(families);
+    ui->chooseSubstitutionCombo->addItems(families);
     QList<int> sizes = db.standardSizes();
     foreach(int i, sizes)
-        ui->psizecombo->addItem(QString::number(i));
+        ui->pointSizeCombo->addItem(QString::number(i));
 
-    ui->dcispin->setValue(QApplication::doubleClickInterval());
-    ui->cfispin->setValue(QApplication::cursorFlashTime());
-    ui->wslspin->setValue(QApplication::wheelScrollLines());
+    ui->doubleClickIntervalSpinBox->setValue(QApplication::doubleClickInterval());
+    ui->cursorFlashTimeSpinBox->setValue(QApplication::cursorFlashTime());
+    ui->wheelScrollLinesSpinBox->setValue(QApplication::wheelScrollLines());
     // #############
-//    resolvelinks->setChecked(qt_resolve_symlinks);
+//    resolveLinksCheckBox->setChecked(qt_resolve_symlinks);
 
-    ui->effectcheckbox->setChecked(QApplication::isEffectEnabled(Qt::UI_General));
-    ui->effectbase->setEnabled(ui->effectcheckbox->isChecked());
+    ui->effectsCheckBox->setChecked(QApplication::isEffectEnabled(Qt::UI_General));
+    ui->effectsFrame->setEnabled(ui->effectsCheckBox->isChecked());
 
     if (QApplication::isEffectEnabled(Qt::UI_FadeMenu))
-        ui->menueffect->setCurrentIndex(2);
+        ui->menuEffectCombo->setCurrentIndex(2);
     else if (QApplication::isEffectEnabled(Qt::UI_AnimateMenu))
-        ui->menueffect->setCurrentIndex(1);
+        ui->menuEffectCombo->setCurrentIndex(1);
 
     if (QApplication::isEffectEnabled(Qt::UI_AnimateCombo))
-        ui->comboeffect->setCurrentIndex(1);
+        ui->comboEffectCombo->setCurrentIndex(1);
 
     if (QApplication::isEffectEnabled(Qt::UI_FadeTooltip))
-        ui->tooltipeffect->setCurrentIndex(2);
+        ui->toolTipEffectCombo->setCurrentIndex(2);
     else if (QApplication::isEffectEnabled(Qt::UI_AnimateTooltip))
-        ui->tooltipeffect->setCurrentIndex(1);
+        ui->toolTipEffectCombo->setCurrentIndex(1);
 
     if (QApplication::isEffectEnabled(Qt::UI_AnimateToolBox))
-        ui->toolboxeffect->setCurrentIndex(1);
+        ui->toolBoxEffectCombo->setCurrentIndex(1);
 
     QSize globalStrut = QApplication::globalStrut();
-    ui->strutwidth->setValue(globalStrut.width());
-    ui->strutheight->setValue(globalStrut.height());
+    ui->strutWidthSpinBox->setValue(globalStrut.width());
+    ui->strutHeightSpinBox->setValue(globalStrut.height());
 
     // find the default family
     QStringList::Iterator sit = families.begin();
@@ -330,10 +330,10 @@ MainWindow::MainWindow()
     if (i == -1) // no clue about the current font
         i = 0;
 
-    ui->familycombo->setCurrentIndex(i);
+    ui->fontFamilyCombo->setCurrentIndex(i);
 
-    QStringList styles = db.styles(ui->familycombo->currentText());
-    ui->stylecombo->addItems(styles);
+    QStringList styles = db.styles(ui->fontFamilyCombo->currentText());
+    ui->fontStyleCombo->addItems(styles);
 
     QString stylestring = db.styleString(QApplication::font());
     sit = styles.begin();
@@ -352,64 +352,64 @@ MainWindow::MainWindow()
         i = possible;
     if (i == -1) // no clue about the current font
         i = 0;
-    ui->stylecombo->setCurrentIndex(i);
+    ui->fontStyleCombo->setCurrentIndex(i);
 
     i = 0;
-    for (int psize = QApplication::font().pointSize(); i < ui->psizecombo->count(); ++i) {
-        const int sz = ui->psizecombo->itemText(i).toInt();
+    for (int psize = QApplication::font().pointSize(); i < ui->pointSizeCombo->count(); ++i) {
+        const int sz = ui->pointSizeCombo->itemText(i).toInt();
         if (sz == psize) {
-            ui->psizecombo->setCurrentIndex(i);
+            ui->pointSizeCombo->setCurrentIndex(i);
             break;
         } else if(sz > psize) {
-            ui->psizecombo->insertItem(i, QString::number(psize));
-            ui->psizecombo->setCurrentIndex(i);
+            ui->pointSizeCombo->insertItem(i, QString::number(psize));
+            ui->pointSizeCombo->setCurrentIndex(i);
             break;
         }
     }
 
-    QStringList subs = QFont::substitutes(ui->familysubcombo->currentText());
-    ui->sublistbox->clear();
-    ui->sublistbox->insertItems(0, subs);
+    QStringList subs = QFont::substitutes(ui->familySubstitutionCombo->currentText());
+    ui->substitutionsListBox->clear();
+    ui->substitutionsListBox->insertItems(0, subs);
 
-    ui->rtlExtensions->setChecked(settings.value(QLatin1String("useRtlExtensions"), false)
-                                  .toBool());
+    ui->rtlExtensionsCheckBox->setChecked(settings.value(QLatin1String("useRtlExtensions"), false)
+                                          .toBool());
 
 #ifdef Q_WS_X11
     QString settingsInputStyle = settings.value(QLatin1String("XIMInputStyle")).toString();
     if (!settingsInputStyle.isEmpty())
-      ui->inputStyle->setCurrentIndex(ui->inputStyle->findText(settingsInputStyle));
+      ui->inputStyleCombo->setCurrentIndex(ui->inputStyleCombo->findText(settingsInputStyle));
 #else
-    ui->inputStyle->hide();
-    ui->inputStyleLabel->hide();
+    ui->inputStyleCombo->hide();
+    ui->inputStyleComboLabel->hide();
 #endif
 
 #if defined(Q_WS_X11) && !defined(QT_NO_XIM)
-    QStringList inputMethods = QInputContextFactory::keys();
-    int inputMethodIndex = -1;
+    QStringList inputMethodCombo = QInputContextFactory::keys();
+    int inputMethodComboIndex = -1;
     QString defaultInputMethod = settings.value(QLatin1String("DefaultInputMethod"), QLatin1String("xim")).toString();
-    for (int i = inputMethods.size()-1; i >= 0; --i) {
-        const QString &im = inputMethods.at(i);
+    for (int i = inputMethodCombo.size()-1; i >= 0; --i) {
+        const QString &im = inputMethodCombo.at(i);
         if (im.contains(QLatin1String("imsw"))) {
-            inputMethods.removeAt(i);
-            if (inputMethodIndex > i)
-                --inputMethodIndex;
+            inputMethodCombo.removeAt(i);
+            if (inputMethodComboIndex > i)
+                --inputMethodComboIndex;
         } else if (im == defaultInputMethod) {
-            inputMethodIndex = i;
+            inputMethodComboIndex = i;
         }
     }
-    if (inputMethodIndex == -1 && !inputMethods.isEmpty())
-        inputMethodIndex = 0;
-    ui->inputMethod->addItems(inputMethods);
-    ui->inputMethod->setCurrentIndex(inputMethodIndex);
+    if (inputMethodComboIndex == -1 && !inputMethodCombo.isEmpty())
+        inputMethodComboIndex = 0;
+    ui->inputMethodCombo->addItems(inputMethodCombo);
+    ui->inputMethodCombo->setCurrentIndex(inputMethodComboIndex);
 #else
-    ui->inputMethod->hide();
-    ui->inputMethodLabel->hide();
+    ui->inputMethodCombo->hide();
+    ui->inputMethodComboLabel->hide();
 #endif
 
-    ui->fontembeddingcheckbox->setChecked(settings.value(QLatin1String("embedFonts"), true)
+    ui->fontEmbeddingCheckBox->setChecked(settings.value(QLatin1String("embedFonts"), true)
                                           .toBool());
     fontpaths = settings.value(QLatin1String("fontPath")).toStringList();
-    ui->fontpathlistbox->insertItems(0, fontpaths);
+    ui->fontpathListBox->insertItems(0, fontpaths);
 
     ui->audiosinkCombo->addItem(tr("Auto (default)"), QLatin1String("Auto"));
     ui->audiosinkCombo->setItemData(ui->audiosinkCombo->findText(tr("Auto (default)")),
@@ -424,7 +424,7 @@ MainWindow::MainWindow()
 #ifndef QT_NO_GSTREAMER
     if (gst_init_check(0, 0, 0)) {
         gchar *versionString = gst_version_string();
-        ui->gstversionLabel->setText(QLatin1String(versionString));
+        ui->gstVersionLabel->setText(QLatin1String(versionString));
         g_free(versionString);
         GList *factoryList = gst_registry_get_feature_list(gst_registry_get_default(),
                                                            GST_TYPE_ELEMENT_FACTORY);
@@ -451,7 +451,7 @@ MainWindow::MainWindow()
         g_list_free(factoryList);
     }
 #else
-    ui->tab4->setEnabled(false);
+    ui->phononTab->setEnabled(false);
     ui->phononLabel->setText(tr("Phonon GStreamer backend not available."));
 #endif
 
@@ -484,7 +484,7 @@ MainWindow::MainWindow()
 
     settings.endGroup(); // Qt
 
-    ui->helpview->setText(tr(appearance_text));
+    ui->helpView->setText(tr(appearance_text));
 
     setModified(false);
     updateStyleLayout();
@@ -512,12 +512,12 @@ void MainWindow::fileSave()
         QSettings settings(QLatin1String("Trolltech"));
         settings.beginGroup(QLatin1String("Qt"));
         QFontDatabase db;
-        QFont font = db.font(ui->familycombo->currentText(),
-                             ui->stylecombo->currentText(),
-                             ui->psizecombo->currentText().toInt());
+        QFont font = db.font(ui->fontFamilyCombo->currentText(),
+                             ui->fontStyleCombo->currentText(),
+                             ui->pointSizeCombo->currentText().toInt());
 
         QStringList actcg, inactcg, discg;
-        bool overrideDesktopSettings = (ui->gstylecombo->currentText() != desktopThemeName);
+        bool overrideDesktopSettings = (ui->guiStyleCombo->currentText() != desktopThemeName);
         if (overrideDesktopSettings) {
             int i;
             for (i = 0; i < QPalette::NColorRoles; i++)
@@ -537,24 +537,24 @@ void MainWindow::fileSave()
         settings.setValue(QLatin1String("Palette/disabled"), discg);
 
         settings.setValue(QLatin1String("fontPath"), fontpaths);
-        settings.setValue(QLatin1String("embedFonts"), ui->fontembeddingcheckbox->isChecked());
+        settings.setValue(QLatin1String("embedFonts"), ui->fontEmbeddingCheckBox->isChecked());
         settings.setValue(QLatin1String("style"),
-                          overrideDesktopSettings ? ui->gstylecombo->currentText() : QString());
+                          overrideDesktopSettings ? ui->guiStyleCombo->currentText() : QString());
 
-        settings.setValue(QLatin1String("doubleClickInterval"), ui->dcispin->value());
+        settings.setValue(QLatin1String("doubleClickInterval"), ui->doubleClickIntervalSpinBox->value());
         settings.setValue(QLatin1String("cursorFlashTime"),
-                          ui->cfispin->value() == 9 ? 0 : ui->cfispin->value());
-        settings.setValue(QLatin1String("wheelScrollLines"), ui->wslspin->value());
-        settings.setValue(QLatin1String("resolveSymlinks"), ui->resolvelinks->isChecked());
+                          ui->cursorFlashTimeSpinBox->value() == 9 ? 0 : ui->cursorFlashTimeSpinBox->value());
+        settings.setValue(QLatin1String("wheelScrollLines"), ui->wheelScrollLinesSpinBox->value());
+        settings.setValue(QLatin1String("resolveSymlinks"), ui->resolveLinksCheckBox->isChecked());
 
-        QSize strut(ui->strutwidth->value(), ui->strutheight->value());
+        QSize strut(ui->strutWidthSpinBox->value(), ui->strutHeightSpinBox->value());
         settings.setValue(QLatin1String("globalStrut/width"), strut.width());
         settings.setValue(QLatin1String("globalStrut/height"), strut.height());
 
-        settings.setValue(QLatin1String("useRtlExtensions"), ui->rtlExtensions->isChecked());
+        settings.setValue(QLatin1String("useRtlExtensions"), ui->rtlExtensionsCheckBox->isChecked());
 
 #ifdef Q_WS_X11
-        QString style = ui->inputStyle->currentText();
+        QString style = ui->inputStyleCombo->currentText();
         QString str = QLatin1String("On The Spot");
         if (style == tr("Over The Spot"))
             str = QLatin1String("Over The Spot");
@@ -565,7 +565,7 @@ void MainWindow::fileSave()
         settings.setValue(QLatin1String("XIMInputStyle"), str);
 #endif
 #if defined(Q_WS_X11) && !defined(QT_NO_XIM)
-        settings.setValue(QLatin1String("DefaultInputMethod"), ui->inputMethod->currentText());
+        settings.setValue(QLatin1String("DefaultInputMethod"), ui->inputMethodCombo->currentText());
 #endif
 
         QString audioSink = settings.value(QLatin1String("audiosink"), QLatin1String("Auto")).toString();
@@ -576,24 +576,24 @@ void MainWindow::fileSave()
                           ui->videomodeCombo->itemData(ui->videomodeCombo->currentIndex()));
 
         QStringList effects;
-        if (ui->effectcheckbox->isChecked()) {
+        if (ui->effectsCheckBox->isChecked()) {
             effects << QLatin1String("general");
 
-            switch (ui->menueffect->currentIndex()) {
+            switch (ui->menuEffectCombo->currentIndex()) {
             case 1: effects << QLatin1String("animatemenu"); break;
             case 2: effects << QLatin1String("fademenu"); break;
             }
 
-            switch (ui->comboeffect->currentIndex()) {
+            switch (ui->comboEffectCombo->currentIndex()) {
             case 1: effects << QLatin1String("animatecombo"); break;
             }
 
-            switch (ui->tooltipeffect->currentIndex()) {
+            switch (ui->toolTipEffectCombo->currentIndex()) {
             case 1: effects << QLatin1String("animatetooltip"); break;
             case 2: effects << QLatin1String("fadetooltip"); break;
             }
 
-            switch (ui->toolboxeffect->currentIndex()) {
+            switch (ui->toolBoxEffectCombo->currentIndex()) {
             case 1: effects << QLatin1String("animatetoolbox"); break;
             }
         } else
@@ -688,10 +688,10 @@ void MainWindow::paletteSelected(int)
 
 void MainWindow::updateStyleLayout()
 {
-    QString currentStyle = ui->gstylecombo->currentText();
+    QString currentStyle = ui->guiStyleCombo->currentText();
     bool autoStyle = (currentStyle == desktopThemeName);
     ui->previewFrame->setPreviewVisible(!autoStyle);
-    ui->groupAutoPalette->setEnabled(currentStyle.toLower() != QLatin1String("gtk") && !autoStyle);
+    ui->buildPaletteGroup->setEnabled(currentStyle.toLower() != QLatin1String("gtk") && !autoStyle);
 }
 
 void MainWindow::styleSelected(const QString &stylename)
@@ -715,170 +715,170 @@ void MainWindow::familySelected(const QString &family)
 {
     QFontDatabase db;
     QStringList styles = db.styles(family);
-    ui->stylecombo->clear();
-    ui->stylecombo->addItems(styles);
-    ui->familysubcombo->addItem(family);
+    ui->fontStyleCombo->clear();
+    ui->fontStyleCombo->addItems(styles);
+    ui->familySubstitutionCombo->addItem(family);
     buildFont();
 }
 
 void MainWindow::buildFont()
 {
     QFontDatabase db;
-    QFont font = db.font(ui->familycombo->currentText(),
-                         ui->stylecombo->currentText(),
-                         ui->psizecombo->currentText().toInt());
-    ui->samplelineedit->setFont(font);
+    QFont font = db.font(ui->fontFamilyCombo->currentText(),
+                         ui->fontStyleCombo->currentText(),
+                         ui->pointSizeCombo->currentText().toInt());
+    ui->sampleLineEdit->setFont(font);
     setModified(true);
 }
 
 void MainWindow::substituteSelected(const QString &family)
 {
     QStringList subs = QFont::substitutes(family);
-    ui->sublistbox->clear();
-    ui->sublistbox->insertItems(0, subs);
+    ui->substitutionsListBox->clear();
+    ui->substitutionsListBox->insertItems(0, subs);
 }
 
 void MainWindow::removeSubstitute()
 {
-    if (!ui->sublistbox->currentItem())
+    if (!ui->substitutionsListBox->currentItem())
         return;
 
-    int row = ui->sublistbox->currentRow();
-    QStringList subs = QFont::substitutes(ui->familysubcombo->currentText());
-    subs.removeAt(ui->sublistbox->currentRow());
-    ui->sublistbox->clear();
-    ui->sublistbox->insertItems(0, subs);
-    if (row > ui->sublistbox->count())
-        row = ui->sublistbox->count() - 1;
-    ui->sublistbox->setCurrentRow(row);
-    QFont::removeSubstitution(ui->familysubcombo->currentText());
-    QFont::insertSubstitutions(ui->familysubcombo->currentText(), subs);
+    int row = ui->substitutionsListBox->currentRow();
+    QStringList subs = QFont::substitutes(ui->familySubstitutionCombo->currentText());
+    subs.removeAt(ui->substitutionsListBox->currentRow());
+    ui->substitutionsListBox->clear();
+    ui->substitutionsListBox->insertItems(0, subs);
+    if (row > ui->substitutionsListBox->count())
+        row = ui->substitutionsListBox->count() - 1;
+    ui->substitutionsListBox->setCurrentRow(row);
+    QFont::removeSubstitution(ui->familySubstitutionCombo->currentText());
+    QFont::insertSubstitutions(ui->familySubstitutionCombo->currentText(), subs);
     setModified(true);
 }
 
 void MainWindow::addSubstitute()
 {
-    if (!ui->sublistbox->currentItem()) {
-        QFont::insertSubstitution(ui->familysubcombo->currentText(),
-                                  ui->choosesubcombo->currentText());
-        QStringList subs = QFont::substitutes(ui->familysubcombo->currentText());
-        ui->sublistbox->clear();
-        ui->sublistbox->insertItems(0, subs);
+    if (!ui->substitutionsListBox->currentItem()) {
+        QFont::insertSubstitution(ui->familySubstitutionCombo->currentText(),
+                                  ui->chooseSubstitutionCombo->currentText());
+        QStringList subs = QFont::substitutes(ui->familySubstitutionCombo->currentText());
+        ui->substitutionsListBox->clear();
+        ui->substitutionsListBox->insertItems(0, subs);
         setModified(true);
         return;
     }
 
-    int row = ui->sublistbox->currentRow();
-    QFont::insertSubstitution(ui->familysubcombo->currentText(), ui->choosesubcombo->currentText());
-    QStringList subs = QFont::substitutes(ui->familysubcombo->currentText());
-    ui->sublistbox->clear();
-    ui->sublistbox->insertItems(0, subs);
-    ui->sublistbox->setCurrentRow(row);
+    int row = ui->substitutionsListBox->currentRow();
+    QFont::insertSubstitution(ui->familySubstitutionCombo->currentText(), ui->chooseSubstitutionCombo->currentText());
+    QStringList subs = QFont::substitutes(ui->familySubstitutionCombo->currentText());
+    ui->substitutionsListBox->clear();
+    ui->substitutionsListBox->insertItems(0, subs);
+    ui->substitutionsListBox->setCurrentRow(row);
     setModified(true);
 }
 
 void MainWindow::downSubstitute()
 {
-    if (!ui->sublistbox->currentItem() || ui->sublistbox->currentRow() >= ui->sublistbox->count())
+    if (!ui->substitutionsListBox->currentItem() || ui->substitutionsListBox->currentRow() >= ui->substitutionsListBox->count())
         return;
 
-    int row = ui->sublistbox->currentRow();
-    QStringList subs = QFont::substitutes(ui->familysubcombo->currentText());
+    int row = ui->substitutionsListBox->currentRow();
+    QStringList subs = QFont::substitutes(ui->familySubstitutionCombo->currentText());
     QString fam = subs.at(row);
     subs.removeAt(row);
     subs.insert(row + 1, fam);
-    ui->sublistbox->clear();
-    ui->sublistbox->insertItems(0, subs);
-    ui->sublistbox->setCurrentRow(row + 1);
-    QFont::removeSubstitution(ui->familysubcombo->currentText());
-    QFont::insertSubstitutions(ui->familysubcombo->currentText(), subs);
+    ui->substitutionsListBox->clear();
+    ui->substitutionsListBox->insertItems(0, subs);
+    ui->substitutionsListBox->setCurrentRow(row + 1);
+    QFont::removeSubstitution(ui->familySubstitutionCombo->currentText());
+    QFont::insertSubstitutions(ui->familySubstitutionCombo->currentText(), subs);
     setModified(true);
 }
 
 void MainWindow::upSubstitute()
 {
-    if (!ui->sublistbox->currentItem() || ui->sublistbox->currentRow() < 1)
+    if (!ui->substitutionsListBox->currentItem() || ui->substitutionsListBox->currentRow() < 1)
         return;
 
-    int row = ui->sublistbox->currentRow();
-    QStringList subs = QFont::substitutes(ui->familysubcombo->currentText());
+    int row = ui->substitutionsListBox->currentRow();
+    QStringList subs = QFont::substitutes(ui->familySubstitutionCombo->currentText());
     QString fam = subs.at(row);
     subs.removeAt(row);
     subs.insert(row-1, fam);
-    ui->sublistbox->clear();
-    ui->sublistbox->insertItems(0, subs);
-    ui->sublistbox->setCurrentRow(row - 1);
-    QFont::removeSubstitution(ui->familysubcombo->currentText());
-    QFont::insertSubstitutions(ui->familysubcombo->currentText(), subs);
+    ui->substitutionsListBox->clear();
+    ui->substitutionsListBox->insertItems(0, subs);
+    ui->substitutionsListBox->setCurrentRow(row - 1);
+    QFont::removeSubstitution(ui->familySubstitutionCombo->currentText());
+    QFont::insertSubstitutions(ui->familySubstitutionCombo->currentText(), subs);
     setModified(true);
 }
 
 void MainWindow::removeFontpath()
 {
-    if (!ui->fontpathlistbox->currentItem())
+    if (!ui->fontpathListBox->currentItem())
         return;
 
-    int row = ui->fontpathlistbox->currentRow();
+    int row = ui->fontpathListBox->currentRow();
     fontpaths.removeAt(row);
-    ui->fontpathlistbox->clear();
-    ui->fontpathlistbox->insertItems(0, fontpaths);
-    if (row > ui->fontpathlistbox->count())
-        row = ui->fontpathlistbox->count() - 1;
-    ui->fontpathlistbox->setCurrentRow(row);
+    ui->fontpathListBox->clear();
+    ui->fontpathListBox->insertItems(0, fontpaths);
+    if (row > ui->fontpathListBox->count())
+        row = ui->fontpathListBox->count() - 1;
+    ui->fontpathListBox->setCurrentRow(row);
     setModified(true);
 }
 
 void MainWindow::addFontpath()
 {
-    if (ui->fontpathlineedit->text().isEmpty())
+    if (ui->fontPathLineEdit->text().isEmpty())
         return;
 
-    if (!ui->fontpathlistbox->currentItem()) {
-        fontpaths.append(ui->fontpathlineedit->text());
-        ui->fontpathlistbox->clear();
-        ui->fontpathlistbox->insertItems(0, fontpaths);
+    if (!ui->fontpathListBox->currentItem()) {
+        fontpaths.append(ui->fontPathLineEdit->text());
+        ui->fontpathListBox->clear();
+        ui->fontpathListBox->insertItems(0, fontpaths);
         setModified(true);
 
         return;
     }
 
-    int row = ui->fontpathlistbox->currentRow();
-    fontpaths.insert(row + 1, ui->fontpathlineedit->text());
-    ui->fontpathlistbox->clear();
-    ui->fontpathlistbox->insertItems(0, fontpaths);
-    ui->fontpathlistbox->setCurrentRow(row);
+    int row = ui->fontpathListBox->currentRow();
+    fontpaths.insert(row + 1, ui->fontPathLineEdit->text());
+    ui->fontpathListBox->clear();
+    ui->fontpathListBox->insertItems(0, fontpaths);
+    ui->fontpathListBox->setCurrentRow(row);
     setModified(true);
 }
 
 void MainWindow::downFontpath()
 {
-    if (!ui->fontpathlistbox->currentItem()
-        || ui->fontpathlistbox->currentRow() >= (ui->fontpathlistbox->count() - 1)) {
+    if (!ui->fontpathListBox->currentItem()
+        || ui->fontpathListBox->currentRow() >= (ui->fontpathListBox->count() - 1)) {
         return;
     }
 
-    int row = ui->fontpathlistbox->currentRow();
+    int row = ui->fontpathListBox->currentRow();
     QString fam = fontpaths.at(row);
     fontpaths.removeAt(row);
     fontpaths.insert(row + 1, fam);
-    ui->fontpathlistbox->clear();
-    ui->fontpathlistbox->insertItems(0, fontpaths);
-    ui->fontpathlistbox->setCurrentRow(row + 1);
+    ui->fontpathListBox->clear();
+    ui->fontpathListBox->insertItems(0, fontpaths);
+    ui->fontpathListBox->setCurrentRow(row + 1);
     setModified(true);
 }
 
 void MainWindow::upFontpath()
 {
-    if (!ui->fontpathlistbox->currentItem() || ui->fontpathlistbox->currentRow() < 1)
+    if (!ui->fontpathListBox->currentItem() || ui->fontpathListBox->currentRow() < 1)
         return;
 
-    int row = ui->fontpathlistbox->currentRow();
+    int row = ui->fontpathListBox->currentRow();
     QString fam = fontpaths.at(row);
     fontpaths.removeAt(row);
     fontpaths.insert(row - 1, fam);
-    ui->fontpathlistbox->clear();
-    ui->fontpathlistbox->insertItems(0, fontpaths);
-    ui->fontpathlistbox->setCurrentRow(row - 1);
+    ui->fontpathListBox->clear();
+    ui->fontpathListBox->insertItems(0, fontpaths);
+    ui->fontpathListBox->setCurrentRow(row - 1);
     setModified(true);
 }
 
@@ -888,7 +888,7 @@ void MainWindow::browseFontpath()
     if (dirname.isNull())
         return;
 
-   ui->fontpathlineedit->setText(dirname);
+   ui->fontPathLineEdit->setText(dirname);
 }
 
 void MainWindow::somethingModified()
@@ -915,16 +915,16 @@ void MainWindow::helpAboutQt()
 
 void MainWindow::pageChanged(QWidget *page)
 {
-    if (page == ui->tab)
-        ui->helpview->setText(tr(interface_text));
-    else if (page == ui->tab1)
-        ui->helpview->setText(tr(appearance_text));
-    else if (page == ui->tab2)
-        ui->helpview->setText(tr(font_text));
-    else if (page == ui->tab3)
-        ui->helpview->setText(tr(printer_text));
-    else if (page == ui->tab4)
-        ui->helpview->setText(tr(phonon_text));
+    if (page == ui->interfaceTab)
+        ui->helpView->setText(tr(interface_text));
+    else if (page == ui->appearanceTab)
+        ui->helpView->setText(tr(appearance_text));
+    else if (page == ui->fontsTab)
+        ui->helpView->setText(tr(font_text));
+    else if (page == ui->printerTab)
+        ui->helpView->setText(tr(printer_text));
+    else if (page == ui->phononTab)
+        ui->helpView->setText(tr(phonon_text));
 }
 
 void MainWindow::closeEvent(QCloseEvent *e)
diff --git a/tools/qtconfig/mainwindow.ui b/tools/qtconfig/mainwindow.ui
index 117a777..2ca9101 100644
--- a/tools/qtconfig/mainwindow.ui
+++ b/tools/qtconfig/mainwindow.ui
@@ -59,7 +59,7 @@
      <number>8</number>
     </property>
     <item row="0" column="0">
-     <widget class="QTextEdit" name="helpview">
+     <widget class="QTextEdit" name="helpView">
       <property name="minimumSize">
        <size>
         <width>200</width>
@@ -72,17 +72,17 @@
      </widget>
     </item>
     <item row="0" column="1">
-     <widget class="QTabWidget" name="TabWidget3">
+     <widget class="QTabWidget" name="mainTabWidget">
       <property name="currentIndex">
        <number>0</number>
       </property>
-      <widget class="QWidget" name="tab1">
+      <widget class="QWidget" name="appearanceTab">
        <attribute name="title">
         <string>Appearance</string>
        </attribute>
        <layout class="QGridLayout" name="gridLayout_5">
         <item row="0" column="0">
-         <widget class="QGroupBox" name="GroupBox40">
+         <widget class="QGroupBox" name="guiStyleGroup">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
             <horstretch>0</horstretch>
@@ -106,7 +106,7 @@
             <number>8</number>
            </property>
            <item>
-            <widget class="QLabel" name="gstylebuddy">
+            <widget class="QLabel" name="guiStyleLabel">
              <property name="minimumSize">
               <size>
                <width>0</width>
@@ -117,18 +117,18 @@
               <string>Select GUI &amp;Style:</string>
              </property>
              <property name="buddy">
-              <cstring>gstylecombo</cstring>
+              <cstring>guiStyleCombo</cstring>
              </property>
             </widget>
            </item>
            <item>
-            <widget class="QComboBox" name="gstylecombo"/>
+            <widget class="QComboBox" name="guiStyleCombo"/>
            </item>
           </layout>
          </widget>
         </item>
         <item row="3" column="0">
-         <widget class="QGroupBox" name="groupPreview">
+         <widget class="QGroupBox" name="previewGroup">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
             <horstretch>0</horstretch>
@@ -140,7 +140,7 @@
           </property>
           <layout class="QGridLayout" name="gridLayout_4">
            <item row="0" column="0">
-            <widget class="QLabel" name="TextLabel1">
+            <widget class="QLabel" name="paletteLabel">
              <property name="text">
               <string>Select &amp;Palette:</string>
              </property>
@@ -188,7 +188,7 @@
          </widget>
         </item>
         <item row="1" column="0">
-         <widget class="QGroupBox" name="groupAutoPalette">
+         <widget class="QGroupBox" name="buildPaletteGroup">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
             <horstretch>0</horstretch>
@@ -278,7 +278,7 @@
                </spacer>
               </item>
               <item>
-               <widget class="QPushButton" name="btnAdvanced">
+               <widget class="QPushButton" name="tunePaletteButton">
                 <property name="text">
                  <string>&amp;Tune Palette...</string>
                 </property>
@@ -288,7 +288,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QLabel" name="labelKDENote">
+            <widget class="QLabel" name="kdeNoteLabel">
              <property name="text">
               <string>Please use the KDE Control Center to set the palette.</string>
              </property>
@@ -299,13 +299,13 @@
         </item>
        </layout>
       </widget>
-      <widget class="QWidget" name="tab2">
+      <widget class="QWidget" name="fontsTab">
        <attribute name="title">
         <string>Fonts</string>
        </attribute>
        <layout class="QVBoxLayout">
         <item>
-         <widget class="QGroupBox" name="GroupBox1">
+         <widget class="QGroupBox" name="defaultFontGroup">
           <property name="title">
            <string>Default Font</string>
           </property>
@@ -317,7 +317,7 @@
             <number>4</number>
            </property>
            <item row="1" column="1">
-            <widget class="QComboBox" name="stylecombo">
+            <widget class="QComboBox" name="fontStyleCombo">
              <property name="autoCompletion">
               <bool>true</bool>
              </property>
@@ -327,7 +327,7 @@
             </widget>
            </item>
            <item row="0" column="1">
-            <widget class="QComboBox" name="familycombo">
+            <widget class="QComboBox" name="fontFamilyCombo">
              <property name="autoCompletion">
               <bool>true</bool>
              </property>
@@ -337,7 +337,7 @@
             </widget>
            </item>
            <item row="2" column="1">
-            <widget class="QComboBox" name="psizecombo">
+            <widget class="QComboBox" name="pointSizeCombo">
              <property name="editable">
               <bool>true</bool>
              </property>
@@ -350,37 +350,37 @@
             </widget>
            </item>
            <item row="1" column="0">
-            <widget class="QLabel" name="stylebuddy">
+            <widget class="QLabel" name="fontStyleLabel">
              <property name="text">
               <string>&amp;Style:</string>
              </property>
              <property name="buddy">
-              <cstring>stylecombo</cstring>
+              <cstring>fontStyleCombo</cstring>
              </property>
             </widget>
            </item>
            <item row="2" column="0">
-            <widget class="QLabel" name="psizebuddy">
+            <widget class="QLabel" name="pointSizeLabel">
              <property name="text">
               <string>&amp;Point Size:</string>
              </property>
              <property name="buddy">
-              <cstring>psizecombo</cstring>
+              <cstring>pointSizeCombo</cstring>
              </property>
             </widget>
            </item>
            <item row="0" column="0">
-            <widget class="QLabel" name="familybuddy">
+            <widget class="QLabel" name="fontFamilyLabel">
              <property name="text">
               <string>F&amp;amily:</string>
              </property>
              <property name="buddy">
-              <cstring>familycombo</cstring>
+              <cstring>fontFamilyCombo</cstring>
              </property>
             </widget>
            </item>
            <item row="3" column="0" colspan="2">
-            <widget class="QLineEdit" name="samplelineedit">
+            <widget class="QLineEdit" name="sampleLineEdit">
              <property name="text">
               <string>Sample Text</string>
              </property>
@@ -393,7 +393,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QGroupBox" name="GroupBox2">
+         <widget class="QGroupBox" name="fontSubstitutionGroup">
           <property name="title">
            <string>Font Substitution</string>
           </property>
@@ -413,17 +413,17 @@
               <number>0</number>
              </property>
              <item>
-              <widget class="QLabel" name="famsubbuddy">
+              <widget class="QLabel" name="familySubstitutionLabel">
                <property name="text">
                 <string>S&amp;elect or Enter a Family:</string>
                </property>
                <property name="buddy">
-                <cstring>familysubcombo</cstring>
+                <cstring>familySubstitutionCombo</cstring>
                </property>
               </widget>
              </item>
              <item>
-              <widget class="QComboBox" name="familysubcombo">
+              <widget class="QComboBox" name="familySubstitutionCombo">
                <property name="editable">
                 <bool>true</bool>
                </property>
@@ -451,14 +451,14 @@
             </widget>
            </item>
            <item>
-            <widget class="QLabel" name="TextLabel5">
+            <widget class="QLabel" name="substitutionsLabel">
              <property name="text">
               <string>Current Substitutions:</string>
              </property>
             </widget>
            </item>
            <item>
-            <widget class="QListWidget" name="sublistbox"/>
+            <widget class="QListWidget" name="substitutionsListBox"/>
            </item>
            <item>
             <layout class="QHBoxLayout">
@@ -469,21 +469,21 @@
               <number>0</number>
              </property>
              <item>
-              <widget class="QPushButton" name="PushButton2">
+              <widget class="QPushButton" name="upSubstitutionButton">
                <property name="text">
                 <string>Up</string>
                </property>
               </widget>
              </item>
              <item>
-              <widget class="QPushButton" name="PushButton3">
+              <widget class="QPushButton" name="downSubstitutionButton">
                <property name="text">
                 <string>Down</string>
                </property>
               </widget>
              </item>
              <item>
-              <widget class="QPushButton" name="PushButton4">
+              <widget class="QPushButton" name="removeSubstitutionButton">
                <property name="text">
                 <string>Remove</string>
                </property>
@@ -513,17 +513,17 @@
               <number>0</number>
              </property>
              <item>
-              <widget class="QLabel" name="choosebuddy">
+              <widget class="QLabel" name="chooseSubstitutionLabel">
                <property name="text">
                 <string>Select s&amp;ubstitute Family:</string>
                </property>
                <property name="buddy">
-                <cstring>choosesubcombo</cstring>
+                <cstring>chooseSubstitutionCombo</cstring>
                </property>
               </widget>
              </item>
              <item>
-              <widget class="QComboBox" name="choosesubcombo">
+              <widget class="QComboBox" name="chooseSubstitutionCombo">
                <property name="autoCompletion">
                 <bool>true</bool>
                </property>
@@ -533,7 +533,7 @@
               </widget>
              </item>
              <item>
-              <widget class="QPushButton" name="PushButton1">
+              <widget class="QPushButton" name="addSubstitutionButton">
                <property name="text">
                 <string>Add</string>
                </property>
@@ -546,13 +546,13 @@
         </item>
        </layout>
       </widget>
-      <widget class="QWidget" name="tab">
+      <widget class="QWidget" name="interfaceTab">
        <attribute name="title">
         <string>Interface</string>
        </attribute>
        <layout class="QVBoxLayout">
         <item>
-         <widget class="QGroupBox" name="GroupBox4">
+         <widget class="QGroupBox" name="feelSettingsGroup">
           <property name="title">
            <string>Feel Settings</string>
           </property>
@@ -564,7 +564,7 @@
             <number>4</number>
            </property>
            <item row="0" column="1">
-            <widget class="QSpinBox" name="dcispin">
+            <widget class="QSpinBox" name="doubleClickIntervalSpinBox">
              <property name="suffix">
               <string> ms</string>
              </property>
@@ -577,17 +577,17 @@
             </widget>
            </item>
            <item row="0" column="0">
-            <widget class="QLabel" name="dcibuddy">
+            <widget class="QLabel" name="doubleClickIntervalLabel">
              <property name="text">
               <string>&amp;Double Click Interval:</string>
              </property>
              <property name="buddy">
-              <cstring>dcispin</cstring>
+              <cstring>doubleClickIntervalSpinBox</cstring>
              </property>
             </widget>
            </item>
            <item row="1" column="1">
-            <widget class="QSpinBox" name="cfispin">
+            <widget class="QSpinBox" name="cursorFlashTimeSpinBox">
              <property name="specialValueText">
               <string>No blinking</string>
              </property>
@@ -603,17 +603,17 @@
             </widget>
            </item>
            <item row="1" column="0">
-            <widget class="QLabel" name="cfibuddy">
+            <widget class="QLabel" name="cursorFlashTimeLabel">
              <property name="text">
               <string>&amp;Cursor Flash Time:</string>
              </property>
              <property name="buddy">
-              <cstring>cfispin</cstring>
+              <cstring>cursorFlashTimeSpinBox</cstring>
              </property>
             </widget>
            </item>
            <item row="2" column="1">
-            <widget class="QSpinBox" name="wslspin">
+            <widget class="QSpinBox" name="wheelScrollLinesSpinBox">
              <property name="suffix">
               <string> lines</string>
              </property>
@@ -626,17 +626,17 @@
             </widget>
            </item>
            <item row="2" column="0">
-            <widget class="QLabel" name="wslbuddy">
+            <widget class="QLabel" name="wheelScrollLinesLabel">
              <property name="text">
               <string>Wheel &amp;Scroll Lines:</string>
              </property>
              <property name="buddy">
-              <cstring>wslspin</cstring>
+              <cstring>wheelScrollLinesSpinBox</cstring>
              </property>
             </widget>
            </item>
            <item row="3" column="0" colspan="2">
-            <widget class="QCheckBox" name="resolvelinks">
+            <widget class="QCheckBox" name="resolveLinksCheckBox">
              <property name="text">
               <string>Resolve symlinks in URLs</string>
              </property>
@@ -646,7 +646,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QGroupBox" name="GroupBox3">
+         <widget class="QGroupBox" name="guiEffectsGroup">
           <property name="title">
            <string>GUI Effects</string>
           </property>
@@ -658,7 +658,7 @@
             <number>8</number>
            </property>
            <item>
-            <widget class="QCheckBox" name="effectcheckbox">
+            <widget class="QCheckBox" name="effectsCheckBox">
              <property name="text">
               <string>&amp;Enable</string>
              </property>
@@ -668,53 +668,53 @@
             </widget>
            </item>
            <item>
-            <widget class="QFrame" name="effectbase">
+            <widget class="QFrame" name="effectsFrame">
              <layout class="QGridLayout">
               <property name="spacing">
                <number>4</number>
               </property>
               <item row="0" column="0">
-               <widget class="QLabel" name="meffectbuddy">
+               <widget class="QLabel" name="menuEffectLabel">
                 <property name="text">
                  <string>&amp;Menu Effect:</string>
                 </property>
                 <property name="buddy">
-                 <cstring>menueffect</cstring>
+                 <cstring>menuEffectCombo</cstring>
                 </property>
                </widget>
               </item>
               <item row="1" column="0">
-               <widget class="QLabel" name="ceffectbuddy">
+               <widget class="QLabel" name="comboEffectLabel">
                 <property name="text">
                  <string>C&amp;omboBox Effect:</string>
                 </property>
                 <property name="buddy">
-                 <cstring>comboeffect</cstring>
+                 <cstring>comboEffectCombo</cstring>
                 </property>
                </widget>
               </item>
               <item row="2" column="0">
-               <widget class="QLabel" name="teffectbuddy">
+               <widget class="QLabel" name="toolTipEffectLabel">
                 <property name="text">
                  <string>&amp;ToolTip Effect:</string>
                 </property>
                 <property name="buddy">
-                 <cstring>tooltipeffect</cstring>
+                 <cstring>toolTipEffectCombo</cstring>
                 </property>
                </widget>
               </item>
               <item row="3" column="0">
-               <widget class="QLabel" name="beffectbuddy">
+               <widget class="QLabel" name="toolBoxEffectLabel">
                 <property name="text">
                  <string>Tool&amp;Box Effect:</string>
                 </property>
                 <property name="buddy">
-                 <cstring>toolboxeffect</cstring>
+                 <cstring>toolBoxEffectCombo</cstring>
                 </property>
                </widget>
               </item>
               <item row="0" column="1">
-               <widget class="QComboBox" name="menueffect">
+               <widget class="QComboBox" name="menuEffectCombo">
                 <property name="currentIndex">
                  <number>0</number>
                 </property>
@@ -739,7 +739,7 @@
                </widget>
               </item>
               <item row="1" column="1">
-               <widget class="QComboBox" name="comboeffect">
+               <widget class="QComboBox" name="comboEffectCombo">
                 <item>
                  <property name="text">
                   <string>Disable</string>
@@ -753,7 +753,7 @@
                </widget>
               </item>
               <item row="2" column="1">
-               <widget class="QComboBox" name="tooltipeffect">
+               <widget class="QComboBox" name="toolTipEffectCombo">
                 <item>
                  <property name="text">
                   <string>Disable</string>
@@ -772,7 +772,7 @@
                </widget>
               </item>
               <item row="3" column="1">
-               <widget class="QComboBox" name="toolboxeffect">
+               <widget class="QComboBox" name="toolBoxEffectCombo">
                 <item>
                  <property name="text">
                   <string>Disable</string>
@@ -792,7 +792,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QGroupBox" name="GroupBox5">
+         <widget class="QGroupBox" name="globalStrutGroup">
           <property name="title">
            <string>Global Strut</string>
           </property>
@@ -804,27 +804,27 @@
             <number>4</number>
            </property>
            <item row="0" column="0">
-            <widget class="QLabel" name="swbuddy">
+            <widget class="QLabel" name="strutWidthLabel">
              <property name="text">
               <string>Minimum &amp;Width:</string>
              </property>
              <property name="buddy">
-              <cstring>strutwidth</cstring>
+              <cstring>strutWidthSpinBox</cstring>
              </property>
             </widget>
            </item>
            <item row="1" column="0">
-            <widget class="QLabel" name="shbuddy">
+            <widget class="QLabel" name="strutHeightLabel">
              <property name="text">
               <string>Minimum Hei&amp;ght:</string>
              </property>
              <property name="buddy">
-              <cstring>strutheight</cstring>
+              <cstring>strutHeightSpinBox</cstring>
              </property>
             </widget>
            </item>
            <item row="0" column="1">
-            <widget class="QSpinBox" name="strutwidth">
+            <widget class="QSpinBox" name="strutWidthSpinBox">
              <property name="suffix">
               <string> pixels</string>
              </property>
@@ -834,7 +834,7 @@
             </widget>
            </item>
            <item row="1" column="1">
-            <widget class="QSpinBox" name="strutheight">
+            <widget class="QSpinBox" name="strutHeightSpinBox">
              <property name="suffix">
               <string> pixels</string>
              </property>
@@ -847,7 +847,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QCheckBox" name="rtlExtensions">
+         <widget class="QCheckBox" name="rtlExtensionsCheckBox">
           <property name="text">
            <string>Enhanced support for languages written right-to-left</string>
           </property>
@@ -861,7 +861,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QComboBox" name="inputStyle">
+         <widget class="QComboBox" name="inputStyleCombo">
           <property name="currentIndex">
            <number>0</number>
           </property>
@@ -895,7 +895,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QComboBox" name="inputMethod">
+         <widget class="QComboBox" name="inputMethodCombo">
           <property name="currentIndex">
            <number>-1</number>
           </property>
@@ -919,13 +919,13 @@
         </item>
        </layout>
       </widget>
-      <widget class="QWidget" name="tab3">
+      <widget class="QWidget" name="printerTab">
        <attribute name="title">
         <string>Printer</string>
        </attribute>
        <layout class="QVBoxLayout">
         <item>
-         <widget class="QCheckBox" name="fontembeddingcheckbox">
+         <widget class="QCheckBox" name="fontEmbeddingCheckBox">
           <property name="text">
            <string>Enable Font embedding</string>
           </property>
@@ -935,7 +935,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QGroupBox" name="GroupBox10">
+         <widget class="QGroupBox" name="fontPathsGroup">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
             <horstretch>0</horstretch>
@@ -961,28 +961,28 @@
               <number>4</number>
              </property>
              <item row="1" column="0">
-              <widget class="QPushButton" name="PushButton11">
+              <widget class="QPushButton" name="upFontpathButton">
                <property name="text">
                 <string>Up</string>
                </property>
               </widget>
              </item>
              <item row="1" column="2">
-              <widget class="QPushButton" name="PushButton13">
+              <widget class="QPushButton" name="removeFontpathButton">
                <property name="text">
                 <string>Remove</string>
                </property>
               </widget>
              </item>
              <item row="1" column="1">
-              <widget class="QPushButton" name="PushButton12">
+              <widget class="QPushButton" name="downFontpathButton">
                <property name="text">
                 <string>Down</string>
                </property>
               </widget>
              </item>
              <item row="0" column="0" colspan="3">
-              <widget class="QListWidget" name="fontpathlistbox"/>
+              <widget class="QListWidget" name="fontpathListBox"/>
              </item>
             </layout>
            </item>
@@ -1011,28 +1011,28 @@
               </spacer>
              </item>
              <item row="2" column="2">
-              <widget class="QPushButton" name="PushButton15">
+              <widget class="QPushButton" name="addFontPathButton">
                <property name="text">
                 <string>Add</string>
                </property>
               </widget>
              </item>
              <item row="2" column="1">
-              <widget class="QPushButton" name="PushButton14">
+              <widget class="QPushButton" name="browseFontPathButton">
                <property name="text">
                 <string>Browse...</string>
                </property>
               </widget>
              </item>
              <item row="0" column="0" colspan="3">
-              <widget class="QLabel" name="TextLabel15_2">
+              <widget class="QLabel" name="browseFontPathLabel">
                <property name="text">
                 <string>Press the &lt;b&gt;Browse&lt;/b&gt; button or enter a directory and press Enter to add them to the list.</string>
                </property>
               </widget>
              </item>
              <item row="1" column="0" colspan="3">
-              <widget class="QLineEdit" name="fontpathlineedit"/>
+              <widget class="QLineEdit" name="fontPathLineEdit"/>
              </item>
             </layout>
            </item>
@@ -1041,19 +1041,19 @@
         </item>
        </layout>
       </widget>
-      <widget class="QWidget" name="tab4">
+      <widget class="QWidget" name="phononTab">
        <attribute name="title">
         <string>Phonon</string>
        </attribute>
        <layout class="QVBoxLayout" name="verticalLayout">
         <item>
-         <widget class="QGroupBox" name="groupBox_4">
+         <widget class="QGroupBox" name="aboutPhononGroup">
           <property name="title">
            <string>About Phonon</string>
           </property>
           <layout class="QGridLayout" name="gridLayout_2">
            <item row="0" column="0">
-            <widget class="QLabel" name="label_7">
+            <widget class="QLabel" name="phononVersionBuddyLabel">
              <property name="text">
               <string>Current Version:</string>
              </property>
@@ -1067,20 +1067,16 @@
             </widget>
            </item>
            <item row="1" column="0">
-            <widget class="QLabel" name="label_5">
+            <widget class="QLabel" name="phononWebsiteBuddyLabel">
              <property name="text">
               <string>Website:</string>
              </property>
             </widget>
            </item>
            <item row="1" column="1">
-            <widget class="QLabel" name="gstversionLabel_3">
+            <widget class="QLabel" name="phononWebsiteLabel">
              <property name="text">
-              <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://phonon.kde.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://phonon.kde.org&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              <string>&lt;a href=&quot;http://phonon.kde.org&quot;&gt;http://phonon.kde.org/&lt;/a&gt;</string>
              </property>
              <property name="openExternalLinks">
               <bool>true</bool>
@@ -1091,40 +1087,36 @@ p, li { white-space: pre-wrap; }
          </widget>
         </item>
         <item>
-         <widget class="QGroupBox" name="groupBox_3">
+         <widget class="QGroupBox" name="aboutGStreamerGroup">
           <property name="title">
            <string>About GStreamer</string>
           </property>
           <layout class="QGridLayout">
            <item row="0" column="0">
-            <widget class="QLabel" name="label_3">
+            <widget class="QLabel" name="gstVersionBuddyLabel">
              <property name="text">
               <string>Current Version:</string>
              </property>
             </widget>
            </item>
            <item row="0" column="1">
-            <widget class="QLabel" name="gstversionLabel">
+            <widget class="QLabel" name="gstVersionLabel">
              <property name="text">
               <string>Not available</string>
              </property>
             </widget>
            </item>
            <item row="1" column="0">
-            <widget class="QLabel" name="label_4">
+            <widget class="QLabel" name="gstWebsiteBuddyLabel">
              <property name="text">
               <string>Website:</string>
              </property>
             </widget>
            </item>
            <item row="1" column="1">
-            <widget class="QLabel" name="gstversionLabel_2">
+            <widget class="QLabel" name="gstWebsiteLabel">
              <property name="text">
-              <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://gstreamer.freedesktop.org/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://gstreamer.freedesktop.org/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              <string>&lt;a href=&quot;http://gstreamer.freedesktop.org/&quot;&gt;http://gstreamer.freedesktop.org/&lt;/a&gt;</string>
              </property>
              <property name="openExternalLinks">
               <bool>true</bool>
@@ -1135,13 +1127,13 @@ p, li { white-space: pre-wrap; }
          </widget>
         </item>
         <item>
-         <widget class="QGroupBox" name="groupBox">
+         <widget class="QGroupBox" name="gstBackendGroup">
           <property name="title">
            <string>GStreamer backend settings</string>
           </property>
           <layout class="QGridLayout" name="gridLayout_3">
            <item row="0" column="0">
-            <widget class="QLabel" name="label">
+            <widget class="QLabel" name="audiosinkLabel">
              <property name="text">
               <string>Preferred audio sink:</string>
              </property>
@@ -1154,7 +1146,7 @@ p, li { white-space: pre-wrap; }
             <widget class="QComboBox" name="audiosinkCombo"/>
            </item>
            <item row="1" column="0">
-            <widget class="QLabel" name="label_2">
+            <widget class="QLabel" name="videomodeLabel">
              <property name="text">
               <string>Preferred render method:</string>
              </property>
@@ -1167,7 +1159,7 @@ p, li { white-space: pre-wrap; }
             <widget class="QComboBox" name="videomodeCombo"/>
            </item>
            <item row="2" column="0" colspan="2">
-            <widget class="QLabel" name="label_6">
+            <widget class="QLabel" name="gstBackendNoteLabel">
              <property name="text">
               <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
@@ -1218,7 +1210,7 @@ p, li { white-space: pre-wrap; }
     </item>
    </layout>
   </widget>
-  <widget class="QMenuBar" name="menubar">
+  <widget class="QMenuBar" name="mainMenu">
    <property name="geometry">
     <rect>
      <x>0</x>
@@ -1227,7 +1219,7 @@ p, li { white-space: pre-wrap; }
      <height>19</height>
     </rect>
    </property>
-   <widget class="QMenu" name="PopupMenu">
+   <widget class="QMenu" name="fileMenu">
     <property name="geometry">
      <rect>
       <x>203</x>
@@ -1243,11 +1235,11 @@ p, li { white-space: pre-wrap; }
     <addaction name="separator"/>
     <addaction name="fileExitAction"/>
    </widget>
-   <widget class="QMenu" name="PopupMenu_2">
+   <widget class="QMenu" name="saveMenu">
     <property name="geometry">
      <rect>
-      <x>234</x>
-      <y>115</y>
+      <x>543</x>
+      <y>98</y>
       <width>161</width>
       <height>106</height>
      </rect>
@@ -1258,9 +1250,9 @@ p, li { white-space: pre-wrap; }
     <addaction name="helpAboutAction"/>
     <addaction name="helpAboutQtAction"/>
    </widget>
-   <addaction name="PopupMenu"/>
+   <addaction name="fileMenu"/>
    <addaction name="separator"/>
-   <addaction name="PopupMenu_2"/>
+   <addaction name="saveMenu"/>
   </widget>
   <action name="fileSaveAction">
    <property name="text">
@@ -1317,34 +1309,53 @@ p, li { white-space: pre-wrap; }
   </customwidget>
  </customwidgets>
  <tabstops>
-  <tabstop>helpview</tabstop>
-  <tabstop>familycombo</tabstop>
-  <tabstop>stylecombo</tabstop>
-  <tabstop>psizecombo</tabstop>
-  <tabstop>samplelineedit</tabstop>
-  <tabstop>familysubcombo</tabstop>
-  <tabstop>PushButton2</tabstop>
-  <tabstop>PushButton3</tabstop>
-  <tabstop>PushButton4</tabstop>
-  <tabstop>choosesubcombo</tabstop>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>dcispin</tabstop>
-  <tabstop>cfispin</tabstop>
-  <tabstop>wslspin</tabstop>
-  <tabstop>effectcheckbox</tabstop>
-  <tabstop>menueffect</tabstop>
-  <tabstop>comboeffect</tabstop>
-  <tabstop>tooltipeffect</tabstop>
-  <tabstop>strutwidth</tabstop>
-  <tabstop>strutheight</tabstop>
-  <tabstop>sublistbox</tabstop>
+  <tabstop>helpView</tabstop>
+  <tabstop>mainTabWidget</tabstop>
+  <tabstop>guiStyleCombo</tabstop>
+  <tabstop>tunePaletteButton</tabstop>
+  <tabstop>paletteCombo</tabstop>
+  <tabstop>fontFamilyCombo</tabstop>
+  <tabstop>fontStyleCombo</tabstop>
+  <tabstop>pointSizeCombo</tabstop>
+  <tabstop>sampleLineEdit</tabstop>
+  <tabstop>familySubstitutionCombo</tabstop>
+  <tabstop>substitutionsListBox</tabstop>
+  <tabstop>upSubstitutionButton</tabstop>
+  <tabstop>downSubstitutionButton</tabstop>
+  <tabstop>removeSubstitutionButton</tabstop>
+  <tabstop>chooseSubstitutionCombo</tabstop>
+  <tabstop>addSubstitutionButton</tabstop>
+  <tabstop>doubleClickIntervalSpinBox</tabstop>
+  <tabstop>cursorFlashTimeSpinBox</tabstop>
+  <tabstop>wheelScrollLinesSpinBox</tabstop>
+  <tabstop>resolveLinksCheckBox</tabstop>
+  <tabstop>effectsCheckBox</tabstop>
+  <tabstop>menuEffectCombo</tabstop>
+  <tabstop>comboEffectCombo</tabstop>
+  <tabstop>toolTipEffectCombo</tabstop>
+  <tabstop>toolBoxEffectCombo</tabstop>
+  <tabstop>strutWidthSpinBox</tabstop>
+  <tabstop>strutHeightSpinBox</tabstop>
+  <tabstop>rtlExtensionsCheckBox</tabstop>
+  <tabstop>inputStyleCombo</tabstop>
+  <tabstop>inputMethodCombo</tabstop>
+  <tabstop>fontEmbeddingCheckBox</tabstop>
+  <tabstop>fontpathListBox</tabstop>
+  <tabstop>upFontpathButton</tabstop>
+  <tabstop>downFontpathButton</tabstop>
+  <tabstop>removeFontpathButton</tabstop>
+  <tabstop>fontPathLineEdit</tabstop>
+  <tabstop>browseFontPathButton</tabstop>
+  <tabstop>addFontPathButton</tabstop>
+  <tabstop>audiosinkCombo</tabstop>
+  <tabstop>videomodeCombo</tabstop>
  </tabstops>
  <resources/>
  <connections>
   <connection>
-   <sender>effectcheckbox</sender>
+   <sender>effectsCheckBox</sender>
    <signal>toggled(bool)</signal>
-   <receiver>effectbase</receiver>
+   <receiver>effectsFrame</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
@@ -1358,9 +1369,9 @@ p, li { white-space: pre-wrap; }
    </hints>
   </connection>
   <connection>
-   <sender>fontembeddingcheckbox</sender>
+   <sender>fontEmbeddingCheckBox</sender>
    <signal>toggled(bool)</signal>
-   <receiver>GroupBox10</receiver>
+   <receiver>fontPathsGroup</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">