3 files changed, 109 insertions, 26 deletions

diff --git a/core/apps/textedit/fileBrowser.cpp b/core/apps/textedit/fileBrowser.cpp
index 41e800c..acd50c2 100644
--- a/core/apps/textedit/fileBrowser.cpp
+++ b/core/apps/textedit/fileBrowser.cpp
@@ -104,196 +104,204 @@ fileBrowser::fileBrowser( QWidget* parent,  const char* name, bool modal, WFlags
     ListView->setSorting( 2, FALSE);
     ListView->addColumn( tr( "Size" ) );
     ListView->setColumnWidth(1,-1);
     ListView->addColumn( "Date",-1);
 
     ListView->setColumnWidthMode(0,QListView::Manual);
     ListView->setColumnAlignment(1,QListView::AlignRight);
     ListView->setColumnAlignment(2,QListView::AlignRight);
     ListView->setAllColumnsShowFocus( TRUE );
 
     QPEApplication::setStylusOperation( ListView->viewport(),QPEApplication::RightOnHold);
     connect( ListView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
              this,SLOT( ListPressed(int, QListViewItem *, const QPoint&, int)) );
 
     connect( ListView, SIGNAL( clicked( QListViewItem*)), SLOT(listClicked(QListViewItem *)) );
 
     FileStack->addWidget( ListView, get_unique_id() );
     mimeType="text/*";
     fileSelector = new FileSelector( mimeType, FileStack, "fileselector" , FALSE, FALSE); //buggy
 //    connect( fileSelector, SIGNAL( closeMe() ), this, SLOT( showEditTools() ) );
 //    connect( fileSelector, SIGNAL( newSelected( const DocLnk &) ), this, SLOT( newFile( const DocLnk & ) ) );
     connect( fileSelector, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( docOpen( const DocLnk & ) ) );
     layout->addMultiCellWidget( FileStack, 1, 1, 0, 7 );
 
     SelectionCombo = new QComboBox( FALSE, this, "SelectionCombo" );
     SelectionCombo->insertItem( tr( "Documents" ) );
     SelectionCombo->insertItem( tr( "All files" ) );
     SelectionCombo->insertItem( tr( "Hidden files" ) );
 //      SelectionCombo->setMaximumWidth(120);
     layout->addMultiCellWidget( SelectionCombo, 2, 2, 0, 3 );
 
     connect( SelectionCombo, SIGNAL( activated( const QString & ) ),
             this, SLOT( selectionChanged( const QString & ) ) );
 
     typemb = new MenuButton(this);
     typemb->setLabel(tr("Type: %1"));
     typemb->setMinimumWidth(110);
     typemb->setFixedHeight(22);
     layout->addMultiCellWidget( typemb, 2, 2, 4, 7 );
     updateMimeTypeMenu() ;
 
     currentDir.setPath(QDir::currentDirPath());
     currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden */| QDir::All);
 
     populateList();
     move(0,15);
 }
 
 fileBrowser::~fileBrowser()
 {
 }
 
 void fileBrowser::setFileView( int selection )
 {
     SelectionCombo->setCurrentItem( selection );
     selectionChanged( SelectionCombo->currentText() );
 }
 
 void fileBrowser::populateList()
 {
     ListView->clear();
     bool isDir=FALSE;
 //qDebug(currentDir.canonicalPath());
     currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
     currentDir.setMatchAllDirs(TRUE);
 
     currentDir.setNameFilter(filterStr);
 //    currentDir.setNameFilter("*.txt;*.etx");
     QString fileL, fileS, fileDate;
     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();
 //         qDebug("Symlink detected "+symLink);
          QFileInfo sym( symLink);
             fileS.sprintf( "%10li", sym.size() );
             fileL.sprintf( "%s ->  %s",  sym.fileName().data(),sym.absFilePath().data() );
             fileDate = sym.lastModified().toString();
         } else {
 //        qDebug("Not a dir: "+currentDir.canonicalPath()+fileL);
             fileS.sprintf( "%10li", fi->size() );
             fileL.sprintf( "%s",fi->fileName().data() );
             fileDate= fi->lastModified().toString();
             if( QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+fileL)).exists() ) {
                 fileL+="/";
                 isDir=TRUE;
 //     qDebug( fileL);
             }
         }
         if(fileL !="./") {
         item= new QListViewItem( ListView,fileL,fileS , fileDate);
          QPixmap pm;
          pm= Resource::loadPixmap( "folder" );
-         if(isDir || fileL.find("/",0,TRUE) != -1)
+         
+         if(isDir || fileL.find("/",0,TRUE) != -1) {
+             if( !QDir( fi->filePath() ).isReadable())
+                  pm = Resource::loadPixmap( "lockedfolder" );
              item->setPixmap( 0,pm );
-         else
-             item->setPixmap( 0, Resource::loadPixmap( "fileopen" ));
+         } else {
+             if( !fi->isReadable() )
+                   pm = Resource::loadPixmap( "locked" );
+             else
+                 pm =  Resource::loadPixmap( "fileopen" );
+             item->setPixmap( 0,pm);
+         }
          if(  fileL.find("->",0,TRUE) != -1) {
                // overlay link image
              QPixmap lnk = Resource::loadPixmap( "symlink" );
              QPainter painter( &pm );
              painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk );
              pm.setMask( pm.createHeuristicMask( FALSE ) );
          item->setPixmap( 0, pm);
         }
     }
         isDir=FALSE;
         ++it;
     }
     ListView->setSorting( 3, FALSE);
     QString currentPath = currentDir.canonicalPath();
 
     fillCombo( (const QString &)currentPath);
 //   dirPathCombo->lineEdit()->setText(currentPath);
 
 //      if( dirPathStringList.grep(currentPath,TRUE).isEmpty() ) {
 //          dirPathCombo->clear();
 //          dirPathStringList.prepend(currentPath );
 //          dirPathCombo->insertStringList( dirPathStringList,-1);
 //      }
 }
 
 void fileBrowser::upDir()
 {
     QString current = currentDir.canonicalPath();
     QDir dir(current);
     dir.cdUp();
     current = dir.canonicalPath();
     chdir( current.latin1() );
     currentDir.cd(  current, TRUE);
     populateList();
     update();
 }
 
 // you may want to switch these 2 functions. I like single clicks
 void fileBrowser::listClicked(QListViewItem *selectedItem)
 {
     QString strItem=selectedItem->text(0);
     QString strSize=selectedItem->text(1);
 //    qDebug("strItem is "+strItem);
     strSize.stripWhiteSpace();
 //  qDebug(strSize);
 
         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);
 //            qDebug("strItem symlink is "+strItem2);
             if(QDir(strItem2).exists() ) {
                 currentDir.cd(strItem2, TRUE);
                 populateList();
             }
         } 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);
 //       qDebug("Path is "+strItem);
                     populateList();
                 } else {
                     currentDir.cdUp();
                     populateList();
                 }
                 if(QDir(strItem).exists()){
                     currentDir.cd(strItem, TRUE);
                     populateList();
                 }
             } else {
                 strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem);
                   if( QFile::exists(strItem ) ) {
 //currentDir.canonicalPath()
                       qDebug("We found our files!!"+strItem);
                     OnOK();
                   }
                 } //end not symlink
         chdir(strItem.latin1());
       }
 }
 
 void fileBrowser::OnOK()
 {
   QListViewItemIterator it1( ListView);
     for ( ; it1.current(); ++it1 ) {
       if ( it1.current()->isSelected() ) {
          selectedFileName=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+it1.current()->text(0));
          qDebug("selected filename is "+selectedFileName);
        fileList.append( selectedFileName );
       }
     }
   accept();
 }
 
 void fileBrowser::homeButtonPushed() {
     QString current = QDir::homeDirPath();
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp
index e97a9bf..37e2134 100644
--- a/noncore/net/opieftp/opieftp.cpp
+++ b/noncore/net/opieftp/opieftp.cpp
@@ -1,120 +1,121 @@
 /***************************************************************************
    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"
 #include "ftplib.h"
 #include "inputDialog.h"
 
 #include <qpe/qpemenubar.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/config.h>
 
+#include <qstringlist.h>
 #include <qtextstream.h>
 #include <qpushbutton.h>
 #include <qtoolbutton.h>
 #include <qdatetime.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qstring.h>
 #include <qcombobox.h>
 #include <qpopupmenu.h>
 #include <qlistview.h>
 #include <qmainwindow.h>
 #include <qlabel.h>
 #include <qprogressbar.h>
 #include <qspinbox.h>
 #include <qtabwidget.h>
 #include <qwidget.h>
 #include <qlayout.h>
 #include <qimage.h>
 #include <qpixmap.h>
 #include <qmessagebox.h>
 #include <qlineedit.h>
 #include <qregexp.h>
 
 #include <unistd.h>
 #include <stdlib.h>
 
 
 QProgressBar *ProgressBar;
 static netbuf *conn=NULL;
 
 static int log_progress(netbuf *ctl, int xfered, void *arg)
 {
     int fsz = *(int *)arg;
     int pct = (xfered * 100) / fsz;
 //      printf("%3d%%\r", pct);
 //      fflush(stdout);
     ProgressBar->setProgress(xfered);
     qApp->processEvents();
     return 1;
 }
 
 OpieFtp::OpieFtp( )
         : QMainWindow( )
 {
     setCaption( tr( "OpieFtp" ) );
 
     QGridLayout *layout = new QGridLayout( this );
     layout->setSpacing( 2);
     layout->setMargin( 2);
 
     connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
 
     QPEMenuBar *menuBar = new QPEMenuBar(this);
     connectionMenu  = new QPopupMenu( this );
     localMenu  = new QPopupMenu( this );
     remoteMenu  = new QPopupMenu( this );
     tabMenu = new QPopupMenu( this );
 
     layout->addMultiCellWidget( menuBar, 0, 0, 0, 3 );
 
     menuBar->insertItem( tr( "Connection" ), connectionMenu);
     menuBar->insertItem( tr( "Local" ), localMenu);
     menuBar->insertItem( tr( "Remote" ), remoteMenu);
     menuBar->insertItem( tr( "View" ), tabMenu);
 
     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->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->setCheckable(TRUE);
 
     TabWidget = new QTabWidget( this, "TabWidget" );
     layout->addMultiCellWidget( TabWidget, 1, 1, 0, 3 );
 
     TabWidget->setTabShape(QTabWidget::Triangular);
 
     tab = new QWidget( TabWidget, "tab" );
     tabLayout = new QGridLayout( tab );
@@ -143,250 +144,256 @@ OpieFtp::OpieFtp( )
     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"),120);
     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->addColumn( tr("Dir"),-1);
     Remote_View->setColumnAlignment(4,QListView::AlignRight);
     Remote_View->setAllColumnsShowFocus(TRUE);
     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 );
 
     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 );
 
     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);
     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);
 
     QPushButton *deleteServerBtn;
     deleteServerBtn = new QPushButton( "Delete Server", tab_3 , "OpenButton" );
     tabLayout_3->addMultiCellWidget( deleteServerBtn, 5, 5, 2, 3);
 
     connect(deleteServerBtn,SIGNAL(clicked()),SLOT(deleteServer()));
 
     connectServerBtn = new QPushButton( "Connect", tab_3 , "ConnectButton" );
     tabLayout_3->addMultiCellWidget( connectServerBtn, 5, 5, 0, 1);
     connectServerBtn->setToggleButton(TRUE);
     connect(connectServerBtn,SIGNAL( toggled( bool)),SLOT( connectorBtnToggled(bool) ));
 
 
     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);
-    currentPathEdit = new QLineEdit( "/", this, "currentPathEdit" );
-    layout->addMultiCellWidget( currentPathEdit, 3, 3, 0, 3 );
 
-    currentPathEdit->setText( currentDir.canonicalPath());
-    connect( currentPathEdit,SIGNAL(returnPressed()),this,SLOT(currentPathEditChanged()));
+    currentPathCombo = new QComboBox( FALSE, this, "currentPathCombo" );
+    layout->addMultiCellWidget( currentPathCombo, 3, 3, 0, 3 );
+
+    currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
+
+    connect( currentPathCombo, SIGNAL( activated( const QString & ) ),
+              this, SLOT(  currentPathComboChanged()currentPathCombo( const QString & ) ) );
+
+    connect( currentPathCombo->lineEdit(),SIGNAL(returnPressed()),
+             this,SLOT(currentPathComboChanged()));
 
     ProgressBar = new QProgressBar( this, "ProgressBar" );
     layout->addMultiCellWidget( ProgressBar, 4, 4, 0, 3 );
 
 //     fillCombos();
 
 #ifdef DEVELOPERS_VERSION
     ServerComboBox->lineEdit()->setText( tr( "192.168.129.201" ) );
     UsernameComboBox->lineEdit()->setText("root");
     PortSpinBox->setValue( 4242);
     remotePath->setText( currentRemoteDir = "/");
 //    ServerComboBox->lineEdit()->setText( tr( "llornkcor.com" ) );
 //    UsernameComboBox->lineEdit()->setText("llornkcor");
 //    PortSpinBox->setValue( 21);
 //    remotePath->setText( currentRemoteDir = "/home/llornkcor");
     PasswordEdit->setText( tr( "" ) );
 #endif
     filterStr="*";
     b=FALSE;
     populateLocalView();
     readConfig();
     ServerComboBox->setCurrentItem(currentServerConfig);   
     TabWidget->setCurrentPage(2);
 }
 
 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();
 }
 
 void OpieFtp::tabChanged(QWidget *w)
 {
     if (TabWidget->currentPageIndex() == 0) {
-            currentPathEdit->setText( currentDir.canonicalPath());
+            currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
             tabMenu->setItemChecked(tabMenu->idAt(0),TRUE);
             tabMenu->setItemChecked(tabMenu->idAt(1),FALSE);
             tabMenu->setItemChecked(tabMenu->idAt(2),FALSE);
     }
   if (TabWidget->currentPageIndex() == 1) {
-            currentPathEdit->setText( currentRemoteDir );
+            currentPathCombo->lineEdit()->setText( currentRemoteDir );
             tabMenu->setItemChecked(tabMenu->idAt(1),TRUE);
             tabMenu->setItemChecked(tabMenu->idAt(0),FALSE);
             tabMenu->setItemChecked(tabMenu->idAt(2),FALSE);
     }
   if (TabWidget->currentPageIndex() == 2) {
             tabMenu->setItemChecked(tabMenu->idAt(2),TRUE);
             tabMenu->setItemChecked(tabMenu->idAt(0),FALSE);
             tabMenu->setItemChecked(tabMenu->idAt(1),FALSE);
     }
 }
 
 void OpieFtp::newConnection()
 {
    UsernameComboBox->lineEdit()->setText("");
    PasswordEdit->setText( "" );
    ServerComboBox->lineEdit()->setText( "");
    remotePath->setText( currentRemoteDir = "/");
    PortSpinBox->setValue( 21);
    TabWidget->setCurrentPage(2);
    currentServerConfig = -1;
 }
 
 void OpieFtp::serverComboEdited(const QString & edit) {
     if( !edit.isEmpty() ) {
         currentServerConfig = -1;
         qDebug("comboedited");
     }
 }
 
 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();
 
     if(ftp_host.find("ftp://",0, TRUE) != -1 )
         ftp_host=ftp_host.right(ftp_host.length()-6);
     ftp_host+=":"+port;
     if (!FtpConnect( ftp_host.latin1(), &conn)) {
         QMessageBox::message(tr("Note"),tr("Unable to connect to\n")+ftp_host);
         connectServerBtn->setOn(FALSE);
         connectServerBtn->setText( tr("Connect"));
         return ;
     }
     if (!FtpLogin( ftp_user.latin1(), ftp_pass.latin1(),conn )) {
         QString msg;
         msg.sprintf(tr("Unable to log in\n")+"%s",FtpLastResponse(conn));
         msg.replace(QRegExp(":"),"\n");
         QMessageBox::message(tr("Note"),msg);
         if(conn)
             FtpQuit(conn);
         connectServerBtn->setOn(FALSE);
         connectServerBtn->setText( tr("Connect"));
         return ;
     }
     remoteDirList("/") ;
     setCaption(ftp_host);
     writeConfig();
     connectServerBtn->setText( tr("Disconnect"));
     QCopEnvelope ( "QPE/System", "notBusy()" );
 }
 
 void OpieFtp::disConnector()
 {
     if(conn)
         FtpQuit(conn);
     setCaption("OpieFtp");
     currentRemoteDir="/";
     Remote_View->clear();
     connectServerBtn->setText( tr("Connect"));
     connectServerBtn->setOn(FALSE);
@@ -451,310 +458,331 @@ void OpieFtp::remoteDownload()
     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);
     qDebug("Get: %s, %s",localFile.latin1(),remoteFile.latin1());
 
     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();
     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";
 //    qDebug("Listing remote dir "+tmp);
     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);
             qDebug(msg);
         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();
 //         qDebug("Symlink detected "+symLink);
             QFileInfo sym( symLink);
             fileS.sprintf( "%10li", sym.size() );
             fileL.sprintf( "%s ->  %s",  sym.fileName().data(),sym.absFilePath().data() );
             fileDate = sym.lastModified().toString();
         } else {
 //        qDebug("Not a dir: "+currentDir.canonicalPath()+fileL);
             fileS.sprintf( "%10li", fi->size() );
             fileL.sprintf( "%s",fi->fileName().data() );
             fileDate= fi->lastModified().toString();
             if( QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+fileL)).exists() ) {
                 fileL+="/";
                 isDir=TRUE;
 //     qDebug( fileL);
             }
         }
         if(fileL !="./") {
-        item = new QListViewItem( Local_View,fileL,fileS, fileDate);
-        if(isDir || fileL.find("/",0,TRUE) != -1)
-            item->setPixmap( 0,  Resource::loadPixmap( "folder" ));
-        else
-            item->setPixmap( 0, Resource::loadPixmap( "fileopen" ));
+            item= new QListViewItem( ListView,fileL,fileS , fileDate);
+            QPixmap pm;
+            pm= Resource::loadPixmap( "folder" );
+         
+            if(isDir || fileL.find("/",0,TRUE) != -1) {
+                if( !QDir( fi->filePath() ).isReadable())
+                    pm = Resource::loadPixmap( "lockedfolder" );
+                item->setPixmap( 0,pm );
+            } else {
+                if( !fi->isReadable() )
+                    pm = Resource::loadPixmap( "locked" );
+                else
+                    pm =  Resource::loadPixmap( "fileopen" );
+                item->setPixmap( 0,pm);
+            }
+            if(  fileL.find("->",0,TRUE) != -1) {
+                  // overlay link image
+                QPixmap lnk = Resource::loadPixmap( "symlink" );
+                QPainter painter( &pm );
+                painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk );
+                pm.setMask( pm.createHeuristicMask( FALSE ) );
+                item->setPixmap( 0, pm);
+            }
         }
         isDir=FALSE;
         ++it;
-     }
+    }
     Local_View->setSorting( 3,FALSE);
-    currentPathEdit->setText( currentDir.canonicalPath() );
+    currentPathCombo->lineEdit()->setText( currentDir.canonicalPath() );
+    fillCombo( (const QString &)currentDir);
+
 }
 
 bool OpieFtp::populateRemoteView( )
 {
 //    qDebug("populate remoteview");
     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;
     QString fileL, fileS, fileDate;
     if ( file.open(IO_ReadOnly)) {
         QTextStream t( &file );   // use a text stream
         while ( !t.eof()) {
             s = t.readLine();
             fileL = s.right(s.length()-55);
             fileL = fileL.stripWhiteSpace();
             if(s.left(1) == "d") 
                 fileL = fileL+"/";
 //                  fileL = "/"+fileL+"/";
             fileS = s.mid( 30, 42-30);
             fileS = fileS.stripWhiteSpace();
             fileDate = s.mid( 42, 55-42);
             fileDate = fileDate.stripWhiteSpace();
             if(fileL.find("total",0,TRUE) == -1) {
                 if(s.left(1) == "d" || fileL.find("/",0,TRUE) != -1) {
                 QListViewItem * item = new QListViewItem( Remote_View, fileL, fileS, fileDate,"d");
                     item->setPixmap( 0, Resource::loadPixmap( "folder" ));
 //                      if(itemDir)
                           item->moveItem(itemDir);
                       itemDir=item;
                 } else {
                 QListViewItem * item = new QListViewItem( Remote_View, fileL, fileS, fileDate,"f");
                     item->setPixmap( 0, Resource::loadPixmap( "fileopen" ));
 //                      if(itemFile)
                           item->moveItem(itemDir);
                           item->moveItem(itemFile);
                       itemFile=item;
                 }
             }
         }
         QListViewItem * item1 = new QListViewItem( Remote_View, "../");
         item1->setPixmap( 0, Resource::loadPixmap( "folder" ));
         file.close();
         if( file.exists())
             file. remove();
     } else
         qDebug("temp file not opened successfullly "+sfile);
     Remote_View->setSorting( 4,TRUE);
     return true;        
 }
 
 void OpieFtp::remoteListClicked(QListViewItem *selectedItem)
 {
     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);
             qDebug(msg);
         }
         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);
             qDebug(msg);
         }
         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="";
                 qDebug("RemoteCurrentDir1 "+oldRemoteCurrentDir);
             }
         } else if(strItem.find("/",0,TRUE) != -1) { // this is a directory
             qDebug("trying directory");
             if( !remoteChDir( (const QString &)currentRemoteDir + strItem)) {
                 currentRemoteDir = oldRemoteCurrentDir;
                 strItem="";
                 qDebug("RemoteCurrentDir1 "+oldRemoteCurrentDir);
 
             } else {
             currentRemoteDir = currentRemoteDir+strItem;
             }
         } else {
             qDebug("download "+strItem);
         }
     }
     remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
     if(currentRemoteDir.right(1) !="/")
         currentRemoteDir +="/";
-    currentPathEdit->setText( currentRemoteDir );
+    currentPathCombo->lineEdit()->setText( currentRemoteDir );
+    fillRemoteCombo( (const QString &)currentDir);
     QCopEnvelope ( "QPE/System", "notBusy()" );
 }
 
 void OpieFtp::localListClicked(QListViewItem *selectedItem)
 {
     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 ) ) {
                 qDebug("upload "+strItem);
             }
         } //end not symlink
         chdir(strItem.latin1());
     }
 }
 
 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);
     b=TRUE;
     
     }  else {
     currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
     localMenu->setItemChecked(localMenu->idAt(0),FALSE);
 //    currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
     b=FALSE;
     }
     populateLocalView();
 }
 
 void OpieFtp::ListPressed( int mouse, QListViewItem *item, const QPoint &point, int i)
 {
     switch (mouse) {
       case 1:
           break;
       case 2:
           showLocalMenu(item);
     break;
     };
 }
 
 void OpieFtp::RemoteListPressed( int mouse, QListViewItem *item, const QPoint &point, int i)
 {
  switch (mouse) {
       case 1:
           break;
       case 2:
           showRemoteMenu(item);
     break;
     };
 }
 
 void OpieFtp::showRemoteMenu(QListViewItem * item)
 {
     QPopupMenu  m;// = new QPopupMenu( Local_View );
     if( /*item->text(0).right(1) == "/" ||*/ item->text(0).find("/",0,TRUE) != -1)
         m.insertItem( tr( "Change Directory" ), this, SLOT( doRemoteCd() ));
     else
     m.insertItem( tr( "Download" ), this, SLOT( remoteDownload() ));
