ffs 12.1 rc1

8 files changed, 67 insertions, 47 deletions

diff --git a/freefilesync/debian/_service b/freefilesync/debian/_service
index cab1830..4fa92de 100644
--- a/freefilesync/debian/_service
+++ b/freefilesync/debian/_service
@@ -14,7 +14,7 @@
    <service name="tar_scm">
       <param name="scm">git</param>
       <param name="url">https://gitlab.com/opensource-tracking/FreeFileSync.git</param>
-      <param name="revision">12.0</param>
+      <param name="revision">12.1</param>
       <param name="version">_none_</param>
    </service>
    <service name="recompress">
diff --git a/freefilesync/debian/changelog b/freefilesync/debian/changelog
index 8a92145..cd16dc2 100644
--- a/freefilesync/debian/changelog
+++ b/freefilesync/debian/changelog
@@ -1,3 +1,23 @@
+freefilesync (12.1-100+stackrpms) obs; urgency=low
+
+  * Upstream updates
+    * First official build based on GTK3 (Linux)
+    * Allow cancel during folder path normalization (e.g. delay during HDD
+      spin up)
+    * Fixed slow FTP comparison performance due to libcurl regression
+    * Open terminal with log messages on startup error (Linux)
+    * Preserve changed config during auto-update
+    * Save config during unexpected reboot (Linux)
+    * Preserve config upon SIGTERM (Linux, macOS)
+    * Fixed progress dialog z-order after switching windows (macOS)
+    * Removed packet size limit for SFTP directory reading
+    * Mouse hover effects for config and overview grid
+    * Always update existing shortcuts during installation (Windows, Linux)
+    * Fixed another "Some files will be synchronized as part of multiple
+      base folders" false-negative
+
+ -- B. Stack <bgstack15@gmail.com>  Tue, 21 Feb 2023 12:22:27 -0500
+
 freefilesync (12.0-100+stackrpms) obs; urgency=low
 
   * Upstream updates
diff --git a/freefilesync/debian/freefilesync+devuan.dsc b/freefilesync/debian/freefilesync+stackrpms.dsc
index 1bdcbe0..f8e6e36 100644
--- a/freefilesync/debian/freefilesync+devuan.dsc
+++ b/freefilesync/debian/freefilesync+stackrpms.dsc
@@ -2,7 +2,7 @@ Format: 3.0 (quilt)
 Source: freefilesync
 Binary: freefilesync
 Architecture: any
-Version: 12.0-100+stackrpms
+Version: 12.1-100+stackrpms
 Maintainer: B. Stack <bgstack15@gmail.com>
 Homepage: https://freefilesync.org/
 Standards-Version: 4.1.4
@@ -11,4 +11,4 @@ Package-List:
  freefilesync deb utils optional arch=any
 Files:
  00000000000000000000000000000000 1 freefilesync.orig.tar.gz
- 00000000000000000000000000000000 1 freefilesync+devuan.debian.tar.xz
+ 00000000000000000000000000000000 1 freefilesync+stackrpms.debian.tar.xz
diff --git a/freefilesync/debian/patches/ffs_allow_parallel_ops.patch b/freefilesync/debian/patches/ffs_allow_parallel_ops.patch
index c102480..41434f3 100644
--- a/freefilesync/debian/patches/ffs_allow_parallel_ops.patch
+++ b/freefilesync/debian/patches/ffs_allow_parallel_ops.patch
@@ -1,5 +1,5 @@
-Version: 12.0
-Date: 2023-01-23
+Version: 12.1
+Date: 2023-02-21
 Author: bgstack15
 Message: The source release appears not to actually include the logic that performs operations in parallel, so this patch doesn't actually do anything.
 --- a/FreeFileSync/Source/ui/folder_selector.cpp
@@ -15,7 +15,7 @@ Message: The source release appears not to actually include the logic that perfo
          return;
 --- a/FreeFileSync/Source/ui/small_dlgs.cpp
 +++ b/FreeFileSync/Source/ui/small_dlgs.cpp
