remove duplicated boiler plate code in favour of the OTaskbarApplet template

author: mickeyl <mickeyl> 2004-03-01 19:19:37 (UTC)
committer: mickeyl <mickeyl> 2004-03-01 19:19:37 (UTC)
commit: ddc3d749af5f7afebf69488b79641771fe246b5b (patch) (unidiff)
tree: 8ea8614906c568e4677493ef09040724d60dd2d4
parent: fb0981f47e529f9d1dd77fa005ffa3c3ecedff67 (diff)
download: opie-ddc3d749af5f7afebf69488b79641771fe246b5b.zip
opie-ddc3d749af5f7afebf69488b79641771fe246b5b.tar.gz
opie-ddc3d749af5f7afebf69488b79641771fe246b5b.tar.bz2
31 files changed, 107 insertions, 688 deletions
diff --git a/core/applets/clipboardapplet/clipboard.cpp b/core/applets/clipboardapplet/clipboard.cpp
index bb0db9b..34d151e 100644
--- a/core/applets/clipboardapplet/clipboard.cpp
+++ b/core/applets/clipboardapplet/clipboard.cpp
@@ -1,178 +1,189 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "clipboard.h"
+#include <opie2/otaskbarapplet.h>
 #include <qpe/resource.h>
 #include <qpe/applnk.h>
 #include <qpainter.h>
 #include <qpopupmenu.h>
 #include <qwindowsystem_qws.h>
 #include <qapplication.h>
 #include <qclipboard.h>
 #include <qtimer.h>
 //===========================================================================
 ClipboardApplet::ClipboardApplet( QWidget *parent, const char *name ) : QWidget( parent, name )
 {
        setFixedWidth ( AppLnk::smallIconSize()  );
        setFixedHeight ( AppLnk::smallIconSize()  );
        QImage img = Resource::loadImage( "paste");
        img = img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
        m_clipboardPixmap.convertFromImage( img );
        m_timer = new QTimer ( this );
        connect ( QApplication::clipboard ( ), SIGNAL( dataChanged ( )), this, SLOT( newData ( )));
        connect ( m_timer, SIGNAL( timeout ( )), this, SLOT( newData ( )));
        connect ( qApp, SIGNAL( aboutToQuit ( )), this, SLOT( shutdown ( )));
        m_menu = 0;
        m_dirty = true;
        m_lasttext = QString::null;
        m_timer-> start ( 0, true );
 }
 ClipboardApplet::~ClipboardApplet ( )
 {
 }
+int ClipboardApplet::position()
+{
+    return 6;
+}
 void ClipboardApplet::shutdown ( )
 {
        // the timer has to be stopped, or Qt/E will hang on quit()
        // see launcher/desktop.cpp
        m_timer-> stop ( );
 }
 void ClipboardApplet::mousePressEvent ( QMouseEvent *)
 {
        if ( m_dirty ) {
                delete m_menu;
                m_menu = new QPopupMenu ( this );
                m_menu-> setCheckable ( true );
                if ( m_history. count ( )) {
                        for ( unsigned int i = 0; i < m_history. count ( ); i++ ) {
                                QString str = m_history [i];
                                if ( str. length ( ) > 20 )
                                        str = str. left ( 20 ) + "...";
                                m_menu-> insertItem ( QString ( "%1: %2" ). arg ( i + 1 ). arg ( str ), i );
                                m_menu-> setItemChecked ( i, false );
                        }
                        m_menu-> setItemChecked ( m_history. count ( ) - 1, true );
                        m_menu-> insertSeparator ( );
                }
                m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "cut" )), tr( "Cut" ), 100 );
                m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "copy" )), tr( "Copy" ), 101 );
                m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "paste" )), tr( "Paste" ), 102 );
                connect ( m_menu, SIGNAL( activated ( int )), this, SLOT( action ( int )));
                m_dirty = false;
        }
        QPoint p = mapToGlobal ( QPoint ( 0, 0 ));
        QSize s = m_menu-> sizeHint ( );
        m_menu-> popup ( QPoint ( p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), p. y ( ) - s. height ( )));
 }
 void ClipboardApplet::action(int id)
 {
        ushort unicode = 0;
        int scan = 0;
        switch ( id ) {
                case 100:
                        unicode = 'X' - '@';
                        scan    = Key_X; // Cut
                        break;
                case 101:
                        unicode = 'C' - '@';
                        scan    = Key_C; // Copy
                        break;
                case 102:
                        unicode = 'V' - '@';
                        scan    = Key_V; // Paste
                        break;
                default:
                        if (( id >= 0 ) && ( uint( id ) < m_history. count ( ))) {
                                QApplication::clipboard ( )-> setText ( m_history [id] );
                                for ( uint i = 0; i < m_history. count ( ); i++ )
                                        m_menu-> setItemChecked ( i, i == uint( id ));
                                unicode = 'V' - '@';
                                scan    = Key_V;
                        }
                        break;
        }
        if ( scan ) {
                qwsServer-> sendKeyEvent ( unicode, scan, ControlButton, true, false );
                qwsServer-> sendKeyEvent ( unicode, scan, ControlButton, false, false );
        }
 }
 void ClipboardApplet::paintEvent ( QPaintEvent* )
 {
        QPainter p ( this );
        /* center the height but our pixmap is as big as the height ;)*/
              p. drawPixmap( 0, 0,
                       m_clipboardPixmap );
 }
 void ClipboardApplet::newData ( )
 {
        static bool excllock = false;
        if ( excllock )
                return;
        else
                excllock = true;
        m_timer-> stop ( );
        QCString type = "plain";
        QString txt = QApplication::clipboard ( )-> text ( type );
        if ( !txt. isEmpty ( ) && !m_history. contains ( txt )) {
                m_history. append ( txt );
                if ( m_history. count ( ) > 5 )
                        m_history. remove ( m_history. begin ( ));
                m_dirty = true;
        }
        m_timer-> start ( 1500, true );
        excllock = false;
 }
+Q_EXPORT_INTERFACE()
+{
+    Q_CREATE_INSTANCE( OTaskbarAppletWrapper<ClipboardApplet> );
+}
diff --git a/core/applets/clipboardapplet/clipboard.h b/core/applets/clipboardapplet/clipboard.h
index ec87d39..bbda0ff 100644
--- a/core/applets/clipboardapplet/clipboard.h
+++ b/core/applets/clipboardapplet/clipboard.h
@@ -1,57 +1,58 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef __CLIPBOARD_APPLET_H__
 #define __CLIPBOARD_APPLET_H__
 #include <qwidget.h>
 #include <qpixmap.h>
 #include <qstringlist.h>
 class QTimer;
 class ClipboardApplet : public QWidget
 {
    Q_OBJECT
 public:
    ClipboardApplet ( QWidget *parent = 0, const char *name=0 );
    ~ClipboardApplet ( );
+    static int position();
 protected:
    void mousePressEvent ( QMouseEvent *);
    void paintEvent ( QPaintEvent* );
 private slots:
    void action ( int );
        void newData ( );
        void shutdown ( );
 private:
    QPopupMenu * m_menu;
    QStringList  m_history;
    bool         m_dirty;
    QString      m_lasttext;
    QTimer *     m_timer;
    
    QPixmap      m_clipboardPixmap;
 };
 #endif // __CLIPBOARD_APPLET_H__
diff --git a/core/applets/clipboardapplet/clipboardapplet.pro b/core/applets/clipboardapplet/clipboardapplet.pro
index f6842a2..74cf48c 100644
--- a/core/applets/clipboardapplet/clipboardapplet.pro
+++ b/core/applets/clipboardapplet/clipboardapplet.pro
@@ -1,13 +1,13 @@
        TEMPLATE= lib
        CONFIG  += qt plugin warn_on release
-        HEADERS=   clipboard.h clipboardappletimpl.h
+        HEADERS         =   clipboard.h
-        SOURCES=   clipboard.cpp clipboardappletimpl.cpp
+        SOURCES         =   clipboard.cpp
        TARGET  = clipboardapplet
        DESTDIR         = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include
 LIBS            += -lqpe
        VERSION         = 1.0.0
 include ( $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/clipboardapplet/clipboardappletimpl.cpp b/core/applets/clipboardapplet/clipboardappletimpl.cpp
deleted file mode 100644
index f454529..0000000
--- a/core/applets/clipboardapplet/clipboardappletimpl.cpp
+++ b/dev/null
@@ -1,66 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of Qtopia Environment.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-#include "clipboard.h"
-#include "clipboardappletimpl.h"
-ClipboardAppletImpl::ClipboardAppletImpl()
-    : clipboard(0)
-{
-}
-ClipboardAppletImpl::~ClipboardAppletImpl()
-{
-    delete clipboard;
-}
-QWidget *ClipboardAppletImpl::applet( QWidget *parent )
-{
-    if ( !clipboard )
-        clipboard = new ClipboardApplet( parent );
-    return clipboard;
-}
-int ClipboardAppletImpl::position() const
-{
-    return 6;
-}
-QRESULT ClipboardAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
-{
-    *iface = 0;
-    if ( uuid == IID_QUnknown )
-        *iface = this;
-    else if ( uuid == IID_TaskbarApplet )
-        *iface = this;
-    else
-        return QS_FALSE;
-    if ( *iface )
-        (*iface)->addRef();
-    return QS_OK;
-}
-Q_EXPORT_INTERFACE()
-{
-    Q_CREATE_INSTANCE( ClipboardAppletImpl )
-}
diff --git a/core/applets/clipboardapplet/clipboardappletimpl.h b/core/applets/clipboardapplet/clipboardappletimpl.h
deleted file mode 100644
index 497360c..0000000
--- a/core/applets/clipboardapplet/clipboardappletimpl.h
+++ b/dev/null
@@ -1,43 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of Qtopia Environment.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-#ifndef CLIPBOARDAPPLETIMPL_H
-#define CLIPBOARDAPPLETIMPL_H
-#include <qpe/taskbarappletinterface.h>
-class ClipboardApplet;
-class ClipboardAppletImpl : public TaskbarAppletInterface
-{
-public:
-    ClipboardAppletImpl();
-    virtual ~ClipboardAppletImpl();
-    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
-    Q_REFCOUNT
-    virtual QWidget *applet( QWidget *parent );
-    virtual int position() const;
-private:
-    ClipboardApplet *clipboard;
-};
-#endif
diff --git a/core/applets/clockapplet/clock.cpp b/core/applets/clockapplet/clock.cpp
index aadd9b6..9fead03 100644
--- a/core/applets/clockapplet/clock.cpp
+++ b/core/applets/clockapplet/clock.cpp
@@ -1,109 +1,121 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "clock.h"
+#include <opie2/otaskbarapplet.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/config.h>
 LauncherClock::LauncherClock( QWidget *parent ) : QLabel( parent )
 {
    // If you want a sunken border around the clock do this:
    // setFrameStyle( QFrame::Panel | QFrame::Sunken );
    //setFont( QFont( "Helvetica", , QFont::Normal ) );
    connect( qApp, SIGNAL( timeChanged() ), this, SLOT( updateTime( ) ) );
    connect( qApp, SIGNAL( clockChanged( bool ) ),
       this, SLOT( slotClockChanged( bool ) ) );
    readConfig();
    timerId = 0;
    timerEvent( 0 );
    show();
 }
+int LauncherClock::position()
+{
+    return 10;
+}
 void LauncherClock::readConfig() {
    Config config( "qpe" );
    config.setGroup( "Time" );
    ampmFormat = config.readBoolEntry( "AMPM", TRUE );
    config.setGroup( "Date" );
    format = config.readNumEntry("ClockApplet",0);
 }
 void LauncherClock::mouseReleaseEvent( QMouseEvent * )
 {
        QCString setTimeApp;
        setTimeApp="systemtime";
        QCopEnvelope e("QPE/Application/"+setTimeApp, "raise()");
 }
 void LauncherClock::timerEvent( QTimerEvent *e )
 {
    if ( !e || e->timerId() == timerId ) {
  killTimer( timerId );
  changeTime();
  QTime t = QTime::currentTime();
  int ms = (60 - t.second())*1000 - t.msec();
  timerId = startTimer( ms );
    } else {
  QLabel::timerEvent( e );
    }
 }
 void LauncherClock::updateTime( void )
 {
    changeTime();
 }
 void LauncherClock::changeTime( void )
 {
    QTime tm = QDateTime::currentDateTime().time();
    QString s;
    if( ampmFormat ) {
  int hour = tm.hour();
  if (hour == 0)
      hour = 12;
  if (hour > 12)
      hour -= 12;
  s.sprintf( "%2d:%02d %s", hour, tm.minute(),
       (tm.hour() >= 12) ? "PM" : "AM" );
    } else
  s.sprintf( "%2d:%02d", tm.hour(), tm.minute() );
    if (format==1) {
  QDate dm = QDate::currentDate();
  QString d;
  d.sprintf("%d/%d ", dm.day(), dm.month());
  setText( d+s );
    } else if (format==2) {
  QDate dm = QDate::currentDate();
  QString d;
  d.sprintf("%d/%d ", dm.month(), dm.day());
  setText( d+s );
    } else {
  setText( s );
    }
 }
 void LauncherClock::slotClockChanged( bool pm )
 {
    readConfig();
    updateTime();
 }
+Q_EXPORT_INTERFACE()
+{
+    Q_CREATE_INSTANCE( OTaskbarAppletWrapper<LauncherClock> );
+}
diff --git a/core/applets/clockapplet/clock.h b/core/applets/clockapplet/clock.h
index caa0c5f..996fb56 100644
--- a/core/applets/clockapplet/clock.h
+++ b/core/applets/clockapplet/clock.h
@@ -1,48 +1,49 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef __LAUNCHER_CLOCK_H__
 #define __LAUNCHER_CLOCK_H__
 #include <qlabel.h>
 #include <qdatetime.h>
 class LauncherClock : public QLabel
 {
    Q_OBJECT
 public:
    LauncherClock( QWidget *parent );
+    static int position();
 protected slots:
    void updateTime( void );
    void slotClockChanged( bool pm );
 protected:
    void mouseReleaseEvent( QMouseEvent * );
    void timerEvent( QTimerEvent * );
    void changeTime( void );
    void readConfig();
    bool ampmFormat;
    int timerId;
    int format;
 };
 #endif // __LAUNCHER_CLOCK_H__
diff --git a/core/applets/clockapplet/clockapplet.pro b/core/applets/clockapplet/clockapplet.pro
index 057e332..8ce3f6f 100644
--- a/core/applets/clockapplet/clockapplet.pro
+++ b/core/applets/clockapplet/clockapplet.pro
@@ -1,13 +1,13 @@
        TEMPLATE= lib
        CONFIG  += qt plugin warn_on release
-        HEADERS=   clock.h clockappletimpl.h
+        HEADERS         = clock.h
-        SOURCES=   clock.cpp clockappletimpl.cpp
+        SOURCES         = clock.cpp
        TARGET  = clockapplet
        DESTDIR         = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include ..
 LIBS            += -lqpe
        VERSION         = 1.0.0
 include ( $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/clockapplet/clockappletimpl.cpp b/core/applets/clockapplet/clockappletimpl.cpp
deleted file mode 100644
index 7481f19..0000000
--- a/core/applets/clockapplet/clockappletimpl.cpp
+++ b/dev/null
@@ -1,67 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of Qtopia Environment.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-#include "clock.h"
-#include "clockappletimpl.h"
-ClockAppletImpl::ClockAppletImpl()
-    : clock(0)
-{
-}
-ClockAppletImpl::~ClockAppletImpl()
-{
-    delete clock;
-}
-QWidget *ClockAppletImpl::applet( QWidget *parent )
-{
-    if ( !clock )
-        clock = new LauncherClock( parent );
-    return clock;
-}
-int ClockAppletImpl::position() const
-{
-    return 10;
-}
-#ifndef QT_NO_COMPONENT
-QRESULT ClockAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
-{
-    *iface = 0;
-    if ( uuid == IID_QUnknown )
-        *iface = this;
-    else if ( uuid == IID_TaskbarApplet )
-        *iface = this;
-    else
-        return QS_FALSE;
-    if ( *iface )
-        (*iface)->addRef();
-    return QS_OK;
-}
-Q_EXPORT_INTERFACE()
-{
-    Q_CREATE_INSTANCE( ClockAppletImpl )
-}
-#endif
diff --git a/core/applets/clockapplet/clockappletimpl.h b/core/applets/clockapplet/clockappletimpl.h
deleted file mode 100644
index 1f9c8f0..0000000
--- a/core/applets/clockapplet/clockappletimpl.h
+++ b/dev/null
@@ -1,45 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of Qtopia Environment.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-#ifndef CLOCKAPPLETIMPL_H
-#define CLOCKAPPLETIMPL_H
-#include <qpe/taskbarappletinterface.h>
-class LauncherClock;
-class ClockAppletImpl : public TaskbarAppletInterface
-{
-public:
-    ClockAppletImpl();
-    virtual ~ClockAppletImpl();
-#ifndef QT_NO_COMPONENT
-    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
-    Q_REFCOUNT
-#endif
-    virtual QWidget *applet( QWidget *parent );
-    virtual int position() const;
-private:
-    LauncherClock *clock;
-};
-#endif
diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp
index a47f33d..afc0592 100644
--- a/core/applets/irdaapplet/irda.cpp
+++ b/core/applets/irdaapplet/irda.cpp
@@ -1,352 +1,365 @@
 /**********************************************************************
 ** Copyright (C) 2002 David Woodhouse <dwmw2@infradead.org>
 **                    Max Reiss <harlekin@handhelds.org> [trivial stuff]
 **                    Robert Griebl <sandman@handhelds.org>
 **                    Holger Freyther <zecke@handhelds.org> QCOP Interface
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
+#include "irda.h"
+/* OPIE */
+#include <opie2/otaskbarapplet.h>
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
+/* QT */
 #include <qpainter.h>
 #include <qfile.h>
 #include <qtimer.h>
 #include <qtextstream.h>
+/* STD */
 #include <unistd.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
-#include "irda.h"
 //===========================================================================
 IrdaApplet::IrdaApplet ( QWidget *parent, const char *name )
                : QWidget ( parent, name )
 {
        setFixedHeight ( 18 );
        setFixedWidth ( 14 );
        m_sockfd = ::socket ( PF_INET, SOCK_DGRAM, IPPROTO_IP );
        m_irdaOnPixmap          = Resource::loadPixmap( "irdaapplet/irdaon" );
        m_irdaOffPixmap         = Resource::loadPixmap( "irdaapplet/irdaoff" );
        m_irdaDiscoveryOnPixmap = Resource::loadPixmap( "irdaapplet/magglass" );
        m_receiveActivePixmap   = Resource::loadPixmap( "irdaapplet/receive" );
        m_irda_active = false;
        m_irda_discovery_active = false;
        m_receive_active = false;
        m_receive_state_changed = false;
        m_popup = 0;
                m_wasOn = false;
                m_wasDiscover = false;
        QCopChannel* chan = new QCopChannel("QPE/IrDaApplet", this );
        connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ),
                this, SLOT(slotMessage(const QCString&, const QByteArray& ) ) );
 }
