Ticket #8413: welcomedialog.cpp.patch
File welcomedialog.cpp.patch, 1.5 KB (added by , 14 years ago) |
---|
-
welcomedialog.cpp
old new 19 19 #include "compat.h" 20 20 #include "mythdirs.h" 21 21 #include "remoteutil.h" 22 //#include "mythprogressdialog.h" 22 23 23 24 #include "welcomedialog.h" 24 25 #include "welcomesettings.h" … … 104 105 105 106 void WelcomeDialog::startFrontend(void) 106 107 { 108 107 109 QString startFECmd = gContext->GetSetting("MythWelcomeStartFECmd", 108 110 m_installDir + "/bin/mythfrontend"); 109 111 closeLoadingMsg(); 110 112 myth_system(startFECmd); 111 113 updateAll(); 112 114 m_frontendIsRunning = false; … … 121 123 122 124 // this makes sure the button appears to click properly 123 125 QTimer::singleShot(500, this, SLOT(startFrontend())); 126 showLoadingMsg(); 124 127 } 125 128 126 129 void WelcomeDialog::checkAutoStart(void) … … 618 621 m_menuPopup->AddButton(tr("Cancel")); 619 622 } 620 623 624 void 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 634 void WelcomeDialog::closeLoadingMsg(void) 635 { 636 if (m_loadingPopup) 637 m_loadingPopup->Close(); 638 m_loadingPopup = NULL; 639 } 640 641 621 642 void WelcomeDialog::lockShutdown(void) 622 643 { 623 644 QString mythshutdown_exe = m_installDir + "/bin/mythshutdown --lock";