author | llornkcor <llornkcor> | 2002-12-16 04:14:46 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-12-16 04:14:46 (UTC) |
commit | cc6c77e7014a3056debd6963946265671d41517d (patch) (unidiff) | |
tree | 1b8f929dd83a8d64915b91ecb3052c19ff5ac0b5 | |
parent | b1880703eea8601e06cf3d3e8593b649cd1a485e (diff) | |
download | opie-cc6c77e7014a3056debd6963946265671d41517d.zip opie-cc6c77e7014a3056debd6963946265671d41517d.tar.gz opie-cc6c77e7014a3056debd6963946265671d41517d.tar.bz2 |
send as text the real filename is symlink
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.cpp | 8 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.h | 1 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfmMenu.cpp | 34 |
3 files changed, 30 insertions, 13 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp index 92804b2..c653b90 100644 --- a/noncore/apps/advancedfm/advancedfm.cpp +++ b/noncore/apps/advancedfm/advancedfm.cpp | |||
@@ -310,17 +310,18 @@ void AdvancedFm::populateRemoteView() { | |||
310 | } | 310 | } |
311 | 311 | ||
312 | void AdvancedFm::localListClicked(QListViewItem *selectedItem) { | 312 | void AdvancedFm::localListClicked(QListViewItem *selectedItem) { |
313 | if(selectedItem) { | 313 | if(selectedItem) { |
314 | QString strItem=selectedItem->text(0); | 314 | QString strItem=selectedItem->text(0); |
315 | QString strSize=selectedItem->text(1); | 315 | QString strSize=selectedItem->text(1); |
316 | strSize=strSize.stripWhiteSpace(); | 316 | strSize=strSize.stripWhiteSpace(); |
317 | if(strItem.find("@",0,TRUE) !=-1 || strItem.find("->",0,TRUE) !=-1 ) { //if symlink | 317 | if(strItem.find("@",0,TRUE) !=-1 || strItem.find("->",0,TRUE) !=-1 ) { //if symlink |
318 | QString strItem2 = strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4); | 318 | QString strItem2 = dealWithSymName((const QString&)strItem); |
319 | // QString strItem2 = strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4); | ||
319 | if(QDir(strItem2).exists() ) { | 320 | if(QDir(strItem2).exists() ) { |
320 | currentDir.cd(strItem2, TRUE); | 321 | currentDir.cd(strItem2, TRUE); |
321 | populateLocalView(); | 322 | populateLocalView(); |
322 | 323 | ||
323 | } | 324 | } |
324 | } else { // not a symlink | 325 | } else { // not a symlink |
325 | if(strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) { | 326 | if(strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) { |
326 | if(QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem)).exists() ) { | 327 | if(QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem)).exists() ) { |
@@ -356,17 +357,18 @@ void AdvancedFm::localListClicked(QListViewItem *selectedItem) { | |||
356 | 357 | ||
357 | void AdvancedFm::remoteListClicked(QListViewItem *selectedItem) { | 358 | void AdvancedFm::remoteListClicked(QListViewItem *selectedItem) { |
358 | 359 | ||
359 | if(selectedItem) { | 360 | if(selectedItem) { |
360 | QString strItem=selectedItem->text(0); | 361 | QString strItem=selectedItem->text(0); |
361 | QString strSize=selectedItem->text(1); | 362 | QString strSize=selectedItem->text(1); |
362 | strSize=strSize.stripWhiteSpace(); | 363 | strSize=strSize.stripWhiteSpace(); |
363 | if(strItem.find("@",0,TRUE) !=-1 || strItem.find("->",0,TRUE) !=-1 ) { //if symlink | 364 | if(strItem.find("@",0,TRUE) !=-1 || strItem.find("->",0,TRUE) !=-1 ) { //if symlink |
364 | QString strItem2 = strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4); | 365 | QString strItem2 = dealWithSymName((const QString&)strItem); |
366 | // QString strItem2 = strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4); | ||
365 | currentRemoteDir.cd(strItem2, TRUE); | 367 | currentRemoteDir.cd(strItem2, TRUE); |
366 | populateRemoteView(); | 368 | populateRemoteView(); |
367 | } else { // not a symlink | 369 | } else { // not a symlink |
368 | if(strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) { | 370 | if(strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) { |
369 | if(QDir(QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+strItem)).exists() ) { | 371 | if(QDir(QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+strItem)).exists() ) { |
370 | strItem=QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+strItem); | 372 | strItem=QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+strItem); |
371 | currentRemoteDir.cd(strItem,FALSE); | 373 | currentRemoteDir.cd(strItem,FALSE); |
372 | populateRemoteView(); | 374 | populateRemoteView(); |
@@ -456,17 +458,17 @@ void AdvancedFm::currentPathComboChanged() { | |||
456 | populateRemoteView(); | 458 | populateRemoteView(); |
457 | } else { | 459 | } else { |
458 | QMessageBox::message(tr("Note"),tr("That directory does not exist")); | 460 | QMessageBox::message(tr("Note"),tr("That directory does not exist")); |
459 | } | 461 | } |
460 | } | 462 | } |
461 | } | 463 | } |
462 | 464 | ||
463 | void AdvancedFm::fillCombo(const QString ¤tPath) { | 465 | void AdvancedFm::fillCombo(const QString ¤tPath) { |
464 | 466 | qDebug("%d",TabWidget->getCurrentTab()); | |
465 | if (TabWidget->getCurrentTab() == 0) { | 467 | if (TabWidget->getCurrentTab() == 0) { |
466 | // if (TabWidget->currentPageIndex() == 0) { | 468 | // if (TabWidget->currentPageIndex() == 0) { |
467 | currentPathCombo->lineEdit()->setText( currentPath); | 469 | currentPathCombo->lineEdit()->setText( currentPath); |
468 | if( localDirPathStringList.grep(currentPath,TRUE).isEmpty() ) { | 470 | if( localDirPathStringList.grep(currentPath,TRUE).isEmpty() ) { |
469 | currentPathCombo->clear(); | 471 | currentPathCombo->clear(); |
470 | localDirPathStringList.prepend( currentPath ); | 472 | localDirPathStringList.prepend( currentPath ); |
471 | currentPathCombo->insertStringList( localDirPathStringList,-1); | 473 | currentPathCombo->insertStringList( localDirPathStringList,-1); |
472 | } | 474 | } |
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h index 9948255..7ced056 100644 --- a/noncore/apps/advancedfm/advancedfm.h +++ b/noncore/apps/advancedfm/advancedfm.h | |||
@@ -119,16 +119,17 @@ protected: | |||
119 | 119 | ||
120 | void init(); | 120 | void init(); |
121 | void initConnections(); | 121 | void initConnections(); |
122 | void keyReleaseEvent( QKeyEvent *); | 122 | void keyReleaseEvent( QKeyEvent *); |
123 | QString getFileSystemType(const QString &); | 123 | QString getFileSystemType(const QString &); |
124 | QString getDiskSpace(const QString &); | 124 | QString getDiskSpace(const QString &); |
125 | void parsetab(const QString &fileName); | 125 | void parsetab(const QString &fileName); |
126 | QString checkDiskSpace(const QString &); | 126 | QString checkDiskSpace(const QString &); |
127 | QString dealWithSymName(const QString &); | ||
127 | 128 | ||
128 | protected slots: | 129 | protected slots: |
129 | void showFileMenu(); | 130 | void showFileMenu(); |
130 | void cancelMenuTimer(); | 131 | void cancelMenuTimer(); |
131 | void homeButtonPushed(); | 132 | void homeButtonPushed(); |
132 | void docButtonPushed(); | 133 | void docButtonPushed(); |
133 | void SDButtonPushed(); | 134 | void SDButtonPushed(); |
134 | void CFButtonPushed(); | 135 | void CFButtonPushed(); |
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp index 0a9f921..f77554a 100644 --- a/noncore/apps/advancedfm/advancedfmMenu.cpp +++ b/noncore/apps/advancedfm/advancedfmMenu.cpp | |||
@@ -98,23 +98,31 @@ void AdvancedFm::showRemoteHidden() { | |||
98 | 98 | ||
99 | } else { | 99 | } else { |
100 | currentRemoteDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); | 100 | currentRemoteDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); |
101 | // b=FALSE; | 101 | // b=FALSE; |
102 | } | 102 | } |
103 | populateRemoteView(); | 103 | populateRemoteView(); |
104 | } | 104 | } |
105 | 105 | ||
106 | QString AdvancedFm::dealWithSymName(const QString &fileName) { | ||
107 | QString strItem = fileName; | ||
108 | return strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4); | ||
109 | } | ||
110 | |||
106 | void AdvancedFm::runThis() { | 111 | void AdvancedFm::runThis() { |
107 | QString fs; | 112 | QString fs; |
108 | if (TabWidget->getCurrentTab() == 0) { | 113 | if (TabWidget->getCurrentTab() == 0) { |
109 | QString curFile = Local_View->currentItem()->text(0); | 114 | QString curFile = Local_View->currentItem()->text(0); |
115 | if( curFile.find("@",0,TRUE) !=-1 || curFile.find("->",0,TRUE) !=-1 ) //if symlink | ||
116 | curFile = dealWithSymName((const QString&)curFile); | ||
117 | |||
110 | if(curFile != "../") { | 118 | if(curFile != "../") { |
111 | 119 | ||
112 | fs= getFileSystemType((const QString &) currentDir.canonicalPath()); | 120 | fs = getFileSystemType((const QString &) currentDir.canonicalPath()); |
113 | QFileInfo fileInfo( currentDir.canonicalPath()+"/"+curFile); | 121 | QFileInfo fileInfo( currentDir.canonicalPath()+"/"+curFile); |
114 | qDebug( fileInfo.owner()); | 122 | qDebug( fileInfo.owner()); |
115 | if( (fileInfo.permission( QFileInfo::ExeUser) | 123 | if( (fileInfo.permission( QFileInfo::ExeUser) |
116 | | fileInfo.permission( QFileInfo::ExeGroup) | 124 | | fileInfo.permission( QFileInfo::ExeGroup) |
117 | | fileInfo.permission( QFileInfo::ExeOther)) // & fs.find("vfat",0,TRUE) == -1) { | 125 | | fileInfo.permission( QFileInfo::ExeOther)) // & fs.find("vfat",0,TRUE) == -1) { |
118 | | fs == "vfat" && fileInfo.filePath().contains("/bin") ) { | 126 | | fs == "vfat" && fileInfo.filePath().contains("/bin") ) { |
119 | QCopEnvelope e("QPE/System", "execute(QString)" ); | 127 | QCopEnvelope e("QPE/System", "execute(QString)" ); |
120 | e << curFile; | 128 | e << curFile; |
@@ -127,16 +135,18 @@ void AdvancedFm::runThis() { | |||
127 | } else { | 135 | } else { |
128 | nf.execute(); | 136 | nf.execute(); |
129 | } | 137 | } |
130 | } | 138 | } |
131 | } | 139 | } |
132 | } else { | 140 | } else { |
133 | QString curFile = Remote_View->currentItem()->text(0); | 141 | QString curFile = Remote_View->currentItem()->text(0); |
134 | if(curFile != "../") { | 142 | if(curFile != "../") { |
143 | if( curFile.find("@",0,TRUE) !=-1 || curFile.find("->",0,TRUE) !=-1 ) //if symlink | ||
144 | curFile = dealWithSymName((const QString&)curFile); | ||
135 | 145 | ||
136 | fs= getFileSystemType((const QString &) currentRemoteDir.canonicalPath()); | 146 | fs= getFileSystemType((const QString &) currentRemoteDir.canonicalPath()); |
137 | qDebug("Filesystemtype is "+fs); | 147 | qDebug("Filesystemtype is "+fs); |
138 | QFileInfo fileInfo( currentRemoteDir.canonicalPath()+"/"+curFile); | 148 | QFileInfo fileInfo( currentRemoteDir.canonicalPath()+"/"+curFile); |
139 | if( (fileInfo.permission( QFileInfo::ExeUser) | 149 | if( (fileInfo.permission( QFileInfo::ExeUser) |
140 | | fileInfo.permission( QFileInfo::ExeGroup) | 150 | | fileInfo.permission( QFileInfo::ExeGroup) |
141 | | fileInfo.permission( QFileInfo::ExeOther)) // & fs.find("vfat",0,TRUE) == -1) { | 151 | | fileInfo.permission( QFileInfo::ExeOther)) // & fs.find("vfat",0,TRUE) == -1) { |
142 | | fs == "vfat" && fileInfo.filePath().contains("/bin") ) { | 152 | | fs == "vfat" && fileInfo.filePath().contains("/bin") ) { |
@@ -155,24 +165,28 @@ void AdvancedFm::runThis() { | |||
155 | } | 165 | } |
156 | } | 166 | } |
157 | } | 167 | } |
158 | 168 | ||
159 | void AdvancedFm::runText() { | 169 | void AdvancedFm::runText() { |
160 | if (TabWidget->getCurrentTab() == 0) { | 170 | if (TabWidget->getCurrentTab() == 0) { |
161 | QString curFile = Local_View->currentItem()->text(0); | 171 | QString curFile = Local_View->currentItem()->text(0); |
162 | if(curFile != "../") { | 172 | if(curFile != "../") { |
173 | if( curFile.find("@",0,TRUE) !=-1 || curFile.find("->",0,TRUE) !=-1 ) //if symlink | ||
174 | curFile = dealWithSymName((const QString&)curFile); | ||
163 | curFile = currentDir.canonicalPath()+"/"+curFile; | 175 | curFile = currentDir.canonicalPath()+"/"+curFile; |
164 | QCopEnvelope e("QPE/Application/textedit", "setDocument(QString)" ); | 176 | QCopEnvelope e("QPE/Application/textedit", "setDocument(QString)" ); |
165 | e << curFile; | 177 | e << curFile; |
166 | } | 178 | } |
167 | } else { | 179 | } else { |
168 | QString curFile = Remote_View->currentItem()->text(0); | 180 | QString curFile = Remote_View->currentItem()->text(0); |
169 | if(curFile != "../") { | 181 | if(curFile != "../") { |
170 | curFile = currentRemoteDir.canonicalPath()+"/"+curFile; | 182 | curFile = currentRemoteDir.canonicalPath()+"/"+curFile; |
183 | if( curFile.find("@",0,TRUE) !=-1 || curFile.find("->",0,TRUE) !=-1 ) //if symlink | ||
184 | curFile = dealWithSymName((const QString&)curFile); | ||
171 | DocLnk nf(curFile); | 185 | DocLnk nf(curFile); |
172 | QCopEnvelope e("QPE/Application/textedit", "setDocument(QString)" ); | 186 | QCopEnvelope e("QPE/Application/textedit", "setDocument(QString)" ); |
173 | e << curFile; | 187 | e << curFile; |
174 | } | 188 | } |
175 | } | 189 | } |
176 | } | 190 | } |
177 | 191 | ||
178 | void AdvancedFm::localMakDir() { | 192 | void AdvancedFm::localMakDir() { |
@@ -477,17 +491,17 @@ void AdvancedFm::copy() { | |||
477 | tr("Yes"),tr("No"),0,0,1) ) { | 491 | tr("Yes"),tr("No"),0,0,1) ) { |
478 | case 1: | 492 | case 1: |
479 | return; | 493 | return; |
480 | break; | 494 | break; |
481 | }; | 495 | }; |
482 | } | 496 | } |
483 | f.remove(); | 497 | f.remove(); |
484 | } | 498 | } |
485 | if(!copyFile(destFile, curFile) ) { | 499 | if(!copyFile( curFile, destFile) ) { |
486 | QMessageBox::message("AdvancedFm","Could not copy\n"+curFile +"to\n"+destFile); | 500 | QMessageBox::message("AdvancedFm","Could not copy\n"+curFile +"to\n"+destFile); |
487 | return; | 501 | return; |
488 | } | 502 | } |
489 | } | 503 | } |
490 | populateRemoteView(); | 504 | populateRemoteView(); |
491 | TabWidget->setCurrentTab(1); | 505 | TabWidget->setCurrentTab(1); |
492 | 506 | ||
493 | } else { | 507 | } else { |
@@ -508,17 +522,17 @@ void AdvancedFm::copy() { | |||
508 | item+tr("\nexists. Ok to overwrite?"), | 522 | item+tr("\nexists. Ok to overwrite?"), |
509 | tr("Yes"),tr("No"),0,0,1) ) { | 523 | tr("Yes"),tr("No"),0,0,1) ) { |
510 | case 1: | 524 | case 1: |
511 | return; | 525 | return; |
512 | break; | 526 | break; |
513 | }; | 527 | }; |
514 | f.remove(); | 528 | f.remove(); |
515 | } | 529 | } |
516 | if(!copyFile(destFile, curFile) ) { | 530 | if(!copyFile( curFile, destFile) ) { |
517 | QMessageBox::message("AdvancedFm",tr("Could not copy\n") | 531 | QMessageBox::message("AdvancedFm",tr("Could not copy\n") |
518 | +curFile +tr("to\n")+destFile); | 532 | +curFile +tr("to\n")+destFile); |
519 | return; | 533 | return; |
520 | 534 | ||
521 | } | 535 | } |
522 | } | 536 | } |
523 | populateLocalView(); | 537 | populateLocalView(); |
524 | TabWidget->setCurrentTab(0); | 538 | TabWidget->setCurrentTab(0); |
@@ -556,17 +570,17 @@ void AdvancedFm::copyAs() { | |||
556 | case 0: | 570 | case 0: |
557 | f.remove(); | 571 | f.remove(); |
558 | break; | 572 | break; |
559 | case 1: | 573 | case 1: |
560 | return; | 574 | return; |
561 | break; | 575 | break; |
562 | }; | 576 | }; |
563 | } | 577 | } |
564 | if(!copyFile(destFile, curFile) ) { | 578 | if(!copyFile( curFile,destFile) ) { |
565 | QMessageBox::message("AdvancedFm",tr("Could not copy\n") | 579 | QMessageBox::message("AdvancedFm",tr("Could not copy\n") |
566 | +curFile +tr("to\n")+destFile); | 580 | +curFile +tr("to\n")+destFile); |
567 | return; | 581 | return; |
568 | } | 582 | } |
569 | } | 583 | } |
570 | delete fileDlg; | 584 | delete fileDlg; |
571 | 585 | ||
572 | } | 586 | } |
@@ -596,17 +610,17 @@ void AdvancedFm::copyAs() { | |||
596 | case 0: | 610 | case 0: |
597 | f.remove(); | 611 | f.remove(); |
598 | break; | 612 | break; |
599 | case 1: | 613 | case 1: |
600 | return; | 614 | return; |
601 | break; | 615 | break; |
602 | }; | 616 | }; |
603 | } | 617 | } |
604 | if(!copyFile(destFile, curFile) ) { | 618 | if(!copyFile( curFile,destFile) ) { |
605 | QMessageBox::message("AdvancedFm",tr("Could not copy\n") | 619 | QMessageBox::message("AdvancedFm",tr("Could not copy\n") |
606 | +curFile +tr("to\n")+destFile); | 620 | +curFile +tr("to\n")+destFile); |
607 | return; | 621 | return; |
608 | } | 622 | } |
609 | 623 | ||
610 | } | 624 | } |
611 | delete fileDlg; | 625 | delete fileDlg; |
612 | 626 | ||
@@ -646,17 +660,17 @@ void AdvancedFm::copySameDir() { | |||
646 | 660 | ||
647 | f.remove(); | 661 | f.remove(); |
648 | break; | 662 | break; |
649 | case 1: | 663 | case 1: |
650 | return; | 664 | return; |
651 | break; | 665 | break; |
652 | }; | 666 | }; |
653 | } | 667 | } |
654 | if(!copyFile(destFile, curFile) ) { | 668 | if(!copyFile( curFile,destFile) ) { |
655 | QMessageBox::message("AdvancedFm",tr("Could not copy\n") | 669 | QMessageBox::message("AdvancedFm",tr("Could not copy\n") |
656 | +curFile +tr("to\n")+destFile); | 670 | +curFile +tr("to\n")+destFile); |
657 | return; | 671 | return; |
658 | } | 672 | } |
659 | 673 | ||
660 | qDebug("copy "+curFile+" as "+destFile); | 674 | qDebug("copy "+curFile+" as "+destFile); |
661 | } | 675 | } |
662 | delete fileDlg; | 676 | delete fileDlg; |
@@ -684,17 +698,17 @@ void AdvancedFm::copySameDir() { | |||
684 | case 0: | 698 | case 0: |
685 | f.remove(); | 699 | f.remove(); |
686 | break; | 700 | break; |
687 | case 1: | 701 | case 1: |
688 | return; | 702 | return; |
689 | break; | 703 | break; |
690 | }; | 704 | }; |
691 | } | 705 | } |
692 | if(!copyFile(destFile, curFile) ) { | 706 | if(!copyFile( curFile,destFile) ) { |
693 | QMessageBox::message("AdvancedFm",tr("Could not copy\n") | 707 | QMessageBox::message("AdvancedFm",tr("Could not copy\n") |
694 | +curFile +tr("to\n")+destFile); | 708 | +curFile +tr("to\n")+destFile); |
695 | return; | 709 | return; |
696 | } | 710 | } |
697 | qDebug("copy "+curFile+" as "+destFile); | 711 | qDebug("copy "+curFile+" as "+destFile); |
698 | } | 712 | } |
699 | delete fileDlg; | 713 | delete fileDlg; |
700 | } | 714 | } |
@@ -725,17 +739,17 @@ void AdvancedFm::move() { | |||
725 | if(curFile.right(1).find("/",0,TRUE) == -1) | 739 | if(curFile.right(1).find("/",0,TRUE) == -1) |
726 | curFile +="/"; | 740 | curFile +="/"; |
727 | 741 | ||
728 | curFile+= item; | 742 | curFile+= item; |
729 | qDebug("CurrentFile file is " + curFile); | 743 | qDebug("CurrentFile file is " + curFile); |
730 | 744 | ||
731 | QFile f( curFile); | 745 | QFile f( curFile); |
732 | if( f.exists()) { | 746 | if( f.exists()) { |
733 | if(!copyFile( destFile, curFile) ) { | 747 | if(!copyFile( curFile,destFile) ) { |
734 | QMessageBox::message(tr("Note"),tr("Could not move\n")+curFile); | 748 | QMessageBox::message(tr("Note"),tr("Could not move\n")+curFile); |
735 | return; | 749 | return; |
736 | } else | 750 | } else |
737 | QFile::remove(curFile); | 751 | QFile::remove(curFile); |
738 | } | 752 | } |
739 | } | 753 | } |
740 | 754 | ||
741 | TabWidget->setCurrentTab(1); | 755 | TabWidget->setCurrentTab(1); |
@@ -757,31 +771,31 @@ void AdvancedFm::move() { | |||
757 | 771 | ||
758 | if(curFile.right(1).find("/",0,TRUE) == -1) | 772 | if(curFile.right(1).find("/",0,TRUE) == -1) |
759 | curFile +="/"; | 773 | curFile +="/"; |
760 | curFile+= item; | 774 | curFile+= item; |
761 | qDebug("CurrentFile file is " + curFile); | 775 | qDebug("CurrentFile file is " + curFile); |
762 | 776 | ||
763 | QFile f( curFile); | 777 | QFile f( curFile); |
764 | if( f.exists()) { | 778 | if( f.exists()) { |
765 | if(!copyFile( destFile, curFile) ) { | 779 | if(!copyFile( curFile, destFile) ) { |
766 | QMessageBox::message(tr("Note"),tr("Could not move\n") + curFile); | 780 | QMessageBox::message(tr("Note"),tr("Could not move\n") + curFile); |
767 | return; | 781 | return; |
768 | } else | 782 | } else |
769 | QFile::remove( curFile); | 783 | QFile::remove( curFile); |
770 | } | 784 | } |
771 | TabWidget->setCurrentTab(0); | 785 | TabWidget->setCurrentTab(0); |
772 | } | 786 | } |
773 | } | 787 | } |
774 | populateRemoteView(); | 788 | populateRemoteView(); |
775 | populateLocalView(); | 789 | populateLocalView(); |
776 | } | 790 | } |
777 | } | 791 | } |
778 | 792 | ||
779 | bool AdvancedFm::copyFile( const QString & dest, const QString & src ) { | 793 | bool AdvancedFm::copyFile( const QString & src, const QString & dest ) { |
780 | char bf[ 50000 ]; | 794 | char bf[ 50000 ]; |
781 | int bytesRead; | 795 | int bytesRead; |
782 | bool success = TRUE; | 796 | bool success = TRUE; |
783 | struct stat status; | 797 | struct stat status; |
784 | 798 | ||
785 | QFile s( src ); | 799 | QFile s( src ); |
786 | QFile d( dest ); | 800 | QFile d( dest ); |
787 | 801 | ||