summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/apps/calibrate/calibrate.cpp11
-rw-r--r--core/launcher/shutdownimpl.cpp11
-rw-r--r--core/launcher/shutdownimpl.h2
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
@@ -23,7 +23,7 @@
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_)
@@ -80,8 +80,15 @@ void Calibrate::store()
80 80
81void Calibrate::hide() 81void 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
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
@@ -21,6 +21,7 @@
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>
@@ -165,4 +166,14 @@ void ShutdownImpl::timeout ( )
165 m_progress-> setProgress ( m_counter ); 166 m_progress-> setProgress ( m_counter );
166} 167}
167 168
169void 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
@@ -34,6 +34,8 @@ public:
34 34
35 enum Type { ShutdownSystem, RebootSystem, RestartDesktop, TerminateDesktop }; 35 enum Type { ShutdownSystem, RebootSystem, RestartDesktop, TerminateDesktop };
36 36
37 virtual void hide ( );
38
37signals: 39signals:
38 void shutdown( ShutdownImpl::Type ); 40 void shutdown( ShutdownImpl::Type );
39 41