-rw-r--r-- | noncore/net/opieftp/opieftp.cpp | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp index 6684abb..6d0be57 100644 --- a/noncore/net/opieftp/opieftp.cpp +++ b/noncore/net/opieftp/opieftp.cpp | |||
@@ -389,9 +389,9 @@ void OpieFtp::connectorBtnToggled(bool On) | |||
389 | } | 389 | } |
390 | 390 | ||
391 | void OpieFtp::connector() | 391 | void OpieFtp::connector() |
392 | { | 392 | { |
393 | QCopEnvelope ( "QPE/System", "busy()" ); | 393 | // QCopEnvelope ( "QPE/System", "busy()" ); |
394 | // qApp->processEvents(); | 394 | // qApp->processEvents(); |
395 | currentRemoteDir=remotePath->text(); | 395 | currentRemoteDir=remotePath->text(); |
396 | if(ServerComboBox->currentText().isEmpty()) { | 396 | if(ServerComboBox->currentText().isEmpty()) { |
397 | QMessageBox::warning(this,tr("Ftp"),tr("Please set the server info"),tr("Ok"),0,0); | 397 | QMessageBox::warning(this,tr("Ftp"),tr("Please set the server info"),tr("Ok"),0,0); |
@@ -432,9 +432,9 @@ void OpieFtp::connector() | |||
432 | remoteDirList("/") ; | 432 | remoteDirList("/") ; |
433 | setCaption(ftp_host); | 433 | setCaption(ftp_host); |
434 | writeConfig(); | 434 | writeConfig(); |
435 | connectServerBtn->setText( tr("Disconnect")); | 435 | connectServerBtn->setText( tr("Disconnect")); |
436 | QCopEnvelope ( "QPE/System", "notBusy()" ); | 436 | // QCopEnvelope ( "QPE/System", "notBusy()" ); |
437 | } | 437 | } |
438 | 438 | ||
439 | void OpieFtp::disConnector() | 439 | void OpieFtp::disConnector() |
440 | { | 440 | { |
@@ -444,8 +444,9 @@ void OpieFtp::disConnector() | |||
444 | currentRemoteDir="/"; | 444 | currentRemoteDir="/"; |
445 | Remote_View->clear(); | 445 | Remote_View->clear(); |
446 | connectServerBtn->setText( tr("Connect")); | 446 | connectServerBtn->setText( tr("Connect")); |
447 | connectServerBtn->setOn(FALSE); | 447 | connectServerBtn->setOn(FALSE); |
448 | setCaption("OpieFtp"); | ||
448 | } | 449 | } |
449 | 450 | ||
450 | void OpieFtp::localUpload() | 451 | void OpieFtp::localUpload() |
451 | { | 452 | { |
@@ -489,9 +490,9 @@ void OpieFtp::localUpload() | |||
489 | } | 490 | } |
490 | Local_View->clearFocus(); | 491 | Local_View->clearFocus(); |
491 | TabWidget->setCurrentPage(1); | 492 | TabWidget->setCurrentPage(1); |
492 | remoteDirList( (const QString &)currentRemoteDir); //this also calls populate | 493 | remoteDirList( (const QString &)currentRemoteDir); //this also calls populate |
493 | QCopEnvelope ( "QPE/System", "notBusy()" ); | 494 | // QCopEnvelope ( "QPE/System", "notBusy()" ); |
494 | } | 495 | } |
495 | 496 | ||
496 | void OpieFtp::nullifyCallBack() | 497 | void OpieFtp::nullifyCallBack() |
497 | { | 498 | { |
@@ -504,9 +505,9 @@ void OpieFtp::nullifyCallBack() | |||
504 | void OpieFtp::remoteDownload() | 505 | void OpieFtp::remoteDownload() |
505 | { | 506 | { |
506 | // qApp->processEvents(); | 507 | // qApp->processEvents(); |
507 | int fsz; | 508 | int fsz; |
508 | QCopEnvelope ( "QPE/System", "busy()" ); | 509 | // QCopEnvelope ( "QPE/System", "busy()" ); |
509 | 510 | ||
510 | QList<QListViewItem> * getSelectedItems( QListView * Remote_View ); | 511 | QList<QListViewItem> * getSelectedItems( QListView * Remote_View ); |
511 | QListViewItemIterator it( Remote_View ); | 512 | QListViewItemIterator it( Remote_View ); |
512 | for ( ; it.current(); ++it ) { | 513 | for ( ; it.current(); ++it ) { |
@@ -547,9 +548,9 @@ void OpieFtp::remoteDownload() | |||
547 | } | 548 | } |
548 | Remote_View->setFocus(); | 549 | Remote_View->setFocus(); |
549 | TabWidget->setCurrentPage(0); | 550 | TabWidget->setCurrentPage(0); |
550 | populateLocalView(); | 551 | populateLocalView(); |
551 | QCopEnvelope ( "QPE/System", "notBusy()" ); | 552 | // QCopEnvelope ( "QPE/System", "notBusy()" ); |
552 | } | 553 | } |
553 | 554 | ||
554 | bool OpieFtp::remoteDirList(const QString &dir) | 555 | bool OpieFtp::remoteDirList(const QString &dir) |
555 | { | 556 | { |
@@ -558,34 +559,34 @@ bool OpieFtp::remoteDirList(const QString &dir) | |||
558 | tmp+="/._temp"; | 559 | tmp+="/._temp"; |
559 | else | 560 | else |
560 | tmp+="._temp"; | 561 | tmp+="._temp"; |
561 | // qDebug("Listing remote dir "+tmp); | 562 | // qDebug("Listing remote dir "+tmp); |
562 | QCopEnvelope ( "QPE/System", "busy()" ); | 563 | // QCopEnvelope ( "QPE/System", "busy()" ); |
563 | if (!FtpDir( tmp.latin1(), dir.latin1(), conn) ) { | 564 | if (!FtpDir( tmp.latin1(), dir.latin1(), conn) ) { |
564 | QString msg; | 565 | QString msg; |
565 | msg.sprintf(tr("Unable to list the directory\n")+dir+"\n%s",FtpLastResponse(conn) ); | 566 | msg.sprintf(tr("Unable to list the directory\n")+dir+"\n%s",FtpLastResponse(conn) ); |
566 | msg.replace(QRegExp(":"),"\n"); | 567 | msg.replace(QRegExp(":"),"\n"); |
567 | QMessageBox::message(tr("Note"),msg); | 568 | QMessageBox::message(tr("Note"),msg); |
568 | return false; | 569 | return false; |
569 | } | 570 | } |
570 | populateRemoteView() ; | 571 | populateRemoteView() ; |
571 | QCopEnvelope ( "QPE/System", "notBusy()" ); | 572 | // QCopEnvelope ( "QPE/System", "notBusy()" ); |
572 | return true; | 573 | return true; |
573 | } | 574 | } |
574 | 575 | ||
575 | bool OpieFtp::remoteChDir(const QString &dir) | 576 | bool OpieFtp::remoteChDir(const QString &dir) |
576 | { | 577 | { |
577 | QCopEnvelope ( "QPE/System", "busy()" ); | 578 | // QCopEnvelope ( "QPE/System", "busy()" ); |
578 | if (!FtpChdir( dir.latin1(), conn )) { | 579 | if (!FtpChdir( dir.latin1(), conn )) { |
579 | QString msg; | 580 | QString msg; |
580 | msg.sprintf(tr("Unable to change directories\n")+dir+"\n%s",FtpLastResponse(conn)); | 581 | msg.sprintf(tr("Unable to change directories\n")+dir+"\n%s",FtpLastResponse(conn)); |
581 | msg.replace(QRegExp(":"),"\n"); | 582 | msg.replace(QRegExp(":"),"\n"); |
582 | QMessageBox::message(tr("Note"),msg); | 583 | QMessageBox::message(tr("Note"),msg); |
583 | // qDebug(msg); | 584 | // qDebug(msg); |
584 | QCopEnvelope ( "QPE/System", "notBusy()" ); | 585 | // QCopEnvelope ( "QPE/System", "notBusy()" ); |
585 | return FALSE; | 586 | return FALSE; |
586 | } | 587 | } |
587 | QCopEnvelope ( "QPE/System", "notBusy()" ); | 588 | // QCopEnvelope ( "QPE/System", "notBusy()" ); |
588 | return TRUE; | 589 | return TRUE; |
589 | } | 590 | } |
590 | 591 | ||
591 | void OpieFtp::populateLocalView() | 592 | void OpieFtp::populateLocalView() |
@@ -754,9 +755,9 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem) | |||
754 | } else { | 755 | } else { |
755 | currentRemoteDir = currentRemoteDir+strItem; | 756 | currentRemoteDir = currentRemoteDir+strItem; |
756 | } | 757 | } |
757 | } else { | 758 | } else { |
758 | QCopEnvelope ( "QPE/System", "notBusy()" ); | 759 | // QCopEnvelope ( "QPE/System", "notBusy()" ); |
759 | return; | 760 | return; |
760 | } | 761 | } |
761 | } | 762 | } |
762 | remoteDirList( (const QString &)currentRemoteDir); //this also calls populate | 763 | remoteDirList( (const QString &)currentRemoteDir); //this also calls populate |
@@ -956,16 +957,16 @@ void OpieFtp::remoteMakDir() | |||
956 | fileDlg->exec(); | 957 | fileDlg->exec(); |
957 | if( fileDlg->result() == 1 ) { | 958 | if( fileDlg->result() == 1 ) { |
958 | QString filename = fileDlg->LineEdit1->text();//+".playlist"; | 959 | QString filename = fileDlg->LineEdit1->text();//+".playlist"; |
959 | QString tmp=currentRemoteDir+filename; | 960 | QString tmp=currentRemoteDir+filename; |
960 | QCopEnvelope ( "QPE/System", "busy()" ); | 961 | // QCopEnvelope ( "QPE/System", "busy()" ); |
961 | if(FtpMkdir( tmp.latin1(), conn) == 0) { | 962 | if(FtpMkdir( tmp.latin1(), conn) == 0) { |
962 | QString msg; | 963 | QString msg; |
963 | msg.sprintf(tr("Unable to make directory\n")+"%s",FtpLastResponse(conn)); | 964 | msg.sprintf(tr("Unable to make directory\n")+"%s",FtpLastResponse(conn)); |
964 | msg.replace(QRegExp(":"),"\n"); | 965 | msg.replace(QRegExp(":"),"\n"); |
965 | QMessageBox::message(tr("Note"),msg); | 966 | QMessageBox::message(tr("Note"),msg); |
966 | } | 967 | } |
967 | QCopEnvelope ( "QPE/System", "notBusy()" ); | 968 | // QCopEnvelope ( "QPE/System", "notBusy()" ); |
968 | remoteDirList( (const QString &)currentRemoteDir); //this also calls populate | 969 | remoteDirList( (const QString &)currentRemoteDir); //this also calls populate |
969 | } | 970 | } |
970 | } | 971 | } |
971 | 972 | ||
@@ -976,9 +977,9 @@ void OpieFtp::remoteDelete() | |||
976 | for ( ; it.current(); ++it ) { | 977 | for ( ; it.current(); ++it ) { |
977 | if ( it.current()->isSelected() ) { | 978 | if ( it.current()->isSelected() ) { |
978 | QString f = it.current()->text(0); | 979 | QString f = it.current()->text(0); |
979 | // QString f = Remote_View->currentItem()->text(0); | 980 | // QString f = Remote_View->currentItem()->text(0); |
980 | QCopEnvelope ( "QPE/System", "busy()" ); | 981 | // QCopEnvelope ( "QPE/System", "busy()" ); |
981 | if( f.right(1) =="/") { | 982 | if( f.right(1) =="/") { |
982 | QString path= currentRemoteDir+f; | 983 | QString path= currentRemoteDir+f; |
983 | switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+f+"?" | 984 | switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+f+"?" |
984 | ,tr("Yes"),tr("No"),0,0,1) ) { | 985 | ,tr("Yes"),tr("No"),0,0,1) ) { |
@@ -1011,9 +1012,9 @@ void OpieFtp::remoteDelete() | |||
1011 | }; | 1012 | }; |
1012 | } | 1013 | } |
1013 | } | 1014 | } |
1014 | } | 1015 | } |
1015 | QCopEnvelope ( "QPE/System", "notBusy()" ); | 1016 | // QCopEnvelope ( "QPE/System", "notBusy()" ); |
1016 | } | 1017 | } |
1017 | 1018 | ||
1018 | void OpieFtp::remoteRename() | 1019 | void OpieFtp::remoteRename() |
1019 | { | 1020 | { |
@@ -1024,16 +1025,16 @@ void OpieFtp::remoteRename() | |||
1024 | fileDlg->exec(); | 1025 | fileDlg->exec(); |
1025 | if( fileDlg->result() == 1 ) { | 1026 | if( fileDlg->result() == 1 ) { |
1026 | QString oldName = currentRemoteDir +"/"+ curFile; | 1027 | QString oldName = currentRemoteDir +"/"+ curFile; |
1027 | QString newName = currentRemoteDir +"/"+ fileDlg->LineEdit1->text();//+".playlist"; | 1028 | QString newName = currentRemoteDir +"/"+ fileDlg->LineEdit1->text();//+".playlist"; |
1028 | QCopEnvelope ( "QPE/System", "busy()" ); | 1029 | // QCopEnvelope ( "QPE/System", "busy()" ); |
1029 | if(FtpRename( oldName.latin1(), newName.latin1(),conn) == 0) { | 1030 | if(FtpRename( oldName.latin1(), newName.latin1(),conn) == 0) { |
1030 | QString msg; | 1031 | QString msg; |
1031 | msg.sprintf(tr("Unable to rename file\n")+"%s",FtpLastResponse(conn)); | 1032 | msg.sprintf(tr("Unable to rename file\n")+"%s",FtpLastResponse(conn)); |
1032 | msg.replace(QRegExp(":"),"\n"); | 1033 | msg.replace(QRegExp(":"),"\n"); |
1033 | QMessageBox::message(tr("Note"),msg); | 1034 | QMessageBox::message(tr("Note"),msg); |
1034 | } | 1035 | } |
1035 | QCopEnvelope ( "QPE/System", "notBusy()" ); | 1036 | // QCopEnvelope ( "QPE/System", "notBusy()" ); |
1036 | remoteDirList( (const QString &)currentRemoteDir); //this also calls populate | 1037 | remoteDirList( (const QString &)currentRemoteDir); //this also calls populate |
1037 | } | 1038 | } |
1038 | } | 1039 | } |
1039 | 1040 | ||