Resource -> OResource

7 files changed, 38 insertions, 74 deletions

diff --git a/core/applets/restartapplet2/opie-restartapplet2.control b/core/applets/restartapplet2/opie-restartapplet2.control
index cec3b19..9cc8dac 100644
--- a/core/applets/restartapplet2/opie-restartapplet2.control
+++ b/core/applets/restartapplet2/opie-restartapplet2.control
@@ -1,10 +1,10 @@
 Package: opie-restartapplet2
 Files: plugins/applets/librestartapplet2.so*
 Priority: optional
 Section: opie/applets
 Maintainer: L.J. Potter <lpotter@trolltech.com>
 Architecture: arm
-Depends: task-opie-minimal
+Depends: task-opie-minimal, libopiecore2
 Description: Restart Applet
  A simple opie menu applet to restart the Opie environment
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/applets/restartapplet2/restart.cpp b/core/applets/restartapplet2/restart.cpp
index eda0005..42d814a 100644
--- a/core/applets/restartapplet2/restart.cpp
+++ b/core/applets/restartapplet2/restart.cpp
@@ -1,106 +1,72 @@
 // coptright Mon 10-21-2002 01:14:03 by L. Potter <ljp@llornkcor.com>
 
 #include "restart.h"
 
+#include <opie2/oresource.h>
+
 #include <qpe/applnk.h>
 #include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 
-/* XPM */
-static char *restart_xpm[] = {
-"16 16 11 1",
-"   c None",
-".  c #000000",
-"+  c #DCDCDC",
-"@  c #A0A0A0",
-"#  c #C3C3C3",
-"$  c #808080",
-"%  c #FFA858",
-"&  c #FFDCA8",
-"*  c #FFFFC0",
-"=  c #FFFFFF",
-"-  c #585858",
-"       ..       ",
-"   .. .++. ..   ",
-"  .+@.@##@.@+.  ",
-"  .@+$@%%@$+@.  ",
-"   .$%%&%&%$.   ",
-" ..+@%&$$%&@+.. ",
-".+#@%&%@@&*%@#+.",
-".$@+$&*&&=*$+@$.",
-" .--+$&*=&$+--. ",
-"  .$#++$$++#$.  ",
-" .@=$-$++$-$=@. ",
-" .+@-..@@..-@+. ",
-"  ... .+=. ...  ",
-"      .-$.      ",
-"       ..       ",
-"                "};
-
 RestartApplet::RestartApplet ( )
   : QObject ( 0, "RestartApplet" )
 {
 }
 
 RestartApplet::~RestartApplet ( )
 {
 }
 
 int RestartApplet::position ( ) const
 {
     return 4;
 }
 
 QString RestartApplet::name ( ) const
 {
   return tr( "Restart" );
 }
 
 QString RestartApplet::text ( ) const
 {
   return tr( "Restart Opie" );
 }
 
 QIconSet RestartApplet::icon ( ) const
 {
-  QPixmap pix;
-  QImage img =  ( const char** ) restart_xpm ;//Resource::loadImage ( "Run" );
-  
-  if ( !img. isNull ( ))
-        pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
+    QPixmap pix = Opie::Core::OResource::loadPixmap( "exec", Opie::Core::OResource::SmallIcon );
   return pix;
 }
 
 QPopupMenu *RestartApplet::popup ( QWidget * ) const
 {
   return 0;
 }
 
 void RestartApplet::activated ( )
 {
     QCopEnvelope e("QPE/System", "restart()");
 }
 
 
 QRESULT RestartApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
 {
   *iface = 0;
   if ( uuid == IID_QUnknown )
     *iface = this;
   else if ( uuid == IID_MenuApplet )
     *iface = this;
   else
     return QS_FALSE;
 
   if ( *iface )
     (*iface)-> addRef ( );
   return QS_OK;
 }
 
 Q_EXPORT_INTERFACE( )
 {
   Q_CREATE_INSTANCE( RestartApplet )
 }
 
 
diff --git a/core/applets/restartapplet2/restartapplet.pro b/core/applets/restartapplet2/restartapplet.pro
index 60d34f2..d3c408d 100644
--- a/core/applets/restartapplet2/restartapplet.pro
+++ b/core/applets/restartapplet2/restartapplet.pro
@@ -1,17 +1,17 @@
 TEMPLATE  = lib
 CONFIG    += qt plugin warn_on 
 HEADERS =   restart.h
 SOURCES =   restart.cpp
 TARGET    = restartapplet2
 DESTDIR   = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
