diff options
Diffstat (limited to 'abs/core/mythinstall')
6 files changed, 177 insertions, 160 deletions
diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/infrared.cpp b/abs/core/mythinstall/MythVantage-app/mythinstall/infrared.cpp index 34a2a33..cd56683 100755 --- a/abs/core/mythinstall/MythVantage-app/mythinstall/infrared.cpp +++ b/abs/core/mythinstall/MythVantage-app/mythinstall/infrared.cpp @@ -528,7 +528,7 @@ static HostComboBox *HostBlasterType() //gc->addSelection("pvr150"); gc->addSelection("iguanaIR-usb"); gc->addSelection("hd_pvr"); - gc->setHelpText(QObject::tr("The type of infrared transmitter being used. Selecting CommandIR or iguanaIR-usb will use that device for both transmitting and receiving. All other receivers will be disabled.")); + gc->setHelpText(QObject::tr("The type of infrared transmitter being used. Receiver will use the receiver settings. Selecting CommandIR or iguanaIR-usb will use that device for both transmitting and receiving. All other receivers will be disabled.")); gc->setValue("None"); return gc; }; @@ -673,7 +673,7 @@ public: addTarget("None", blanksettings); addTarget("Receiver", transmit_1); - addTarget("Serial", serial_settings); + addTarget("serial", serial_settings); addTarget("CommandIR", CommandIRsettings); //addTarget("pvr150",blanksettings); addTarget("hd_pvr",transmit_1); diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.cpp b/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.cpp index 2e505f1..3592f09 100755 --- a/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.cpp +++ b/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.cpp @@ -936,16 +936,6 @@ static HostCheckBox *Hostpluginmythbrowser() }; -// static HostCheckBox *Hostpluginmythcontrols() -// { -// HostCheckBox *gc = new HostCheckBox("Hostpluginmythcontrols"); -// gc->setLabel(QObject::tr("mythcontrols")); -// gc->setValue(true); -// gc->setHelpText(QObject::tr("check to enable mythcontrols")); -// return gc; -// }; - - static HostCheckBox *Hostpluginmythnetvision() { HostCheckBox *gc = new HostCheckBox("Hostpluginmythnetvision"); @@ -1048,17 +1038,6 @@ static HostCheckBox *HostpluginmythgameXe() }; -/* -static HostCheckBox *Hostpluginmythmovietime() -{ - HostCheckBox *gc = new HostCheckBox("Hostpluginmythmovietime"); - gc->setLabel(QObject::tr("mythmovietime")); - gc->setValue(true); - gc->setHelpText(QObject::tr("Check to enable mythmovietime")); - return gc; -};*/ - - static HostCheckBox *Hostpluginmythmusic() { HostCheckBox *gc = new HostCheckBox("Hostpluginmythmusic"); @@ -1079,25 +1058,6 @@ static HostCheckBox *Hostpluginmythnews() }; -// static HostCheckBox *Hostpluginmythsmolt() -// { -// HostCheckBox *gc = new HostCheckBox("Hostpluginmythsmolt"); -// gc->setLabel(QObject::tr("mythsmolt")); -// gc->setValue(true); -// gc->setHelpText(QObject::tr("check to enable mythsmolt")); -// return gc; -// }; - - -// static HostCheckBox *Hostpluginmythvideo() -// { -// HostCheckBox *gc = new HostCheckBox("Hostpluginmythvideo"); -// gc->setLabel(QObject::tr("mythvideo")); -// gc->setValue(true); -// gc->setHelpText(QObject::tr("check to enable mythvideo")); -// return gc; -// }; - static HostCheckBox *Hostpluginmythvideo_dvdcss() { HostCheckBox *gc = new HostCheckBox("Hostpluginmythvideo_dvdcss"); @@ -1109,15 +1069,6 @@ static HostCheckBox *Hostpluginmythvideo_dvdcss() -// static HostCheckBox *Hostpluginmythstream() -// { -// HostCheckBox *gc = new HostCheckBox("Hostpluginmythstream"); -// gc->setLabel(QObject::tr("mythstream")); -// gc->setValue(false); -// gc->setHelpText(QObject::tr("MythStream is an unofficial MythTv plugin that plays Internet audio and video streams.")); -// return gc; -// }; - static HostCheckBox *Hostpluginmythappletrailers() { HostCheckBox *gc = new HostCheckBox("Hostpluginmythappletrailers"); @@ -1138,14 +1089,14 @@ static HostCheckBox *Hostpluginmythweather() }; -static HostCheckBox *HostMiro() -{ - HostCheckBox *gc = new HostCheckBox("HostMiro"); - gc->setLabel(QObject::tr("Miro")); - gc->setValue(false); - gc->setHelpText(QObject::tr("Miro is a popular, free, and open internet TV application. It brings video channels from thousands of sources and has more free HD than any other platform.")); - return gc; -}; +//static HostCheckBox *HostMiro() +//{ +// HostCheckBox *gc = new HostCheckBox("HostMiro"); +// gc->setLabel(QObject::tr("Miro")); +// gc->setValue(false); +// gc->setHelpText(QObject::tr("Miro is a popular, free, and open internet TV application. It brings video channels from thousands of sources and has more free HD than any other platform.")); +// return gc; +//}; // static HostCheckBox *HostXine() @@ -1158,23 +1109,15 @@ static HostCheckBox *HostMiro() // }; -// static HostCheckBox *Hostwebmin() -// { -// HostCheckBox *gc = new HostCheckBox("Hostwebmin"); -// gc->setLabel(QObject::tr("Webmin")); -// gc->setValue(false); -// gc->setHelpText(QObject::tr("Webmin is a web-based interface for system administration for Unix. Once installed, you can access it at https://ip.of.back.end:10000 using your root password.")); -// return gc; -// }; +static HostCheckBox *Hostwebmin() +{ + HostCheckBox *gc = new HostCheckBox("Hostwebmin"); + gc->setLabel(QObject::tr("Webmin")); + gc->setValue(false); + gc->setHelpText(QObject::tr("Webmin is a web-based interface for system administration. Once installed, access it at https://ip.of.back.end:10000 using your root password.")); + return gc; +}; -// static HostCheckBox *Hostfuppes() -// { -// HostCheckBox *gc = new HostCheckBox("Hostfuppes"); -// gc->setLabel(QObject::tr("Fuppes")); -// gc->setValue(false); -// gc->setHelpText(QObject::tr("Upnp server")); -// return gc; -// }; static HostCheckBox *Hostfoldingathome() { @@ -1205,6 +1148,14 @@ static HostCheckBox *HostHuluDesktop() return gc; }; +static HostCheckBox *HostXBMC() +{ + HostCheckBox *gc = new HostCheckBox("HostXBMC"); + gc->setLabel(QObject::tr("XBMC")); + gc->setValue(false); + gc->setHelpText(QObject::tr("A software media player and entertainment hub for digital media.")); + return gc; +}; static HostComboBox *Hostfoldingusername() { @@ -2800,9 +2751,8 @@ SoundSettings::SoundSettings(): HostAudiotype->setLabel(QObject::tr("Sound Card Driver")); HostAudiotype->addSelection("OSS"); HostAudiotype->addSelection("ALSA"); - HostAudiotype->addSelection("tinker"); - HostAudiotype->setHelpText(QObject::tr("Select the sound driver, OSS or ALSA." ) ); + HostAudiotype->setHelpText(QObject::tr("Select the sound driver, ALSA or OSS." ) ); addChild(HostAudiotype); setTrigger(HostAudiotype); @@ -2835,34 +2785,32 @@ SoundSettings::SoundSettings(): HorizontalConfigurationGroup *lpalsa = new HorizontalConfigurationGroup(false, false, true, true); TransButtonSetting *LoadOSSbutton = new TransButtonSetting(); - LoadOSSbutton->setLabel(tr("Load OSS driver")); + LoadOSSbutton->setLabel(tr("Load OSS Driver")); TransButtonSetting *LoadALSAbutton = new TransButtonSetting(); - LoadALSAbutton->setLabel(tr("Load ALSA driver")); + LoadALSAbutton->setLabel(tr("Load ALSA Driver")); TransButtonSetting *TestAudiobutton = new TransButtonSetting(); - TestAudiobutton->setLabel(tr("Test Audio Settings")); + TestAudiobutton->setLabel(tr("Test Device")); + TestAudiobutton->setHelpText(QObject::tr("Will play a sound using the selected default device.")); lp->addChild(TestAudiobutton); lp->addChild(LoadOSSbutton); TransButtonSetting *TestALSAAudiobutton = new TransButtonSetting(); - TestALSAAudiobutton->setLabel(tr("Test ALSA Audio Settings")); + TestALSAAudiobutton->setLabel(tr("Test Device")); + TestALSAAudiobutton->setHelpText(QObject::tr("Will play a sound using the selected default device.")); lpalsa->addChild(TestALSAAudiobutton); lpalsa->addChild(LoadALSAbutton); TransLabelSetting *osslabel = new TransLabelSetting(); - osslabel->setValue("The original OSS! More information can be found at:"); - - TransLabelSetting *osslabel1 = new TransLabelSetting(); - osslabel1->setValue("http://www.opensound.com \n\nPlease note to fully configure sound visit the \nMythTV audio setup.\n"); + osslabel->setValue("OSS- Open Sound System\nhttp://opensound.com\n\nTo configure sound for MythTV go to:\nService Menu --> MythTV Settings --> Setup --> Audio\n"); TransLabelSetting *AlsaLabel = new TransLabelSetting(); - AlsaLabel->setValue("ALSA, the alternative to OSS\n\nPlease note to fully configure sound visit the \nMythTV audio setup.\n"); + AlsaLabel->setValue("ALSA - Advanced Linux Sound Architecture\nhttp://alsa-project.org\n\nTo configure sound for MythTV go to:\nService Menu --> MythTV Settings --> Setup --> Audio\n"); // OSS GROUP SoundOSSsettings *OSS = new SoundOSSsettings ; ConfigurationGroup* osssettings = new VerticalConfigurationGroup(false); osssettings->addChild(osslabel); - osssettings->addChild(osslabel1); osssettings->addChild(OSS); // osssettings->addChild(syncboxes); osssettings->addChild(lp); @@ -2889,7 +2837,6 @@ SoundSettings::SoundSettings(): ALSA, SLOT(loadalsadriver())); addTarget("ALSA", alsasettings); addTarget("OSS", osssettings); - addTarget("tinker", new VerticalConfigurationGroup(false)); }; @@ -2898,13 +2845,17 @@ SoundOSSsettings::SoundOSSsettings(): { SetVertical(true); HostSoundTypeout = new HostComboBox("HostSoundTypeout"); - HostSoundTypeout->setLabel(QObject::tr("Type")); + HostSoundTypeout->setLabel(QObject::tr("Audio Type")); HostSoundTypeout->addSelection("Analog"); HostSoundTypeout->addSelection("Digital"); - HostSoundTypeout->setHelpText(QObject::tr("")); + HostSoundTypeout->setHelpText(QObject::tr("Select the connection type, Analog or Digital.")); HostSoundOssAnalog = new HostComboBox("HostSoundOssAnalog"); + HostSoundOssAnalog->setLabel(QObject::tr("Default Device")); + HostSoundOssAnalog->setHelpText(QObject::tr("Select the default audio output device for the system.")); HostSoundOssDigital = new HostComboBox("HostSoundOssDigital"); + HostSoundOssDigital->setLabel(QObject::tr("Default Device")); + HostSoundOssDigital->setHelpText(QObject::tr("Select the default audio output device for the system.")); fillossselection(); int findossanalog=HostSoundOssAnalog->findSelection(hostparm.OLDHostSoundOSSAnalog ); int findossdigital=HostSoundOssDigital->findSelection(hostparm.OLDHostSoundOSSDigital ); @@ -2921,13 +2872,17 @@ SoundALSAsettings::SoundALSAsettings(): { SetVertical(true); HostSoundALSATypeout = new HostComboBox("HostSoundALSATypeout"); - HostSoundALSATypeout->setLabel(QObject::tr("Type")); + HostSoundALSATypeout->setLabel(QObject::tr("Audio Type")); HostSoundALSATypeout->addSelection("Analog"); HostSoundALSATypeout->addSelection("Digital"); - HostSoundALSATypeout->setHelpText(QObject::tr("")); + HostSoundALSATypeout->setHelpText(QObject::tr("Select the connection type, Analog or Digital.")); HostSoundALSAAnalog = new HostComboBox("HostSoundALSAAnalog"); + HostSoundALSAAnalog->setLabel(QObject::tr("Default Device")); + HostSoundALSAAnalog->setHelpText(QObject::tr("Select the default audio output device for the system. Chrome, aplay and other programs that use the default system device for audio will use this device. Mplayer will be set to use this device.")); HostSoundALSADigital = new HostComboBox("HostSoundALSADigital"); + HostSoundALSADigital->setLabel(QObject::tr("Default Device")); + HostSoundALSADigital->setHelpText(QObject::tr("Select the default audio output device for the system. Chrome, aplay and other programs that use the default system device for audio will use this device. Mplayer will be set to use this device.")); fillALSAselection(); int findalsaanalog=HostSoundALSAAnalog->findSelection(hostparm.OLDHostSoundALSAAnalog ); int findalsadigital=HostSoundALSADigital->findSelection(hostparm.OLDHostSoundALSADigital ); @@ -3143,10 +3098,10 @@ void SoundALSAsettings::fillALSAselection() break; } //card 0: I82801DBICH4:q [Intel 82801DB-ICH4], device 0: Intel ICH [Intel 82801DB-ICH4] - alsadescription=line.section( "," , 0 ,0 ); + alsadescription=line.section( ", " , 0 ,0 ); alsadescription=alsadescription.section(":",1,1); - alsadescription2=line.section( "," , 1 ,1 ); + alsadescription2=line.section( ", " , 1 ,1 ); //alsadescription2=alsadescription.section(":",0,0); hwdevice=line.section( ":" , 0 ,0 ); @@ -3157,16 +3112,33 @@ void SoundALSAsettings::fillALSAselection() temphwdevice=temphwdevice.section(" ",-1,-1 ); hwdevice.append(","); hwdevice.append(temphwdevice); - simpleitem=alsadescription2 + "(hw:" + hwdevice + ")"; - if (line.contains("IEC958") || line.contains("Digital")) + simpleitem=alsadescription2 + "(plughw:" + hwdevice + ")"; + if (line.contains("IEC958") || line.contains("Digital") || line.contains("PCM") || line.contains("HDMI")) HostSoundALSADigital->addSelection(simpleitem); else HostSoundALSAAnalog->addSelection(simpleitem); } } } + myth_system("aplay -L > /tmp/alsapcm"); + currentfile = "/tmp/alsapcm"; + QFile file1(currentfile); + if ( file1.open(QIODevice::ReadOnly | QIODevice::Text) ) + { + Q3TextStream t( &file1 ); // use a text stream + while ( !t.eof() ) + { + line = t.readLine(); + if (line.startsWith("iec958:") ) + { + alsadescription=line; + simpleitem=alsadescription + "(plug:iec958)"; + HostSoundALSADigital->addSelection(simpleitem); + break; + } + } + } return ; - } void SoundSettings::soundossgathersettings_1 (void) @@ -3215,7 +3187,7 @@ void SoundOSSsettings::soundossgathersettings(void) cmdtxt.append("bin/soundconfig.sh -t test -i OSS -d " + hostparm.ThisHostSoundDevice + "&"); system(cmdtxt); int return_code = 0; - QString msgtext = "Playing sample audio" ; + QString msgtext = "Playing Test Audio" ; MythScreenStack *popupStack = GetMythMainWindow()->GetStack("popup stack"); MythUIBusyDialog *busyPopup = new MythUIBusyDialog(msgtext, popupStack,"installbusy"); @@ -3293,10 +3265,10 @@ void SoundALSAsettings::soundalsagathersettings(void) // Add info popup right here QString cmdtxt; cmdtxt=MV_ROOT ; - cmdtxt.append("bin/soundconfig.sh -t test -i ALSA -d " + hostparm.ThisHostSoundDevice + "&"); + cmdtxt.append("bin/soundconfig.sh -t test -i ALSA -d " + hostparm.ThisHostSoundDevice + "&"); system(cmdtxt); int return_code = 0; - QString msgtext = "Playing sample audio" ; + QString msgtext = "Playing Test Audio" ; MythScreenStack *popupStack = GetMythMainWindow()->GetStack("popup stack"); MythUIBusyDialog *busyPopup = new MythUIBusyDialog(msgtext, popupStack,"installbusy"); if (busyPopup->Create()) @@ -3521,7 +3493,7 @@ void run_systemconfig(QString modulelist, bool restart, QString dbcommand) cmdtxt.append("bin/systemconfig.sh " + modulelist + " &"); myth_system(cmdtxt); int return_code = 0; - QString msgtext = "Please wait while " ; + QString msgtext = "Please wait while " ; msgtext.append(gCoreContext->GetSetting("HostMyhostname")); msgtext.append(" is configured"); MythScreenStack *popupStack = GetMythMainWindow()->GetStack("popup stack"); @@ -3997,16 +3969,11 @@ void writesettings () //plugins hostparm.ThisHostpluginmytharchive = gCoreContext->GetSetting("Hostpluginmytharchive"); hostparm.ThisHostpluginmythbrowser = gCoreContext->GetSetting("Hostpluginmythbrowser"); - //hostparm.ThisHostpluginmythcontrols = gCoreContext->GetSetting("Hostpluginmythcontrols"); hostparm.ThisHostpluginmythnetvision = gCoreContext->GetSetting("Hostpluginmythnetvision"); hostparm.ThisHostpluginmythgallery = gCoreContext->GetSetting("Hostpluginmythgallery"); hostparm.ThisHostpluginmythgame = gCoreContext->GetSetting("Hostpluginmythgame"); - // hostparm.ThisHostpluginmythmovietime = gCoreContext->GetSetting("Hostpluginmythmovietime"); hostparm.ThisHostpluginmythmusic = gCoreContext->GetSetting("Hostpluginmythmusic"); hostparm.ThisHostpluginmythnews = gCoreContext->GetSetting("Hostpluginmythnews"); -// hostparm.ThisHostpluginmythphone = gCoreContext->GetSetting("Hostpluginmythphone"); -// hostparm.ThisHostpluginmythsmolt = gCoreContext->GetSetting("Hostpluginmythsmolt"); -// hostparm.ThisHostpluginmythvideo = gCoreContext->GetSetting("Hostpluginmythvideo"); hostparm.ThisHostpluginmythweather = gCoreContext->GetSetting("Hostpluginmythweather"); hostparm.ThisHostpluginmythzoneminder = gCoreContext->GetSetting("Hostpluginmythzoneminder"); hostparm.ThisHostpluginmythgamefceux = gCoreContext->GetSetting("Hostpluginmythgamefceux"); @@ -4017,22 +3984,15 @@ void writesettings () hostparm.ThisHostpluginmythvideo_dvdcss = gCoreContext->GetSetting("Hostpluginmythvideo_dvdcss"); hostparm.ThisHostpluginmythappletrailers= gCoreContext->GetSetting("Hostpluginmythappletrailers"); -// hostparm.ThisHostpluginmythstream= gCoreContext->GetSetting("Hostpluginmythstream"); -// hostparm.ThisHostpluginmythvodka= gCoreContext->GetSetting("Hostpluginmythvodka"); - hostparm.ThisHostMiro= gCoreContext->GetSetting("HostMiro"); +// hostparm.ThisHostMiro= gCoreContext->GetSetting("HostMiro"); hostparm.ThisHostpluginmythgameMednafen= gCoreContext->GetSetting("HostpluginmythgameMednafen"); hostparm.ThisHostpluginmythgameROMDB= gCoreContext->GetSetting("HostpluginmythgameROMDB"); hostparm.ThisHostpluginmythgameMupen64= gCoreContext->GetSetting("HostpluginmythgameMupen64"); // hostparm.ThisHostXine = gCoreContext->GetSetting("HostXine"); -// hostparm.ThisHostwebmin = gCoreContext->GetSetting("Hostwebmin"); -// hostparm.ThisHostfuppes = gCoreContext->GetSetting("Hostfuppes"); + hostparm.ThisHostwebmin = gCoreContext->GetSetting("Hostwebmin"); hostparm.ThisHostHuluDesktop = gCoreContext->GetSetting("HostHuluDesktop"); hostparm.ThisHostwebonlinhes = gCoreContext->GetSetting("HostWebonlinhes"); - -// hostparm.ThisHostfuppes = gCoreContext->GetSetting("Hostfuppes"); - - - + hostparm.ThisHostXBMC = gCoreContext->GetSetting("HostXBMC"); hostparm.ThisHostfoldingathome = gCoreContext->GetSetting("Hostfoldingathome"); hostparm.ThisHostfoldingusername = gCoreContext->GetSetting("Hostfoldingusername"); @@ -4362,22 +4322,15 @@ void writesettings () myfile << "dvdcss=\"" + hostparm.ThisHostpluginmythvideo_dvdcss + "\"\n"; myfile << "mythappletrailers=\"" + hostparm.ThisHostpluginmythappletrailers + "\"\n"; - myfile << "miro=\"" + hostparm.ThisHostMiro + "\"\n"; +// myfile << "miro=\"" + hostparm.ThisHostMiro + "\"\n"; myfile << "webonlinhes=\"" + hostparm.ThisHostwebonlinhes + "\"\n"; myfile << "huludesktop=\"" + hostparm.ThisHostHuluDesktop + "\"\n"; - //myfile << "fuppes=\"" + hostparm.ThisHostfuppes + "\"\n"; + myfile << "xbmc=\"" + hostparm.ThisHostXBMC + "\"\n"; myfile << "foldingathome=\"" + hostparm.ThisHostfoldingathome + "\"\n"; myfile << "foldingusername=\"" + hostparm.ThisHostfoldingusername + "\"\n"; myfile << "foldingworksize=\"" + hostparm.ThisHostfoldingworksize + "\"\n"; - //myfile << "mythstream=\"" + hostparm.ThisHostpluginmythstream + "\"\n"; - // myfile << "mythphone=\"" + hostparm.ThisHostpluginmythphone + "\"\n"; - // myfile << "mythsmolt=\"" + hostparm.ThisHostpluginmythsmolt + "\"\n"; - // myfile << "mythvideo=\"" + hostparm.ThisHostpluginmythvideo + "\"\n"; - // myfile << "mythcontrols=\"" + hostparm.ThisHostpluginmythcontrols + "\"\n"; - // myfile << "mythmovietime=\"" + hostparm.ThisHostpluginmythmovietime + "\"\n"; - // myfile << "mythvodka=\"" +hostparm.ThisHostpluginmythvodka + "\"\n"; // myfile << "xine=\"" + hostparm.ThisHostXine + "\"\n"; - // myfile << "webmin=\"" + hostparm.ThisHostwebmin + "\"\n";er + "\"\n"; + myfile << "webmin=\"" + hostparm.ThisHostwebmin + "\"\n"; systemheader="\n# ddns settings\n" ; @@ -4759,30 +4712,20 @@ MythInstallSettings::MythInstallSettings() GridShowPlugin->setLabel(QObject::tr("Programs (1/4)")); GridShowPlugin->addChild(Hostpluginmytharchive()); GridShowPlugin->addChild(Hostpluginmythbrowser()); - //GridShowPlugin->addChild(Hostpluginmythcontrols()); GridShowPlugin->addChild(Hostpluginmythnetvision()); GridShowPlugin->addChild(Hostpluginmythgallery()); - //GridShowPlugin->addChild(Hostpluginmythmovietime()); //ConfigurationGroup *GridShowPlugin2 = new GridConfigurationGroup(2); GridShowPlugin->addChild(Hostpluginmythmusic()); GridShowPlugin->addChild(Hostpluginmythnews()); - //GridShowPlugin2->addChild(Hostpluginmythphone()); - //GridShowPlugin2->addChild(Hostpluginmythsmolt()); GridShowPlugin->addChild(Hostpluginmythweather()); GridShowPlugin->addChild(Hostpluginmythzoneminder()); -// ConfigurationGroup *Mythvideoplugin = new HorizontalConfigurationGroup(); -// Mythvideoplugin->addChild(Hostpluginmythvideo()); -// Mythvideoplugin->addChild(Hostpluginmythvideo_dvdcss()); - - ConfigurationGroup *GridShowPlugin3 = new VerticalConfigurationGroup(false,true); GridShowPlugin3->setLabel(QObject::tr("Programs (2/4)")); GridShowPlugin3->addChild(new MythGamesettings); GridShowPlugin3->addChild(Hostpluginmythvideo_dvdcss()); - //GridShowPlugin3->addChild(Mythvideoplugin); addChild(GridShowPlugin); // addChild(GridShowPlugin2); @@ -4802,18 +4745,14 @@ MythInstallSettings::MythInstallSettings() ConfigurationGroup *GridShowPlugin4 = new GridConfigurationGroup(2,false); GridShowPlugin4->setLabel(QObject::tr("Programs (3/4)")); GridShowPlugin4->addChild(Hostpluginmythappletrailers()); - //GridShowPlugin4->addChild(Hostpluginmythstream()); - //GridShowPlugin4->addChild(Hostpluginmythvodka()); - GridShowPlugin4->addChild(HostMiro()); + //GridShowPlugin4->addChild(HostMiro()); //GridShowPlugin4->addChild(HostXine()); - //GridShowPlugin4->addChild(Hostwebmin()); - //GridShowPlugin4->addChild(Hostfuppes()); GridShowPlugin4->addChild(HostHuluDesktop()); + GridShowPlugin4->addChild(Hostwebmin()); GridShowPlugin4->addChild(Hostwebonlinhes()); - + GridShowPlugin4->addChild(HostXBMC()); ConfigurationGroup *GridShowPlugin5 = new GridConfigurationGroup(2); - //GridShowPlugin5->addChild(Hostfuppes()); ConfigurationGroup *GridShowPlugin6 = new VerticalConfigurationGroup(false,true); GridShowPlugin6->setLabel(QObject::tr("Programs (4/4)")); diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.h b/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.h index 23c00f0..6ce0eff 100755 --- a/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.h +++ b/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.h @@ -510,28 +510,20 @@ struct HostParms QString ThisHostRemoteBackupDir; QString ThisHostpluginmytharchive; QString ThisHostpluginmythbrowser; - QString ThisHostpluginmythcontrols; QString ThisHostpluginmythnetvision; QString ThisHostpluginmythgallery; QString ThisHostpluginmythgame; - QString ThisHostpluginmythmovietime; QString ThisHostpluginmythmusic; QString ThisHostpluginmythnews; - QString ThisHostpluginmythphone; - QString ThisHostpluginmythsmolt; - QString ThisHostpluginmythvideo; QString ThisHostpluginmythweather; QString ThisHostpluginmythzoneminder; - - QString ThisHostpluginmythvideo_dvdcss; QString ThisHostpluginmythappletrailers; - QString ThisHostpluginmythstream; - QString ThisHostpluginmythvodka; - QString ThisHostMiro; +// QString ThisHostMiro; QString ThisHostwebonlinhes; + QString ThisHostXBMC; QString ThisHostHuluDesktop; QString ThisHostpluginmythgameMame; @@ -544,8 +536,7 @@ struct HostParms QString ThisHostpluginmythgameXe; // QString ThisHostXine; -// QString ThisHostwebmin; -// QString ThisHostfuppes; + QString ThisHostwebmin; QString ThisHostfoldingathome; QString ThisHostfoldingusername; QString ThisHostfoldingworksize; diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/main.cpp b/abs/core/mythinstall/MythVantage-app/mythinstall/main.cpp index fa16918..a9f0aa9 100755 --- a/abs/core/mythinstall/MythVantage-app/mythinstall/main.cpp +++ b/abs/core/mythinstall/MythVantage-app/mythinstall/main.cpp @@ -100,8 +100,8 @@ int main(int argc, char **argv) QString question; - int FRONTEND_EXIT_NO_MYTHCONTEXT = 1; - int FRONTEND_EXIT_INVALID_CMDLINE =1 ; +// int FRONTEND_EXIT_NO_MYTHCONTEXT = 1; +// int FRONTEND_EXIT_INVALID_CMDLINE =1 ; QApplication a(argc, argv); QCoreApplication::setApplicationName("mythinstall"); @@ -152,7 +152,7 @@ int main(int argc, char **argv) LOG(VB_GENERAL, LOG_INFO, QString("mythinstall: Screen stuff")); QString tmpArg = (cmdline.toString("screen")) ; QStringList pairs = QStringList::split(",", tmpArg); - for (unsigned int index = 0; index < pairs.size(); ++index) + for (int index = 0; index < pairs.size(); ++index) { if ( pairs[index] == "network" ) { @@ -305,6 +305,92 @@ int main(int argc, char **argv) system("cp -f /etc/systemconfig /tmp/systemconfig.bak"); QString olddb = gCoreContext->GetSetting("HostMysqlserver"); QString oldhostype = gCoreContext->GetSetting("HostSystemType"); + + //sync db with pacman + if (bShowplugins || bShowsoftware) + { + system("pacman -Q > /tmp/pacman_installed"); + QString progPacmanNamesArray[] = { "mythappletrailers", + "mytharchive", + "mythbrowser", + "mythgallery", + "mythgame", + "dolphin-emu", + "fceux", + "sdlmame", + "mednafen", + "mupen64plus-svn", + "romdb", + "snes9x", + "xe", + "mythmusic", + "mythnetvision", + "mythnews", + "libdvdcss", + "mythweather", + "mythzoneminder", + "huludesktop", + "xbmc", + "webmin", + "web-on-linhes", + "foldingathome"}; + QString progDBNamesArray[] = { "Hostpluginmythappletrailers", + "Hostpluginmytharchive", + "Hostpluginmythbrowser", + "Hostpluginmythgallery", + "Hostpluginmythgame", + "HostpluginmythgameDolphin", + "Hostpluginmythgamefceux", + "HostpluginmythgameMame", + "HostpluginmythgameMednafen", + "Hostpluginmythgamemupen64", + "HostpluginmythgameROMDB", + "Hostpluginmythgamesnes9x", + "HostpluginmythgameXe", + "Hostpluginmythmusic", + "Hostpluginmythnetvision", + "Hostpluginmythnews", + "Hostpluginmythvideo_dvdcss", + "Hostpluginmythweather", + "Hostpluginmythzoneminder", + "HostHuluDesktop", + "HostXBMC", + "Hostwebmin", + "Hostwebonlinhes", + "Hostfoldingathome"}; + char cmd[200]; + int grepstatus; + int pacmanNamesArraySize = sizeof(progPacmanNamesArray) / sizeof(progPacmanNamesArray[0]); + + //for loop to run though progPacmanNamesArray + for(int i = 0; i < pacmanNamesArraySize; i++) + { + QByteArray PacName = progPacmanNamesArray[i].toLocal8Bit(); + const char *PacNameChar = PacName.data(); + sprintf(cmd, "grep -q '%s ' /tmp/pacman_installed", PacNameChar); + + //LOG(VB_GENERAL, LOG_INFO, QString(progPacmanNamesArray[i])); + //LOG(VB_GENERAL, LOG_INFO, QString(progDBNamesArray[i])); + QString currDBValue = gCoreContext->GetSetting(progDBNamesArray[i]); + //LOG(VB_GENERAL, LOG_INFO, QString(currDBValue)); + grepstatus = system(cmd); + if ( grepstatus != 0 && currDBValue == "1" ) + { + //LOG(VB_GENERAL, LOG_INFO, QString("pkg NOT found and db 1")); + gCoreContext->SaveSetting(progDBNamesArray[i],"0" ); + runconfig = true; + } + else if ( grepstatus == 0 && currDBValue == "0" ) + { + //LOG(VB_GENERAL, LOG_INFO, QString("pkg found and db 0")); + gCoreContext->SaveSetting(progDBNamesArray[i],"1" ); + runconfig = true; + } + } + system("rm -f /tmp/pacman_installed"); + } + //DONE sync db with pacman + runsettings(false,bShowNetwork,bShowHostype,bShowMisc,bShowshutdown,bShowadvanced,bShowsound,bShowadvancedX,bShowAccesscontrol,bShowplugins,bShowsoftware,bShowuser,bShowwebuser,bShowddns,bShowinfrared,bShowscreensaver,bShowsupplemental,bShowremotes_only,bShowvnc,bShowFileshare); QString newdb = gCoreContext->GetSetting("HostMysqlserver"); QString newhostype = gCoreContext->GetSetting("HostSystemType"); diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/misc_settings.cpp b/abs/core/mythinstall/MythVantage-app/mythinstall/misc_settings.cpp index 43f360a..2914630 100755 --- a/abs/core/mythinstall/MythVantage-app/mythinstall/misc_settings.cpp +++ b/abs/core/mythinstall/MythVantage-app/mythinstall/misc_settings.cpp @@ -22,9 +22,10 @@ static HostComboBox *Hostupdateplan() HostComboBox *gc = new HostComboBox("Hostupdateplan"); gc->setLabel(QObject::tr("Automatic Updates")); gc->addSelection("None"); + gc->addSelection("Notify"); gc->addSelection("Myth_only"); gc->addSelection("All"); - gc->setHelpText("None: Do not install updates automatically.\nMyth_only: Automatically installs updates for MythTV only.\nAll: Automatically installs all updates for LinHES."); + gc->setHelpText("None: Do not install updates automatically. Notify: Check for updates and notify in the Service Menu and LinHES theme. Myth_only: Automatically install updates for MythTV only. All: Automatically install all updates for LinHES."); return gc; } diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD index 5a64034..c37757d 100644 --- a/abs/core/mythinstall/PKGBUILD +++ b/abs/core/mythinstall/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Jams pkgname=mythinstall -pkgver=8.1 +pkgver=8.2 pkgrel=7 pkgdesc="LinHES installer/systemconfig GUI." arch=('i686' 'x86_64') |