Merge branch 'freefilesync-bump' into 'master'

Freefilesync 11.12

See merge request bgstack15/stackrpms!249

10 files changed, 144 insertions, 123 deletions

diff --git a/freefilesync/debian/changelog b/freefilesync/debian/changelog
index a64536c..cbb681c 100644
--- a/freefilesync/debian/changelog
+++ b/freefilesync/debian/changelog
@@ -1,3 +1,17 @@
+freefilesync (11.12-1+devuan) obs; urgency=medium
+
+  * Upstream updates
+    - Native ARM64 build to support Apple silicon M1 (macOS)
+    - Non-intrusive mouse highlight on file grid
+    - Fixed /lib/i386-linux-gnu/libgcc_s.so.1: version `GCC_7.0.0' not found
+    - Parse file times with no limits on time span (e.g. year 0, year 3000)
+    - Show folder icon during drag and drop (Windows)
+    - Show user name for (S)FTP display paths
+    - Fixed FTP connection lost error with TLS 1.3
+    - Present file sizes in powers of 1000 bytes (Linux, macOS)
+
+ -- B. Stack <bgstack15@gmail.com>  Thu, 15 Jul 2021 10:00:37 -0400
+
 freefilesync (11.11-1+devuan) obs; urgency=medium
 
   * Upstream updates
diff --git a/freefilesync/debian/freefilesync+devuan.dsc b/freefilesync/debian/freefilesync+devuan.dsc
index 4148058..920d35c 100644
--- a/freefilesync/debian/freefilesync+devuan.dsc
+++ b/freefilesync/debian/freefilesync+devuan.dsc
@@ -2,7 +2,7 @@ Format: 3.0 (quilt)
 Source: freefilesync
 Binary: freefilesync
 Architecture: any
-Version: 11.11-1+devuan
+Version: 11.12-1+devuan
 Maintainer: B. Stack <bgstack15@gmail.com>
 Homepage: https://freefilesync.org/
 Standards-Version: 4.1.4
diff --git a/freefilesync/debian/patches/ffs_devuan.patch b/freefilesync/debian/patches/ffs_devuan.patch
index e155745..ace8fde 100644
--- a/freefilesync/debian/patches/ffs_devuan.patch
+++ b/freefilesync/debian/patches/ffs_devuan.patch
@@ -32,12 +32,12 @@ diff -Naur -x '*.orig' -x '*.rej' -x .git 11.4-0/FreeFileSync/Source/Makefile 11
  
  
  cxxFlags  += `pkg-config --cflags openssl`
-diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.19-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.19-1/FreeFileSync/Source/ui/small_dlgs.cpp
+diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.19-0/FreeFileSync/Source/ui/small_dlgs.cpp 11.12-1/FreeFileSync/Source/ui/small_dlgs.cpp
 --- 10.11-0/FreeFileSync/Source/ui/small_dlgs.cpp	2019-12-27 07:56:06.714625467 -0500
-+++ 10.21-1/FreeFileSync/Source/ui/small_dlgs.cpp  2020-03-18 09:03:57.753183052 -0400
-@@ -97,6 +97,8 @@
-     build += L"64 Bit";
- #endif
++++ 11.12-1/FreeFileSync/Source/ui/small_dlgs.cpp  2021-07-15 09:03:57.753183052 -0400
+@@ -93,6 +93,8 @@
+     build += LTR_MARK; //fix Arabic
+     build += utfTo<wxString>(cpuArchName);
  
 +    build += L" for Devuan";
 +
diff --git a/freefilesync/debian/patches/ffs_no_check_updates.patch b/freefilesync/debian/patches/ffs_no_check_updates.patch
index c0c4fc2..5e61dce 100644
--- a/freefilesync/debian/patches/ffs_no_check_updates.patch
+++ b/freefilesync/debian/patches/ffs_no_check_updates.patch
@@ -2,57 +2,57 @@ Version: 11.10
 Message: This is a major rewrite of the ffs_no_check_updates patch from before 11.10 which disabled only a few technical www interactions. This current version completely deletes all logic associated with checking the version of the program.
 Date: 2021-05-10
 Author: bgstack15
-diff -aur 11.10-1/FreeFileSync/Source/ui/gui_generated.cpp 11.10-2/FreeFileSync/Source/ui/gui_generated.cpp
+diff -aur 11.10-1/FreeFileSync/Source/ui/gui_generated.cpp 11.12-1/FreeFileSync/Source/ui/gui_generated.cpp
 --- 11.10-1/FreeFileSync/Source/ui/gui_generated.cpp	2021-05-10 08:10:14.747776591 -0400
-+++ 11.10-2/FreeFileSync/Source/ui/gui_generated.cpp	2021-05-10 10:41:28.446374196 -0400
-@@ -109,17 +109,6 @@
-     m_menuItemHelp = new wxMenuItem( m_menuHelp, wxID_HELP, wxString( _("&View help") ) + wxT('\t') + wxT("F1"), wxEmptyString, wxITEM_NORMAL );
-     m_menuHelp->Append( m_menuItemHelp );
++++ 11.12-1/FreeFileSync/Source/ui/gui_generated.cpp	2021-07-15 10:41:28.446374196 -0400
+@@ -108,17 +108,6 @@
+ 	m_menuItemHelp = new wxMenuItem( m_menuHelp, wxID_HELP, wxString( _("&View help") ) + wxT('\t') + wxT("F1"), wxEmptyString, wxITEM_NORMAL );
+ 	m_menuHelp->Append( m_menuItemHelp );
  
--    m_menuHelp->AppendSeparator();
+-	m_menuHelp->AppendSeparator();
 -
--    m_menuItemCheckVersionNow = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("&Check for updates now") ), wxEmptyString, wxITEM_NORMAL );
--    m_menuHelp->Append( m_menuItemCheckVersionNow );
+-	m_menuItemCheckVersionNow = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("&Check for updates now") ) , wxEmptyString, wxITEM_NORMAL );
+-	m_menuHelp->Append( m_menuItemCheckVersionNow );
 -
--    m_menuItemCheckVersionAuto = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("Check &automatically once a week") ), wxEmptyString, wxITEM_CHECK );
--    m_menuHelp->Append( m_menuItemCheckVersionAuto );
--    m_menuItemCheckVersionAuto->Check( true );
+-	m_menuItemCheckVersionAuto = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("Check &automatically once a week") ) , wxEmptyString, wxITEM_CHECK );
+-	m_menuHelp->Append( m_menuItemCheckVersionAuto );
+-	m_menuItemCheckVersionAuto->Check( true );
 -
--    m_menuHelp->AppendSeparator();
+-	m_menuHelp->AppendSeparator();
 -
-     m_menuItemAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About") ) + wxT('\t') + wxT("Shift+F1"), wxEmptyString, wxITEM_NORMAL );
-     m_menuHelp->Append( m_menuItemAbout );
+ 	m_menuItemAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About") ) + wxT('\t') + wxT("Shift+F1"), wxEmptyString, wxITEM_NORMAL );
+ 	m_menuHelp->Append( m_menuItemAbout );
  
-@@ -1140,8 +1129,6 @@
-     m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuExportFileList ), this, m_menuItemExportList->GetId());
-     m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuResetLayout ), this, m_menuItem51->GetId());
-     m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onShowHelp ), this, m_menuItemHelp->GetId());
--    m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuCheckVersion ), this, m_menuItemCheckVersionNow->GetId());
--    m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuCheckVersionAutomatically ), this, m_menuItemCheckVersionAuto->GetId());
-     m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuAbout ), this, m_menuItemAbout->GetId());
-     m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCmpSettings ), NULL, this );
-     m_bpButtonCmpConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onCompSettingsContextMouse ), NULL, this );
+@@ -1139,8 +1128,6 @@
+ 	m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuExportFileList ), this, m_menuItemExportList->GetId());
+ 	m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuResetLayout ), this, m_menuItemResetLayout->GetId());
+ 	m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onShowHelp ), this, m_menuItemHelp->GetId());
+-	m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuCheckVersion ), this, m_menuItemCheckVersionNow->GetId());
+-	m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuCheckVersionAutomatically ), this, m_menuItemCheckVersionAuto->GetId());
+ 	m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuAbout ), this, m_menuItemAbout->GetId());
+ 	m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCmpSettings ), NULL, this );
+ 	m_bpButtonCmpConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onCompSettingsContextMouse ), NULL, this );
 diff -aur 11.10-1/FreeFileSync/Source/ui/gui_generated.h 11.10-2/FreeFileSync/Source/ui/gui_generated.h
---- 11.10-1/FreeFileSync/Source/ui/gui_generated.h	2021-05-10 08:10:14.747776591 -0400
-+++ 11.10-2/FreeFileSync/Source/ui/gui_generated.h	2021-05-10 10:52:32.132708289 -0400
-@@ -92,8 +92,6 @@
-     wxMenuItem* m_menuItemShowOverview;
-     wxMenu* m_menuHelp;
-     wxMenuItem* m_menuItemHelp;
--    wxMenuItem* m_menuItemCheckVersionNow;
--    wxMenuItem* m_menuItemCheckVersionAuto;
-     wxMenuItem* m_menuItemAbout;
-     wxBoxSizer* bSizerPanelHolder;
-     wxPanel* m_panelTopButtons;
-@@ -228,8 +226,6 @@
-     virtual void onMenuExportFileList( wxCommandEvent& event ) { event.Skip(); }
-     virtual void onMenuResetLayout( wxCommandEvent& event ) { event.Skip(); }
-     virtual void onShowHelp( wxCommandEvent& event ) { event.Skip(); }
--    virtual void onMenuCheckVersion( wxCommandEvent& event ) { event.Skip(); }
--    virtual void onMenuCheckVersionAutomatically( wxCommandEvent& event ) { event.Skip(); }
-     virtual void onMenuAbout( wxCommandEvent& event ) { event.Skip(); }
-     virtual void onCompSettingsContextMouse( wxMouseEvent& event ) { event.Skip(); }
-     virtual void onCompSettingsContext( wxCommandEvent& event ) { event.Skip(); }
+--- 11.12-0/FreeFileSync/Source/ui/gui_generated.h	2021-07-15 09:40:40.888701315 -0400
++++ 11.12-1/FreeFileSync/Source/ui/gui_generated.h	2021-07-15 10:11:03.761175152 -0400
+@@ -93,8 +93,6 @@
+ 		wxMenuItem* m_menuItemShowOverview;
+ 		wxMenu* m_menuHelp;
+ 		wxMenuItem* m_menuItemHelp;
+-		wxMenuItem* m_menuItemCheckVersionNow;
+-		wxMenuItem* m_menuItemCheckVersionAuto;
+ 		wxMenuItem* m_menuItemAbout;
+ 		wxBoxSizer* bSizerPanelHolder;
+ 		wxPanel* m_panelTopButtons;
+@@ -229,8 +227,6 @@
+ 		virtual void onMenuExportFileList( wxCommandEvent& event ) { event.Skip(); }
+ 		virtual void onMenuResetLayout( wxCommandEvent& event ) { event.Skip(); }
+ 		virtual void onShowHelp( wxCommandEvent& event ) { event.Skip(); }
+-		virtual void onMenuCheckVersion( wxCommandEvent& event ) { event.Skip(); }
+-		virtual void onMenuCheckVersionAutomatically( wxCommandEvent& event ) { event.Skip(); }
+ 		virtual void onMenuAbout( wxCommandEvent& event ) { event.Skip(); }
+ 		virtual void onCompSettingsContextMouse( wxMouseEvent& event ) { event.Skip(); }
+ 		virtual void onCompSettingsContext( wxCommandEvent& event ) { event.Skip(); }
 diff -aur 11.10-1/FreeFileSync/Source/ui/main_dlg.cpp 11.10-2/FreeFileSync/Source/ui/main_dlg.cpp
 --- 11.10-1/FreeFileSync/Source/ui/main_dlg.cpp	2021-05-10 10:43:26.103497095 -0400
 +++ 11.10-2/FreeFileSync/Source/ui/main_dlg.cpp	2021-05-10 10:52:37.904763378 -0400
diff --git a/freefilesync/debian/patches/ffs_traditional_view.patch b/freefilesync/debian/patches/ffs_traditional_view.patch
index 616d665..c48536f 100644
--- a/freefilesync/debian/patches/ffs_traditional_view.patch
+++ b/freefilesync/debian/patches/ffs_traditional_view.patch
@@ -168,7 +168,7 @@ diff -x '*.orig' -x '*.rej' -aur 11.3-0/FreeFileSync/Source/ui/file_grid.cpp 11.
  
                                  wxColor backCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
                                  dc.GetPixel(rectNav.GetTopRight(), &backCol); //e.g. selected row!
-@@ -930,11 +998,11 @@
+@@ -914,13 +982,13 @@
                                  dc.GradientFillLinear(rectNav, getColorSelectionGradientFrom(), backCol, wxEAST);
                              }
  
@@ -176,12 +176,14 @@ diff -x '*.orig' -x '*.rej' -aur 11.3-0/FreeFileSync/Source/ui/file_grid.cpp 11.
 +                        if (!(itemPathFormat_ == ItemPathFormat::traditional || itemPathFormat_ == ItemPathFormat::tradrel) && !groupName.empty() && row == groupFirstRow)
                          {
                              wxRect rectGroupNameBack = rectGroupName;
-                             rectGroupNameBack.width += 2 * gapSize_; //include gap left of vline
+ 
+                             if (!itemName.empty()) 
+                                 rectGroupNameBack.width += 2 * gapSize_; //include gap left of item vline
 -                            rectGroupNameBack.height -= fastFromDIP(1); //harmonize with item separation lines
 +                            rectGroupNameBack.height -= lineWidth; //harmonize with item separation lines
  
-                             //mouse highlight: group name
                              wxDCTextColourChanger textColorGroupName(dc);
+                             //folder background: coordinate with renderRowBackgound()
 @@ -974,9 +1042,9 @@
                                  drawCellText(dc, rectGroupName, groupName, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, &getTextExtentBuffered(dc, groupName));
                          }
@@ -194,7 +196,7 @@ diff -x '*.orig' -x '*.rej' -aur 11.3-0/FreeFileSync/Source/ui/file_grid.cpp 11.
                              (groupName.empty() || !pdi.folderGroupObj->isEmpty<side>())) //don't show for missing folders
                          {
                              wxRect rectGroupParentText = rectGroupParent;
-@@ -994,16 +1062,16 @@
+@@ -975,16 +1043,16 @@
                              rectGroupItems.x     += 2 * gapSize_;
                              rectGroupItems.width -= 2 * gapSize_;
  
@@ -213,8 +215,8 @@ diff -x '*.orig' -x '*.rej' -aur 11.3-0/FreeFileSync/Source/ui/file_grid.cpp 11.
 -                        rectItemsBack.height -= fastFromDIP(1); //preserve item separation lines!
 +                        rectItemsBack.height -= lineWidth; //preserve item separation lines!
  
-                         //mouse highlight: item name
-                         wxDCTextColourChanger textColorGroupItems(dc);
+                             drawCudHighlight(rectItemsBack, pdi.fsObj->getSyncOperation());
+ 
 @@ -1134,7 +1202,12 @@
                               groupNameWidth] = getGroupRenderLayout(dc, row, pdi, insanelyHugeWidth);
                  assert(!stackedGroupRender);
@@ -274,8 +276,8 @@ diff -x '.git*' -x '*.orig' -x '*.rej' -aur 11.2-1/FreeFileSync/Source/ui/file_g
  const ItemPathFormat defaultItemPathFormatLeftGrid  = ItemPathFormat::relative;
 diff -x '.git*' -x '*.orig' -x '*.rej' -aur 11.2-1/FreeFileSync/Source/ui/main_dlg.cpp 11.2-1-trad3/FreeFileSync/Source/ui/main_dlg.cpp
 --- 11.2-1/FreeFileSync/Source/ui/main_dlg.cpp	2020-10-02 20:49:11.487782099 -0400
-+++ 11.2-1-trad3/FreeFileSync/Source/ui/main_dlg.cpp	2020-10-02 20:22:02.191278722 -0400
-@@ -2710,6 +2710,8 @@
++++ 11.12-1/FreeFileSync/Source/ui/main_dlg.cpp	2021-07-15 20:22:02.191278722 -0400
+@@ -2653,6 +2647,8 @@
      addFormatEntry(_("Item name"    ), ItemPathFormat::name);
      addFormatEntry(_("Relative path"), ItemPathFormat::relative);
      addFormatEntry(_("Full path"    ), ItemPathFormat::full);
@@ -283,7 +285,7 @@ diff -x '.git*' -x '*.orig' -x '*.rej' -aur 11.2-1/FreeFileSync/Source/ui/main_d
 +    addFormatEntry(_("Trad. relative"),ItemPathFormat::tradrel);
  
      //----------------------------------------------------------------------------------------------
-     menu.addSeparator();
+     auto setIconSize = [&](FileIconSize sz, bool showIcons)
 diff -x '.git*' -x '*.orig' -x '*.rej' -aur 11.2-1/FreeFileSync/Source/config.cpp 11.2-1-trad3/FreeFileSync/Source/config.cpp
 --- 11.2-1/FreeFileSync/Source/config.cpp	2020-10-02 14:39:05.233462578 -0400
 +++ 11.2-1-trad3/FreeFileSync/Source/config.cpp	2020-10-02 20:22:24.275555557 -0400
diff --git a/freefilesync/ffs_el.patch b/freefilesync/ffs_el.patch
index c8b0fcc..ad9ae15 100644
--- a/freefilesync/ffs_el.patch
+++ b/freefilesync/ffs_el.patch
@@ -76,12 +76,12 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/FreeFileSync/Source/RealTim
  #treat as system headers so that warnings are hidden:
  cxxFlags  += -isystem/usr/include/gtk-2.0
 
-diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.19-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.19-1/FreeFileSync/Source/ui/small_dlgs.cpp
---- 10.22-0/FreeFileSync/Source/ui/small_dlgs.cpp  2020-03-18 15:49:57.837901137 -0400
-+++ 10.22-1/FreeFileSync/Source/ui/small_dlgs.cpp  2020-03-18 16:18:46.215713307 -0400
-@@ -97,6 +97,8 @@
-     build += L"64 Bit";
- #endif
+diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.19-0/FreeFileSync/Source/ui/small_dlgs.cpp 11.12-1/FreeFileSync/Source/ui/small_dlgs.cpp
+--- 10.11-0/FreeFileSync/Source/ui/small_dlgs.cpp	2019-12-27 07:56:06.714625467 -0500
++++ 11.12-1/FreeFileSync/Source/ui/small_dlgs.cpp  2021-07-15 09:03:57.753183052 -0400
+@@ -93,6 +93,8 @@
+     build += LTR_MARK; //fix Arabic
+     build += utfTo<wxString>(cpuArchName);
  
 +    build += L" for CentOS";
 +
diff --git a/freefilesync/ffs_fedora.patch b/freefilesync/ffs_fedora.patch
index 1396c91..83beb4a 100644
--- a/freefilesync/ffs_fedora.patch
+++ b/freefilesync/ffs_fedora.patch
@@ -68,12 +68,12 @@ diff -Naur -x '*.rej' -x '*.orig' -x '*.git*' 11.4-0/FreeFileSync/Source/RealTim
  
  cppFiles=
  cppFiles+=application.cpp
-diff -Naur -x '*.rej' -x '*.orig' -x '*.git*' 11.4-0/FreeFileSync/Source/ui/small_dlgs.cpp 11.4-1/FreeFileSync/Source/ui/small_dlgs.cpp
---- 10.22-0/FreeFileSync/Source/ui/small_dlgs.cpp  2020-03-18 15:49:57.837901137 -0400
-+++ 10.22-1/FreeFileSync/Source/ui/small_dlgs.cpp  2020-03-18 15:51:50.381251257 -0400
-@@ -97,6 +97,8 @@
-     build += L"64 Bit";
- #endif
+diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.19-0/FreeFileSync/Source/ui/small_dlgs.cpp 11.12-1/FreeFileSync/Source/ui/small_dlgs.cpp
+--- 10.11-0/FreeFileSync/Source/ui/small_dlgs.cpp	2019-12-27 07:56:06.714625467 -0500
++++ 11.12-1/FreeFileSync/Source/ui/small_dlgs.cpp  2021-07-15 09:03:57.753183052 -0400
+@@ -93,6 +93,8 @@
+     build += LTR_MARK; //fix Arabic
+     build += utfTo<wxString>(cpuArchName);
  
 +    build += L" for Fedora";
 +
diff --git a/freefilesync/ffs_no_check_updates.patch b/freefilesync/ffs_no_check_updates.patch
index c0c4fc2..5e61dce 100644
--- a/freefilesync/ffs_no_check_updates.patch
+++ b/freefilesync/ffs_no_check_updates.patch
@@ -2,57 +2,57 @@ Version: 11.10
 Message: This is a major rewrite of the ffs_no_check_updates patch from before 11.10 which disabled only a few technical www interactions. This current version completely deletes all logic associated with checking the version of the program.
 Date: 2021-05-10
 Author: bgstack15
-diff -aur 11.10-1/FreeFileSync/Source/ui/gui_generated.cpp 11.10-2/FreeFileSync/Source/ui/gui_generated.cpp
+diff -aur 11.10-1/FreeFileSync/Source/ui/gui_generated.cpp 11.12-1/FreeFileSync/Source/ui/gui_generated.cpp
 --- 11.10-1/FreeFileSync/Source/ui/gui_generated.cpp	2021-05-10 08:10:14.747776591 -0400
-+++ 11.10-2/FreeFileSync/Source/ui/gui_generated.cpp	2021-05-10 10:41:28.446374196 -0400
-@@ -109,17 +109,6 @@
-     m_menuItemHelp = new wxMenuItem( m_menuHelp, wxID_HELP, wxString( _("&View help") ) + wxT('\t') + wxT("F1"), wxEmptyString, wxITEM_NORMAL );
-     m_menuHelp->Append( m_menuItemHelp );
++++ 11.12-1/FreeFileSync/Source/ui/gui_generated.cpp	2021-07-15 10:41:28.446374196 -0400
+@@ -108,17 +108,6 @@
+ 	m_menuItemHelp = new wxMenuItem( m_menuHelp, wxID_HELP, wxString( _("&View help") ) + wxT('\t') + wxT("F1"), wxEmptyString, wxITEM_NORMAL );
+ 	m_menuHelp->Append( m_menuItemHelp );
  
--    m_menuHelp->AppendSeparator();
+-	m_menuHelp->AppendSeparator();
 -
--    m_menuItemCheckVersionNow = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("&Check for updates now") ), wxEmptyString, wxITEM_NORMAL );
--    m_menuHelp->Append( m_menuItemCheckVersionNow );
+-	m_menuItemCheckVersionNow = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("&Check for updates now") ) , wxEmptyString, wxITEM_NORMAL );
+-	m_menuHelp->Append( m_menuItemCheckVersionNow );
 -
--    m_menuItemCheckVersionAuto = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("Check &automatically once a week") ), wxEmptyString, wxITEM_CHECK );
--    m_menuHelp->Append( m_menuItemCheckVersionAuto );
--    m_menuItemCheckVersionAuto->Check( true );
+-	m_menuItemCheckVersionAuto = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("Check &automatically once a week") ) , wxEmptyString, wxITEM_CHECK );
+-	m_menuHelp->Append( m_menuItemCheckVersionAuto );
+-	m_menuItemCheckVersionAuto->Check( true );
 -
--    m_menuHelp->AppendSeparator();
+-	m_menuHelp->AppendSeparator();
 -
-     m_menuItemAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About") ) + wxT('\t') + wxT("Shift+F1"), wxEmptyString, wxITEM_NORMAL );
-     m_menuHelp->Append( m_menuItemAbout );
+ 	m_menuItemAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About") ) + wxT('\t') + wxT("Shift+F1"), wxEmptyString, wxITEM_NORMAL );
+ 	m_menuHelp->Append( m_menuItemAbout );
  
-@@ -1140,8 +1129,6 @@
-     m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuExportFileList ), this, m_menuItemExportList->GetId());
-     m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuResetLayout ), this, m_menuItem51->GetId());
-     m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onShowHelp ), this, m_menuItemHelp->GetId());
--    m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuCheckVersion ), this, m_menuItemCheckVersionNow->GetId());
--    m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuCheckVersionAutomatically ), this, m_menuItemCheckVersionAuto->GetId());
-     m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuAbout ), this, m_menuItemAbout->GetId());
-     m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCmpSettings ), NULL, this );
-     m_bpButtonCmpConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onCompSettingsContextMouse ), NULL, this );
+@@ -1139,8 +1128,6 @@
+ 	m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuExportFileList ), this, m_menuItemExportList->GetId());
+ 	m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuResetLayout ), this, m_menuItemResetLayout->GetId());
+ 	m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onShowHelp ), this, m_menuItemHelp->GetId());
+-	m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuCheckVersion ), this, m_menuItemCheckVersionNow->GetId());
+-	m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuCheckVersionAutomatically ), this, m_menuItemCheckVersionAuto->GetId());
+ 	m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuAbout ), this, m_menuItemAbout->GetId());
+ 	m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCmpSettings ), NULL, this );
+ 	m_bpButtonCmpConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onCompSettingsContextMouse ), NULL, this );
 diff -aur 11.10-1/FreeFileSync/Source/ui/gui_generated.h 11.10-2/FreeFileSync/Source/ui/gui_generated.h
---- 11.10-1/FreeFileSync/Source/ui/gui_generated.h	2021-05-10 08:10:14.747776591 -0400
-+++ 11.10-2/FreeFileSync/Source/ui/gui_generated.h	2021-05-10 10:52:32.132708289 -0400
-@@ -92,8 +92,6 @@
-     wxMenuItem* m_menuItemShowOverview;
-     wxMenu* m_menuHelp;
-     wxMenuItem* m_menuItemHelp;
--    wxMenuItem* m_menuItemCheckVersionNow;
--    wxMenuItem* m_menuItemCheckVersionAuto;
-     wxMenuItem* m_menuItemAbout;
-     wxBoxSizer* bSizerPanelHolder;
-     wxPanel* m_panelTopButtons;
-@@ -228,8 +226,6 @@
-     virtual void onMenuExportFileList( wxCommandEvent& event ) { event.Skip(); }
-     virtual void onMenuResetLayout( wxCommandEvent& event ) { event.Skip(); }
-     virtual void onShowHelp( wxCommandEvent& event ) { event.Skip(); }
--    virtual void onMenuCheckVersion( wxCommandEvent& event ) { event.Skip(); }
--    virtual void onMenuCheckVersionAutomatically( wxCommandEvent& event ) { event.Skip(); }
-     virtual void onMenuAbout( wxCommandEvent& event ) { event.Skip(); }
-     virtual void onCompSettingsContextMouse( wxMouseEvent& event ) { event.Skip(); }
-     virtual void onCompSettingsContext( wxCommandEvent& event ) { event.Skip(); }
+--- 11.12-0/FreeFileSync/Source/ui/gui_generated.h	2021-07-15 09:40:40.888701315 -0400
++++ 11.12-1/FreeFileSync/Source/ui/gui_generated.h	2021-07-15 10:11:03.761175152 -0400
+@@ -93,8 +93,6 @@
+ 		wxMenuItem* m_menuItemShowOverview;
+ 		wxMenu* m_menuHelp;
+ 		wxMenuItem* m_menuItemHelp;
+-		wxMenuItem* m_menuItemCheckVersionNow;
+-		wxMenuItem* m_menuItemCheckVersionAuto;
+ 		wxMenuItem* m_menuItemAbout;
+ 		wxBoxSizer* bSizerPanelHolder;
+ 		wxPanel* m_panelTopButtons;
+@@ -229,8 +227,6 @@
+ 		virtual void onMenuExportFileList( wxCommandEvent& event ) { event.Skip(); }
+ 		virtual void onMenuResetLayout( wxCommandEvent& event ) { event.Skip(); }
+ 		virtual void onShowHelp( wxCommandEvent& event ) { event.Skip(); }
+-		virtual void onMenuCheckVersion( wxCommandEvent& event ) { event.Skip(); }
+-		virtual void onMenuCheckVersionAutomatically( wxCommandEvent& event ) { event.Skip(); }
+ 		virtual void onMenuAbout( wxCommandEvent& event ) { event.Skip(); }
+ 		virtual void onCompSettingsContextMouse( wxMouseEvent& event ) { event.Skip(); }
+ 		virtual void onCompSettingsContext( wxCommandEvent& event ) { event.Skip(); }
 diff -aur 11.10-1/FreeFileSync/Source/ui/main_dlg.cpp 11.10-2/FreeFileSync/Source/ui/main_dlg.cpp
 --- 11.10-1/FreeFileSync/Source/ui/main_dlg.cpp	2021-05-10 10:43:26.103497095 -0400
 +++ 11.10-2/FreeFileSync/Source/ui/main_dlg.cpp	2021-05-10 10:52:37.904763378 -0400
diff --git a/freefilesync/ffs_traditional_view.patch b/freefilesync/ffs_traditional_view.patch
index 616d665..c48536f 100644
--- a/freefilesync/ffs_traditional_view.patch
+++ b/freefilesync/ffs_traditional_view.patch
@@ -168,7 +168,7 @@ diff -x '*.orig' -x '*.rej' -aur 11.3-0/FreeFileSync/Source/ui/file_grid.cpp 11.
  
                                  wxColor backCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
                                  dc.GetPixel(rectNav.GetTopRight(), &backCol); //e.g. selected row!
-@@ -930,11 +998,11 @@
+@@ -914,13 +982,13 @@
                                  dc.GradientFillLinear(rectNav, getColorSelectionGradientFrom(), backCol, wxEAST);
                              }
  
@@ -176,12 +176,14 @@ diff -x '*.orig' -x '*.rej' -aur 11.3-0/FreeFileSync/Source/ui/file_grid.cpp 11.
 +                        if (!(itemPathFormat_ == ItemPathFormat::traditional || itemPathFormat_ == ItemPathFormat::tradrel) && !groupName.empty() && row == groupFirstRow)
                          {
                              wxRect rectGroupNameBack = rectGroupName;
-                             rectGroupNameBack.width += 2 * gapSize_; //include gap left of vline
+ 
+                             if (!itemName.empty()) 
+                                 rectGroupNameBack.width += 2 * gapSize_; //include gap left of item vline
 -                            rectGroupNameBack.height -= fastFromDIP(1); //harmonize with item separation lines
 +                            rectGroupNameBack.height -= lineWidth; //harmonize with item separation lines
  
-                             //mouse highlight: group name
                              wxDCTextColourChanger textColorGroupName(dc);
+                             //folder background: coordinate with renderRowBackgound()
 @@ -974,9 +1042,9 @@
                                  drawCellText(dc, rectGroupName, groupName, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, &getTextExtentBuffered(dc, groupName));
                          }
@@ -194,7 +196,7 @@ diff -x '*.orig' -x '*.rej' -aur 11.3-0/FreeFileSync/Source/ui/file_grid.cpp 11.
                              (groupName.empty() || !pdi.folderGroupObj->isEmpty<side>())) //don't show for missing folders
                          {
                              wxRect rectGroupParentText = rectGroupParent;
-@@ -994,16 +1062,16 @@
+@@ -975,16 +1043,16 @@
                              rectGroupItems.x     += 2 * gapSize_;
                              rectGroupItems.width -= 2 * gapSize_;
  
@@ -213,8 +215,8 @@ diff -x '*.orig' -x '*.rej' -aur 11.3-0/FreeFileSync/Source/ui/file_grid.cpp 11.
 -                        rectItemsBack.height -= fastFromDIP(1); //preserve item separation lines!
 +                        rectItemsBack.height -= lineWidth; //preserve item separation lines!
  
-                         //mouse highlight: item name
-                         wxDCTextColourChanger textColorGroupItems(dc);
+                             drawCudHighlight(rectItemsBack, pdi.fsObj->getSyncOperation());
+ 
 @@ -1134,7 +1202,12 @@
                               groupNameWidth] = getGroupRenderLayout(dc, row, pdi, insanelyHugeWidth);
                  assert(!stackedGroupRender);
@@ -274,8 +276,8 @@ diff -x '.git*' -x '*.orig' -x '*.rej' -aur 11.2-1/FreeFileSync/Source/ui/file_g
  const ItemPathFormat defaultItemPathFormatLeftGrid  = ItemPathFormat::relative;
 diff -x '.git*' -x '*.orig' -x '*.rej' -aur 11.2-1/FreeFileSync/Source/ui/main_dlg.cpp 11.2-1-trad3/FreeFileSync/Source/ui/main_dlg.cpp
 --- 11.2-1/FreeFileSync/Source/ui/main_dlg.cpp	2020-10-02 20:49:11.487782099 -0400
-+++ 11.2-1-trad3/FreeFileSync/Source/ui/main_dlg.cpp	2020-10-02 20:22:02.191278722 -0400
-@@ -2710,6 +2710,8 @@
++++ 11.12-1/FreeFileSync/Source/ui/main_dlg.cpp	2021-07-15 20:22:02.191278722 -0400
+@@ -2653,6 +2647,8 @@
      addFormatEntry(_("Item name"    ), ItemPathFormat::name);
      addFormatEntry(_("Relative path"), ItemPathFormat::relative);
      addFormatEntry(_("Full path"    ), ItemPathFormat::full);
@@ -283,7 +285,7 @@ diff -x '.git*' -x '*.orig' -x '*.rej' -aur 11.2-1/FreeFileSync/Source/ui/main_d
 +    addFormatEntry(_("Trad. relative"),ItemPathFormat::tradrel);
  
      //----------------------------------------------------------------------------------------------
-     menu.addSeparator();
+     auto setIconSize = [&](FileIconSize sz, bool showIcons)
 diff -x '.git*' -x '*.orig' -x '*.rej' -aur 11.2-1/FreeFileSync/Source/config.cpp 11.2-1-trad3/FreeFileSync/Source/config.cpp
 --- 11.2-1/FreeFileSync/Source/config.cpp	2020-10-02 14:39:05.233462578 -0400
 +++ 11.2-1-trad3/FreeFileSync/Source/config.cpp	2020-10-02 20:22:24.275555557 -0400
diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec
index b882410..b77eb1f 100644
--- a/freefilesync/freefilesync.spec
+++ b/freefilesync/freefilesync.spec
@@ -19,7 +19,7 @@
 %define libssh2_name libssh2-%{name}
 %endif
 Name:       freefilesync
-Version:    11.11
+Version:    11.12
 Release:    1%{?dist}
 Summary:    A file synchronization utility
 
@@ -210,6 +210,9 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & :
 %ghost %config %attr(666, -, -) %{_datadir}/%{name}/GlobalSettings.xml
 
 %changelog
+* Thu Jul 15 2021 B. Stack <bgstack15@gmail.com> - 11.12-1
+- version bump
+
 * Sat Jun 12 2021 B. Stack <bgstack15@gmail.com> - 11.11-1
 - version bump