Ticket #6536: mythweather_fix.patch
File mythweather_fix.patch, 4.7 KB (added by , 15 years ago) |
---|
-
mythplugins/mythweather/mythweather/weather.cpp
304 304 { 305 305 m_srcMan->stopTimers(); 306 306 m_nextpage_Timer->stop(); 307 m_srcMan->clearSources();308 m_srcMan->findScripts();309 307 310 308 MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack(); 311 309 -
mythplugins/mythweather/mythweather/weatherSetup.cpp
908 908 MythScreenStack *popupStack = GetMythMainWindow()->GetStack("popup stack"); 909 909 910 910 MythUIBusyDialog *busyPopup = new MythUIBusyDialog(busymessage, popupStack, 911 "mythweatherbusydialog" );911 "mythweatherbusydialog", true); 912 912 913 913 if (busyPopup->Create()) 914 914 popupStack->AddScreen(busyPopup, false); -
mythplugins/mythweather/mythweather/sourceManager.cpp
87 87 MythScreenStack *popupStack = GetMythMainWindow()->GetStack("popup stack"); 88 88 89 89 MythUIBusyDialog *busyPopup = new MythUIBusyDialog(busymessage, popupStack, 90 "mythweatherbusydialog" );90 "mythweatherbusydialog", true); 91 91 92 92 if (busyPopup->Create()) 93 93 popupStack->AddScreen(busyPopup, false); -
mythtv/libs/libmythui/mythprogressdialog.h
32 32 Q_OBJECT 33 33 public: 34 34 MythUIBusyDialog(const QString &message, 35 MythScreenStack *parent, const char *name );35 MythScreenStack *parent, const char *name, bool modal=false); 36 36 37 37 bool Create(void); 38 38 bool keyPressEvent(QKeyEvent *event); 39 39 40 40 protected: 41 bool m_modal; 41 42 QString m_message; 42 43 43 44 MythUIText *m_messageText; … … 48 49 Q_OBJECT 49 50 public: 50 51 MythUIProgressDialog(const QString &message, 51 MythScreenStack *parent, const char *name );52 MythScreenStack *parent, const char *name, bool modal=false); 52 53 53 54 bool Create(void); 54 55 bool keyPressEvent(QKeyEvent *event); … … 60 61 protected: 61 62 void UpdateProgress(void); 62 63 64 bool m_modal; 63 65 QString m_message; 64 66 uint m_total; 65 67 uint m_count; -
mythtv/libs/libmythui/mythprogressdialog.cpp
3 3 #include "mythverbose.h" 4 4 5 5 MythUIBusyDialog::MythUIBusyDialog(const QString &message, 6 MythScreenStack *parent, const char *name )7 : MythScreenType(parent, name, false) 6 MythScreenStack *parent, const char *name, bool modal) 7 : MythScreenType(parent, name, false), m_modal(modal) 8 8 { 9 9 if (!message.isEmpty()) 10 10 m_message = message; … … 28 28 29 29 bool MythUIBusyDialog::keyPressEvent(QKeyEvent *event) 30 30 { 31 // We want to handle any keypresses, including Escape in the base 32 // class 33 return false; 31 // We want to catch all keypresses here if the busy dialog is modal. 32 return m_modal; 34 33 } 35 34 36 35 MythUIBusyDialog *ShowBusyPopup(const QString &message) … … 69 68 //--------------------------------------------------------- 70 69 71 70 MythUIProgressDialog::MythUIProgressDialog(const QString &message, 72 MythScreenStack *parent, const char *name )73 : MythScreenType(parent, name, false) 71 MythScreenStack *parent, const char *name, bool modal) 72 : MythScreenType(parent, name, false), m_modal(modal) 74 73 { 75 74 m_count = m_total = 0; 76 75 m_message = message; … … 94 93 95 94 bool MythUIProgressDialog::keyPressEvent(QKeyEvent *event) 96 95 { 97 // We want to handle any keypresses, including Escape in the base 98 // class 99 return false; 96 // We want to catch all keypresses here if the progress dialog is modal. 97 return m_modal; 100 98 } 101 99 102 100 void MythUIProgressDialog::customEvent(QEvent *event)