1 files changed, 32 insertions, 34 deletions

diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/xorgsettings.h b/abs/core/mythinstall/MythVantage-app/mythinstall/xorgsettings.h
index ad62564..8c659f7 100755
--- a/abs/core/mythinstall/MythVantage-app/mythinstall/xorgsettings.h
+++ b/abs/core/mythinstall/MythVantage-app/mythinstall/xorgsettings.h
@@ -1,6 +1,6 @@
-#include <settings.h>
-#include "mythdialogs.h"
-#include "libmyth/mythdialogs.h"
+//#include <settings.h>
+//#include "mythdialogs.h"
+//#include "libmyth/mythdialogs.h"
 #include "libmyth/mythwidgets.h"
 #include "installsettings.h"
 
@@ -8,13 +8,13 @@
 #include <qdir.h>
 
 
-class AdvancedXNvidiaConnections: public TriggeredConfigurationGroup {
+class AdvancedXNvidiaConnections: public GroupSetting {
     Q_OBJECT
 public:
     AdvancedXNvidiaConnections();
-    HostComboBox *HostXNvidiaConnection;
-    HostComboBox *HostXnVidiaTVformat;
-    HostComboBox *HostXnVidiaTVstandard;
+    HostComboBoxSetting *HostXNvidiaConnection;
+    HostComboBoxSetting *HostXnVidiaTVformat;
+    HostComboBoxSetting *HostXnVidiaTVstandard;
 
 public slots:
     void AdvancedXNvidiaConnectionsGatherSettings();
@@ -23,20 +23,20 @@ signals:
 };
 
 
-class AdvancedXNvidia_modelines: public TriggeredConfigurationGroup {
+class AdvancedXNvidia_modelines: public GroupSetting {
     Q_OBJECT
 public:
     AdvancedXNvidia_modelines();
-    HostComboBox *HostXNvidiaModelineCatagory;
-    HostComboBox *HostXNvidiaadvancedresVESA;
-    HostComboBox *HostXNvidiaadvancedresATSC;
-    HostComboBox *HostXNvidiaadvancedresDVD;
-    HostComboBox *HostXNvidiaadvancedresNTSC;
-    HostComboBox *HostXNvidiaadvancedresCustom;
-    HostCheckBox *HostXnVidia1080p;
-    HostCheckBox *HostXnVidia1080i;
-    HostCheckBox *HostXnVidia720p;
-    HostCheckBox *HostXnVidia480p;
+    HostComboBoxSetting *HostXNvidiaModelineCatagory;
+    HostComboBoxSetting *HostXNvidiaadvancedresVESA;
+    HostComboBoxSetting *HostXNvidiaadvancedresATSC;
+    HostComboBoxSetting *HostXNvidiaadvancedresDVD;
+    HostComboBoxSetting *HostXNvidiaadvancedresNTSC;
+    HostComboBoxSetting *HostXNvidiaadvancedresCustom;
+    HostCheckBoxSetting *HostXnVidia1080p;
+    HostCheckBoxSetting *HostXnVidia1080i;
+    HostCheckBoxSetting *HostXnVidia720p;
+    HostCheckBoxSetting *HostXnVidia480p;
     void Nvidia_fillselection(QString);
 public slots:
     void AdvancedXNvidia_modelines_GatherSettings(void);
@@ -45,11 +45,11 @@ public slots:
 
 //-------------------------------------------------
 
-class AdvancedXcardtype: public TriggeredConfigurationGroup {
+class AdvancedXcardtype: public GroupSetting {
     Q_OBJECT
 public:
     AdvancedXcardtype();
-    HostComboBox *HostXcardtype;
+    HostComboBoxSetting *HostXcardtype;
 
 public slots:
     void AdvancedXcardgatherSettings();
@@ -60,34 +60,33 @@ signals:
 };
 
 
-class AdvancedXSettings:    public TriggeredConfigurationGroup {
+class AdvancedXSettings: public GroupSetting {
     Q_OBJECT
 public:
     AdvancedXSettings();
-    HostCheckBox *HostXIgnoreConfig;
+    HostCheckBoxSetting *HostXIgnoreConfig;
 protected slots:
     void ADJUSTEDID(void);
 };
 
 
-class AdvancedXGeneric_modelines: public TriggeredConfigurationGroup {
+class AdvancedXGeneric_modelines: public GroupSetting {
     Q_OBJECT
 public:
     AdvancedXGeneric_modelines();
-    HostComboBox *HostXModelineCatagory;
-    HostComboBox *HostXadvancedresVESA;
-    HostComboBox *HostXadvancedresATSC;
-    HostComboBox *HostXadvancedresDVD;
-    HostComboBox *HostXadvancedresNTSC;
-    HostComboBox *HostXadvancedresCustom;
+    HostComboBoxSetting *HostXModelineCatagory;
+    HostComboBoxSetting *HostXadvancedresVESA;
+    HostComboBoxSetting *HostXadvancedresATSC;
+    HostComboBoxSetting *HostXadvancedresDVD;
+    HostComboBoxSetting *HostXadvancedresNTSC;
+    HostComboBoxSetting *HostXadvancedresCustom;
     void generic_fillselection(QString);
 public slots:
     void AdvancedXGeneric_modelines_GatherSettings(void);
 };
 
 
-class EDIDOptions : public ConfigurationWizard
-{
+class EDIDOptions : public GroupSetting {
 public:
     EDIDOptions();
 };
@@ -101,10 +100,10 @@ void ReadDDCvalues();
 
 #include <iostream>
 
-static HostComboBox *HostXres()
+static HostComboBoxSetting *HostXres()
 //Used in the simple config
 {
-    HostComboBox *gc = new HostComboBox("HostXres");
+    HostComboBoxSetting *gc = new HostComboBoxSetting("HostXres");
     gc->setLabel(QObject::tr("Initial Resolution"));
     gc->addSelection("Auto") ;
     gc->setHelpText(QObject::tr(""));
@@ -124,4 +123,3 @@ static HostComboBox *HostXres()
 
     return gc;
 }
-