Ticket #8413: welcomedialog.cpp.patch

File welcomedialog.cpp.patch, 1.5 KB (added by ralf.dittmer@…, 14 years ago)

Patch for welcomedialog.cpp

  • welcomedialog.cpp

    old new  
    1919#include "compat.h"
    2020#include "mythdirs.h"
    2121#include "remoteutil.h"
     22//#include "mythprogressdialog.h"
    2223
    2324#include "welcomedialog.h"
    2425#include "welcomesettings.h"
     
    104105
    105106void WelcomeDialog::startFrontend(void)
    106107{
     108 
    107109    QString startFECmd = gContext->GetSetting("MythWelcomeStartFECmd",
    108110                         m_installDir + "/bin/mythfrontend");
    109 
     111    closeLoadingMsg();
    110112    myth_system(startFECmd);
    111113    updateAll();
    112114    m_frontendIsRunning = false;
     
    121123
    122124    // this makes sure the button appears to click properly
    123125    QTimer::singleShot(500, this, SLOT(startFrontend()));
     126    showLoadingMsg();
    124127}
    125128
    126129void WelcomeDialog::checkAutoStart(void)
     
    618621    m_menuPopup->AddButton(tr("Cancel"));
    619622}
    620623
     624void WelcomeDialog::showLoadingMsg(void)
     625{
     626    MythScreenStack *popupStack = GetMythMainWindow()->GetStack("popup stack");
     627    m_loadingPopup = new MythUIBusyDialog("Loading Frontend...", popupStack,
     628                                       "mythscreentypebusydialog");
     629    if (m_loadingPopup->Create())
     630        popupStack->AddScreen(m_loadingPopup); 
     631
     632}
     633
     634void WelcomeDialog::closeLoadingMsg(void)
     635{
     636    if (m_loadingPopup)
     637        m_loadingPopup->Close();
     638    m_loadingPopup = NULL;
     639}
     640
     641
    621642void WelcomeDialog::lockShutdown(void)
    622643{
    623644    QString mythshutdown_exe = m_installDir + "/bin/mythshutdown --lock";