Merge from BRANCH_1_0

6 files changed, 11 insertions, 18 deletions

diff --git a/core/applets/batteryapplet/battery.cpp b/core/applets/batteryapplet/battery.cpp
index 480d261..078ce8d 100644
--- a/core/applets/batteryapplet/battery.cpp
+++ b/core/applets/batteryapplet/battery.cpp
@@ -101,60 +101,50 @@ void BatteryMeter::timerEvent( QTimerEvent * )
     if ( batteryView )
         batteryView->repaint();
     }
 }
 
 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 );
-        if ( percent > 98 ) {
-            p.drawText( 0, 0, width(), height(), Qt::AlignCenter, tr( "F" ) );
-        }
-        else if ( percent < 5 )
-        {
-            p.drawText( 0, 0, width(), height(), Qt::AlignCenter, tr( "E" ) );
-        }
-        else
-        {
-            p.drawText( 0, AppLnk::smallIconSize()/2, QString::number( percent ) );
-            p.drawText( AppLnk::smallIconSize()/4, AppLnk::smallIconSize(), "%" );
-        }
+        p.drawText( 0, AppLnk::smallIconSize()/2, QString::number( percent ) );
+        p.drawText( AppLnk::smallIconSize()/4, AppLnk::smallIconSize(), "%" );
         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
diff --git a/core/applets/batteryapplet/batterystatus.cpp b/core/applets/batteryapplet/batterystatus.cpp
index 092a48d..5936b5d 100644
--- a/core/applets/batteryapplet/batterystatus.cpp
+++ b/core/applets/batteryapplet/batterystatus.cpp
@@ -219,37 +219,37 @@ void BatteryStatus::paintEvent( QPaintEvent * ) {
   p.setPen( black );
   qDrawShadePanel( &p,   9, 30, rightEnd1 , 39, colorGroup(), TRUE, 1, NULL);
   qDrawShadePanel( &p, rightEnd2, 37,  12, 24, colorGroup(), TRUE, 1, NULL);
   drawSegment( &p, QRect( 10, 30, percent2, 40 ), lightc, darkc, lightc.light(115), 6 );
   drawSegment( &p, QRect( 11 + percent2, 30,  rightEnd1 - percent2, 40 ), white.light(80), black, white.light(90), 6 );
   drawSegment( &p, QRect( rightEnd2, 37, 10, 25 ), white.light(80), black, white.light(90), 2 );
   p.setPen( black);
 
 
   if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) {
 
       p.drawText(15, 50, tr ("Ipaq  " + ipaqChem));
 
       QString jacketMsg;
       if (bat2) {
           p.setPen(black);
           p.drawText(10,220, tr("Percentage battery remaining: ") + perc2 + " " + jackStatus);
           p.drawText(10,240, tr("Battery time remaining: ") + sec2);
           jacketMsg = tr("Jacket  " + jackChem);
       } else {
           jackPercent = 0;
           jacketMsg = tr("No jacket with battery inserted");
       }
 
-      int jackPerc =  ( jackPercent / 100.0 ) * screenWidth - 47;
+      int jackPerc =  ( jackPercent / 100.0 ) * ( screenWidth - 47 ) ;
 
       qDrawShadePanel( &p,   9, 160, rightEnd1, 39, colorGroup(), TRUE, 1, NULL);
       qDrawShadePanel( &p, rightEnd2, 167,  12, 24, colorGroup(), TRUE, 1, NULL);
       drawSegment( &p, QRect( 10, 160, jackPerc, 40 ), lightc, darkc, lightc.light(115), 6 );
       drawSegment( &p, QRect( 11 + jackPerc, 160, rightEnd1 - jackPerc, 40 ), white.light(80), black, white.light(90), 6 );
       drawSegment( &p, QRect( rightEnd2, 167, 10, 25 ), white.light(80), black, white.light(90), 2 );
       p.setPen( black );
       p.drawText(15, 180, jacketMsg);
   }
 
 }
 
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index b8c4553..4ed09b8 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -251,49 +251,51 @@ bool CardMonitor::getStatusPcmcia(int showPopUp)
             QString what = QString::null;
             if (cardWas0 != cardInPcmcia0) {
                 if (cardInPcmcia0) {
                     text += tr("New card: ");
                     what = "on";
                 } else {
                     text += tr("Ejected: ");
                     what = "off";
                 }
                 text += cardInPcmcia0Name;
                 popUp(text, "cardmon/" + cardInPcmcia0Type);
             }
 
             if (cardWas1 != cardInPcmcia1) {
                 if (cardInPcmcia1) {
                     text += tr("New card: ");
                     what = "on";
                 } else {
                     text += tr("Ejected: ");
                     what = "off";
                 }
                 text += cardInPcmcia1Name;
                 popUp(text, "cardmon/" + cardInPcmcia1Type);
             }
