Resource -> OResource

2 files changed, 28 insertions, 26 deletions

diff --git a/core/settings/button/buttonsettings.cpp b/core/settings/button/buttonsettings.cpp
index a90b4a1..a476a6b 100644
--- a/core/settings/button/buttonsettings.cpp
+++ b/core/settings/button/buttonsettings.cpp
@@ -1,268 +1,268 @@
 /*
-               =.            This file is part of the OPIE Project
-             .=l.            Copyright (c)  2002 Robert Griebl <sandman@handhelds.org>
-           .>+-=
- _;:,     .>    :=|.         This file is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU 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 file 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 General
-..}^=.=       =       ;      Public License for more details.
-++=   -.     .`     .:
- :     =  ...= . :.=-        You should have received a copy of the GNU
- -.   .:....=;==+<;          General Public License along with this file;
-  -_. . .   )=.  =           see the file COPYING. If not, write to the
-    --        :-=`           Free Software Foundation, Inc.,
+       =.            This file is part of the OPIE Project
+      .=l.            Copyright (c)  2002 Robert Griebl <sandman@handhelds.org>
+     .>+-=
+_;:,   .>  :=|.         This file is free software; you can
+.> <`_,  > .  <=          redistribute it and/or modify it under
+:`=1 )Y*s>-.--  :           the terms of the GNU 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 file 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 General
+..}^=.=    =    ;      Public License for more details.
+++=  -.   .`   .:
+:   = ...= . :.=-        You should have received a copy of the GNU
+-.  .:....=;==+<;          General Public License along with this file;
+ -_. . .  )=. =           see the file COPYING. If not, write to the
+  --    :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "buttonsettings.h"
 #include "buttonutils.h"
 #include "remapdlg.h"
 
 #include <opie2/odevice.h>
 
 #include <qpe/applnk.h>
 
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qtimer.h>
 #include <qscrollview.h>
 
 
 using namespace Opie::Core;
 
 struct buttoninfo {
     const ODeviceButton *m_button;
     int          m_index;
 
     OQCopMessage m_pmsg;
     QLabel      *m_picon;
     QLabel      *m_plabel;
 
     OQCopMessage m_hmsg;
     QLabel      *m_hicon;
     QLabel      *m_hlabel;
 
     bool        m_pdirty : 1;
     bool        m_hdirty : 1;
 };
 
 
 ButtonSettings::ButtonSettings ( QWidget *parent , const char *,  bool, WFlags  )
     : QDialog ( parent, "ButtonSettings", false, WStyle_ContextHelp )
 {
     const QValueList <ODeviceButton> &buttons = ODevice::inst ( )-> buttons ( );
     (void) ButtonUtils::inst ( ); // initialise
 
     setCaption ( tr( "Button Settings" ));
 
     QVBoxLayout *toplay = new QVBoxLayout ( this, 3, 3 );
     QScrollView*mainview = new QScrollView(this);
     mainview->setResizePolicy( QScrollView::AutoOneFit );
 
     toplay->addWidget(mainview);
     QFrame*framehold=new QFrame(mainview->viewport());
     framehold->setFrameStyle(QFrame::NoFrame|QFrame::Plain);
     mainview->addChild(framehold);
     toplay = new QVBoxLayout (framehold, 3, 3 );
 
     QLabel *l = new QLabel ( tr( "<center>Press or hold the button you want to remap.</center>" ), framehold );
     toplay-> addWidget ( l );
 
     QGridLayout *lay = new QGridLayout ( toplay );
     lay-> setMargin ( 0 );
     lay-> setColStretch ( 0, 0 );
     lay-> setColStretch ( 1, 0 );
     lay-> setColStretch ( 2, 0 );
     lay-> setColStretch ( 3, 10 );
 
     m_infos. setAutoDelete ( true );
 
     int i = 1;
     int index = 0;
     for ( QValueList<ODeviceButton>::ConstIterator it = buttons. begin ( ); it != buttons. end ( ); it++ ) {
         if ( it != buttons. begin ( )) {
             QFrame *f = new QFrame ( framehold );
             f-> setFrameStyle ( QFrame::Sunken | QFrame::VLine );
             lay-> addMultiCellWidget ( f, i, i, 0, 3 );
             i++;
         }
 
         buttoninfo *bi = new buttoninfo ( );
         bi-> m_button = &(*it);
         bi-> m_index = index++;
         bi-> m_pmsg = (*it). pressedAction ( );
         bi-> m_hmsg = (*it). heldAction ( );
         bi-> m_pdirty = false;
         bi-> m_hdirty = false;
 
         l = new QLabel ( framehold );
         l-> setPixmap (( *it ). pixmap ( ));
 
         lay-> addMultiCellWidget ( l, i, i + 1, 0, 0 );
 
         l = new QLabel ( tr( "Press:" ), framehold );
         lay-> addWidget ( l, i, 1, AlignLeft | AlignBottom );
         l = new QLabel ( tr( "Hold:" ), framehold );
         lay-> addWidget ( l, i + 1, 1, AlignLeft | AlignTop );
 
         l = new QLabel ( framehold );
-        l-> setFixedSize ( 16, 16 );
+        l-> setFixedSize ( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
         lay-> addWidget ( l, i, 2, AlignLeft | AlignBottom );
         bi-> m_picon = l;
 
         l = new QLabel ( framehold );
         l-> setAlignment ( AlignLeft | AlignVCenter | SingleLine );
         lay-> addWidget ( l, i, 3, AlignLeft | AlignBottom );
         bi-> m_plabel = l;
 
         l = new QLabel ( framehold );
-        l-> setFixedSize ( 16, 16 );
+        l-> setFixedSize ( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
         lay-> addWidget ( l, i + 1, 2, AlignLeft | AlignTop );
         bi-> m_hicon = l;
 
         l = new QLabel ( framehold );
         l-> setAlignment ( AlignLeft | AlignVCenter | SingleLine );
         lay-> addWidget ( l, i + 1, 3, AlignLeft | AlignTop );
         bi-> m_hlabel = l;
 
         i += 2;
 
         m_infos. append ( bi );
     }
 
     toplay-> addStretch ( 10 );
 
     m_last_button = 0;
     m_lock = false;
 
     m_timer = new QTimer ( this );
     connect ( m_timer, SIGNAL( timeout()), this, SLOT( keyTimeout()));
 
     updateLabels ( );
 
     QPEApplication::grabKeyboard ( );
 }
 
 ButtonSettings::~ButtonSettings ( )
 {
     QPEApplication::ungrabKeyboard ( );
 }
 
 void ButtonSettings::updateLabels ( )
 {
     for ( QListIterator <buttoninfo> it ( m_infos ); *it; ++it ) {
         qCopInfo cip = ButtonUtils::inst ( )-> messageToInfo ((*it)-> m_pmsg );
 
         QPixmap pic;
         pic.convertFromImage( cip.m_icon.convertToImage().smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
         (*it)-> m_picon-> setPixmap ( pic );
         (*it)-> m_plabel-> setText ( cip. m_name );
 
         qCopInfo cih = ButtonUtils::inst ( )-> messageToInfo ((*it)-> m_hmsg );
 
         pic.convertFromImage( cih.m_icon.convertToImage().smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
         (*it)-> m_hicon-> setPixmap ( pic );
         (*it)-> m_hlabel-> setText ( cih. m_name );
     }
 }
 
 buttoninfo *ButtonSettings::buttonInfoForKeycode ( ushort key )
 {
     for ( QListIterator <buttoninfo> it ( m_infos ); *it; ++it ) {
         if ((*it)-> m_button-> keycode ( ) == key )
             return *it;
     }
     return 0;
 }
 
 void ButtonSettings::keyPressEvent ( QKeyEvent *e )
 {
     buttoninfo *bi = buttonInfoForKeycode ( e-> key ( ));
 
     if ( bi && !e-> isAutoRepeat ( )) {
         m_timer-> stop ( );
         m_last_button = bi;
         m_timer-> start ( ODevice::inst ( )-> buttonHoldTime ( ), true );
     }
     else
         QDialog::keyPressEvent ( e );
 }
 
 void ButtonSettings::keyReleaseEvent ( QKeyEvent *e )
 {
     buttoninfo *bi = buttonInfoForKeycode ( e-> key ( ));
 
     if ( bi && !e-> isAutoRepeat ( ) && m_timer-> isActive ( )) {
         m_timer-> stop ( );
         edit ( bi, false );
     }
     else
         QDialog::keyReleaseEvent ( e );
 }
 
 void ButtonSettings::keyTimeout ( )
 {
     if ( m_last_button ) {
         edit ( m_last_button, true );
         m_last_button = false;
     }
 }
 
 void ButtonSettings::edit ( buttoninfo *bi, bool hold )
 {
 
     if ( m_lock )
         return;
     m_lock = true;
 
     RemapDlg *d = new RemapDlg ( bi-> m_button, hold, this );
 
     if ( QPEApplication::execDialog ( d ) == QDialog::Accepted ) {
 
 
         if ( hold ) {
             bi-> m_hmsg = d-> message ( );
             bi-> m_hdirty = true;
         }
         else {
             bi-> m_pmsg = d-> message ( );
             bi-> m_pdirty = true;
         }
 
         updateLabels ( );
     }
 
     delete d;
 
     m_lock = false;
 }
 
 void ButtonSettings::accept ( )
 {
     for ( QListIterator <buttoninfo> it ( m_infos ); *it; ++it ) {
         buttoninfo *bi = *it;
 
         if ( bi-> m_pdirty )
             ODevice::inst ( )-> remapPressedAction ( bi-> m_index, bi-> m_pmsg );
         if ( bi-> m_hdirty )
             ODevice::inst ( )-> remapHeldAction ( bi-> m_index, bi-> m_hmsg );
     }
     QDialog::accept ( );
 }
 
 void ButtonSettings::done ( int r )
 {
     QDialog::done ( r );
     close ( );
 }
diff --git a/core/settings/button/buttonutils.cpp b/core/settings/button/buttonutils.cpp
index 9bf4b53..05fa883 100644
--- a/core/settings/button/buttonutils.cpp
+++ b/core/settings/button/buttonutils.cpp
@@ -1,129 +1,131 @@
 #include <stdlib.h>
 
+#include <opie2/oresource.h>
+
 #include <qapplication.h>
 #include <qlistview.h>
 #include <qpe/applnk.h>
 #include <qpe/mimetype.h>
-#include <qpe/resource.h>
 
 #include "buttonutils.h"
 
 using namespace Opie;
 
 using namespace Opie::Core;
 struct predef_qcop {
         const char *m_text;
         const char *m_pixmap;
         const char *m_channel;
         const char *m_function;
 };
 
 static const predef_qcop predef [] = {
 
         { QT_TRANSLATE_NOOP( "ButtonSettings", "Beam VCard" ),       "beam",                  "QPE/Application/addressbook", "beamBusinessCard()" },
         { QT_TRANSLATE_NOOP( "ButtonSettings", "Send eMail" ),       "buttonsettings/mail",   "QPE/Application/mail",        "newMail()"          },
         
 
         { QT_TRANSLATE_NOOP( "ButtonSettings", "Toggle Menu" ),      "buttonsettings/menu",   "QPE/TaskBar",  "toggleMenu()"      },
         { QT_TRANSLATE_NOOP( "ButtonSettings", "Toggle O-Menu" ),    "buttonsettings/omenu",  "QPE/TaskBar",  "toggleStartMenu()" },
         { QT_TRANSLATE_NOOP( "ButtonSettings", "Show Desktop" ),     "home",                  "QPE/Launcher", "home()"            },
         { QT_TRANSLATE_NOOP( "ButtonSettings", "Toggle Recording" ), "buttonsettings/record", "QPE/VMemo",    "toggleRecord()"    },
        
     { 0, 0, 0, 0 }                                                          
 };
 
 
 
 
 ButtonUtils *ButtonUtils::ButtonUtils::inst ( )
 {
         static ButtonUtils *p = 0;
         
         if ( !p ) {
                 p = new ButtonUtils ( );
                 ::atexit ( cleanup );
         }
         return p;
 }
 
 void ButtonUtils::cleanup ( )
 {
         delete inst ( );
 }
 
 ButtonUtils::ButtonUtils ( )
 {
         m_apps = new AppLnkSet( MimeType::appsFolderName ( ));
 }
 
 ButtonUtils::~ButtonUtils ( )
 {
         delete m_apps;
 }
 
 qCopInfo ButtonUtils::messageToInfo ( const OQCopMessage &c )
 {
         QCString ch = c. channel ( );
         QCString f  = c. message ( ); 
 
         
         if ( ch == "ignore" )
                 return qCopInfo ( qApp-> translate ( "ButtonSettings", "<nobr>Ignored</nobr>" ));
         
         for ( const predef_qcop *p = predef; p-> m_text; p++ ) {
                 if (( ch == p-> m_channel ) && ( f == p-> m_function ))
-                        return qCopInfo ( qApp-> translate ( "ButtonSettings", p-> m_text ), Resource::loadPixmap ( p-> m_pixmap ));
+                        return qCopInfo ( qApp-> translate ( "ButtonSettings", p-> m_text ),
+                              Opie::Core::OResource::loadPixmap( p->m_pixmap, Opie::Core::OResource::SmallIcon ) );
                 }
         
         if ( ch. left ( 16 ) == "QPE/Application/" ) {
                 QString app = ch. mid ( 16 );
                 const AppLnk *applnk = m_apps-> findExec ( app );
                 if ( applnk )
                         app = applnk-> name ( );
                         
                 if (( f == "raise()" ) || ( f == "nextView()" ))
                         return qCopInfo ( qApp-> translate ( "ButtonSettings", "<nobr>Show <b>%1</b></nobr>" ). arg ( app ), applnk ? applnk-> pixmap ( ) : QPixmap ( ));
                 else
                         return qCopInfo ( qApp-> translate ( "ButtonSettings", "<nobr>Call <b>%1</b>: <i>%2</i></nobr>" ). arg ( app ). arg ( f ), applnk ? applnk-> pixmap ( ) : QPixmap ( ));
         }
         else {
                 return qCopInfo ( qApp-> translate ( "ButtonSettings", "<nobr>Call <b>%1</b> <i>%2</i></nobr>" ). arg (( ch. left ( 4 ) == "QPE/" ) ? ch. mid ( 4 ) : ch ). arg ( f ));
         }
 }
 
 
 void ButtonUtils::insertActions ( QListViewItem *here )
 {
         for ( const predef_qcop *p = predef; p-> m_text; p++ ) {
                 QListViewItem *item = new QListViewItem ( here, qApp-> translate ( "ButtonSettings", p-> m_text ), p-> m_channel, p-> m_function );
-                item-> setPixmap ( 0, Resource::loadPixmap ( p-> m_pixmap ));
+  item-> setPixmap ( 0, Opie::Core::OResource::loadPixmap( p->m_pixmap, Opie::Core::OResource::SmallIcon ) );
                 }       
 }
 
 
 void ButtonUtils::insertAppLnks ( QListViewItem *here )
 {
         QStringList types = m_apps-> types ( );   
         QListViewItem *typeitem [types. count ( )];
    
            int i = 0;
         for ( QStringList::Iterator it = types. begin ( ); it != types. end ( ); ++it ) {
                 QListViewItem *item = new QListViewItem ( here, m_apps-> typeName ( *it ));
                 item-> setPixmap ( 0, m_apps-> typePixmap ( *it ));
         
                         typeitem [i++] = item;
                 }
         
         for ( QListIterator <AppLnk> appit ( m_apps-> children ( )); *appit; ++appit ) {
                 AppLnk *l = *appit;
         
                 int i = 0;
                         for ( QStringList::Iterator it = types. begin ( ); it != types. end ( ); ++it ) {       
                         if ( l-> type ( ) == *it ) {
                                 QListViewItem *sub = new QListViewItem ( typeitem [i], l-> name ( ), QString ( "QPE/Application/" ) + l-> exec ( ), "raise()" );
                                 sub-> setPixmap ( 0, l-> pixmap ( ));
                         }
                         i++;
                         }
         }                                  
 }