From d5edf2fcadde8e5e3e70f9d655fe226d9750b18c Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 10 Feb 2017 14:28:46 +0000
Subject: mythinstall: Update some dialog for install

---
 .../MythVantage-app/mythinstall/installdialog.cpp  | 49 ++++++++++++----------
 abs/core/mythinstall/PKGBUILD                      |  2 +-
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/installdialog.cpp b/abs/core/mythinstall/MythVantage-app/mythinstall/installdialog.cpp
index 6b338f4..6f4252f 100755
--- a/abs/core/mythinstall/MythVantage-app/mythinstall/installdialog.cpp
+++ b/abs/core/mythinstall/MythVantage-app/mythinstall/installdialog.cpp
@@ -230,7 +230,7 @@ void WelcomeDialog::updateScreen(void)
     cmdtxt=MV_ROOT  ;
     cmdtxt.append("bin/install_proxy.sh " );
     system(qPrintable(cmdtxt));
-    recording_text=" ";
+    recording_text="Press MENU for Options";
     mythvantage_text=" ";
     error_text=" ";
     scheduled_text=" ";
@@ -293,6 +293,7 @@ void WelcomeDialog::updateScreen(void)
     // shows the busy box when configuring the system
     if ( scheduled_text == "Configuring system")
     {
+        m_recording_text->SetText(" ");
         if  ( ! I_AM_BUSY )
             busy_box();
     }
@@ -300,9 +301,9 @@ void WelcomeDialog::updateScreen(void)
 
 void WelcomeDialog::busy_box(void)
 {
-    QString msgtext = "Please wait, " ;
+    QString msgtext = "Please wait, configuring LinHES on host " ;
     msgtext.append(current_hostname);
-    msgtext.append(" is preparing for life");
+    msgtext.append("...");
     MythScreenStack *popupStack = GetMythMainWindow()->GetStack("popup stack");
     MythUIBusyDialog *busyPopup = new MythUIBusyDialog(msgtext, popupStack,"installbusy");
     if (busyPopup->Create())
@@ -316,7 +317,7 @@ void WelcomeDialog::busy_box(void)
     }
 
 
-    while (  scheduled_text == "Configuring system" )
+    while ( scheduled_text == "Configuring system" )
     {
         qApp->processEvents ();
         usleep(900);
@@ -334,7 +335,7 @@ void WelcomeDialog::busy_box(void)
 void WelcomeDialog::busy_find_oldsettings(void)
 {
 
-     QString msgtext = "Importing old settings" ;
+     QString msgtext = "Importing Old Settings..." ;
      MythScreenStack *popupStack = GetMythMainWindow()->GetStack("popup stack");
      MythUIBusyDialog *busyPopup = new MythUIBusyDialog(msgtext, popupStack,
                                                         "importsettingsbusy");
@@ -423,13 +424,13 @@ void WelcomeDialog::showPopup(void)
                                SLOT(runLIVECD()));
         m_menuPopup->AddButton(tr("Exit"),
                                SLOT(closeDialog()));
-        m_menuPopup->AddButton(tr("Close menu")) ;
+        m_menuPopup->AddButton(tr("Close Menu")) ;
     }
     else
     {
         m_menuPopup->AddButton(tr("Exit"),
                                SLOT(closeDialog()));
-        m_menuPopup->AddButton(tr("Close menu"));
+        m_menuPopup->AddButton(tr("Close Menu"));
     }
 
 }
@@ -545,7 +546,7 @@ void WelcomeDialog::showPopup_2(void)
 {
     MythScreenStack *popupStack = GetMythMainWindow()->GetMainStack();
 
-    m_menuPopup = new MythDialogBox("Select the drive to install to", popupStack, "actionmenu");
+    m_menuPopup = new MythDialogBox("Where do you want to install LinHES?", popupStack, "actionmenu");
 
     if (m_menuPopup->Create())
         popupStack->AddScreen(m_menuPopup);
@@ -561,7 +562,7 @@ void WelcomeDialog::showPopup_2(void)
     QString NETBOOT = getenv("NETBOOT");
     NETBOOT=NETBOOT.simplified();
     if ( NETBOOT   == "YES" )
-        m_menuPopup->AddButton(("Diskless Frontend " ), SLOT(install_net() ) );
+        m_menuPopup->AddButton(("Diskless Frontend"), SLOT(install_net() ) );
 
     QString  INSTALLSOURCE = findinstallsouce();
     ifstream partitions("/proc/partitions");
@@ -615,7 +616,7 @@ void WelcomeDialog::showPopup_2(void)
 void WelcomeDialog::GO_popup(QString go_text)
 {
     DialogCode  retval = MythPopupBox::Show2ButtonPopup(GetMythMainWindow(),
-                         "", go_text, tr("Start the process"),
+                         "", go_text, tr("Start Installation"),
                          tr("Cancel"), kDialogCodeButton0);
 
     if ( retval  == kDialogCodeButton0  )
@@ -644,11 +645,12 @@ void WelcomeDialog::Reboot_popup(void)
         prompt1.append("\n");
     }
     else
-        prompt1 = QObject::tr("Ready to go!");
+        prompt1 = QObject::tr("Installation of LinHES is complete!");
+        prompt1.append("\n");
 
     reboot_box = new DialogBox(GetMythMainWindow(),  prompt1);
     reboot_box->AddButton(QObject::tr("Reboot"));
-    reboot_box->AddButton(QObject::tr("Power off"));
+    reboot_box->AddButton(QObject::tr("Power Off"));
 
     int returncode = 0;
     DialogCode  dcode = reboot_box->exec();
@@ -832,9 +834,9 @@ void WelcomeDialog::install_generic(void)
             installwarningtext="Warning!";
             installwarningtext.append ("\n");
             installwarningtext.append ("\n");
-            installwarningtext.append  ("Installation drive (");
+            installwarningtext.append  ("The selected drive (");
             installwarningtext.append (install_drive);
-            installwarningtext.append  (") is about to be erased.");
+            installwarningtext.append  (") will be erased and LinHES will be installed.");
             installwarningtext.append ("\n");
         }
         else if ( installtype == "NET")
