- enabled the Shutdown button in Shutdown-Settings on OZ

- enabled the LockKeyState indicator for iPAQs (to the right of the clock
  applet, since also iPAQs can have keyboards)
- kergoth forgot a QT_QWS_EBX -> QT_QWS_SHARP

- the launcher binary is now exactly the same on iPAQ and Zaurus

2 files changed, 2 insertions, 11 deletions

diff --git a/core/launcher/shutdownimpl.cpp b/core/launcher/shutdownimpl.cpp
index a202b7b..cf4f926 100644
--- a/core/launcher/shutdownimpl.cpp
+++ b/core/launcher/shutdownimpl.cpp
@@ -111,17 +111,12 @@ ShutdownImpl::ShutdownImpl( QWidget* parent, const char *name, WFlags fl )
 
         connect ( btngrp, SIGNAL( clicked ( int ) ), this, SLOT( buttonClicked ( int ) ) );
         connect ( cancel, SIGNAL( clicked ( ) ), this, SLOT( cancelClicked ( ) ) );
 
         m_progress-> hide ( );
         Global::hideInputMethod ( );
-
-#ifdef QT_QWS_SHARP
-
-        shutdown-> hide ( );
-#endif
 }
 
 void ShutdownImpl::buttonClicked ( int b )
 {
         m_counter = 0;
 
diff --git a/core/launcher/taskbar.cpp b/core/launcher/taskbar.cpp
index 1e6b74e..b4b7df6 100644
--- a/core/launcher/taskbar.cpp
+++ b/core/launcher/taskbar.cpp
@@ -79,13 +79,13 @@ static Global::Command builtins[] = {
 #ifdef SINGLE_APP
 #define APP(a,b,c,d) { a, new##b, c },
 #include "../launcher/apps.h"
 #undef APP
 #endif
 
-#if defined(QT_QWS_IPAQ) || defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_EBX)
+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_SHARP)
         { "calibrate",          TaskBar::calibrate, 1, 0 },
 #endif
 #if !defined(QT_QWS_CASSIOPEIA)
   { "shutdown",           Global::shutdown,   1, 0 },
 //  { "run",                run,      1, 0 },
 #endif
@@ -165,18 +165,14 @@ TaskBar::TaskBar() : QHBox(0, 0, WStyle_Customize | WStyle_Tool | WStyle_StaysOn
 
     waitIcon = new Wait( this );
     (void) new AppIcons( this );
 
     sysTray = new SysTray( this );
 
-    // ## make customizable in some way?
-#ifdef QT_QWS_SHARP
+    // ## make customizable in some way? 
     lockState = new LockKeyState( this );
-#else
-    lockState = 0;
-#endif
 
 #if defined(Q_WS_QWS)
 #if !defined(QT_NO_COP)
     QCopChannel *channel = new QCopChannel( "QPE/TaskBar", this );
     connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
   this, SLOT(receive(const QCString&, const QByteArray&)) );