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 /noncore/apps | |
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 | |||
@@ -315,7 +315,8 @@ void AdvancedFm::localListClicked(QListViewItem *selectedItem) { | |||
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(); |
@@ -361,7 +362,8 @@ void AdvancedFm::remoteListClicked(QListViewItem *selectedItem) { | |||
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 |
@@ -461,7 +463,7 @@ void AdvancedFm::currentPathComboChanged() { | |||
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); |
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 | |||
@@ -124,6 +124,7 @@ protected: | |||
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(); |
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 | |||
@@ -103,13 +103,21 @@ void AdvancedFm::showRemoteHidden() { | |||
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) |
@@ -132,6 +140,8 @@ void AdvancedFm::runThis() { | |||
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); |
@@ -160,6 +170,8 @@ 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; |
@@ -168,6 +180,8 @@ void AdvancedFm::runText() { | |||
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; |
@@ -482,7 +496,7 @@ void AdvancedFm::copy() { | |||
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 | } |
@@ -513,7 +527,7 @@ void AdvancedFm::copy() { | |||
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; |
@@ -561,7 +575,7 @@ void AdvancedFm::copyAs() { | |||
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; |
@@ -601,7 +615,7 @@ void AdvancedFm::copyAs() { | |||
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; |
@@ -651,7 +665,7 @@ void AdvancedFm::copySameDir() { | |||
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; |
@@ -689,7 +703,7 @@ void AdvancedFm::copySameDir() { | |||
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; |
@@ -730,7 +744,7 @@ void AdvancedFm::move() { | |||
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 |
@@ -762,7 +776,7 @@ void AdvancedFm::move() { | |||
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 |
@@ -776,7 +790,7 @@ void AdvancedFm::move() { | |||
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; |