Resource -> OResource

2 files changed, 32 insertions, 41 deletions

diff --git a/noncore/net/opieftp/opie-ftp.control b/noncore/net/opieftp/opie-ftp.control
index 32cc7a6..82f774f 100644
--- a/noncore/net/opieftp/opie-ftp.control
+++ b/noncore/net/opieftp/opie-ftp.control
@@ -1,11 +1,11 @@
 Package: opie-ftp
 Files: plugins/application/libopieftp.so* bin/opieftp pics/opieftp apps/Applications/opieftp.desktop
 Priority: optional
 Section: opie/applications
 Maintainer: L.J. Potter <ljp@llornkcor.com>
 Architecture: arm
-Depends: task-opie-minimal, ftplib
+Depends: task-opie-minimal, ftplib, libopiecore2
 Replaces: opieftp
 Description: Opie-Ftp
  The ftp client for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp
index 4f0ca29..14fd859 100644
--- a/noncore/net/opieftp/opieftp.cpp
+++ b/noncore/net/opieftp/opieftp.cpp
@@ -1,472 +1,464 @@
 /***************************************************************************
    opieftp.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 "opieftp.h"
 
 extern "C" {
 #include <ftplib.h>
 }
 
 #include "inputDialog.h"
 
 /* OPIE */
 //#include <opie2/odebug.h>
 //using namespace Opie::Core;
 
-#include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
+
+#include <qpe/applnk.h>
 #include <qpe/config.h>
 #include <qpe/mimetype.h>
+#include <qpe/qpeapplication.h>
+#include <qpe/qpemenubar.h>
 
-#include <qtextstream.h>
-#include <qpushbutton.h>
-#include <qtoolbutton.h>
+#include <qbitmap.h>
 #include <qcombobox.h>
-#include <qlistview.h>
 #include <qlabel.h>
+#include <qlayout.h>
+#include <qlistview.h>
+#include <qmenubar.h>
+#include <qmessagebox.h>
 #include <qprogressbar.h>
+#include <qpushbutton.h>
 #include <qspinbox.h>
 #include <qtabwidget.h>
-#include <qlayout.h>
-#include <qmessagebox.h>
-#include <qmenubar.h>
-#include <qpe/qpemenubar.h>
+#include <qtextstream.h>
+#include <qtoolbutton.h>
 
 #include <qlineedit.h>
 #include <qlistbox.h>
 #include <qvbox.h>
 /* STD */
 #include <unistd.h>
 #include <stdlib.h>
 
 QProgressBar *ProgressBar;
 static netbuf *conn = NULL;
 
 static int log_progress(netbuf *, int xfered, void *)
 {
 //    int fsz = *(int *)arg;
 //    int pct = (xfered * 100) / fsz;
 //      printf("%3d%%\r", pct);
 //      fflush(stdout);
     ProgressBar->setProgress(xfered);
     qApp->processEvents();
     return 1;
 }
 
 OpieFtp::OpieFtp( QWidget* , const char*, WFlags)
         : QMainWindow( )
 {
     qDebug("OpieFtp constructor");
     setCaption( tr( "OpieFtp" ) );
         //      initializeGui();
          QTimer::singleShot( 50, this, SLOT(initializeGui() ));
 }
 
 void OpieFtp::initializeGui() {
     fuckeduphack=FALSE;
 
     QVBox* wrapperBox = new QVBox( this );
     setCentralWidget( wrapperBox );
 
     QWidget *view = new QWidget( wrapperBox );
 
     QGridLayout *layout = new QGridLayout( view );
     layout->setSpacing( 1);
     layout->setMargin( 1);
     connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
 
     QPEMenuBar *menuBar = new QPEMenuBar(view);
 //    QMenuBar *menuBar = new QMenuBar(this);
 //     QPEToolBar *menuBar = new QPEToolBar(this);
 //     menuBar->setHorizontalStretchable( TRUE );
 
-    QWMatrix matrix;
-    QPixmap pix(Resource::loadPixmap( "UnknownDocument" ));
-    matrix.scale( .4, .4);
-    unknownXpm =  pix.xForm(matrix);
+    unknownXpm =  Opie::Core::OResource::loadPixmap( "UnknownDocument", Opie::Core::OResource::SmallIcon );
 
     connectionMenu  = new QPopupMenu( this );
     localMenu  = new QPopupMenu( this );
     remoteMenu  = new QPopupMenu( this );
     tabMenu = new QPopupMenu( this );
 
     layout->addMultiCellWidget( menuBar, 0, 0, 0, 2 );
 
     menuBar->insertItem( tr( "Connection" ), connectionMenu);
 //      menuBar->insertItem( tr( "Local" ), localMenu);
 //      menuBar->insertItem( tr( "Remote" ), remoteMenu);
     menuBar->insertItem( tr( "View" ), tabMenu);
 
     tabMenu->insertItem( tr( "Local" ), localMenu);
     tabMenu->insertItem( tr( "Remote" ), remoteMenu);
 
     connectionMenu->insertItem( tr( "New" ), this,  SLOT( newConnection() ));
     connectionMenu->insertItem( tr( "Connect" ), this,  SLOT( connector() ));
     connectionMenu->insertItem( tr( "Disconnect" ), this,  SLOT( disConnector() ));
 
     localMenu->insertItem( tr( "Show Hidden Files" ), this,  SLOT( showHidden() ));
     localMenu->insertSeparator();
     localMenu->insertItem( tr( "Upload" ), this, SLOT( localUpload() ));
     localMenu->insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() ));
     localMenu->insertItem( tr( "Rename" ), this, SLOT( localRename() ));
     localMenu->insertSeparator();
     localMenu->insertItem( tr( "Delete" ), this, SLOT( localDelete() ));
     localMenu->setCheckable(TRUE);
 
     remoteMenu->insertItem( tr( "Download" ), this, SLOT( remoteDownload() ));
     remoteMenu->insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() ));
     remoteMenu->insertItem( tr( "Rename" ), this, SLOT( remoteRename() ));
     remoteMenu->insertSeparator();
     remoteMenu->insertItem( tr( "Delete" ), this, SLOT( remoteDelete() ));
 
     tabMenu->insertSeparator();
     tabMenu->insertItem( tr( "Switch to Local" ), this, SLOT( switchToLocalTab() ));
     tabMenu->insertItem( tr( "Switch to Remote" ), this, SLOT( switchToRemoteTab() ));
     tabMenu->insertItem( tr( "Switch to Config" ), this, SLOT( switchToConfigTab() ));
