From 6a830379c8b2750e34387db8a48d1d20d180b22a Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Tue, 20 Jun 2023 09:19:11 -0400 Subject: defuzz traditional view patch --- freefilesync/debian/patches/ffs_traditional_view.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'freefilesync/debian/patches') diff --git a/freefilesync/debian/patches/ffs_traditional_view.patch b/freefilesync/debian/patches/ffs_traditional_view.patch index fe04e26..bbb36f9 100644 --- a/freefilesync/debian/patches/ffs_traditional_view.patch +++ b/freefilesync/debian/patches/ffs_traditional_view.patch @@ -251,15 +251,15 @@ Message: restore a traditional view to FreeFileSync, and disable "welcomeShownVe const ItemPathFormat defaultItemPathFormatLeftGrid = ItemPathFormat::relative; --- a/FreeFileSync/Source/ui/main_dlg.cpp +++ b/FreeFileSync/Source/ui/main_dlg.cpp -@@ -448,7 +448,6 @@ void MainDialog::create(const Zstring& g +@@ -449,7 +449,6 @@ void MainDialog::create(const Zstring& g - //showAboutDialog(mainDlg); => dialog centered incorrectly (Centos), or hidden behind main dialog (Lubuntu) https://freefilesync.org/forum/viewtopic.php?t=10246 + //showAboutDialog(mainDlg); => dialog centered incorrectly (Centos) //mainDlg->CallAfter([mainDlg] { showAboutDialog(mainDlg); }); => dialog centered incorrectly (Windows, Centos) - mainDlg->guiQueue_.processAsync([] {}, [mainDlg]() { showAboutDialog(mainDlg); }); //apparently oh-kay? } -@@ -2777,6 +2776,8 @@ void MainDialog::onGridLabelContextRim(G +@@ -2780,6 +2779,8 @@ void MainDialog::onGridLabelContextRim(G addFormatEntry(_("Item name" ), ItemPathFormat::name); addFormatEntry(_("Relative path"), ItemPathFormat::relative); addFormatEntry(_("Full path" ), ItemPathFormat::full); @@ -270,7 +270,7 @@ Message: restore a traditional view to FreeFileSync, and disable "welcomeShownVe auto setIconSize = [&](GridIconSize sz, bool showIcons) --- a/FreeFileSync/Source/config.cpp +++ b/FreeFileSync/Source/config.cpp -@@ -495,6 +495,12 @@ void writeText(const ItemPathFormat& val +@@ -477,6 +477,12 @@ void writeText(const ItemPathFormat& val case ItemPathFormat::full: output = "Full"; break; @@ -283,7 +283,7 @@ Message: restore a traditional view to FreeFileSync, and disable "welcomeShownVe } } -@@ -508,6 +514,10 @@ bool readText(const std::string& input, +@@ -490,6 +496,10 @@ bool readText(const std::string& input, value = ItemPathFormat::relative; else if (tmp == "Full") value = ItemPathFormat::full; -- cgit