1 files changed, 37 insertions, 42 deletions

diff --git a/core/launcher/startmenu.cpp b/core/launcher/startmenu.cpp
index ce7840e..24a9d7e 100644
--- a/core/launcher/startmenu.cpp
+++ b/core/launcher/startmenu.cpp
@@ -1,76 +1,80 @@
-/**********************************************************************

-** 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.

-**

-**********************************************************************/

-

+/*

+                             This file is part of the Opie Project

+              =.             (C) 2000-2002 Trolltech AS

+            .=l.             (C) 2002-2005 The Opie Team <opie-devel@handhelds.org>

+           .>+-=

+ _;:,     .>    :=|.         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; version 2 of the License.

+     ._= =}       :

+    .%`+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.

+*/

 // TODO. During startup

 // Launcher::typeAdded

 // is called for each new tab and calls then each time the refresh of startmenu

 // suboptimal

 

 #define INCLUDE_MENUITEM_DEF

 

 #include "startmenu.h"

 

+/* OPIE */

+#include <opie2/oresource.h>

+using namespace Opie::Core;

 #include <qtopia/qpeapplication.h>

 #include <qtopia/config.h>

-#include <qtopia/resource.h>

 #include <qtopia/mimetype.h>

 #include <qtopia/qlibrary.h>

 

-//#include <qpainter.h>

-

-//#include <stdlib.h>

-

-

 #define APPLNK_ID_OFFSET 250

 #define NO_ID -1

 

 

 void StartPopupMenu::keyPressEvent( QKeyEvent *e )

 {

     if ( e->key() == Key_F33 || e->key() == Key_Space ) {

             // "OK" button, little hacky

             QKeyEvent ke(QEvent::KeyPress, Key_Enter, 13, 0);

             QPopupMenu::keyPressEvent( &ke );

     } else {

             QPopupMenu::keyPressEvent( e );

     }

 }

 

 //---------------------------------------------------------------------------

 

 StartMenu::StartMenu(QWidget *parent) : QLabel( parent )

 {

     startButtonPixmap = "go"; // No tr

 

     int sz = AppLnk::smallIconSize()+3;

     QPixmap pm;

-    pm.convertFromImage(Resource::loadImage( startButtonPixmap).smoothScale( sz,sz) );

+    pm.convertFromImage(OResource::loadImage( startButtonPixmap, OResource::NoScale ).smoothScale( sz,sz) );

     setPixmap(pm);

     setFocusPolicy( NoFocus );

 

     useWidePopupMenu = true;

     launchMenu = 0;

     currentItem = 0;

     refreshMenu();

 }

 

 

 void StartMenu::mousePressEvent( QMouseEvent * )

 {

@@ -136,42 +140,36 @@ void StartMenu::createAppEntry( QPopupMenu *menu, QDir dir, QString file )
 {

     if ( file.right(8) == ".desktop" ) {

                 AppLnk* applnk = new AppLnk( dir.path() + "/" + file );

             if ( !applnk->isValid() ) {

             delete applnk;

             return;

         }

 

             if ( applnk->type() == "Separator" ) { // No tr

                     menu->insertSeparator();

                 delete applnk;

                } else {

-                QPixmap test;

-                QImage img = Resource::loadImage( applnk->icon() );

-                if(!img.isNull() )

-                    test.convertFromImage(

-                           img.smoothScale(

-                            AppLnk::smallIconSize(), AppLnk::smallIconSize() ), 0 );

-                

+            QPixmap pixmap = OResource::loadPixmap( applnk->icon(), OResource::SmallIcon );

                 // Insert items ordered lexically

                 int current, left = 0, right = currentItem;

                 while( left != right ) {

                     current = ( left + right ) / 2;

                     if ( menu->text(menu->idAt( ( current ) ) ) < applnk->name() )

                         left = ++current;

                     else

                         right = current;

                 }

-                

-                menu->insertItem( test, applnk->name(),

+

+                menu->insertItem( pixmap, applnk->name(),

                               currentItem + APPLNK_ID_OFFSET, current );

                 appLnks.insert( currentItem + APPLNK_ID_OFFSET, applnk );

                 currentItem++;

                 }

     }

 

 }

 

 void StartMenu::createDirEntry( QPopupMenu *menu, QDir dir, QString file, bool lot )

 {

     // do some sanity checks and collect information

 

@@ -185,39 +183,36 @@ void StartMenu::createDirEntry( QPopupMenu *menu, QDir dir, QString file, bool l
         if ( !name || !icon ) return;

 

     QDir subdir = QDir( dir );

     subdir.cd( file );

     subdir.setFilter( QDir::Files );

     subdir.setNameFilter( "*.desktop" );

     // we don' t show the menu if there are no entries

     // perhaps one should check if there exist subsubdirs with entries...

     if ( subdir.entryList().isEmpty() ) return;

 

     // checks were ok

 

-    QPixmap test;

-    test.convertFromImage( Resource::loadImage( icon ).smoothScale(

-        AppLnk::smallIconSize(), AppLnk::smallIconSize() ), 0 );

-

+    QPixmap pixmap = OResource::loadPixmap( icon, OResource::SmallIcon );

         if ( useWidePopupMenu ) {

         // generate submenu

         QPopupMenu *submenu = new QPopupMenu( menu );

         connect( submenu,  SIGNAL(activated(int)), SLOT(itemSelected(int)) );

-        menu->insertItem( test, name, submenu, NO_ID );

+        menu->insertItem( pixmap, name, submenu, NO_ID );

 

         // ltabs is true cause else we wouldn't stuck around..

         createMenuEntries( submenu, subdir, true, lot );

     } else {

         // no submenus - just bring corresponding tab to front

-        menu->insertItem( test, name, currentItem );

+        menu->insertItem( pixmap, name, currentItem );

         tabNames.insert( currentItem, new QString( file ) );

         currentItem++;

     }

 }

 

 void StartMenu::createMenuEntries( QPopupMenu *menu, QDir dir, bool ltabs, bool lot )

 {

     if ( lot ) {

         dir.setFilter( QDir::Files );

         dir.setNameFilter( "*.desktop" );

         QStringList files = dir.entryList();

         files.sort();