2 files changed, 136 insertions, 36 deletions

diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp
index 919649e..fb57193 100644
--- a/noncore/net/opieftp/opieftp.cpp
+++ b/noncore/net/opieftp/opieftp.cpp
@@ -78,4 +78,7 @@ OpieFtp::OpieFtp( )
 
     QPEMenuBar *menuBar = new QPEMenuBar(this);
+//     QPEToolBar *menuBar = new QPEToolBar(this);
+//     menuBar->setHorizontalStretchable( TRUE );
+
     connectionMenu  = new QPopupMenu( this );
     localMenu  = new QPopupMenu( this );
@@ -83,5 +86,5 @@ OpieFtp::OpieFtp( )
     tabMenu = new QPopupMenu( this );
 
-    layout->addMultiCellWidget( menuBar, 0, 0, 0, 3 );
+    layout->addMultiCellWidget( menuBar, 0, 0, 0, 2 );
 
     menuBar->insertItem( tr( "Connection" ), connectionMenu);
@@ -114,6 +117,27 @@ OpieFtp::OpieFtp( )
     tabMenu->setCheckable(TRUE);
 
+
+    cdUpButton = new QPushButton(Resource::loadIconSet("up"),"",this,"cdUpButton");
+    cdUpButton ->setFixedSize( QSize( 20, 20 ) );
+    connect( cdUpButton ,SIGNAL(released()),this,SLOT( upDir()) );
+    cdUpButton ->setFlat(TRUE);
+    layout->addMultiCellWidget( cdUpButton, 0, 0, 3, 3 );
+     cdUpButton->hide();
+
+//     docButton = new QPushButton(Resource::loadIconSet("DocsIcon"),"",this,"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 QPushButton( Resource::loadIconSet("home"),"",this,"homeButton");
+    homeButton->setFixedSize( QSize( 20, 20 ) );
+    connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) );
+    homeButton->setFlat(TRUE);
+    layout->addMultiCellWidget( homeButton, 0, 0, 4, 4);
+     homeButton->hide();
+
     TabWidget = new QTabWidget( this, "TabWidget" );
-    layout->addMultiCellWidget( TabWidget, 1, 1, 0, 3 );
+    layout->addMultiCellWidget( TabWidget, 1, 1, 0, 4 );
 
 //     TabWidget->setTabShape(QTabWidget::Triangular);
@@ -249,5 +273,6 @@ OpieFtp::OpieFtp( )
 
     currentPathCombo = new QComboBox( FALSE, this, "currentPathCombo" );
-    layout->addMultiCellWidget( currentPathCombo, 3, 3, 0, 3 );
+    layout->addMultiCellWidget( currentPathCombo, 3, 3, 0, 4);
+
     currentPathCombo->setEditable(TRUE);
     currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
@@ -260,5 +285,5 @@ OpieFtp::OpieFtp( )
 
     ProgressBar = new QProgressBar( this, "ProgressBar" );
-    layout->addMultiCellWidget( ProgressBar, 4, 4, 0, 3 );
+    layout->addMultiCellWidget( ProgressBar, 4, 4, 0, 4);
 
 //     fillCombos();
@@ -295,19 +320,30 @@ void OpieFtp::tabChanged(QWidget *w)
 {
     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);