-    tabMenu->insertSeparator();
-//    tabMenu->insertItem( tr( "About" ), this, SLOT( doAbout() ));
     tabMenu->setCheckable(TRUE);
 
-
+    bool useBigPix = qApp->desktop()->size().width() > 330;
     cdUpButton = new QToolButton( view,"cdUpButton");
-    cdUpButton->setPixmap(Resource::loadPixmap("up"));
-    cdUpButton ->setFixedSize( QSize( 20, 20 ) );
+    cdUpButton->setUsesBigPixmap( useBigPix );
+    cdUpButton->setPixmap( Opie::Core::OResource::loadPixmap( "up", Opie::Core::OResource::SmallIcon ) );
+    cdUpButton->setFixedSize( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
     connect( cdUpButton ,SIGNAL(released()),this,SLOT( upDir()) );
     layout->addMultiCellWidget( cdUpButton, 0, 0, 4, 4 );
     cdUpButton->hide();
 
-//     docButton = new QPushButton(Resource::loadIconSet("DocsIcon"),"",view,"docsButton");
-//     docButton->setFixedSize( QSize( 20, 20 ) );
-//     connect( docButton,SIGNAL(released()),this,SLOT( docButtonPushed()) );
-//     docButton->setFlat(TRUE);
-//     layout->addMultiCellWidget( docButton, 0, 0, 6, 6 );
-
     homeButton = new QToolButton( view,"homeButton");
-    homeButton->setPixmap( Resource::loadPixmap("home"));
-    homeButton->setFixedSize( QSize( 20, 20 ) );
+    homeButton->setUsesBigPixmap( useBigPix );
+    homeButton->setPixmap( Opie::Core::OResource::loadPixmap( "home", Opie::Core::OResource::SmallIcon ) );
+    homeButton->setFixedSize( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
     connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) );
     layout->addMultiCellWidget( homeButton, 0, 0, 3, 3);
     homeButton->hide();
 
     TabWidget = new QTabWidget( view, "TabWidget" );
     layout->addMultiCellWidget( TabWidget, 1, 1, 0, 4 );
 
