forked from pool/FreeFileSync
6ea46d9294
* Show dynamic error and warning count in progress dialogs * Show process elevation status in title bar (Administrator, root) * Fixed libcurl bug CURLE_URL_MALFORMAT for numerical host name * Don't discard config panel last log after no changes found * Set taskbar relaunch command to launcher executable (Windows) * Fixed Btrfs compression not being applied during copy (Linux) * Run on file systems with buggy GetFinalPathNameByHandle() implementation, e.g. Dokany-based * Save selected view mode (F11) in batch config file - Rebase FreeFileSync-disable-in-app-updates.patch - Rebase FreeFileSync-resources.patch OBS-URL: https://build.opensuse.org/package/show/network/FreeFileSync?expand=0&rev=67
47 lines
2.4 KiB
Diff
47 lines
2.4 KiB
Diff
diff -ru a/FreeFileSync/Source/ui/gui_generated.cpp b/FreeFileSync/Source/ui/gui_generated.cpp
|
|
--- a/FreeFileSync/Source/ui/gui_generated.cpp 2023-06-20 10:23:07.000000000 +0200
|
|
+++ b/FreeFileSync/Source/ui/gui_generated.cpp 2023-06-28 08:56:38.529499152 +0200
|
|
@@ -108,13 +108,14 @@
|
|
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 );
|
|
+ // disable update/auto update actions for packaged version (they are only hidden, to not break any code and keep the patch small)
|
|
+ //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_menuHelp->Append( m_menuItemCheckVersionAuto );
|
|
m_menuItemCheckVersionAuto->Check( true );
|
|
|
|
m_menuHelp->AppendSeparator();
|
|
diff -ru a/FreeFileSync/Source/ui/main_dlg.cpp b/FreeFileSync/Source/ui/main_dlg.cpp
|
|
--- a/FreeFileSync/Source/ui/main_dlg.cpp 2023-06-20 10:23:07.000000000 +0200
|
|
+++ b/FreeFileSync/Source/ui/main_dlg.cpp 2023-06-28 08:57:07.697666495 +0200
|
|
@@ -945,7 +945,7 @@
|
|
updateGui();
|
|
|
|
//register regular check for update on next idle event
|
|
- Bind(wxEVT_IDLE, &MainDialog::onStartupUpdateCheck, this);
|
|
+ //Bind(wxEVT_IDLE, &MainDialog::onStartupUpdateCheck, this);
|
|
|
|
//asynchronous call to wxWindow::Dimensions(): fix superfluous frame on right and bottom when FFS is started in fullscreen mode
|
|
Bind(wxEVT_IDLE, &MainDialog::onLayoutWindowAsync, this);
|
|
diff -ru a/FreeFileSync/Source/ui/version_check.cpp b/FreeFileSync/Source/ui/version_check.cpp
|
|
--- a/FreeFileSync/Source/ui/version_check.cpp 2023-06-20 10:23:07.000000000 +0200
|
|
+++ b/FreeFileSync/Source/ui/version_check.cpp 2023-06-28 08:58:01.869976507 +0200
|
|
@@ -84,7 +84,8 @@
|
|
return false;
|
|
|
|
const time_t now = std::time(nullptr);
|
|
- return std::abs(now - lastUpdateCheck) >= 7 * 24 * 3600; //check weekly
|
|
+ //return std::abs(now - lastUpdateCheck) >= 7 * 24 * 3600; //check weekly
|
|
+ return false;
|
|
}
|
|
|
|
|