Ticket #7800: mythvideo-mythui-settings.patch

mythvideo/mythvideo/main.cpp

@@ -12 +12 @@
 #include <mythtv/libmythui/mythdialogbox.h>
 
 #include "videodlg.h"
-#include "globalsettings.h"
 #include "fileassoc.h"
 #include "playersettings.h"
 #include "metadatasettings.h"
+#include "importsettings.h"
+#include "generalsettings.h"
+#include "dvdsettings.h"
+#include "parentalsettings.h"
+#include "mtdsettings.h"
 #include "dbcheck.h"
 #include "cleanup.h"
 #include "globals.h"
@@ -400 +404 @@
 
             if (passwordValid)
             {
-                VideoGeneralSettings settings;
-                settings.exec();
+                VERBOSE(VB_IMPORTANT, "Pwd valid, Loading Parental");
+                MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
+                ParentalSettings *ps = new ParentalSettings(mainStack, "parental settings");
+
+                if (ps->Create())
+                    mainStack->AddScreen(ps);
             }
             else
             {
@@ -432 +440 @@
             runScreen(VideoDialog::DLG_TREE);
         else if (sel == "gallery")
             runScreen(VideoDialog::DLG_GALLERY);
-        else if (sel == "settings_general")
-        {
-            RunSettingsCompletion::Create(gContext->
-                    GetNumSetting("VideoAggressivePC", 0));
-        }
         else if (sel == "settings_player")
         {
             MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
-
             PlayerSettings *ps = new PlayerSettings(mainStack, "player settings");
 
             if (ps->Create())
@@ -449 +451 @@
         else if (sel == "settings_metadata")
         {
             MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
-
             MetadataSettings *ms = new MetadataSettings(mainStack, "metadata settings");
 
             if (ms->Create())
@@ -458 +459 @@
         else if (sel == "settings_associations")
         {
             MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
-
             FileAssocDialog *fa = new FileAssocDialog(mainStack, "fa dialog");
 
             if (fa->Create())
                 mainStack->AddScreen(fa);
         }
+        else if (sel == "settings_general")
+        {
+            VERBOSE(VB_IMPORTANT, "Loading General");
+            MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
+            GeneralSettings *gs = new GeneralSettings(mainStack, "general settings");
+
+            if (gs->Create())
+                mainStack->AddScreen(gs);
+        }
+        else if (sel == "settings_dvd")
+        {
+            VERBOSE(VB_IMPORTANT, "Loading DVD");
+            MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
+            DvdSettings *ds = new DvdSettings(mainStack, "dvd settings");
+
+            if (ds->Create())
+                mainStack->AddScreen(ds);
+        }
+        else if (sel == "settings_parental")
+        {
+            VERBOSE(VB_IMPORTANT, "Loading Parental");
+            RunSettingsCompletion::Create(gContext->GetNumSetting("VideoAggressivePC", 0));
+        }
+        else if (sel == "settings_import")
+        {
+            VERBOSE(VB_IMPORTANT, "Loading Import");
+            MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
+            ImportSettings *is = new ImportSettings(mainStack, "import settings");
+
+            if (is->Create())
+                mainStack->AddScreen(is);
+        }
+        else if (sel == "settings_mtd")
+        {
+            VERBOSE(VB_IMPORTANT, "Loading MTD");
+            MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
+            MtdSettings *ms = new MtdSettings(mainStack, "mtd settings");
+
+            if (ms->Create())
+                mainStack->AddScreen(ms);
+        }
         else if (sel == "dvd_play")
         {
             playDVD();
@@ -476 +517 @@
         {
             startDVDRipper();
         }
-        else if (sel == "dvd_settings_rip")
-        {
-            DVDRipperSettings settings;
-            settings.exec();
-        }
     }
 
     int runMenu(const QString &menuname)
@@ -532 +568 @@
         return -1;
     }
 
-    VideoGeneralSettings general;
-    general.Load();
-    general.Save();
-
-    DVDRipperSettings rsettings;
-    rsettings.Load();
-    rsettings.Save();
-
     setupKeys();
 
     return 0;

mythvideo/mythvideo/dvdsettings.cpp

@@ +1 @@
+using namespace std;
+
+// Qt
+#include <QString>
+
+// MythTV
+#include <mythcontext.h>
+#include <mythdbcon.h>
+#include <mythdirs.h>
+
+#include "dvdsettings.h"
+
+DvdSettings::DvdSettings(MythScreenStack *parent, const char *name)
+        : MythScreenType(parent, name),
+        m_dvdOnInsertDVD(NULL),
+        m_dvdDriveSpeed(NULL),
+        m_enableDVDBookmark(NULL),
+        m_dvdBookmarkPrompt(NULL),
+        m_dvdBookmarkDays(NULL),
+        m_helpText(NULL),
+        m_saveButton(NULL),
+        m_cancelButton(NULL)
+{
+}
+
+DvdSettings::~DvdSettings()
+{
+
+}
+
+bool DvdSettings::Create()
+{
+    bool foundtheme = false;
+
+    // Load the theme for this screen
+    foundtheme = LoadWindowFromXML("video-ui.xml", "dvdsettings", this);
+
+    if (!foundtheme)
+        return false;
+
+    m_dvdOnInsertDVD = dynamic_cast<MythUIButtonList *> (GetChild("dvdoninsertdvd"));
+    m_dvdDriveSpeed = dynamic_cast<MythUISpinBox *> (GetChild("dvddrivespeed"));
+    m_enableDVDBookmark = dynamic_cast<MythUICheckBox *> (GetChild("enabledvdbookmark"));
+    m_dvdBookmarkPrompt = dynamic_cast<MythUICheckBox *> (GetChild("dvdbookmarkprompt"));
+    m_dvdBookmarkDays = dynamic_cast<MythUISpinBox *> (GetChild("dvdbookmarkdays"));
+
+    m_helpText = dynamic_cast<MythUIText *> (GetChild("helptext"));
+    m_saveButton = dynamic_cast<MythUIButton *> (GetChild("save"));
+    m_cancelButton = dynamic_cast<MythUIButton *> (GetChild("cancel"));
+
+    if (!m_dvdOnInsertDVD || !m_dvdDriveSpeed || !m_enableDVDBookmark ||
+        !m_dvdBookmarkPrompt || !m_dvdBookmarkDays ||
+        !m_saveButton || !m_cancelButton)
+    {
+        VERBOSE(VB_IMPORTANT, "Theme is missing critical theme elements.");
+        return false;
+    }
+
+    new MythUIButtonListItem(m_dvdOnInsertDVD, tr("Do nothing"), qVariantFromValue(0));
+    new MythUIButtonListItem(m_dvdOnInsertDVD, tr("Show DVD Menu"), qVariantFromValue(1));
+    new MythUIButtonListItem(m_dvdOnInsertDVD, tr("Play DVD"), qVariantFromValue(2));
+    new MythUIButtonListItem(m_dvdOnInsertDVD, tr("Rip DVD"), qVariantFromValue(3));
+    m_dvdOnInsertDVD->SetValueByData(gContext->GetSetting("DVDOnInsertDVD"));
+
+    m_dvdDriveSpeed->SetRange(2, 12, 2);
+    m_dvdDriveSpeed->SetValue(gContext->GetSetting("DVDDriveSpeed"));
+
+    int loadEnableDVDBookmark = gContext->GetNumSetting("EnableDVDBookmark", 0);
+    if (loadEnableDVDBookmark == 1)
+        m_enableDVDBookmark->SetCheckState(MythUIStateType::Full);
+
+    int loadDvdBookmarkPrompt = gContext->GetNumSetting("DVDBookmarkPrompt", 0);
+    if (loadDvdBookmarkPrompt == 1)
+        m_dvdBookmarkPrompt->SetCheckState(MythUIStateType::Full);
+
+    m_dvdBookmarkDays->SetRange(5, 50, 5);
+    m_dvdBookmarkDays->SetValue(gContext->GetSetting("DVDBookmarkDays"));
+
+    toggleUseDVD();
+
+    connect(m_saveButton, SIGNAL(Clicked()), this, SLOT(slotSave()));
+    connect(m_cancelButton, SIGNAL(Clicked()), this, SLOT(Close()));
+    connect(m_dvdOnInsertDVD,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+    connect(m_dvdDriveSpeed,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+    connect(m_enableDVDBookmark,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+    connect(m_dvdBookmarkPrompt,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+    connect(m_dvdBookmarkDays,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+    connect(m_enableDVDBookmark, SIGNAL(valueChanged()), SLOT(toggleUseDVD()));
+
+    if (!BuildFocusList())
+        VERBOSE(VB_IMPORTANT, "Failed to build a focuslist. Something is wrong");
+
+    SetFocusWidget(m_dvdOnInsertDVD);
+
+    return true;
+}
+
+bool DvdSettings::keyPressEvent(QKeyEvent *event)
+{
+    if (GetFocusWidget()->keyPressEvent(event))
+        return true;
+
+    bool handled = false;
+
+    if (!handled && MythScreenType::keyPressEvent(event))
+        handled = true;
+
+    return handled;
+}
+
+void DvdSettings::slotSave(void)
+{
+    gContext->SaveSetting("DVDOnInsertDVD", m_dvdOnInsertDVD->GetDataValue().toString());
+    gContext->SaveSetting("DVDDriveSpeed", m_dvdBookmarkDays->GetValue());
+    gContext->SaveSetting("DVDBookmarkDays", m_dvdBookmarkDays->GetValue());
+
+    int saveEnableDVDBookmark = (m_enableDVDBookmark->GetCheckState() == MythUIStateType::Full) ? 1 : 0;
+    gContext->SaveSetting("EnableDVDBookmark", saveEnableDVDBookmark);
+
+    int saveDvdBookmarkPrompt = (m_dvdBookmarkPrompt->GetCheckState() == MythUIStateType::Full) ? 1 : 0;
+    gContext->SaveSetting("DVDBookmarkPrompt", saveDvdBookmarkPrompt);
+
+    Close();
+}
+
+void DvdSettings::slotFocusChanged(void)
+{
+    if (!m_helpText)
+        return;
+
+    QString msg = "";
+    if (GetFocusWidget() == m_dvdOnInsertDVD)
+        msg = tr("Media Monitoring should be turned on to "
+                 "allow this feature (Setup -> General -> CD/DVD Monitor).");
+    else if (GetFocusWidget() == m_dvdDriveSpeed)
+        msg = tr("Set DVD Drive Speed during DVD Playback. "
+                 "Speed is in multiples of 177KB/s. "
+                 "Slower speeds may reduce drive noise but in "
+                 "some cases it causes playback to stutter.");
+    else if (GetFocusWidget() == m_enableDVDBookmark)
+        msg = tr("Enable the setting and skipping to "
+                 "of a bookmark in DVD playback.");
+    else if (GetFocusWidget() == m_dvdBookmarkPrompt)
+        msg = tr("Display a prompt to choose whether "
+                 "to play the DVD from the beginning or from the bookmark.");
+    else if (GetFocusWidget() == m_dvdBookmarkDays)
+        msg = tr("Delete DVD Bookmarks that are older than the "
+                 "number of days specified.");
+    else if (GetFocusWidget() == m_cancelButton)
+        msg = tr("Exit without saving settings");
+    else if (GetFocusWidget() == m_saveButton)
+        msg = tr("Save settings and Exit");
+
+    m_helpText->SetText(msg);
+}
+
+void DvdSettings::toggleUseDVD(void)
+{
+    int checked = (m_enableDVDBookmark->GetCheckState() == MythUIStateType::Full) ? true : false;
+
+    m_dvdBookmarkPrompt->SetVisible(checked);
+    m_dvdBookmarkDays->SetVisible(checked);
+}
+
+

mythvideo/mythvideo/dvdsettings.h

@@ +1 @@
+#ifndef DVDSETTINGS_H
+#define DVDSETTINGS_H
+
+#include <mythtv/mythwidgets.h>
+#include <mythtv/mythdialogs.h>
+
+#include <libmythui/mythuispinbox.h>
+#include <libmythui/mythuibutton.h>
+#include <libmythui/mythuibuttonlist.h>
+#include <libmythui/mythuicheckbox.h>
+#include <libmythui/mythscreentype.h>
+#include <libmythui/mythdialogbox.h>
+
+
+class DvdSettings : public MythScreenType
+{
+    Q_OBJECT
+public:
+    DvdSettings(MythScreenStack *parent, const char *name = 0);
+    ~DvdSettings();
+
+    bool Create(void);
+    bool keyPressEvent(QKeyEvent *);
+
+private:
+    MythUIButtonList   *m_dvdOnInsertDVD;
+    MythUISpinBox      *m_dvdDriveSpeed;
+    MythUICheckBox     *m_enableDVDBookmark;
+    MythUICheckBox     *m_dvdBookmarkPrompt;
+    MythUISpinBox      *m_dvdBookmarkDays;
+
+    MythUIText         *m_helpText;
+    MythUIButton       *m_saveButton;
+    MythUIButton       *m_cancelButton;
+
+private slots:
+    void slotSave(void);
+    void slotFocusChanged(void);
+    void toggleUseDVD(void);
+
+};
+
+#endif // DVDSETTINGS_H

mythvideo/mythvideo/fileassoc.cpp

@@ -328 +328 @@
         const QString &lname) :
     MythScreenType(screenParent, lname), m_commandEdit(0),
     m_extensionList(0), m_defaultCheck(0), m_ignoreCheck(0), m_doneButton(0),
-    m_newButton(0), m_deleteButton(0), m_private(new FileAssocDialogPrivate)
+    m_newButton(0), m_deleteButton(0), m_helpText(NULL),
+    m_private(new FileAssocDialogPrivate)
 {
 }
 
@@ -370 +371 @@
             SLOT(OnNewExtensionPressed()));
     connect(m_deleteButton, SIGNAL(Clicked()), SLOT(OnDeletePressed()));
 
+    connect(m_extensionList,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+    connect(m_commandEdit,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+    connect(m_defaultCheck,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+    connect(m_ignoreCheck,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+    connect(m_doneButton,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+    connect(m_newButton,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+    connect(m_deleteButton,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+
     UpdateScreen();
 
     if (!BuildFocusList())
         VERBOSE(VB_IMPORTANT, "Failed to build a focuslist.");
 
+    SetFocusWidget(m_extensionList);
+
     return true;
 }
 
@@ -526 +537 @@
 
     BuildFocusList();
 }
+
+void FileAssocDialog::slotFocusChanged(void)
+{
+    if (!m_helpText)
+        return;
+
+    QString msg = "";
+    if (GetFocusWidget() == m_extensionList)
+        msg = tr("Select the extension you want to edit.");
+    else if (GetFocusWidget() == m_commandEdit)
+        msg = tr("Command to the player that shall be used to play the video file with the specified extension.");
+    else if (GetFocusWidget() == m_defaultCheck)
+        msg = tr("Use the default player for videos with this file extension.");
+    else if (GetFocusWidget() == m_ignoreCheck)
+        msg = tr("Check to skip playing videos that have this file extension.");
+    else if (GetFocusWidget() == m_doneButton)
+        msg = tr("Save settings and exit ");
+    else if (GetFocusWidget() == m_newButton)
+        msg = tr("Create a new file extension setting");
+    else if (GetFocusWidget() == m_deleteButton)
+        msg = tr("Delete current file extension setting");
+
+    m_helpText->SetText(msg);
+}

mythvideo/mythvideo/fileassoc.h

@@ -36 +36 @@
   private:
     void UpdateScreen(bool useSelectionOverride = false);
 
+  private slots:
+    void slotFocusChanged(void);
+
   private:
     MythUITextEdit *m_commandEdit;
     MythUIButtonList *m_extensionList;
@@ -44 +47 @@
     MythUIButton *m_doneButton;
     MythUIButton *m_newButton;
     MythUIButton *m_deleteButton;
+    MythUIText   *m_helpText;
 
     class FileAssocDialogPrivate *m_private;
 };

mythvideo/mythvideo/generalsettings.cpp

@@ +1 @@
+using namespace std;
+
+// Qt
+#include <QString>
+
+// MythTV
+#include <mythcontext.h>
+#include <mythdbcon.h>
+#include <mythdirs.h>
+
+#include "generalsettings.h"
+
+GeneralSettings::GeneralSettings(MythScreenStack *parent, const char *name)
+        : MythScreenType(parent, name),
+        m_videoStartupDir(NULL),
+        m_videoArtworkDir(NULL),
+        m_screenshotDir(NULL),
+        m_bannerDir(NULL),
+        m_fanartDir(NULL),
+        m_trailersDir(NULL),
+        m_helpText(NULL),
+        m_saveButton(NULL),
+        m_cancelButton(NULL)
+{
+}
+
+GeneralSettings::~GeneralSettings()
+{
+
+}
+
+bool GeneralSettings::Create()
+{
+    bool foundtheme = false;
+
+    // Load the theme for this screen
+    foundtheme = LoadWindowFromXML("video-ui.xml", "generalsettings", this);
+
+    if (!foundtheme)
+        return false;
+
+    m_videoStartupDir = dynamic_cast<MythUITextEdit *> (GetChild("startupdir"));
+    m_videoArtworkDir = dynamic_cast<MythUITextEdit *> (GetChild("artworkdir"));
+    m_screenshotDir = dynamic_cast<MythUITextEdit *> (GetChild("screenshotdir"));
+    m_bannerDir = dynamic_cast<MythUITextEdit *> (GetChild("bannerdir"));
+    m_fanartDir = dynamic_cast<MythUITextEdit *> (GetChild("fanartdir"));
+    m_trailersDir = dynamic_cast<MythUITextEdit *> (GetChild("trailersdir"));
+
+    m_helpText = dynamic_cast<MythUIText *> (GetChild("helptext"));
+    m_saveButton = dynamic_cast<MythUIButton *> (GetChild("save"));
+    m_cancelButton = dynamic_cast<MythUIButton *> (GetChild("cancel"));
+
+    if (!m_videoStartupDir || !m_videoArtworkDir || !m_screenshotDir ||
+        !m_bannerDir || !m_fanartDir || !m_trailersDir ||
+        !m_saveButton || !m_cancelButton)
+    {
+        VERBOSE(VB_IMPORTANT, "Theme is missing critical theme elements.");
+        return false;
+    }
+
+    m_videoStartupDir->SetText(gContext->GetSetting("VideoStartupDir"));
+    m_videoArtworkDir->SetText(gContext->GetSetting("VideoArtworkDir"));
+    m_screenshotDir->SetText(gContext->GetSetting("mythvideo.screenshotDir"));
+    m_bannerDir->SetText(gContext->GetSetting("mythvideo.bannerDir"));
+    m_fanartDir->SetText(gContext->GetSetting("mythvideo.fanartDir"));
+    m_trailersDir->SetText(gContext->GetSetting("mythvideo.TrailersDir"));
+
+    connect(m_saveButton, SIGNAL(Clicked()), this, SLOT(slotSave()));
+    connect(m_cancelButton, SIGNAL(Clicked()), this, SLOT(Close()));
+    connect(m_videoStartupDir,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+    connect(m_videoArtworkDir,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+    connect(m_screenshotDir,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+    connect(m_bannerDir,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+    connect(m_fanartDir,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+    connect(m_trailersDir,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+
+    if (!BuildFocusList())
+        VERBOSE(VB_IMPORTANT, "Failed to build a focuslist. Something is wrong");
+
+    SetFocusWidget(m_videoStartupDir);
+
+    return true;
+}
+
+bool GeneralSettings::keyPressEvent(QKeyEvent *event)
+{
+    if (GetFocusWidget()->keyPressEvent(event))
+        return true;
+
+    bool handled = false;
+
+    if (!handled && MythScreenType::keyPressEvent(event))
+        handled = true;
+
+    return handled;
+}
+
+void GeneralSettings::slotSave(void)
+{
+    gContext->SaveSetting("VideoStartupDir", m_videoStartupDir->GetText());
+    gContext->SaveSetting("VideoArtworkDir", m_videoArtworkDir->GetText());
+    gContext->SaveSetting("mythvideo.screenshotDir", m_screenshotDir->GetText());
+    gContext->SaveSetting("mythvideo.bannerDir", m_bannerDir->GetText());
+    gContext->SaveSetting("mythvideo.fanartDir", m_fanartDir->GetText());
+    gContext->SaveSetting("mythvideo.TrailersDir", m_trailersDir->GetText());
+
+    Close();
+}
+
+void GeneralSettings::slotFocusChanged(void)
+{
+    if (!m_helpText)
+        return;
+
+    QString msg = "";
+    if (GetFocusWidget() == m_videoStartupDir)
+        msg = tr("Multiple directories can be separated by ':'. "
+                 "Each directory must exist and be readable by the user "
+                 "running MythVideo.");
+    else if (GetFocusWidget() == m_videoArtworkDir)
+        msg = tr("This directory must exist, and the user "
+                 "running MythVideo needs to have read/write permission "
+                 "to the directory.");
+    else if (GetFocusWidget() == m_screenshotDir)
+        msg = tr("This directory must exist, and the user "
+                 "running MythVideo needs to have read/write permission "
+                 "to the directory.");
+    else if (GetFocusWidget() == m_bannerDir)
+        msg = tr("This directory must exist, and the user "
+                 "running MythVideo needs to have read/write permission "
+                 "to the directory.");
+    else if (GetFocusWidget() == m_fanartDir)
+        msg = tr("This directory must exist, and the user "
+                 "running MythVideo needs to have read/write permission "
+                 "to the directory.");
+    else if (GetFocusWidget() == m_trailersDir)
+        msg = tr("This directory must exist, and the user "
+                 "running MythVideo needs to have read/write permission "
+                 "to the directory.");
+    else if (GetFocusWidget() == m_cancelButton)
+        msg = tr("Exit without saving settings");
+    else if (GetFocusWidget() == m_saveButton)
+        msg = tr("Save settings and Exit");
+
+    m_helpText->SetText(msg);
+}
+

mythvideo/mythvideo/generalsettings.h

@@ +1 @@
+#ifndef GENERALSETTINGS_H
+#define GENERALSETTINGS_H
+
+#include <mythtv/mythwidgets.h>
+#include <mythtv/mythdialogs.h>
+
+#include <libmythui/mythuispinbox.h>
+#include <libmythui/mythuibutton.h>
+#include <libmythui/mythuibuttonlist.h>
+#include <libmythui/mythuicheckbox.h>
+#include <libmythui/mythscreentype.h>
+#include <libmythui/mythdialogbox.h>
+
+
+class GeneralSettings : public MythScreenType
+{
+    Q_OBJECT
+public:
+    GeneralSettings(MythScreenStack *parent, const char *name = 0);
+    ~GeneralSettings();
+
+    bool Create(void);
+    bool keyPressEvent(QKeyEvent *);
+
+private:
+    MythUITextEdit     *m_videoStartupDir;
+    MythUITextEdit     *m_videoArtworkDir;
+    MythUITextEdit     *m_screenshotDir;
+    MythUITextEdit     *m_bannerDir;
+    MythUITextEdit     *m_fanartDir;
+    MythUITextEdit     *m_trailersDir;
+
+    MythUIText         *m_helpText;
+    MythUIButton       *m_saveButton;
+    MythUIButton       *m_cancelButton;
+
+private slots:
+    void slotSave(void);
+    void slotFocusChanged(void);
+
+};
+
+#endif // GENERALSETTINGS_H

mythvideo/mythvideo/importsettings.cpp

@@ +1 @@
+using namespace std;
+
+// Qt
+#include <QString>
+
+// MythTV
+#include <mythcontext.h>
+#include <mythdbcon.h>
+#include <mythdirs.h>
+
+#include "importsettings.h"
+
+ImportSettings::ImportSettings(MythScreenStack *parent, const char *name)
+        : MythScreenType(parent, name),
+        m_dvdRipLocation(NULL),
+        m_titlePlayCommand(NULL),
+        m_subTitleCommand(NULL),
+        m_transcodeCommand(NULL),
+        m_helpText(NULL),
+        m_saveButton(NULL),
+        m_cancelButton(NULL)
+{
+}
+
+ImportSettings::~ImportSettings()
+{
+
+}
+
+bool ImportSettings::Create()
+{
+    bool foundtheme = false;
+
+    // Load the theme for this screen
+    foundtheme = LoadWindowFromXML("video-ui.xml", "importsettings", this);
+
+    if (!foundtheme)
+        return false;
+
+    m_dvdRipLocation = dynamic_cast<MythUITextEdit *> (GetChild("dvdriplocation"));
+    m_titlePlayCommand = dynamic_cast<MythUITextEdit *> (GetChild("titleplaycommand"));
+    m_subTitleCommand = dynamic_cast<MythUITextEdit *> (GetChild("subtitlecommand"));
+    m_transcodeCommand = dynamic_cast<MythUITextEdit *> (GetChild("transcodecommand"));
+    m_helpText = dynamic_cast<MythUIText *> (GetChild("helptext"));
+    m_saveButton = dynamic_cast<MythUIButton *> (GetChild("save"));
+    m_cancelButton = dynamic_cast<MythUIButton *> (GetChild("cancel"));
+
+    if (!m_dvdRipLocation || !m_titlePlayCommand ||
+        !m_subTitleCommand || !m_transcodeCommand ||
+        !m_saveButton || !m_cancelButton)
+    {
+        VERBOSE(VB_IMPORTANT, "Theme is missing critical theme elements.");
+        return false;
+    }
+
+    m_dvdRipLocation->SetText(gContext->GetSetting("DVDRipLocation"));
+    m_titlePlayCommand->SetText(gContext->GetSetting("TitlePlayCommand"));
+    m_subTitleCommand->SetText(gContext->GetSetting("SubTitleCommand"));
+    m_transcodeCommand->SetText(gContext->GetSetting("TranscodeCommand"));
+
+    connect(m_dvdRipLocation,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+    connect(m_titlePlayCommand,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+    connect(m_subTitleCommand,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+    connect(m_transcodeCommand,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+    connect(m_saveButton, SIGNAL(Clicked()), this, SLOT(slotSave()));
+    connect(m_cancelButton, SIGNAL(Clicked()), this, SLOT(Close()));
+
+    if (!BuildFocusList())
+        VERBOSE(VB_IMPORTANT, "Failed to build a focuslist. Something is wrong");
+
+    SetFocusWidget(m_dvdRipLocation);
+
+    return true;
+}
+
+bool ImportSettings::keyPressEvent(QKeyEvent *event)
+{
+    if (GetFocusWidget()->keyPressEvent(event))
+        return true;
+
+    bool handled = false;
+
+    if (!handled && MythScreenType::keyPressEvent(event))
+        handled = true;
+
+    return handled;
+}
+
+void ImportSettings::slotSave(void)
+{
+    gContext->SaveSetting("DVDRipLocation", m_dvdRipLocation->GetText());
+    gContext->SaveSetting("TitlePlayCommand", m_titlePlayCommand->GetText());
+    gContext->SaveSetting("SubTitleCommand", m_subTitleCommand->GetText());
+    gContext->SaveSetting("TranscodeCommand", m_transcodeCommand->GetText());
+
+    Close();
+}
+
+void ImportSettings::slotFocusChanged(void)
+{
+    if (!m_helpText)
+        return;
+
+    QString msg = "";
+    if (GetFocusWidget() == m_dvdRipLocation)
+        msg = tr("This directory must exist, and the user "
+                 "running MythDVD needs to have write permission "
+                 "to the directory.");
+    else if (GetFocusWidget() == m_titlePlayCommand)
+        msg = tr("This is a command used to preview a given "
+                 "title on a DVD. If present %t will be set "
+                 "to the title, %d for device, %a for audio "
+                 "track, %c for audio channels.");
+    else if (GetFocusWidget() == m_subTitleCommand)
+        msg = tr("If you choose any subtitles for ripping, this "
+                 "command is added to the end of the Title Play "
+                 "Command to allow previewing of subtitles. If  "
+                 "present %s will be set to the subtitle track.");
+    else if (GetFocusWidget() == m_transcodeCommand)
+        msg = tr("This is the base (without arguments) command "
+                 "to run transcode on your system.");
+    else if (GetFocusWidget() == m_cancelButton)
+        msg = tr("Exit without saving settings");
+    else if (GetFocusWidget() == m_saveButton)
+        msg = tr("Save settings and Exit");
+
+    m_helpText->SetText(msg);
+}
+

mythvideo/mythvideo/importsettings.h

@@ +1 @@
+#ifndef IMPORTSETTINGS_H
+#define IMPORTSETTINGS_H
+
+#include <mythtv/mythwidgets.h>
+#include <mythtv/mythdialogs.h>
+
+#include <libmythui/mythuispinbox.h>
+#include <libmythui/mythuibutton.h>
+#include <libmythui/mythuibuttonlist.h>
+#include <libmythui/mythuicheckbox.h>
+#include <libmythui/mythscreentype.h>
+#include <libmythui/mythdialogbox.h>
+
+
+class ImportSettings : public MythScreenType
+{
+    Q_OBJECT
+public:
+    ImportSettings(MythScreenStack *parent, const char *name = 0);
+    ~ImportSettings();
+
+    bool Create(void);
+    bool keyPressEvent(QKeyEvent *);
+
+private:
+    MythUITextEdit     *m_dvdRipLocation;
+    MythUITextEdit     *m_titlePlayCommand;
+    MythUITextEdit     *m_subTitleCommand;
+    MythUITextEdit     *m_transcodeCommand;
+    MythUIText         *m_helpText;
+    MythUIButton       *m_saveButton;
+    MythUIButton       *m_cancelButton;
+
+private slots:
+    void slotSave(void);
+    void slotFocusChanged(void);
+
+};
+
+#endif // IMPORTSETTINGS_H

mythvideo/mythvideo/mtdsettings.cpp

@@ +1 @@
+using namespace std;
+
+// Qt
+#include <QString>
+
+// MythTV
+#include <mythcontext.h>
+#include <mythdbcon.h>
+#include <mythdirs.h>
+
+#include "mtdsettings.h"
+
+MtdSettings::MtdSettings(MythScreenStack *parent, const char *name)
+        : MythScreenType(parent, name),
+        m_mtdPort(NULL),
+        m_mtdNiceLevel(NULL),
+        m_mtdConcurrentTranscodes(NULL),
+        m_mtdRipSize(NULL),
+        m_mtdConsoleLog(NULL),
+        m_mtdKeepAc3(NULL),
+        m_mtdPreferXvid(NULL),
+        m_mtdFrDetect(NULL),
+        m_helpText(NULL),
+        m_saveButton(NULL),
+        m_cancelButton(NULL)
+{
+}
+
+MtdSettings::~MtdSettings()
+{
+
+}
+
+bool MtdSettings::Create()
+{
+    bool foundtheme = false;
+
+    // Load the theme for this screen
+    foundtheme = LoadWindowFromXML("video-ui.xml", "mtdsettings", this);
+
+    if (!foundtheme)
+        return false;
+
+    m_mtdPort = dynamic_cast<MythUISpinBox *> (GetChild("mtdport"));
+    m_mtdNiceLevel = dynamic_cast<MythUISpinBox *> (GetChild("mtdnicelevel"));
+    m_mtdConcurrentTranscodes = dynamic_cast<MythUISpinBox *> (GetChild("mtdconcurrenttranscodes"));
+    m_mtdRipSize = dynamic_cast<MythUISpinBox *> (GetChild("mtdripsize"));
+    m_mtdConsoleLog = dynamic_cast<MythUICheckBox *> (GetChild("mtdconsolelog"));
+    m_mtdKeepAc3 = dynamic_cast<MythUICheckBox *> (GetChild("mtdkeepac3"));
+    m_mtdPreferXvid = dynamic_cast<MythUICheckBox *> (GetChild("mtdpreferxvid"));
+    m_mtdFrDetect = dynamic_cast<MythUICheckBox *> (GetChild("mtdfrdetect"));
+
+    m_helpText = dynamic_cast<MythUIText *> (GetChild("helptext"));
+    m_saveButton = dynamic_cast<MythUIButton *> (GetChild("save"));
+    m_cancelButton = dynamic_cast<MythUIButton *> (GetChild("cancel"));
+
+    if (!m_mtdPort || !m_mtdNiceLevel ||
+        !m_mtdConcurrentTranscodes || !m_mtdRipSize ||
+        !m_mtdConsoleLog || !m_mtdKeepAc3 ||
+        !m_mtdPreferXvid || !m_mtdFrDetect ||
+        !m_saveButton || !m_cancelButton)
+    {
+        VERBOSE(VB_IMPORTANT, "Theme is missing critical theme elements.");
+        return false;
+    }
+
+    m_mtdPort->SetRange(1024, 65535, 1);
+    m_mtdPort->SetValue(gContext->GetNumSetting("MTDPort"));
+
+    m_mtdNiceLevel->SetRange(0, 20, 1);
+    m_mtdNiceLevel->SetValue(gContext->GetNumSetting("MTDNiceLevel"));
+
+    m_mtdConcurrentTranscodes->SetRange(1, 99, 1);
+    m_mtdConcurrentTranscodes->SetValue(gContext->GetNumSetting("MTDConcurrentTranscodes"));
+
+    m_mtdRipSize->SetRange(0, 4096, 1);
+    m_mtdRipSize->SetValue(gContext->GetNumSetting("MTDRipSize"));
+
+
+    int loadMtdConsoleLog = gContext->GetNumSetting("MTDLogFlag", 0);
+    if (loadMtdConsoleLog == 1)
+        m_mtdConsoleLog->SetCheckState(MythUIStateType::Full);
+
+    int loadMtdKeepAc3 = gContext->GetNumSetting("MTDac3Flag", 0);
+    if (loadMtdKeepAc3 == 1)
+        m_mtdKeepAc3->SetCheckState(MythUIStateType::Full);
+
+    int loadMtdPreferXvid = gContext->GetNumSetting("MTDxvidFlag", 0);
+    if (loadMtdPreferXvid == 1)
+        m_mtdPreferXvid->SetCheckState(MythUIStateType::Full);
+
+    int loadMtdFrDetect = gContext->GetNumSetting("mythvideo.TrustTranscodeFRDetect", 0);
+    if (loadMtdFrDetect == 1)
+        m_mtdFrDetect->SetCheckState(MythUIStateType::Full);
+
+
+    connect(m_mtdPort,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+    connect(m_mtdNiceLevel,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+    connect(m_mtdConcurrentTranscodes,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+    connect(m_mtdRipSize,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+    connect(m_mtdConsoleLog,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+    connect(m_mtdKeepAc3,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+    connect(m_mtdPreferXvid,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+    connect(m_mtdFrDetect,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+
+    connect(m_saveButton, SIGNAL(Clicked()), this, SLOT(slotSave()));
+    connect(m_cancelButton, SIGNAL(Clicked()), this, SLOT(Close()));
+
+    if (!BuildFocusList())
+        VERBOSE(VB_IMPORTANT, "Failed to build a focuslist. Something is wrong");
+
+    SetFocusWidget(m_mtdPort);
+
+    return true;
+}
+
+bool MtdSettings::keyPressEvent(QKeyEvent *event)
+{
+    if (GetFocusWidget()->keyPressEvent(event))
+        return true;
+
+    bool handled = false;
+
+    if (!handled && MythScreenType::keyPressEvent(event))
+        handled = true;
+
+    return handled;
+}
+
+void MtdSettings::slotSave(void)
+{
+    gContext->SaveSetting("MTDPort", m_mtdPort->GetValue());
+    gContext->SaveSetting("MTDNiceLevel", m_mtdNiceLevel->GetValue());
+    gContext->SaveSetting("MTDConcurrentTranscodes", m_mtdConcurrentTranscodes->GetValue());
+    gContext->SaveSetting("MTDRipSize", m_mtdRipSize->GetValue());
+
+    int saveMtdConsoleLog = (m_mtdConsoleLog->GetCheckState() == MythUIStateType::Full) ? 1 : 0;
+    gContext->SaveSetting("MTDLogFlag", saveMtdConsoleLog);
+
+    int saveMtdKeepAc3 = (m_mtdKeepAc3->GetCheckState() == MythUIStateType::Full) ? 1 : 0;
+    gContext->SaveSetting("MTDac3Flag", saveMtdKeepAc3);
+
+    int saveMtdPreferXvid = (m_mtdPreferXvid->GetCheckState() == MythUIStateType::Full) ? 1 : 0;
+    gContext->SaveSetting("MTDxvidFlag", saveMtdPreferXvid);
+
+    int saveMtdFrDetect = (m_mtdFrDetect->GetCheckState() == MythUIStateType::Full) ? 1 : 0;
+    gContext->SaveSetting("mythvideo.TrustTranscodeFRDetect", saveMtdFrDetect);
+    Close();
+}
+
+void MtdSettings::slotFocusChanged(void)
+{
+    if (!m_helpText)
+        return;
+
+    QString msg = "";
+    if (GetFocusWidget() == m_mtdPort)
+        msg = tr("The port number that should be used for "
+                 "communicating with the MTD (Myth Transcoding "
+                 "Daemon)");
+    else if (GetFocusWidget() == m_mtdNiceLevel)
+        msg = tr("This determines the priority of the Myth "
+                 "Transcoding Daemon. Higher numbers mean "
+                 "lower priority (more CPU to other tasks).");
+    else if (GetFocusWidget() == m_mtdConcurrentTranscodes)
+        msg = tr("This determines the number of simultaneous "
+                 "transcode jobs. If set at 1 (the default), "
+                 "there will only be one active job at a time.");
+    else if (GetFocusWidget() == m_mtdRipSize)
+        msg = tr("If set to something other than 0, ripped "
+                 "video titles will be broken up into files "
+                 "of this size (in MB). Applies to both perfect "
+                 "quality recordings and intermediate files "
+                 "used for transcoding.");
+    else if (GetFocusWidget() == m_mtdConsoleLog)
+        msg = tr("If set, the MTD (Myth Transcoding Daemon) "
+                 "will log to the window it is started from. "
+                 "Otherwise, it will write to a file called  "
+                 "mtd.log in the top level ripping directory.");
+    else if (GetFocusWidget() == m_mtdKeepAc3)
+        msg = tr("If set, the MTD (Myth Transcoding Daemon) "
+                 "will, by default, preserve AC3 (Dolby "
+                 "Digital) audio in transcoded files.");
+    else if (GetFocusWidget() == m_mtdPreferXvid)
+        msg = tr("If set, mythdvd will use the (open, free) "
+                 "xvid codec rather than divx whenever "
+                 "possible.");
+    else if (GetFocusWidget() == m_mtdFrDetect)
+        msg = tr("If set, transcode will determine the frame "
+                 "rate automatically. If not set, 23.976 is "
+                 "assumed.");
+    else if (GetFocusWidget() == m_cancelButton)
+        msg = tr("Exit without saving settings");
+    else if (GetFocusWidget() == m_saveButton)
+        msg = tr("Save settings and Exit");
+
+    m_helpText->SetText(msg);
+}
+

mythvideo/mythvideo/mtdsettings.h

@@ +1 @@
+#ifndef MTDSETTINGS_H
+#define MTDSETTINGS_H
+
+#include <mythtv/mythwidgets.h>
+#include <mythtv/mythdialogs.h>
+
+#include <libmythui/mythuispinbox.h>
+#include <libmythui/mythuibutton.h>
+#include <libmythui/mythuibuttonlist.h>
+#include <libmythui/mythuicheckbox.h>
+#include <libmythui/mythscreentype.h>
+#include <libmythui/mythdialogbox.h>
+
+
+class MtdSettings : public MythScreenType
+{
+    Q_OBJECT
+public:
+    MtdSettings(MythScreenStack *parent, const char *name = 0);
+    ~MtdSettings();
+
+    bool Create(void);
+    bool keyPressEvent(QKeyEvent *);
+
+private:
+    MythUISpinBox      *m_mtdPort;
+    MythUISpinBox      *m_mtdNiceLevel;
+    MythUISpinBox      *m_mtdConcurrentTranscodes;
+    MythUISpinBox      *m_mtdRipSize;
+    MythUICheckBox     *m_mtdConsoleLog;
+    MythUICheckBox     *m_mtdKeepAc3;
+    MythUICheckBox     *m_mtdPreferXvid;
+    MythUICheckBox     *m_mtdFrDetect;
+
+    MythUIText         *m_helpText;
+    MythUIButton       *m_saveButton;
+    MythUIButton       *m_cancelButton;
+
+private slots:
+    void slotSave(void);
+    void slotFocusChanged(void);
+
+};
+
+#endif // MTDSETTINGS_H

mythvideo/mythvideo/parentalsettings.cpp

@@ +1 @@
+using namespace std;
+
+// Qt
+#include <QString>
+
+// MythTV
+#include <mythcontext.h>
+#include <mythdbcon.h>
+#include <mythdirs.h>
+
+#include "parentalcontrols.h"
+#include "parentalsettings.h"
+
+
+ParentalSettings::ParentalSettings(MythScreenStack *parent, const char *name)
+        : MythScreenType(parent, name),
+        m_defaultParentalLevel(NULL),
+        m_adminPassword4(NULL),
+        m_adminPassword3(NULL),
+        m_adminPassword2(NULL),
+        m_aggressivePC(NULL),
+        m_parentalLevelFromRating(NULL),
+        m_parentalLevel1(NULL),
+        m_parentalLevel2(NULL),
+        m_parentalLevel3(NULL),
+        m_parentalLevel4(NULL),
+        m_helpText(NULL),
+        m_saveButton(NULL),
+        m_cancelButton(NULL)
+{
+}
+
+ParentalSettings::~ParentalSettings()
+{
+
+}
+
+bool ParentalSettings::Create()
+{
+    bool foundtheme = false;
+
+    // Load the theme for this screen
+    foundtheme = LoadWindowFromXML("video-ui.xml", "parentalsettings", this);
+
+    if (!foundtheme)
+        return false;
+
+    m_defaultParentalLevel = dynamic_cast<MythUIButtonList *> (GetChild("defaultparentallevel"));
+    m_adminPassword4 = dynamic_cast<MythUITextEdit *> (GetChild("adminpassword4"));
+    m_adminPassword3 = dynamic_cast<MythUITextEdit *> (GetChild("adminpassword3"));
+    m_adminPassword2 = dynamic_cast<MythUITextEdit *> (GetChild("adminpassword2"));
+    m_aggressivePC = dynamic_cast<MythUICheckBox *> (GetChild("aggressivepc"));
+    m_parentalLevelFromRating = dynamic_cast<MythUICheckBox *> (GetChild("parentallevelfromrating"));
+    m_parentalLevel1 = dynamic_cast<MythUITextEdit *> (GetChild("parentallevel1"));
+    m_parentalLevel2 = dynamic_cast<MythUITextEdit *> (GetChild("parentallevel2"));
+    m_parentalLevel3 = dynamic_cast<MythUITextEdit *> (GetChild("parentallevel3"));
+    m_parentalLevel4 = dynamic_cast<MythUITextEdit *> (GetChild("parentallevel4"));
+
+    m_helpText = dynamic_cast<MythUIText *> (GetChild("helptext"));
+    m_saveButton = dynamic_cast<MythUIButton *> (GetChild("save"));
+    m_cancelButton = dynamic_cast<MythUIButton *> (GetChild("cancel"));
+
+    if (!m_defaultParentalLevel ||
+        !m_adminPassword4 || !m_adminPassword3 || !m_adminPassword2 ||
+        !m_aggressivePC   || !m_parentalLevelFromRating ||
+        !m_parentalLevel1 || !m_parentalLevel2 ||
+        !m_parentalLevel3 || !m_parentalLevel4 ||
+        !m_saveButton || !m_cancelButton)
+    {
+        VERBOSE(VB_IMPORTANT, "Theme is missing critical theme elements.");
+        return false;
+    }
+
+    new MythUIButtonListItem(m_defaultParentalLevel, tr("4 - High"), qVariantFromValue(QString(ParentalLevel::plHigh)));
+    new MythUIButtonListItem(m_defaultParentalLevel, tr("3 - Medium"), qVariantFromValue(QString(ParentalLevel::plMedium)));
+    new MythUIButtonListItem(m_defaultParentalLevel, tr("2 - Low"), qVariantFromValue(QString(ParentalLevel::plLow)));
+    new MythUIButtonListItem(m_defaultParentalLevel, tr("1 - Lowest"), qVariantFromValue(QString(ParentalLevel::plLowest)));
+    m_defaultParentalLevel->SetValueByData(gContext->GetSetting("VideoDefaultParentalLevel"));
+
+    m_adminPassword4->SetText(gContext->GetSetting("VideoAdminPassword"));
+    m_adminPassword3->SetText(gContext->GetSetting("VideoAdminPasswordThree"));
+    m_adminPassword2->SetText(gContext->GetSetting("VideoAdminPasswordTwo"));
+
+    int loadAggressivePC = gContext->GetNumSetting("VideoAggressivePC", 0);
+    if (loadAggressivePC == 1)
+        m_aggressivePC->SetCheckState(MythUIStateType::Full);
+
+    int loadParentalLevelFromRating = gContext->GetNumSetting("mythvideo.ParentalLevelFromRating", 0);
+    if (loadParentalLevelFromRating == 1)
+        m_parentalLevelFromRating->SetCheckState(MythUIStateType::Full);
+
+    m_parentalLevel1->SetText(gContext->GetSetting("mythvideo.AutoR2PL1", "G"));
+    m_parentalLevel2->SetText(gContext->GetSetting("mythvideo.AutoR2PL2", "PG"));
+    m_parentalLevel3->SetText(gContext->GetSetting("mythvideo.AutoR2PL3", "PG-13"));
+    m_parentalLevel4->SetText(gContext->GetSetting("mythvideo.AutoR2PL4", "R:NC-17"));
+
+    toggleLevelFromRating();
+
+    connect(m_defaultParentalLevel,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+    connect(m_adminPassword4,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+    connect(m_adminPassword3,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+    connect(m_adminPassword2,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+    connect(m_aggressivePC,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+    connect(m_parentalLevelFromRating,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+    connect(m_parentalLevel1,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+    connect(m_parentalLevel2,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+    connect(m_parentalLevel3,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+    connect(m_parentalLevel4,  SIGNAL(TakingFocus()), SLOT(slotFocusChanged()));
+    connect(m_parentalLevelFromRating,  SIGNAL(valueChanged()), SLOT(toggleLevelFromRating()));
+    connect(m_saveButton, SIGNAL(Clicked()), this, SLOT(slotSave()));
+    connect(m_cancelButton, SIGNAL(Clicked()), this, SLOT(Close()));
+
+    if (!BuildFocusList())
+        VERBOSE(VB_IMPORTANT, "Failed to build a focuslist. Something is wrong");
+
+    SetFocusWidget(m_defaultParentalLevel);
+
+    return true;
+}
+
+bool ParentalSettings::keyPressEvent(QKeyEvent *event)
+{
+    if (GetFocusWidget()->keyPressEvent(event))
+        return true;
+
+    bool handled = false;
+
+    if (!handled && MythScreenType::keyPressEvent(event))
+        handled = true;
+
+    return handled;
+}
+
+void ParentalSettings::slotSave(void)
+{
+    gContext->SaveSetting("VideoDefaultParentalLevel", m_defaultParentalLevel->GetDataValue().toString());
+
+    gContext->SaveSetting("VideoAdminPassword", m_adminPassword4->GetText());
+    gContext->SaveSetting("VideoAdminPasswordThree", m_adminPassword3->GetText());
+    gContext->SaveSetting("VideoAdminPasswordTwo", m_adminPassword2->GetText());
+
+    int saveAggressivePC = (m_aggressivePC->GetCheckState() == MythUIStateType::Full) ? 1 : 0;
+    gContext->SaveSetting("VideoAggressivePC", saveAggressivePC);
+
+    int saveParentalLevelFromRating = (m_parentalLevelFromRating->GetCheckState() == MythUIStateType::Full) ? 1 : 0;
+    gContext->SaveSetting("mythvideo.ParentalLevelFromRating", saveParentalLevelFromRating);
+
+    gContext->SaveSetting("mythvideo.AutoR2PL1", m_parentalLevel1->GetText());
+    gContext->SaveSetting("mythvideo.AutoR2PL2", m_parentalLevel2->GetText());
+    gContext->SaveSetting("mythvideo.AutoR2PL3", m_parentalLevel3->GetText());
+    gContext->SaveSetting("mythvideo.AutoR2PL4", m_parentalLevel4->GetText());
+
+    Close();
+}
+
+void ParentalSettings::slotFocusChanged(void)
+{
+    if (!m_helpText)
+        return;
+
+    QString msg = "";
+    if (GetFocusWidget() == m_defaultParentalLevel)
+        msg = tr("This is the 'level' that MythVideo starts at. "
+                 "Any videos with a level at or below this will be shown in "
+                 "the list or while browsing by default. The Parental PIN "
+                 "should be set to limit changing of the default level.");
+    else if (GetFocusWidget() == m_adminPassword4)
+        msg = tr("This PIN is used to enter Parental Control "
+                 "Level 4 as well as the Video Manager.");
+    else if (GetFocusWidget() == m_adminPassword3)
+        msg = tr("This PIN is used to enter Parental Control Level 3.");
+    else if (GetFocusWidget() == m_adminPassword2)
+        msg = tr("This PIN is used to enter Parental Control Level 2.");
+    else if (GetFocusWidget() == m_aggressivePC)
+        msg = tr("If set, you will not be able to return "
+                 "to this screen and reset the Parental "
+                 "PIN without first entering the current PIN. You have "
+                 "been warned.");
+    else if (GetFocusWidget() == m_parentalLevelFromRating)
+        msg = tr("If enabled, searches will automatically "
+                 "set the Parental Level to the one "
+                 "matching the rating below.");
+    else if (GetFocusWidget() == m_parentalLevel1)
+        msg = tr("Ratings containing these strings "
+                 "(separated by :) will be assigned "
+                 "to Parental Level 1.");
+    else if (GetFocusWidget() == m_parentalLevel2)
+        msg = tr("Ratings containing these strings "
+                 "(separated by :) will be assigned "
+                 "to Parental Level 2.");
+    else if (GetFocusWidget() == m_parentalLevel3)
+        msg = tr("Ratings containing these strings "
+                 "(separated by :) will be assigned "
+                 "to Parental Level 3.");
+    else if (GetFocusWidget() == m_parentalLevel4)
+        msg = tr("Ratings containing these strings "
+                 "(separated by :) will be assigned "
+                 "to Parental Level 4.");
+    else if (GetFocusWidget() == m_cancelButton)
+        msg = tr("Exit without saving settings");
+    else if (GetFocusWidget() == m_saveButton)
+        msg = tr("Save settings and Exit");
+
+    m_helpText->SetText(msg);
+}
+
+void ParentalSettings::toggleLevelFromRating(void)
+{
+    int checked = (m_parentalLevelFromRating->GetCheckState() == MythUIStateType::Full) ? true : false;
+
+    m_parentalLevel1->SetVisible(checked);
+    m_parentalLevel2->SetVisible(checked);
+    m_parentalLevel3->SetVisible(checked);
+    m_parentalLevel4->SetVisible(checked);
+}
+

mythvideo/mythvideo/parentalsettings.h

@@ +1 @@
+#ifndef PARENTALSETTINGS_H
+#define PARENTALSETTINGS_H
+
+#include <mythtv/mythwidgets.h>
+#include <mythtv/mythdialogs.h>
+
+#include <libmythui/mythuispinbox.h>
+#include <libmythui/mythuibutton.h>
+#include <libmythui/mythuibuttonlist.h>
+#include <libmythui/mythuicheckbox.h>
+#include <libmythui/mythscreentype.h>
+#include <libmythui/mythdialogbox.h>
+
+
+class ParentalSettings : public MythScreenType
+{
+    Q_OBJECT
+public:
+    ParentalSettings(MythScreenStack *parent, const char *name = 0);
+    ~ParentalSettings();
+
+    bool Create(void);
+    bool keyPressEvent(QKeyEvent *);
+
+private:
+    MythUIButtonList   *m_defaultParentalLevel;
+    MythUITextEdit     *m_adminPassword4;
+    MythUITextEdit     *m_adminPassword3;
+    MythUITextEdit     *m_adminPassword2;
+    MythUICheckBox     *m_aggressivePC;
+
+    MythUICheckBox     *m_parentalLevelFromRating;
+    MythUITextEdit     *m_parentalLevel1;
+    MythUITextEdit     *m_parentalLevel2;
+    MythUITextEdit     *m_parentalLevel3;
+    MythUITextEdit     *m_parentalLevel4;
+
+    MythUIText         *m_helpText;
+    MythUIButton       *m_saveButton;
+    MythUIButton       *m_cancelButton;
+
+private slots:
+    void slotSave(void);
+    void slotFocusChanged(void);
+    void toggleLevelFromRating(void);
+
+};
+
+#endif // PARENTALSETTINGS_H

mythvideo/theme/menus/video_settings.xml

@@ -23 +23 @@
    </button>
 
    <button>
+      <type>VIDEO_SETTINGS_DVD</type>
+      <text>DVD Settings</text>
+      <text lang="DE">DVD Einstellungen</text>
+      <action>SETTINGS_DVD</action>
+      <description>Options for internal DVD playback</description>
+      <description lang="DE">Optionen fÃŒr den internen DVD Spieler</description>
+   </button>
+
+   <button>
+      <type>VIDEO_SETTINGS_PARENTAL</type>
+      <text>Parental Settings</text>
+      <text lang="DE">Altersfreigabe</text>
+      <action>SETTINGS_PARENTAL</action>
+      <description>Options for parental controls</description>
+      <description lang="DE">Optionen zur Altersfreigabe und Bewertungen</description>
+   </button>
+
+   <button>
       <type>VIDEO_SETTINGS_PLAYER</type>
       <text>Player Settings</text>
       <text lang="ES">Opciones de reproducción</text>
@@ -75 +93 @@
 
    <!-- MythDVD -->
    <button>
-      <type>DVD_RIP</type>
-      <text>Rip Settings</text>
+      <type>VIDEO_SETTINGS_IMPORT</type>
+      <text>DVD Rip Settings</text>
       <text lang="DA">Genkodnings indstillinger</text>
       <text lang="PT">Conf. Importação DVDs</text>
-      <text lang="DE">Import</text>
+      <text lang="DE">DVD Import</text>
       <text lang="SV">InstÀllningar för kopiering</text>
       <text lang="ES">Opciones de "ripear"</text>
       <text lang="CA">Opcions de volcat</text>
@@ -90 +108 @@
       <text lang="RU">НастрПйкО ОЌпПрта</text>
       <text lang="PL">Ustaw zrzucanie DVD</text>
       <text lang="NB">Innstillinger for import</text>
-      <action>DVD_SETTINGS_RIP</action>
-      <description>DVD Rip and Transcode options</description>
+      <action>SETTINGS_IMPORT</action>
+      <description>DVD Rip options</description>
+      <description lang="DE">DVD Import Optionen</description>
+   </button>
+
+   <button>
+      <type>VIDEO_SETTINGS_MTD</type>
+      <text>Trancoding Settings</text>
+      <text lang="DE">Umwandlung</text>
+      <action>SETTINGS_MTD</action>
+      <description>Options for the Myth Transcoding Deamon</description>
+      <description lang="DE">Optionen fÃŒr den Myth Umwandler</description>
    </button>
 
 </mythmenu>

mythvideo/theme/default-wide/video-ui.xml

@@ -1506 +1506 @@
 
     </window>
 
+        
+
+        <window name="generalsettings">
+                
+                <textarea name="startupdir_label" from="basetextarea">
+                        <area>240,150,400,40</area>
+                        <align>right,vcenter</align>
+                        <value>Directories that hold videos:</value>
+                </textarea>     
+                <textarea name="artworkdir_label" from="basetextarea">
+                        <area>240,200,400,40</area>
+                        <align>right,vcenter</align>
+                        <value>Directory that holds movie posters:</value>
+                </textarea>
+                <textarea name="screenshotdir_label" from="basetextarea">
+                        <area>240,250,400,40</area>
+                        <align>right,vcenter</align>
+                        <value>Directory that holds movie screenshots:</value>
+                </textarea>
+                <textarea name="bannerdir_label" from="basetextarea">
+                        <area>240,300,400,40</area>
+                        <align>right,vcenter</align>
+                        <value>Directory that holds movie/TV Banners:</value>
+                </textarea>
+                <textarea name="fanartdir_label" from="basetextarea">
+                        <area>240,350,400,40</area>
+                        <align>right,vcenter</align>
+                        <value>Directory that holds movie fanart:</value>
+                </textarea>
+                <textarea name="trailersdir_label" from="basetextarea">
+                        <area>240,400,400,40</area>
+                        <align>right,vcenter</align>
+                        <value>Directory that holds movie trailers:</value>
+                </textarea>
+                
+                <textedit name="startupdir" from="basetextedit">
+                        <area>650,150,280,40</area>
+                </textedit>
+                <textedit name="artworkdir" from="basetextedit">
+                        <area>650,200,280,40</area>
+                </textedit>
+                <textedit name="screenshotdir" from="basetextedit">
+                        <area>650,250,280,40</area>
+                </textedit>
+                <textedit name="bannerdir" from="basetextedit">
+                        <area>650,300,280,40</area>
+                </textedit>
+                <textedit name="fanartdir" from="basetextedit">
+                        <area>650,350,280,40</area>
+                </textedit>
+                <textedit name="trailersdir" from="basetextedit">
+                        <area>650,400,280,40</area>
+                </textedit>     
+                
+                <textarea name="helptext" from="basetextarea">
+                        <area>205,451,870,80</area>
+                        <cutdown>yes</cutdown>
+                        <align>allcenter</align>
+                        <multiline>yes</multiline>
+                </textarea>
+                
+                <button name="save" from="basebutton">
+                        <position>480,550</position>
+                        <value>Save</value>
+                </button>               
+                <button name="cancel" from="basebutton">
+                        <position>650,550</position>
+                        <value>Cancel</value>
+                </button>
+        </window>
+        
+        
+        <window name="dvdsettings">
+                
+                <textarea name="dvdoninsertdvd_label" from="basetextarea">
+                        <area>200,180,440,40</area>
+                        <align>right,vcenter</align>
+                        <value>On DVD insertion:</value>
+                </textarea>     
+                <textarea name="dvddrivespeed_label" from="basetextarea">
+                        <area>200,230,440,40</area>
+                        <align>right,vcenter</align>
+                        <value>DVD Drive Speed:</value>
+                </textarea>
+                <textarea name="enabledvdbookmark_label" from="basetextarea">
+                        <area>200,280,440,40</area>
+                        <align>right,vcenter</align>
+                        <value>Enable DVD Bookmark Support:</value>
+                </textarea>
+                <textarea name="dvdbookmarkprompt_label" from="basetextarea">
+                        <area>200,330,440,40</area>
+                        <align>right,vcenter</align>
+                        <value>DVD Bookmark Prompt:</value>
+                </textarea>
+                <textarea name="dvdbookmarkdays_label" from="basetextarea">
+                        <area>200,380,440,40</area>
+                        <align>right,vcenter</align>
+                        <value>Remove DVD Bookmarks Older than (days):</value>
+                </textarea>
+                
+                <buttonlist name="dvdoninsertdvd" from="baseselector">
+                        <area>650,180,280,40</area>
+                </buttonlist>
+                <spinbox name="dvddrivespeed" from="basespinbox">
+                        <area>650,230,280,40</area>
+                </spinbox>
+                <checkbox name="enabledvdbookmark" from="basecheckbox">
+                        <area>650,285,280,40</area>
+                </checkbox>
+                <checkbox name="dvdbookmarkprompt" from="basecheckbox">
+                        <area>650,335,280,40</area>
+                </checkbox>
+                <spinbox name="dvdbookmarkdays" from="basespinbox">
+                        <area>650,380,280,40</area>
+                </spinbox>
+                
+                <textarea name="helptext" from="basetextarea">
+                        <area>205,431,870,80</area>
+                        <cutdown>yes</cutdown>
+                        <align>allcenter</align>
+                        <multiline>yes</multiline>
+                </textarea>
+                
+                <button name="save" from="basebutton">
+                        <position>480,530</position>
+                        <value>Save</value>
+                </button>               
+                <button name="cancel" from="basebutton">
+                        <position>650,530</position>
+                        <value>Cancel</value>
+                </button>
+        </window>
+        
+        
+        <window name="parentalsettings">
+                
+                <textarea name="defaultparentallevel_label" from="basetextarea">
+                        <area>200,110,440,40</area>
+                        <align>right,vcenter</align>
+                        <value>Starting Parental Level:</value>
+                </textarea>     
+                <textarea name="adminpassword4_label" from="basetextarea">
+                        <area>150,160,250,40</area>
+                        <align>right,vcenter</align>
+                        <value>PIN for Parental Level 4:</value>
+                </textarea>
+                <textarea name="adminpassword3_label" from="basetextarea">
+                        <area>590,160,50,40</area>
+                        <align>right,vcenter</align>
+                        <value>3:</value>
+                </textarea>
+                <textarea name="adminpassword2_label" from="basetextarea">
+                        <area>830,160,50,40</area>
+                        <align>right,vcenter</align>
+                        <value>2:</value>
+                </textarea>
+                <textarea name="aggressivepc_label" from="basetextarea">
+                        <area>200,210,440,40</area>
+                        <align>right,vcenter</align>
+                        <value>Aggressive Parental Control:</value>
+                </textarea>
+                
+                <textarea name="parentallevelfromrating_label" from="basetextarea">
+                        <area>160,270,480,40</area>
+                        <align>right,vcenter</align>
+                        <value>Enable automatic Parental Level from rating:</value>
+                </textarea>
+                <textarea name="parentallevel1_label" from="basetextarea">
+                        <area>200,320,440,40</area>
+                        <align>right,vcenter</align>
+                        <value>PL 1 default search string:</value>
+                </textarea>
+                <textarea name="parentallevel2_label" from="basetextarea">
+                        <area>200,370,440,40</area>
+                        <align>right,vcenter</align>
+                        <value>PL 2 default search string:</value>
+                </textarea>
+                <textarea name="parentallevel3_label" from="basetextarea">
+                        <area>200,420,440,40</area>
+                        <align>right,vcenter</align>
+                        <value>PL 3 default search string:</value>
+                </textarea>             
+                <textarea name="parentallevel4_label" from="basetextarea">
+                        <area>200,470,440,40</area>
+                        <align>right,vcenter</align>
+                        <value>PL 4 default search string:</value>
+                </textarea>                     
+                
+                <buttonlist name="defaultparentallevel" from="baseselector">
+                        <position>650,110</position>
+                </buttonlist>
+                <textedit name="adminpassword4" from="basetextedit">
+                        <position>410,160</position>
+                </textedit>
+                <textedit name="adminpassword3" from="basetextedit">
+                        <position>650,160</position>
+                </textedit>
+                <textedit name="adminpassword2" from="basetextedit">
+                        <position>890,160</position>
+                </textedit>
+                <checkbox name="aggressivepc" from="basecheckbox">
+                        <position>650,215</position>
+                </checkbox>     
+                
+                <checkbox name="parentallevelfromrating" from="basecheckbox">
+                        <position>650,275</position>
+                </checkbox>
+                <textedit name="parentallevel1" from="basetextedit">
+                        <position>650,320</position>
+                </textedit>     
+                <textedit name="parentallevel2" from="basetextedit">
+                        <position>650,370</position>
+                </textedit>     
+                <textedit name="parentallevel3" from="basetextedit">
+                        <position>650,420</position>
+                </textedit>     
+                <textedit name="parentallevel4" from="basetextedit">
+                        <position>650,470</position>
+                </textedit>     
+                
+                <textarea name="helptext" from="basetextarea">
+                        <area>165,526,960,80</area>
+                        <cutdown>yes</cutdown>
+                        <align>allcenter</align>
+                        <multiline>yes</multiline>
+                </textarea>
+                
+                <button name="save" from="basebutton">
+                        <position>480,625</position>
+                        <value>Save</value>
+                </button>               
+                <button name="cancel" from="basebutton">
+                        <position>650,625</position>
+                        <value>Cancel</value>
+                </button>
+        </window>
+        
+        
+        <window name="importsettings">
+                
+                <textarea name="dvdriplocation_label" from="basetextarea">
+                        <area>240,200,400,40</area>
+                        <align>right,vcenter</align>
+                        <value>Directory to hold temporary files:</value>
+                </textarea>     
+                <textarea name="titleplaycommand_label" from="basetextarea">
+                        <area>240,250,400,40</area>
+                        <align>right,vcenter</align>
+                        <value>Title Playing Command:</value>
+                </textarea>
+                <textarea name="subtitlecommand_label" from="basetextarea">
+                        <area>240,300,400,40</area>
+                        <align>right,vcenter</align>
+                        <value>Subtitle arguments:</value>
+                </textarea>
+                <textarea name="transcodecommand_label" from="basetextarea">
+                        <area>240,350,400,40</area>
+                        <align>right,vcenter</align>
+                        <value>Base transcode command:</value>
+                </textarea>
+                
+                <textedit name="dvdriplocation" from="basetextedit">
+                        <area>650,200,280,40</area>
+                </textedit>
+                <textedit name="titleplaycommand" from="basetextedit">
+                        <area>650,250,280,40</area>
+                </textedit>
+                <textedit name="subtitlecommand" from="basetextedit">
+                        <area>650,300,280,40</area>
+                </textedit>
+                <textedit name="transcodecommand" from="basetextedit">
+                        <area>650,350,280,40</area>
+                </textedit>
+                
+                <textarea name="helptext" from="basetextarea">
+                        <area>205,401,870,80</area>
+                        <cutdown>yes</cutdown>
+                        <align>allcenter</align>
+                        <multiline>yes</multiline>
+                </textarea>
+                
+                <button name="save" from="basebutton">
+                        <position>480,500</position>
+                        <value>Save</value>
+                </button>               
+                <button name="cancel" from="basebutton">
+                        <position>650,500</position>
+                        <value>Cancel</value>
+                </button>
+        </window>
+        
+        
+        <window name="mtdsettings">
+                
+                <textarea name="mtdport_label" from="basetextarea">
+                        <area>240,100,400,40</area>
+                        <align>right,vcenter</align>
+                        <value>MTD port number:</value>
+                </textarea>     
+                <textarea name="mtdnicelevel_label" from="basetextarea">
+                        <area>240,150,400,40</area>
+                        <align>right,vcenter</align>
+                        <value>Nice level for MTD:</value>
+                </textarea>
+                <textarea name="mtdconcurrenttranscodes_label" from="basetextarea">
+                        <area>240,200,400,40</area>
+                        <align>right,vcenter</align>
+                        <value>Simultaneous Transcode Jobs:</value>
+                </textarea>
+                <textarea name="mtdripsize_label" from="basetextarea">
+                        <area>240,250,400,40</area>
+                        <align>right,vcenter</align>
+                        <value>Ripped video segments:</value>
+                </textarea>
+                <textarea name="mtdconsolelog_label" from="basetextarea">
+                        <area>240,300,400,40</area>
+                        <align>right,vcenter</align>
+                        <value>MTD logs to terminal window:</value>
+                </textarea>
+                <textarea name="mtdkeepac3_label" from="basetextarea">
+                        <area>240,350,400,40</area>
+                        <align>right,vcenter</align>
+                        <value>Transcode AC3 Audio:</value>
+                </textarea>
+                <textarea name="mtdpreferxvid_label" from="basetextarea">
+                        <area>240,400,400,40</area>
+                        <align>right,vcenter</align>
+                        <value>Use xvid rather than divx:</value>
+                </textarea>
+                <textarea name="mtdfrdetect_label" from="basetextarea">
+                        <area>240,450,400,40</area>
+                        <align>right,vcenter</align>
+                        <value>Let transcode determine frame rate:</value>
+                </textarea>
+                
+                <spinbox name="mtdport" from="basespinbox">
+                        <area>650,100,280,40</area>
+                </spinbox>
+                <spinbox name="mtdnicelevel" from="basespinbox">
+                        <area>650,150,280,40</area>
+                </spinbox>
+                <spinbox name="mtdconcurrenttranscodes" from="basespinbox">
+                        <area>650,200,280,40</area>
+                </spinbox>
+                <spinbox name="mtdripsize" from="basespinbox">
+                        <area>650,250,280,40</area>
+                </spinbox>
+                <checkbox name="mtdconsolelog" from="basecheckbox">
+                        <area>650,305,280,40</area>
+                </checkbox>
+                <checkbox name="mtdkeepac3" from="basecheckbox">
+                        <area>650,355,280,40</area>
+                </checkbox>
+                <checkbox name="mtdpreferxvid" from="basecheckbox">
+                        <area>650,405,280,40</area>
+                </checkbox>
+                <checkbox name="mtdfrdetect" from="basecheckbox">
+                        <area>650,455,280,40</area>
+                </checkbox>
+                
+                <textarea name="helptext" from="basetextarea">
+                        <area>205,501,870,80</area>
+                        <cutdown>yes</cutdown>
+                        <align>allcenter</align>
+                        <multiline>yes</multiline>
+                </textarea>
+                
+                <button name="save" from="basebutton">
+                        <position>480,600</position>
+                        <value>Save</value>
+                </button>               
+                <button name="cancel" from="basebutton">
+                        <position>650,600</position>
+                        <value>Cancel</value>
+                </button>
+        </window>
+        
+                
 </mythuitheme>
 <!-- vim: set expandtab ts=4 sw=4 : -->

mythvideo/mythvideo/mythvideo.pro

@@ -38 +38 @@
 HEADERS += cleanup.h globals.h dirscan.h videoutils.h
 HEADERS += parentalcontrols.h playercommand.h playersettings.h
 HEADERS += metadatasettings.h
+HEADERS += generalsettings.h
+HEADERS += dvdsettings.h
+HEADERS += parentalsettings.h
+HEADERS += importsettings.h
+HEADERS += mtdsettings.h
 
 #MythDVD
 HEADERS += dvdripbox.h dvdinfo.h titledialog.h
@@ -51 +56 @@
 SOURCES += globals.cpp dirscan.cpp videoutils.cpp
 SOURCES += parentalcontrols.cpp playercommand.cpp
 SOURCES += playersettings.cpp metadatasettings.cpp
+SOURCES += generalsettings.cpp
+SOURCES += dvdsettings.cpp
+SOURCES += parentalsettings.cpp
+SOURCES += importsettings.cpp
+SOURCES += mtdsettings.cpp
 
 #MythDVD
 SOURCES += dvdripbox.cpp dvdinfo.cpp titledialog.cpp

mythvideo/mythvideo/videodlg.cpp

@@ -45 +45 @@
 #include "playercommand.h"
 #include "videodlg.h"
 #include "fileassoc.h"
+#include "generalsettings.h"
+#include "dvdsettings.h"
+#include "parentalsettings.h"
 #include "playersettings.h"
 #include "metadatasettings.h"
+#include "importsettings.h"
+#include "mtdsettings.h"
 
 namespace
 {
@@ -3102 +3107 @@
 
     m_menuPopup->SetReturnEvent(this, "view");
 
+    m_menuPopup->AddButton(tr("General Settings"), SLOT(ShowGeneralSettings()));
+    m_menuPopup->AddButton(tr("DVD Settings"), SLOT(ShowDvdSettings()));
+    m_menuPopup->AddButton(tr("Parental Settings"), SLOT(ShowParentalSettings()));
     m_menuPopup->AddButton(tr("Player Settings"), SLOT(ShowPlayerSettings()));
     m_menuPopup->AddButton(tr("Metadata Settings"), SLOT(ShowMetadataSettings()));
     m_menuPopup->AddButton(tr("File Type Settings"), SLOT(ShowExtensionSettings()));
+    m_menuPopup->AddButton(tr("DVD Rip Settings"), SLOT(ShowImportSettings()));
+    m_menuPopup->AddButton(tr("Transcoding Settings"), SLOT(ShowTranscodingSettings()));
+}
+
+/** \fn VideoDialog::ShowGeneralSettings()
+ *  \brief Pop up a MythUI Menu for MythVideo General Settings.
+ *  \return void.
+ */
+void VideoDialog::ShowGeneralSettings()
+{
+    GeneralSettings *gs = new GeneralSettings(m_popupStack, "general settings");
+
+    if (gs->Create())
+        m_popupStack->AddScreen(gs);
+    else
+        delete gs;
+}
+
+/** \fn VideoDialog::ShowDvdSettings()
+ *  \brief Pop up a MythUI Menu for MythVideo DVD Settings.
+ *  \return void.
+ */
+void VideoDialog::ShowDvdSettings()
+{
+    DvdSettings *ds = new DvdSettings(m_popupStack, "dvd settings");
+
+    if (ds->Create())
+        m_popupStack->AddScreen(ds);
+    else
+        delete ds;
+}
+
+/** \fn VideoDialog::ShowParentalSettings()
+ *  \brief Pop up a MythUI Menu for MythVideo Parental Settings.
+ *  \return void.
+ */
+void VideoDialog::ShowParentalSettings()
+{
+    ParentalSettings *ps = new ParentalSettings(m_popupStack, "parental settings");
+
+    if (ps->Create())
+        m_popupStack->AddScreen(ps);
+    else
+        delete ps;
 }
 
 /** \fn VideoDialog::ShowPlayerSettings()
@@ -3149 +3201 @@
         delete fa;
 }
 
+/** \fn VideoDialog::ShowImportSettings()
+ *  \brief Pop up a MythUI Menu for MythVideo Import Settings.
+ *  \return void.
+ */
+void VideoDialog::ShowImportSettings()
+{
+    ImportSettings *is = new ImportSettings(m_popupStack, "import settings");
+
+    if (is->Create())
+        m_popupStack->AddScreen(is);
+    else
+        delete is;
+}
+
+/** \fn VideoDialog::ShowTranscodingSettings()
+ *  \brief Pop up a MythUI Menu for MythVideo Transcoding Settings.
+ *  \return void.
+ */
+void VideoDialog::ShowTranscodingSettings()
+{
+    MtdSettings *ms = new MtdSettings(m_popupStack, "mtd settings");
+
+    if (ms->Create())
+        m_popupStack->AddScreen(ms);
+    else
+        delete ms;
+}
+
 /** \fn VideoDialog::MetadataBrowseMenu()
  *  \brief Pop up a MythUI Menu for MythVideo Metadata Browse modes.
  *  \return void.

mythvideo/mythvideo/videodlg.h

@@ -119 +119 @@
     void ShowCastDialog();
     void ShowHomepage();
     bool DoItemDetailShow();
+    void ShowGeneralSettings();
+    void ShowDvdSettings();
+    void ShowParentalSettings();
     void ShowPlayerSettings();
     void ShowExtensionSettings();
     void ShowMetadataSettings();
+    void ShowImportSettings();
+    void ShowTranscodingSettings();
 
     void OnParentalChange(int amount);