+int IrdaApplet::position()
+{
+        return 6;
+}
 void IrdaApplet::show()
 {
        QWidget::show ( );
        startTimer ( 2000 );
 }
 IrdaApplet::~IrdaApplet()
 {
        if ( m_sockfd >= 0 )
                ::close ( m_sockfd );
 }
 void IrdaApplet::popup ( QString message, QString icon )
 {
        if ( !m_popup )
                m_popup = new QPopupMenu ( this );
        m_popup-> clear ( );
        if ( icon. isEmpty ( ))
                m_popup-> insertItem ( message, 0 );
        else
                m_popup-> insertItem ( QIconSet ( Resource::loadPixmap ( icon )), message, 0 );
        QPoint p = mapToGlobal ( QPoint ( 0, 0 ));
        QSize s = m_popup-> sizeHint ( );
        m_popup-> popup ( QPoint ( p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ),
                                   p. y ( ) - s. height ( )));
        QTimer::singleShot ( 2000, this, SLOT( popupTimeout ( )));
 }
 void IrdaApplet::popupTimeout ( )
 {
        m_popup-> hide ( );
 }
 bool IrdaApplet::checkIrdaStatus ( )
 {
        struct ifreq ifr;
        strcpy ( ifr. ifr_name, "irda0" );
        if ( ::ioctl ( m_sockfd, SIOCGIFFLAGS, &ifr ) < 0 )
                return false;
        return ( ifr. ifr_flags & IFF_UP );
 }
 bool IrdaApplet::setIrdaStatus ( bool b )
 {
        struct ifreq ifr;
        strcpy ( ifr. ifr_name, "irda0" );
        if ( ::ioctl ( m_sockfd, SIOCGIFFLAGS, &ifr ) < 0 )
                return false;
        if ( b ) {
                ifr. ifr_flags |= IFF_UP;
        }
        else {
                setIrdaDiscoveryStatus ( 0 );
                setIrdaReceiveStatus ( 0 );
                ifr. ifr_flags &= ~IFF_UP;
        }
        if ( ::ioctl ( m_sockfd, SIOCSIFFLAGS, &ifr ) < 0 )
                return false;
        return true;
 }
 bool IrdaApplet::checkIrdaDiscoveryStatus ( )
 {
        QFile discovery ( "/proc/sys/net/irda/discovery" );
        QString streamIn = "0";
        if ( discovery. open ( IO_ReadOnly )) {
                QTextStream stream ( &discovery );
                streamIn = stream. read ( );
        }
        return streamIn. toInt ( ) > 0;
 }
 bool IrdaApplet::setIrdaDiscoveryStatus ( bool d )
 {
        QFile discovery ( "/proc/sys/net/irda/discovery" );
        if ( discovery. open ( IO_WriteOnly | IO_Raw )) {
                discovery.putch ( d ? '1' : '0' );
                return true;
        }
        return false;
 }
 bool IrdaApplet::setIrdaReceiveStatus ( bool d )
 {
        QCopEnvelope e ( "QPE/Obex", "receive(int)" );
        e << ( d ? 1 : 0 );
        m_receive_active = d;
        m_receive_state_changed = true;
        return true;
 }
 void IrdaApplet::showDiscovered ( )
 {
        //static Sound snd_found ( "irdaapplet/irdaon" );
        //static Sound snd_lost ( "irdaapplet/irdaoff" );
        QFile discovery ( "/proc/net/irda/discovery" );
        if ( discovery. open ( IO_ReadOnly )) {
                bool qcopsend = false;
                QString discoveredDevice;
                QString deviceAddr;
                // since it is /proc we _must_ use QTextStream
                QStringList list =  QStringList::split ( "\n", QTextStream ( &discovery ). read ( ));
                QMap <QString, QString>::Iterator it;
                for ( it = m_devices. begin ( ); it != m_devices. end ( ); ++it )
                        it. data ( ). prepend ( "+++" );
                for ( QStringList::Iterator lit = list. begin ( ); lit != list. end ( ); ++lit ) {
                        const QString &line = *lit;
                        if ( line. startsWith ( "nickname:" )) {
                                discoveredDevice = line. mid ( line. find ( ':' ) + 2, line. find ( ',' ) - line. find ( ':' ) - 2 );
                                deviceAddr       = line. mid ( line. find ( "daddr:" ) + 9, 8 );
                                // qDebug(discoveredDevice + "(" + deviceAddr + ")");
                                if ( !m_devices. contains ( deviceAddr )) {
                                        popup ( tr( "Found:" ) + " " + discoveredDevice );
                                        //snd_found. play ( );
                                        qcopsend = true;
                                }
                                m_devices. replace ( deviceAddr, discoveredDevice );
                        }
                }
                for ( it = m_devices. begin ( ); it != m_devices. end ( ); ) {
                        // qDebug("IrdaMon: delete " + it.currentKey() + "=" + *devicesAvailable[it.currentKey()] + "?");
                        if ( it. data ( ). left ( 3 ) == "+++" ) {
                                popup ( tr( "Lost:" ) + " " + it. data ( ). mid ( 3 ));
                                //snd_lost. play ( );
                                QMap <QString, QString>::Iterator tmp = it;
                                tmp++;
                                m_devices. remove ( it ); // in contrast to QValueListIterator this remove doesn't return the next Iterator
                                it = tmp;
                                qcopsend = true;
                        }
                        else
                                it++;
                }
                // XXX if( qcopsend ) {
                    QCopEnvelope e ( "QPE/Network", "irdaSend(bool)" );
                    e << ( m_devices. count ( ) > 0 );
                // }
        }
 }
 void IrdaApplet::mousePressEvent ( QMouseEvent * )
 {
        QPopupMenu *menu = new QPopupMenu ( this );
        QString cmd;
        /* Refresh active state */
        timerEvent ( 0 );
                //menu->insertItem( tr("More..."), 4 );
        if ( m_irda_active && !m_devices. isEmpty ( )) {
                menu-> insertItem ( tr( "Discovered Device:" ), 9 );
                for ( QMap<QString, QString>::Iterator it = m_devices. begin ( ); it != m_devices. end ( ); ++it )
                        menu-> insertItem ( *it );
                menu-> insertSeparator ( );
        }
        menu-> insertItem ( m_irda_active ? tr( "Disable IrDA" ) : tr( "Enable IrDA" ), 0 );
        if ( m_irda_active ) {
                menu-> insertItem ( m_irda_discovery_active ? tr( "Disable Discovery" ) : tr( "Enable Discovery" ), 1 );
                menu-> insertItem ( m_receive_active ? tr( "Disable Receive" ) : tr( "Enable Receive" ), 2 );
        }
        QPoint p = mapToGlobal ( QPoint ( 0, 0 ) );
        QSize s = menu-> sizeHint ( );
        p = QPoint ( p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), p. y ( ) - s. height ( ));
        switch (  menu-> exec ( p )) {
                case 0:
                        setIrdaStatus ( !m_irda_active );
                        timerEvent ( 0 );
                        break;
                case 1:
                        setIrdaDiscoveryStatus ( !m_irda_discovery_active );
                        timerEvent ( 0 );
                        break;
                case 2:
                        setIrdaReceiveStatus ( !m_receive_active );
                        timerEvent( 0 );
                        break;
        }
        delete menu;
 }
 void IrdaApplet::timerEvent ( QTimerEvent * )
 {
        bool oldactive = m_irda_active;
        bool olddiscovery = m_irda_discovery_active;
        bool receiveUpdate = false;
        if ( m_receive_state_changed ) {
                receiveUpdate = true;
                m_receive_state_changed = false;
        }
        m_irda_active = checkIrdaStatus ( );
        m_irda_discovery_active = checkIrdaDiscoveryStatus ( );
        if ( m_irda_discovery_active )
                showDiscovered ( );
        if (( m_irda_active != oldactive ) || ( m_irda_discovery_active != olddiscovery ) || receiveUpdate )
                update ( );
 }
 void IrdaApplet::paintEvent ( QPaintEvent * )
 {
        QPainter p ( this );
        p. drawPixmap ( 0, 1, m_irda_active ? m_irdaOnPixmap : m_irdaOffPixmap );
        if ( m_irda_discovery_active )
                    p. drawPixmap( 0, 1, m_irdaDiscoveryOnPixmap );
        if ( m_receive_active )
                p. drawPixmap( 0, 1, m_receiveActivePixmap );
 }
 /*
 * We know 3 calls
 * a) enable
 * b) disable
 * a and b will temp enable the IrDa device and disable will disable it again if it wasn't on
 * c) listDevices: We will return a list of known devices
 */
 void IrdaApplet::slotMessage( const QCString& str, const QByteArray& ar ) {
    if ( str == "enableIrda()") {
        m_wasOn = checkIrdaStatus();
        m_wasDiscover = checkIrdaDiscoveryStatus();
        if (!m_wasOn)  {
            setIrdaStatus( true );
        }
        if ( !m_wasDiscover ) {
            setIrdaDiscoveryStatus ( true );
        }
    } else if ( str == "disableIrda()") {
        if (!m_wasOn)  {
            setIrdaStatus( false );
        }
        if ( !m_wasDiscover ) {
            setIrdaDiscoveryStatus ( false );
        }
    } else if ( str == "listDevices()") {
        QCopEnvelope e("QPE/IrDaAppletBack", "devices(QStringList)");
        QStringList list;
        QMap<QString, QString>::Iterator it;
        for (it = m_devices.begin(); it != m_devices.end(); ++it )
            list << (*it);
        e << list;
    }
 }
