2 files changed, 26 insertions, 30 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 979549d..828f5a1 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -1,744 +1,739 @@
 /***************************************************************************
    AdvancedFm.cpp
   -------------------
   ** Created: Sat Mar 9 23:33:09 2002
     copyright            : (C) 2002 by ljp
     email                : ljp@llornkcor.com
     *   This program is free software; you can redistribute it and/or modify  *
     *   it under the terms of the GNU General Public License as published by  *
     *   the Free Software Foundation; either version 2 of the License, or     *
     *   (at your option) any later version.                                   *
     ***************************************************************************/
 #define DEVELOPERS_VERSION
 #include "advancedfm.h"
 
 #include <opie2/odebug.h>
-
+#include <opie2/oresource.h>
 #include <opie2/ostorageinfo.h>
 
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qpe/mimetype.h>
 #include <qpe/applnk.h>
-#include <qpe/resource.h>
 #include <qpe/menubutton.h>
 
 #include <qcombobox.h>
 #include <qpopupmenu.h>
 #include <qlistview.h>
 #include <qmessagebox.h>
 #include <qlineedit.h>
 
 
 #include <sys/stat.h>
 #include <time.h>
 #include <dirent.h>
 #include <fcntl.h>
 #include <sys/vfs.h>
 #include <mntent.h>
 
 using namespace Opie::Ui;
 
 AdvancedFm::AdvancedFm(QWidget *,const char*, WFlags )
    : QMainWindow( ) {
    init();
    renameBox = 0;
          whichTab = 1;
-   unknownXpm = Resource::loadImage("UnknownDocument").smoothScale(AppLnk::smallIconSize(),AppLnk::smallIconSize() );
+   unknownXpm = Opie::Core::OResource::loadImage("UnknownDocument", Opie::Core::OResource::SmallIcon);
 
          initConnections();
          rePopulate();
          channel = new QCopChannel( "QPE/Application/advancedfm", this );
          connect(channel,SIGNAL(received(const QCString&,const QByteArray&)),this,SLOT(qcopReceive(const QCString&,const QByteArray&)));
          switchToLocalTab();
 }
 
 AdvancedFm::~AdvancedFm() {
 }
 
 
 void AdvancedFm::cleanUp() {
    QString sfile=QDir::homeDirPath();
    if(sfile.right(1) != "/")
       sfile+="/._temp";
    else
       sfile+="._temp";
    QFile file( sfile);
    if(file.exists())
       file.remove();
 }
 
 void AdvancedFm::tabChanged(QWidget *wd) {
                 if(wd == tab) {
                                 whichTab = 1;
                                 viewMenu->setItemChecked(viewMenu->idAt(0), true);
                                 viewMenu->setItemChecked(viewMenu->idAt(1), false);
         //                      qDebug("tabchanged: LOCAL VIEW SHOWN");
                 }
 
                 else if(wd == tab_2) {
                                 whichTab = 2;
                                 viewMenu->setItemChecked(viewMenu->idAt(0), false);
                                 viewMenu->setItemChecked(viewMenu->idAt(1), true);
         //                      qDebug("tabchanged: REMOTE VIEW SHOWN");
                 }
                 qApp->processEvents();
                 QString path = CurrentDir()->canonicalPath();
 
                 chdir( path.latin1());
                 currentPathCombo->lineEdit()->setText(path);
 }
 
 
 void AdvancedFm::populateView() {
 
                 QPixmap pm;
                 QListView *thisView = CurrentView();
                 QDir *thisDir = CurrentDir();
                 QString path = thisDir->canonicalPath();
 
                 thisView->clear();
                 thisDir->setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
                 thisDir->setMatchAllDirs(TRUE);
                 thisDir->setNameFilter(filterStr);
                 QString fileL, fileS, fileDate;
 
                 QString fs = getFileSystemType((const QString &) path);
                 setCaption(tr("AdvancedFm :: ")+fs+" :: "
                                                          +checkDiskSpace((const QString &) path)+ tr(" kB free") );
                 bool isDir = FALSE;
 
                 const QFileInfoList *list = thisDir->entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/);
                 QFileInfoListIterator it(*list);
                 QFileInfo *fi;
                 while ( (fi=it.current()) ) {
                                 if (fi->isSymLink() )  {
                                                 QString symLink = fi->readLink();
                                                 QFileInfo sym( symLink);
                                                 fileS.sprintf( "%10i", sym.size() );
                                                 fileL =  fi->fileName() +" ->  " + sym.filePath().data();
                                                 fileDate = sym.lastModified().toString();
                                 }  else  {
                                                 fileS.sprintf( "%10i", fi->size() );
                                                 fileL = fi->fileName();
                                                 fileDate= fi->lastModified().toString();
                                                 if( QDir(QDir::cleanDirPath( path +"/"+fileL)).exists() ) {
 //           if(fileL == "..")
                                                                 fileL += "/";
                                                                 isDir=TRUE;
                                                 }
                                 }
                                 QFileInfo fileInfo(  path + "/" + fileL);
 
                                 if(fileL !="./" && fi->exists())  {
                                                 item = new QListViewItem( thisView, fileL, fileS , fileDate);
 
                                                 if(isDir || fileL.find("/",0,TRUE) != -1) {
 
                                                                 if( !QDir( fi->filePath() ).isReadable()) //is directory
-                                                                                pm.convertFromImage( Resource::loadImage( "lockedfolder" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
+                                    pm = Opie::Core::OResource::loadPixmap( "lockedfolder", Opie::Core::OResource::SmallIcon );
                                                                 else
-                                                                                pm.convertFromImage( Resource::loadImage( "folder" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
-                                                }
+                                    pm = Opie::Core::OResource::loadPixmap( "folder", Opie::Core::OResource::SmallIcon );
+      }
                                                 else if ( fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
-                                                                pm.convertFromImage( Resource::loadImage( "exec" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
+                            pm = Opie::Core::OResource::loadPixmap( "exec", Opie::Core::OResource::SmallIcon );
                                                 }
                                                 else if( (fileInfo.permission( QFileInfo::ExeUser)
                                                                                         | fileInfo.permission( QFileInfo::ExeGroup)
                                                                                         | fileInfo.permission( QFileInfo::ExeOther)) && fs != "vfat" ) {
-                                                                pm.convertFromImage( Resource::loadImage( "exec" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
+                            pm = Opie::Core::OResource::loadPixmap( "exec", Opie::Core::OResource::SmallIcon );
                                                 }
                                                 else if( !fi->isReadable() )  {
-                                                                pm.convertFromImage( Resource::loadImage( "locked" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
+                            pm = Opie::Core::OResource::loadPixmap( "locked", Opie::Core::OResource::SmallIcon );
                                                 }
                                                 else { //everything else goes by mimetype
                                                                 MimeType mt(fi->filePath());
                                                                 pm=mt.pixmap(); //sets the correct pixmap for mimetype
                                                                 if(pm.isNull()) {
                                                                                 pm = unknownXpm;
                                                                 }
                                                 }
                                                 if(  fi->isSymLink() || fileL.find("->",0,TRUE) != -1) {
                                                                         //  odebug << " overlay link image" << oendl;
-                                                                pm.convertFromImage( Resource::loadImage( "advancedfm/symlink" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
-                                                                        //              pm= Resource::loadPixmap( "folder" );
-//                QPixmap lnk = Resource::loadPixmap( "opie/symlink" );
-//                QPainter painter( &pm );
-//                painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk );
-//                pm.setMask( pm.createHeuristicMask( FALSE ) );
+                            pm = Opie::Core::OResource::loadPixmap( "advancedfm/symlink", Opie::Core::OResource::SmallIcon );
                                                 }
                                                 item->setPixmap( 0, pm );
 
                                 }
                                 isDir=FALSE;
                                 ++it;
                 }
 
                 if( path.find("dev",0,TRUE) != -1) {
                                 struct stat buf;
                                 dev_t devT;
                                 DIR *dir;
                                 struct dirent *mydirent;
 
                                 if((dir = opendir( path.latin1())) != NULL)
                                                 while ((mydirent = readdir(dir)) != NULL) {
                                                                 lstat( mydirent->d_name, &buf);
 //        odebug << mydirent->d_name << oendl;
                                                                 fileL.sprintf("%s", mydirent->d_name);
                                                                 devT = buf.st_dev;
                                                                 fileS.sprintf("%d, %d", (int) ( devT >>8) &0xFF, (int)devT &0xFF);
                                                                 fileDate.sprintf("%s", ctime( &buf.st_mtime));
                                                                 if( fileL.find(".") == -1 ) {
                                                                                 item= new QListViewItem( thisView, fileL, fileS, fileDate);
                                                                                 pm = unknownXpm;
                                                                                 item->setPixmap( 0,pm);
                                                                 }
                                                 }
 
                                 closedir(dir);
                 }
 
                 thisView->setSorting( 3,FALSE);
                 fillCombo( (const QString &) path );
 }
 
 void AdvancedFm::rePopulate() {
         //      qDebug("repopulate views");
                 populateView();
                 setOtherTabCurrent();
                 populateView();
 }
 
 void AdvancedFm::ListClicked(QListViewItem *selectedItem) {
                 if(selectedItem) {
                                 QString strItem=selectedItem->text(0);
 //      owarn << strItem << oendl;
                                 QString strSize=selectedItem->text(1);
                                 strSize=strSize.stripWhiteSpace();
                                 bool isDirectory = false;
                                 QString strItem2;
 
                                 if(strItem.find("@",0,TRUE) !=-1 || strItem.find("->",0,TRUE) !=-1 ) {//if symlink
                                                 strItem2 = dealWithSymName((const QString&)strItem);
                                                 if(QDir(strItem2).exists() )
                                                                 strItem = strItem2;
                                 }
 
                                 if( strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) {
 
                                                 if(QDir(strItem).exists())
                                                                 isDirectory = true;
                                 }
 
                                 if( isDirectory ) {
                                                 CurrentDir()->cd( strItem, TRUE);
                                                 populateView();
                                                 CurrentView()->ensureItemVisible( CurrentView()->firstChild());
                                 }
                                 chdir( strItem.latin1());
                 }
 }
 
 void AdvancedFm::ListPressed( int mouse, QListViewItem *item, const QPoint& , int ) {
                 Q_UNUSED(item);
    switch (mouse) {
    case 1:
    {
       if(renameBox != 0 ) {
          cancelRename();
       }
    }
    break;
 //    case 2:
 //       menuTimer.start( 50, TRUE );
 //       break;
    };
 }
 
 
 void AdvancedFm::refreshCurrentTab() {
      populateView();
         // if ( TabWidget->currentWidget() == tab) {
 }
 
 void AdvancedFm::switchToLocalTab() {
                 TabWidget->setCurrentWidget(tab);
                 Local_View->setFocus();
         //      whichTab = 1;
 }
 
 void AdvancedFm::switchToRemoteTab() {
                 TabWidget->setCurrentWidget(tab_2);
                 Remote_View->setFocus();
         //      whichTab = 2;
 }
 
 void  AdvancedFm::currentPathComboChanged() {
                 QString pDir = currentPathCombo->lineEdit()->text();
    if(QDir(pDir).exists()) {
       CurrentDir()->setPath(pDir );
       populateView();
    } else {
       QMessageBox::message(tr("Note"),tr("<p>%1 does not exist</p>").arg(pDir));
    }
 }
 
 void  AdvancedFm::fillCombo(const QString &currentPath) {
 
          if ( TabWidget->currentWidget() == tab) {
 //   if ( whichTab == 1) {
       currentPathCombo->lineEdit()->setText( currentPath);
       if( localDirPathStringList.grep( currentPath,TRUE).isEmpty() ) {
          currentPathCombo->clear();
          localDirPathStringList.prepend( currentPath );
          currentPathCombo->insertStringList( localDirPathStringList,-1);
       }
    } else {
       currentPathCombo->lineEdit()->setText( currentPath);
       if( remoteDirPathStringList.grep( currentPath,TRUE).isEmpty() ) {
          currentPathCombo->clear();
          remoteDirPathStringList.prepend( currentPath );
          currentPathCombo->insertStringList( remoteDirPathStringList,-1);
       }
    }
 }
 
 QStringList AdvancedFm::getPath() {
    QStringList strList;
    QListView *thisView=CurrentView();
    QList<QListViewItem> * getSelectedItems( QListView * thisView );
    QListViewItemIterator it( thisView );
    for ( ; it.current(); ++it ) {
       if ( it.current()->isSelected() ) {
          strList <<  it.current()->text(0);
 //        odebug << it.current()->text(0) << oendl;
       }
    }
    return strList;
 }
 
 void AdvancedFm::changeTo(const QString &dir) {
    chdir( dir.latin1());
    CurrentDir()->cd(dir, TRUE);
    populateView();
    update();
 }
 
 void AdvancedFm::homeButtonPushed() {
  changeTo(QDir::homeDirPath());
 }
 
 void AdvancedFm::docButtonPushed() {
    changeTo(QPEApplication::documentDir());
 }
 
 void AdvancedFm::SDButtonPushed() {
    Opie::Core::OStorageInfo info;
    if(StorageInfo::hasSd() ) {
       changeTo(info.sdPath());
    }
    else if(StorageInfo::hasMmc()) {
       changeTo(info.mmcPath());
    }
 }
 
 void AdvancedFm::CFButtonPushed() {
                 Opie::Core::OStorageInfo info;
                 changeTo(info.cfPath());
 }
 
 void AdvancedFm::QPEButtonPushed() {
                 changeTo(QPEApplication::qpeDir());
 }
 
 void AdvancedFm::doAbout() {
    QMessageBox::message("AdvancedFm",tr("<P>Advanced FileManager is copyright 2002-2003 by L.J.Potter<llornkcor@handhelds.org> and is licensed by the GPL</P>"));
 }
 
 void AdvancedFm::keyPressEvent( QKeyEvent *e) {
                 Q_UNUSED(e);
 }
 
 void AdvancedFm::keyReleaseEvent( QKeyEvent *e) {
 //     if( CurrentView()->hasFocus() )
 //        e->ignore();
 
         if( currentPathCombo->lineEdit()->hasFocus()) {
         //                      qDebug("shout!");
                 }
 
                                 else if(  e->key() ==  Key_Left )
                                 upDir();
                 else if( e->key() == Key_Return || e->key() == Key_Enter)
                                 navigateToSelected();
                 else if( e->key() == Key_Tab)
                                 setOtherTabCurrent();
                 else if( e->key() == Key_Delete )
                                 del();
                 else
                                 e->accept();
 
 }
 
 
 void AdvancedFm::parsetab(const QString &fileName) {
 
    fileSystemTypeList.clear();
    fsList.clear();
    struct mntent *me;
    FILE *mntfp = setmntent( fileName.latin1(), "r" );
    if ( mntfp ) {
       while ( (me = getmntent( mntfp )) != 0 ) {
          QString deviceName = me->mnt_fsname;
          QString filesystemType = me->mnt_type;
          QString mountDir = me->mnt_dir;
          if(deviceName != "none") {
             if( fsList.contains(filesystemType) == 0
                 & filesystemType.find("proc",0,TRUE) == -1
                 & filesystemType.find("cramfs",0,TRUE) == -1
                 & filesystemType.find("auto",0,TRUE) == -1)
                fsList << filesystemType;
             fileSystemTypeList << mountDir+"::"+filesystemType;
          }
       }
    }
    endmntent( mntfp );
 }
 
 QString  AdvancedFm::getFileSystemType(const QString &currentText) {
    parsetab("/etc/mtab"); //why did TT forget filesystem type?
    QString current = currentText;//.right( currentText.length()-1);
    QString baseFs;
    for ( QStringList::Iterator it = fileSystemTypeList.begin(); it != fileSystemTypeList.end(); ++it ) {
       QString temp = (*it);
       QString path = temp.left(temp.find("::",0,TRUE) );
       path = path.right( path.length()-1);
       if(path.isEmpty()) baseFs = temp.right( temp.length() - temp.find("::",0,TRUE) - 2);
       if( current.find( path,0,TRUE) != -1 && !path.isEmpty()) {
          return temp.right( temp.length() - temp.find("::",0,TRUE) - 2);
       }
    }
    return baseFs;
 }
 
 QString  AdvancedFm::getDiskSpace( const QString &path) {
    struct statfs fss;
    if ( !statfs( path.latin1(), &fss ) ) {
       int blkSize = fss.f_bsize;
       //    int totalBlks = fs.f_blocks;
       int availBlks = fss.f_bavail;
 
       long mult = blkSize / 1024;
       long div = 1024 / blkSize;
       if ( !mult ) mult = 1;
       if ( !div ) div = 1;
 
       return QString::number(availBlks * mult / div);
    }
    return "";
 }
 
 
 void AdvancedFm::showFileMenu() {
    QString curApp;
    curApp = CurrentView()->currentItem()->text(0);
 
    MimeType mt(curApp);
    const AppLnk* app = mt.application();
    QFile fi(curApp);
    QPopupMenu *m = new QPopupMenu(0);
    QPopupMenu *n = new QPopupMenu(0);
    //    QPopupMenu *o = new QPopupMenu(0);
    m->insertItem(tr("Show Hidden Files"),this,SLOT(showHidden()));
 
    if ( QFileInfo(fi).isDir()) {
       m->insertSeparator();
       m->insertItem(tr("Change Directory"),this,SLOT(doDirChange()));
    } else {
 
       if (app)
          m->insertItem(app->pixmap(),tr("Open in " + app->name()),this,SLOT(runThis()));
       else if(QFileInfo(fi).isExecutable() ) //damn opie doesnt like this
          m->insertItem(tr("Execute"),this,SLOT(runThis()));
-      m->insertItem(Resource::loadPixmap("txt"),tr("Open as text"),this,SLOT(runText()));
+      m->insertItem( Opie::Core::OResource::loadPixmap( "txt", Opie::Core::OResource::SmallIcon ),
+                     tr("Open as text"),this,SLOT(runText()));
    }
 
    m->insertItem(tr("Actions"),n);
    n->insertItem(tr("Make Directory"),this,SLOT(makeDir()));
 
    n->insertItem(tr("Make Symlink"),this,SLOT(mkSym()));
 
    n->insertSeparator();
    n->insertItem(tr("Rename"),this,SLOT(renameIt()));
 
    n->insertItem(tr("Copy"),this,SLOT(copyTimer()));
    n->insertItem(tr("Copy As"),this,SLOT(copyAsTimer()));
    n->insertItem(tr("Copy Same Dir"),this,SLOT(copySameDirTimer()));
    n->insertItem(tr("Move"),this,SLOT(moveTimer()));
 
    n->insertSeparator();
    n->insertItem(tr("Delete"),this,SLOT(doDelete()));
    m->insertItem(tr("Add To Documents"),this,SLOT(addToDocs()));
 
    m->insertItem(tr("Run Command"),this,SLOT(runCommand()));
    m->insertItem(tr("File Info"),this,SLOT(fileStatus()));
 
    m->insertSeparator();
    m->insertItem(tr("Set Permissions"),this,SLOT(filePerms()));
 
 #if defined(QT_QWS_OPIE)
    m->insertItem(tr("Properties"),this,SLOT(doProperties()));
 #endif
    m->setCheckable(TRUE);
    if (!b)
       m->setItemChecked(m->idAt(0),TRUE);
    else
       m->setItemChecked(m->idAt(0),FALSE);
 
    if(Ir::supported())
       m->insertItem(tr("Beam File"),this,SLOT(doBeam()));
    m->setFocus();
 
    m->exec(QPoint(QCursor::pos().x(),QCursor::pos().y()));
 
    if(m) delete m;
 }
 
 
 QString AdvancedFm::checkDiskSpace(const QString &path) {
    struct statfs fss;
    if ( !statfs( path.latin1(), &fss ) ) {
       int blkSize = fss.f_bsize;
 //    int totalBlks = fs.f_blocks;
       int availBlks = fss.f_bavail;
 
       long mult = blkSize / 1024;
       long div = 1024 / blkSize;
       if ( !mult ) mult = 1;
       if ( !div ) div = 1;
 
 
       return QString::number(availBlks * mult / div);
    }
    return "";
 }
 
 void AdvancedFm::addToDocs() {
    QStringList strListPaths = getPath();
    QDir *thisDir = CurrentDir();
 
    if( strListPaths.count() > 0) {
       QString curFile;
       for ( QStringList::Iterator it = strListPaths.begin(); it != strListPaths.end(); ++it ) {
          curFile = thisDir->canonicalPath()+"/"+(*it);
 //                odebug << curFile << oendl;
          QFileInfo fi(curFile);
          DocLnk f;
 //                curFile.replace(QRegExp("\\..*"),"");
          f.setName(fi.baseName() );
          f.setFile( curFile);
          f.writeLink();
       }
    }
 }
 
 
 void AdvancedFm::customDirsToMenu() {
 
    Config cfg("AdvancedFm");
    cfg.setGroup("Menu");
 
    QStringList list = cfg.readListEntry( "CustomDir", ',');
    menuButton->insertItems(list );
 
 //      for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it )
 //        {
 //            customDirMenu->insertItem(*it );
 //        }
 }
 
 void AdvancedFm::dirMenuSelected(int item) {
    switch(item)
    {
 
    case -21:
    case 0:
       addCustomDir();
       break;
    case -22:
    case 1:
       removeCustomDir();
       break;
    default:
    {
 //            gotoCustomDir( menuButton->text(item));
 //            gotoCustomDir( customDirMenu->text(item));
    }
    break;
 
    };
 }
 
 void AdvancedFm::addCustomDir() {
    Config cfg("AdvancedFm");
    cfg.setGroup("Menu");
    QString dir;
    QStringList list = cfg.readListEntry( (const QString &)"CustomDir", (const QChar)',');
 
    dir =  CurrentDir()->canonicalPath();
 
    bool addIt=true;
    for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
       if( dir == (*it)) {
          addIt=false;
       }
    }
    if(addIt) {
       menuButton->insertItem(dir);
 //          customDirMenu->insertItem(dir);
       list <<  dir;
    }
 
    cfg.writeEntry("CustomDir", list, ',');
    cfg.write();
 }
 
 void AdvancedFm::removeCustomDir() {
 //  odebug << "remove custom dir" << oendl;
    Config cfg("AdvancedFm");
    cfg.setGroup("Menu");
    QString dir;
    QStringList list = cfg.readListEntry( (const QString &)"CustomDir", (const QChar)',');
    QStringList list2;
    dir =  CurrentDir()->canonicalPath();
    int ramble=2;
 //  int ramble=-24;
 //first remove list
    if(list.grep(dir,true).isEmpty()) {
       QMessageBox::message(tr( "AdvancedFm" ),
                            tr("<p>Cannot remove current directory from bookmarks. It is not bookmarked!</p>"));
    } else {
       for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
          if((*it) != dir) {
 //current item is not our current dir, so add it to temp list
             list2 <<(*it);
          } else {
 //              customDirMenu->removeItem( ramble);
             menuButton->remove( ramble);
 
          }
          ramble++;
 //        ramble--;
       }
 
       cfg.writeEntry("CustomDir", list2, ',');
       cfg.write();
    }
 //    customDirsToMenu();
 
 }
 
 void AdvancedFm::gotoCustomDir(const QString &dir) {
 //     odebug << "gotoCustomDir(const QString &dir) " +dir << oendl;
 //  QString curDir = dir;
 //  QDir *thisDir = CurrentDir();
 //     if( curDir.isEmpty()) {
 //     }
    if( dir == s_addBookmark) {
       addCustomDir();
    }
    if( dir == s_removeBookmark) {
       removeCustomDir( );
    } else {
       changeTo( dir);
 //       if(QDir( curDir).exists() )
 //         {
 //           thisDir->setPath( curDir );
 //           chdir( curDir.latin1() );
 //           thisDir->cd( curDir, TRUE);
 //           populateView();
 //         }
    }
 }
 
 QDir *AdvancedFm::CurrentDir() {
    if ( whichTab == 1) {
         //               qDebug("CurrentTab is Local");
       return &currentDir;
    } else {
         //               qDebug("CurrentTab is Remote");
       return &currentRemoteDir;
    }
 }
 
 QDir *AdvancedFm::OtherDir() {
         // if ( TabWidget->currentWidget() == tab) {
    if ( whichTab == 1) {
       return &currentRemoteDir;
    } else {
       return &currentDir;
    }
 }
 
 QListView * AdvancedFm::CurrentView() {
         // if ( TabWidget->currentWidget() == tab) {
    if ( whichTab == 1) {
         //                      qDebug("CurrentView: local");
       return Local_View;
    } else {
 //      owarn << "CurrentView Tab 2" << oendl;
         //                      qDebug("CurrentView: remote");
       return Remote_View;
    }
 }
 
 QListView * AdvancedFm::OtherView() {
    if ( whichTab == 1)
       return Remote_View;
    else
       return Local_View;
 }
 
 void AdvancedFm::setOtherTabCurrent() {
         //      qDebug("setOtherTabCurrent() %d",whichTab);
    if ( whichTab == 1) {
       TabWidget->setCurrentWidget(1);
    } else {
       TabWidget->setCurrentWidget(0);
    }
 //    OtherView()->setFocus();
     OtherView()->setSelected( CurrentView()->firstChild(), true);
 }
 
 void AdvancedFm::qcopReceive(const QCString &msg, const QByteArray &data) {
 //   odebug << "qcop message "+msg << oendl;
    QDataStream stream ( data, IO_ReadOnly );
    if ( msg == "openDirectory(QString)" ) {
 //      odebug << "received" << oendl;
       QString file;
       stream >> file;
       changeTo( (const QString &) file);
    }
 }
 
 void AdvancedFm::setDocument(const QString &file) {
    changeTo( file);
 }
 
 
 void AdvancedFm::slotSwitchMenu(int item) {
    if(item == -23)  {
       switchToLocalTab();
       tabChanged( tab);
     }
 
     if(item == -24) {
       switchToRemoteTab();
       tabChanged( tab_2);
     }
 }
 
 void AdvancedFm::navigateToSelected() {
    if( !CurrentView()->currentItem()) return;
    doDirChange();
 }
diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp
index b43d2ba..aa9db52 100644
--- a/noncore/apps/advancedfm/advancedfmData.cpp
+++ b/noncore/apps/advancedfm/advancedfmData.cpp
@@ -1,276 +1,277 @@
 /***************************************************************************
    advancedfmData.cpp
                              -------------------
 ** Created: Mon 09-23-2002 13:24:11
     copyright            : (C) 2002 by ljp
     email                : ljp@llornkcor.com
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 #include "advancedfm.h"
 
 /* OPIE */
 #include <opie2/odebug.h>
+#include <opie2/oresource.h>
 #include <qpe/applnk.h>
 #include <qpe/storage.h>
 #include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
 #include <qpe/menubutton.h>
 using namespace Opie::Core;
 using namespace Opie::Ui;
 
 /* QT */
 #include <qlayout.h>
 #include <qhbox.h>
 #include <qmenubar.h>
 #include <qcombobox.h>
 #include <qtoolbutton.h>
 #include <qlineedit.h>
 #include <qlistview.h>
 
 /* STD */
 #include <sys/utsname.h>
 
 void AdvancedFm::init() {
          b = false;
          setCaption( tr( "AdvancedFm" ) );
 
          QVBoxLayout *layout = new QVBoxLayout( this );
          layout->setSpacing( 2);
          layout->setMargin( 0); // squeeze
 
          QMenuBar *menuBar = new QMenuBar(this);
          menuBar->setMargin( 0 ); // squeeze
          fileMenu = new QPopupMenu( this );
          viewMenu  = new QPopupMenu( this );
 //  customDirMenu  = new QPopupMenu( this );
 
          layout->addWidget( menuBar );
 
          menuBar->insertItem( tr( "File" ), fileMenu);
          menuBar->insertItem( tr( "View" ), viewMenu);
 
-         QPixmap pm;
+    bool useBigIcon = qApp->desktop()->size().width() > 330;
+
          cdUpButton = new QToolButton( 0,"cdUpButton");
-         pm.convertFromImage( Resource::loadImage( "up" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
-         cdUpButton->setPixmap( pm );
+     cdUpButton->setUsesBigPixmap( useBigIcon );
+         cdUpButton->setPixmap( Opie::Core::OResource::loadPixmap( "up", Opie::Core::OResource::SmallIcon ) );
          cdUpButton->setAutoRaise( true );
          menuBar->insertItem( cdUpButton );
 
          qpeDirButton= new QToolButton( 0,"QPEButton");
-         pm.convertFromImage( Resource::loadImage( "logo/opielogo" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
-         qpeDirButton->setPixmap( pm );//,"",this,"QPEButton");
+     qpeDirButton->setUsesBigPixmap( useBigIcon );
+         qpeDirButton->setPixmap( Opie::Core::OResource::loadPixmap( "logo/opielogo", Opie::Core::OResource::SmallIcon ) );
          qpeDirButton->setAutoRaise( true );
          menuBar->insertItem( qpeDirButton );
 
          cfButton = new QToolButton( 0, "CFButton");
-         pm.convertFromImage( Resource::loadImage( "cardmon/pcmcia" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
-         cfButton->setPixmap( pm );
+     cfButton->setUsesBigPixmap( useBigIcon );
+         cfButton->setPixmap( Opie::Core::OResource::loadPixmap( "cardmon/pcmcia", Opie::Core::OResource::SmallIcon ) );
          cfButton->setAutoRaise( true );
          menuBar->insertItem( cfButton );
 
          sdButton = new QToolButton( 0, "SDButton");
-         pm.convertFromImage( Resource::loadImage( "advancedfm/sdcard" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
-         sdButton->setPixmap( pm );
+     sdButton->setUsesBigPixmap( useBigIcon );
+         sdButton->setPixmap( Opie::Core::OResource::loadPixmap( "advancedfm/sdcard", Opie::Core::OResource::SmallIcon ) );
          sdButton->setAutoRaise( true );
          menuBar->insertItem( sdButton );
 
          docButton = new QToolButton( 0,"docsButton");
-         pm.convertFromImage( Resource::loadImage( "DocsIcon" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
-         docButton->setPixmap( pm );
+     docButton->setUsesBigPixmap( useBigIcon );
+         docButton->setPixmap( Opie::Core::OResource::loadPixmap( "DocsIcon", Opie::Core::OResource::SmallIcon ) );
          docButton->setAutoRaise( true );
          menuBar->insertItem( docButton );
 
          homeButton = new QToolButton( 0, "homeButton");
-         pm.convertFromImage( Resource::loadImage( "home" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
-         homeButton->setPixmap( pm );
+     homeButton->setUsesBigPixmap( useBigIcon );
+         homeButton->setPixmap( Opie::Core::OResource::loadPixmap( "home", Opie::Core::OResource::SmallIcon ) );
          homeButton->setAutoRaise( true );
          menuBar->insertItem( homeButton );
 
          fileMenu->insertItem( tr( "Show Hidden Files" ), this,  SLOT( showMenuHidden() ));
          fileMenu->setItemChecked( fileMenu->idAt(0),TRUE);
          fileMenu->insertSeparator();
          fileMenu->insertItem( tr( "File Search" ), this, SLOT( openSearch() ));
          fileMenu->insertSeparator();
          fileMenu->insertItem( tr( "Make Directory" ), this, SLOT( mkDir() ));
          fileMenu->insertItem( tr( "Rename" ), this, SLOT( rn() ));
          fileMenu->insertItem( tr( "Run Command" ), this, SLOT( runCommandStd() ));
          fileMenu->insertItem( tr( "Run Command with Output" ), this, SLOT( runCommand() ));
          fileMenu->insertSeparator();
          fileMenu->insertItem( tr( "Make Symlink" ), this, SLOT( mkSym() ));
          fileMenu->insertItem( tr( "Select All" ), this, SLOT( selectAll() ));
          fileMenu->insertItem( tr( "Add To Documents" ), this, SLOT( addToDocs() ));
          fileMenu->insertItem( tr( "Delete" ), this, SLOT( del() ));
          fileMenu->setCheckable(TRUE);
 
          viewMenu->insertItem( tr( "Switch to View 1" ), this, SLOT( switchToLocalTab()));
          viewMenu->insertItem( tr( "Switch to View 2" ), this, SLOT( switchToRemoteTab()));
          viewMenu->insertItem( tr( "Refresh" ), this, SLOT( refreshCurrentTab()));
 //     viewMenu->insertSeparator();
 //     viewMenu->insertItem( tr( "About" ), this, SLOT( doAbout() ));
          viewMenu->setCheckable(true);
          viewMenu->setItemChecked( viewMenu->idAt(0), true);
          viewMenu->setItemChecked( viewMenu->idAt(1), false);
 
          s_addBookmark = tr("Bookmark Directory");
          s_removeBookmark = tr("Remove Current Directory from Bookmarks");
 
 //    menuButton->insertItem("");
 
 //     customDirMenu->insertItem(tr("Add This Directory"));
 //     customDirMenu->insertItem(tr("Remove This Directory"));
 //     customDirMenu->insertSeparator();
 
          QHBoxLayout *CBHB = new QHBoxLayout(); // parent layout will be set later
          CBHB->setMargin( 0 );
          CBHB->setSpacing( 1 );
 
          menuButton = new MenuButton( this );
 
          menuButton->setUseLabel(false);
          menuButton->setMaximumWidth( 20 );
          menuButton->insertItem( s_addBookmark);
          menuButton->insertItem( s_removeBookmark);
          menuButton->insertSeparator();
 // menuButton->setFocusPolicy(NoFocus);
          CBHB->addWidget( menuButton );
 
          customDirsToMenu();
 
          currentPathCombo = new QComboBox( FALSE, this, "currentPathCombo" );
          currentPathCombo->setEditable(TRUE);
          currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
         // currentPathCombo->setFocusPolicy(NoFocus);
          CBHB->addWidget( currentPathCombo );
 
          layout->addLayout( CBHB );
 
          TabWidget = new OSplitter( Horizontal, this, "TabWidget" );
 //  TabWidget = new QTabWidget( this, "TabWidget" );
          layout->addWidget( TabWidget, 4 );
 
          tab = new QWidget( TabWidget, "tab" );
          tabLayout = new QGridLayout( tab );
          tabLayout->setSpacing( 2);
          tabLayout->setMargin( 2);
 
          Local_View = new QListView( tab, "Local_View" );
          Local_View->addColumn( tr("File"),130);
          Local_View->addColumn( tr("Size"),-1);
          Local_View->setColumnAlignment(1,QListView::AlignRight);
          Local_View->addColumn( tr("Date"),-1);
          Local_View->setColumnAlignment(2,QListView::AlignRight);
          Local_View->setAllColumnsShowFocus(TRUE);
          Local_View->setMultiSelection( TRUE );
          Local_View->setSelectionMode(QListView::Extended);
          Local_View->setFocusPolicy(StrongFocus);
          Local_View->installEventFilter( this );
 
          QPEApplication::setStylusOperation( Local_View->viewport() , QPEApplication::RightOnHold);
 
          tabLayout->addWidget( Local_View, 0, 0 );
 
          TabWidget->addWidget( tab,"advancedfm/smFileBrowser.png", tr("1"));
 //  TabWidget->insertTab( tab, tr("1"));
 
          tab_2 = new QWidget( TabWidget, "tab_2" );
          tabLayout_2 = new QGridLayout( tab_2 );
          tabLayout_2->setSpacing( 2);
          tabLayout_2->setMargin( 2);
 
          Remote_View = new QListView( tab_2, "Remote_View" );
          Remote_View->addColumn( tr("File"),130);
          Remote_View->addColumn( tr("Size"),-1);
          Remote_View->setColumnAlignment(1,QListView::AlignRight);
          Remote_View->addColumn( tr("Date"),-1);
          Remote_View->setColumnAlignment(2,QListView::AlignRight);
          Remote_View->setAllColumnsShowFocus(TRUE);
          Remote_View->setMultiSelection( TRUE );
          Remote_View->setSelectionMode(QListView::Extended);
          Remote_View->setFocusPolicy(StrongFocus);
          Remote_View->installEventFilter( this );
 
          QPEApplication::setStylusOperation( Remote_View->viewport(), QPEApplication::RightOnHold);
 
          tabLayout_2->addWidget( Remote_View, 0, 0 );
 
          TabWidget->addWidget( tab_2, "advancedfm/smFileBrowser.png",tr( "2"));
          TabWidget->setSizeChange( 370 );
 //  TabWidget->insertTab( tab_2, tr( "2"));
 
          /*     tab_3 = new QWidget( TabWidget, "tab_3" );
                                         tabLayout_3 = new QGridLayout( tab_3 );
                                         tabLayout_3->setSpacing( 2);
                                         tabLayout_3->setMargin( 2);
 
 
                                         //     OFileDialog fileDialog;
                                         // fileDialog;
                                         //    fileSelector = new FileSelector( "*",tab_3, "fileselector" , FALSE, FALSE); //buggy
                                         //     fileDialog = new OFileDialog("bangalow", tab_3, 4, 2, "Bungalow");
                                         //      OFileSelector fileDialog = new OFileSelector( tab_3, 4, 2,"/");
 
                                         QListView *fileTree;
                                         fileTree = new QListView( tab_3, "tree" );
 
 
                                         tabLayout_3->addMultiCellWidget( fileTree, 0, 0, 0, 3 );
 
                                         TabWidget->insertTab( tab_3, tr( "Remote" ) );
          */
 
          ///////////////
 
          if( !StorageInfo::hasSd() || !StorageInfo::hasMmc()) {
                         sdButton->hide();
          }
          if( !StorageInfo::hasCf() ) {
                         cfButton->hide();
          }
          currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
          currentDir.setPath( QDir::currentDirPath());
 
          currentRemoteDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
          currentRemoteDir.setPath( QDir::currentDirPath());
 
          filterStr="*";
          showMenuHidden();
          TabWidget->setCurrentWidget(0);
 
 }
 
 void AdvancedFm::initConnections()
 {
 
   connect(qApp,SIGNAL(aboutToQuit()),this,SLOT(cleanUp()));
   connect(qpeDirButton,SIGNAL(released()),this,SLOT(QPEButtonPushed()));
   connect(cfButton,SIGNAL(released()),this,SLOT(CFButtonPushed()));
   connect(sdButton,SIGNAL(released()),this,SLOT(SDButtonPushed()));
   connect(cdUpButton,SIGNAL(released()),this,SLOT(upDir()));
   connect(docButton,SIGNAL(released()),this,SLOT(docButtonPushed()));
   connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()));
   connect(currentPathCombo,SIGNAL(activated(const QString&)),this,SLOT(changeTo(const QString&)));
 
   connect(currentPathCombo->lineEdit(),SIGNAL(returnPressed()),this,SLOT(currentPathComboChanged()));
 
   connect(Local_View,SIGNAL(clicked(QListViewItem*)),this,SLOT( ListClicked(QListViewItem*)));
 
   connect(Local_View,SIGNAL(mouseButtonPressed(int,QListViewItem*,const QPoint&,int)),this,SLOT( ListPressed(int,QListViewItem*,const QPoint&,int)) );
 
   connect(Remote_View,SIGNAL(clicked(QListViewItem*)),this,SLOT(ListClicked(QListViewItem*)));
   connect(Remote_View,SIGNAL(mouseButtonPressed(int,QListViewItem*,const QPoint&,int)),this,SLOT(ListPressed(int,QListViewItem*,const QPoint&,int)));
 
   connect(TabWidget,SIGNAL(currentChanged(QWidget*)),this,SLOT(tabChanged(QWidget*)));
 
   connect(Remote_View,SIGNAL(rightButtonPressed(QListViewItem*,const QPoint&,int)),this,SLOT(showFileMenu()));
   connect(Local_View,SIGNAL(rightButtonPressed(QListViewItem*,const QPoint&,int)),this,SLOT(showFileMenu()));
 
   connect(menuButton,SIGNAL(selected(const QString&)),SLOT(gotoCustomDir(const QString&)));
 //  connect( menuButton, SIGNAL( selected(int)), SLOT( dirMenuSelected(int)));
   connect(viewMenu,SIGNAL(activated(int)),this,SLOT(slotSwitchMenu(int)));
 //  connect( customDirMenu, SIGNAL( activated(int)), this, SLOT( dirMenuSelected(int)));
 
 }