summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/opieftp/opieftp.cpp35
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
@@ -390,7 +390,7 @@ void OpieFtp::connectorBtnToggled(bool On)
390 390
391void OpieFtp::connector() 391void 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()) {
@@ -433,7 +433,7 @@ void OpieFtp::connector()
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
439void OpieFtp::disConnector() 439void OpieFtp::disConnector()
@@ -445,6 +445,7 @@ void OpieFtp::disConnector()
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
450void OpieFtp::localUpload() 451void OpieFtp::localUpload()
@@ -490,7 +491,7 @@ void OpieFtp::localUpload()
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
496void OpieFtp::nullifyCallBack() 497void OpieFtp::nullifyCallBack()
@@ -505,7 +506,7 @@ 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 );
@@ -548,7 +549,7 @@ void OpieFtp::remoteDownload()
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
554bool OpieFtp::remoteDirList(const QString &dir) 555bool OpieFtp::remoteDirList(const QString &dir)
@@ -559,7 +560,7 @@ bool OpieFtp::remoteDirList(const QString &dir)
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) );
@@ -568,23 +569,23 @@ bool OpieFtp::remoteDirList(const QString &dir)
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
575bool OpieFtp::remoteChDir(const QString &dir) 576bool 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
@@ -755,7 +756,7 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem)
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 }
@@ -957,14 +958,14 @@ void OpieFtp::remoteMakDir()
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}
@@ -977,7 +978,7 @@ void OpieFtp::remoteDelete()
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+"?"
@@ -1012,7 +1013,7 @@ void OpieFtp::remoteDelete()
1012 } 1013 }
1013 } 1014 }
1014 } 1015 }
1015 QCopEnvelope ( "QPE/System", "notBusy()" ); 1016// QCopEnvelope ( "QPE/System", "notBusy()" );
1016} 1017}
1017 1018
1018void OpieFtp::remoteRename() 1019void OpieFtp::remoteRename()
@@ -1025,14 +1026,14 @@ void OpieFtp::remoteRename()
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}