+Q_EXPORT_INTERFACE()
+{
+    Q_CREATE_INSTANCE( OTaskbarAppletWrapper<IrdaApplet> );
+}
diff --git a/core/applets/irdaapplet/irda.h b/core/applets/irdaapplet/irda.h
index ec1d32c..f713bbe 100644
--- a/core/applets/irdaapplet/irda.h
+++ b/core/applets/irdaapplet/irda.h
@@ -1,76 +1,77 @@
 /**********************************************************************
 ** Copyright (C) 2002 L.J. Potter ljp@llornkcor.com,
 **                    Robert Griebl sandman@handhelds.org
 **  All rights reserved.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 #ifndef __OPIE_IRDA_APPLET_H__
 #define __OPIE_IRDA_APPLET_H__
 #include <qwidget.h>
 #include <qpixmap.h>
 #include <qpopupmenu.h>
 #include <qmap.h>
 class IrdaApplet : public QWidget
 {
        Q_OBJECT
 public:
        IrdaApplet( QWidget *parent = 0, const char *name = 0 );
        ~IrdaApplet();
+        static int position();
        virtual void show ( );
 protected:
        virtual void timerEvent ( QTimerEvent * );
        virtual void mousePressEvent ( QMouseEvent * );
        virtual void paintEvent ( QPaintEvent* );
 private slots:
        void popupTimeout ( );
        void slotMessage( const QCString& , const QByteArray& );
 private:
        void popup( QString message, QString icon = QString::null );
        bool checkIrdaStatus ( );
        bool setIrdaStatus ( bool );
        bool checkIrdaDiscoveryStatus ();
        bool setIrdaDiscoveryStatus ( bool );
        bool setIrdaReceiveStatus ( bool );
        void showDiscovered();
 private:
        QPixmap m_irdaOnPixmap;
        QPixmap m_irdaOffPixmap;
        QPixmap m_irdaDiscoveryOnPixmap;
        QPixmap m_receiveActivePixmap;
        bool m_irda_active;
        bool m_irda_discovery_active;
        bool m_receive_active;
        bool m_receive_state_changed;
        QPopupMenu *m_popup;
        int m_sockfd;
        QMap <QString, QString> m_devices;
                bool m_wasOn; // if IrDa was enabled
        bool m_wasDiscover;
 };
 #endif // __OPIE_IRDA_APPLET_H__
diff --git a/core/applets/irdaapplet/irdaapplet.pro b/core/applets/irdaapplet/irdaapplet.pro
index 4e94dfb..31e8691 100644
--- a/core/applets/irdaapplet/irdaapplet.pro
+++ b/core/applets/irdaapplet/irdaapplet.pro
@@ -1,13 +1,13 @@
-TEMPLATE  = lib
+        TEMPLATE  = lib
-CONFIG    += qt plugin warn_on release
+        CONFIG    += qt plugin warn_on release
-HEADERS =   irda.h irdaappletimpl.h
+        HEADERS = irda.h
-SOURCES =   irda.cpp irdaappletimpl.cpp
+        SOURCES = irda.cpp
-TARGET    = irdaapplet
+        TARGET    = irdaapplet
-DESTDIR   = $(OPIEDIR)/plugins/applets
+        DESTDIR   = $(OPIEDIR)/plugins/applets
-INCLUDEPATH += $(OPIEDIR)/include
+        INCLUDEPATH+= $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include
 LIBS            += -lqpe
 VERSION   = 1.0.0
 include ( $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/irdaapplet/irdaappletimpl.cpp b/core/applets/irdaapplet/irdaappletimpl.cpp
deleted file mode 100644
index 33d98af..0000000
--- a/core/applets/irdaapplet/irdaappletimpl.cpp
+++ b/dev/null
@@ -1,66 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of Qtopia Environment.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-#include "irda.h"
-#include "irdaappletimpl.h"
-IrdaAppletImpl::IrdaAppletImpl()
-    : irda(0)
-{
-}
-IrdaAppletImpl::~IrdaAppletImpl()
-{
-    delete irda;
-}
-QWidget *IrdaAppletImpl::applet( QWidget *parent )
-{
-    if ( !irda )
-  irda = new IrdaApplet( parent );
-    return irda;
-}
-int IrdaAppletImpl::position() const
-{
-    return 6;
-}
-QRESULT IrdaAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
-{
-    *iface = 0;
-    if ( uuid == IID_QUnknown )
-  *iface = this;
-    else if ( uuid == IID_TaskbarApplet )
-  *iface = this;
-    else
-        return QS_FALSE;
-        
-    if ( *iface )
-  (*iface)->addRef();
-    return QS_OK;
-}
-Q_EXPORT_INTERFACE()
-{
-    Q_CREATE_INSTANCE( IrdaAppletImpl )
-}
diff --git a/core/applets/irdaapplet/irdaappletimpl.h b/core/applets/irdaapplet/irdaappletimpl.h
deleted file mode 100644
index 024cc06..0000000
--- a/core/applets/irdaapplet/irdaappletimpl.h
+++ b/dev/null
@@ -1,45 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of Qtopia Environment.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-#ifndef IRDAAPPLETIMPL_H
-#define IRDAAPPLETIMPL_H
-#include <qwidget.h>
-#include <qpe/taskbarappletinterface.h>
-class IrdaApplet;
-class IrdaAppletImpl : public TaskbarAppletInterface
-{
-public:
-    IrdaAppletImpl();
-    virtual ~IrdaAppletImpl();
-    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
-    Q_REFCOUNT
-    virtual QWidget *applet( QWidget *parent );
-    virtual int position() const;
-private:
-    IrdaApplet *irda;
-};
-#endif
diff --git a/core/applets/screenshotapplet/screenshot.cpp b/core/applets/screenshotapplet/screenshot.cpp
index 56a031c..5d6bce4 100644
--- a/core/applets/screenshotapplet/screenshot.cpp
+++ b/core/applets/screenshotapplet/screenshot.cpp
@@ -1,530 +1,543 @@
 /**********************************************************************
 ** Copyright (C) 2002 L.J. Potter ljp@llornkcor.com
 **  All rights reserved.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 #include "screenshot.h"
 #include "inputDialog.h"
-#include <stdlib.h>
+/* OPIE */
-#include <sys/socket.h>
+#include <opie2/otaskbarapplet.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <unistd.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/applnk.h>
+/* QT */
 #include <qlineedit.h>
 #include <qdir.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qpainter.h>
 #include <qspinbox.h>
 #include <qlayout.h>
 #include <qcheckbox.h>
 #include <qmessagebox.h>
+/* STD */
+#include <stdlib.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <unistd.h>
 /* XPM */
 static char * snapshot_xpm[] = {
 "32 32 177 2",
        "  c None",
        ". c #042045",
        "+ c #0D2B47",
        "@ c #0E325E",
        "# c #0D2E50",
        "$ c #0A1C32",
        "% c #0F3A69",
        "& c #164680",
        "* c #165EAE",
        "= c #134D89",
        "- c #0A3A6E",
        "; c #031024",
        "> c #031B36",
        ", c #1A5EA3",
        "' c #1862B1",
        ") c #1866B9",
        "! c #0F5AAC",
        "~ c #0F56A8",
        "{ c #0C4C96",
        "] c #030918",
        "^ c #060206",
        "/ c #20242C",
        "( c #3E3B3B",
        "_ c #186ABD",
        ": c #115EB3",
        "< c #082644",
        "[ c #222C38",
        "} c #5A5859",
        "| c #091921",
        "1 c #1E7EDE",
        "2 c #1A7ADA",
        "3 c #1970CD",
        "4 c #1758A1",
        "5 c #0E529A",
        "6 c #094388",
        "7 c #22364E",
        "8 c #384454",
        "9 c #04162C",
        "0 c #123451",
        "a c #3296B4",
        "b c #298AB1",
        "c c #2484AC",
        "d c #033D86",
        "e c #033677",
        "f c #072C58",
        "g c #525862",
        "h c #5E5E5E",
        "i c #23492A",
        "j c #4FBD3F",
        "k c #50B24C",
        "l c #51C72E",
        "m c #42C64A",
        "n c #2686CA",
        "o c #0B52A4",
        "p c #054A9A",
        "q c #053B7C",
        "r c #2B2325",
        "s c #6E7070",
        "t c #0D240E",
        "u c #1E423E",
        "v c #468ABE",
        "w c #6A8AC2",
        "x c #7EAA8E",
        "y c #84BE4E",
        "z c #65C639",
        "A c #064EA0",
        "B c #0A4DA0",
        "C c #4E5242",
        "D c #62362E",
        "E c #721A1A",
        "F c #6E0A0A",
        "G c #3E0E0E",
        "H c #6AB85E",
        "I c #7E8ECA",
        "J c #929CD4",
        "K c #9EAECA",
        "L c #9EBEAE",
        "M c #8EC26A",
        "N c #32A276",
        "O c #20518C",
        "P c #46566E",
        "Q c #614A51",
        "R c #AE2A26",
        "S c #C41C1A",
        "T c #CE0A0A",
        "U c #A60606",
        "V c #921616",
        "W c #863735",
        "X c #866A66",
        "Y c #9E9EA2",
        "Z c #1E5212",
        "` c #7EC652",
        " .c #B2B2F2",
        "..c #CACAF6",
        "+.c #AECEC6",
        "@.c #92CE72",
        "#.c #42AA86",
        "$.c #365E96",
        "%.c #B82420",
        "&.c #E20E0E",
        "*.c #EF0E0B",
        "=.c #566A86",
        "-.c #92929A",
        ";.c #16260E",
        ">.c #2E571A",
        ",.c #7ED64E",
        "'.c #9ECEB2",
        ").c #C6D5EF",
        "!.c #E2E0FE",
        "~.c #A2DE8A",
        "{.c #4AAA5B",
        "].c #2A6AB2",
        "^.c #9A7A6E",
        "/.c #D25A52",
        "(.c #F62626",
        "_.c #FA0206",
        ":.c #DE1E16",
        "<.c #B63A26",
        "[.c #865A2E",
        "}.c #26568E",
        "|.c #435F7D",
        "1.c #7AE246",
        "2.c #96EA6E",
        "3.c #BEEAAE",
        "4.c #D0EADC",
        "5.c #B6CEFE",
        "6.c #9ADE8A",
        "7.c #2A609A",
        "8.c #7E623E",
        "9.c #CA7A72",
        "0.c #F26E6E",
        "a.c #FE5252",
        "b.c #FA3638",
        "c.c #DA2E28",
        "d.c #9E3E3A",
        "e.c #3E7656",
        "f.c #76CB3A",
        "g.c #90DE44",
        "h.c #A2EE6A",
        "i.c #9EEA9A",
        "j.c #92BEDE",
        "k.c #7ADA7E",
        "l.c #5ECE52",
        "m.c #6A5E52",
        "n.c #A83238",
        "o.c #FA5656",
        "p.c #F29A92",
        "q.c #D29E92",
        "r.c #8A7A62",
        "s.c #05336B",
        "t.c #59C631",
        "u.c #8AD23A",
        "v.c #66E242",
        "w.c #1D6FC1",
        "x.c #E61212",
        "y.c #CA261E",
        "z.c #5A763E",
        "A.c #1E6E9A",
        "B.c #023272",
        "C.c #329696",
        "D.c #2074B6",
        "E.c #3E4E76",
        "F.c #5A525E",
        "G.c #425868",
        "H.c #04448E",
        "I.c #28828A",
        "J.c #2D8593",
        "K.c #12427A",
        "L.c #054696",
        "M.c #042B5E",
        "N.c #134F95",
        "O.c #1E6ABB",
        "P.c #1A5E96",
        "Q.c #022E67",
        "R.c #0C3E7C",
        "S.c #023E8A",
        "T.c #021A3E",
 "                                                                ",
 "                                                                ",
 "                                                                ",
 "            . + @ # +                                           ",
 "      $ # % & * * = - # $                                       ",
 "; > % @ = , ' ) ' ! ~ { % @ . ] ^ / (                           ",
 "; + ' * ) _ ) ) ' : : ! { { % < . [ ( }                         ",
 "| @ 1 2 3 _ _ ) ' : : : : 4 5 6 6 # 7 8 }                       ",
 "9 0 a b b b c _ ) : : ! ! ~ ~ 5 ~ d e f [ 8 g h h }             ",
 "| i j k j l m n 3 ) : ! ! ! ~ o o o p 6 q f / r r r s           ",
 "t u v w x y y z a 1 3 ' : ! ~ A A B A p = C D E F G ( s         ",
 "| u H I J K L M H k N 3 3 : ~ o o 5 O P Q R S T T U V W X Y     ",
 "| Z ` J  .....+.@.z #.3 _ 3 3 ) $.P W %.S &.*.*.&.S W Q P =.-.  ",
 ";.>.,.'.).!.!.).~.,.{.) : ) 3 ].h ^./.(._._._.:.<.[.g }.= & |.  ",
 ";.>.1.2.3.4.4.5.6.,.{._ : : : 7.8.9.0.a.b.b.c.d.} e.4 = 6 q #   ",
 ";.>.z f.g.h.i.j.k.l.N ) : ! ! 4 m.n.c.o.p.q.r.|.5 { d e e s..   ",
 "t Z l t.f.u.g.1.v.#.w.' : ! ~ ~ 7.|.n.x.y.z.A.A q - e e e B.>   ",
 "| 0 c k t.t.l l C.D.) * * ! 5 { B o E.F.F.G.= H.e e e e q B..   ",
 "; + D.I.J.I.I.I.w.) : : * o K.7 - L.= O = }.6 6 e q q e q s.>   ",
 "9 + ) ) ) ) ' ' , * : ! ! ! K.< . M.q 6 B N.{ d q e e e e s.9   ",
 "9 # O.) ) ' , , P.* ! ! ! ! = % . . M.e d p L.d B.B.e B.B.Q.9   ",
 "; < ' ' ' ' , , 4 4 ~ ! ! ~ ! 5 e q e e q A H.d q q e e B.Q.9   ",
 "; $ R.K.5 4 4 ' ! ! 4 ~ ! ~ ~ ~ o { B o A A L.S.B.B.B.B.B.Q.>   ",
 "    ] $ 0 R.= ' ' 4 4 5 4 5 5 o B o B p A A L.d e e B.B.B.Q.9   ",
 "          # + - { 4 4 ~ ! o { o L.p p p p p H.S.B.B.s.Q.Q.M.T.  ",
 "                + s.6 B o o 5 B p L.p p L.p H.q B.Q.Q.Q.Q.M.;   ",
 "                  < # s.- B o B p p L.L.H.L.H.d B.Q.Q.Q.Q.Q.9   ",
 "                      $ . s.d 6 B A p H.S.L.H.q B.Q.Q.M.M.. ;   ",
 "                          ; 9 . 6 L.p L.d L.H.d Q.M.M.. 9 ; ]   ",
 "                                | > e L.d L.H.e M.. ; ] ]       ",
 "                                    > 9 . S.Q.. ; ]             ",
 "                                          T.; ]                 "};
 static const char *SCAP_hostname = "www.handhelds.org";
 static const int SCAP_port = 80;
 ScreenshotControl::ScreenshotControl( QWidget *parent, const char *name )
    : QFrame( parent, name, WDestructiveClose | WStyle_StaysOnTop | WType_Popup )
 {
  setFrameStyle( QFrame::PopupPanel | QFrame::Raised );
  QVBoxLayout *vbox = new QVBoxLayout ( this, 5, 3 );
  QHBoxLayout *hbox;
  hbox = new QHBoxLayout ( vbox );
  QLabel *l = new QLabel ( tr( "Delay" ), this );
  hbox-> addWidget ( l );
  delaySpin = new QSpinBox( 0, 60, 1, this, "Spinner" );
  delaySpin-> setButtonSymbols ( QSpinBox::PlusMinus );
  delaySpin-> setSuffix ( tr( "sec" ));
  delaySpin-> setFocusPolicy( QWidget::NoFocus );
  delaySpin-> setValue ( 1 );
  hbox-> addWidget ( delaySpin );
  saveNamedCheck = new QCheckBox ( tr( "Save named" ), this);
  saveNamedCheck-> setFocusPolicy ( QWidget::NoFocus );
  vbox->addWidget( saveNamedCheck);
  vbox-> addSpacing ( 3 );
  l = new QLabel ( tr( "Save screenshot as..." ), this );
  vbox-> addWidget ( l, AlignCenter );
  hbox = new QHBoxLayout ( vbox );
  grabItButton = new QPushButton( tr( "File" ), this, "GrabButton" );
  grabItButton ->setFocusPolicy( QWidget::TabFocus );
  hbox-> addWidget ( grabItButton );
  scapButton = new QPushButton( tr( "Scap" ), this, "ScapButton" );
  scapButton ->setFocusPolicy( QWidget::TabFocus );
  hbox-> addWidget ( scapButton );
  setFixedSize ( sizeHint ( ));
  setFocusPolicy ( QWidget::NoFocus );
  grabTimer = new QTimer ( this, "grab timer");
  
  connect ( grabTimer, SIGNAL( timeout ( )), this, SLOT( performGrab ( )));
  connect ( grabItButton, SIGNAL( clicked ( )), SLOT( slotGrab ( )));
  connect ( scapButton, SIGNAL( clicked ( )), SLOT( slotScap ( )));
 }
 void ScreenshotControl::slotGrab()
 {
  buttonPushed = 1;
  hide();
  setFileName = FALSE;
  if ( saveNamedCheck->isChecked()) {
    setFileName = TRUE;
    InputDialog *fileDlg;
    fileDlg = new InputDialog( 0 , tr("Name of screenshot "), TRUE, 0);
    fileDlg->exec();
    fileDlg->raise();
    QString fileName, list;
    if ( fileDlg->result() == 1 ) {
      fileName = fileDlg->LineEdit1->text();
      if (fileName.find("/", 0, TRUE) == -1)
        FileNamePath = QDir::homeDirPath() + "/Documents/image/png/" + fileName;
      else
        FileNamePath = fileName;
    }
    delete fileDlg;
  }
  if ( delaySpin->value() )
    grabTimer->start( delaySpin->value() * 1000, true );
  else
    show();
 }
 void ScreenshotControl::slotScap()
 {
  buttonPushed = 2;
  hide();
  if ( delaySpin->value() )
    grabTimer->start( delaySpin->value() * 1000, true );
  else
    show();
 }
 void ScreenshotControl::savePixmap()
 {
  DocLnk lnk;
  QString fileName;
  if ( setFileName) {
    fileName = FileNamePath;
    //not sure why this is needed here, but it forgets fileName
    // if this is below the braces
    if (fileName.right(3) != "png")
      fileName = fileName + ".png";
    lnk.setFile(fileName); //sets File property
    qDebug("saving file " + fileName);
    snapshot.save( fileName, "PNG");
    QFileInfo fi( fileName);
    lnk.setName( fi.fileName()); //sets file name
    if (!lnk.writeLink())
      qDebug("Writing doclink did not work");
  }
  else {
    fileName = "sc_" + QDateTime::currentDateTime().toString();
    fileName.replace(QRegExp("'"), "");
    fileName.replace(QRegExp(" "), "_");
    fileName.replace(QRegExp(":"), ".");
    fileName.replace(QRegExp(","), "");
    QString dirName = QDir::homeDirPath() + "/Documents/image/png/";
    if ( !QDir( dirName).exists() ) {
      qDebug("making dir " + dirName);
      QString msg = "mkdir -p " + dirName;
      system(msg.latin1());
    }
    fileName = dirName + fileName;
    if (fileName.right(3) != "png")
      fileName = fileName + ".png";
    lnk.setFile(fileName); //sets File property
    qDebug("saving file " + fileName);
    snapshot.save( fileName, "PNG");
    QFileInfo fi( fileName);
    lnk.setName( fi.fileName()); //sets file name
    if (!lnk.writeLink())
      qDebug("Writing doclink did not work");
  }
  QPEApplication::beep();
 }
 void ScreenshotControl::performGrab()
 {
                snapshot = QPixmap::grabWindow( QPEApplication::desktop()->winId(), 0, 0, QApplication::desktop()->width(),  QApplication::desktop()->height() );
                if (buttonPushed == 1) {
                                qDebug("grabbing screen");
                                grabTimer->stop();
                                show();
                                qApp->processEvents();
                                savePixmap();
                } else {
                                grabTimer->stop();
                                struct sockaddr_in raddr;
                                struct hostent *rhost_info;
                                int sock = -1;
                                bool ok = false;
                                QString displayEnv = getenv("QWS_DISPLAY");
                                qDebug(displayEnv);
                                if(( displayEnv.left(2) != ":0" ) && (!displayEnv.isEmpty())) {
                                                if (( rhost_info = (struct hostent *) ::gethostbyname ((char *) SCAP_hostname )) != 0 ) {
                                                ::memset ( &raddr, 0, sizeof (struct sockaddr_in));
                                                ::memcpy ( &raddr. sin_addr, rhost_info-> h_addr, rhost_info-> h_length );
                                                raddr. sin_family = rhost_info-> h_addrtype;
                                                raddr. sin_port = htons ( SCAP_port );
                                                if (( sock = ::socket ( AF_INET, SOCK_STREAM, 0 )) >= 0 ) {
                                                                if ( ::connect ( sock, (struct sockaddr *) & raddr, sizeof (struct sockaddr)) >= 0 ) {
                                                                                QString header;
                                                                                QPixmap pix;
                                                                                QString SCAP_model="";
 #warning FIXME: model string should be filled with actual device model
                                                                                                if( snapshot.width() > 320)
                                                                                                                SCAP_model ="Corgi";
                                                                                
                                                                                if(displayEnv == "QVFb:0")  {//set this if you plan on using this app in qvfb!!
                                                                                                pix = snapshot.xForm(QWMatrix().rotate(90));
                                                                                } else
                                                                                                pix = ( snapshot.width() > snapshot.height() ) ? snapshot : snapshot.xForm( QWMatrix().rotate(90) ); 
                                                                        
                                                                                QImage img = pix.convertToImage().convertDepth( 16 ); // could make that also depth independent, if hh.org/scap can handle it
                                                                                header = "POST /scap/capture.cgi?%1+%2 HTTP/1.1\n"  // 1: model / 2: user
                                                                                                "Content-length: %3\n"                     // 3: content length
                                                                                                "Content-Type: image/png\n"
                                                                                                "Host: %4\n"                               // 4: scap host
                                                                                                "\n";
                 
                                                                                header = header.arg( SCAP_model).arg( ::getenv( "USER" ) ).arg( img.numBytes() ).arg( SCAP_hostname );
                                                                                qDebug(header);
                                        
                                                                                if ( !pix.isNull() )  {
                                                                                                const char *ascii = header.latin1( );
                                                                                                uint ascii_len = ::strlen( ascii );
                                                                                                ::write ( sock, ascii, ascii_len );
                                                                                                ::write ( sock, img.bits(), img.numBytes() );
                                                                                                ok = true;
                                                                                }
                                                                }
                                                                ::close ( sock );
                                                }
                                }
                                if ( ok ) {
                                                QMessageBox::information( 0, tr( "Success" ), QString( "<p>%1</p>" ).arg ( tr( "Screenshot was uploaded to %1" )).arg( SCAP_hostname ));
                                } else {
                                                QMessageBox::warning( 0, tr( "Error" ), QString( "<p>%1</p>" ).arg( tr( "Connection to %1 failed." )).arg( SCAP_hostname ));
                                }
                } else {
                                QMessageBox::warning( 0, tr( "Error" ),tr("Please set <b>QWS_DISPLAY</b> environmental variable."));
                        }
                }
                                
 }
 //===========================================================================
 ScreenshotApplet::ScreenshotApplet( QWidget *parent, const char *name )
    : QWidget( parent, name )
 {
                setFixedWidth( AppLnk::smallIconSize());
    QImage  img = (const char **)snapshot_xpm;
    img = img.smoothScale(AppLnk::smallIconSize(), AppLnk::smallIconSize());
    m_icon.convertFromImage(img);
 }
 ScreenshotApplet::~ScreenshotApplet()
 {
 }
