summaryrefslogtreecommitdiff
authorsandman <sandman>2002-11-17 02:03:01 (UTC)
committer sandman <sandman>2002-11-17 02:03:01 (UTC)
commit5a1f5ba99dfb754f1be4500dd55dca42b36413b8 (patch) (side-by-side diff)
tree18b10582e1a4b1d28f5091494a2939fcad5f9de9
parentd28c78c564f3c6ecad91506c50e2c80e66c1a718 (diff)
downloadopie-5a1f5ba99dfb754f1be4500dd55dca42b36413b8.zip
opie-5a1f5ba99dfb754f1be4500dd55dca42b36413b8.tar.gz
opie-5a1f5ba99dfb754f1be4500dd55dca42b36413b8.tar.bz2
- 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
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/shutdownimpl.cpp5
-rw-r--r--core/launcher/taskbar.cpp8
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
@@ -114,11 +114,6 @@ ShutdownImpl::ShutdownImpl( QWidget* parent, const char *name, WFlags fl )
m_progress-> hide ( );
Global::hideInputMethod ( );
-
-#ifdef QT_QWS_SHARP
-
- shutdown-> hide ( );
-#endif
}
void ShutdownImpl::buttonClicked ( int b )
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
@@ -82,7 +82,7 @@ static Global::Command builtins[] = {
#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)
@@ -168,12 +168,8 @@ TaskBar::TaskBar() : QHBox(0, 0, WStyle_Customize | WStyle_Tool | WStyle_StaysOn
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)