diff options
author | Ken Moore <ken@pcbsd.org> | 2016-10-13 13:10:34 -0400 |
---|---|---|
committer | Ken Moore <ken@pcbsd.org> | 2016-10-13 13:10:34 -0400 |
commit | 725ca9791ec516f1bb0c5a37ec17fbedd888d928 (patch) | |
tree | 6f8e9ca53b4546c1c16ce04ee25ad5a1d6bfca9b /src-qt5/desktop-utils/lumina-fm/FODialog.cpp | |
parent | Add a "launch" option within the context menu for applauncher desktop plugins. (diff) | |
download | lumina-725ca9791ec516f1bb0c5a37ec17fbedd888d928.tar.gz lumina-725ca9791ec516f1bb0c5a37ec17fbedd888d928.tar.bz2 lumina-725ca9791ec516f1bb0c5a37ec17fbedd888d928.zip |
Another large update to lumina-fm:
Have all file operations performed in the background, and show up within a new system tray icon *if* the operation lasts longer than 1 second (automatic cleanup for short ops).
Diffstat (limited to 'src-qt5/desktop-utils/lumina-fm/FODialog.cpp')
-rw-r--r-- | src-qt5/desktop-utils/lumina-fm/FODialog.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src-qt5/desktop-utils/lumina-fm/FODialog.cpp b/src-qt5/desktop-utils/lumina-fm/FODialog.cpp index b03f1b56..ee22f832 100644 --- a/src-qt5/desktop-utils/lumina-fm/FODialog.cpp +++ b/src-qt5/desktop-utils/lumina-fm/FODialog.cpp @@ -295,17 +295,17 @@ void FOWorker::slotStartOperations(){ if(isRM){ //only old files olist << subfiles(ofiles[i], false); //dirs need to be last for removals }else if(isCP || isRESTORE){ - if(nfiles[i] == ofiles[i] && overwrite==1){ - //Trying to copy a file/dir to itself - skip it - continue; - } if(QFile::exists(nfiles[i])){ if(overwrite!=1){ qDebug() << " - Get New Filename:" << nfiles[i]; nfiles[i] = newFileName(nfiles[i]); //prompt for new file name up front before anything starts - qDebug() << " -- nfiles[i]"; + qDebug() << " -- " << nfiles[i]; } } + if(nfiles[i] == ofiles[i] && overwrite==1){ + //Trying to copy a file/dir to itself - skip it + continue; + } QStringList subs = subfiles(ofiles[i], true); //dirs need to be first for additions for(int s=0; s<subs.length(); s++){ olist << subs[s]; |