-rw-r--r-- | noncore/net/opieftp/opieftp.cpp | 8 | ||||
-rw-r--r-- | noncore/net/opieftp/opieftp.pro | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp index a3b29a1..814d706 100644 --- a/noncore/net/opieftp/opieftp.cpp +++ b/noncore/net/opieftp/opieftp.cpp | |||
@@ -466,89 +466,89 @@ void OpieFtp::populateLocalView() | |||
466 | const QFileInfoList *list = currentDir.entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/); | 466 | const QFileInfoList *list = currentDir.entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/); |
467 | QFileInfoListIterator it(*list); | 467 | QFileInfoListIterator it(*list); |
468 | QFileInfo *fi; | 468 | QFileInfo *fi; |
469 | while ( (fi=it.current()) ) { | 469 | while ( (fi=it.current()) ) { |
470 | if (fi->isSymLink() ){ | 470 | if (fi->isSymLink() ){ |
471 | QString symLink=fi->readLink(); | 471 | QString symLink=fi->readLink(); |
472 | // qDebug("Symlink detected "+symLink); | 472 | // qDebug("Symlink detected "+symLink); |
473 | QFileInfo sym( symLink); | 473 | QFileInfo sym( symLink); |
474 | fileS.sprintf( "%10li", sym.size() ); | 474 | fileS.sprintf( "%10li", sym.size() ); |
475 | fileL.sprintf( "%s -> %s", sym.fileName().data(),sym.absFilePath().data() ); | 475 | fileL.sprintf( "%s -> %s", sym.fileName().data(),sym.absFilePath().data() ); |
476 | fileDate = sym.lastModified().toString(); | 476 | fileDate = sym.lastModified().toString(); |
477 | } else { | 477 | } else { |
478 | // qDebug("Not a dir: "+currentDir.canonicalPath()+fileL); | 478 | // qDebug("Not a dir: "+currentDir.canonicalPath()+fileL); |
479 | fileS.sprintf( "%10li", fi->size() ); | 479 | fileS.sprintf( "%10li", fi->size() ); |
480 | fileL.sprintf( "%s",fi->fileName().data() ); | 480 | fileL.sprintf( "%s",fi->fileName().data() ); |
481 | fileDate= fi->lastModified().toString(); | 481 | fileDate= fi->lastModified().toString(); |
482 | if( QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+fileL)).exists() ) { | 482 | if( QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+fileL)).exists() ) { |
483 | fileL+="/"; | 483 | fileL+="/"; |
484 | isDir=TRUE; | 484 | isDir=TRUE; |
485 | // qDebug( fileL); | 485 | // qDebug( fileL); |
486 | } | 486 | } |
487 | } | 487 | } |
488 | if(fileL !="./") { | 488 | if(fileL !="./") { |
489 | item = new QListViewItem( Local_View,fileL,fileS, fileDate); | 489 | item = new QListViewItem( Local_View,fileL,fileS, fileDate); |
490 | if(isDir) | 490 | if(isDir || fileL.find("/",0,TRUE) != -1) |
491 | item->setPixmap( 0, Resource::loadPixmap( "folder" )); | 491 | item->setPixmap( 0, Resource::loadPixmap( "folder" )); |
492 | else | 492 | else |
493 | item->setPixmap( 0, Resource::loadPixmap( "fileopen" )); | 493 | item->setPixmap( 0, Resource::loadPixmap( "fileopen" )); |
494 | } | 494 | } |
495 | isDir=FALSE; | 495 | isDir=FALSE; |
496 | ++it; | 496 | ++it; |
497 | } | 497 | } |
498 | Local_View->setSorting( 3,FALSE); | 498 | Local_View->setSorting( 3,FALSE); |
499 | currentPathEdit->setText( currentDir.canonicalPath() ); | 499 | currentPathEdit->setText( currentDir.canonicalPath() ); |
500 | } | 500 | } |
501 | 501 | ||
502 | bool OpieFtp::populateRemoteView( ) | 502 | bool OpieFtp::populateRemoteView( ) |
503 | { | 503 | { |
504 | // qDebug("populate remoteview"); | 504 | // qDebug("populate remoteview"); |
505 | QString sfile=QDir::homeDirPath(); | 505 | QString sfile=QDir::homeDirPath(); |
506 | if(sfile.right(1) != "/") | 506 | if(sfile.right(1) != "/") |
507 | sfile+="/._temp"; | 507 | sfile+="/._temp"; |
508 | else | 508 | else |
509 | sfile+="._temp"; | 509 | sfile+="._temp"; |
510 | QFile file( sfile); | 510 | QFile file( sfile); |
511 | Remote_View->clear(); | 511 | Remote_View->clear(); |
512 | QString s, File_Name; | 512 | QString s, File_Name; |
513 | QListViewItem *itemDir=NULL, *itemFile=NULL; | 513 | QListViewItem *itemDir=NULL, *itemFile=NULL; |
514 | QString fileL, fileS, fileDate; | 514 | QString fileL, fileS, fileDate; |
515 | if ( file.open(IO_ReadOnly)) { | 515 | if ( file.open(IO_ReadOnly)) { |
516 | QTextStream t( &file ); // use a text stream | 516 | QTextStream t( &file ); // use a text stream |
517 | while ( !t.eof()) { | 517 | while ( !t.eof()) { |
518 | s = t.readLine(); | 518 | s = t.readLine(); |
519 | fileL = s.right(s.length()-55); | 519 | fileL = s.right(s.length()-55); |
520 | fileL = fileL.stripWhiteSpace(); | 520 | fileL = fileL.stripWhiteSpace(); |
521 | if(s.left(1) == "d") | 521 | if(s.left(1) == "d") |
522 | fileL = fileL+"/"; | 522 | fileL = fileL+"/"; |
523 | // fileL = "/"+fileL+"/"; | 523 | // fileL = "/"+fileL+"/"; |
524 | fileS = s.mid( 30, 42-30); | 524 | fileS = s.mid( 30, 42-30); |
525 | fileS = fileS.stripWhiteSpace(); | 525 | fileS = fileS.stripWhiteSpace(); |
526 | fileDate = s.mid( 42, 55-42); | 526 | fileDate = s.mid( 42, 55-42); |
527 | fileDate = fileDate.stripWhiteSpace(); | 527 | fileDate = fileDate.stripWhiteSpace(); |
528 | if(fileL.find("total",0,TRUE) == -1) { | 528 | if(fileL.find("total",0,TRUE) == -1) { |
529 | QListViewItem * item = new QListViewItem( Remote_View, fileL, fileS, fileDate); | 529 | QListViewItem * item = new QListViewItem( Remote_View, fileL, fileS, fileDate); |
530 | if(s.left(1) == "d") { | 530 | if(s.left(1) == "d" || fileL.find("/",0,TRUE) != -1) { |
531 | item->setPixmap( 0, Resource::loadPixmap( "folder" )); | 531 | item->setPixmap( 0, Resource::loadPixmap( "folder" )); |
532 | if(itemDir) | 532 | if(itemDir) |
533 | item->moveItem(itemDir); | 533 | item->moveItem(itemDir); |
534 | itemDir=item; | 534 | itemDir=item; |
535 | } else { | 535 | } else { |
536 | item->setPixmap( 0, Resource::loadPixmap( "fileopen" )); | 536 | item->setPixmap( 0, Resource::loadPixmap( "fileopen" )); |
537 | if(itemFile) | 537 | if(itemFile) |
538 | item->moveItem(itemFile); | 538 | item->moveItem(itemFile); |
539 | itemFile=item; | 539 | itemFile=item; |
540 | } | 540 | } |
541 | } | 541 | } |
542 | } | 542 | } |
543 | QListViewItem * item1 = new QListViewItem( Remote_View, "../"); | 543 | QListViewItem * item1 = new QListViewItem( Remote_View, "../"); |
544 | item1->setPixmap( 0, Resource::loadPixmap( "folder" )); | 544 | item1->setPixmap( 0, Resource::loadPixmap( "folder" )); |
545 | file.close(); | 545 | file.close(); |
546 | if( file.exists()) | 546 | if( file.exists()) |
547 | file. remove(); | 547 | file. remove(); |
548 | } else | 548 | } else |
549 | qDebug("temp file not opened successfullly "+sfile); | 549 | qDebug("temp file not opened successfullly "+sfile); |
550 | Remote_View->setSorting( 4,TRUE); | 550 | Remote_View->setSorting( 4,TRUE); |
551 | 551 | ||
552 | return true; | 552 | return true; |
553 | } | 553 | } |
554 | 554 | ||
@@ -674,65 +674,65 @@ void OpieFtp::ListPressed( int mouse, QListViewItem *item, const QPoint &point, | |||
674 | { | 674 | { |
675 | switch (mouse) { | 675 | switch (mouse) { |
676 | case 1: | 676 | case 1: |
677 | break; | 677 | break; |
678 | case 2: | 678 | case 2: |
679 | showLocalMenu(item); | 679 | showLocalMenu(item); |
680 | break; | 680 | break; |
681 | }; | 681 | }; |
682 | } | 682 | } |
683 | 683 | ||
684 | void OpieFtp::RemoteListPressed( int mouse, QListViewItem *item, const QPoint &point, int i) | 684 | void OpieFtp::RemoteListPressed( int mouse, QListViewItem *item, const QPoint &point, int i) |
685 | { | 685 | { |
686 | switch (mouse) { | 686 | switch (mouse) { |
687 | case 1: | 687 | case 1: |
688 | break; | 688 | break; |
689 | case 2: | 689 | case 2: |
690 | showRemoteMenu(item); | 690 | showRemoteMenu(item); |
691 | break; | 691 | break; |
692 | }; | 692 | }; |
693 | } | 693 | } |
694 | 694 | ||
695 | void OpieFtp::showRemoteMenu(QListViewItem * item) | 695 | void OpieFtp::showRemoteMenu(QListViewItem * item) |
696 | { | 696 | { |
697 | QPopupMenu m;// = new QPopupMenu( Local_View ); | 697 | QPopupMenu m;// = new QPopupMenu( Local_View ); |
698 | if(item->text(0).right(1) == "/") | 698 | if( /*item->text(0).right(1) == "/" ||*/ item->text(0).find("/",0,TRUE)) |
699 | m.insertItem( tr( "Change Directory" ), this, SLOT( doRemoteCd() )); | 699 | m.insertItem( tr( "Change Directory" ), this, SLOT( doRemoteCd() )); |
700 | else | 700 | else |
701 | m.insertItem( tr( "Download" ), this, SLOT( remoteDownload() )); | 701 | m.insertItem( tr( "Download" ), this, SLOT( remoteDownload() )); |
702 | m.insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() )); | 702 | m.insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() )); |
703 | m.insertItem( tr( "Rename" ), this, SLOT( remoteRename() )); | 703 | m.insertItem( tr( "Rename" ), this, SLOT( remoteRename() )); |
704 | m.insertSeparator(); | 704 | m.insertSeparator(); |
705 | m.insertItem( tr( "Delete" ), this, SLOT( remoteDelete() )); | 705 | m.insertItem( tr( "Delete" ), this, SLOT( remoteDelete() )); |
706 | m.exec( QCursor::pos() ); | 706 | m.exec( QCursor::pos() ); |
707 | } | 707 | } |
708 | 708 | ||
709 | void OpieFtp::showLocalMenu(QListViewItem * item) | 709 | void OpieFtp::showLocalMenu(QListViewItem * item) |
710 | { | 710 | { |
711 | QPopupMenu m; | 711 | QPopupMenu m; |
712 | m.insertItem( tr( "Show Hidden Files" ), this, SLOT( showHidden() )); | 712 | m.insertItem( tr( "Show Hidden Files" ), this, SLOT( showHidden() )); |
713 | m.insertSeparator(); | 713 | m.insertSeparator(); |
714 | if(item->text(0).right(1) == "/") | 714 | if( /*item->text(0).right(1) == "/" ||*/ item->text(0).find("/",0,TRUE)) |
715 | m.insertItem( tr( "Change Directory" ), this, SLOT( doLocalCd() )); | 715 | m.insertItem( tr( "Change Directory" ), this, SLOT( doLocalCd() )); |
716 | else | 716 | else |
717 | m.insertItem( tr( "Upload" ), this, SLOT( localUpload() )); | 717 | m.insertItem( tr( "Upload" ), this, SLOT( localUpload() )); |
718 | m.insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() )); | 718 | m.insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() )); |
719 | m.insertItem( tr( "Rename" ), this, SLOT( localRename() )); | 719 | m.insertItem( tr( "Rename" ), this, SLOT( localRename() )); |
720 | m.insertSeparator(); | 720 | m.insertSeparator(); |
721 | m.insertItem( tr( "Delete" ), this, SLOT( localDelete() )); | 721 | m.insertItem( tr( "Delete" ), this, SLOT( localDelete() )); |
722 | m.setCheckable(TRUE); | 722 | m.setCheckable(TRUE); |
723 | if (b) | 723 | if (b) |
724 | m.setItemChecked(m.idAt(0),TRUE); | 724 | m.setItemChecked(m.idAt(0),TRUE); |
725 | else | 725 | else |
726 | m.setItemChecked(m.idAt(0),FALSE); | 726 | m.setItemChecked(m.idAt(0),FALSE); |
727 | 727 | ||
728 | m.exec( QCursor::pos() ); | 728 | m.exec( QCursor::pos() ); |
729 | } | 729 | } |
730 | 730 | ||
731 | void OpieFtp::localMakDir() | 731 | void OpieFtp::localMakDir() |
732 | { | 732 | { |
733 | InputDialog *fileDlg; | 733 | InputDialog *fileDlg; |
734 | fileDlg = new InputDialog(this,"Make Directory",TRUE, 0); | 734 | fileDlg = new InputDialog(this,"Make Directory",TRUE, 0); |
735 | fileDlg->exec(); | 735 | fileDlg->exec(); |
736 | if( fileDlg->result() == 1 ) { | 736 | if( fileDlg->result() == 1 ) { |
737 | QString filename = fileDlg->LineEdit1->text(); | 737 | QString filename = fileDlg->LineEdit1->text(); |
738 | currentDir.mkdir( currentDir.canonicalPath()+"/"+filename); | 738 | currentDir.mkdir( currentDir.canonicalPath()+"/"+filename); |
diff --git a/noncore/net/opieftp/opieftp.pro b/noncore/net/opieftp/opieftp.pro index b4d0b4c..f485cdf 100644 --- a/noncore/net/opieftp/opieftp.pro +++ b/noncore/net/opieftp/opieftp.pro | |||
@@ -1,11 +1,12 @@ | |||
1 | TEMPLATE = app | 1 | TEMPLATE = app |
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | HEADERS = opieftp.h inputDialog.h ftplib.h | 3 | HEADERS = opieftp.h inputDialog.h ftplib.h |
4 | SOURCES = opieftp.cpp inputDialog.cpp ftplib.c main.cpp | 4 | SOURCES = opieftp.cpp inputDialog.cpp ftplib.c main.cpp |
5 | TARGET = opieftp | 5 | TARGET = opieftp |
6 | REQUIRES=medium-config | 6 | REQUIRES=medium-config |
7 | DESTDIR = $(OPIEDIR)/bin | 7 | DESTDIR = $(OPIEDIR)/bin |
8 | INCLUDEPATH += $(OPIEDIR)/include | 8 | INCLUDEPATH += $(OPIEDIR)/include |
9 | DEPENDPATH += $(OPIEDIR)/include | 9 | DEPENDPATH += $(OPIEDIR)/include |
10 | LIBS += -lqpe | 10 | LIBS += -lqpe |
11 | 11 | ||
12 | TRANSLATIONS = ../../i18n/pt_BR/opieftp.ts | ||