+        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 (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 (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 (TabWidget->currentPageIndex() == 2) {
-            tabMenu->setItemChecked(tabMenu->idAt(2),TRUE);
-            tabMenu->setItemChecked(tabMenu->idAt(0),FALSE);
-            tabMenu->setItemChecked(tabMenu->idAt(1),FALSE);
+    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();
     }
 }
@@ -343,5 +379,5 @@ void OpieFtp::connectorBtnToggled(bool On)
 void OpieFtp::connector()
 {
-    QCopEnvelope ( "QPE/System", "busy()" );
+//    QCopEnvelope ( "QPE/System", "busy()" );
 //    qApp->processEvents();
     currentRemoteDir=remotePath->text();
@@ -386,5 +422,5 @@ void OpieFtp::connector()
     writeConfig();
     connectServerBtn->setText( tr("Disconnect"));
-    QCopEnvelope ( "QPE/System", "notBusy()" );
+//    QCopEnvelope ( "QPE/System", "notBusy()" );
 }
 
@@ -403,5 +439,5 @@ void OpieFtp::localUpload()
 {
     int fsz;
-    QCopEnvelope ( "QPE/System", "busy()" );
+//    QCopEnvelope ( "QPE/System", "busy()" );
 //    qApp->processEvents();
     QList<QListViewItem> * getSelectedItems( QListView * Local_View );
@@ -439,5 +475,6 @@ void OpieFtp::localUpload()
     TabWidget->setCurrentPage(1);
     remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
-    QCopEnvelope ( "QPE/System", "notBusy()" );
+//    QCopEnvelope ( "QPE/System", "notBusy()" );
+
 }
 
@@ -454,5 +491,5 @@ void OpieFtp::remoteDownload()
 //    qApp->processEvents();
     int fsz;
-    QCopEnvelope ( "QPE/System", "busy()" );
+//    QCopEnvelope ( "QPE/System", "busy()" );
 
     QList<QListViewItem> * getSelectedItems( QListView * Remote_View );
@@ -493,5 +530,6 @@ void OpieFtp::remoteDownload()
     TabWidget->setCurrentPage(0);
     populateLocalView();
-    QCopEnvelope ( "QPE/System", "notBusy()" );
+//    QCopEnvelope ( "QPE/System", "notBusy()" );
+    
 }
 
@@ -504,5 +542,5 @@ bool OpieFtp::remoteDirList(const QString &dir)
         tmp+="._temp";
 //    qDebug("Listing remote dir "+tmp);
-    QCopEnvelope ( "QPE/System", "busy()" );
+//    QCopEnvelope ( "QPE/System", "busy()" );
     if (!FtpDir( tmp.latin1(), dir.latin1(), conn) ) {
         QString msg;
@@ -513,5 +551,5 @@ bool OpieFtp::remoteDirList(const QString &dir)
     }
     populateRemoteView() ;
-    QCopEnvelope ( "QPE/System", "notBusy()" );
+//    QCopEnvelope ( "QPE/System", "notBusy()" );
     return true;
 }
@@ -519,5 +557,5 @@ bool OpieFtp::remoteDirList(const QString &dir)
 bool OpieFtp::remoteChDir(const QString &dir)
 {
-    QCopEnvelope ( "QPE/System", "busy()" );
+//    QCopEnvelope ( "QPE/System", "busy()" );
     if (!FtpChdir( dir.latin1(), conn )) {
         QString msg;
@@ -526,8 +564,8 @@ bool OpieFtp::remoteChDir(const QString &dir)
         QMessageBox::message(tr("Note"),msg);
 //        qDebug(msg);
-        QCopEnvelope ( "QPE/System", "notBusy()" );
+//        QCopEnvelope ( "QPE/System", "notBusy()" );
         return FALSE;
     }
-    QCopEnvelope ( "QPE/System", "notBusy()" );
+//    QCopEnvelope ( "QPE/System", "notBusy()" );
     return TRUE;
 }
@@ -600,4 +638,5 @@ void OpieFtp::populateLocalView()
     currentPathCombo->lineEdit()->setText( currentDir.canonicalPath() );
     fillCombo( (const QString &)currentDir);
+
 }
 
@@ -700,5 +739,5 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem)
                 }
             } else {
-                QCopEnvelope ( "QPE/System", "notBusy()" );
+//                QCopEnvelope ( "QPE/System", "notBusy()" );
                 return;
             }
@@ -752,4 +791,5 @@ void OpieFtp::localListClicked(QListViewItem *selectedItem)
         }
     }
+    
 }
 
@@ -889,5 +929,5 @@ void OpieFtp::remoteMakDir()
        QString  filename = fileDlg->LineEdit1->text();//+".playlist";
        QString tmp=currentRemoteDir+filename;
