Ticket #10092: settings-mythfrontend-2012-03-09.diff

mythtv/programs/mythfrontend/audiogeneralsettings.cpp

@@ -25 +25 @@
 #include "libavformat/avformat.h"
 }
 
-
-class TriggeredItem : public TriggeredConfigurationGroup
-{
-  public:
-    TriggeredItem(Setting *checkbox, ConfigurationGroup *group) :
-        TriggeredConfigurationGroup(false, false, false, false)
-    {
-        setTrigger(checkbox);
-
-        addTarget("1", group);
-        addTarget("0", new VerticalConfigurationGroup(true));
-    }
-    TriggeredItem(Setting *checkbox, Setting *setting) :
-        TriggeredConfigurationGroup(false, false, false, false)
-    {
-        setTrigger(checkbox);
-
-        addTarget("1", setting);
-        addTarget("0", new VerticalConfigurationGroup(false, false));
-    }
-};
-
 AudioDeviceComboBox::AudioDeviceComboBox(AudioConfigSettings *parent) :
-    HostComboBox("AudioOutputDevice", true), m_parent(parent)
+    HostComboBoxSetting("AudioOutputDevice", true), m_parent(parent)
 {
     setLabel(QObject::tr("Audio output device"));
 #ifdef USING_ALSA
@@ -66 +44 @@
                                                dflt);
     addSelection(current, current, true);
 
-    connect(this, SIGNAL(valueChanged(const QString&)),
-            this, SLOT(AudioDescriptionHelp(const QString&)));
+    connect(this, SIGNAL(valueChanged(StandardSetting *)),
+            this, SLOT(AudioDescriptionHelp(StandardSetting *)));
+}
+
+void AudioDeviceComboBox::edit(MythScreenType * screen)
+{
+    AudioRescan();
+    HostComboBoxSetting::edit(screen);
 }
 
 void AudioDeviceComboBox::AudioRescan()
@@ -80 +64 @@
 
     QString value = getValue();
     clearSelections();
-    resetMaxCount(vect.size());
 
     bool found = false;
     for (it = vect.begin(); it != vect.end(); ++it)
@@ -88 +71 @@
                      value == it->name ? (found = true) : false);
     if (!found)
     {
-        resetMaxCount(vect.size()+1);
         addSelection(value, value, true);
     }
-        // For some reason, it adds an empty entry, remove it
-    removeSelection(QString::null);
 }
 
-void AudioDeviceComboBox::AudioDescriptionHelp(const QString &device)
+void AudioDeviceComboBox::AudioDescriptionHelp(StandardSetting * setting)
 {
-    QString desc = m_parent->AudioDeviceMap().value(device).desc;
+    QString desc = m_parent->AudioDeviceMap().value(setting->getValue()).desc;
     setHelpText(desc);
 }
 
-AudioConfigSettings::AudioConfigSettings(ConfigurationWizard *parent) :
-    VerticalConfigurationGroup(false, true, false, false),
-    m_OutputDevice(NULL),   m_MaxAudioChannels(NULL),
-    m_AudioUpmix(NULL),     m_AudioUpmixType(NULL),
-    m_AC3PassThrough(NULL), m_DTSPassThrough(NULL),
-    m_EAC3PassThrough(NULL),m_TrueHDPassThrough(NULL), m_DTSHDPassThrough(NULL),
-    m_parent(parent)
+
+AudioConfigSettings::AudioConfigSettings() :
+    GroupSetting()
 {
     setLabel(QObject::tr("Audio System"));
-    setUseLabel(false);
-
-    ConfigurationGroup *devicegroup = new HorizontalConfigurationGroup(false,
-                                                                       false);
-    devicegroup->addChild((m_OutputDevice = new AudioDeviceComboBox(this)));
-        // Rescan button
-    TransButtonSetting *rescan = new TransButtonSetting("rescan");
-    rescan->setLabel(QObject::tr("Rescan"));
-    rescan->setHelpText(QObject::tr("Rescan for available audio devices. "
-                                    "Current entry will be checked and "
-                                    "capability entries populated."));
-    devicegroup->addChild(rescan);
-    connect(rescan, SIGNAL(pressed()), this, SLOT(AudioRescan()));
-    addChild(devicegroup);
+
+    this->addChild((m_OutputDevice = new AudioDeviceComboBox(this)));
 
     QString name = m_OutputDevice->getValue();
     AudioOutput::AudioDeviceConfig *adc =
@@ -139 +103 @@
 
     delete adc;
 
-    ConfigurationGroup *maingroup = new VerticalConfigurationGroup(false,
-                                                                   false);
-    addChild(maingroup);
 
-    m_triggerDigital = new TransCheckBoxSetting();
-    m_AC3PassThrough = AC3PassThrough();
-    m_DTSPassThrough = DTSPassThrough();
-    m_EAC3PassThrough = EAC3PassThrough();
-    m_TrueHDPassThrough = TrueHDPassThrough();
-    m_DTSHDPassThrough = DTSHDPassThrough();
+    // digital settings
+    m_triggerDigital = new GroupSetting();
+    m_triggerDigital->setLabel(QObject::tr("Digital Audio Capabilities"));
+    m_triggerDigital->addChild(m_AC3PassThrough = AC3PassThrough());
+    m_triggerDigital->addChild(m_DTSPassThrough = DTSPassThrough());
+    m_triggerDigital->addChild(m_EAC3PassThrough = EAC3PassThrough());
+    m_triggerDigital->addChild(m_TrueHDPassThrough = TrueHDPassThrough());
+    m_triggerDigital->addChild(m_DTSHDPassThrough = DTSHDPassThrough());
+    addChild(m_triggerDigital);
+
+    addChild((m_MaxAudioChannels = MaxAudioChannels()));
+    addChild((m_AudioUpmix = AudioUpmix()));
+    addChild((m_AudioUpmixType = AudioUpmixType()));
+    addChild(MythControlsVolume());
+
 
-    m_cgsettings = new HorizontalConfigurationGroup();
-    m_cgsettings->setLabel(QObject::tr("Digital Audio Capabilities"));
-    m_cgsettings->addChild(m_AC3PassThrough);
-    m_cgsettings->addChild(m_DTSPassThrough);
-    m_cgsettings->addChild(m_EAC3PassThrough);
-    m_cgsettings->addChild(m_TrueHDPassThrough);
-    m_cgsettings->addChild(m_DTSHDPassThrough);
+    //Advanced Settings
+    GroupSetting * advancedSettings = new GroupSetting();
+    advancedSettings->setLabel(QObject::tr("Advanced Audio Settings"));
+    advancedSettings->setHelpText(QObject::tr("Enable extra audio settings. Under most "
+                                  "usage all options should be left alone"));
+    addChild(advancedSettings);
+    m_PassThroughOverride = PassThroughOverride();
+    advancedSettings->addChild(m_PassThroughOverride);
+    m_PassThroughDeviceOverride = PassThroughOutputDevice();
+    advancedSettings->addChild(m_PassThroughDeviceOverride);
+    connect(m_PassThroughOverride, SIGNAL(valueChanged(bool)),
+            m_PassThroughDeviceOverride, SLOT(setEnabled(bool)));
 
-    TriggeredItem *sub1 = new TriggeredItem(m_triggerDigital, m_cgsettings);
 
-    maingroup->addChild(sub1);
+    StandardSetting *srcqualityoverride = SRCQualityOverride();
+    srcqualityoverride->addTargetedChild("1",SRCQuality());
 
-    maingroup->addChild((m_MaxAudioChannels = MaxAudioChannels()));
-    maingroup->addChild((m_AudioUpmix = AudioUpmix()));
-    maingroup->addChild((m_AudioUpmixType = AudioUpmixType()));
+    advancedSettings->addChild(Audio48kOverride());
+#if USING_ALSA
+    advancedSettings->addChild(SPDIFRateOverride());
+#endif
 
-    TransButtonSetting *test = new TransButtonSetting("test");
-    test->setLabel(QObject::tr("Test"));
-    test->setHelpText(QObject::tr("Will play a test pattern on all configured "
-                                  "speakers"));
-    connect(test, SIGNAL(pressed()), this, SLOT(StartAudioTest()));
-    addChild(test);
+    advancedSettings->addChild(m_MPCM = MPCM());
 
-    TransButtonSetting *advanced = new TransButtonSetting("advanced");
-    advanced->setLabel(QObject::tr("Advanced Audio Settings"));
-    advanced->setHelpText(QObject::tr("Enable extra audio settings. Under most "
-                                  "usage all options should be left alone"));
-    connect(advanced, SIGNAL(pressed()), this, SLOT(AudioAdvanced()));
-    addChild(advanced);
+    addChild(m_audioTest = new AudioTest());
 
         // Set slots
-    connect(m_MaxAudioChannels, SIGNAL(valueChanged(const QString&)),
-            this, SLOT(UpdateVisibility(const QString&)));
-    connect(m_OutputDevice, SIGNAL(valueChanged(const QString&)),
-            this, SLOT(UpdateCapabilities(const QString&)));
-    connect(m_AC3PassThrough, SIGNAL(valueChanged(const QString&)),
-            this, SLOT(UpdateCapabilities(const QString&)));
-    connect(m_DTSPassThrough, SIGNAL(valueChanged(const QString&)),
-            this, SLOT(UpdateCapabilities(const QString&)));
-    connect(m_EAC3PassThrough, SIGNAL(valueChanged(const QString&)),
-            this, SLOT(UpdateCapabilities(const QString&)));
-    connect(m_TrueHDPassThrough, SIGNAL(valueChanged(const QString&)),
-            this, SLOT(UpdateCapabilities(const QString&)));
-    connect(m_DTSHDPassThrough, SIGNAL(valueChanged(const QString&)),
-            this, SLOT(UpdateCapabilities(const QString&)));
+    connect(m_MaxAudioChannels, SIGNAL(valueChanged(StandardSetting *)),
+            this, SLOT(UpdateVisibility(StandardSetting *)));
+    connect(m_OutputDevice, SIGNAL(valueChanged(StandardSetting *)),
+            this, SLOT(UpdateCapabilities(StandardSetting *)));
+    connect(m_AC3PassThrough, SIGNAL(valueChanged(StandardSetting *)),
+            this, SLOT(UpdateCapabilities(StandardSetting *)));
+    connect(m_DTSPassThrough, SIGNAL(valueChanged(StandardSetting *)),
+            this, SLOT(UpdateCapabilities(StandardSetting *)));
+    connect(m_EAC3PassThrough, SIGNAL(valueChanged(StandardSetting *)),
+            this, SLOT(UpdateCapabilities(StandardSetting *)));
+    connect(m_TrueHDPassThrough, SIGNAL(valueChanged(StandardSetting *)),
+            this, SLOT(UpdateCapabilities(StandardSetting *)));
+    connect(m_DTSHDPassThrough, SIGNAL(valueChanged(StandardSetting *)),
+            this, SLOT(UpdateCapabilities(StandardSetting *)));
+    //Slot for audio test
+    connect(m_OutputDevice,SIGNAL(valueChanged(StandardSetting *)),
+            this,SLOT(UpdateAudioTest()));
+    connect(m_MaxAudioChannels,SIGNAL(valueChanged(StandardSetting *)),
+            this,SLOT(UpdateAudioTest()));
+
+
     AudioRescan();
 }
 
 void AudioConfigSettings::AudioRescan()
 {
+
+        LOG(VB_GENERAL, LOG_ERR,
+            QString("AudioConfigSettings::AudioRescan()"));
     if (!slotlock.tryLock())
         return;
 
@@ -237 +213 @@
     {
         QString msg =QObject::tr("Passthrough device is invalid or not useable."
                                  " Check configuration in Advanced Settings:") +
-            gCoreContext->GetSetting("PassThruOutputDevice");
+            m_PassThroughDeviceOverride->getValue();
         MythPopupBox::showOkPopup(
             GetMythMainWindow(), QObject::tr("Warning"), msg);
         LOG(VB_GENERAL, LOG_ERR, QString("Audio device %1 isn't usable")
                 .arg(name));
     }
     slotlock.unlock();
-    UpdateCapabilities(QString::null);
+    UpdateCapabilities(NULL);
 }
 
-void AudioConfigSettings::UpdateVisibility(const QString &device)
+void AudioConfigSettings::UpdateVisibility(StandardSetting *)
 {
     if (!m_MaxAudioChannels && !m_AudioUpmix && !m_AudioUpmixType)
         return;
@@ -258 +234 @@
 }
 
 AudioOutputSettings AudioConfigSettings::UpdateCapabilities(
-    const QString &device)
+    StandardSetting *)
 {
     int max_speakers = 8;
     int realmax_speakers = 8;
@@ -290 +266 @@
     }
     else
     {
-        bool bForceDigital =
-            gCoreContext->GetNumSetting("PassThruDeviceOverride", false);
+
+        bool bForceDigital = m_PassThroughOverride->boolValue();
 
         settings = audiodevs.value(out).settings;
         settingsdigital = bForceDigital ?
-            audiodevs.value(gCoreContext->GetSetting("PassThruOutputDevice"))
+            audiodevs.value(m_PassThroughDeviceOverride->getValue())
             .settings : settings;
 
         realmax_speakers = max_speakers = settings.BestSupportedChannels();
@@ -320 +296 @@
             max_speakers = 6;
     }
 
-    m_triggerDigital->setValue(invalid || settingsdigital.canFeature(
+    m_triggerDigital->setEnabled(invalid || settingsdigital.canFeature(
                                    FEATURE_AC3 | FEATURE_DTS | FEATURE_EAC3 |
                                    FEATURE_TRUEHD | FEATURE_DTSHD));
+    
     m_EAC3PassThrough->setEnabled(bEAC3);
     m_TrueHDPassThrough->setEnabled(bTRUEHD);
     m_DTSHDPassThrough->setEnabled(bDTSHD);
@@ -335 +312 @@
         cur_speakers = max_speakers;
     }
 
-        // Remove everything and re-add available channels
+    // Remove everything and re-add available channels
     m_MaxAudioChannels->clearSelections();
-    m_MaxAudioChannels->resetMaxCount(3);
     for (int i = 1; i <= max_speakers; i++)
     {
         if (invalid || settings.IsSupportedChannels(i))
@@ -362 +338 @@
                                              i == cur_speakers);
         }
     }
+
+    setMPCMEnabled(settings.canPassthrough() >= 0);
         // Return values is used by audio test
         // where we mainly are interested by the number of channels
         // if we support AC3 and/or LPCM
@@ -373 +351 @@
     return settings;
 }
 