@@ -839,213 +867,254 @@ void OpieFtp::remoteMakDir()
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0);
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
        QString  filename = fileDlg->LineEdit1->text();//+".playlist";
        QString tmp=currentRemoteDir+filename;
        QCopEnvelope ( "QPE/System", "busy()" );
        if(FtpMkdir( tmp.latin1(), conn) == 0) {
            QString msg;
            msg.sprintf(tr("Unable to make directory\n")+"%s",FtpLastResponse(conn));
            msg.replace(QRegExp(":"),"\n");
            QMessageBox::message(tr("Note"),msg);
        }
        QCopEnvelope ( "QPE/System", "notBusy()" );
     remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
     }
 }
 
 void OpieFtp::remoteDelete()
 {
     QString f = Remote_View->currentItem()->text(0);
     QCopEnvelope ( "QPE/System", "busy()" );
     if( f.right(1) =="/") {
         QString path= currentRemoteDir+f;
         switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+f+"?"
                                       ,tr("Yes"),tr("No"),0,0,1) ) {
           case 0: {
               f=currentDir.canonicalPath()+"/"+f;
               if(FtpRmdir( path.latin1(), conn) ==0) {
                   QString msg;
                   msg.sprintf(tr("Unable to remove directory\n")+"%s",FtpLastResponse(conn));
                   msg.replace(QRegExp(":"),"\n");
                   QMessageBox::message(tr("Note"),msg);
               }
               remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
 
           }
           break;
         };
     } else {
         switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+f+"?"
                                       ,tr("Yes"),tr("No"),0,0,1) ) {
           case 0: {
               QString path= currentRemoteDir+f;
               if(FtpDelete( path.latin1(), conn)==0) {
                   QString msg;
                   msg.sprintf(tr("Unable to delete file\n")+"%s",FtpLastResponse(conn));
                   msg.replace(QRegExp(":"),"\n");
                   QMessageBox::message(tr("Note"),msg);
               }
               remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
           }
           break;
         };
     }
     QCopEnvelope ( "QPE/System", "notBusy()" );
 }
 
 void OpieFtp::remoteRename()
 {
     QString curFile = Remote_View->currentItem()->text(0);
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0);
     fileDlg->inputText = curFile;
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
         QString oldName = currentRemoteDir +"/"+ curFile;
         QString newName = currentRemoteDir  +"/"+ fileDlg->LineEdit1->text();//+".playlist";
         QCopEnvelope ( "QPE/System", "busy()" );
         if(FtpRename( oldName.latin1(), newName.latin1(),conn) == 0) {
             QString msg;
             msg.sprintf(tr("Unable to rename file\n")+"%s",FtpLastResponse(conn));
             msg.replace(QRegExp(":"),"\n");
             QMessageBox::message(tr("Note"),msg);
         }
         QCopEnvelope ( "QPE/System", "notBusy()" );
     remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
     }
 }
 
 void OpieFtp::localRename()
 {
     QString curFile = Local_View->currentItem()->text(0);
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0);
     fileDlg->inputText = curFile;
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
         QString oldname =  currentDir.canonicalPath() + "/" + curFile;
         QString newName =  currentDir.canonicalPath() + "/" + fileDlg->LineEdit1->text();//+".playlist";
         if( rename(oldname.latin1(), newName.latin1())== -1)
             QMessageBox::message(tr("Note"),tr("Could not rename"));
     }
     populateLocalView();
 }
 