+int ScreenshotApplet::position()
+{
+    return 6;
+}
 void ScreenshotApplet::mousePressEvent( QMouseEvent *)
 {
  ScreenshotControl *sc = new ScreenshotControl ( );
  QPoint curPos = mapToGlobal ( QPoint ( 0, 0 ));
  // windowPosX is the windows position centered above the applets icon.
  // If the icon is near the edge of the screen, the window would leave the visible area
  // so we check the position against the screen width and correct the difference if needed
  
  int screenWidth = qApp->desktop()->width();
  int windowPosX = curPos. x ( ) - ( sc-> sizeHint ( ). width ( ) - width ( )) / 2 ;
  int ZwindowPosX, XwindowPosX;
  
  // the window would be placed beyond the screen wich doesn't look tooo good
  if ( (windowPosX + sc-> sizeHint ( ). width ( )) > screenWidth ) {
          XwindowPosX = windowPosX + sc-> sizeHint ( ). width ( ) - screenWidth;
        ZwindowPosX = windowPosX - XwindowPosX - 1;
  } else {
          ZwindowPosX = windowPosX;
  }
  
   sc-> move ( ZwindowPosX, curPos. y ( ) - sc-> sizeHint ( ). height ( ) );
   sc-> show ( );
 }
 void ScreenshotApplet::paintEvent( QPaintEvent* )
 {
  QPainter p ( this );
        p.drawPixmap( 0,0, m_icon );
 }
+Q_EXPORT_INTERFACE()
+{
+    Q_CREATE_INSTANCE( OTaskbarAppletWrapper<ScreenshotApplet> );
+}
diff --git a/core/applets/screenshotapplet/screenshot.h b/core/applets/screenshotapplet/screenshot.h
index 74cc5e6..b753583 100644
--- a/core/applets/screenshotapplet/screenshot.h
+++ b/core/applets/screenshotapplet/screenshot.h
@@ -1,70 +1,71 @@
 /**********************************************************************
 ** Copyright (C) 2002 L.J. Potter ljp@llornkcor.com
 **  All rights reserved.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 #ifndef __SCREENSHOT_APPLET_H__
 #define __SCREENSHOT_APPLET_H__
 #include <qwidget.h>
 #include <qframe.h>
 #include <qpixmap.h>
 #include <qguardedptr.h>
 #include <qtimer.h>
 class QComboBox;
 class QCheckBox;
 class QSpinBox;
 class QPushButton;
 //class QImage;
 class ScreenshotControl : public QFrame
 {
    Q_OBJECT
 public:
    ScreenshotControl( QWidget *parent=0, const char *name=0 );
 private:
    QPushButton *grabItButton, *scapButton;
    QPixmap snapshot;
    QTimer* grabTimer;
    QCheckBox *saveNamedCheck;
    QString FileNamePath;
    bool setFileName;
    QSpinBox  *delaySpin;
    int buttonPushed;
 private slots:
    void slotGrab();
    void slotScap(); 
    void savePixmap();
    void performGrab();
 };
 class ScreenshotApplet : public QWidget {
 public:
    ScreenshotApplet( QWidget *parent = 0, const char *name=0 );
    ~ScreenshotApplet();
+    static int position();
    
 protected:
    void mousePressEvent( QMouseEvent * );
    void paintEvent( QPaintEvent* );
    
 private:
        QPixmap m_icon;
 };
 #endif // __SCREENSHOT_APPLET_H__
diff --git a/core/applets/screenshotapplet/screenshotapplet.pro b/core/applets/screenshotapplet/screenshotapplet.pro
index 45a5759..c7fcc3e 100644
--- a/core/applets/screenshotapplet/screenshotapplet.pro
+++ b/core/applets/screenshotapplet/screenshotapplet.pro
@@ -1,15 +1,13 @@
 TEMPLATE  = lib
 CONFIG    += qt plugin warn_on release
-HEADERS =   screenshot.h inputDialog.h screenshotappletimpl.h
+HEADERS   = screenshot.h inputDialog.h
-SOURCES =   screenshot.cpp inputDialog.cpp screenshotappletimpl.cpp
+SOURCES   = screenshot.cpp inputDialog.cpp
 TARGET    = screenshotapplet
 DESTDIR   = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include
 LIBS            += -lqpe
 VERSION   = 1.0.0
-MOC_DIR=opieobj
-OBJECTS_DIR=opieobj
 include ( $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/screenshotapplet/screenshotappletimpl.cpp b/core/applets/screenshotapplet/screenshotappletimpl.cpp
deleted file mode 100644
index e99ecb0..0000000
--- a/core/applets/screenshotapplet/screenshotappletimpl.cpp
+++ b/dev/null
@@ -1,66 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of Qtopia Environment.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-#include "screenshot.h"
-#include "screenshotappletimpl.h"
-ScreenshotAppletImpl::ScreenshotAppletImpl()
-    : screenshot(0)
-{
-}
-ScreenshotAppletImpl::~ScreenshotAppletImpl()
-{
-    delete screenshot;
-}
-QWidget *ScreenshotAppletImpl::applet( QWidget *parent )
-{
-    if ( !screenshot )
-  screenshot = new ScreenshotApplet( parent );
-    return screenshot;
-}
-int ScreenshotAppletImpl::position() const
-{
-    return 6;
-}
-QRESULT ScreenshotAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
-{
-    *iface = 0;
-    if ( uuid == IID_QUnknown )
-  *iface = this;
-    else if ( uuid == IID_TaskbarApplet )
-  *iface = this;
-    else
-        return QS_FALSE;
-        
-    if ( *iface )
-  (*iface)->addRef();
-    return QS_OK;
-}
-Q_EXPORT_INTERFACE()
-{
-    Q_CREATE_INSTANCE( ScreenshotAppletImpl )
-}
diff --git a/core/applets/screenshotapplet/screenshotappletimpl.h b/core/applets/screenshotapplet/screenshotappletimpl.h
deleted file mode 100644
index 988a34c..0000000
--- a/core/applets/screenshotapplet/screenshotappletimpl.h
+++ b/dev/null
@@ -1,43 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of Qtopia Environment.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-#ifndef SCREENSHOTAPPLETIMPL_H
-#define SCREENSHOTAPPLETIMPL_H
-#include <qpe/taskbarappletinterface.h>
-class ScreenshotApplet;
-class ScreenshotAppletImpl : public TaskbarAppletInterface
-{
-public:
-    ScreenshotAppletImpl();
-    virtual ~ScreenshotAppletImpl();
-    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
-    Q_REFCOUNT
-    virtual QWidget *applet( QWidget *parent );
-    virtual int position() const;
-private:
-    ScreenshotApplet *screenshot;
-};
-#endif
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index fe8ebfd..563d110 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -1,633 +1,645 @@
 /************************************************************************************
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ************************************************************************************/
 // copyright 2002 Jeremy Cowgar <jc@cowgar.com>
 // copyright 2002 and 2003  L.J.Potter <ljp@llornkcor.com>
 extern "C" {
 #include "adpcm.h"
 }
 #include <unistd.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <linux/soundcard.h>
 #include <errno.h>
 typedef struct _waveheader {
  u_long  main_chunk; /* 'RIFF'  */
  u_long  length;     /* filelen */
  u_long  chunk_type; /* 'WAVE'  */
  u_long  sub_chunk;  /* 'fmt '                                               */
  u_long  sc_len;     /* length of sub_chunk, =16     
                         (chunckSize) format len */
  u_short format;     /* should be 1 for PCM-code        (formatTag)          */
  u_short modus;      /* 1 Mono, 2 Stereo                (channels)           */
  u_long  sample_fq;  /* samples per second              (samplesPerSecond)   */
  u_long  byte_p_sec; /* avg bytes per second            (avgBytePerSecond)   */
  u_short byte_p_spl; /* samplesize; 1 or 2 bytes        (blockAlign)         */
  u_short bit_p_spl;  /* 8, 12 or 16 bit                 (bitsPerSample)      */
  u_long  data_chunk; /* 'data'      */
  u_long  data_length;/* samplecount */
 } WaveHeader;
 #define RIFF        0x46464952
 #define WAVE        0x45564157
 #define FMT         0x20746D66
 #define DATA        0x61746164
 #define PCM_CODE    1
 #define WAVE_MONO   1
 #define WAVE_STEREO 2
 struct adpcm_state encoder_state;
 //struct adpcm_state decoder_state;
 #define WAVE_FORMAT_DVI_ADPCM (0x0011)
 #define WAVE_FORMAT_PCM (0x0001)
 #include "vmemo.h"
