| -rw-r--r-- | noncore/net/opieftp/opieftp.cpp | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp index 3dda17e..e64fd73 100644 --- a/noncore/net/opieftp/opieftp.cpp +++ b/noncore/net/opieftp/opieftp.cpp @@ -135,3 +135,4 @@ OpieFtp::OpieFtp( ) Local_View->setSelectionMode(QListView::Extended); - QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold); + + QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold); @@ -320,3 +321,2 @@ void OpieFtp::newConnection() TabWidget->setCurrentPage(2); - currentServerConfig = -1; } @@ -434,4 +434,4 @@ void OpieFtp::localUpload() nullifyCallBack(); - it.current()->setSelected(FALSE); } //end currentSelected + it.current()->setSelected(FALSE); } @@ -488,4 +488,4 @@ void OpieFtp::remoteDownload() nullifyCallBack(); - it.current()->setSelected(FALSE); } + it.current()->setSelected(FALSE); } @@ -659,3 +659,3 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem) if( selectedItem) { - QCopEnvelope ( "QPE/System", "busy()" ); +// QCopEnvelope ( "QPE/System", "busy()" ); QString oldRemoteCurrentDir = currentRemoteDir; @@ -688,6 +688,5 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem) strItem=""; - qDebug("RemoteCurrentDir1 "+oldRemoteCurrentDir); +// qDebug("RemoteCurrentDir1 "+oldRemoteCurrentDir); } } else if(strItem.find("/",0,TRUE) != -1) { // this is a directory - qDebug("trying directory"); if( !remoteChDir( (const QString &)currentRemoteDir + strItem)) { @@ -695,3 +694,3 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem) strItem=""; - qDebug("RemoteCurrentDir1 "+oldRemoteCurrentDir); +// qDebug("RemoteCurrentDir1 "+oldRemoteCurrentDir); @@ -701,3 +700,4 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem) } else { - qDebug("download "+strItem); + QCopEnvelope ( "QPE/System", "notBusy()" ); + return; } @@ -707,5 +707,5 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem) currentRemoteDir +="/"; - currentPathCombo->lineEdit()->setText( currentRemoteDir ); - fillRemoteCombo( (const QString &)currentDir); - QCopEnvelope ( "QPE/System", "notBusy()" ); + currentPathCombo->lineEdit()->setText( currentRemoteDir); + fillRemoteCombo( (const QString &)currentRemoteDir); +// QCopEnvelope ( "QPE/System", "notBusy()" ); } @@ -729,2 +729,3 @@ void OpieFtp::localListClicked(QListViewItem *selectedItem) if(strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) { + if(QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem)).exists() ) { @@ -745,2 +746,3 @@ void OpieFtp::localListClicked(QListViewItem *selectedItem) // qDebug("upload "+strItem); + return; } @@ -1070,3 +1072,2 @@ void OpieFtp::writeConfig() { - Config cfg("opieftp"); @@ -1076,2 +1077,7 @@ void OpieFtp::writeConfig() if( currentServerConfig == -1) { + for (int i = 1; i <= numberOfEntries; i++) { + temp.setNum(i); + cfg.setGroup("Server"); + QString tempStr = cfg.readEntry( temp,""); + } @@ -1092,3 +1098,2 @@ void OpieFtp::writeConfig() cfg.writeEntry("numberOfEntries", QString::number(numberOfEntries + 1 )); - } |