libopie1-->libopie2

6 files changed, 20 insertions, 113 deletions

diff --git a/core/applets/batteryapplet/battery.cpp b/core/applets/batteryapplet/battery.cpp
index 9a9ddf6..fed9b34 100644
--- a/core/applets/batteryapplet/battery.cpp
+++ b/core/applets/batteryapplet/battery.cpp
@@ -1,91 +1,94 @@
 /**********************************************************************
 ** 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 "battery.h"
 #include "batterystatus.h"
 
+/* OPIE */
+#include <opie2/otaskbarapplet.h>
 #include <qpe/applnk.h>
 #include <qpe/config.h>
 #include <qpe/power.h>
 #include <qpe/qpeapplication.h>
 
+/* QT */
 #include <qpainter.h>
 #include <qtimer.h>
 
 
 BatteryMeter::BatteryMeter( QWidget *parent )
     : QWidget( parent ), charging(false)
 {
     ps = new PowerStatus;
     startTimer( 10000 );
 
     setFixedWidth(  QMAX(AppLnk::smallIconSize()*3/4, 6) );
     setFixedHeight( AppLnk::smallIconSize() );
 
     chargeTimer = new QTimer( this );
     connect( chargeTimer, SIGNAL(timeout()), this, SLOT(chargeTimeout()) );
     timerEvent(0);
     QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold );
     Config c( "qpe" );
     c.setGroup( "Battery" );
     style = c.readNumEntry( "Style", 0 );
 }
 
 BatteryMeter::~BatteryMeter()
 {
     delete ps;
 }
 
 QSize BatteryMeter::sizeHint() const
 {
     return QSize(QMAX(AppLnk::smallIconSize()*3/4, 6), height() );
 }
 
 void BatteryMeter::mousePressEvent( QMouseEvent* e )
 {
     if ( e->button() == RightButton )
     {
         style = 1-style;
         Config c( "qpe" );
         c.setGroup( "Battery" );
         c.writeEntry( "Style", style );
         repaint( true );
     }
     QWidget::mousePressEvent( e );
 }
 
 void BatteryMeter::mouseReleaseEvent( QMouseEvent* /*e*/ )
 {
     if ( batteryView && batteryView->isVisible() ) {
         delete (QWidget *) batteryView;
     } else {
         if ( !batteryView ) batteryView = new BatteryStatus( ps );
         QPEApplication::showWidget( batteryView );
         batteryView->raise();
         batteryView->show();
     }
 }
 
 void BatteryMeter::timerEvent( QTimerEvent * )
 {
     PowerStatus prev = *ps;
 
     *ps = PowerStatusManager::readStatus();
 
     if ( prev != *ps ) {
@@ -107,64 +110,74 @@ void BatteryMeter::timerEvent( QTimerEvent * )
 }
 
 void BatteryMeter::chargeTimeout()
 {
     percent += 20;
     if ( percent > 100 )
     percent = 0;
 
     repaint(FALSE);
     if ( batteryView )
     batteryView->updatePercent( percent );
 }
 
 void BatteryMeter::paintEvent( QPaintEvent* )
 {
 
     if ( style == 1 )
     {
         QPainter p(this);
         QFont f( "Fixed", AppLnk::smallIconSize()/2 );
         QFontMetrics fm( f );
         p.setFont( f );
         p.drawText( 0, height()/2, QString::number( percent ) );
         p.drawText( width()/4, height(), "%" );
         return;
     }
 
     QPainter p(this);
     QColor color;
     QColor g = gray.light( 160 );
     switch ( ps->acStatus() )
     {
         case PowerStatus::Offline: color = blue.light( 150 ); break;
         case PowerStatus::Online: color = green.dark( 130 ).light( 180 ); break;
         default: color = red.light( 160 );
     }
 
     int w = height() / 2;
     if ( !(w%2) ) w--; // should have an odd value to get a real middle line
     int h = height() - 4;
     int pix = (percent * h) / 100;
     int y2 = height() -2;
     int y = y2 - pix;
     int x1 = (width() - w ) / 2;
 
     p.setPen(QColor(80,80,80));
     p.drawLine(x1+w/4,0,x1+w/4+w/2+1,0);  // header
     p.drawRect(x1,1,w,height()-1);      // corpus
     p.setBrush(color);
 
     //int extra = ((percent * h) % 100)/(100/4);
 
     int middle = w/2;
     for ( int i = 0; i < middle; i++ )
     {
         p.setPen( gray.dark( 100+i*20 ) );
         p.drawLine( x1+middle-i, 2, x1+middle-i, y-1 );
         p.drawLine( x1+middle+i, 2, x1+middle+i, y-1 );
         p.setPen( color.dark( 100+i*20 ) );
         p.drawLine( x1+middle-i, y, x1+middle-i, y2 );
         p.drawLine( x1+middle+i, y, x1+middle+i, y2 );
     }
 }
 
+int BatteryMeter::position()
+{
+    return 8;
+}
+
+Q_EXPORT_INTERFACE()
+{
+    Q_CREATE_INSTANCE( OTaskbarAppletWrapper<BatteryMeter> );
+}
+
diff --git a/core/applets/batteryapplet/battery.h b/core/applets/batteryapplet/battery.h
index c2d1216..622c083 100644
--- a/core/applets/batteryapplet/battery.h
+++ b/core/applets/batteryapplet/battery.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 BATTERY_H
 #define BATTERY_H
 
 #include <qwidget.h>
 #include <qguardedptr.h>
 
 class PowerStatus;
 class BatteryStatus;
 class QTimer;
 
 class BatteryMeter : public QWidget
 {
     Q_OBJECT
   public:
     BatteryMeter( QWidget *parent = 0 );
     ~BatteryMeter();
 
     QSize sizeHint() const;
+    static int position();
 
   protected:
     void timerEvent( QTimerEvent* );
     void paintEvent( QPaintEvent* );
     void mousePressEvent( QMouseEvent* );
     void mouseReleaseEvent( QMouseEvent* );
 
   protected slots:
     void chargeTimeout();
 
   protected:
     QGuardedPtr<BatteryStatus> batteryView;
     PowerStatus *ps;
     QTimer *chargeTimer;
     int percent;
     bool charging;
     int style;
 };
 
 #endif
diff --git a/core/applets/batteryapplet/batteryapplet.pro b/core/applets/batteryapplet/batteryapplet.pro
index 2076987..d956aa0 100644
--- a/core/applets/batteryapplet/batteryapplet.pro
+++ b/core/applets/batteryapplet/batteryapplet.pro
@@ -1,13 +1,13 @@
 TEMPLATE	= lib
 CONFIG		+= qt plugin warn_on release
-HEADERS	=   battery.h batterystatus.h batteryappletimpl.h
-SOURCES	=   battery.cpp batterystatus.cpp batteryappletimpl.cpp
+HEADERS	=   battery.h batterystatus.h
+SOURCES	=   battery.cpp batterystatus.cpp
 TARGET		= batteryapplet
 DESTDIR		= $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include ..
-LIBS            += -lqpe -lopie
+LIBS            += -lqpe -lopiecore2
 VERSION		= 1.0.0
 
 include ( $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/batteryapplet/batteryappletimpl.cpp b/core/applets/batteryapplet/batteryappletimpl.cpp
deleted file mode 100644
index 7cc5f50..0000000
--- a/core/applets/batteryapplet/batteryappletimpl.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 "battery.h"
-#include "batteryappletimpl.h"
-
-
-BatteryAppletImpl::BatteryAppletImpl()
-    : battery(0)
-{
-}
-
-BatteryAppletImpl::~BatteryAppletImpl()
-{
-    delete battery;
-}
-
-QWidget *BatteryAppletImpl::applet( QWidget *parent )
-{
-    if ( !battery )
-	battery = new BatteryMeter( parent );
-    return battery;
-}
-
-int BatteryAppletImpl::position() const
-{
-    return 8;
-}
-
-QRESULT BatteryAppletImpl::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( BatteryAppletImpl )
-}
-
diff --git a/core/applets/batteryapplet/batteryappletimpl.h b/core/applets/batteryapplet/batteryappletimpl.h
deleted file mode 100644
index 99654e3..0000000
--- a/core/applets/batteryapplet/batteryappletimpl.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 BATTERYAPPLETIMPL_H
-#define BATTERYAPPLETIMPL_H
-
-#include <qpe/taskbarappletinterface.h>
-
-class BatteryMeter;
-
-class BatteryAppletImpl : public TaskbarAppletInterface
-{
-public:
-    BatteryAppletImpl();
-    virtual ~BatteryAppletImpl();
-
-    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
-    Q_REFCOUNT
-
-    virtual QWidget *applet( QWidget *parent );
-    virtual int position() const;
-
-private:
-    BatteryMeter *battery;
-};
-
-#endif
diff --git a/core/applets/batteryapplet/batterystatus.cpp b/core/applets/batteryapplet/batterystatus.cpp
index 86b20e8..b9ca7b5 100644
--- a/core/applets/batteryapplet/batterystatus.cpp
+++ b/core/applets/batteryapplet/batterystatus.cpp
@@ -1,71 +1,72 @@
 
 #include "batterystatus.h"
 
+/* OPIE */
+#include <opie2/odevice.h>
 #include <qpe/power.h>
 
-#include <opie/odevice.h>
-
+/* QT */
 #include <qpainter.h>
 #include <qpushbutton.h>
 #include <qdrawutil.h>
 #include <qfile.h>
 #include <qlayout.h>
 #include <qtextstream.h>
 #include <qapplication.h>
 #include <qmessagebox.h>
 
 using namespace Opie;
 
 BatteryStatus::BatteryStatus( const PowerStatus *p, QWidget *parent )
   : QWidget( parent, 0, WDestructiveClose), ps(p), bat2(false) {
   setCaption( tr("Battery status") );
   setMinimumSize( 150, 200 );
 
   QPushButton *pb = new QPushButton( tr("Close"), this );
   QVBoxLayout *layout = new QVBoxLayout ( this );
 
   jackPercent = 0;
 
   pb->setMaximumSize( 120, 40 );
 
   pb->show();
 
   layout->addStretch();
   layout->addWidget( pb );
 
   if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) {
       getProcApmStatusIpaq();
   }
   connect( pb, SIGNAL( clicked() ), this, SLOT( close() ) );
   percent = ps->batteryPercentRemaining();
   show();
 }
 
 BatteryStatus::~BatteryStatus()
 {
 }
 
 /*
  * Make use of the advanced apm interface of the ipaq
  */
 bool BatteryStatus::getProcApmStatusIpaq() {
 
   bat2 = false;
 
   QFile procApmIpaq("/proc/hal/battery");
 
   if (procApmIpaq.open(IO_ReadOnly) ) {
     QStringList list;
     // since it is /proc we _must_ use QTextStream
     QTextStream stream ( &procApmIpaq);
     QString streamIn;
     streamIn = stream.read();
     list = QStringList::split("\n", streamIn);
 
     for(QStringList::Iterator line=list.begin(); line!=list.end(); line++) {
       // not nice, need a rewrite later
       if( (*line).startsWith(" Percentage") ){
         if (bat2 == true) {
       perc2 = (*line).mid(((*line).find('('))+1,(*line).find(')')-(*line).find('(')-2);
     } else {
       perc1 = (*line).mid(((*line).find('('))+1,(*line).find(')')-(*line).find('(')-2);