From cae5d8ec24ead51416fe79fd73fa13bdbe6a761a Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 11 Feb 2015 00:40:16 +0000
Subject: mythinstall: Fix Run MythFrontend from the iso

---
 .../MythVantage-app/mythinstall/installdialog.cpp          |  3 ++-
 .../MythVantage-app/mythinstall/installsettings.cpp        | 14 ++++++++------
 abs/core/mythinstall/PKGBUILD                              |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/installdialog.cpp b/abs/core/mythinstall/MythVantage-app/mythinstall/installdialog.cpp
index ac72a0b..e18da49 100755
--- a/abs/core/mythinstall/MythVantage-app/mythinstall/installdialog.cpp
+++ b/abs/core/mythinstall/MythVantage-app/mythinstall/installdialog.cpp
@@ -116,7 +116,8 @@ void WelcomeDialog::runLIVECD(void)
     if ( runsettings(true) ==  1  )
     {
         QString PAINTER = gCoreContext->GetSetting("ThemePainter");
-        QString startFECmd = ("MYTHCONFDIR=/tmp  mythfrontend -O ThemePainter=" + PAINTER   );
+        QString SERVERIP = gCoreContext->GetSetting("HostMysqlServer");
+        QString startFECmd = ("MYTHCONFDIR=/tmp mythfrontend -O ThemePainter=" + PAINTER + " -O AudioOutputDevice=ALSA:default -O MasterServerIP=" + SERVERIP  );
         myth_system(startFECmd.ascii());
     }
     else
diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.cpp b/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.cpp
index 56fcf13..05acc5e 100755
--- a/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.cpp
+++ b/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.cpp
@@ -56,7 +56,7 @@ static HostComboBox *ThemePainter()
     gc->setLabel(QObject::tr("Paint Engine"));
     gc->addSelection(QObject::tr("Qt"), "qt");
     gc->addSelection(QObject::tr("OpenGL"), "opengl");
-    gc->setHelpText(QObject::tr("This selects what Myth uses to draw.  If you have decent hardware, select OpenGL. Changing this requires a restart."));
+    gc->setHelpText(QObject::tr("This selects what Myth uses to draw. If you have decent hardware, select OpenGL. Changing this requires a restart."));
     return gc;
 
 }
@@ -453,8 +453,9 @@ static HostCheckBox *HostRunFrontend()
 static HostComboBox *HostMysqlserverip_listbox()
 {
     HostComboBox *gc = new HostComboBox("HostMysqlServer",true);
-    gc->setLabel(QObject::tr("Mysql server"));
+    gc->setLabel(QObject::tr("MySQL Server"));
 
+    myth_system("avahi-browse -l -r -t _mysql._tcp > /tmp/mysqllist");
     QString currentitem;
     QString prevline;
     QString line;
@@ -479,8 +480,8 @@ static HostComboBox *HostMysqlserverip_listbox()
         file.close();
         //system ("rm -f /tmp/mysqllist");
     }
-    gc->addSelection("Manual: type ip here");
-    gc->setHelpText(QObject::tr(""));
+    gc->addSelection("Manual: Enter IP Address");
+    gc->setHelpText(QObject::tr("The IP address of the MasterBackend MySQL server."));
 
     QString NETBOOT = getenv("NETBOOT");
     NETBOOT=NETBOOT.stripWhiteSpace();
@@ -3612,7 +3613,7 @@ int runsettings (bool mysqlonly , bool shownetwork , bool showhostype,
     int retc = 0 ;
     displaymysqlonly = mysqlonly;
 
-    if (displaymysqlonly )
+    if (displaymysqlonly)
     {
         MythInstallSettings mysqlsettings;
         mysqlsettings.Load();
@@ -3645,7 +3646,7 @@ int runsettings (bool mysqlonly , bool shownetwork , bool showhostype,
         displayshownetwork = false;
     };
 
-    if (   showhostype && continuerun )
+    if ( showhostype && continuerun )
     {
         displayshowhostype = showhostype;
         system ("avahi-browse -l -r  -t  _mysql._tcp > /tmp/mysqllist");
@@ -4431,6 +4432,7 @@ MythInstallSettings::MythInstallSettings()
     denied->addChild(deniedlabel);
     if  ( displaymysqlonly  )
     {
+        vcg->setLabel(QObject::tr("Run MythFrontend Settings"));
         vcg->addChild(HostMysqlserverip_listbox());
         vcg->addChild(ThemePainter());
         addChild(vcg);
diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD
index f760bc1..901f6ad 100644
--- a/abs/core/mythinstall/PKGBUILD
+++ b/abs/core/mythinstall/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Jams
 pkgname=mythinstall
 pkgver=8.3
-pkgrel=5
+pkgrel=6
 pkgdesc="LinHES installer/systemconfig GUI."
 arch=('i686' 'x86_64')
 depends=('mythtv>=0.27')
-- 
cgit v0.12

