4 files changed, 5 insertions, 5 deletions

diff --git a/core/apps/calibrate/calibrate.cpp b/core/apps/calibrate/calibrate.cpp
index c0ec933..945749b 100644
--- a/core/apps/calibrate/calibrate.cpp
+++ b/core/apps/calibrate/calibrate.cpp
@@ -1,243 +1,243 @@
 /**********************************************************************
 ** 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 "calibrate.h"
 
 #include <qpe/resource.h>
 
 #include <qapplication.h>
 
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
 
 #include <qpainter.h>
 #include <qtimer.h>
 #include <qwindowsystem_qws.h>
 #include <qgfx_qws.h>
 
 
 Calibrate::Calibrate(QWidget* parent, const char * name, WFlags wf) :
     QDialog( parent, name, TRUE, wf | WStyle_Tool | WStyle_Customize | WStyle_StaysOnTop )
 {
     showCross = TRUE;
     const int offset = 30;
     QRect desk = qApp->desktop()->geometry();
     setGeometry( 0, 0, desk.width(), desk.height() );
     if ( desk.height() < 250 ) {
         int w = desk.height()/3;
-        logo.convertFromImage(Resource::loadImage("opielogo").smoothScale(w,w));
+        logo.convertFromImage(Resource::loadImage("launcher/launcher/opielogo").smoothScale(w,w));
     } else {
-        logo = Resource::loadPixmap( "opielogo" );
+        logo = Resource::loadPixmap( "launcher/launcher/opielogo" );
     }
     cd.screenPoints[QWSPointerCalibrationData::TopLeft] = QPoint( offset, offset );
     cd.screenPoints[QWSPointerCalibrationData::BottomLeft] = QPoint( offset, qt_screen->deviceHeight() - offset );
     cd.screenPoints[QWSPointerCalibrationData::BottomRight] = QPoint( qt_screen->deviceWidth() - offset, qt_screen->deviceHeight() - offset );
     cd.screenPoints[QWSPointerCalibrationData::TopRight] = QPoint( qt_screen->deviceWidth() - offset, offset );
     cd.screenPoints[QWSPointerCalibrationData::Center] = QPoint( qt_screen->deviceWidth()/2, qt_screen->deviceHeight()/2 );
     goodcd = cd;
     reset();
 
     timer = new QTimer( this );
     connect( timer, SIGNAL(timeout()), this, SLOT(timeout()) );
 }
 
 Calibrate::~Calibrate()
 {
     store();
 }
 
 void Calibrate::show()
 {
     grabMouse();
     QWSServer::mouseHandler()->getCalibration(&goodcd);
     QWSServer::mouseHandler()->clearCalibration();
     QDialog::show();
 }
 
 void Calibrate::store()
 {
     QWSServer::mouseHandler()->calibrate( &goodcd );
 }
 
 void Calibrate::hide()
 {
     if ( isVisible() )
         store();
     QDialog::hide();
 }
 
 void Calibrate::reset()
 {
     penPos = QPoint();
     location = QWSPointerCalibrationData::TopLeft;
     crossPos = fromDevice( cd.screenPoints[location] );
 }
 
 QPoint Calibrate::fromDevice( const QPoint &p )
 {
     return qt_screen->mapFromDevice( p,
                 QSize(qt_screen->deviceWidth(), qt_screen->deviceHeight()) );
 }
 
 bool Calibrate::sanityCheck()
 {
     QPoint tl = cd.devPoints[QWSPointerCalibrationData::TopLeft];
     QPoint tr = cd.devPoints[QWSPointerCalibrationData::TopRight];
     QPoint bl = cd.devPoints[QWSPointerCalibrationData::BottomLeft];
     QPoint br = cd.devPoints[QWSPointerCalibrationData::BottomRight];
 
     int vl = QABS( tl.y() - bl.y() );
     int vr = QABS( tr.y() - br.y() );
     int diff = QABS( vl - vr );
     int avg = ( vl + vr ) / 2;
     if ( diff > avg / 20 ) // 5% leeway
         return FALSE;
 
     int ht = QABS( tl.x() - tr.x() );
     int hb = QABS( br.x() - bl.x() );
     diff = QABS( ht - hb );
     avg = ( ht + hb ) / 2;
     if ( diff > avg / 20 ) // 5% leeway
         return FALSE;
 
     return TRUE;
 }
 
 void Calibrate::moveCrosshair( QPoint pt )
 {
 /*
     QPainter p( this );
     p.drawPixmap( crossPos.x()-8, crossPos.y()-8, saveUnder );
     saveUnder = QPixmap::grabWindow( winId(), pt.x()-8, pt.y()-8, 16, 16 );
     p.drawRect( pt.x()-1, pt.y()-8, 2, 7 );
     p.drawRect( pt.x()-1, pt.y()+1, 2, 7 );
     p.drawRect( pt.x()-8, pt.y()-1, 7, 2 );
     p.drawRect( pt.x()+1, pt.y()-1, 7, 2 );
 */
     showCross = FALSE;
     repaint( crossPos.x()-8, crossPos.y()-8, 16, 16 );
     showCross = TRUE;
     crossPos = pt;
     repaint( crossPos.x()-8, crossPos.y()-8, 16, 16 );
 }
 
 void Calibrate::paintEvent( QPaintEvent * )
 {
     QPainter p( this );
 
     int y;
 
     if ( !logo.isNull() ) {
         y = height() / 2 - logo.height() - 15;
         p.drawPixmap( (width() - logo.width())/2, y, logo );
     }
 
     y = height() / 2 + 15;
 
     p.drawText( 0, y+height()/8, width(), height() - y, AlignHCenter,
         tr("Touch the crosshairs firmly and\n"
             "accurately to calibrate your screen.") );
 
     QFont f = p.font(); f.setBold(TRUE);
     p.setFont( f );
     p.drawText( 0, y, width(), height() - y, AlignHCenter|WordBreak, 
             tr("Welcome to Opie") );
 
 /*
     saveUnder = QPixmap::grabWindow( winId(), crossPos.x()-8, crossPos.y()-8,
                                      16, 16 );
     moveCrosshair( crossPos );
 */
     if ( showCross ) {
         p.drawRect( crossPos.x()-1, crossPos.y()-8, 2, 7 );
         p.drawRect( crossPos.x()-1, crossPos.y()+1, 2, 7 );
         p.drawRect( crossPos.x()-8, crossPos.y()-1, 7, 2 );
         p.drawRect( crossPos.x()+1, crossPos.y()-1, 7, 2 );
     }
 }
 
 void Calibrate::mousePressEvent( QMouseEvent *e )
 {
     // map to device coordinates
     QPoint devPos = qt_screen->mapToDevice( e->pos(),
                         QSize(qt_screen->width(), qt_screen->height()) );
     if ( penPos.isNull() )
         penPos = devPos;
     else
         penPos = QPoint( (penPos.x() + devPos.x())/2,
                          (penPos.y() + devPos.y())/2 );
 }
 
 void Calibrate::mouseReleaseEvent( QMouseEvent * )
 {
     if ( timer->isActive() )
         return;
 
     bool doMove = TRUE;
 
     cd.devPoints[location] = penPos;
     if ( location < QWSPointerCalibrationData::LastLocation ) {
         location = (QWSPointerCalibrationData::Location)((int)location + 1);
     } else {
         if ( sanityCheck() ) {
             reset();
             goodcd = cd;
             hide();
             emit accept();
             doMove = FALSE;
         } else {
             location = QWSPointerCalibrationData::TopLeft;
         }
     }
             
     if ( doMove ) {
         QPoint target = fromDevice( cd.screenPoints[location] );
         dx = (target.x() - crossPos.x())/10;
         dy = (target.y() - crossPos.y())/10;
         timer->start( 30 );
     }
 }
 
 void Calibrate::timeout()
 {
     QPoint target = fromDevice( cd.screenPoints[location] );
 
     bool doneX = FALSE;
     bool doneY = FALSE;
     QPoint newPos( crossPos.x() + dx, crossPos.y() + dy );
 
     if ( QABS(crossPos.x() - target.x()) <= QABS(dx) ) {
         newPos.setX( target.x() );
         doneX = TRUE;
     }
 
     if ( QABS(crossPos.y() - target.y()) <= QABS(dy) ) {
         newPos.setY(target.y());
         doneY = TRUE;
     }
 
     if ( doneX && doneY ) {
         penPos = QPoint();
         timer->stop();
     }
 
     moveCrosshair( newPos );
 }
 
 #endif // _WS_QWS_