-void AudioConfigSettings::AudioAdvanced()
-{
-    QString out  = m_OutputDevice->getValue();
-    bool invalid = false;
-    AudioOutputSettings settings;
-
-    if (!audiodevs.contains(out))
-    {
-        invalid = true;
-    }
-    else
-    {
-        settings = audiodevs.value(out).settings;
-    }
-
-    AudioAdvancedSettingsGroup audiosettings(invalid ||
-                                             (settings.canPassthrough() >= 0));
-
-    if (audiosettings.exec() == kDialogCodeAccepted)
-    {
-        AudioRescan();
-        UpdateCapabilities(QString::null);
-    }
-}
-
-HostComboBox *AudioConfigSettings::MaxAudioChannels()
+HostComboBoxSetting *AudioConfigSettings::MaxAudioChannels()
 {
     QString name = "MaxChannels";
-    HostComboBox *gc = new HostComboBox(name, false);
+    HostComboBoxSetting *gc = new HostComboBoxSetting(name, false);
     gc->setLabel(QObject::tr("Speaker configuration"));
     gc->addSelection(QObject::tr("Stereo"), "2", true); // default
     gc->setHelpText(QObject::tr("Select the maximum number of audio "
@@ -410 +363 @@
     return gc;
 }
 
-HostCheckBox *AudioConfigSettings::AudioUpmix()
+HostCheckBoxSetting *AudioConfigSettings::AudioUpmix()
 {
-    HostCheckBox *gc = new HostCheckBox("AudioDefaultUpmix");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("AudioDefaultUpmix");
     gc->setLabel(QObject::tr("Upconvert stereo to 5.1 surround"));
     gc->setValue(true);
     gc->setHelpText(QObject::tr("If enabled, MythTV will upconvert stereo "
@@ -421 +374 @@
     return gc;
 }
 
-HostComboBox *AudioConfigSettings::AudioUpmixType()
+HostComboBoxSetting *AudioConfigSettings::AudioUpmixType()
 {
-    HostComboBox *gc = new HostComboBox("AudioUpmixType",false);
+    HostComboBoxSetting *gc = new HostComboBoxSetting("AudioUpmixType",false);
     gc->setLabel(QObject::tr("Upmix Quality"));
     gc->addSelection(QObject::tr("Good"), "1");
     gc->addSelection(QObject::tr("Best"), "2", true);  // default
@@ -431 +384 @@
     return gc;
 }
 
-HostCheckBox *AudioConfigSettings::AC3PassThrough()
+HostCheckBoxSetting *AudioConfigSettings::AC3PassThrough()
 {
-    HostCheckBox *gc = new HostCheckBox("AC3PassThru");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("AC3PassThru");
     gc->setLabel(QObject::tr("Dolby Digital"));
     gc->setValue(false);
     gc->setHelpText(QObject::tr("Enable if your amplifier or sound decoder "
@@ -442 +395 @@
     return gc;
 }
 
-HostCheckBox *AudioConfigSettings::DTSPassThrough()
+HostCheckBoxSetting *AudioConfigSettings::DTSPassThrough()
 {
-    HostCheckBox *gc = new HostCheckBox("DTSPassThru");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("DTSPassThru");
     gc->setLabel(QObject::tr("DTS"));
     gc->setValue(false);
     gc->setHelpText(QObject::tr("Enable if your amplifier or sound decoder "
@@ -453 +406 @@
     return gc;
 }
 
-HostCheckBox *AudioConfigSettings::EAC3PassThrough()
+HostCheckBoxSetting *AudioConfigSettings::EAC3PassThrough()
 {
-    HostCheckBox *gc = new HostCheckBox("EAC3PassThru");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("EAC3PassThru");
     gc->setLabel(QObject::tr("E-AC-3"));
     gc->setValue(false);
     gc->setHelpText(QObject::tr("Enable if your amplifier or sound decoder "
@@ -463 +416 @@
     return gc;
 }
 
-HostCheckBox *AudioConfigSettings::TrueHDPassThrough()
+HostCheckBoxSetting *AudioConfigSettings::TrueHDPassThrough()
 {
-    HostCheckBox *gc = new HostCheckBox("TrueHDPassThru");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("TrueHDPassThru");
     gc->setLabel(QObject::tr("TrueHD"));
     gc->setValue(false);
     gc->setHelpText(QObject::tr("Enable if your amplifier or sound decoder "
@@ -473 +426 @@
     return gc;
 }
 
-HostCheckBox *AudioConfigSettings::DTSHDPassThrough()
+HostCheckBoxSetting *AudioConfigSettings::DTSHDPassThrough()
 {
-    HostCheckBox *gc = new HostCheckBox("DTSHDPassThru");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("DTSHDPassThru");
     gc->setLabel(QObject::tr("DTS-HD"));
     gc->setValue(false);
     gc->setHelpText(QObject::tr("Enable if your amplifier or sound decoder "
@@ -487 +440 @@
 {
     bool ok = true;
 
-    if (gCoreContext->GetNumSetting("PassThruDeviceOverride", false))
+    if (m_PassThroughOverride->boolValue())
     {
-        QString name = gCoreContext->GetSetting("PassThruOutputDevice");
+        QString name = m_PassThroughDeviceOverride->getValue();
         AudioOutput::AudioDeviceConfig *adc =
             AudioOutput::GetAudioDeviceConfig(name, name, true);
         if (adc->settings.IsInvalid())
@@ -507 +460 @@
     return ok;
 }
 
-void AudioConfigSettings::StartAudioTest()
+static void fillSelectionsFromDir(HostComboBoxSetting *comboBox, const QDir& dir, bool absPath = true)
+
+{
+    QFileInfoList il = dir.entryInfoList();
+
+    for (QFileInfoList::Iterator it = il.begin();
+                                 it != il.end();
+                                ++it )
+    {
+         QFileInfo &fi = *it;
+
+        if (absPath)
+            comboBox->addSelection( fi.absoluteFilePath() );
+        else
+            comboBox->addSelection( fi.fileName() );
+    }
+}
+
+HostComboBoxSetting *AudioConfigSettings::MixerDevice()
+{
+    HostComboBoxSetting *gc = new HostComboBoxSetting("MixerDevice", true);
+    gc->setLabel(QObject::tr("Mixer device"));
+
+#ifdef USING_OSS
+    QDir dev("/dev", "mixer*", QDir::Name, QDir::System);
+    fillSelectionsFromDir(gc, dev);
+
+    dev.setPath("/dev/sound");
+    if (dev.exists())
+    {
+        fillSelectionsFromDir(gc, dev);
+    }
+#endif
+#ifdef USING_ALSA
+    gc->addSelection("ALSA:default", "ALSA:default");
+#endif
+#ifdef USING_MINGW
+    gc->addSelection("DirectX:", "DirectX:");
+    gc->addSelection("Windows:", "Windows:");
+#endif
+#if !defined(USING_MINGW)
+    gc->addSelection("software", "software");
+    gc->setHelpText(QObject::tr("Setting the mixer device to \"software\" "
+                    "lets MythTV control the volume of all audio at the "
+                    "expense of a slight quality loss."));
+#endif
+
+    return gc;
+}
+
+static const char* MixerControlControls[] = { "PCM",
+                                              "Master" };
+
+HostComboBoxSetting *AudioConfigSettings::MixerControl()
 {
-    AudioOutputSettings settings = UpdateCapabilities(QString::null);
+    HostComboBoxSetting *gc = new HostComboBoxSetting("MixerControl", true);
+    gc->setLabel(QObject::tr("Mixer controls"));
+    for (unsigned int i = 0; i < sizeof(MixerControlControls) / sizeof(char*);
+         ++i)
+    {
+        gc->addSelection(QObject::tr(MixerControlControls[i]),
+                         MixerControlControls[i]);
+    }
+
+    gc->setHelpText(QObject::tr("Changing the volume adjusts the selected mixer."));
+    return gc;
+}
+
+
+//TODO was a slider
+HostSpinBoxSetting *AudioConfigSettings::MixerVolume()
+{
+    HostSpinBoxSetting *gs = new HostSpinBoxSetting("MasterMixerVolume", 0, 100, 1);
+    gs->setLabel(QObject::tr("Master mixer volume"));
+    gs->setValue(70);
+    gs->setHelpText(QObject::tr("Initial volume for the Master mixer. "
+                    "This affects all sound created by the audio device. "
+                    "Note: Do not set this too low."));
+    return gs;
+}
+
+//TODO was a slider
+HostSpinBoxSetting *AudioConfigSettings::PCMVolume()
+{
+    HostSpinBoxSetting *gs = new HostSpinBoxSetting("PCMMixerVolume", 0, 100, 1);
+    gs->setLabel(QObject::tr("PCM mixer volume"));
+    gs->setValue(70);
+    gs->setHelpText(QObject::tr("Initial volume for PCM output. Using the "
+                    "volume keys in MythTV will adjust this parameter."));
+    return gs;
+}
+
+
+HostCheckBoxSetting *AudioConfigSettings::MythControlsVolume()
+{
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("MythControlsVolume");
+    gc->setLabel(QObject::tr("Use internal volume controls"));
+    gc->setValue(true);
+    gc->setHelpText(QObject::tr("If enabled, MythTV will control the PCM and "
+                    "master mixer volume. Disable this option if you prefer "
+                    "to control the volume externally (for example, using "
+                    "your amplifier) or if you use an external mixer program."));
+
+    gc->addTargetedChild("1",MixerDevice());
+    gc->addTargetedChild("1",MixerControl());
+    gc->addTargetedChild("1",MixerVolume());
+    gc->addTargetedChild("1",PCMVolume());
+    return gc;
+}
+
+void AudioConfigSettings::UpdateAudioTest()
+{
+
+    LOG(VB_GENERAL, LOG_ERR, "AudioConfigSettings::UpdateAudioTest()");
+    AudioOutputSettings settings = UpdateCapabilities(NULL);
     
     QString out  = m_OutputDevice->getValue();
-    QString passthrough =
-        gCoreContext->GetNumSetting("PassThruDeviceOverride", false) ?
-        gCoreContext->GetSetting("PassThruOutputDevice") : QString::null;
+    QString passthrough = m_PassThroughOverride->boolValue() ? 
+                     m_PassThroughDeviceOverride->getValue(): QString::null;
     int channels = m_MaxAudioChannels->getValue().toInt();
-    QString errMsg;
 
-    AudioTestGroup audiotest(out, passthrough, channels, settings);
+    m_audioTest->UpdateCapabilities(out, passthrough, channels, settings);
 
-    audiotest.exec();
 }
 
 AudioTestThread::AudioTestThread(QObject *parent,
@@ -691 +753 @@
     RunEpilog();
 }
 
-AudioTest::AudioTest(QString main, QString passthrough,
-                     int channels, AudioOutputSettings settings) 
-    : VerticalConfigurationGroup(false, true, false, false),
-      m_frontleft(NULL), m_frontright(NULL), m_center(NULL),
-      m_surroundleft(NULL), m_surroundright(NULL),
-      m_rearleft(NULL), m_rearright(NULL), m_lfe(NULL),
-      m_main(main), m_passthrough(passthrough), m_settings(settings),
+AudioTest::AudioTest() 
+    : GroupSetting(),
+      m_at(NULL),
       m_quality(false)
 {
+    int channels=2;
+
+
     m_channels = gCoreContext->GetNumSetting("TestingChannels", channels);
     setLabel(QObject::tr("Audio Configuration Testing"));
+    setHelpText(QObject::tr("Will play a test pattern on all configured "
+                                  "speakers"));
 
-    m_at = new AudioTestThread(this, m_main, m_passthrough, m_channels,
-                               m_settings, m_quality);
-    if (!m_at->result().isEmpty())
-    {
-        QString msg = main + QObject::tr(" is invalid or not "
-                                         "useable.");
-        MythPopupBox::showOkPopup(
-            GetMythMainWindow(), QObject::tr("Warning"), msg);
-        return;
-    }
-
-    m_button = new TransButtonSetting("start");
-    m_button->setLabel(QObject::tr("Test All"));
-    m_button->setHelpText(QObject::tr("Start all channels test"));
-    connect(m_button, SIGNAL(pressed(QString)), this, SLOT(toggle(QString)));
-
-    ConfigurationGroup *frontgroup =
-        new HorizontalConfigurationGroup(false,
-                                         false);
-    ConfigurationGroup *middlegroup =
-        new HorizontalConfigurationGroup(false,
-                                         false);
-    ConfigurationGroup *reargroup =
-        new HorizontalConfigurationGroup(false,
-                                         false);
-    m_frontleft = new TransButtonSetting("0");
+    m_frontleft = new ButtonStandardSetting("0");
     m_frontleft->setLabel(QObject::tr("Front Left"));
+    addChild(m_frontleft);
     connect(m_frontleft,
-            SIGNAL(pressed(QString)), this, SLOT(toggle(QString)));
-    m_frontright = new TransButtonSetting(m_channels == 2 ? "1" : "2");
+            SIGNAL(clicked()), this, SLOT(toggle()));
+    m_frontright = new ButtonStandardSetting(m_channels == 2 ? "1" : "2");
     m_frontright->setLabel(QObject::tr("Front Right"));
+    addChild(m_frontright);
     connect(m_frontright,
-            SIGNAL(pressed(QString)), this, SLOT(toggle(QString)));
-    frontgroup->addChild(m_frontleft);
-
-    switch(m_channels)
-    {
-        case 8:
-            m_rearleft = new TransButtonSetting("5");
-            m_rearleft->setLabel(QObject::tr("Rear Left"));
-            connect(m_rearleft,
-                    SIGNAL(pressed(QString)), this, SLOT(toggle(QString)));
-            reargroup->addChild(m_rearleft);
-
-        case 7:
-            m_rearright = new TransButtonSetting("4");
-            m_rearright->setLabel(QObject::tr(m_channels == 8 ?
-                                              "Rear Right" : "Rear Center"));
-            connect(m_rearright,
-                    SIGNAL(pressed(QString)), this, SLOT(toggle(QString)));
-
-            reargroup->addChild(m_rearright);
-
-        case 6:
-            m_lfe = new TransButtonSetting(m_channels == 6 ? "5" :
-                                           m_channels == 7 ? "6" : "7");
-            m_lfe->setLabel(QObject::tr("LFE"));
-            connect(m_lfe,
-                    SIGNAL(pressed(QString)), this, SLOT(toggle(QString)));
-
-        case 5:
-            m_surroundleft = new TransButtonSetting(m_channels == 6 ? "4" :
-                                                    m_channels == 7 ? "5" : "6");
-            m_surroundleft->setLabel(QObject::tr("Surround Left"));
-            connect(m_surroundleft,
-                    SIGNAL(pressed(QString)), this, SLOT(toggle(QString)));
-            m_surroundright = new TransButtonSetting("3");
-            m_surroundright->setLabel(QObject::tr("Surround Right"));
-            connect(m_surroundright,
-                    SIGNAL(pressed(QString)), this, SLOT(toggle(QString)));
-            m_center = new TransButtonSetting("1");
-            m_center->setLabel(QObject::tr("Center"));
-            connect(m_center,
-                    SIGNAL(pressed(QString)), this, SLOT(toggle(QString)));
-            frontgroup->addChild(m_center);
-            middlegroup->addChild(m_surroundleft);
-            if (m_lfe)
-                middlegroup->addChild(m_lfe);
-            middlegroup->addChild(m_surroundright);
-
-        case 2:
-            break;
-    }
-    frontgroup->addChild(m_frontright);
-    addChild(frontgroup);
-    addChild(middlegroup);
-    addChild(reargroup);
-    addChild(m_button);
-
-    m_hd = new TransCheckBoxSetting();
+            SIGNAL(clicked()), this, SLOT(toggle()));
+
+    m_rearleft = new ButtonStandardSetting("5");
+    m_rearleft->setLabel(QObject::tr("Rear Left"));
+    addChild(m_rearleft);
+    connect(m_rearleft,
+            SIGNAL(clicked()), this, SLOT(toggle()));
+
+    m_rearright = new ButtonStandardSetting("4");
+    m_rearright->setLabel(QObject::tr("Rear Right"));
+    addChild(m_rearright);
+    connect(m_rearright,
+            SIGNAL(clicked()), this, SLOT(toggle()));
+
+    m_lfe = new ButtonStandardSetting(m_channels == 6 ? "5" :
+                                   m_channels == 7 ? "6" : "7");
+    m_lfe->setLabel(QObject::tr("LFE"));
+    addChild(m_lfe);
+    connect(m_lfe,
+            SIGNAL(clicked()), this, SLOT(toggle()));
+
+    m_surroundleft = new ButtonStandardSetting(m_channels == 6 ? "4" :
+                                            m_channels == 7 ? "5" : "6");
+    m_surroundleft->setLabel(QObject::tr("Surround Left"));
+    addChild(m_surroundleft);
+    connect(m_surroundleft,
+            SIGNAL(clicked()), this, SLOT(toggle()));
+
+    m_surroundright = new ButtonStandardSetting("3");
+    m_surroundright->setLabel(QObject::tr("Surround Right"));
+    addChild(m_surroundright);
+    connect(m_surroundright,
+            SIGNAL(clicked()), this, SLOT(toggle()));
+
+    m_center = new ButtonStandardSetting("1");
+    m_center->setLabel(QObject::tr("Center"));
+    addChild(m_center);
+    connect(m_center,
+            SIGNAL(clicked()), this, SLOT(toggle()));
+
+    m_startButton = new ButtonStandardSetting("start");
+    m_startButton->setLabel(QObject::tr("Test All"));
+    m_startButton->setHelpText(QObject::tr("Start all channels test"));
+    addChild(m_startButton);
+    connect(m_startButton, SIGNAL(clicked()), this, SLOT(toggle()));
+
+    m_hd = new TransMythUICheckBoxSetting();
     m_hd->setLabel(QObject::tr("Use Highest Quality Mode"));
     m_hd->setHelpText(QObject::tr("Use the highest audio quality settings "
                                   "supported by your audio card. This will be "
@@ -804 +833 @@
 
 AudioTest::~AudioTest()
 {
-    m_at->cancel();
-    m_at->wait();
-    delete m_at;
+    if (m_at)
+    {
+        m_at->cancel();
+        m_at->wait();
+        delete m_at;
+    }
+}
+
+
+void AudioTest::UpdateCapabilities(QString main, QString passthrough,
+          int channels, AudioOutputSettings settings)
+{
+    m_rearleft->setEnabled(m_channels>=8);
+    m_rearright->setEnabled(m_channels>=7);
+    m_lfe->setEnabled(m_channels>=6);
+    m_surroundleft->setEnabled(m_channels>=5);
+    m_surroundright->setEnabled(m_channels>=5);
+    m_center->setEnabled(m_channels>=5);
 }
 
-void AudioTest::toggle(QString str)
+void AudioTest::toggle()
 {
-    if (str == "start")
+    if (this->sender() == m_startButton)
     {
-        if (m_at->isRunning())
-        {
-            m_at->cancel();
-            m_button->setLabel(QObject::tr("Test All"));
-            if (m_frontleft)
-                m_frontleft->setEnabled(true);
-            if (m_frontright)
-                m_frontright->setEnabled(true);
-            if (m_center)
-                m_center->setEnabled(true);
-            if (m_surroundleft)
-                m_surroundleft->setEnabled(true);
-            if (m_surroundright)
-                m_surroundright->setEnabled(true);
-            if (m_rearleft)
-                m_rearleft->setEnabled(true);
-            if (m_rearright)
-                m_rearright->setEnabled(true);
-            if (m_lfe)
-                m_lfe->setEnabled(true);
-        }
+        if (m_at != NULL && m_at->isRunning())
+            cancelTest();
         else
         {
+            prepareTest();
+            LOG(VB_GENERAL, LOG_ERR, QString("AudioTest::toggle() Starting all"));
             m_at->setChannel(-1);
             m_at->start();
-            m_button->setLabel(QObject::tr("Stop"));
+            m_startButton->setLabel(QObject::tr("Stop"));
         }
         return;
     }
-    if (m_at->isRunning())
+    if (m_at != NULL && m_at->isRunning())
     {
+        LOG(VB_GENERAL, LOG_ERR, QString("AudioTest::toggle() Stopping"));
         m_at->cancel();
         m_at->wait();
     }
 
-    int channel = str.toInt();
+    prepareTest();
+    
+    int channel=1;
+
+    if (this->sender() == m_frontleft)
+        channel=0;
+    else if (this->sender() == m_frontright)
+        channel = (m_channels == 2) ? 1 : 2;
+    else if (this->sender() == m_rearleft)
+        channel=5;
+    else if (this->sender() == m_rearright)
+        channel=4;
+    else if (this->sender() == m_lfe)
+        channel=((m_channels == 6) ? 5 :((m_channels == 7) ? 6 : 7));
+    else if (this->sender() == m_surroundleft)
+        channel=((m_channels == 6) ? 4 : ((m_channels == 7) ? 5 : 6));
+    else if (this->sender() == m_surroundright)
+        channel=3;
+    else if (this->sender() == m_center)
+        channel=1;
+
+/*    int channel = str.toInt();*/
     m_at->setChannel(channel);
 
     m_at->start();
 }
 
+
 void AudioTest::togglequality()
 {
-    if (m_at->isRunning())
+    cancelTest();
+    m_quality = m_hd->boolValue();
+}
+
+
+void AudioTest::cancelTest()
+{
+    if (m_at !=NULL && m_at->isRunning())
     {
-        toggle("start");
+        LOG(VB_GENERAL, LOG_ERR, QString("AudioTest::toggle() Stopping all"));
+        m_at->cancel();
+        m_startButton->setLabel(QObject::tr("Test All"));
     }
+}
 
-    m_quality = m_hd->boolValue();
-    delete m_at;
+void AudioTest::prepareTest()
+{
+    cancelTest();
+    if (m_at!=NULL)
+    {
+        m_at->cancel();
+        m_at->wait();
+        delete m_at;
+    }
     m_at = new AudioTestThread(this, m_main, m_passthrough, m_channels,
                                m_settings, m_quality);
     if (!m_at->result().isEmpty())
     {
-        QString msg = QObject::tr("Audio device is invalid or not useable.");
-        MythPopupBox::showOkPopup(
-            GetMythMainWindow(), QObject::tr("Warning"), msg);
+
+        MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
+
+        MythConfirmationDialog *mcd = new MythConfirmationDialog(mainStack, 
+            QObject::tr("Audio device is invalid or not useable."), false);
+
+        if (mcd->Create())
+            mainStack->AddScreen(mcd);
     }
 }
 
@@ -939 +1011 @@
 }
 
 
-AudioTestGroup::AudioTestGroup(QString main, QString passthrough,
-                               int channels, AudioOutputSettings settings)
+HostCheckBoxSetting *AudioConfigSettings::MPCM()
 {
-    addChild(new AudioTest(main, passthrough, channels, settings));
-}
-
-HostCheckBox *AudioMixerSettings::MythControlsVolume()
-{
-    HostCheckBox *gc = new HostCheckBox("MythControlsVolume");
-    gc->setLabel(QObject::tr("Use internal volume controls"));
-    gc->setValue(true);
-    gc->setHelpText(QObject::tr("If enabled, MythTV will control the PCM and "
-                    "master mixer volume. Disable this option if you prefer "
-                    "to control the volume externally (for example, using "
-                    "your amplifier) or if you use an external mixer program."));
-    return gc;
-}
-
-HostComboBox *AudioMixerSettings::MixerDevice()
-{
-    HostComboBox *gc = new HostComboBox("MixerDevice", true);
-    gc->setLabel(QObject::tr("Mixer device"));
-
-#ifdef USING_OSS
-    QDir dev("/dev", "mixer*", QDir::Name, QDir::System);
-    gc->fillSelectionsFromDir(dev);
-
-    dev.setPath("/dev/sound");
-    if (dev.exists())
-    {
-        gc->fillSelectionsFromDir(dev);
-    }
-#endif
-#ifdef USING_ALSA
-    gc->addSelection("ALSA:default", "ALSA:default");
-#endif
-#ifdef USING_MINGW
-    gc->addSelection("DirectX:", "DirectX:");
-    gc->addSelection("Windows:", "Windows:");
-#endif
-#if !defined(USING_MINGW)
-    gc->addSelection("software", "software");
-    gc->setHelpText(QObject::tr("Setting the mixer device to \"software\" "
-                    "lets MythTV control the volume of all audio at the "
-                    "expense of a slight quality loss."));
-#endif
-
-    return gc;
-}
-
-const char* AudioMixerSettings::MixerControlControls[] = { "PCM",
-                                                           "Master" };
-
-HostComboBox *AudioMixerSettings::MixerControl()
-{
-    HostComboBox *gc = new HostComboBox("MixerControl", true);
-    gc->setLabel(QObject::tr("Mixer controls"));
-    for (unsigned int i = 0; i < sizeof(MixerControlControls) / sizeof(char*);
-         ++i)
-    {
-        gc->addSelection(QObject::tr(MixerControlControls[i]),
-                         MixerControlControls[i]);
-    }
-
-    gc->setHelpText(QObject::tr("Changing the volume adjusts the selected mixer."));
-    return gc;
-}
-
-HostSlider *AudioMixerSettings::MixerVolume()
-{
-    HostSlider *gs = new HostSlider("MasterMixerVolume", 0, 100, 1);
-    gs->setLabel(QObject::tr("Master mixer volume"));
-    gs->setValue(70);
-    gs->setHelpText(QObject::tr("Initial volume for the Master mixer. "
-                    "This affects all sound created by the audio device. "
-                    "Note: Do not set this too low."));
-    return gs;
-}
-
-HostSlider *AudioMixerSettings::PCMVolume()
-{
-    HostSlider *gs = new HostSlider("PCMMixerVolume", 0, 100, 1);
-    gs->setLabel(QObject::tr("PCM mixer volume"));
-    gs->setValue(70);
-    gs->setHelpText(QObject::tr("Initial volume for PCM output. Using the "
-                    "volume keys in MythTV will adjust this parameter."));
-    return gs;
-}
-
-AudioMixerSettings::AudioMixerSettings() :
-    TriggeredConfigurationGroup(false, true, false, false)
-{
-    setLabel(QObject::tr("Audio Mixer"));
-    setUseLabel(false);
-
-    Setting *volumeControl = MythControlsVolume();
-    addChild(volumeControl);
-
-        // Mixer settings
-    ConfigurationGroup *settings =
-        new VerticalConfigurationGroup(false, true, false, false);
-    settings->addChild(MixerDevice());
-    settings->addChild(MixerControl());
-    settings->addChild(MixerVolume());
-    settings->addChild(PCMVolume());
-
-    ConfigurationGroup *dummy =
-        new VerticalConfigurationGroup(false, true, false, false);
-
-        // Show Mixer config only if internal volume controls enabled
-    setTrigger(volumeControl);
-    addTarget("0", dummy);
-    addTarget("1", settings);
-}
-
-AudioGeneralSettings::AudioGeneralSettings()
-{
-    addChild(new AudioConfigSettings(this));
-    addChild(new AudioMixerSettings());
-}
-
-HostCheckBox *AudioAdvancedSettings::MPCM()
-{
-    HostCheckBox *gc = new HostCheckBox("StereoPCM");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("StereoPCM");
     gc->setLabel(QObject::tr("Stereo PCM Only"));
     gc->setValue(false);
     gc->setHelpText(QObject::tr("Enable if your amplifier or sound decoder "
@@ -1072 +1023 @@
     return gc;
 }
 
-HostCheckBox *AudioAdvancedSettings::SRCQualityOverride()
+HostCheckBoxSetting *AudioConfigSettings::SRCQualityOverride()
 {
-    HostCheckBox *gc = new HostCheckBox("SRCQualityOverride");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("SRCQualityOverride");
     gc->setLabel(QObject::tr("Override SRC quality"));
     gc->setValue(false);
     gc->setHelpText(QObject::tr("Enable to override audio sample rate "
@@ -1082 +1033 @@
     return gc;
 }
 
-HostComboBox *AudioAdvancedSettings::SRCQuality()
+HostComboBoxSetting *AudioConfigSettings::SRCQuality()
 {
-    HostComboBox *gc = new HostComboBox("SRCQuality", false);
+    HostComboBoxSetting *gc = new HostComboBoxSetting("SRCQuality", false);
     gc->setLabel(QObject::tr("Sample rate conversion"));
     gc->addSelection(QObject::tr("Disabled"), "-1");
     gc->addSelection(QObject::tr("Fastest"), "0");
@@ -1097 +1048 @@
     return gc;
 }
 
-HostCheckBox *AudioAdvancedSettings::Audio48kOverride()
+HostCheckBoxSetting *AudioConfigSettings::Audio48kOverride()
 {
-    HostCheckBox *gc = new HostCheckBox("Audio48kOverride");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("Audio48kOverride");
     gc->setLabel(QObject::tr("Force audio device output to 48kHz"));
     gc->setValue(false);
     gc->setHelpText(QObject::tr("Force audio sample rate to 48kHz. "
@@ -1108 +1059 @@
     return gc;
 }
 
-HostCheckBox *AudioAdvancedSettings::PassThroughOverride()
+HostCheckBoxSetting *AudioConfigSettings::PassThroughOverride()
 {
-    HostCheckBox *gc = new HostCheckBox("PassThruDeviceOverride");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("PassThruDeviceOverride");
     gc->setLabel(QObject::tr("Separate digital output device"));
     gc->setValue(false);
     gc->setHelpText(QObject::tr("Use a distinct digital output device from "
@@ -1119 +1070 @@
     return gc;
 }
 
-HostComboBox *AudioAdvancedSettings::PassThroughOutputDevice()
+HostComboBoxSetting *AudioConfigSettings::PassThroughOutputDevice()
 {
-    HostComboBox *gc = new HostComboBox("PassThruOutputDevice", true);
+    HostComboBoxSetting *gc = new HostComboBoxSetting("PassThruOutputDevice", true);
 
     gc->setLabel(QObject::tr("Digital output device"));
-    gc->addSelection(QObject::tr("Default"), "Default");
+    //TODO Is default not equivalent to PassThroughOverride off? if so PassThruDeviceOverride dsetting could be removed
+    gc->addSelection(QObject::tr("Default"), "Default"); 
 #ifdef USING_MINGW
     gc->addSelection("DirectX:Primary Sound Driver");
 #else
@@ -1140 +1092 @@
     return gc;
 }
 
-HostCheckBox *AudioAdvancedSettings::SPDIFRateOverride()
+HostCheckBoxSetting *AudioConfigSettings::SPDIFRateOverride()
 {
-    HostCheckBox *gc = new HostCheckBox("SPDIFRateOverride");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("SPDIFRateOverride");
     gc->setLabel(QObject::tr("SPDIF 48kHz rate override"));
     gc->setValue(false);
     gc->setHelpText(QObject::tr("ALSA only. By default, let ALSA determine "
@@ -1152 +1104 @@
     return gc;
 }
 
-HostCheckBox *AudioAdvancedSettings::HBRPassthrough()
+HostCheckBoxSetting *AudioConfigSettings::HBRPassthrough()
 {
-    HostCheckBox *gc = new HostCheckBox("HBRPassthru");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("HBRPassthru");
     gc->setLabel(QObject::tr("HBR passthrough support"));
     gc->setValue(true);
     gc->setHelpText(QObject::tr("HBR support is required for TrueHD and DTS-HD "
@@ -1166 +1118 @@
     return gc;
 }
 
-AudioAdvancedSettings::AudioAdvancedSettings(bool mpcm)
-{
-    ConfigurationGroup *settings3 =
-        new HorizontalConfigurationGroup(false, false);
-
-    m_PassThroughOverride = PassThroughOverride();
-    TriggeredItem *sub3 =
-        new TriggeredItem(m_PassThroughOverride, PassThroughOutputDevice());
-    settings3->addChild(m_PassThroughOverride);
-    settings3->addChild(sub3);
-
-    ConfigurationGroup *settings4 =
-        new HorizontalConfigurationGroup(false, false);
-    Setting *srcqualityoverride = SRCQualityOverride();
-    TriggeredItem *sub4 =
-        new TriggeredItem(srcqualityoverride, SRCQuality());
-    settings4->addChild(srcqualityoverride);
-    settings4->addChild(sub4);
-
-    ConfigurationGroup *settings5 =
-        new HorizontalConfigurationGroup(false, false);
-    settings5->addChild(Audio48kOverride());
-#if USING_ALSA
-    settings5->addChild(SPDIFRateOverride());
-#endif
-
-    ConfigurationGroup *settings6 =
-        new HorizontalConfigurationGroup(false, false);
-    settings6->addChild(HBRPassthrough());
-
-    addChild(settings4);
-    addChild(settings5);
-    addChild(settings3);
-    addChild(settings6);
-
-    if (mpcm)
-    {
-        ConfigurationGroup *settings7;
-        settings7 = new HorizontalConfigurationGroup(false, false);
-        settings7->addChild(MPCM());
-        addChild(settings7);
-    }
-}
-
-AudioAdvancedSettingsGroup::AudioAdvancedSettingsGroup(bool mpcm)
+void AudioConfigSettings::setMPCMEnabled(bool flag)
 {
-    addChild(new AudioAdvancedSettings(mpcm));
+    m_MPCM->setEnabled(flag);
 }
 // vim:set sw=4 ts=4 expandtab:

mythtv/programs/mythfrontend/audiogeneralsettings.h

@@ -11 +11 @@
 #include "mythuibutton.h"
 #include "audiooutput.h"
 #include "mythcontext.h"
-#include "settings.h"
+#include "standardsettings.h"
 #include "mthread.h"
 
 class AudioDeviceComboBox;
+class AudioAdvancedSettings;
+class AudioTest;
 
-class AudioConfigSettings : public VerticalConfigurationGroup
+class AudioConfigSettings : public GroupSetting
 {
     Q_OBJECT
 
   public:
-    AudioConfigSettings(ConfigurationWizard *);
+    AudioConfigSettings();
 
     typedef QMap<QString,AudioOutput::AudioDeviceConfig> ADCMap;
 
@@ -29 +31 @@
     AudioOutput::ADCVect &AudioDeviceVect(void) { return devices; };
 
   private slots:
-    void UpdateVisibility(const QString&);
-    AudioOutputSettings UpdateCapabilities(const QString&);
+    void UpdateVisibility(StandardSetting *);
+    AudioOutputSettings UpdateCapabilities(StandardSetting *);
     void AudioRescan();
-    void AudioAdvanced();
-    void StartAudioTest();
+    void UpdateAudioTest();
 
   private:
+    void setMPCMEnabled(bool flag);
+
     AudioDeviceComboBox *OutputDevice();
-    HostComboBox        *MaxAudioChannels();
-    HostCheckBox        *AudioUpmix();
-    HostComboBox        *AudioUpmixType();
-    HostCheckBox        *AC3PassThrough();
-    HostCheckBox        *DTSPassThrough();
-    HostCheckBox        *EAC3PassThrough();
-    HostCheckBox        *TrueHDPassThrough();
-    HostCheckBox        *DTSHDPassThrough();
-    bool                 CheckPassthrough();
-
-    ConfigurationGroup  *m_cgsettings;
+    HostComboBoxSetting *MaxAudioChannels();
+    HostCheckBoxSetting *AudioUpmix();
+    HostComboBoxSetting *AudioUpmixType();
+    HostCheckBoxSetting *AC3PassThrough();
+    HostCheckBoxSetting *DTSPassThrough();
+    HostCheckBoxSetting *EAC3PassThrough();
+    HostCheckBoxSetting *TrueHDPassThrough();
+    HostCheckBoxSetting *DTSHDPassThrough();
+    HostCheckBoxSetting *MythControlsVolume();
+    HostComboBoxSetting *MixerDevice();
+    HostComboBoxSetting *MixerControl();
+    HostSpinBoxSetting  *MixerVolume();
+    HostSpinBoxSetting  *PCMVolume();
+
+    //advanced setting
+    HostCheckBoxSetting *MPCM();
+    HostCheckBoxSetting *SRCQualityOverride();
+    HostComboBoxSetting *SRCQuality();
+    HostCheckBoxSetting *Audio48kOverride();
+    HostCheckBoxSetting *PassThroughOverride();
+    HostComboBoxSetting *PassThroughOutputDevice();
+    HostCheckBoxSetting *SPDIFRateOverride();
+    HostCheckBoxSetting *HBRPassthrough();
+
+    bool                CheckPassthrough();
+
     AudioDeviceComboBox *m_OutputDevice;
-    HostComboBox        *m_MaxAudioChannels;
-    HostCheckBox        *m_AudioUpmix;
-    HostComboBox        *m_AudioUpmixType;
-    CheckBoxSetting     *m_triggerDigital;
-    HostCheckBox        *m_AC3PassThrough;
-    HostCheckBox        *m_DTSPassThrough;
-    HostCheckBox        *m_EAC3PassThrough;
-    HostCheckBox        *m_TrueHDPassThrough;
-    HostCheckBox        *m_DTSHDPassThrough;
+    HostComboBoxSetting *m_MaxAudioChannels;
+    HostCheckBoxSetting *m_AudioUpmix;
+    HostComboBoxSetting *m_AudioUpmixType;
+
+    // digital settings
+    GroupSetting        *m_triggerDigital;
+    HostCheckBoxSetting *m_AC3PassThrough;
+    HostCheckBoxSetting *m_DTSPassThrough;
+    HostCheckBoxSetting *m_EAC3PassThrough;
+    HostCheckBoxSetting *m_TrueHDPassThrough;
+    HostCheckBoxSetting *m_DTSHDPassThrough;
+    //advanced setting
+    HostCheckBoxSetting       *m_MPCM;
+    HostCheckBoxSetting       *m_PassThroughOverride;  
+    HostComboBoxSetting       *m_PassThroughDeviceOverride;
+
+    AudioTest           *m_audioTest;
+
     ADCMap               audiodevs;
     AudioOutput::ADCVect devices;
     QMutex               slotlock;
-    ConfigurationWizard *m_parent;
+
 };
 
-class AudioDeviceComboBox : public HostComboBox
+class AudioDeviceComboBox : public HostComboBoxSetting
 {
     Q_OBJECT
   public:
     AudioDeviceComboBox(AudioConfigSettings*);
     void AudioRescan();
 
+    virtual void edit(MythScreenType * screen);
+
   private slots:
-    void AudioDescriptionHelp(const QString&);
+    void AudioDescriptionHelp(StandardSetting * setting);
 
   private:
     AudioConfigSettings *m_parent;
 };
-
-class AudioMixerSettings : public TriggeredConfigurationGroup
+/*
+class AudioMixerSettings : public GroupSetting
 {
   public:
     AudioMixerSettings();
   private:
-    HostCheckBox       *MythControlsVolume();
-    HostComboBox       *MixerDevice();
-    HostComboBox       *MixerControl();
-    HostSlider         *MixerVolume();
-    HostSlider         *PCMVolume();
-    static const char  *MixerControlControls[];
-};
-
-class AudioGeneralSettings : public ConfigurationWizard
-{
-  public:
-    AudioGeneralSettings();
-};
-
-class AudioAdvancedSettings : public VerticalConfigurationGroup
-{
-  public:
-    AudioAdvancedSettings(bool mpcm);
-
-    HostCheckBox       *MPCM();
-    HostCheckBox       *SRCQualityOverride();
-    HostComboBox       *SRCQuality();
-    HostCheckBox       *Audio48kOverride();
-    HostCheckBox       *PassThroughOverride();
-    HostComboBox       *PassThroughOutputDevice();
-    HostCheckBox       *SPDIFRateOverride();
-    HostCheckBox       *HBRPassthrough();
-
-    CheckBoxSetting    *m_triggerMPCM;
-    HostCheckBox       *m_MPCM;
-    HostCheckBox       *m_PassThroughOverride;
-};
-
-class AudioAdvancedSettingsGroup : public ConfigurationWizard
-{
-  public:
-    AudioAdvancedSettingsGroup(bool mpcm);
-};
-
-class AudioTestGroup : public ConfigurationWizard
-{
-  public:
-    AudioTestGroup(QString main, QString passthrough,
-                   int channels, AudioOutputSettings settings);
-};
+    HostCheckBoxSetting *MythControlsVolume();
+    HostComboBoxSetting *MixerDevice();
+    HostComboBoxSetting *MixerControl();
+    HostSpinBoxSetting  *MixerVolume();
+    HostSpinBoxSetting  *PCMVolume();
+    static const char   *MixerControlControls[];
+};*/
 
 class ChannelChangedEvent : public QEvent
 {
@@ -170 +161 @@
     AudioFormat             m_format;
 };
 
-class AudioTest : public VerticalConfigurationGroup
+class AudioTest : public GroupSetting
 {
     Q_OBJECT
   public:
-    AudioTest(QString main, QString passthrough,
-              int channels, AudioOutputSettings settings);
+    AudioTest(/*QString main, QString passthrough,
+              int channels, AudioOutputSettings settings*/);
     ~AudioTest();
+   // m_audioTest->UpdateCapabilities(out, passthrough, channels, settings);
+    void UpdateCapabilities(QString main, QString passthrough,
+              int channels, AudioOutputSettings settings);
     bool event(QEvent *event);
 
   private:
-    int                     m_channels;
-    TransButtonSetting     *m_frontleft;
-    TransButtonSetting     *m_frontright;
-    TransButtonSetting     *m_center;
-    TransButtonSetting     *m_surroundleft;
-    TransButtonSetting     *m_surroundright;
-    TransButtonSetting     *m_rearleft;
-    TransButtonSetting     *m_rearright;
-    TransButtonSetting     *m_lfe;
-    AudioTestThread        *m_at;
-    TransButtonSetting     *m_button;
-    TransCheckBoxSetting   *m_hd;
-    QString                 m_main;
-    QString                 m_passthrough;
-    AudioOutputSettings     m_settings;
-    bool                    m_quality;
+    int                         m_channels;
+    ButtonStandardSetting      *m_frontleft;
+    ButtonStandardSetting      *m_frontright;
+    ButtonStandardSetting      *m_center;
+    ButtonStandardSetting      *m_surroundleft;
+    ButtonStandardSetting      *m_surroundright;
+    ButtonStandardSetting      *m_rearleft;
+    ButtonStandardSetting      *m_rearright;
+    ButtonStandardSetting      *m_lfe;
+    AudioTestThread            *m_at;
+    ButtonStandardSetting      *m_startButton;
+    TransMythUICheckBoxSetting *m_hd;
+    QString                     m_main;
+    QString                     m_passthrough;
+    AudioOutputSettings         m_settings;
+    bool                        m_quality;
 
   private slots:
-    void toggle(QString str);
+    void toggle();
     void togglequality(void);
+    void cancelTest();
+    void prepareTest();
 };
 #endif

mythtv/programs/mythfrontend/globalsettings.cpp

@@ -3 +3 @@
 
 // Standard UNIX C headers
 #include <unistd.h>
+#include <cmath>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -39 +40 @@
 #include "mythdirs.h"
 #include "mythuihelper.h"
 
-static HostCheckBox *DecodeExtraAudio()
+//Use for playBackGroup, to be remove at one point
+#include "playgroup.h"
+
+static HostCheckBoxSetting *DecodeExtraAudio()
 {
-    HostCheckBox *gc = new HostCheckBox("DecodeExtraAudio");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("DecodeExtraAudio");
     gc->setLabel(QObject::tr("Extra audio buffering"));
     gc->setValue(true);
     gc->setHelpText(QObject::tr("Enable this setting if MythTV is playing "
@@ -53 +57 @@
     return gc;
 }
 
-static HostComboBox *PIPLocationComboBox()
+static HostComboBoxSetting *PIPLocationComboBox()
 {
-    HostComboBox *gc = new HostComboBox("PIPLocation");
+    HostComboBoxSetting *gc = new HostComboBoxSetting("PIPLocation");
     gc->setLabel(QObject::tr("PIP video location"));
     for (uint loc = 0; loc < kPIP_END; ++loc)
         gc->addSelection(toString((PIPLocation) loc), QString::number(loc));
@@ -63 +67 @@
     return gc;
 }
 
-static HostComboBox *DisplayRecGroup()
+static HostComboBoxSetting *DisplayRecGroup()
 {
-    HostComboBox *gc = new HostComboBox("DisplayRecGroup");
+    HostComboBoxSetting *gc = new HostComboBoxSetting("DisplayRecGroup");
     gc->setLabel(QObject::tr("Default group filter to apply"));
 
     gc->addSelection(QObject::tr("All Programs"), QString("All Programs"));
@@ -99 +103 @@
 
     gc->setHelpText(QObject::tr("Default group filter to apply "
                     "on the View Recordings screen."));
+
     return gc;
 }
 
-static HostCheckBox *QueryInitialFilter()
+static HostCheckBoxSetting *QueryInitialFilter()
 {
-    HostCheckBox *gc = new HostCheckBox("QueryInitialFilter");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("QueryInitialFilter");
     gc->setLabel(QObject::tr("Always prompt for initial group filter"));
     gc->setValue(false);
     gc->setHelpText(QObject::tr("If enabled, always prompt the user for the "
@@ -113 +118 @@
     return gc;
 }
 
-static HostCheckBox *RememberRecGroup()
+static HostCheckBoxSetting *RememberRecGroup()
 {
-    HostCheckBox *gc = new HostCheckBox("RememberRecGroup");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("RememberRecGroup");
     gc->setLabel(QObject::tr("Save current group filter when changed"));
     gc->setValue(true);
     gc->setHelpText(QObject::tr("If enabled, remember the last selected filter "
@@ -124 +129 @@
     return gc;
 }
 
-static HostCheckBox *UseGroupNameAsAllPrograms()
+static HostCheckBoxSetting *UseGroupNameAsAllPrograms()
 {
-    HostCheckBox *gc = new HostCheckBox("DispRecGroupAsAllProg");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("DispRecGroupAsAllProg");
     gc->setLabel(QObject::tr("Show filter name instead of \"All Programs\""));
     gc->setValue(false);
     gc->setHelpText(QObject::tr("If enabled, use the name of the display "
@@ -135 +140 @@
     return gc;
 }
 
-static HostCheckBox *PBBStartInTitle()
+static HostCheckBoxSetting *PBBStartInTitle()
 {
-    HostCheckBox *gc = new HostCheckBox("PlaybackBoxStartInTitle");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("PlaybackBoxStartInTitle");
     gc->setLabel(QObject::tr("Start in group list"));
     gc->setValue(true);
     gc->setHelpText(QObject::tr("If enabled, the focus will "
@@ -146 +151 @@
     return gc;
 }
 
-static HostCheckBox *SmartForward()
+static HostCheckBoxSetting *SmartForward()
 {
-    HostCheckBox *gc = new HostCheckBox("SmartForward");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("SmartForward");
     gc->setLabel(QObject::tr("Smart fast forwarding"));
     gc->setValue(false);
     gc->setHelpText(QObject::tr("If enabled, then immediately after "
@@ -157 +162 @@
     return gc;
 }
 
-static HostCheckBox *ExactSeeking()
+static HostCheckBoxSetting *ExactSeeking()
 {
-    HostCheckBox *gc = new HostCheckBox("ExactSeeking");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("ExactSeeking");
     gc->setLabel(QObject::tr("Seek to exact frame"));
     gc->setValue(false);
     gc->setHelpText(QObject::tr("If enabled, seeking is frame exact, but "
@@ -167 +172 @@
     return gc;
 }
 
-static GlobalComboBox *CommercialSkipMethod()
+static GlobalComboBoxSetting *CommercialSkipMethod()
 {
-    GlobalComboBox *bc = new GlobalComboBox("CommercialSkipMethod");
+    GlobalComboBoxSetting *bc = new GlobalComboBoxSetting("CommercialSkipMethod");
     bc->setLabel(QObject::tr("Commercial detection method"));
     bc->setHelpText(QObject::tr(
                         "This determines the method used by MythTV to "
@@ -182 +187 @@
     return bc;
 }
 
-static GlobalCheckBox *CommFlagFast()
+static GlobalCheckBoxSetting *CommFlagFast()
 {
-    GlobalCheckBox *gc = new GlobalCheckBox("CommFlagFast");
+    GlobalCheckBoxSetting *gc = new GlobalCheckBoxSetting("CommFlagFast");
     gc->setLabel(QObject::tr("Enable experimental speedup of commercial detection"));
     gc->setValue(false);
     gc->setHelpText(QObject::tr("If enabled, experimental commercial detection "
@@ -192 +197 @@
     return gc;
 }
 
-static HostComboBox *AutoCommercialSkip()
+static HostComboBoxSetting *AutoCommercialSkip()
 {
-    HostComboBox *gc = new HostComboBox("AutoCommercialSkip");
+    HostComboBoxSetting *gc = new HostComboBoxSetting("AutoCommercialSkip");
     gc->setLabel(QObject::tr("Automatically skip commercials"));
     gc->addSelection(QObject::tr("Off"), "0");
     gc->addSelection(QObject::tr("Notify, but do not skip"), "2");
@@ -206 +211 @@
     return gc;
 }
 
-static GlobalCheckBox *AutoMetadataLookup()
+static GlobalCheckBoxSetting *AutoMetadataLookup()
 {
-    GlobalCheckBox *bc = new GlobalCheckBox("AutoMetadataLookup");
+    GlobalCheckBoxSetting *bc = new GlobalCheckBoxSetting("AutoMetadataLookup");
     bc->setLabel(QObject::tr("Run metadata lookup"));
     bc->setValue(true);
     bc->setHelpText(QObject::tr("This is the default value used for the "
@@ -217 +222 @@
     return bc;
 }
 
-static GlobalCheckBox *AutoCommercialFlag()
+static GlobalCheckBoxSetting *AutoCommercialFlag()
 {
-    GlobalCheckBox *bc = new GlobalCheckBox("AutoCommercialFlag");
+    GlobalCheckBoxSetting *bc = new GlobalCheckBoxSetting("AutoCommercialFlag");
     bc->setLabel(QObject::tr("Run commercial detection"));
     bc->setValue(true);
     bc->setHelpText(QObject::tr("This is the default value used for the "
@@ -228 +233 @@
     return bc;
 }
 
-static GlobalCheckBox *AutoTranscode()
+static GlobalCheckBoxSetting *AutoTranscode()
 {
-    GlobalCheckBox *bc = new GlobalCheckBox("AutoTranscode");
+    GlobalCheckBoxSetting *bc = new GlobalCheckBoxSetting("AutoTranscode");
     bc->setLabel(QObject::tr("Run transcoder"));
     bc->setValue(false);
     bc->setHelpText(QObject::tr("This is the default value used for the "
@@ -239 +244 @@
     return bc;
 }
 
-static GlobalComboBox *DefaultTranscoder()
+/*TODO This function is borrowed from RecordingProfile::fillSelections and sligthly modified 
+I will need to change the original to use a pure abstract class instead of SelectSetting
+*/
+static void RecordingProfile_fillSelections(MythUIComboBoxSetting *setting, int group,
+                                      bool foldautodetect)
+{
+    if (!group)
+    {
+       for (uint i = 0; !availProfiles[i].isEmpty(); i++)
+           setting->addSelection(availProfiles[i], availProfiles[i]);
+       return;
+    }
+
+    MSqlQuery result(MSqlQuery::InitCon());
+    result.prepare(
+        "SELECT name, id "
+        "FROM recordingprofiles "
+        "WHERE profilegroup = :GROUP "
+        "ORDER BY id");
+    result.bindValue(":GROUP", group);
+
+    if (!result.exec())
+    {
+        MythDB::DBError("RecordingProfile::fillSelections 1", result);
+        return;
+    }
+    else if (!result.next())
+    {
+        return;
+    }
+
+    if (group == RecordingProfile::TranscoderGroup && foldautodetect)
+    {
+        QString id = QString::number(RecordingProfile::TranscoderAutodetect);
+        setting->addSelection(QObject::tr("Autodetect"), id);
+    }
+
+    do
+    {
+        QString name = result.value(0).toString();
+        QString id   = result.value(1).toString();
+
+        if (group == RecordingProfile::TranscoderGroup)
+        {
+            if (name == "RTjpeg/MPEG4" || name == "MPEG2")
+            {
+                if (!foldautodetect)
+                {
+                    setting->addSelection(
+                        QObject::tr("Autodetect from %1").arg(name), id);
+                }
+            }
+            else
+            {
+                setting->addSelection(name, id);
+            }
+            continue;
+        }
+
+        setting->addSelection(name, id);
+    }
+    while (result.next());
+}
+
+static GlobalComboBoxSetting *DefaultTranscoder()
 {
-    GlobalComboBox *bc = new GlobalComboBox("DefaultTranscoder");
+    GlobalComboBoxSetting *bc = new GlobalComboBoxSetting("DefaultTranscoder");
     bc->setLabel(QObject::tr("Default transcoder"));
-    RecordingProfile::fillSelections(bc, RecordingProfile::TranscoderGroup,
+    RecordingProfile_fillSelections(bc, RecordingProfile::TranscoderGroup,
                                      true);
+
     bc->setHelpText(QObject::tr("This is the default value used for the "
                     "transcoder setting when a new scheduled "
                     "recording is created."));
     return bc;
 }
 
-static GlobalSpinBox *DeferAutoTranscodeDays()
+static GlobalSpinBoxSetting *DeferAutoTranscodeDays()
 {
-    GlobalSpinBox *gs = new GlobalSpinBox("DeferAutoTranscodeDays", 0, 365, 1);
+    GlobalSpinBoxSetting *gs = new GlobalSpinBoxSetting("DeferAutoTranscodeDays", 0, 365, 1);
     gs->setLabel(QObject::tr("Deferral days for auto transcode jobs"));
     gs->setHelpText(QObject::tr("If non-zero, automatic transcode jobs will "
                     "be scheduled to run this many days after a recording "
@@ -262 +332 @@
     return gs;
 }
 
-static GlobalCheckBox *AutoRunUserJob(uint job_num)
+static GlobalCheckBoxSetting *AutoRunUserJob(uint job_num)
 {
     QString dbStr = QString("AutoRunUserJob%1").arg(job_num);
     QString label = QObject::tr("Run user job #%1")
         .arg(job_num);
-    GlobalCheckBox *bc = new GlobalCheckBox(dbStr);
+    GlobalCheckBoxSetting *bc = new GlobalCheckBoxSetting(dbStr);
     bc->setLabel(label);
     bc->setValue(false);
     bc->setHelpText(QObject::tr("This is the default value used for the "
@@ -278 +348 @@
     return bc;
 }
 
-static GlobalCheckBox *AggressiveCommDetect()
+static GlobalCheckBoxSetting *AggressiveCommDetect()
 {
-    GlobalCheckBox *bc = new GlobalCheckBox("AggressiveCommDetect");
+    GlobalCheckBoxSetting *bc = new GlobalCheckBoxSetting("AggressiveCommDetect");
     bc->setLabel(QObject::tr("Strict commercial detection"));
     bc->setValue(true);
     bc->setHelpText(QObject::tr("Enable stricter commercial detection code. "
@@ -288 +358 @@
     return bc;
 }
 
-static HostSpinBox *CommRewindAmount()
+static HostSpinBoxSetting *CommRewindAmount()
 {
-    HostSpinBox *gs = new HostSpinBox("CommRewindAmount", 0, 10, 1);
+    HostSpinBoxSetting *gs = new HostSpinBoxSetting("CommRewindAmount", 0, 10, 1);
     gs->setLabel(QObject::tr("Commercial skip automatic rewind amount (secs)"));
     gs->setHelpText(QObject::tr("MythTV will automatically rewind "
                     "this many seconds after performing a commercial skip."));
@@ -298 +368 @@
     return gs;
 }
 
-static HostSpinBox *CommNotifyAmount()
+static HostSpinBoxSetting *CommNotifyAmount()
 {
-    HostSpinBox *gs = new HostSpinBox("CommNotifyAmount", 0, 10, 1);
+    HostSpinBoxSetting *gs = new HostSpinBoxSetting("CommNotifyAmount", 0, 10, 1);
     gs->setLabel(QObject::tr("Commercial skip notify amount (secs)"));
     gs->setHelpText(QObject::tr("MythTV will act like a commercial "
                     "begins this many seconds early. This can be useful "
@@ -310 +380 @@
     return gs;
 }
 
-static GlobalSpinBox *MaximumCommercialSkip()
+static GlobalSpinBoxSetting *MaximumCommercialSkip()
 {
-    GlobalSpinBox *bs = new GlobalSpinBox("MaximumCommercialSkip", 0, 3600, 10);
+    GlobalSpinBoxSetting *bs = new GlobalSpinBoxSetting("MaximumCommercialSkip", 0, 3600, 10);
     bs->setLabel(QObject::tr("Maximum commercial skip (secs)"));
     bs->setHelpText(QObject::tr("MythTV will discourage long manual commercial "
                     "skips. Skips which are longer than this will require the "
@@ -322 +392 @@
     return bs;
 }
 
-static GlobalSpinBox *MergeShortCommBreaks()
+static GlobalSpinBoxSetting *MergeShortCommBreaks()
 {
-    GlobalSpinBox *bs = new GlobalSpinBox("MergeShortCommBreaks", 0, 3600, 5);
+    GlobalSpinBoxSetting *bs = new GlobalSpinBoxSetting("MergeShortCommBreaks", 0, 3600, 5);
     bs->setLabel(QObject::tr("Merge short commercial breaks (secs)"));
     bs->setHelpText(QObject::tr("Treat consecutive commercial breaks shorter "
                     "than this as one break when skipping forward. Useful if "
@@ -334 +404 @@
     return bs;
 }
 
-static GlobalSpinBox *AutoExpireExtraSpace()
+
+static GlobalSpinBoxSetting *AutoExpireExtraSpace()
 {
-    GlobalSpinBox *bs = new GlobalSpinBox("AutoExpireExtraSpace", 0, 200, 1);
+    GlobalSpinBoxSetting *bs = new GlobalSpinBoxSetting("AutoExpireExtraSpace", 0, 200, 1);
     bs->setLabel(QObject::tr("Extra disk space (GB)"));
     bs->setHelpText(QObject::tr("Extra disk space (in gigabytes) beyond what "
                     "MythTV requires that you want to keep free on the "
@@ -345 +416 @@
     return bs;
 };
 
-#if 0
-static GlobalCheckBox *AutoExpireInsteadOfDelete()
-{
-    GlobalCheckBox *cb = new GlobalCheckBox("AutoExpireInsteadOfDelete");
-    cb->setLabel(QObject::tr("Auto-Expire instead of delete recording"));
-    cb->setValue(false);
-    cb->setHelpText(QObject::tr("If enabled, move deleted recordings to the "
-                    "'Deleted' recgroup and turn on autoexpire "
-                    "instead of deleting immediately."));
-    return cb;
-}
-#endif
-
-static GlobalSpinBox *DeletedMaxAge()
+static GlobalSpinBoxSetting *DeletedMaxAge()
 {
-    GlobalSpinBox *bs = new GlobalSpinBox("DeletedMaxAge", -1, 365, 1);
+    GlobalSpinBoxSetting *bs = new GlobalSpinBoxSetting("DeletedMaxAge", 0, 365, 1);
     bs->setLabel(QObject::tr("Time to retain deleted recordings (days)"));
     bs->setHelpText(QObject::tr("Determines the maximum number of days before "
                                 "undeleting a recording will become impossible. "
@@ -374 +432 @@
     return bs;
 };
 
-static GlobalCheckBox *DeletedFifoOrder()
+static GlobalCheckBoxSetting *DeletedFifoOrder()
 {
-    GlobalCheckBox *cb = new GlobalCheckBox("DeletedFifoOrder");
+    GlobalCheckBoxSetting *cb = new GlobalCheckBoxSetting("DeletedFifoOrder");
     cb->setLabel(QObject::tr("Expire in deleted order"));
     cb->setValue(false);
     cb->setHelpText(QObject::tr(
@@ -386 +444 @@
 };
 
 #if 0
-class DeletedExpireOptions : public TriggeredConfigurationGroup
+static GlobalCheckBoxSetting *AutoExpireInsteadOfDelete()
 {
-    public:
-     DeletedExpireOptions() :
-         TriggeredConfigurationGroup(false, false, false, false)
-         {
-             setLabel(QObject::tr("DeletedExpireOptions"));
-             Setting* enabled = AutoExpireInsteadOfDelete();
-             addChild(enabled);
-             setTrigger(enabled);
-
-             HorizontalConfigurationGroup* settings =
-                 new HorizontalConfigurationGroup(false);
-             settings->addChild(DeletedFifoOrder());
-             settings->addChild(DeletedMaxAge());
-             addTarget("1", settings);
-
-             // show nothing if fillEnabled is off
-             addTarget("0", new HorizontalConfigurationGroup(true));
-         };
-};
+    GlobalCheckBoxSetting *cb = new GlobalCheckBoxSetting("AutoExpireInsteadOfDelete");
+    cb->setLabel(QObject::tr("Auto-Expire instead of delete recording"));
+    cb->setValue(false);
+    cb->setHelpText(QObject::tr("If enabled, move deleted recordings to the "
+                    "'Deleted' recgroup and turn on autoexpire "
+                    "instead of deleting immediately."));
+
+    cb->addTargetedChild("1",DeletedFifoOrder());
+    cb->addTargetedChild("1",DeletedMaxAge());
+    return cb;
+}
+
 #endif
 
-static GlobalComboBox *AutoExpireMethod()
+static GlobalComboBoxSetting *AutoExpireMethod()
 {
-    GlobalComboBox *bc = new GlobalComboBox("AutoExpireMethod");
+    GlobalComboBoxSetting *bc = new GlobalComboBoxSetting("AutoExpireMethod");
     bc->setLabel(QObject::tr("Auto-Expire method"));
     bc->addSelection(QObject::tr("Oldest show first"), "1");
     bc->addSelection(QObject::tr("Lowest priority first"), "2");
@@ -423 +474 @@
     return bc;
 }
 
-static GlobalCheckBox *AutoExpireWatchedPriority()
+static GlobalCheckBoxSetting *AutoExpireWatchedPriority()
 {
-    GlobalCheckBox *bc = new GlobalCheckBox("AutoExpireWatchedPriority");
+    GlobalCheckBoxSetting *bc = new GlobalCheckBoxSetting("AutoExpireWatchedPriority");
     bc->setLabel(QObject::tr("Watched before unwatched"));
     bc->setValue(false);
     bc->setHelpText(QObject::tr("If enabled, programs that have been marked as "
@@ -434 +485 @@
     return bc;
 }
 
-static GlobalSpinBox *AutoExpireDayPriority()
+static GlobalSpinBoxSetting *AutoExpireDayPriority()
 {
-    GlobalSpinBox *bs = new GlobalSpinBox("AutoExpireDayPriority", 1, 400, 1);
+    GlobalSpinBoxSetting *bs = new GlobalSpinBoxSetting("AutoExpireDayPriority", 1, 400, 1);
     bs->setLabel(QObject::tr("Priority weight"));
     bs->setHelpText(QObject::tr("The number of days bonus a program gets for "
                     "each priority point. This is only used when the Weighted "
@@ -445 +496 @@
     return bs;
 };
 
-static GlobalCheckBox *AutoExpireDefault()
+static GlobalCheckBoxSetting *AutoExpireDefault()
 {
-    GlobalCheckBox *bc = new GlobalCheckBox("AutoExpireDefault");
+    GlobalCheckBoxSetting *bc = new GlobalCheckBoxSetting("AutoExpireDefault");
     bc->setLabel(QObject::tr("Auto-Expire default"));
     bc->setValue(true);
     bc->setHelpText(QObject::tr("If enabled, any new recording schedules "
@@ -456 +507 @@
     return bc;
 }
 
-static GlobalSpinBox *AutoExpireLiveTVMaxAge()
+static GlobalSpinBoxSetting *AutoExpireLiveTVMaxAge()
 {
-    GlobalSpinBox *bs = new GlobalSpinBox("AutoExpireLiveTVMaxAge", 1, 365, 1);
+    GlobalSpinBoxSetting *bs = new GlobalSpinBoxSetting("AutoExpireLiveTVMaxAge", 1, 365, 1);
     bs->setLabel(QObject::tr("Live TV max age (days)"));
     bs->setHelpText(QObject::tr("Auto-Expire will force expiration of Live "
                     "TV recordings when they are this many days old. Live TV "
                     "recordings may also be expired early if necessary to "
                     "free up disk space."));
-    bs->setValue(1);
+    bs->setValue((int)1);
     return bs;
 };
 
@@ -483 +534 @@
 }
 #endif
 
-static GlobalCheckBox *RerecordWatched()
+static GlobalCheckBoxSetting *RerecordWatched()
 {
-    GlobalCheckBox *bc = new GlobalCheckBox("RerecordWatched");
+    GlobalCheckBoxSetting *bc = new GlobalCheckBoxSetting("RerecordWatched");
     bc->setLabel(QObject::tr("Re-record watched"));
     bc->setValue(false);
     bc->setHelpText(QObject::tr("If enabled, programs that have been marked as "
@@ -494 +545 @@
     return bc;
 }
 
-static GlobalSpinBox *RecordPreRoll()
+static GlobalSpinBoxSetting *RecordPreRoll()
 {
-    GlobalSpinBox *bs = new GlobalSpinBox("RecordPreRoll", 0, 600, 60, true);
+    GlobalSpinBoxSetting *bs = new GlobalSpinBoxSetting("RecordPreRoll", 0, 600, 60, true);
     bs->setLabel(QObject::tr("Time to record before start of show "
                  "(secs)"));
     bs->setHelpText(QObject::tr("This global setting allows the recorder "
@@ -507 +558 @@
     return bs;
 }
 
-static GlobalSpinBox *RecordOverTime()
+static GlobalSpinBoxSetting *RecordOverTime()
 {
-    GlobalSpinBox *bs = new GlobalSpinBox("RecordOverTime", 0, 1800, 60, true);
+    GlobalSpinBoxSetting *bs = new GlobalSpinBoxSetting("RecordOverTime", 0, 1800, 60, true);
     bs->setLabel(QObject::tr("Time to record past end of show (secs)"));
     bs->setValue(0);
     bs->setHelpText(QObject::tr("This global setting allows the recorder "
@@ -519 +570 @@
     return bs;
 }
 
-static GlobalComboBox *OverTimeCategory()
+static GlobalComboBoxSetting *OverTimeCategory()
 {
-    GlobalComboBox *gc = new GlobalComboBox("OverTimeCategory");
+    GlobalComboBoxSetting *gc = new GlobalComboBoxSetting("OverTimeCategory");
     gc->setLabel(QObject::tr("Category of shows to be extended"));
     gc->setHelpText(QObject::tr("For a special category (e.g. "
                     "\"Sports event\"), request that shows be autoextended. "
                     "Only works if a show's category can be determined."));
 
     MSqlQuery query(MSqlQuery::InitCon());
+    //TODO We should not have any SQL here
     query.prepare("SELECT DISTINCT category FROM program GROUP BY category;");
 
     gc->addSelection("", "");
+
     if (query.exec())
     {
         while (query.next())
@@ -544 +597 @@
     return gc;
 }
 
-static GlobalSpinBox *CategoryOverTime()
+static GlobalSpinBoxSetting *CategoryOverTime()
 {
-    GlobalSpinBox *bs = new GlobalSpinBox("CategoryOverTime",
+    GlobalSpinBoxSetting *bs = new GlobalSpinBoxSetting("CategoryOverTime",
                                           0, 180, 60, true);
     bs->setLabel(QObject::tr("Record past end of show (mins)"));
     bs->setValue(30);
@@ -557 +610 @@
     return bs;
 }
 
-static VerticalConfigurationGroup *CategoryOverTimeSettings()
+static GroupSetting *CategoryOverTimeSettings()
 {
-    VerticalConfigurationGroup *vcg =
-        new VerticalConfigurationGroup(false, false);
-
+    GroupSetting *vcg = new GroupSetting();
     vcg->setLabel(QObject::tr("Category record over-time"));
-    vcg->setUseLabel(true);
     vcg->addChild(OverTimeCategory());
     vcg->addChild(CategoryOverTime());
     return vcg;
@@ -588 +638 @@
 
     return tmp;
 }
-
+/*
 PlaybackProfileItemConfig::PlaybackProfileItemConfig(ProfileItem &_item) :
     item(_item)
 {
@@ -1117 +1167 @@
     labels[i]->setValue(label_j);
     labels[j]->setValue(label_i);
 }
+*/
+
+static HostComboBoxSetting * CurrentPlaybackProfile()
+{
+    HostComboBoxSetting *grouptrigger = new HostComboBoxSetting("DefaultVideoPlaybackProfile");
+    grouptrigger->setLabel(QObject::tr("Current Video Playback Profile"));
+
+    QString host = gCoreContext->GetHostName();
+    QStringList profiles = VideoDisplayProfile::GetProfiles(host);
+    if (profiles.empty())
+    {
+        VideoDisplayProfile::CreateProfiles(host);
+        profiles = VideoDisplayProfile::GetProfiles(host);
+    }
+    if (profiles.empty())
+        return grouptrigger;
+
+    if (!profiles.contains("Normal") &&
+        !profiles.contains("High Quality") &&
+        !profiles.contains("Slim"))
+    {
+        VideoDisplayProfile::CreateNewProfiles(host);
+        profiles = VideoDisplayProfile::GetProfiles(host);
+    }
+
+    if (!profiles.contains("VDPAU Normal") &&
+        !profiles.contains("VDPAU High Quality") &&
+        !profiles.contains("VDPAU Slim"))
+    {
+        VideoDisplayProfile::CreateVDPAUProfiles(host);
+        profiles = VideoDisplayProfile::GetProfiles(host);
+    }
+
+    QString profile = VideoDisplayProfile::GetDefaultProfileName(host);
+    if (!profiles.contains(profile))
+    {
+        profile = (profiles.contains("Normal")) ? "Normal" : profiles[0];
+        VideoDisplayProfile::SetDefaultProfileName(profile, host);
+    }
+
+    QStringList::const_iterator it;
+    for (it = profiles.begin(); it != profiles.end(); ++it)
+        grouptrigger->addSelection(ProgramInfo::i18n(*it), *it);
+    return grouptrigger;
+}
 
-PlaybackProfileConfigs::PlaybackProfileConfigs(const QString &str) :
+/*
+PlaybackProfileConfigs::PlaybackProfileConfigs() :
     TriggeredConfigurationGroup(false, true,  true, true,
                                 false, false, true, true), grouptrigger(NULL)
 {
-    setLabel(QObject::tr("Playback Profiles") + str);
+    setLabel(QObject::tr("Playback Profiles"));
 
     QString host = gCoreContext->GetHostName();
     QStringList profiles = VideoDisplayProfile::GetProfiles(host);
@@ -1256 +1352 @@
 void PlaybackProfileConfigs::triggerChanged(const QString &trig)
 {
     TriggeredConfigurationGroup::triggerChanged(trig);
-}
+}*/
+/*
+class PlaybackProfileConfigsButton : public StandardSetting, public TransientStorage
+{
+  public:
+    PlaybackProfileConfigsButton():StandardSetting(),TransientStorage()
+    {
+        setLabel()
+        
+    };
 
-static HostComboBox *PlayBoxOrdering()
+    virtual void Load(void){StandardSetting::Load();};
+    virtual void Save(void){StandardSetting::Save();};
+    virtual bool edit(MythScreenType * screen);
+    virtual void resultEdit(DialogCompletionEvent *dce, MythUIButtonListItem *item){};
+    virtual void applyChange(){};
+};*/
+
+static HostComboBoxSetting *PlayBoxOrdering()
 {
     QString str[4] =
     {
@@ -1273 +1385 @@
         "refers to sections (e.g. \"All Programs\") which list "
         "multiple titles. Sections in parentheses are not affected.");
 
-    HostComboBox *gc = new HostComboBox("PlayBoxOrdering");
+    HostComboBoxSetting *gc = new HostComboBoxSetting("PlayBoxOrdering");
     gc->setLabel(QObject::tr("Episode sort orderings"));
 
     for (int i = 0; i < 4; ++i)
@@ -1285 +1397 @@
     return gc;
 }
 
-static HostComboBox *PlayBoxEpisodeSort()
+static HostComboBoxSetting *PlayBoxEpisodeSort()
 {
-    HostComboBox *gc = new HostComboBox("PlayBoxEpisodeSort");
+    HostComboBoxSetting *gc = new HostComboBoxSetting("PlayBoxEpisodeSort");
     gc->setLabel(QObject::tr("Sort episodes"));
     gc->addSelection(QObject::tr("Record date"), "Date");
     gc->addSelection(QObject::tr("Season/Episode"), "Season");
@@ -1297 +1409 @@
     return gc;
 }
 
-static HostSpinBox *FFRewReposTime()
+static HostSpinBoxSetting *FFRewReposTime()
 {
-    HostSpinBox *gs = new HostSpinBox("FFRewReposTime", 0, 200, 5);
+    HostSpinBoxSetting *gs = new HostSpinBoxSetting("FFRewReposTime", 0, 200, 5);
     gs->setLabel(QObject::tr("Fast forward/rewind reposition amount"));
     gs->setValue(100);
     gs->setHelpText(QObject::tr("When exiting sticky keys fast forward/rewind "
@@ -1310 +1422 @@
     return gs;
 }
 
-static HostCheckBox *FFRewReverse()
+static HostCheckBoxSetting *FFRewReverse()
 {
-    HostCheckBox *gc = new HostCheckBox("FFRewReverse");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("FFRewReverse");
     gc->setLabel(QObject::tr("Reverse direction in fast forward/rewind"));
     gc->setValue(true);
     gc->setHelpText(QObject::tr("If enabled, pressing the sticky rewind key "
@@ -1323 +1435 @@
     return gc;
 }
 
-static HostComboBox *MenuTheme()
+static HostComboBoxSetting *MenuTheme()
 {
-    HostComboBox *gc = new HostComboBox("MenuTheme");
+    HostComboBoxSetting *gc = new HostComboBoxSetting("MenuTheme");
     gc->setLabel(QObject::tr("Menu theme"));
 
     QList<ThemeInfo> themelist = GetMythUI()->GetThemes(THEME_MENU);
@@ -1358 +1470 @@
     return gc;
 }
 
-static HostSpinBox *OSDCC708TextZoomPercentage(void)
+static HostSpinBoxSetting *OSDCC708TextZoomPercentage(void)
 {
-    HostSpinBox *gs = new HostSpinBox("OSDCC708TextZoom", 50, 200, 5);
+    HostSpinBoxSetting *gs = new HostSpinBoxSetting("OSDCC708TextZoom", 50, 200, 5);
     gs->setLabel(QObject::tr("Subtitle text zoom percentage"));
     gs->setValue(100);
     gs->setHelpText(QObject::tr("Use this to enlarge or shrink text based subtitles."));
@@ -1368 +1480 @@
     return gs;
 }
 
-static HostComboBox *SubtitleFont()
+static HostComboBoxSetting *SubtitleFont()
 {
-    HostComboBox *hcb = new HostComboBox("DefaultSubtitleFont");
+    HostComboBoxSetting *hcb = new HostComboBoxSetting("DefaultSubtitleFont");
     QFontDatabase db;
     QStringList fonts = db.families();
     QStringList hide  = db.families(QFontDatabase::Symbol);
@@ -1385 +1497 @@
     return hcb;
 }
 
-static HostComboBox *SubtitleCodec()
+static HostComboBoxSetting *SubtitleCodec()
 {
-    HostComboBox *gc = new HostComboBox("SubtitleCodec");
+    HostComboBoxSetting *gc = new HostComboBoxSetting("SubtitleCodec");
 
     gc->setLabel(QObject::tr("Subtitle Codec"));
     QList<QByteArray> list = QTextCodec::availableCodecs();
@@ -1400 +1512 @@
     return gc;
 }
 
-static HostComboBox *ChannelOrdering()
+static HostComboBoxSetting *ChannelOrdering()
 {
-    HostComboBox *gc = new HostComboBox("ChannelOrdering");
+    HostComboBoxSetting *gc = new HostComboBoxSetting("ChannelOrdering");
     gc->setLabel(QObject::tr("Channel ordering"));
     gc->addSelection(QObject::tr("channel number"), "channum");
     gc->addSelection(QObject::tr("callsign"),       "callsign");
     return gc;
 }
 
-static HostSpinBox *VertScanPercentage()
+static HostSpinBoxSetting *VertScanPercentage()
 {
-    HostSpinBox *gs = new HostSpinBox("VertScanPercentage", -100, 100, 1);
+    HostSpinBoxSetting *gs = new HostSpinBoxSetting("VertScanPercentage", -100, 100, 1);
+    //TODO should this not be 0% -> 200%
     gs->setLabel(QObject::tr("Vertical scaling"));
     gs->setValue(0);
     gs->setHelpText(QObject::tr(
@@ -1420 +1533 @@
     return gs;
 }
 
-static HostSpinBox *HorizScanPercentage()
+static HostSpinBoxSetting *HorizScanPercentage()
 {
-    HostSpinBox *gs = new HostSpinBox("HorizScanPercentage", -100, 100, 1);
+    HostSpinBoxSetting *gs = new HostSpinBoxSetting("HorizScanPercentage", -100, 100, 1);
+    //TODO should this not be 0% -> 200%
     gs->setLabel(QObject::tr("Horizontal scaling"));
     gs->setValue(0);
     gs->setHelpText(QObject::tr(
@@ -1431 +1545 @@
     return gs;
 };
 
-static HostSpinBox *XScanDisplacement()
+static HostSpinBoxSetting *XScanDisplacement()
 {
-    HostSpinBox *gs = new HostSpinBox("XScanDisplacement", -50, 50, 1);
+    HostSpinBoxSetting *gs = new HostSpinBoxSetting("XScanDisplacement", -50, 50, 1);
     gs->setLabel(QObject::tr("Scan displacement (X)"));
     gs->setValue(0);
     gs->setHelpText(QObject::tr("Adjust this to move the image horizontally."));
     return gs;
 }
 
-static HostSpinBox *YScanDisplacement()
+static HostSpinBoxSetting *YScanDisplacement()
 {
-    HostSpinBox *gs = new HostSpinBox("YScanDisplacement", -50, 50, 1);
+    HostSpinBoxSetting *gs = new HostSpinBoxSetting("YScanDisplacement", -50, 50, 1);
     gs->setLabel(QObject::tr("Scan displacement (Y)"));
     gs->setValue(0);
     gs->setHelpText(QObject::tr("Adjust this to move the image vertically."));
     return gs;
 };
 
-static HostCheckBox *CCBackground()
+static HostCheckBoxSetting *CCBackground()
 {
-    HostCheckBox *gc = new HostCheckBox("CCBackground");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("CCBackground");
     gc->setLabel(QObject::tr("Black background for closed captioning"));
     gc->setValue(false);
     gc->setHelpText(QObject::tr(
@@ -1461 +1575 @@
     return gc;
 }
 
-static HostCheckBox *DefaultCCMode()
+static HostCheckBoxSetting *DefaultCCMode()
 {
-    HostCheckBox *gc = new HostCheckBox("DefaultCCMode");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("DefaultCCMode");
     gc->setLabel(QObject::tr("Always display closed captioning or subtitles"));
     gc->setValue(false);
     gc->setHelpText(QObject::tr(
@@ -1474 +1588 @@
     return gc;
 }
 
-static HostCheckBox *PreferCC708()
+static HostCheckBoxSetting *PreferCC708()
 {
-    HostCheckBox *gc = new HostCheckBox("Prefer708Captions");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("Prefer708Captions");
     gc->setLabel(QObject::tr("Prefer EIA-708 over EIA-608 captions"));
     gc->setValue(true);
     gc->setHelpText(
@@ -1487 +1601 @@
     return gc;
 }
 
-static HostCheckBox *EnableMHEG()
+static HostCheckBoxSetting *EnableMHEG()
 {
-    HostCheckBox *gc = new HostCheckBox("EnableMHEG");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("EnableMHEG");
     gc->setLabel(QObject::tr("Enable interactive TV"));
     gc->setValue(false);
     gc->setHelpText(QObject::tr(
@@ -1499 +1613 @@
     return gc;
 }
 
-static HostCheckBox *PersistentBrowseMode()
+static HostCheckBoxSetting *PersistentBrowseMode()
 {
-    HostCheckBox *gc = new HostCheckBox("PersistentBrowseMode");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("PersistentBrowseMode");
     gc->setLabel(QObject::tr("Always use browse mode in Live TV"));
     gc->setValue(true);
     gc->setHelpText(
@@ -1511 +1625 @@
     return gc;
 }
 
-static HostCheckBox *BrowseAllTuners()
+static HostCheckBoxSetting *BrowseAllTuners()
 {
-    HostCheckBox *gc = new HostCheckBox("BrowseAllTuners");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("BrowseAllTuners");
     gc->setLabel(QObject::tr("Browse all channels"));
     gc->setValue(false);
     gc->setHelpText(
@@ -1524 +1638 @@
     return gc;
 }
 
-static HostCheckBox *ClearSavedPosition()
+static HostCheckBoxSetting *ClearSavedPosition()
 {
-    HostCheckBox *gc = new HostCheckBox("ClearSavedPosition");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("ClearSavedPosition");
     gc->setLabel(QObject::tr("Clear bookmark on playback"));
     gc->setValue(true);
     gc->setHelpText(QObject::tr("If enabled, automatically clear the "
@@ -1536 +1650 @@
     return gc;
 }
 
-static HostCheckBox *AltClearSavedPosition()
+static HostCheckBoxSetting *AltClearSavedPosition()
 {
-    HostCheckBox *gc = new HostCheckBox("AltClearSavedPosition");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("AltClearSavedPosition");
     gc->setLabel(QObject::tr("Alternate clear and save bookmark"));
     gc->setValue(true);
     gc->setHelpText(QObject::tr("During playback the SELECT key "
@@ -1549 +1663 @@
     return gc;
 }
 
-static HostComboBox *PlaybackExitPrompt()
+static HostComboBoxSetting *PlaybackExitPrompt()
 {
-    HostComboBox *gc = new HostComboBox("PlaybackExitPrompt");
+    HostComboBoxSetting *gc = new HostComboBoxSetting("PlaybackExitPrompt");
     gc->setLabel(QObject::tr("Action on playback exit"));
     gc->addSelection(QObject::tr("Just exit"), "0");
     gc->addSelection(QObject::tr("Save position and exit"), "2");
@@ -1565 +1679 @@
     return gc;
 }
 
-static HostCheckBox *EndOfRecordingExitPrompt()
+static HostCheckBoxSetting *EndOfRecordingExitPrompt()
 {
-    HostCheckBox *gc = new HostCheckBox("EndOfRecordingExitPrompt");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("EndOfRecordingExitPrompt");
     gc->setLabel(QObject::tr("Prompt at end of recording"));
     gc->setValue(false);
     gc->setHelpText(QObject::tr("If enabled, a menu will be displayed allowing "
@@ -1576 +1690 @@
     return gc;
 }
 
-static HostCheckBox *JumpToProgramOSD()
+static HostCheckBoxSetting *JumpToProgramOSD()
 {
-    HostCheckBox *gc = new HostCheckBox("JumpToProgramOSD");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("JumpToProgramOSD");
     gc->setLabel(QObject::tr("Jump to program OSD"));
     gc->setValue(true);
     gc->setHelpText(QObject::tr(
@@ -1590 +1704 @@
     return gc;
 }
 
-static HostCheckBox *ContinueEmbeddedTVPlay()
+static HostCheckBoxSetting *ContinueEmbeddedTVPlay()
 {
-    HostCheckBox *gc = new HostCheckBox("ContinueEmbeddedTVPlay");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("ContinueEmbeddedTVPlay");
     gc->setLabel(QObject::tr("Continue playback when embedded"));
     gc->setValue(false);
     gc->setHelpText(QObject::tr(
@@ -1603 +1717 @@
     return gc;
 }
 
-static HostCheckBox *AutomaticSetWatched()
+static HostCheckBoxSetting *AutomaticSetWatched()
 {
-    HostCheckBox *gc = new HostCheckBox("AutomaticSetWatched");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("AutomaticSetWatched");
     gc->setLabel(QObject::tr("Automatically mark a recording as watched"));
     gc->setValue(false);
     gc->setHelpText(QObject::tr("If enabled, when you exit near the end of a "
@@ -1616 +1730 @@
     return gc;
 }
 
-static HostSpinBox *LiveTVIdleTimeout()
+static HostSpinBoxSetting *LiveTVIdleTimeout()
 {
-    HostSpinBox *gs = new HostSpinBox("LiveTVIdleTimeout", 0, 3600, 1);
+    HostSpinBoxSetting *gs = new HostSpinBoxSetting("LiveTVIdleTimeout", 0, 3600, 1);
     gs->setLabel(QObject::tr("Live TV idle timeout (mins)"));
     gs->setValue(0);
     gs->setHelpText(QObject::tr(
@@ -1653 +1767 @@
 //     return gc;
 // }
 
-static HostCheckBox *UseVirtualKeyboard()
+static HostCheckBoxSetting *UseVirtualKeyboard()
 {
-    HostCheckBox *gc = new HostCheckBox("UseVirtualKeyboard");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("UseVirtualKeyboard");
     gc->setLabel(QObject::tr("Use line edit virtual keyboards"));
     gc->setValue(true);
     gc->setHelpText(QObject::tr("If enabled, you can use a virtual keyboard "
@@ -1664 +1778 @@
     return gc;
 }
 
-static HostComboBox *OverrideExitMenu()
+static HostComboBoxSetting *OverrideExitMenu()
 {
-    HostComboBox *gc = new HostComboBox("OverrideExitMenu");
+    HostComboBoxSetting *gc = new HostComboBoxSetting("OverrideExitMenu");
     gc->setLabel(QObject::tr("Customize exit menu options"));
     gc->addSelection(QObject::tr("Default"), "0");
     gc->addSelection(QObject::tr("Show quit"), "1");
@@ -1681 +1795 @@
     return gc;
 }
 
-static HostLineEdit *RebootCommand()
+static HostTextEditSetting *RebootCommand()
 {
-    HostLineEdit *ge = new HostLineEdit("RebootCommand");
+    HostTextEditSetting *ge = new HostTextEditSetting("RebootCommand");
     ge->setLabel(QObject::tr("Reboot command"));
     ge->setValue("");
     ge->setHelpText(QObject::tr("Optional. Script to run if you select "
@@ -1693 +1807 @@
     return ge;
 }
 
-static HostLineEdit *HaltCommand()
+static HostTextEditSetting *HaltCommand()
 {
-    HostLineEdit *ge = new HostLineEdit("HaltCommand");
+    HostTextEditSetting *ge = new HostTextEditSetting("HaltCommand");
     ge->setLabel(QObject::tr("Halt command"));
     ge->setValue("");
     ge->setHelpText(QObject::tr("Optional. Script to run if you select "
@@ -1705 +1819 @@
     return ge;
 }
 
-static HostLineEdit *LircDaemonDevice()
+static HostTextEditSetting *LircDaemonDevice()
 {
-    HostLineEdit *ge = new HostLineEdit("LircSocket");
+// TODO Cannot use File browser as it can be address[:port]
+//    HostFileBrowserSetting *ge = new HostFileBrowserSetting("LircSocket");
+    HostTextEditSetting *ge = new HostTextEditSetting("LircSocket");
     ge->setLabel(QObject::tr("LIRC daemon socket"));
 
     /* lircd socket moved from /dev/ to /var/run/lirc/ in lirc 0.8.6 */
@@ -1722 +1838 @@
     return ge;
 }
 
-static HostLineEdit *ScreenShotPath()
+static HostTextEditSetting *ScreenShotPath()
 {
-    HostLineEdit *ge = new HostLineEdit("ScreenShotPath");
+    HostTextEditSetting *ge = new HostTextEditSetting("ScreenShotPath");
     ge->setLabel(QObject::tr("Screen shot path"));
     ge->setValue("/tmp/");
     ge->setHelpText(QObject::tr("Path to screenshot storage location. Should be writable by the frontend"));
     return ge;
 }
 
-static HostLineEdit *SetupPinCode()
+static HostTextEditSetting *SetupPinCode()
 {
-    HostLineEdit *ge = new HostLineEdit("SetupPinCode");
+    HostTextEditSetting *ge = new HostTextEditSetting("SetupPinCode");
     ge->setLabel(QObject::tr("Setup PIN code"));
     ge->setHelpText(QObject::tr("This PIN is used to control access to the "
                     "setup menus. If you want to use this feature, then "
@@ -1742 +1858 @@
     return ge;
 }
 
-static HostCheckBox *SetupPinCodeRequired()
+static HostCheckBoxSetting *SetupPinCodeRequired()
 {
-    HostCheckBox *gc = new HostCheckBox("SetupPinCodeRequired");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("SetupPinCodeRequired");
     gc->setLabel(QObject::tr("Require setup PIN") + "    ");
     gc->setValue(false);
     gc->setHelpText(QObject::tr("If enabled, you will not be able to return "
@@ -1753 +1869 @@
     return gc;
 }
 
-static HostComboBox *XineramaScreen()
+static HostComboBoxSetting *XineramaScreen()
 {
-    HostComboBox *gc = new HostComboBox("XineramaScreen", false);
+    HostComboBoxSetting *gc = new HostComboBoxSetting("XineramaScreen");
     int num = MythDisplay::GetNumberXineramaScreens();
     for (int i=0; i<num; ++i)
         gc->addSelection(QString::number(i), QString::number(i));
@@ -1768 +1884 @@
 }
 
 
-static HostComboBox *XineramaMonitorAspectRatio()
+static HostComboBoxSetting *XineramaMonitorAspectRatio()
 {
-    HostComboBox *gc = new HostComboBox("XineramaMonitorAspectRatio");
+    HostComboBoxSetting *gc = new HostComboBoxSetting("XineramaMonitorAspectRatio");
     gc->setLabel(QObject::tr("Monitor aspect ratio"));
     gc->addSelection(QObject::tr("4:3"),   "1.3333");
     gc->addSelection(QObject::tr("16:9"),  "1.7777");
@@ -1781 +1897 @@
     return gc;
 }
 
-static HostComboBox *LetterboxingColour()
+static HostComboBoxSetting *LetterboxingColour()
 {
-    HostComboBox *gc = new HostComboBox("LetterboxColour");
+    HostComboBoxSetting *gc = new HostComboBoxSetting("LetterboxColour");
     gc->setLabel(QObject::tr("Letterboxing color"));
     for (int m = kLetterBoxColour_Black; m < kLetterBoxColour_END; ++m)
         gc->addSelection(toString((LetterBoxColour)m), QString::number(m));
@@ -1796 +1912 @@
     return gc;
 }
 
-static HostComboBox *AspectOverride()
+static HostComboBoxSetting *AspectOverride()
 {
-    HostComboBox *gc = new HostComboBox("AspectOverride");
+    HostComboBoxSetting *gc = new HostComboBoxSetting("AspectOverride");
     gc->setLabel(QObject::tr("Video aspect override"));
     for (int m = kAspect_Off; m < kAspect_END; ++m)
         gc->addSelection(toString((AspectOverrideMode)m), QString::number(m));
@@ -1809 +1925 @@
     return gc;
 }
 
-static HostComboBox *AdjustFill()
+static HostComboBoxSetting *AdjustFill()
 {
-    HostComboBox *gc = new HostComboBox("AdjustFill");
+    HostComboBoxSetting *gc = new HostComboBoxSetting("AdjustFill");
     gc->setLabel(QObject::tr("Zoom"));
     for (int m = kAdjustFill_Off; m < kAdjustFill_END; ++m)
         gc->addSelection(toString((AdjustFillMode)m), QString::number(m));
@@ -1827 +1943 @@
 
 // Theme settings
 
-static HostSpinBox *GuiWidth()
+static HostSpinBoxSetting *GuiWidth()
 {
-    HostSpinBox *gs = new HostSpinBox("GuiWidth", 0, 1920, 8, true);
+    HostSpinBoxSetting *gs = new HostSpinBoxSetting("GuiWidth", 0, 1920, 8, true);
     gs->setLabel(QObject::tr("GUI width (pixels)"));
     gs->setValue(0);
     gs->setHelpText(QObject::tr("The width of the GUI. Do not make the GUI "
@@ -1838 +1954 @@
     return gs;
 }
 
-static HostSpinBox *GuiHeight()
+static HostSpinBoxSetting *GuiHeight()
 {
-    HostSpinBox *gs = new HostSpinBox("GuiHeight", 0, 1600, 8, true);
+    HostSpinBoxSetting *gs = new HostSpinBoxSetting("GuiHeight", 0, 1600, 8, true);
     gs->setLabel(QObject::tr("GUI height (pixels)"));
     gs->setValue(0);
     gs->setHelpText(QObject::tr("The height of the GUI. Do not make the GUI "
@@ -1849 +1965 @@
     return gs;
 }
 
-static HostSpinBox *GuiOffsetX()
+static HostSpinBoxSetting *GuiOffsetX()
 {
-    HostSpinBox *gs = new HostSpinBox("GuiOffsetX", -3840, 3840, 32, true);
+    HostSpinBoxSetting *gs = new HostSpinBoxSetting("GuiOffsetX", -3840, 3840, 32, true);
     gs->setLabel(QObject::tr("GUI X offset"));
     gs->setValue(0);
     gs->setHelpText(QObject::tr("The horizontal offset where the GUI will be "
@@ -1859 +1975 @@
     return gs;
 }
 
-static HostSpinBox *GuiOffsetY()
+static HostSpinBoxSetting *GuiOffsetY()
 {
-    HostSpinBox *gs = new HostSpinBox("GuiOffsetY", -1600, 1600, 8, true);
+    HostSpinBoxSetting *gs = new HostSpinBoxSetting("GuiOffsetY", -1600, 1600, 8, true);
     gs->setLabel(QObject::tr("GUI Y offset"));
     gs->setValue(0);
     gs->setHelpText(QObject::tr("The vertical offset where the GUI will be "
@@ -1893 +2009 @@
 }
 #endif
 
-static HostCheckBox *GuiSizeForTV()
+static HostCheckBoxSetting *GuiSizeForTV()
 {
-    HostCheckBox *gc = new HostCheckBox("GuiSizeForTV");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("GuiSizeForTV");
     gc->setLabel(QObject::tr("Use GUI size for TV playback"));
     gc->setValue(true);
     gc->setHelpText(QObject::tr("If enabled, use the above size for TV, "
@@ -1904 +2020 @@
 }
 
 #if defined(USING_XRANDR) || CONFIG_DARWIN
-static HostCheckBox *UseVideoModes()
-{
-    HostCheckBox *gc = new HostCheckBox("UseVideoModes");
-    gc->setLabel(QObject::tr("Separate video modes for GUI and TV playback"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("Switch X Window video modes for TV. "
-                    "Requires \"xrandr\" support."));
-    return gc;
-}
 
-static HostSpinBox *VidModeWidth(int idx)
+static HostSpinBoxSetting *VidModeWidth(int idx)
 {
-    HostSpinBox *gs = new HostSpinBox(QString("VidModeWidth%1").arg(idx),
+    HostSpinBoxSetting *gs = new HostSpinBoxSetting(QString("VidModeWidth%1").arg(idx),
                                             0, 1920, 16, true);
     gs->setLabel((idx<1) ? QObject::tr("In X"): "");
-    gs->setLabelAboveWidget(idx<1);
     gs->setValue(0);
     gs->setHelpText(QObject::tr("Horizontal resolution of video "
                     "which needs a special output resolution."));
     return gs;
 }
 
-static HostSpinBox *VidModeHeight(int idx)
+static HostSpinBoxSetting *VidModeHeight(int idx)
 {
-    HostSpinBox *gs = new HostSpinBox(QString("VidModeHeight%1").arg(idx),
+    HostSpinBoxSetting *gs = new HostSpinBoxSetting(QString("VidModeHeight%1").arg(idx),
                                             0, 1080, 16, true);
     gs->setLabel((idx<1) ? QObject::tr("In Y"): "");
-    gs->setLabelAboveWidget(idx<1);
     gs->setValue(0);
     gs->setHelpText(QObject::tr("Vertical resolution of video "
                     "which needs a special output resolution."));
     return gs;
 }
 
-static HostComboBox *GuiVidModeResolution()
+static HostComboBoxSetting *GuiVidModeResolution()
 {
-    HostComboBox *gc = new HostComboBox("GuiVidModeResolution");
+    HostComboBoxSetting *gc = new HostComboBoxSetting("GuiVidModeResolution");
     gc->setLabel(QObject::tr("GUI"));
-    gc->setLabelAboveWidget(true);
     gc->setHelpText(QObject::tr("Resolution of screen "
                     "when not watching a video."));
 
@@ -1971 +2075 @@
     return gc;
 }
 
-static HostComboBox *TVVidModeResolution(int idx=-1)
+static HostComboBoxSetting *TVVidModeResolution(int idx=-1)
 {
     QString dhelp = QObject::tr("Default screen resolution "
                                 "when watching a video.");
@@ -1980 +2084 @@
 
     QString qstr = (idx<0) ? "TVVidModeResolution" :
         QString("TVVidModeResolution%1").arg(idx);
-    HostComboBox *gc = new HostComboBox(qstr);
+    HostComboBoxSetting *gc = new HostComboBoxSetting(qstr);
     QString lstr = (idx<0) ? QObject::tr("Video output") :
         ((idx<1) ? QObject::tr("Output") : "");
     QString hstr = (idx<0) ? dhelp : ohelp;
 
     gc->setLabel(lstr);
-    gc->setLabelAboveWidget(idx<1);
     gc->setHelpText(hstr);
 
     const vector<DisplayResScreen> scr = GetVideoModes();
@@ -1998 +2101 @@
     return gc;
 }
 
-static HostRefreshRateComboBox *TVVidModeRefreshRate(int idx=-1)
+
+void HostRefreshRateComboBoxSetting::ChangeResolution(StandardSetting * setting)
+{
+    clearSelections();
+    QString resolution = setting->getValue();
+
+    const vector<double> list = GetRefreshRates(resolution);
+    addSelection(QObject::tr("Auto"), "0");
+    int hz50 = -1, hz60 = -1;
+    for (uint i=0; i<list.size(); ++i)
+    {
+        QString sel = QString::number((double) list[i],'f', 3);
+        addSelection(sel+" Hz", sel);
+        hz50 = (fabs(50.0 - list[i]) < 0.01) ? i : hz50;
+        hz60 = (fabs(60.0 - list[i]) < 0.01) ? i : hz60;
+    }
+
+    setValue(0);
+    if ("640x480" == resolution || "720x480" == resolution)
+        setValue(hz60+1);
+    if ("640x576" == resolution || "720x576" == resolution)
+        setValue(hz50+1);
+
+    setEnabled(list.size());
+}
+
+const vector<double> HostRefreshRateComboBoxSetting::GetRefreshRates(const QString &res)
+{
+    QStringList slist = res.split("x");
+    int w = 0, h = 0;
+    bool ok0 = false, ok1 = false;
+    if (2 == slist.size())
+    {
+        w = slist[0].toInt(&ok0);
+        h = slist[1].toInt(&ok1);
+    }
+
+    DisplayRes *display_res = DisplayRes::GetDisplayRes();
+    if (display_res && ok0 && ok1)
+        return display_res->GetRefreshRates(w, h);
+
+    vector<double> list;
+    return list;
+}
+
+
+static HostRefreshRateComboBoxSetting *TVVidModeRefreshRate(int idx=-1)
 {
     QString dhelp = QObject::tr("Default refresh rate "
                                 "when watching a video. "
@@ -2008 +2157 @@
                                 "Leave at \"Auto\" to automatically use the best available");
     QString qstr = (idx<0) ? "TVVidModeRefreshRate" :
         QString("TVVidModeRefreshRate%1").arg(idx);
-    HostRefreshRateComboBox *gc = new HostRefreshRateComboBox(qstr);
+    HostRefreshRateComboBoxSetting *gc = new HostRefreshRateComboBoxSetting(qstr);
     QString lstr = (idx<1) ? QObject::tr("Rate") : "";
     QString hstr = (idx<0) ? dhelp : ohelp;
 
     gc->setLabel(lstr);
-    gc->setLabelAboveWidget(idx<1);
     gc->setHelpText(hstr);
     gc->setEnabled(false);
     return gc;
 }
 
-static HostComboBox *TVVidModeForceAspect(int idx=-1)
+static HostComboBoxSetting *TVVidModeForceAspect(int idx=-1)
 {
     QString dhelp = QObject::tr("Aspect ratio when watching a video.");
     QString ohelp = QObject::tr("Aspect ratio when watching a "
@@ -2027 +2175 @@
 
     QString qstr = (idx<0) ? "TVVidModeForceAspect" :
         QString("TVVidModeForceAspect%1").arg(idx);
-    HostComboBox *gc = new HostComboBox(qstr);
+    HostComboBoxSetting *gc = new HostComboBoxSetting(qstr);
     gc->setLabel( (idx<1) ? QObject::tr("Aspect") : "" );
-    gc->setLabelAboveWidget(idx<1);
 
     QString hstr = (idx<0) ? dhelp : ohelp;
     gc->setHelpText(hstr+"  "+
@@ -2042 +2189 @@
     return gc;
 }
 
+
+
+class DefaultVideoMode : public GroupSetting
+{
+  public:
+    DefaultVideoMode():GroupSetting()
+    {
+        setLabel(QObject::tr("Video Mode Settings"));
+        m_res = TVVidModeResolution();
+        m_rate = TVVidModeRefreshRate();
+        addChild(GuiVidModeResolution());
+        addChild(m_res);
+        addChild(m_rate);
+        addChild(TVVidModeForceAspect());
+        connect(m_res, SIGNAL(valueChanged(StandardSetting *)),
+                m_rate, SLOT(ChangeResolution(StandardSetting *)));
+   }
+  private:
+    HostComboBoxSetting *m_res;
+    HostRefreshRateComboBoxSetting *m_rate;
+}; 
+
+
+class OverrideVideoMode : public GroupSetting
+{
+  public:
+    OverrideVideoMode (int idx):GroupSetting()
+    {
+        setLabel(QObject::tr("Override video mode #%1").arg(idx));
+        // input side
+        addChild(VidModeWidth(idx));
+        addChild(VidModeHeight(idx));
+        // output side
+        addChild(m_res = TVVidModeResolution(idx));
+        addChild(m_rate = TVVidModeRefreshRate(idx));
+        addChild(TVVidModeForceAspect(idx));
+                connect(m_res, SIGNAL(valueChanged(StandardSetting *)),
+                        m_rate, SLOT(ChangeResolution(StandardSetting *)));
+    }
+  private:
+    HostComboBoxSetting *m_res;
+    HostRefreshRateComboBoxSetting *m_rate;
+};
+
+static HostCheckBoxSetting *UseVideoModes() // replace VideoModeSettings
+{
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("UseVideoModes");
+    gc->setLabel(QObject::tr("Separate video modes for GUI and TV playback"));
+    gc->setValue(false);
+    gc->setHelpText(QObject::tr("Switch X Window video modes for TV. "
+                    "Requires \"xrandr\" support."));
+
+    gc->addTargetedChild("1",new DefaultVideoMode());
+
+    for (int idx = 0; idx < 3; ++idx)
+    {
+        gc->addTargetedChild("1",new OverrideVideoMode(idx));
+    }
+    return gc;
+}
+
+/*
 class VideoModeSettings : public TriggeredConfigurationGroup
 {
   public:
@@ -2058 +2267 @@
         ConfigurationGroup* defaultsettings =
             new HorizontalConfigurationGroup(false, false);
 
-        HostComboBox *res = TVVidModeResolution();
+        HostComboBoxSetting *res = TVVidModeResolution();
         HostRefreshRateComboBox *rate = TVVidModeRefreshRate();
         defaultsettings->addChild(GuiVidModeResolution());
         defaultsettings->addChild(res);
@@ -2091 +2300 @@
         addTarget("1", settings);
         addTarget("0", new VerticalConfigurationGroup(true));
     }
-};
+};*/
 #endif
 
-static HostCheckBox *HideMouseCursor()
+static HostCheckBoxSetting *HideMouseCursor()
 {
-    HostCheckBox *gc = new HostCheckBox("HideMouseCursor");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("HideMouseCursor");
     gc->setLabel(QObject::tr("Hide mouse cursor in MythTV"));
     gc->setValue(false);
     gc->setHelpText(QObject::tr("Toggles mouse cursor visibility for touchscreens. "
@@ -2106 +2315 @@
 };
 
 
-static HostCheckBox *RunInWindow()
+static HostCheckBoxSetting *RunInWindow()
 {
-    HostCheckBox *gc = new HostCheckBox("RunFrontendInWindow");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("RunFrontendInWindow");
     gc->setLabel(QObject::tr("Use window border"));
     gc->setValue(false);
     gc->setHelpText(QObject::tr("Toggles between windowed and "
@@ -2116 +2325 @@
     return gc;
 }
 
-static HostCheckBox *UseFixedWindowSize()
+static HostCheckBoxSetting *UseFixedWindowSize()
 {
 {
-    HostCheckBox *gc = new HostCheckBox("UseFixedWindowSize");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("UseFixedWindowSize");
     gc->setLabel(QObject::tr("Use fixed window size"));
     gc->setValue(true);
     gc->setHelpText(QObject::tr(
@@ -2129 +2338 @@
 }
 }
 
-static HostComboBox *MythDateFormatCB()
+static HostComboBoxSetting *MythDateFormatCB()
 {
-    HostComboBox *gc = new HostComboBox("DateFormat");
+    HostComboBoxSetting *gc = new HostComboBoxSetting("DateFormat");
     gc->setLabel(QObject::tr("Date format"));
 
     QDate sampdate = QDate::currentDate();
@@ -2170 +2379 @@
     return gc;
 }
 
-static HostComboBox *MythShortDateFormat()
+static HostComboBoxSetting *MythShortDateFormat()
 {
-    HostComboBox *gc = new HostComboBox("ShortDateFormat");
+    HostComboBoxSetting *gc = new HostComboBoxSetting("ShortDateFormat");
     gc->setLabel(QObject::tr("Short date format"));
 
     QDate sampdate = QDate::currentDate();
@@ -2209 +2418 @@
     return gc;
 }
 
-static HostComboBox *MythTimeFormat()
+static HostComboBoxSetting *MythTimeFormat()
 {
-    HostComboBox *gc = new HostComboBox("TimeFormat");
+    HostComboBoxSetting *gc = new HostComboBoxSetting("TimeFormat");
     gc->setLabel(QObject::tr("Time format"));
 
     QTime samptime = QTime::currentTime();
@@ -2229 +2438 @@
     return gc;
 }
 
-static HostComboBox *ChannelFormat()
+static HostComboBoxSetting *ChannelFormat()
 {
-    HostComboBox *gc = new HostComboBox("ChannelFormat");
+    HostComboBoxSetting *gc = new HostComboBoxSetting("ChannelFormat");
     gc->setLabel(QObject::tr("Channel format"));
     gc->addSelection(QObject::tr("number"), "<num>");
     gc->addSelection(QObject::tr("number callsign"), "<num> <sign>");
@@ -2243 +2452 @@
     return gc;
 }
 
-static HostComboBox *LongChannelFormat()
+static HostComboBoxSetting *LongChannelFormat()
 {
-    HostComboBox *gc = new HostComboBox("LongChannelFormat");
+    HostComboBoxSetting *gc = new HostComboBoxSetting("LongChannelFormat");
     gc->setLabel(QObject::tr("Long channel format"));
     gc->addSelection(QObject::tr("number"), "<num>");
     gc->addSelection(QObject::tr("number callsign"), "<num> <sign>");
@@ -2257 +2466 @@
     return gc;
 }
 
-static GlobalCheckBox *LiveTVPriority()
+static GlobalCheckBoxSetting *LiveTVPriority()
 {
-    GlobalCheckBox *bc = new GlobalCheckBox("LiveTVPriority");
+    GlobalCheckBoxSetting *bc = new GlobalCheckBoxSetting("LiveTVPriority");
     bc->setLabel(QObject::tr("Allow Live TV to move scheduled shows"));
     bc->setValue(false);
     bc->setHelpText(QObject::tr("If enabled, scheduled recordings will "
@@ -2268 +2477 @@
     return bc;
 }
 
-static HostCheckBox *ChannelGroupRememberLast()
-{
-    HostCheckBox *gc = new HostCheckBox("ChannelGroupRememberLast");
-    gc->setLabel(QObject::tr("Remember last channel group"));
-    gc->setHelpText(QObject::tr("If enabled, the EPG will initially display "
-                    "only the channels from the last channel group selected. Pressing "
-                    "\"4\" will toggle channel group."));
-    gc->setValue(false);
-    return gc;
-}
 
-static HostComboBox *ChannelGroupDefault()
+
+static HostComboBoxSetting *ChannelGroupDefault()
 {
-    HostComboBox *gc = new HostComboBox("ChannelGroupDefault");
+    HostComboBoxSetting *gc = new HostComboBoxSetting("ChannelGroupDefault");
     gc->setLabel(QObject::tr("Default channel group"));
 
     ChannelGroupList changrplist;
@@ -2301 +2501 @@
     return gc;
 }
 
-static HostCheckBox *BrowseChannelGroup()
+static HostCheckBoxSetting *ChannelGroupRememberLast()
+{
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("ChannelGroupRememberLast");
+    gc->setLabel(QObject::tr("Remember last channel group"));
+    gc->setHelpText(QObject::tr("If enabled, the EPG will initially display "
+                    "only the channels from the last channel group selected. Pressing "
+                    "\"4\" will toggle channel group."));
+    gc->setValue(false);
+    gc->addTargetedChild("0", ChannelGroupDefault());
+    return gc;
+}
+
+static HostCheckBoxSetting *BrowseChannelGroup()
 {
-    HostCheckBox *gc = new HostCheckBox("BrowseChannelGroup");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("BrowseChannelGroup");
     gc->setLabel(QObject::tr("Browse/change channels from Channel Group"));
     gc->setHelpText(QObject::tr("If enabled, Live TV will browse or change "
                     "channels from the selected channel group. The \"All "
@@ -2313 +2525 @@
     return gc;
 }
 
-// Channel Group Settings
-class ChannelGroupSettings : public TriggeredConfigurationGroup
-{
-  public:
-    ChannelGroupSettings() : TriggeredConfigurationGroup(false, true, false, false)
-    {
-         setLabel(QObject::tr("Remember last channel group"));
-         setUseLabel(false);
-
-         Setting* RememberChanGrpEnabled = ChannelGroupRememberLast();
-         addChild(RememberChanGrpEnabled);
-         setTrigger(RememberChanGrpEnabled);
-
-         ConfigurationGroup* settings = new VerticalConfigurationGroup(false,false);
-         settings->addChild(ChannelGroupDefault());
-         addTarget("0", settings);
-
-         // show nothing if RememberChanGrpEnabled is on
-         addTarget("1", new VerticalConfigurationGroup(true,false));
-     };
-};
-
 // General RecPriorities settings
 
-static GlobalCheckBox *GRSchedMoveHigher()
+static GlobalCheckBoxSetting *GRSchedMoveHigher()
 {
-    GlobalCheckBox *bc = new GlobalCheckBox("SchedMoveHigher");
+    GlobalCheckBoxSetting *bc = new GlobalCheckBoxSetting("SchedMoveHigher");
     bc->setLabel(QObject::tr("Reschedule higher priorities"));
     bc->setHelpText(QObject::tr("Move higher priority programs to other "
                     "cards and showings when resolving conflicts. This "
@@ -2350 +2540 @@
     return bc;
 }
 
-static GlobalComboBox *GRSchedOpenEnd()
+static GlobalComboBoxSetting *GRSchedOpenEnd()
 {
-    GlobalComboBox *bc = new GlobalComboBox("SchedOpenEnd");
+    GlobalComboBoxSetting *bc = new GlobalComboBoxSetting("SchedOpenEnd");
     bc->setLabel(QObject::tr("Avoid back to back recordings"));
     bc->setHelpText(QObject::tr("Selects the situations where the scheduler "
                     "will avoid assigning shows to the same card if their "
@@ -2365 +2555 @@
     return bc;
 }
 
-static GlobalSpinBox *GRDefaultStartOffset()
+static GlobalSpinBoxSetting *GRDefaultStartOffset()
 {
-    GlobalSpinBox *bs = new GlobalSpinBox("DefaultStartOffset",
+    GlobalSpinBoxSetting *bs = new GlobalSpinBoxSetting("DefaultStartOffset",
                                           -10, 30, 5, true);
     bs->setLabel(QObject::tr("Default 'Start Early' minutes for new "
                              "recording rules"));
@@ -2380 +2570 @@
     return bs;
 }
 
-static GlobalSpinBox *GRDefaultEndOffset()
+static GlobalSpinBoxSetting *GRDefaultEndOffset()
 {
-    GlobalSpinBox *bs = new GlobalSpinBox("DefaultEndOffset",
+    GlobalSpinBoxSetting *bs = new GlobalSpinBoxSetting("DefaultEndOffset",
                                           -10, 30, 5, true);
     bs->setLabel(QObject::tr("Default 'End Late' minutes for new "
                              "recording rules"));
@@ -2395 +2585 @@
     return bs;
 }
 
-static GlobalSpinBox *GRPrefInputRecPriority()
+static GlobalSpinBoxSetting *GRPrefInputRecPriority()
 {
-    GlobalSpinBox *bs = new GlobalSpinBox("PrefInputPriority", 1, 99, 1);
+    GlobalSpinBoxSetting *bs = new GlobalSpinBoxSetting("PrefInputPriority", 1, 99, 1);
     bs->setLabel(QObject::tr("Preferred input priority"));
     bs->setHelpText(QObject::tr("Additional priority when a showing "
                     "matches the preferred input selected in the 'Scheduling "
@@ -2406 +2596 @@
     return bs;
 }
 
-static GlobalSpinBox *GRHDTVRecPriority()
+static GlobalSpinBoxSetting *GRHDTVRecPriority()
 {
-    GlobalSpinBox *bs = new GlobalSpinBox("HDTVRecPriority", -99, 99, 1);
+    GlobalSpinBoxSetting *bs = new GlobalSpinBoxSetting("HDTVRecPriority", -99, 99, 1);
     bs->setLabel(QObject::tr("HDTV recording priority"));
     bs->setHelpText(QObject::tr("Additional priority when a showing "
                     "is marked as an HDTV broadcast in the TV listings."));
@@ -2416 +2606 @@
     return bs;
 }
 
-static GlobalSpinBox *GRWSRecPriority()
+static GlobalSpinBoxSetting *GRWSRecPriority()
 {
-    GlobalSpinBox *bs = new GlobalSpinBox("WSRecPriority", -99, 99, 1);
+    GlobalSpinBoxSetting *bs = new GlobalSpinBoxSetting("WSRecPriority", -99, 99, 1);
     bs->setLabel(QObject::tr("Widescreen recording priority"));
     bs->setHelpText(QObject::tr("Additional priority when a showing "
                     "is marked as widescreen in the TV listings."));
@@ -2426 +2616 @@
     return bs;
 }
 
-static GlobalSpinBox *GRAutoRecPriority()
+static GlobalSpinBoxSetting *GRAutoRecPriority()
 {
-    GlobalSpinBox *bs = new GlobalSpinBox("AutoRecPriority", -99, 99, 1);
+    GlobalSpinBoxSetting *bs = new GlobalSpinBoxSetting("AutoRecPriority", -99, 99, 1);
     bs->setLabel(QObject::tr("Automatic priority range (+/-)"));
     bs->setHelpText(QObject::tr("Up to this number of priority points may "
                     "be added for titles that are usually watched soon after "
@@ -2438 +2628 @@
     return bs;
 }
 
-static GlobalSpinBox *GRSignLangRecPriority()
+static GlobalSpinBoxSetting *GRSignLangRecPriority()
 {
-    GlobalSpinBox *bs = new GlobalSpinBox("SignLangRecPriority",
+    GlobalSpinBoxSetting *bs = new GlobalSpinBoxSetting("SignLangRecPriority",
                                             -99, 99, 1);
     bs->setLabel(QObject::tr("Sign language recording priority"));
     bs->setHelpText(QObject::tr("Additional priority when a showing "
@@ -2449 +2639 @@
     return bs;
 }
 
-static GlobalSpinBox *GROnScrSubRecPriority()
+static GlobalSpinBoxSetting *GROnScrSubRecPriority()
 {
-    GlobalSpinBox *bs = new GlobalSpinBox("OnScrSubRecPriority",
+    GlobalSpinBoxSetting *bs = new GlobalSpinBoxSetting("OnScrSubRecPriority",
                                             -99, 99, 1);
     bs->setLabel(QObject::tr("In-vision Subtitles Recording Priority"));
     bs->setHelpText(QObject::tr("Additional priority when a showing "
@@ -2460 +2650 @@
     return bs;
 }
 
-static GlobalSpinBox *GRCCRecPriority()
+static GlobalSpinBoxSetting *GRCCRecPriority()
 {
-    GlobalSpinBox *bs = new GlobalSpinBox("CCRecPriority",
+    GlobalSpinBoxSetting *bs = new GlobalSpinBoxSetting("CCRecPriority",
                                             -99, 99, 1);
     bs->setLabel(QObject::tr("Subtitles/CC recording priority"));
     bs->setHelpText(QObject::tr("Additional priority when a showing "
@@ -2472 +2662 @@
     return bs;
 }
 
-static GlobalSpinBox *GRHardHearRecPriority()
+static GlobalSpinBoxSetting *GRHardHearRecPriority()
 {
-    GlobalSpinBox *bs = new GlobalSpinBox("HardHearRecPriority",
+    GlobalSpinBoxSetting *bs = new GlobalSpinBoxSetting("HardHearRecPriority",
                                             -99, 99, 1);
     bs->setLabel(QObject::tr("Hard of hearing priority"));
     bs->setHelpText(QObject::tr("Additional priority when a showing "
@@ -2484 +2674 @@
     return bs;
 }
 
-static GlobalSpinBox *GRAudioDescRecPriority()
+static GlobalSpinBoxSetting *GRAudioDescRecPriority()
 {
-    GlobalSpinBox *bs = new GlobalSpinBox("AudioDescRecPriority",
+    GlobalSpinBoxSetting *bs = new GlobalSpinBoxSetting("AudioDescRecPriority",
                                             -99, 99, 1);
     bs->setLabel(QObject::tr("Audio described priority"));
     bs->setHelpText(QObject::tr("Additional priority when a showing "
@@ -2495 +2685 @@
     return bs;
 }
 
-static GlobalSpinBox *GRSingleRecordRecPriority()
+static GlobalSpinBoxSetting *GRSingleRecordRecPriority()
 {
-    GlobalSpinBox *bs = new GlobalSpinBox("SingleRecordRecPriority",
+    GlobalSpinBoxSetting *bs = new GlobalSpinBoxSetting("SingleRecordRecPriority",
                                             -99, 99, 1);
     bs->setLabel(QObject::tr("Single recordings priority"));
     bs->setHelpText(QObject::tr("Single recordings will receive this "
@@ -2506 +2696 @@
     return bs;
 }
 
-static GlobalSpinBox *GRWeekslotRecordRecPriority()
+static GlobalSpinBoxSetting *GRWeekslotRecordRecPriority()
 {
-    GlobalSpinBox *bs = new GlobalSpinBox("WeekslotRecordRecPriority",
+    GlobalSpinBoxSetting *bs = new GlobalSpinBoxSetting("WeekslotRecordRecPriority",
                                             -99, 99, 1);
     bs->setLabel(QObject::tr("Weekslot recordings priority"));
     bs->setHelpText(QObject::tr("Weekslot recordings will receive this "
@@ -2517 +2707 @@
     return bs;
 }
 
-static GlobalSpinBox *GRTimeslotRecordRecPriority()
+static GlobalSpinBoxSetting *GRTimeslotRecordRecPriority()
 {
-    GlobalSpinBox *bs = new GlobalSpinBox("TimeslotRecordRecPriority",
+    GlobalSpinBoxSetting *bs = new GlobalSpinBoxSetting("TimeslotRecordRecPriority",
                                             -99, 99, 1);
     bs->setLabel(QObject::tr("Timeslot recordings priority"));
     bs->setHelpText(QObject::tr("Timeslot recordings will receive this "
@@ -2528 +2718 @@
     return bs;
 }
 
-static GlobalSpinBox *GRChannelRecordRecPriority()
+static GlobalSpinBoxSetting *GRChannelRecordRecPriority()
 {
-    GlobalSpinBox *bs = new GlobalSpinBox("ChannelRecordRecPriority",
+    GlobalSpinBoxSetting *bs = new GlobalSpinBoxSetting("ChannelRecordRecPriority",
                                             -99, 99, 1);
     bs->setLabel(QObject::tr("Channel recordings priority"));
     bs->setHelpText(QObject::tr("Channel recordings will receive this "
@@ -2539 +2729 @@
     return bs;
 }
 
-static GlobalSpinBox *GRAllRecordRecPriority()
+static GlobalSpinBoxSetting *GRAllRecordRecPriority()
 {
-    GlobalSpinBox *bs = new GlobalSpinBox("AllRecordRecPriority",
+    GlobalSpinBoxSetting *bs = new GlobalSpinBoxSetting("AllRecordRecPriority",
                                             -99, 99, 1);
     bs->setLabel(QObject::tr("All recordings priority"));
     bs->setHelpText(QObject::tr("The 'All' recording type will receive this "
@@ -2550 +2740 @@
     return bs;
 }
 
-static GlobalSpinBox *GRFindOneRecordRecPriority()
+static GlobalSpinBoxSetting *GRFindOneRecordRecPriority()
 {
-    GlobalSpinBox *bs = new GlobalSpinBox("FindOneRecordRecPriority",
+    GlobalSpinBoxSetting *bs = new GlobalSpinBoxSetting("FindOneRecordRecPriority",
                                             -99, 99, 1);
     bs->setLabel(QObject::tr("Find one recordings priority"));
     bs->setHelpText(QObject::tr("Find One, Find Weekly and Find Daily "
@@ -2562 +2752 @@
     return bs;
 }
 
-static GlobalSpinBox *GROverrideRecordRecPriority()
+static GlobalSpinBoxSetting *GROverrideRecordRecPriority()
 {
-    GlobalSpinBox *bs = new GlobalSpinBox("OverrideRecordRecPriority",
+    GlobalSpinBoxSetting *bs = new GlobalSpinBoxSetting("OverrideRecordRecPriority",
                                             -99, 99, 1);
     bs->setLabel(QObject::tr("Override recordings priority"));
     bs->setHelpText(QObject::tr("Override recordings will receive this "
@@ -2573 +2763 @@
     return bs;
 }
 
-static HostLineEdit *DefaultTVChannel()
+static HostTextEditSetting *DefaultTVChannel()
 {
-    HostLineEdit *ge = new HostLineEdit("DefaultTVChannel");
+    HostTextEditSetting *ge = new HostTextEditSetting("DefaultTVChannel");
     ge->setLabel(QObject::tr("Guide starts at channel"));
     ge->setValue("3");
     ge->setHelpText(QObject::tr("The program guide starts on this channel if "
@@ -2583 +2773 @@
     return ge;
 }
 
-static HostSpinBox *EPGRecThreshold()
+static HostSpinBoxSetting *EPGRecThreshold()
 {
-    HostSpinBox *gs = new HostSpinBox("SelChangeRecThreshold", 1, 600, 1);
+    HostSpinBoxSetting *gs = new HostSpinBoxSetting("SelChangeRecThreshold", 1, 600, 1);
     gs->setLabel(QObject::tr("Record threshold"));
     gs->setValue(16);
     gs->setHelpText(QObject::tr("Pressing SELECT on a show that is at least "
@@ -2594 +2784 @@
     return gs;
 }
 
-static HostComboBox *MythLanguage()
+static HostComboBoxSetting *MythLanguage()
 {
-    HostComboBox *gc = new HostComboBox("Language");
+    HostComboBoxSetting *gc = new HostComboBoxSetting("Language");
     gc->setLabel(QObject::tr("Language"));
 
     QMap<QString, QString> langMap = MythTranslation::getLanguages();
@@ -2618 +2808 @@
     return gc;
 }
 
-static void ISO639_fill_selections(SelectSetting *widget, uint i)
+static void ISO639_fill_selections(MythUIComboBoxSetting *comboBox, uint i)
 {
-    widget->clearSelections();
+    comboBox->clearSelections();
     QString q = QString("ISO639Language%1").arg(i);
     QString lang = gCoreContext->GetSetting(q, "").toLower();
 
@@ -2641 +2831 @@
             desc = desc.left(idx);
 
         const QString il = iso639_key_to_str3(it.key());
-        widget->addSelection(desc, il, il == lang);
+        comboBox->addSelection(desc, il, il == lang);
     }
 }
 
-static GlobalComboBox *ISO639PreferredLanguage(uint i)
+static GlobalComboBoxSetting *ISO639PreferredLanguage(uint i)
 {
-    GlobalComboBox *gc = new GlobalComboBox(QString("ISO639Language%1").arg(i));
+    GlobalComboBoxSetting *gc = new GlobalComboBoxSetting(QString("ISO639Language%1").arg(i));
     gc->setLabel(QObject::tr("Guide language #%1").arg(i+1));
     // We should try to get language from "MythLanguage"
     // then use code 2 to code 3 map in iso639.h
@@ -2658 +2848 @@
     return gc;
 }
 
-static HostCheckBox *NetworkControlEnabled()
-{
-    HostCheckBox *gc = new HostCheckBox("NetworkControlEnabled");
-    gc->setLabel(QObject::tr("Enable Network Remote Control interface"));
-    gc->setHelpText(QObject::tr("This enables support for controlling "
-                    "mythfrontend over the network."));
-    gc->setValue(false);
-    return gc;
-}
 
-static HostSpinBox *NetworkControlPort()
+static HostSpinBoxSetting *NetworkControlPort()
 {
-    HostSpinBox *gs = new HostSpinBox("NetworkControlPort", 1025, 65535, 1);
+    HostSpinBoxSetting *gs = new HostSpinBoxSetting("NetworkControlPort", 1025, 65535, 1);
     gs->setLabel(QObject::tr("Network Remote Control port"));
     gs->setValue(6546);
     gs->setHelpText(QObject::tr("This specifies what port the network remote "
@@ -2678 +2859 @@
     return gs;
 }
 
-static HostLineEdit *UDPNotifyPort()
+static HostTextEditSetting *UDPNotifyPort()
 {
-    HostLineEdit *ge = new HostLineEdit("UDPNotifyPort");
+    HostTextEditSetting *ge = new HostTextEditSetting("UDPNotifyPort");
     ge->setLabel(QObject::tr("UDP notify port"));
     ge->setValue("6948");
     ge->setHelpText(QObject::tr("MythTV will listen for connections "
@@ -2688 +2869 @@
     return ge;
 }
 
-static HostCheckBox *RealtimePriority()
+static HostCheckBoxSetting *NetworkControlEnabled()
+{
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("NetworkControlEnabled");
+    gc->setLabel(QObject::tr("Enable Network Remote Control interface"));
+    gc->setHelpText(QObject::tr("This enables support for controlling "
+                    "mythfrontend over the network."));
+    gc->setValue(false);
+
+    gc->addTargetedChild("1",NetworkControlPort());
+    gc->addTargetedChild("1",UDPNotifyPort());
+    return gc;
+}
+
+static HostCheckBoxSetting *RealtimePriority()
 {
-    HostCheckBox *gc = new HostCheckBox("RealtimePriority");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("RealtimePriority");
     gc->setLabel(QObject::tr("Enable realtime priority threads"));
     gc->setHelpText(QObject::tr("When running mythfrontend with root "
                     "privileges, some threads can be given enhanced priority. "
@@ -2700 +2894 @@
     return gc;
 }
 
-static HostCheckBox *EnableMediaMon()
-{
-    HostCheckBox *gc = new HostCheckBox("MonitorDrives");
-    gc->setLabel(QObject::tr("Monitor CD/DVD") +
-                 QObject::tr(" (and other removable devices)"));
-    gc->setHelpText(QObject::tr("This enables support for monitoring your "
-                    "CD/DVD drives for new disks and launching the proper "
-                    "plugin to handle them. Requires restart."));
-    gc->setValue(false);
-    return gc;
-}
-
-static HostLineEdit *IgnoreMedia()
+static HostTextEditSetting *IgnoreMedia()
 {
-    HostLineEdit *ge = new HostLineEdit("IgnoreDevices");
+    HostTextEditSetting *ge = new HostTextEditSetting("IgnoreDevices");
     ge->setLabel(QObject::tr("Ignore devices"));
     ge->setValue("");
     ge->setHelpText(QObject::tr("If there are any devices that you do not want "
@@ -2724 +2906 @@
     return ge;
 }
 
-class MythMediaSettings : public TriggeredConfigurationGroup
+static HostCheckBoxSetting *EnableMediaMon()
 {
-  public:
-     MythMediaSettings() :
-         TriggeredConfigurationGroup(false, false, true, true)
-     {
-         setLabel(QObject::tr("MythMediaMonitor"));
-         setUseLabel(false);
-
-         Setting* enabled = EnableMediaMon();
-         addChild(enabled);
-         setTrigger(enabled);
-
-         ConfigurationGroup* settings = new VerticalConfigurationGroup(false);
-         settings->addChild(IgnoreMedia());
-         addTarget("1", settings);
-
-         // show nothing if fillEnabled is off
-         addTarget("0", new VerticalConfigurationGroup(true));
-     };
-};
-
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("MonitorDrives");
+    gc->setLabel(QObject::tr("Media Monitor"));
+    gc->setHelpText(QObject::tr("This enables support for monitoring "
+                    "your CD/DVD drives for new disks and launching "
+                    "the proper plugin to handle them. Requires restart."));
+    gc->setValue(false);
+    gc->addTargetedChild("1", IgnoreMedia());
+    return gc;
+}
 
-static HostComboBox *DisplayGroupTitleSort()
+static HostComboBoxSetting *DisplayGroupTitleSort()
 {
-    HostComboBox *gc = new HostComboBox("DisplayGroupTitleSort");
+    HostComboBoxSetting *gc = new HostComboBoxSetting("DisplayGroupTitleSort");
     gc->setLabel(QObject::tr("Sort titles"));
     gc->addSelection(QObject::tr("Alphabetically"),
             QString::number(PlaybackBox::TitleSortAlphabetical));
@@ -2760 +2931 @@
     return gc;
 }
 
-static HostCheckBox *PlaybackWatchList()
-{
-    HostCheckBox *gc = new HostCheckBox("PlaybackWatchList");
-    gc->setLabel(QObject::tr("Include the 'Watch List' group"));
-    gc->setValue(true);
-    gc->setHelpText(QObject::tr("The 'Watch List' is an abbreviated list of "
-                                "recordings sorted to highlight series and "
-                                "shows that need attention in order to "
-                                "keep up to date."));
-    return gc;
-}
-
-static HostCheckBox *PlaybackWLStart()
+static HostCheckBoxSetting *PlaybackWLStart()
 {
-    HostCheckBox *gc = new HostCheckBox("PlaybackWLStart");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("PlaybackWLStart");
     gc->setLabel(QObject::tr("Start from the Watch List view"));
     gc->setValue(false);
     gc->setHelpText(QObject::tr("If enabled, the 'Watch List' will be the "
@@ -2783 +2942 @@
     return gc;
 }
 
-static HostCheckBox *PlaybackWLAutoExpire()
+static HostCheckBoxSetting *PlaybackWLAutoExpire()
 {
-    HostCheckBox *gc = new HostCheckBox("PlaybackWLAutoExpire");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("PlaybackWLAutoExpire");
     gc->setLabel(QObject::tr("Exclude recordings not set for Auto-Expire"));
     gc->setValue(false);
     gc->setHelpText(QObject::tr("Set this if you turn off Auto-Expire only "
@@ -2795 +2954 @@
     return gc;
 }
 
-static HostSpinBox *PlaybackWLMaxAge()
+static HostSpinBoxSetting *PlaybackWLMaxAge()
 {
-    HostSpinBox *gs = new HostSpinBox("PlaybackWLMaxAge", 30, 180, 10);
+    HostSpinBoxSetting *gs = new HostSpinBoxSetting("PlaybackWLMaxAge", 30, 180, 10);
     gs->setLabel(QObject::tr("Maximum days counted in the score"));
     gs->setValue(60);
     gs->setHelpText(QObject::tr("The 'Watch List' scores are based on 1 point "
@@ -2807 +2966 @@
     return gs;
 }
 
-static HostSpinBox *PlaybackWLBlackOut()
+static HostSpinBoxSetting *PlaybackWLBlackOut()
 {
-    HostSpinBox *gs = new HostSpinBox("PlaybackWLBlackOut", 0, 5, 1);
+    HostSpinBoxSetting *gs = new HostSpinBoxSetting("PlaybackWLBlackOut", 0, 5, 1);
     gs->setLabel(QObject::tr("Days to exclude weekly episodes after delete"));
     gs->setValue(2);
     gs->setHelpText(QObject::tr("When an episode is deleted or marked as "
@@ -2820 +2979 @@
     return gs;
 }
 
-class WatchListSettings : public TriggeredConfigurationGroup
+static HostCheckBoxSetting *PlaybackWatchList()
 {
-  public:
-     WatchListSettings() :
-         TriggeredConfigurationGroup(false, false, true, true)
-     {
-
-         Setting* watchList = PlaybackWatchList();
-         addChild(watchList);
-         setTrigger(watchList);
-
-         ConfigurationGroup* settings = new VerticalConfigurationGroup(false);
-         settings->addChild(PlaybackWLStart());
-         settings->addChild(PlaybackWLAutoExpire());
-         settings->addChild(PlaybackWLMaxAge());
-         settings->addChild(PlaybackWLBlackOut());
-         addTarget("1", settings);
-
-         addTarget("0", new VerticalConfigurationGroup(true));
-    };
-};
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("PlaybackWatchList");
+    gc->setLabel(QObject::tr("Include the 'Watch List' group"));
+    gc->setValue(true);
+    gc->setHelpText(QObject::tr("The 'Watch List' is an abbreviated list of "
+                                "recordings sorted to highlight series and "
+                                "shows that need attention in order to "
+                                "keep up to date."));
+
+    gc->addTargetedChild("1", PlaybackWLStart());
+    gc->addTargetedChild("1", PlaybackWLAutoExpire());
+    gc->addTargetedChild("1", PlaybackWLMaxAge());
+    gc->addTargetedChild("1", PlaybackWLBlackOut());
+    return gc;
+}
 
-static HostCheckBox *LCDShowTime()
+static HostCheckBoxSetting *LCDShowTime()
 {
-    HostCheckBox *gc = new HostCheckBox("LCDShowTime");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("LCDShowTime");
     gc->setLabel(QObject::tr("Display time"));
     gc->setHelpText(QObject::tr("Display current time on idle LCD display. "));
     gc->setValue(true);
     return gc;
 }
 
-static HostCheckBox *LCDShowRecStatus()
+static HostCheckBoxSetting *LCDShowRecStatus()
 {
-    HostCheckBox *gc = new HostCheckBox("LCDShowRecStatus");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("LCDShowRecStatus");
     gc->setLabel(QObject::tr("Display recording status"));
     gc->setHelpText(QObject::tr("Display current recordings information on "
                                 "LCD display."));
@@ -2861 +3015 @@
     return gc;
 }
 
-static HostCheckBox *LCDShowMenu()
+static HostCheckBoxSetting *LCDShowMenu()
 {
-    HostCheckBox *gc = new HostCheckBox("LCDShowMenu");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("LCDShowMenu");
     gc->setLabel(QObject::tr("Display menus"));
     gc->setHelpText(QObject::tr("Display selected menu on LCD display. "));
     gc->setValue(true);
     return gc;
 }
 
-static HostSpinBox *LCDPopupTime()
+static HostSpinBoxSetting *LCDPopupTime()
 {
-    HostSpinBox *gs = new HostSpinBox("LCDPopupTime", 1, 300, 1, true);
+    HostSpinBoxSetting *gs = new HostSpinBoxSetting("LCDPopupTime", 1, 300, 1, true);
     gs->setLabel(QObject::tr("Menu pop-up time"));
     gs->setHelpText(QObject::tr("How many seconds the menu will "
                     "remain visible after navigation."));
@@ -2880 +3034 @@
     return gs;
 }
 
-static HostCheckBox *LCDShowMusic()
+static HostCheckBoxSetting *LCDShowMusic()
 {
-    HostCheckBox *gc = new HostCheckBox("LCDShowMusic");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("LCDShowMusic");
     gc->setLabel(QObject::tr("Display music artist and title"));
     gc->setHelpText(QObject::tr("Display playing artist and song title in "
                     "MythMusic on LCD display."));
@@ -2890 +3044 @@
     return gc;
 }
 
-static HostComboBox *LCDShowMusicItems()
+static HostComboBoxSetting *LCDShowMusicItems()
 {
-    HostComboBox *gc = new HostComboBox("LCDShowMusicItems");
+    HostComboBoxSetting *gc = new HostComboBoxSetting("LCDShowMusicItems");
     gc->setLabel(QObject::tr("Items"));
     gc->addSelection(QObject::tr("Artist - Title"), "ArtistTitle");
     gc->addSelection(QObject::tr("Artist [Album] Title"), "ArtistAlbumTitle");
@@ -2900 +3054 @@
     return gc;
 }
 
-static HostCheckBox *LCDShowChannel()
+static HostCheckBoxSetting *LCDShowChannel()
 {
-    HostCheckBox *gc = new HostCheckBox("LCDShowChannel");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("LCDShowChannel");
     gc->setLabel(QObject::tr("Display channel information"));
     gc->setHelpText(QObject::tr("Display tuned channel information on LCD display."));
     gc->setValue(true);
     return gc;
 }
 
-static HostCheckBox *LCDShowVolume()
+static HostCheckBoxSetting *LCDShowVolume()
 {
-    HostCheckBox *gc = new HostCheckBox("LCDShowVolume");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("LCDShowVolume");
     gc->setLabel(QObject::tr("Display volume information"));
     gc->setHelpText(QObject::tr("Display volume level information "
                                 "on LCD display."));
@@ -2919 +3073 @@
     return gc;
 }
 
-static HostCheckBox *LCDShowGeneric()
+static HostCheckBoxSetting *LCDShowGeneric()
 {
-    HostCheckBox *gc = new HostCheckBox("LCDShowGeneric");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("LCDShowGeneric");
     gc->setLabel(QObject::tr("Display generic information"));
     gc->setHelpText(QObject::tr("Display generic information on LCD display."));
     gc->setValue(true);
     return gc;
 }
 
-static HostCheckBox *LCDBacklightOn()
+static HostCheckBoxSetting *LCDBacklightOn()
 {
-    HostCheckBox *gc = new HostCheckBox("LCDBacklightOn");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("LCDBacklightOn");
     gc->setLabel(QObject::tr("Backlight always on"));
     gc->setHelpText(QObject::tr("Turn on the backlight permanently "
                                 "on the LCD display."));
@@ -2938 +3092 @@
     return gc;
 }
 
-static HostCheckBox *LCDHeartBeatOn()
+static HostCheckBoxSetting *LCDHeartBeatOn()
 {
-    HostCheckBox *gc = new HostCheckBox("LCDHeartBeatOn");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("LCDHeartBeatOn");
     gc->setLabel(QObject::tr("Heartbeat always on"));
     gc->setHelpText(QObject::tr("Turn on the LCD heartbeat."));
     gc->setValue(false);
     return gc;
 }
 
-static HostCheckBox *LCDBigClock()
+static HostCheckBoxSetting *LCDBigClock()
 {
-    HostCheckBox *gc = new HostCheckBox("LCDBigClock");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("LCDBigClock");
     gc->setLabel(QObject::tr("Display large clock"));
     gc->setHelpText(QObject::tr("On multiline displays try and display the time as large as possible."));
     gc->setValue(false);
     return gc;
 }
 
-static HostLineEdit *LCDKeyString()
+static HostTextEditSetting *LCDKeyString()
 {
-    HostLineEdit *ge = new HostLineEdit("LCDKeyString");
+    HostTextEditSetting *ge = new HostTextEditSetting("LCDKeyString");
     ge->setLabel(QObject::tr("LCD key order"));
     ge->setValue("ABCDEF");
     ge->setHelpText(QObject::tr("Enter the 6 Keypad Return Codes for your "
@@ -2969 +3123 @@
     return ge;
 }
 
-static HostCheckBox *LCDEnable()
+static HostCheckBoxSetting *LCDEnable()
 {
-    HostCheckBox *gc = new HostCheckBox("LCDEnable");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("LCDEnable");
     gc->setLabel(QObject::tr("Enable LCD device"));
     gc->setHelpText(QObject::tr("Use an LCD display to view MythTV status "
                     "information."));
     gc->setValue(false);
+    gc->addTargetedChild("1",LCDShowTime());
+    gc->addTargetedChild("1",LCDShowMenu());
+    gc->addTargetedChild("1",LCDShowMusic());
+    gc->addTargetedChild("1",LCDShowMusicItems());
+    gc->addTargetedChild("1",LCDShowChannel());
+    gc->addTargetedChild("1",LCDShowRecStatus());
+    gc->addTargetedChild("1",LCDShowVolume());
+    gc->addTargetedChild("1",LCDShowGeneric());
+    gc->addTargetedChild("1",LCDBacklightOn());
+    gc->addTargetedChild("1",LCDHeartBeatOn());
+    gc->addTargetedChild("1",LCDBigClock());
+    gc->addTargetedChild("1",LCDKeyString());
+    gc->addTargetedChild("1",LCDPopupTime());
     return gc;
 }
 
-class LcdSettings : public TriggeredConfigurationGroup
-{
-  public:
-    LcdSettings() : TriggeredConfigurationGroup(false, false,  false, false,
-                                                false, false, false, false)
-    {
-         setLabel(QObject::tr("LCD device display"));
-         setUseLabel(false);
-
-         Setting* lcd_enable = LCDEnable();
-         addChild(lcd_enable);
-         setTrigger(lcd_enable);
-
-         ConfigurationGroup *settings =
-             new VerticalConfigurationGroup(false, true, false, false);
-         ConfigurationGroup *setHoriz =
-             new HorizontalConfigurationGroup(false, false, false, false);
-
-         ConfigurationGroup* setLeft  =
-             new VerticalConfigurationGroup(false, false, false, false);
-         ConfigurationGroup* setRight =
-             new VerticalConfigurationGroup(false, false, false, false);
-
-         setLeft->addChild(LCDShowTime());
-         setLeft->addChild(LCDShowMenu());
-         setLeft->addChild(LCDShowMusic());
-         setLeft->addChild(LCDShowMusicItems());
-         setLeft->addChild(LCDShowChannel());
-         setLeft->addChild(LCDShowRecStatus());
-         setRight->addChild(LCDShowVolume());
-         setRight->addChild(LCDShowGeneric());
-         setRight->addChild(LCDBacklightOn());
-         setRight->addChild(LCDHeartBeatOn());
-         setRight->addChild(LCDBigClock());
-         setRight->addChild(LCDKeyString());
-         setHoriz->addChild(setLeft);
-         setHoriz->addChild(setRight);
-         settings->addChild(setHoriz);
-         settings->addChild(LCDPopupTime());
-
-         addTarget("1", settings);
-
-         addTarget("0", new VerticalConfigurationGroup(true));
-    };
-};
-
 
 #if CONFIG_DARWIN
-static HostCheckBox *MacGammaCorrect()
+static HostCheckBoxSetting *MacGammaCorrect()
 {
-    HostCheckBox *gc = new HostCheckBox("MacGammaCorrect");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("MacGammaCorrect");
     gc->setLabel(QObject::tr("Enable gamma correction for video"));
     gc->setValue(false);
     gc->setHelpText(QObject::tr("If enabled, QuickTime will correct the gamma "
@@ -3038 +3159 @@
     return gc;
 }
 
-static HostCheckBox *MacScaleUp()
+static HostCheckBoxSetting *MacScaleUp()
 {
-    HostCheckBox *gc = new HostCheckBox("MacScaleUp");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("MacScaleUp");
     gc->setLabel(QObject::tr("Scale video as necessary"));
     gc->setValue(true);
     gc->setHelpText(QObject::tr("If enabled, video will be scaled to fit your "
@@ -3049 +3170 @@
     return gc;
 }
 
-static HostSpinBox *MacFullSkip()
+static HostSpinBoxSetting *MacFullSkip()
 {
-    HostSpinBox *gs = new HostSpinBox("MacFullSkip", 0, 30, 1, true);
+    HostSpinBoxSetting *gs = new HostSpinBoxSetting("MacFullSkip", 0, 30, 1, true);
     gs->setLabel(QObject::tr("Frames to skip in fullscreen mode"));
     gs->setValue(0);
     gs->setHelpText(QObject::tr("Video displayed in fullscreen or non-windowed "
@@ -3062 +3183 @@
     return gs;
 }
 
-static HostCheckBox *MacMainEnabled()
-{
-    HostCheckBox *gc = new HostCheckBox("MacMainEnabled");
-    gc->setLabel(QObject::tr("Video in main window"));
-    gc->setValue(true);
-    gc->setHelpText(QObject::tr("If enabled, video will be displayed in the "
-                    "main GUI window. Disable this when you only want video "
-                    "on the desktop or in a floating window. Only valid when "
-                    "\"Use GUI size for TV playback\" and \"Run the "
-                    "frontend in a window\" are checked."));
-    return gc;
-}
 
-static HostSpinBox *MacMainSkip()
+
+static HostSpinBoxSetting *MacMainSkip()
 {
-    HostSpinBox *gs = new HostSpinBox("MacMainSkip", 0, 30, 1, true);
+    HostSpinBoxSetting *gs = new HostSpinBoxSetting("MacMainSkip", 0, 30, 1, true);
     gs->setLabel(QObject::tr("Frames to skip"));
     gs->setValue(0);
     gs->setHelpText(QObject::tr("Video in the main window will skip this many "
@@ -3086 +3196 @@
     return gs;
 }
 
-static HostSpinBox *MacMainOpacity()
+static HostSpinBoxSetting *MacMainOpacity()
 {
-    HostSpinBox *gs = new HostSpinBox("MacMainOpacity", 0, 100, 5, false);
+    HostSpinBoxSetting *gs = new HostSpinBoxSetting("MacMainOpacity", 0, 100, 5, false);
     gs->setLabel(QObject::tr("Opacity"));
     gs->setValue(100);
     gs->setHelpText(QObject::tr("The opacity of the main window. Set to "
@@ -3097 +3207 @@
     return gs;
 }
 
-class MacMainSettings : public TriggeredConfigurationGroup
+static HostCheckBoxSetting *MacMainEnabled()
 {
-  public:
-    MacMainSettings() : TriggeredConfigurationGroup(false)
-    {
-        setLabel(QObject::tr("Video in main window"));
-        setUseLabel(false);
-        Setting *gc = MacMainEnabled();
-        addChild(gc);
-        setTrigger(gc);
-
-        VerticalConfigurationGroup *opts =
-            new VerticalConfigurationGroup(false, false);
-        opts->addChild(MacMainSkip());
-        opts->addChild(MacMainOpacity());
-
-        addTarget("1", opts);
-        addTarget("0", new VerticalConfigurationGroup(false, false));
-    }
-};
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("MacMainEnabled");
+    gc->setLabel(QObject::tr("Video in main window"));
+    gc->setValue(true);
+    gc->setHelpText(QObject::tr("If enabled, video will be displayed in the "
+                    "main GUI window. Disable this when you only want video "
+                    "on the desktop or in a floating window. Only valid when "
+                    "\"Use GUI size for TV playback\" and \"Run the "
+                    "frontend in a window\" are checked."));
 
-static HostCheckBox *MacFloatEnabled()
-{
-    HostCheckBox *gc = new HostCheckBox("MacFloatEnabled");
-    gc->setLabel(QObject::tr("Video in floating window"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("If enabled, video will be displayed in a "
-                    "floating window. Only valid when \"Use GUI size for TV "
-                    "playback\" and \"Run the frontend in a window\" are "
-                    "checked."));
+    gc->addTargetedChild("1", MacMainSkip());
+    gc->addTargetedChild("1", MacMainOpacity());
     return gc;
 }
 
-static HostSpinBox *MacFloatSkip()
+static HostSpinBoxSetting *MacFloatSkip()
 {
-    HostSpinBox *gs = new HostSpinBox("MacFloatSkip", 0, 30, 1, true);
+    HostSpinBoxSetting *gs = new HostSpinBoxSetting("MacFloatSkip", 0, 30, 1, true);
     gs->setLabel(QObject::tr("Frames to skip"));
     gs->setValue(0);
     gs->setHelpText(QObject::tr("Video in the floating window will skip "
@@ -3141 +3234 @@
     return gs;
 }
 
-static HostSpinBox *MacFloatOpacity()
+static HostSpinBoxSetting *MacFloatOpacity()
 {
-    HostSpinBox *gs = new HostSpinBox("MacFloatOpacity", 0, 100, 5, false);
+    HostSpinBoxSetting *gs = new HostSpinBoxSetting("MacFloatOpacity", 0, 100, 5, false);
     gs->setLabel(QObject::tr("Opacity"));
     gs->setValue(100);
     gs->setHelpText(QObject::tr("The opacity of the floating window. Set to "
@@ -3152 +3245 @@
     return gs;
 }
 
-class MacFloatSettings : public TriggeredConfigurationGroup
+static HostCheckBoxSetting *MacFloatEnabled()
 {
-  public:
-    MacFloatSettings() : TriggeredConfigurationGroup(false)
-    {
-        setLabel(QObject::tr("Video in floating window"));
-        setUseLabel(false);
-        Setting *gc = MacFloatEnabled();
-        addChild(gc);
-        setTrigger(gc);
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("MacFloatEnabled");
+    gc->setLabel(QObject::tr("Video in floating window"));
+    gc->setValue(false);
+    gc->setHelpText(QObject::tr("If enabled, video will be displayed in a "
+                    "floating window. Only valid when \"Use GUI size for TV "
+                    "playback\" and \"Run the frontend in a window\" are "
+                    "checked."));
 
-        VerticalConfigurationGroup *opts =
-            new VerticalConfigurationGroup(false, false);
-        opts->addChild(MacFloatSkip());
-        opts->addChild(MacFloatOpacity());
+    gc->addTargetedChild("1", MacFloatSkip());
+    gc->addTargetedChild("1", MacFloatOpacity());
+    return gc;
+}
 
-        addTarget("1", opts);
-        addTarget("0", new VerticalConfigurationGroup(false, false));
-    }
-};
+static HostSpinBoxSetting *MacDockSkip()
+{
+    HostSpinBoxSetting *gs = new HostSpinBoxSetting("MacDockSkip", 0, 30, 1, true);
+    gs->setLabel(QObject::tr("Frames to skip"));
+    gs->setValue(3);
+    gs->setHelpText(QObject::tr("Video in the dock icon will skip this many "
+                    "frames for each frame drawn. Set to 0 to show "
+                    "every frame."));
+    return gs;
+}
 
-static HostCheckBox *MacDockEnabled()
+static HostCheckBoxSetting *MacDockEnabled()
 {
-    HostCheckBox *gc = new HostCheckBox("MacDockEnabled");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("MacDockEnabled");
     gc->setLabel(QObject::tr("Video in the dock"));
     gc->setValue(true);
     gc->setHelpText(QObject::tr("If enabled, video will be displayed in the "
                     "application's dock icon. Only valid when \"Use GUI size "
                     "for TV playback\" and \"Run the frontend in a window\" "
                     "are checked."));
+    gc->addTargetedChild("1", MacDockSkip());
+    
     return gc;
 }
 
-static HostSpinBox *MacDockSkip()
+static HostSpinBoxSetting *MacDesktopSkip()
 {
-    HostSpinBox *gs = new HostSpinBox("MacDockSkip", 0, 30, 1, true);
+    HostSpinBoxSetting *gs = new HostSpinBoxSetting("MacDesktopSkip", 0, 30, 1, true);
     gs->setLabel(QObject::tr("Frames to skip"));
-    gs->setValue(3);
-    gs->setHelpText(QObject::tr("Video in the dock icon will skip this many "
+    gs->setValue(0);
+    gs->setHelpText(QObject::tr("Video on the desktop will skip this many "
                     "frames for each frame drawn. Set to 0 to show "
                     "every frame."));
     return gs;
 }
 
-class MacDockSettings : public TriggeredConfigurationGroup
-{
-  public:
-    MacDockSettings() : TriggeredConfigurationGroup(false)
-    {
-        setLabel(QObject::tr("Video in the dock"));
-        setUseLabel(false);
-        Setting *gc = MacDockEnabled();
-        addChild(gc);
-        setTrigger(gc);
-
-        Setting *skip = MacDockSkip();
-        addTarget("1", skip);
-        addTarget("0", new HorizontalConfigurationGroup(false, false));
-    }
-};
-
-static HostCheckBox *MacDesktopEnabled()
+static HostCheckBoxSetting *MacDesktopEnabled()
 {
-    HostCheckBox *gc = new HostCheckBox("MacDesktopEnabled");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("MacDesktopEnabled");
     gc->setLabel(QObject::tr("Video on the desktop"));
     gc->setValue(false);
     gc->setHelpText(QObject::tr("If enabled, video will be displayed on the "
                     "desktop, behind the Finder icons. Only valid when \"Use "
                     "GUI size for TV playback\" and \"Run the frontend in a "
                     "window\" are checked."));
+
+    gc->addTarget("1", MacDesktopSkip());
+
     return gc;
 }
 
-static HostSpinBox *MacDesktopSkip()
+#endif
+
+static HostCheckBoxSetting *WatchTVGuide()
 {
-    HostSpinBox *gs = new HostSpinBox("MacDesktopSkip", 0, 30, 1, true);
-    gs->setLabel(QObject::tr("Frames to skip"));
-    gs->setValue(0);
-    gs->setHelpText(QObject::tr("Video on the desktop will skip this many "
-                    "frames for each frame drawn. Set to 0 to show "
-                    "every frame."));
-    return gs;
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("WatchTVGuide");
+    gc->setLabel(QObject::tr("Show the program guide when starting Live TV"));
+    gc->setHelpText(QObject::tr("This starts the program guide immediately "
+             "upon starting to watch Live TV."));
+    gc->setValue(false);
+    return gc;
 }
 
-class MacDesktopSettings : public TriggeredConfigurationGroup
+
+/* This code is a duplication the class DatabaseSettings. As it it also use bymythbackend I rewrote here for the time being */
+
+class DatabaseGroupSetting : public GroupSetting
 {
   public:
-    MacDesktopSettings() : TriggeredConfigurationGroup(false)
+    DatabaseGroupSetting(const QString &DBhostOverride = QString::null):GroupSetting()
     {
-        setLabel(QObject::tr("Video on the desktop"));
-        setUseLabel(false);
-        Setting *gc = MacDesktopEnabled();
-        addChild(gc);
-        setTrigger(gc);
-
-        Setting *skip = MacDesktopSkip();
-        addTarget("1", skip);
-        addTarget("0", new HorizontalConfigurationGroup(false, false));
+        m_DBhostOverride = DBhostOverride;
+
+        setLabel(QObject::tr("Database Configuration"));
+
+        MSqlQuery query(MSqlQuery::InitCon());
+        if (query.isConnected())
+            setHelpText(QObject::tr("All database settings take effect when "
+                                       "you restart this program."));
+        else
+            setHelpText(QObject::tr("MythTV could not connect to the database. "
+                                       "Please verify your database settings "
+                                       "below."));
+
+        dbHostName = new TransTextEditSetting();
+        dbHostName->setLabel(QObject::tr("Hostname"));
+        dbHostName->setHelpText(QObject::tr("The host name or IP address of "
+                                        "the machine hosting the database. "
+                                        "This information is required."));
+        addChild(dbHostName);
+
+        dbHostPing = new TransMythUICheckBoxSetting();
+        dbHostPing->setLabel(QObject::tr("Ping test server?"));
+        dbHostPing->setHelpText(QObject::tr("Test basic host connectivity using "
+                                            "the ping command. Turn off if your "
+                                            "host or network don't support ping "
+                                            "(ICMP ECHO) packets"));
+        addChild(dbHostPing);
+
+        dbPort = new TransTextEditSetting();
+        dbPort->setLabel(QObject::tr("Port"));
+        dbPort->setHelpText(QObject::tr("The port number the database is running "
+                                        "on.  Leave blank if using the default "
+                                        "port (3306)."));
+        addChild(dbPort);
+
+        dbName = new TransTextEditSetting();
+        dbName->setLabel(QObject::tr("Database name"));
+        dbName->setHelpText(QObject::tr("The name of the database. "
+                                        "This information is required."));
+        addChild(dbName);
+
+        dbUserName = new TransTextEditSetting();
+        dbUserName->setLabel(QObject::tr("User"));
+        dbUserName->setHelpText(QObject::tr("The user name to use while "
+                                            "connecting to the database. "
+                                            "This information is required."));
+        addChild(dbUserName);
+
+        dbPassword = new TransTextEditSetting();
+        dbPassword->setLabel(QObject::tr("Password"));
+        dbPassword->setHelpText(QObject::tr("The password to use while "
+                                            "connecting to the database. "
+                                            "This information is required."));
+        addChild(dbPassword);
+
+        localEnabled = new TransMythUICheckBoxSetting();
+        localEnabled->setLabel(QObject::tr("Use custom identifier for frontend "
+                                           "preferences"));
+        localEnabled->setHelpText(QObject::tr("If this frontend's host name "
+                                              "changes often, check this box "
+                                              "and provide a network-unique "
+                                              "name to identify it. "
+                                              "If unchecked, the frontend "
+                                              "machine's local host name will "
+                                              "be used to save preferences in "
+                                              "the database."));
+        addChild(localEnabled);
+
+
+        localHostName = new TransTextEditSetting();
+        localHostName->setLabel(QObject::tr("Custom identifier"));
+        localHostName->setHelpText(QObject::tr("An identifier to use while "
+                                               "saving the settings for this "
+                                               "frontend."));
+        localEnabled->addTargetedChild("1", localHostName);
+
+
+        wolEnabled = new TransMythUICheckBoxSetting();
+        wolEnabled->setLabel(QObject::tr("Enable database server wakeup"));
+        wolEnabled->setHelpText(QObject::tr("If enabled, the frontend will use "
+                                            "database wakeup parameters to "
+                                            "reconnect to the database server."));
+        addChild(wolEnabled);
+
+        wolReconnect = new TransMythUISpinBoxSetting(0, 60, 1, true);
+        wolReconnect->setLabel(QObject::tr("Reconnect time"));
+        wolReconnect->setHelpText(QObject::tr("The time in seconds to wait for "
+                                          "the server to wake up."));
+        wolEnabled->addTargetedChild("1",wolReconnect);
+
+
+        wolRetry = new TransMythUISpinBoxSetting(1, 10, 1, true);
+        wolRetry->setLabel(QObject::tr("Retry attempts"));
+        wolRetry->setHelpText(QObject::tr("The number of retries to wake the "
+                                      "server before the frontend gives "
+                                      "up."));
+        wolEnabled->addTargetedChild("1",wolRetry);
+
+        wolCommand = new TransTextEditSetting();
+        wolCommand->setLabel(QObject::tr("Wake command"));
+        wolCommand->setHelpText(QObject::tr("The command executed on this "
+                                        "frontend to wake up the database "
+                                        "server (eg. sudo /etc/init.d/mysql "
+                                        "restart)."));
+        wolEnabled->addTargetedChild("1",wolCommand);
     }
+
+    void Load(void)
+    {
+            LOG(VB_GENERAL, LOG_ERR, QString("DatabaseGroupSetting::Load()"));
+
+        DatabaseParams params = gContext->GetDatabaseParams();
+
+        if (params.dbHostName.isEmpty() ||
+            params.dbUserName.isEmpty() ||
+            params.dbPassword.isEmpty() ||
+            params.dbName.isEmpty())
+            setHelpText(getHelpText() + "\n" +
+                           QObject::tr("Required fields are"
+                                       " marked with an asterisk (*)."));
+
+        if (params.dbHostName.isEmpty())
+        {
+            dbHostName->setLabel("* " + dbHostName->getLabel());
+            dbHostName->setValue(m_DBhostOverride);
+        }
+        else
+            dbHostName->setValue(params.dbHostName);
+
+        dbHostPing->setValue(params.dbHostPing);
+
+        if (params.dbPort)
+            dbPort->setValue(QString::number(params.dbPort));
+
+        dbUserName->setValue(params.dbUserName);
+        if (params.dbUserName.isEmpty())
+            dbUserName->setLabel("* " + dbUserName->getLabel());
+        dbPassword->setValue(params.dbPassword);
+        if (params.dbPassword.isEmpty())
+            dbPassword->setLabel("* " + dbPassword->getLabel());
+        dbName->setValue(params.dbName);
+        if (params.dbName.isEmpty())
+            dbName->setLabel("* " + dbName->getLabel());
+
+        localEnabled->setValue(params.localEnabled);
+        localHostName->setValue(params.localHostName);
+
+        wolEnabled->setValue(params.wolEnabled);
+        wolReconnect->setValue(params.wolReconnect);
+        wolRetry->setValue(params.wolRetry);
+        wolCommand->setValue(params.wolCommand);
+        //set all the children's m_haveChanged to false 
+        GroupSetting::Load();
+    };
+    void Save(void)
+    {
+        DatabaseParams params = gContext->GetDatabaseParams();
+
+        params.dbHostName    = dbHostName->getValue();
+        params.dbHostPing    = dbHostPing->boolValue();
+        params.dbPort        = dbPort->getValue().toInt();
+        params.dbUserName    = dbUserName->getValue();
+        params.dbPassword    = dbPassword->getValue();
+        params.dbName        = dbName->getValue();
+        params.dbType        = "QMYSQL";
+
+        params.localEnabled  = localEnabled->boolValue();
+        params.localHostName = localHostName->getValue();
+
+        params.wolEnabled    = wolEnabled->boolValue();
+        params.wolReconnect  = wolReconnect->intValue();
+        params.wolRetry      = wolRetry->intValue();
+        params.wolCommand    = wolCommand->getValue();
+
+        gContext->SaveDatabaseParams(params);
+        //set all the children's m_haveChanged to false
+        GroupSetting::Save();
+    };
+
+  protected:
+    TransTextEditSetting       *dbHostName;
+    TransMythUICheckBoxSetting *dbHostPing;
+    TransTextEditSetting       *dbPort;
+    TransTextEditSetting       *dbName;
+    TransTextEditSetting       *dbUserName;
+    TransTextEditSetting       *dbPassword;
+    TransMythUICheckBoxSetting *localEnabled;
+    TransTextEditSetting       *localHostName;
+    TransMythUICheckBoxSetting *wolEnabled;
+    TransMythUISpinBoxSetting  *wolReconnect;
+    TransMythUISpinBoxSetting  *wolRetry;
+    TransTextEditSetting       *wolCommand;
+
+    QString              m_DBhostOverride;
 };
-#endif
 
-static HostCheckBox *WatchTVGuide()
+/* end of duplicated code form DatabaseSettings */
+
+
+class ShutDownRebootSetting : public GroupSetting
 {
-    HostCheckBox *gc = new HostCheckBox("WatchTVGuide");
-    gc->setLabel(QObject::tr("Show the program guide when starting Live TV"));
-    gc->setHelpText(QObject::tr("This starts the program guide immediately "
-             "upon starting to watch Live TV."));
-    gc->setValue(false);
-    return gc;
+  public:
+    ShutDownRebootSetting();
+  private slots:
+    void childChanged(StandardSetting *);
+  private:
+    StandardSetting * m_overrideExitMenu;
+    StandardSetting * m_haltCommand;
+    StandardSetting * m_rebootCommand;
+    
+};
+
+ShutDownRebootSetting::ShutDownRebootSetting()
+    :GroupSetting()
+{
+    setLabel(QObject::tr("Shutdown/Reboot Settings"));
+    addChild(m_overrideExitMenu = OverrideExitMenu());
+    addChild(m_haltCommand      = HaltCommand());
+    addChild(m_rebootCommand    = RebootCommand());
+    connect(m_overrideExitMenu,SIGNAL(valueChanged(StandardSetting *)),
+            this,SLOT(childChanged(StandardSetting *)));
+}
+
+void ShutDownRebootSetting::childChanged(StandardSetting *)
+{
+    switch (m_overrideExitMenu->getValue().toInt())
+    {
+        case 2:
+        case 4:
+            m_haltCommand->setEnabled(true);
+            m_rebootCommand->setEnabled(false);
+            break;
+        case 3:
+        case 6:
+            m_haltCommand->setEnabled(true);
+            m_rebootCommand->setEnabled(true);
+            break;
+        case 5:
+            m_haltCommand->setEnabled(false);
+            m_rebootCommand->setEnabled(true);
+            break;
+        case 0:
+        case 1:
+        default:
+            m_haltCommand->setEnabled(false);
+            m_rebootCommand->setEnabled(false);
+            break;
+    }
 }
 
+
 MainGeneralSettings::MainGeneralSettings()
 {
-    DatabaseSettings::addDatabaseSettings(this);
+    //DatabaseSettings::addDatabaseSettings(this);
+    setLabel(QObject::tr("Main Settings"));
+
+    addChild(new DatabaseGroupSetting());
 
-    VerticalConfigurationGroup *pin =
-        new VerticalConfigurationGroup(false, true, false, false);
+    GroupSetting *pin = new GroupSetting();
     pin->setLabel(QObject::tr("Settings Access"));
     pin->addChild(SetupPinCodeRequired());
     pin->addChild(SetupPinCode());
     addChild(pin);
 
-    VerticalConfigurationGroup *general =
-        new VerticalConfigurationGroup(false, true, false, false);
+    GroupSetting *general = new GroupSetting();
     general->setLabel(QObject::tr("General"));
     general->addChild(UseVirtualKeyboard());
     general->addChild(ScreenShotPath());
     addChild(general);
 
-    VerticalConfigurationGroup *media =
-        new VerticalConfigurationGroup(false, true, false, false);
-    media->setLabel(QObject::tr("Media Monitor"));
-    MythMediaSettings *mediaMon = new MythMediaSettings();
-    media->addChild(mediaMon);
-    addChild(media);
-
-    VerticalConfigurationGroup *shutdownSettings =
-        new VerticalConfigurationGroup(true, true, false, false);
-    shutdownSettings->setLabel(QObject::tr("Shutdown/Reboot Settings"));
-    shutdownSettings->addChild(OverrideExitMenu());
-    shutdownSettings->addChild(HaltCommand());
-    shutdownSettings->addChild(RebootCommand());
-    addChild(shutdownSettings);
-
-    VerticalConfigurationGroup *remotecontrol =
-        new VerticalConfigurationGroup(false, true, false, false);
+    addChild(EnableMediaMon());
+
+    addChild(new ShutDownRebootSetting());
+
+    GroupSetting *remotecontrol = new GroupSetting();
     remotecontrol->setLabel(QObject::tr("Remote Control"));
     remotecontrol->addChild(LircDaemonDevice());
     remotecontrol->addChild(NetworkControlEnabled());
-    remotecontrol->addChild(NetworkControlPort());
-    remotecontrol->addChild(UDPNotifyPort());
     addChild(remotecontrol);
 }
 
+void MainGeneralSettings::applyChange()
+{
+    QStringList strlist( QString("REFRESH_BACKEND") );
+    gCoreContext->SendReceiveStringList(strlist);
+}
+
+
+class PlayBackScaling : public GroupSetting
+{
+    public:
+        PlayBackScaling();
+        virtual void updateButton(MythUIButtonListItem *item);
+    
+    private slots:
+        virtual void childChanged(StandardSetting *);
+    private:
+        StandardSetting * m_VertScan;
+        StandardSetting * m_HorizScan;
+        StandardSetting * m_XScan;
+        StandardSetting * m_YScan;
+};
+
+PlayBackScaling::PlayBackScaling()
+    :GroupSetting()
+{
+    setLabel(QObject::tr("Scaling"));
+    addChild(m_VertScan = VertScanPercentage());
+    addChild(m_YScan = YScanDisplacement());
+    addChild(m_HorizScan = HorizScanPercentage());
+    addChild(m_XScan = XScanDisplacement());
+    connect(m_VertScan,SIGNAL(valueChanged(StandardSetting *)),
+                    this,SLOT(childChanged(StandardSetting *)));
+    connect(m_YScan,SIGNAL(valueChanged(StandardSetting *)),
+                    this,SLOT(childChanged(StandardSetting *)));
+    connect(m_HorizScan,SIGNAL(valueChanged(StandardSetting *)),
+                    this,SLOT(childChanged(StandardSetting *)));
+    connect(m_XScan,SIGNAL(valueChanged(StandardSetting *)),
+                    this,SLOT(childChanged(StandardSetting *)));
+}
+
+
+void PlayBackScaling::updateButton(MythUIButtonListItem *item)
+{
+    GroupSetting::updateButton(item);
+    if (   m_VertScan->getValue()=="0"
+        && m_HorizScan->getValue()=="0"
+        && m_YScan->getValue()=="0"
+        && m_XScan->getValue()=="0")
+        item->SetText(QObject::tr("No scaling"),"value");
+    else
+        item->SetText(QString("%1%x%2%+%3%+%4%")
+                .arg(m_HorizScan->getValue())
+                .arg(m_VertScan->getValue())
+                .arg(m_XScan->getValue())
+                .arg(m_YScan->getValue()),"value");
+}
+
+void PlayBackScaling::childChanged(StandardSetting *)
+{
+    emit ShouldRedraw(this);
+}
+
 PlaybackSettings::PlaybackSettings()
 {
-    uint i = 0, total = 8;
-#if CONFIG_DARWIN
-    total += 2;
-#endif // USING_DARWIN
+    setLabel(QObject::tr("Playback settings"));
 
+    GroupSetting* general = new GroupSetting();
+    general->setLabel(QObject::tr("General Playback"));
+    general->addChild(RealtimePriority());
+    general->addChild(DecodeExtraAudio());
+    general->addChild(JumpToProgramOSD());
+    general->addChild(ClearSavedPosition());
+    general->addChild(AltClearSavedPosition());
+    general->addChild(AutomaticSetWatched());
+    general->addChild(ContinueEmbeddedTVPlay());
+    general->addChild(LiveTVIdleTimeout());
 
-    VerticalConfigurationGroup* general1 =
-        new VerticalConfigurationGroup(false);
-    general1->setLabel(QObject::tr("General Playback") +
-                      QString(" (%1/%2)").arg(++i).arg(total));
+    general->addChild(new PlayBackScaling());
 
-    HorizontalConfigurationGroup *columns =
-        new HorizontalConfigurationGroup(false, false, true, true);
+    general->addChild(AspectOverride());
+    general->addChild(AdjustFill());
 
-    VerticalConfigurationGroup *column1 =
-        new VerticalConfigurationGroup(false, false, true, true);
-    column1->addChild(RealtimePriority());
-    column1->addChild(DecodeExtraAudio());
-    column1->addChild(JumpToProgramOSD());
-    columns->addChild(column1);
+    general->addChild(LetterboxingColour());
+    general->addChild(PIPLocationComboBox());
+    general->addChild(PlaybackExitPrompt());
+    general->addChild(EndOfRecordingExitPrompt());
+    addChild(general);
 
-    VerticalConfigurationGroup *column2 =
-        new VerticalConfigurationGroup(false, false, true, true);
-    column2->addChild(ClearSavedPosition());
-    column2->addChild(AltClearSavedPosition());
-    column2->addChild(AutomaticSetWatched());
-    column2->addChild(ContinueEmbeddedTVPlay());
-    columns->addChild(column2);
-
-    general1->addChild(columns);
-    general1->addChild(LiveTVIdleTimeout());
-    addChild(general1);
-
-    VerticalConfigurationGroup* general2 =
-        new VerticalConfigurationGroup(false);
-    general2->setLabel(QObject::tr("General Playback") +
-                      QString(" (%1/%2)").arg(++i).arg(total));
-
-    HorizontalConfigurationGroup* oscan =
-        new HorizontalConfigurationGroup(false, false, true, true);
-    VerticalConfigurationGroup *ocol1 =
-        new VerticalConfigurationGroup(false, false, true, true);
-    VerticalConfigurationGroup *ocol2 =
-        new VerticalConfigurationGroup(false, false, true, true);
-    ocol1->addChild(VertScanPercentage());
-    ocol1->addChild(YScanDisplacement());
-    ocol2->addChild(HorizScanPercentage());
-    ocol2->addChild(XScanDisplacement());
-    oscan->addChild(ocol1);
-    oscan->addChild(ocol2);
-
-    HorizontalConfigurationGroup* aspect_fill =
-        new HorizontalConfigurationGroup(false, false, true, true);
-    aspect_fill->addChild(AspectOverride());
-    aspect_fill->addChild(AdjustFill());
-
-    general2->addChild(oscan);
-    general2->addChild(aspect_fill);
-    general2->addChild(LetterboxingColour());
-    general2->addChild(PIPLocationComboBox());
-    general2->addChild(PlaybackExitPrompt());
-    general2->addChild(EndOfRecordingExitPrompt());
-    addChild(general2);
+    addChild(CurrentPlaybackProfile());
 
-    QString tmp = QString(" (%1/%2)").arg(++i).arg(total);
-    addChild(new PlaybackProfileConfigs(tmp));
 
-    VerticalConfigurationGroup* pbox = new VerticalConfigurationGroup(false);
-    pbox->setLabel(QObject::tr("View Recordings") +
-                   QString(" (%1/%2)").arg(++i).arg(total));
+    GroupSetting* pbox = new GroupSetting();
+    pbox->setLabel(QObject::tr("View Recordings"));
     pbox->addChild(PlayBoxOrdering());
     pbox->addChild(PlayBoxEpisodeSort());
     // Disabled until we re-enable live previews
     // pbox->addChild(PlaybackPreview());
     // pbox->addChild(HWAccelPlaybackPreview());
     pbox->addChild(PBBStartInTitle());
-    addChild(pbox);
 
-    VerticalConfigurationGroup* pbox2 = new VerticalConfigurationGroup(false);
-    pbox2->setLabel(QObject::tr("Recording Groups") +
-                    QString(" (%1/%2)").arg(++i).arg(total));
+
+    GroupSetting* pbox2 = new GroupSetting();
+    pbox2->setLabel(QObject::tr("Recording Groups"));
     pbox2->addChild(DisplayRecGroup());
     pbox2->addChild(QueryInitialFilter());
     pbox2->addChild(RememberRecGroup());
     pbox2->addChild(UseGroupNameAsAllPrograms());
-    addChild(pbox2);
-
-    VerticalConfigurationGroup* pbox3 = new VerticalConfigurationGroup(false);
-    pbox3->setLabel(QObject::tr("View Recordings") +
-                    QString(" (%1/%2)").arg(++i).arg(total));
-    pbox3->addChild(DisplayGroupTitleSort());
-    pbox3->addChild(new WatchListSettings());
-    addChild(pbox3);
-
-    VerticalConfigurationGroup* seek = new VerticalConfigurationGroup(false);
-    seek->setLabel(QObject::tr("Seeking") +
-                   QString(" (%1/%2)").arg(++i).arg(total));
+    pbox->addChild(pbox2);
+
+    pbox->addChild(DisplayGroupTitleSort());
+    pbox->addChild(PlaybackWatchList());
+    addChild(pbox);
+
+    GroupSetting* seek = new GroupSetting();
+    seek->setLabel(QObject::tr("Seeking"));
     seek->addChild(SmartForward());
     seek->addChild(FFRewReposTime());
     seek->addChild(FFRewReverse());
     seek->addChild(ExactSeeking());
     addChild(seek);
 
-    VerticalConfigurationGroup* comms = new VerticalConfigurationGroup(false);
-    comms->setLabel(QObject::tr("Commercial Skip") +
-                    QString(" (%1/%2)").arg(++i).arg(total));
+
+
+    GroupSetting* comms = new GroupSetting();
+    comms->setLabel(QObject::tr("Commercial Skip"));
     comms->addChild(AutoCommercialSkip());
     comms->addChild(CommRewindAmount());
     comms->addChild(CommNotifyAmount());
+    //TODO mixing Host setting with Global setting, not very clear for the user
     comms->addChild(MaximumCommercialSkip());
     comms->addChild(MergeShortCommBreaks());
     addChild(comms);
 
 #if CONFIG_DARWIN
-    VerticalConfigurationGroup* mac1 = new VerticalConfigurationGroup(false);
-    mac1->setLabel(QObject::tr("Mac OS X Video Settings") +
-                   QString(" (%1/%2)").arg(++i).arg(total));
-    mac1->addChild(MacGammaCorrect());
-    mac1->addChild(MacScaleUp());
-    mac1->addChild(MacFullSkip());
-    addChild(mac1);
-
-    VerticalConfigurationGroup* mac2 = new VerticalConfigurationGroup(false);
-    mac2->setLabel(QObject::tr("Mac OS X Video Settings") +
-                   QString(" (%1/%2)").arg(++i).arg(total));
-    mac2->addChild(new MacMainSettings());
-    mac2->addChild(new MacFloatSettings());
-
-    HorizontalConfigurationGroup *row =
-        new HorizontalConfigurationGroup(false, false, true, true);
-    row->addChild(new MacDockSettings());
-    row->addChild(new MacDesktopSettings());
-    mac2->addChild(row);
-
-    addChild(mac2);
+    GroupSetting* ma1 = new GroupSetting(false);
+    mac->setLabel(QObject::tr("Mac OS X Video Settings"));
+    mac->addChild(MacGammaCorrect());
+    mac->addChild(MacScaleUp());
+    mac->addChild(MacFullSkip());
+
+    mac->addChild(MacMainEnabled());
+    mac->addChild(MacFloatEnabled());
+    mac->addChild(MacDockEnabled());
+    mac->addChild(MacDesktopEnabled());
+    mac->addChild(row);
+
+    addChild(mac);
 #endif
 }
 
 OSDSettings::OSDSettings()
 {
-    VerticalConfigurationGroup* osd = new VerticalConfigurationGroup(false);
-    osd->setLabel(QObject::tr("On-screen Display"));
+    setLabel(QObject::tr("On-screen Display"));
 
-    osd->addChild(EnableMHEG());
-    osd->addChild(PersistentBrowseMode());
-    osd->addChild(BrowseAllTuners());
-    osd->addChild(CCBackground());
-    osd->addChild(DefaultCCMode());
-    osd->addChild(PreferCC708());
-    osd->addChild(SubtitleFont());
-    osd->addChild(OSDCC708TextZoomPercentage());
-    osd->addChild(SubtitleCodec());
-    addChild(osd);
+    addChild(EnableMHEG());
+    addChild(PersistentBrowseMode());
+    addChild(BrowseAllTuners());
+    addChild(CCBackground());
+    addChild(DefaultCCMode());
+    addChild(PreferCC708());
+    addChild(SubtitleFont());
+    addChild(OSDCC708TextZoomPercentage());
+    addChild(SubtitleCodec());
 
     //VerticalConfigurationGroup *cc = new VerticalConfigurationGroup(false);
     //cc->setLabel(QObject::tr("Closed Captions"));
@@ -3476 +3789 @@
 
 GeneralSettings::GeneralSettings()
 {
-    VerticalConfigurationGroup* general = new VerticalConfigurationGroup(false);
-    general->setLabel(QObject::tr("General (Basic)"));
+    setLabel(QObject::tr("General"));
+    GroupSetting* general = new GroupSetting();
+    general->setLabel(QObject::tr("Basic"));
     general->addChild(ChannelOrdering());
     general->addChild(ChannelFormat());
     general->addChild(LongChannelFormat());
+    //LiveTVPriority (backend setting) should probably not be mixed with frontend settings
     general->addChild(LiveTVPriority());
     addChild(general);
 
-    VerticalConfigurationGroup* autoexp = new VerticalConfigurationGroup(false);
-    autoexp->setLabel(QObject::tr("General (Auto-Expire)"));
+    GroupSetting* autoexp = new GroupSetting();
+    autoexp->setLabel(QObject::tr("Auto-Expire"));
     autoexp->addChild(AutoExpireMethod());
-
-    VerticalConfigurationGroup *expgrp0 =
-        new VerticalConfigurationGroup(false, false, true, true);
-    expgrp0->addChild(AutoExpireDefault());
-    expgrp0->addChild(RerecordWatched());
-    expgrp0->addChild(AutoExpireWatchedPriority());
-
-    VerticalConfigurationGroup *expgrp1 =
-        new VerticalConfigurationGroup(false, false, true, true);
-    expgrp1->addChild(AutoExpireLiveTVMaxAge());
-    expgrp1->addChild(AutoExpireDayPriority());
-    expgrp1->addChild(AutoExpireExtraSpace());
-
-    HorizontalConfigurationGroup *expgrp =
-        new HorizontalConfigurationGroup(false, false, true, true);
-    expgrp->addChild(expgrp0);
-    expgrp->addChild(expgrp1);
-
-    autoexp->addChild(expgrp);
-//    autoexp->addChild(new DeletedExpireOptions());
+    autoexp->addChild(AutoExpireDefault());
+    autoexp->addChild(RerecordWatched());
+    autoexp->addChild(AutoExpireWatchedPriority());
+    autoexp->addChild(AutoExpireLiveTVMaxAge());
+    autoexp->addChild(AutoExpireDayPriority());
+    autoexp->addChild(AutoExpireExtraSpace());
+    //autoexp->addChild(AutoExpireInsteadOfDelete());
     autoexp->addChild(DeletedFifoOrder());
     autoexp->addChild(DeletedMaxAge());
-
     addChild(autoexp);
 
-    VerticalConfigurationGroup* jobs = new VerticalConfigurationGroup(false);
-    jobs->setLabel(QObject::tr("General (Jobs)"));
+    GroupSetting* jobs = new GroupSetting();
+    jobs->setLabel(QObject::tr("Jobs"));
     jobs->addChild(CommercialSkipMethod());
     jobs->addChild(CommFlagFast());
     jobs->addChild(AggressiveCommDetect());
     jobs->addChild(DefaultTranscoder());
     jobs->addChild(DeferAutoTranscodeDays());
 
-    VerticalConfigurationGroup* autogrp0 =
-        new VerticalConfigurationGroup(false, false, true, true);
-    autogrp0->addChild(AutoMetadataLookup());
-    autogrp0->addChild(AutoCommercialFlag());
-    autogrp0->addChild(AutoTranscode());
-
-    VerticalConfigurationGroup* autogrp1 =
-        new VerticalConfigurationGroup(false, false, true, true);
-    autogrp0->addChild(AutoRunUserJob(1));
-    autogrp1->addChild(AutoRunUserJob(2));
-    autogrp1->addChild(AutoRunUserJob(3));
-    autogrp1->addChild(AutoRunUserJob(4));
-
-    HorizontalConfigurationGroup *autogrp =
-        new HorizontalConfigurationGroup(true, true, false, true);
+    GroupSetting *autogrp = new GroupSetting();
     autogrp->setLabel(
         QObject::tr("Default Job Queue Settings for New Scheduled Recordings"));
-    autogrp->addChild(autogrp0);
-    autogrp->addChild(autogrp1);
+    autogrp->addChild(AutoMetadataLookup());
+    autogrp->addChild(AutoCommercialFlag());
+    autogrp->addChild(AutoTranscode());
+    autogrp->addChild(AutoRunUserJob(1));
+    autogrp->addChild(AutoRunUserJob(2));
+    autogrp->addChild(AutoRunUserJob(3));
+    autogrp->addChild(AutoRunUserJob(4));
+
     jobs->addChild(autogrp);
 
     addChild(jobs);
 
-    VerticalConfigurationGroup* general2 = new VerticalConfigurationGroup(false);
-    general2->setLabel(QObject::tr("General (Advanced)"));
+    GroupSetting* general2 = new GroupSetting();
+    general2->setLabel(QObject::tr("Advanced"));
     general2->addChild(RecordPreRoll());
     general2->addChild(RecordOverTime());
     general2->addChild(CategoryOverTimeSettings());
     addChild(general2);
 
-    VerticalConfigurationGroup* changrp = new VerticalConfigurationGroup(false);
-    changrp->setLabel(QObject::tr("General (Channel Groups)"));
-    ChannelGroupSettings *changroupsettings = new ChannelGroupSettings();
-    changrp->addChild(changroupsettings);
+    GroupSetting* changrp = new GroupSetting();
+    changrp->setLabel(QObject::tr("Channel Groups"));
+    changrp->addChild(ChannelGroupRememberLast());
     changrp->addChild(BrowseChannelGroup());
     addChild(changrp);
 }
 
 EPGSettings::EPGSettings()
 {
-    VerticalConfigurationGroup* epg = new VerticalConfigurationGroup(false);
-    epg->setLabel(QObject::tr("Program Guide") + " 1/1");
-    epg->addChild(WatchTVGuide());
-    epg->addChild(DefaultTVChannel());
-    epg->addChild(EPGRecThreshold());
-    addChild(epg);
+    setLabel(QObject::tr("Program Guide"));
+    addChild(WatchTVGuide());
+    addChild(DefaultTVChannel());
+    addChild(EPGRecThreshold());
 }
 
 GeneralRecPrioritiesSettings::GeneralRecPrioritiesSettings()
 {
-    VerticalConfigurationGroup* sched = new VerticalConfigurationGroup(false);
+    GroupSetting* sched = new GroupSetting();
     sched->setLabel(QObject::tr("Scheduler Options"));
 
     sched->addChild(GRSchedMoveHigher());
@@ -3583 +3873 @@
     sched->addChild(GRAutoRecPriority());
     addChild(sched);
 
-    VerticalConfigurationGroup* access = new VerticalConfigurationGroup(false);
+    GroupSetting* access = new GroupSetting();
     access->setLabel(QObject::tr("Accessibility Options"));
 
     access->addChild(GRSignLangRecPriority());
@@ -3593 +3883 @@
     access->addChild(GRAudioDescRecPriority());
     addChild(access);
 
-    VerticalConfigurationGroup* rtype = new VerticalConfigurationGroup(false);
+    GroupSetting* rtype = new GroupSetting();
     rtype->setLabel(QObject::tr("Recording Type Priority Settings"));
 
     rtype->addChild(GRSingleRecordRecPriority());
@@ -3606 +3896 @@
     addChild(rtype);
 }
 
+
+class GuiDimension : public GroupSetting
+{
+    public:
+        GuiDimension();
+        //virtual QString getValue();
+        virtual void updateButton(MythUIButtonListItem *item);
+    
+    private slots:
+        virtual void childChanged(StandardSetting *);
+    private:
+        StandardSetting * m_width;
+        StandardSetting * m_height;
+        StandardSetting * m_offsetX;
+        StandardSetting * m_offsetY;
+};
+
+GuiDimension::GuiDimension()
+    :GroupSetting()
+{
+    setLabel(QObject::tr("Gui dimension"));
+    addChild(m_width   = GuiWidth());
+    addChild(m_height  = GuiHeight());
+    addChild(m_offsetX = GuiOffsetX());
+    addChild(m_offsetY = GuiOffsetY());
+    connect(m_width, SIGNAL(valueChanged(StandardSetting *)),
+                    this, SLOT(childChanged(StandardSetting *)));
+    connect(m_height, SIGNAL(valueChanged(StandardSetting *)),
+                    this, SLOT(childChanged(StandardSetting *)));
+    connect(m_offsetX, SIGNAL(valueChanged(StandardSetting *)),
+                    this, SLOT(childChanged(StandardSetting *)));
+    connect(m_offsetY, SIGNAL(valueChanged(StandardSetting *)),
+                    this, SLOT(childChanged(StandardSetting *)));
+}
+
+void GuiDimension::updateButton(MythUIButtonListItem *item)
+{
+    GroupSetting::updateButton(item);
+    if ((  m_width->getValue()=="0"
+        || m_height->getValue()=="0")
+        && m_offsetX->getValue()=="0"
+        && m_offsetY->getValue()=="0")
+        item->SetText(QObject::tr("Fullscreen"),"value");
+    else
+        item->SetText(QString("%1x%2+%3+%4")
+                .arg(m_width->getValue())
+                .arg(m_height->getValue())
+                .arg(m_offsetX->getValue())
+                .arg(m_offsetY->getValue()),"value");
+}
+
+
+
+void GuiDimension::childChanged(StandardSetting *)
+{
+    emit ShouldRedraw(this);
+}
+
+
+
 AppearanceSettings::AppearanceSettings()
 {
-    VerticalConfigurationGroup* screen = new VerticalConfigurationGroup(false);
+    GroupSetting* screen = new GroupSetting();
     screen->setLabel(QObject::tr("Theme") + " / " + QObject::tr("Screen Settings"));
+    addChild(screen);
 
     screen->addChild(MenuTheme());
 
@@ -3622 +3973 @@
 //    screen->addChild(DisplaySizeHeight());
 //    screen->addChild(DisplaySizeWidth());
 
-    VerticalConfigurationGroup *column1 =
-        new VerticalConfigurationGroup(false, false, false, false);
-
-    column1->addChild(GuiWidth());
-    column1->addChild(GuiHeight());
-    column1->addChild(GuiOffsetX());
-    column1->addChild(GuiOffsetY());
-
-    VerticalConfigurationGroup *column2 =
-        new VerticalConfigurationGroup(false, false, false, false);
-
-    column2->addChild(GuiSizeForTV());
-    column2->addChild(HideMouseCursor());
-    column2->addChild(RunInWindow());
-    column2->addChild(UseFixedWindowSize());
-
-    HorizontalConfigurationGroup *columns =
-        new HorizontalConfigurationGroup(false, false, false, false);
+    screen->addChild(new GuiDimension());
 
-    columns->addChild(column1);
-    columns->addChild(column2);
-
-    screen->addChild(columns);
-
-    addChild(screen);
+    screen->addChild(GuiSizeForTV());
+    screen->addChild(HideMouseCursor());
+    screen->addChild(RunInWindow());
+    screen->addChild(UseFixedWindowSize());
 
 #if defined(USING_XRANDR) || CONFIG_DARWIN
     const vector<DisplayResScreen> scr = GetVideoModes();
     if (!scr.empty())
-        addChild(new VideoModeSettings());
+        addChild(UseVideoModes());
 #endif
-    VerticalConfigurationGroup* dates = new VerticalConfigurationGroup(false);
+    GroupSetting* dates = new GroupSetting();
     dates->setLabel(QObject::tr("Localization"));
     dates->addChild(MythLanguage());
     dates->addChild(ISO639PreferredLanguage(0));
@@ -3663 +3995 @@
     dates->addChild(MythTimeFormat());
     addChild(dates);
 
-    addChild(new LcdSettings());
+    addChild(LCDEnable());
+}
+
+void AppearanceSettings::applyChange()
+{
+    qApp->processEvents();
+    GetMythMainWindow()->JumpTo("Reload Theme");
+}
+
+/*******************************************************************************
+*                                PlayBack Groups                               *
+*******************************************************************************/
+
+
+class PlayBackGroupSetting : public GroupSetting
+{
+  public:
+    PlayBackGroupSetting(const QString &label, const QString &name);
+    virtual void updateButton(MythUIButtonListItem *item);
+    virtual void Load();
+    virtual void Save();
+    virtual void Close();
+  private:
+    TransTextEditSetting       *m_groupName;
+    TransTextEditSetting       *m_titleMatch;
+    TransMythUISpinBoxSetting  *m_skipAhead;
+    TransMythUISpinBoxSetting  *m_skipBack;
+    TransMythUISpinBoxSetting  *m_jumpMinutes;
+    TransMythUISpinBoxSetting  *m_timeStrech;
+    TransMythUICheckBoxSetting *m_markForDeletion;
+    bool                        m_isNew;
+};
+
+//TODO allow to delete a group
+
+void PlayBackGroupSetting::updateButton(MythUIButtonListItem *item)
+{
+    item->setEnabled(isEnabled());
+    item->SetText(m_label);
+    //item->SetText(m_settingValue,"value");
+    item->SetText(getHelpText(),"description");
+    item->setDrawArrow (haveSubSettings());
+}
+
+PlayBackGroupSetting::PlayBackGroupSetting(const QString &label, const QString &name)
+    :GroupSetting(),m_isNew(true)
+{
+
+    setLabel(label);
+    setValue(name);
+
+    m_groupName = new TransTextEditSetting();
+    m_groupName->setLabel(QObject::tr("Playback Group Name"));
+    addChild(m_groupName);
+
+    m_titleMatch = new TransTextEditSetting();
+    m_titleMatch->setLabel(QObject::tr("Title match (regex)"));
+    m_titleMatch->setHelpText(QObject::tr("Automatically set new recording rules to "
+                                "use this group if the title matches this "
+                                "regular expression.  For example, "
+                                "\"(News|CNN)\" would match any title in "
+                                "which \"News\" or \"CNN\" appears."));
+    addChild(m_titleMatch);
+
+    m_skipAhead = new TransMythUISpinBoxSetting(0, 600, 5, true);
+    m_skipAhead->addSelection(tr("Default"),"0",true);
+    m_skipAhead->setLabel(QObject::tr("Skip ahead (seconds)"));
+    m_skipAhead->setHelpText(QObject::tr("How many seconds to skip forward on a fast "
+                            "forward."));
+    addChild(m_skipAhead);
+
+    m_skipBack = new TransMythUISpinBoxSetting(0, 600, 5, true);
+    m_skipBack->addSelection(tr("Default"),"0",true);
+    m_skipBack->setLabel(QObject::tr("Skip back (seconds)"));
+    m_skipBack->setHelpText(QObject::tr("How many seconds to skip backward on a "
+                                "rewind."));
+    addChild(m_skipBack);
+
+    m_jumpMinutes = new TransMythUISpinBoxSetting(0, 30, 10, true);
+    m_jumpMinutes->addSelection(tr("Default"),"0",true);
+    m_jumpMinutes->setLabel(QObject::tr("Jump amount (minutes)"));
+    m_jumpMinutes->setHelpText(QObject::tr("How many minutes to jump forward or backward "
+                    "when the jump keys are pressed."));
+    addChild(m_jumpMinutes);
+
+    m_timeStrech = new TransMythUISpinBoxSetting(45, 200, 5, false);
+    m_timeStrech->addSelection(tr("Default"),"0",true);
+    m_timeStrech->setLabel(QObject::tr("Time stretch (speed x 100)"));
+    m_timeStrech->setHelpText(QObject::tr("Initial playback speed with adjusted audio.  "
+                                "Use 100 for normal speed, 50 for half speed "
+                                "and 200 for double speed."));
+    addChild(m_timeStrech);
+
+    m_markForDeletion = new TransMythUICheckBoxSetting();
+    m_markForDeletion->setLabel(QObject::tr("Mark for deletion"));
+    m_markForDeletion->setEnabled(false);
+    addChild(m_markForDeletion);
+}
+
+
+void PlayBackGroupSetting::Load()
+{
+    LOG(VB_GENERAL, LOG_ERR, QString("PlayBackGroupSetting::Load(%1)").arg(getLabel()));
+    if (getValue().isEmpty())
+    {
+        GroupSetting::Load();
+        return;
+    }
+    MSqlQuery query(MSqlQuery::InitCon());
+    query.prepare("SELECT name, titlematch, skipahead, skipback, jump, timestretch FROM playgroup "
+                  "WHERE name = :NAME ;");
+    query.bindValue(":NAME", getValue());
+    if (!query.exec())
+        MythDB::DBError("PlayBackGroupSetting::Load()", query);
+    else if (query.next())
+    {
+        LOG(VB_GENERAL, LOG_ERR, QString("PlayBackGroupSetting::Load(%1) SUCCESS").arg(getLabel()));
+        m_isNew=false;
+        m_groupName->setValue(query.value(0).toString());
+        m_groupName->setEnabled(getValue()!="Default");
+        m_titleMatch->setValue(query.value(1).toString());
+        m_skipAhead->setValue(query.value(2).toInt());
+        m_skipBack->setValue(query.value(3).toInt());
+        m_jumpMinutes->setValue(query.value(4).toInt());
+
+        if (query.value(5).toInt() < 45 || query.value(5).toInt() > 200)
+            m_timeStrech->setValue(0);
+        else
+            m_timeStrech->setValue(query.value(4).toInt());
+        m_markForDeletion->setEnabled(getValue()!="Default");
+        //mark setting as not changed
+        GroupSetting::Load();
+
+    }
+}
+
+void PlayBackGroupSetting::Close()
+{
+    Save();
+}
+
+void PlayBackGroupSetting::Save()
+{
+    LOG(VB_GENERAL, LOG_ERR, QString("PlayBackGroupSetting::Save(%1)").arg(getLabel()));
+    MSqlQuery query(MSqlQuery::InitCon());
+
+    if (m_isNew)
+    {
+        query.prepare("INSERT playgroup "
+                        "(name, titlematch, skipahead, skipback, jump, timestretch) "
+                        "VALUES "
+                        "(:NEWNAME, :TITLEMATCH, :SKIPAHEAD, :SKIPBACK, :JUMP, :TIMESTRETCH);");
+
+        query.bindValue(":NEWNAME",     m_groupName->getValue());
+        query.bindValue(":TITLEMATCH",  m_titleMatch->getValue());
+        query.bindValue(":SKIPAHEAD",   m_skipAhead->intValue());
+        query.bindValue(":SKIPBACK",    m_skipBack->intValue());
+        query.bindValue(":JUMP",        m_jumpMinutes->intValue());
+        query.bindValue(":TIMESTRETCH", m_timeStrech->intValue());
+
+        if (!query.exec())
+            MythDB::DBError("PlayBackGroupSetting::Save", query);
+    }
+    else if (m_markForDeletion->boolValue())
+    {
+        query.prepare("DELETE FROM playgroup "
+                        "WHERE name = :NAME ;");
+        query.bindValue(":NAME",        getValue());
+
+        if (!query.exec())
+            MythDB::DBError("PlayBackGroupSetting::Save", query);
+    }
+    else
+    {
+        query.prepare("UPDATE playgroup SET "
+                        "name        = :NEWNAME, "
+                        "titlematch  = :TITLEMATCH, "
+                        "skipahead   = :SKIPAHEAD, "
+                        "skipback    = :SKIPBACK, "
+                        "jump        = :JUMP, "
+                        "timestretch = :TIMESTRETCH " 
+                        "WHERE name = :NAME ;");
+
+        query.bindValue(":NEWNAME",     m_groupName->getValue());
+        query.bindValue(":TITLEMATCH",  m_titleMatch->getValue());
+        query.bindValue(":SKIPAHEAD",   m_skipAhead->intValue());
+        query.bindValue(":SKIPBACK",    m_skipBack->intValue());
+        query.bindValue(":JUMP",        m_jumpMinutes->intValue());
+        query.bindValue(":TIMESTRETCH", m_timeStrech->intValue());
+        query.bindValue(":NAME",        getValue());
+
+        if (!query.exec())
+            MythDB::DBError("PlayBackGroupSetting::Save", query);
+    }
+
+    GroupSetting::Save();
+}
+
+
+PlayBackGroupsSetting::PlayBackGroupsSetting():
+    GroupSetting()
+{
+    setLabel(tr("Playback Groups"));
+}
+
+
+void PlayBackGroupsSetting::Open()
+{
+    //TODO the play groups are loaded twice when the dialog is open for the first time
+    Load();
+}
+
+
+void PlayBackGroupsSetting::Load()
+{
+    clearSettings();
+    addChild(new PlayBackGroupSetting(tr("Create new group"),""));
+
+    addChild(new PlayBackGroupSetting(tr("Default"),"Default"));
+
+    QStringList names = PlayGroup::GetNames();
+    while (!names.isEmpty())
+    {
+        addChild(new PlayBackGroupSetting(names.front(),names.front()));
+        names.pop_front();
+    }
+    
+    //Load all the groups
+    GroupSetting::Load();
+    //TODO select the new one or the edited one
+    emit settingsChanged(NULL);
+}
+
+
+/*******************************************************************************
+*                                Channel Groups                                *
+*******************************************************************************/
+
+class ChannelCheckBoxSetting : public TransMythUICheckBoxSetting
+{
+  public:
+    ChannelCheckBoxSetting(uint chanid, 
+        const QString &channum, const QString &name);
+    uint getChannelId(){return m_channelId;};
+  private:
+    uint m_channelId;
+    
+};
+
+ChannelCheckBoxSetting::ChannelCheckBoxSetting(uint chanid, 
+        const QString &channum, const QString &channame)
+    :TransMythUICheckBoxSetting(),
+    m_channelId(chanid)
+{
+    setLabel(QString("%1 %2").arg(channum).arg(channame));
+    setHelpText(QObject::tr("Select/Unselect channels for this channel group"));
+}
+
+
+
+ChannelGroupSetting::ChannelGroupSetting(const QString &groupName, int groupId = -1)
+    :GroupSetting(),
+    m_groupId(groupId),
+    m_groupName(NULL),
+    m_markForDeletion(NULL)
+{
+    setLabel(groupName);//TODO this should be the translated name if Favorite
+    setValue(groupName);
+    m_groupName = new TransTextEditSetting();
+    m_groupName->setLabel(groupName);
+}
+
+void ChannelGroupSetting::Open()
+{
+    Load();
+}
+
+void ChannelGroupSetting::Close()
+{
+    LOG(VB_GENERAL, LOG_ERR, QString("ChannelGroupSetting::Close() %1").arg(getLabel()));
+    if (m_markForDeletion)
+        LOG(VB_GENERAL, LOG_ERR, QString("m_markForDeletion => %1").arg(m_markForDeletion->boolValue()));
+    //Change the name
+    if (m_markForDeletion && m_markForDeletion->boolValue() && m_groupId>1)
+    {
+        MSqlQuery query(MSqlQuery::InitCon());
+        // Delete channels from this group
+        query.prepare("DELETE FROM channelgroup WHERE grpid = :GRPID;");
+        query.bindValue(":GRPID", m_groupId);
+        if (!query.exec())
+            MythDB::DBError("ChannelGroupSetting::Close", query);
+
+        // Now delete the group from channelgroupnames
+        query.prepare("DELETE FROM channelgroupnames WHERE grpid = :GRPID;");
+        query.bindValue(":GRPID", m_groupId);
+        if (!query.exec())
+            MythDB::DBError("ChannelGroupSetting::Close", query);
+        return;
+    }
+
+    if (m_groupName && m_groupName->haveChanged())
+    {
+        if (m_groupId==-1)//create a new group
+        {
+            MSqlQuery query(MSqlQuery::InitCon());
+            QString qstr = "INSERT INTO channelgroupnames (name) VALUE (:NEWNAME);";
+            query.prepare(qstr);
+            query.bindValue(":NEWNAME",     m_groupName->getValue());
+
+            if (!query.exec())
+                MythDB::DBError("ChannelGroupSetting::Close", query);
+            else
+            {
+                //update m_groupId
+                QString qstr = "SELECT grpid FROM channelgroupnames "
+                                "WHERE name = :NEWNAME;";
+                query.prepare(qstr);
+                query.bindValue(":NEWNAME",     m_groupName->getValue());
+                if (!query.exec())
+                    MythDB::DBError("ChannelGroupSetting::Close", query);
+            }
+        }
+        else
+        {
+            MSqlQuery query(MSqlQuery::InitCon());
+            QString qstr = "UPDATE channelgroupnames set name = :NEWNAME "
+                            " WHERE name = :OLDNAME ;";
+            query.prepare(qstr);
+            query.bindValue(":NEWNAME",     m_groupName->getValue());
+            query.bindValue(":OLDNAME",        getValue());
+
+            if (!query.exec())
+                MythDB::DBError("ChannelGroupSetting::Close", query);
+            else
+                m_groupId = query.value(0).toUInt();
+        }
+    }
+    if (m_groupId==-1) return;
+    QList<StandardSetting *> *children = getSubSettings();
+    if (children==NULL) return;
+    QList<StandardSetting *>::const_iterator i;
+    for (i = children->constBegin(); i != children->constEnd(); ++i)
+    {
+        if ((*i)->haveChanged())
+        {
+            if ((*i)==m_groupName)
+            {
+                LOG(VB_GENERAL, LOG_ERR, QString("ChannelGroupSetting::Close() change %1 to %2")
+                    .arg(getLabel())
+                    .arg(m_groupName->getValue()));
+            }
+            else
+            {
+                ChannelCheckBoxSetting *channel = dynamic_cast<ChannelCheckBoxSetting *>(*i);
+                if (channel)
+                {
+                    if (channel->boolValue())
+                    {
+                        LOG(VB_GENERAL, LOG_ERR, QString("ChannelGroupSetting::Close() add %1").arg(channel->getLabel()));
+                        ChannelGroup::AddChannel(channel->getChannelId(), m_groupId);
+                    }
+                    else
+                    {
+                        LOG(VB_GENERAL, LOG_ERR, QString("ChannelGroupSetting::Close() remove %1").arg(channel->getLabel()));
+                        ChannelGroup::DeleteChannel(channel->getChannelId(), m_groupId);
+                    }
+                }
+            }
+        }
+    }
+}
+
+void ChannelGroupSetting::Load()
+{
+    LOG(VB_GENERAL, LOG_ERR, QString("ChannelGroupSetting::Load() %1").arg(getLabel()));
+    clearSettings();
+    //We can not rename the Favorite group
+    //if (m_groupId!=1)
+    //{
+        m_groupName = new TransTextEditSetting();
+        m_groupName->setLabel(tr("Group name"));
+        if (m_groupId>-1)
+            m_groupName->setValue(getLabel());
+        m_groupName->setEnabled(m_groupId!=1);
+        addChild(m_groupName);
+    //}
+
+    MSqlQuery query(MSqlQuery::InitCon());
+
+    QString qstr = "SELECT channel.chanid, channum, name, grpid FROM channel "
+                    "LEFT JOIN channelgroup "
+                    "ON (channel.chanid = channelgroup.chanid AND  grpid = :GRPID) ;";
+
+    query.prepare(qstr);
+
+    query.bindValue(":GRPID",  m_groupId);
+
+    if (!query.exec() || !query.isActive())
+        MythDB::DBError("ChannelGroupSetting::Load", query);
+    else
+    {
+        while(query.next())
+        {
+            ChannelCheckBoxSetting * channelCheckBox = 
+                    new ChannelCheckBoxSetting(
+                        query.value(0).toUInt(),
+                        query.value(1).toString(),
+                        query.value(2).toString()
+                    );
+            channelCheckBox->setValue(!query.value(3).isNull());
+            addChild(channelCheckBox);
+        }
+    }
+
+    //can not delete new group or Favorite
+    m_markForDeletion = new TransMythUICheckBoxSetting();
+    m_markForDeletion->setLabel(tr("Mark for deletion"));
+    addChild(m_markForDeletion);
+    m_markForDeletion->setEnabled(m_groupId>1);
+
+    GroupSetting::Load();
+}
+
+
+ChannelGroupsSetting::ChannelGroupsSetting():
+    GroupSetting()
+{
+    setLabel(tr("Channel Groups"));
+}
+
+
+void ChannelGroupsSetting::Open()
+{
+    //TODO the play groups are loaded twice when the dialog is open for the first time
+    Load();
+}
+
+
+
+void ChannelGroupsSetting::Load()
+{
+    clearSettings();
+    addChild(new ChannelGroupSetting(tr("Create New Channel Group")));
+    addChild(new ChannelGroupSetting(tr("Favorites"), 1));
+
+
+    MSqlQuery query(MSqlQuery::InitCon());
+
+    QString qstr = "SELECT grpid, name FROM channelgroupnames "
+                        " WHERE grpid <> 1 "
+                        " ORDER BY name ; ";
+
+    query.prepare(qstr);
+
+    if (!query.exec() || !query.isActive())
+        MythDB::DBError("ChannelGroupsSetting::Load", query);
+    else
+    {
+        while(query.next())
+        {
+            addChild(new ChannelGroupSetting(query.value(1).toString(),
+                    query.value(0).toUInt()));
+        }
+    }
+    
+    //Load all the groups
+    GroupSetting::Load();
+    //TODO select the new one or the edited one
+    emit settingsChanged(NULL);
 }
 
 // vim:set sw=4 ts=4 expandtab:

mythtv/programs/mythfrontend/globalsettings.h

@@ -4 +4 @@
 #include <QStringList>
 #include <QObject>
 
-#include "settings.h"
 #include "mythcontext.h"
 #include "videodisplayprofile.h"
+#include "standardsettings.h"
 
 #include <QMutex>
 
 class QFileInfo;
 
-class PlaybackSettings : public ConfigurationWizard
+class PlaybackSettings : public GroupSetting //ConfigurationWizard
 {
   public:
     PlaybackSettings();
 };
 
-class OSDSettings: virtual public ConfigurationWizard
+//TODO check the purpose of virtual here
+//class OSDSettings: virtual public ConfigurationWizard
+class OSDSettings: public GroupSetting
 {
   public:
     OSDSettings();
 };
 
-class GeneralSettings : public ConfigurationWizard
+class GeneralSettings : public GroupSetting
 {
   public:
     GeneralSettings();
 };
 
-class EPGSettings : public ConfigurationWizard
+class EPGSettings : public GroupSetting
 {
   public:
     EPGSettings();
 };
 
-class AppearanceSettings : public ConfigurationWizard
+class AppearanceSettings : public GroupSetting
 {
   public:
     AppearanceSettings();
+    virtual void applyChange();
 };
 
-class MainGeneralSettings : public ConfigurationWizard
+class HostRefreshRateComboBoxSetting : public HostComboBoxSetting
+{
+    Q_OBJECT
+  public:
+    HostRefreshRateComboBoxSetting(const QString &name) :
+        HostComboBoxSetting(name) { }
+    virtual ~HostRefreshRateComboBoxSetting() { ; }
+
+  public slots:
+    virtual void ChangeResolution(StandardSetting *);
+
+  private:
+    static const vector<double> GetRefreshRates(const QString &resolution);
+};
+
+
+class MainGeneralSettings : public GroupSetting
 {
   public:
     MainGeneralSettings();
+    virtual void applyChange();
 };
 
-class GeneralRecPrioritiesSettings : public ConfigurationWizard
+class GeneralRecPrioritiesSettings : public GroupSetting
 {
   public:
     GeneralRecPrioritiesSettings();
@@ -59 +79 @@
   public:
     XboxSettings();
 };
-
+/*
 class PlaybackProfileItemConfig : public QObject, public ConfigurationWizard
 {
     Q_OBJECT
@@ -128 +148 @@
     vector<TransSpinBoxSetting*> priority;
 };
 
+
 class PlaybackProfileConfigs : public TriggeredConfigurationGroup
 {
     Q_OBJECT
@@ -146 +167 @@
   private:
     QStringList   profiles;
     HostComboBox *grouptrigger;
+};*/
+
+
+
+class PlayBackGroupsSetting : public GroupSetting
+{
+    Q_OBJECT
+  public:
+    PlayBackGroupsSetting();
+    virtual void Load();
+    virtual void Open();
+  public slots:
+    //void newPlayBackGroup(StandardSetting *);
+    //void editPlayBackGroup(StandardSetting *);
+    //void RefreshList();
+  private:
+    ButtonStandardSetting *m_addGroupButton;
+};
+
+class ChannelGroupSetting : public GroupSetting
+{
+  public:
+    ChannelGroupSetting(const QString &groupName, int groupId);
+    virtual void Load();
+    virtual void Open();
+    virtual void Close();
+  private:
+    int m_groupId;
+    TransTextEditSetting       *m_groupName;
+    TransMythUICheckBoxSetting *m_markForDeletion;
+    
 };
 
+class ChannelGroupsSetting : public GroupSetting
+{
+  public:
+    ChannelGroupsSetting();
+    virtual void Load();
+    virtual void Open();
+  private:
+    ButtonStandardSetting *m_addGroupButton;
+};
+
+
+
 #endif

mythtv/programs/mythfrontend/main.cpp

@@ -1 @@
-#include <unistd.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <cerrno>
@@ -74 +73 @@
 #include "themechooser.h"
 #include "mythversion.h"
 #include "taskqueue.h"
+#include "standardsettings.h"
 
 // Video
 #include "cleanup.h"
@@ -144 +144 @@
 
             if (passwordValid)
             {
-                VideoGeneralSettings settings;
-                settings.exec();
+                MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
+                StandardSettingDialog *ssd = new StandardSettingDialog(mainStack, "videogeneralsettings");
+
+                if (ssd->Create())
+                {
+                    ssd->loadSettings(new VideoGeneralSettings());
+                    mainStack->AddScreen(ssd);
+                }
+                else
+                    delete ssd;
             }
             else
             {
@@ -861 +869 @@
         startPrevious();
     else if (sel == "settings appearance")
     {
-        AppearanceSettings *settings = new AppearanceSettings();
-        DialogCode res = settings->exec();
-        delete settings;
+        MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
+        StandardSettingDialog *ssd = new StandardSettingDialog(mainStack, "videogeneralsettings");
 
-        if (kDialogCodeRejected != res)
+        if (ssd->Create())
         {
-            qApp->processEvents();
-            GetMythMainWindow()->JumpTo("Reload Theme");
+            ssd->loadSettings(new AppearanceSettings());
+            mainStack->AddScreen(ssd);
         }
+        else
+            delete ssd;
     }
     else if (sel == "settings themechooser")
     {
@@ -911 +920 @@
     }
     else if (sel == "settings playgroup")
     {
-        PlayGroupEditor editor;
-        editor.exec();
+        MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
+        StandardSettingDialog *ssd = new StandardSettingDialog(mainStack, "playbackgroupsetting");
+
+        if (ssd->Create())
+        {
+            ssd->loadSettings(new PlayBackGroupsSetting());
+            mainStack->AddScreen(ssd);
+        }
+        else
+            delete ssd;
     }
     else if (sel == "settings general")
     {
-        GeneralSettings settings;
-        settings.exec();
+        MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
+        StandardSettingDialog *ssd = new StandardSettingDialog(mainStack, "videogeneralsettings");
+
+        if (ssd->Create())
+        {
+            ssd->loadSettings(new GeneralSettings());
+            mainStack->AddScreen(ssd);
+        }
+        else
+            delete ssd;
     }
     else if (sel == "settings audiogeneral")
     {
-        AudioGeneralSettings audiosettings;
-        audiosettings.exec();
+        MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
+        StandardSettingDialog *ssd = new StandardSettingDialog(mainStack, "videogeneralsettings");
+
+        if (ssd->Create())
+        {
+            ssd->loadSettings(new AudioConfigSettings());
+            mainStack->AddScreen(ssd);
+        }
+        else
+            delete ssd;
     }
     else if (sel == "settings maingeneral")
     {
-        MainGeneralSettings mainsettings;
-        mainsettings.exec();
-        QStringList strlist( QString("REFRESH_BACKEND") );
-        gCoreContext->SendReceiveStringList(strlist);
+        MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
+        StandardSettingDialog *ssd = new StandardSettingDialog(mainStack, "videogeneralsettings");
+
+        if (ssd->Create())
+        {
+            ssd->loadSettings(new MainGeneralSettings());
+            mainStack->AddScreen(ssd);
+        }
+        else
+            delete ssd;
     }
     else if (sel == "settings playback")
     {
-        PlaybackSettings settings;
-        settings.exec();
+        MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
+        StandardSettingDialog *ssd = new StandardSettingDialog(mainStack, "videogeneralsettings");
+
+        if (ssd->Create())
+        {
+            ssd->loadSettings(new PlaybackSettings());
+            mainStack->AddScreen(ssd);
+        }
+        else
+            delete ssd;
     }
     else if (sel == "settings osd")
     {
-        OSDSettings settings;
-        settings.exec();
+        MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
+        StandardSettingDialog *ssd = new StandardSettingDialog(mainStack, "videogeneralsettings");
+
+        if (ssd->Create())
+        {
+            ssd->loadSettings(new OSDSettings());
+            mainStack->AddScreen(ssd);
+        }
+        else
+            delete ssd;
     }
     else if (sel == "settings epg")
     {
-        EPGSettings settings;
-        settings.exec();
+        MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
+        StandardSettingDialog *ssd = new StandardSettingDialog(mainStack, "videogeneralsettings");
+
+        if (ssd->Create())
+        {
+            ssd->loadSettings(new EPGSettings());
+            mainStack->AddScreen(ssd);
+        }
+        else
+            delete ssd;
     }
     else if (sel == "settings channelgroups")
     {
-        ChannelGroupEditor editor;
-        editor.exec();
+        MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
+        StandardSettingDialog *ssd = new StandardSettingDialog(mainStack, "videogeneralsettings");
+
+        if (ssd->Create())
+        {
+            ssd->loadSettings(new ChannelGroupsSetting());
+            mainStack->AddScreen(ssd);
+        }
+        else
+            delete ssd;
     }
     else if (sel == "settings generalrecpriorities")
     {
-        GeneralRecPrioritiesSettings settings;
-        settings.exec();
+        MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
+        StandardSettingDialog *ssd = new StandardSettingDialog(mainStack, "videogeneralsettings");
+
+        if (ssd->Create())
+        {
+            ssd->loadSettings(new GeneralRecPrioritiesSettings());
+            mainStack->AddScreen(ssd);
+        }
+        else
+            delete ssd;
     }
     else if (sel == "settings channelrecpriorities")
     {
@@ -1109 +1188 @@
     VideoGeneralSettings vgs;
     vgs.Load();
     vgs.Save();
+    //TODo Playback group not loaded?
+    //TODo Channel group not loaded?
 }
 
 static int internal_play_media(const QString &mrl, const QString &plot,

mythtv/programs/mythfrontend/videoglobalsettings.cpp

@@ -9 +9 @@
 #include "videodlg.h"
 #include "videoglobalsettings.h"
 
+#include "mythlogging.h"
+
 namespace
 {
 // General Settings
-HostComboBox *VideoDefaultParentalLevel()
+HostComboBoxSetting *VideoDefaultParentalLevel()
 {
-    HostComboBox *gc = new HostComboBox("VideoDefaultParentalLevel");
+    HostComboBoxSetting *gc = new HostComboBoxSetting("VideoDefaultParentalLevel");
     gc->setLabel(QObject::tr("Starting Parental Level"));
     gc->addSelection(QObject::tr("4 - Highest"),
                      QString::number(ParentalLevel::plHigh));
@@ -33 +35 @@
     QT_TRANSLATE_NOOP("QObject", "Setting this value to all numbers will make your life "
                 "much easier.");
 
-HostLineEdit *VideoAdminPassword()
+HostTextEditSetting *VideoAdminPassword()
 {
-    HostLineEdit *gc = new HostLineEdit("VideoAdminPassword");
+    HostTextEditSetting *gc = new HostTextEditSetting("VideoAdminPassword");
     gc->setLabel(QObject::tr("Parental Level 4 PIN"));
     gc->setHelpText(QString("%1 %2")
         .arg(QObject::tr("This PIN is used to enter Parental Control "
@@ -44 +46 @@
     return gc;
 }
 
-HostLineEdit *VideoAdminPasswordThree()
+HostTextEditSetting *VideoAdminPasswordThree()
 {
-    HostLineEdit *gc = new HostLineEdit("VideoAdminPasswordThree");
+    HostTextEditSetting *gc = new HostTextEditSetting("VideoAdminPasswordThree");
     gc->setLabel(QObject::tr("Parental Level 3 PIN"));
     gc->setHelpText(QString("%1 %2")
         .arg(QObject::tr("This PIN is used to enter Parental Control Level 3."))
@@ -54 +56 @@
     return gc;
 }
 
-HostLineEdit *VideoAdminPasswordTwo()
+HostTextEditSetting *VideoAdminPasswordTwo()
 {
-    HostLineEdit *gc = new HostLineEdit("VideoAdminPasswordTwo");
+    HostTextEditSetting *gc = new HostTextEditSetting("VideoAdminPasswordTwo");
     gc->setLabel(QObject::tr("Parental Level 2 PIN"));
     gc->setHelpText(QString("%1 %2")
         .arg(QObject::tr("This PIN is used to enter Parental Control Level 2."))
@@ -64 +66 @@
     return gc;
 }
 
-HostCheckBox *VideoAggressivePC()
+HostCheckBoxSetting *VideoAggressivePC()
 {
-    HostCheckBox *gc = new HostCheckBox("VideoAggressivePC");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("VideoAggressivePC");
     gc->setLabel(QObject::tr("Aggressive Parental Control"));
     gc->setValue(false);
     gc->setHelpText(QObject::tr("If set, you will not be able to return "
@@ -76 +78 @@
     return gc;
 }
 
-HostLineEdit *VideoStartupDirectory()
+//TODO use MythUIFileBrowser but we need to be able to have more than one directory
+HostTextEditSetting *VideoStartupDirectory()
 {
-    HostLineEdit *gc = new HostLineEdit("VideoStartupDir");
+    HostTextEditSetting *gc = new HostTextEditSetting("VideoStartupDir");
     gc->setLabel(QObject::tr("Directories that hold videos"));
     gc->setValue(DEFAULT_VIDEOSTARTUP_DIR);
     gc->setHelpText(QObject::tr("Multiple directories can be separated by ':'. "
@@ -87 +90 @@
     return gc;
 }
 
-HostLineEdit *VideoArtworkDirectory()
+HostFileBrowserSetting *VideoArtworkDirectory()
 {
-    HostLineEdit *gc = new HostLineEdit("VideoArtworkDir");
+    HostFileBrowserSetting *gc = new HostFileBrowserSetting("VideoArtworkDir");
     gc->setLabel(QObject::tr("Directory that holds movie posters"));
     gc->setValue(GetConfDir() + "/Video/Artwork");
     gc->setHelpText(QObject::tr("This directory must exist, and the user "
                     "running the frontend needs to have read/write permission "
                     "to the directory."));
+    gc->SetTypeFilter(QDir::AllDirs | QDir::Hidden);
     return gc;
 }
 
-HostLineEdit *VideoScreenshotDirectory()
+HostFileBrowserSetting *VideoScreenshotDirectory()
 {
-    HostLineEdit *gc = new HostLineEdit("mythvideo.screenshotDir");
+    HostFileBrowserSetting *gc = new HostFileBrowserSetting("mythvideo.screenshotDir");
     gc->setLabel(QObject::tr("Directory that holds movie screenshots"));
     gc->setValue(GetConfDir() + "/Video/Screenshots");
     gc->setHelpText(QObject::tr("This directory must exist, and the user "
                     "running the frontend needs to have read/write permission "
                     "to the directory."));
+    gc->SetTypeFilter(QDir::AllDirs | QDir::Hidden);
     return gc;
 }
 
-HostLineEdit *VideoBannerDirectory()
+HostFileBrowserSetting *VideoBannerDirectory()
 {
-    HostLineEdit *gc = new HostLineEdit("mythvideo.bannerDir");
+    HostFileBrowserSetting *gc = new HostFileBrowserSetting("mythvideo.bannerDir");
     gc->setLabel(QObject::tr("Directory that holds movie/TV Banners"));
     gc->setValue(GetConfDir() + "/Video/Banners");
     gc->setHelpText(QObject::tr("This directory must exist, and the user "
                     "running the frontend needs to have read/write permission "
                     "to the directory."));
+    gc->SetTypeFilter(QDir::AllDirs | QDir::Hidden);
     return gc;
 }
 
-HostLineEdit *VideoFanartDirectory()
+HostFileBrowserSetting *VideoFanartDirectory()
 {
-    HostLineEdit *gc = new HostLineEdit("mythvideo.fanartDir");
+    HostFileBrowserSetting *gc = new HostFileBrowserSetting("mythvideo.fanartDir");
     gc->setLabel(QObject::tr("Directory that holds movie fanart"));
     gc->setValue(GetConfDir() + "/Video/Fanart");
     gc->setHelpText(QObject::tr("This directory must exist, and the user "
                     "running the frontend needs to have read/write permission "
                     "to the directory."));
+    gc->SetTypeFilter(QDir::AllDirs | QDir::Hidden);
     return gc;
 }
 
-HostLineEdit *TrailerDirectory()
+HostFileBrowserSetting *TrailerDirectory()
 {
-    HostLineEdit *gc = new HostLineEdit("mythvideo.TrailersDir");
+    HostFileBrowserSetting *gc = new HostFileBrowserSetting("mythvideo.TrailersDir");
     gc->setLabel(QObject::tr("Directory that holds movie trailers"));
     gc->setValue(GetConfDir() + "/Video/Trailers");
     gc->setHelpText(QObject::tr("This directory must exist, and the user "
                     "running the frontend needs to have read/write permission "
                     "to the directory."));
+    gc->SetTypeFilter(QDir::AllDirs | QDir::Hidden);
     return gc;
 }
 
@@ -148 +156 @@
 
 // General Settings
 
-HostComboBox *SetOnInsertDVD()
+HostComboBoxSetting *SetOnInsertDVD()
 {
-    HostComboBox *gc = new HostComboBox("DVDOnInsertDVD");
+    HostComboBoxSetting *gc = new HostComboBoxSetting("DVDOnInsertDVD");
     gc->setLabel(QObject::tr("On DVD insertion"));
     gc->addSelection(QObject::tr("Display mythdvd menu"),"1");
     gc->addSelection(QObject::tr("Do nothing"),"0");
@@ -160 +168 @@
     return gc;
 }
 
-HostCheckBox *VideoTreeRemember()
+HostCheckBoxSetting *VideoTreeRemember()
 {
-    HostCheckBox *gc = new HostCheckBox("mythvideo.VideoTreeRemember");
+    HostCheckBoxSetting *gc = new HostCheckBoxSetting("mythvideo.VideoTreeRemember");
     gc->setLabel(QObject::tr("Video Tree remembers last selected position"));
     gc->setValue(false);
     gc->setHelpText(QObject::tr("If set, the current position in the Video "
@@ -170 +178 @@
     return gc;
 }
 
-struct ConfigPage
-{
-    typedef std::vector<ConfigurationGroup *> PageList;
-
-  protected:
-    ConfigPage(PageList &pl) : m_pl(pl)
-    {
-    }
-
-    void Add(ConfigurationGroup *page)
-    {
-        m_pl.push_back(page);
-    }
 
-  private:
-    ConfigPage(const ConfigPage &);
-    ConfigPage &operator=(const ConfigPage &);
 
-  private:
-    PageList &m_pl;
-};
 
-struct VConfigPage : public ConfigPage
+HostCheckBoxSetting *RatingsToPL()
 {
-    VConfigPage(PageList &pl, bool luselabel = true, bool luseframe  = true,
-                bool lzeroMargin = false, bool lzeroSpace = false) :
-        ConfigPage(pl)
-    {
-        m_vc_page = new VerticalConfigurationGroup(luselabel, luseframe,
-                                                   lzeroMargin, lzeroSpace);
-        Add(m_vc_page);
-    }
-
-    VerticalConfigurationGroup *operator->()
+    HostCheckBoxSetting *r2pl =
+            new HostCheckBoxSetting("mythvideo.ParentalLevelFromRating");
+    r2pl->setLabel(QObject::tr("Enable automatic Parental Level from "
+                               "rating"));
+    r2pl->setValue(false);
+    r2pl->setHelpText(QObject::tr("If enabled, searches will automatically "
+                                  "set the Parental Level to the one "
+                                  "matching the rating below."));
+
+    typedef std::map<ParentalLevel::Level, QString> r2pl_map;
+    r2pl_map r2pl_defaults;
+    r2pl_defaults.insert(r2pl_map::value_type(ParentalLevel::plLowest,
+            QObject::tr("G", "PL 1 default search string.")));
+    r2pl_defaults.insert(r2pl_map::value_type(ParentalLevel::plLow,
+            QObject::tr("PG", "PL 2 default search string.")));
+    r2pl_defaults.insert(r2pl_map::value_type(ParentalLevel::plMedium,
+            QObject::tr("PG-13", "PL3 default search string.")));
+    r2pl_defaults.insert(r2pl_map::value_type(ParentalLevel::plHigh,
+            QObject::tr("R:NC-17", "PL4 default search string.")));
+
+    for (ParentalLevel pl(ParentalLevel::plLowest);
+         pl.GetLevel() <= ParentalLevel::plHigh && pl.good(); ++pl)
     {
-        return m_vc_page;
-    }
-
-  private:
-    VerticalConfigurationGroup *m_vc_page;
-};
-
-class RatingsToPL : public TriggeredConfigurationGroup
-{
-  public:
-    RatingsToPL() : TriggeredConfigurationGroup(false)
-    {
-        HostCheckBox *r2pl =
-                new HostCheckBox("mythvideo.ParentalLevelFromRating");
-        r2pl->setLabel(QObject::tr("Enable automatic Parental Level from "
-                                   "rating"));
-        r2pl->setValue(false);
-        r2pl->setHelpText(QObject::tr("If enabled, searches will automatically "
-                                      "set the Parental Level to the one "
-                                      "matching the rating below."));
-        addChild(r2pl);
-        setTrigger(r2pl);
-
-        typedef std::map<ParentalLevel::Level, QString> r2pl_map;
-        r2pl_map r2pl_defaults;
-        r2pl_defaults.insert(r2pl_map::value_type(ParentalLevel::plLowest,
-                tr("G", "PL 1 default search string.")));
-        r2pl_defaults.insert(r2pl_map::value_type(ParentalLevel::plLow,
-                tr("PG", "PL 2 default search string.")));
-        r2pl_defaults.insert(r2pl_map::value_type(ParentalLevel::plMedium,
-                tr("PG-13", "PL3 default search string.")));
-        r2pl_defaults.insert(r2pl_map::value_type(ParentalLevel::plHigh,
-                tr("R:NC-17", "PL4 default search string.")));
-
-        VerticalConfigurationGroup *vcg = new VerticalConfigurationGroup(true);
-
-        for (ParentalLevel pl(ParentalLevel::plLowest);
-             pl.GetLevel() <= ParentalLevel::plHigh && pl.good(); ++pl)
+        HostTextEditSetting *hle = new HostTextEditSetting(QString("mythvideo.AutoR2PL%1")
+                                             .arg(pl.GetLevel()));
+        hle->setLabel(QObject::tr("Level %1").arg(pl.GetLevel()));
+        hle->setHelpText(QObject::tr("Ratings containing these strings "
+                                     "(separated by :) will be assigned "
+                                     "to Parental Level %1.")
+                         .arg(pl.GetLevel()));
+
+        r2pl_map::const_iterator def_setting =
+                r2pl_defaults.find(pl.GetLevel());
+        if (def_setting != r2pl_defaults.end())
         {
-            HostLineEdit *hle = new HostLineEdit(QString("mythvideo.AutoR2PL%1")
-                                                 .arg(pl.GetLevel()));
-            hle->setLabel(QObject::tr("Level %1").arg(pl.GetLevel()));
-            hle->setHelpText(QObject::tr("Ratings containing these strings "
-                                         "(separated by :) will be assigned "
-                                         "to Parental Level %1.")
-                             .arg(pl.GetLevel()));
-
-            r2pl_map::const_iterator def_setting =
-                    r2pl_defaults.find(pl.GetLevel());
-            if (def_setting != r2pl_defaults.end())
-            {
-                hle->setValue(def_setting->second);
-            }
-
-            vcg->addChild(hle);
+            hle->setValue(def_setting->second);
         }
 
-        addTarget("0", new VerticalConfigurationGroup(true));
-        addTarget("1", vcg);
+        r2pl->addTargetedChild("1", hle);
     }
-};
 
-} // namespace
+    return r2pl;
+}
+
+}
 
 VideoGeneralSettings::VideoGeneralSettings()
+    :GroupSetting()
 {
-    ConfigPage::PageList pages;
-
-    VConfigPage page1(pages, false);
-    page1->addChild(VideoStartupDirectory());
-    page1->addChild(TrailerDirectory());
-    page1->addChild(VideoArtworkDirectory());
-    page1->addChild(VideoScreenshotDirectory());
-    page1->addChild(VideoBannerDirectory());
-    page1->addChild(VideoFanartDirectory());
-
-    VConfigPage page2(pages, false);
-    page2->addChild(SetOnInsertDVD());
-    page2->addChild(VideoTreeRemember());
-
-    // page 3
-    VerticalConfigurationGroup *pctrl =
-            new VerticalConfigurationGroup(true, false);
+    setLabel(QObject::tr("General settings"));
+
+    addChild(VideoStartupDirectory());
+    addChild(TrailerDirectory());
+    addChild(VideoArtworkDirectory());
+    addChild(VideoScreenshotDirectory());
+    addChild(VideoBannerDirectory());
+    addChild(VideoFanartDirectory());
+
+    addChild(SetOnInsertDVD());
+    addChild(VideoTreeRemember());
+
+    GroupSetting *pctrl =
+            new GroupSetting();
     pctrl->setLabel(QObject::tr("Parental Control Settings"));
+
     pctrl->addChild(VideoDefaultParentalLevel());
     pctrl->addChild(VideoAdminPassword());
     pctrl->addChild(VideoAdminPasswordThree());
     pctrl->addChild(VideoAdminPasswordTwo());
     pctrl->addChild(VideoAggressivePC());
-    VConfigPage page3(pages, false);
-    page3->addChild(pctrl);
 
-    VConfigPage page4(pages, false);
-    page4->addChild(new RatingsToPL());
+    addChild(pctrl);
+
+    addChild(RatingsToPL());
 
-    int page_num = 1;
-    for (ConfigPage::PageList::const_iterator p = pages.begin();
-         p != pages.end(); ++p, ++page_num)
-    {
-        (*p)->setLabel(QObject::tr("General Settings (%1/%2)").arg(page_num)
-                       .arg(pages.size()));
-        addChild(*p);
-    }
 }
+

mythtv/programs/mythfrontend/videoglobalsettings.h

@@ -3 +3 @@
 
 #include "settings.h"
 
-class VideoGeneralSettings : public ConfigurationWizard
+#include "standardsettings.h"
+
+class VideoGeneralSettings : public GroupSetting
 {
   public:
     VideoGeneralSettings();