diff options
Diffstat (limited to 'abs/core/mythinstall/MythVantage-app/mythinstall/installdialog.cpp')
-rwxr-xr-x | abs/core/mythinstall/MythVantage-app/mythinstall/installdialog.cpp | 84 |
1 files changed, 46 insertions, 38 deletions
diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/installdialog.cpp b/abs/core/mythinstall/MythVantage-app/mythinstall/installdialog.cpp index 4c7099d..899f62d 100755 --- a/abs/core/mythinstall/MythVantage-app/mythinstall/installdialog.cpp +++ b/abs/core/mythinstall/MythVantage-app/mythinstall/installdialog.cpp @@ -1,12 +1,11 @@ #include <qapplication.h> -//Added by qt3to4: -#include <Q3TextStream> +#include <QTextStream> #include <unistd.h> #include <fstream> #include "mythcontext.h" //#include "tv.h" -#include "uitypes.h" +//#include "uitypes.h" #include "installdialog.h" #include "installsettings.h" #include "installationtype.h" @@ -100,7 +99,7 @@ bool WelcomeDialog::Create(void) void WelcomeDialog::shutdownNow(int rc) { QString NETBOOT = getenv("NETBOOT"); - NETBOOT=NETBOOT.stripWhiteSpace(); + NETBOOT=NETBOOT.trimmed(); // system("rm -f /tmp/.install_state"); // system("rm -f /tmp/.install_percent"); // system("rm -f /tmp/.install_error"); @@ -118,7 +117,8 @@ void WelcomeDialog::runLIVECD(void) QString PAINTER = gCoreContext->GetSetting("ThemePainter"); QString SERVERIP = gCoreContext->GetSetting("HostMysqlServer"); QString startFECmd = ("MYTHCONFDIR=/tmp mythfrontend -O ThemePainter=" + PAINTER + " -O AudioOutputDevice=ALSA:default -O MasterServerIP=" + SERVERIP ); - myth_system(startFECmd.ascii()); +// myth_system(startFECmd.ascii()); + myth_system(startFECmd); } else { @@ -156,8 +156,10 @@ bool WelcomeDialog::keyPressEvent(QKeyEvent *event) QString cmd = gCoreContext->GetSetting("MythShutdownXTermCmd", ""); if (!cmd.isEmpty()) { - QByteArray tmp = cmd.toAscii(); - system(tmp); +// QByteArray tmp = cmd.toAscii(); +// QByteArray tmp = cmd; +// system(tmp); + system(qPrintable(cmd)); } } else @@ -203,7 +205,7 @@ void WelcomeDialog::updateTime(void) QFile file(releasefile); if ( file.open(QIODevice::ReadOnly | QIODevice::Text) ) { - Q3TextStream t( &file ); // use a text stream + QTextStream t( &file ); // use a text stream distro_line = t.readLine(); file.close(); } @@ -227,7 +229,7 @@ void WelcomeDialog::updateScreen(void) QString cmdtxt; cmdtxt=MV_ROOT ; cmdtxt.append("bin/install_proxy.sh " ); - system(cmdtxt); + system(qPrintable(cmdtxt)); recording_text=" "; mythvantage_text=" "; error_text=" "; @@ -238,21 +240,21 @@ void WelcomeDialog::updateScreen(void) QFile mylog("/tmp/mythvantage_install.log"); if ( mystatus.open(QIODevice::ReadOnly | QIODevice::Text) ) { - Q3TextStream t( &mystatus ); // use a text stream + QTextStream t( &mystatus ); // use a text stream scheduled_text = t.readLine(); mystatus.close(); } if ( mypercent.open(QIODevice::ReadOnly | QIODevice::Text) ) { - Q3TextStream t( &mypercent ); // use a text stream + QTextStream t( &mypercent ); // use a text stream recording_text = t.readLine(); mypercent.close(); } if ( myerror.open(QIODevice::ReadOnly | QIODevice::Text) ) { - Q3TextStream t( &myerror ); // use a text stream + QTextStream t( &myerror ); // use a text stream error_text = t.readLine(); myerror.close(); scheduled_text = error_text; @@ -264,7 +266,7 @@ void WelcomeDialog::updateScreen(void) { if ( mylog.open( QIODevice::ReadOnly| QIODevice::Text ) ) { - Q3TextStream t( &mylog ); + QTextStream t( &mylog ); while ( !t.atEnd() ) { mythvantage_text=t.readLine(); @@ -282,7 +284,8 @@ void WelcomeDialog::updateScreen(void) install_text = ""; m_status_text->SetText(install_text ); - m_updateScreenTimer->start(UPDATE_SCREEN_INTERVAL, true); +// m_updateScreenTimer->start(UPDATE_SCREEN_INTERVAL, true); + m_updateScreenTimer->start(UPDATE_SCREEN_INTERVAL); if ( scheduled_text == "Done" ) { Reboot_popup () ; @@ -530,7 +533,8 @@ QString WelcomeDialog::findinstallsouce(void) { int ndx = line.find(" "); currentitem =QString::fromStdString(line.substr(0,ndx)); - ndx = currentitem.findRev("/"); +// ndx = currentitem.findRev("/"); + ndx = currentitem.lastIndexOf("/"); currentitem = currentitem.mid(ndx+1,3); return currentitem; }; @@ -555,7 +559,7 @@ void WelcomeDialog::showPopup_2(void) bool installsource = false; QString NETBOOT = getenv("NETBOOT"); - NETBOOT=NETBOOT.stripWhiteSpace(); + NETBOOT=NETBOOT.trimmed(); if ( NETBOOT == "YES" ) m_menuPopup->AddButton(("Diskless Frontend " ), SLOT(install_net() ) ); @@ -611,9 +615,8 @@ void WelcomeDialog::showPopup_2(void) void WelcomeDialog::GO_popup(QString go_text) { DialogCode retval = MythPopupBox::Show2ButtonPopup(GetMythMainWindow(), - QString("Start the process"), - QObject::tr(go_text), - QObject::tr("Start the process"), QObject::tr("Cancel"), kDialogCodeButton0); + "", go_text, tr("Start the process"), + tr("Cancel"), kDialogCodeButton0); if ( retval == kDialogCodeButton0 ) { @@ -783,7 +786,7 @@ void WelcomeDialog::write_install_conf(QString rootdisk) sqlsize=sqlsize + "000"; QFile f( "/etc/install_layout" ); - if( !f.open( IO_WriteOnly ) ) + if( !f.open( QIODevice::WriteOnly | QIODevice::Text ) ) std::cout << "Failed to open file /etc/install_layout." << std::endl; QTextStream myfile( &f ); @@ -859,7 +862,7 @@ void WelcomeDialog::install_generic(void) QString cmdtxt; cmdtxt=MV_ROOT ; cmdtxt.append("bin/install_proxy.sh find_update " + install_drive +" &"); - system(cmdtxt); + system(qPrintable(cmdtxt)); busy_find_oldsettings(); bool flag = false; QString line; @@ -867,8 +870,8 @@ void WelcomeDialog::install_generic(void) QFile file("/etc/systemconfig"); if ( file.open(QIODevice::ReadOnly | QIODevice::Text) ) { - Q3TextStream t( &file ); // use a text stream - while ( !t.eof() ) + QTextStream t( &file ); // use a text stream + while ( !t.atEnd() ) { line = t.readLine(); if ( line.startsWith("hostname")) @@ -888,8 +891,8 @@ void WelcomeDialog::install_generic(void) QFile file("/tmp/etc/LinHES-release"); if ( file.open(QIODevice::ReadOnly | QIODevice::Text) ) { - Q3TextStream t( &file ); // use a text stream - while ( !t.eof() ) + QTextStream t( &file ); // use a text stream + while ( !t.atEnd() ) { line = t.readLine(); if ( line.contains("8.") ) @@ -992,14 +995,14 @@ int WelcomeDialog::ask_validate_network(void) QString cmdtxt; cmdtxt=MV_ROOT ; cmdtxt.append("bin/install_proxy.sh network_check_it setup_network &"); - retval = system(cmdtxt); + retval = system(qPrintable(cmdtxt)); busy_network(); if (network_check) { network_check->setProgress(2); cmdtxt=MV_ROOT ; cmdtxt.append("bin/install_proxy.sh network_check_it check_self"); - retval = system(cmdtxt); + retval = system(qPrintable(cmdtxt)); if ( retval != 0 ) { network_check->Close(); @@ -1012,7 +1015,7 @@ int WelcomeDialog::ask_validate_network(void) network_check->setProgress(3); cmdtxt=MV_ROOT ; cmdtxt.append("bin/install_proxy.sh network_check_it check_gw"); - retval = system(cmdtxt); + retval = system(qPrintable(cmdtxt)); if ( retval != 0 ) { network_check->Close(); @@ -1025,7 +1028,7 @@ int WelcomeDialog::ask_validate_network(void) network_check->setProgress(4); cmdtxt=MV_ROOT ; cmdtxt.append("bin/install_proxy.sh network_check_it check_ns"); - retval = system(cmdtxt); + retval = system(qPrintable(cmdtxt)); if ( retval != 0 ) { network_check->Close(); @@ -1038,7 +1041,7 @@ int WelcomeDialog::ask_validate_network(void) network_check->setProgress(5); cmdtxt=MV_ROOT ; cmdtxt.append("bin/install_proxy.sh network_check_it check_names"); - retval = system(cmdtxt); + retval = system(qPrintable(cmdtxt)); if ( retval != 0 ) { network_check->Close(); @@ -1051,7 +1054,7 @@ int WelcomeDialog::ask_validate_network(void) network_check->setProgress(6); cmdtxt=MV_ROOT ; cmdtxt.append("bin/install_proxy.sh network_check_it host_names"); - retval = system(cmdtxt); + retval = system(qPrintable(cmdtxt)); if ( retval != 0 ) { network_check->Close(); @@ -1068,7 +1071,12 @@ int WelcomeDialog::ask_validate_network(void) if (retval != 0 ) { - DialogCode val = MythPopupBox::Show2ButtonPopup(GetMythMainWindow(), QString(""), QObject::tr(pop_text), QObject::tr("Continue"), QObject::tr("Try again"), kDialogCodeButton0); + DialogCode val = MythPopupBox::Show2ButtonPopup( + GetMythMainWindow(), + "", pop_text, + tr("Continue"), + tr("Try again"), + kDialogCodeButton0); if (kDialogCodeButton0 == val ) retval = 0; } @@ -1118,11 +1126,11 @@ void WelcomeDialog::install_it(void) QFile file("/proc/meminfo"); if ( file.open(QIODevice::ReadOnly | QIODevice::Text) ) { - Q3TextStream t( &file ); // use a text stream + QTextStream t( &file ); // use a text stream line = t.readLine(); if ( line.startsWith("MemTotal:")) { - currentitem = line.simplifyWhiteSpace(); + currentitem = line.simplified(); currentitem = currentitem.section( " ", 1, 1 ); } } @@ -1141,14 +1149,14 @@ void WelcomeDialog::install_it(void) QString cmdtxt=MV_ROOT ; //cmdtxt.append("bin/install_proxy.sh full_install_it " + install_drive + " " + rootfs + " " + rootsize + " " + datafs + " " + datasize + " " + swapsize + "&"); cmdtxt.append("bin/install_proxy.sh full_install_it &"); - system(cmdtxt); + system(qPrintable(cmdtxt)); } else if ( installtype == "Upgrade" ) { QString cmdtxt=MV_ROOT ; //cmdtxt.append("bin/install_proxy.sh upgrade_it " + install_drive + " " + uprootfs + "&"); cmdtxt.append("bin/install_proxy.sh upgrade_it &"); - system(cmdtxt); + system(qPrintable(cmdtxt)); } else if (installtype=="NET") { @@ -1165,11 +1173,11 @@ void WelcomeDialog::install_it(void) QString h; h=localhostname; cmdtxt.append("bin/restore_default_settings.sh -c save -t syssettings -d 127.0.0.1 -h " + h); - system(cmdtxt); + system(qPrintable(cmdtxt)); cmdtxt=MV_ROOT ; //cmdtxt.append("bin/install_proxy.sh NETBOOT " + install_drive + " &"); cmdtxt.append("bin/install_proxy.sh NETBOOT &"); - system(cmdtxt); + system(qPrintable(cmdtxt)); } WORKING_ON_INSTALL = true; |