+#ifndef QT_NO_SOUND
             QSound::play(Resource::findSound("cardmon/card" + what));
+#endif
         }
     } else {
         // no file found
         qDebug("no file found");
         cardInPcmcia0 = FALSE;
         cardInPcmcia1 = FALSE;
     }
     repaint( FALSE );
     return ((cardWas0 == cardInPcmcia0
              && cardWas1 == cardInPcmcia1) ? FALSE : TRUE);
 
 }
 
 
 bool CardMonitor::getStatusSd(int showPopUp)
 {
 
             bool cardWas = cardInSd;// remember last state
     cardInSd = FALSE;
 
 #if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
     struct mntent *me;
     FILE *mntfp = setmntent("/etc/mtab", "r");
 
@@ -303,47 +305,49 @@ bool CardMonitor::getStatusSd(int showPopUp)
             //qDebug( fs );
             if (fs.left(14) == "/dev/mmc/part1" || fs.left(7) == "/dev/sd"
                 || fs.left(9) == "/dev/mmcd") {
                 cardInSd = TRUE;
                 show();
             }
 //            else {
 //                 cardInSd = FALSE;
 //             }
         }
         endmntent(mntfp);
     }
 
     if (!showPopUp && cardWas != cardInSd) {
         QString text = QString::null;
         QString what = QString::null;
         if (cardInSd) {
             text += "New card: SD/MMC";
             what = "on";
         } else {
             text += "Ejected: SD/MMC";
             what = "off";
         }
         //qDebug("TEXT: " + text );
+#ifndef QT_NO_SOUND
         QSound::play(Resource::findSound("cardmon/card" + what));
+#endif
                 popUp(text, "cardmon/ide");// XX add SD pic
     }
 #else
 #error "Not on Linux"
 #endif
     repaint( FALSE );
     return ((cardWas == cardInSd) ? FALSE : TRUE);
 }
 
 void CardMonitor::paintEvent(QPaintEvent *)
 {
 
     QPainter p(this);
 
     if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd ) {
         p.drawPixmap(0, 0, pm  );
         show();
     } else {
         //p.eraseRect(rect());
         hide();
     }
 }
diff --git a/core/applets/homeapplet/home.h b/core/applets/homeapplet/home.h
index 64af97d..1186caf 100644
--- a/core/applets/homeapplet/home.h
+++ b/core/applets/homeapplet/home.h
@@ -11,39 +11,39 @@
 ** 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 __OPIE_HOME_APPLET_H__
 #define __OPIE_HOME_APPLET_H__
 
 #include <qpe/menuappletinterface.h>
 
 class HomeApplet : public QObject, public MenuAppletInterface
 {
 public:
     HomeApplet ( );
     virtual ~HomeApplet ( );
 
     QRESULT queryInterface( const QUuid&, QUnknownInterface** );
     Q_REFCOUNT
 
     virtual int position() const;
-    
+
     virtual QString name ( ) const;
     virtual QIconSet icon ( ) const;
     virtual QString text ( ) const;
     virtual QString tr( const char* ) const;
     virtual QString tr( const char*, const char* ) const;
     virtual QPopupMenu *popup ( QWidget *parent ) const;
-    
+
     virtual void activated ( );
 
 private:
     ulong ref;
 };
 
 #endif
diff --git a/core/applets/restartapplet2/.cvsignore b/core/applets/restartapplet2/.cvsignore
index a403d26..4943911 100644
--- a/core/applets/restartapplet2/.cvsignore
+++ b/core/applets/restartapplet2/.cvsignore
@@ -1,7 +1,6 @@
 *.moc
 *.~
 Makefile*
 config.in
 moc_*
 opieobjconfig.in
-opieobj
diff --git a/core/applets/suspendapplet/suspend.h b/core/applets/suspendapplet/suspend.h
index 0c92bcb..75467c1 100644
--- a/core/applets/suspendapplet/suspend.h
+++ b/core/applets/suspendapplet/suspend.h
@@ -11,39 +11,39 @@
 ** 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 __OPIE_SUSPEND_APPLET_H__
 #define __OPIE_SUSPEND_APPLET_H__
 
 #include <qpe/menuappletinterface.h>
 
 class SuspendApplet : public QObject, public MenuAppletInterface
 {
 public:
     SuspendApplet ( );
     virtual ~SuspendApplet ( );
 
     QRESULT queryInterface( const QUuid&, QUnknownInterface** );
     Q_REFCOUNT
 
     virtual int position() const;
-    
+
     virtual QString name ( ) const;
     virtual QIconSet icon ( ) const;
     virtual QString text ( ) const;
     virtual QString tr( const char* ) const;
     virtual QString tr( const char*, const char* ) const;
     virtual QPopupMenu *popup ( QWidget *parent ) const;
-    
+
     virtual void activated ( );
 
 private:
     ulong ref;
 };
 
 #endif