author | llornkcor <llornkcor> | 2002-04-28 21:59:34 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-04-28 21:59:34 (UTC) |
commit | 726d985ddb6a5c7eb25a48efdadb189eb38b9a2a (patch) (unidiff) | |
tree | e92814b56ee706ccb1d95a0c2e86294aa79ab2c2 /noncore/apps/advancedfm | |
parent | d9a38221ea876cae8ef8b015968e14af75e202bb (diff) | |
download | opie-726d985ddb6a5c7eb25a48efdadb189eb38b9a2a.zip opie-726d985ddb6a5c7eb25a48efdadb189eb38b9a2a.tar.gz opie-726d985ddb6a5c7eb25a48efdadb189eb38b9a2a.tar.bz2 |
fixed multi symlink handling
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.cpp | 149 |
1 files changed, 76 insertions, 73 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp index bd513c0..b5fcccf 100644 --- a/noncore/apps/advancedfm/advancedfm.cpp +++ b/noncore/apps/advancedfm/advancedfm.cpp | |||
@@ -316,17 +316,17 @@ void AdvancedFm::populateLocalView() | |||
316 | if( !QDir( fi->filePath() ).isReadable()) | 316 | if( !QDir( fi->filePath() ).isReadable()) |
317 | pm = Resource::loadPixmap( "lockedfolder" ); | 317 | pm = Resource::loadPixmap( "lockedfolder" ); |
318 | else | 318 | else |
319 | pm= Resource::loadPixmap( "folder" ); | 319 | pm= Resource::loadPixmap( "folder" ); |
320 | item->setPixmap( 0,pm ); | 320 | item->setPixmap( 0,pm ); |
321 | } else { | 321 | } else { |
322 | if(fi->isExecutable()) { | 322 | // if(fi->isExecutable()) { |
323 | pm = Resource::loadPixmap( "exec"); | 323 | // pm = Resource::loadPixmap( "exec"); |
324 | item->setPixmap( 0,pm); | 324 | // item->setPixmap( 0,pm); |
325 | } | 325 | // } |
326 | else if( !fi->isReadable() ) { | 326 | if( !fi->isReadable() ) { |
327 | pm = Resource::loadPixmap( "locked" ); | 327 | pm = Resource::loadPixmap( "locked" ); |
328 | item->setPixmap( 0,pm); | 328 | item->setPixmap( 0,pm); |
329 | 329 | ||
330 | } | 330 | } |
331 | else { | 331 | else { |
332 | MimeType mt(fi->filePath()); | 332 | MimeType mt(fi->filePath()); |
@@ -432,17 +432,17 @@ void AdvancedFm::populateRemoteView() | |||
432 | if( !QDir( fi->filePath() ).isReadable()) | 432 | if( !QDir( fi->filePath() ).isReadable()) |
433 | pm = Resource::loadPixmap( "lockedfolder" ); | 433 | pm = Resource::loadPixmap( "lockedfolder" ); |
434 | else | 434 | else |
435 | pm= Resource::loadPixmap( "folder" ); | 435 | pm= Resource::loadPixmap( "folder" ); |
436 | item->setPixmap( 0,pm ); | 436 | item->setPixmap( 0,pm ); |
437 | } else { | 437 | } else { |
438 | if(fi->isExecutable()) { | 438 | // if(fi->isExecutable()) { |
439 | pm = Resource::loadPixmap( "exec"); | 439 | // pm = Resource::loadPixmap( "exec"); |
440 | item->setPixmap( 0,pm); | 440 | // item->setPixmap( 0,pm); |
441 | } | 441 | // } |
442 | else if( !fi->isReadable() ) { | 442 | if( !fi->isReadable() ) { |
443 | pm = Resource::loadPixmap( "locked" ); | 443 | pm = Resource::loadPixmap( "locked" ); |
444 | item->setPixmap( 0,pm); | 444 | item->setPixmap( 0,pm); |
445 | } else { | 445 | } else { |
446 | MimeType mt(fi->filePath()); | 446 | MimeType mt(fi->filePath()); |
447 | pm=mt.pixmap(); //sets the correct pixmap for mimetype | 447 | pm=mt.pixmap(); //sets the correct pixmap for mimetype |
448 | if(pm.isNull()) | 448 | if(pm.isNull()) |
@@ -713,42 +713,42 @@ void AdvancedFm::showRemoteMenu(QListViewItem * item) | |||
713 | 713 | ||
714 | void AdvancedFm::runThis() { | 714 | void AdvancedFm::runThis() { |
715 | // QFileInfo *fi; | 715 | // QFileInfo *fi; |
716 | if (TabWidget->currentPageIndex() == 0) { | 716 | if (TabWidget->currentPageIndex() == 0) { |
717 | QString curFile = Local_View->currentItem()->text(0); | 717 | QString curFile = Local_View->currentItem()->text(0); |
718 | QFileInfo fileInfo( currentDir.canonicalPath()+"/"+curFile); | 718 | QFileInfo fileInfo( currentDir.canonicalPath()+"/"+curFile); |
719 | if(fileInfo.isExecutable()) { | 719 | // if(fileInfo.isExecutable()) { |
720 | QCopEnvelope e("QPE/System", "execute(QString)" ); | 720 | // QCopEnvelope e("QPE/System", "execute(QString)" ); |
721 | e << curFile; | 721 | // e << curFile; |
722 | } else { | 722 | // } else { |
723 | curFile = currentDir.canonicalPath()+"/"+curFile; | 723 | curFile = currentDir.canonicalPath()+"/"+curFile; |
724 | DocLnk nf(curFile); | 724 | DocLnk nf(curFile); |
725 | QString execStr = nf.exec(); | 725 | QString execStr = nf.exec(); |
726 | qDebug( execStr); | 726 | qDebug( execStr); |
727 | if( execStr.isEmpty() ) { | 727 | if( execStr.isEmpty() ) { |
728 | } else { | 728 | } else { |
729 | nf.execute(); | 729 | nf.execute(); |
730 | } | 730 | } |
731 | } | 731 | // } |
732 | // MimeType mt( curFile); | 732 | // MimeType mt( curFile); |
733 | } else { | 733 | } else { |
734 | QString curFile = Remote_View->currentItem()->text(0); | 734 | QString curFile = Remote_View->currentItem()->text(0); |
735 | QFileInfo fileInfo( currentRemoteDir.canonicalPath()+"/"+curFile); | 735 | QFileInfo fileInfo( currentRemoteDir.canonicalPath()+"/"+curFile); |
736 | if(fileInfo.isExecutable()) { | 736 | // if(fileInfo.isExecutable()) { |
737 | QCopEnvelope e("QPE/System", "execute(QString)" ); | 737 | // QCopEnvelope e("QPE/System", "execute(QString)" ); |
738 | e << curFile; | 738 | // e << curFile; |
739 | } else { | 739 | // } else { |
740 | curFile = currentRemoteDir.canonicalPath()+"/"+curFile; | 740 | curFile = currentRemoteDir.canonicalPath()+"/"+curFile; |
741 | DocLnk nf(curFile); | 741 | DocLnk nf(curFile); |
742 | QString execStr = nf.exec(); | 742 | QString execStr = nf.exec(); |
743 | qDebug(execStr); | 743 | qDebug(execStr); |
744 | if( execStr.isEmpty() ) { | 744 | if( execStr.isEmpty() ) { |
745 | } else { | 745 | } else { |
746 | nf.execute(); | 746 | nf.execute(); |
747 | } | 747 | } |
748 | } | 748 | // } |
749 | // MimeType mt( curFile); | 749 | // MimeType mt( curFile); |
750 | } | 750 | } |
751 | } | 751 | } |
752 | 752 | ||
753 | void AdvancedFm::runText() { | 753 | void AdvancedFm::runText() { |
754 | if (TabWidget->currentPageIndex() == 0) { | 754 | if (TabWidget->currentPageIndex() == 0) { |
@@ -1043,13 +1043,13 @@ QStringList AdvancedFm::getPath() { | |||
1043 | return strList; | 1043 | return strList; |
1044 | } else { | 1044 | } else { |
1045 | QList<QListViewItem> * getSelectedItems( QListView * Remote_View ); | 1045 | QList<QListViewItem> * getSelectedItems( QListView * Remote_View ); |
1046 | QListViewItemIterator it( Remote_View ); | 1046 | QListViewItemIterator it( Remote_View ); |
1047 | for ( ; it.current(); ++it ) { | 1047 | for ( ; it.current(); ++it ) { |
1048 | if ( it.current()->isSelected() ) { | 1048 | if ( it.current()->isSelected() ) { |
1049 | strList << currentDir.canonicalPath()+"/"+ it.current()->text(0); | 1049 | strList << it.current()->text(0); |
1050 | } | 1050 | } |
1051 | } | 1051 | } |
1052 | return strList; | 1052 | return strList; |
1053 | } | 1053 | } |
1054 | return ""; | 1054 | return ""; |
1055 | } | 1055 | } |
@@ -1136,45 +1136,47 @@ void AdvancedFm::copy() | |||
1136 | { | 1136 | { |
1137 | QStringList curFileList = getPath(); | 1137 | QStringList curFileList = getPath(); |
1138 | QString curFile; | 1138 | QString curFile; |
1139 | if (TabWidget->currentPageIndex() == 0) { | 1139 | if (TabWidget->currentPageIndex() == 0) { |
1140 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { | 1140 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { |
1141 | 1141 | ||
1142 | QString destFile = currentRemoteDir.canonicalPath(); | 1142 | QString destFile = currentRemoteDir.canonicalPath()+"/"+(*it); |
1143 | if(destFile.right(1).find("/",0,TRUE) == -1) | 1143 | // if(destFile.right(1).find("/",0,TRUE) == -1) |
1144 | destFile+="/"; | 1144 | // destFile+="/"; |
1145 | destFile +=(*it); | 1145 | // destFile +=(*it); |
1146 | curFile = currentDir.canonicalPath(); | 1146 | |
1147 | if(curFile.right(1).find("/",0,TRUE) == -1) | 1147 | curFile = currentDir.canonicalPath()+"/"+(*it); |
1148 | curFile +="/"; | 1148 | // if(curFile.right(1).find("/",0,TRUE) == -1) |
1149 | curFile +=(*it); | 1149 | // curFile +="/"; |
1150 | // curFile +=(*it); | ||
1151 | |||
1150 | QFile f(destFile); | 1152 | QFile f(destFile); |
1151 | if( f.exists()) | 1153 | if( f.exists()) |
1152 | f.remove(); | 1154 | f.remove(); |
1153 | if(!copyFile(destFile, curFile) ) | 1155 | if(!copyFile(destFile, curFile) ) { |
1156 | QMessageBox::message("AdvancedFm","Could not copy\n"+curFile +"to\n"+destFile); | ||
1154 | qWarning("nothin doing"); | 1157 | qWarning("nothin doing"); |
1158 | } | ||
1155 | } | 1159 | } |
1156 | populateRemoteView(); | 1160 | populateRemoteView(); |
1157 | TabWidget->setCurrentPage(1); | 1161 | TabWidget->setCurrentPage(1); |
1158 | 1162 | ||
1159 | } else { | 1163 | } else { |
1160 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { | 1164 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { |
1161 | 1165 | ||
1162 | QString destFile = currentDir.canonicalPath(); | 1166 | QString destFile = currentDir.canonicalPath()+"/"+(*it); |
1163 | if(destFile.right(1).find("/",0,TRUE) == -1) | 1167 | curFile = currentRemoteDir.canonicalPath()+"/"+(*it); |
1164 | destFile+="/"; | 1168 | |
1165 | destFile +=(*it); | ||
1166 | curFile = currentRemoteDir.canonicalPath(); | ||
1167 | if(curFile.right(1).find("/",0,TRUE) == -1) | ||
1168 | curFile +="/"; | ||
1169 | curFile +=(*it); | ||
1170 | QFile f(destFile); | 1169 | QFile f(destFile); |
1171 | if( f.exists()) | 1170 | if( f.exists()) |
1172 | f.remove(); | 1171 | f.remove(); |
1173 | if(!copyFile(destFile, curFile) ) | 1172 | if(!copyFile(destFile, curFile) ) { |
1174 | qWarning("nothin doing"); | 1173 | QMessageBox::message("AdvancedFm","Could not copy\n"+curFile +"to\n"+destFile); |
1174 | |||
1175 | qWarning("nothin doing"); | ||
1176 | } | ||
1175 | } | 1177 | } |
1176 | populateLocalView(); | 1178 | populateLocalView(); |
1177 | TabWidget->setCurrentPage(0); | 1179 | TabWidget->setCurrentPage(0); |
1178 | } | 1180 | } |
1179 | } | 1181 | } |
1180 | 1182 | ||
@@ -1185,60 +1187,52 @@ void AdvancedFm::copyAs() | |||
1185 | InputDialog *fileDlg; | 1187 | InputDialog *fileDlg; |
1186 | fileDlg = new InputDialog(this,tr("Copy As"),TRUE, 0); | 1188 | fileDlg = new InputDialog(this,tr("Copy As"),TRUE, 0); |
1187 | 1189 | ||
1188 | if (TabWidget->currentPageIndex() == 0) { | 1190 | if (TabWidget->currentPageIndex() == 0) { |
1189 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { | 1191 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { |
1190 | QString destFile; | 1192 | QString destFile; |
1191 | curFile = currentDir.canonicalPath(); | 1193 | curFile = currentDir.canonicalPath()+"/"+(*it); |
1192 | if(curFile.right(1).find("/",0,TRUE) == -1) | ||
1193 | curFile +="/"; | ||
1194 | curFile+=(*it); | ||
1195 | // InputDialog *fileDlg; | 1194 | // InputDialog *fileDlg; |
1196 | // fileDlg = new InputDialog(this,tr("Copy As"),TRUE, 0); | 1195 | // fileDlg = new InputDialog(this,tr("Copy As"),TRUE, 0); |
1197 | fileDlg->setInputText((const QString &) destFile ); | 1196 | fileDlg->setInputText((const QString &) destFile ); |
1198 | fileDlg->exec(); | 1197 | fileDlg->exec(); |
1199 | if( fileDlg->result() == 1 ) { | 1198 | if( fileDlg->result() == 1 ) { |
1200 | QString filename = fileDlg->LineEdit1->text(); | 1199 | QString filename = fileDlg->LineEdit1->text(); |
1201 | destFile = currentRemoteDir.canonicalPath(); | 1200 | destFile = currentRemoteDir.canonicalPath()+"/"+(*it); |
1202 | if(destFile.right(1).find("/",0,TRUE) == -1) | ||
1203 | destFile+="/"; | ||
1204 | destFile +=(*it); | ||
1205 | 1201 | ||
1206 | QFile f(destFile); | 1202 | QFile f(destFile); |
1207 | if( f.exists()) | 1203 | if( f.exists()) |
1208 | f.remove(); | 1204 | f.remove(); |
1209 | if(!copyFile(destFile, curFile) ) | 1205 | if(!copyFile(destFile, curFile) ) { |
1206 | QMessageBox::message("AdvancedFm","Could not copy\n"+curFile +"to\n"+destFile); | ||
1210 | qWarning("nothin doing"); | 1207 | qWarning("nothin doing"); |
1208 | } | ||
1211 | } | 1209 | } |
1212 | } | 1210 | } |
1213 | 1211 | ||
1214 | populateRemoteView(); | 1212 | populateRemoteView(); |
1215 | TabWidget->setCurrentPage(1); | 1213 | TabWidget->setCurrentPage(1); |
1216 | } else { | 1214 | } else { |
1217 | if (TabWidget->currentPageIndex() == 0) { | 1215 | if (TabWidget->currentPageIndex() == 0) { |
1218 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { | 1216 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { |
1219 | 1217 | ||
1220 | curFile = currentDir.canonicalPath(); | 1218 | curFile = currentDir.canonicalPath()+"/"+(*it); |
1221 | if(curFile.right(1).find("/",0,TRUE) == -1) | ||
1222 | curFile +="/"; | ||
1223 | curFile+=(*it); | ||
1224 | QString destFile; | 1219 | QString destFile; |
1225 | fileDlg->setInputText((const QString &) destFile); | 1220 | fileDlg->setInputText((const QString &) destFile); |
1226 | fileDlg->exec(); | 1221 | fileDlg->exec(); |
1227 | if( fileDlg->result() == 1 ) { | 1222 | if( fileDlg->result() == 1 ) { |
1228 | QString filename = fileDlg->LineEdit1->text(); | 1223 | QString filename = fileDlg->LineEdit1->text(); |
1229 | destFile = currentDir.canonicalPath(); | 1224 | destFile = currentDir.canonicalPath()+"/"+(*it); |
1230 | if(destFile.right(1).find("/",0,TRUE) == -1) | ||
1231 | destFile+="/"; | ||
1232 | destFile +=(*it); | ||
1233 | 1225 | ||
1234 | QFile f(destFile); | 1226 | QFile f(destFile); |
1235 | if( f.exists()) | 1227 | if( f.exists()) |
1236 | f.remove(); | 1228 | f.remove(); |
1237 | if(!copyFile(destFile, curFile) ) | 1229 | if(!copyFile(destFile, curFile) ) { |
1238 | qWarning("nothin doing"); | 1230 | QMessageBox::message("AdvancedFm","Could not copy\n"+curFile +"to\n"+destFile); |
1231 | qWarning("nothin doing"); | ||
1232 | } | ||
1239 | } | 1233 | } |
1240 | } | 1234 | } |
1241 | populateLocalView(); | 1235 | populateLocalView(); |
1242 | TabWidget->setCurrentPage(0); | 1236 | TabWidget->setCurrentPage(0); |
1243 | } | 1237 | } |
1244 | } | 1238 | } |
@@ -1531,28 +1525,37 @@ void AdvancedFm::keyReleaseEvent( QKeyEvent *e) | |||
1531 | } | 1525 | } |
1532 | 1526 | ||
1533 | } | 1527 | } |
1534 | 1528 | ||
1535 | void AdvancedFm::mkSym() { | 1529 | void AdvancedFm::mkSym() { |
1536 | QString cmd; | 1530 | QString cmd; |
1531 | QStringList curFileList = getPath(); | ||
1532 | |||
1537 | if (TabWidget->currentPageIndex() == 0) { | 1533 | if (TabWidget->currentPageIndex() == 0) { |
1538 | QString curFile = Local_View->currentItem()->text(0); | 1534 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { |
1539 | if(curFile.right(1) == "/") curFile = curFile.left(curFile.length() - 1); | 1535 | |
1540 | QString destName = currentRemoteDir.canonicalPath()+"/"+curFile; | 1536 | QString destName = currentRemoteDir.canonicalPath()+"/"+(*it); |
1541 | curFile = currentDir.canonicalPath()+"/"+curFile; | 1537 | QString curFile = currentDir.canonicalPath()+"/"+(*it); |
1542 | cmd = "ln -s "+curFile+" "+destName; | 1538 | cmd = "ln -s "+curFile+" "+destName; |
1543 | system(cmd.latin1() ); | 1539 | qDebug(cmd); |
1544 | populateRemoteView(); | 1540 | system(cmd.latin1() ); |
1541 | } | ||
1542 | populateRemoteView(); | ||
1543 | TabWidget->setCurrentPage(1); | ||
1545 | } else { | 1544 | } else { |
1546 | QString curFile = Remote_View->currentItem()->text(0); | 1545 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { |
1547 | if(curFile.right(1) == "/") curFile = curFile.left(curFile.length() - 1); | 1546 | |
1548 | QString destName = currentDir.canonicalPath()+"/"+curFile; | 1547 | QString destName = currentDir.canonicalPath()+"/"+(*it); |
1549 | curFile = currentRemoteDir.canonicalPath()+"/"+curFile; | 1548 | QString curFile = currentRemoteDir.canonicalPath()+"/"+(*it); |
1550 | cmd = "ln -s "+curFile+" "+destName; | 1549 | |
1551 | system(cmd.latin1() ); | 1550 | cmd = "ln -s "+curFile+" "+destName; |
1552 | populateLocalView(); | 1551 | qDebug(cmd); |
1552 | system(cmd.latin1() ); | ||
1553 | } | ||
1554 | populateLocalView(); | ||
1555 | TabWidget->setCurrentPage(0); | ||
1553 | } | 1556 | } |
1554 | } | 1557 | } |
1555 | 1558 | ||
1556 | void AdvancedFm::QPEButtonPushed() { | 1559 | void AdvancedFm::QPEButtonPushed() { |
1557 | QString current = QPEApplication::qpeDir(); | 1560 | QString current = QPEApplication::qpeDir(); |
1558 | chdir( current.latin1() ); | 1561 | chdir( current.latin1() ); |