-rw-r--r-- | noncore/net/opieftp/opieftp.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp index 36de842..6be28d6 100644 --- a/noncore/net/opieftp/opieftp.cpp +++ b/noncore/net/opieftp/opieftp.cpp | |||
@@ -310,25 +310,26 @@ void OpieFtp::tabChanged(QWidget *w) | |||
310 | 310 | ||
311 | void OpieFtp::newConnection() | 311 | void OpieFtp::newConnection() |
312 | { | 312 | { |
313 | UsernameComboBox->lineEdit()->setText(""); | 313 | UsernameComboBox->lineEdit()->setText(""); |
314 | PasswordEdit->setText( "" ); | 314 | PasswordEdit->setText( "" ); |
315 | ServerComboBox->lineEdit()->setText( ""); | 315 | ServerComboBox->lineEdit()->setText( ""); |
316 | remotePath->setText( currentRemoteDir = "/"); | 316 | remotePath->setText( currentRemoteDir = "/"); |
317 | PortSpinBox->setValue( 21); | 317 | PortSpinBox->setValue( 21); |
318 | TabWidget->setCurrentPage(2); | 318 | TabWidget->setCurrentPage(2); |
319 | currentServerConfig = -1; | 319 | currentServerConfig = -1; |
320 | } | 320 | } |
321 | 321 | ||
322 | void OpieFtp::serverComboEdited(const QString & edit) { | 322 | void OpieFtp::serverComboEdited(const QString & edit) |
323 | { | ||
323 | if( !edit.isEmpty() ) { | 324 | if( !edit.isEmpty() ) { |
324 | currentServerConfig = -1; | 325 | currentServerConfig = -1; |
325 | // qDebug("comboedited"); | 326 | // qDebug("comboedited"); |
326 | } | 327 | } |
327 | } | 328 | } |
328 | 329 | ||
329 | void OpieFtp::connectorBtnToggled(bool On) | 330 | void OpieFtp::connectorBtnToggled(bool On) |
330 | { | 331 | { |
331 | if(On) { | 332 | if(On) { |
332 | connector(); | 333 | connector(); |
333 | } else { | 334 | } else { |
334 | disConnector(); | 335 | disConnector(); |
@@ -645,25 +646,25 @@ bool OpieFtp::populateRemoteView( ) | |||
645 | item1->setPixmap( 0, Resource::loadPixmap( "folder" )); | 646 | item1->setPixmap( 0, Resource::loadPixmap( "folder" )); |
646 | file.close(); | 647 | file.close(); |
647 | if( file.exists()) | 648 | if( file.exists()) |
648 | file. remove(); | 649 | file. remove(); |
649 | } else | 650 | } else |
650 | qDebug("temp file not opened successfullly "+sfile); | 651 | qDebug("temp file not opened successfullly "+sfile); |
651 | Remote_View->setSorting( 4,TRUE); | 652 | Remote_View->setSorting( 4,TRUE); |
652 | return true; | 653 | return true; |
653 | } | 654 | } |
654 | 655 | ||
655 | void OpieFtp::remoteListClicked(QListViewItem *selectedItem) | 656 | void OpieFtp::remoteListClicked(QListViewItem *selectedItem) |
656 | { | 657 | { |
657 | if(item) { | 658 | if( selectedItem) { |
658 | QCopEnvelope ( "QPE/System", "busy()" ); | 659 | QCopEnvelope ( "QPE/System", "busy()" ); |
659 | QString oldRemoteCurrentDir = currentRemoteDir; | 660 | QString oldRemoteCurrentDir = currentRemoteDir; |
660 | QString strItem=selectedItem->text(0); | 661 | QString strItem=selectedItem->text(0); |
661 | strItem=strItem.simplifyWhiteSpace(); | 662 | strItem=strItem.simplifyWhiteSpace(); |
662 | if(strItem == "../") { // the user wants to go ^ | 663 | if(strItem == "../") { // the user wants to go ^ |
663 | if( FtpCDUp( conn) == 0) { | 664 | if( FtpCDUp( conn) == 0) { |
664 | QString msg; | 665 | QString msg; |
665 | msg.sprintf(tr("Unable to cd up\n")+"%s",FtpLastResponse(conn)); | 666 | msg.sprintf(tr("Unable to cd up\n")+"%s",FtpLastResponse(conn)); |
666 | msg.replace(QRegExp(":"),"\n"); | 667 | msg.replace(QRegExp(":"),"\n"); |
667 | QMessageBox::message(tr("Note"),msg); | 668 | QMessageBox::message(tr("Note"),msg); |
668 | qDebug(msg); | 669 | qDebug(msg); |
669 | } | 670 | } |
@@ -702,26 +703,25 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem) | |||
702 | } | 703 | } |
703 | remoteDirList( (const QString &)currentRemoteDir); //this also calls populate | 704 | remoteDirList( (const QString &)currentRemoteDir); //this also calls populate |
704 | if(currentRemoteDir.right(1) !="/") | 705 | if(currentRemoteDir.right(1) !="/") |
705 | currentRemoteDir +="/"; | 706 | currentRemoteDir +="/"; |
706 | currentPathCombo->lineEdit()->setText( currentRemoteDir ); | 707 | currentPathCombo->lineEdit()->setText( currentRemoteDir ); |
707 | fillRemoteCombo( (const QString &)currentDir); | 708 | fillRemoteCombo( (const QString &)currentDir); |
708 | QCopEnvelope ( "QPE/System", "notBusy()" ); | 709 | QCopEnvelope ( "QPE/System", "notBusy()" ); |
709 | } | 710 | } |
710 | } | 711 | } |
711 | 712 | ||
712 | void OpieFtp::localListClicked(QListViewItem *selectedItem) | 713 | void OpieFtp::localListClicked(QListViewItem *selectedItem) |
713 | { | 714 | { |
714 | // qDebug(selectedItem->text(0)); | 715 | if(selectedItem!= NULL) { |
715 | if(item!= NULL) { | ||
716 | 716 | ||
717 | QString strItem=selectedItem->text(0); | 717 | QString strItem=selectedItem->text(0); |
718 | QString strSize=selectedItem->text(1); | 718 | QString strSize=selectedItem->text(1); |
719 | strSize=strSize.stripWhiteSpace(); | 719 | strSize=strSize.stripWhiteSpace(); |
720 | if(strItem.find("@",0,TRUE) !=-1 || strItem.find("->",0,TRUE) !=-1 ) { //if symlink | 720 | if(strItem.find("@",0,TRUE) !=-1 || strItem.find("->",0,TRUE) !=-1 ) { //if symlink |
721 | // is symlink | 721 | // is symlink |
722 | QString strItem2 = strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4); | 722 | QString strItem2 = strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4); |
723 | if(QDir(strItem2).exists() ) { | 723 | if(QDir(strItem2).exists() ) { |
724 | currentDir.cd(strItem2, TRUE); | 724 | currentDir.cd(strItem2, TRUE); |
725 | populateLocalView(); | 725 | populateLocalView(); |
726 | } | 726 | } |
727 | } else { // not a symlink | 727 | } else { // not a symlink |