-       QCopEnvelope ( "QPE/System", "busy()" );
+//       QCopEnvelope ( "QPE/System", "busy()" );
        if(FtpMkdir( tmp.latin1(), conn) == 0) {
            QString msg;
@@ -896,5 +936,5 @@ void OpieFtp::remoteMakDir()
            QMessageBox::message(tr("Note"),msg);
        }
-       QCopEnvelope ( "QPE/System", "notBusy()" );
+//       QCopEnvelope ( "QPE/System", "notBusy()" );
     remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
     }
@@ -904,5 +944,5 @@ void OpieFtp::remoteDelete()
 {
     QString f = Remote_View->currentItem()->text(0);
-    QCopEnvelope ( "QPE/System", "busy()" );
+//    QCopEnvelope ( "QPE/System", "busy()" );
     if( f.right(1) =="/") {
         QString path= currentRemoteDir+f;
@@ -937,5 +977,5 @@ void OpieFtp::remoteDelete()
         };
     }
-    QCopEnvelope ( "QPE/System", "notBusy()" );
+//    QCopEnvelope ( "QPE/System", "notBusy()" );
 }
 
@@ -950,5 +990,5 @@ void OpieFtp::remoteRename()
         QString oldName = currentRemoteDir +"/"+ curFile;
         QString newName = currentRemoteDir  +"/"+ fileDlg->LineEdit1->text();//+".playlist";
-        QCopEnvelope ( "QPE/System", "busy()" );
+//        QCopEnvelope ( "QPE/System", "busy()" );
         if(FtpRename( oldName.latin1(), newName.latin1(),conn) == 0) {
             QString msg;
@@ -957,5 +997,5 @@ void OpieFtp::remoteRename()
             QMessageBox::message(tr("Note"),msg);
         }
-        QCopEnvelope ( "QPE/System", "notBusy()" );
+//        QCopEnvelope ( "QPE/System", "notBusy()" );
     remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
     }
@@ -1192,2 +1232,58 @@ void OpieFtp::deleteServer()
     }
 }
+
+void OpieFtp::upDir()
+{
+    if (TabWidget->currentPageIndex() == 0) {
+        QString current = currentDir.canonicalPath();
+        QDir dir(current);
+        dir.cdUp();
+        current = dir.canonicalPath();
+        chdir( current.latin1() );
+        currentDir.cd(  current, TRUE);
+        populateLocalView();
+        update();
+    } else {
+        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;
+        remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
+        if(currentRemoteDir.right(1) !="/")
+            currentRemoteDir +="/";
+        currentPathCombo->lineEdit()->setText( currentRemoteDir);
+        fillRemoteCombo( (const QString &)currentRemoteDir);
+        populateRemoteView( );        
+    }
+}
+
+void OpieFtp::docButtonPushed() {
+    QString current = QPEApplication::documentDir();
+    chdir( current.latin1() );
+    currentDir.cd( current, TRUE);
+     populateLocalView();
+    update();
+
+}
+
+void OpieFtp::homeButtonPushed() {
+    if (TabWidget->currentPageIndex() == 0) {
+        QString current = QDir::homeDirPath();
+        chdir( current.latin1() );
+        currentDir.cd(  current, TRUE);
+        populateLocalView();
+        update();
+    }
+}
diff --git a/noncore/net/opieftp/opieftp.h b/noncore/net/opieftp/opieftp.h
index 32862c7..6852b1c 100644
--- a/noncore/net/opieftp/opieftp.h
+++ b/noncore/net/opieftp/opieftp.h
@@ -61,8 +61,12 @@ public:
     QString filterStr;
     QListViewItem * item;
-    QPushButton *connectServerBtn;
+    QPushButton *connectServerBtn, *cdUpButton, *homeButton, *docButton;
     bool b;
     int currentServerConfig;
 protected slots:
+    void upDir();
+    void homeButtonPushed();
+    void docButtonPushed();
+ 
     void serverComboEdited(const QString & );
     void showLocalMenu( QListViewItem *);