ffs 11.28 dpkg rc1

1 files changed, 18 insertions, 18 deletions

diff --git a/freefilesync/01_no_check_updates.patch b/freefilesync/01_no_check_updates.patch
index d37005d..005f662 100644
--- a/freefilesync/01_no_check_updates.patch
+++ b/freefilesync/01_no_check_updates.patch
@@ -1,5 +1,5 @@
-Version: 11.25
-Date: 2022-09-07
+Version: 11.28
+Date: 2022-11-22
 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
@@ -20,7 +20,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
      m_menuItemAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About") ) + wxT('\t') + wxT("Shift+F1"), wxEmptyString, wxITEM_NORMAL );
      m_menuHelp->Append( m_menuItemAbout );
  
-@@ -1132,8 +1123,6 @@
+@@ -1129,8 +1120,6 @@ MainDialogGenerated::MainDialogGenerated
      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());
@@ -28,7 +28,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
 -    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_buttonCompare->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCompare ), NULL, this );
-     m_buttonCompare->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onCompSettingsContextMouse ), NULL, this );
+     m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCmpSettings ), NULL, this );
 --- a/FreeFileSync/Source/ui/gui_generated.h
 +++ b/FreeFileSync/Source/ui/gui_generated.h
 @@ -96,8 +96,6 @@ protected:
@@ -40,7 +40,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
      wxMenuItem* m_menuItemAbout;
      wxBoxSizer* bSizerPanelHolder;
      wxPanel* m_panelTopButtons;
-@@ -232,8 +230,6 @@ protected:
+@@ -234,8 +232,6 @@ protected:
      virtual void onMenuExportFileList( wxCommandEvent& event ) { event.Skip(); }
      virtual void onMenuResetLayout( wxCommandEvent& event ) { event.Skip(); }
      virtual void onShowHelp( wxCommandEvent& event ) { event.Skip(); }
@@ -51,7 +51,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
      virtual void onCompSettingsContext( wxCommandEvent& event ) { event.Skip(); }
 --- a/FreeFileSync/Source/ui/main_dlg.cpp
 +++ b/FreeFileSync/Source/ui/main_dlg.cpp
-@@ -30,7 +30,6 @@
+@@ -31,7 +31,6 @@
  #include <wx+/window_tools.h>
  #include <wx+/image_resources.h>
  #include "cfg_grid.h"
@@ -59,7 +59,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
  #include "gui_status_handler.h"
  #include "small_dlgs.h"
  #include "progress_indicator.h"
-@@ -826,7 +825,6 @@ imgFileManagerSmall_([]
+@@ -830,7 +829,6 @@ imgFileManagerSmall_([]
  
      setImage(*m_menuItemHelp,            loadImage("help_sicon"));
      setImage(*m_menuItemAbout,           loadImage("about_sicon"));
@@ -67,7 +67,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
  
      fixMenuIcons(*m_menuFile);
      fixMenuIcons(*m_menuActions);
-@@ -927,9 +925,6 @@ imgFileManagerSmall_([]
+@@ -930,9 +928,6 @@ imgFileManagerSmall_([]
      //mainly to update row label sizes...
      updateGui();
  
@@ -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()
-@@ -1123,8 +1118,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();
  }
  
-@@ -5746,72 +5739,6 @@ void MainDialog::onMenuExportFileList(wx
+@@ -5831,72 +5824,6 @@ void MainDialog::onMenuExportFileList(wx
      }
  }
  
@@ -170,9 +170,9 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
      void onMenuAbout          (wxCommandEvent& event) override;
      void onShowHelp           (wxCommandEvent& event) override { wxLaunchDefaultBrowser(L"https://freefilesync.org/manual.php?topic=freefilesync"); }
      void onMenuQuit           (wxCommandEvent& event) override { Close(); }
---- 11.25-0/FreeFileSync/Source/ui/version_check.cpp	2022-09-07 14:54:31.556630130 -0400
-+++ 11.25-1/FreeFileSync/Source/ui/version_check.cpp	2022-09-07 15:24:11.648682649 -0400
-@@ -79,6 +79,8 @@
+--- a/FreeFileSync/Source/ui/version_check.cpp
++++ b/FreeFileSync/Source/ui/version_check.cpp
+@@ -79,6 +79,8 @@ void openBrowserForDownload(wxWindow* pa
  
  bool fff::shouldRunAutomaticUpdateCheck(time_t lastUpdateCheck)
  {
@@ -181,7 +181,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
      if (lastUpdateCheck == getVersionCheckInactiveId())
          return false;
  
-@@ -175,8 +174,7 @@
+@@ -175,8 +177,7 @@ void showUpdateAvailableDialog(wxWindow*
      std::wstring updateDetailsMsg;
      try
      {
@@ -191,7 +191,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
      }
      catch (const SysError& e) { updateDetailsMsg = _("Failed to retrieve update information.") + + L"\n\n" + e.toString(); }
  
-@@ -198,8 +196,8 @@
+@@ -198,8 +199,8 @@ void showUpdateAvailableDialog(wxWindow*
  
  std::string getOnlineVersion(const std::vector<std::pair<std::string, std::string>>& postParams) //throw SysError
  {
@@ -202,7 +202,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
  
      if (response.empty() ||
      !std::all_of(response.begin(), response.end(), [](char c) { return isDigit(c) || c == FFS_VERSION_SEPARATOR; }) ||
-@@ -239,58 +240,6 @@
+@@ -246,58 +247,6 @@ void fff::disableUpdateCheck(time_t& las
  }
  
  
@@ -275,7 +275,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
  #endif //VERSION_CHECK_H_324872374893274983275
 --- a/FreeFileSync/Source/Makefile
 +++ b/FreeFileSync/Source/Makefile
-@@ -77,7 +77,6 @@ cppFiles+=ui/small_dlgs.cpp
+@@ -78,7 +78,6 @@ cppFiles+=ui/small_dlgs.cpp
  cppFiles+=ui/sync_cfg.cpp
  cppFiles+=ui/tray_icon.cpp
  cppFiles+=ui/triple_splitter.cpp
@@ -285,7 +285,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
  cppFiles+=../../zen/file_io.cpp
 --- a/FreeFileSync/Source/ui/small_dlgs.cpp
 +++ b/FreeFileSync/Source/ui/small_dlgs.cpp
-@@ -27,7 +27,6 @@
+@@ -26,7 +26,6 @@
  #include <wx+/image_resources.h>
  #include "gui_generated.h"
  #include "folder_selector.h"