@@ -856,8 +858,11 @@ void WelcomeDialog::install_generic(void)
             installwarningtext.append  ("OS partition (");
             installwarningtext.append (install_drive);
             installwarningtext.append  ("1");
-            installwarningtext.append  (") will be erased.");
+            installwarningtext.append  (") will be erased and LinHES will be installed.");
             installwarningtext.append ("\n");
+            installwarningtext.append  ("The other partitions on (");
+            installwarningtext.append (install_drive);
+            installwarningtext.append  (") will not be erased.");
 
             QString cmdtxt;
             cmdtxt=MV_ROOT  ;
@@ -947,7 +952,7 @@ void WelcomeDialog::install_generic(void)
 
 void busy_network(void)
 {
-    QString msgtext = "Starting network" ;
+    QString msgtext = "Starting Network" ;
     MythScreenStack *popupStack = GetMythMainWindow()->GetStack("popup stack");
     MythUIBusyDialog *busyPopup = new MythUIBusyDialog(msgtext, popupStack,"installbusy");
     if (busyPopup->Create())
@@ -991,7 +996,7 @@ int  WelcomeDialog::ask_validate_network(void)
         else
         {
             MythProgressDialog *network_check = NULL;
-            network_check = new MythProgressDialog(QObject::tr("Please wait while the network is checked."), 7);
+            network_check = new MythProgressDialog(QObject::tr("Please wait while the network is checked..."), 7);
             QString cmdtxt;
             cmdtxt=MV_ROOT  ;
             cmdtxt.append("bin/install_proxy.sh network_check_it setup_network &");
@@ -1006,7 +1011,7 @@ int  WelcomeDialog::ask_validate_network(void)
                 if ( retval != 0 )
                 {
                     network_check->Close();
-                    pop_text="Could not find myself on the network";
+                    pop_text="Could not find myself on the network.";
                 }
             }
 
@@ -1019,7 +1024,7 @@ int  WelcomeDialog::ask_validate_network(void)
                 if ( retval != 0 )
                 {
                     network_check->Close();
-                    pop_text="Could not locate gateway";
+                    pop_text="Could not locate the gateway server.";
                 }
             }
 
@@ -1032,7 +1037,7 @@ int  WelcomeDialog::ask_validate_network(void)
                 if ( retval != 0 )
                 {
                     network_check->Close();
-                    pop_text="Could not locate nameserver";
+                    pop_text="Could not locate nameserver.";
                 }
             }
 
@@ -1045,7 +1050,7 @@ int  WelcomeDialog::ask_validate_network(void)
                 if ( retval != 0 )
                 {
                     network_check->Close();
-                    pop_text="Could not lookup names";
+                    pop_text="Could not lookup names.";
                 }
             }
 
@@ -1058,7 +1063,7 @@ int  WelcomeDialog::ask_validate_network(void)
                 if ( retval != 0 )
                 {
                     network_check->Close();
-                    pop_text="Hostname already on the network";
+                    pop_text="This hostname is already on the network.";
                 }
             }
 
diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD
index 9235032..93a8f00 100644
--- a/abs/core/mythinstall/PKGBUILD
+++ b/abs/core/mythinstall/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Jams
 pkgname=mythinstall
 pkgver=8.4.3
-pkgrel=1
+pkgrel=2
 pkgdesc="LinHES installer/systemconfig GUI."
 arch=('i686' 'x86_64')
 depends=('mythtv>=0.28')
-- 
cgit v0.12

