-rw-r--r-- | core/launcher/shutdownimpl.cpp | 11 | ||||
-rw-r--r-- | core/launcher/shutdownimpl.h | 2 |
2 files changed, 13 insertions, 0 deletions
diff --git a/core/launcher/shutdownimpl.cpp b/core/launcher/shutdownimpl.cpp index b1925d9..9292bb8 100644 --- a/core/launcher/shutdownimpl.cpp +++ b/core/launcher/shutdownimpl.cpp | |||
@@ -18,12 +18,13 @@ | |||
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "shutdownimpl.h" | 21 | #include "shutdownimpl.h" |
22 | 22 | ||
23 | #include <qpe/global.h> | 23 | #include <qpe/global.h> |
24 | #include <qpe/qcopenvelope_qws.h> | ||
24 | 25 | ||
25 | #include <qtimer.h> | 26 | #include <qtimer.h> |
26 | #include <qprogressbar.h> | 27 | #include <qprogressbar.h> |
27 | #include <qpushbutton.h> | 28 | #include <qpushbutton.h> |
28 | #include <qbuttongroup.h> | 29 | #include <qbuttongroup.h> |
29 | #include <qlabel.h> | 30 | #include <qlabel.h> |
@@ -162,7 +163,17 @@ void ShutdownImpl::timeout ( ) | |||
162 | emit shutdown ( m_operation ); | 163 | emit shutdown ( m_operation ); |
163 | } | 164 | } |
164 | else | 165 | else |
165 | m_progress-> setProgress ( m_counter ); | 166 | m_progress-> setProgress ( m_counter ); |
166 | } | 167 | } |
167 | 168 | ||
169 | void ShutdownImpl::hide ( ) | ||
170 | { | ||
171 | if ( isVisible ( )) { | ||
172 | // hack - shutdown is a launcher dialog, but treated like a standalone app | ||
173 | QCopEnvelope e( "QPE/System", "closing(QString)" ); | ||
174 | e << QString ( "shutdown" ); | ||
175 | |||
176 | } | ||
177 | QWidget::hide ( ); | ||
178 | } | ||
168 | 179 | ||
diff --git a/core/launcher/shutdownimpl.h b/core/launcher/shutdownimpl.h index c2ebcc7..12b859d 100644 --- a/core/launcher/shutdownimpl.h +++ b/core/launcher/shutdownimpl.h | |||
@@ -31,12 +31,14 @@ class ShutdownImpl : public QWidget | |||
31 | Q_OBJECT | 31 | Q_OBJECT |
32 | public: | 32 | public: |
33 | ShutdownImpl( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | 33 | ShutdownImpl( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); |
34 | 34 | ||
35 | enum Type { ShutdownSystem, RebootSystem, RestartDesktop, TerminateDesktop }; | 35 | enum Type { ShutdownSystem, RebootSystem, RestartDesktop, TerminateDesktop }; |
36 | 36 | ||
37 | virtual void hide ( ); | ||
38 | |||
37 | signals: | 39 | signals: |
38 | void shutdown( ShutdownImpl::Type ); | 40 | void shutdown( ShutdownImpl::Type ); |
39 | 41 | ||
40 | private slots: | 42 | private slots: |
41 | void buttonClicked( int ); | 43 | void buttonClicked( int ); |
42 | void cancelClicked(); | 44 | void cancelClicked(); |