-rw-r--r-- | core/apps/calibrate/calibrate.cpp | 11 | ||||
-rw-r--r-- | core/launcher/shutdownimpl.cpp | 11 | ||||
-rw-r--r-- | core/launcher/shutdownimpl.h | 2 |
3 files changed, 22 insertions, 2 deletions
diff --git a/core/apps/calibrate/calibrate.cpp b/core/apps/calibrate/calibrate.cpp index b9ad73d..6d498bc 100644 --- a/core/apps/calibrate/calibrate.cpp +++ b/core/apps/calibrate/calibrate.cpp | |||
@@ -18,17 +18,17 @@ | |||
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include <math.h> | 21 | #include <math.h> |
22 | 22 | ||
23 | #include "calibrate.h" | 23 | #include "calibrate.h" |
24 | 24 | ||
25 | #include <qpe/resource.h> | 25 | #include <qpe/resource.h> |
26 | 26 | #include <qpe/qcopenvelope_qws.h> | |
27 | #include <qapplication.h> | 27 | #include <qapplication.h> |
28 | 28 | ||
29 | #if defined(Q_WS_QWS) || defined(_WS_QWS_) | 29 | #if defined(Q_WS_QWS) || defined(_WS_QWS_) |
30 | 30 | ||
31 | #include <qpainter.h> | 31 | #include <qpainter.h> |
32 | #include <qtimer.h> | 32 | #include <qtimer.h> |
33 | #include <qwindowsystem_qws.h> | 33 | #include <qwindowsystem_qws.h> |
34 | #include <qgfx_qws.h> | 34 | #include <qgfx_qws.h> |
@@ -75,18 +75,25 @@ void Calibrate::show() | |||
75 | 75 | ||
76 | void Calibrate::store() | 76 | void Calibrate::store() |
77 | { | 77 | { |
78 | QWSServer::mouseHandler() ->calibrate( &goodcd ); | 78 | QWSServer::mouseHandler() ->calibrate( &goodcd ); |
79 | } | 79 | } |
80 | 80 | ||
81 | void Calibrate::hide() | 81 | void Calibrate::hide() |
82 | { | 82 | { |
83 | if ( isVisible() ) | 83 | if ( isVisible ( )) { |
84 | store(); | 84 | store(); |
85 | |||
86 | // hack - calibrate is a launcher dialog, but treated like a standalone app | ||
87 | { | ||
88 | QCopEnvelope e( "QPE/System", "closing(QString)" ); | ||
89 | e << QString ( "calibrate" ); | ||
90 | } | ||
91 | } | ||
85 | QDialog::hide(); | 92 | QDialog::hide(); |
86 | } | 93 | } |
87 | 94 | ||
88 | void Calibrate::reset() | 95 | void Calibrate::reset() |
89 | { | 96 | { |
90 | penPos = QPoint(); | 97 | penPos = QPoint(); |
91 | location = QWSPointerCalibrationData::TopLeft; | 98 | location = QWSPointerCalibrationData::TopLeft; |
92 | crossPos = fromDevice( cd.screenPoints[ location ] ); | 99 | crossPos = fromDevice( cd.screenPoints[ location ] ); |
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 | |||
@@ -16,16 +16,17 @@ | |||
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
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> |
30 | #include <qlayout.h> | 31 | #include <qlayout.h> |
31 | #include <qpalette.h> | 32 | #include <qpalette.h> |
@@ -160,9 +161,19 @@ void ShutdownImpl::timeout ( ) | |||
160 | m_progress-> hide ( ); | 161 | m_progress-> hide ( ); |
161 | m_timer-> stop ( ); | 162 | m_timer-> stop ( ); |
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 | |||
@@ -29,16 +29,18 @@ class QProgressBar; | |||
29 | class ShutdownImpl : public QWidget | 29 | class ShutdownImpl : public QWidget |
30 | { | 30 | { |
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(); |
43 | void timeout(); | 45 | void timeout(); |
44 | 46 | ||