-rw-r--r-- | noncore/apps/advancedfm/advancedfm.cpp | 162 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.h | 1 |
2 files changed, 156 insertions, 7 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp index 9e38d14..f97ae99 100644 --- a/noncore/apps/advancedfm/advancedfm.cpp +++ b/noncore/apps/advancedfm/advancedfm.cpp | |||
@@ -1185,8 +1185,18 @@ void AdvancedFm::copy() | |||
1185 | // curFile +=(*it); | 1185 | // curFile +=(*it); |
1186 | 1186 | ||
1187 | QFile f(destFile); | 1187 | QFile f(destFile); |
1188 | if( f.exists()) | 1188 | if( f.exists()) { |
1189 | switch ( QMessageBox::warning(this,tr("Delete"), | ||
1190 | destFile+tr(" already exists\nDo you really want to delete it?"), | ||
1191 | tr("Yes"),tr("No"),0,0,1) ) { | ||
1192 | case 0: | ||
1189 | f.remove(); | 1193 | f.remove(); |
1194 | break; | ||
1195 | case 1: | ||
1196 | return; | ||
1197 | break; | ||
1198 | }; | ||
1199 | } | ||
1190 | if(!copyFile(destFile, curFile) ) { | 1200 | if(!copyFile(destFile, curFile) ) { |
1191 | QMessageBox::message("AdvancedFm","Could not copy\n"+curFile +"to\n"+destFile); | 1201 | QMessageBox::message("AdvancedFm","Could not copy\n"+curFile +"to\n"+destFile); |
1192 | qWarning("nothin doing"); | 1202 | qWarning("nothin doing"); |
@@ -1202,8 +1212,18 @@ void AdvancedFm::copy() | |||
1202 | curFile = currentRemoteDir.canonicalPath()+"/"+(*it); | 1212 | curFile = currentRemoteDir.canonicalPath()+"/"+(*it); |
1203 | 1213 | ||
1204 | QFile f(destFile); | 1214 | QFile f(destFile); |
1205 | if( f.exists()) | 1215 | if( f.exists()) { |
1216 | switch ( QMessageBox::warning(this,tr("Delete"), | ||
1217 | destFile+tr(" already exists\nDo you really want to delete it?"), | ||
1218 | tr("Yes"),tr("No"),0,0,1) ) { | ||
1219 | case 0: | ||
1206 | f.remove(); | 1220 | f.remove(); |
1221 | break; | ||
1222 | case 1: | ||
1223 | return; | ||
1224 | break; | ||
1225 | }; | ||
1226 | } | ||
1207 | if(!copyFile(destFile, curFile) ) { | 1227 | if(!copyFile(destFile, curFile) ) { |
1208 | QMessageBox::message("AdvancedFm","Could not copy\n"+curFile +"to\n"+destFile); | 1228 | QMessageBox::message("AdvancedFm","Could not copy\n"+curFile +"to\n"+destFile); |
1209 | 1229 | ||
@@ -1237,15 +1257,24 @@ void AdvancedFm::copyAs() | |||
1237 | destFile = currentRemoteDir.canonicalPath()+"/"+(*it); | 1257 | destFile = currentRemoteDir.canonicalPath()+"/"+(*it); |
1238 | 1258 | ||
1239 | QFile f(destFile); | 1259 | QFile f(destFile); |
1240 | if( f.exists()) | 1260 | if( f.exists()) { |
1261 | switch (QMessageBox::warning(this,tr("Delete"), | ||
1262 | destFile+tr(" already exists\nDo you really want to delete it?"), | ||
1263 | tr("Yes"),tr("No"),0,0,1) ) { | ||
1264 | case 0: | ||
1241 | f.remove(); | 1265 | f.remove(); |
1266 | break; | ||
1267 | case 1: | ||
1268 | return; | ||
1269 | break; | ||
1270 | }; | ||
1271 | } | ||
1242 | if(!copyFile(destFile, curFile) ) { | 1272 | if(!copyFile(destFile, curFile) ) { |
1243 | QMessageBox::message("AdvancedFm","Could not copy\n"+curFile +"to\n"+destFile); | 1273 | QMessageBox::message("AdvancedFm","Could not copy\n"+curFile +"to\n"+destFile); |
1244 | qWarning("nothin doing"); | 1274 | qWarning("nothin doing"); |
1245 | } | 1275 | } |
1246 | } | 1276 | } |
1247 | } | 1277 | } |
1248 | |||
1249 | populateRemoteView(); | 1278 | populateRemoteView(); |
1250 | TabWidget->setCurrentPage(1); | 1279 | TabWidget->setCurrentPage(1); |
1251 | } else { | 1280 | } else { |
@@ -1261,12 +1290,23 @@ void AdvancedFm::copyAs() | |||
1261 | destFile = currentDir.canonicalPath()+"/"+(*it); | 1290 | destFile = currentDir.canonicalPath()+"/"+(*it); |
1262 | 1291 | ||
1263 | QFile f(destFile); | 1292 | QFile f(destFile); |
1264 | if( f.exists()) | 1293 | if( f.exists()) { |
1294 | switch ( QMessageBox::warning(this,tr("Delete"), | ||
1295 | destFile+tr(" already exists\nDo you really want to delete it?"), | ||
1296 | tr("Yes"),tr("No"),0,0,1) ) { | ||
1297 | case 0: | ||
1265 | f.remove(); | 1298 | f.remove(); |
1299 | break; | ||
1300 | case 1: | ||
1301 | return; | ||
1302 | break; | ||
1303 | }; | ||
1304 | } | ||
1266 | if(!copyFile(destFile, curFile) ) { | 1305 | if(!copyFile(destFile, curFile) ) { |
1267 | QMessageBox::message("AdvancedFm","Could not copy\n"+curFile +"to\n"+destFile); | 1306 | QMessageBox::message("AdvancedFm","Could not copy\n"+curFile +"to\n"+destFile); |
1268 | qWarning("nothin doing"); | 1307 | qWarning("nothin doing"); |
1269 | } | 1308 | } |
1309 | |||
1270 | } | 1310 | } |
1271 | } | 1311 | } |
1272 | populateLocalView(); | 1312 | populateLocalView(); |
@@ -1274,6 +1314,93 @@ void AdvancedFm::copyAs() | |||
1274 | } | 1314 | } |
1275 | } | 1315 | } |
1276 | } | 1316 | } |
1317 | |||
1318 | } | ||
1319 | |||
1320 | void AdvancedFm::copySameDir() { | ||
1321 | QStringList curFileList = getPath(); | ||
1322 | if( curFileList.count() > 0) { | ||
1323 | QString curFile; | ||
1324 | InputDialog *fileDlg; | ||
1325 | |||
1326 | if (TabWidget->currentPageIndex() == 0) { | ||
1327 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { | ||
1328 | QString destFile; | ||
1329 | curFile = currentDir.canonicalPath()+"/"+(*it); | ||
1330 | fileDlg = new InputDialog(this,tr("Copy ")+curFile+tr(" As"),TRUE, 0); | ||
1331 | // InputDialog *fileDlg; | ||
1332 | // fileDlg = new InputDialog(this,tr("Copy As"),TRUE, 0); | ||
1333 | fileDlg->setInputText((const QString &) destFile ); | ||
1334 | fileDlg->exec(); | ||
1335 | if( fileDlg->result() == 1 ) { | ||
1336 | QString filename = fileDlg->LineEdit1->text(); | ||
1337 | destFile = currentDir.canonicalPath()+"/"+filename; | ||
1338 | |||
1339 | QFile f(destFile); | ||
1340 | if( f.exists()) { | ||
1341 | switch (QMessageBox::warning(this,tr("Delete"), | ||
1342 | destFile+tr(" already exists\nDo you really want to delete it?"), | ||
1343 | tr("Yes"),tr("No"),0,0,1) ) { | ||
1344 | case 0: | ||
1345 | qDebug(""); | ||
1346 | f.remove(); | ||
1347 | break; | ||
1348 | case 1: | ||
1349 | return; | ||
1350 | break; | ||
1351 | }; | ||
1352 | } | ||
1353 | if(!copyFile(destFile, curFile) ) { | ||
1354 | QMessageBox::message("AdvancedFm","Could not copy\n"+curFile +"to\n"+destFile); | ||
1355 | qWarning("nothin doing"); | ||
1356 | } | ||
1357 | |||
1358 | qDebug("copy "+curFile+" as "+destFile); | ||
1359 | } | ||
1360 | delete fileDlg; | ||
1361 | } | ||
1362 | populateRemoteView(); | ||
1363 | TabWidget->setCurrentPage(1); | ||
1364 | } else { | ||
1365 | if (TabWidget->currentPageIndex() == 0) { | ||
1366 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { | ||
1367 | |||
1368 | curFile = currentRemoteDir.canonicalPath()+"/"+(*it); | ||
1369 | fileDlg = new InputDialog(this,tr("Copy ")+curFile+tr(" As"),TRUE, 0); | ||
1370 | QString destFile; | ||
1371 | fileDlg->setInputText((const QString &) destFile); | ||
1372 | fileDlg->exec(); | ||
1373 | if( fileDlg->result() == 1 ) { | ||
1374 | QString filename = fileDlg->LineEdit1->text(); | ||
1375 | destFile = currentDir.canonicalPath()+"/"+filename; | ||
1376 | |||
1377 | QFile f(destFile); | ||
1378 | if( f.exists()) { | ||
1379 | switch ( QMessageBox::warning(this,tr("Delete"), | ||
1380 | destFile+tr(" already exists\nDo you really want to delete it?"), | ||
1381 | tr("Yes"),tr("No"),0,0,1) ) { | ||
1382 | case 0: | ||
1383 | f.remove(); | ||
1384 | break; | ||
1385 | case 1: | ||
1386 | return; | ||
1387 | break; | ||
1388 | }; | ||
1389 | } | ||
1390 | if(!copyFile(destFile, curFile) ) { | ||
1391 | QMessageBox::message("AdvancedFm","Could not copy\n"+curFile +"to\n"+destFile); | ||
1392 | qWarning("nothin doing"); | ||
1393 | } | ||
1394 | qDebug("copy "+curFile+" as "+destFile); | ||
1395 | } | ||
1396 | delete fileDlg; | ||
1397 | } | ||
1398 | populateLocalView(); | ||
1399 | TabWidget->setCurrentPage(0); | ||
1400 | } | ||
1401 | } | ||
1402 | } | ||
1403 | |||
1277 | } | 1404 | } |
1278 | 1405 | ||
1279 | void AdvancedFm::move() { | 1406 | void AdvancedFm::move() { |
@@ -1297,14 +1424,24 @@ void AdvancedFm::move() { | |||
1297 | curFile+=(*it); | 1424 | curFile+=(*it); |
1298 | 1425 | ||
1299 | QFile f(destFile); | 1426 | QFile f(destFile); |
1300 | if( f.exists()) | 1427 | if( f.exists()) { |
1428 | switch (QMessageBox::warning(this,tr("Delete"), | ||
1429 | destFile+tr(" already exists\nDo you really want to delete it?"), | ||
1430 | tr("Yes"),tr("No"),0,0,1) ) { | ||
1431 | case 0: | ||
1301 | f.remove(); | 1432 | f.remove(); |
1433 | break; | ||
1434 | case 1: | ||
1435 | return; | ||
1436 | break; | ||
1437 | }; | ||
1302 | if(!copyFile( destFile, curFile) ) { | 1438 | if(!copyFile( destFile, curFile) ) { |
1303 | QMessageBox::message(tr("Note"),tr("Could not move\n"+curFile)); | 1439 | QMessageBox::message(tr("Note"),tr("Could not move\n"+curFile)); |
1304 | return; | 1440 | return; |
1305 | } | 1441 | } |
1306 | QFile::remove(curFile); | 1442 | QFile::remove(curFile); |
1307 | } | 1443 | } |
1444 | } | ||
1308 | TabWidget->setCurrentPage(1); | 1445 | TabWidget->setCurrentPage(1); |
1309 | } else { | 1446 | } else { |
1310 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { | 1447 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { |
@@ -1319,12 +1456,22 @@ void AdvancedFm::move() { | |||
1319 | curFile+=(*it); | 1456 | curFile+=(*it); |
1320 | 1457 | ||
1321 | QFile f(destFile); | 1458 | QFile f(destFile); |
1322 | if( f.exists()) | 1459 | if( f.exists()) { |
1460 | switch (QMessageBox::warning(this,tr("Delete"), | ||
1461 | destFile+tr(" already exists\nDo you really want to delete it?"), | ||
1462 | tr("Yes"),tr("No"),0,0,1) ) { | ||
1463 | case 0: | ||
1323 | f.remove(); | 1464 | f.remove(); |
1465 | break; | ||
1466 | case 1: | ||
1467 | return; | ||
1468 | break; | ||
1469 | }; | ||
1324 | if(!copyFile(destFile, curFile) ) { | 1470 | if(!copyFile(destFile, curFile) ) { |
1325 | QMessageBox::message(tr("Note"),tr("Could not move\n"+curFile)); | 1471 | QMessageBox::message(tr("Note"),tr("Could not move\n"+curFile)); |
1326 | return; | 1472 | return; |
1327 | } | 1473 | } |
1474 | } | ||
1328 | QFile::remove(curFile); | 1475 | QFile::remove(curFile); |
1329 | TabWidget->setCurrentPage(0); | 1476 | TabWidget->setCurrentPage(0); |
1330 | } | 1477 | } |
@@ -1755,6 +1902,7 @@ void AdvancedFm::showFileMenu() { | |||
1755 | 1902 | ||
1756 | m->insertItem( tr( "Copy" ), this, SLOT( copy() )); | 1903 | m->insertItem( tr( "Copy" ), this, SLOT( copy() )); |
1757 | m->insertItem( tr( "Copy As" ), this, SLOT( copyAs() )); | 1904 | m->insertItem( tr( "Copy As" ), this, SLOT( copyAs() )); |
1905 | m->insertItem( tr( "Copy Same Dir" ), this, SLOT( copySameDir() )); | ||
1758 | m->insertItem( tr( "Move" ), this, SLOT( move() )); | 1906 | m->insertItem( tr( "Move" ), this, SLOT( move() )); |
1759 | m->insertSeparator(); | 1907 | m->insertSeparator(); |
1760 | 1908 | ||
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h index 7335773..7665fe9 100644 --- a/noncore/apps/advancedfm/advancedfm.h +++ b/noncore/apps/advancedfm/advancedfm.h | |||
@@ -124,6 +124,7 @@ protected slots: | |||
124 | void currentPathComboChanged(); | 124 | void currentPathComboChanged(); |
125 | void copy(); | 125 | void copy(); |
126 | void copyAs(); | 126 | void copyAs(); |
127 | void copySameDir(); | ||
127 | void currentPathComboActivated(const QString &); | 128 | void currentPathComboActivated(const QString &); |
128 | void fillCombo(const QString &); | 129 | void fillCombo(const QString &); |
129 | bool copyFile( const QString & , const QString & ); | 130 | bool copyFile( const QString & , const QString & ); |