diff --git a/core/multimedia/opieplayer/playlistselection.cpp b/core/multimedia/opieplayer/playlistselection.cpp
index 47fc731..b5d8b78 100644
--- a/core/multimedia/opieplayer/playlistselection.cpp
+++ b/core/multimedia/opieplayer/playlistselection.cpp
@@ -1,183 +1,183 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the 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 <qpe/applnk.h>
 #include <qpe/resource.h>
 #include <qpainter.h>
 #include <qimage.h>
 #include <qheader.h>
 #include <qlistview.h>
 #include <qlist.h>
 #include <qpixmap.h>
 
 #include "playlistselection.h"
 
 #include <stdlib.h>
 
 class PlayListSelectionItem : public QListViewItem {
 public:
     PlayListSelectionItem( QListView *parent, const DocLnk *f ) : QListViewItem( parent ), fl( f ) {
   setText( 0, f->name() );
   setPixmap( 0, f->pixmap() );
     }
 
     ~PlayListSelectionItem() {
     };
 
     const DocLnk *file() const { return fl; }
 
 private:
     const DocLnk *fl;
 };
 
 
 PlayListSelection::PlayListSelection( QWidget *parent, const char *name )
     : QListView( parent, name )
 {
     qDebug("starting playlistselector");
 // #ifdef USE_PLAYLIST_BACKGROUND
 //    setStaticBackground( TRUE );
 //      setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/background" ) );
 
-    setBackgroundPixmap( Resource::loadPixmap( "opielogo" ) );
+    setBackgroundPixmap( Resource::loadPixmap( "launcher/launcher/opielogo" ) );
 // #endif
 //      addColumn("Title",236);
 //      setAllColumnsShowFocus( TRUE );
      addColumn( tr( "Playlist Selection" ) );
     header()->hide();
     setSorting( -1, FALSE );
 }
 
 
 PlayListSelection::~PlayListSelection() {
 }
 
 
 // #ifdef USE_PLAYLIST_BACKGROUND
 void PlayListSelection::drawBackground( QPainter *p, const QRect &r ) {
 //  qDebug("drawBackground");
    p->fillRect( r, QBrush( white ) );
-      QImage logo = Resource::loadImage( "opielogo" );
+      QImage logo = Resource::loadImage( "launcher/launcher/opielogo" );
         if ( !logo.isNull() )
       p->drawImage( (width() - logo.width()) / 2, (height() - logo.height()) / 2, logo );
 }
 // #endif
 
 
 void PlayListSelection::contentsMouseMoveEvent( QMouseEvent *event ) {
     if ( event->state() == QMouseEvent::LeftButton ) {
   QListViewItem *currentItem = selectedItem();
   QListViewItem *itemUnder = itemAt( QPoint( event->pos().x(), event->pos().y() - contentsY() ) );
   if ( currentItem && currentItem->itemAbove() == itemUnder )
       moveSelectedUp();
   else if ( currentItem && currentItem->itemBelow() == itemUnder )
       moveSelectedDown();
     }
 }
 
 
 const DocLnk *PlayListSelection::current() {
     PlayListSelectionItem *item = (PlayListSelectionItem *)selectedItem();
     if ( item )
   return item->file();
     return NULL;
 }
 
 
 void PlayListSelection::addToSelection( const DocLnk &lnk ) {
     PlayListSelectionItem *item = new PlayListSelectionItem( this, new DocLnk( lnk ) );
     QListViewItem *current = selectedItem();
     if ( current )
         item->moveItem( current );
     setSelected( item, TRUE );
     ensureItemVisible( selectedItem() );
 }
 
 
 void PlayListSelection::removeSelected() {
     QListViewItem *item = selectedItem();
     if ( item )
   delete item;
     setSelected( currentItem(), TRUE );
     ensureItemVisible( selectedItem() );
 }
 
 
 void PlayListSelection::moveSelectedUp() {
     QListViewItem *item = selectedItem();
     if ( item && item->itemAbove() )
   item->itemAbove()->moveItem( item );
     ensureItemVisible( selectedItem() );
 }
 
 
 void PlayListSelection::moveSelectedDown() {
     QListViewItem *item = selectedItem();
     if ( item && item->itemBelow() )
         item->moveItem( item->itemBelow() );
     ensureItemVisible( selectedItem() );
 }
 
 
 bool PlayListSelection::prev() {
     QListViewItem *item = selectedItem();
     if ( item && item->itemAbove() )
         setSelected( item->itemAbove(), TRUE );
     else
   return FALSE;
     ensureItemVisible( selectedItem() );
     return TRUE;
 }
 
 
 bool PlayListSelection::next() {
     QListViewItem *item = selectedItem();
     if ( item && item->itemBelow() )
         setSelected( item->itemBelow(), TRUE );
     else
   return FALSE;
     ensureItemVisible( selectedItem() );
     return TRUE;
 }
 
 
 bool PlayListSelection::first() {
     QListViewItem *item = firstChild();
     if ( item )
         setSelected( item, TRUE );
     else
   return FALSE;
     ensureItemVisible( selectedItem() );
     return TRUE;
 }
 
 
 bool PlayListSelection::last() {
     QListViewItem *prevItem = NULL;
     QListViewItem *item = firstChild();
     while ( ( item = item->nextSibling() ) )
   prevItem = item;
     if ( prevItem )
         setSelected( prevItem, TRUE );
     else
   return FALSE;
     ensureItemVisible( selectedItem() );
     return TRUE;
 }
 
