From c0fce877c478ddbf71a1b651c789e5ea00a00144 Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 17:05:30 +0200 Subject: 3.4 --- Application.cpp | 48 +- Application.h | 16 +- BUILD/Changelog.txt | 21 + BUILD/FreeFileSync.chm | Bin 168410 -> 265290 bytes BUILD/Help/FreeFileSync.hhp | 1 + BUILD/Help/Table of Contents.hhc | 4 + BUILD/Help/html/Features.html | 4 +- .../069dee95-d329-4e99-ab3d-678edf80fbca.jpeg | Bin 0 -> 35558 bytes .../17e8fbfe-a994-4860-abaa-e00e0289b44c.jpeg | Bin 0 -> 7121 bytes .../7aa44556-38dc-467e-9902-2c9143cd0116.jpeg | Bin 0 -> 67331 bytes .../93f0cb09-bd16-4d76-b764-e30042a8e123.jpeg | Bin 0 -> 5576 bytes BUILD/Help/html/advanced/EnvironmentVariables.html | 8 +- BUILD/Help/html/advanced/RunAsService.html | 116 +++ .../html/advanced/RunAsService_html_4f230a46.jpg | Bin 0 -> 11177 bytes .../html/advanced/RunAsService_html_68e0fe53.jpg | Bin 0 -> 4262 bytes .../html/advanced/RunAsService_html_m3be0f332.jpg | Bin 0 -> 7969 bytes .../html/advanced/RunAsService_html_m3e56d901.jpg | Bin 0 -> 30249 bytes BUILD/Help/html/advanced/ScheduleBatch.html | 27 +- .../html/advanced/ScheduleBatch_html_372f0f3.gif | Bin 0 -> 20148 bytes .../html/advanced/ScheduleBatch_html_m10bf0d36.gif | Bin 0 -> 20720 bytes BUILD/Help/html/advanced/SendMail.html | 17 +- BUILD/Help/html/advanced/VariableDrive.html | 16 +- .../bf02de4e-7b45-4353-97e8-85b55cff3ac5.jpeg | Bin 0 -> 5829 bytes .../ce1ccceb-e3c6-4fab-adac-ef16f36698b0.jpeg | Bin 0 -> 12654 bytes .../f1d462c4-3bd9-4463-a858-ae3de5f6af9e.jpeg | Bin 0 -> 8929 bytes BUILD/Languages/chinese_simple.lng | 120 +-- BUILD/Languages/chinese_traditional.lng | 122 +-- BUILD/Languages/czech.lng | 122 +-- BUILD/Languages/dutch.lng | 120 +-- BUILD/Languages/finnish.lng | 162 ++-- BUILD/Languages/french.lng | 232 ++--- BUILD/Languages/german.lng | 126 +-- BUILD/Languages/hungarian.lng | 122 +-- BUILD/Languages/italian.lng | 120 +-- BUILD/Languages/japanese.lng | 108 ++- BUILD/Languages/polish.lng | 122 +-- BUILD/Languages/portuguese.lng | 114 +-- BUILD/Languages/portuguese_br.lng | 124 +-- BUILD/Languages/romanian.lng | 136 +-- BUILD/Languages/russian.lng | 116 +-- BUILD/Languages/slovenian.lng | 124 +-- BUILD/Languages/spanish.lng | 258 ++--- BUILD/Languages/swedish.lng | 122 +-- BUILD/Languages/turkish.lng | 112 +-- BUILD/Resources.dat | Bin 275228 -> 291613 bytes Cleanup.cmd | 30 +- FreeFileSync.cbp | 46 +- FreeFileSync.vcproj | 29 +- Makefile | 55 +- RealtimeSync/RealtimeSync.cbp | 1 + RealtimeSync/RealtimeSync.vcproj | 24 +- RealtimeSync/application.cpp | 29 +- RealtimeSync/application.h | 16 +- RealtimeSync/functions.cpp | 6 + RealtimeSync/functions.h | 6 + RealtimeSync/guiGenerated.cpp | 10 +- RealtimeSync/mainDialog.cpp | 29 +- RealtimeSync/mainDialog.h | 17 +- RealtimeSync/makefile | 21 +- RealtimeSync/pch.h | 6 + RealtimeSync/resources.cpp | 8 +- RealtimeSync/resources.h | 6 + RealtimeSync/trayMenu.cpp | 16 +- RealtimeSync/trayMenu.h | 6 + RealtimeSync/watcher.cpp | 16 +- RealtimeSync/watcher.h | 6 + RealtimeSync/xmlFreeFileSync.cpp | 8 +- RealtimeSync/xmlFreeFileSync.h | 6 + RealtimeSync/xmlProcessing.cpp | 6 + RealtimeSync/xmlProcessing.h | 6 + algorithm.cpp | 117 ++- algorithm.h | 6 + comparison.cpp | 275 ++---- comparison.h | 14 +- fileHierarchy.cpp | 42 +- fileHierarchy.h | 27 +- library/CustomGrid.cpp | 294 +++--- library/CustomGrid.h | 11 +- library/Recycler/Recycler_Vista.vcproj | 409 -------- library/Recycler/dllmain.cpp | 22 - library/Recycler/recycler.cpp | 142 --- library/Recycler/recycler.h | 24 - library/Recycler_Vista/Recycler_Vista.vcproj | 409 ++++++++ library/Recycler_Vista/dllmain.cpp | 27 + library/Recycler_Vista/recycler.cpp | 148 +++ library/Recycler_Vista/recycler.h | 30 + library/ShadowCopy/dllmain.cpp | 7 +- library/ShadowCopy/shadow.cpp | 6 + library/ShadowCopy/shadow.h | 6 + library/binary.cpp | 122 +++ library/binary.h | 28 + library/detectRenaming.cpp | 6 + library/detectRenaming.h | 6 + library/errorLogging.cpp | 6 + library/errorLogging.h | 16 +- library/filter.cpp | 6 + library/filter.h | 6 + library/iconBuffer.cpp | 171 ++-- library/iconBuffer.h | 30 +- library/multithreading.cpp | 6 + library/multithreading.h | 6 + library/pch.h | 10 + library/processXml.cpp | 51 +- library/processXml.h | 40 +- library/resources.cpp | 8 +- library/resources.h | 6 + library/statistics.cpp | 8 + library/statistics.h | 6 + library/statusHandler.cpp | 6 + library/statusHandler.h | 6 + shared/appMain.cpp | 6 + shared/appMain.h | 6 + shared/buildInfo.h | 6 + shared/customButton.cpp | 8 +- shared/customButton.h | 12 +- shared/customComboBox.cpp | 6 + shared/customComboBox.h | 8 +- shared/customTooltip.cpp | 8 +- shared/customTooltip.h | 6 + shared/dllLoader.cpp | 6 + shared/dllLoader.h | 6 + shared/dragAndDrop.cpp | 33 +- shared/dragAndDrop.h | 6 + shared/fileError.h | 6 + shared/fileHandling.cpp | 303 +++--- shared/fileHandling.h | 17 +- shared/fileID.cpp | 24 +- shared/fileID.h | 6 + shared/fileTraverser.cpp | 57 +- shared/fileTraverser.h | 28 +- shared/globalFunctions.cpp | 8 + shared/globalFunctions.h | 6 + shared/guid.cpp | 6 + shared/guid.h | 6 + shared/helpProvider.cpp | 44 + shared/helpProvider.h | 17 + shared/inotify/CHANGELOG | 3 + shared/inotify/COPYING | 2 +- shared/inotify/LICENSE-X11 | 2 +- shared/inotify/README | 2 +- shared/inotify/VERSION | 1 - shared/inotify/doc/html/annotated.html | 47 +- shared/inotify/doc/html/classInotify-members.html | 51 +- shared/inotify/doc/html/classInotify.html | 744 +++++++++------ .../doc/html/classInotifyEvent-members.html | 59 +- shared/inotify/doc/html/classInotifyEvent.html | 404 +++++--- ...nt_309ebf3c5b131522295185a926d551bb_icgraph.map | 4 + ...nt_309ebf3c5b131522295185a926d551bb_icgraph.md5 | 1 + ...nt_309ebf3c5b131522295185a926d551bb_icgraph.png | Bin 0 -> 9618 bytes ...nt_5ab91d587bdc7ab3c18c6cdff73f3097_icgraph.map | 1 + ...nt_5ab91d587bdc7ab3c18c6cdff73f3097_icgraph.md5 | 1 + ...nt_5ab91d587bdc7ab3c18c6cdff73f3097_icgraph.png | Bin 0 -> 3331 bytes .../doc/html/classInotifyEvent__coll__graph.map | 2 + .../doc/html/classInotifyEvent__coll__graph.md5 | 1 + .../doc/html/classInotifyEvent__coll__graph.png | Bin 0 -> 4658 bytes ...nt_c08a0a26ea33dbe94aaf1ac830c103a5_icgraph.map | 1 + ...nt_c08a0a26ea33dbe94aaf1ac830c103a5_icgraph.md5 | 1 + ...nt_c08a0a26ea33dbe94aaf1ac830c103a5_icgraph.png | Bin 0 -> 3424 bytes ...nt_c7160544f6f4f24611df57a4422ac47f_icgraph.map | 1 + ...nt_c7160544f6f4f24611df57a4422ac47f_icgraph.md5 | 1 + ...nt_c7160544f6f4f24611df57a4422ac47f_icgraph.png | Bin 0 -> 3681 bytes .../doc/html/classInotifyException-members.html | 45 +- shared/inotify/doc/html/classInotifyException.html | 101 +- .../doc/html/classInotifyWatch-members.html | 55 +- shared/inotify/doc/html/classInotifyWatch.html | 349 +++++-- ...ch_2e659c699e7d43bd0a218fe4905784d2_icgraph.map | 2 + ...ch_2e659c699e7d43bd0a218fe4905784d2_icgraph.md5 | 1 + ...ch_2e659c699e7d43bd0a218fe4905784d2_icgraph.png | Bin 0 -> 3258 bytes ...ch_804cdc1e9579a075a60c239b202559f4_icgraph.map | 1 + ...ch_804cdc1e9579a075a60c239b202559f4_icgraph.md5 | 1 + ...ch_804cdc1e9579a075a60c239b202559f4_icgraph.png | Bin 0 -> 3724 bytes ...ch_855f982421402dd63d064dde328f2a59_icgraph.map | 1 + ...ch_855f982421402dd63d064dde328f2a59_icgraph.md5 | 1 + ...ch_855f982421402dd63d064dde328f2a59_icgraph.png | Bin 0 -> 3963 bytes .../doc/html/classInotifyWatch__coll__graph.map | 1 + .../doc/html/classInotifyWatch__coll__graph.md5 | 1 + .../doc/html/classInotifyWatch__coll__graph.png | Bin 0 -> 3053 bytes ...ch_f759f9baca6f4abbbaae57e076486009_icgraph.map | 3 + ...ch_f759f9baca6f4abbbaae57e076486009_icgraph.md5 | 1 + ...ch_f759f9baca6f4abbbaae57e076486009_icgraph.png | Bin 0 -> 7077 bytes ...fy_19cde43d082ff92bd02654610019300d_icgraph.map | 1 + ...fy_19cde43d082ff92bd02654610019300d_icgraph.md5 | 1 + ...fy_19cde43d082ff92bd02654610019300d_icgraph.png | Bin 0 -> 2766 bytes ...fy_21c39bb8e5bbc1941b945c18f9005b84_icgraph.map | 1 + ...fy_21c39bb8e5bbc1941b945c18f9005b84_icgraph.md5 | 1 + ...fy_21c39bb8e5bbc1941b945c18f9005b84_icgraph.png | Bin 0 -> 2751 bytes ...fy_2ef771ebaf982d76ebe19b3f5bc9cd83_icgraph.map | 1 + ...fy_2ef771ebaf982d76ebe19b3f5bc9cd83_icgraph.md5 | 1 + ...fy_2ef771ebaf982d76ebe19b3f5bc9cd83_icgraph.png | Bin 0 -> 2377 bytes ...fy_490a3f824c6d041d31ccaabe9bd92008_icgraph.map | 1 + ...fy_490a3f824c6d041d31ccaabe9bd92008_icgraph.md5 | 1 + ...fy_490a3f824c6d041d31ccaabe9bd92008_icgraph.png | Bin 0 -> 2675 bytes ...fy_70b3b57e8661fbb4c5bc404b86225c3b_icgraph.map | 3 + ...fy_70b3b57e8661fbb4c5bc404b86225c3b_icgraph.md5 | 1 + ...fy_70b3b57e8661fbb4c5bc404b86225c3b_icgraph.png | Bin 0 -> 9913 bytes ...fy_734538233ba2136164f76f4df6c3654e_icgraph.map | 3 + ...fy_734538233ba2136164f76f4df6c3654e_icgraph.md5 | 1 + ...fy_734538233ba2136164f76f4df6c3654e_icgraph.png | Bin 0 -> 10284 bytes ...fy_86ae86c43ea1a72f562ca46393309635_icgraph.map | 1 + ...fy_86ae86c43ea1a72f562ca46393309635_icgraph.md5 | 1 + ...fy_86ae86c43ea1a72f562ca46393309635_icgraph.png | Bin 0 -> 2364 bytes ...fy_bc1fd5830ca561efb69bcd2283981741_icgraph.map | 2 + ...fy_bc1fd5830ca561efb69bcd2283981741_icgraph.md5 | 1 + ...fy_bc1fd5830ca561efb69bcd2283981741_icgraph.png | Bin 0 -> 3286 bytes shared/inotify/doc/html/classes.html | 32 + shared/inotify/doc/html/doxygen.css | 645 +++++++------ shared/inotify/doc/html/files.html | 45 +- shared/inotify/doc/html/functions.html | 161 ++-- shared/inotify/doc/html/functions_func.html | 124 +-- shared/inotify/doc/html/functions_rela.html | 53 +- shared/inotify/doc/html/functions_vars.html | 80 +- shared/inotify/doc/html/globals.html | 55 +- shared/inotify/doc/html/globals_defs.html | 55 +- shared/inotify/doc/html/globals_enum.html | 55 +- shared/inotify/doc/html/globals_eval.html | 55 +- shared/inotify/doc/html/globals_type.html | 55 +- shared/inotify/doc/html/graph_legend.dot | 22 + shared/inotify/doc/html/graph_legend.html | 84 ++ shared/inotify/doc/html/graph_legend.png | Bin 0 -> 18687 bytes shared/inotify/doc/html/index.html | 28 +- shared/inotify/doc/html/inotify-cxx_8cpp.html | 67 +- shared/inotify/doc/html/inotify-cxx_8cpp__incl.map | 1 + shared/inotify/doc/html/inotify-cxx_8cpp__incl.md5 | 1 + shared/inotify/doc/html/inotify-cxx_8cpp__incl.png | Bin 0 -> 23669 bytes shared/inotify/doc/html/inotify-cxx_8h-source.html | 505 ---------- shared/inotify/doc/html/inotify-cxx_8h.html | 109 ++- .../inotify/doc/html/inotify-cxx_8h__dep__incl.map | 1 + .../inotify/doc/html/inotify-cxx_8h__dep__incl.md5 | 1 + .../inotify/doc/html/inotify-cxx_8h__dep__incl.png | Bin 0 -> 2602 bytes shared/inotify/doc/html/inotify-cxx_8h__incl.map | 0 shared/inotify/doc/html/inotify-cxx_8h__incl.md5 | 1 + shared/inotify/doc/html/inotify-cxx_8h__incl.png | Bin 0 -> 8941 bytes shared/inotify/doc/html/inotify-cxx_8h_source.html | 503 ++++++++++ shared/inotify/doc/html/tabs.css | 13 +- shared/inotify/doc/man/man3/Inotify.3 | 376 ++++---- shared/inotify/doc/man/man3/InotifyEvent.3 | 172 ++-- shared/inotify/doc/man/man3/InotifyException.3 | 33 +- shared/inotify/doc/man/man3/InotifyWatch.3 | 134 ++- shared/inotify/doc/man/man3/inotify-cxx.cpp.3 | 18 +- shared/inotify/doc/man/man3/inotify-cxx.h.3 | 16 +- shared/inotify/inotify-cxx.cpp | 17 +- shared/inotify/inotify-cxx.h | 14 +- shared/localization.cpp | 47 +- shared/localization.h | 9 +- shared/loki/CHANGES | 446 +++++++++ shared/longPathPrefix.cpp | 46 +- shared/longPathPrefix.h | 9 +- shared/recycler.cpp | 102 +- shared/recycler.h | 37 +- shared/serialize.cpp | 6 + shared/serialize.h | 6 + shared/shadow.cpp | 10 +- shared/shadow.h | 6 + shared/standardPaths.cpp | 93 +- shared/standardPaths.h | 18 +- shared/staticAssert.h | 6 + shared/stringConv.h | 6 + shared/systemConstants.h | 6 + shared/systemFunctions.cpp | 8 +- shared/systemFunctions.h | 6 + shared/toggleButton.cpp | 6 + shared/toggleButton.h | 6 + shared/xmlBase.cpp | 6 + shared/xmlBase.h | 6 + shared/zstring.cpp | 53 +- shared/zstring.h | 71 +- structures.cpp | 170 ++-- structures.h | 171 ++-- synchronization.cpp | 790 +++++++++------ synchronization.h | 17 +- ui/MainDialog.cpp | 213 +++-- ui/MainDialog.h | 29 +- ui/SmallDialogs.cpp | 1009 ++++++-------------- ui/SmallDialogs.h | 368 +------ ui/appMain.h | 20 - ui/batchStatusHandler.cpp | 87 +- ui/batchStatusHandler.h | 10 +- ui/checkVersion.cpp | 17 +- ui/checkVersion.h | 6 + ui/folderPair.h | 35 +- ui/gridView.cpp | 50 +- ui/gridView.h | 10 + ui/guiGenerated.cpp | 391 ++++---- ui/guiGenerated.h | 93 +- ui/guiStatusHandler.cpp | 125 +-- ui/guiStatusHandler.h | 9 +- ui/messagePopup.cpp | 180 ++++ ui/messagePopup.h | 80 ++ ui/mouseMoveWindow.cpp | 26 + ui/mouseMoveWindow.h | 36 + ui/progressIndicator.cpp | 773 +++++++++++++++ ui/progressIndicator.h | 76 ++ ui/search.cpp | 264 +++++ ui/search.h | 20 + ui/settingsDialog.cpp | 105 +- ui/settingsDialog.h | 13 +- ui/sorting.h | 37 +- ui/trayIcon.cpp | 179 ++-- ui/trayIcon.h | 6 + ui/util.cpp | 12 +- ui/util.h | 8 +- version/version.h | 8 +- 302 files changed, 11096 insertions(+), 7286 deletions(-) create mode 100644 BUILD/Help/html/advanced/069dee95-d329-4e99-ab3d-678edf80fbca.jpeg create mode 100644 BUILD/Help/html/advanced/17e8fbfe-a994-4860-abaa-e00e0289b44c.jpeg create mode 100644 BUILD/Help/html/advanced/7aa44556-38dc-467e-9902-2c9143cd0116.jpeg create mode 100644 BUILD/Help/html/advanced/93f0cb09-bd16-4d76-b764-e30042a8e123.jpeg create mode 100644 BUILD/Help/html/advanced/RunAsService.html create mode 100644 BUILD/Help/html/advanced/RunAsService_html_4f230a46.jpg create mode 100644 BUILD/Help/html/advanced/RunAsService_html_68e0fe53.jpg create mode 100644 BUILD/Help/html/advanced/RunAsService_html_m3be0f332.jpg create mode 100644 BUILD/Help/html/advanced/RunAsService_html_m3e56d901.jpg create mode 100644 BUILD/Help/html/advanced/ScheduleBatch_html_372f0f3.gif create mode 100644 BUILD/Help/html/advanced/ScheduleBatch_html_m10bf0d36.gif create mode 100644 BUILD/Help/html/advanced/bf02de4e-7b45-4353-97e8-85b55cff3ac5.jpeg create mode 100644 BUILD/Help/html/advanced/ce1ccceb-e3c6-4fab-adac-ef16f36698b0.jpeg create mode 100644 BUILD/Help/html/advanced/f1d462c4-3bd9-4463-a858-ae3de5f6af9e.jpeg delete mode 100644 library/Recycler/Recycler_Vista.vcproj delete mode 100644 library/Recycler/dllmain.cpp delete mode 100644 library/Recycler/recycler.cpp delete mode 100644 library/Recycler/recycler.h create mode 100644 library/Recycler_Vista/Recycler_Vista.vcproj create mode 100644 library/Recycler_Vista/dllmain.cpp create mode 100644 library/Recycler_Vista/recycler.cpp create mode 100644 library/Recycler_Vista/recycler.h create mode 100644 library/binary.cpp create mode 100644 library/binary.h create mode 100644 shared/helpProvider.cpp create mode 100644 shared/helpProvider.h delete mode 100644 shared/inotify/VERSION create mode 100644 shared/inotify/doc/html/classInotifyEvent_309ebf3c5b131522295185a926d551bb_icgraph.map create mode 100644 shared/inotify/doc/html/classInotifyEvent_309ebf3c5b131522295185a926d551bb_icgraph.md5 create mode 100644 shared/inotify/doc/html/classInotifyEvent_309ebf3c5b131522295185a926d551bb_icgraph.png create mode 100644 shared/inotify/doc/html/classInotifyEvent_5ab91d587bdc7ab3c18c6cdff73f3097_icgraph.map create mode 100644 shared/inotify/doc/html/classInotifyEvent_5ab91d587bdc7ab3c18c6cdff73f3097_icgraph.md5 create mode 100644 shared/inotify/doc/html/classInotifyEvent_5ab91d587bdc7ab3c18c6cdff73f3097_icgraph.png create mode 100644 shared/inotify/doc/html/classInotifyEvent__coll__graph.map create mode 100644 shared/inotify/doc/html/classInotifyEvent__coll__graph.md5 create mode 100644 shared/inotify/doc/html/classInotifyEvent__coll__graph.png create mode 100644 shared/inotify/doc/html/classInotifyEvent_c08a0a26ea33dbe94aaf1ac830c103a5_icgraph.map create mode 100644 shared/inotify/doc/html/classInotifyEvent_c08a0a26ea33dbe94aaf1ac830c103a5_icgraph.md5 create mode 100644 shared/inotify/doc/html/classInotifyEvent_c08a0a26ea33dbe94aaf1ac830c103a5_icgraph.png create mode 100644 shared/inotify/doc/html/classInotifyEvent_c7160544f6f4f24611df57a4422ac47f_icgraph.map create mode 100644 shared/inotify/doc/html/classInotifyEvent_c7160544f6f4f24611df57a4422ac47f_icgraph.md5 create mode 100644 shared/inotify/doc/html/classInotifyEvent_c7160544f6f4f24611df57a4422ac47f_icgraph.png create mode 100644 shared/inotify/doc/html/classInotifyWatch_2e659c699e7d43bd0a218fe4905784d2_icgraph.map create mode 100644 shared/inotify/doc/html/classInotifyWatch_2e659c699e7d43bd0a218fe4905784d2_icgraph.md5 create mode 100644 shared/inotify/doc/html/classInotifyWatch_2e659c699e7d43bd0a218fe4905784d2_icgraph.png create mode 100644 shared/inotify/doc/html/classInotifyWatch_804cdc1e9579a075a60c239b202559f4_icgraph.map create mode 100644 shared/inotify/doc/html/classInotifyWatch_804cdc1e9579a075a60c239b202559f4_icgraph.md5 create mode 100644 shared/inotify/doc/html/classInotifyWatch_804cdc1e9579a075a60c239b202559f4_icgraph.png create mode 100644 shared/inotify/doc/html/classInotifyWatch_855f982421402dd63d064dde328f2a59_icgraph.map create mode 100644 shared/inotify/doc/html/classInotifyWatch_855f982421402dd63d064dde328f2a59_icgraph.md5 create mode 100644 shared/inotify/doc/html/classInotifyWatch_855f982421402dd63d064dde328f2a59_icgraph.png create mode 100644 shared/inotify/doc/html/classInotifyWatch__coll__graph.map create mode 100644 shared/inotify/doc/html/classInotifyWatch__coll__graph.md5 create mode 100644 shared/inotify/doc/html/classInotifyWatch__coll__graph.png create mode 100644 shared/inotify/doc/html/classInotifyWatch_f759f9baca6f4abbbaae57e076486009_icgraph.map create mode 100644 shared/inotify/doc/html/classInotifyWatch_f759f9baca6f4abbbaae57e076486009_icgraph.md5 create mode 100644 shared/inotify/doc/html/classInotifyWatch_f759f9baca6f4abbbaae57e076486009_icgraph.png create mode 100644 shared/inotify/doc/html/classInotify_19cde43d082ff92bd02654610019300d_icgraph.map create mode 100644 shared/inotify/doc/html/classInotify_19cde43d082ff92bd02654610019300d_icgraph.md5 create mode 100644 shared/inotify/doc/html/classInotify_19cde43d082ff92bd02654610019300d_icgraph.png create mode 100644 shared/inotify/doc/html/classInotify_21c39bb8e5bbc1941b945c18f9005b84_icgraph.map create mode 100644 shared/inotify/doc/html/classInotify_21c39bb8e5bbc1941b945c18f9005b84_icgraph.md5 create mode 100644 shared/inotify/doc/html/classInotify_21c39bb8e5bbc1941b945c18f9005b84_icgraph.png create mode 100644 shared/inotify/doc/html/classInotify_2ef771ebaf982d76ebe19b3f5bc9cd83_icgraph.map create mode 100644 shared/inotify/doc/html/classInotify_2ef771ebaf982d76ebe19b3f5bc9cd83_icgraph.md5 create mode 100644 shared/inotify/doc/html/classInotify_2ef771ebaf982d76ebe19b3f5bc9cd83_icgraph.png create mode 100644 shared/inotify/doc/html/classInotify_490a3f824c6d041d31ccaabe9bd92008_icgraph.map create mode 100644 shared/inotify/doc/html/classInotify_490a3f824c6d041d31ccaabe9bd92008_icgraph.md5 create mode 100644 shared/inotify/doc/html/classInotify_490a3f824c6d041d31ccaabe9bd92008_icgraph.png create mode 100644 shared/inotify/doc/html/classInotify_70b3b57e8661fbb4c5bc404b86225c3b_icgraph.map create mode 100644 shared/inotify/doc/html/classInotify_70b3b57e8661fbb4c5bc404b86225c3b_icgraph.md5 create mode 100644 shared/inotify/doc/html/classInotify_70b3b57e8661fbb4c5bc404b86225c3b_icgraph.png create mode 100644 shared/inotify/doc/html/classInotify_734538233ba2136164f76f4df6c3654e_icgraph.map create mode 100644 shared/inotify/doc/html/classInotify_734538233ba2136164f76f4df6c3654e_icgraph.md5 create mode 100644 shared/inotify/doc/html/classInotify_734538233ba2136164f76f4df6c3654e_icgraph.png create mode 100644 shared/inotify/doc/html/classInotify_86ae86c43ea1a72f562ca46393309635_icgraph.map create mode 100644 shared/inotify/doc/html/classInotify_86ae86c43ea1a72f562ca46393309635_icgraph.md5 create mode 100644 shared/inotify/doc/html/classInotify_86ae86c43ea1a72f562ca46393309635_icgraph.png create mode 100644 shared/inotify/doc/html/classInotify_bc1fd5830ca561efb69bcd2283981741_icgraph.map create mode 100644 shared/inotify/doc/html/classInotify_bc1fd5830ca561efb69bcd2283981741_icgraph.md5 create mode 100644 shared/inotify/doc/html/classInotify_bc1fd5830ca561efb69bcd2283981741_icgraph.png create mode 100644 shared/inotify/doc/html/classes.html create mode 100644 shared/inotify/doc/html/graph_legend.dot create mode 100644 shared/inotify/doc/html/graph_legend.html create mode 100644 shared/inotify/doc/html/graph_legend.png create mode 100644 shared/inotify/doc/html/inotify-cxx_8cpp__incl.map create mode 100644 shared/inotify/doc/html/inotify-cxx_8cpp__incl.md5 create mode 100644 shared/inotify/doc/html/inotify-cxx_8cpp__incl.png delete mode 100644 shared/inotify/doc/html/inotify-cxx_8h-source.html create mode 100644 shared/inotify/doc/html/inotify-cxx_8h__dep__incl.map create mode 100644 shared/inotify/doc/html/inotify-cxx_8h__dep__incl.md5 create mode 100644 shared/inotify/doc/html/inotify-cxx_8h__dep__incl.png create mode 100644 shared/inotify/doc/html/inotify-cxx_8h__incl.map create mode 100644 shared/inotify/doc/html/inotify-cxx_8h__incl.md5 create mode 100644 shared/inotify/doc/html/inotify-cxx_8h__incl.png create mode 100644 shared/inotify/doc/html/inotify-cxx_8h_source.html create mode 100644 shared/loki/CHANGES delete mode 100644 ui/appMain.h create mode 100644 ui/messagePopup.cpp create mode 100644 ui/messagePopup.h create mode 100644 ui/mouseMoveWindow.cpp create mode 100644 ui/mouseMoveWindow.h create mode 100644 ui/progressIndicator.cpp create mode 100644 ui/progressIndicator.h create mode 100644 ui/search.cpp create mode 100644 ui/search.h diff --git a/Application.cpp b/Application.cpp index 6b17bc19..7e11b4d1 100644 --- a/Application.cpp +++ b/Application.cpp @@ -1,9 +1,9 @@ -/*************************************************************** - * Purpose: Code for Application Class - * Author: ZenJu (zhnmju123@gmx.de) - * Created: 2008-07-16 - **************************************************************/ - +// ************************************************************************** +// * This file is part of the FreeFileSync project. It is distributed under * +// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * Copyright (C) 2008-2010 ZenJu (zhnmju123 AT gmx.de) * +// ************************************************************************** +// #include "application.h" #include "ui/mainDialog.h" #include @@ -31,7 +31,7 @@ using FreeFileSync::CustomLocale; -IMPLEMENT_APP(Application); +IMPLEMENT_APP(Application) bool Application::OnInit() { @@ -70,16 +70,7 @@ void Application::OnStartApplication(wxIdleEvent&) SetAppName(wxT("FreeFileSync")); #ifdef FFS_LINUX - ::gtk_rc_parse("styles.rc"); //remove inner border from bitmap buttons -#endif - - //initialize help controller - helpController.reset(new wxHelpController); - helpController->Initialize(FreeFileSync::getInstallationDir() + -#ifdef FFS_WIN - wxT("FreeFileSync.chm")); -#elif defined FFS_LINUX - wxT("Help/FreeFileSync.hhp")); + ::gtk_rc_parse(FreeFileSync::wxToZ(FreeFileSync::getResourceDir()) + "styles.rc"); //remove inner border from bitmap buttons #endif //test if FFS is to be started on UI with config file passed as commandline parameter @@ -111,7 +102,7 @@ void Application::OnStartApplication(wxIdleEvent&) } catch (const xmlAccess::XmlError& error) { - if (wxFileExists(FreeFileSync::getGlobalConfigFile())) + if (wxFileExists(xmlAccess::getGlobalConfigFile())) { //show messagebox and continue if (error.getSeverity() == xmlAccess::XmlError::WARNING) @@ -167,7 +158,7 @@ int Application::OnRun() catch (const std::exception& e) //catch all STL exceptions { //unfortunately it's not always possible to display a message box in this erroneous situation, however (non-stream) file output always works! - wxFile safeOutput(FreeFileSync::getLastErrorTxtFile(), wxFile::write); + wxFile safeOutput(FreeFileSync::getConfigDir() + wxT("LastError.txt"), wxFile::write); safeOutput.Write(wxString::FromAscii(e.what())); wxMessageBox(wxString::FromAscii(e.what()), _("An exception occured!"), wxOK | wxICON_ERROR); @@ -192,16 +183,13 @@ int Application::OnExit() wxMessageBox(error.show(), _("Error"), wxOK | wxICON_ERROR); } - //delete help provider: "Cross-Platform GUI Programming with wxWidgets" says this should be done here... - helpController.reset(); - return 0; } void Application::runGuiMode(const wxString& cfgFileName, xmlAccess::XmlGlobalSettings& settings) { - MainDialog* frame = new MainDialog(NULL, cfgFileName, settings, *helpController); + MainDialog* frame = new MainDialog(NULL, cfgFileName, settings); frame->SetIcon(*GlobalResources::getInstance().programIcon); //set application icon frame->Show(); @@ -227,26 +215,24 @@ void Application::runBatchMode(const wxString& filename, xmlAccess::XmlGlobalSet } //all settings have been read successfully... - //regular check for program updates - if (!batchCfg.silent) - FreeFileSync::checkForUpdatePeriodically(globSettings.lastUpdateCheck); - + //regular check for program updates -> disabled for batch + //if (!batchCfg.silent) + // FreeFileSync::checkForUpdatePeriodically(globSettings.lastUpdateCheck); try //begin of synchronization process (all in one try-catch block) { //class handling status updates and error messages std::auto_ptr statusHandler; //delete object automatically if (batchCfg.silent) - statusHandler.reset(new BatchStatusHandler(true, &batchCfg.logFileDirectory, batchCfg.handleError, returnValue)); + statusHandler.reset(new BatchStatusHandler(true, filename, &batchCfg.logFileDirectory, batchCfg.handleError, returnValue)); else - statusHandler.reset(new BatchStatusHandler(false, NULL, batchCfg.handleError, returnValue)); + statusHandler.reset(new BatchStatusHandler(false, filename, NULL, batchCfg.handleError, returnValue)); //COMPARE DIRECTORIES FreeFileSync::FolderComparison folderCmp; FreeFileSync::CompareProcess comparison(batchCfg.mainCfg.hidden.traverseDirectorySymlinks, batchCfg.mainCfg.hidden.fileTimeTolerance, globSettings.ignoreOneHourDiff, - globSettings.detectRenameThreshold, globSettings.optDialogs, statusHandler.get()); @@ -276,7 +262,7 @@ void Application::runBatchMode(const wxString& filename, xmlAccess::XmlGlobalSet synchronization.startSynchronizationProcess(syncProcessCfg, folderCmp); //play (optional) sound notification after sync has completed (GUI and batch mode) - const wxString soundFile = FreeFileSync::getInstallationDir() + wxT("Sync_Complete.wav"); + const wxString soundFile = FreeFileSync::getResourceDir() + wxT("Sync_Complete.wav"); if (FreeFileSync::fileExists(FreeFileSync::wxToZ(soundFile))) wxSound::Play(soundFile, wxSOUND_ASYNC); } diff --git a/Application.h b/Application.h index 8d5a0fcf..8287b9be 100644 --- a/Application.h +++ b/Application.h @@ -1,16 +1,14 @@ -/*************************************************************** - * Name: FreeFileSyncApp.h - * Purpose: Defines Application Class - * Author: ZenJu (zhnmju123@gmx.de) - * Created: 2008-07-16 - **************************************************************/ - +// ************************************************************************** +// * This file is part of the FreeFileSync project. It is distributed under * +// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * Copyright (C) 2008-2010 ZenJu (zhnmju123 AT gmx.de) * +// ************************************************************************** +// #ifndef FREEFILESYNCAPP_H #define FREEFILESYNCAPP_H #include #include "library/processXml.h" -#include class Application : public wxApp @@ -27,8 +25,6 @@ private: void runBatchMode(const wxString& filename, xmlAccess::XmlGlobalSettings& globSettings); xmlAccess::XmlGlobalSettings globalSettings; //settings used by GUI, batch mode or both - - boost::shared_ptr helpController; //global help controller int returnValue; }; diff --git a/BUILD/Changelog.txt b/BUILD/Changelog.txt index 5bc1a41b..9507ff6f 100644 --- a/BUILD/Changelog.txt +++ b/BUILD/Changelog.txt @@ -2,6 +2,27 @@ |FreeFileSync| -------------- +Changelog v3.4 +-------------- +Performance: Reduced Recycle Bin access time by 90% +Recycle Bin support for Linux +Performance: Reduced binary comparison sequential read time (by up to 75% for CD/DVD access) +Improved synchronization sequence to avoid disk space shortage: overwrite large files by small ones first +Fixed problems with file renaming on Samba share +New free text grid search via shortcuts CTRL + F and F3 +Show number of processed files at end of synchronization +New optional grid column: file extension +New comparison category icons +Fixed handling sync-config of first folder pair +Allow moving main dialog by dragging client area instead of title bar only +Enhanced helpfile: Run RealtimeSync as Service +Prefix logfiles with name of batchjob +Fixed GUI right-to-left mirroring for locales Hebrew and Arabic +Portable version: save configuration in installation folder +Many small GUI enhancements +Updated translation files + + Changelog v3.3 -------------- New installer package for portable/local/32/64-bit versions diff --git a/BUILD/FreeFileSync.chm b/BUILD/FreeFileSync.chm index 139df0e1..1e1b085f 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 a59f966c..96e57799 100644 --- a/BUILD/Help/FreeFileSync.hhp +++ b/BUILD/Help/FreeFileSync.hhp @@ -27,6 +27,7 @@ html\advanced\DaylightSavingTime.html html\advanced\EnvironmentVariables.html html\advanced\RealtimeSync.html html\advanced\ShadowCopy.html +html\advanced\RunAsService.html [INFOTYPES] diff --git a/BUILD/Help/Table of Contents.hhc b/BUILD/Help/Table of Contents.hhc index 01f73ef5..f262f543 100644 --- a/BUILD/Help/Table of Contents.hhc +++ b/BUILD/Help/Table of Contents.hhc @@ -60,6 +60,10 @@ +
  • + + +
  • diff --git a/BUILD/Help/html/Features.html b/BUILD/Help/html/Features.html index 7a40fcdb..195794b2 100644 --- a/BUILD/Help/html/Features.html +++ b/BUILD/Help/html/Features.html @@ -5,7 +5,7 @@ - + + + +

    Run RealtimeSync +as a Service (Windows only)

    +


    +

    +

    The +following step-by-step guide describes how to setup RealtimeSync (or +any other application) as a Windows Service. This can be useful if +the tool shall run on a SYSTEM account without necessarily requiring +a user to log in.

    +


    +

    +

    1. Get +access to the command-line tools "instsrv.exe" +and "srvany.exe" +which come with the Windows Server 2003 Resource Kit Tools:

    +

    Download: +http://www.microsoft.com/downloads/details.aspx?familyid=9d467a69-57ff-4ae7-96ee-b18c4790cffd&displaylang=en

    +


    +

    +

    2. +Create and register a new Service via command line:

    +
      +

      +

      + instsrv <ServiceName> + <PathToResourceKit>\srvany.exe

      +
       

      +
    +


    +

    +

    3. Link +the new Service with RealtimeSync:

    +
      +

    • Open + the Registry editor (Regedit.exe) and navigate to key + "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\<ServiceName>"

      +

      +

    • Add + a new key "Parameters".

      +

      +

    • Add + a new String value named "Application" + and specify a command line that shall be executed as value.

      +
    +


    +

    +

    That's +it!

    +


    +

    +


    +

    +

    The new +service can now be started via commandline or Windows Service +administration:

    +
      +

      +

      + net start <ServiceName>

      +
       

       

      +
    +


    +

    +


    +

    +

    +

    + Note:
    By default the + service is created with startup type "automatic" which + runs it on Windows start. This behavior can be changed in Windows + Service administration.

    +

    +

    +

    +


    +

    +


    +

    +

    If the +Service shall be removed from the system, enter via command line:

    +
      +

      +

      + instsrv <ServiceName> remove

      +
       

      +
    +


    +

    +

    (Reference: +http://support.microsoft.com/kb/137890)

    + + \ No newline at end of file diff --git a/BUILD/Help/html/advanced/RunAsService_html_4f230a46.jpg b/BUILD/Help/html/advanced/RunAsService_html_4f230a46.jpg new file mode 100644 index 00000000..df346c8f Binary files /dev/null and b/BUILD/Help/html/advanced/RunAsService_html_4f230a46.jpg differ diff --git a/BUILD/Help/html/advanced/RunAsService_html_68e0fe53.jpg b/BUILD/Help/html/advanced/RunAsService_html_68e0fe53.jpg new file mode 100644 index 00000000..9b0638ba Binary files /dev/null and b/BUILD/Help/html/advanced/RunAsService_html_68e0fe53.jpg differ diff --git a/BUILD/Help/html/advanced/RunAsService_html_m3be0f332.jpg b/BUILD/Help/html/advanced/RunAsService_html_m3be0f332.jpg new file mode 100644 index 00000000..93e70d1b Binary files /dev/null and b/BUILD/Help/html/advanced/RunAsService_html_m3be0f332.jpg differ diff --git a/BUILD/Help/html/advanced/RunAsService_html_m3e56d901.jpg b/BUILD/Help/html/advanced/RunAsService_html_m3e56d901.jpg new file mode 100644 index 00000000..e02d95d9 Binary files /dev/null and b/BUILD/Help/html/advanced/RunAsService_html_m3e56d901.jpg differ diff --git a/BUILD/Help/html/advanced/ScheduleBatch.html b/BUILD/Help/html/advanced/ScheduleBatch.html index bb956401..4df27850 100644 --- a/BUILD/Help/html/advanced/ScheduleBatch.html +++ b/BUILD/Help/html/advanced/ScheduleBatch.html @@ -5,7 +5,7 @@ - +