author | llornkcor <llornkcor> | 2002-04-30 12:13:14 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-04-30 12:13:14 (UTC) |
commit | 99ae08c3e872fb9dcbba8057ee98f9f1687d0af1 (patch) (unidiff) | |
tree | 48546f25bfd565839687cde043e5ab1079098ae6 | |
parent | 713aa4385e859c9300ee2a5b0086fbaabf3b3a33 (diff) | |
download | opie-99ae08c3e872fb9dcbba8057ee98f9f1687d0af1.zip opie-99ae08c3e872fb9dcbba8057ee98f9f1687d0af1.tar.gz opie-99ae08c3e872fb9dcbba8057ee98f9f1687d0af1.tar.bz2 |
took out QCop busy() because its too slow to respond, fixed titlebar after disconnect still showing ftp server info
-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 | |||
@@ -391,5 +391,5 @@ void OpieFtp::connectorBtnToggled(bool On) | |||
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(); |
@@ -434,5 +434,5 @@ void OpieFtp::connector() | |||
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 | ||
@@ -446,4 +446,5 @@ void OpieFtp::disConnector() | |||
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 | ||
@@ -491,5 +492,5 @@ void OpieFtp::localUpload() | |||
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 | ||
@@ -506,5 +507,5 @@ void OpieFtp::remoteDownload() | |||
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 ); |
@@ -549,5 +550,5 @@ void OpieFtp::remoteDownload() | |||
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 | ||
@@ -560,5 +561,5 @@ bool OpieFtp::remoteDirList(const QString &dir) | |||
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; |
@@ -569,5 +570,5 @@ bool OpieFtp::remoteDirList(const QString &dir) | |||
569 | } | 570 | } |
570 | populateRemoteView() ; | 571 | populateRemoteView() ; |
571 | QCopEnvelope ( "QPE/System", "notBusy()" ); | 572 | // QCopEnvelope ( "QPE/System", "notBusy()" ); |
572 | return true; | 573 | return true; |
573 | } | 574 | } |
@@ -575,5 +576,5 @@ bool OpieFtp::remoteDirList(const QString &dir) | |||
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; |
@@ -582,8 +583,8 @@ bool OpieFtp::remoteChDir(const QString &dir) | |||
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 | } |
@@ -756,5 +757,5 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem) | |||
756 | } | 757 | } |
757 | } else { | 758 | } else { |
758 | QCopEnvelope ( "QPE/System", "notBusy()" ); | 759 | // QCopEnvelope ( "QPE/System", "notBusy()" ); |
759 | return; | 760 | return; |
760 | } | 761 | } |
@@ -958,5 +959,5 @@ void OpieFtp::remoteMakDir() | |||
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; |
@@ -965,5 +966,5 @@ void OpieFtp::remoteMakDir() | |||
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 | } |
@@ -978,5 +979,5 @@ void OpieFtp::remoteDelete() | |||
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; |
@@ -1013,5 +1014,5 @@ void OpieFtp::remoteDelete() | |||
1013 | } | 1014 | } |
1014 | } | 1015 | } |
1015 | QCopEnvelope ( "QPE/System", "notBusy()" ); | 1016 | // QCopEnvelope ( "QPE/System", "notBusy()" ); |
1016 | } | 1017 | } |
1017 | 1018 | ||
@@ -1026,5 +1027,5 @@ void OpieFtp::remoteRename() | |||
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; |
@@ -1033,5 +1034,5 @@ void OpieFtp::remoteRename() | |||
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 | } |