summaryrefslogtreecommitdiff
path: root/freefilesync/debian/patches/ffs_traditional_view.patch
diff options
context:
space:
mode:
authorB. Stack <bgstack15@gmail.com>2022-06-27 15:57:42 +0000
committerB. Stack <bgstack15@gmail.com>2022-06-27 15:57:42 +0000
commita5edb11a9334edb513e8606824efea1c067153ce (patch)
tree744d5d5a840cc83203450b6b4838596003249752 /freefilesync/debian/patches/ffs_traditional_view.patch
parentMerge branch 'scite-bump' into 'master' (diff)
parentffs 11.22 rpm rc1 (diff)
downloadstackrpms-a5edb11a9334edb513e8606824efea1c067153ce.tar.gz
stackrpms-a5edb11a9334edb513e8606824efea1c067153ce.tar.bz2
stackrpms-a5edb11a9334edb513e8606824efea1c067153ce.zip
Merge branch 'freefilesync-el8' into 'master'
freefilesync 11.22, and reenable el8 support See merge request bgstack15/stackrpms!301
Diffstat (limited to 'freefilesync/debian/patches/ffs_traditional_view.patch')
-rw-r--r--freefilesync/debian/patches/ffs_traditional_view.patch18
1 files changed, 14 insertions, 4 deletions
diff --git a/freefilesync/debian/patches/ffs_traditional_view.patch b/freefilesync/debian/patches/ffs_traditional_view.patch
index e0cf0d2..2c7ab23 100644
--- a/freefilesync/debian/patches/ffs_traditional_view.patch
+++ b/freefilesync/debian/patches/ffs_traditional_view.patch
@@ -1,7 +1,7 @@
-Version: 11.21
-Date: 2022-05-24
+Version: 11.22
+Date: 2022-06-26
Author: bgstack15@gmail.com
-Message: restore a traditional view to FreeFileSync
+Message: restore a traditional view to FreeFileSync, and disable "welcomeShownVersion" About dialog
diff -x '*.orig' -x '*.rej' -aur 11.3-0/FreeFileSync/Source/ui/file_grid.cpp 11.3-1/FreeFileSync/Source/ui/file_grid.cpp
--- 11.21-0/FreeFileSync/Source/ui/file_grid.cpp 2022-05-22 17:09:32.242809600 -0400
+++ 11.21-1/FreeFileSync/Source/ui/file_grid.cpp 2022-05-22 20:23:04.015916689 -0400
@@ -315,4 +315,14 @@ diff -x '.git*' -x '*.orig' -x '*.rej' -aur 11.2-1/FreeFileSync/Source/ui/file_v
if ( ascending && onLeft) std::sort(sortedRef_.begin(), sortedRef_.end(), LessFullPath<true, SelectSide::left>(folderPairs_));
else if ( ascending && !onLeft) std::sort(sortedRef_.begin(), sortedRef_.end(), LessFullPath<true, SelectSide::right>(folderPairs_));
else if (!ascending && onLeft) std::sort(sortedRef_.begin(), sortedRef_.end(), LessFullPath<false, SelectSide::left>(folderPairs_));
-
+diff -aur 11.22-0/FreeFileSync/Source/ui/main_dlg.cpp 11.22-1/FreeFileSync/Source/ui/main_dlg.cpp
+--- 11.22-0/FreeFileSync/Source/ui/main_dlg.cpp 2022-06-26 12:01:15.634291415 -0400
++++ 11.22-1/FreeFileSync/Source/ui/main_dlg.cpp 2022-06-26 15:39:46.313320272 -0400
+@@ -436,7 +436,6 @@
+ if (mainDlg->globalCfg_.welcomeShownVersion != ffsVersion)
+ {
+ mainDlg->globalCfg_.welcomeShownVersion = ffsVersion;
+- showAboutDialog(mainDlg);
+ }
+
+
bgstack15