From c32707148292d104c66276b43796d6057c8c7a5d Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 17:08:42 +0200 Subject: 3.10 --- Application.cpp | 23 +- BUILD/Changelog.txt | 24 +- BUILD/FreeFileSync.chm | Bin 376650 -> 377174 bytes BUILD/Help/FreeFileSync.hhp | 2 +- BUILD/Help/Table of Contents.hhc | 10 +- BUILD/Help/html/Unbenannt 1.odf | Bin 4975 -> 0 bytes BUILD/Help/html/advanced/BackupStrategy.html | 93 ++ BUILD/Help/html/advanced/CompareFileSize.html | 23 +- BUILD/Help/html/advanced/DaylightSavingTime.html | 71 +- BUILD/Help/html/advanced/EnvironmentVariables.html | 11 +- BUILD/Help/html/advanced/ExternalApp.html | 9 +- BUILD/Help/html/advanced/Ftp.html | 48 +- BUILD/Help/html/advanced/RealtimeSync.html | 13 +- BUILD/Help/html/advanced/RunAsService.html | 9 +- BUILD/Help/html/advanced/SendMail.html | 15 +- BUILD/Help/html/advanced/ShadowCopy.html | 14 +- BUILD/Help/html/advanced/SymbolicLinks.html | 6 +- BUILD/Help/html/advanced/TimeStamped.html | 78 -- BUILD/Languages/chinese_simple.lng | 42 +- BUILD/Languages/chinese_traditional.lng | 34 +- BUILD/Languages/czech.lng | 40 +- BUILD/Languages/dutch.lng | 32 +- BUILD/Languages/english_uk.lng | 36 +- BUILD/Languages/finnish.lng | 64 +- BUILD/Languages/french.lng | 36 +- BUILD/Languages/german.lng | 38 +- BUILD/Languages/hebrew.lng | 32 +- BUILD/Languages/hungarian.lng | 34 +- BUILD/Languages/italian.lng | 44 +- BUILD/Languages/japanese.lng | 34 +- BUILD/Languages/polish.lng | 38 +- BUILD/Languages/portuguese.lng | 128 +-- BUILD/Languages/portuguese_br.lng | 38 +- BUILD/Languages/romanian.lng | 38 +- BUILD/Languages/russian.lng | 74 +- BUILD/Languages/slovenian.lng | 42 +- BUILD/Languages/spanish.lng | 56 +- BUILD/Languages/swedish.lng | 40 +- BUILD/Languages/turkish.lng | 32 +- BUILD/Resources.dat | Bin 296186 -> 294348 bytes FreeFileSync - wxWidgets v2.9.1 Beta.vcxproj | 19 +- FreeFileSync.cbp | 25 +- FreeFileSync.vcxproj | 19 +- Makefile | 11 +- RealtimeSync/RealtimeSync.cbp | 14 +- RealtimeSync/RealtimeSync.vcxproj | 18 +- RealtimeSync/functions.cpp | 22 - RealtimeSync/functions.h | 21 - RealtimeSync/gui_generated.cpp | 10 +- RealtimeSync/gui_generated.h | 8 +- RealtimeSync/main_dlg.cpp | 64 +- RealtimeSync/main_dlg.h | 28 +- RealtimeSync/makefile | 12 +- RealtimeSync/notify.cpp | 10 +- RealtimeSync/resource.rc | 16 +- RealtimeSync/tray_menu.cpp | 136 ++- RealtimeSync/watcher.cpp | 6 +- RealtimeSync/xml_ffs.cpp | 2 +- RealtimeSync/xml_proc.h | 2 +- algorithm.cpp | 56 +- algorithm.h | 4 +- comparison.cpp | 204 ++-- comparison.h | 2 - file_hierarchy.cpp | 8 +- file_hierarchy.h | 8 +- library/custom_grid.cpp | 133 ++- library/custom_grid.h | 10 +- library/db_file.cpp | 13 +- library/db_file.h | 8 +- library/dir_lock.cpp | 177 ++- library/dir_lock.h | 4 +- library/error_log.h | 2 +- library/filter.cpp | 151 ++- library/filter.h | 4 +- library/icon_buffer.cpp | 91 +- library/icon_buffer.h | 20 +- library/process_xml.cpp | 14 +- library/process_xml.h | 4 +- library/status_handler.h | 6 +- resource.rc | 19 +- shared/IFileOperation/file_op.cpp | 32 +- shared/IFileOperation/file_op.h | 6 +- shared/ShadowCopy/shadow.cpp | 42 +- shared/ShadowCopy/shadow.h | 21 +- shared/Taskbar_Seven/taskbar.cpp | 112 +- shared/Taskbar_Seven/taskbar.h | 27 +- shared/app_main.cpp | 6 +- shared/app_main.h | 2 +- shared/c_dll.h | 132 +++ shared/check_exist.cpp | 32 +- shared/com_error.h | 3 + shared/com_util.h | 6 +- shared/custom_button.cpp | 2 + shared/debug_new.cpp | 19 +- shared/debug_new.h | 45 +- shared/dir_name.cpp | 281 +++++ shared/dir_name.h | 77 ++ shared/dll_loader.cpp | 44 +- shared/dll_loader.h | 28 +- shared/drag_n_drop.cpp | 219 ---- shared/drag_n_drop.h | 70 -- shared/dst_hack.cpp | 312 ++++++ shared/dst_hack.h | 38 + shared/file_handling.cpp | 237 ++-- shared/file_handling.h | 71 +- shared/file_id.cpp | 1 - shared/file_io.cpp | 3 +- shared/file_traverser.cpp | 419 ++++--- shared/file_traverser.h | 27 +- shared/global_func.cpp | 27 - shared/global_func.h | 18 - shared/guid.cpp | 10 + shared/lock.cpp | 22 - shared/lock.h | 26 - shared/loki/SmallObj.cpp | 26 +- shared/long_path_prefix.cpp | 12 +- shared/perf.h | 30 +- shared/recycler.cpp | 20 +- shared/serialize.h | 10 +- shared/shadow.cpp | 38 +- shared/shadow.h | 9 +- shared/string_conv.h | 34 +- shared/system_constants.h | 10 +- shared/taskbar.cpp | 125 +-- shared/taskbar.h | 2 +- shared/util.cpp | 199 ++-- shared/util.h | 11 +- shared/zbase.h | 1162 ++++++++++++++++++++ shared/zstring.cpp | 553 ++-------- shared/zstring.h | 795 ++----------- structures.cpp | 6 +- structures.h | 4 +- synchronization.cpp | 228 ++-- ui/batch_config.cpp | 85 +- ui/batch_config.h | 13 +- ui/batch_status_handler.cpp | 6 +- ui/batch_status_handler.h | 4 +- ui/folder_pair.h | 25 +- ui/gui_generated.cpp | 127 +-- ui/gui_generated.h | 300 ++--- ui/gui_status_handler.cpp | 6 +- ui/gui_status_handler.h | 6 +- ui/main_dlg.cpp | 237 ++-- ui/main_dlg.h | 19 +- ui/mouse_move_dlg.cpp | 23 +- ui/mouse_move_dlg.h | 21 +- ui/msg_popup.cpp | 16 + ui/progress_indicator.cpp | 8 +- ui/search.cpp | 6 + ui/small_dlgs.cpp | 45 +- ui/sorting.h | 4 +- ui/sync_cfg.cpp | 15 +- ui/sync_cfg.h | 4 +- ui/tray_icon.cpp | 21 +- version/version.h | 2 +- version/version.rc | 4 +- 156 files changed, 5414 insertions(+), 4056 deletions(-) delete mode 100644 BUILD/Help/html/Unbenannt 1.odf create mode 100644 BUILD/Help/html/advanced/BackupStrategy.html delete mode 100644 BUILD/Help/html/advanced/TimeStamped.html delete mode 100644 RealtimeSync/functions.cpp delete mode 100644 RealtimeSync/functions.h create mode 100644 shared/c_dll.h create mode 100644 shared/dir_name.cpp create mode 100644 shared/dir_name.h delete mode 100644 shared/drag_n_drop.cpp delete mode 100644 shared/drag_n_drop.h create mode 100644 shared/dst_hack.cpp create mode 100644 shared/dst_hack.h delete mode 100644 shared/lock.cpp delete mode 100644 shared/lock.h create mode 100644 shared/zbase.h diff --git a/Application.cpp b/Application.cpp index 120bd567..af111a65 100644 --- a/Application.cpp +++ b/Application.cpp @@ -102,6 +102,15 @@ void Application::OnStartApplication(wxIdleEvent&) GlobalResources::getInstance().load(); //loads bitmap resources on program startup +#ifndef _MSC_VER +#warning wxWidgets 2.9 +#endif + /* + wxToolTip::SetMaxWidth(-1); //disable tooltip wrapping + wxToolTip::SetAutoPop(7000); //tooltip visibilty in ms, 5s seems to be default for Windows + */ + + try //load global settings from XML { if (fileExists(wxToZ(xmlAccess::getGlobalConfigFile()))) @@ -182,9 +191,10 @@ int Application::OnExit() { xmlAccess::writeConfig(globalSettings); } - catch (const xmlAccess::XmlError& error) + catch (const xmlAccess::XmlError&) { - wxMessageBox(error.msg(), _("Error"), wxOK | wxICON_ERROR); + //wxMessageBox(error.msg(), _("Error"), wxOK | wxICON_ERROR); -> not that important/might be tedious in silent batch? + assert(false); //get info in debug build } return 0; @@ -233,10 +243,9 @@ void Application::runBatchMode(const wxString& filename, xmlAccess::XmlGlobalSet //COMPARE DIRECTORIES ffs3::FolderComparison folderCmp; ffs3::CompareProcess comparison(batchCfg.mainCfg.handleSymlinks, - globSettings.fileTimeTolerance, - globSettings.ignoreOneHourDiff, - globSettings.optDialogs, - statusHandler.get()); + globSettings.fileTimeTolerance, + globSettings.optDialogs, + statusHandler.get()); comparison.startCompareProcess(ffs3::extractCompareCfg(batchCfg.mainCfg), batchCfg.mainCfg.compareVar, @@ -245,7 +254,7 @@ void Application::runBatchMode(const wxString& filename, xmlAccess::XmlGlobalSet //check if there are files/folders to be sync'ed at all if (!synchronizationNeeded(folderCmp)) { - statusHandler->reportInfo(_("Nothing to synchronize according to configuration!")); //inform about this special case + statusHandler->logInfo(_("Nothing to synchronize according to configuration!")); //inform about this special case //return; -> disabled: mode requires database to be written in any case } diff --git a/BUILD/Changelog.txt b/BUILD/Changelog.txt index 693d96fc..97e98126 100644 --- a/BUILD/Changelog.txt +++ b/BUILD/Changelog.txt @@ -2,6 +2,28 @@ |FreeFileSync| -------------- +Changelog v3.10 +--------------- +Automatically solve daylight saving time and time zone shift issues on FAT/FAT32 (finally) +Instantly resolve abandoned directory locks associated with local computer +Show expanded directory name as tooltip and label text (resolves macros and relative paths) +Do not copy relative file attributes for base target directories that are created implicitly +Move dialogs by clicking (almost) anywhere +RealtimeSync: ignore request for device removal on Samba shares +Added UTF-8 BOM for CSV export +Correctly handle window position on multi-screen desktop +Disabled warning "database not yet existing" +RealtimeSync: replaced delay by minimum idle time +Maximum number of folder pairs configurable via GlobalSettings.xml (XML node ) +Added tooltips to display long filenames on main grid +Keep application responsive when deleting large directories +Vista/Windows 7: harmonize modification times shown on main grid with Windows Explorer +Changed background color to avoid unreadable texts in combination with certain color themes +Toggle middle grid comparison result/sync preview with right mouse button click +Further GUI enhancements/polishment/standard conformance +Updated translation files + + Changelog v3.9 -------------- Advanced locking strategy to allow multiple processes synchronize the same directories (e.g. via network share) @@ -31,7 +53,7 @@ Run folder existence checks in separate thread (faster network share access) Write mode database file even if both sides are already in sync Don't raise status dialog to the top after synchronisation Embedded version information into executable (Windows) -Migrated Compiler to Visual C++ 2010 (Windows) +Migrated compiler to Visual C++ 2010 (Windows) Avoid losing manual changes when excluding via context menu Adjusted auto-updater web-address Updated translation files diff --git a/BUILD/FreeFileSync.chm b/BUILD/FreeFileSync.chm index cfcf6752..381fc7ca 100644 Binary files a/BUILD/FreeFileSync.chm and b/BUILD/FreeFileSync.chm differ diff --git a/BUILD/Help/FreeFileSync.hhp b/BUILD/Help/FreeFileSync.hhp index 02e45e53..a20a4acd 100644 --- a/BUILD/Help/FreeFileSync.hhp +++ b/BUILD/Help/FreeFileSync.hhp @@ -20,7 +20,7 @@ html\advanced\Ftp.html html\advanced\ScheduleBatch.html html\advanced\SendMail.html html\advanced\SymbolicLinks.html -html\advanced\TimeStamped.html +html\advanced\BackupStrategy.html html\advanced\VariableDrive.html html\Overview.html html\advanced\DaylightSavingTime.html diff --git a/BUILD/Help/Table of Contents.hhc b/BUILD/Help/Table of Contents.hhc index 35ad8d46..1c23acff 100644 --- a/BUILD/Help/Table of Contents.hhc +++ b/BUILD/Help/Table of Contents.hhc @@ -28,12 +28,16 @@