-void OpieFtp::currentPathEditChanged()
+void OpieFtp::currentPathComboActivated(const QString & currentPath) {
+    if (TabWidget->currentPageIndex() == 0) {
+    chdir( currentPath.latin1() );
+    currentDir.cd( currentPath, TRUE);
+    populateLocalList();
+    update();
+    } else {
+//     chdir( currentPath.latin1() );
+//     currentDir.cd( currentPath, TRUE);
+//     populateList();
+//     update();
+
+    }
+}
+
+void OpieFtp::fillCombo(const QString &currentPath) {
+
+        currentPathComboBox->lineEdit()->setText(currentPath);
+        if( localDirPathStringList.grep(currentPath,TRUE).isEmpty() ) {
+            currentPathComboBox->clear();
+            localDirPathStringList.prepend(currentPath );
+            currentPathComboBox->insertStringList( localDirPathStringList,-1);
+        }
+        currentPathComboBox->lineEdit()->setText(currentPath);
+        if( remoteDirPathStringList.grep(currentPath,TRUE).isEmpty() ) {
+            currentPathComboBox->clear();
+            remoteDirPathStringList.prepend(currentPath );
+            currentPathComboBox->insertStringList( remoteDirPathStringList,-1);
+        }
+}
+
+void OpieFtp::fillRemoteCombo(const QString &currentPath) {
+
+        dirPathCombo->lineEdit()->setText(currentPath);
+        if( remoteDirPathStringList.grep(currentPath,TRUE).isEmpty() ) {
+            dirPathCombo->clear();
+            remoteDirPathStringList.prepend(currentPath );
+            dirPathCombo->insertStringList( remoteDirPathStringList,-1);
+        }
+}
+
+void OpieFtp::currentPathComboChanged()
 {
     QString  oldRemoteCurrentDir =  currentRemoteDir;
 //    qDebug("oldRemoteCurrentDir "+oldRemoteCurrentDir);
     if (TabWidget->currentPageIndex() == 0) {
-        if(QDir( currentPathEdit->text()).exists()) {
-            currentDir.setPath( currentPathEdit->text() );
+        if(QDir( currentPathCombo->lineEdit()->text()).exists()) {
+            currentDir.setPath( currentPathCombo->lineEdit()->text() );
             populateLocalView();
         } else {
             QMessageBox::message(tr("Note"),tr("That directory does not exist"));
         }
     }
     if (TabWidget->currentPageIndex() == 1) {
-        currentRemoteDir = currentPathEdit->text();
+        currentRemoteDir = currentPathCombo->lineEdit()->text();
         if(currentRemoteDir.right(1) !="/") {
             currentRemoteDir = currentRemoteDir +"/";
-            currentPathEdit->setText( currentRemoteDir );
+            currentPathCombo->lineEdit()->setText( currentRemoteDir );
         }
             if( !remoteChDir( (const QString &)currentRemoteDir) ) {
                 currentRemoteDir = oldRemoteCurrentDir;
-                currentPathEdit->setText( currentRemoteDir );
+                currentPathCombo->lineEdit()->setText( currentRemoteDir );
             }
 
         remoteDirList( (const QString &)currentRemoteDir);
     }
 }
 
 void OpieFtp::switchToLocalTab()
 {
     TabWidget->setCurrentPage(0);
 }
 
 void OpieFtp::switchToRemoteTab()
 {
     TabWidget->setCurrentPage(1);
 }
 
 void OpieFtp::switchToConfigTab()
 {
     TabWidget->setCurrentPage(2);
 }
 
 void OpieFtp::readConfig()
 {
     fillCombos();
     Config cfg("opieftp");
     cfg.setGroup("Server");
     currentServerConfig = cfg.readNumEntry("currentServer", -1);
     serverComboSelected( currentServerConfig);
 }
 
 void OpieFtp::writeConfig()
 {
 
     Config cfg("opieftp");
     cfg.setGroup("Server");
     QString username, remoteServerStr, remotePathStr, password, port, temp;
     int numberOfEntries = cfg.readNumEntry("numberOfEntries",0);
     if( currentServerConfig == -1) {
 
         temp.setNum( numberOfEntries + 1);
         cfg.setGroup("Server");
         remoteServerStr = cfg.readEntry( temp,"");
         int divider = remoteServerStr.length() - remoteServerStr.find(":",0,TRUE);
         remoteServerStr = remoteServerStr.left(remoteServerStr.length()-divider);
 
         temp.setNum(numberOfEntries+1);
         cfg.setGroup("Server");
         cfg.writeEntry( temp, ServerComboBox->currentText() +":"+PortSpinBox->cleanText() );
         cfg.setGroup(temp);
         cfg.writeEntry("RemotePath", remotePath->text());
         cfg.writeEntry("Username", UsernameComboBox->currentText());
         cfg.writeEntryCrypt( UsernameComboBox->currentText(), PasswordEdit->text());
         cfg.setGroup("Server");
         cfg.writeEntry("numberOfEntries", QString::number(numberOfEntries + 1 ));
 
     }
 }
 
 void OpieFtp::fillCombos()
 {
     Config cfg("opieftp");
     cfg.setGroup("Server");
     QString username, remoteServerStr, remotePathStr, password, port, temp;
     int numberOfEntries = cfg.readNumEntry("numberOfEntries",0);
     for (int i = 1; i <= numberOfEntries; i++) {
         temp.setNum(i);
         cfg.setGroup("Server");
         remoteServerStr = cfg.readEntry( temp,"");
         int divider = remoteServerStr.length() - remoteServerStr.find(":",0,TRUE);
         port = remoteServerStr.right( divider - 1);
         bool ok;
         PortSpinBox->setValue( port.toInt(&ok,10));
 
         remoteServerStr = remoteServerStr.left(remoteServerStr.length()-divider);
         ServerComboBox->insertItem( remoteServerStr );
 //          cfg.setGroup(temp);
 
 //          remotePathStr = cfg.readEntry(remoteServer,"");
 //          int divider = remoteServer.length() - remoteServer.find(":",0,TRUE);
 //          port = remoteServer.right( divider+1);
 //          PortSpinBox->setValue( port);
 
 //          remoteServer = remoteServer.left(divider - 1);
 //          remotePath->setText( remotePathStr);
 
 //          username = cfg.readEntry(temp);
 //          UsernameComboBox->insertItem(username);
 //          password = cfg.readEntryCrypt(username,"");
 //          PasswordEdit->setText(password);
     }
 }
 
 
 void OpieFtp::serverComboSelected(int index)
 {
     currentServerConfig = index;
diff --git a/noncore/net/opieftp/opieftp.h b/noncore/net/opieftp/opieftp.h
index 52ed885..57599b7 100644
--- a/noncore/net/opieftp/opieftp.h
+++ b/noncore/net/opieftp/opieftp.h
@@ -1,111 +1,117 @@
 /***************************************************************************
    opieftp.h
                              -------------------
 ** 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.                                   *
  ***************************************************************************/
 #ifndef OPIEFTP_H
 #define OPIEFTP_H
 
 #include <qvariant.h>
 #include <qdialog.h>
 #include <qmainwindow.h>
 #include <qdir.h>
 #include <qstring.h>
 #include <qpoint.h>
 
 class QVBoxLayout; 
 class QHBoxLayout; 
 class QGridLayout; 
 class QComboBox;
 class QListView;
 class QListviewItem;
 class QLabel;
 class QProgressBar;
 class QSpinBox;
 class QTabWidget;
 class QWidget;
 class QPEToolBar;
 class QPEMenuBar;
 class QPopupMenu;
 class QFile;
 class QListViewItem;
 class QLineEdit;
 class QPushButton;
+class QStringList;
 
 class OpieFtp : public QMainWindow
 {
     Q_OBJECT
 
 public:
     OpieFtp(  );
     ~OpieFtp();
 
     QTabWidget *TabWidget;
     QWidget *tab, *tab_2, *tab_3;
     QListView *Local_View, *Remote_View;
 
-    QComboBox *UsernameComboBox, *ServerComboBox;
+    QComboBox *UsernameComboBox, *ServerComboBox, *currentPathCombo;
     QLineEdit *PasswordEdit, *remotePath, *currentPathEdit;
     QLabel *TextLabel2, *TextLabel1, *TextLabel3, *TextLabel4;;
     QSpinBox* PortSpinBox;
     QPopupMenu *connectionMenu, *localMenu, *remoteMenu, *tabMenu;
     QDir currentDir;
     QString currentRemoteDir;
     QString filterStr;
     QListViewItem * item;
     QPushButton *connectServerBtn;
     bool b;
     int currentServerConfig;
 protected slots:
     void serverComboEdited(const QString & );
     void showLocalMenu( QListViewItem *);
     void showRemoteMenu( QListViewItem *);
     void doLocalCd();
     void doRemoteCd();
     void localUpload();
     void remoteDownload();
     void newConnection();
     void connector();
     void disConnector();
     void populateLocalView();
     bool populateRemoteView();
     void showHidden();
     void writeConfig();
     void readConfig();
     void localListClicked(QListViewItem *);
     void remoteListClicked(QListViewItem *);
     void ListPressed( int, QListViewItem *, const QPoint&, int);
     void RemoteListPressed( int, QListViewItem *, const QPoint&, int);
     void localMakDir();
     void localDelete();
     void remoteMakDir();
     void remoteDelete();
     bool remoteDirList(const QString &);
     bool remoteChDir(const QString &);
     void tabChanged(QWidget*);
     void cleanUp();
     void remoteRename();
     void localRename();
-    void currentPathEditChanged();
+    void currentPathComboChanged();
+    void fillCombos();
+    void fillCombo(const QString &);
+    void currentPathComboActivated(const QString &);
   void switchToLocalTab();
   void switchToRemoteTab();
   void switchToConfigTab();
-  void fillCombos();
+  void fillCombo();
+  void fillRemoteCombo();
   void serverComboSelected(int);
   void deleteServer();
   void connectorBtnToggled(bool);  
 protected:
+  QStringList remoteDirPathStringList, localDirPathStringList;
     void nullifyCallBack();
     QGridLayout* tabLayout;
     QGridLayout* tabLayout_2;
     QGridLayout* tabLayout_3;
     
 };
 
 #endif // OPIEFTP_H