+#include <opie2/otaskbarapplet.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qpainter.h>
 #include <qmessagebox.h>
 int seq = 0;
 /* XPM */
 static char * vmemo_xpm[] = {
  "16 16 102 2",
  "   c None",
  ".  c #60636A",
  "+  c #6E6E72",
  "@  c #68696E",
  "#  c #4D525C",
  "$  c #6B6C70",
  "%  c #E3E3E8",
  "&  c #EEEEF2",
  "*  c #EAEAEF",
  "=  c #CACAD0",
  "-  c #474A51",
  ";  c #171819",
  ">  c #9B9B9F",
  ",  c #EBEBF0",
  "'  c #F4F4F7",
  ")  c #F1F1F5",
  "!  c #DEDEE4",
  "~  c #57575C",
  "{  c #010101",
  "]  c #A2A2A6",
  "^  c #747477",
  "/  c #B5B5B8",
  "(  c #AEAEB2",
  "_  c #69696D",
  ":  c #525256",
  "<  c #181C24",
  "[  c #97979B",
  "}  c #A7A7AC",
  "|  c #B0B0B4",
  "1  c #C8C8D1",
  "2  c #75757B",
  "3  c #46464A",
  "4  c #494A4F",
  "5  c #323234",
  "6  c #909095",
  "7  c #39393B",
  "8  c #757578",
  "9  c #87878E",
  "0  c #222224",
  "a  c #414144",
  "b  c #6A6A6E",
  "c  c #020C16",
  "d  c #6B6B6F",
  "e  c #68686D",
  "f  c #5B5B60",
  "g  c #8A8A8F",
  "h  c #6B6B6E",
  "i  c #ADADB2",
  "j  c #828289",
  "k  c #3E3E41",
  "l  c #CFCFD7",
  "m  c #4C4C50",
  "n  c #000000",
  "o  c #66666A",
  "p  c #505054",
  "q  c #838388",
  "r  c #A1A1A7",
  "s  c #A9A9AE",
  "t  c #A8A8B0",
  "u  c #5E5E63",
  "v  c #3A3A3E",
  "w  c #BDBDC6",
  "x  c #59595E",
  "y  c #76767C",
  "z  c #373738",
  "A  c #717174",
  "B  c #727278",
  "C  c #1C1C1E",
  "D  c #3C3C3F",
  "E  c #ADADB6",
  "F  c #54555A",
  "G  c #8B8C94",
  "H  c #5A5A5F",
  "I  c #BBBBC3",
  "J  c #C4C4CB",
  "K  c #909098",
  "L  c #737379",
  "M  c #343437",
  "N  c #8F8F98",
  "O  c #000407",
  "P  c #2D3137",
  "Q  c #B0B1BC",
  "R  c #3B3C40",
  "S  c #6E6E74",
  "T  c #95959C",
  "U  c #74747A",
  "V  c #1D1D1E",
  "W  c #91929A",
  "X  c #42444A",
  "Y  c #22282E",
  "Z  c #B0B2BC",
  "`  c #898A90",
  " . c #65656A",
  ".. c #999AA2",
  "+. c #52535A",
  "@. c #151B21",
  "#. c #515257",
  "$. c #B5B5BE",
  "%. c #616167",
  "&. c #1A1D22",
  "*. c #000713",
  "=. c #1F1F21",
  "                                ",
  "            . + @ #             ",
  "          $ % & * = -           ",
  "        ; > , ' ) ! ~           ",
  "        { ] ^ / ( _ :           ",
  "        < [ } | 1 2 3           ",
  "      4 5 6 7 8 9 0 a b c       ",
  "    d e f g h i j 3 k l m n     ",
  "      o p q r s t u v w n       ",
  "      o x y z A B C D E n       ",
  "      F G H I J K L M N O       ",
  "      P Q R S T U V W X         ",
  "        Y Z ` b  ...+.          ",
  "          @.#.$.%.&.            ",
  "            *.B =.              ",
  "      n n n n n n n n n         "};
 VMemo::VMemo( QWidget *parent, const char *_name )
  : QWidget( parent, _name ) {
  setFixedHeight( 18 );
  setFixedWidth( 14 );
  
  t_timer = new QTimer( this );
  connect( t_timer, SIGNAL( timeout() ), SLOT( timerBreak() ) );
  
    Config vmCfg("Vmemo");
    vmCfg.setGroup("Defaults");
    int toggleKey = setToggleButton(vmCfg.readNumEntry("toggleKey", -1));
    useADPCM = vmCfg.readBoolEntry("use_ADPCM", 0);
    qDebug("toggleKey %d", toggleKey);
    if ( QFile::exists ( "/dev/sharp_buz" ) || QFile::exists ( "/dev/sharp_led" ))
         systemZaurus=TRUE;
    else 
      systemZaurus=FALSE;
      
    myChannel = new QCopChannel( "QPE/VMemo", this );
    connect( myChannel, SIGNAL(received(const QCString&, const QByteArray&)),
             this, SLOT(receive(const QCString&, const QByteArray&)) );
    if( toggleKey != -1 ) {
      // keyRegister(key, channel, message)
      QCopEnvelope e("QPE/Launcher", "keyRegister(int,QCString,QCString)");
      //           e << 4096; // Key_Escape
      //          e << Key_F5; //4148
      e << toggleKey;
      e << QString("QPE/VMemo");
      e << QString("toggleRecord()");
    }
    if(toggleKey == 1)
        usingIcon=TRUE;
    else
        usingIcon=FALSE;
    if( vmCfg.readNumEntry("hideIcon",0) == 1)
      hide();
    recording = FALSE;
    // }
 }
 VMemo::~VMemo() {
 }
+int VMemo::position()
+{
+    return 6;
+}
 void VMemo::receive( const QCString &msg, const QByteArray &data ) {
  qDebug("receive");
  QDataStream stream( data, IO_ReadOnly );
  if (msg == "toggleRecord()")  {
      if (recording) {
          fromToggle = TRUE;
          stopRecording();
      }  else {
          fromToggle = TRUE;
          startRecording();
      }
  }
 }
 void VMemo::paintEvent( QPaintEvent* ) {
  QPainter p(this);
  p.drawPixmap( 0, 1,( const char** )  vmemo_xpm );
 }
 void VMemo::mousePressEvent( QMouseEvent * me) {
  /*  No mousePress/mouseRelease recording on the iPAQ. The REC button on the iPAQ calls these functions
         mousePressEvent and mouseReleaseEvent with a NULL parameter.  */
        
 //  if (!systemZaurus && me != NULL)
 //        return;
 //    }
  if(!recording)
       startRecording();
   else
       stopRecording();
 }
 void VMemo::mouseReleaseEvent( QMouseEvent * ) {
 }
 bool VMemo::startRecording() {
  Config config( "Vmemo" );
  config.setGroup( "System" );
  useAlerts = config.readBoolEntry("Alert",1);
  if(useAlerts) {
    msgLabel = new QLabel( 0, "alertLabel" );
    msgLabel->setText("<B><P><font size=+2>VMemo-Recording</font></B>");
    msgLabel->show();
  }
  qDebug("Start recording engines");
  recording = TRUE;
  if (openDSP() == -1)  {
    recording = FALSE;
    return FALSE;
  }
  
  config.setGroup("Defaults");
  date = TimeString::dateString( QDateTime::currentDateTime(),false,true);
  date.replace(QRegExp("'"),"");
  date.replace(QRegExp(" "),"_");
  date.replace(QRegExp(":"),".");
  date.replace(QRegExp(","),"");
  QString fName;
  config.setGroup( "System" );
  fName = QPEApplication::documentDir() ;
  fileName = config.readEntry("RecLocation", fName);
  int s;
  s=fileName.find(':');
  if(s)
    fileName=fileName.right(fileName.length()-s-2);
  qDebug("pathname will be "+fileName);   
  if( fileName.left(1).find('/') == -1)
    fileName="/"+fileName;
  if( fileName.right(1).find('/') == -1)
    fileName+="/";
  fName = "vm_"+ date+ ".wav";
  
  fileName+=fName;
  qDebug("filename is "+fileName);
 // open tmp file here
  char *pointer;
  pointer=tmpnam(NULL); 
  qDebug("Opening tmp file %s",pointer);
  
  if(openWAV(pointer ) == -1)  {
    QString err("Could not open the temp file\n");
    err += fileName;
    QMessageBox::critical(0, "vmemo", err, "Abort");
    ::close(dsp);
    return FALSE;
  }
  if( record() ) {
  QString cmd;
  if( fileName.find(".wav",0,TRUE) == -1)
      fileName += ".wav";
  cmd.sprintf("mv %s "+fileName, pointer);
 // move tmp file to regular file here
  
  system(cmd.latin1());
  QArray<int> cats(1);
  cats[0] = config.readNumEntry("Category", 0);
  
  QString dlName("vm_");
  dlName += date;
  DocLnk l;
  l.setFile(fileName);
  l.setName(dlName);
  l.setType("audio/x-wav");
  l.setCategories(cats);
  l.writeLink();
  return TRUE;
  } else
      return FALSE;
  
 }
 void VMemo::stopRecording() {
    show();
    qDebug("Stopped recording");
    recording = FALSE;
    if(useAlerts) {
        msgLabel->close();
        msgLabel=0;
        delete msgLabel;
    }
    t_timer->stop();
    Config cfg("Vmemo");
    cfg.setGroup("Defaults");
    if( cfg.readNumEntry("hideIcon",0) == 1 )
        hide();
 }
 int VMemo::openDSP() {
  Config cfg("Vmemo");
  cfg.setGroup("Record");
  
  speed = cfg.readNumEntry("SampleRate", 22050);
  channels = cfg.readNumEntry("Stereo", 1) ? 2 : 1; // 1 = stereo(2), 0 = mono(1)
  if (cfg.readNumEntry("SixteenBit", 1)==1)  {
    format = AFMT_S16_LE;
    resolution = 16;
  } else {
    format = AFMT_U8;
    resolution = 8;
  }
  qDebug("samplerate: %d, channels %d, resolution %d", speed, channels, resolution);  
  if(systemZaurus) {
    dsp = open("/dev/dsp1", O_RDONLY); //Zaurus needs /dev/dsp1
    channels=1; //zaurus has one input channel
  }  else {
    dsp = open("/dev/dsp", O_RDONLY);
  }
  
  if(dsp == -1)  {
      msgLabel->close();
      msgLabel=0;
      delete msgLabel;
    
      perror("open(\"/dev/dsp\")");
      errorMsg="open(\"/dev/dsp\")\n "+(QString)strerror(errno);
    QMessageBox::critical(0, "vmemo", errorMsg, "Abort");
    return -1;
  }
  
  if(ioctl(dsp, SNDCTL_DSP_SETFMT , &format)==-1)  {
    perror("ioctl(\"SNDCTL_DSP_SETFMT\")");
    return -1;
  }
  if(ioctl(dsp, SNDCTL_DSP_CHANNELS , &channels)==-1)  {
    perror("ioctl(\"SNDCTL_DSP_CHANNELS\")");
    return -1;
  }
  if(ioctl(dsp, SNDCTL_DSP_SPEED , &speed)==-1)  {
    perror("ioctl(\"SNDCTL_DSP_SPEED\")");
    return -1;
  }
  if(ioctl(dsp, SOUND_PCM_READ_RATE , &rate)==-1)  {
    perror("ioctl(\"SOUND_PCM_READ_RATE\")");
    return -1;
  }
  QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; //mute
  
  return 1;
 }
 int VMemo::openWAV(const char *filename) {
  track.setName(filename);
  if(!track.open(IO_WriteOnly|IO_Truncate|IO_Raw)) {
    errorMsg=filename;
    return -1;
  }
  wav=track.handle();
    Config vmCfg("Vmemo");
    vmCfg.setGroup("Defaults");
  useADPCM = vmCfg.readBoolEntry("use_ADPCM", 0);
  
  WaveHeader wh;
  wh.main_chunk = RIFF;
  wh.length=0; 
  wh.chunk_type = WAVE;
  wh.sub_chunk  = FMT;
  wh.sc_len     = 16;
  if(useADPCM)
      wh.format     = WAVE_FORMAT_DVI_ADPCM;//PCM_CODE;
  else
      wh.format     = PCM_CODE;     
  wh.modus      = channels;
  wh.sample_fq  = speed;
  wh.byte_p_sec = speed * channels *  resolution/8;
  wh.byte_p_spl = channels * (resolution / 8); 
  wh.bit_p_spl  = resolution;
  wh.data_chunk = DATA;
  wh.data_length= 0; 
  //    qDebug("Write header channels %d, speed %d, b/s %d, blockalign %d, bitrate %d"
  //           , wh.modus, wh.sample_fq, wh.byte_p_sec, wh.byte_p_spl, wh.bit_p_spl );
  write (wav, &wh, sizeof(WaveHeader));
  
  return 1;
 }
 bool VMemo::record() {
   length=0;
   int result, value;
  QString msg;
  msg.sprintf("Recording format %d", format);
  qDebug(msg);
  Config config("Vmemo");
  config.setGroup("Record");
  int sRate=config.readNumEntry("SizeLimit", 30);
  if(sRate > 0)
      t_timer->start( sRate * 1000+1000, TRUE);
 //    if(systemZaurus) {
 //    } else { // 16 bit only capabilities
    msg.sprintf("Recording format other");
    qDebug(msg);
    int bufsize=1024;
    int bytesWritten=0;
    signed short sound[1024], monoBuffer[1024];
    char abuf[bufsize/2];
    short sbuf[bufsize];
    Config vmCfg("Vmemo");
    vmCfg.setGroup("Defaults");
    useADPCM = vmCfg.readBoolEntry("use_ADPCM", 0);
    while(recording)  {
        if(useADPCM)
            result = read( dsp, sbuf, bufsize); // 8192
        else
            result = read(dsp, sound, 1024); // 8192
        if( result <= 0) {
          perror("recording error ");
 //          qDebug(currentFileName);
          QMessageBox::message(tr("Note"),tr("error recording"));
          recording=FALSE;
          break;
          return FALSE;
        }
        if(useADPCM) {
            adpcm_coder( sbuf, abuf, result/2, &encoder_state);
            bytesWritten =  ::write(wav, abuf, result/4);
        } else {
            for (int i = 0; i < result; i++) { //since Z is mono do normally
                monoBuffer[i] = sound[i];
            }
            length+=write(wav, monoBuffer, result);
        }
        length +=bytesWritten;
      if(length<0) {
        recording=false;
        perror("dev/dsp's is a lookin' messy");
        QMessageBox::message("Vmemo","Error writing to file\n"+ fileName);
          break;
          return FALSE;
      }
      //       printf("%d\r",length);
      //       fflush(stdout);
      qApp->processEvents();
    }
    //  qDebug("file has length of %d lasting %d seconds",
    //         length, (( length / speed) / channels) / 2 );
    //  }
  //>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<//
  value = length+36;
  lseek(wav, 4, SEEK_SET);
  write(wav, &value, 4);
  lseek(wav, 40, SEEK_SET);
  write(wav, &length, 4);
  track.close();
  qDebug("Track closed");
  
  if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1)
    perror("ioctl(\"SNDCTL_DSP_RESET\")");
  ::close(dsp);
      Config cfgO("OpieRec");
      cfgO.setGroup("Sounds");
      int nFiles = cfgO.readNumEntry( "NumberofFiles",0);
      QString currentFileName = fileName;
      QString currentFile = "vm_"+ date;
      
      float numberOfRecordedSeconds=(float) length / (float)speed * (float)2;
      cfgO.writeEntry( "NumberofFiles", nFiles + 1);
      cfgO.writeEntry( QString::number( nFiles + 1), currentFile);
      cfgO.writeEntry( currentFile, currentFileName);
      QString time;
      time.sprintf("%.2f", numberOfRecordedSeconds);
      cfgO.writeEntry( currentFileName, time );
      //      qDebug("writing config numberOfRecordedSeconds "+time);
      cfgO.write();
      qDebug("done recording "+fileName);
  Config cfg("qpe");
  cfg.setGroup("Volume");
  QString foo = cfg.readEntry("Mute","TRUE");
  if(foo.find("TRUE",0,TRUE) != -1)
    QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; //mute
 return TRUE;
 }
 int VMemo::setToggleButton(int tog) {
  for( int i=0; i < 10;i++) {
    switch (tog) {
    case 0:
      return -1; 
      break; 
    case 1:
      return 0; 
      break; 
    case 2:
        return Key_F24; //was Escape
      break; 
    case 3:
      return Key_Space;
      break; 
    case 4:
      return Key_F12;
      break; 
    case 5:
      return Key_F9;
      break; 
    case 6:
      return Key_F10;
      break; 
    case 7:
      return Key_F11;
      break; 
    case 8:
      return Key_F13;
      break; 
    };
  }
  return -1;
 }
 void VMemo::timerBreak() {
  //stop
    stopRecording();
  QMessageBox::message("Vmemo","Vmemo recording has ended");
 }
