bf8ba3aac6
* Merge logs of individual steps (comparison, manual operation, sync) * Show total percentage in progress dialog header * Log and report errors during cleanup or exception handling * Skip folder traversal if existence check fails for other side of the pair * Automatically adapt batch options to prevent hanging a non-interactive process (Windows) * Support path lists for external applications: %item_paths%, %local_paths%, %item_names%, %parent_paths% * Create directory lock files with hidden attribute * Don't clear other side when right-clicking file selection * Fixed passive FTP when using different IP than control connection * Work around FTP servers silently renaming unsupported characters of temporary file OBS-URL: https://build.opensuse.org/package/show/network/FreeFileSync?expand=0&rev=69
46 lines
2.3 KiB
Diff
46 lines
2.3 KiB
Diff
diff -ru orig/FreeFileSync/Source/ui/gui_generated.cpp mod/FreeFileSync/Source/ui/gui_generated.cpp
|
|
--- orig/FreeFileSync/Source/ui/gui_generated.cpp 2023-07-21 15:28:49.000000000 +0200
|
|
+++ mod/FreeFileSync/Source/ui/gui_generated.cpp 2023-08-02 14:27:08.425812785 +0200
|
|
@@ -108,13 +108,13 @@
|
|
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_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 orig/FreeFileSync/Source/ui/main_dlg.cpp mod/FreeFileSync/Source/ui/main_dlg.cpp
|
|
--- orig/FreeFileSync/Source/ui/main_dlg.cpp 2023-07-21 15:28:49.000000000 +0200
|
|
+++ mod/FreeFileSync/Source/ui/main_dlg.cpp 2023-08-02 14:27:26.222583175 +0200
|
|
@@ -955,7 +955,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 orig/FreeFileSync/Source/ui/version_check.cpp mod/FreeFileSync/Source/ui/version_check.cpp
|
|
--- orig/FreeFileSync/Source/ui/version_check.cpp 2023-07-21 15:28:49.000000000 +0200
|
|
+++ mod/FreeFileSync/Source/ui/version_check.cpp 2023-08-02 14:27:41.709340094 +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;
|
|
}
|
|
|
|
|