-@@ -379,11 +379,14 @@ CloudSetupDlg::CloudSetupDlg(wxWindow* p
+@@ -386,11 +386,14 @@ CloudSetupDlg::CloudSetupDlg(wxWindow* p
  
      m_spinCtrlConnectionCount->SetValue(parallelOps);
  
@@ -34,7 +34,7 @@ Message: The source release appears not to actually include the logic that perfo
      //---------------------------------------------------------
  
      //set up default view for dialog size calculation
-@@ -932,7 +935,7 @@ CopyToDialog::CopyToDialog(wxWindow* par
+@@ -943,7 +946,7 @@ CopyToDialog::CopyToDialog(wxWindow* par
  
      targetFolder = std::make_unique<FolderSelector>(this, *this, *m_buttonSelectTargetFolder, *m_bpButtonSelectAltTargetFolder, *m_targetFolderPath,
                                                      targetFolderLastSelected, sftpKeyFileLastSelected, nullptr /*staticText*/, nullptr /*wxWindow*/, nullptr /*droppedPathsFilter*/,
diff --git a/freefilesync/debian/patches/ffs_desktop_notifications.patch b/freefilesync/debian/patches/ffs_desktop_notifications.patch
index 4dec781..b660044 100644
--- a/freefilesync/debian/patches/ffs_desktop_notifications.patch
+++ b/freefilesync/debian/patches/ffs_desktop_notifications.patch
@@ -1,5 +1,5 @@
-Version: 12.0
-Date: 2023-01-23
+Version: 12.1
+Date: 2023-02-21
 Author: bgstack15
 Message: Add support for building with desktop notification support.
 --- a/FreeFileSync/Source/Makefile
@@ -30,7 +30,7 @@ Message: Add support for building with desktop notification support.
  
  using namespace zen;
  using namespace fff;
-@@ -1369,6 +1372,22 @@ void SyncProgressDialogImpl<TopLevelDial
+@@ -1368,6 +1371,22 @@ void SyncProgressDialogImpl<TopLevelDial
      pnl_.m_staticTextPhase->SetLabelText(getSyncResultLabel(syncResult));
      //pnl_.m_bitmapStatus->SetToolTip(); -> redundant
  
diff --git a/freefilesync/debian/patches/ffs_devuan.patch b/freefilesync/debian/patches/ffs_devuan.patch
index 6db7b9d..a24c41e 100644
--- a/freefilesync/debian/patches/ffs_devuan.patch
+++ b/freefilesync/debian/patches/ffs_devuan.patch
@@ -1,7 +1,7 @@
 Author: bgstack15
 Source: Original research
-Last-Modified: 2022-09-07
-Last-Version: 11.25
+Last-Modified: 2023-02-21
+Last-Version: 12.1
 Message: Main patch to compile on Devuan.
 --- a/FreeFileSync/Source/ffs_paths.cpp
 +++ b/FreeFileSync/Source/ffs_paths.cpp
@@ -55,7 +55,7 @@ Message: Main patch to compile on Devuan.
  
      //--------------------------------------------------------------------------
      //have animal + text match *final* dialog width
-@@ -149,7 +151,7 @@ AboutDlg::AboutDlg(wxWindow* parent) : A
+@@ -153,7 +155,7 @@ AboutDlg::AboutDlg(wxWindow* parent) : A
          const int imageWidth = (m_panelDonate->GetSize().GetWidth() - 5 - 5 - 5 /* grey border*/) / 2;
          const int textWidth  =  m_panelDonate->GetSize().GetWidth() - 5 - 5 - 5 - imageWidth;
  
diff --git a/freefilesync/debian/patches/ffs_no_check_updates.patch b/freefilesync/debian/patches/ffs_no_check_updates.patch
index 6fd0fc2..88806ca 100644
--- a/freefilesync/debian/patches/ffs_no_check_updates.patch
+++ b/freefilesync/debian/patches/ffs_no_check_updates.patch
@@ -1,5 +1,5 @@
-Version: 12.0
-Date: 2023-01-22
+Version: 12.1
+Date: 2023-02-21
 Author: bgstack15
 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.
 --- a/FreeFileSync/Source/ui/gui_generated.cpp
@@ -77,7 +77,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
      //asynchronous call to wxWindow::Layout(): fix superfluous frame on right and bottom when FFS is started in fullscreen mode
      Bind(wxEVT_IDLE, &MainDialog::onLayoutWindowAsync, this);
      wxCommandEvent evtDummy;           //call once before onLayoutWindowAsync()
-@@ -1130,8 +1125,6 @@ void MainDialog::setGlobalCfgOnInit(cons
+@@ -1126,8 +1121,6 @@ void MainDialog::setGlobalCfgOnInit(cons
      auiMgr_.GetPane(m_panelSearch).Hide(); //no need to show it on startup
      auiMgr_.GetPane(m_panelLog   ).Hide(); //
  
@@ -86,7 +86,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
      auiMgr_.Update();
  }
  
-@@ -5848,72 +5841,6 @@ void MainDialog::onMenuExportFileList(wx
+@@ -5839,72 +5832,6 @@ void MainDialog::onMenuExportFileList(wx
      }
  }
  
diff --git a/freefilesync/debian/patches/ffs_traditional_view.patch b/freefilesync/debian/patches/ffs_traditional_view.patch
index 7601b8a..e24afd0 100644
--- a/freefilesync/debian/patches/ffs_traditional_view.patch
+++ b/freefilesync/debian/patches/ffs_traditional_view.patch
@@ -1,21 +1,21 @@
-Version: 12.0
-Date: 2023-01-23
+Version: 12.1
+Date: 2023-02-21
 Author: bgstack15@gmail.com
 Message: restore a traditional view to FreeFileSync, and disable "welcomeShownVersion" About dialog
 --- a/FreeFileSync/Source/ui/file_grid.cpp
 +++ b/FreeFileSync/Source/ui/file_grid.cpp
-@@ -475,8 +475,10 @@ private:
-                             case ItemPathFormat::name:
-                                 return utfTo<std::wstring>(fsObj->getItemName<side>());
-                             case ItemPathFormat::relative:
-+                            case ItemPathFormat::tradrel:
-                                 return utfTo<std::wstring>(fsObj->getRelativePath<side>());
-                             case ItemPathFormat::full:
-+                            case ItemPathFormat::traditional:
-                                 return AFS::getDisplayPath(fsObj->getAbstractPath<side>());
-                         }
-                         assert(false);
-@@ -529,8 +531,13 @@ private:
+@@ -473,8 +473,10 @@ private:
+                         case ItemPathFormat::name:
+                             return utfTo<std::wstring>(fsObj->getItemName<side>());
+                         case ItemPathFormat::relative:
++                        case ItemPathFormat::tradrel:
+                             return utfTo<std::wstring>(fsObj->getRelativePath<side>());
+                         case ItemPathFormat::full:
++                        case ItemPathFormat::traditional:
+                             return AFS::getDisplayPath(fsObj->getAbstractPath<side>());
+                     }
+ 
+@@ -534,8 +536,13 @@ private:
          else
              GridData::renderRowBackgound(dc, rect, row, true /*enabled*/, true /*selected*/, rowHover);
  
@@ -30,7 +30,7 @@ Message: restore a traditional view to FreeFileSync, and disable "welcomeShownVe
          clearArea(dc, rectLine, row == pdi.groupLastRow - 1 /*last group item*/ ?
                    getColorGridLine() : getDefaultBackgroundColorAlternating(pdi.groupIdx % 2 != 0));
      }
-@@ -636,6 +643,26 @@ private:
+@@ -641,6 +648,26 @@ private:
                  else //=> BaseFolderPair
                      groupParentFolder = AFS::getDisplayPath(pdi.fsObj->base().getAbstractPath<side>());
                  break;
@@ -57,7 +57,7 @@ Message: restore a traditional view to FreeFileSync, and disable "welcomeShownVe
          }
  
          //path components should follow the app layout direction and are NOT a single piece of text!
-@@ -661,11 +688,38 @@ private:
+@@ -666,11 +693,38 @@ private:
          int       groupNameWidth    = groupName.empty() ? 0 : (gapSize_ + iconSize + gapSize_ + getTextExtentBuffered(dc, groupName).x);
          const int groupNameMinWidth = groupName.empty() ? 0 : (gapSize_ + iconSize + gapSize_ + ellipsisWidth);
  
@@ -97,7 +97,7 @@ Message: restore a traditional view to FreeFileSync, and disable "welcomeShownVe
          //not enough space? => collapse
          if (int excessWidth = groupParentWidth + groupNameWidth + groupItemsWidth - maxWidth;
              excessWidth > 0)
-@@ -732,6 +786,11 @@ private:
+@@ -737,6 +791,11 @@ private:
              }
          }
  