+Q_EXPORT_INTERFACE()
+{
+    Q_CREATE_INSTANCE( OTaskbarAppletWrapper<VMemo> );
+}
diff --git a/core/applets/vmemo/vmemo.h b/core/applets/vmemo/vmemo.h
index 31d0a25..1bd735f 100644
--- a/core/applets/vmemo/vmemo.h
+++ b/core/applets/vmemo/vmemo.h
@@ -1,64 +1,65 @@
 /**************************************************************************************94x78**
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 *********************************************************************************************/
 /*
 * $Id$
 */
 #ifndef __VMEMO_H__
 #define __VMEMO_H__
 #include <qwidget.h>
 #include <qpixmap.h>
 #include <qpe/applnk.h>
 #include <qfile.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qlabel.h>
 #include <qtimer.h>
 class VMemo : public QWidget
 {
  Q_OBJECT
 public:
  VMemo( QWidget *parent, const char *name = NULL);
  ~VMemo();
+  static int position();
  QFile track;
  int length;
  QString fileName, errorMsg, date;
  QLabel* msgLabel;
  QTimer *t_timer;
 bool usingIcon, useADPCM;
 public slots:
  bool record();
  void mousePressEvent( QMouseEvent * );
  void mouseReleaseEvent( QMouseEvent * );
  void receive( const QCString &msg, const QByteArray &data );
  bool startRecording();
  void stopRecording();
  void timerBreak();
 private:
  bool useAlerts;
  void paintEvent( QPaintEvent* );
  int setToggleButton(int);
  int openDSP();
  int openWAV(const char *filename);
  bool fromToggle;
  QPixmap vmemoPixmap;
  QCopChannel *myChannel;
  bool systemZaurus;
  int dsp, wav, rate, speed, channels, format, resolution;
  bool recording;
 };
 #endif // __VMEMO_H__
diff --git a/core/applets/vmemo/vmemo.pro b/core/applets/vmemo/vmemo.pro
index f83a53f..2deedfd 100644
--- a/core/applets/vmemo/vmemo.pro
+++ b/core/applets/vmemo/vmemo.pro
@@ -1,13 +1,13 @@
 TEMPLATE  = lib
 CONFIG    += qt plugin warn_on release