-LIBS            += -lqpe
+LIBS            += -lqpe -lopiecore2
 VERSION   = 1.0.0
 MOC_DIR=opieobj
 OBJECTS_DIR=opieobj
 
 
 
 include( $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets
diff --git a/core/applets/rotateapplet/rotate.cpp b/core/applets/rotateapplet/rotate.cpp
index d13c2c0..9abbde8 100644
--- a/core/applets/rotateapplet/rotate.cpp
+++ b/core/applets/rotateapplet/rotate.cpp
@@ -1,241 +1,241 @@
 /*
-                             This file is part of the OPIE Project
+                             This file is part of the Opie Project
+
                              Copyright (C) 2003 Maximilian Reiss <harlekin@handhelds.org>
                              Copyright (C) 2003 Greg Gilbert <ggilbert@treke.net>
-               =.            Copyright (C) 2004 Michael Lauer <mickey@Vanille.de>
-             .=l.
-           .>+-=
- _;:,     .>    :=|.         This library is free software; you can
-.> <,   >  .   <=           redistribute it and/or  modify it under
-:=1 )Y*s>-.--   :            the terms of the GNU Library General Public
-.="- .-=="i,     .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
-    .%+i>       _;_.
-    .i_,=:_.      -<s.       This library is distributed in the hope that
-     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-    : ..    .:,     . . .    without even the implied warranty of
-    =_        +     =;=|     MERCHANTABILITY or FITNESS FOR A
-  _.=:.       :    :=>:      PARTICULAR PURPOSE. See the GNU
-..}^=.=       =       ;      Library General Public License for more
-++=   -.     .     .:        details.
- :     =  ...= . :.=-
- -.   .:....=;==+<;          You should have received a copy of the GNU
-  -_. . .   )=.  =           Library General Public License along with
-    --        :-=            this library; see the file COPYING.LIB.
+                             Copyright (C) 2004 Michael Lauer <mickey@Vanille.de>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+    :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      Library General Public License for more
+++=   -.     .`     .:       details.
+    :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 
 #include "rotate.h"
 
 /* OPIE */
 #include <opie2/odebug.h>
 #include <opie2/odevice.h>
+#include <opie2/oresource.h>
+
 #include <qpe/applnk.h>
 #include <qpe/config.h>
 #include <qpe/power.h>
 #include <qpe/qcopenvelope_qws.h>
-#include <qpe/resource.h>
 using namespace Opie::Core;
 
 /* STD */
 #include <time.h>
 
 RotateApplet::RotateApplet()
              :QObject( 0, "RotateApplet" ), m_flipped( false )
 {
 
 #if !defined(QT_NO_COP)
     QCopChannel *rotateChannel = new QCopChannel( "QPE/Rotation" , this );
     connect ( rotateChannel, SIGNAL( received(const QCString&,const QByteArray&) ),
               this, SLOT ( channelReceived(const QCString&,const QByteArray&) ) );
 #endif
 
 }
 
 RotateApplet::~RotateApplet ( )
 {}
 
 /**
  * Qcop receive method.
  */
 void RotateApplet::channelReceived( const QCString &msg, const QByteArray & data )
 {
     odebug << "RotateApplet::channelReceived( '" <<  msg << "' )" << oendl;
 
     if ( ODevice::inst()->hasHingeSensor() )
     {
         struct timespec interval;
         struct timespec remain;
         interval.tv_sec = 0;
         interval.tv_nsec = 600000;
         ::nanosleep( &interval, &remain );
         OHingeStatus status = ODevice::inst()->readHingeSensor();
         odebug << "RotateApplet::readHingeSensor = " << (int) status << "" << oendl;
 
         Config cfg( "apm" );
         cfg.setGroup( PowerStatusManager::readStatus().acStatus() == PowerStatus::Online ? "AC" : "Battery" );
         int action = cfg.readNumEntry( "CloseHingeAction", 0 );
 
         if ( status == CASE_CLOSED )
         {
             switch ( action )
             {
                 case 1: /* DISPLAY OFF */ ODevice::inst()->setDisplayBrightness( 0 ); break;
                 case 2: /* SUSPEND */ ODevice::inst()->suspend(); break;
                 default: /* IGNORE */ break;
             }
         }
         else /* status != CASE_CLOSED */
         {
             switch ( action )
             {
                 case 1: /* DISPLAY OFF */ ODevice::inst()->setDisplayBrightness( 127 ); break;
                 case 2: /* SUSPEND */ /* How to wake up the device from kernel? */; break;
                 default: /* IGNORE */ break;
             }
         }
         odebug << "RotateApplet::switchAction " << cfg.readNumEntry( "CloseHingeAction" ) << " performed." << oendl;
     }
 
     QDataStream stream( data, IO_ReadOnly );
     if ( msg == "flip()" )
     {
         activated ( );
     }
     else if ( msg == "rotateDefault()")
     {
         rotateDefault();
     }
 }
 
 int RotateApplet::position() const
 {
     return 3;
 }
 
 QString RotateApplet::name() const
 {
     return tr( "Rotate shortcut" );
 }
 
 QString RotateApplet::text() const
 {
     return tr( "Rotate" );
 }
 
 /*QString RotateApplet::tr( const char* s ) const
 {
     return qApp->translate( "RotateApplet", s, 0 );
 }
 
 QString RotateApplet::tr( const char* s, const char* p ) const
 {
     return qApp->translate( "RotateApplet", s, p );
 }
 */
 
 QIconSet RotateApplet::icon() const
 {
-    QPixmap pix;
-    QImage img = Resource::loadImage( "Rotation" );
-    if ( !img.isNull() )
-        pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
+    QPixmap pix = Opie::Core::OResource::loadPixmap( "Rotation", Opie::Core::OResource::SmallIcon );
     return pix;
 }
 
 QPopupMenu* RotateApplet::popup(QWidget*) const
 {
     return 0;
 }
 
 void RotateApplet::rotateDefault()
 {
     int rot = ODevice::inst()->rotation();
 
     switch (rot)
     {
         case Rot0:   rot=0;   break;
         case Rot90:  rot=90;  break;
         case Rot180: rot=180; break;
         case Rot270: rot=270; break;
         default:     rot=0;   break;
     }
 
     Config cfg( "qpe" );
     cfg.setGroup( "Appearance" );
 
     bool rotateEnabled = cfg.readBoolEntry( "rotateEnabled",true );
 
     if ( !rotateEnabled) return;
 
     // hide inputs methods before rotation
     QCopEnvelope en( "QPE/TaskBar", "hideInputMethod()" );
 
     QCopEnvelope env( "QPE/System", "setCurrentRotation(int)" );
     env << rot;
 
     m_flipped = false;
 
 }
 void RotateApplet::activated()
 {
     int defaultRotation = QPEApplication::defaultRotation();
     int newRotation = defaultRotation;
 
     Config cfg( "qpe" );
     cfg.setGroup( "Appearance" );
 
     int rotDirection = cfg.readNumEntry( "rotatedir" );
     ODirection rot = CW;
 
     if (rotDirection == -1)
     {
         rot = ODevice::inst()->direction();
     }
     else
     {
         rot = (ODirection) rotDirection;
     }
 
     // hide inputs methods before rotation
     QCopEnvelope en( "QPE/TaskBar", "hideInputMethod()" );
 
     if ( m_flipped )
     {
         // if flipped, flip back to the original state,
         // regardless of rotation direction
         newRotation = defaultRotation;
     }
     else
     {
         if ( rot == CCW )
         {
             newRotation = ( defaultRotation + 90 ) % 360;
         }
         else if ( rot == CW )
         {
             newRotation = ( defaultRotation + 270 ) % 360;
         }
         else if ( rot == Flip )
         {
             newRotation = ( defaultRotation + 180 ) % 360;
         }
     }
 
     QCopEnvelope env( "QPE/System", "setCurrentRotation(int)" );
     env << newRotation;
 
     m_flipped = !m_flipped;
 }
 
 
 QRESULT RotateApplet::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
     *iface = 0;
     if ( uuid == IID_QUnknown )
         *iface = this;
     else if ( uuid == IID_MenuApplet )
         *iface = this;
diff --git a/core/applets/vtapplet/opie-vtapplet.control b/core/applets/vtapplet/opie-vtapplet.control
index a1662f1..ae504a9 100644
--- a/core/applets/vtapplet/opie-vtapplet.control
+++ b/core/applets/vtapplet/opie-vtapplet.control
@@ -1,9 +1,9 @@
 Package: opie-vtapplet
 Files: plugins/applets/libvtapplet.so*
 Priority: optional
 Section: opie/applets
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
-Depends: task-opie-minimal
+Depends: task-opie-minimal, libopiecore2
 Description: Switch to another virtual terminal
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/applets/vtapplet/vt.cpp b/core/applets/vtapplet/vt.cpp
index ae89635..0d4e657 100644
--- a/core/applets/vtapplet/vt.cpp
+++ b/core/applets/vtapplet/vt.cpp
@@ -1,171 +1,169 @@
 /**********************************************************************
 ** Copyright (C) 2003-2004 Michael 'Mickey' Lauer <mickey@Vanille.de>
 **
 ** 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 "vt.h"
 
 /* OPIE */
 #include <opie2/odebug.h>
+#include <opie2/oresource.h>
+
 #include <qpe/applnk.h>
-#include <qpe/resource.h>
+
 using namespace Opie::Core;
 
 /* QT */
 #include <qpopupmenu.h>
 
 /* STD */
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <linux/vt.h>
 
 VTApplet::VTApplet ( )
     : QObject ( 0, "VTApplet" )
 {
 }
 
 VTApplet::~VTApplet ( )
 {
 }
 
 int VTApplet::position ( ) const
 {
     return 2;
 }
 
 QString VTApplet::name ( ) const
 {
     return tr( "VT shortcut" );
 }
 
 QString VTApplet::text ( ) const
 {
     return tr( "Terminal" );
 }
 
 /*
 QString VTApplet::tr( const char* s ) const
 {
     return qApp->translate( "VTApplet", s, 0 );
 }
 
 QString VTApplet::tr( const char* s, const char* p ) const
 {
     return qApp->translate( "VTApplet", s, p );
 }
 */
 
 QIconSet VTApplet::icon ( ) const
 {
-    QPixmap pix;
-    QImage img = Resource::loadImage ( "terminal" );
-
-    if ( !img. isNull ( ))
-        pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
+    QPixmap pix = Opie::Core::OResource::loadPixmap( "terminal", Opie::Core::OResource::SmallIcon );
     return pix;
 }
 
 QPopupMenu *VTApplet::popup ( QWidget* parent ) const
 {
     odebug << "VTApplet::popup" << oendl;
 
     struct vt_stat vtstat;
 #ifdef QT_QWS_DEVFS
     int fd = ::open( "/dev/vc/0", O_RDWR );
 #else
     int fd = ::open( "/dev/tty0", O_RDWR );
 #endif
     if ( fd == -1 ) return 0;
     if ( ioctl( fd, VT_GETSTATE, &vtstat ) == -1 ) return 0;
 
     m_subMenu = new QPopupMenu( parent );
     m_subMenu->setCheckable( true );
     for ( int i = 1; i < 10; ++i )
     {
         int id = m_subMenu->insertItem( QString::number( i ), 500+i );
         m_subMenu->setItemChecked( id, id-500 == vtstat.v_active );
     }
     ::close( fd );
 
     connect( m_subMenu, SIGNAL( activated(int) ), this, SLOT( changeVT(int) ) );
     connect( m_subMenu, SIGNAL( aboutToShow() ), this, SLOT( updateMenu() ) );
 
     return m_subMenu;
 }
 
 
 void VTApplet::changeVT( int index )
 {
     //odebug << "VTApplet::changeVT( " << index-500 << " )" << oendl;
 
 #ifdef QT_QWS_DEVFS
     int fd = ::open("/dev/vc/0", O_RDWR);
 #else
     int fd = ::open("/dev/tty0", O_RDWR);
 #endif
     if ( fd == -1 ) return;
     ioctl( fd, VT_ACTIVATE, index-500 );
 }
 
 
 void VTApplet::updateMenu()
 {
     //odebug << "VTApplet::updateMenu()" << oendl;
 
     int fd = ::open( "/dev/console", O_RDONLY );
     if ( fd == -1 ) return;
 
     for ( int i = 1; i < 10; ++i )
     {
         int result = ioctl( fd, VT_DISALLOCATE, i );
 
         /*
         if ( result == -1 )
             odebug << "VT " << i << " disallocated == free" << oendl;
         else
             odebug << "VT " << i << " _not_ disallocated == busy" << oendl;
         */
 
         m_subMenu->setItemEnabled( 500+i, result == -1 );
     }
 
     ::close( fd );
 }
 
 
 void VTApplet::activated()
 {
     odebug << "VTApplet::activated()" << oendl;
 }
 
 
 QRESULT VTApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
 {
     *iface = 0;
     if ( uuid == IID_QUnknown )
         *iface = this;
     else if ( uuid == IID_MenuApplet )
         *iface = this;
     else
         return QS_FALSE;
 
     if ( *iface )
         (*iface)-> addRef ( );
     return QS_OK;
 }
 
 Q_EXPORT_INTERFACE( )
 {
     Q_CREATE_INSTANCE( VTApplet )
 }
diff --git a/core/applets/vtapplet/vtapplet.pro b/core/applets/vtapplet/vtapplet.pro
index 6c4873c..912af58 100644
--- a/core/applets/vtapplet/vtapplet.pro
+++ b/core/applets/vtapplet/vtapplet.pro
@@ -1,13 +1,13 @@
 TEMPLATE      = lib
 CONFIG       += qt warn_on 
 HEADERS       = vt.h
 SOURCES       = vt.cpp
 TARGET        = vtapplet
 DESTDIR       = $(OPIEDIR)/plugins/applets
 INCLUDEPATH  += $(OPIEDIR)/include
 DEPENDPATH   += $(OPIEDIR)/include
-LIBS         += -lqpe
+LIBS         += -lqpe -lopiecore2
 VERSION       = 1.0.0
 
 include( $(OPIEDIR)/include.pro )
 target.path = $$prefix/plugins/applets