@@ -109,7 +109,7 @@ Message: restore a traditional view to FreeFileSync, and disable "welcomeShownVe
          return
          {
              itemName,
-@@ -872,6 +931,9 @@ private:
+@@ -877,6 +936,9 @@ private:
                      rectGroup = rectGroupParent = rectGroupName = rectTmp;
  
                      rectGroupParent.width = groupParentWidth;
@@ -119,7 +119,7 @@ Message: restore a traditional view to FreeFileSync, and disable "welcomeShownVe
                      rectGroupName  .width = groupNameWidth;
  
                      if (stackedGroupRender)
-@@ -895,6 +957,11 @@ private:
+@@ -900,6 +962,11 @@ private:
                          rectGroupItems.width = 0;
                      }
  
@@ -131,7 +131,7 @@ Message: restore a traditional view to FreeFileSync, and disable "welcomeShownVe
                      //-------------------------------------------------------------------------
                      {
                          //clear background below parent path => harmonize with renderRowBackgound()
-@@ -905,8 +972,9 @@ private:
+@@ -910,8 +977,9 @@ private:
                              wxRect rectGroupBack = rectGroup;
                              rectGroupBack.width += 2 * gapSize_; //include gap before vline
  
@@ -143,7 +143,7 @@ Message: restore a traditional view to FreeFileSync, and disable "welcomeShownVe
  
                              clearArea(dc, rectGroupBack, getDefaultBackgroundColorAlternating(pdi.groupIdx % 2 == 0));
                              //clearArea() is surprisingly expensive => call just once!
-@@ -914,9 +982,9 @@ private:
+@@ -919,9 +987,9 @@ private:
                              //accessibility: always set *both* foreground AND background colors!
                          }
  