diff --git a/noncore/settings/sysinfo/versioninfo.cpp b/noncore/settings/sysinfo/versioninfo.cpp
index ecb13bc..27c4cf5 100644
--- a/noncore/settings/sysinfo/versioninfo.cpp
+++ b/noncore/settings/sysinfo/versioninfo.cpp
@@ -1,109 +1,109 @@
 /**********************************************************************
 ** 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 <qpe/resource.h>
 #include <qpe/version.h>
 
 #include <qlabel.h>
 #include <qpixmap.h>
 #include <qpainter.h>
 #include <qimage.h>
 #include <qtimer.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qlayout.h>
 #include "versioninfo.h"
 
 VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f )
     : QWidget( parent, name, f )
 {
     setMinimumSize( 200, 150 );
 
     QVBoxLayout *vb = new QVBoxLayout( this, 4 );
     
     QString kernelVersionString;
     QFile file( "/proc/version" );
     if ( file.open( IO_ReadOnly ) ) {
         QTextStream t( &file );
         QString v;
         t >> v; t >> v; t >> v;
         v = v.left( 20 );
         kernelVersionString = tr( "<b>Linux Kernel</b><p>Version: " ) + v + "<p>";
         t >> v;
         kernelVersionString += tr( "Compiled by: " ) + v;
         file.close();
     }
 
     QString palmtopVersionString;
     palmtopVersionString = tr( "<b>Opie</b><p>Version: " ) + QPE_VERSION + "<p>";
 #ifdef QPE_VENDOR
     QString builder = QPE_VENDOR;
 #else
     QString builder = "Unknown";
 #endif    
     palmtopVersionString += tr( "Compiled by: " ) + builder + "<p>";
     palmtopVersionString += tr( "Built on: " ) + __DATE__;
 
     
     QHBoxLayout *hb1 = new QHBoxLayout( vb );
     hb1->setSpacing( 2 );
 
     QLabel *palmtopLogo = new QLabel( this );
-    QImage logo1 = Resource::loadImage( "opielogo" );
+    QImage logo1 = Resource::loadImage( "launcher/launcher/opielogo" );
     logo1 = logo1.smoothScale( 50, 55 );
     QPixmap logo1Pixmap;
     logo1Pixmap.convertFromImage( logo1 );
     palmtopLogo->setPixmap( logo1Pixmap );
     palmtopLogo->setFixedSize( 60, 60 );
     hb1->addWidget( palmtopLogo, 0, Qt::AlignTop + Qt::AlignLeft );
     
     QLabel *palmtopVersion = new QLabel( this );
     palmtopVersion->setText( palmtopVersionString  );
     hb1->addWidget( palmtopVersion, 1, Qt::AlignTop + Qt::AlignLeft );
 
     
     QHBoxLayout *hb2 = new QHBoxLayout( vb );
     hb1->setSpacing( 2 );
     
     QLabel *linuxLogo = new QLabel( this );
 
     // Need to do this extra qpainter code with this image becuase for some
     // reason it doesn't alpha belnd if directly converted to a pixmap
     QPixmap logo2Pixmap( 60, 60 );
     QColor bgColor = colorGroup().background();
     QPainter painter( &logo2Pixmap );
     painter.fillRect( QRect( 0, 0, 60, 60 ), QBrush( bgColor ) );
     QImage logo2 = Resource::loadImage( "tux-logo" );
     logo2 = logo2.smoothScale( 40, 47 );
     painter.drawImage( 0, 0, logo2 );
     painter.end();
     linuxLogo->setPixmap( logo2Pixmap );
     linuxLogo->setFixedSize( 60, 60 );
     hb2->addWidget( linuxLogo, 0, Qt::AlignTop + Qt::AlignLeft );
     
     QLabel *kernelVersion = new QLabel( this );
     kernelVersion->setText( kernelVersionString );
     hb2->addWidget( kernelVersion, 1, Qt::AlignTop + Qt::AlignLeft );
 }
 
 VersionInfo::~VersionInfo()
 {
 }
 
diff --git a/pics/opielogo.png b/pics/launcher/opielogo.png
index 0adc183..0adc183 100644
--- a/pics/opielogo.png
+++ b/pics/launcher/opielogo.png