diff options
Diffstat (limited to 'abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.h')
| -rwxr-xr-x | abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.h | 239 |
1 files changed, 86 insertions, 153 deletions
diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.h b/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.h index 3a53048..fa9908e 100755 --- a/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.h +++ b/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.h @@ -1,37 +1,38 @@ #ifndef WELCOMESETTINGS_H #define WELCOMESETTINGS_H -#include <settings.h> +//#include <settings.h> +#include <standardsettings.h> #include "mythdialogs.h" #include "libmyth/mythdialogs.h" #include "libmyth/mythwidgets.h" -#include "compat-mv.h" +//#include "compat-mv.h" -class SystemtypeGroup: public TriggeredConfigurationGroup { +class SystemtypeGroup: public GroupSetting { Q_OBJECT public: SystemtypeGroup(); - HostComboBox *HostSystemType; + HostComboBoxSetting *HostSystemType; public slots: void SystemtypeHelp(); }; //------------------------------------------- -class NetworkSettingseth0: - public TriggeredConfigurationGroup { +class NetworkSettingseth0: public GroupSetting { Q_OBJECT public: NetworkSettingseth0(); - HostLineEdit *HostIPeth0; - HostComboBox *HostNETMASKeth0; - HostLineEdit *HostGWeth0; - HostLineEdit *HostDNSeth0; - HostCheckBox *HostActiveonbooteth0; - HostCheckBox *HostUseDHCPeth0 ; - HostCheckBox *HostDefaulteth0; - TransButtonSetting *wirelessbuttoneth0; - + HostTextEditSetting *HostIPeth0; + HostComboBoxSetting *HostNETMASKeth0; + HostTextEditSetting *HostGWeth0; + HostTextEditSetting *HostDNSeth0; + HostCheckBoxSetting *HostActiveonbooteth0; + HostCheckBoxSetting *HostUseDHCPeth0; + HostCheckBoxSetting *HostDefaulteth0; + ButtonStandardSetting *wirelessbuttoneth0; + HostComboBoxSetting *HOSTESSIDeth0(); + HostTextEditSetting *Hostkeyeth0(); signals: void eth0_is_default(void); public slots: @@ -41,27 +42,27 @@ public slots: void eth0_wireless_disable(); }; -class eth0options : public ConfigurationWizard -{ +class eth0options: public GroupSetting { public: eth0options(); }; -class NetworkSettingseth1: - public TriggeredConfigurationGroup { +class NetworkSettingseth1: public GroupSetting { Q_OBJECT public: NetworkSettingseth1(); - HostLineEdit *HostIPeth1; - HostComboBox *HostNETMASKeth1; - HostLineEdit *HostGWeth1; - HostLineEdit *HostDNSeth1; - HostCheckBox *HostActiveonbooteth1; - HostCheckBox *HostUseDHCPeth1 ; - HostCheckBox *HostDefaulteth1; - TransButtonSetting *wirelessbuttoneth1; + HostTextEditSetting *HostIPeth1; + HostComboBoxSetting *HostNETMASKeth1; + HostTextEditSetting *HostGWeth1; + HostTextEditSetting *HostDNSeth1; + HostCheckBoxSetting *HostActiveonbooteth1; + HostCheckBoxSetting *HostUseDHCPeth1 ; + HostCheckBoxSetting *HostDefaulteth1; + ButtonStandardSetting *wirelessbuttoneth1; + HostComboBoxSetting *HOSTESSIDeth1(); + HostTextEditSetting *Hostkeyeth1(); signals: void eth1_is_default(void); public slots: @@ -71,28 +72,27 @@ public slots: void eth1_wireless_disable(); }; -class eth1options : public ConfigurationWizard -{ +class eth1options: public GroupSetting { public: eth1options(); }; - -class NetworkSettingswlan0: - public TriggeredConfigurationGroup { +class NetworkSettingswlan0: public GroupSetting { Q_OBJECT public: NetworkSettingswlan0(); - HostLineEdit *HostIPwlan0; - HostComboBox *HostNETMASKwlan0; - HostLineEdit *HostGWwlan0; - HostLineEdit *HostDNSwlan0; - HostCheckBox *HostActiveonbootwlan0; - HostCheckBox *HostUseDHCPwlan0 ; - HostCheckBox *HostDefaultwlan0; - TransButtonSetting *wirelessbuttonwlan0; + HostTextEditSetting *HostIPwlan0; + HostComboBoxSetting *HostNETMASKwlan0; + HostTextEditSetting *HostGWwlan0; + HostTextEditSetting *HostDNSwlan0; + HostCheckBoxSetting *HostActiveonbootwlan0; + HostCheckBoxSetting *HostUseDHCPwlan0 ; + HostCheckBoxSetting *HostDefaultwlan0; + ButtonStandardSetting *wirelessbuttonwlan0; + HostComboBoxSetting *HOSTESSIDwlan0(); + HostTextEditSetting *Hostkeywlan0(); signals: void wlan0_is_default(void); public slots: @@ -102,27 +102,27 @@ public slots: void wlan0_wireless_disable(); }; -class Wlan0options : public ConfigurationWizard -{ +class Wlan0options: public GroupSetting { public: Wlan0options(); }; -class NetworkSettingswlan1: - public TriggeredConfigurationGroup { +class NetworkSettingswlan1: public GroupSetting { Q_OBJECT public: NetworkSettingswlan1(); - HostLineEdit *HostIPwlan1; - HostComboBox *HostNETMASKwlan1; - HostLineEdit *HostGWwlan1; - HostLineEdit *HostDNSwlan1; - HostCheckBox *HostActiveonbootwlan1; - HostCheckBox *HostUseDHCPwlan1 ; - HostCheckBox *HostDefaultwlan1; - TransButtonSetting *wirelessbuttonwlan1; + HostTextEditSetting *HostIPwlan1; + HostComboBoxSetting *HostNETMASKwlan1; + HostTextEditSetting *HostGWwlan1; + HostTextEditSetting *HostDNSwlan1; + HostCheckBoxSetting *HostActiveonbootwlan1; + HostCheckBoxSetting *HostUseDHCPwlan1 ; + HostCheckBoxSetting *HostDefaultwlan1; + ButtonStandardSetting *wirelessbuttonwlan1; + HostComboBoxSetting *HOSTESSIDwlan1(); + HostTextEditSetting *Hostkeywlan1(); signals: void wlan1_is_default(void); public slots: @@ -132,28 +132,25 @@ public slots: void wlan1_wireless_disable(); }; -class wlan1options : public ConfigurationWizard -{ +class wlan1options: public GroupSetting { public: wlan1options(); }; - -class NetworkSettingsath0: - public TriggeredConfigurationGroup { +class NetworkSettingsath0: public GroupSetting { Q_OBJECT public: NetworkSettingsath0(); - HostLineEdit *HostIPath0; - HostComboBox *HostNETMASKath0; - HostLineEdit *HostGWath0; - HostLineEdit *HostDNSath0; - HostCheckBox *HostActiveonbootath0; - HostCheckBox *HostUseDHCPath0 ; - HostCheckBox *HostDefaultath0; - TransButtonSetting *wirelessbuttonath0; + HostTextEditSetting *HostIPath0; + HostComboBoxSetting *HostNETMASKath0; + HostTextEditSetting *HostGWath0; + HostTextEditSetting *HostDNSath0; + HostCheckBoxSetting *HostActiveonbootath0; + HostCheckBoxSetting *HostUseDHCPath0 ; + HostCheckBoxSetting *HostDefaultath0; + ButtonStandardSetting *wirelessbuttonath0; signals: void ath0_is_default(void); public slots: @@ -163,19 +160,17 @@ public slots: void ath0_wireless_disable(); }; -class ath0options : public ConfigurationWizard -{ +class ath0options: public GroupSetting { public: ath0options(); }; -class NetworkOptionsFrame: public VerticalConfigurationGroup { +class NetworkOptionsFrame: public GroupSetting { Q_OBJECT public: NetworkOptionsFrame(); - TransButtonSetting *FetchDhcpHostnameButton; - TransLabelSetting *networklabel; - HostComboBox *HostMyhostname; + ButtonStandardSetting *FetchDhcpHostnameButton; + HostComboBoxSetting *HostMyhostname; QString find_hostname(); public slots: void fetch_hostname(); @@ -185,11 +180,11 @@ public slots: //-------------------------------------------- -class SoundSettings: public TriggeredConfigurationGroup { +class SoundSettings: public GroupSetting { Q_OBJECT public: SoundSettings(); - HostComboBox *HostAudiotype; + HostComboBoxSetting *HostAudiotype; signals: @@ -201,23 +196,23 @@ public slots: }; - -class SoundOSSsettings: public TriggeredConfigurationGroup { +/* +class SoundOSSsettings: public HostCheckBoxSetting { Q_OBJECT public: SoundOSSsettings(); - HostComboBox *HostSoundOssAll; + HostComboBoxSetting *HostSoundOssAll; void fillossselection(); public slots: void soundossgathersettings(); void loadossdriver(); }; - -class SoundALSAsettings: public TriggeredConfigurationGroup { +*/ +class SoundALSAsettings: public GroupSetting { Q_OBJECT public: SoundALSAsettings(); - HostComboBox *HostSoundALSAAll; + HostComboBoxSetting *HostSoundALSAAll; void fillALSAselection(); public slots: void soundalsagathersettings(); @@ -227,80 +222,36 @@ public slots: //############################################ -class MythInstallSettings: public ConfigurationWizard -{ - +class MythInstallSettings: public GroupSetting { public: MythInstallSettings(); void testme(); private: MythPopupBox *popup; - }; -/* -#include "mythstorage.h" - -class MPUBLIC ImageSelectSetting: public SelectSetting { - Q_OBJECT -public: - ImageSelectSetting(Storage *_storage) : - SelectSetting(_storage), - bxwidget(NULL), imagelabel(NULL), combo(NULL), - m_hmult(1.0f), m_wmult(1.0f) { } - virtual QWidget* configWidget(ConfigurationGroup *cg, QWidget* parent, - const char* widgetName = 0); - virtual void widgetInvalid(QObject *obj); - virtual void deleteLater(void); - virtual void setHelpText(const QString &str); - - virtual void addImageSelection(const QString& label, - QImage* image, - QString value=QString::null, - bool select=false); - -protected slots: - void imageSet(int); - -protected: - void Teardown(void); - virtual ~ImageSelectSetting(); - -protected: - vector<QImage*> images; - QWidget *bxwidget; - QLabel *imagelabel; - MythComboBox *combo; - float m_hmult, m_wmult; -}; - - -class MPUBLIC HostImageSelect : public ImageSelectSetting, public HostDBStorage -{ -public: - HostImageSelect(const QString &name) : - ImageSelectSetting(this), HostDBStorage(this, name) { } -};*/ - +/* class HostRemoteType: public HostImageSelect { public: HostRemoteType(); }; - +*/ #define MV_ROOT "/usr/MythVantage/" -int runsettings(bool = false , bool = false , bool = false ,bool = false ,bool = false, bool = false,bool = false,bool = false , bool = false , bool = false , bool = false, bool = false , bool = false , bool = false , bool = false, bool = false , bool = false , bool = false , bool = false, bool = false); +int runsettings(bool = false, bool = false, bool = false, bool = false, + bool = false, bool = false, bool = false, bool = false, + bool = false, bool = false, bool = false, bool = false, + bool = false, bool = false, bool = false, bool = false, + bool = false, bool = false, bool = false, bool = false); //void ReadDDCifno(void); void run_systemconfig(QString,bool = false,QString = ""); +void settingsWait(); void writesettings(); //void testXconfiguration(); - - - struct HostParms { @@ -329,7 +280,6 @@ struct HostParms QString ThisHostkeyeth0; QString ThisHostMTUeth0; - QString ThisHostIPeth1; QString ThisHostNETMASKeth1; QString ThisHostDNSeth1; @@ -354,7 +304,6 @@ struct HostParms QString ThisHostkeywlan0; QString ThisHostMTUwlan0; - QString ThisHostIPwlan1; QString ThisHostNETMASKwlan1; QString ThisHostDNSwlan1; @@ -379,7 +328,6 @@ struct HostParms QString ThisHostkeyath0; QString ThisHostMTUath0; - QString ThisRemote; QString ThisHostRemotebucket; @@ -393,12 +341,12 @@ struct HostParms QString ThisNFS; QString ThisMythWEB; QString ThisHostwebauth; - // QString ThisHostServiceHobbit; - // QString ThisHostServiceRRD; +// QString ThisHostServiceHobbit; +// QString ThisHostServiceRRD; QString ThisHostRunDHCP; QString ThisSystemType; -// QString ThisBlaster; +// QString ThisBlaster; QString ThisHostTransmitproto_1; QString ThisHostTransmitproto_2; @@ -416,12 +364,6 @@ struct HostParms QString ThisHostTransmitDelay_4; QString ThisHostTransmitSend_after_4; - - - - - - QString ThisReceiverType; QString ThisHDHRlirc_device; QString ThisHostLircWait; @@ -431,8 +373,6 @@ struct HostParms QString ThisDBhost; QString ThisXres; - - QString ThisHostBEWait; QString ThisHostUseXLargeMouse; QString ThisShutdowntime; @@ -503,7 +443,6 @@ struct HostParms QString ThisHostXBMC; QString ThisHostPLEXHT; QString ThisHostPLEXMS; - QString ThisHostHuluDesktop; QString ThisHostpluginmythgameMame; QString ThisHostpluginmythgamefceux; @@ -549,10 +488,4 @@ struct DDCinfo QString Displaysize; }; - - - - - - #endif |