-//     TabWidget->setTabShape(QTabWidget::Triangular);
-
     tab = new QWidget( TabWidget, "tab" );
     tabLayout = new QGridLayout( tab );
     tabLayout->setSpacing( 2);
     tabLayout->setMargin( 2);
 
     Local_View = new QListView( tab, "Local_View" );
 //    Local_View->setResizePolicy( QListView::AutoOneFit );
     Local_View->addColumn( tr("File"),150);
     Local_View->addColumn( tr("Date"),-1);
     Local_View->setColumnAlignment(1,QListView::AlignRight);
     Local_View->addColumn( tr("Size"),-1);
     Local_View->setColumnAlignment(2,QListView::AlignRight);
     Local_View->setAllColumnsShowFocus(TRUE);
 
     Local_View->setMultiSelection( TRUE);
     Local_View->setSelectionMode(QListView::Extended);
     Local_View->setFocusPolicy(QWidget::ClickFocus);
 
     QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold);
 
     tabLayout->addWidget( Local_View, 0, 0 );
 
      connect( Local_View, SIGNAL( clicked(QListViewItem*)),
               this,SLOT( localListClicked(QListViewItem*)) );
 //     connect( Local_View, SIGNAL( doubleClicked(QListViewItem*)),
 //              this,SLOT( localListClicked(QListViewItem*)) );
      connect( Local_View, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int)),
               this,SLOT( ListPressed(int,QListViewItem*,const QPoint&,int)) );
 
     TabWidget->insertTab( tab, tr( "Local" ) );
 
     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"),150);
     Remote_View->addColumn( tr("Date"),-1);
 //    Remote_View->setColumnAlignment(1,QListView::AlignRight);
     Remote_View->addColumn( tr("Size"),-1);
     Remote_View->setColumnAlignment(2,QListView::AlignRight);
     Remote_View->setColumnAlignment(3,QListView::AlignCenter);
     Remote_View->addColumn( tr("Dir"),-1);
     Remote_View->setColumnAlignment(4,QListView::AlignRight);
     Remote_View->setAllColumnsShowFocus(TRUE);
 
     Remote_View->setMultiSelection( FALSE);
     Remote_View->setSelectionMode(QListView::Extended);
     Remote_View->setFocusPolicy(QWidget::ClickFocus);
 
     QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold);
 
     connect( Remote_View, SIGNAL( clicked(QListViewItem*)),
              this,SLOT( remoteListClicked(QListViewItem*)) );
     connect( Remote_View, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int)),
              this,SLOT( RemoteListPressed(int,QListViewItem*,const QPoint&,int)) );
 
     tabLayout_2->addWidget( Remote_View, 0, 0 );
 
     TabWidget->insertTab( tab_2, tr( "Remote" ) );
 
     tab_3 = new QWidget( TabWidget, "tab_3" );
     tabLayout_3 = new QGridLayout( tab_3 );
     tabLayout_3->setSpacing( 2);
     tabLayout_3->setMargin( 2);
 
     TextLabel1 = new QLabel( tab_3, "TextLabel1" );
     TextLabel1->setText( tr( "Username" ) );
     tabLayout_3->addMultiCellWidget( TextLabel1, 0, 0, 0, 1 );
 
     UsernameComboBox = new QComboBox( FALSE, tab_3, "UsernameComboBox" );
     UsernameComboBox->setEditable(TRUE);
     tabLayout_3->addMultiCellWidget( UsernameComboBox, 1, 1, 0, 1 );
 
     connect( UsernameComboBox,SIGNAL(textChanged(const QString&)),this,
              SLOT( UsernameComboBoxEdited(const QString&) ));
 
     TextLabel2 = new QLabel( tab_3, "TextLabel2" );
     TextLabel2->setText( tr( "Password" ) );
     tabLayout_3->addMultiCellWidget( TextLabel2, 0, 0, 2, 3 );
 
     PasswordEdit = new QLineEdit( "", tab_3, "PasswordComboBox" );
     PasswordEdit->setEchoMode(QLineEdit::Password);
     tabLayout_3->addMultiCellWidget( PasswordEdit, 1, 1, 2, 3 );
 
     connect( PasswordEdit,SIGNAL(textChanged(const QString&)),this,
              SLOT( PasswordEditEdited(const QString&) ));
 
 //PasswordEdit->setFixedWidth(85);
     TextLabel3 = new QLabel( tab_3, "TextLabel3" );
     TextLabel3->setText( tr( "Remote server" ) );
     tabLayout_3->addMultiCellWidget( TextLabel3, 2, 2, 0, 1 );
 
     ServerComboBox = new QComboBox( FALSE, tab_3, "ServerComboBox" );
     ServerComboBox->setEditable(TRUE);
                 ServerComboBox->setAutoCompletion(true);
         //      ServerComboBox->blockSignals(true);
                 
     tabLayout_3->addMultiCellWidget( ServerComboBox, 3, 3, 0, 1 );
 
     connect(ServerComboBox,SIGNAL(activated(int)),this,SLOT(serverComboSelected(int) ));
     connect(ServerComboBox,SIGNAL(textChanged(const QString&)),this,
             SLOT(serverComboEdited(const QString&) ));
 
     QLabel *TextLabel5 = new QLabel( tab_3, "TextLabel5" );
     TextLabel5->setText( tr( "Remote path" ) );
     tabLayout_3->addMultiCellWidget( TextLabel5, 2, 2, 2, 3 );
 
 
     remotePath = new QLineEdit( "/", tab_3, "remotePath" );
     tabLayout_3->addMultiCellWidget( remotePath, 3, 3, 2, 3 );
     TextLabel4 = new QLabel( tab_3, "TextLabel4" );
     TextLabel4->setText( tr( "Port" ) );
     tabLayout_3->addMultiCellWidget( TextLabel4, 4, 4, 0, 1 );
 
     PortSpinBox = new QSpinBox( tab_3, "PortSpinBox" );
     PortSpinBox->setButtonSymbols( QSpinBox::UpDownArrows );
     PortSpinBox->setMaxValue(32786);
     tabLayout_3->addMultiCellWidget( PortSpinBox, 4, 4, 1, 1);
 
     serverListView = new QListBox( tab_3, "ServerListView" );
     tabLayout_3->addMultiCellWidget( serverListView , 5, 5, 0, 5);
 
     connect( serverListView, SIGNAL( highlighted(const QString&)),
              this,SLOT( serverListClicked(const QString&) ) );
 
     connectServerBtn = new QPushButton( tr("Connect"), tab_3 , "ConnectButton" );
     tabLayout_3->addMultiCellWidget( connectServerBtn, 6, 6, 0, 1);
     connectServerBtn->setToggleButton(TRUE);
     connect(connectServerBtn,SIGNAL( toggled(bool)),SLOT( connectorBtnToggled(bool) ));
 
     newServerButton= new QPushButton( tr("Add"), tab_3 , "NewServerButton" );
     tabLayout_3->addMultiCellWidget( newServerButton, 6, 6, 2, 2);
     connect( newServerButton,SIGNAL( clicked()),SLOT( NewServer() ));
 
     QPushButton *deleteServerBtn;
     deleteServerBtn = new QPushButton( tr("Delete"), tab_3 , "OpenButton" );
     tabLayout_3->addMultiCellWidget( deleteServerBtn, 6, 6, 3, 3);
 
     connect(deleteServerBtn,SIGNAL(clicked()),SLOT(deleteServer()));
 
 
     QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );
     tabLayout_3->addItem( spacer, 5, 0 );
 
     TabWidget->insertTab( tab_3, tr( "Config" ) );
 
     connect(TabWidget,SIGNAL(currentChanged(QWidget*)),
             this,SLOT(tabChanged(QWidget*)));
 
     currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
     currentDir.setPath( QDir::currentDirPath());
 //      currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
 
     currentPathCombo = new QComboBox( FALSE, view, "currentPathCombo" );
     layout->addMultiCellWidget( currentPathCombo, 3, 3, 0, 4);
 
                 currentPathCombo ->setFixedWidth(220);
     currentPathCombo->setEditable(TRUE);
     currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
 
     connect( currentPathCombo, SIGNAL( activated(const QString&) ),
               this, SLOT(  currentPathComboActivated(const QString&) ) );
 
     connect( currentPathCombo->lineEdit(),SIGNAL(returnPressed()),
              this,SLOT(currentPathComboChanged()));
      ProgressBar = new QProgressBar( view, "ProgressBar" );
      layout->addMultiCellWidget( ProgressBar, 4, 4, 0, 4);
      ProgressBar->setMaximumHeight(10);
     filterStr="*";
     b=FALSE;
     populateLocalView();
     readConfig();
 
 //    ServerComboBox->setCurrentItem(currentServerConfig);
 
     TabWidget->setCurrentPage(2);
