diff options
| author | B Stack <bgstack15@gmail.com> | 2020-09-16 22:59:58 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2020-09-16 22:59:58 +0000 |
| commit | e122dd642c02b51a2548f0aca2973bb450d63df1 (patch) | |
| tree | 1615ea45c4713241439fedf09e5fc3032b620849 | |
| parent | Merge branch 'freefilesync-bump' into 'master' (diff) | |
| parent | ability to save and sort Traditional view (diff) | |
| download | stackrpms-e122dd642c02b51a2548f0aca2973bb450d63df1.tar.gz stackrpms-e122dd642c02b51a2548f0aca2973bb450d63df1.tar.bz2 stackrpms-e122dd642c02b51a2548f0aca2973bb450d63df1.zip | |
Merge branch 'freefilesync-bump' into 'master'
freefilesync: ability to save and sort Traditional view
See merge request bgstack15/stackrpms!185
| -rw-r--r-- | freefilesync/debian/patches/ffs_traditional_view.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/freefilesync/debian/patches/ffs_traditional_view.patch b/freefilesync/debian/patches/ffs_traditional_view.patch index 9793c6e..e602033 100644 --- a/freefilesync/debian/patches/ffs_traditional_view.patch +++ b/freefilesync/debian/patches/ffs_traditional_view.patch @@ -240,3 +240,36 @@ index 491b7321..2d5c20c3 100644 //---------------------------------------------------------------------------------------------- menu.addSeparator(); +diff -x .git -Naur 11.1-1/FreeFileSync/Source/config.cpp 11.1-2/FreeFileSync/Source/config.cpp +--- 11.1-1/FreeFileSync/Source/config.cpp 2020-09-01 19:07:43.715122167 -0400 ++++ 11.1-2/FreeFileSync/Source/config.cpp 2020-09-10 09:38:14.539542699 -0400 +@@ -528,6 +528,9 @@ + case ItemPathFormat::full: + output = "Full"; + break; ++ case ItemPathFormat::traditional: ++ output = "Traditional"; ++ break; + } + } + +@@ -541,6 +545,8 @@ + value = ItemPathFormat::relative; + else if (tmp == "Full") + value = ItemPathFormat::full; ++ else if (tmp == "Traditional") ++ value = ItemPathFormat::traditional; + else + return false; + return true; +diff -x .git -Naur 11.1-1/FreeFileSync/Source/ui/file_view.cpp 11.1-2/FreeFileSync/Source/ui/file_view.cpp +--- 11.1-1/FreeFileSync/Source/ui/file_view.cpp 2020-09-01 19:07:43.719122215 -0400 ++++ 11.1-2/FreeFileSync/Source/ui/file_view.cpp 2020-09-10 09:40:11.609044834 -0400 +@@ -798,6 +798,7 @@ + break; + + case ItemPathFormat::full: ++ case ItemPathFormat::traditional: + if ( ascending && onLeft) std::sort(sortedRef_.begin(), sortedRef_.end(), LessFullPath<true, LEFT_SIDE>(folderPairs_)); + else if ( ascending && !onLeft) std::sort(sortedRef_.begin(), sortedRef_.end(), LessFullPath<true, RIGHT_SIDE>(folderPairs_)); + else if (!ascending && onLeft) std::sort(sortedRef_.begin(), sortedRef_.end(), LessFullPath<false, LEFT_SIDE>(folderPairs_)); |