@@ -155,7 +155,7 @@ Message: restore a traditional view to FreeFileSync, and disable "welcomeShownVe
                              (groupName.empty() || !pdi.folderGroupObj->isEmpty<side>())) //don't show for missing folders
                          {
                              tryDrawNavMarker(rectGroupParent);
-@@ -928,14 +996,14 @@ private:
+@@ -933,14 +1001,14 @@ private:
                              drawCellText(dc, rectGroupParentText, groupParentFolder, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, &getTextExtentBuffered(dc, groupParentFolder));
                          }
  
@@ -172,7 +172,7 @@ Message: restore a traditional view to FreeFileSync, and disable "welcomeShownVe
  
                              wxDCTextColourChanger textColorGroupName(dc);
                              //folder background: coordinate with renderRowBackgound()
-@@ -979,16 +1047,16 @@ private:
+@@ -984,16 +1052,16 @@ private:
                              rectGroupItems.x     += 2 * gapSize_;
                              rectGroupItems.width -= 2 * gapSize_;
  
@@ -193,7 +193,7 @@ Message: restore a traditional view to FreeFileSync, and disable "welcomeShownVe
  
                          drawCudHighlight(rectItemsBack, pdi.fsObj->getSyncOperation());
                          tryDrawNavMarker(rectGroupItems);
-@@ -1119,7 +1187,12 @@ private:
+@@ -1124,7 +1192,12 @@ private:
                               groupNameWidth] = getGroupRenderLayout(dc, row, pdi, insanelyHugeWidth);
                  assert(!stackedGroupRender);
  
@@ -207,7 +207,7 @@ Message: restore a traditional view to FreeFileSync, and disable "welcomeShownVe
                  const int fileIconWidth = getIconManager().getIconBuffer() ? gapSize_ + getIconManager().getIconSize() : 0;
                  const int ellipsisWidth = getTextExtentBuffered(dc, ELLIPSIS).x;
                  const int itemWidth = itemName.empty() ? 0 :
-@@ -1151,6 +1224,10 @@ private:
+@@ -1156,6 +1229,10 @@ private:
                          return _("Relative path");
                      case ItemPathFormat::full:
                          return _("Full path");
@@ -218,7 +218,7 @@ Message: restore a traditional view to FreeFileSync, and disable "welcomeShownVe
                  }
                  assert(false);
                  break;
-@@ -1408,7 +1485,8 @@ private:
+@@ -1413,7 +1490,8 @@ private:
              GridData::renderRowBackgound(dc, rect, row, true /*enabled*/, true /*selected*/, rowHover);
  
          //----------------------------------------------------------------------------------
@@ -228,7 +228,7 @@ Message: restore a traditional view to FreeFileSync, and disable "welcomeShownVe
          clearArea(dc, rectLine, row == pdi.groupLastRow - 1 /*last group item*/ ?
                    getColorGridLine() : getDefaultBackgroundColorAlternating(pdi.groupIdx % 2 != 0));
      }
-@@ -1432,7 +1510,8 @@ private:
+@@ -1437,7 +1515,8 @@ private:
                  {
                      wxRect rectBack = rect;
                      if (row == pdi.groupLastRow - 1 /*last group item*/) //preserve the group separation line!
@@ -252,14 +252,14 @@ Message: restore a traditional view to FreeFileSync, and disable "welcomeShownVe
 --- a/FreeFileSync/Source/ui/main_dlg.cpp
 +++ b/FreeFileSync/Source/ui/main_dlg.cpp
 @@ -439,7 +439,6 @@ void MainDialog::create(const Zstring& g
-     if (mainDlg->globalCfg_.welcomeShownVersion != ffsVersion)
+     if (mainDlg->globalCfg_.welcomeDialogLastVersion != ffsVersion)
      {
-         mainDlg->globalCfg_.welcomeShownVersion = ffsVersion;
+         mainDlg->globalCfg_.welcomeDialogLastVersion = ffsVersion;
 -        showAboutDialog(mainDlg);
      }
  
  
-@@ -2773,6 +2772,8 @@ void MainDialog::onGridLabelContextRim(G
+@@ -2765,6 +2764,8 @@ void MainDialog::onGridLabelContextRim(G
      addFormatEntry(_("Item name"    ), ItemPathFormat::name);
      addFormatEntry(_("Relative path"), ItemPathFormat::relative);
      addFormatEntry(_("Full path"    ), ItemPathFormat::full);