-                qDebug("XXXXXXXXXXXX Constructor done");
+        //      qDebug("XXXXXXXXXXXX Constructor done");
 
 }
 
 OpieFtp::~OpieFtp()
 {
 }
 
 void OpieFtp::cleanUp()
 {
     if(conn)
         FtpQuit(conn);
     QString sfile=QDir::homeDirPath();
     if(sfile.right(1) != "/")
         sfile+="/._temp";
     else
         sfile+="._temp";
     QFile file( sfile);
     if(file.exists())
         file.remove();
     Config cfg("opieftp");
     cfg.setGroup("Server");
     cfg.writeEntry("currentServer", currentServerConfig);
 
     exit(0);
 }
 
 void OpieFtp::tabChanged(QWidget *)
 {
     if (TabWidget->currentPageIndex() == 0) {
         currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
         tabMenu->setItemChecked(tabMenu->idAt(0),TRUE);
         tabMenu->setItemChecked(tabMenu->idAt(1),FALSE);
         tabMenu->setItemChecked(tabMenu->idAt(2),FALSE);
         if(cdUpButton->isHidden())
             cdUpButton->show();
         if(homeButton->isHidden())
             homeButton->show();
                                 if(currentPathCombo->isHidden()) currentPathCombo->show();
 
     }
     if (TabWidget->currentPageIndex() == 1) {
         currentPathCombo->lineEdit()->setText( currentRemoteDir );
         tabMenu->setItemChecked(tabMenu->idAt(1),TRUE);
         tabMenu->setItemChecked(tabMenu->idAt(0),FALSE);
         tabMenu->setItemChecked(tabMenu->idAt(2),FALSE);
         if(cdUpButton->isHidden())
             cdUpButton->show();
         homeButton->hide();
                                 if(currentPathCombo->isHidden()) currentPathCombo->show();
 
     }
     if (TabWidget->currentPageIndex() == 2) {
         tabMenu->setItemChecked(tabMenu->idAt(2),TRUE);
         tabMenu->setItemChecked(tabMenu->idAt(0),FALSE);
         tabMenu->setItemChecked(tabMenu->idAt(1),FALSE);
         cdUpButton->hide();
         homeButton->hide();
                                 if(!currentPathCombo->isHidden()) currentPathCombo->hide();
     }
 }
 
 void OpieFtp::newConnection()
 {
    UsernameComboBox->lineEdit()->setText("");
    PasswordEdit->setText( "" );
    ServerComboBox->lineEdit()->setText( "");
    remotePath->setText( currentRemoteDir = "/");
    PortSpinBox->setValue( 21);
    TabWidget->setCurrentPage(2);
 }
 
 void OpieFtp::serverComboEdited(const QString & )
 {
 //   if(  ServerComboBox->text(currentServerConfig) != edit /*edit.isEmpty() */) {
 //       odebug << "ServerComboEdited" << oendl; 
 //  //        currentServerConfig = -1;
 //      }
 }
 
 void OpieFtp::UsernameComboBoxEdited(const QString &) {
 //        currentServerConfig = -1;
 }
 
 void OpieFtp::PasswordEditEdited(const QString & ) {
 //        currentServerConfig = -1;
 }
 
 void OpieFtp::connectorBtnToggled(bool On)
 {
     if(On) {
         connector();
     } else {
         disConnector();
     }
 
 }
 
 void OpieFtp::connector()
 {
 //    QCopEnvelope ( "QPE/System", "busy()" );
 //    qApp->processEvents();
     currentRemoteDir=remotePath->text();
 
     if( ServerComboBox->currentText().isEmpty()) {
 
         QMessageBox::warning(this,tr("Ftp"),tr("Please set the server info"),tr("Ok"),0,0);
         TabWidget->setCurrentPage(2);
         ServerComboBox->setFocus();
         connectServerBtn->setOn(FALSE);
         connectServerBtn->setText( tr("Connect"));
         return;
     }
 
     FtpInit();
 
     TabWidget->setCurrentPage(1);
     QString ftp_host = ServerComboBox->currentText();
     QString ftp_user = UsernameComboBox->currentText();
     QString ftp_pass = PasswordEdit->text();
     QString port=PortSpinBox->cleanText();
     port.stripWhiteSpace();
 
     Config cfg("opieftp");
     cfg.setGroup("Server");
 //    int current=cfg.readNumEntry("currentServer", 1);
 
 //      if(ftp_host!= cfg.readEntry(QString::number( current)))
 //         currentServerConfig=-1;
@@ -574,335 +566,334 @@ void OpieFtp::nullifyCallBack()
         FtpOptions(FTPLIB_CALLBACKBYTES, 0, conn);
 }
 
 void OpieFtp::remoteDownload()
 {
 //    qApp->processEvents();
     int fsz;
 //    QCopEnvelope ( "QPE/System", "busy()" );
 
     QList<QListViewItem> * getSelectedItems( QListView * Remote_View );
     QListViewItemIterator it( Remote_View );
     for ( ; it.current(); ++it ) {
         if ( it.current()->isSelected() ) {
             QString strItem = it.current()->text(0);
 //      strItem=strItem.right(strItem.length()-1);
             QString localFile = currentDir.canonicalPath();
             if(localFile.right(1).find("/",0,TRUE) == -1)
                 localFile += "/";
             localFile += strItem;
 //    QString localFile = currentDir.canonicalPath()+"/"+strItem;
             QString remoteFile= currentRemoteDir+strItem;
             if (!FtpSize( remoteFile.latin1(), &fsz, FTPLIB_ASCII, conn))
                 fsz = 0;
             QString temp;
             temp.sprintf( remoteFile+" "+" %dkb", fsz);
 
             ProgressBar->setTotalSteps(fsz);
             FtpOptions(FTPLIB_CALLBACK, (long) log_progress, conn);
             FtpOptions(FTPLIB_IDLETIME, (long) 1000, conn);
             FtpOptions(FTPLIB_CALLBACKARG, (long) &fsz, conn);
             FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn);
 //            odebug << "Get: " << localFile.latin1() << ", " << remoteFile.latin1() << "" << oendl; 
 
             if(!FtpGet( localFile.latin1(), remoteFile.latin1(),FTPLIB_IMAGE, conn ) ) {
                 QString msg;
                 msg.sprintf(tr("Unable to download \n")+"%s",FtpLastResponse(conn));
                 msg.replace(QRegExp(":"),"\n");
                 QMessageBox::message(tr("Note"),msg);
             }
             ProgressBar->reset();
             nullifyCallBack();
         it.current()->setSelected(FALSE);
         }
     }
     for ( ; it.current(); ++it ) {
         Remote_View->clearSelection();
     }
     Remote_View->setFocus();
     TabWidget->setCurrentPage(0);
     populateLocalView();
 //    QCopEnvelope ( "QPE/System", "notBusy()" );
 }
 
 bool OpieFtp::remoteDirList(const QString &dir)
 {
     QString tmp = QDir::homeDirPath();
     if(tmp.right(1) != "/")
         tmp+="/._temp";
     else
         tmp+="._temp";
 //    odebug << "Listing remote dir "+tmp << oendl; 
 //    QCopEnvelope ( "QPE/System", "busy()" );
     if (!FtpDir( tmp.latin1(), dir.latin1(), conn) ) {
         QString msg;
         msg.sprintf(tr("Unable to list the directory\n")+dir+"\n%s",FtpLastResponse(conn) );
         msg.replace(QRegExp(":"),"\n");
         QMessageBox::message(tr("Note"),msg);
         return false;
     }
     populateRemoteView() ;
 //    QCopEnvelope ( "QPE/System", "notBusy()" );
     return true;
 }
 
 bool OpieFtp::remoteChDir(const QString &dir)
 {
 //    QCopEnvelope ( "QPE/System", "busy()" );
     if (!FtpChdir( dir.latin1(), conn )) {
         QString msg;
         msg.sprintf(tr("Unable to change directories\n")+dir+"\n%s",FtpLastResponse(conn));
         msg.replace(QRegExp(":"),"\n");
         QMessageBox::message(tr("Note"),msg);
 //        odebug << msg << oendl; 
 //        QCopEnvelope ( "QPE/System", "notBusy()" );
         return FALSE;
     }
 //    QCopEnvelope ( "QPE/System", "notBusy()" );
     return TRUE;
 }
 
 void OpieFtp::populateLocalView()
 {
     Local_View->clear();
     currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
     currentDir.setMatchAllDirs(TRUE);
     currentDir.setNameFilter(filterStr);
     QString fileL, fileS, fileDate;
     bool isDir=FALSE;
     const QFileInfoList *list = currentDir.entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/);
     QFileInfoListIterator it(*list);
     QFileInfo *fi;
     while ( (fi=it.current()) ) {
         if (fi->isSymLink() ){
             QString symLink=fi->readLink();
 //         odebug << "Symlink detected "+symLink << oendl; 
             QFileInfo sym( symLink);
             fileS.sprintf( "%10i", sym.size() );
             fileL.sprintf( "%s ->  %s",  fi->fileName().data(),sym.absFilePath().data() );
             fileDate = sym.lastModified().toString();
         } else {
 //        odebug << "Not a dir: "+currentDir.canonicalPath()+fileL << oendl; 
             fileS.sprintf( "%10i", fi->size() );
             fileL.sprintf( "%s",fi->fileName().data() );
             fileDate= fi->lastModified().toString();
             if( QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+fileL)).exists() ) {
                 fileL+="/";
                 isDir=TRUE;
 //     odebug << fileL << oendl; 
             }
         }
 
 
         if(fileL !="./" && fi->exists()) {
             item = new QListViewItem( Local_View,fileL, fileDate, fileS );
             QPixmap pm;
 
             if(isDir || fileL.find("/",0,TRUE) != -1) {
                 if( !QDir( fi->filePath() ).isReadable())
-                    pm = Resource::loadPixmap( "lockedfolder" );
+                    pm = Opie::Core::OResource::loadPixmap( "lockedfolder", Opie::Core::OResource::SmallIcon );
                 else
-                    pm= Resource::loadPixmap( "folder" );
+                    pm = Opie::Core::OResource::loadPixmap( "folder", Opie::Core::OResource::SmallIcon );
                 item->setPixmap( 0,pm );
             } else {
                 if( !fi->isReadable() )
-                    pm = Resource::loadPixmap( "locked" );
+                    pm = Opie::Core::OResource::loadPixmap( "locked", Opie::Core::OResource::SmallIcon );
                 else {
                     MimeType mt(fi->filePath());
                     pm=mt.pixmap(); //sets the correct pixmap for mimetype
                     if(pm.isNull())
                         pm =  unknownXpm;
                 }
             }
             if(  fileL.find("->",0,TRUE) != -1) {
                   // overlay link image
-                pm= Resource::loadPixmap( "folder" );
-                QPixmap lnk = Resource::loadPixmap( "opie/symlink" );
+                pm = Opie::Core::OResource::loadPixmap( "folder", Opie::Core::OResource::SmallIcon );
+                QPixmap lnk = Opie::Core::OResource::loadPixmap( "opie/symlink" );
                 QPainter painter( &pm );
                 painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk );
-                pm.setMask( pm.createHeuristicMask( FALSE ) );
             }
