diff options
author | Ken Moore <ken@pcbsd.org> | 2014-12-23 08:46:02 -0500 |
---|---|---|
committer | Ken Moore <ken@pcbsd.org> | 2014-12-23 08:46:02 -0500 |
commit | 7531a620650cdf0985525775ca84160933e99f26 (patch) | |
tree | 89880be799e8da8fc10774c66f4a9fe77fdb8749 /lumina-fm/FODialog.h | |
parent | Merge branch 'master' of github.com:pcbsd/lumina (diff) | |
download | lumina-7531a620650cdf0985525775ca84160933e99f26.tar.gz lumina-7531a620650cdf0985525775ca84160933e99f26.tar.bz2 lumina-7531a620650cdf0985525775ca84160933e99f26.zip |
Clean up all the Qt5 *.pro files a bit. Now they should always work.
Also do a large clean up of the file operations in lumina-fm:
1) When doing copies of directories, make sure to properly copy all child files/dirs (no matter how deep)
2) Clean the order of directory copies so that you can successfull make a copy of a directory into itself (copy ~/Test -> ~/Test/Test for example)
3) Check for attempting to *move* a directory into itself and show a warning to the user about an invalid operation.
4) Get the total number of files/dirs to be operated on before starting operations. This allows the UI to be more detailed about what it is doing at that particular time.
5) If a directory fails to copy for some reason, don't try to copy all the children of that directory either (they will all fail and just bloat the list of errors)
Diffstat (limited to 'lumina-fm/FODialog.h')
-rw-r--r-- | lumina-fm/FODialog.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lumina-fm/FODialog.h b/lumina-fm/FODialog.h index e823fe2e..e455c995 100644 --- a/lumina-fm/FODialog.h +++ b/lumina-fm/FODialog.h @@ -47,9 +47,9 @@ private: int overwrite; // [-1= auto, 0= no overwrite, 1= overwrite] QStringList ofiles, nfiles; //original/new files - QStringList subfiles(QString dirpath); //recursive function for fetching all "child" files/dirs (dirs last) + QStringList subfiles(QString dirpath, bool dirsfirst = false); //recursive function for fetching all "child" files/dirs (dirs last by default) QString newFileName(QString path); - QStringList removeItem(QString path); + QStringList removeItem(QString path, bool recursive = false); QStringList copyItem(QString oldpath, QString newpath); private slots: |