summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -20,13 +20,13 @@
#include <math.h>
#include "calibrate.h"
#include <qpe/resource.h>
-
+#include <qpe/qcopenvelope_qws.h>
#include <qapplication.h>
#if defined(Q_WS_QWS) || defined(_WS_QWS_)
#include <qpainter.h>
#include <qtimer.h>
@@ -77,14 +77,21 @@ void Calibrate::store()
{
QWSServer::mouseHandler() ->calibrate( &goodcd );
}
void Calibrate::hide()
{
- if ( isVisible() )
+ if ( isVisible ( )) {
store();
+
+ // hack - calibrate is a launcher dialog, but treated like a standalone app
+ {
+ QCopEnvelope e( "QPE/System", "closing(QString)" );
+ e << QString ( "calibrate" );
+ }
+ }
QDialog::hide();
}
void Calibrate::reset()
{
penPos = QPoint();
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 @@
**
**********************************************************************/
#include "shutdownimpl.h"
#include <qpe/global.h>
+#include <qpe/qcopenvelope_qws.h>
#include <qtimer.h>
#include <qprogressbar.h>
#include <qpushbutton.h>
#include <qbuttongroup.h>
#include <qlabel.h>
@@ -162,7 +163,17 @@ void ShutdownImpl::timeout ( )
emit shutdown ( m_operation );
}
else
m_progress-> setProgress ( m_counter );
}
+void ShutdownImpl::hide ( )
+{
+ if ( isVisible ( )) {
+ // hack - shutdown is a launcher dialog, but treated like a standalone app
+ QCopEnvelope e( "QPE/System", "closing(QString)" );
+ e << QString ( "shutdown" );
+
+ }
+ QWidget::hide ( );
+}
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
Q_OBJECT
public:
ShutdownImpl( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
enum Type { ShutdownSystem, RebootSystem, RestartDesktop, TerminateDesktop };
+ virtual void hide ( );
+
signals:
void shutdown( ShutdownImpl::Type );
private slots:
void buttonClicked( int );
void cancelClicked();