-                    item->setPixmap( 0,pm);
+            item->setPixmap( 0,pm);
         }
         isDir=FALSE;
         ++it;
     }
     Local_View->setSorting( 3,FALSE);
     currentPathCombo->lineEdit()->setText( currentDir.canonicalPath() );
    fillCombo( (const QString &)currentDir.canonicalPath());
 }
 
 bool OpieFtp::populateRemoteView( )
 {
 //    odebug << "populate remoteview" << oendl; 
     QString sfile=QDir::homeDirPath();
     if(sfile.right(1) != "/")
         sfile+="/._temp";
     else
         sfile+="._temp";
     QFile file( sfile);
     Remote_View->clear();
     QString s, File_Name;
     QListViewItem *itemDir=NULL, *itemFile=NULL;
     QRegExp monthRe(" [JFMASOND][eapuecoe][brynlgptvc] [ 0-9][0-9] [ 0-9][0-9][:0-9][0-9][0-9] ");
     QString fileL, fileS, fileDate;
     if ( file.open(IO_ReadOnly)) {
         QTextStream t( &file );   // use a text stream
         while ( !t.eof()) {
             s = t.readLine();
 
             if(s.find("total",0,TRUE) == 0)
                continue;
 
            int len, month = monthRe.match(s, 0, &len);
            fileDate = s.mid(month + 1, len - 2);       // minus spaces
            fileL = s.right(s.length() - month - len);
             if(s.left(1) == "d")
                 fileL = fileL+"/";
             fileS = s.mid(month - 8, 8);  // FIXME
             fileS = fileS.stripWhiteSpace();
 
            if(s.left(1) == "d" || fileL.find("/",0,TRUE) != -1) {
                QListViewItem * item = new QListViewItem( Remote_View, fileL, fileDate, fileS,"d");
-               item->setPixmap( 0, Resource::loadPixmap( "folder" ));
+               item->setPixmap( 0, Opie::Core::OResource::loadPixmap( "folder", Opie::Core::OResource::SmallIcon ));
 //                      if(itemDir)
                      item->moveItem(itemDir);
                  itemDir=item;
            } else {
                QListViewItem * item = new QListViewItem( Remote_View, fileL, fileDate, fileS,"f");
-               item->setPixmap( 0, Resource::loadPixmap( "fileopen" ));
+               item->setPixmap( 0, Opie::Core::OResource::loadPixmap( "fileopen", Opie::Core::OResource::SmallIcon ));
 //                      if(itemFile)
                      item->moveItem(itemDir);
                      item->moveItem(itemFile);
                  itemFile=item;
            }
         }
         QListViewItem * item1 = new QListViewItem( Remote_View, "../");
-        item1->setPixmap( 0, Resource::loadPixmap( "folder" ));
+        item1->setPixmap( 0, Opie::Core::OResource::loadPixmap( "folder", Opie::Core::OResource::SmallIcon ));
         file.close();
         if( file.exists())
             file. remove();
     } 
 //        odebug << "temp file not opened successfully "+sfile << oendl; 
     Remote_View->setSorting( 4,TRUE);
     return true;
 }
 
 void OpieFtp::remoteListClicked(QListViewItem *selectedItem)
 {
      if( selectedItem) {
         //   if(selectedItem!= NULL) {
 //         QCopEnvelope ( "QPE/System", "busy()" );
         QString  oldRemoteCurrentDir =  currentRemoteDir;
         QString strItem=selectedItem->text(0);
         strItem=strItem.simplifyWhiteSpace();
         if(strItem == "../") { // the user wants to go ^
             if( FtpCDUp( conn) == 0) {
                 QString msg;
                 msg.sprintf(tr("Unable to cd up\n")+"%s",FtpLastResponse(conn));
                 msg.replace(QRegExp(":"),"\n");
                 QMessageBox::message(tr("Note"),msg);
 //                odebug << msg << oendl; 
             }
             char path[256];
             if( FtpPwd( path,sizeof(path),conn) == 0) { //this is easier than fudging the string
                 QString msg;
                 msg.sprintf(tr("Unable to get working dir\n")+"%s",FtpLastResponse(conn));
                 msg.replace(QRegExp(":"),"\n");
                 QMessageBox::message(tr("Note"),msg);
 //                odebug << msg << oendl; 
             }
             currentRemoteDir=path;
         } else {
             if(strItem.find("->",0,TRUE) != -1) { //symlink on some servers
                 strItem=strItem.right( strItem.length() - strItem.find("->",0,TRUE) - 2 );
                 strItem = strItem.stripWhiteSpace();
                 currentRemoteDir = strItem;
                 if( !remoteChDir( (const QString &)strItem)) {
                     currentRemoteDir = oldRemoteCurrentDir;
                     strItem="";
 //                     odebug << "RemoteCurrentDir1 "+oldRemoteCurrentDir << oendl; 
                 }
             } else if(strItem.find("/",0,TRUE) != -1) { // this is a directory
                 if( !remoteChDir( (const QString &)currentRemoteDir + strItem)) {
                     currentRemoteDir = oldRemoteCurrentDir;
                     strItem="";
 //                     odebug << "RemoteCurrentDir1 "+oldRemoteCurrentDir << oendl; 
 
                 } else {
                     currentRemoteDir = currentRemoteDir+strItem;
                 }
             } else {
 //                QCopEnvelope ( "QPE/System", "notBusy()" );
                 return;
             }
         }
         remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
         if(currentRemoteDir.right(1) !="/")
             currentRemoteDir +="/";
         currentPathCombo->lineEdit()->setText( currentRemoteDir);
         fillRemoteCombo( (const QString &)currentRemoteDir);
 //        QCopEnvelope ( "QPE/System", "notBusy()" );
     Remote_View->ensureItemVisible(Remote_View->firstChild());
 
     }
 }
 
 void OpieFtp::localListClicked(QListViewItem *selectedItem)
 {
     if(selectedItem!= NULL) {
 
     QString strItem=selectedItem->text(0);
         QString strSize=selectedItem->text(1);
         strSize=strSize.stripWhiteSpace();
         if(strItem.find("@",0,TRUE) !=-1 || strItem.find("->",0,TRUE) !=-1 ) { //if symlink
               // is symlink
             QString strItem2 = strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4);
             if(QDir(strItem2).exists() ) {
                 currentDir.cd(strItem2, TRUE);
                 populateLocalView();
             }
         } else { // not a symlink
             if(strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) {
 
                 if(QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem)).exists() ) {
                     strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem);
                     currentDir.cd(strItem,FALSE);
                     populateLocalView();
                 } else {
                     currentDir.cdUp();
                     populateLocalView();
                 }
                 if(QDir(strItem).exists()){
                     currentDir.cd(strItem, TRUE);
                     populateLocalView();
                 }
             } else {
                 strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem);
                 if( QFile::exists(strItem ) ) {
                       //  odebug << "upload "+strItem << oendl; 
                     return;
                 }
             } //end not symlink
             chdir(strItem.latin1());
         }
     Local_View->ensureItemVisible(Local_View->firstChild());
     }
 }
 
 void OpieFtp::doLocalCd()
 {
     localListClicked( Local_View->currentItem());
 }
 
 void OpieFtp:: doRemoteCd()
 {
     remoteListClicked( Remote_View->currentItem());
 
 }
 
 void OpieFtp::showHidden()
 {
     if (!b) {
     currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
     localMenu->setItemChecked(localMenu->idAt(0),TRUE);
 //    currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);