-HEADERS =   vmemo.h vmemoimpl.h adpcm.h
+HEADERS =   vmemo.h adpcm.h
-SOURCES =   vmemo.cpp vmemoimpl.cpp adpcm.c
+SOURCES =   vmemo.cpp adpcm.c
 TARGET    = vmemoapplet
 DESTDIR   =$(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
 VERSION   = 1.0.0
 include ( $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/vmemo/vmemoimpl.cpp b/core/applets/vmemo/vmemoimpl.cpp
deleted file mode 100644
index 7779b83..0000000
--- a/core/applets/vmemo/vmemoimpl.cpp
+++ b/dev/null
@@ -1,61 +0,0 @@
-/**************************************************************************************94x78**
- **
- ** This file may be distributed and/or modified under the terms of the
- ** GNU General Public License version 2 as published by the Free Software
- ** Foundation and appearing in the file LICENSE.GPL included in the
- ** packaging of this file.
- **
- ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- **
- *********************************************************************************************/
-/*
- * $Id$
- */
-#include "vmemo.h"
-#include "vmemoimpl.h"
-VMemoAppletImpl::VMemoAppletImpl()
-        : vmemo(0)
-{
-}
-VMemoAppletImpl::~VMemoAppletImpl()
-{
-    delete vmemo;
-}
-QWidget *VMemoAppletImpl::applet( QWidget *parent )
-{
-    if ( !vmemo )
-        vmemo = new VMemo( parent );
-    return vmemo;
-}
-int VMemoAppletImpl::position() const
-{
-    return 6;
-}
-QRESULT VMemoAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
-{
-    *iface = 0;
-    if ( uuid == IID_QUnknown )
-        *iface = this;
-    else if ( uuid == IID_TaskbarApplet )
-        *iface = this;
-    else
-        return QS_FALSE;
-  
-    if ( *iface )
-        (*iface)->addRef();
-    return QS_OK;
-}
-Q_EXPORT_INTERFACE()
-{
-    Q_CREATE_INSTANCE( VMemoAppletImpl )
-        }
diff --git a/core/applets/vmemo/vmemoimpl.h b/core/applets/vmemo/vmemoimpl.h
deleted file mode 100644
index 985138b..0000000
--- a/core/applets/vmemo/vmemoimpl.h
+++ b/dev/null
@@ -1,40 +0,0 @@
-/**************************************************************************************94x78**
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-*********************************************************************************************/
-/*
- * $Id$
- */
-#ifndef __VMEMOIMPLAPPLETIMPL_H__
-#define __VMEMOIMPLAPPLETIMPL_H__
-#include <qpe/taskbarappletinterface.h>
-class VMemo;
-class VMemoAppletImpl : public TaskbarAppletInterface
-{
-public:
-    VMemoAppletImpl();
-    virtual ~VMemoAppletImpl();
-    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
-    Q_REFCOUNT
-    virtual QWidget *applet( QWidget *parent );
-    virtual int position() const;
-private:
-    VMemo *vmemo;
-};
-#endif
diff --git a/core/applets/volumeapplet/volume.cpp b/core/applets/volumeapplet/volume.cpp
index c736437..8fd88f6 100644
--- a/core/applets/volumeapplet/volume.cpp
+++ b/core/applets/volumeapplet/volume.cpp
@@ -1,779 +1,783 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
-#include <stdio.h>
 #include "volume.h"
+#include "oledbox.h"
+#include <opie2/odevice.h>
+#include <opie2/otaskbarapplet.h>
 #include <qpe/resource.h>
 #include <qpe/applnk.h>
 #include <qpe/config.h>
-#if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP)
 #include <qpe/qcopenvelope_qws.h>
-#endif
 #include <qpainter.h>
 #include <qcheckbox.h>
 #include <qslider.h>
 #include <qlayout.h>
 #include <qvbox.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qtimer.h>
-#include <opie/odevice.h>
+#include <stdio.h>
-#include "oledbox.h"
 using namespace Opie;
 #define RATE_TIMER_INTERVAL 100
 // Ten times per second is fine (RATE_TIMER_INTERVAL 100).  A shorter time
 // results in "hanging" buttons on the iPAQ due to quite high CPU consumption.
 /* XPM */
 static const char * vol_xpm[] = {
 "20 20 3 1",
 "   c None",
 ".  c #0000FF",
 "+  c #000000",
 "                    ",
 "        .           ",
 "        . . . .     ",
 "    . . . . . .     ",
 "    . . . . . . .   ",
 "    . . ..... . .   ",
 "  . ... ..... ...   ",
 "  ........... ....  ",
 "  ................. ",
 "++++++++++++++++++++",
 " .................. ",
 "  . ............. . ",
 "  . ..... .......   ",
 "    . ... ..... .   ",
 "    . ... ..... .   ",
 "    . ... .....     ",
 "    .  .  . . .     ",
 "       .  . .       ",
 "       .  . .       ",
 "                    "};
 /* XPM */
 static const char * mic_xpm[] = {
 "20 20 21 1",
 "   c None",
 ".  c #000000",
 "+  c #EEEEEE",
 "@  c #B4B6B4",
 "#  c #8B8D8B",
 "$  c #D5D6D5",
 "%  c #E6E6E6",
 "&  c #9C9D9C",
 "*  c #6A696A",
 "=  c #E6E2E6",
 "-  c #F6F2F6",
 ";  c #CDC6CD",
 ">  c #737573",
 ",  c #4A484A",
 "'  c #DEDEDE",
 ")  c #F6EEF6",
 "!  c #414041",
 "~  c #202020",
 "{  c #ACAEAC",
 "]  c #838583",
 "^  c #6A656A",
 "                    ",
 "            ....    ",
 "           .+@+#.   ",
 "          ..$%&%*.  ",
 "         .=-.;=>=,. ",
 "         .'+).&+!+. ",
 "         .+;+;.~+~. ",
 "         ..%{%,.... ",
 "         ..&=>=~..  ",
 "        .+..]^,..   ",
 "       .+.......    ",
 "      .%...         ",
 "     .=...          ",
 "    .+...           ",
 "   .+...            ",
 "   ....             ",
 "  ....              ",
 "  ..                ",
 " .                  ",
 ".                   "};
 static const char * bass_xpm[] = {
 "20 20 3 1",
 "       c None",
 ".      c #000000",
 "+      c #0000FF",
 "                    ",
 "                    ",
 "                    ",
 ".....   +++   ......",
 "      +++++++       ",
 "     ++    ++       ",
 "... ++ ...  ++  ++ .",
 "    +++     ++  ++  ",
 "    ++++    ++      ",
 "... ++++ .. ++ .....",
 "     ++    ++       ",
 "           ++   ++  ",
 "..........++    ++ .",
 "         ++         ",
 "        ++          ",
 "...... ++  .........",
 "       +            ",
 "                    ",
 "                    ",
 "                    "};
 static const char * treble_xpm[] = {
 "20 20 3 1",
 "       c None",
 ".      c #0000FF",
 "+      c #000000",
 "          ..        ",
 "         . ..       ",
 "         . ..       ",
 "++++++++ . .. ++++++",
 "         . .        ",
 "         ...        ",
 "++++++++ .   +++++++",
 "        ..          ",
 "      .. .          ",
 "+++  ..  ... +++++++",
 "    ..  .. ..       ",
 "    .. . .  ..      ",
 "+++ .. . . + . +++++",
 "    ..   .  ..      ",
 "     ..  . ..       ",
 "++++  ...... +++++++",
 "         .          ",
 "      .. .          ",
 "      .. .          ",
 "       ..           "};
 /* XPM */
 static const char * alarm_xpm[] = {
 "20 20 33 1",
 "   c None",
 ".  c #080602",
 "+  c #AAA602",
 "@  c #252002",
 "#  c #434202",
 "$  c #795602",
 "%  c #C3C20D",
 "&  c #DADAC2",
 "*  c #826002",
 "=  c #740502",
 "-  c #D6D602",
 ";  c #322E02",
 ">  c #826A02",
 ",  c #F1F195",
 "'  c #959215",
 ")  c #423602",
 "!  c #4B0302",
 "~  c #844315",
 "{  c #AAAA2A",
 "]  c #E2DE42",
 "^  c #BA7E04",
 "/  c #7F7502",
 "(  c #828276",
 "_  c #FEFE4E",
 ":  c #7D1902",
 "<  c #989656",
 "[  c #260B02",
 "}  c #F7F7D8",
 "|  c #DCDA5A",
 "1  c #823102",
 "2  c #B1AC6B",
 "3  c #F7F710",
 "4  c #838204",
 "                    ",
 "                    ",
 "        4'4/        ",
 "        /-^=        ",
 "       42{4>4       ",
 "      '2|+*$44      ",
 "     +2&3+$1*44     ",
 "    (%_}_+/$:>/4    ",
 "    4%_}3+#;>:*4    ",
 "    4%_}&+#[1$/4    ",
 "    4%_,2')[~~>4    ",
 "    4%33'4#@~1>4    ",
 "    4%3344#[:>/4    ",
 "   42&_3'4#@>:*44   ",
 "  42|}}3'4#[;$)$44  ",
 "444{]]2^~~:!!#.@##/ ",
 "4444-%*:==!!=...../ ",
 "       /:[..        ",
 "        /@.         ",
 "                    "};
 VolumeControl::VolumeControl ( VolumeApplet *icon, bool /*showMic*/, QWidget *parent, const char *name )
    : QFrame ( parent, name, WStyle_StaysOnTop | WType_Popup )
 {
  m_icon = icon;
  bool has_wav_alarm = true;
  bool has_bass = true;
  bool has_treble = true;
  switch ( ODevice::inst ( )-> model ( )) { // we need to add other devices eventually
    case Model_Zaurus_SL5000:
      has_wav_alarm = false; //poor guys probably feeling left out...
      break;
    default:
      break;
  }
  if ( !ODevice::inst ( )-> series ( ) == Model_iPAQ ) {
    has_bass = false;
    has_treble = false;
  }
  setFrameStyle ( QFrame::PopupPanel | QFrame::Raised );
  QGridLayout *grid = new QGridLayout ( this, 1, 1, 6, 4 );
  grid-> setSpacing ( 4 );
  grid-> setMargin ( 6 );
  QVBoxLayout *vbox;
  QLabel *l;
  vbox = new QVBoxLayout ( );
  vbox-> setSpacing ( 4 );
  grid-> addLayout ( vbox, 1, 0 );
  upButton = new QPushButton ( this );
  upButton-> setSizePolicy ( QSizePolicy ( QSizePolicy::Minimum, QSizePolicy::Expanding ));
  upButton-> setPixmap ( Resource::loadPixmap ( "up" ));
  upButton-> setFocusPolicy ( QWidget::NoFocus );
  vbox-> addWidget ( upButton );
  downButton = new QPushButton ( this );
  downButton-> setSizePolicy ( QSizePolicy ( QSizePolicy::Minimum, QSizePolicy::Expanding ));
  downButton-> setPixmap ( Resource::loadPixmap ( "down" ));
  downButton-> setFocusPolicy ( QWidget::NoFocus );
  vbox-> addWidget ( downButton );
  volSlider = new QSlider ( this );
  volSlider-> setRange ( 0, 100 );
  volSlider-> setTickmarks ( QSlider::Both );
  volSlider-> setTickInterval ( 20 );
  volSlider-> setFocusPolicy ( QWidget::NoFocus );
  l = new QLabel ( this );
  l-> setPixmap ( QPixmap ( vol_xpm ));
  grid-> addWidget ( l, 0, 1, AlignCenter );
  grid-> addWidget ( volSlider, 1, 1, AlignCenter );
  volLed = new OLedBox ( green, this );
  volLed-> setFocusPolicy ( QWidget::NoFocus );
  volLed-> setFixedSize ( 16, 16  );
  grid-> addWidget ( volLed, 2, 1, AlignCenter );
  QVBox *basstrebleBox = new QVBox( this );
  trebleSlider = new QSlider ( basstrebleBox );
  trebleSlider-> setRange ( 0, 100 );
  trebleSlider-> setTickmarks ( QSlider::Both );
  trebleSlider-> setTickInterval ( 20 );
  trebleSlider->setMaximumHeight( 40 );
  trebleSlider-> setFocusPolicy ( QWidget::NoFocus );
  bassSlider = new QSlider ( basstrebleBox );
  bassSlider-> setRange ( 0, 100 );
  bassSlider-> setTickmarks ( QSlider::Both );
  bassSlider-> setTickInterval ( 20 );
  bassSlider->setMaximumHeight( 40 );
  bassSlider-> setFocusPolicy ( QWidget::NoFocus );
  QLabel *bassLabel = new QLabel ( this );
  bassLabel-> setPixmap ( QPixmap ( bass_xpm ));
  QLabel *trebleLabel = new QLabel( this );
  trebleLabel->setPixmap( QPixmap ( treble_xpm ) );
  grid->addWidget( trebleLabel, 0, 4, AlignCenter );
  grid->addWidget( basstrebleBox, 1, 4, AlignCenter );
  grid-> addWidget ( bassLabel, 2, 4, AlignCenter );
  if ( !has_bass ) {
    bassSlider->hide();
    bassLabel->hide();
  }
  if ( !has_treble ) {
    trebleSlider->hide();
    trebleLabel->hide();
  }
  micSlider = new QSlider ( this );
  micSlider-> setRange ( 0, 100 );
  micSlider-> setTickmarks ( QSlider::Both );
  micSlider-> setTickInterval ( 20 );
  micSlider-> setFocusPolicy ( QWidget::NoFocus );
  l = new QLabel ( this );
  l-> setPixmap ( QPixmap ( mic_xpm ));
  grid-> addWidget ( l, 0, 2, AlignCenter );
  grid-> addWidget ( micSlider, 1, 2, AlignCenter );
  micLed = new OLedBox ( red, this );
  micLed-> setFocusPolicy ( QWidget::NoFocus );
  micLed-> setFixedSize ( 16, 16 );
  grid-> addWidget ( micLed, 2, 2, AlignCenter );
  alarmSlider = new QSlider ( this );
  alarmSlider-> setRange ( 0, 100 );
  alarmSlider-> setTickmarks ( QSlider::Both );
  alarmSlider-> setTickInterval ( 20 );
  alarmSlider-> setFocusPolicy ( QWidget::NoFocus );
  QLabel *alarmLabel = new QLabel ( this );
  alarmLabel-> setPixmap ( QPixmap ( alarm_xpm ));
  grid-> addWidget ( alarmLabel, 0, 3, AlignCenter );
  grid-> addWidget ( alarmSlider, 1, 3, AlignCenter );
  alarmLed = new OLedBox ( yellow, this );
  alarmLed-> setFocusPolicy ( QWidget::NoFocus );
  alarmLed-> setFixedSize ( 16, 16 );
  grid-> addWidget ( alarmLed, 2, 3, AlignCenter );
  if ( !has_wav_alarm ) {
    alarmSlider-> hide ( );
    alarmLabel-> hide ( );
    alarmLed-> hide ( );
  }
  grid-> addWidget ( new QLabel ( tr( "Enable Sounds for:" ), this ), 0, 6, AlignVCenter | AlignLeft );
  vbox = new QVBoxLayout ( );
  vbox-> setSpacing ( 4 );
  grid-> addMultiCellLayout ( vbox, 1, 2, 6, 6 );
  tapBox = new QCheckBox ( tr( "Screen Taps" ), this );
  tapBox-> setFocusPolicy ( QWidget::NoFocus );
  vbox-> addWidget ( tapBox, AlignVCenter | AlignLeft );
  keyBox = new QCheckBox ( tr( "Key Clicks" ), this );
  keyBox-> setFocusPolicy ( QWidget::NoFocus );
  vbox-> addWidget ( keyBox, AlignVCenter | AlignLeft );
  alarmBox = new QCheckBox ( tr( "Alarm Sound" ), this );
  alarmBox-> setFocusPolicy ( QWidget::NoFocus );
  vbox-> addWidget ( alarmBox, AlignVCenter | AlignLeft );
  if ( has_wav_alarm ) {
    alarmBox-> hide ( );
  }
  vbox-> addStretch ( 100 );
  setFixedSize ( sizeHint ( ));
  setFocusPolicy ( QWidget::NoFocus );
  rateTimer = new QTimer( this );
  connect ( rateTimer, SIGNAL( timeout ( )), this, SLOT( rateTimerDone ( )));
  connect ( upButton,   SIGNAL( pressed ( )),  this, SLOT( buttonChanged ( )));
  connect ( upButton,   SIGNAL( released ( )), this, SLOT( buttonChanged ( )));
  connect ( downButton, SIGNAL( pressed ( )),  this, SLOT( buttonChanged ( )));
  connect ( downButton, SIGNAL( released ( )), this, SLOT( buttonChanged ( )));
  connect ( micSlider, SIGNAL( valueChanged ( int )), this, SLOT( micMoved( int )));
  connect ( volSlider, SIGNAL( valueChanged ( int )), this, SLOT( volMoved( int )));
  connect ( alarmSlider, SIGNAL( valueChanged ( int )), this, SLOT( alarmMoved( int )));
  connect ( bassSlider, SIGNAL( valueChanged ( int )), this, SLOT( bassMoved( int )));
  connect ( trebleSlider, SIGNAL( valueChanged ( int )), this, SLOT( trebleMoved( int )));
  connect ( volLed,   SIGNAL( toggled ( bool )), this, SLOT( volMuteToggled ( bool )));
  connect ( micLed,   SIGNAL( toggled ( bool )), this, SLOT( micMuteToggled ( bool )));
  connect ( alarmLed, SIGNAL( toggled ( bool )), this, SLOT( alarmSoundToggled ( bool )));
  connect ( alarmBox, SIGNAL( toggled ( bool )), this, SLOT( alarmSoundToggled ( bool )));
  connect ( keyBox,   SIGNAL( toggled ( bool )), this, SLOT( keyClickToggled ( bool )));
  connect ( tapBox,   SIGNAL( toggled ( bool )), this, SLOT( screenTapToggled ( bool )));
  // initialize variables
  readConfig ( true );
  // initialize the config file, in case some entries are missing
  writeConfigEntry ( "VolumePercent", m_vol_percent,   UPD_None );
  writeConfigEntry ( "BassPercent",   m_vol_percent,   UPD_None );
  writeConfigEntry ( "TreblePercent", m_vol_percent,   UPD_None );
  writeConfigEntry ( "Mute",          m_vol_muted,     UPD_None );
  writeConfigEntry ( "AlarmPercent",  m_alarm_percent, UPD_None );
  writeConfigEntry ( "TouchSound",    m_snd_touch,     UPD_None );
  writeConfigEntry ( "KeySound",      m_snd_key,       UPD_None );
  writeConfigEntry ( "AlarmSound",    m_snd_alarm,     UPD_Vol );
  writeConfigEntry ( "Mic",           m_mic_percent,   UPD_None );
  writeConfigEntry ( "MicMute",       m_mic_muted,     UPD_Mic );
 }
 bool VolumeControl::volMuted ( ) const
 {
  return m_vol_muted;
 }
 int VolumeControl::volPercent ( ) const
 {
  return m_vol_percent;
 }
 void VolumeControl::keyPressEvent ( QKeyEvent *e )
 {
  switch ( e-> key ( )) {
    case Key_Up:
      volSlider-> subtractStep ( );
      break;
    case Key_Down:
      volSlider-> addStep ( );
      break;
    case Key_Space:
      volLed-> toggle ( );
      break;
    case Key_Escape:
      hide ( );
      break;
  }
 }
 void VolumeControl::buttonChanged ( )
 {
  if ( upButton-> isDown ( ) || downButton->isDown ( )) {
    rateTimerDone ( ); // Call it one time manually, otherwise it wont get
    // called at all when a button is pressed for a time
    // shorter than RATE_TIMER_INTERVAL.
    rateTimer-> start ( RATE_TIMER_INTERVAL, false );
  }
  else
    rateTimer-> stop ( );
 }
 void VolumeControl::rateTimerDone ( )
 {
  if ( upButton-> isDown ( ))
    volSlider-> setValue ( volSlider-> value ( ) - 2 );
  else // if ( downButton-> isDown ( ))
    volSlider-> setValue ( volSlider-> value ( ) + 2 );
 }
 void VolumeControl::show ( bool /*showMic*/ )
 {
  readConfig ( );
  QPoint curPos = m_icon-> mapToGlobal ( QPoint ( 0, 0 ));
  int w = sizeHint ( ). width ( );
  int x = curPos.x ( ) - ( w / 2 );
  if (( x + w ) > QPEApplication::desktop ( )-> width ( ))
    x = QPEApplication::desktop ( )-> width ( ) - w;
  move ( x, curPos. y ( ) - sizeHint ( ). height ( ));
  QFrame::show ( );
 }
 void VolumeControl::readConfig ( bool force )
 {
  Config cfg ( "qpe" );
  cfg. setGroup ( "Volume" );
  int old_vp = m_vol_percent;
  int old_mp = m_mic_percent;
  int old_bass = m_bass_percent;
  int old_treble = m_treble_percent;
  bool old_vm = m_vol_muted;
  bool old_mm = m_mic_muted;
  bool old_sk = m_snd_key;
  bool old_st = m_snd_touch;
  bool old_sa = m_snd_alarm;
  int old_ap = m_alarm_percent;
  m_vol_percent   = cfg. readNumEntry ( "VolumePercent", 50 );
  m_mic_percent   = cfg. readNumEntry ( "Mic", 50 );
  m_bass_percent  = cfg. readNumEntry ( "BassPercent", 50 );
  m_treble_percent = cfg. readNumEntry ( "TreblePercent", 50 );
  m_vol_muted     = cfg. readBoolEntry ( "Mute", 0 );
  m_mic_muted     = cfg. readBoolEntry ( "MicMute", 0 );
  m_snd_key       = cfg. readBoolEntry ( "KeySound", 0 );
  m_snd_touch     = cfg. readBoolEntry ( "TouchSound", 0 );
  m_snd_alarm     = cfg. readBoolEntry ( "AlarmSound", 1 );
  m_alarm_percent = cfg. readNumEntry ( "AlarmPercent", 65 );
  if ( force || ( m_vol_percent != old_vp ))
    volSlider-> setValue ( 100 - m_vol_percent );
  if ( force || ( m_mic_percent != old_mp ))
    micSlider-> setValue ( 100 - m_mic_percent );
  if ( force || ( m_alarm_percent != old_ap ))
    alarmSlider-> setValue ( 100 - m_alarm_percent );
  if ( force || ( m_bass_percent != old_bass ))
    bassSlider-> setValue ( 100 - m_bass_percent );
  if ( force || ( m_treble_percent != old_treble ))
    trebleSlider-> setValue ( 100 - m_treble_percent );
  if ( force || ( m_vol_muted != old_vm ))
    volLed-> setOn ( !m_vol_muted );
  if ( force || ( m_mic_muted != old_mm ))
    micLed-> setOn ( !m_mic_muted );
  if ( force || ( m_snd_alarm != old_sa ))
    alarmLed-> setOn ( m_snd_alarm );
  if ( force || ( m_snd_key != old_sk ))
    keyBox-> setChecked ( m_snd_key );
  if ( force || ( m_snd_touch != old_st ))
    tapBox-> setChecked ( m_snd_touch );
  if ( force || ( m_snd_alarm != old_sa ))
    alarmBox-> setChecked ( m_snd_alarm );
 }
 void VolumeControl::volumeChanged ( bool /*nowMuted*/ )
 {
  int prevVol = m_vol_percent;
  bool prevMute = m_vol_muted;
  readConfig ( );
  // Handle case where muting it toggled
  if ( m_vol_muted != prevMute )
          m_icon-> redraw ( true );
  else if ( prevVol != m_vol_percent ) // Avoid over repainting
          m_icon-> redraw ( false );
 }
 void VolumeControl::micChanged ( bool nowMuted )
 {
  if ( !nowMuted )
    readConfig ( );
  m_mic_muted = nowMuted;
 }
 void VolumeControl::screenTapToggled ( bool b )
 {
  m_snd_touch = b;
  writeConfigEntry ( "TouchSound", m_snd_touch, UPD_Vol );
 }
 void VolumeControl::keyClickToggled ( bool b )
 {
  m_snd_key = b;
  writeConfigEntry ( "KeySound", m_snd_key, UPD_Vol );
 }
 void VolumeControl::alarmSoundToggled ( bool b )
 {
  m_snd_alarm = b;
  writeConfigEntry ( "AlarmSound", m_snd_alarm, UPD_Vol );
 }
 void VolumeControl::volMuteToggled ( bool b )
 {
  m_vol_muted = !b;
  m_icon-> redraw ( true );
  writeConfigEntry ( "Mute", m_vol_muted, UPD_Vol );
 }
 void VolumeControl::micMuteToggled ( bool b )
 {
  m_mic_muted = !b;
  writeConfigEntry ( "MicMute", m_mic_muted, UPD_Mic );
 }
 void VolumeControl::volMoved ( int percent )
 {
  m_vol_percent = 100 - percent;
  // clamp volume percent to be between 0 and 100
  m_vol_percent = ( m_vol_percent < 0 ) ? 0 : (( m_vol_percent > 100 ) ? 100 : m_vol_percent );
  // repaint just the little volume rectangle
  m_icon-> redraw ( false );
  writeConfigEntry ( "VolumePercent", m_vol_percent, UPD_Vol );
 }
 void VolumeControl::micMoved ( int percent )
 {
  m_mic_percent = 100 - percent;
  // clamp volume percent to be between 0 and 100
  m_mic_percent = ( m_mic_percent < 0 ) ? 0 : (( m_mic_percent > 100 ) ? 100 : m_mic_percent );
  writeConfigEntry ( "Mic", m_mic_percent, UPD_Mic );
 }
 void VolumeControl::alarmMoved ( int percent )
 {
  m_alarm_percent = 100 - percent;
  // clamp volume percent to be between 0 and 100
  m_alarm_percent = ( m_alarm_percent < 0 ) ? 0 : (( m_alarm_percent > 100 ) ? 100 : m_alarm_percent );
  writeConfigEntry ( "AlarmPercent", m_alarm_percent, UPD_None );
 }
 void VolumeControl::bassMoved ( int percent )
 {
  m_bass_percent = 100 - percent;
  // clamp bass percent to be between 0 and 100
  m_bass_percent = ( m_bass_percent < 0 ) ? 0 : (( m_bass_percent > 100 ) ? 100 : m_bass_percent );
  writeConfigEntry ( "BassPercent", m_bass_percent, UPD_Bass );
 }
 void VolumeControl::trebleMoved ( int percent )
 {
  m_treble_percent = 100 - percent;
  // clamp treble percent to be between 0 and 100
  m_treble_percent = ( m_treble_percent < 0 ) ? 0 : (( m_treble_percent > 100 ) ? 100 : m_treble_percent );
  writeConfigEntry ( "TreblePercent", m_treble_percent, UPD_Treble );
 }
 void VolumeControl::writeConfigEntry ( const char *entry, int val, eUpdate upd )
 {
  Config cfg ( "qpe" );
  cfg. setGroup ( "Volume" );
  cfg. writeEntry ( entry, val );
 //  cfg. write ( );
 #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP)
  switch ( upd ) {
    case UPD_Vol: {
      QCopEnvelope ( "QPE/System", "volumeChange(bool)" ) << m_vol_muted;
      break;
    }
    case UPD_Mic: {
      QCopEnvelope ( "QPE/System", "micChange(bool)" ) << m_mic_muted;
      break;
    }
    case UPD_Bass: {
      QCopEnvelope ( "QPE/System", "bassChange(bool)" ) << true;
      break;
    }
    case UPD_Treble: {
      QCopEnvelope ( "QPE/System", "trebleChange(bool)" ) << true;
      break;
    }
    case UPD_None:
      break;
  }
 #endif
 }
 //===========================================================================
 VolumeApplet::VolumeApplet( QWidget *parent, const char *name )
    : QWidget( parent, name )
 {
  setFixedWidth ( AppLnk::smallIconSize()  );
  setFixedHeight ( AppLnk::smallIconSize()+4 );
  m_pixmap = new QPixmap ( Resource::loadPixmap ( "volume" ));
  m_dialog = new VolumeControl ( this, true, this, "volumecontrol" );
  connect ( qApp, SIGNAL( volumeChanged ( bool )), m_dialog, SLOT( volumeChanged( bool )));
  connect ( qApp, SIGNAL( micChanged ( bool )), m_dialog, SLOT ( micChanged( bool )));
 }
 VolumeApplet::~VolumeApplet()
 {
  delete m_pixmap;
 }
+int VolumeApplet::position()
+{
+  return 6;
+}
 void VolumeApplet::mousePressEvent ( QMouseEvent * )
 {
  if ( m_dialog-> isVisible ( ))
    m_dialog-> hide ( );
  else
    m_dialog-> show ( true );
 }
 void VolumeApplet::redraw ( bool all )
 {
        if ( all )
                repaint ( true );
        else
                repaint ( 2, height ( ) - 3, width ( ) - 4, 2, false );
 }
 void VolumeApplet::paintEvent ( QPaintEvent * )
 {
  QPainter p ( this );
  p. drawPixmap ( (width()- m_pixmap->width())/2, QMAX( (height()-4-m_pixmap->height() )/2, 1), *m_pixmap );
  p. setPen ( darkGray );
  p. drawRect ( 1, height() - 4, width() - 2, 4 );
  int pixelsWide = m_dialog-> volPercent ( ) * ( width() - 4 ) / 100;
  p. fillRect ( 2, height() - 3, pixelsWide, 2, red );
  p. fillRect ( pixelsWide + 2, height() - 3, width() - 4 - pixelsWide, 2, lightGray );
  if ( m_dialog-> volMuted ( )) {
    p. setPen ( red );
    p. drawLine ( 1, 2, width() - 2, height() - 5 );
    p. drawLine ( 1, 3, width() - 2, height() - 4 );
    p. drawLine ( width() - 2, 2, 1, height() - 5 );
    p. drawLine ( width() - 2, 3, 1, height() - 4 );
  }
 }
+Q_EXPORT_INTERFACE()
+{
+    Q_CREATE_INSTANCE( OTaskbarAppletWrapper<VolumeApplet> );
+}
diff --git a/core/applets/volumeapplet/volume.h b/core/applets/volumeapplet/volume.h
index d2345b5..454a688 100644
--- a/core/applets/volumeapplet/volume.h
+++ b/core/applets/volumeapplet/volume.h
@@ -1,134 +1,135 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef __VOLUME_APPLET_H__
 #define __VOLUME_APPLET_H__
 #include <qframe.h>
 class QPixmap;
 class QTimer;
 class QSlider;
 class QCheckBox;
 class QButton;
 class OLedBox;
 class VolumeApplet;
 class VolumeControl : public QFrame {
        Q_OBJECT
        
 public:
        VolumeControl ( VolumeApplet *icon, bool showMic = false, QWidget *parent=0, const char *name=0 );
        bool volMuted ( ) const;
        int volPercent ( ) const;
        virtual void show ( bool showmic );
 protected:
        virtual void keyPressEvent ( QKeyEvent * e );
        
 protected slots:
        void volumeChanged ( bool muted );
        void micChanged ( bool muted );
        
 private slots:
        void volMoved ( int percent );
        void micMoved ( int percent );
        void alarmMoved ( int percent );
        void bassMoved( int percent );
        void trebleMoved( int percent );
        
        void volMuteToggled ( bool );
        void micMuteToggled ( bool );
        void alarmSoundToggled ( bool );
        void keyClickToggled ( bool );
        void screenTapToggled ( bool ); 
        void buttonChanged ( );
        void rateTimerDone ( );
        
 private:
        void readConfig ( bool force = false );
        enum eUpdate {
                UPD_None,
                UPD_Vol,
                UPD_Mic,
                UPD_Bass,
                UPD_Treble
        };
        void writeConfigEntry ( const char *entry, int val, eUpdate upd );
 private:
        QSlider *volSlider;
        QSlider *bassSlider;
        QSlider *trebleSlider;
        QSlider *micSlider;
        QSlider *alarmSlider;
        OLedBox *volLed;
        OLedBox *micLed;
        OLedBox *alarmLed;
        
        QCheckBox *alarmBox;
        QCheckBox *tapBox;
        QCheckBox *keyBox;
        QPushButton *upButton;
        QPushButton *downButton;
        QTimer *rateTimer;
        int  m_vol_percent;
        int  m_mic_percent;
        int  m_alarm_percent;
        int  m_bass_percent;
        int  m_treble_percent;
        bool m_vol_muted;
                bool m_mic_muted;
        bool m_snd_alarm;
        bool m_snd_touch;
        bool m_snd_key;
                VolumeApplet *m_icon;
 };
 class VolumeApplet : public QWidget {
        Q_OBJECT
 public:
        VolumeApplet ( QWidget *parent = 0, const char *name=0 );
        ~VolumeApplet ( );
+        static int position();
        void redraw ( bool all = true );
 protected:
        virtual void mousePressEvent ( QMouseEvent * );
        virtual void paintEvent ( QPaintEvent* );
        
 private:
        QPixmap *      m_pixmap;
        VolumeControl *m_dialog;
 };
 #endif // __VOLUME_APPLET_H__
diff --git a/core/applets/volumeapplet/volumeapplet.pro b/core/applets/volumeapplet/volumeapplet.pro
index 92c6b0a..b14956e 100644
--- a/core/applets/volumeapplet/volumeapplet.pro
+++ b/core/applets/volumeapplet/volumeapplet.pro
@@ -1,13 +1,13 @@
        TEMPLATE= lib
        CONFIG  += qt plugin warn_on release
-        HEADERS=   volume.h volumeappletimpl.h oledbox.h
+        HEADERS         = volume.h oledbox.h
-        SOURCES=   volume.cpp volumeappletimpl.cpp oledbox.cpp
+        SOURCES         = volume.cpp oledbox.cpp
        TARGET  = volumeapplet
        DESTDIR         = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include
 LIBS            += -lqpe
        VERSION         = 1.0.0
 include ( $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/volumeapplet/volumeappletimpl.cpp b/core/applets/volumeapplet/volumeappletimpl.cpp
deleted file mode 100644
index 9c7dea3..0000000
--- a/core/applets/volumeapplet/volumeappletimpl.cpp
+++ b/dev/null
@@ -1,65 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of Qtopia Environment.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-#include "volume.h"
-#include "volumeappletimpl.h"
-VolumeAppletImpl::VolumeAppletImpl()
-    : volume(0)
-{
-}
-VolumeAppletImpl::~VolumeAppletImpl()
-{
-        delete volume;
-}
-QWidget *VolumeAppletImpl::applet( QWidget *parent )
-{
-        if ( !volume )
-                volume = new VolumeApplet( parent );
-        return volume;
-}
-int VolumeAppletImpl::position() const
-{
-        return 6;
-}
-QRESULT VolumeAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
-{
-        *iface = 0;
-        if ( uuid == IID_QUnknown )
-                *iface = this;
-        else if ( uuid == IID_TaskbarApplet )
-                *iface = this;
-        else
-            return QS_FALSE;
-        if ( *iface )
-                (*iface)->addRef();
-        return QS_OK;
-}
-Q_EXPORT_INTERFACE()
-{
-    Q_CREATE_INSTANCE( VolumeAppletImpl )
-}
diff --git a/core/applets/volumeapplet/volumeappletimpl.h b/core/applets/volumeapplet/volumeappletimpl.h
deleted file mode 100644
index a9221c6..0000000
--- a/core/applets/volumeapplet/volumeappletimpl.h
+++ b/dev/null
@@ -1,43 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of Qtopia Environment.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-#ifndef VOLUMEAPPLETIMPL_H
-#define VOLUMEAPPLETIMPL_H
-#include <qpe/taskbarappletinterface.h>
-class VolumeApplet;
-class VolumeAppletImpl : public TaskbarAppletInterface
-{
-public:
-    VolumeAppletImpl();
-    virtual ~VolumeAppletImpl();
-    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
-    Q_REFCOUNT
-    virtual QWidget *applet( QWidget *parent );
-    virtual int position() const;
-private:
-    VolumeApplet *volume;
-};
-#endif
diff --git a/core/obex/obex.pro b/core/obex/obex.pro
index 6f0e6d1..a296b2c 100644
--- a/core/obex/obex.pro
+++ b/core/obex/obex.pro
@@ -1,13 +1,13 @@
        TEMPLATE= lib
        CONFIG  += qt warn_on release
-        HEADERS=   obex.h obeximpl.h obexhandler.h obexsend.h receiver.h
+        HEADERS=   obex.h obexhandler.h obexsend.h receiver.h
-        SOURCES=   obex.cc obeximpl.cpp obexsend.cpp obexhandler.cpp receiver.cpp
+        SOURCES=   obex.cc obexsend.cpp obexhandler.cpp receiver.cpp
        TARGET  = opieobex
        DESTDIR         = $(OPIEDIR)/plugins/obex
 INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/core/launcher
 DEPENDPATH      += ../$(OPIEDIR)/include
-LIBS            += -lqpe -lopie
+LIBS            += -lqpe -lopiecore2
        VERSION         = 0.0.2
 include ( $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
author	mickeyl <mickeyl>	2004-03-01 19:19:37 (UTC)
committer	mickeyl <mickeyl>	2004-03-01 19:19:37 (UTC)
commit	ddc3d749af5f7afebf69488b79641771fe246b5b (patch) (unidiff)
tree	8ea8614906c568e4677493ef09040724d60dd2d4
parent	fb0981f47e529f9d1dd77fa005ffa3c3ecedff67 (diff)
download	opie-ddc3d749af5f7afebf69488b79641771fe246b5b.zip opie-ddc3d749af5f7afebf69488b79641771fe246b5b.tar.gz opie-ddc3d749af5f7afebf69488b79641771fe246b5b.tar.bz2