9.2

53 files changed, 6699 insertions, 6537 deletions

diff --git a/Changelog.txt b/Changelog.txt
index 02ce6223..19cb9bf4 100755
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,5 +1,21 @@
-FreeFileSync 9.1  [2017-05-24]
-------------------------------
+FreeFileSync 9.2 [2017-07-03]
+-----------------------------
+Replaced file existing handling with use of unique temporary names
+Support SFTP authentication via Pageant/SSH agent
+New menu option to restore hidden panels individually
+Use direct copy instead of transaction to speed up versioning
+Fixed GTK button icon being truncated (Linux)
+Fixed error dialog hiding behind progress dialog (macOS)
+Round out FTP symlink deletion handling
+Support four-digit year format on IIS FTP
+Fixed FTP parsing error for epoch time on Windows server
+Narrow contract for file system abstraction regarding existing files
+Treat failure to load database as error rather than warning
+Save root folder access for certain FTP path checks
+
+
+FreeFileSync 9.1 [2017-05-24]
+-----------------------------
 Fixed crash when getting invalid data after item type check
 Fixed copying symlinks pointing to network folders
 Support resolving network paths in the NT namespace
@@ -460,7 +476,7 @@ FreeFileSync 6.12 [2014-12-01]
 ------------------------------
 New "Actions" menu bar entry with basic operations
 Fixed crash after comparison while needlessly copying traversal results
-Support auto-updater URL redirection (Linux, OS X)
+Support update-checker URL redirection (Linux, OS X)
 Merged installer translations into .lng files
 Fully translated FreeFileSync context menu options and file types in Windows Explorer
 More structured symlink handling options
@@ -967,7 +983,7 @@ Dynamic save button and dialog title show unsaved configuration
 Exclude all folders if file size or time span filters are active
 Added macros %csidl_Nethood%, %csidl_Programs%, %csidl_Startup%
 Fixed crash on failed CRT parameter validation (Windows)
-Auto-updater handles moved web address for version check
+Update-checker handles moved web address
 Fixed configuration conversion error when deleting into versioning folder
 Avoid modal error dialogs in batch mode unless error handling is set to "pop up"
 Set return codes in batch mode even if modal dialogs are shown
@@ -1472,7 +1488,7 @@ Don't raise status dialog to the top after synchronization
 Embedded version information into executable (Windows)
 Migrated compiler to Visual C++ 2010 (Windows)
 Avoid losing manual changes when excluding via context menu
-Adjusted auto-updater web-address
+Adjusted update-checker web-address
 Updated translation files
 
 
diff --git a/FreeFileSync/Build/Help/html/command-line.html b/FreeFileSync/Build/Help/html/command-line.html
index 8b7d3077..c2e1ac95 100755
--- a/FreeFileSync/Build/Help/html/command-line.html
+++ b/FreeFileSync/Build/Help/html/command-line.html
@@ -57,7 +57,7 @@
 		</div>
 	</div>
 
-	<p>Instead of showing an error message you can also send an email notification (using a third party tool).</p>
+	<p>Instead of showing an error message, you can also send an email notification (using a third party tool).</p>
 
 	<div class="bluebox">
 		<b>Attention</b><br>
@@ -108,9 +108,9 @@
 	
 	<h2>5. Use a different GlobalSettings.xml file</h2>
 	<p>
-		By default FreeFileSync uses a single GlobalSettings.xml file containing options that apply to all synchronization tasks;
+		By default, FreeFileSync uses a single GlobalSettings.xml file containing options that apply to all synchronization tasks;
 		for examples see <a href="expert-settings.html">Expert Settings</a>.
-		If you want FreeFileSync to use a different settings file instead you can specify the path via command line:
+		If you want FreeFileSync to use a different settings file instead, you can specify the path via command line:
 	</p>
 
 	<div class="greybox">
diff --git a/FreeFileSync/Build/Help/html/comparison-settings.html b/FreeFileSync/Build/Help/html/comparison-settings.html
index ece7d67f..951efdef 100755
--- a/FreeFileSync/Build/Help/html/comparison-settings.html
+++ b/FreeFileSync/Build/Help/html/comparison-settings.html
@@ -24,7 +24,7 @@
 		This variant considers two files equal when both <b>modification time and file size</b> match.
 		It should be selected when synchronizing files with a backup location.
 		Whenever a file is changed, its file modification time is also updated. 
-		Therefore a compare by <i>File Time and size</i> will detect all files that should be synchronized.
+		Therefore, a comparison by <i>File Time and size</i> will detect all files that should be synchronized.
 		The following categories are distinguished:
 	</p>
 	<ol style="list-style: upper-roman">
@@ -54,8 +54,8 @@
 	<p>
 		Two files are marked as equal if they have <b>identical content</b>.
 		This variant should be selected when doing consistency checks to see if the files on both sides are bit-wise identical.
-		Naturally it is the slowest of all comparison variants, so its usefulness for the purpose of synchronization is limited.
-		If used for synchronization, it can serve as a fallback when modification times are not reliable: for example
+		Naturally, it is the slowest of all comparison variants, so its usefulness for the purpose of synchronization is limited.
+		If used for synchronization, it can serve as a fallback when modification times are not reliable. For example
 		certain mobile phones and legacy FTP servers do not preserve modification times, so the only way to detect different files when the 
 		file sizes are the same is by reading their content.
 	</p>
@@ -78,7 +78,7 @@
 	<p>
 		Two files are considered equal if they have the <b>same file size</b>.
 		Since it's possible for files that have the same size to have different content, this variant should only be used when file modification times are not
-		available or reliable, e.g. in certain MTP and FTP synchronization scenarios, and where a compare by content would be too slow.
+		available or reliable, e.g. in certain MTP and FTP synchronization scenarios, and where a comparison by content would be too slow.
 	</p>
 	<ol style="list-style: upper-roman">
 		<li><b>file exists on one side only</b>
diff --git a/FreeFileSync/Build/Help/html/daylight-saving-time.html b/FreeFileSync/Build/Help/html/daylight-saving-time.html
index 3b3ccedb..70574316 100755
--- a/FreeFileSync/Build/Help/html/daylight-saving-time.html
+++ b/FreeFileSync/Build/Help/html/daylight-saving-time.html
@@ -10,12 +10,12 @@
 	<h1>Daylight Saving Time<span style="font-weight: normal"> (Windows)</span></h1>
 
 	<p>
-		A common problem synchronization software has to handle are +-1 hour
+		A common problem synchronization software has to handle is +-1 hour
 		file time shifts after a Daylight Saving Time (DST) switch has
-		occurred. This can be observed for example when a FAT-formatted
+		occurred. This can be observed, for example, when a FAT-formatted
 		volume is compared against an NTFS volume, like when synchronizing a local disk against a
 		USB memory stick. Files that previously appeared to be in sync are
-		now shown with an one hour modification time offset, although they
+		now shown with a one hour modification time offset, although they
 		have not been modified by the user or the operating system.
 	</p>
 
@@ -27,9 +27,9 @@
 
 	<p>
 		When times of these two different formats are compared, one format
-		has to be converted into the other first. In either way Windows uses
+		has to be converted into the other first. In either way, Windows uses
 		the current DST status as well as the current time zone for
-		its calculations. Consequently the result of this comparison is
+		its calculations. Consequently, the result of this comparison is
 		dependent from current system settings with the effect that file times
 		that used to be the same show up as different after a DST switch or when the time zone has changed.
 	</p>
@@ -45,8 +45,8 @@
 	<ol>
 		<li><p>
 				In FreeFileSync's comparison settings you can enter one or more time shifts to ignore during comparison:
-				If you need to handle differences due to daylight saving time enter a single one hour shift. If the differences are caused by changing the time zone 
-				enter one or more time shifts as needed.
+				If you need to handle differences due to daylight saving time, enter a single one hour shift.
+				If the differences are caused by changing the time zone, enter one or more time shifts as needed.
 				<br>
 			</p>
 			<img src="../images/ignore-time-shift.png" alt="Ignore daylight saving time shift"><br>
@@ -54,11 +54,11 @@
 			<div class="bluebox">
 				<b>Note</b><br>
 				File times have to be equal or differ by exactly the time shift entered to be considered the same. 
-				Therefore the time shift setting should not be confused with a time interval or tolerance.
+				Therefore, the time shift setting should not be confused with a time interval or tolerance.
 			</div>
 			<br>
 		
-		<li>Alternatively you can avoid the problem in first place by only synchronizing from FAT to FAT or NTFS to NTFS file systems.
+		<li>Alternatively, you can avoid the problem in first place by only synchronizing from FAT to FAT or NTFS to NTFS file systems.
 			Since most local disks are formatted with NTFS and USB memory sticks with FAT, this situation could be handled by formatting the USB stick with NTFS as well.		
 	</ol>
 </body>
diff --git a/FreeFileSync/Build/Help/html/exclude-items.html b/FreeFileSync/Build/Help/html/exclude-items.html
index 69a195f1..a30dcaf7 100755
--- a/FreeFileSync/Build/Help/html/exclude-items.html
+++ b/FreeFileSync/Build/Help/html/exclude-items.html
@@ -81,7 +81,7 @@
 	<div class="bluebox">
 		<b>Note</b>
 		<ul style="margin: 0">
-			<li>For simple exclusions just right-click and exclude one item or a list
+			<li>For simple exclusions, just right-click and exclude one item or a list
 			of items directly via the context menu on main dialog.
 			
 			<li>A filter phrase is compared against
diff --git a/FreeFileSync/Build/Help/html/expert-settings.html b/FreeFileSync/Build/Help/html/expert-settings.html
index b1c62c0e..dfe76447 100755
--- a/FreeFileSync/Build/Help/html/expert-settings.html
+++ b/FreeFileSync/Build/Help/html/expert-settings.html
@@ -13,12 +13,12 @@
 		FreeFileSync has a number of special-purpose settings that can only be accessed
 		by manually opening the global configuration file <span class="file-path">GlobalSettings.xml</span>.
 		Note that this file is read once when FreeFileSync starts and saved again on exit.
-		Therefore you should <b>apply manual changes only while FreeFileSync is not running.</b><br>
+		Therefore, you should <b>apply manual changes only while FreeFileSync is not running.</b><br>
 		 <br>
-		To locate this file on Windows enter <b><span class="command-line">%appdata%\FreeFileSync</span></b> in the Windows Explorer address bar or go to the FreeFileSync
+		To locate this file on Windows, enter <b><span class="command-line">%appdata%\FreeFileSync</span></b> in the Windows Explorer address bar or go to the FreeFileSync
 		installation folder if you are using the portable installation. 
-		On Linux you can find the file in <b><span class="command-line">~/.FreeFileSync</span></b> for the Launchpad release and in the installation folder for the portable version. 
-		On macOS go to <b><span class="command-line">~/Library/Application Support/FreeFileSync</span></b>.
+		On Linux, you can find the file in <b><span class="command-line">~/.FreeFileSync</span></b> for the Launchpad release and in the installation folder for the portable version. 
+		On macOS, go to <b><span class="command-line">~/Library/Application Support/FreeFileSync</span></b>.
 	</p>
 
 	<div class="greybox">
@@ -63,8 +63,8 @@
 		<b>LockDirectoriesDuringSync:</b><br>
 		In order to prevent multiple synchronization tasks from reading and writing the same files,
 		FreeFileSync instances are serialized with lock files (<span class="file-path">sync.ffs_lock</span>).
-		The lock files are only recognized by FreeFileSync and make sure that
-		at most a single synchronization is running against a certain folder at a time while 
+		The lock files are only recognized by FreeFileSync and make sure that at most,
+		a single synchronization is running against a certain folder at a time while 
 		other instances are queued to wait.
 		This ensures that only consistent sets of files are subject to synchronization.		
 		The primary use case are network synchronization scenarios where
@@ -76,7 +76,7 @@
 		If active, FreeFileSync will binary-compare source and target files after
 		copying and report verification errors. Note that this may double
 		file copy times and is no guarantee that data has not already been
-		corrupted prior to copying. Additionally corruption may be hidden by
+		corrupted prior to copying. Additionally, corruption may be hidden by
 		deceptively reading valid data from various buffers in the
 		application and hardware stack:<br>
 		<a rel="nofollow" target="_blank" href="https://blogs.msdn.microsoft.com/oldnewthing/20120919-00/?p=6563/">Does
diff --git a/FreeFileSync/Build/Help/html/external-applications.html b/FreeFileSync/Build/Help/html/external-applications.html
index 624e626c..3fb8ad5b 100755
--- a/FreeFileSync/Build/Help/html/external-applications.html
+++ b/FreeFileSync/Build/Help/html/external-applications.html
@@ -11,15 +11,15 @@
 
 	<p>
 		When you double-click on one of the rows on the main dialog, FreeFileSync opens the operating system's file browser 
-		by default. On Windows it calls <span class="command-line">explorer /select, &quot;%local_path%&quot;</span>, on 
+		by default. On Windows, it calls <span class="command-line">explorer /select, &quot;%local_path%&quot;</span>, on 
 		Linux <span class="command-line">xdg-open &quot;%folder_path%&quot;</span> and on macOS <span class="command-line">open -R &quot;%local_path%&quot;</span>.
 		To customize this behavior or integrate other external applications into FreeFileSync, 
 		navigate to <b>Menu &rarr; Tools &rarr; Options &rarr; Customize context menu</b> and add or replace a command.
 	</p>
 		
 	<p>
-		The <b>first entry</b> will be executed when <b>double-clicking</b> a row on main grid or when pressing <b>ENTER</b>. All other entries can be accessed 		
-		quickly by pressing the associated <b>numeric keys</b> or via the context menu that is shown after a right mouse click.
+		The <b>first entry</b> will be executed when <b>double-clicking</b> a row on the main grid or when pressing <b>ENTER</b>.
+		All other entries can be accessed quickly by pressing the associated <b>numeric keys</b> or via the context menu that is shown after a right mouse click.
 	</p>
 		
 	<p>
diff --git a/FreeFileSync/Build/Help/html/macros.html b/FreeFileSync/Build/Help/html/macros.html
index 5b397bea..a563ce39 100755
--- a/FreeFileSync/Build/Help/html/macros.html
+++ b/FreeFileSync/Build/Help/html/macros.html
@@ -11,7 +11,7 @@
 
 	<p>
 		All directory paths may contain macros that are expanded during
-		synchronization. Begin and end of each macro are marked by a <b>%</b> character. In addition to special macros
+		synchronization. The beginnings and ends of each macro are marked by a <b>%</b> character. In addition to special macros
 		handling time and date, the <b>operating system's environment variables</b> may also be used.
 		<br><br>
 	</p>
@@ -210,7 +210,7 @@
 	<br>
 
 	<p>
-		<b>Hint:</b> You can add a flexibility to a ffs_batch configuration file
+		<b>Hint:</b> You can add a flexibility to an ffs_batch configuration file
 		 by creating new temporary environment variables in a bat or cmd file that are evaluated by FreeFileSync at runtime:
 		<br><br>
 	</p>
diff --git a/FreeFileSync/Build/Help/html/realtimesync.html b/FreeFileSync/Build/Help/html/realtimesync.html
index f4635891..59bf1389 100755
--- a/FreeFileSync/Build/Help/html/realtimesync.html
+++ b/FreeFileSync/Build/Help/html/realtimesync.html
@@ -13,7 +13,7 @@
 	</h1>
 
 	<p>
-		The primary purpose of RealTimeSync is to execute a command line each time it <b>detects changes</b> in one of the monitored directories
+		The primary purpose of RealTimeSync is to execute a command line each time it <b>detects changes</b> in one of the monitored directories,
 		or when a <b>directory becomes available</b> (e. g. insert of a USB-stick). Usually this command line will trigger a FreeFileSync batch job.<br>
 		<br>
 		
@@ -26,10 +26,10 @@
 	<h2>Example: <span style="font-weight:normal">Real time synchronization - in combination with FreeFileSync</span></h2>
 	<p>
 		Start RealTimeSync.exe located in FreeFileSync's installation directory and 
-		enter the folders you want to monitor. Instead of doing this manually you can import a ffs_batch
+		enter the folders you want to monitor. Instead of doing this manually you can import an ffs_batch
 		file via <b>Menu &rarr; File &rarr; Open</b> or simply via <b>drag and drop</b>.
-		RealTimeSync will not only extract all directories relevant for synchronization
-		but also set up the command line to execute the ffs_batch file each time changes are detected.
+		RealTimeSync will not only extract all directories relevant for synchronization,
+		but will also set up the command line to execute the ffs_batch file each time changes are detected.
 		Now press <b>Start</b> to begin monitoring.
 	</p>
 	<div style="margin-left: 1.3cm">
@@ -45,7 +45,7 @@
 				<br>&nbsp;
 				
 			<li>RealTimeSync will skip showing the main dialog and begin monitoring immediately if 
-				you pass a ffs_real configuration file <b>or</b> a FreeFileSync ffs_batch file as the first 
+				you pass an ffs_real configuration file <b>or</b> a FreeFileSync ffs_batch file as the first 
 				command line argument to RealTimeSync.exe. This can be used to integrate RealTimeSync into the operating system's auto start:<br>				
 				<div class="command-line">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&quot;C:\Program Files\FreeFileSync\RealTimeSync.exe&quot; &quot;D:\Backup Projects.ffs_real&quot;</div>
 				<div class="command-line">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&quot;C:\Program Files\FreeFileSync\RealTimeSync.exe&quot; &quot;D:\Backup Projects.ffs_batch&quot;</div>
@@ -58,9 +58,9 @@
 
 	<h2>Example: <span style="font-weight:normal">Automatic synchronization when a USB stick is inserted</span></h2>
 	<p>
-		Save a ffs_batch configuration in the USB stick's root directory, 
+		Save an ffs_batch configuration in the USB stick's root directory, 
 		e.g. <span class="file-path">H:\</span> and let FreeFileSync run it when the stick is mounted.
-		But instead of hard coding the USB drive letter <span class="file-path">H:\</span> (which may change occasionally), 
+		But, instead of hard coding the USB drive letter <span class="file-path">H:\</span> (which may change occasionally), 
 		refer to the USB stick via its <a href="variable-drive-letters.html">volume name</a> instead.<br>
 		<br>
 		Configure RealTimeSync as follows:<br>
@@ -116,8 +116,8 @@
 	</ul>
 	<p>
 		The command line usually starts a synchronization task using FreeFileSync which naturally leads to additional file change notifications.
-		Therefore the RealTimeSync change detection has to be deactivated to not go into an endless loop.
-		On the other hand it is not likely that changes (other than those from FreeFileSync) happen in first place since RealTimeSync runs the command line only after the user-specified idle time has passed.
+		Therefore, the RealTimeSync change detection has to be deactivated to not go into an endless loop.
+		On the other hand, it is not likely that changes (other than those from FreeFileSync) happen in first place since RealTimeSync runs the command line only after the user-specified idle time has passed.
 		This makes sure the monitored folders are not in heavy use. In any case, files changed during the execution of FreeFileSync will be synchronized the next time FreeFileSync runs.
 	</p>
 </body>
diff --git a/FreeFileSync/Build/Help/html/run-as-service.html b/FreeFileSync/Build/Help/html/run-as-service.html
index ca0993f7..6175ee7b 100755
--- a/FreeFileSync/Build/Help/html/run-as-service.html
+++ b/FreeFileSync/Build/Help/html/run-as-service.html
@@ -10,9 +10,9 @@
 	<h1>Run as Service <span style="font-weight: normal">(Windows)</span></h1>
 
 	<p>
-		RealTimeSync is designed to run as a background process which does not need further
-		attention. Depending on your requirements there are a number of ways to start it automatically.
-		Generally the goal is to execute a command line of the form:
+		RealTimeSync is designed to run as a background process which does not need further attention.
+		Depending on your requirements, there are a number of ways to start it automatically.
+		Generally, the goal is to execute a command line of the form:
 	</p>
 
 	<div class="greybox">
@@ -39,9 +39,9 @@
 			<br>&nbsp;
 		
 		<li><p>
-				RealTimeSync should be monitoring while Windows is running irrespective of currently logged in users:<br>
-				Create a new task in your operating systems's task scheduler and have it execute the command line above
-				when the system starts. See <a href="schedule-a-batch-job.html">Schedule a Batch Job</a> for an example how to add a task. Then change
+				RealTimeSync should be monitoring while Windows is running, irrespective of currently logged in users:<br>
+				Create a new task in your operating systems's task scheduler and have it execute the command line above when the system starts.
+				See <a href="schedule-a-batch-job.html">Schedule a Batch Job</a> for an example of how to add a task. Then change
 				the user which runs the task to <b>SYSTEM</b> - a special user account always running in the background.
 			</p>
 			<img src="../images/realtimesync-schedule.png" alt="Schedule RealTimeSync">
diff --git a/FreeFileSync/Build/Help/html/schedule-a-batch-job.html b/FreeFileSync/Build/Help/html/schedule-a-batch-job.html
index e3fe41fe..8f99875a 100755
--- a/FreeFileSync/Build/Help/html/schedule-a-batch-job.html
+++ b/FreeFileSync/Build/Help/html/schedule-a-batch-job.html
@@ -10,16 +10,16 @@
 	<h1>Schedule a Batch Job</h1>
 
 	<ol>
-		<li>Create a new batch job via FreeFileSync's main dialog: <b>Menu &rarr; File &rarr; Save as batch job...</b><br>&nbsp;
+		<li>Create a new batch job via FreeFileSync's main dialog: <b>Menu &rarr; File &rarr; Save as a batch job...</b><br>&nbsp;
 			<br>
 			<img src="../images/setup-batch-job.png" alt="Setup a FreeFileSync batch job">
 			<br><br>
 		
 		
-		<li>By default FreeFileSync will show a progress dialog during synchronization and wait while the results dialog is shown.
-			If the progress dialog is not needed enable checkbox <b>Run minimized</b>. This will also skip the results dialog at the end.
+		<li>By default, FreeFileSync will show a progress dialog during synchronization and will wait while the results dialog is shown.
+			If the progress dialog is not needed, enable checkbox <b>Run minimized</b>. This will also skip the results dialog at the end.
 			<br><br>	
-			Alternatively if you want to see the progress, but not wait at the results dialog, it's sufficient to only select the <i>On completion</i> action <b>Close progress dialog</b>.
+			Alternatively, if you want to see the progress, but not to wait at the results dialog, it's sufficient to only select the <i>On completion</i> action <b>Close progress dialog</b>.
 			<br><br>
 		
 			<div class="bluebox">
@@ -35,7 +35,7 @@
 		<li>If log files are required, enable <b>Save log</b> and enter a folder path. 
 			If the path is left empty, the logs will be saved under the current user's roaming profile,
 			<span class="file-path">%appdata%\FreeFileSync\Logs</span>.<br>
-			Additionally FreeFileSync always stores the result of the last
+			Additionally, FreeFileSync always stores the result of the last
 			synchronization in file <span class="file-path">LastSyncs.log</span> (up to a user-defined size, see <a href="expert-settings.html">Expert Settings</a>).<br>
 			&nbsp;
 		<li>Set up the FreeFileSync batch job in your operating system's scheduler:<br>
@@ -46,7 +46,7 @@
 	
 	<h2>A. Windows Task Scheduler:</h2>
 	<ul>
-		<li>Open the Task Scheduler either via the start menu or enter <span class="command-line"><b>taskschd.msc</b></span> in the run dialog (keyboard shortcut: Windows + R).
+		<li>Open the Task Scheduler either via the start menu, or enter <span class="command-line"><b>taskschd.msc</b></span> in the run dialog (keyboard shortcut: Windows + R).
 		
 		<li>Create a new <b>basic task</b> and follow the wizard.			
 		
@@ -61,9 +61,10 @@
 		<b>Note</b><br>
 		<ul>
 			<li>In Windows 7 <i>Program/script</i> always needs to point to an executable file like FreeFileSync.exe even
-				when the ffs_batch file association is registered. If a ffs_batch file were entered instead, the task would return with
+				when the ffs_batch file association is registered. If an ffs_batch file was entered instead, the task would return with
 				error code 2147942593 (0x800700C1), &quot;%1 is not a valid Win32 application&quot;.<br>
 				For Windows 8 and later this limitation does not apply and you may enter the ffs_batch file path directly into <i>Program/script</i> and leave out <i>Add arguments</i>.
+				
 			<li>If you schedule FreeFileSync to run under a different user account, note that settings (e.g. <span class="file-path">GlobalSettings.xml</span>)
 				will also be read from a different path, <span class="file-path">C:\Users\&lt;username&gt;\AppData\Roaming\FreeFileSync</span>, or in the case of the SYSTEM account from
 				<span class="file-path">C:\Windows\System32\config\systemprofile\AppData\Roaming\FreeFileSync</span>.
diff --git a/FreeFileSync/Build/Help/html/synchronization-settings.html b/FreeFileSync/Build/Help/html/synchronization-settings.html
index 0f96c50c..dfe31444 100755
--- a/FreeFileSync/Build/Help/html/synchronization-settings.html
+++ b/FreeFileSync/Build/Help/html/synchronization-settings.html
@@ -15,12 +15,14 @@
 
 	<h2>Detect Moved Files</h2>
 	<p>
-		FreeFileSync is able to detect moved files on one side and can quickly apply the same move on the target side during synchronization instead of a slow copy and delete. To make this work FreeFileSync requires database files (sync.ffs_db) to compare the current file system state against the time of the last synchronization.
+		FreeFileSync is able to detect moved files on one side and can quickly apply the same move on the target side during
+		synchronization instead of a slow copy and delete. To make this work, FreeFileSync requires database files (sync.ffs_db)
+		to compare the current file system state against the time of the last synchronization.
 	</p>
 	<p>
-		The <i>Two way</i> variant already creates database files, therefore detection of moved files is always active.<br>
-		The <i>Mirror</i> variant however does not need the database files to find synchronization directions, so detection of moved files
-		is not available by default. If you don't mind the creation of the database files you can enable this feature by
+		The <i>Two way</i> variant already creates database files, therefore, detection of moved files is always active.<br>
+		The <i>Mirror</i> variant however, does not need the database files to find synchronization directions, so detection of moved files
+		is not available by default. If you don't mind the creation of the database files, you can enable this feature by
 		selecting the <b>Detect moved files</b> checkbox.
 	</p>
 
diff --git a/FreeFileSync/Build/Help/html/synchronize-with-sftp.html b/FreeFileSync/Build/Help/html/synchronize-with-sftp.html
index e565db1e..ac43a186 100755
--- a/FreeFileSync/Build/Help/html/synchronize-with-sftp.html
+++ b/FreeFileSync/Build/Help/html/synchronize-with-sftp.html
@@ -3,11 +3,11 @@
 <head>
 	<meta charset="utf-8">
 	<link rel="stylesheet" type="text/css" href="base.css" >
-	<title>Synchronize with SFTP</title>
+	<title>Synchronize Files with SFTP</title>
 </head>
 
 <body>
-	<h1>Synchronize with SFTP <span style="font-weight: normal">(Windows, macOS)</span></h1>
+	<h1>Synchronize Files with SFTP <span style="font-weight: normal">(Windows, macOS)</span></h1>
 
 	<p>
 		FreeFileSync supports synchronization with SFTP natively. Just enter your SFTP login information into the dialog shown for cloud folder selection:
@@ -26,9 +26,9 @@
 	
 	<h2>Set up SFTP for best performance</h2>
 	<p>
-		By default FreeFileSync creates one connection to the server and uses one SFTP channel, i.e. only a single SFTP command can be sent and received at a time.
-		Since most of this time is spent waiting due to the high latency of the remote connection you can speed up reading large directory hierarchies
-		by increasing both connection and channel count.<br>
+		By default, FreeFileSync creates one connection to the server and uses one SFTP channel, i.e. only a single SFTP command can be sent and received at a time.
+		Since most of this time is spent waiting due to the high latency of the remote connection, you can speed up reading large directory hierarchies
+		by increasing both the connection and channel count.<br>
 		<br>
 		<em>The directory reading time is reduced by a factor of N x M when using N connections with M channels each.</em><br>
 		<br>
@@ -39,17 +39,17 @@
 				setting up too many connections and channels might actually slow the overall process down.
 				Creating extra connections is slower than creating extra channels.<br>&nbsp;
 			
-			<li>SFTP servers have internal limits on the number of allowed connections and channels. Generally servers expect
-				one connection per user, so this number should be kept rather low. If too many connections and channels are used the server
-				may decide to stop responding.
+			<li>SFTP servers have internal limits on the number of allowed connections and channels.
+				Generally, servers expect one connection per user, so this number should be kept rather low.
+				If too many connections and channels are used, the server may decide to stop responding.
 		</ul>
 	</p>
 	
 	<div class="bluebox">
 		<b>Advice</b><br>Start with low numbers and make tests with different combinations of connections and channels for your
 		particular SFTP synchronization scenario to see what gives the highest speed.
-		Note however that FreeFileSync <b>reuses existing</b> SFTP connections/channels.
-		Therefore you should <b>restart</b> FreeFileSync before measuring SFTP speed.
+		Note, however, that FreeFileSync <b>reuses existing</b> SFTP connections/channels.
+		Therefore, you should <b>restart</b> FreeFileSync before measuring SFTP speed.
 	</div>
 	<br>
 	
diff --git a/FreeFileSync/Build/Help/html/tips-and-tricks.html b/FreeFileSync/Build/Help/html/tips-and-tricks.html
index 604f3efe..ca72cfc7 100755
--- a/FreeFileSync/Build/Help/html/tips-and-tricks.html
+++ b/FreeFileSync/Build/Help/html/tips-and-tricks.html
@@ -10,7 +10,7 @@
 	<h1>Tips and Tricks</h1>
 
 	<div class="tip" id="single-click-settings-change">
-		Change settings with a single mouse click: Press and hold the right mouse button until the context menu is shown then release while over the selection:
+		Change settings with a single mouse click: Press and hold the right mouse button until the context menu is shown, then release while over the selection:
 	</div>
 	<img style="vertical-align: top;" src="../images/com-settings-context.png"  alt="Comparison settings context menu">
 	<img style="vertical-align: top;" src="../images/filter-context.png"        alt="Filter context menu">
@@ -21,7 +21,7 @@
 		Select multiple configurations at a time:
 	</div>
 	<img style="float:left; margin-right:10px" src="../images/config-multiple-selection.png"  alt="Select multiple configurations">
-	Select a few items via mouse and refine the selection by holding the Control key while clicking.<br>
+	Select a few items via mouse, and refine the selection by holding the Control key while clicking.<br>
 	<div style="clear:both"></div>
 	<div class="separation_line"></div>
 
diff --git a/FreeFileSync/Build/Help/html/versioning.html b/FreeFileSync/Build/Help/html/versioning.html
index ffb389dc..acc22fa7 100755
--- a/FreeFileSync/Build/Help/html/versioning.html
+++ b/FreeFileSync/Build/Help/html/versioning.html
@@ -9,9 +9,9 @@
 <body>
 	<h1>File Versioning</h1>
 	<p>
-		When you need to preserve files that have been deleted or overwritten it's
-		often sufficient to select <b>Recycle bin</b> in synchronization
-		settings. However this is only available for local drives and offers
+		When you need to preserve files that have been deleted or overwritten,
+		it's often sufficient to select <b>Recycle bin</b> in synchronization
+		settings. However, this is only available for local drives and offers
 		little control on how to store and how long to keep the files.
 		FreeFileSync therefore has an additional option, <b>Versioning</b>.
 		<br><br>
@@ -19,7 +19,7 @@
 
 	<h2>1. Keep only the most recent versions</h2>
 	<p>
-		In synchronization settings set deletion handling to <b>Versioning</b> and naming convention to
+		In synchronization settings, set deletion handling to <b>Versioning</b> and naming convention to
 		<b>Replace</b>. Deleted files will be moved to the specified folder
 		without any decoration and will replace already existing older
 		versions.<br>
@@ -54,8 +54,8 @@
 	<p>
 		With naming convention <b>Replace</b>
 		it is possible to refine the granularity of versions to keep by adding <a href="macros.html">Macros</a>
-		to the versioning folder path. For example you can save deleted files
-		on a per sync session basis by adding the <b><span class="command-line">%timestamp%</span></b> macro:
+		to the versioning folder path. For example, you can save deleted files
+		on a per-sync session basis by adding the <b><span class="command-line">%timestamp%</span></b> macro:
 	</p>
 
 	<p><b>Example:</b> Using the dynamically generated folder name <span class="file-path">C:\Revisions\%timestamp%</span></p>
diff --git a/FreeFileSync/Build/Help/html/volume-shadow-copy.html b/FreeFileSync/Build/Help/html/volume-shadow-copy.html
index 7fc6cb0e..cc897e3b 100755
--- a/FreeFileSync/Build/Help/html/volume-shadow-copy.html
+++ b/FreeFileSync/Build/Help/html/volume-shadow-copy.html
@@ -25,8 +25,8 @@
 
 	<h2>Troubleshooting</h2>
 	<p>
-		If you experience problems using the Volume Shadow Copy Service a renewal of
-		registration might help. Create and execute a cmd batch file and insert the following lines or enter directly via command line:
+		If you experience problems using the Volume Shadow Copy Service, a renewal of registration might help.
+		Create and execute a cmd batch file and insert the following lines or enter directly via command line:
 	</p>
 
 	<div class="greybox">
diff --git a/FreeFileSync/Build/Languages/french.lng b/FreeFileSync/Build/Languages/french.lng
index b1096134..21846c1e 100755
--- a/FreeFileSync/Build/Languages/french.lng
+++ b/FreeFileSync/Build/Languages/french.lng
@@ -855,7 +855,7 @@ La commande est déclenchée si :
 <target>&Sauvegarder</target>
 
 <source>Save as &batch job...</source>
-<target>Enregistrer en temps que job &batch ...</target>
+<target>Enregistrer en tant que job &batch ...</target>
 
 <source>Start &comparison</source>
 <target>Démarrer la &comparaison</target>
diff --git a/FreeFileSync/Build/Languages/portuguese.lng b/FreeFileSync/Build/Languages/portuguese.lng
index 7e7e6915..a0a691d3 100755
--- a/FreeFileSync/Build/Languages/portuguese.lng
+++ b/FreeFileSync/Build/Languages/portuguese.lng
@@ -1,4 +1,4 @@
-<header>
+<header>
 	<language>Português</language>
 	<translator>Igor Rückert</translator>
 	<locale>pt_PT</locale>
@@ -20,7 +20,7 @@
 <target>A base de dados não está sincronizada com as definições correntes.</target>
 
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
-<target>Escolher direcção de sincronização por defeito: Os ficheiros antigos serão substituídos pelos novos.</target>
+<target>Escolher a direcção de sincronização por defeito: Os ficheiros antigos serão substituídos pelos novos.</target>
 
 <source>Creating file %x</source>
 <target>Criar ficheiro %x</target>
@@ -89,10 +89,10 @@
 <target>Sintaxe:</target>
 
 <source>global config file:</source>
-<target>ficheiro configuração global:</target>
+<target>ficheiro de configuração global:</target>
 
 <source>config files:</source>
-<target>ficheiros configuração:</target>
+<target>ficheiros de configuração:</target>
 
 <source>directory</source>
 <target>directório</target>
@@ -291,9 +291,6 @@ Actual: %y bytes
 <source>Cannot read directory %x.</source>
 <target>Não é possível ler o directório %x.</target>
 
-<source>Cannot read file attributes of %x.</source>
-<target>Não é possível ler os atributos do ficheiro %x.</target>
-
 <source>Cannot read file %x.</source>
 <target>Não é possível ler o ficheiro %x.</target>
 
@@ -306,6 +303,9 @@ Actual: %y bytes
 <source>Cannot delete directory %x.</source>
 <target>Não é possível eliminar o directório %x.</target>
 
+<source>Cannot read file attributes of %x.</source>
+<target>Não é possível ler os atributos do ficheiro %x.</target>
+
 <source>Cannot write modification time of %x.</source>
 <target>Não é possível alterar a data de modificação a %x.</target>
 
@@ -717,7 +717,7 @@ O comando é executado se:
 <target>A pasta de versão será sincronizada pois ela está contida em uma pasta base.</target>
 
 <source>Synchronizing folder pair:</source>
-<target>A sincronizar o par de pastas:</target>
+<target>A cincronizar o par de pastas:</target>
 
 <source>Generating database...</source>
 <target>A gerar base de dados...</target>
@@ -1038,7 +1038,7 @@ O comando é executado se:
 </source>
 <target>
 - Não suportado em todos os sistemas
-- Requeri e cria ficheiros de base de dados
+- Requer e cria ficheiros de base de dados
 - A detecção não está disponível para a primeira sincronização
 </target>
 
@@ -1070,7 +1070,7 @@ O comando é executado se:
 <target>Tratar erros:</target>
 
 <source>&Pop-up</source>
-<target>&Alertar</target>
+<target>&Popup</target>
 
 <source>Show pop-up on errors or warnings</source>
 <target>Mostrar popup em caso de erros ou avisos</target>
@@ -1775,7 +1775,7 @@ Isto garante um estado consistente mesmo em caso de falha grave.
 <target>Actualizações automáticas:</target>
 
 <source>Requires FreeFileSync Donation Edition</source>
-<target>Requeri o FreeFileSync Donation Edition</target>
+<target>Requer o FreeFileSync Donation Edition</target>
 
 <source>Check for Program Updates</source>
 <target>Procurar actualizações do programa</target>
@@ -1784,7 +1784,7 @@ Isto garante um estado consistente mesmo em caso de falha grave.
 <target>Actualizar agora ou descarregar manualmente do sítio do FreeFileSync?</target>
 
 <source>&Auto-update</source>
-<target>&Actualizar automático</target>
+<target>&Actualização automática</target>
 
 <source>&Home page</source>
 <target>&Sítio da web</target>
diff --git a/FreeFileSync/Build/styles.gtk_rc b/FreeFileSync/Build/styles.gtk_rc
new file mode 100755
index 00000000..36eecb1b
--- /dev/null
+++ b/FreeFileSync/Build/styles.gtk_rc
@@ -0,0 +1,7 @@
+style "no-inner-border"
+{
+	GtkButton::focus-padding = 0
+	GtkButton::inner-border = {0, 0, 0, 0}
+}
+
+class "GtkButton" style "no-inner-border"
diff --git a/FreeFileSync/Source/algorithm.cpp b/FreeFileSync/Source/algorithm.cpp
index 8374c713..b519da44 100755
--- a/FreeFileSync/Source/algorithm.cpp
+++ b/FreeFileSync/Source/algorithm.cpp
@@ -24,13 +24,11 @@ using namespace zen;
 //using namespace std::rel_ops;
 
 
-void zen::swapGrids(const MainConfiguration& config, FolderComparison& folderCmp)
+void zen::swapGrids(const MainConfiguration& config, FolderComparison& folderCmp) //throw FileError
 {
     std::for_each(begin(folderCmp), end(folderCmp), [](BaseFolderPair& baseFolder) { baseFolder.flip(); });
 
-    redetermineSyncDirection(config, folderCmp,
-                             nullptr,  //reportWarning
-                             nullptr); //notifyStatus
+    redetermineSyncDirection(config, folderCmp, nullptr /*notifyStatus*/); //throw FileError
 }
 
 //----------------------------------------------------------------------------------------------
@@ -674,11 +672,12 @@ std::vector<DirectionConfig> zen::extractDirectionCfg(const MainConfiguration& m
 }
 
 
-void zen::redetermineSyncDirection(const DirectionConfig& dirCfg,
+void zen::redetermineSyncDirection(const DirectionConfig& dirCfg, //throw FileError
                                    BaseFolderPair& baseFolder,
-                                   const std::function<void(const std::wstring& msg)>& reportWarning,
                                    const std::function<void(const std::wstring& msg)>& notifyStatus)
 {
+    Opt<FileError> dbLoadError; //defer until after default directions have been set!
+
     //try to load sync-database files
     std::shared_ptr<InSyncFolder> lastSyncState;
     if (dirCfg.var == DirectionConfig::TWO_WAY || detectMovedFilesEnabled(dirCfg))
@@ -689,13 +688,13 @@ void zen::redetermineSyncDirection(const DirectionConfig& dirCfg,
 
             lastSyncState = loadLastSynchronousState(baseFolder, notifyStatus); //throw FileError, FileErrorDatabaseNotExisting
         }
-        catch (FileErrorDatabaseNotExisting&) {} //let's ignore this error, there's no value in reporting it other than confuse users
+        catch (FileErrorDatabaseNotExisting&) {} //let's ignore this error, there's no value in reporting it other than to confuse users
         catch (const FileError& e) //e.g. incompatible database version
         {
-            if (reportWarning)
-                reportWarning(e.toString() +
-                              (dirCfg.var == DirectionConfig::TWO_WAY ?
-                               L" \n\n" + _("Setting default synchronization directions: Old files will be overwritten with newer files.") : std::wstring()));
+            if (dirCfg.var == DirectionConfig::TWO_WAY)
+                dbLoadError = FileError(e.toString(), _("Setting default synchronization directions: Old files will be overwritten with newer files."));
+            else
+                dbLoadError = e;
         }
 
     //set sync directions
@@ -712,12 +711,15 @@ void zen::redetermineSyncDirection(const DirectionConfig& dirCfg,
     //detect renamed files
     if (lastSyncState)
         DetectMovedFiles::execute(baseFolder, *lastSyncState);
+
+    //error reporting: not any time earlier
+    if (dbLoadError)
+        throw* dbLoadError;
 }
 
 
-void zen::redetermineSyncDirection(const MainConfiguration& mainCfg,
+void zen::redetermineSyncDirection(const MainConfiguration& mainCfg, //throw FileError
                                    FolderComparison& folderCmp,
-                                   const std::function<void(const std::wstring& msg)>& reportWarning,
                                    const std::function<void(const std::wstring& msg)>& notifyStatus)
 {
     if (folderCmp.empty())
@@ -728,11 +730,21 @@ void zen::redetermineSyncDirection(const MainConfiguration& mainCfg,
     if (folderCmp.size() != directCfgs.size())
         throw std::logic_error("Contract violation! " + std::string(__FILE__) + ":" + numberTo<std::string>(__LINE__));
 
+    Opt<FileError> dbLoadError; //defer until after default directions have been set!
+
     for (auto it = folderCmp.begin(); it != folderCmp.end(); ++it)
-    {
-        const DirectionConfig& cfg = directCfgs[it - folderCmp.begin()];
-        redetermineSyncDirection(cfg, **it, reportWarning, notifyStatus);
-    }
+        try
+        {
+            redetermineSyncDirection(directCfgs[it - folderCmp.begin()], **it, notifyStatus); //throw FileError
+        }
+        catch (const FileError& e)
+        {
+            if (!dbLoadError)
+                dbLoadError = e;
+        }
+
+    if (dbLoadError)
+        throw* dbLoadError;
 }
 
 //---------------------------------------------------------------------------------------------------------------
@@ -1046,12 +1058,12 @@ void zen::applyFiltering(FolderComparison& folderCmp, const MainConfiguration& m
 class FilterByTimeSpan
 {
 public:
-    static void execute(ContainerObject& hierObj, int64_t timeFrom, int64_t timeTo) { FilterByTimeSpan(hierObj, timeFrom, timeTo); }
+    static void execute(ContainerObject& hierObj, time_t timeFrom, time_t timeTo) { FilterByTimeSpan(hierObj, timeFrom, timeTo); }
 
 private:
     FilterByTimeSpan(ContainerObject& hierObj,
-                     int64_t timeFrom,
-                     int64_t timeTo) :
+                     time_t timeFrom,
+                     time_t timeTo) :
         timeFrom_(timeFrom),
         timeTo_(timeTo) { recurse(hierObj); }
 
@@ -1100,12 +1112,12 @@ private:
                obj.template getLastWriteTime<side>() <= timeTo_;
     }
 
-    const int64_t timeFrom_;
-    const int64_t timeTo_;
+    const time_t timeFrom_;
+    const time_t timeTo_;
 };
 
 
-void zen::applyTimeSpanFilter(FolderComparison& folderCmp, int64_t timeFrom, int64_t timeTo)
+void zen::applyTimeSpanFilter(FolderComparison& folderCmp, time_t timeFrom, time_t timeTo)
 {
     std::for_each(begin(folderCmp), end(folderCmp), [&](BaseFolderPair& baseFolder) { FilterByTimeSpan::execute(baseFolder, timeFrom, timeTo); });
 }
@@ -1196,13 +1208,15 @@ void copyToAlternateFolderFrom(const std::vector<const FileSystemObject*>& rowsT
     auto copyItem = [overwriteIfExists](const AbstractPath& targetPath, //throw FileError
                                         const std::function<void(const std::function<void()>& deleteTargetItem)>& copyItemPlain) //throw FileError
     {
-        Opt<FileError> deleteError; //files are copied with "transactionalCopy = true" => handle already existing target BEFORE failing after an expensive copy
-
+        //start deleting existing target as required by copyFileTransactional():
+        //best amortized performance if "target existing" is the most common case
+        Opt<FileError> deletionError;
         auto tryDeleteTargetItem = [&]
         {
             if (overwriteIfExists)
                 try { AFS::removeFilePlain(targetPath); /*throw FileError*/ }
-                catch (const FileError& e) { deleteError = e; } //probably "not existing" error, defer evaluation
+                catch (const FileError& e) { deletionError = e; } //probably "not existing" error, defer evaluation
+            //else: copyFileTransactional() undefined behavior (fail/overwrite/auto-rename)
         };
 
         try
@@ -1219,8 +1233,8 @@ void copyToAlternateFolderFrom(const std::vector<const FileSystemObject*>& rowsT
             {
                 if (pd->relPath.empty()) //already existing
                 {
-                    if (deleteError)
-                        throw* deleteError;
+                    if (deletionError)
+                        throw* deletionError;
                 }
                 else if (pd->relPath.size() > 1) //parent folder missing
                 {
@@ -1250,6 +1264,7 @@ void copyToAlternateFolderFrom(const std::vector<const FileSystemObject*>& rowsT
             notifyItemCopy(txtCreatingFolder, AFS::getDisplayPath(targetPath));
             try
             {
+                //target existing: undefined behavior! (fail/overwrite)
                 AFS::createFolderPlain(targetPath); //throw FileError
                 statReporter.reportDelta(1, 0);
             }
@@ -1291,8 +1306,8 @@ void copyToAlternateFolderFrom(const std::vector<const FileSystemObject*>& rowsT
             copyItem(targetPath, [&](const std::function<void()>& deleteTargetItem) //throw FileError
             {
                 auto notifyUnbufferedIO = [&](int64_t bytesDelta) { statReporter.reportDelta(0, bytesDelta); };
-                const AFS::FileCopyResult result = AFS::copyFileTransactional(sourcePath, sourceAttr, targetPath, //throw FileError, ErrorFileLocked
-                                                                              false /*copyFilePermissions*/, true /*transactionalCopy*/, deleteTargetItem, notifyUnbufferedIO);
+                /*const AFS::FileCopyResult result =*/ AFS::copyFileTransactional(sourcePath, sourceAttr, targetPath, //throw FileError, ErrorFileLocked
+                                                                                  false /*copyFilePermissions*/, true /*transactionalCopy*/, deleteTargetItem, notifyUnbufferedIO);
                 //result.errorModTime? => probably irrelevant (behave like Windows Explorer)
             });
             statReporter.reportDelta(1, 0);
@@ -1638,9 +1653,8 @@ void TempFileBuffer::createTempFiles(const std::set<FileDescriptor>& workLoad, P
             Zstring tempPathTmp = appendSeparator(getTempFolderPath()); //throw FileError
             tempPathTmp += Zstr("FFS-");
 
-            const std::string guid = generateGUID(); //no need for full-blown (pseudo-)random numbers for this one-time invocation
-            const uint32_t crc32 = getCrc32(guid);
-            tempPathTmp += printNumber<Zstring>(Zstr("%08x"), static_cast<unsigned int>(crc32));
+            const uint32_t shortGuid = getCrc32(generateGUID()); //no need for full-blown (pseudo-)random numbers for this one-time invocation
+            tempPathTmp += printNumber<Zstring>(Zstr("%08x"), static_cast<unsigned int>(shortGuid));
 
             createDirectoryIfMissingRecursion(tempPathTmp); //throw FileError
 
@@ -1665,7 +1679,7 @@ void TempFileBuffer::createTempFiles(const std::set<FileDescriptor>& workLoad, P
 
         const Zstring fileName = AFS::getItemName(descr.path);
 
-        auto it = std::find(fileName.begin(), fileName.end(), Zchar('.')); //gracefully handle case of missing "."
+        auto it = find_last(fileName.begin(), fileName.end(), Zchar('.')); //gracefully handle case of missing "."
         const Zstring tempFileName = Zstring(fileName.begin(), it) + Zchar('-') + descrHash + Zstring(it, fileName.end());
 
         const Zstring tempFilePath = appendSeparator(tempFolderPath_) + tempFileName;
@@ -1679,9 +1693,9 @@ void TempFileBuffer::createTempFiles(const std::set<FileDescriptor>& workLoad, P
 
             auto notifyUnbufferedIO = [&](int64_t bytesDelta) { statReporter.reportDelta(0, bytesDelta); };
 
-            AFS::copyFileTransactional(descr.path, sourceAttr, //throw FileError, ErrorFileLocked
-                                       createItemPathNative(tempFilePath),
-                                       false /*copyFilePermissions*/, true /*transactionalCopy*/, nullptr /*onDeleteTargetFile*/, notifyUnbufferedIO);
+            /*const AFS::FileCopyResult result =*/ AFS::copyFileTransactional(descr.path, sourceAttr, //throw FileError, ErrorFileLocked
+                                                                              createItemPathNative(tempFilePath),
+                                                                              false /*copyFilePermissions*/, true /*transactionalCopy*/, nullptr /*onDeleteTargetFile*/, notifyUnbufferedIO);
             //result.errorModTime? => irrelevant for temp files!
 
             statReporter.reportDelta(1, 0);
diff --git a/FreeFileSync/Source/algorithm.h b/FreeFileSync/Source/algorithm.h
index ea930ce7..55022ae6 100755
--- a/FreeFileSync/Source/algorithm.h
+++ b/FreeFileSync/Source/algorithm.h
@@ -16,18 +16,16 @@
 
 namespace zen
 {
-void swapGrids(const MainConfiguration& config, FolderComparison& folderCmp);
+void swapGrids(const MainConfiguration& config, FolderComparison& folderCmp); //throw FileError
 
 std::vector<DirectionConfig> extractDirectionCfg(const MainConfiguration& mainCfg);
 
-void redetermineSyncDirection(const DirectionConfig& directConfig,
+void redetermineSyncDirection(const DirectionConfig& directConfig, //throw FileError
                               BaseFolderPair& baseFolder,
-                              const std::function<void(const std::wstring& msg)>& reportWarning,
                               const std::function<void(const std::wstring& msg)>& notifyStatus);
 
-void redetermineSyncDirection(const MainConfiguration& mainCfg,
+void redetermineSyncDirection(const MainConfiguration& mainCfg, //throw FileError
                               FolderComparison& folderCmp,
-                              const std::function<void(const std::wstring& msg)>& reportWarning,
                               const std::function<void(const std::wstring& msg)>& notifyStatus);
 
 void setSyncDirectionRec(SyncDirection newDirection, FileSystemObject& fsObj); //set new direction (recursively)
@@ -39,7 +37,7 @@ void applyFiltering  (FolderComparison& folderCmp, const MainConfiguration& main
 void addHardFiltering(BaseFolderPair& baseFolder, const Zstring& excludeFilter);     //exclude additional entries only
 void addSoftFiltering(BaseFolderPair& baseFolder, const SoftFilter& timeSizeFilter); //exclude additional entries only
 
-void applyTimeSpanFilter(FolderComparison& folderCmp, int64_t timeFrom, int64_t timeTo); //overwrite current active/inactive settings
+void applyTimeSpanFilter(FolderComparison& folderCmp, time_t timeFrom, time_t timeTo); //overwrite current active/inactive settings
 
 void setActiveStatus(bool newStatus, FolderComparison& folderCmp); //activate or deactivate all rows
 void setActiveStatus(bool newStatus, FileSystemObject& fsObj);     //activate or deactivate row: (not recursively anymore)
diff --git a/FreeFileSync/Source/application.cpp b/FreeFileSync/Source/application.cpp
index 9dd5a901..a86016a2 100755
--- a/FreeFileSync/Source/application.cpp
+++ b/FreeFileSync/Source/application.cpp
@@ -54,7 +54,7 @@ bool Application::OnInit()
     //do not call wxApp::OnInit() to avoid using wxWidgets command line parser
 
     ::gtk_init(nullptr, nullptr);
-    //::gtk_rc_parse((getResourceDirPf() + "styles.gtk_rc").c_str()); //remove inner border from bitmap buttons
+    ::gtk_rc_parse((getResourceDirPf() + "styles.gtk_rc").c_str()); //remove inner border from bitmap buttons
 
     //Windows User Experience Interaction Guidelines: tool tips should have 5s timeout, info tips no timeout => compromise:
     wxToolTip::Enable(true); //yawn, a wxWidgets screw-up: wxToolTip::SetAutoPop is no-op if global tooltip window is not yet constructed: wxToolTip::Enable creates it
@@ -411,7 +411,7 @@ void showSyntaxHelp()
                                                  L"    [-LeftDir " + _("directory") + L"] [-RightDir " + _("directory") + L"]" + L"\n" +
                                                  L"    [-Edit]" + L"\n" +
                                                  L"    [" + _("global config file:") + L" GlobalSettings.xml]" + L"\n" +
-							                      L"\n" +
+                                                 L"\n" +
 
                                                  _("config files:") + L"\n" +
                                                  _("Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.") + L"\n\n" +
@@ -421,7 +421,7 @@ void showSyntaxHelp()
 
                                                  L"-Edit" + L"\n" +
                                                  _("Open configuration for editing without executing it.") + L"\n\n" +
-						   
+
                                                  _("global config file:") + L"\n" +
                                                  _("Path to an alternate GlobalSettings.xml file.")));
 }
@@ -472,13 +472,13 @@ void runBatchMode(const Zstring& globalConfigFilePath, const XmlBatchConfig& bat
 
     try //begin of synchronization process (all in one try-catch block)
     {
-        const TimeComp timeStamp = getLocalTime();
+        const std::chrono::system_clock::time_point batchStartTime = std::chrono::system_clock::now();
 
         //class handling status updates and error messages
         BatchStatusHandler statusHandler(!batchCfg.runMinimized, //throw BatchAbortProcess, BatchRequestSwitchToMainDialog
                                          extractJobName(referenceFile),
                                          globalCfg.soundFileSyncFinished,
-                                         timeStamp,
+                                         batchStartTime,
                                          batchCfg.logFolderPathPhrase,
                                          batchCfg.logfilesCountLimit,
                                          globalCfg.lastSyncsLogFileSizeMax,
@@ -523,7 +523,7 @@ void runBatchMode(const Zstring& globalConfigFilePath, const XmlBatchConfig& bat
         if (syncProcessCfg.size() != cmpResult.size())
             throw std::logic_error("Contract violation! " + std::string(__FILE__) + ":" + numberTo<std::string>(__LINE__));
 
-        synchronize(timeStamp,
+        synchronize(batchStartTime,
                     globalCfg.verifyFileCopy,
                     globalCfg.copyLockedFiles,
                     globalCfg.copyFilePermissions,
diff --git a/FreeFileSync/Source/comparison.cpp b/FreeFileSync/Source/comparison.cpp
index f4e94d8a..48b65588 100755
--- a/FreeFileSync/Source/comparison.cpp
+++ b/FreeFileSync/Source/comparison.cpp
@@ -982,9 +982,12 @@ FolderComparison zen::compare(xmlAccess::OptionalDialogs& warnings,
             callback.reportStatus(_("Calculating sync directions..."));
             callback.forceUiRefresh();
 
-            zen::redetermineSyncDirection(fpCfg.directionCfg, *it,
-            [&](const std::wstring& msg) { callback.reportWarning(msg, warnings.warnDatabaseError); }, //throw X
-            [&](const std::wstring& msg) { callback.reportStatus(msg); }); //throw X
+            tryReportingError([&]
+            {
+                zen::redetermineSyncDirection(fpCfg.directionCfg, *it, //throw FileError
+                [&](const std::wstring& msg) { callback.reportStatus(msg); }); //throw X
+
+            }, callback); //throw X?
         }
 
         return output;
diff --git a/FreeFileSync/Source/file_hierarchy.h b/FreeFileSync/Source/file_hierarchy.h
index 057bdd5f..a691bdb4 100755
--- a/FreeFileSync/Source/file_hierarchy.h
+++ b/FreeFileSync/Source/file_hierarchy.h
@@ -29,16 +29,19 @@ using AFS = AbstractFileSystem;
 struct FileAttributes
 {
     FileAttributes() {}
-    FileAttributes(int64_t modTimeIn,
+    FileAttributes(time_t modTimeIn,
                    uint64_t fileSizeIn,
                    const AFS::FileId& idIn,
                    bool isSymlink) :
         modTime(modTimeIn),
         fileSize(fileSizeIn),
         fileId(idIn),
-        isFollowedSymlink(isSymlink) {}
+        isFollowedSymlink(isSymlink)
+    {
+        static_assert(std::is_signed<time_t>::value, "... and signed!");
+    }
 
-    int64_t modTime = 0; //number of seconds since Jan. 1st 1970 UTC, same semantics like time_t (== signed long)
+    time_t modTime = 0; //number of seconds since Jan. 1st 1970 UTC
     uint64_t fileSize = 0;
     AFS::FileId fileId; //optional!
     bool isFollowedSymlink = false;
@@ -48,9 +51,9 @@ struct FileAttributes
 struct LinkAttributes
 {
     LinkAttributes() {}
-    explicit LinkAttributes(int64_t modTimeIn) : modTime(modTimeIn) {}
+    explicit LinkAttributes(time_t modTimeIn) : modTime(modTimeIn) {}
 
-    int64_t modTime = 0; //number of seconds since Jan. 1st 1970 UTC, same semantics like time_t (== signed long)
+    time_t modTime = 0; //number of seconds since Jan. 1st 1970 UTC
 };
 
 
@@ -557,7 +560,7 @@ public:
         attrL_(attrL),
         attrR_(attrR) {}
 
-    template <SelectedSide side> int64_t     getLastWriteTime() const;
+    template <SelectedSide side> time_t      getLastWriteTime() const;
     template <SelectedSide side> uint64_t         getFileSize() const;
     template <SelectedSide side> AFS::FileId        getFileId() const;
     template <SelectedSide side> bool       isFollowedSymlink() const;
@@ -606,7 +609,7 @@ class SymlinkPair : public FileSystemObject //this class models a TRUE symbolic
 public:
     void accept(FSObjectVisitor& visitor) const override;
 
-    template <SelectedSide side> int64_t getLastWriteTime() const; //write time of the link, NOT target!
+    template <SelectedSide side> time_t getLastWriteTime() const; //write time of the link, NOT target!
 
     CompareSymlinkResult getLinkCategory()   const; //returns actually used subset of CompareFilesResult
 
@@ -1106,7 +1109,7 @@ FileAttributes FilePair::getAttributes() const
 
 
 template <SelectedSide side> inline
-int64_t FilePair::getLastWriteTime() const
+time_t FilePair::getLastWriteTime() const
 {
     return SelectParam<side>::ref(attrL_, attrR_).modTime;
 }
@@ -1190,7 +1193,7 @@ void FolderPair::setSyncedTo(const Zstring& itemName,
 
 
 template <SelectedSide side> inline
-int64_t SymlinkPair::getLastWriteTime() const
+time_t SymlinkPair::getLastWriteTime() const
 {
     return SelectParam<side>::ref(attrL_, attrR_).modTime;
 }
diff --git a/FreeFileSync/Source/fs/abstract.cpp b/FreeFileSync/Source/fs/abstract.cpp
index 5e933573..5f2613ee 100755
--- a/FreeFileSync/Source/fs/abstract.cpp
+++ b/FreeFileSync/Source/fs/abstract.cpp
@@ -6,6 +6,8 @@
 
 #include "abstract.h"
 #include <zen/serialize.h>
+#include <zen/guid.h>
+#include <zen/crc.h>
 
 using namespace zen;
 using AFS = AbstractFileSystem;
@@ -65,7 +67,8 @@ Opt<AfsPath> AFS::getParentAfsPath(const AfsPath& afsPath)
 }
 
 
-AFS::FileCopyResult AFS::copyFileAsStream(const AfsPath& afsPathSource, const StreamAttributes& attrSource, //throw FileError, ErrorTargetExisting, ErrorFileLocked
+//target existing: undefined behavior! (fail/overwrite/auto-rename)
+AFS::FileCopyResult AFS::copyFileAsStream(const AfsPath& afsPathSource, const StreamAttributes& attrSource, //throw FileError, ErrorFileLocked
                                           const AbstractPath& apTarget, const IOCallback& notifyUnbufferedIO) const
 {
     int64_t totalUnbufferedIO = 0;
@@ -74,13 +77,14 @@ AFS::FileCopyResult AFS::copyFileAsStream(const AfsPath& afsPathSource, const St
 
     StreamAttributes attrSourceNew = {};
     //try to get the most current attributes if possible (input file might have changed after comparison!)
-    if (Opt<StreamAttributes> attr = streamIn->getBufferedAttributes()) //throw FileError
+    if (Opt<StreamAttributes> attr = streamIn->getAttributesBuffered()) //throw FileError
         attrSourceNew = *attr; //Native/MTP
     else //use more stale ones:
         attrSourceNew = attrSource; //SFTP/FTP
-    warn_static("evaluate: consequences of stale attributes")
+    //TODO: evaluate: consequences of stale attributes
 
-    auto streamOut = getOutputStream(apTarget, &attrSourceNew.fileSize, IOCallbackDivider(notifyUnbufferedIO, totalUnbufferedIO)); //throw FileError, ErrorTargetExisting
+    //target existing: undefined behavior! (fail/overwrite/auto-rename)
+    auto streamOut = getOutputStream(apTarget, &attrSourceNew.fileSize, IOCallbackDivider(notifyUnbufferedIO, totalUnbufferedIO)); //throw FileError
 
     bufferedStreamCopy(*streamIn, *streamOut); //throw FileError, X
 
@@ -89,7 +93,7 @@ AFS::FileCopyResult AFS::copyFileAsStream(const AfsPath& afsPathSource, const St
     //check if "expected == actual number of bytes written"
     //-> extra check: bytes reported via notifyUnbufferedIO() should match actual number of bytes written
     if (totalUnbufferedIO != 2 * makeSigned(attrSourceNew.fileSize))
-        throw FileError(replaceCpy(_("Cannot write file %x."), L"%x", fmtPath(AFS::getDisplayPath(apTarget))),
+        throw FileError(replaceCpy(_("Cannot read file %x."), L"%x", fmtPath(getDisplayPath(afsPathSource))),
                         replaceCpy(replaceCpy(_("Unexpected size of data stream.\nExpected: %x bytes\nActual: %y bytes"),
                                               L"%x", numberTo<std::wstring>(2 * attrSourceNew.fileSize)),
                                    L"%y", numberTo<std::wstring>(totalUnbufferedIO)) + L" [notifyUnbufferedIO]");
@@ -130,6 +134,7 @@ AFS::FileCopyResult AFS::copyFileAsStream(const AfsPath& afsPathSource, const St
 }
 
 
+//target existing: undefined behavior! (fail/overwrite/auto-rename)
 AFS::FileCopyResult AFS::copyFileTransactional(const AbstractPath& apSource, const StreamAttributes& attrSource, //throw FileError, ErrorFileLocked
                                                const AbstractPath& apTarget,
                                                bool copyFilePermissions,
@@ -137,41 +142,45 @@ AFS::FileCopyResult AFS::copyFileTransactional(const AbstractPath& apSource, con
                                                const std::function<void()>& onDeleteTargetFile,
                                                const IOCallback& notifyUnbufferedIO)
 {
-    auto copyFileBestEffort = [&](const AbstractPath& apTargetTmp)
+    auto copyFilePlain = [&](const AbstractPath& apTargetTmp)
     {
         //caveat: typeid returns static type for pointers, dynamic type for references!!!
-        if (typeid(*apSource.afs) == typeid(*apTarget.afs))
+        if (typeid(*apSource.afs) == typeid(*apTargetTmp.afs))
             return apSource.afs->copyFileForSameAfsType(apSource.afsPath, attrSource,
-                                                        apTargetTmp, copyFilePermissions, notifyUnbufferedIO); //throw FileError, ErrorTargetExisting, ErrorFileLocked
+                                                        apTargetTmp, copyFilePermissions, notifyUnbufferedIO); //throw FileError, ErrorFileLocked
+        //target existing: undefined behavior! (fail/overwrite/auto-rename)
 
         //fall back to stream-based file copy:
         if (copyFilePermissions)
             throw FileError(replaceCpy(_("Cannot write permissions of %x."), L"%x", fmtPath(AFS::getDisplayPath(apTargetTmp))),
                             _("Operation not supported for different base folder types."));
 
-        return apSource.afs->copyFileAsStream(apSource.afsPath, attrSource, apTargetTmp, notifyUnbufferedIO); //throw FileError, ErrorTargetExisting, ErrorFileLocked
+        return apSource.afs->copyFileAsStream(apSource.afsPath, attrSource, apTargetTmp, notifyUnbufferedIO); //throw FileError, ErrorFileLocked
+        //target existing: undefined behavior! (fail/overwrite/auto-rename)
     };
 
     if (transactionalCopy)
     {
-        AbstractPath apTargetTmp(apTarget.afs, AfsPath(apTarget.afsPath.value + TEMP_FILE_ENDING));
-        AFS::FileCopyResult result;
-
-        for (int i = 0;; ++i)
-            try
-            {
-                result = copyFileBestEffort(apTargetTmp); //throw FileError, ErrorTargetExisting, ErrorFileLocked
-                break;
-            }
-            catch (ErrorTargetExisting&) //optimistic strategy: assume everything goes well, but recover on error -> minimize file accesses
-            {
-                if (i == 10) throw; //avoid endless recursion in pathological cases, e.g. http://www.freefilesync.org/forum/viewtopic.php?t=1592
-                apTargetTmp.afsPath.value = apTarget.afsPath.value + Zchar('_') + numberTo<Zstring>(i) + TEMP_FILE_ENDING;
-            }
-
-        //transactional behavior: ensure cleanup; not needed before copyFileBestEffort() which is already transactional
+        Opt<AbstractPath> parentPath = AFS::getParentFolderPath(apTarget);
+        if (!parentPath)
+            throw FileError(replaceCpy(_("Cannot write file %x."), L"%x", fmtPath(AFS::getDisplayPath(apTarget))), L"Path is device root.");
+        const Zstring fileName = AFS::getItemName(apTarget);
+
+        //- generate (hopefully) unique file name to avoid clashing with some remnant ffs_tmp file
+        //- do not loop and avoid pathological cases, e.g. http://www.freefilesync.org/forum/viewtopic.php?t=1592
+        const Zstring shortGuid = printNumber<Zstring>(Zstr("%04x"), static_cast<unsigned int>(getCrc16(generateGUID())));
+        auto it = find_last(fileName.begin(), fileName.end(), Zchar('.')); //gracefully handle case of missing "."
+        const Zstring fileNameTmp = Zstring(fileName.begin(), it) + Zchar('.') + shortGuid + TEMP_FILE_ENDING;
+
+        const AbstractPath apTargetTmp = AFS::appendRelPath(*parentPath, fileNameTmp);
+        //AbstractPath apTargetTmp(apTarget.afs, AfsPath(apTarget.afsPath.value + TEMP_FILE_ENDING));
+        //-------------------------------------------------------------------------------------------
+
+        const AFS::FileCopyResult result = copyFilePlain(apTargetTmp); //throw FileError, ErrorFileLocked
+
+        //transactional behavior: ensure cleanup; not needed before copyFilePlain() which is already transactional
         ZEN_ON_SCOPE_FAIL( try { AFS::removeFilePlain(apTargetTmp); }
-        catch (FileError&) {} );
+        catch (FileError&) {});
 
         //have target file deleted (after read access on source and target has been confirmed) => allow for almost transactional overwrite
         if (onDeleteTargetFile)
@@ -181,11 +190,11 @@ AFS::FileCopyResult AFS::copyFileTransactional(const AbstractPath& apSource, con
         renameItem(apTargetTmp, apTarget); //throw FileError, (ErrorDifferentVolume)
 
         /*
-        CAVEAT on FAT/FAT32: the sequence of deleting the target file and renaming "file.txt.ffs_tmp" to "file.txt" does
-        NOT PRESERVE the creation time of the .ffs_tmp file, but SILENTLY "reuses" whatever creation time the old "file.txt" had!
-        This "feature" is called "File System Tunneling":
-        https://blogs.msdn.microsoft.com/oldnewthing/20050715-14/?p=34923
-        http://support.microsoft.com/kb/172190/en-us
+            CAVEAT on FAT/FAT32: the sequence of deleting the target file and renaming "file.txt.ffs_tmp" to "file.txt" does
+            NOT PRESERVE the creation time of the .ffs_tmp file, but SILENTLY "reuses" whatever creation time the old "file.txt" had!
+            This "feature" is called "File System Tunneling":
+            https://blogs.msdn.microsoft.com/oldnewthing/20050715-14/?p=34923
+            http://support.microsoft.com/kb/172190/en-us
         */
         return result;
     }
@@ -201,7 +210,7 @@ AFS::FileCopyResult AFS::copyFileTransactional(const AbstractPath& apSource, con
         if (onDeleteTargetFile)
             onDeleteTargetFile();
 
-        return copyFileBestEffort(apTarget); //throw FileError, ErrorTargetExisting, ErrorFileLocked
+        return copyFilePlain(apTarget); //throw FileError, ErrorFileLocked
     }
 }
 
@@ -213,6 +222,7 @@ void AFS::createFolderIfMissingRecursion(const AbstractPath& ap) //throw FileErr
 
     try
     {
+        //target existing: undefined behavior! (fail/overwrite)
         createFolderPlain(ap); //throw FileError
     }
     catch (FileError&)
@@ -221,7 +231,9 @@ void AFS::createFolderIfMissingRecursion(const AbstractPath& ap) //throw FileErr
         try { pd = getPathStatus(ap); /*throw FileError*/ }
         catch (FileError&) {} //previous exception is more relevant
 
-        if (pd && pd->existingType != ItemType::FILE)
+        if (pd &&
+            pd->existingType != ItemType::FILE &&
+            pd->relPath.size() != 1) //don't repeat the very same createFolderPlain() call from above!
         {
             AbstractPath intermediatePath = pd->existingPath;
             for (const Zstring& itemName : pd->relPath)
@@ -388,14 +400,14 @@ bool AFS::removeFileIfExists(const AbstractPath& ap) //throw FileError
 {
     try
     {
-        removeFilePlain(ap); //throw FileError
+        AFS::removeFilePlain(ap); //throw FileError
         return true;
     }
     catch (FileError&)
     {
         try
         {
-            if (!getItemTypeIfExists(ap)) //throw FileError
+            if (!AFS::getItemTypeIfExists(ap)) //throw FileError
                 return false;
         }
         catch (FileError&) {} //previous exception is more relevant
@@ -416,7 +428,7 @@ bool AFS::removeSymlinkIfExists(const AbstractPath& ap) //throw FileError
     {
         try
         {
-            if (!getItemTypeIfExists(ap)) //throw FileError
+            if (!AFS::getItemTypeIfExists(ap)) //throw FileError
                 return false;
         }
         catch (FileError&) {} //previous exception is more relevant
diff --git a/FreeFileSync/Source/fs/abstract.h b/FreeFileSync/Source/fs/abstract.h
index 1ab1384d..02243a7a 100755
--- a/FreeFileSync/Source/fs/abstract.h
+++ b/FreeFileSync/Source/fs/abstract.h
@@ -95,12 +95,12 @@ struct AbstractFileSystem //THREAD-SAFETY: "const" member functions must model t
     static PathStatus getPathStatus(const AbstractPath& ap); //throw FileError
     //----------------------------------------------------------------------------------------------------------------
 
-    //- error if already existing
-    //- does NOT create parent directories recursively if not existing
+    //target existing: undefined behavior! (fail/overwrite)
+    //does NOT create parent directories recursively if not existing
     static void createFolderPlain(const AbstractPath& ap) { ap.afs->createFolderPlain(ap.afsPath); } //throw FileError
 
-    //- no error if already existing
-    //- creates parent directories recursively if not existing
+    //no error if already existing
+    //creates parent directories recursively if not existing
     static void createFolderIfMissingRecursion(const AbstractPath& ap); //throw FileError
 
     static bool removeFileIfExists   (const AbstractPath& ap); //throw FileError; return "false" if file is not existing
@@ -113,7 +113,7 @@ struct AbstractFileSystem //THREAD-SAFETY: "const" member functions must model t
     static void removeSymlinkPlain(const AbstractPath& ap) { ap.afs->removeSymlinkPlain(ap.afsPath); } //throw FileError
     static void removeFolderPlain (const AbstractPath& ap) { ap.afs->removeFolderPlain (ap.afsPath); } //throw FileError
     //----------------------------------------------------------------------------------------------------------------
-    static void setModTime(const AbstractPath& ap, int64_t modTime) { ap.afs->setModTime       (ap.afsPath, modTime); } //throw FileError, follows symlinks
+    static void setModTime(const AbstractPath& ap, time_t modTime) { ap.afs->setModTime(ap.afsPath, modTime); } //throw FileError, follows symlinks
 
     static AbstractPath getSymlinkResolvedPath(const AbstractPath& ap) { return ap.afs->getSymlinkResolvedPath(ap.afsPath); } //throw FileError
     static std::string getSymlinkBinaryContent(const AbstractPath& ap) { return ap.afs->getSymlinkBinaryContent(ap.afsPath); } //throw FileError
@@ -129,7 +129,7 @@ struct AbstractFileSystem //THREAD-SAFETY: "const" member functions must model t
 
     struct StreamAttributes
     {
-        int64_t modTime; //number of seconds since Jan. 1st 1970 UTC, same semantics like time_t (== signed long)
+        time_t modTime; //number of seconds since Jan. 1st 1970 UTC
         uint64_t fileSize;
         FileId fileId; //optional!
     };
@@ -139,10 +139,10 @@ struct AbstractFileSystem //THREAD-SAFETY: "const" member functions must model t
     {
         virtual ~InputStream() {}
         virtual size_t read(void* buffer, size_t bytesToRead) = 0; //throw FileError, X; return "bytesToRead" bytes unless end of stream!
-        virtual size_t getBlockSize() const = 0; //non-zero block size is AFS contract! it's implementers job to always give a reasonable buffer size!
+        virtual size_t getBlockSize() const = 0; //non-zero block size is AFS contract! it's implementer's job to always give a reasonable buffer size!
 
         //only returns attributes if they are already buffered within stream handle and determination would be otherwise expensive (e.g. FTP/SFTP):
-        virtual Opt<StreamAttributes> getBufferedAttributes() = 0; //throw FileError
+        virtual Opt<StreamAttributes> getAttributesBuffered() = 0; //throw FileError
     };
 
     struct OutputStreamImpl
@@ -169,10 +169,11 @@ struct AbstractFileSystem //THREAD-SAFETY: "const" member functions must model t
     };
 
     //return value always bound:
-    static std::unique_ptr<InputStream > getInputStream(const AbstractPath& ap, const IOCallback& notifyUnbufferedIO) //throw FileError, ErrorFileLocked, X
+    static std::unique_ptr<InputStream> getInputStream(const AbstractPath& ap, const IOCallback& notifyUnbufferedIO) //throw FileError, ErrorFileLocked, X
     { return ap.afs->getInputStream(ap.afsPath, notifyUnbufferedIO); }
 
-    static std::unique_ptr<OutputStream> getOutputStream(const AbstractPath& ap, //throw FileError, ErrorTargetExisting
+    //target existing: undefined behavior! (fail/overwrite/auto-rename)
+    static std::unique_ptr<OutputStream> getOutputStream(const AbstractPath& ap, //throw FileError
                                                          const uint64_t* streamSize,           //optional
                                                          const IOCallback& notifyUnbufferedIO) //
     { return std::make_unique<OutputStream>(ap.afs->getOutputStream(ap.afsPath, streamSize, notifyUnbufferedIO), ap, streamSize); }
@@ -185,14 +186,14 @@ struct AbstractFileSystem //THREAD-SAFETY: "const" member functions must model t
         struct SymlinkInfo
         {
             Zstring itemName;
-            int64_t modTime; //number of seconds since Jan. 1st 1970 UTC
+            time_t modTime; //number of seconds since Jan. 1st 1970 UTC
         };
 
         struct FileInfo
         {
             Zstring itemName;
             uint64_t fileSize; //unit: bytes!
-            int64_t modTime; //number of seconds since Jan. 1st 1970 UTC
+            time_t modTime; //number of seconds since Jan. 1st 1970 UTC
             FileId fileId; //optional: empty if not supported!
             const SymlinkInfo* symlinkInfo; //only filled if file is a followed symlink
         };
@@ -230,34 +231,40 @@ struct AbstractFileSystem //THREAD-SAFETY: "const" member functions must model t
 
     static bool supportPermissionCopy(const AbstractPath& apSource, const AbstractPath& apTarget); //throw FileError
 
+    //target existing: undefined behavior! (fail/overwrite/auto-rename)
+    static void renameItem(const AbstractPath& apSource, const AbstractPath& apTarget); //throw FileError, ErrorDifferentVolume
+
+    //Note: it MAY happen that copyFileTransactional() leaves temp files behind, e.g. temporary network drop.
+    // => clean them up at an appropriate time (automatically set sync directions to delete them). They have the following ending:
+    static const Zchar* TEMP_FILE_ENDING; //don't use Zstring as global constant: avoid static initialization order problem in global namespace!
+
     struct FileCopyResult
     {
         uint64_t fileSize = 0;
-        int64_t modTime = 0; //time_t-compatible (UTC)
+        time_t modTime = 0; //number of seconds since Jan. 1st 1970 UTC
         FileId sourceFileId;
         FileId targetFileId;
         Opt<FileError> errorModTime; //failure to set modification time
     };
-    //return current attributes at the time of copy
-    //symlink handling: dereference source
-
-    //Note: it MAY happen that copyFileTransactional() leaves temp files behind, e.g. temporary network drop.
-    // => clean them up at an appropriate time (automatically set sync directions to delete them). They have the following ending:
-    static const Zchar* TEMP_FILE_ENDING; //don't use Zstring as global constant: avoid static initialization order problem in global namespace!
 
+    //symlink handling: follow
+    //target existing: undefined behavior! (fail/overwrite/auto-rename)
+    //returns current attributes at the time of copy
     static FileCopyResult copyFileTransactional(const AbstractPath& apSource, const StreamAttributes& attrSource, //throw FileError, ErrorFileLocked
                                                 const AbstractPath& apTarget,
                                                 bool copyFilePermissions,
                                                 bool transactionalCopy,
-                                                //if target is existing user needs to implement deletion: copyFile() NEVER overwrites target if already existing!
+                                                //if target is existing user *must* implement deletion to avoid undefined behavior
                                                 //if transactionalCopy == true, full read access on source had been proven at this point, so it's safe to delete it.
                                                 const std::function<void()>& onDeleteTargetFile,
                                                 //accummulated delta != file size! consider ADS, sparse, compressed files
                                                 const IOCallback& notifyUnbufferedIO);
 
+    //target existing: undefined behavior! (fail/overwrite)
+    //symlink handling: follow link!
     static void copyNewFolder(const AbstractPath& apSource, const AbstractPath& apTarget, bool copyFilePermissions); //throw FileError
+
     static void copySymlink  (const AbstractPath& apSource, const AbstractPath& apTarget, bool copyFilePermissions); //throw FileError
-    static void renameItem   (const AbstractPath& apSource, const AbstractPath& apTarget); //throw FileError, ErrorDifferentVolume
 
     //----------------------------------------------------------------------------------------------------------------
 
@@ -299,7 +306,8 @@ protected: //grant derived classes access to AbstractPath:
     };
     PathStatusImpl getPathStatusViaFolderTraversal(const AfsPath& afsPath) const; //throw FileError
 
-    FileCopyResult copyFileAsStream(const AfsPath& afsPathSource, const StreamAttributes& attrSource, //throw FileError, ErrorTargetExisting, ErrorFileLocked
+    //target existing: undefined behavior! (fail/overwrite/auto-rename)
+    FileCopyResult copyFileAsStream(const AfsPath& afsPathSource, const StreamAttributes& attrSource, //throw FileError, ErrorFileLocked
                                     const AbstractPath& apTarget, const IOCallback& notifyUnbufferedIO) const; //may be nullptr; throw X!
 
 private:
@@ -318,6 +326,7 @@ private:
     virtual PathStatusImpl getPathStatus(const AfsPath& afsPath) const = 0; //throw FileError
     //----------------------------------------------------------------------------------------------------------------
 
+    //target existing: undefined behavior! (fail/overwrite)
     virtual void createFolderPlain(const AfsPath& afsPath) const = 0; //throw FileError
 
     //non-recursive folder deletion:
@@ -325,30 +334,38 @@ private:
     virtual void removeSymlinkPlain(const AfsPath& afsPath) const = 0; //throw FileError
     virtual void removeFolderPlain (const AfsPath& afsPath) const = 0; //throw FileError
     //----------------------------------------------------------------------------------------------------------------
-    virtual void setModTime(const AfsPath& afsPath, int64_t modTime) const = 0; //throw FileError, follows symlinks
+    virtual void setModTime(const AfsPath& afsPath, time_t modTime) const = 0; //throw FileError, follows symlinks
 
     virtual AbstractPath getSymlinkResolvedPath(const AfsPath& afsPath) const = 0; //throw FileError
     virtual std::string getSymlinkBinaryContent(const AfsPath& afsPath) const = 0; //throw FileError
     //----------------------------------------------------------------------------------------------------------------
-    virtual std::unique_ptr<InputStream     > getInputStream (const AfsPath& afsPath, const IOCallback& notifyUnbufferedIO) const = 0; //throw FileError, ErrorFileLocked, X
-    virtual std::unique_ptr<OutputStreamImpl> getOutputStream(const AfsPath& afsPath, //throw FileError, ErrorTargetExisting
+    virtual std::unique_ptr<InputStream> getInputStream (const AfsPath& afsPath, const IOCallback& notifyUnbufferedIO) const = 0; //throw FileError, ErrorFileLocked, X
+
+    //target existing: undefined behavior! (fail/overwrite/auto-rename)
+    virtual std::unique_ptr<OutputStreamImpl> getOutputStream(const AfsPath& afsPath, //throw FileError
                                                               const uint64_t* streamSize,                      //optional
                                                               const IOCallback& notifyUnbufferedIO) const = 0; //
     //----------------------------------------------------------------------------------------------------------------
     virtual void traverseFolder(const AfsPath& afsPath, TraverserCallback& sink) const = 0; //noexcept
     //----------------------------------------------------------------------------------------------------------------
+    virtual bool supportsPermissions(const AfsPath& afsPath) const = 0; //throw FileError
+
+    //target existing: undefined behavior! (fail/overwrite/auto-rename)
+    virtual void renameItemForSameAfsType(const AfsPath& afsPathSource, const AbstractPath& apTarget) const = 0; //throw FileError, ErrorDifferentVolume
 
     //symlink handling: follow link!
-    virtual FileCopyResult copyFileForSameAfsType(const AfsPath& afsPathSource, const StreamAttributes& attrSource, //throw FileError, ErrorTargetExisting, ErrorFileLocked
+    //target existing: undefined behavior! (fail/overwrite/auto-rename)
+    virtual FileCopyResult copyFileForSameAfsType(const AfsPath& afsPathSource, const StreamAttributes& attrSource, //throw FileError, ErrorFileLocked
                                                   const AbstractPath& apTarget, bool copyFilePermissions,
                                                   //accummulated delta != file size! consider ADS, sparse, compressed files
                                                   const IOCallback& notifyUnbufferedIO) const = 0; //may be nullptr; throw X!
 
+
+    //target existing: undefined behavior! (fail/overwrite)
     //symlink handling: follow link!
     virtual void copyNewFolderForSameAfsType(const AfsPath& afsPathSource, const AbstractPath& apTarget, bool copyFilePermissions) const = 0; //throw FileError
-    virtual void copySymlinkForSameAfsType  (const AfsPath& afsPathSource, const AbstractPath& apTarget, bool copyFilePermissions) const = 0; //throw FileError
-    virtual void renameItemForSameAfsType   (const AfsPath& afsPathSource, const AbstractPath& apTarget) const = 0; //throw FileError, ErrorDifferentVolume
-    virtual bool supportsPermissions(const AfsPath& afsPath) const = 0; //throw FileError
+
+    virtual void copySymlinkForSameAfsType(const AfsPath& afsPathSource, const AbstractPath& apTarget, bool copyFilePermissions) const = 0; //throw FileError
 
     //----------------------------------------------------------------------------------------------------------------
     virtual ImageHolder getFileIcon      (const AfsPath& afsPath, int pixelSize) const = 0; //noexcept; optional return value
@@ -485,9 +502,9 @@ void AbstractFileSystem::OutputStream::write(const void* data, size_t len) //thr
 inline
 AbstractFileSystem::FileId AbstractFileSystem::OutputStream::finalize() //throw FileError, X
 {
-    //important check: catches corrupt sftp download with libssh2!
+    //important check: catches corrupt SFTP download with libssh2!
     if (bytesExpected_ && *bytesExpected_ != bytesWrittenTotal_)
-        throw FileError(replaceCpy(_("Cannot write file %x."), L"%x", fmtPath(getDisplayPath(filePath_))),
+        throw FileError(replaceCpy(_("Cannot write file %x."), L"%x", fmtPath(getDisplayPath(filePath_))), //instead we should report the source file, but don't have it here...
                         replaceCpy(replaceCpy(_("Unexpected size of data stream.\nExpected: %x bytes\nActual: %y bytes"),
                                               L"%x", numberTo<std::wstring>(*bytesExpected_)),
                                    L"%y", numberTo<std::wstring>(bytesWrittenTotal_)));
@@ -500,6 +517,30 @@ AbstractFileSystem::FileId AbstractFileSystem::OutputStream::finalize() //throw
 //--------------------------------------------------------------------------
 
 inline
+bool AbstractFileSystem::supportPermissionCopy(const AbstractPath& apSource, const AbstractPath& apTarget) //throw FileError
+{
+    if (typeid(*apSource.afs) != typeid(*apTarget.afs))
+        return false;
+
+    return apSource.afs->supportsPermissions(apSource.afsPath) && //throw FileError
+           apTarget.afs->supportsPermissions(apTarget.afsPath);
+}
+
+
+inline
+void AbstractFileSystem::renameItem(const AbstractPath& apSource, const AbstractPath& apTarget) //throw FileError, ErrorDifferentVolume
+{
+    if (typeid(*apSource.afs) == typeid(*apTarget.afs))
+        return apSource.afs->renameItemForSameAfsType(apSource.afsPath, apTarget); //throw FileError, ErrorDifferentVolume
+
+    throw ErrorDifferentVolume(replaceCpy(replaceCpy(_("Cannot move file %x to %y."),
+                                                     L"%x", L"\n" + fmtPath(getDisplayPath(apSource))),
+                                          L"%y", L"\n" + fmtPath(getDisplayPath(apTarget))), _("Operation not supported for different base folder types."));
+}
+
+
+
+inline
 void AbstractFileSystem::copyNewFolder(const AbstractPath& apSource, const AbstractPath& apTarget, bool copyFilePermissions) //throw FileError
 {
     if (typeid(*apSource.afs) == typeid(*apTarget.afs))
@@ -510,6 +551,7 @@ void AbstractFileSystem::copyNewFolder(const AbstractPath& apSource, const Abstr
         throw FileError(replaceCpy(_("Cannot write permissions of %x."), L"%x", fmtPath(getDisplayPath(apTarget))),
                         _("Operation not supported for different base folder types."));
 
+    //target existing: undefined behavior! (fail/overwrite)
     createFolderPlain(apTarget); //throw FileError
 }
 
@@ -524,29 +566,6 @@ void AbstractFileSystem::copySymlink(const AbstractPath& apSource, const Abstrac
                                           L"%x", L"\n" + fmtPath(getDisplayPath(apSource))),
                                L"%y", L"\n" + fmtPath(getDisplayPath(apTarget))), _("Operation not supported for different base folder types."));
 }
-
-
-inline
-void AbstractFileSystem::renameItem(const AbstractPath& apSource, const AbstractPath& apTarget) //throw FileError, ErrorDifferentVolume
-{
-    if (typeid(*apSource.afs) == typeid(*apTarget.afs))
-        return apSource.afs->renameItemForSameAfsType(apSource.afsPath, apTarget); //throw FileError, ErrorDifferentVolume
-
-    throw ErrorDifferentVolume(replaceCpy(replaceCpy(_("Cannot move file %x to %y."),
-                                                     L"%x", L"\n" + fmtPath(getDisplayPath(apSource))),
-                                          L"%y", L"\n" + fmtPath(getDisplayPath(apTarget))), _("Operation not supported for different base folder types."));
-}
-
-
-inline
-bool AbstractFileSystem::supportPermissionCopy(const AbstractPath& apSource, const AbstractPath& apTarget) //throw FileError
-{
-    if (typeid(*apSource.afs) != typeid(*apTarget.afs))
-        return false;
-
-    return apSource.afs->supportsPermissions(apSource.afsPath) && //throw FileError
-           apTarget.afs->supportsPermissions(apTarget.afsPath);
-}
 }
 
 #endif //ABSTRACT_H_873450978453042524534234
diff --git a/FreeFileSync/Source/fs/native.cpp b/FreeFileSync/Source/fs/native.cpp
index 0603c3f8..e4e04ac2 100755
--- a/FreeFileSync/Source/fs/native.cpp
+++ b/FreeFileSync/Source/fs/native.cpp
@@ -11,6 +11,8 @@
 #include <zen/file_id_def.h>
 #include <zen/stl_tools.h>
 #include <zen/recycler.h>
+#include <zen/guid.h>
+#include <zen/crc.h>
 #include "../lib/resolve_path.h"
 #include "../lib/icon_loader.h"
 #include "native_traverser_impl.h"
@@ -62,18 +64,18 @@ struct InputStreamNative : public AbstractFileSystem::InputStream
 
     size_t read(void* buffer, size_t bytesToRead) override { return fi_.read(buffer, bytesToRead); } //throw FileError, X; return "bytesToRead" bytes unless end of stream!
     size_t getBlockSize() const override { return fi_.getBlockSize(); } //non-zero block size is AFS contract!
-    Opt<AFS::StreamAttributes> getBufferedAttributes() override; //throw FileError
+    Opt<AFS::StreamAttributes> getAttributesBuffered() override; //throw FileError
 
 private:
     FileInput fi_;
 };
 
 
-Opt<AFS::StreamAttributes> InputStreamNative::getBufferedAttributes() //throw FileError
+Opt<AFS::StreamAttributes> InputStreamNative::getAttributesBuffered() //throw FileError
 {
     const FileAttribs fileAttr = getFileAttributes(fi_.getHandle(), fi_.getFilePath()); //throw FileError
 
-    const int64_t modTime = fileAttr.st_mtime;
+    const time_t modTime = fileAttr.st_mtime;
 
     const uint64_t fileSize = makeUnsigned(fileAttr.st_size);
 
@@ -157,11 +159,11 @@ private:
     }
     //----------------------------------------------------------------------------------------------------------------
 
-    //should provide for single ATOMIC folder creation!
+    //target existing: undefined behavior! (fail/overwrite) => Native will fail and give a clear error message
     void createFolderPlain(const AfsPath& afsPath) const override //throw FileError
     {
         initComForThread(); //throw FileError
-        copyNewDirectory(Zstring(), getNativePath(afsPath), false /*copyFilePermissions*/); //throw FileError, ErrorTargetExisting
+        createDirectory(getNativePath(afsPath)); //throw FileError, ErrorTargetExisting
     }
 
     void removeFilePlain(const AfsPath& afsPath) const override //throw FileError
@@ -183,7 +185,7 @@ private:
     }
 
     //----------------------------------------------------------------------------------------------------------------
-    void setModTime(const AfsPath& afsPath, int64_t modTime) const override //throw FileError, follows symlinks
+    void setModTime(const AfsPath& afsPath, time_t modTime) const override //throw FileError, follows symlinks
     {
         initComForThread(); //throw FileError
         zen::setFileTime(getNativePath(afsPath), modTime, ProcSymlink::FOLLOW); //throw FileError
@@ -220,12 +222,13 @@ private:
         return std::make_unique<InputStreamNative>(getNativePath(afsPath), notifyUnbufferedIO); //throw FileError, ErrorFileLocked
     }
 
-    std::unique_ptr<OutputStreamImpl> getOutputStream(const AfsPath& afsPath, //throw FileError, ErrorTargetExisting
+    //target existing: undefined behavior! (fail/overwrite/auto-rename) => Native will fail and give a clear error message
+    std::unique_ptr<OutputStreamImpl> getOutputStream(const AfsPath& afsPath, //throw FileError
                                                       const uint64_t* streamSize,                          //optional
                                                       const IOCallback& notifyUnbufferedIO) const override //
     {
         initComForThread(); //throw FileError
-        return std::make_unique<OutputStreamNative>(getNativePath(afsPath), streamSize, notifyUnbufferedIO); //throw FileError, ErrorTargetExisting
+        return std::make_unique<OutputStreamNative>(getNativePath(afsPath), streamSize, notifyUnbufferedIO); //throw FileError
     }
 
     //----------------------------------------------------------------------------------------------------------------
@@ -236,7 +239,8 @@ private:
     //----------------------------------------------------------------------------------------------------------------
 
     //symlink handling: follow link!
-    FileCopyResult copyFileForSameAfsType(const AfsPath& afsPathSource, const StreamAttributes& attrSource, //throw FileError, ErrorTargetExisting, ErrorFileLocked
+    //target existing: undefined behavior! (fail/overwrite/auto-rename) => Native will fail and give a clear error message
+    FileCopyResult copyFileForSameAfsType(const AfsPath& afsPathSource, const StreamAttributes& attrSource, //throw FileError, ErrorFileLocked
                                           const AbstractPath& apTarget, bool copyFilePermissions, const IOCallback& notifyUnbufferedIO) const override //may be nullptr; throw X!
     {
         const Zstring nativePathTarget = static_cast<const NativeFileSystem&>(getAfs(apTarget)).getNativePath(getAfsPath(apTarget));
@@ -254,13 +258,24 @@ private:
         return result;
     }
 
+    //target existing: undefined behavior! (fail/overwrite) => Native will fail and give a clear error message
     //symlink handling: follow link!
     void copyNewFolderForSameAfsType(const AfsPath& afsPathSource, const AbstractPath& apTarget, bool copyFilePermissions) const override //throw FileError
     {
-        const Zstring nativePathTarget = static_cast<const NativeFileSystem&>(getAfs(apTarget)).getNativePath(getAfsPath(apTarget));
-
         initComForThread(); //throw FileError
-        zen::copyNewDirectory(getNativePath(afsPathSource), nativePathTarget, copyFilePermissions); //throw FileError, ErrorTargetExisting
+
+        const Zstring& sourcePath = getNativePath(afsPathSource);
+        const Zstring& targetPath = static_cast<const NativeFileSystem&>(getAfs(apTarget)).getNativePath(getAfsPath(apTarget));
+
+        zen::createDirectory(targetPath); //throw FileError, ErrorTargetExisting
+
+        ZEN_ON_SCOPE_FAIL(try { removeDirectoryPlain(targetPath); }
+        catch (FileError&) {});
+
+        tryCopyDirectoryAttributes(sourcePath, targetPath); //throw FileError
+
+        if (copyFilePermissions)
+            copyItemPermissions(sourcePath, targetPath, ProcSymlink::FOLLOW); //throw FileError
     }
 
     void copySymlinkForSameAfsType(const AfsPath& afsPathSource, const AbstractPath& apTarget, bool copyFilePermissions) const override //throw FileError
@@ -271,6 +286,7 @@ private:
         zen::copySymlink(getNativePath(afsPathSource), nativePathTarget, copyFilePermissions); //throw FileError
     }
 
+    //target existing: undefined behavior! (fail/overwrite/auto-rename) => Native will fail and give a clear error message
     void renameItemForSameAfsType(const AfsPath& afsPathSource, const AbstractPath& apTarget) const override //throw FileError, ErrorDifferentVolume
     {
         //perf test: detecting different volumes by path is ~30 times faster than having MoveFileEx fail with ERROR_NOT_SAME_DEVICE (6µs vs 190µs)
diff --git a/FreeFileSync/Source/lib/db_file.cpp b/FreeFileSync/Source/lib/db_file.cpp
index 5f37558c..796efb87 100755
--- a/FreeFileSync/Source/lib/db_file.cpp
+++ b/FreeFileSync/Source/lib/db_file.cpp
@@ -6,6 +6,7 @@
 
 #include "db_file.h"
 #include <zen/guid.h>
+#include <zen/crc.h>
 #include <wx+/zlib_wrap.h>
 
 
@@ -39,11 +40,18 @@ AbstractPath getDatabaseFilePath(const BaseFolderPair& baseFolder, bool tempfile
 {
     //Linux and Windows builds are binary incompatible: different file id?, problem with case sensitivity?
     //precomposed/decomposed UTF? are UTC file times really compatible? what about endianess!?
-    //however 32 and 64 bit db files *are* designed to be binary compatible!
+    //however 32 and 64-bit FreeFileSync are designed to produce binary-identical db files!
     //Give db files different names.
     //make sure they end with ".ffs_db". These files will be excluded from comparison
     const Zstring dbName = Zstr(".sync"); //files beginning with dots are hidden e.g. in Nautilus
-    const Zstring dbFileName = dbName + (tempfile ? Zstr(".tmp") : Zstr("")) + SYNC_DB_FILE_ENDING;
+    Zstring dbFileName;
+    if (tempfile) //generate (hopefully) unique file name to avoid clashing with some remnant ffs_tmp file
+    {
+        const Zstring shortGuid = printNumber<Zstring>(Zstr("%04x"), static_cast<unsigned int>(getCrc16(generateGUID())));
+        dbFileName = dbName + Zchar('.') + shortGuid + AFS::TEMP_FILE_ENDING;
+    }
+    else
+        dbFileName = dbName + SYNC_DB_FILE_ENDING;
 
     return AFS::appendRelPath(baseFolder.getAbstractPath<side>(), dbFileName);
 }
@@ -52,7 +60,7 @@ AbstractPath getDatabaseFilePath(const BaseFolderPair& baseFolder, bool tempfile
 
 void saveStreams(const DbStreams& streamList, const AbstractPath& dbPath, const IOCallback& notifyUnbufferedIO) //throw FileError
 {
-    const std::unique_ptr<AFS::OutputStream> fileStreamOut = AFS::getOutputStream(dbPath, //throw FileError, ErrorTargetExisting
+    const std::unique_ptr<AFS::OutputStream> fileStreamOut = AFS::getOutputStream(dbPath, //throw FileError
                                                                                   nullptr /*streamSize*/,
                                                                                   notifyUnbufferedIO /*throw X*/);
     //write FreeFileSync file identifier
@@ -858,8 +866,8 @@ void zen::saveLastSynchronousState(const BaseFolderPair& baseFolder, const std::
     const AbstractPath dbPathLeft  = getDatabaseFilePath< LEFT_SIDE>(baseFolder);
     const AbstractPath dbPathRight = getDatabaseFilePath<RIGHT_SIDE>(baseFolder);
 
-    const AbstractPath dbPathLeftTmp  = getDatabaseFilePath< LEFT_SIDE>(baseFolder, true);
-    const AbstractPath dbPathRightTmp = getDatabaseFilePath<RIGHT_SIDE>(baseFolder, true);
+    const AbstractPath dbPathLeftTmp  = getDatabaseFilePath< LEFT_SIDE>(baseFolder, true /*tempfile*/);
+    const AbstractPath dbPathRightTmp = getDatabaseFilePath<RIGHT_SIDE>(baseFolder, true /*tempfile*/);
 
     StreamStatusNotifier notifyLoadL(replaceCpy(_("Loading file %x..."), L"%x", fmtPath(AFS::getDisplayPath(dbPathLeft) )), notifyStatus);
     StreamStatusNotifier notifyLoadR(replaceCpy(_("Loading file %x..."), L"%x", fmtPath(AFS::getDisplayPath(dbPathRight))), notifyStatus);
@@ -933,10 +941,6 @@ void zen::saveLastSynchronousState(const BaseFolderPair& baseFolder, const std::
     streamsLeft [sessionID] = std::move(sessionDataL);
     streamsRight[sessionID] = std::move(sessionDataR);
 
-    //delete old tmp file, if necessary -> throws if deletion fails!
-    AFS::removeFileIfExists(dbPathLeftTmp);  //
-    AFS::removeFileIfExists(dbPathRightTmp); //throw FileError
-
     //write (temp-) files as a transaction
     saveStreams(streamsLeft,  dbPathLeftTmp,  notifySaveL); //throw FileError
     auto guardTmpL = makeGuard<ScopeGuardRunMode::ON_FAIL>([&] { try { AFS::removeFilePlain(dbPathLeftTmp); } catch (FileError&) {} });
diff --git a/FreeFileSync/Source/lib/db_file.h b/FreeFileSync/Source/lib/db_file.h
index 6b4be6c7..ba980f50 100755
--- a/FreeFileSync/Source/lib/db_file.h
+++ b/FreeFileSync/Source/lib/db_file.h
@@ -17,19 +17,19 @@ const Zchar SYNC_DB_FILE_ENDING[] = Zstr(".ffs_db"); //don't use Zstring as glob
 
 struct InSyncDescrFile //subset of FileAttributes
 {
-    InSyncDescrFile(int64_t modTimeIn, const AFS::FileId& idIn) :
+    InSyncDescrFile(time_t modTimeIn, const AFS::FileId& idIn) :
         modTime(modTimeIn),
         fileId(idIn) {}
 
-    int64_t modTime;
+    time_t modTime;
     AFS::FileId fileId; // == file id: optional! (however, always set on Linux, and *generally* available on Windows)
 };
 
 struct InSyncDescrLink
 {
-    explicit InSyncDescrLink(int64_t modTimeIn) : modTime(modTimeIn) {}
+    explicit InSyncDescrLink(time_t modTimeIn) : modTime(modTimeIn) {}
 
-    int64_t modTime;
+    time_t modTime;
 };
 
 
diff --git a/FreeFileSync/Source/lib/process_xml.cpp b/FreeFileSync/Source/lib/process_xml.cpp
index 41ea062a..762f0064 100755
--- a/FreeFileSync/Source/lib/process_xml.cpp
+++ b/FreeFileSync/Source/lib/process_xml.cpp
@@ -1033,7 +1033,7 @@ void readConfig(const XmlIn& in, XmlGlobalSettings& config, int formatVer)
     inOpt["WarnRecycleBinNotAvailable" ].attribute("Enabled", config.optDialogs.warnRecyclerMissing);
     inOpt["WarnInputFieldEmpty"        ].attribute("Enabled", config.optDialogs.warnInputFieldEmpty);
     inOpt["WarnModificationTimeError"  ].attribute("Enabled", config.optDialogs.warnModificationTimeError);
-    inOpt["WarnDatabaseError"          ].attribute("Enabled", config.optDialogs.warnDatabaseError);
+    //inOpt["WarnDatabaseError"          ].attribute("Enabled", config.optDialogs.warnDatabaseError);
     inOpt["WarnDependentFolderPair"    ].attribute("Enabled", config.optDialogs.warnDependentFolderPair);
     inOpt["WarnDependentBaseFolders"   ].attribute("Enabled", config.optDialogs.warnDependentBaseFolders);
     inOpt["WarnDirectoryLockFailed"    ].attribute("Enabled", config.optDialogs.warnDirectoryLockFailed);
@@ -1471,7 +1471,7 @@ void writeConfig(const XmlGlobalSettings& config, XmlOut& out)
     outOpt["WarnRecycleBinNotAvailable" ].attribute("Enabled", config.optDialogs.warnRecyclerMissing);
     outOpt["WarnInputFieldEmpty"        ].attribute("Enabled", config.optDialogs.warnInputFieldEmpty);
     outOpt["WarnModificationTimeError"  ].attribute("Enabled", config.optDialogs.warnModificationTimeError);
-    outOpt["WarnDatabaseError"          ].attribute("Enabled", config.optDialogs.warnDatabaseError);
+    //outOpt["WarnDatabaseError"          ].attribute("Enabled", config.optDialogs.warnDatabaseError);
     outOpt["WarnDependentFolderPair"    ].attribute("Enabled", config.optDialogs.warnDependentFolderPair);
     outOpt["WarnDependentBaseFolders"   ].attribute("Enabled", config.optDialogs.warnDependentBaseFolders);
     outOpt["WarnDirectoryLockFailed"    ].attribute("Enabled", config.optDialogs.warnDirectoryLockFailed);
diff --git a/FreeFileSync/Source/lib/process_xml.h b/FreeFileSync/Source/lib/process_xml.h
index 7a772d11..d7f45543 100755
--- a/FreeFileSync/Source/lib/process_xml.h
+++ b/FreeFileSync/Source/lib/process_xml.h
@@ -82,7 +82,6 @@ struct OptionalDialogs
     bool warnNotEnoughDiskSpace           = true;
     bool warnUnresolvedConflicts          = true;
     bool warnModificationTimeError        = true;
-    bool warnDatabaseError                = true;
     bool warnRecyclerMissing              = true;
     bool warnInputFieldEmpty              = true;
     bool warnDirectoryLockFailed          = true;
diff --git a/FreeFileSync/Source/lib/versioning.cpp b/FreeFileSync/Source/lib/versioning.cpp
index 6dad7433..88b3f551 100755
--- a/FreeFileSync/Source/lib/versioning.cpp
+++ b/FreeFileSync/Source/lib/versioning.cpp
@@ -98,12 +98,11 @@ template <class Function>
 void moveExistingItemToVersioning(const AbstractPath& sourcePath, const AbstractPath& targetPath, //throw FileError
                                   Function copyNewItemPlain /*throw FileError*/)
 {
-
-    Opt<FileError> deleteError; //- files are copied with "transactionalCopy = true" => handle already existing target BEFORE failing after an expensive copy
-    //- even in the "same volume" case, a preemptive target deletion with deferred evaluation gives the best amortized performance considering that
-    //  "already existing" is the most common expected failure!
+    //start deleting existing target as required by copyFileTransactional()/renameItem():
+    //best amortized performance if "target existing" is the most common case
+    std::exception_ptr deletionError;
     try { AFS::removeFilePlain(targetPath); /*throw FileError*/ }
-    catch (const FileError& e) { deleteError = e; } //probably "not existing" error, defer evaluation
+    catch (FileError&) { deletionError = std::current_exception(); } //probably "not existing" error, defer evaluation
     //overwrite AFS::ItemType::FOLDER with FILE? => highly dubious, do not allow
 
     auto fixedTargetPathIssues = [&] //throw FileError
@@ -116,8 +115,8 @@ void moveExistingItemToVersioning(const AbstractPath& sourcePath, const Abstract
         {
             if (pd->relPath.empty()) //already existing
             {
-                if (deleteError)
-                    throw* deleteError;
+                if (deletionError)
+                    std::rethrow_exception(deletionError);
             }
             else if (pd->relPath.size() > 1) //parent folder missing
             {
@@ -207,9 +206,11 @@ bool FileVersioner::revisionFile(const FileDescriptor& fileDescr, const Zstring&
         else
             moveExistingItemToVersioning(filePath, targetPath, [&] //throw FileError
         {
-            AFS::copyFileTransactional(filePath, fileAttr, //throw FileError, ErrorFileLocked
-                                       targetPath,
-                                       false /*copyFilePermissions*/, true /*transactionalCopy*/, nullptr /*onDeleteTargetFile*/, notifyUnbufferedIO);
+            //target existing: copyFileTransactional() undefined behavior! (fail/overwrite/auto-rename) => not expected here:
+            /*const AFS::FileCopyResult result =*/ AFS::copyFileTransactional(filePath, fileAttr, targetPath, //throw FileError, ErrorFileLocked
+                                                                              false, //copyFilePermissions
+                                                                              false,  //transactionalCopy: not needed for versioning!
+                                                                              nullptr /*onDeleteTargetFile*/, notifyUnbufferedIO);
             //result.errorModTime? => irrelevant for versioning!
         });
         return true;
@@ -278,8 +279,11 @@ void FileVersioner::revisionFolderImpl(const AbstractPath& folderPath, const Zst
 
         moveExistingItemToVersioning(sourcePath, targetPath, [&] //throw FileError
         {
-            AFS::copyFileTransactional(sourcePath, sourceAttr, targetPath, //throw FileError, ErrorFileLocked
-                                       false /*copyFilePermissions*/, true /*transactionalCopy*/, nullptr /*onDeleteTargetFile*/, notifyUnbufferedIO);
+            //target existing: copyFileTransactional() undefined behavior! (fail/overwrite/auto-rename) => not expected here:
+            /*const AFS::FileCopyResult result =*/ AFS::copyFileTransactional(sourcePath, sourceAttr, targetPath, //throw FileError, ErrorFileLocked
+                                                                              false, //copyFilePermissions
+                                                                              false,  //transactionalCopy: not needed for versioning!
+                                                                              nullptr /*onDeleteTargetFile*/, notifyUnbufferedIO);
             //result.errorModTime? => irrelevant for versioning!
         });
     }
diff --git a/FreeFileSync/Source/synchronization.cpp b/FreeFileSync/Source/synchronization.cpp
index d2c1a9db..9e0f53b8 100755
--- a/FreeFileSync/Source/synchronization.cpp
+++ b/FreeFileSync/Source/synchronization.cpp
@@ -8,6 +8,8 @@
 #include <tuple>
 #include <zen/process_priority.h>
 #include <zen/perf.h>
+#include <zen/guid.h>
+#include <zen/crc.h>
 #include "algorithm.h"
 #include "lib/db_file.h"
 #include "lib/dir_exist_async.h"
@@ -722,6 +724,7 @@ private:
         procCallback_.reportInfo(replaceCpy(replaceCpy(rawText, L"%x", L"\n" + fmtPath(displayPath1)), L"%y", L"\n" + fmtPath(displayPath2)));
     }
 
+    //target existing after onDeleteTargetFile(): undefined behavior! (fail/overwrite/auto-rename)
     AFS::FileCopyResult copyFileWithCallback(const FileDescriptor& sourceDescr, //throw FileError
                                              const AbstractPath& targetPath,
                                              const std::function<void()>& onDeleteTargetFile,
@@ -800,35 +803,24 @@ template <SelectedSide side>
 void SynchronizeFolderPair::prepare2StepMove(FilePair& sourceObj,
                                              FilePair& targetObj) //throw FileError
 {
-    Zstring sourceRelPathTmp = sourceObj.getItemName<side>() + AFS::TEMP_FILE_ENDING;
+    //generate (hopefully) unique file name to avoid clashing with some remnant ffs_tmp file
+    const Zstring shortGuid = printNumber<Zstring>(Zstr("%04x"), static_cast<unsigned int>(getCrc16(generateGUID())));
+    const Zstring fileName = sourceObj.getItemName<side>();
+    auto it = find_last(fileName.begin(), fileName.end(), Zchar('.')); //gracefully handle case of missing "."
+
+    const Zstring sourceRelPathTmp = Zstring(fileName.begin(), it) + Zchar('.') + shortGuid + AFS::TEMP_FILE_ENDING;
+    //-------------------------------------------------------------------------------------------
     //this could still lead to a name-clash in obscure cases, if some file exists on the other side with
     //the very same (.ffs_tmp) name and is copied before the second step of the move is executed
-    //good news: even in this pathologic case, this may only prevent the copy of the other file, but not the move
-    for (int i = 0;; ++i)
-    {
-        const AbstractPath sourcePathTmp = AFS::appendRelPath(sourceObj.base().getAbstractPath<side>(), sourceRelPathTmp);
-        try
-        {
-            reportInfo(txtMovingFile,
-                       AFS::getDisplayPath(sourceObj.getAbstractPath<side>()),
-                       AFS::getDisplayPath(sourcePathTmp));
-
-            AFS::renameItem(sourceObj.getAbstractPath<side>(), sourcePathTmp); //throw FileError, (ErrorDifferentVolume)
-            break;
-        }
-        catch (FileError&) //repeat until unique name found: no file system race condition!
-        {
-            if (i == 10) throw; //avoid endless recursion in pathological cases
+    //good news: even in this pathologic case, this may only prevent the copy of the other file, but not this move
 
-            bool alreadyExists = true;
-            try {  /*ItemType type =*/ AFS::getItemType(sourcePathTmp); } /*throw FileError*/ catch (FileError&) { alreadyExists = false; } //previous exception is more relevant
+    const AbstractPath sourcePathTmp = AFS::appendRelPath(sourceObj.base().getAbstractPath<side>(), sourceRelPathTmp);
 
-            if (!alreadyExists)
-                throw;
+    reportInfo(txtMovingFile,
+               AFS::getDisplayPath(sourceObj.getAbstractPath<side>()),
+               AFS::getDisplayPath(sourcePathTmp));
 
-            sourceRelPathTmp = sourceObj.getItemName<side>() + Zchar('_') + numberTo<Zstring>(i) + AFS::TEMP_FILE_ENDING;
-        }
-    }
+    AFS::renameItem(sourceObj.getAbstractPath<side>(), sourcePathTmp); //throw FileError, (ErrorDifferentVolume)
 
     //TODO: prepare2StepMove: consider ErrorDifferentVolume! e.g. symlink aliasing!
 
@@ -1172,7 +1164,7 @@ void SynchronizeFolderPair::synchronizeFileInt(FilePair& file, SyncOperation syn
 
                 const AFS::FileCopyResult result = copyFileWithCallback({ file.getAbstractPath<sideSrc>(), file.getAttributes<sideSrc>() },
                                                                         targetPath,
-                                                                        nullptr, //no target to delete
+                                                                        nullptr, //onDeleteTargetFile: nothing to delete; if existing: undefined behavior! (fail/overwrite/auto-rename)
                                                                         notifyUnbufferedIO); //throw FileError
                 if (result.errorModTime)
                     errorsModTime_.push_back(*result.errorModTime); //show all warnings later as a single message
@@ -1535,6 +1527,7 @@ void SynchronizeFolderPair::synchronizeFolderInt(FolderPair& folder, SyncOperati
                 StatisticsReporter statReporter(1, 0, procCallback_);
                 try
                 {
+                    //target existing: undefined behavior! (fail/overwrite)
                     AFS::copyNewFolder(folder.getAbstractPath<sideSrc>(), targetPath, copyFilePermissions_); //throw FileError
                 }
                 catch (FileError&)
@@ -1665,6 +1658,7 @@ AFS::FileCopyResult SynchronizeFolderPair::copyFileWithCallback(const FileDescri
 
     auto copyOperation = [this, &sourceAttr, &targetPath, &onDeleteTargetFile, &notifyUnbufferedIO](const AbstractPath& sourcePathTmp)
     {
+        //target existing after onDeleteTargetFile(): undefined behavior! (fail/overwrite/auto-rename)
         const AFS::FileCopyResult result = AFS::copyFileTransactional(sourcePathTmp, sourceAttr, //throw FileError, ErrorFileLocked
                                                                       targetPath,
                                                                       copyFilePermissions_,
@@ -1745,7 +1739,7 @@ bool createBaseFolder(BaseFolderPair& baseFolder, int folderAccessTimeout, Proce
                 callback.reportFatalError(replaceCpy(_("Target folder %x already existing."), L"%x", fmtPath(AFS::getDisplayPath(baseFolderPath))));
                 temporaryNetworkDrop = true;
 
-                //Is it possible we're catching a "false-positive" here, could FFS have created the directory indirectly after comparison?
+                //Is it possible we're catching a "false positive" here, could FFS have created the directory indirectly after comparison?
                 //  1. deletion handling: recycler       -> no, temp directory created only at first deletion
                 //  2. deletion handling: versioning     -> "
                 //  3. log file creates containing folder -> no, log only created in batch mode, and only *before* comparison
@@ -1766,7 +1760,7 @@ enum class FolderPairJobType
 }
 
 
-void zen::synchronize(const TimeComp& timeStamp,
+void zen::synchronize(const std::chrono::system_clock::time_point& syncStartTime,
                       bool verifyCopiedFiles,
                       bool copyLockedFiles,
                       bool copyFilePermissions,
@@ -2180,6 +2174,7 @@ void zen::synchronize(const TimeComp& timeStamp,
                     return folderPairCfg.handleDeletion;
                 };
 
+                const TimeComp timeStamp = getLocalTime(std::chrono::system_clock::to_time_t(syncStartTime));
 
                 DeletionHandling delHandlerL(baseFolder.getAbstractPath<LEFT_SIDE>(),
                                              getEffectiveDeletionPolicy(baseFolder.getAbstractPath<LEFT_SIDE>()),
diff --git a/FreeFileSync/Source/synchronization.h b/FreeFileSync/Source/synchronization.h
index 24232b40..68587793 100755
--- a/FreeFileSync/Source/synchronization.h
+++ b/FreeFileSync/Source/synchronization.h
@@ -7,7 +7,8 @@
 #ifndef SYNCHRONIZATION_H_8913470815943295
 #define SYNCHRONIZATION_H_8913470815943295
 
-#include <zen/time.h>
+//#include <zen/time.h>
+#include <chrono>
 #include "file_hierarchy.h"
 #include "lib/process_xml.h"
 #include "process_callback.h"
@@ -94,7 +95,7 @@ std::vector<FolderPairSyncCfg> extractSyncCfg(const MainConfiguration& mainCfg);
 
 
 //FFS core routine:
-void synchronize(const TimeComp& timeStamp,
+void synchronize(const std::chrono::system_clock::time_point& syncStartTime,
                  bool verifyCopiedFiles,
                  bool copyLockedFiles,
                  bool copyFilePermissions,
diff --git a/FreeFileSync/Source/ui/batch_status_handler.cpp b/FreeFileSync/Source/ui/batch_status_handler.cpp
index 166b2779..4fa9a855 100755
--- a/FreeFileSync/Source/ui/batch_status_handler.cpp
+++ b/FreeFileSync/Source/ui/batch_status_handler.cpp
@@ -21,13 +21,13 @@ using namespace zen;
 
 namespace
 {
-//"Backup FreeFileSync 2013-09-15 015052.log" ->
-//"Backup FreeFileSync 2013-09-15 015052 [Error].log"
+//"Backup FreeFileSync 2013-09-15 015052.123.log" ->
+//"Backup FreeFileSync 2013-09-15 015052.123 [Error].log"
 
 //return value always bound!
 std::unique_ptr<AFS::OutputStream> prepareNewLogfile(const AbstractPath& logFolderPath, //throw FileError
                                                      const std::wstring& jobName,
-                                                     const TimeComp& timeStamp,
+                                                     const std::chrono::system_clock::time_point& batchStartTime,
                                                      const std::wstring& status,
                                                      ProcessCallback& pc)
 {
@@ -37,29 +37,24 @@ std::unique_ptr<AFS::OutputStream> prepareNewLogfile(const AbstractPath& logFold
     AFS::createFolderIfMissingRecursion(logFolderPath); //throw FileError
 
     //const std::string colon = "\xcb\xb8"; //="modifier letter raised colon" => regular colon is forbidden in file names on Windows and OS X
-    //=> too many issues, most notably cmd.exe is not Unicode-awere: http://www.freefilesync.org/forum/viewtopic.php?t=1679
+    //=> too many issues, most notably cmd.exe is not Unicode-aware: http://www.freefilesync.org/forum/viewtopic.php?t=1679
 
     //assemble logfile name
-    Zstring body = utfTo<Zstring>(jobName) + Zstr(" ") + formatTime<Zstring>(Zstr("%Y-%m-%d %H%M%S"), timeStamp);
+    const TimeComp timeStamp = getLocalTime(std::chrono::system_clock::to_time_t(batchStartTime));
+    const auto timeMs = std::chrono::duration_cast<std::chrono::milliseconds>(batchStartTime.time_since_epoch()).count() % 1000;
+
+    Zstring logFileName = utfTo<Zstring>(jobName) +
+                          Zstr(" ") + formatTime<Zstring>(Zstr("%Y-%m-%d %H%M%S"), timeStamp) +
+                          Zstr(".") + printNumber<Zstring>(Zstr("%03d"), static_cast<int>(timeMs)); //[ms] should yield a fairly unique name
     if (!status.empty())
-        body += utfTo<Zstring>(L" [" + status + L"]");
+        logFileName += utfTo<Zstring>(L" [" + status + L"]");
+    logFileName += Zstr(".log");
 
-    //ensure uniqueness; avoid file system race-condition!
-    Zstring logFileName = body + Zstr(".log");
-    for (int i = 0;; ++i)
-        try
-        {
-            const AbstractPath logFilePath = AFS::appendRelPath(logFolderPath, logFileName);
+    const AbstractPath logFilePath = AFS::appendRelPath(logFolderPath, logFileName);
 
-            return AFS::getOutputStream(logFilePath, //throw FileError, ErrorTargetExisting
-                                        nullptr, /*streamSize*/
-                                        OnUpdateLogfileStatusNoThrow(pc, AFS::getDisplayPath(logFilePath)));
-        }
-        catch (ErrorTargetExisting&)
-        {
-            if (i == 10) throw; //avoid endless recursion in pathological cases
-            logFileName = body + Zstr('_') + numberTo<Zstring>(i) + Zstr(".log");
-        }
+    return AFS::getOutputStream(logFilePath, //throw FileError
+                                nullptr, /*streamSize*/
+                                OnUpdateLogfileStatusNoThrow(pc, AFS::getDisplayPath(logFilePath)));
 }
 
 
@@ -136,7 +131,7 @@ void limitLogfileCount(const AbstractPath& logFolderPath, const std::wstring& jo
 BatchStatusHandler::BatchStatusHandler(bool showProgress,
                                        const std::wstring& jobName,
                                        const Zstring& soundFileSyncComplete,
-                                       const TimeComp& timeStamp,
+                                       const std::chrono::system_clock::time_point& batchStartTime,
                                        const Zstring& logFolderPathPhrase, //may be empty
                                        int logfilesCountLimit,
                                        size_t lastSyncsLogFileSizeMax,
@@ -155,7 +150,7 @@ BatchStatusHandler::BatchStatusHandler(bool showProgress,
     automaticRetryDelay_(automaticRetryDelay),
     progressDlg_(createProgressDialog(*this, [this] { this->onProgressDialogTerminate(); }, *this, nullptr, showProgress, jobName, soundFileSyncComplete, onCompletion, onCompletionHistory)),
              jobName_(jobName),
-             timeStamp_(timeStamp),
+             batchStartTime_(batchStartTime),
              logFolderPathPhrase_(logFolderPathPhrase)
 {
     //ATTENTION: "progressDlg_" is an unmanaged resource!!! However, at this point we already consider construction complete! =>
@@ -252,7 +247,7 @@ BatchStatusHandler::~BatchStatusHandler()
     // 4. failure to write to particular stream must not be retried!
     if (logfilesCountLimit_ != 0)
     {
-        auto requestUiRefreshNoThrow = [&] { try { requestUiRefresh();  /*throw X*/ } catch (...) {} };
+        auto requestUiRefreshNoThrow = [&] { try { requestUiRefresh(); /*throw X*/ } catch (...) {} };
 
         const AbstractPath logFolderPath = createAbstractPath(trimCpy(logFolderPathPhrase_).empty() ? getConfigDirPathPf() + Zstr("Logs") : logFolderPathPhrase_); //noexcept
 
@@ -260,7 +255,7 @@ BatchStatusHandler::~BatchStatusHandler()
         {
             tryReportingError([&] //errors logged here do not impact final status calculation above! => not a problem!
             {
-                std::unique_ptr<AFS::OutputStream> logFileStream = prepareNewLogfile(logFolderPath, jobName_, timeStamp_, status, *this); //throw FileError; return value always bound!
+                std::unique_ptr<AFS::OutputStream> logFileStream = prepareNewLogfile(logFolderPath, jobName_, batchStartTime_, status, *this); //throw FileError; return value always bound!
 
                 streamToLogFile(summary, errorLog_, *logFileStream); //throw FileError, (X)
                 logFileStream->finalize();                           //throw FileError, (X)
diff --git a/FreeFileSync/Source/ui/batch_status_handler.h b/FreeFileSync/Source/ui/batch_status_handler.h
index 8d1ed5ec..7a0499bc 100755
--- a/FreeFileSync/Source/ui/batch_status_handler.h
+++ b/FreeFileSync/Source/ui/batch_status_handler.h
@@ -7,8 +7,9 @@
 #ifndef BATCH_STATUS_HANDLER_H_857390451451234566
 #define BATCH_STATUS_HANDLER_H_857390451451234566
 
+#include <chrono>
 #include <zen/error_log.h>
-#include <zen/time.h>
+//#include <zen/time.h>
 #include "progress_indicator.h"
 #include "../lib/status_handler.h"
 #include "../lib/process_xml.h"
@@ -26,7 +27,7 @@ public:
     BatchStatusHandler(bool showProgress, //defines: -start minimized and -quit immediately when finished
                        const std::wstring& jobName, //should not be empty for a batch job!
                        const Zstring& soundFileSyncComplete,
-                       const zen::TimeComp& timeStamp,
+                       const std::chrono::system_clock::time_point& batchStartTime,
                        const Zstring& logFolderPathPhrase,
                        int logfilesCountLimit, //0: logging inactive; < 0: no limit
                        size_t lastSyncsLogFileSizeMax,
@@ -66,7 +67,7 @@ private:
     SyncProgressDialog* progressDlg_; //managed to have shorter lifetime than this handler!
 
     const std::wstring jobName_;
-    const zen::TimeComp timeStamp_;
+    const std::chrono::system_clock::time_point batchStartTime_;
     const time_t startTime_ = std::time(nullptr); //don't use wxStopWatch: may overflow after a few days due to ::QueryPerformanceCounter()
 
     const Zstring logFolderPathPhrase_;
diff --git a/FreeFileSync/Source/ui/gui_generated.cpp b/FreeFileSync/Source/ui/gui_generated.cpp
index 09bdaa1b..8e43d0cb 100755
--- a/FreeFileSync/Source/ui/gui_generated.cpp
+++ b/FreeFileSync/Source/ui/gui_generated.cpp
@@ -19,1026 +19,1043 @@
 
 MainDialogGenerated::MainDialogGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxSize( 640,400 ), wxDefaultSize );
-	
-	m_menubar1 = new wxMenuBar( 0 );
-	m_menuFile = new wxMenu();
-	m_menuItemNew = new wxMenuItem( m_menuFile, wxID_NEW, wxString( _("&New") ) + wxT('\t') + wxT("Ctrl+N"), wxEmptyString, wxITEM_NORMAL );
-	m_menuFile->Append( m_menuItemNew );
-	
-	m_menuItemLoad = new wxMenuItem( m_menuFile, wxID_OPEN, wxString( _("&Open...") ) + wxT('\t') + wxT("Ctrl+O"), wxEmptyString, wxITEM_NORMAL );
-	m_menuFile->Append( m_menuItemLoad );
-	
-	m_menuFile->AppendSeparator();
-	
-	m_menuItemSave = new wxMenuItem( m_menuFile, wxID_SAVE, wxString( _("&Save") ) + wxT('\t') + wxT("Ctrl+S"), wxEmptyString, wxITEM_NORMAL );
-	m_menuFile->Append( m_menuItemSave );
-	
-	m_menuItemSaveAs = new wxMenuItem( m_menuFile, wxID_SAVEAS, wxString( _("Save &as...") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menuFile->Append( m_menuItemSaveAs );
-	
-	m_menuItemSaveAsBatch = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("Save as &batch job...") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menuFile->Append( m_menuItemSaveAsBatch );
-	
-	m_menuFile->AppendSeparator();
-	
-	wxMenuItem* m_menuItem4;
-	m_menuItem4 = new wxMenuItem( m_menuFile, wxID_EXIT, wxString( _("E&xit") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menuFile->Append( m_menuItem4 );
-	
-	m_menubar1->Append( m_menuFile, _("&File") ); 
-	
-	m_menu4 = new wxMenu();
-	m_menuItemCompare = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("Start &comparison") ) + wxT('\t') + wxT("F5"), wxEmptyString, wxITEM_NORMAL );
-	m_menu4->Append( m_menuItemCompare );
-	
-	m_menu4->AppendSeparator();
-	
-	m_menuItemCompSettings = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("C&omparison settings") ) + wxT('\t') + wxT("F6"), wxEmptyString, wxITEM_NORMAL );
-	m_menu4->Append( m_menuItemCompSettings );
-	
-	m_menuItemFilter = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("&Filter settings") ) + wxT('\t') + wxT("F7"), wxEmptyString, wxITEM_NORMAL );
-	m_menu4->Append( m_menuItemFilter );
-	
-	m_menuItemSyncSettings = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("S&ynchronization settings") ) + wxT('\t') + wxT("F8"), wxEmptyString, wxITEM_NORMAL );
-	m_menu4->Append( m_menuItemSyncSettings );
-	
-	m_menu4->AppendSeparator();
-	
-	m_menuItemSynchronize = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("Start &synchronization") ) + wxT('\t') + wxT("F9"), wxEmptyString, wxITEM_NORMAL );
-	m_menu4->Append( m_menuItemSynchronize );
-	
-	m_menubar1->Append( m_menu4, _("&Actions") ); 
-	
-	m_menuTools = new wxMenu();
-	m_menuItemOptions = new wxMenuItem( m_menuTools, wxID_PREFERENCES, wxString( _("&Preferences") ) + wxT('\t') + wxT("Ctrl+,"), wxEmptyString, wxITEM_NORMAL );
-	m_menuTools->Append( m_menuItemOptions );
-	
-	m_menuLanguages = new wxMenu();
-	wxMenuItem* m_menuLanguagesItem = new wxMenuItem( m_menuTools, wxID_ANY, _("&Language"), wxEmptyString, wxITEM_NORMAL, m_menuLanguages );
-	m_menuTools->Append( m_menuLanguagesItem );
-	
-	m_menuTools->AppendSeparator();
-	
-	m_menuItemFind = new wxMenuItem( m_menuTools, wxID_FIND, wxString( _("&Find...") ) + wxT('\t') + wxT("Ctrl+F"), wxEmptyString, wxITEM_NORMAL );
-	m_menuTools->Append( m_menuItemFind );
-	
-	wxMenuItem* m_menuItem51;
-	m_menuItem51 = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("&Reset layout") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menuTools->Append( m_menuItem51 );
-	
-	wxMenuItem* m_menuItem5;
-	m_menuItem5 = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("&Export file list...") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menuTools->Append( m_menuItem5 );
-	
-	m_menubar1->Append( m_menuTools, _("&Tools") ); 
-	
-	m_menuHelp = new wxMenu();
-	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_menuItemCheckVersionNow = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("&Check for updates now") ) , wxEmptyString, wxITEM_NORMAL );
-	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_menuItemCheckVersionAuto->Check( true );
-	
-	m_menuHelp->AppendSeparator();
-	
-	m_menuItemAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About") ) + wxT('\t') + wxT("Shift+F1"), wxEmptyString, wxITEM_NORMAL );
-	m_menuHelp->Append( m_menuItemAbout );
-	
-	m_menubar1->Append( m_menuHelp, _("&Help") ); 
-	
-	this->SetMenuBar( m_menubar1 );
-	
-	bSizerPanelHolder = new wxBoxSizer( wxVERTICAL );
-	
-	m_panelTopButtons = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer1791;
-	bSizer1791 = new wxBoxSizer( wxVERTICAL );
-	
-	bSizerTopButtons = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizerTopButtons->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonCancel = new zen::BitmapTextButton( m_panelTopButtons, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_buttonCancel->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	m_buttonCancel->Enable( false );
-	m_buttonCancel->Hide();
-	
-	bSizerTopButtons->Add( m_buttonCancel, 0, wxEXPAND, 5 );
-	
-	m_buttonCompare = new zen::BitmapTextButton( m_panelTopButtons, wxID_ANY, _("Compare"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_buttonCompare->SetDefault(); 
-	m_buttonCompare->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	m_buttonCompare->SetToolTip( _("dummy") );
-	
-	bSizerTopButtons->Add( m_buttonCompare, 0, wxEXPAND, 5 );
-	
-	
-	bSizerTopButtons->Add( 4, 0, 0, 0, 5 );
-	
-	wxBoxSizer* bSizer198;
-	bSizer198 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bpButtonCmpConfig = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
-	m_bpButtonCmpConfig->SetToolTip( _("dummy") );
-	
-	bSizer198->Add( m_bpButtonCmpConfig, 1, wxEXPAND, 5 );
-	
-	m_bpButtonCmpContext = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 17,-1 ), wxBU_AUTODRAW );
-	m_bpButtonCmpContext->SetToolTip( _("dummy") );
-	
-	bSizer198->Add( m_bpButtonCmpContext, 0, wxEXPAND, 5 );
-	
-	
-	bSizerTopButtons->Add( bSizer198, 0, wxEXPAND, 5 );
-	
-	
-	bSizerTopButtons->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerTopButtons->Add( 5, 5, 0, 0, 5 );
-	
-	wxBoxSizer* bSizer199;
-	bSizer199 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bpButtonFilter = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 60,-1 ), wxBU_AUTODRAW|wxFULL_REPAINT_ON_RESIZE );
-	bSizer199->Add( m_bpButtonFilter, 1, wxEXPAND, 5 );
-	
-	m_bpButtonFilterContext = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 17,-1 ), wxBU_AUTODRAW );
-	m_bpButtonFilterContext->SetToolTip( _("dummy") );
-	
-	bSizer199->Add( m_bpButtonFilterContext, 0, wxEXPAND, 5 );
-	
-	
-	bSizerTopButtons->Add( bSizer199, 0, wxEXPAND, 5 );
-	
-	
-	bSizerTopButtons->Add( 5, 5, 0, 0, 5 );
-	
-	
-	bSizerTopButtons->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxBoxSizer* bSizer200;
-	bSizer200 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bpButtonSyncConfig = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
-	m_bpButtonSyncConfig->SetToolTip( _("dummy") );
-	
-	bSizer200->Add( m_bpButtonSyncConfig, 1, wxEXPAND, 5 );
-	
-	m_bpButtonSyncContext = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 17,-1 ), wxBU_AUTODRAW );
-	m_bpButtonSyncContext->SetToolTip( _("dummy") );
-	
-	bSizer200->Add( m_bpButtonSyncContext, 0, wxEXPAND, 5 );
-	
-	
-	bSizerTopButtons->Add( bSizer200, 0, wxEXPAND, 5 );
-	
-	
-	bSizerTopButtons->Add( 4, 0, 0, 0, 5 );
-	
-	m_buttonSync = new zen::BitmapTextButton( m_panelTopButtons, wxID_ANY, _("Synchronize"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_buttonSync->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	m_buttonSync->SetToolTip( _("dummy") );
-	
-	bSizerTopButtons->Add( m_buttonSync, 0, wxEXPAND, 5 );
-	
-	
-	bSizerTopButtons->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer1791->Add( bSizerTopButtons, 1, wxEXPAND, 5 );
-	
-	
-	m_panelTopButtons->SetSizer( bSizer1791 );
-	m_panelTopButtons->Layout();
-	bSizer1791->Fit( m_panelTopButtons );
-	bSizerPanelHolder->Add( m_panelTopButtons, 0, wxEXPAND, 5 );
-	
-	m_panelDirectoryPairs = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSTATIC_BORDER|wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer1601;
-	bSizer1601 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer91;
-	bSizer91 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_panelTopLeft = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panelTopLeft->SetMinSize( wxSize( 1,-1 ) );
-	
-	wxFlexGridSizer* fgSizer8;
-	fgSizer8 = new wxFlexGridSizer( 0, 2, 0, 0 );
-	fgSizer8->AddGrowableCol( 1 );
-	fgSizer8->SetFlexibleDirection( wxBOTH );
-	fgSizer8->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_ALL );
-	
-	
-	fgSizer8->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticTextResolvedPathL = new wxStaticText( m_panelTopLeft, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextResolvedPathL->Wrap( -1 );
-	fgSizer8->Add( m_staticTextResolvedPathL, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2 );
-	
-	wxBoxSizer* bSizer159;
-	bSizer159 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bpButtonAddPair = new wxBitmapButton( m_panelTopLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25,25 ), wxBU_AUTODRAW );
-	m_bpButtonAddPair->SetToolTip( _("Add folder pair") );
-	
-	bSizer159->Add( m_bpButtonAddPair, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonRemovePair = new wxBitmapButton( m_panelTopLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25,25 ), wxBU_AUTODRAW );
-	m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
-	
-	bSizer159->Add( m_bpButtonRemovePair, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	fgSizer8->Add( bSizer159, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxBoxSizer* bSizer182;
-	bSizer182 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_folderPathLeft = new FolderHistoryBox( m_panelTopLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
-	bSizer182->Add( m_folderPathLeft, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonSelectFolderLeft = new wxButton( m_panelTopLeft, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonSelectFolderLeft->SetToolTip( _("Select a folder") );
-	
-	bSizer182->Add( m_buttonSelectFolderLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonSelectAltFolderLeft = new wxBitmapButton( m_panelTopLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,-1 ), wxBU_AUTODRAW );
-	m_bpButtonSelectAltFolderLeft->SetToolTip( _("Access online storage") );
-	
-	bSizer182->Add( m_bpButtonSelectAltFolderLeft, 0, wxEXPAND, 5 );
-	
-	
-	fgSizer8->Add( bSizer182, 0, wxEXPAND, 5 );
-	
-	
-	m_panelTopLeft->SetSizer( fgSizer8 );
-	m_panelTopLeft->Layout();
-	fgSizer8->Fit( m_panelTopLeft );
-	bSizer91->Add( m_panelTopLeft, 1, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panelTopCenter = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer1771;
-	bSizer1771 = new wxBoxSizer( wxVERTICAL );
-	
-	
-	bSizer1771->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_bpButtonSwapSides = new wxBitmapButton( m_panelTopCenter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
-	m_bpButtonSwapSides->SetToolTip( _("Swap sides") );
-	
-	bSizer1771->Add( m_bpButtonSwapSides, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer160;
-	bSizer160 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bpButtonAltCompCfg = new wxBitmapButton( m_panelTopCenter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 26,25 ), wxBU_AUTODRAW );
-	bSizer160->Add( m_bpButtonAltCompCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonLocalFilter = new wxBitmapButton( m_panelTopCenter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 26,25 ), wxBU_AUTODRAW );
-	bSizer160->Add( m_bpButtonLocalFilter, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonAltSyncCfg = new wxBitmapButton( m_panelTopCenter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 26,25 ), wxBU_AUTODRAW );
-	bSizer160->Add( m_bpButtonAltSyncCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer1771->Add( bSizer160, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizer1771->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	m_panelTopCenter->SetSizer( bSizer1771 );
-	m_panelTopCenter->Layout();
-	bSizer1771->Fit( m_panelTopCenter );
-	bSizer91->Add( m_panelTopCenter, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
-	m_panelTopRight = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panelTopRight->SetMinSize( wxSize( 1,-1 ) );
-	
-	wxBoxSizer* bSizer183;
-	bSizer183 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticTextResolvedPathR = new wxStaticText( m_panelTopRight, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextResolvedPathR->Wrap( -1 );
-	bSizer183->Add( m_staticTextResolvedPathR, 0, wxALL, 2 );
-	
-	wxBoxSizer* bSizer179;
-	bSizer179 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_folderPathRight = new FolderHistoryBox( m_panelTopRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
-	bSizer179->Add( m_folderPathRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonSelectFolderRight = new wxButton( m_panelTopRight, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonSelectFolderRight->SetToolTip( _("Select a folder") );
-	
-	bSizer179->Add( m_buttonSelectFolderRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonSelectAltFolderRight = new wxBitmapButton( m_panelTopRight, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,-1 ), wxBU_AUTODRAW );
-	m_bpButtonSelectAltFolderRight->SetToolTip( _("Access online storage") );
-	
-	bSizer179->Add( m_bpButtonSelectAltFolderRight, 0, wxEXPAND, 5 );
-	
-	
-	bSizer183->Add( bSizer179, 0, wxEXPAND, 5 );
-	
-	
-	m_panelTopRight->SetSizer( bSizer183 );
-	m_panelTopRight->Layout();
-	bSizer183->Fit( m_panelTopRight );
-	bSizer91->Add( m_panelTopRight, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	
-	bSizer1601->Add( bSizer91, 0, wxEXPAND, 5 );
-	
-	m_scrolledWindowFolderPairs = new wxScrolledWindow( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxHSCROLL|wxVSCROLL );
-	m_scrolledWindowFolderPairs->SetScrollRate( 10, 10 );
-	m_scrolledWindowFolderPairs->SetMinSize( wxSize( -1,0 ) );
-	
-	bSizerAddFolderPairs = new wxBoxSizer( wxVERTICAL );
-	
-	
-	m_scrolledWindowFolderPairs->SetSizer( bSizerAddFolderPairs );
-	m_scrolledWindowFolderPairs->Layout();
-	bSizerAddFolderPairs->Fit( m_scrolledWindowFolderPairs );
-	bSizer1601->Add( m_scrolledWindowFolderPairs, 1, wxEXPAND, 5 );
-	
-	
-	m_panelDirectoryPairs->SetSizer( bSizer1601 );
-	m_panelDirectoryPairs->Layout();
-	bSizer1601->Fit( m_panelDirectoryPairs );
-	bSizerPanelHolder->Add( m_panelDirectoryPairs, 0, wxEXPAND, 5 );
-	
-	m_gridNavi = new zen::Grid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
-	m_gridNavi->SetScrollRate( 5, 5 );
-	bSizerPanelHolder->Add( m_gridNavi, 1, wxEXPAND, 5 );
-	
-	m_panelCenter = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer1711;
-	bSizer1711 = new wxBoxSizer( wxVERTICAL );
-	
-	m_splitterMain = new zen::TripleSplitter( m_panelCenter, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer1781;
-	bSizer1781 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_gridMainL = new zen::Grid( m_splitterMain, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
-	m_gridMainL->SetScrollRate( 5, 5 );
-	bSizer1781->Add( m_gridMainL, 1, wxEXPAND, 5 );
-	
-	m_gridMainC = new zen::Grid( m_splitterMain, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
-	m_gridMainC->SetScrollRate( 5, 5 );
-	bSizer1781->Add( m_gridMainC, 0, wxEXPAND, 5 );
-	
-	m_gridMainR = new zen::Grid( m_splitterMain, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
-	m_gridMainR->SetScrollRate( 5, 5 );
-	bSizer1781->Add( m_gridMainR, 1, wxEXPAND, 5 );
-	
-	
-	m_splitterMain->SetSizer( bSizer1781 );
-	m_splitterMain->Layout();
-	bSizer1781->Fit( m_splitterMain );
-	bSizer1711->Add( m_splitterMain, 1, wxEXPAND, 5 );
-	
-	m_panelStatusBar = new wxPanel( m_panelCenter, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSTATIC_BORDER|wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer451;
-	bSizer451 = new wxBoxSizer( wxHORIZONTAL );
-	
-	bSizer451->SetMinSize( wxSize( -1,22 ) ); 
-	bSizerFileStatus = new wxBoxSizer( wxHORIZONTAL );
-	
-	bSizerStatusLeft = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer53;
-	bSizer53 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer53->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizerStatusLeftDirectories = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapSmallDirectoryLeft = new wxStaticBitmap( m_panelStatusBar, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizerStatusLeftDirectories->Add( m_bitmapSmallDirectoryLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerStatusLeftDirectories->Add( 2, 0, 0, 0, 5 );
-	
-	m_staticTextStatusLeftDirs = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextStatusLeftDirs->Wrap( -1 );
-	bSizerStatusLeftDirectories->Add( m_staticTextStatusLeftDirs, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizer53->Add( bSizerStatusLeftDirectories, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizerStatusLeftFiles = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizerStatusLeftFiles->Add( 10, 0, 0, 0, 5 );
-	
-	m_bitmapSmallFileLeft = new wxStaticBitmap( m_panelStatusBar, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizerStatusLeftFiles->Add( m_bitmapSmallFileLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerStatusLeftFiles->Add( 2, 0, 0, 0, 5 );
-	
-	m_staticTextStatusLeftFiles = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextStatusLeftFiles->Wrap( -1 );
-	bSizerStatusLeftFiles->Add( m_staticTextStatusLeftFiles, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerStatusLeftFiles->Add( 4, 0, 0, 0, 5 );
-	
-	m_staticTextStatusLeftBytes = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextStatusLeftBytes->Wrap( -1 );
-	bSizerStatusLeftFiles->Add( m_staticTextStatusLeftBytes, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer53->Add( bSizerStatusLeftFiles, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer53->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerStatusLeft->Add( bSizer53, 1, wxEXPAND, 5 );
-	
-	m_staticline9 = new wxStaticLine( m_panelStatusBar, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizerStatusLeft->Add( m_staticline9, 0, wxEXPAND|wxTOP, 2 );
-	
-	
-	bSizerFileStatus->Add( bSizerStatusLeft, 1, wxEXPAND, 5 );
-	
-	
-	bSizerFileStatus->Add( 26, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticTextStatusCenter = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextStatusCenter->Wrap( -1 );
-	bSizerFileStatus->Add( m_staticTextStatusCenter, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerFileStatus->Add( 26, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizerStatusRight = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticline10 = new wxStaticLine( m_panelStatusBar, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizerStatusRight->Add( m_staticline10, 0, wxEXPAND|wxTOP, 2 );
-	
-	wxBoxSizer* bSizer52;
-	bSizer52 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer52->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizerStatusRightDirectories = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapSmallDirectoryRight = new wxStaticBitmap( m_panelStatusBar, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizerStatusRightDirectories->Add( m_bitmapSmallDirectoryRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerStatusRightDirectories->Add( 2, 0, 0, 0, 5 );
-	
-	m_staticTextStatusRightDirs = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextStatusRightDirs->Wrap( -1 );
-	bSizerStatusRightDirectories->Add( m_staticTextStatusRightDirs, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer52->Add( bSizerStatusRightDirectories, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizerStatusRightFiles = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizerStatusRightFiles->Add( 10, 0, 0, 0, 5 );
-	
-	m_bitmapSmallFileRight = new wxStaticBitmap( m_panelStatusBar, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizerStatusRightFiles->Add( m_bitmapSmallFileRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerStatusRightFiles->Add( 2, 0, 0, 0, 5 );
-	
-	m_staticTextStatusRightFiles = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextStatusRightFiles->Wrap( -1 );
-	bSizerStatusRightFiles->Add( m_staticTextStatusRightFiles, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerStatusRightFiles->Add( 4, 0, 0, 0, 5 );
-	
-	m_staticTextStatusRightBytes = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextStatusRightBytes->Wrap( -1 );
-	bSizerStatusRightFiles->Add( m_staticTextStatusRightBytes, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer52->Add( bSizerStatusRightFiles, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer52->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerStatusRight->Add( bSizer52, 1, wxEXPAND, 5 );
-	
-	
-	bSizerFileStatus->Add( bSizerStatusRight, 1, wxEXPAND, 5 );
-	
-	
-	bSizer451->Add( bSizerFileStatus, 1, wxEXPAND, 5 );
-	
-	m_staticTextFullStatus = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextFullStatus->Wrap( -1 );
-	m_staticTextFullStatus->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer451->Add( m_staticTextFullStatus, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	
-	m_panelStatusBar->SetSizer( bSizer451 );
-	m_panelStatusBar->Layout();
-	bSizer451->Fit( m_panelStatusBar );
-	bSizer1711->Add( m_panelStatusBar, 0, wxEXPAND, 5 );
-	
-	
-	m_panelCenter->SetSizer( bSizer1711 );
-	m_panelCenter->Layout();
-	bSizer1711->Fit( m_panelCenter );
-	bSizerPanelHolder->Add( m_panelCenter, 1, wxEXPAND, 5 );
-	
-	m_panelSearch = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer1713;
-	bSizer1713 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bpButtonHideSearch = new wxBitmapButton( m_panelSearch, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25,25 ), wxBU_AUTODRAW );
-	m_bpButtonHideSearch->SetToolTip( _("Close search bar") );
-	
-	bSizer1713->Add( m_bpButtonHideSearch, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_staticText101 = new wxStaticText( m_panelSearch, wxID_ANY, _("Find:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText101->Wrap( -1 );
-	bSizer1713->Add( m_staticText101, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrlSearchTxt = new wxTextCtrl( m_panelSearch, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 220,-1 ), wxTE_PROCESS_ENTER|wxWANTS_CHARS );
-	m_textCtrlSearchTxt->SetMaxLength( 0 ); 
-	bSizer1713->Add( m_textCtrlSearchTxt, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-	
-	m_checkBoxMatchCase = new wxCheckBox( m_panelSearch, wxID_ANY, _("Match case"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer1713->Add( m_checkBoxMatchCase, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	
-	m_panelSearch->SetSizer( bSizer1713 );
-	m_panelSearch->Layout();
-	bSizer1713->Fit( m_panelSearch );
-	bSizerPanelHolder->Add( m_panelSearch, 0, 0, 5 );
-	
-	m_panelConfig = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	bSizerConfig = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer151;
-	bSizer151 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer17611;
-	bSizer17611 = new wxBoxSizer( wxVERTICAL );
-	
-	m_bpButtonNew = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	m_bpButtonNew->SetToolTip( _("dummy") );
-	
-	bSizer17611->Add( m_bpButtonNew, 0, wxEXPAND, 5 );
-	
-	m_staticText951 = new wxStaticText( m_panelConfig, wxID_ANY, _("New"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText951->Wrap( -1 );
-	bSizer17611->Add( m_staticText951, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 2 );
-	
-	
-	bSizer151->Add( bSizer17611, 0, 0, 5 );
-	
-	wxBoxSizer* bSizer1761;
-	bSizer1761 = new wxBoxSizer( wxVERTICAL );
-	
-	m_bpButtonOpen = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	m_bpButtonOpen->SetToolTip( _("dummy") );
-	
-	bSizer1761->Add( m_bpButtonOpen, 0, wxEXPAND, 5 );
-	
-	m_staticText95 = new wxStaticText( m_panelConfig, wxID_ANY, _("Open..."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText95->Wrap( -1 );
-	bSizer1761->Add( m_staticText95, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 2 );
-	
-	
-	bSizer151->Add( bSizer1761, 0, 0, 5 );
-	
-	wxBoxSizer* bSizer175;
-	bSizer175 = new wxBoxSizer( wxVERTICAL );
-	
-	m_bpButtonSave = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	m_bpButtonSave->SetToolTip( _("dummy") );
-	
-	bSizer175->Add( m_bpButtonSave, 0, wxEXPAND, 5 );
-	
-	m_staticText961 = new wxStaticText( m_panelConfig, wxID_ANY, _("Save"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText961->Wrap( -1 );
-	bSizer175->Add( m_staticText961, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 2 );
-	
-	
-	bSizer151->Add( bSizer175, 0, 0, 5 );
-	
-	wxBoxSizer* bSizer174;
-	bSizer174 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer1772;
-	bSizer1772 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bpButtonSaveAs = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	m_bpButtonSaveAs->SetToolTip( _("dummy") );
-	
-	bSizer1772->Add( m_bpButtonSaveAs, 1, 0, 5 );
-	
-	m_bpButtonSaveAsBatch = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	m_bpButtonSaveAsBatch->SetToolTip( _("dummy") );
-	
-	bSizer1772->Add( m_bpButtonSaveAsBatch, 1, 0, 5 );
-	
-	
-	bSizer174->Add( bSizer1772, 0, wxEXPAND, 5 );
-	
-	m_staticText97 = new wxStaticText( m_panelConfig, wxID_ANY, _("Save as..."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText97->Wrap( -1 );
-	bSizer174->Add( m_staticText97, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 2 );
-	
-	
-	bSizer151->Add( bSizer174, 0, 0, 5 );
-	
-	
-	bSizerConfig->Add( bSizer151, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_listBoxHistory = new wxListBox( m_panelConfig, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_EXTENDED|wxLB_NEEDED_SB ); 
-	m_listBoxHistory->SetMinSize( wxSize( -1,40 ) );
-	
-	bSizerConfig->Add( m_listBoxHistory, 1, wxEXPAND, 5 );
-	
-	
-	m_panelConfig->SetSizer( bSizerConfig );
-	m_panelConfig->Layout();
-	bSizerConfig->Fit( m_panelConfig );
-	bSizerPanelHolder->Add( m_panelConfig, 0, 0, 5 );
-	
-	m_panelViewFilter = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	bSizerViewFilter = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticTextViewType = new wxStaticText( m_panelViewFilter, wxID_ANY, _("View type:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextViewType->Wrap( -1 );
-	bSizerViewFilter->Add( m_staticTextViewType, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonViewTypeSyncAction = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 82,42 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonViewTypeSyncAction, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT, 5 );
-	
-	m_bpButtonShowExcluded = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonShowExcluded, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizerViewFilter->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticTextSelectView = new wxStaticText( m_panelViewFilter, wxID_ANY, _("Select view:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextSelectView->Wrap( -1 );
-	bSizerViewFilter->Add( m_staticTextSelectView, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonShowDeleteLeft = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonShowDeleteLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonShowUpdateLeft = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonShowUpdateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonShowCreateLeft = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonShowCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonShowLeftOnly = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonShowLeftOnly, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonShowLeftNewer = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonShowLeftNewer, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonShowEqual = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonShowEqual, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonShowDoNothing = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonShowDoNothing, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonShowDifferent = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonShowDifferent, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonShowRightNewer = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonShowRightNewer, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonShowRightOnly = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonShowRightOnly, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonShowCreateRight = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonShowCreateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonShowUpdateRight = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonShowUpdateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonShowDeleteRight = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonShowDeleteRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonShowConflict = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonShowConflict, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizerViewFilter->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticText96 = new wxStaticText( m_panelViewFilter, wxID_ANY, _("Statistics:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText96->Wrap( -1 );
-	bSizerViewFilter->Add( m_staticText96, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_panelStatistics = new wxPanel( m_panelViewFilter, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
-	m_panelStatistics->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	bSizer1801 = new wxBoxSizer( wxVERTICAL );
-	
-	bSizerStatistics = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer173;
-	bSizer173 = new wxBoxSizer( wxVERTICAL );
-	
-	m_bitmapDeleteLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapDeleteLeft->SetToolTip( _("Number of files and folders that will be deleted") );
-	
-	bSizer173->Add( m_bitmapDeleteLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer173->Add( 5, 2, 0, 0, 5 );
-	
-	
-	bSizer173->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticTextDeleteLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextDeleteLeft->Wrap( -1 );
-	m_staticTextDeleteLeft->SetToolTip( _("Number of files and folders that will be deleted") );
-	
-	bSizer173->Add( m_staticTextDeleteLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerStatistics->Add( bSizer173, 0, wxEXPAND, 5 );
-	
-	
-	bSizerStatistics->Add( 5, 5, 0, 0, 5 );
-	
-	wxBoxSizer* bSizer172;
-	bSizer172 = new wxBoxSizer( wxVERTICAL );
-	
-	m_bitmapUpdateLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapUpdateLeft->SetToolTip( _("Number of files that will be updated") );
-	
-	bSizer172->Add( m_bitmapUpdateLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer172->Add( 5, 2, 0, 0, 5 );
-	
-	
-	bSizer172->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticTextUpdateLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextUpdateLeft->Wrap( -1 );
-	m_staticTextUpdateLeft->SetToolTip( _("Number of files that will be updated") );
-	
-	bSizer172->Add( m_staticTextUpdateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizerStatistics->Add( bSizer172, 0, wxEXPAND, 5 );
-	
-	
-	bSizerStatistics->Add( 5, 5, 0, 0, 5 );
-	
-	wxBoxSizer* bSizer1712;
-	bSizer1712 = new wxBoxSizer( wxVERTICAL );
-	
-	m_bitmapCreateLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapCreateLeft->SetToolTip( _("Number of files and folders that will be created") );
-	
-	bSizer1712->Add( m_bitmapCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizer1712->Add( 5, 2, 0, 0, 5 );
-	
-	
-	bSizer1712->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticTextCreateLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextCreateLeft->Wrap( -1 );
-	m_staticTextCreateLeft->SetToolTip( _("Number of files and folders that will be created") );
-	
-	bSizer1712->Add( m_staticTextCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizerStatistics->Add( bSizer1712, 0, wxEXPAND, 5 );
-	
-	
-	bSizerStatistics->Add( 5, 5, 0, 0, 5 );
-	
-	bSizerData = new wxBoxSizer( wxVERTICAL );
-	
-	m_bitmapData = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapData->SetToolTip( _("Total bytes to copy") );
-	
-	bSizerData->Add( m_bitmapData, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizerData->Add( 5, 2, 0, 0, 5 );
-	
-	
-	bSizerData->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticTextData = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextData->Wrap( -1 );
-	m_staticTextData->SetToolTip( _("Total bytes to copy") );
-	
-	bSizerData->Add( m_staticTextData, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerStatistics->Add( bSizerData, 0, wxEXPAND, 5 );
-	
-	
-	bSizerStatistics->Add( 5, 5, 0, 0, 5 );
-	
-	wxBoxSizer* bSizer178;
-	bSizer178 = new wxBoxSizer( wxVERTICAL );
-	
-	m_bitmapCreateRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapCreateRight->SetToolTip( _("Number of files and folders that will be created") );
-	
-	bSizer178->Add( m_bitmapCreateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizer178->Add( 5, 2, 0, 0, 5 );
-	
-	
-	bSizer178->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticTextCreateRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextCreateRight->Wrap( -1 );
-	m_staticTextCreateRight->SetToolTip( _("Number of files and folders that will be created") );
-	
-	bSizer178->Add( m_staticTextCreateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerStatistics->Add( bSizer178, 0, wxEXPAND, 5 );
-	
-	
-	bSizerStatistics->Add( 5, 5, 0, 0, 5 );
-	
-	wxBoxSizer* bSizer177;
-	bSizer177 = new wxBoxSizer( wxVERTICAL );
-	
-	m_bitmapUpdateRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapUpdateRight->SetToolTip( _("Number of files that will be updated") );
-	
-	bSizer177->Add( m_bitmapUpdateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizer177->Add( 5, 2, 0, 0, 5 );
-	
-	
-	bSizer177->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticTextUpdateRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextUpdateRight->Wrap( -1 );
-	m_staticTextUpdateRight->SetToolTip( _("Number of files that will be updated") );
-	
-	bSizer177->Add( m_staticTextUpdateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerStatistics->Add( bSizer177, 0, wxEXPAND, 5 );
-	
-	
-	bSizerStatistics->Add( 5, 5, 0, 0, 5 );
-	
-	wxBoxSizer* bSizer176;
-	bSizer176 = new wxBoxSizer( wxVERTICAL );
-	
-	m_bitmapDeleteRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapDeleteRight->SetToolTip( _("Number of files and folders that will be deleted") );
-	
-	bSizer176->Add( m_bitmapDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer176->Add( 5, 2, 0, 0, 5 );
-	
-	
-	bSizer176->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticTextDeleteRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextDeleteRight->Wrap( -1 );
-	m_staticTextDeleteRight->SetToolTip( _("Number of files and folders that will be deleted") );
-	
-	bSizer176->Add( m_staticTextDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerStatistics->Add( bSizer176, 0, wxEXPAND, 5 );
-	
-	
-	bSizer1801->Add( bSizerStatistics, 0, wxALL, 4 );
-	
-	
-	m_panelStatistics->SetSizer( bSizer1801 );
-	m_panelStatistics->Layout();
-	bSizer1801->Fit( m_panelStatistics );
-	bSizerViewFilter->Add( m_panelStatistics, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	m_panelViewFilter->SetSizer( bSizerViewFilter );
-	m_panelViewFilter->Layout();
-	bSizerViewFilter->Fit( m_panelViewFilter );
-	bSizerPanelHolder->Add( m_panelViewFilter, 0, 0, 5 );
-	
-	
-	this->SetSizer( bSizerPanelHolder );
-	this->Layout();
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainDialogGenerated::OnClose ) );
-	this->Connect( m_menuItemNew->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigNew ) );
-	this->Connect( m_menuItemLoad->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigLoad ) );
-	this->Connect( m_menuItemSave->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigSave ) );
-	this->Connect( m_menuItemSaveAs->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigSaveAs ) );
-	this->Connect( m_menuItemSaveAsBatch->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSaveAsBatchJob ) );
-	this->Connect( m_menuItem4->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuQuit ) );
-	this->Connect( m_menuItemCompare->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnCompare ) );
-	this->Connect( m_menuItemCompSettings->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnCmpSettings ) );
-	this->Connect( m_menuItemFilter->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigureFilter ) );
-	this->Connect( m_menuItemSyncSettings->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSyncSettings ) );
-	this->Connect( m_menuItemSynchronize->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ) );
-	this->Connect( m_menuItemOptions->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuOptions ) );
-	this->Connect( m_menuItemFind->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuFindItem ) );
-	this->Connect( m_menuItem51->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuResetLayout ) );
-	this->Connect( m_menuItem5->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuExportFileList ) );
-	this->Connect( m_menuItemHelp->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnShowHelp ) );
-	this->Connect( m_menuItemCheckVersionNow->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuCheckVersion ) );
-	this->Connect( m_menuItemCheckVersionAuto->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuCheckVersionAutomatically ) );
-	this->Connect( m_menuItemAbout->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuAbout ) );
-	m_buttonCompare->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCompare ), NULL, this );
-	m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCmpSettings ), NULL, this );
-	m_bpButtonCmpConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnCompSettingsContext ), NULL, this );
-	m_bpButtonCmpContext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCompSettingsContext ), NULL, this );
-	m_bpButtonCmpContext->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnCompSettingsContext ), NULL, this );
-	m_bpButtonFilter->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigureFilter ), NULL, this );
-	m_bpButtonFilter->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnGlobalFilterContext ), NULL, this );
-	m_bpButtonFilterContext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnGlobalFilterContext ), NULL, this );
-	m_bpButtonFilterContext->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnGlobalFilterContext ), NULL, this );
-	m_bpButtonSyncConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncSettings ), NULL, this );
-	m_bpButtonSyncConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnSyncSettingsContext ), NULL, this );
-	m_bpButtonSyncContext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncSettingsContext ), NULL, this );
-	m_bpButtonSyncContext->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnSyncSettingsContext ), NULL, this );
-	m_buttonSync->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ), NULL, this );
-	m_bpButtonAddPair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnTopFolderPairAdd ), NULL, this );
-	m_bpButtonRemovePair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnTopFolderPairRemove ), NULL, this );
-	m_bpButtonSwapSides->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSwapSides ), NULL, this );
-	m_bpButtonAltCompCfg->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnTopLocalCompCfg ), NULL, this );
-	m_bpButtonLocalFilter->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnTopLocalFilterCfg ), NULL, this );
-	m_bpButtonAltSyncCfg->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnTopLocalSyncCfg ), NULL, this );
-	m_bpButtonHideSearch->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnHideSearchPanel ), NULL, this );
-	m_textCtrlSearchTxt->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( MainDialogGenerated::OnSearchGridEnter ), NULL, this );
-	m_bpButtonNew->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigNew ), NULL, this );
-	m_bpButtonOpen->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigLoad ), NULL, this );
-	m_bpButtonSave->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigSave ), NULL, this );
-	m_bpButtonSaveAs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigSaveAs ), NULL, this );
-	m_bpButtonSaveAsBatch->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSaveAsBatchJob ), NULL, this );
-	m_listBoxHistory->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( MainDialogGenerated::OnCfgHistoryKeyEvent ), NULL, this );
-	m_listBoxHistory->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnLoadFromHistory ), NULL, this );
-	m_listBoxHistory->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( MainDialogGenerated::OnLoadFromHistoryDoubleClick ), NULL, this );
-	m_listBoxHistory->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnCfgHistoryRightClick ), NULL, this );
-	m_bpButtonViewTypeSyncAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewType ), NULL, this );
-	m_bpButtonShowExcluded->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowExcluded->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowDeleteLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowDeleteLeft->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowUpdateLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowUpdateLeft->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowCreateLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowCreateLeft->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowLeftOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowLeftOnly->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowLeftNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowLeftNewer->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowEqual->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowEqual->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowDoNothing->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowDoNothing->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowDifferent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowDifferent->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowRightNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowRightNewer->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowRightOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowRightOnly->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowCreateRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowCreateRight->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowUpdateRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowUpdateRight->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowDeleteRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowDeleteRight->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowConflict->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowConflict->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    this->SetSizeHints( wxSize( 640, 400 ), wxDefaultSize );
+
+    m_menubar1 = new wxMenuBar( 0 );
+    m_menuFile = new wxMenu();
+    m_menuItemNew = new wxMenuItem( m_menuFile, wxID_NEW, wxString( _("&New") ) + wxT('\t') + wxT("Ctrl+N"), wxEmptyString, wxITEM_NORMAL );
+    m_menuFile->Append( m_menuItemNew );
+
+    m_menuItemLoad = new wxMenuItem( m_menuFile, wxID_OPEN, wxString( _("&Open...") ) + wxT('\t') + wxT("Ctrl+O"), wxEmptyString, wxITEM_NORMAL );
+    m_menuFile->Append( m_menuItemLoad );
+
+    m_menuFile->AppendSeparator();
+
+    m_menuItemSave = new wxMenuItem( m_menuFile, wxID_SAVE, wxString( _("&Save") ) + wxT('\t') + wxT("Ctrl+S"), wxEmptyString, wxITEM_NORMAL );
+    m_menuFile->Append( m_menuItemSave );
+
+    m_menuItemSaveAs = new wxMenuItem( m_menuFile, wxID_SAVEAS, wxString( _("Save &as...") ), wxEmptyString, wxITEM_NORMAL );
+    m_menuFile->Append( m_menuItemSaveAs );
+
+    m_menuItemSaveAsBatch = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("Save as &batch job...") ), wxEmptyString, wxITEM_NORMAL );
+    m_menuFile->Append( m_menuItemSaveAsBatch );
+
+    m_menuFile->AppendSeparator();
+
+    wxMenuItem* m_menuItem4;
+    m_menuItem4 = new wxMenuItem( m_menuFile, wxID_EXIT, wxString( _("E&xit") ), wxEmptyString, wxITEM_NORMAL );
+    m_menuFile->Append( m_menuItem4 );
+
+    m_menubar1->Append( m_menuFile, _("&File") );
+
+    m_menu4 = new wxMenu();
+    m_menuItemCompare = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("Start &comparison") ) + wxT('\t') + wxT("F5"), wxEmptyString, wxITEM_NORMAL );
+    m_menu4->Append( m_menuItemCompare );
+
+    m_menu4->AppendSeparator();
+
+    m_menuItemCompSettings = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("C&omparison settings") ) + wxT('\t') + wxT("F6"), wxEmptyString, wxITEM_NORMAL );
+    m_menu4->Append( m_menuItemCompSettings );
+
+    m_menuItemFilter = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("&Filter settings") ) + wxT('\t') + wxT("F7"), wxEmptyString, wxITEM_NORMAL );
+    m_menu4->Append( m_menuItemFilter );
+
+    m_menuItemSyncSettings = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("S&ynchronization settings") ) + wxT('\t') + wxT("F8"), wxEmptyString, wxITEM_NORMAL );
+    m_menu4->Append( m_menuItemSyncSettings );
+
+    m_menu4->AppendSeparator();
+
+    m_menuItemSynchronize = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("Start &synchronization") ) + wxT('\t') + wxT("F9"), wxEmptyString, wxITEM_NORMAL );
+    m_menu4->Append( m_menuItemSynchronize );
+
+    m_menubar1->Append( m_menu4, _("&Actions") );
+
+    m_menuTools = new wxMenu();
+    m_menuItemOptions = new wxMenuItem( m_menuTools, wxID_PREFERENCES, wxString( _("&Preferences") ) + wxT('\t') + wxT("Ctrl+,"), wxEmptyString, wxITEM_NORMAL );
+    m_menuTools->Append( m_menuItemOptions );
+
+    m_menuLanguages = new wxMenu();
+    wxMenuItem* m_menuLanguagesItem = new wxMenuItem( m_menuTools, wxID_ANY, _("&Language"), wxEmptyString, wxITEM_NORMAL, m_menuLanguages );
+    m_menuTools->Append( m_menuLanguagesItem );
+
+    m_menuTools->AppendSeparator();
+
+    m_menuItemFind = new wxMenuItem( m_menuTools, wxID_FIND, wxString( _("&Find...") ) + wxT('\t') + wxT("Ctrl+F"), wxEmptyString, wxITEM_NORMAL );
+    m_menuTools->Append( m_menuItemFind );
+
+    wxMenuItem* m_menuItem5;
+    m_menuItem5 = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("&Export file list...") ), wxEmptyString, wxITEM_NORMAL );
+    m_menuTools->Append( m_menuItem5 );
+
+    m_menuTools->AppendSeparator();
+
+    wxMenuItem* m_menuItem51;
+    m_menuItem51 = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("&Reset layout") ), wxEmptyString, wxITEM_NORMAL );
+    m_menuTools->Append( m_menuItem51 );
+
+    m_menuItemShowMain = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("dummy") ), wxEmptyString, wxITEM_NORMAL );
+    m_menuTools->Append( m_menuItemShowMain );
+
+    m_menuItemShowFolders = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("dummy") ), wxEmptyString, wxITEM_NORMAL );
+    m_menuTools->Append( m_menuItemShowFolders );
+
+    m_menuItemShowViewFilter = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("dummy") ), wxEmptyString, wxITEM_NORMAL );
+    m_menuTools->Append( m_menuItemShowViewFilter );
+
+    m_menuItemShowConfig = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("dummy") ), wxEmptyString, wxITEM_NORMAL );
+    m_menuTools->Append( m_menuItemShowConfig );
+
+    m_menuItemShowOverview = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("dummy") ), wxEmptyString, wxITEM_NORMAL );
+    m_menuTools->Append( m_menuItemShowOverview );
+
+    m_menubar1->Append( m_menuTools, _("&Tools") );
+
+    m_menuHelp = new wxMenu();
+    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_menuItemCheckVersionNow = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("&Check for updates now") ), wxEmptyString, wxITEM_NORMAL );
+    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_menuItemCheckVersionAuto->Check( true );
+
+    m_menuHelp->AppendSeparator();
+
+    m_menuItemAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About") ) + wxT('\t') + wxT("Shift+F1"), wxEmptyString, wxITEM_NORMAL );
+    m_menuHelp->Append( m_menuItemAbout );
+
+    m_menubar1->Append( m_menuHelp, _("&Help") );
+
+    this->SetMenuBar( m_menubar1 );
+
+    bSizerPanelHolder = new wxBoxSizer( wxVERTICAL );
+
+    m_panelTopButtons = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer1791;
+    bSizer1791 = new wxBoxSizer( wxVERTICAL );
+
+    bSizerTopButtons = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizerTopButtons->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonCancel = new zen::BitmapTextButton( m_panelTopButtons, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_buttonCancel->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+    m_buttonCancel->Enable( false );
+    m_buttonCancel->Hide();
+
+    bSizerTopButtons->Add( m_buttonCancel, 0, wxEXPAND, 5 );
+
+    m_buttonCompare = new zen::BitmapTextButton( m_panelTopButtons, wxID_ANY, _("Compare"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_buttonCompare->SetDefault();
+    m_buttonCompare->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+    m_buttonCompare->SetToolTip( _("dummy") );
+
+    bSizerTopButtons->Add( m_buttonCompare, 0, wxEXPAND, 5 );
+
+
+    bSizerTopButtons->Add( 4, 0, 0, 0, 5 );
+
+    wxBoxSizer* bSizer198;
+    bSizer198 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bpButtonCmpConfig = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
+    m_bpButtonCmpConfig->SetToolTip( _("dummy") );
+
+    bSizer198->Add( m_bpButtonCmpConfig, 1, wxEXPAND, 5 );
+
+    m_bpButtonCmpContext = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 17, -1 ), wxBU_AUTODRAW );
+    m_bpButtonCmpContext->SetToolTip( _("dummy") );
+
+    bSizer198->Add( m_bpButtonCmpContext, 0, wxEXPAND, 5 );
+
+
+    bSizerTopButtons->Add( bSizer198, 0, wxEXPAND, 5 );
+
+
+    bSizerTopButtons->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerTopButtons->Add( 5, 5, 0, 0, 5 );
+
+    wxBoxSizer* bSizer199;
+    bSizer199 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bpButtonFilter = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 60, -1 ), wxBU_AUTODRAW|wxFULL_REPAINT_ON_RESIZE );
+    bSizer199->Add( m_bpButtonFilter, 1, wxEXPAND, 5 );
+
+    m_bpButtonFilterContext = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 17, -1 ), wxBU_AUTODRAW );
+    m_bpButtonFilterContext->SetToolTip( _("dummy") );
+
+    bSizer199->Add( m_bpButtonFilterContext, 0, wxEXPAND, 5 );
+
+
+    bSizerTopButtons->Add( bSizer199, 0, wxEXPAND, 5 );
+
+
+    bSizerTopButtons->Add( 5, 5, 0, 0, 5 );
+
+
+    bSizerTopButtons->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxBoxSizer* bSizer200;
+    bSizer200 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bpButtonSyncConfig = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
+    m_bpButtonSyncConfig->SetToolTip( _("dummy") );
+
+    bSizer200->Add( m_bpButtonSyncConfig, 1, wxEXPAND, 5 );
+
+    m_bpButtonSyncContext = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 17, -1 ), wxBU_AUTODRAW );
+    m_bpButtonSyncContext->SetToolTip( _("dummy") );
+
+    bSizer200->Add( m_bpButtonSyncContext, 0, wxEXPAND, 5 );
+
+
+    bSizerTopButtons->Add( bSizer200, 0, wxEXPAND, 5 );
+
+
+    bSizerTopButtons->Add( 4, 0, 0, 0, 5 );
+
+    m_buttonSync = new zen::BitmapTextButton( m_panelTopButtons, wxID_ANY, _("Synchronize"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_buttonSync->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+    m_buttonSync->SetToolTip( _("dummy") );
+
+    bSizerTopButtons->Add( m_buttonSync, 0, wxEXPAND, 5 );
+
+
+    bSizerTopButtons->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer1791->Add( bSizerTopButtons, 1, wxEXPAND, 5 );
+
+
+    m_panelTopButtons->SetSizer( bSizer1791 );
+    m_panelTopButtons->Layout();
+    bSizer1791->Fit( m_panelTopButtons );
+    bSizerPanelHolder->Add( m_panelTopButtons, 0, wxEXPAND, 5 );
+
+    m_panelDirectoryPairs = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSTATIC_BORDER|wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer1601;
+    bSizer1601 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer91;
+    bSizer91 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_panelTopLeft = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panelTopLeft->SetMinSize( wxSize( 1, -1 ) );
+
+    wxFlexGridSizer* fgSizer8;
+    fgSizer8 = new wxFlexGridSizer( 0, 2, 0, 0 );
+    fgSizer8->AddGrowableCol( 1 );
+    fgSizer8->SetFlexibleDirection( wxBOTH );
+    fgSizer8->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_ALL );
+
+
+    fgSizer8->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticTextResolvedPathL = new wxStaticText( m_panelTopLeft, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextResolvedPathL->Wrap( -1 );
+    fgSizer8->Add( m_staticTextResolvedPathL, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2 );
+
+    wxBoxSizer* bSizer159;
+    bSizer159 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bpButtonAddPair = new wxBitmapButton( m_panelTopLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25, 25 ), wxBU_AUTODRAW );
+    m_bpButtonAddPair->SetToolTip( _("Add folder pair") );
+
+    bSizer159->Add( m_bpButtonAddPair, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonRemovePair = new wxBitmapButton( m_panelTopLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25, 25 ), wxBU_AUTODRAW );
+    m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
+
+    bSizer159->Add( m_bpButtonRemovePair, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    fgSizer8->Add( bSizer159, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxBoxSizer* bSizer182;
+    bSizer182 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_folderPathLeft = new FolderHistoryBox( m_panelTopLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+    bSizer182->Add( m_folderPathLeft, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonSelectFolderLeft = new wxButton( m_panelTopLeft, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonSelectFolderLeft->SetToolTip( _("Select a folder") );
+
+    bSizer182->Add( m_buttonSelectFolderLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonSelectAltFolderLeft = new wxBitmapButton( m_panelTopLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30, -1 ), wxBU_AUTODRAW );
+    m_bpButtonSelectAltFolderLeft->SetToolTip( _("Access online storage") );
+
+    bSizer182->Add( m_bpButtonSelectAltFolderLeft, 0, wxEXPAND, 5 );
+
+
+    fgSizer8->Add( bSizer182, 0, wxEXPAND, 5 );
+
+
+    m_panelTopLeft->SetSizer( fgSizer8 );
+    m_panelTopLeft->Layout();
+    fgSizer8->Fit( m_panelTopLeft );
+    bSizer91->Add( m_panelTopLeft, 1, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panelTopCenter = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer1771;
+    bSizer1771 = new wxBoxSizer( wxVERTICAL );
+
+
+    bSizer1771->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_bpButtonSwapSides = new wxBitmapButton( m_panelTopCenter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
+    m_bpButtonSwapSides->SetToolTip( _("Swap sides") );
+
+    bSizer1771->Add( m_bpButtonSwapSides, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer160;
+    bSizer160 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bpButtonAltCompCfg = new wxBitmapButton( m_panelTopCenter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 26, 25 ), wxBU_AUTODRAW );
+    bSizer160->Add( m_bpButtonAltCompCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonLocalFilter = new wxBitmapButton( m_panelTopCenter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 26, 25 ), wxBU_AUTODRAW );
+    bSizer160->Add( m_bpButtonLocalFilter, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonAltSyncCfg = new wxBitmapButton( m_panelTopCenter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 26, 25 ), wxBU_AUTODRAW );
+    bSizer160->Add( m_bpButtonAltSyncCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer1771->Add( bSizer160, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizer1771->Add( 0, 0, 1, wxEXPAND, 5 );
+
+
+    m_panelTopCenter->SetSizer( bSizer1771 );
+    m_panelTopCenter->Layout();
+    bSizer1771->Fit( m_panelTopCenter );
+    bSizer91->Add( m_panelTopCenter, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 );
+
+    m_panelTopRight = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panelTopRight->SetMinSize( wxSize( 1, -1 ) );
+
+    wxBoxSizer* bSizer183;
+    bSizer183 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticTextResolvedPathR = new wxStaticText( m_panelTopRight, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextResolvedPathR->Wrap( -1 );
+    bSizer183->Add( m_staticTextResolvedPathR, 0, wxALL, 2 );
+
+    wxBoxSizer* bSizer179;
+    bSizer179 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_folderPathRight = new FolderHistoryBox( m_panelTopRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+    bSizer179->Add( m_folderPathRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonSelectFolderRight = new wxButton( m_panelTopRight, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonSelectFolderRight->SetToolTip( _("Select a folder") );
+
+    bSizer179->Add( m_buttonSelectFolderRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonSelectAltFolderRight = new wxBitmapButton( m_panelTopRight, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30, -1 ), wxBU_AUTODRAW );
+    m_bpButtonSelectAltFolderRight->SetToolTip( _("Access online storage") );
+
+    bSizer179->Add( m_bpButtonSelectAltFolderRight, 0, wxEXPAND, 5 );
+
+
+    bSizer183->Add( bSizer179, 0, wxEXPAND, 5 );
+
+
+    m_panelTopRight->SetSizer( bSizer183 );
+    m_panelTopRight->Layout();
+    bSizer183->Fit( m_panelTopRight );
+    bSizer91->Add( m_panelTopRight, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+
+    bSizer1601->Add( bSizer91, 0, wxEXPAND, 5 );
+
+    m_scrolledWindowFolderPairs = new wxScrolledWindow( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxSize( -1, -1 ), wxHSCROLL|wxVSCROLL );
+    m_scrolledWindowFolderPairs->SetScrollRate( 10, 10 );
+    m_scrolledWindowFolderPairs->SetMinSize( wxSize( -1, 0 ) );
+
+    bSizerAddFolderPairs = new wxBoxSizer( wxVERTICAL );
+
+
+    m_scrolledWindowFolderPairs->SetSizer( bSizerAddFolderPairs );
+    m_scrolledWindowFolderPairs->Layout();
+    bSizerAddFolderPairs->Fit( m_scrolledWindowFolderPairs );
+    bSizer1601->Add( m_scrolledWindowFolderPairs, 1, wxEXPAND, 5 );
+
+
+    m_panelDirectoryPairs->SetSizer( bSizer1601 );
+    m_panelDirectoryPairs->Layout();
+    bSizer1601->Fit( m_panelDirectoryPairs );
+    bSizerPanelHolder->Add( m_panelDirectoryPairs, 0, wxEXPAND, 5 );
+
+    m_gridOverview = new zen::Grid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
+    m_gridOverview->SetScrollRate( 5, 5 );
+    bSizerPanelHolder->Add( m_gridOverview, 1, wxEXPAND, 5 );
+
+    m_panelCenter = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer1711;
+    bSizer1711 = new wxBoxSizer( wxVERTICAL );
+
+    m_splitterMain = new zen::TripleSplitter( m_panelCenter, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer1781;
+    bSizer1781 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_gridMainL = new zen::Grid( m_splitterMain, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
+    m_gridMainL->SetScrollRate( 5, 5 );
+    bSizer1781->Add( m_gridMainL, 1, wxEXPAND, 5 );
+
+    m_gridMainC = new zen::Grid( m_splitterMain, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
+    m_gridMainC->SetScrollRate( 5, 5 );
+    bSizer1781->Add( m_gridMainC, 0, wxEXPAND, 5 );
+
+    m_gridMainR = new zen::Grid( m_splitterMain, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
+    m_gridMainR->SetScrollRate( 5, 5 );
+    bSizer1781->Add( m_gridMainR, 1, wxEXPAND, 5 );
+
+
+    m_splitterMain->SetSizer( bSizer1781 );
+    m_splitterMain->Layout();
+    bSizer1781->Fit( m_splitterMain );
+    bSizer1711->Add( m_splitterMain, 1, wxEXPAND, 5 );
+
+    m_panelStatusBar = new wxPanel( m_panelCenter, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSTATIC_BORDER|wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer451;
+    bSizer451 = new wxBoxSizer( wxHORIZONTAL );
+
+    bSizer451->SetMinSize( wxSize( -1, 22 ) );
+    bSizerFileStatus = new wxBoxSizer( wxHORIZONTAL );
+
+    bSizerStatusLeft = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer53;
+    bSizer53 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer53->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizerStatusLeftDirectories = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapSmallDirectoryLeft = new wxStaticBitmap( m_panelStatusBar, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizerStatusLeftDirectories->Add( m_bitmapSmallDirectoryLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerStatusLeftDirectories->Add( 2, 0, 0, 0, 5 );
+
+    m_staticTextStatusLeftDirs = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextStatusLeftDirs->Wrap( -1 );
+    bSizerStatusLeftDirectories->Add( m_staticTextStatusLeftDirs, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizer53->Add( bSizerStatusLeftDirectories, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizerStatusLeftFiles = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizerStatusLeftFiles->Add( 10, 0, 0, 0, 5 );
+
+    m_bitmapSmallFileLeft = new wxStaticBitmap( m_panelStatusBar, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizerStatusLeftFiles->Add( m_bitmapSmallFileLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerStatusLeftFiles->Add( 2, 0, 0, 0, 5 );
+
+    m_staticTextStatusLeftFiles = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextStatusLeftFiles->Wrap( -1 );
+    bSizerStatusLeftFiles->Add( m_staticTextStatusLeftFiles, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerStatusLeftFiles->Add( 4, 0, 0, 0, 5 );
+
+    m_staticTextStatusLeftBytes = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextStatusLeftBytes->Wrap( -1 );
+    bSizerStatusLeftFiles->Add( m_staticTextStatusLeftBytes, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer53->Add( bSizerStatusLeftFiles, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer53->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerStatusLeft->Add( bSizer53, 1, wxEXPAND, 5 );
+
+    m_staticline9 = new wxStaticLine( m_panelStatusBar, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizerStatusLeft->Add( m_staticline9, 0, wxEXPAND|wxTOP, 2 );
+
+
+    bSizerFileStatus->Add( bSizerStatusLeft, 1, wxEXPAND, 5 );
+
+
+    bSizerFileStatus->Add( 26, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticTextStatusCenter = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextStatusCenter->Wrap( -1 );
+    bSizerFileStatus->Add( m_staticTextStatusCenter, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerFileStatus->Add( 26, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizerStatusRight = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticline10 = new wxStaticLine( m_panelStatusBar, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizerStatusRight->Add( m_staticline10, 0, wxEXPAND|wxTOP, 2 );
+
+    wxBoxSizer* bSizer52;
+    bSizer52 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer52->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizerStatusRightDirectories = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapSmallDirectoryRight = new wxStaticBitmap( m_panelStatusBar, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizerStatusRightDirectories->Add( m_bitmapSmallDirectoryRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerStatusRightDirectories->Add( 2, 0, 0, 0, 5 );
+
+    m_staticTextStatusRightDirs = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextStatusRightDirs->Wrap( -1 );
+    bSizerStatusRightDirectories->Add( m_staticTextStatusRightDirs, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer52->Add( bSizerStatusRightDirectories, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizerStatusRightFiles = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizerStatusRightFiles->Add( 10, 0, 0, 0, 5 );
+
+    m_bitmapSmallFileRight = new wxStaticBitmap( m_panelStatusBar, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizerStatusRightFiles->Add( m_bitmapSmallFileRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerStatusRightFiles->Add( 2, 0, 0, 0, 5 );
+
+    m_staticTextStatusRightFiles = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextStatusRightFiles->Wrap( -1 );
+    bSizerStatusRightFiles->Add( m_staticTextStatusRightFiles, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerStatusRightFiles->Add( 4, 0, 0, 0, 5 );
+
+    m_staticTextStatusRightBytes = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextStatusRightBytes->Wrap( -1 );
+    bSizerStatusRightFiles->Add( m_staticTextStatusRightBytes, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer52->Add( bSizerStatusRightFiles, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer52->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerStatusRight->Add( bSizer52, 1, wxEXPAND, 5 );
+
+
+    bSizerFileStatus->Add( bSizerStatusRight, 1, wxEXPAND, 5 );
+
+
+    bSizer451->Add( bSizerFileStatus, 1, wxEXPAND, 5 );
+
+    m_staticTextFullStatus = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextFullStatus->Wrap( -1 );
+    m_staticTextFullStatus->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer451->Add( m_staticTextFullStatus, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+
+    m_panelStatusBar->SetSizer( bSizer451 );
+    m_panelStatusBar->Layout();
+    bSizer451->Fit( m_panelStatusBar );
+    bSizer1711->Add( m_panelStatusBar, 0, wxEXPAND, 5 );
+
+
+    m_panelCenter->SetSizer( bSizer1711 );
+    m_panelCenter->Layout();
+    bSizer1711->Fit( m_panelCenter );
+    bSizerPanelHolder->Add( m_panelCenter, 1, wxEXPAND, 5 );
+
+    m_panelSearch = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer1713;
+    bSizer1713 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bpButtonHideSearch = new wxBitmapButton( m_panelSearch, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25, 25 ), wxBU_AUTODRAW );
+    m_bpButtonHideSearch->SetToolTip( _("Close search bar") );
+
+    bSizer1713->Add( m_bpButtonHideSearch, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_staticText101 = new wxStaticText( m_panelSearch, wxID_ANY, _("Find:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText101->Wrap( -1 );
+    bSizer1713->Add( m_staticText101, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrlSearchTxt = new wxTextCtrl( m_panelSearch, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 220, -1 ), wxTE_PROCESS_ENTER|wxWANTS_CHARS );
+    m_textCtrlSearchTxt->SetMaxLength( 0 );
+    bSizer1713->Add( m_textCtrlSearchTxt, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+    m_checkBoxMatchCase = new wxCheckBox( m_panelSearch, wxID_ANY, _("Match case"), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer1713->Add( m_checkBoxMatchCase, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+
+    m_panelSearch->SetSizer( bSizer1713 );
+    m_panelSearch->Layout();
+    bSizer1713->Fit( m_panelSearch );
+    bSizerPanelHolder->Add( m_panelSearch, 0, 0, 5 );
+
+    m_panelConfig = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    bSizerConfig = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer151;
+    bSizer151 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer17611;
+    bSizer17611 = new wxBoxSizer( wxVERTICAL );
+
+    m_bpButtonNew = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42, 42 ), wxBU_AUTODRAW );
+    m_bpButtonNew->SetToolTip( _("dummy") );
+
+    bSizer17611->Add( m_bpButtonNew, 0, wxEXPAND, 5 );
+
+    m_staticText951 = new wxStaticText( m_panelConfig, wxID_ANY, _("New"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText951->Wrap( -1 );
+    bSizer17611->Add( m_staticText951, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 2 );
+
+
+    bSizer151->Add( bSizer17611, 0, 0, 5 );
+
+    wxBoxSizer* bSizer1761;
+    bSizer1761 = new wxBoxSizer( wxVERTICAL );
+
+    m_bpButtonOpen = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42, 42 ), wxBU_AUTODRAW );
+    m_bpButtonOpen->SetToolTip( _("dummy") );
+
+    bSizer1761->Add( m_bpButtonOpen, 0, wxEXPAND, 5 );
+
+    m_staticText95 = new wxStaticText( m_panelConfig, wxID_ANY, _("Open..."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText95->Wrap( -1 );
+    bSizer1761->Add( m_staticText95, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 2 );
+
+
+    bSizer151->Add( bSizer1761, 0, 0, 5 );
+
+    wxBoxSizer* bSizer175;
+    bSizer175 = new wxBoxSizer( wxVERTICAL );
+
+    m_bpButtonSave = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42, 42 ), wxBU_AUTODRAW );
+    m_bpButtonSave->SetToolTip( _("dummy") );
+
+    bSizer175->Add( m_bpButtonSave, 0, wxEXPAND, 5 );
+
+    m_staticText961 = new wxStaticText( m_panelConfig, wxID_ANY, _("Save"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText961->Wrap( -1 );
+    bSizer175->Add( m_staticText961, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 2 );
+
+
+    bSizer151->Add( bSizer175, 0, 0, 5 );
+
+    wxBoxSizer* bSizer174;
+    bSizer174 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer1772;
+    bSizer1772 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bpButtonSaveAs = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42, 42 ), wxBU_AUTODRAW );
+    m_bpButtonSaveAs->SetToolTip( _("dummy") );
+
+    bSizer1772->Add( m_bpButtonSaveAs, 1, 0, 5 );
+
+    m_bpButtonSaveAsBatch = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42, 42 ), wxBU_AUTODRAW );
+    m_bpButtonSaveAsBatch->SetToolTip( _("dummy") );
+
+    bSizer1772->Add( m_bpButtonSaveAsBatch, 1, 0, 5 );
+
+
+    bSizer174->Add( bSizer1772, 0, wxEXPAND, 5 );
+
+    m_staticText97 = new wxStaticText( m_panelConfig, wxID_ANY, _("Save as..."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText97->Wrap( -1 );
+    bSizer174->Add( m_staticText97, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 2 );
+
+
+    bSizer151->Add( bSizer174, 0, 0, 5 );
+
+
+    bSizerConfig->Add( bSizer151, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_listBoxHistory = new wxListBox( m_panelConfig, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_EXTENDED|wxLB_NEEDED_SB );
+    m_listBoxHistory->SetMinSize( wxSize( -1, 40 ) );
+
+    bSizerConfig->Add( m_listBoxHistory, 1, wxEXPAND, 5 );
+
+
+    m_panelConfig->SetSizer( bSizerConfig );
+    m_panelConfig->Layout();
+    bSizerConfig->Fit( m_panelConfig );
+    bSizerPanelHolder->Add( m_panelConfig, 0, 0, 5 );
+
+    m_panelViewFilter = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    bSizerViewFilter = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticTextViewType = new wxStaticText( m_panelViewFilter, wxID_ANY, _("View type:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextViewType->Wrap( -1 );
+    bSizerViewFilter->Add( m_staticTextViewType, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonViewTypeSyncAction = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 82, 42 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonViewTypeSyncAction, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT, 5 );
+
+    m_bpButtonShowExcluded = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42, 42 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonShowExcluded, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizerViewFilter->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticTextSelectView = new wxStaticText( m_panelViewFilter, wxID_ANY, _("Select view:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextSelectView->Wrap( -1 );
+    bSizerViewFilter->Add( m_staticTextSelectView, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonShowDeleteLeft = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42, 42 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonShowDeleteLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonShowUpdateLeft = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42, 42 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonShowUpdateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonShowCreateLeft = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42, 42 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonShowCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonShowLeftOnly = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42, 42 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonShowLeftOnly, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonShowLeftNewer = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42, 42 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonShowLeftNewer, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonShowEqual = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42, 42 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonShowEqual, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonShowDoNothing = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42, 42 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonShowDoNothing, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonShowDifferent = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42, 42 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonShowDifferent, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonShowRightNewer = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42, 42 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonShowRightNewer, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonShowRightOnly = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42, 42 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonShowRightOnly, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonShowCreateRight = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42, 42 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonShowCreateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonShowUpdateRight = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42, 42 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonShowUpdateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonShowDeleteRight = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42, 42 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonShowDeleteRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonShowConflict = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42, 42 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonShowConflict, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizerViewFilter->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticText96 = new wxStaticText( m_panelViewFilter, wxID_ANY, _("Statistics:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText96->Wrap( -1 );
+    bSizerViewFilter->Add( m_staticText96, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_panelStatistics = new wxPanel( m_panelViewFilter, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
+    m_panelStatistics->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    bSizer1801 = new wxBoxSizer( wxVERTICAL );
+
+    bSizerStatistics = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer173;
+    bSizer173 = new wxBoxSizer( wxVERTICAL );
+
+    m_bitmapDeleteLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapDeleteLeft->SetToolTip( _("Number of files and folders that will be deleted") );
+
+    bSizer173->Add( m_bitmapDeleteLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer173->Add( 5, 2, 0, 0, 5 );
+
+
+    bSizer173->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticTextDeleteLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextDeleteLeft->Wrap( -1 );
+    m_staticTextDeleteLeft->SetToolTip( _("Number of files and folders that will be deleted") );
+
+    bSizer173->Add( m_staticTextDeleteLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerStatistics->Add( bSizer173, 0, wxEXPAND, 5 );
+
+
+    bSizerStatistics->Add( 5, 5, 0, 0, 5 );
+
+    wxBoxSizer* bSizer172;
+    bSizer172 = new wxBoxSizer( wxVERTICAL );
+
+    m_bitmapUpdateLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapUpdateLeft->SetToolTip( _("Number of files that will be updated") );
+
+    bSizer172->Add( m_bitmapUpdateLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer172->Add( 5, 2, 0, 0, 5 );
+
+
+    bSizer172->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticTextUpdateLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextUpdateLeft->Wrap( -1 );
+    m_staticTextUpdateLeft->SetToolTip( _("Number of files that will be updated") );
+
+    bSizer172->Add( m_staticTextUpdateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizerStatistics->Add( bSizer172, 0, wxEXPAND, 5 );
+
+
+    bSizerStatistics->Add( 5, 5, 0, 0, 5 );
+
+    wxBoxSizer* bSizer1712;
+    bSizer1712 = new wxBoxSizer( wxVERTICAL );
+
+    m_bitmapCreateLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapCreateLeft->SetToolTip( _("Number of files and folders that will be created") );
+
+    bSizer1712->Add( m_bitmapCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizer1712->Add( 5, 2, 0, 0, 5 );
+
+
+    bSizer1712->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticTextCreateLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextCreateLeft->Wrap( -1 );
+    m_staticTextCreateLeft->SetToolTip( _("Number of files and folders that will be created") );
+
+    bSizer1712->Add( m_staticTextCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizerStatistics->Add( bSizer1712, 0, wxEXPAND, 5 );
+
+
+    bSizerStatistics->Add( 5, 5, 0, 0, 5 );
+
+    bSizerData = new wxBoxSizer( wxVERTICAL );
+
+    m_bitmapData = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapData->SetToolTip( _("Total bytes to copy") );
+
+    bSizerData->Add( m_bitmapData, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizerData->Add( 5, 2, 0, 0, 5 );
+
+
+    bSizerData->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticTextData = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextData->Wrap( -1 );
+    m_staticTextData->SetToolTip( _("Total bytes to copy") );
+
+    bSizerData->Add( m_staticTextData, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerStatistics->Add( bSizerData, 0, wxEXPAND, 5 );
+
+
+    bSizerStatistics->Add( 5, 5, 0, 0, 5 );
+
+    wxBoxSizer* bSizer178;
+    bSizer178 = new wxBoxSizer( wxVERTICAL );
+
+    m_bitmapCreateRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapCreateRight->SetToolTip( _("Number of files and folders that will be created") );
+
+    bSizer178->Add( m_bitmapCreateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizer178->Add( 5, 2, 0, 0, 5 );
+
+
+    bSizer178->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticTextCreateRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextCreateRight->Wrap( -1 );
+    m_staticTextCreateRight->SetToolTip( _("Number of files and folders that will be created") );
+
+    bSizer178->Add( m_staticTextCreateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerStatistics->Add( bSizer178, 0, wxEXPAND, 5 );
+
+
+    bSizerStatistics->Add( 5, 5, 0, 0, 5 );
+
+    wxBoxSizer* bSizer177;
+    bSizer177 = new wxBoxSizer( wxVERTICAL );
+
+    m_bitmapUpdateRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapUpdateRight->SetToolTip( _("Number of files that will be updated") );
+
+    bSizer177->Add( m_bitmapUpdateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizer177->Add( 5, 2, 0, 0, 5 );
+
+
+    bSizer177->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticTextUpdateRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextUpdateRight->Wrap( -1 );
+    m_staticTextUpdateRight->SetToolTip( _("Number of files that will be updated") );
+
+    bSizer177->Add( m_staticTextUpdateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerStatistics->Add( bSizer177, 0, wxEXPAND, 5 );
+
+
+    bSizerStatistics->Add( 5, 5, 0, 0, 5 );
+
+    wxBoxSizer* bSizer176;
+    bSizer176 = new wxBoxSizer( wxVERTICAL );
+
+    m_bitmapDeleteRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapDeleteRight->SetToolTip( _("Number of files and folders that will be deleted") );
+
+    bSizer176->Add( m_bitmapDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer176->Add( 5, 2, 0, 0, 5 );
+
+
+    bSizer176->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticTextDeleteRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextDeleteRight->Wrap( -1 );
+    m_staticTextDeleteRight->SetToolTip( _("Number of files and folders that will be deleted") );
+
+    bSizer176->Add( m_staticTextDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerStatistics->Add( bSizer176, 0, wxEXPAND, 5 );
+
+
+    bSizer1801->Add( bSizerStatistics, 0, wxALL, 4 );
+
+
+    m_panelStatistics->SetSizer( bSizer1801 );
+    m_panelStatistics->Layout();
+    bSizer1801->Fit( m_panelStatistics );
+    bSizerViewFilter->Add( m_panelStatistics, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    m_panelViewFilter->SetSizer( bSizerViewFilter );
+    m_panelViewFilter->Layout();
+    bSizerViewFilter->Fit( m_panelViewFilter );
+    bSizerPanelHolder->Add( m_panelViewFilter, 0, 0, 5 );
+
+
+    this->SetSizer( bSizerPanelHolder );
+    this->Layout();
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainDialogGenerated::OnClose ) );
+    this->Connect( m_menuItemNew->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigNew ) );
+    this->Connect( m_menuItemLoad->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigLoad ) );
+    this->Connect( m_menuItemSave->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigSave ) );
+    this->Connect( m_menuItemSaveAs->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigSaveAs ) );
+    this->Connect( m_menuItemSaveAsBatch->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSaveAsBatchJob ) );
+    this->Connect( m_menuItem4->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuQuit ) );
+    this->Connect( m_menuItemCompare->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnCompare ) );
+    this->Connect( m_menuItemCompSettings->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnCmpSettings ) );
+    this->Connect( m_menuItemFilter->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigureFilter ) );
+    this->Connect( m_menuItemSyncSettings->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSyncSettings ) );
+    this->Connect( m_menuItemSynchronize->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ) );
+    this->Connect( m_menuItemOptions->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuOptions ) );
+    this->Connect( m_menuItemFind->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuFindItem ) );
+    this->Connect( m_menuItem5->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuExportFileList ) );
+    this->Connect( m_menuItem51->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuResetLayout ) );
+    this->Connect( m_menuItemHelp->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnShowHelp ) );
+    this->Connect( m_menuItemCheckVersionNow->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuCheckVersion ) );
+    this->Connect( m_menuItemCheckVersionAuto->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuCheckVersionAutomatically ) );
+    this->Connect( m_menuItemAbout->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuAbout ) );
+    m_buttonCompare->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCompare ), NULL, this );
+    m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCmpSettings ), NULL, this );
+    m_bpButtonCmpConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnCompSettingsContext ), NULL, this );
+    m_bpButtonCmpContext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCompSettingsContext ), NULL, this );
+    m_bpButtonCmpContext->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnCompSettingsContext ), NULL, this );
+    m_bpButtonFilter->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigureFilter ), NULL, this );
+    m_bpButtonFilter->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnGlobalFilterContext ), NULL, this );
+    m_bpButtonFilterContext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnGlobalFilterContext ), NULL, this );
+    m_bpButtonFilterContext->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnGlobalFilterContext ), NULL, this );
+    m_bpButtonSyncConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncSettings ), NULL, this );
+    m_bpButtonSyncConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnSyncSettingsContext ), NULL, this );
+    m_bpButtonSyncContext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncSettingsContext ), NULL, this );
+    m_bpButtonSyncContext->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnSyncSettingsContext ), NULL, this );
+    m_buttonSync->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ), NULL, this );
+    m_bpButtonAddPair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnTopFolderPairAdd ), NULL, this );
+    m_bpButtonRemovePair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnTopFolderPairRemove ), NULL, this );
+    m_bpButtonSwapSides->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSwapSides ), NULL, this );
+    m_bpButtonAltCompCfg->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnTopLocalCompCfg ), NULL, this );
+    m_bpButtonLocalFilter->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnTopLocalFilterCfg ), NULL, this );
+    m_bpButtonAltSyncCfg->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnTopLocalSyncCfg ), NULL, this );
+    m_bpButtonHideSearch->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnHideSearchPanel ), NULL, this );
+    m_textCtrlSearchTxt->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( MainDialogGenerated::OnSearchGridEnter ), NULL, this );
+    m_bpButtonNew->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigNew ), NULL, this );
+    m_bpButtonOpen->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigLoad ), NULL, this );
+    m_bpButtonSave->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigSave ), NULL, this );
+    m_bpButtonSaveAs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigSaveAs ), NULL, this );
+    m_bpButtonSaveAsBatch->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSaveAsBatchJob ), NULL, this );
+    m_listBoxHistory->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( MainDialogGenerated::OnCfgHistoryKeyEvent ), NULL, this );
+    m_listBoxHistory->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnLoadFromHistory ), NULL, this );
+    m_listBoxHistory->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( MainDialogGenerated::OnLoadFromHistoryDoubleClick ), NULL, this );
+    m_listBoxHistory->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnCfgHistoryRightClick ), NULL, this );
+    m_bpButtonViewTypeSyncAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewType ), NULL, this );
+    m_bpButtonShowExcluded->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowExcluded->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowDeleteLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowDeleteLeft->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowUpdateLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowUpdateLeft->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowCreateLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowCreateLeft->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowLeftOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowLeftOnly->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowLeftNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowLeftNewer->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowEqual->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowEqual->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowDoNothing->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowDoNothing->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowDifferent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowDifferent->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowRightNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowRightNewer->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowRightOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowRightOnly->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowCreateRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowCreateRight->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowUpdateRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowUpdateRight->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowDeleteRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowDeleteRight->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowConflict->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowConflict->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
 }
 
 MainDialogGenerated::~MainDialogGenerated()
@@ -1047,895 +1064,895 @@ MainDialogGenerated::~MainDialogGenerated()
 
 ConfigDlgGenerated::ConfigDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer7;
-	bSizer7 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer190;
-	bSizer190 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer1911;
-	bSizer1911 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticTextFolderPairLabel = new wxStaticText( this, wxID_ANY, _("Folder pair:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextFolderPairLabel->Wrap( -1 );
-	bSizer1911->Add( m_staticTextFolderPairLabel, 0, wxALL, 5 );
-	
-	m_listBoxFolderPair = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_NEEDED_SB ); 
-	bSizer1911->Add( m_listBoxFolderPair, 1, 0, 5 );
-	
-	
-	bSizer190->Add( bSizer1911, 0, wxEXPAND|wxLEFT, 5 );
-	
-	m_notebook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	m_panelCompSettingsHolder = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panelCompSettingsHolder->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	wxBoxSizer* bSizer275;
-	bSizer275 = new wxBoxSizer( wxVERTICAL );
-	
-	bSizerHeaderCompSettings = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticTextMainCompSettings = new wxStaticText( m_panelCompSettingsHolder, wxID_ANY, _("Main settings:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextMainCompSettings->Wrap( -1 );
-	bSizerHeaderCompSettings->Add( m_staticTextMainCompSettings, 0, wxALL, 10 );
-	
-	m_checkBoxUseLocalCmpOptions = new wxCheckBox( m_panelCompSettingsHolder, wxID_ANY, _("Use local settings:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_checkBoxUseLocalCmpOptions->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	bSizerHeaderCompSettings->Add( m_checkBoxUseLocalCmpOptions, 0, wxALL|wxEXPAND, 10 );
-	
-	m_staticlineCompHeader = new wxStaticLine( m_panelCompSettingsHolder, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizerHeaderCompSettings->Add( m_staticlineCompHeader, 0, wxEXPAND, 5 );
-	
-	
-	bSizer275->Add( bSizerHeaderCompSettings, 0, wxEXPAND, 5 );
-	
-	m_panelComparisonSettings = new wxPanel( m_panelCompSettingsHolder, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panelComparisonSettings->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	wxBoxSizer* bSizer159;
-	bSizer159 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer178;
-	bSizer178 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer182;
-	bSizer182 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText91 = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("Select a variant:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText91->Wrap( -1 );
-	bSizer182->Add( m_staticText91, 0, wxALL, 5 );
-	
-	wxFlexGridSizer* fgSizer16;
-	fgSizer16 = new wxFlexGridSizer( 3, 2, 5, 5 );
-	fgSizer16->SetFlexibleDirection( wxBOTH );
-	fgSizer16->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_bitmapByTimeSize = new wxStaticBitmap( m_panelComparisonSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer16->Add( m_bitmapByTimeSize, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_toggleBtnByTimeSize = new wxToggleButton( m_panelComparisonSettings, wxID_ANY, _("File time and size"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_toggleBtnByTimeSize->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	fgSizer16->Add( m_toggleBtnByTimeSize, 0, wxEXPAND, 5 );
-	
-	m_bitmapByContent = new wxStaticBitmap( m_panelComparisonSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer16->Add( m_bitmapByContent, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_toggleBtnByContent = new wxToggleButton( m_panelComparisonSettings, wxID_ANY, _("File content"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_toggleBtnByContent->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	fgSizer16->Add( m_toggleBtnByContent, 0, wxEXPAND, 5 );
-	
-	m_bitmapBySize = new wxStaticBitmap( m_panelComparisonSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer16->Add( m_bitmapBySize, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_toggleBtnBySize = new wxToggleButton( m_panelComparisonSettings, wxID_ANY, _("File size"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_toggleBtnBySize->SetValue( true ); 
-	m_toggleBtnBySize->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	fgSizer16->Add( m_toggleBtnBySize, 0, wxEXPAND, 5 );
-	
-	
-	bSizer182->Add( fgSizer16, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizer178->Add( bSizer182, 0, wxALL, 5 );
-	
-	m_staticline42 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizer178->Add( m_staticline42, 0, wxEXPAND, 5 );
-	
-	m_textCtrlCompVarDescription = new wxTextCtrl( m_panelComparisonSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxNO_BORDER );
-	bSizer178->Add( m_textCtrlCompVarDescription, 1, wxEXPAND|wxLEFT, 5 );
-	
-	
-	bSizer159->Add( bSizer178, 0, wxEXPAND, 5 );
-	
-	m_staticline33 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer159->Add( m_staticline33, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer1734;
-	bSizer1734 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer1721;
-	bSizer1721 = new wxBoxSizer( wxVERTICAL );
-	
-	m_checkBoxSymlinksInclude = new wxCheckBox( m_panelComparisonSettings, wxID_ANY, _("Include &symbolic links:"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer1721->Add( m_checkBoxSymlinksInclude, 0, wxALL, 5 );
-	
-	wxBoxSizer* bSizer176;
-	bSizer176 = new wxBoxSizer( wxVERTICAL );
-	
-	m_radioBtnSymlinksFollow = new wxRadioButton( m_panelComparisonSettings, wxID_ANY, _("&Follow"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_radioBtnSymlinksFollow->SetValue( true ); 
-	bSizer176->Add( m_radioBtnSymlinksFollow, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	m_radioBtnSymlinksDirect = new wxRadioButton( m_panelComparisonSettings, wxID_ANY, _("&Direct"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer176->Add( m_radioBtnSymlinksDirect, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	
-	bSizer1721->Add( bSizer176, 0, wxEXPAND|wxLEFT, 18 );
-	
-	m_hyperlink24 = new wxHyperlinkCtrl( m_panelComparisonSettings, wxID_ANY, _("More information"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	bSizer1721->Add( m_hyperlink24, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	
-	bSizer1734->Add( bSizer1721, 0, wxALL, 5 );
-	
-	m_staticline44 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizer1734->Add( m_staticline44, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer1733;
-	bSizer1733 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText112 = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("&Ignore time shift [hh:mm]"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText112->Wrap( -1 );
-	bSizer1733->Add( m_staticText112, 0, wxALL, 5 );
-	
-	m_textCtrlTimeShift = new wxTextCtrl( m_panelComparisonSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_textCtrlTimeShift->SetToolTip( _("List of file time offsets to ignore") );
-	
-	bSizer1733->Add( m_textCtrlTimeShift, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	wxBoxSizer* bSizer197;
-	bSizer197 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText1381 = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("Example:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText1381->Wrap( -1 );
-	m_staticText1381->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-	
-	bSizer197->Add( m_staticText1381, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	m_staticText13811 = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("1, 2, 4:30"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText13811->Wrap( -1 );
-	m_staticText13811->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-	
-	bSizer197->Add( m_staticText13811, 0, wxBOTTOM|wxRIGHT, 5 );
-	
-	
-	bSizer1733->Add( bSizer197, 0, 0, 5 );
-	
-	m_hyperlink241 = new wxHyperlinkCtrl( m_panelComparisonSettings, wxID_ANY, _("Handle daylight saving time"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	bSizer1733->Add( m_hyperlink241, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	
-	bSizer1734->Add( bSizer1733, 0, wxALL, 5 );
-	
-	m_staticline441 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizer1734->Add( m_staticline441, 0, wxEXPAND, 5 );
-	
-	
-	bSizer159->Add( bSizer1734, 0, 0, 5 );
-	
-	m_staticline331 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer159->Add( m_staticline331, 0, wxEXPAND, 5 );
-	
-	
-	m_panelComparisonSettings->SetSizer( bSizer159 );
-	m_panelComparisonSettings->Layout();
-	bSizer159->Fit( m_panelComparisonSettings );
-	bSizer275->Add( m_panelComparisonSettings, 0, wxEXPAND, 5 );
-	
-	
-	m_panelCompSettingsHolder->SetSizer( bSizer275 );
-	m_panelCompSettingsHolder->Layout();
-	bSizer275->Fit( m_panelCompSettingsHolder );
-	m_notebook->AddPage( m_panelCompSettingsHolder, _("dummy"), true );
-	m_panelFilterSettingsHolder = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panelFilterSettingsHolder->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	wxBoxSizer* bSizer278;
-	bSizer278 = new wxBoxSizer( wxVERTICAL );
-	
-	bSizerHeaderFilterSettings = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticTextMainFilterSettings = new wxStaticText( m_panelFilterSettingsHolder, wxID_ANY, _("Main settings:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextMainFilterSettings->Wrap( -1 );
-	bSizerHeaderFilterSettings->Add( m_staticTextMainFilterSettings, 0, wxALL, 10 );
-	
-	m_staticTextLocalFilterSettings = new wxStaticText( m_panelFilterSettingsHolder, wxID_ANY, _("Local settings:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextLocalFilterSettings->Wrap( -1 );
-	bSizerHeaderFilterSettings->Add( m_staticTextLocalFilterSettings, 0, wxALL, 10 );
-	
-	m_staticlineFilterHeader = new wxStaticLine( m_panelFilterSettingsHolder, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizerHeaderFilterSettings->Add( m_staticlineFilterHeader, 0, wxEXPAND, 5 );
-	
-	
-	bSizer278->Add( bSizerHeaderFilterSettings, 0, wxEXPAND, 5 );
-	
-	m_panelFilterSettings = new wxPanel( m_panelFilterSettingsHolder, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panelFilterSettings->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	wxBoxSizer* bSizer1591;
-	bSizer1591 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer166;
-	bSizer166 = new wxBoxSizer( wxVERTICAL );
-	
-	
-	bSizer166->Add( 0, 10, 0, 0, 5 );
-	
-	wxBoxSizer* bSizer1661;
-	bSizer1661 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapInclude = new wxStaticBitmap( m_panelFilterSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), 0 );
-	bSizer1661->Add( m_bitmapInclude, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
-	
-	wxBoxSizer* bSizer1731;
-	bSizer1731 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText78 = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("Include:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText78->Wrap( -1 );
-	bSizer1731->Add( m_staticText78, 0, 0, 5 );
-	
-	m_textCtrlInclude = new wxTextCtrl( m_panelFilterSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE );
-	m_textCtrlInclude->SetMinSize( wxSize( 280,-1 ) );
-	
-	bSizer1731->Add( m_textCtrlInclude, 1, wxEXPAND|wxTOP, 5 );
-	
-	
-	bSizer1661->Add( bSizer1731, 1, wxEXPAND, 5 );
-	
-	
-	bSizer166->Add( bSizer1661, 1, wxEXPAND|wxLEFT, 5 );
-	
-	m_staticline22 = new wxStaticLine( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer166->Add( m_staticline22, 0, wxEXPAND, 5 );
-	
-	
-	bSizer166->Add( 0, 10, 0, 0, 5 );
-	
-	wxBoxSizer* bSizer1651;
-	bSizer1651 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapExclude = new wxStaticBitmap( m_panelFilterSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), 0 );
-	bSizer1651->Add( m_bitmapExclude, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	wxBoxSizer* bSizer1742;
-	bSizer1742 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer189;
-	bSizer189 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText77 = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("Exclude:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText77->Wrap( -1 );
-	bSizer189->Add( m_staticText77, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer189->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_hyperlink171 = new wxHyperlinkCtrl( m_panelFilterSettings, wxID_ANY, _("Show examples"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	bSizer189->Add( m_hyperlink171, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-	
-	
-	bSizer1742->Add( bSizer189, 0, wxEXPAND, 5 );
-	
-	m_textCtrlExclude = new wxTextCtrl( m_panelFilterSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE );
-	bSizer1742->Add( m_textCtrlExclude, 1, wxEXPAND|wxTOP, 5 );
-	
-	
-	bSizer1651->Add( bSizer1742, 1, wxEXPAND, 5 );
-	
-	
-	bSizer166->Add( bSizer1651, 2, wxEXPAND|wxLEFT, 5 );
-	
-	
-	bSizer1591->Add( bSizer166, 1, wxEXPAND, 5 );
-	
-	m_staticline24 = new wxStaticLine( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizer1591->Add( m_staticline24, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer160;
-	bSizer160 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer167;
-	bSizer167 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapFilterDate = new wxStaticBitmap( m_panelFilterSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 34,34 ), 0 );
-	bSizer167->Add( m_bitmapFilterDate, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	wxBoxSizer* bSizer165;
-	bSizer165 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText79 = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("Time span:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText79->Wrap( -1 );
-	bSizer165->Add( m_staticText79, 0, wxBOTTOM, 5 );
-	
-	m_spinCtrlTimespan = new wxSpinCtrl( m_panelFilterSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
-	bSizer165->Add( m_spinCtrlTimespan, 0, wxEXPAND, 5 );
-	
-	wxArrayString m_choiceUnitTimespanChoices;
-	m_choiceUnitTimespan = new wxChoice( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitTimespanChoices, 0 );
-	m_choiceUnitTimespan->SetSelection( 0 );
-	bSizer165->Add( m_choiceUnitTimespan, 0, wxEXPAND, 5 );
-	
-	
-	bSizer167->Add( bSizer165, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-	
-	
-	bSizer160->Add( bSizer167, 0, wxEXPAND|wxALL, 5 );
-	
-	m_staticline23 = new wxStaticLine( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer160->Add( m_staticline23, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer168;
-	bSizer168 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapFilterSize = new wxStaticBitmap( m_panelFilterSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 32,32 ), 0 );
-	bSizer168->Add( m_bitmapFilterSize, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
-	
-	wxBoxSizer* bSizer158;
-	bSizer158 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText80 = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("File size:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText80->Wrap( -1 );
-	bSizer158->Add( m_staticText80, 0, wxBOTTOM, 5 );
-	
-	wxBoxSizer* bSizer162;
-	bSizer162 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText101 = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("Minimum:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText101->Wrap( -1 );
-	bSizer162->Add( m_staticText101, 0, wxBOTTOM, 2 );
-	
-	m_spinCtrlMinSize = new wxSpinCtrl( m_panelFilterSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
-	bSizer162->Add( m_spinCtrlMinSize, 0, wxEXPAND, 5 );
-	
-	wxArrayString m_choiceUnitMinSizeChoices;
-	m_choiceUnitMinSize = new wxChoice( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitMinSizeChoices, 0 );
-	m_choiceUnitMinSize->SetSelection( 0 );
-	bSizer162->Add( m_choiceUnitMinSize, 0, wxEXPAND, 5 );
-	
-	
-	bSizer158->Add( bSizer162, 0, wxBOTTOM|wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer163;
-	bSizer163 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText102 = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("Maximum:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText102->Wrap( -1 );
-	bSizer163->Add( m_staticText102, 0, wxBOTTOM, 2 );
-	
-	m_spinCtrlMaxSize = new wxSpinCtrl( m_panelFilterSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
-	bSizer163->Add( m_spinCtrlMaxSize, 0, wxEXPAND, 5 );
-	
-	wxArrayString m_choiceUnitMaxSizeChoices;
-	m_choiceUnitMaxSize = new wxChoice( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitMaxSizeChoices, 0 );
-	m_choiceUnitMaxSize->SetSelection( 0 );
-	bSizer163->Add( m_choiceUnitMaxSize, 0, wxEXPAND, 5 );
-	
-	
-	bSizer158->Add( bSizer163, 0, wxEXPAND, 5 );
-	
-	
-	bSizer168->Add( bSizer158, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-	
-	
-	bSizer160->Add( bSizer168, 1, wxEXPAND|wxALL, 5 );
-	
-	
-	bSizer1591->Add( bSizer160, 0, wxEXPAND, 5 );
-	
-	
-	m_panelFilterSettings->SetSizer( bSizer1591 );
-	m_panelFilterSettings->Layout();
-	bSizer1591->Fit( m_panelFilterSettings );
-	bSizer278->Add( m_panelFilterSettings, 1, wxEXPAND, 5 );
-	
-	m_staticline62 = new wxStaticLine( m_panelFilterSettingsHolder, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer278->Add( m_staticline62, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer280;
-	bSizer280 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText44 = new wxStaticText( m_panelFilterSettingsHolder, wxID_ANY, _("Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair."), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_staticText44->Wrap( 590 );
-	bSizer280->Add( m_staticText44, 0, wxALIGN_CENTER_VERTICAL|wxALL, 10 );
-	
-	
-	bSizer280->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticline46 = new wxStaticLine( m_panelFilterSettingsHolder, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizer280->Add( m_staticline46, 0, wxEXPAND, 5 );
-	
-	m_buttonClear = new wxButton( m_panelFilterSettingsHolder, wxID_ANY, _("C&lear"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	bSizer280->Add( m_buttonClear, 0, wxALL|wxALIGN_CENTER_VERTICAL, 10 );
-	
-	
-	bSizer278->Add( bSizer280, 0, wxEXPAND, 5 );
-	
-	
-	m_panelFilterSettingsHolder->SetSizer( bSizer278 );
-	m_panelFilterSettingsHolder->Layout();
-	bSizer278->Fit( m_panelFilterSettingsHolder );
-	m_notebook->AddPage( m_panelFilterSettingsHolder, _("dummy"), false );
-	m_panelSyncSettingsHolder = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panelSyncSettingsHolder->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	wxBoxSizer* bSizer276;
-	bSizer276 = new wxBoxSizer( wxVERTICAL );
-	
-	bSizerHeaderSyncSettings = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticTextMainSyncSettings = new wxStaticText( m_panelSyncSettingsHolder, wxID_ANY, _("Main settings:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextMainSyncSettings->Wrap( -1 );
-	bSizerHeaderSyncSettings->Add( m_staticTextMainSyncSettings, 0, wxALL, 10 );
-	
-	m_checkBoxUseLocalSyncOptions = new wxCheckBox( m_panelSyncSettingsHolder, wxID_ANY, _("Use local settings:"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizerHeaderSyncSettings->Add( m_checkBoxUseLocalSyncOptions, 0, wxALL|wxEXPAND, 10 );
-	
-	m_staticlineSyncHeader = new wxStaticLine( m_panelSyncSettingsHolder, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizerHeaderSyncSettings->Add( m_staticlineSyncHeader, 0, wxEXPAND, 5 );
-	
-	
-	bSizer276->Add( bSizerHeaderSyncSettings, 0, wxEXPAND, 5 );
-	
-	m_panelSyncSettings = new wxPanel( m_panelSyncSettingsHolder, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panelSyncSettings->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	wxBoxSizer* bSizer232;
-	bSizer232 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer237;
-	bSizer237 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer235;
-	bSizer235 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText86 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Select a variant:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText86->Wrap( -1 );
-	bSizer235->Add( m_staticText86, 0, wxALL, 5 );
-	
-	wxBoxSizer* bSizer236;
-	bSizer236 = new wxBoxSizer( wxVERTICAL );
-	
-	m_toggleBtnTwoWay = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_toggleBtnTwoWay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer236->Add( m_toggleBtnTwoWay, 0, wxEXPAND|wxBOTTOM, 5 );
-	
-	m_toggleBtnMirror = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_toggleBtnMirror->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer236->Add( m_toggleBtnMirror, 0, wxEXPAND|wxBOTTOM, 5 );
-	
-	m_toggleBtnUpdate = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_toggleBtnUpdate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer236->Add( m_toggleBtnUpdate, 0, wxEXPAND|wxBOTTOM, 5 );
-	
-	m_toggleBtnCustom = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_toggleBtnCustom->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer236->Add( m_toggleBtnCustom, 0, wxEXPAND, 5 );
-	
-	
-	bSizer235->Add( bSizer236, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	
-	bSizer237->Add( bSizer235, 0, wxALL, 5 );
-	
-	m_staticline53 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizer237->Add( m_staticline53, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer238;
-	bSizer238 = new wxBoxSizer( wxVERTICAL );
-	
-	
-	bSizer238->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	bSizerSyncConfig = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer173;
-	bSizer173 = new wxBoxSizer( wxVERTICAL );
-	
-	
-	bSizer173->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticText119 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Category"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText119->Wrap( -1 );
-	bSizer173->Add( m_staticText119, 0, 0, 5 );
-	
-	
-	bSizer173->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	bSizer173->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticText120 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Action"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText120->Wrap( -1 );
-	bSizer173->Add( m_staticText120, 0, 0, 5 );
-	
-	
-	bSizer173->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	bSizerSyncConfig->Add( bSizer173, 0, wxEXPAND|wxRIGHT, 5 );
-	
-	fgSizerSyncDirections = new wxFlexGridSizer( 2, 0, 5, 5 );
-	fgSizerSyncDirections->SetFlexibleDirection( wxBOTH );
-	fgSizerSyncDirections->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_bitmapLeftOnly = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
-	m_bitmapLeftOnly->SetToolTip( _("Item exists on left side only") );
-	
-	fgSizerSyncDirections->Add( m_bitmapLeftOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bitmapLeftNewer = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
-	m_bitmapLeftNewer->SetToolTip( _("Left side is newer") );
-	
-	fgSizerSyncDirections->Add( m_bitmapLeftNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bitmapDifferent = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
-	m_bitmapDifferent->SetToolTip( _("Items have different content") );
-	
-	fgSizerSyncDirections->Add( m_bitmapDifferent, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bitmapConflict = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
-	m_bitmapConflict->SetToolTip( _("Conflict/item cannot be categorized") );
-	
-	fgSizerSyncDirections->Add( m_bitmapConflict, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bitmapRightNewer = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
-	m_bitmapRightNewer->SetToolTip( _("Right side is newer") );
-	
-	fgSizerSyncDirections->Add( m_bitmapRightNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bitmapRightOnly = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
-	m_bitmapRightOnly->SetToolTip( _("Item exists on right side only") );
-	
-	fgSizerSyncDirections->Add( m_bitmapRightOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonLeftOnly = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 46,46 ), wxBU_AUTODRAW );
-	fgSizerSyncDirections->Add( m_bpButtonLeftOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonLeftNewer = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 46,46 ), wxBU_AUTODRAW );
-	fgSizerSyncDirections->Add( m_bpButtonLeftNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonDifferent = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 46,46 ), wxBU_AUTODRAW );
-	fgSizerSyncDirections->Add( m_bpButtonDifferent, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonConflict = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 46,46 ), wxBU_AUTODRAW );
-	fgSizerSyncDirections->Add( m_bpButtonConflict, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonRightNewer = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 46,46 ), wxBU_AUTODRAW );
-	fgSizerSyncDirections->Add( m_bpButtonRightNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonRightOnly = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 46,46 ), wxBU_AUTODRAW );
-	fgSizerSyncDirections->Add( m_bpButtonRightOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerSyncConfig->Add( fgSizerSyncDirections, 0, 0, 5 );
-	
-	m_bitmapDatabase = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_bitmapDatabase->SetToolTip( _("Detect synchronization directions with the help of database files") );
-	
-	bSizerSyncConfig->Add( m_bitmapDatabase, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxALIGN_CENTER_VERTICAL, 10 );
-	
-	wxBoxSizer* bSizerKeepVerticalHeightWhenSyncDirsNotShown;
-	bSizerKeepVerticalHeightWhenSyncDirsNotShown = new wxBoxSizer( wxVERTICAL );
-	
-	
-	bSizerKeepVerticalHeightWhenSyncDirsNotShown->Add( 0, 45, 0, 0, 5 );
-	
-	
-	bSizerKeepVerticalHeightWhenSyncDirsNotShown->Add( 0, 5, 1, 0, 5 );
-	
-	
-	bSizerKeepVerticalHeightWhenSyncDirsNotShown->Add( 0, 46, 0, 0, 5 );
-	
-	
-	bSizerSyncConfig->Add( bSizerKeepVerticalHeightWhenSyncDirsNotShown, 0, 0, 5 );
-	
-	
-	bSizer238->Add( bSizerSyncConfig, 0, wxALL, 10 );
-	
-	
-	bSizer238->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticline431 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer238->Add( m_staticline431, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer201;
-	bSizer201 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_checkBoxDetectMove = new wxCheckBox( m_panelSyncSettings, wxID_ANY, _("Detect moved files"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_checkBoxDetectMove->SetValue(true); 
-	m_checkBoxDetectMove->SetToolTip( _("- Not supported by all file systems\n- Requires and creates database files\n- Detection not available for first sync") );
-	
-	bSizer201->Add( m_checkBoxDetectMove, 0, wxALL|wxEXPAND, 5 );
-	
-	m_hyperlink242 = new wxHyperlinkCtrl( m_panelSyncSettings, wxID_ANY, _("More information"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	bSizer201->Add( m_hyperlink242, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 );
-	
-	
-	bSizer238->Add( bSizer201, 0, wxALL, 5 );
-	
-	
-	bSizer237->Add( bSizer238, 0, wxEXPAND, 5 );
-	
-	m_staticline531 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizer237->Add( m_staticline531, 0, wxEXPAND, 5 );
-	
-	m_textCtrlSyncVarDescription = new wxTextCtrl( m_panelSyncSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxNO_BORDER );
-	bSizer237->Add( m_textCtrlSyncVarDescription, 1, wxLEFT|wxEXPAND, 5 );
-	
-	
-	bSizer232->Add( bSizer237, 0, wxEXPAND, 5 );
-	
-	m_staticline54 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer232->Add( m_staticline54, 0, wxEXPAND, 5 );
-	
-	bSizerDelHandling = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer202;
-	bSizer202 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText87 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Delete files:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText87->Wrap( -1 );
-	bSizer202->Add( m_staticText87, 0, wxALL, 5 );
-	
-	m_bpButtonDeletionType = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 46,46 ), wxBU_AUTODRAW );
-	bSizer202->Add( m_bpButtonDeletionType, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	
-	bSizerDelHandling->Add( bSizer202, 0, 0, 5 );
-	
-	wxBoxSizer* bSizer2011;
-	bSizer2011 = new wxBoxSizer( wxVERTICAL );
-	
-	m_radioBtnRecycler = new wxRadioButton( m_panelSyncSettings, wxID_ANY, _("&Recycle bin"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
-	m_radioBtnRecycler->SetValue( true ); 
-	m_radioBtnRecycler->SetToolTip( _("Back up deleted and overwritten files in the recycle bin") );
-	
-	bSizer2011->Add( m_radioBtnRecycler, 0, wxEXPAND|wxALL, 5 );
-	
-	m_radioBtnPermanent = new wxRadioButton( m_panelSyncSettings, wxID_ANY, _("&Permanent"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_radioBtnPermanent->SetToolTip( _("Delete or overwrite files permanently") );
-	
-	bSizer2011->Add( m_radioBtnPermanent, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
-	m_radioBtnVersioning = new wxRadioButton( m_panelSyncSettings, wxID_ANY, _("&Versioning"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_radioBtnVersioning->SetToolTip( _("Move files to a user-defined folder") );
-	
-	bSizer2011->Add( m_radioBtnVersioning, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
-	
-	bSizerDelHandling->Add( bSizer2011, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panelVersioning = new wxPanel( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panelVersioning->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	wxBoxSizer* bSizer191;
-	bSizer191 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer156;
-	bSizer156 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_versioningFolderPath = new FolderHistoryBox( m_panelVersioning, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
-	bSizer156->Add( m_versioningFolderPath, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonSelectVersioningFolder = new wxButton( m_panelVersioning, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonSelectVersioningFolder->SetToolTip( _("Select a folder") );
-	
-	bSizer156->Add( m_buttonSelectVersioningFolder, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonSelectAltFolder = new wxBitmapButton( m_panelVersioning, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,-1 ), wxBU_AUTODRAW );
-	m_bpButtonSelectAltFolder->SetToolTip( _("Access online storage") );
-	
-	bSizer156->Add( m_bpButtonSelectAltFolder, 0, wxEXPAND, 5 );
-	
-	
-	bSizer191->Add( bSizer156, 0, wxEXPAND|wxALL, 5 );
-	
-	wxBoxSizer* bSizer198;
-	bSizer198 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText93 = new wxStaticText( m_panelVersioning, wxID_ANY, _("Naming convention:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText93->Wrap( -1 );
-	bSizer198->Add( m_staticText93, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxArrayString m_choiceVersioningStyleChoices;
-	m_choiceVersioningStyle = new wxChoice( m_panelVersioning, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceVersioningStyleChoices, 0 );
-	m_choiceVersioningStyle->SetSelection( 0 );
-	bSizer198->Add( m_choiceVersioningStyle, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer198->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_hyperlink17 = new wxHyperlinkCtrl( m_panelVersioning, wxID_ANY, _("Show examples"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	bSizer198->Add( m_hyperlink17, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer191->Add( bSizer198, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	bSizer192 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticTextNamingCvtPart1 = new wxStaticText( m_panelVersioning, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextNamingCvtPart1->Wrap( -1 );
-	m_staticTextNamingCvtPart1->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-	
-	bSizer192->Add( m_staticTextNamingCvtPart1, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticTextNamingCvtPart2Bold = new wxStaticText( m_panelVersioning, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextNamingCvtPart2Bold->Wrap( -1 );
-	m_staticTextNamingCvtPart2Bold->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	m_staticTextNamingCvtPart2Bold->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-	
-	bSizer192->Add( m_staticTextNamingCvtPart2Bold, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticTextNamingCvtPart3 = new wxStaticText( m_panelVersioning, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextNamingCvtPart3->Wrap( -1 );
-	m_staticTextNamingCvtPart3->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-	
-	bSizer192->Add( m_staticTextNamingCvtPart3, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer191->Add( bSizer192, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	
-	m_panelVersioning->SetSizer( bSizer191 );
-	m_panelVersioning->Layout();
-	bSizer191->Fit( m_panelVersioning );
-	bSizerDelHandling->Add( m_panelVersioning, 1, 0, 5 );
-	
-	
-	bSizer232->Add( bSizerDelHandling, 0, wxALL|wxEXPAND, 5 );
-	
-	m_staticline582 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer232->Add( m_staticline582, 0, wxEXPAND, 5 );
-	
-	bSizerMiscConfig = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText88 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Handle errors:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText88->Wrap( -1 );
-	bSizerMiscConfig->Add( m_staticText88, 0, wxTOP|wxBOTTOM|wxLEFT, 10 );
-	
-	wxBoxSizer* bSizer175;
-	bSizer175 = new wxBoxSizer( wxVERTICAL );
-	
-	m_radioBtnPopupOnErrors = new wxRadioButton( m_panelSyncSettings, wxID_ANY, _("&Pop-up"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
-	m_radioBtnPopupOnErrors->SetValue( true ); 
-	m_radioBtnPopupOnErrors->SetToolTip( _("Show pop-up on errors or warnings") );
-	
-	bSizer175->Add( m_radioBtnPopupOnErrors, 0, wxEXPAND|wxALL, 5 );
-	
-	m_radioBtnIgnoreErrors = new wxRadioButton( m_panelSyncSettings, wxID_ANY, _("&Ignore"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_radioBtnIgnoreErrors->SetToolTip( _("Hide all error and warning messages") );
-	
-	bSizer175->Add( m_radioBtnIgnoreErrors, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	
-	bSizerMiscConfig->Add( bSizer175, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticline57 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizerMiscConfig->Add( m_staticline57, 0, wxEXPAND, 5 );
-	
-	bSizerOnCompletion = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText89 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("On completion:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText89->Wrap( -1 );
-	bSizerOnCompletion->Add( m_staticText89, 0, wxBOTTOM, 5 );
-	
-	m_comboBoxOnCompletion = new OnCompletionBox( m_panelSyncSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
-	bSizerOnCompletion->Add( m_comboBoxOnCompletion, 0, wxEXPAND, 5 );
-	
-	
-	bSizerMiscConfig->Add( bSizerOnCompletion, 1, wxALL, 10 );
-	
-	
-	bSizer232->Add( bSizerMiscConfig, 1, wxEXPAND, 5 );
-	
-	
-	m_panelSyncSettings->SetSizer( bSizer232 );
-	m_panelSyncSettings->Layout();
-	bSizer232->Fit( m_panelSyncSettings );
-	bSizer276->Add( m_panelSyncSettings, 1, wxEXPAND, 5 );
-	
-	
-	m_panelSyncSettingsHolder->SetSizer( bSizer276 );
-	m_panelSyncSettingsHolder->Layout();
-	bSizer276->Fit( m_panelSyncSettingsHolder );
-	m_notebook->AddPage( m_panelSyncSettingsHolder, _("dummy"), false );
-	
-	bSizer190->Add( m_notebook, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
-	
-	
-	bSizer7->Add( bSizer190, 1, wxEXPAND, 5 );
-	
-	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_buttonOkay->SetDefault(); 
-	m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizerStdButtons->Add( m_buttonOkay, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-	
-	
-	bSizer7->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
-	
-	
-	this->SetSizer( bSizer7 );
-	this->Layout();
-	bSizer7->Fit( this );
-	
-	this->Centre( wxBOTH );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( ConfigDlgGenerated::OnClose ) );
-	m_listBoxFolderPair->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( ConfigDlgGenerated::onListBoxKeyEvent ), NULL, this );
-	m_listBoxFolderPair->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnSelectFolderPair ), NULL, this );
-	m_checkBoxUseLocalCmpOptions->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleLocalCompSettings ), NULL, this );
-	m_toggleBtnByTimeSize->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnCompByTimeSizeDouble ), NULL, this );
-	m_toggleBtnByTimeSize->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnCompByTimeSize ), NULL, this );
-	m_toggleBtnByContent->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnCompByContentDouble ), NULL, this );
-	m_toggleBtnByContent->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnCompByContent ), NULL, this );
-	m_toggleBtnBySize->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnCompBySizeDouble ), NULL, this );
-	m_toggleBtnBySize->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnCompBySize ), NULL, this );
-	m_checkBoxSymlinksInclude->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeCompOption ), NULL, this );
-	m_hyperlink24->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( ConfigDlgGenerated::OnHelpComparisonSettings ), NULL, this );
-	m_textCtrlTimeShift->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( ConfigDlgGenerated::onlTimeShiftKeyDown ), NULL, this );
-	m_hyperlink241->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( ConfigDlgGenerated::OnHelpTimeShift ), NULL, this );
-	m_textCtrlInclude->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeFilterOption ), NULL, this );
-	m_hyperlink171->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( ConfigDlgGenerated::OnHelpShowExamples ), NULL, this );
-	m_textCtrlExclude->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeFilterOption ), NULL, this );
-	m_choiceUnitTimespan->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeFilterOption ), NULL, this );
-	m_choiceUnitMinSize->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeFilterOption ), NULL, this );
-	m_choiceUnitMaxSize->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeFilterOption ), NULL, this );
-	m_buttonClear->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnFilterReset ), NULL, this );
-	m_checkBoxUseLocalSyncOptions->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleLocalSyncSettings ), NULL, this );
-	m_toggleBtnTwoWay->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnSyncTwoWayDouble ), NULL, this );
-	m_toggleBtnTwoWay->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnSyncTwoWay ), NULL, this );
-	m_toggleBtnMirror->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnSyncMirrorDouble ), NULL, this );
-	m_toggleBtnMirror->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnSyncMirror ), NULL, this );
-	m_toggleBtnUpdate->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnSyncUpdateDouble ), NULL, this );
-	m_toggleBtnUpdate->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnSyncUpdate ), NULL, this );
-	m_toggleBtnCustom->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnSyncCustomDouble ), NULL, this );
-	m_toggleBtnCustom->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnSyncCustom ), NULL, this );
-	m_bpButtonLeftOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnExLeftSideOnly ), NULL, this );
-	m_bpButtonLeftNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnLeftNewer ), NULL, this );
-	m_bpButtonDifferent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnDifferent ), NULL, this );
-	m_bpButtonConflict->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnConflict ), NULL, this );
-	m_bpButtonRightNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnRightNewer ), NULL, this );
-	m_bpButtonRightOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnExRightSideOnly ), NULL, this );
-	m_checkBoxDetectMove->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleDetectMovedFiles ), NULL, this );
-	m_hyperlink242->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( ConfigDlgGenerated::OnHelpDetectMovedFiles ), NULL, this );
-	m_bpButtonDeletionType->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleDeletionType ), NULL, this );
-	m_radioBtnRecycler->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnDeletionRecycler ), NULL, this );
-	m_radioBtnPermanent->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnDeletionPermanent ), NULL, this );
-	m_radioBtnVersioning->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnDeletionVersioning ), NULL, this );
-	m_choiceVersioningStyle->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeSyncOption ), NULL, this );
-	m_hyperlink17->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( ConfigDlgGenerated::OnHelpVersioning ), NULL, this );
-	m_radioBtnPopupOnErrors->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnErrorPopup ), NULL, this );
-	m_radioBtnIgnoreErrors->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnErrorIgnore ), NULL, this );
-	m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnOkay ), NULL, this );
-	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnCancel ), NULL, this );
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    wxBoxSizer* bSizer7;
+    bSizer7 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer190;
+    bSizer190 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer1911;
+    bSizer1911 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticTextFolderPairLabel = new wxStaticText( this, wxID_ANY, _("Folder pair:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextFolderPairLabel->Wrap( -1 );
+    bSizer1911->Add( m_staticTextFolderPairLabel, 0, wxALL, 5 );
+
+    m_listBoxFolderPair = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_NEEDED_SB );
+    bSizer1911->Add( m_listBoxFolderPair, 1, 0, 5 );
+
+
+    bSizer190->Add( bSizer1911, 0, wxEXPAND|wxLEFT, 5 );
+
+    m_notebook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+    m_panelCompSettingsHolder = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panelCompSettingsHolder->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    wxBoxSizer* bSizer275;
+    bSizer275 = new wxBoxSizer( wxVERTICAL );
+
+    bSizerHeaderCompSettings = new wxBoxSizer( wxVERTICAL );
+
+    m_staticTextMainCompSettings = new wxStaticText( m_panelCompSettingsHolder, wxID_ANY, _("Main settings:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextMainCompSettings->Wrap( -1 );
+    bSizerHeaderCompSettings->Add( m_staticTextMainCompSettings, 0, wxALL, 10 );
+
+    m_checkBoxUseLocalCmpOptions = new wxCheckBox( m_panelCompSettingsHolder, wxID_ANY, _("Use local settings:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_checkBoxUseLocalCmpOptions->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    bSizerHeaderCompSettings->Add( m_checkBoxUseLocalCmpOptions, 0, wxALL|wxEXPAND, 10 );
+
+    m_staticlineCompHeader = new wxStaticLine( m_panelCompSettingsHolder, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizerHeaderCompSettings->Add( m_staticlineCompHeader, 0, wxEXPAND, 5 );
+
+
+    bSizer275->Add( bSizerHeaderCompSettings, 0, wxEXPAND, 5 );
+
+    m_panelComparisonSettings = new wxPanel( m_panelCompSettingsHolder, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panelComparisonSettings->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    wxBoxSizer* bSizer159;
+    bSizer159 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer178;
+    bSizer178 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer182;
+    bSizer182 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText91 = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("Select a variant:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText91->Wrap( -1 );
+    bSizer182->Add( m_staticText91, 0, wxALL, 5 );
+
+    wxFlexGridSizer* fgSizer16;
+    fgSizer16 = new wxFlexGridSizer( 3, 2, 5, 5 );
+    fgSizer16->SetFlexibleDirection( wxBOTH );
+    fgSizer16->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    m_bitmapByTimeSize = new wxStaticBitmap( m_panelComparisonSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    fgSizer16->Add( m_bitmapByTimeSize, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_toggleBtnByTimeSize = new wxToggleButton( m_panelComparisonSettings, wxID_ANY, _("File time and size"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_toggleBtnByTimeSize->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    fgSizer16->Add( m_toggleBtnByTimeSize, 0, wxEXPAND, 5 );
+
+    m_bitmapByContent = new wxStaticBitmap( m_panelComparisonSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    fgSizer16->Add( m_bitmapByContent, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_toggleBtnByContent = new wxToggleButton( m_panelComparisonSettings, wxID_ANY, _("File content"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_toggleBtnByContent->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    fgSizer16->Add( m_toggleBtnByContent, 0, wxEXPAND, 5 );
+
+    m_bitmapBySize = new wxStaticBitmap( m_panelComparisonSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    fgSizer16->Add( m_bitmapBySize, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_toggleBtnBySize = new wxToggleButton( m_panelComparisonSettings, wxID_ANY, _("File size"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_toggleBtnBySize->SetValue( true );
+    m_toggleBtnBySize->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    fgSizer16->Add( m_toggleBtnBySize, 0, wxEXPAND, 5 );
+
+
+    bSizer182->Add( fgSizer16, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizer178->Add( bSizer182, 0, wxALL, 5 );
+
+    m_staticline42 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizer178->Add( m_staticline42, 0, wxEXPAND, 5 );
+
+    m_textCtrlCompVarDescription = new wxTextCtrl( m_panelComparisonSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxNO_BORDER );
+    bSizer178->Add( m_textCtrlCompVarDescription, 1, wxEXPAND|wxLEFT, 5 );
+
+
+    bSizer159->Add( bSizer178, 0, wxEXPAND, 5 );
+
+    m_staticline33 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer159->Add( m_staticline33, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer1734;
+    bSizer1734 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer1721;
+    bSizer1721 = new wxBoxSizer( wxVERTICAL );
+
+    m_checkBoxSymlinksInclude = new wxCheckBox( m_panelComparisonSettings, wxID_ANY, _("Include &symbolic links:"), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer1721->Add( m_checkBoxSymlinksInclude, 0, wxALL, 5 );
+
+    wxBoxSizer* bSizer176;
+    bSizer176 = new wxBoxSizer( wxVERTICAL );
+
+    m_radioBtnSymlinksFollow = new wxRadioButton( m_panelComparisonSettings, wxID_ANY, _("&Follow"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_radioBtnSymlinksFollow->SetValue( true );
+    bSizer176->Add( m_radioBtnSymlinksFollow, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+    m_radioBtnSymlinksDirect = new wxRadioButton( m_panelComparisonSettings, wxID_ANY, _("&Direct"), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer176->Add( m_radioBtnSymlinksDirect, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+
+    bSizer1721->Add( bSizer176, 0, wxEXPAND|wxLEFT, 18 );
+
+    m_hyperlink24 = new wxHyperlinkCtrl( m_panelComparisonSettings, wxID_ANY, _("More information"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    bSizer1721->Add( m_hyperlink24, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+
+    bSizer1734->Add( bSizer1721, 0, wxALL, 5 );
+
+    m_staticline44 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizer1734->Add( m_staticline44, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer1733;
+    bSizer1733 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText112 = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("&Ignore time shift [hh:mm]"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText112->Wrap( -1 );
+    bSizer1733->Add( m_staticText112, 0, wxALL, 5 );
+
+    m_textCtrlTimeShift = new wxTextCtrl( m_panelComparisonSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    m_textCtrlTimeShift->SetToolTip( _("List of file time offsets to ignore") );
+
+    bSizer1733->Add( m_textCtrlTimeShift, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+    wxBoxSizer* bSizer197;
+    bSizer197 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText1381 = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("Example:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText1381->Wrap( -1 );
+    m_staticText1381->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+
+    bSizer197->Add( m_staticText1381, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+    m_staticText13811 = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("1, 2, 4:30"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText13811->Wrap( -1 );
+    m_staticText13811->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+
+    bSizer197->Add( m_staticText13811, 0, wxBOTTOM|wxRIGHT, 5 );
+
+
+    bSizer1733->Add( bSizer197, 0, 0, 5 );
+
+    m_hyperlink241 = new wxHyperlinkCtrl( m_panelComparisonSettings, wxID_ANY, _("Handle daylight saving time"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    bSizer1733->Add( m_hyperlink241, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+
+    bSizer1734->Add( bSizer1733, 0, wxALL, 5 );
+
+    m_staticline441 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizer1734->Add( m_staticline441, 0, wxEXPAND, 5 );
+
+
+    bSizer159->Add( bSizer1734, 0, 0, 5 );
+
+    m_staticline331 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer159->Add( m_staticline331, 0, wxEXPAND, 5 );
+
+
+    m_panelComparisonSettings->SetSizer( bSizer159 );
+    m_panelComparisonSettings->Layout();
+    bSizer159->Fit( m_panelComparisonSettings );
+    bSizer275->Add( m_panelComparisonSettings, 0, wxEXPAND, 5 );
+
+
+    m_panelCompSettingsHolder->SetSizer( bSizer275 );
+    m_panelCompSettingsHolder->Layout();
+    bSizer275->Fit( m_panelCompSettingsHolder );
+    m_notebook->AddPage( m_panelCompSettingsHolder, _("dummy"), true );
+    m_panelFilterSettingsHolder = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panelFilterSettingsHolder->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    wxBoxSizer* bSizer278;
+    bSizer278 = new wxBoxSizer( wxVERTICAL );
+
+    bSizerHeaderFilterSettings = new wxBoxSizer( wxVERTICAL );
+
+    m_staticTextMainFilterSettings = new wxStaticText( m_panelFilterSettingsHolder, wxID_ANY, _("Main settings:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextMainFilterSettings->Wrap( -1 );
+    bSizerHeaderFilterSettings->Add( m_staticTextMainFilterSettings, 0, wxALL, 10 );
+
+    m_staticTextLocalFilterSettings = new wxStaticText( m_panelFilterSettingsHolder, wxID_ANY, _("Local settings:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextLocalFilterSettings->Wrap( -1 );
+    bSizerHeaderFilterSettings->Add( m_staticTextLocalFilterSettings, 0, wxALL, 10 );
+
+    m_staticlineFilterHeader = new wxStaticLine( m_panelFilterSettingsHolder, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizerHeaderFilterSettings->Add( m_staticlineFilterHeader, 0, wxEXPAND, 5 );
+
+
+    bSizer278->Add( bSizerHeaderFilterSettings, 0, wxEXPAND, 5 );
+
+    m_panelFilterSettings = new wxPanel( m_panelFilterSettingsHolder, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panelFilterSettings->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    wxBoxSizer* bSizer1591;
+    bSizer1591 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer166;
+    bSizer166 = new wxBoxSizer( wxVERTICAL );
+
+
+    bSizer166->Add( 0, 10, 0, 0, 5 );
+
+    wxBoxSizer* bSizer1661;
+    bSizer1661 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapInclude = new wxStaticBitmap( m_panelFilterSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30, 30 ), 0 );
+    bSizer1661->Add( m_bitmapInclude, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+
+    wxBoxSizer* bSizer1731;
+    bSizer1731 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText78 = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("Include:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText78->Wrap( -1 );
+    bSizer1731->Add( m_staticText78, 0, 0, 5 );
+
+    m_textCtrlInclude = new wxTextCtrl( m_panelFilterSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), wxTE_MULTILINE );
+    m_textCtrlInclude->SetMinSize( wxSize( 280, -1 ) );
+
+    bSizer1731->Add( m_textCtrlInclude, 1, wxEXPAND|wxTOP, 5 );
+
+
+    bSizer1661->Add( bSizer1731, 1, wxEXPAND, 5 );
+
+
+    bSizer166->Add( bSizer1661, 1, wxEXPAND|wxLEFT, 5 );
+
+    m_staticline22 = new wxStaticLine( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer166->Add( m_staticline22, 0, wxEXPAND, 5 );
+
+
+    bSizer166->Add( 0, 10, 0, 0, 5 );
+
+    wxBoxSizer* bSizer1651;
+    bSizer1651 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapExclude = new wxStaticBitmap( m_panelFilterSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30, 30 ), 0 );
+    bSizer1651->Add( m_bitmapExclude, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    wxBoxSizer* bSizer1742;
+    bSizer1742 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer189;
+    bSizer189 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText77 = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("Exclude:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText77->Wrap( -1 );
+    bSizer189->Add( m_staticText77, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer189->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_hyperlink171 = new wxHyperlinkCtrl( m_panelFilterSettings, wxID_ANY, _("Show examples"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    bSizer189->Add( m_hyperlink171, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+
+    bSizer1742->Add( bSizer189, 0, wxEXPAND, 5 );
+
+    m_textCtrlExclude = new wxTextCtrl( m_panelFilterSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), wxTE_MULTILINE );
+    bSizer1742->Add( m_textCtrlExclude, 1, wxEXPAND|wxTOP, 5 );
+
+
+    bSizer1651->Add( bSizer1742, 1, wxEXPAND, 5 );
+
+
+    bSizer166->Add( bSizer1651, 2, wxEXPAND|wxLEFT, 5 );
+
+
+    bSizer1591->Add( bSizer166, 1, wxEXPAND, 5 );
+
+    m_staticline24 = new wxStaticLine( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizer1591->Add( m_staticline24, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer160;
+    bSizer160 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer167;
+    bSizer167 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapFilterDate = new wxStaticBitmap( m_panelFilterSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 34, 34 ), 0 );
+    bSizer167->Add( m_bitmapFilterDate, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    wxBoxSizer* bSizer165;
+    bSizer165 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText79 = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("Time span:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText79->Wrap( -1 );
+    bSizer165->Add( m_staticText79, 0, wxBOTTOM, 5 );
+
+    m_spinCtrlTimespan = new wxSpinCtrl( m_panelFilterSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
+    bSizer165->Add( m_spinCtrlTimespan, 0, wxEXPAND, 5 );
+
+    wxArrayString m_choiceUnitTimespanChoices;
+    m_choiceUnitTimespan = new wxChoice( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitTimespanChoices, 0 );
+    m_choiceUnitTimespan->SetSelection( 0 );
+    bSizer165->Add( m_choiceUnitTimespan, 0, wxEXPAND, 5 );
+
+
+    bSizer167->Add( bSizer165, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+
+
+    bSizer160->Add( bSizer167, 0, wxEXPAND|wxALL, 5 );
+
+    m_staticline23 = new wxStaticLine( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer160->Add( m_staticline23, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer168;
+    bSizer168 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapFilterSize = new wxStaticBitmap( m_panelFilterSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 32, 32 ), 0 );
+    bSizer168->Add( m_bitmapFilterSize, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+
+    wxBoxSizer* bSizer158;
+    bSizer158 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText80 = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("File size:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText80->Wrap( -1 );
+    bSizer158->Add( m_staticText80, 0, wxBOTTOM, 5 );
+
+    wxBoxSizer* bSizer162;
+    bSizer162 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText101 = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("Minimum:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText101->Wrap( -1 );
+    bSizer162->Add( m_staticText101, 0, wxBOTTOM, 2 );
+
+    m_spinCtrlMinSize = new wxSpinCtrl( m_panelFilterSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
+    bSizer162->Add( m_spinCtrlMinSize, 0, wxEXPAND, 5 );
+
+    wxArrayString m_choiceUnitMinSizeChoices;
+    m_choiceUnitMinSize = new wxChoice( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitMinSizeChoices, 0 );
+    m_choiceUnitMinSize->SetSelection( 0 );
+    bSizer162->Add( m_choiceUnitMinSize, 0, wxEXPAND, 5 );
+
+
+    bSizer158->Add( bSizer162, 0, wxBOTTOM|wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer163;
+    bSizer163 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText102 = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("Maximum:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText102->Wrap( -1 );
+    bSizer163->Add( m_staticText102, 0, wxBOTTOM, 2 );
+
+    m_spinCtrlMaxSize = new wxSpinCtrl( m_panelFilterSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
+    bSizer163->Add( m_spinCtrlMaxSize, 0, wxEXPAND, 5 );
+
+    wxArrayString m_choiceUnitMaxSizeChoices;
+    m_choiceUnitMaxSize = new wxChoice( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitMaxSizeChoices, 0 );
+    m_choiceUnitMaxSize->SetSelection( 0 );
+    bSizer163->Add( m_choiceUnitMaxSize, 0, wxEXPAND, 5 );
+
+
+    bSizer158->Add( bSizer163, 0, wxEXPAND, 5 );
+
+
+    bSizer168->Add( bSizer158, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+
+
+    bSizer160->Add( bSizer168, 1, wxEXPAND|wxALL, 5 );
+
+
+    bSizer1591->Add( bSizer160, 0, wxEXPAND, 5 );
+
+
+    m_panelFilterSettings->SetSizer( bSizer1591 );
+    m_panelFilterSettings->Layout();
+    bSizer1591->Fit( m_panelFilterSettings );
+    bSizer278->Add( m_panelFilterSettings, 1, wxEXPAND, 5 );
+
+    m_staticline62 = new wxStaticLine( m_panelFilterSettingsHolder, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer278->Add( m_staticline62, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer280;
+    bSizer280 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText44 = new wxStaticText( m_panelFilterSettingsHolder, wxID_ANY, _("Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair."), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_staticText44->Wrap( 590 );
+    bSizer280->Add( m_staticText44, 0, wxALIGN_CENTER_VERTICAL|wxALL, 10 );
+
+
+    bSizer280->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticline46 = new wxStaticLine( m_panelFilterSettingsHolder, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizer280->Add( m_staticline46, 0, wxEXPAND, 5 );
+
+    m_buttonClear = new wxButton( m_panelFilterSettingsHolder, wxID_ANY, _("C&lear"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    bSizer280->Add( m_buttonClear, 0, wxALL|wxALIGN_CENTER_VERTICAL, 10 );
+
+
+    bSizer278->Add( bSizer280, 0, wxEXPAND, 5 );
+
+
+    m_panelFilterSettingsHolder->SetSizer( bSizer278 );
+    m_panelFilterSettingsHolder->Layout();
+    bSizer278->Fit( m_panelFilterSettingsHolder );
+    m_notebook->AddPage( m_panelFilterSettingsHolder, _("dummy"), false );
+    m_panelSyncSettingsHolder = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panelSyncSettingsHolder->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    wxBoxSizer* bSizer276;
+    bSizer276 = new wxBoxSizer( wxVERTICAL );
+
+    bSizerHeaderSyncSettings = new wxBoxSizer( wxVERTICAL );
+
+    m_staticTextMainSyncSettings = new wxStaticText( m_panelSyncSettingsHolder, wxID_ANY, _("Main settings:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextMainSyncSettings->Wrap( -1 );
+    bSizerHeaderSyncSettings->Add( m_staticTextMainSyncSettings, 0, wxALL, 10 );
+
+    m_checkBoxUseLocalSyncOptions = new wxCheckBox( m_panelSyncSettingsHolder, wxID_ANY, _("Use local settings:"), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizerHeaderSyncSettings->Add( m_checkBoxUseLocalSyncOptions, 0, wxALL|wxEXPAND, 10 );
+
+    m_staticlineSyncHeader = new wxStaticLine( m_panelSyncSettingsHolder, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizerHeaderSyncSettings->Add( m_staticlineSyncHeader, 0, wxEXPAND, 5 );
+
+
+    bSizer276->Add( bSizerHeaderSyncSettings, 0, wxEXPAND, 5 );
+
+    m_panelSyncSettings = new wxPanel( m_panelSyncSettingsHolder, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panelSyncSettings->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    wxBoxSizer* bSizer232;
+    bSizer232 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer237;
+    bSizer237 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer235;
+    bSizer235 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText86 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Select a variant:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText86->Wrap( -1 );
+    bSizer235->Add( m_staticText86, 0, wxALL, 5 );
+
+    wxBoxSizer* bSizer236;
+    bSizer236 = new wxBoxSizer( wxVERTICAL );
+
+    m_toggleBtnTwoWay = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, 30 ), 0 );
+    m_toggleBtnTwoWay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer236->Add( m_toggleBtnTwoWay, 0, wxEXPAND|wxBOTTOM, 5 );
+
+    m_toggleBtnMirror = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, 30 ), 0 );
+    m_toggleBtnMirror->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer236->Add( m_toggleBtnMirror, 0, wxEXPAND|wxBOTTOM, 5 );
+
+    m_toggleBtnUpdate = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, 30 ), 0 );
+    m_toggleBtnUpdate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer236->Add( m_toggleBtnUpdate, 0, wxEXPAND|wxBOTTOM, 5 );
+
+    m_toggleBtnCustom = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, 30 ), 0 );
+    m_toggleBtnCustom->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer236->Add( m_toggleBtnCustom, 0, wxEXPAND, 5 );
+
+
+    bSizer235->Add( bSizer236, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+
+    bSizer237->Add( bSizer235, 0, wxALL, 5 );
+
+    m_staticline53 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizer237->Add( m_staticline53, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer238;
+    bSizer238 = new wxBoxSizer( wxVERTICAL );
+
+
+    bSizer238->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    bSizerSyncConfig = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer173;
+    bSizer173 = new wxBoxSizer( wxVERTICAL );
+
+
+    bSizer173->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticText119 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Category"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText119->Wrap( -1 );
+    bSizer173->Add( m_staticText119, 0, 0, 5 );
+
+
+    bSizer173->Add( 0, 0, 1, wxEXPAND, 5 );
+
+
+    bSizer173->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticText120 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Action"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText120->Wrap( -1 );
+    bSizer173->Add( m_staticText120, 0, 0, 5 );
+
+
+    bSizer173->Add( 0, 0, 1, wxEXPAND, 5 );
+
+
+    bSizerSyncConfig->Add( bSizer173, 0, wxEXPAND|wxRIGHT, 5 );
+
+    fgSizerSyncDirections = new wxFlexGridSizer( 2, 0, 5, 5 );
+    fgSizerSyncDirections->SetFlexibleDirection( wxBOTH );
+    fgSizerSyncDirections->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    m_bitmapLeftOnly = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45, 45 ), 0 );
+    m_bitmapLeftOnly->SetToolTip( _("Item exists on left side only") );
+
+    fgSizerSyncDirections->Add( m_bitmapLeftOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bitmapLeftNewer = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45, 45 ), 0 );
+    m_bitmapLeftNewer->SetToolTip( _("Left side is newer") );
+
+    fgSizerSyncDirections->Add( m_bitmapLeftNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bitmapDifferent = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45, 45 ), 0 );
+    m_bitmapDifferent->SetToolTip( _("Items have different content") );
+
+    fgSizerSyncDirections->Add( m_bitmapDifferent, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bitmapConflict = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45, 45 ), 0 );
+    m_bitmapConflict->SetToolTip( _("Conflict/item cannot be categorized") );
+
+    fgSizerSyncDirections->Add( m_bitmapConflict, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bitmapRightNewer = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45, 45 ), 0 );
+    m_bitmapRightNewer->SetToolTip( _("Right side is newer") );
+
+    fgSizerSyncDirections->Add( m_bitmapRightNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bitmapRightOnly = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45, 45 ), 0 );
+    m_bitmapRightOnly->SetToolTip( _("Item exists on right side only") );
+
+    fgSizerSyncDirections->Add( m_bitmapRightOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonLeftOnly = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 46, 46 ), wxBU_AUTODRAW );
+    fgSizerSyncDirections->Add( m_bpButtonLeftOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonLeftNewer = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 46, 46 ), wxBU_AUTODRAW );
+    fgSizerSyncDirections->Add( m_bpButtonLeftNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonDifferent = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 46, 46 ), wxBU_AUTODRAW );
+    fgSizerSyncDirections->Add( m_bpButtonDifferent, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonConflict = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 46, 46 ), wxBU_AUTODRAW );
+    fgSizerSyncDirections->Add( m_bpButtonConflict, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonRightNewer = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 46, 46 ), wxBU_AUTODRAW );
+    fgSizerSyncDirections->Add( m_bpButtonRightNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonRightOnly = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 46, 46 ), wxBU_AUTODRAW );
+    fgSizerSyncDirections->Add( m_bpButtonRightOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerSyncConfig->Add( fgSizerSyncDirections, 0, 0, 5 );
+
+    m_bitmapDatabase = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_bitmapDatabase->SetToolTip( _("Detect synchronization directions with the help of database files") );
+
+    bSizerSyncConfig->Add( m_bitmapDatabase, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxALIGN_CENTER_VERTICAL, 10 );
+
+    wxBoxSizer* bSizerKeepVerticalHeightWhenSyncDirsNotShown;
+    bSizerKeepVerticalHeightWhenSyncDirsNotShown = new wxBoxSizer( wxVERTICAL );
+
+
+    bSizerKeepVerticalHeightWhenSyncDirsNotShown->Add( 0, 45, 0, 0, 5 );
+
+
+    bSizerKeepVerticalHeightWhenSyncDirsNotShown->Add( 0, 5, 1, 0, 5 );
+
+
+    bSizerKeepVerticalHeightWhenSyncDirsNotShown->Add( 0, 46, 0, 0, 5 );
+
+
+    bSizerSyncConfig->Add( bSizerKeepVerticalHeightWhenSyncDirsNotShown, 0, 0, 5 );
+
+
+    bSizer238->Add( bSizerSyncConfig, 0, wxALL, 10 );
+
+
+    bSizer238->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticline431 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer238->Add( m_staticline431, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer201;
+    bSizer201 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_checkBoxDetectMove = new wxCheckBox( m_panelSyncSettings, wxID_ANY, _("Detect moved files"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_checkBoxDetectMove->SetValue(true);
+    m_checkBoxDetectMove->SetToolTip( _("- Not supported by all file systems\n- Requires and creates database files\n- Detection not available for first sync") );
+
+    bSizer201->Add( m_checkBoxDetectMove, 0, wxALL|wxEXPAND, 5 );
+
+    m_hyperlink242 = new wxHyperlinkCtrl( m_panelSyncSettings, wxID_ANY, _("More information"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    bSizer201->Add( m_hyperlink242, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 );
+
+
+    bSizer238->Add( bSizer201, 0, wxALL, 5 );
+
+
+    bSizer237->Add( bSizer238, 0, wxEXPAND, 5 );
+
+    m_staticline531 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizer237->Add( m_staticline531, 0, wxEXPAND, 5 );
+
+    m_textCtrlSyncVarDescription = new wxTextCtrl( m_panelSyncSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxNO_BORDER );
+    bSizer237->Add( m_textCtrlSyncVarDescription, 1, wxLEFT|wxEXPAND, 5 );
+
+
+    bSizer232->Add( bSizer237, 0, wxEXPAND, 5 );
+
+    m_staticline54 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer232->Add( m_staticline54, 0, wxEXPAND, 5 );
+
+    bSizerDelHandling = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer202;
+    bSizer202 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText87 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Delete files:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText87->Wrap( -1 );
+    bSizer202->Add( m_staticText87, 0, wxALL, 5 );
+
+    m_bpButtonDeletionType = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 46, 46 ), wxBU_AUTODRAW );
+    bSizer202->Add( m_bpButtonDeletionType, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+
+    bSizerDelHandling->Add( bSizer202, 0, 0, 5 );
+
+    wxBoxSizer* bSizer2011;
+    bSizer2011 = new wxBoxSizer( wxVERTICAL );
+
+    m_radioBtnRecycler = new wxRadioButton( m_panelSyncSettings, wxID_ANY, _("&Recycle bin"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
+    m_radioBtnRecycler->SetValue( true );
+    m_radioBtnRecycler->SetToolTip( _("Back up deleted and overwritten files in the recycle bin") );
+
+    bSizer2011->Add( m_radioBtnRecycler, 0, wxEXPAND|wxALL, 5 );
+
+    m_radioBtnPermanent = new wxRadioButton( m_panelSyncSettings, wxID_ANY, _("&Permanent"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_radioBtnPermanent->SetToolTip( _("Delete or overwrite files permanently") );
+
+    bSizer2011->Add( m_radioBtnPermanent, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+
+    m_radioBtnVersioning = new wxRadioButton( m_panelSyncSettings, wxID_ANY, _("&Versioning"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_radioBtnVersioning->SetToolTip( _("Move files to a user-defined folder") );
+
+    bSizer2011->Add( m_radioBtnVersioning, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+
+
+    bSizerDelHandling->Add( bSizer2011, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panelVersioning = new wxPanel( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panelVersioning->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    wxBoxSizer* bSizer191;
+    bSizer191 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer156;
+    bSizer156 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_versioningFolderPath = new FolderHistoryBox( m_panelVersioning, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+    bSizer156->Add( m_versioningFolderPath, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonSelectVersioningFolder = new wxButton( m_panelVersioning, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonSelectVersioningFolder->SetToolTip( _("Select a folder") );
+
+    bSizer156->Add( m_buttonSelectVersioningFolder, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonSelectAltFolder = new wxBitmapButton( m_panelVersioning, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30, -1 ), wxBU_AUTODRAW );
+    m_bpButtonSelectAltFolder->SetToolTip( _("Access online storage") );
+
+    bSizer156->Add( m_bpButtonSelectAltFolder, 0, wxEXPAND, 5 );
+
+
+    bSizer191->Add( bSizer156, 0, wxEXPAND|wxALL, 5 );
+
+    wxBoxSizer* bSizer198;
+    bSizer198 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText93 = new wxStaticText( m_panelVersioning, wxID_ANY, _("Naming convention:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText93->Wrap( -1 );
+    bSizer198->Add( m_staticText93, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxArrayString m_choiceVersioningStyleChoices;
+    m_choiceVersioningStyle = new wxChoice( m_panelVersioning, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceVersioningStyleChoices, 0 );
+    m_choiceVersioningStyle->SetSelection( 0 );
+    bSizer198->Add( m_choiceVersioningStyle, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer198->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_hyperlink17 = new wxHyperlinkCtrl( m_panelVersioning, wxID_ANY, _("Show examples"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    bSizer198->Add( m_hyperlink17, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer191->Add( bSizer198, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+    bSizer192 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticTextNamingCvtPart1 = new wxStaticText( m_panelVersioning, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextNamingCvtPart1->Wrap( -1 );
+    m_staticTextNamingCvtPart1->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+
+    bSizer192->Add( m_staticTextNamingCvtPart1, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticTextNamingCvtPart2Bold = new wxStaticText( m_panelVersioning, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextNamingCvtPart2Bold->Wrap( -1 );
+    m_staticTextNamingCvtPart2Bold->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+    m_staticTextNamingCvtPart2Bold->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+
+    bSizer192->Add( m_staticTextNamingCvtPart2Bold, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticTextNamingCvtPart3 = new wxStaticText( m_panelVersioning, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextNamingCvtPart3->Wrap( -1 );
+    m_staticTextNamingCvtPart3->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+
+    bSizer192->Add( m_staticTextNamingCvtPart3, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer191->Add( bSizer192, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+
+    m_panelVersioning->SetSizer( bSizer191 );
+    m_panelVersioning->Layout();
+    bSizer191->Fit( m_panelVersioning );
+    bSizerDelHandling->Add( m_panelVersioning, 1, 0, 5 );
+
+
+    bSizer232->Add( bSizerDelHandling, 0, wxALL|wxEXPAND, 5 );
+
+    m_staticline582 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer232->Add( m_staticline582, 0, wxEXPAND, 5 );
+
+    bSizerMiscConfig = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText88 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Handle errors:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText88->Wrap( -1 );
+    bSizerMiscConfig->Add( m_staticText88, 0, wxTOP|wxBOTTOM|wxLEFT, 10 );
+
+    wxBoxSizer* bSizer175;
+    bSizer175 = new wxBoxSizer( wxVERTICAL );
+
+    m_radioBtnPopupOnErrors = new wxRadioButton( m_panelSyncSettings, wxID_ANY, _("&Pop-up"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
+    m_radioBtnPopupOnErrors->SetValue( true );
+    m_radioBtnPopupOnErrors->SetToolTip( _("Show pop-up on errors or warnings") );
+
+    bSizer175->Add( m_radioBtnPopupOnErrors, 0, wxEXPAND|wxALL, 5 );
+
+    m_radioBtnIgnoreErrors = new wxRadioButton( m_panelSyncSettings, wxID_ANY, _("&Ignore"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_radioBtnIgnoreErrors->SetToolTip( _("Hide all error and warning messages") );
+
+    bSizer175->Add( m_radioBtnIgnoreErrors, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+
+    bSizerMiscConfig->Add( bSizer175, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticline57 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizerMiscConfig->Add( m_staticline57, 0, wxEXPAND, 5 );
+
+    bSizerOnCompletion = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText89 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("On completion:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText89->Wrap( -1 );
+    bSizerOnCompletion->Add( m_staticText89, 0, wxBOTTOM, 5 );
+
+    m_comboBoxOnCompletion = new OnCompletionBox( m_panelSyncSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+    bSizerOnCompletion->Add( m_comboBoxOnCompletion, 0, wxEXPAND, 5 );
+
+
+    bSizerMiscConfig->Add( bSizerOnCompletion, 1, wxALL, 10 );
+
+
+    bSizer232->Add( bSizerMiscConfig, 1, wxEXPAND, 5 );
+
+
+    m_panelSyncSettings->SetSizer( bSizer232 );
+    m_panelSyncSettings->Layout();
+    bSizer232->Fit( m_panelSyncSettings );
+    bSizer276->Add( m_panelSyncSettings, 1, wxEXPAND, 5 );
+
+
+    m_panelSyncSettingsHolder->SetSizer( bSizer276 );
+    m_panelSyncSettingsHolder->Layout();
+    bSizer276->Fit( m_panelSyncSettingsHolder );
+    m_notebook->AddPage( m_panelSyncSettingsHolder, _("dummy"), false );
+
+    bSizer190->Add( m_notebook, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
+
+
+    bSizer7->Add( bSizer190, 1, wxEXPAND, 5 );
+
+    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+
+    m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_buttonOkay->SetDefault();
+    m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizerStdButtons->Add( m_buttonOkay, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+
+
+    bSizer7->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
+
+
+    this->SetSizer( bSizer7 );
+    this->Layout();
+    bSizer7->Fit( this );
+
+    this->Centre( wxBOTH );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( ConfigDlgGenerated::OnClose ) );
+    m_listBoxFolderPair->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( ConfigDlgGenerated::onListBoxKeyEvent ), NULL, this );
+    m_listBoxFolderPair->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnSelectFolderPair ), NULL, this );
+    m_checkBoxUseLocalCmpOptions->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleLocalCompSettings ), NULL, this );
+    m_toggleBtnByTimeSize->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnCompByTimeSizeDouble ), NULL, this );
+    m_toggleBtnByTimeSize->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnCompByTimeSize ), NULL, this );
+    m_toggleBtnByContent->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnCompByContentDouble ), NULL, this );
+    m_toggleBtnByContent->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnCompByContent ), NULL, this );
+    m_toggleBtnBySize->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnCompBySizeDouble ), NULL, this );
+    m_toggleBtnBySize->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnCompBySize ), NULL, this );
+    m_checkBoxSymlinksInclude->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeCompOption ), NULL, this );
+    m_hyperlink24->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( ConfigDlgGenerated::OnHelpComparisonSettings ), NULL, this );
+    m_textCtrlTimeShift->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( ConfigDlgGenerated::onlTimeShiftKeyDown ), NULL, this );
+    m_hyperlink241->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( ConfigDlgGenerated::OnHelpTimeShift ), NULL, this );
+    m_textCtrlInclude->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeFilterOption ), NULL, this );
+    m_hyperlink171->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( ConfigDlgGenerated::OnHelpShowExamples ), NULL, this );
+    m_textCtrlExclude->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeFilterOption ), NULL, this );
+    m_choiceUnitTimespan->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeFilterOption ), NULL, this );
+    m_choiceUnitMinSize->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeFilterOption ), NULL, this );
+    m_choiceUnitMaxSize->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeFilterOption ), NULL, this );
+    m_buttonClear->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnFilterReset ), NULL, this );
+    m_checkBoxUseLocalSyncOptions->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleLocalSyncSettings ), NULL, this );
+    m_toggleBtnTwoWay->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnSyncTwoWayDouble ), NULL, this );
+    m_toggleBtnTwoWay->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnSyncTwoWay ), NULL, this );
+    m_toggleBtnMirror->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnSyncMirrorDouble ), NULL, this );
+    m_toggleBtnMirror->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnSyncMirror ), NULL, this );
+    m_toggleBtnUpdate->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnSyncUpdateDouble ), NULL, this );
+    m_toggleBtnUpdate->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnSyncUpdate ), NULL, this );
+    m_toggleBtnCustom->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnSyncCustomDouble ), NULL, this );
+    m_toggleBtnCustom->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnSyncCustom ), NULL, this );
+    m_bpButtonLeftOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnExLeftSideOnly ), NULL, this );
+    m_bpButtonLeftNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnLeftNewer ), NULL, this );
+    m_bpButtonDifferent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnDifferent ), NULL, this );
+    m_bpButtonConflict->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnConflict ), NULL, this );
+    m_bpButtonRightNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnRightNewer ), NULL, this );
+    m_bpButtonRightOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnExRightSideOnly ), NULL, this );
+    m_checkBoxDetectMove->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleDetectMovedFiles ), NULL, this );
+    m_hyperlink242->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( ConfigDlgGenerated::OnHelpDetectMovedFiles ), NULL, this );
+    m_bpButtonDeletionType->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleDeletionType ), NULL, this );
+    m_radioBtnRecycler->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnDeletionRecycler ), NULL, this );
+    m_radioBtnPermanent->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnDeletionPermanent ), NULL, this );
+    m_radioBtnVersioning->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnDeletionVersioning ), NULL, this );
+    m_choiceVersioningStyle->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeSyncOption ), NULL, this );
+    m_hyperlink17->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( ConfigDlgGenerated::OnHelpVersioning ), NULL, this );
+    m_radioBtnPopupOnErrors->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnErrorPopup ), NULL, this );
+    m_radioBtnIgnoreErrors->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnErrorIgnore ), NULL, this );
+    m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnOkay ), NULL, this );
+    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnCancel ), NULL, this );
 }
 
 ConfigDlgGenerated::~ConfigDlgGenerated()
@@ -1944,98 +1961,98 @@ ConfigDlgGenerated::~ConfigDlgGenerated()
 
 FolderPairPanelGenerated::FolderPairPanelGenerated( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
 {
-	wxBoxSizer* bSizer74;
-	bSizer74 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_panelLeft = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panelLeft->SetMinSize( wxSize( 1,-1 ) );
-	
-	wxBoxSizer* bSizer134;
-	bSizer134 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bpButtonFolderPairOptions = new wxBitmapButton( m_panelLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25,25 ), wxBU_AUTODRAW );
-	m_bpButtonFolderPairOptions->SetToolTip( _("Arrange folder pair") );
-	
-	bSizer134->Add( m_bpButtonFolderPairOptions, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonRemovePair = new wxBitmapButton( m_panelLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25,25 ), wxBU_AUTODRAW );
-	m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
-	
-	bSizer134->Add( m_bpButtonRemovePair, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_folderPathLeft = new FolderHistoryBox( m_panelLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
-	bSizer134->Add( m_folderPathLeft, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonSelectFolderLeft = new wxButton( m_panelLeft, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonSelectFolderLeft->SetToolTip( _("Select a folder") );
-	
-	bSizer134->Add( m_buttonSelectFolderLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonSelectAltFolderLeft = new wxBitmapButton( m_panelLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,-1 ), wxBU_AUTODRAW );
-	m_bpButtonSelectAltFolderLeft->SetToolTip( _("Access online storage") );
-	
-	bSizer134->Add( m_bpButtonSelectAltFolderLeft, 0, wxEXPAND, 5 );
-	
-	
-	m_panelLeft->SetSizer( bSizer134 );
-	m_panelLeft->Layout();
-	bSizer134->Fit( m_panelLeft );
-	bSizer74->Add( m_panelLeft, 0, wxLEFT|wxEXPAND, 5 );
-	
-	m_panel20 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer95;
-	bSizer95 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer95->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_bpButtonAltCompCfg = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 26,25 ), wxBU_AUTODRAW );
-	bSizer95->Add( m_bpButtonAltCompCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonLocalFilter = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 26,25 ), wxBU_AUTODRAW );
-	bSizer95->Add( m_bpButtonLocalFilter, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonAltSyncCfg = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 26,25 ), wxBU_AUTODRAW );
-	bSizer95->Add( m_bpButtonAltSyncCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer95->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	m_panel20->SetSizer( bSizer95 );
-	m_panel20->Layout();
-	bSizer95->Fit( m_panel20 );
-	bSizer74->Add( m_panel20, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
-	m_panelRight = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panelRight->SetMinSize( wxSize( 1,-1 ) );
-	
-	wxBoxSizer* bSizer135;
-	bSizer135 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_folderPathRight = new FolderHistoryBox( m_panelRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
-	bSizer135->Add( m_folderPathRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonSelectFolderRight = new wxButton( m_panelRight, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonSelectFolderRight->SetToolTip( _("Select a folder") );
-	
-	bSizer135->Add( m_buttonSelectFolderRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonSelectAltFolderRight = new wxBitmapButton( m_panelRight, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,-1 ), wxBU_AUTODRAW );
-	m_bpButtonSelectAltFolderRight->SetToolTip( _("Access online storage") );
-	
-	bSizer135->Add( m_bpButtonSelectAltFolderRight, 0, wxEXPAND, 5 );
-	
-	
-	m_panelRight->SetSizer( bSizer135 );
-	m_panelRight->Layout();
-	bSizer135->Fit( m_panelRight );
-	bSizer74->Add( m_panelRight, 1, wxRIGHT|wxEXPAND, 5 );
-	
-	
-	this->SetSizer( bSizer74 );
-	this->Layout();
-	bSizer74->Fit( this );
+    wxBoxSizer* bSizer74;
+    bSizer74 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_panelLeft = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panelLeft->SetMinSize( wxSize( 1, -1 ) );
+
+    wxBoxSizer* bSizer134;
+    bSizer134 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bpButtonFolderPairOptions = new wxBitmapButton( m_panelLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25, 25 ), wxBU_AUTODRAW );
+    m_bpButtonFolderPairOptions->SetToolTip( _("Arrange folder pair") );
+
+    bSizer134->Add( m_bpButtonFolderPairOptions, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonRemovePair = new wxBitmapButton( m_panelLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25, 25 ), wxBU_AUTODRAW );
+    m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
+
+    bSizer134->Add( m_bpButtonRemovePair, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_folderPathLeft = new FolderHistoryBox( m_panelLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+    bSizer134->Add( m_folderPathLeft, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonSelectFolderLeft = new wxButton( m_panelLeft, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonSelectFolderLeft->SetToolTip( _("Select a folder") );
+
+    bSizer134->Add( m_buttonSelectFolderLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonSelectAltFolderLeft = new wxBitmapButton( m_panelLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30, -1 ), wxBU_AUTODRAW );
+    m_bpButtonSelectAltFolderLeft->SetToolTip( _("Access online storage") );
+
+    bSizer134->Add( m_bpButtonSelectAltFolderLeft, 0, wxEXPAND, 5 );
+
+
+    m_panelLeft->SetSizer( bSizer134 );
+    m_panelLeft->Layout();
+    bSizer134->Fit( m_panelLeft );
+    bSizer74->Add( m_panelLeft, 0, wxLEFT|wxEXPAND, 5 );
+
+    m_panel20 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer95;
+    bSizer95 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer95->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_bpButtonAltCompCfg = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 26, 25 ), wxBU_AUTODRAW );
+    bSizer95->Add( m_bpButtonAltCompCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonLocalFilter = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 26, 25 ), wxBU_AUTODRAW );
+    bSizer95->Add( m_bpButtonLocalFilter, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonAltSyncCfg = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 26, 25 ), wxBU_AUTODRAW );
+    bSizer95->Add( m_bpButtonAltSyncCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer95->Add( 0, 0, 1, wxEXPAND, 5 );
+
+
+    m_panel20->SetSizer( bSizer95 );
+    m_panel20->Layout();
+    bSizer95->Fit( m_panel20 );
+    bSizer74->Add( m_panel20, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 );
+
+    m_panelRight = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panelRight->SetMinSize( wxSize( 1, -1 ) );
+
+    wxBoxSizer* bSizer135;
+    bSizer135 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_folderPathRight = new FolderHistoryBox( m_panelRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+    bSizer135->Add( m_folderPathRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonSelectFolderRight = new wxButton( m_panelRight, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonSelectFolderRight->SetToolTip( _("Select a folder") );
+
+    bSizer135->Add( m_buttonSelectFolderRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonSelectAltFolderRight = new wxBitmapButton( m_panelRight, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30, -1 ), wxBU_AUTODRAW );
+    m_bpButtonSelectAltFolderRight->SetToolTip( _("Access online storage") );
+
+    bSizer135->Add( m_bpButtonSelectAltFolderRight, 0, wxEXPAND, 5 );
+
+
+    m_panelRight->SetSizer( bSizer135 );
+    m_panelRight->Layout();
+    bSizer135->Fit( m_panelRight );
+    bSizer74->Add( m_panelRight, 1, wxRIGHT|wxEXPAND, 5 );
+
+
+    this->SetSizer( bSizer74 );
+    this->Layout();
+    bSizer74->Fit( this );
 }
 
 FolderPairPanelGenerated::~FolderPairPanelGenerated()
@@ -2044,397 +2061,400 @@ FolderPairPanelGenerated::~FolderPairPanelGenerated()
 
 CloudSetupDlgGenerated::CloudSetupDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer134;
-	bSizer134 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer72;
-	bSizer72 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapCloud = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer72->Add( m_bitmapCloud, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
-	
-	m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("Enter your login details:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextHeader->Wrap( -1 );
-	bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 10 );
-	
-	
-	bSizer72->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer231;
-	bSizer231 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText136 = new wxStaticText( this, wxID_ANY, _("Connection type:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText136->Wrap( -1 );
-	bSizer231->Add( m_staticText136, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	m_toggleBtnSftp = new wxToggleButton( this, wxID_ANY, _("SFTP"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_toggleBtnSftp->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer231->Add( m_toggleBtnSftp, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	m_toggleBtnFtp = new wxToggleButton( this, wxID_ANY, _("FTP"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_toggleBtnFtp->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer231->Add( m_toggleBtnFtp, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	
-	bSizer72->Add( bSizer231, 0, wxALL, 5 );
-	
-	
-	bSizer134->Add( bSizer72, 0, wxEXPAND, 5 );
-	
-	m_staticline371 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxLI_HORIZONTAL );
-	bSizer134->Add( m_staticline371, 0, wxEXPAND, 5 );
-	
-	m_panel41 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	m_panel41->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	wxBoxSizer* bSizer185;
-	bSizer185 = new wxBoxSizer( wxVERTICAL );
-	
-	wxFlexGridSizer* fgSizer16;
-	fgSizer16 = new wxFlexGridSizer( 0, 2, 0, 0 );
-	fgSizer16->AddGrowableCol( 1 );
-	fgSizer16->SetFlexibleDirection( wxBOTH );
-	fgSizer16->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_staticText12311 = new wxStaticText( m_panel41, wxID_ANY, _("Server name or IP address:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText12311->Wrap( -1 );
-	fgSizer16->Add( m_staticText12311, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	wxBoxSizer* bSizer183;
-	bSizer183 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_textCtrlServer = new wxTextCtrl( m_panel41, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 260,-1 ), 0 );
-	bSizer183->Add( m_textCtrlServer, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticText1233 = new wxStaticText( m_panel41, wxID_ANY, _("Port:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText1233->Wrap( -1 );
-	bSizer183->Add( m_staticText1233, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	m_textCtrlPort = new wxTextCtrl( m_panel41, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 60,-1 ), 0 );
-	bSizer183->Add( m_textCtrlPort, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	fgSizer16->Add( bSizer183, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	
-	fgSizer16->Add( 0, 0, 0, 0, 5 );
-	
-	wxBoxSizer* bSizer181;
-	bSizer181 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText1381 = new wxStaticText( m_panel41, wxID_ANY, _("Example:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText1381->Wrap( -1 );
-	m_staticText1381->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-	
-	bSizer181->Add( m_staticText1381, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	m_staticText1382 = new wxStaticText( m_panel41, wxID_ANY, _("website.com"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText1382->Wrap( -1 );
-	m_staticText1382->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-	
-	bSizer181->Add( m_staticText1382, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	m_staticText138 = new wxStaticText( m_panel41, wxID_ANY, _("66.198.240.22"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText138->Wrap( -1 );
-	m_staticText138->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-	
-	bSizer181->Add( m_staticText138, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	
-	fgSizer16->Add( bSizer181, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer185->Add( fgSizer16, 0, wxALL|wxEXPAND, 5 );
-	
-	m_staticline58 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer185->Add( m_staticline58, 0, wxEXPAND, 5 );
-	
-	bSizerAuth = new wxBoxSizer( wxHORIZONTAL );
-	
-	bSizerFtpEncrypt = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer2181;
-	bSizer2181 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText1251 = new wxStaticText( m_panel41, wxID_ANY, _("Encryption:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText1251->Wrap( -1 );
-	bSizer2181->Add( m_staticText1251, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-	
-	m_radioBtnEncryptNone = new wxRadioButton( m_panel41, wxID_ANY, _("&Disabled"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
-	m_radioBtnEncryptNone->SetValue( true ); 
-	bSizer2181->Add( m_radioBtnEncryptNone, 0, wxEXPAND|wxALL, 5 );
-	
-	m_radioBtnEncryptSsl = new wxRadioButton( m_panel41, wxID_ANY, _("&Explicit SSL/TLS"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer2181->Add( m_radioBtnEncryptSsl, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
-	
-	bSizerFtpEncrypt->Add( bSizer2181, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticline5721 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizerFtpEncrypt->Add( m_staticline5721, 0, wxEXPAND, 5 );
-	
-	
-	bSizerAuth->Add( bSizerFtpEncrypt, 0, wxEXPAND, 5 );
-	
-	bSizerSftpAuth = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer218;
-	bSizer218 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText125 = new wxStaticText( m_panel41, wxID_ANY, _("Authentication:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText125->Wrap( -1 );
-	bSizer218->Add( m_staticText125, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-	
-	m_radioBtnPassword = new wxRadioButton( m_panel41, wxID_ANY, _("&Password"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
-	m_radioBtnPassword->SetValue( true ); 
-	bSizer218->Add( m_radioBtnPassword, 0, wxEXPAND|wxALL, 5 );
-	
-	m_radioBtnKeyfile = new wxRadioButton( m_panel41, wxID_ANY, _("&Key file"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer218->Add( m_radioBtnKeyfile, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
-	
-	bSizerSftpAuth->Add( bSizer218, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticline572 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizerSftpAuth->Add( m_staticline572, 0, wxEXPAND, 5 );
-	
-	
-	bSizerAuth->Add( bSizerSftpAuth, 0, wxEXPAND, 5 );
-	
-	m_panelAuth = new wxPanel( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panelAuth->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	wxBoxSizer* bSizer221;
-	bSizer221 = new wxBoxSizer( wxVERTICAL );
-	
-	wxFlexGridSizer* fgSizer161;
-	fgSizer161 = new wxFlexGridSizer( 0, 2, 0, 0 );
-	fgSizer161->AddGrowableCol( 1 );
-	fgSizer161->SetFlexibleDirection( wxBOTH );
-	fgSizer161->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_staticText123 = new wxStaticText( m_panelAuth, wxID_ANY, _("User name:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText123->Wrap( -1 );
-	fgSizer161->Add( m_staticText123, 0, wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrlUserName = new wxTextCtrl( m_panelAuth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer161->Add( m_textCtrlUserName, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticTextKeyfile = new wxStaticText( m_panelAuth, wxID_ANY, _("Private key file:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextKeyfile->Wrap( -1 );
-	fgSizer161->Add( m_staticTextKeyfile, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
-	
-	bSizerKeyFile = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_textCtrlKeyfilePath = new wxTextCtrl( m_panelAuth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizerKeyFile->Add( m_textCtrlKeyfilePath, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonSelectKeyfile = new wxButton( m_panelAuth, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonSelectKeyfile->SetToolTip( _("Select a folder") );
-	
-	bSizerKeyFile->Add( m_buttonSelectKeyfile, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	fgSizer161->Add( bSizerKeyFile, 0, wxALL|wxEXPAND, 5 );
-	
-	m_staticTextPassword = new wxStaticText( m_panelAuth, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextPassword->Wrap( -1 );
-	fgSizer161->Add( m_staticTextPassword, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	wxBoxSizer* bSizer182;
-	bSizer182 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_textCtrlPasswordVisible = new wxTextCtrl( m_panelAuth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer182->Add( m_textCtrlPasswordVisible, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	m_textCtrlPasswordHidden = new wxTextCtrl( m_panelAuth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD );
-	bSizer182->Add( m_textCtrlPasswordHidden, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	m_checkBoxShowPassword = new wxCheckBox( m_panelAuth, wxID_ANY, _("&Show password"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer182->Add( m_checkBoxShowPassword, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	
-	fgSizer161->Add( bSizer182, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	
-	bSizer221->Add( fgSizer161, 0, wxALL|wxEXPAND, 5 );
-	
-	
-	m_panelAuth->SetSizer( bSizer221 );
-	m_panelAuth->Layout();
-	bSizer221->Fit( m_panelAuth );
-	bSizerAuth->Add( m_panelAuth, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer185->Add( bSizerAuth, 0, wxEXPAND, 5 );
-	
-	m_staticline581 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer185->Add( m_staticline581, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer217;
-	bSizer217 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText1232 = new wxStaticText( m_panel41, wxID_ANY, _("Directory on server:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText1232->Wrap( -1 );
-	bSizer217->Add( m_staticText1232, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	m_textCtrlServerPath = new wxTextCtrl( m_panel41, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer217->Add( m_textCtrlServerPath, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	m_buttonSelectFolder = new wxButton( m_panel41, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonSelectFolder->SetToolTip( _("Select a folder") );
-	
-	bSizer217->Add( m_buttonSelectFolder, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-	
-	
-	bSizer185->Add( bSizer217, 0, wxALL|wxEXPAND, 5 );
-	
-	
-	m_panel41->SetSizer( bSizer185 );
-	m_panel41->Layout();
-	bSizer185->Fit( m_panel41 );
-	bSizer134->Add( m_panel41, 1, wxEXPAND, 5 );
-	
-	bSizerSftpTweaks = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticline571 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizerSftpTweaks->Add( m_staticline571, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer219;
-	bSizer219 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapSpeed = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer219->Add( m_bitmapSpeed, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
-	
-	m_staticText1361 = new wxStaticText( this, wxID_ANY, _("Performance improvements:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText1361->Wrap( -1 );
-	bSizer219->Add( m_staticText1361, 0, wxALL|wxALIGN_CENTER_VERTICAL, 10 );
-	
-	
-	bSizer219->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_hyperlink171 = new wxHyperlinkCtrl( this, wxID_ANY, _("How to get best performance?"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	bSizer219->Add( m_hyperlink171, 0, wxALL|wxALIGN_CENTER_VERTICAL, 10 );
-	
-	
-	bSizerSftpTweaks->Add( bSizer219, 0, wxEXPAND, 5 );
-	
-	m_staticline57 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizerSftpTweaks->Add( m_staticline57, 0, wxEXPAND, 5 );
-	
-	m_panel411 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	m_panel411->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	wxBoxSizer* bSizer1851;
-	bSizer1851 = new wxBoxSizer( wxVERTICAL );
-	
-	wxFlexGridSizer* fgSizer1611;
-	fgSizer1611 = new wxFlexGridSizer( 0, 3, 0, 0 );
-	fgSizer1611->AddGrowableCol( 1 );
-	fgSizer1611->SetFlexibleDirection( wxBOTH );
-	fgSizer1611->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_staticText12341 = new wxStaticText( m_panel411, wxID_ANY, _("SSH connections for directory reading:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText12341->Wrap( -1 );
-	fgSizer1611->Add( m_staticText12341, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
-	
-	m_spinCtrlConnectionCount = new wxSpinCtrl( m_panel411, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 70,-1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
-	fgSizer1611->Add( m_spinCtrlConnectionCount, 0, wxALL, 5 );
-	
-	wxBoxSizer* bSizer230;
-	bSizer230 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText138111 = new wxStaticText( m_panel411, wxID_ANY, _("Suggested range: [1 - 10]"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText138111->Wrap( -1 );
-	m_staticText138111->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-	
-	bSizer230->Add( m_staticText138111, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	fgSizer1611->Add( bSizer230, 0, 0, 5 );
-	
-	m_staticText1231111 = new wxStaticText( m_panel411, wxID_ANY, _("SFTP channels per connection:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText1231111->Wrap( -1 );
-	fgSizer1611->Add( m_staticText1231111, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	m_spinCtrlChannelCount = new wxSpinCtrl( m_panel411, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 70,-1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
-	fgSizer1611->Add( m_spinCtrlChannelCount, 0, wxALL, 5 );
-	
-	m_button42 = new wxButton( m_panel411, wxID_ANY, _("Detect server limit"), wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer1611->Add( m_button42, 0, wxALL, 5 );
-	
-	
-	bSizer1851->Add( fgSizer1611, 0, wxALL, 5 );
-	
-	wxBoxSizer* bSizer220;
-	bSizer220 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText138112 = new wxStaticText( m_panel411, wxID_ANY, _("Example:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText138112->Wrap( -1 );
-	m_staticText138112->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-	
-	bSizer220->Add( m_staticText138112, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticText13811 = new wxStaticText( m_panel411, wxID_ANY, _("2 connections x 10 channels = 20 times faster directory reading"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText13811->Wrap( -1 );
-	m_staticText13811->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-	
-	bSizer220->Add( m_staticText13811, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer1851->Add( bSizer220, 0, wxBOTTOM|wxRIGHT|wxLEFT, 10 );
-	
-	
-	m_panel411->SetSizer( bSizer1851 );
-	m_panel411->Layout();
-	bSizer1851->Fit( m_panel411 );
-	bSizerSftpTweaks->Add( m_panel411, 1, wxEXPAND, 5 );
-	
-	
-	bSizer134->Add( bSizerSftpTweaks, 0, wxEXPAND, 5 );
-	
-	m_staticline12 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer134->Add( m_staticline12, 0, wxEXPAND, 5 );
-	
-	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_buttonOkay->SetDefault(); 
-	m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizerStdButtons->Add( m_buttonOkay, 0, wxALL, 5 );
-	
-	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-	
-	
-	bSizer134->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
-	
-	
-	this->SetSizer( bSizer134 );
-	this->Layout();
-	bSizer134->Fit( this );
-	
-	this->Centre( wxBOTH );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CloudSetupDlgGenerated::OnClose ) );
-	m_toggleBtnSftp->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnConnectionSftp ), NULL, this );
-	m_toggleBtnFtp->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnConnectionFtp ), NULL, this );
-	m_radioBtnPassword->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CloudSetupDlgGenerated::OnAuthPassword ), NULL, this );
-	m_radioBtnKeyfile->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CloudSetupDlgGenerated::OnAuthKeyfile ), NULL, this );
-	m_buttonSelectKeyfile->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnSelectKeyfile ), NULL, this );
-	m_checkBoxShowPassword->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnToggleShowPassword ), NULL, this );
-	m_buttonSelectFolder->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnBrowseCloudFolder ), NULL, this );
-	m_hyperlink171->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( CloudSetupDlgGenerated::OnHelpSftpPerformance ), NULL, this );
-	m_button42->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnDetectServerChannelLimit ), NULL, this );
-	m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnOkay ), NULL, this );
-	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnCancel ), NULL, this );
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    wxBoxSizer* bSizer134;
+    bSizer134 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer72;
+    bSizer72 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapCloud = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer72->Add( m_bitmapCloud, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
+
+    m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("Enter your login details:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextHeader->Wrap( -1 );
+    bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 10 );
+
+
+    bSizer72->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer231;
+    bSizer231 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText136 = new wxStaticText( this, wxID_ANY, _("Connection type:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText136->Wrap( -1 );
+    bSizer231->Add( m_staticText136, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    m_toggleBtnSftp = new wxToggleButton( this, wxID_ANY, _("SFTP"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_toggleBtnSftp->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer231->Add( m_toggleBtnSftp, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    m_toggleBtnFtp = new wxToggleButton( this, wxID_ANY, _("FTP"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_toggleBtnFtp->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer231->Add( m_toggleBtnFtp, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+
+    bSizer72->Add( bSizer231, 0, wxALL, 5 );
+
+
+    bSizer134->Add( bSizer72, 0, wxEXPAND, 5 );
+
+    m_staticline371 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxSize( -1, -1 ), wxLI_HORIZONTAL );
+    bSizer134->Add( m_staticline371, 0, wxEXPAND, 5 );
+
+    m_panel41 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+    m_panel41->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    wxBoxSizer* bSizer185;
+    bSizer185 = new wxBoxSizer( wxVERTICAL );
+
+    wxFlexGridSizer* fgSizer16;
+    fgSizer16 = new wxFlexGridSizer( 0, 2, 0, 0 );
+    fgSizer16->AddGrowableCol( 1 );
+    fgSizer16->SetFlexibleDirection( wxBOTH );
+    fgSizer16->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    m_staticText12311 = new wxStaticText( m_panel41, wxID_ANY, _("Server name or IP address:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText12311->Wrap( -1 );
+    fgSizer16->Add( m_staticText12311, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    wxBoxSizer* bSizer183;
+    bSizer183 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_textCtrlServer = new wxTextCtrl( m_panel41, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 260, -1 ), 0 );
+    bSizer183->Add( m_textCtrlServer, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticText1233 = new wxStaticText( m_panel41, wxID_ANY, _("Port:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText1233->Wrap( -1 );
+    bSizer183->Add( m_staticText1233, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    m_textCtrlPort = new wxTextCtrl( m_panel41, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 60, -1 ), 0 );
+    bSizer183->Add( m_textCtrlPort, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    fgSizer16->Add( bSizer183, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+
+    fgSizer16->Add( 0, 0, 0, 0, 5 );
+
+    wxBoxSizer* bSizer181;
+    bSizer181 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText1381 = new wxStaticText( m_panel41, wxID_ANY, _("Example:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText1381->Wrap( -1 );
+    m_staticText1381->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+
+    bSizer181->Add( m_staticText1381, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+    m_staticText1382 = new wxStaticText( m_panel41, wxID_ANY, _("website.com"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText1382->Wrap( -1 );
+    m_staticText1382->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+
+    bSizer181->Add( m_staticText1382, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+    m_staticText138 = new wxStaticText( m_panel41, wxID_ANY, _("66.198.240.22"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText138->Wrap( -1 );
+    m_staticText138->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+
+    bSizer181->Add( m_staticText138, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+
+    fgSizer16->Add( bSizer181, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer185->Add( fgSizer16, 0, wxALL|wxEXPAND, 5 );
+
+    m_staticline58 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer185->Add( m_staticline58, 0, wxEXPAND, 5 );
+
+    bSizerAuth = new wxBoxSizer( wxHORIZONTAL );
+
+    bSizerFtpEncrypt = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer2181;
+    bSizer2181 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText1251 = new wxStaticText( m_panel41, wxID_ANY, _("Encryption:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText1251->Wrap( -1 );
+    bSizer2181->Add( m_staticText1251, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+
+    m_radioBtnEncryptNone = new wxRadioButton( m_panel41, wxID_ANY, _("&Disabled"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
+    m_radioBtnEncryptNone->SetValue( true );
+    bSizer2181->Add( m_radioBtnEncryptNone, 0, wxEXPAND|wxALL, 5 );
+
+    m_radioBtnEncryptSsl = new wxRadioButton( m_panel41, wxID_ANY, _("&Explicit SSL/TLS"), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer2181->Add( m_radioBtnEncryptSsl, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+
+
+    bSizerFtpEncrypt->Add( bSizer2181, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticline5721 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizerFtpEncrypt->Add( m_staticline5721, 0, wxEXPAND, 5 );
+
+
+    bSizerAuth->Add( bSizerFtpEncrypt, 0, wxEXPAND, 5 );
+
+    bSizerSftpAuth = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer218;
+    bSizer218 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText125 = new wxStaticText( m_panel41, wxID_ANY, _("Authentication:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText125->Wrap( -1 );
+    bSizer218->Add( m_staticText125, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+
+    m_radioBtnPassword = new wxRadioButton( m_panel41, wxID_ANY, _("&Password"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
+    m_radioBtnPassword->SetValue( true );
+    bSizer218->Add( m_radioBtnPassword, 0, wxEXPAND|wxALL, 5 );
+
+    m_radioBtnKeyfile = new wxRadioButton( m_panel41, wxID_ANY, _("&Key file"), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer218->Add( m_radioBtnKeyfile, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+
+    m_radioBtnAgent = new wxRadioButton( m_panel41, wxID_ANY, _("&SSH agent"), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer218->Add( m_radioBtnAgent, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+
+    bSizerSftpAuth->Add( bSizer218, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticline572 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizerSftpAuth->Add( m_staticline572, 0, wxEXPAND, 5 );
+
+
+    bSizerAuth->Add( bSizerSftpAuth, 0, wxEXPAND, 5 );
+
+    m_panelAuth = new wxPanel( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panelAuth->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    wxBoxSizer* bSizer221;
+    bSizer221 = new wxBoxSizer( wxVERTICAL );
+
+    wxFlexGridSizer* fgSizer161;
+    fgSizer161 = new wxFlexGridSizer( 0, 2, 0, 0 );
+    fgSizer161->AddGrowableCol( 1 );
+    fgSizer161->SetFlexibleDirection( wxBOTH );
+    fgSizer161->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    m_staticText123 = new wxStaticText( m_panelAuth, wxID_ANY, _("User name:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText123->Wrap( -1 );
+    fgSizer161->Add( m_staticText123, 0, wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrlUserName = new wxTextCtrl( m_panelAuth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    fgSizer161->Add( m_textCtrlUserName, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticTextKeyfile = new wxStaticText( m_panelAuth, wxID_ANY, _("Private key file:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextKeyfile->Wrap( -1 );
+    fgSizer161->Add( m_staticTextKeyfile, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
+
+    bSizerKeyFile = new wxBoxSizer( wxHORIZONTAL );
+
+    m_textCtrlKeyfilePath = new wxTextCtrl( m_panelAuth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizerKeyFile->Add( m_textCtrlKeyfilePath, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonSelectKeyfile = new wxButton( m_panelAuth, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonSelectKeyfile->SetToolTip( _("Select a folder") );
+
+    bSizerKeyFile->Add( m_buttonSelectKeyfile, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    fgSizer161->Add( bSizerKeyFile, 0, wxALL|wxEXPAND, 5 );
+
+    m_staticTextPassword = new wxStaticText( m_panelAuth, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextPassword->Wrap( -1 );
+    fgSizer161->Add( m_staticTextPassword, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    bSizerPassword = new wxBoxSizer( wxHORIZONTAL );
+
+    m_textCtrlPasswordVisible = new wxTextCtrl( m_panelAuth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizerPassword->Add( m_textCtrlPasswordVisible, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    m_textCtrlPasswordHidden = new wxTextCtrl( m_panelAuth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD );
+    bSizerPassword->Add( m_textCtrlPasswordHidden, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    m_checkBoxShowPassword = new wxCheckBox( m_panelAuth, wxID_ANY, _("&Show password"), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizerPassword->Add( m_checkBoxShowPassword, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+
+    fgSizer161->Add( bSizerPassword, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+
+    bSizer221->Add( fgSizer161, 0, wxALL|wxEXPAND, 5 );
+
+
+    m_panelAuth->SetSizer( bSizer221 );
+    m_panelAuth->Layout();
+    bSizer221->Fit( m_panelAuth );
+    bSizerAuth->Add( m_panelAuth, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer185->Add( bSizerAuth, 0, wxEXPAND, 5 );
+
+    m_staticline581 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer185->Add( m_staticline581, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer217;
+    bSizer217 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText1232 = new wxStaticText( m_panel41, wxID_ANY, _("Directory on server:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText1232->Wrap( -1 );
+    bSizer217->Add( m_staticText1232, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    m_textCtrlServerPath = new wxTextCtrl( m_panel41, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer217->Add( m_textCtrlServerPath, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    m_buttonSelectFolder = new wxButton( m_panel41, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonSelectFolder->SetToolTip( _("Select a folder") );
+
+    bSizer217->Add( m_buttonSelectFolder, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+
+
+    bSizer185->Add( bSizer217, 0, wxALL|wxEXPAND, 5 );
+
+
+    m_panel41->SetSizer( bSizer185 );
+    m_panel41->Layout();
+    bSizer185->Fit( m_panel41 );
+    bSizer134->Add( m_panel41, 1, wxEXPAND, 5 );
+
+    bSizerSftpTweaks = new wxBoxSizer( wxVERTICAL );
+
+    m_staticline571 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizerSftpTweaks->Add( m_staticline571, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer219;
+    bSizer219 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapSpeed = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer219->Add( m_bitmapSpeed, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
+
+    m_staticText1361 = new wxStaticText( this, wxID_ANY, _("Performance improvements:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText1361->Wrap( -1 );
+    bSizer219->Add( m_staticText1361, 0, wxALL|wxALIGN_CENTER_VERTICAL, 10 );
+
+
+    bSizer219->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_hyperlink171 = new wxHyperlinkCtrl( this, wxID_ANY, _("How to get best performance?"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    bSizer219->Add( m_hyperlink171, 0, wxALL|wxALIGN_CENTER_VERTICAL, 10 );
+
+
+    bSizerSftpTweaks->Add( bSizer219, 0, wxEXPAND, 5 );
+
+    m_staticline57 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizerSftpTweaks->Add( m_staticline57, 0, wxEXPAND, 5 );
+
+    m_panel411 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+    m_panel411->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    wxBoxSizer* bSizer1851;
+    bSizer1851 = new wxBoxSizer( wxVERTICAL );
+
+    wxFlexGridSizer* fgSizer1611;
+    fgSizer1611 = new wxFlexGridSizer( 0, 3, 0, 0 );
+    fgSizer1611->AddGrowableCol( 1 );
+    fgSizer1611->SetFlexibleDirection( wxBOTH );
+    fgSizer1611->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    m_staticText12341 = new wxStaticText( m_panel411, wxID_ANY, _("SSH connections for directory reading:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText12341->Wrap( -1 );
+    fgSizer1611->Add( m_staticText12341, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
+
+    m_spinCtrlConnectionCount = new wxSpinCtrl( m_panel411, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 70, -1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
+    fgSizer1611->Add( m_spinCtrlConnectionCount, 0, wxALL, 5 );
+
+    wxBoxSizer* bSizer230;
+    bSizer230 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText138111 = new wxStaticText( m_panel411, wxID_ANY, _("Suggested range: [1 - 10]"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText138111->Wrap( -1 );
+    m_staticText138111->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+
+    bSizer230->Add( m_staticText138111, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    fgSizer1611->Add( bSizer230, 0, 0, 5 );
+
+    m_staticText1231111 = new wxStaticText( m_panel411, wxID_ANY, _("SFTP channels per connection:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText1231111->Wrap( -1 );
+    fgSizer1611->Add( m_staticText1231111, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    m_spinCtrlChannelCount = new wxSpinCtrl( m_panel411, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 70, -1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
+    fgSizer1611->Add( m_spinCtrlChannelCount, 0, wxALL, 5 );
+
+    m_button42 = new wxButton( m_panel411, wxID_ANY, _("Detect server limit"), wxDefaultPosition, wxDefaultSize, 0 );
+    fgSizer1611->Add( m_button42, 0, wxALL, 5 );
+
+
+    bSizer1851->Add( fgSizer1611, 0, wxALL, 5 );
+
+    wxBoxSizer* bSizer220;
+    bSizer220 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText138112 = new wxStaticText( m_panel411, wxID_ANY, _("Example:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText138112->Wrap( -1 );
+    m_staticText138112->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+
+    bSizer220->Add( m_staticText138112, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticText13811 = new wxStaticText( m_panel411, wxID_ANY, _("2 connections x 10 channels = 20 times faster directory reading"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText13811->Wrap( -1 );
+    m_staticText13811->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+
+    bSizer220->Add( m_staticText13811, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer1851->Add( bSizer220, 0, wxBOTTOM|wxRIGHT|wxLEFT, 10 );
+
+
+    m_panel411->SetSizer( bSizer1851 );
+    m_panel411->Layout();
+    bSizer1851->Fit( m_panel411 );
+    bSizerSftpTweaks->Add( m_panel411, 1, wxEXPAND, 5 );
+
+
+    bSizer134->Add( bSizerSftpTweaks, 0, wxEXPAND, 5 );
+
+    m_staticline12 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer134->Add( m_staticline12, 0, wxEXPAND, 5 );
+
+    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+
+    m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_buttonOkay->SetDefault();
+    m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizerStdButtons->Add( m_buttonOkay, 0, wxALL, 5 );
+
+    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+
+
+    bSizer134->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
+
+
+    this->SetSizer( bSizer134 );
+    this->Layout();
+    bSizer134->Fit( this );
+
+    this->Centre( wxBOTH );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CloudSetupDlgGenerated::OnClose ) );
+    m_toggleBtnSftp->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnConnectionSftp ), NULL, this );
+    m_toggleBtnFtp->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnConnectionFtp ), NULL, this );
+    m_radioBtnPassword->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CloudSetupDlgGenerated::OnAuthPassword ), NULL, this );
+    m_radioBtnKeyfile->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CloudSetupDlgGenerated::OnAuthKeyfile ), NULL, this );
+    m_radioBtnAgent->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CloudSetupDlgGenerated::OnAuthAgent ), NULL, this );
+    m_buttonSelectKeyfile->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnSelectKeyfile ), NULL, this );
+    m_checkBoxShowPassword->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnToggleShowPassword ), NULL, this );
+    m_buttonSelectFolder->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnBrowseCloudFolder ), NULL, this );
+    m_hyperlink171->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( CloudSetupDlgGenerated::OnHelpSftpPerformance ), NULL, this );
+    m_button42->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnDetectServerChannelLimit ), NULL, this );
+    m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnOkay ), NULL, this );
+    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnCancel ), NULL, this );
 }
 
 CloudSetupDlgGenerated::~CloudSetupDlgGenerated()
@@ -2443,72 +2463,72 @@ CloudSetupDlgGenerated::~CloudSetupDlgGenerated()
 
 AbstractFolderPickerGenerated::AbstractFolderPickerGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer134;
-	bSizer134 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer72;
-	bSizer72 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapServer = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer72->Add( m_bitmapServer, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
-	
-	m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("Select a directory on the server:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextHeader->Wrap( -1 );
-	bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 10 );
-	
-	
-	bSizer134->Add( bSizer72, 0, 0, 5 );
-	
-	m_staticline371 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxLI_HORIZONTAL );
-	bSizer134->Add( m_staticline371, 0, wxEXPAND, 5 );
-	
-	m_panel41 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	m_panel41->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	wxBoxSizer* bSizer185;
-	bSizer185 = new wxBoxSizer( wxVERTICAL );
-	
-	m_treeCtrlFileSystem = new wxTreeCtrl( m_panel41, wxID_ANY, wxDefaultPosition, wxSize( 350,400 ), wxTR_FULL_ROW_HIGHLIGHT|wxTR_HAS_BUTTONS|wxTR_LINES_AT_ROOT|wxTR_NO_LINES|wxNO_BORDER );
-	bSizer185->Add( m_treeCtrlFileSystem, 1, wxEXPAND, 5 );
-	
-	
-	m_panel41->SetSizer( bSizer185 );
-	m_panel41->Layout();
-	bSizer185->Fit( m_panel41 );
-	bSizer134->Add( m_panel41, 1, wxEXPAND, 5 );
-	
-	m_staticline12 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer134->Add( m_staticline12, 0, wxEXPAND, 5 );
-	
-	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_buttonOkay = new wxButton( this, wxID_OK, _("Select Folder"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_buttonOkay->SetDefault(); 
-	m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizerStdButtons->Add( m_buttonOkay, 0, wxALL, 5 );
-	
-	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-	
-	
-	bSizer134->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
-	
-	
-	this->SetSizer( bSizer134 );
-	this->Layout();
-	bSizer134->Fit( this );
-	
-	this->Centre( wxBOTH );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( AbstractFolderPickerGenerated::OnClose ) );
-	m_treeCtrlFileSystem->Connect( wxEVT_COMMAND_TREE_ITEM_EXPANDING, wxTreeEventHandler( AbstractFolderPickerGenerated::OnExpandNode ), NULL, this );
-	m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AbstractFolderPickerGenerated::OnOkay ), NULL, this );
-	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AbstractFolderPickerGenerated::OnCancel ), NULL, this );
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    wxBoxSizer* bSizer134;
+    bSizer134 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer72;
+    bSizer72 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapServer = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer72->Add( m_bitmapServer, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
+
+    m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("Select a directory on the server:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextHeader->Wrap( -1 );
+    bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 10 );
+
+
+    bSizer134->Add( bSizer72, 0, 0, 5 );
+
+    m_staticline371 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxSize( -1, -1 ), wxLI_HORIZONTAL );
+    bSizer134->Add( m_staticline371, 0, wxEXPAND, 5 );
+
+    m_panel41 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+    m_panel41->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    wxBoxSizer* bSizer185;
+    bSizer185 = new wxBoxSizer( wxVERTICAL );
+
+    m_treeCtrlFileSystem = new wxTreeCtrl( m_panel41, wxID_ANY, wxDefaultPosition, wxSize( 350, 400 ), wxTR_FULL_ROW_HIGHLIGHT|wxTR_HAS_BUTTONS|wxTR_LINES_AT_ROOT|wxTR_NO_LINES|wxNO_BORDER );
+    bSizer185->Add( m_treeCtrlFileSystem, 1, wxEXPAND, 5 );
+
+
+    m_panel41->SetSizer( bSizer185 );
+    m_panel41->Layout();
+    bSizer185->Fit( m_panel41 );
+    bSizer134->Add( m_panel41, 1, wxEXPAND, 5 );
+
+    m_staticline12 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer134->Add( m_staticline12, 0, wxEXPAND, 5 );
+
+    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+
+    m_buttonOkay = new wxButton( this, wxID_OK, _("Select Folder"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_buttonOkay->SetDefault();
+    m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizerStdButtons->Add( m_buttonOkay, 0, wxALL, 5 );
+
+    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+
+
+    bSizer134->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
+
+
+    this->SetSizer( bSizer134 );
+    this->Layout();
+    bSizer134->Fit( this );
+
+    this->Centre( wxBOTH );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( AbstractFolderPickerGenerated::OnClose ) );
+    m_treeCtrlFileSystem->Connect( wxEVT_COMMAND_TREE_ITEM_EXPANDING, wxTreeEventHandler( AbstractFolderPickerGenerated::OnExpandNode ), NULL, this );
+    m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AbstractFolderPickerGenerated::OnOkay ), NULL, this );
+    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AbstractFolderPickerGenerated::OnCancel ), NULL, this );
 }
 
 AbstractFolderPickerGenerated::~AbstractFolderPickerGenerated()
@@ -2517,221 +2537,221 @@ AbstractFolderPickerGenerated::~AbstractFolderPickerGenerated()
 
 SyncConfirmationDlgGenerated::SyncConfirmationDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer134;
-	bSizer134 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer72;
-	bSizer72 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapSync = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer72->Add( m_bitmapSync, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
-	
-	m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("Start synchronization now?"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextHeader->Wrap( -1 );
-	bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 10 );
-	
-	
-	bSizer134->Add( bSizer72, 0, 0, 5 );
-	
-	m_staticline371 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer134->Add( m_staticline371, 0, wxEXPAND, 5 );
-	
-	m_panelStatistics = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	m_panelStatistics->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	wxBoxSizer* bSizer185;
-	bSizer185 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer185->Add( 40, 0, 0, 0, 5 );
-	
-	
-	bSizer185->Add( 0, 0, 1, 0, 5 );
-	
-	m_staticline38 = new wxStaticLine( m_panelStatistics, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizer185->Add( m_staticline38, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer162;
-	bSizer162 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer182;
-	bSizer182 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText84 = new wxStaticText( m_panelStatistics, wxID_ANY, _("Variant:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText84->Wrap( -1 );
-	bSizer182->Add( m_staticText84, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	
-	bSizer182->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticTextVariant = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextVariant->Wrap( -1 );
-	m_staticTextVariant->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer182->Add( m_staticTextVariant, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	
-	bSizer182->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	bSizer162->Add( bSizer182, 0, wxALL|wxEXPAND, 5 );
-	
-	m_staticline14 = new wxStaticLine( m_panelStatistics, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer162->Add( m_staticline14, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer181;
-	bSizer181 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText83 = new wxStaticText( m_panelStatistics, wxID_ANY, _("Statistics:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText83->Wrap( -1 );
-	bSizer181->Add( m_staticText83, 0, wxALL, 5 );
-	
-	wxFlexGridSizer* fgSizer11;
-	fgSizer11 = new wxFlexGridSizer( 2, 7, 2, 5 );
-	fgSizer11->SetFlexibleDirection( wxBOTH );
-	fgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_bitmapDeleteLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapDeleteLeft->SetToolTip( _("Number of files and folders that will be deleted") );
-	
-	fgSizer11->Add( m_bitmapDeleteLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bitmapUpdateLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapUpdateLeft->SetToolTip( _("Number of files that will be updated") );
-	
-	fgSizer11->Add( m_bitmapUpdateLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bitmapCreateLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapCreateLeft->SetToolTip( _("Number of files and folders that will be created") );
-	
-	fgSizer11->Add( m_bitmapCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bitmapData = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapData->SetToolTip( _("Total bytes to copy") );
-	
-	fgSizer11->Add( m_bitmapData, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bitmapCreateRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapCreateRight->SetToolTip( _("Number of files and folders that will be created") );
-	
-	fgSizer11->Add( m_bitmapCreateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bitmapUpdateRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapUpdateRight->SetToolTip( _("Number of files that will be updated") );
-	
-	fgSizer11->Add( m_bitmapUpdateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bitmapDeleteRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapDeleteRight->SetToolTip( _("Number of files and folders that will be deleted") );
-	
-	fgSizer11->Add( m_bitmapDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticTextDeleteLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextDeleteLeft->Wrap( -1 );
-	m_staticTextDeleteLeft->SetToolTip( _("Number of files and folders that will be deleted") );
-	
-	fgSizer11->Add( m_staticTextDeleteLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticTextUpdateLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextUpdateLeft->Wrap( -1 );
-	m_staticTextUpdateLeft->SetToolTip( _("Number of files that will be updated") );
-	
-	fgSizer11->Add( m_staticTextUpdateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_staticTextCreateLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextCreateLeft->Wrap( -1 );
-	m_staticTextCreateLeft->SetToolTip( _("Number of files and folders that will be created") );
-	
-	fgSizer11->Add( m_staticTextCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_staticTextData = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextData->Wrap( -1 );
-	m_staticTextData->SetToolTip( _("Total bytes to copy") );
-	
-	fgSizer11->Add( m_staticTextData, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticTextCreateRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextCreateRight->Wrap( -1 );
-	m_staticTextCreateRight->SetToolTip( _("Number of files and folders that will be created") );
-	
-	fgSizer11->Add( m_staticTextCreateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticTextUpdateRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextUpdateRight->Wrap( -1 );
-	m_staticTextUpdateRight->SetToolTip( _("Number of files that will be updated") );
-	
-	fgSizer11->Add( m_staticTextUpdateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticTextDeleteRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextDeleteRight->Wrap( -1 );
-	m_staticTextDeleteRight->SetToolTip( _("Number of files and folders that will be deleted") );
-	
-	fgSizer11->Add( m_staticTextDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer181->Add( fgSizer11, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
-	
-	bSizer162->Add( bSizer181, 0, wxEXPAND|wxALL, 5 );
-	
-	
-	bSizer185->Add( bSizer162, 0, 0, 5 );
-	
-	m_staticline381 = new wxStaticLine( m_panelStatistics, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizer185->Add( m_staticline381, 0, wxEXPAND, 5 );
-	
-	
-	bSizer185->Add( 0, 0, 1, 0, 5 );
-	
-	
-	bSizer185->Add( 40, 0, 0, 0, 5 );
-	
-	
-	m_panelStatistics->SetSizer( bSizer185 );
-	m_panelStatistics->Layout();
-	bSizer185->Fit( m_panelStatistics );
-	bSizer134->Add( m_panelStatistics, 0, wxEXPAND, 5 );
-	
-	m_staticline12 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer134->Add( m_staticline12, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer164;
-	bSizer164 = new wxBoxSizer( wxVERTICAL );
-	
-	m_checkBoxDontShowAgain = new wxCheckBox( this, wxID_ANY, _("&Don't show this dialog again"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer164->Add( m_checkBoxDontShowAgain, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
-	
-	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_buttonStartSync = new wxButton( this, wxID_OK, _("Start"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_buttonStartSync->SetDefault(); 
-	m_buttonStartSync->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizerStdButtons->Add( m_buttonStartSync, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 );
-	
-	
-	bSizer164->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
-	
-	
-	bSizer134->Add( bSizer164, 1, wxEXPAND, 5 );
-	
-	
-	this->SetSizer( bSizer134 );
-	this->Layout();
-	bSizer134->Fit( this );
-	
-	this->Centre( wxBOTH );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncConfirmationDlgGenerated::OnClose ) );
-	m_buttonStartSync->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncConfirmationDlgGenerated::OnStartSync ), NULL, this );
-	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncConfirmationDlgGenerated::OnCancel ), NULL, this );
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    wxBoxSizer* bSizer134;
+    bSizer134 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer72;
+    bSizer72 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapSync = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer72->Add( m_bitmapSync, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
+
+    m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("Start synchronization now?"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextHeader->Wrap( -1 );
+    bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 10 );
+
+
+    bSizer134->Add( bSizer72, 0, 0, 5 );
+
+    m_staticline371 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer134->Add( m_staticline371, 0, wxEXPAND, 5 );
+
+    m_panelStatistics = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+    m_panelStatistics->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    wxBoxSizer* bSizer185;
+    bSizer185 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer185->Add( 40, 0, 0, 0, 5 );
+
+
+    bSizer185->Add( 0, 0, 1, 0, 5 );
+
+    m_staticline38 = new wxStaticLine( m_panelStatistics, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizer185->Add( m_staticline38, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer162;
+    bSizer162 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer182;
+    bSizer182 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText84 = new wxStaticText( m_panelStatistics, wxID_ANY, _("Variant:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText84->Wrap( -1 );
+    bSizer182->Add( m_staticText84, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+
+    bSizer182->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticTextVariant = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextVariant->Wrap( -1 );
+    m_staticTextVariant->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer182->Add( m_staticTextVariant, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+
+    bSizer182->Add( 0, 0, 1, wxEXPAND, 5 );
+
+
+    bSizer162->Add( bSizer182, 0, wxALL|wxEXPAND, 5 );
+
+    m_staticline14 = new wxStaticLine( m_panelStatistics, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer162->Add( m_staticline14, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer181;
+    bSizer181 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText83 = new wxStaticText( m_panelStatistics, wxID_ANY, _("Statistics:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText83->Wrap( -1 );
+    bSizer181->Add( m_staticText83, 0, wxALL, 5 );
+
+    wxFlexGridSizer* fgSizer11;
+    fgSizer11 = new wxFlexGridSizer( 2, 7, 2, 5 );
+    fgSizer11->SetFlexibleDirection( wxBOTH );
+    fgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    m_bitmapDeleteLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapDeleteLeft->SetToolTip( _("Number of files and folders that will be deleted") );
+
+    fgSizer11->Add( m_bitmapDeleteLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bitmapUpdateLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapUpdateLeft->SetToolTip( _("Number of files that will be updated") );
+
+    fgSizer11->Add( m_bitmapUpdateLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bitmapCreateLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapCreateLeft->SetToolTip( _("Number of files and folders that will be created") );
+
+    fgSizer11->Add( m_bitmapCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bitmapData = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapData->SetToolTip( _("Total bytes to copy") );
+
+    fgSizer11->Add( m_bitmapData, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bitmapCreateRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapCreateRight->SetToolTip( _("Number of files and folders that will be created") );
+
+    fgSizer11->Add( m_bitmapCreateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bitmapUpdateRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapUpdateRight->SetToolTip( _("Number of files that will be updated") );
+
+    fgSizer11->Add( m_bitmapUpdateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bitmapDeleteRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapDeleteRight->SetToolTip( _("Number of files and folders that will be deleted") );
+
+    fgSizer11->Add( m_bitmapDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticTextDeleteLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextDeleteLeft->Wrap( -1 );
+    m_staticTextDeleteLeft->SetToolTip( _("Number of files and folders that will be deleted") );
+
+    fgSizer11->Add( m_staticTextDeleteLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticTextUpdateLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextUpdateLeft->Wrap( -1 );
+    m_staticTextUpdateLeft->SetToolTip( _("Number of files that will be updated") );
+
+    fgSizer11->Add( m_staticTextUpdateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_staticTextCreateLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextCreateLeft->Wrap( -1 );
+    m_staticTextCreateLeft->SetToolTip( _("Number of files and folders that will be created") );
+
+    fgSizer11->Add( m_staticTextCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_staticTextData = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextData->Wrap( -1 );
+    m_staticTextData->SetToolTip( _("Total bytes to copy") );
+
+    fgSizer11->Add( m_staticTextData, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticTextCreateRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextCreateRight->Wrap( -1 );
+    m_staticTextCreateRight->SetToolTip( _("Number of files and folders that will be created") );
+
+    fgSizer11->Add( m_staticTextCreateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticTextUpdateRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextUpdateRight->Wrap( -1 );
+    m_staticTextUpdateRight->SetToolTip( _("Number of files that will be updated") );
+
+    fgSizer11->Add( m_staticTextUpdateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticTextDeleteRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextDeleteRight->Wrap( -1 );
+    m_staticTextDeleteRight->SetToolTip( _("Number of files and folders that will be deleted") );
+
+    fgSizer11->Add( m_staticTextDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer181->Add( fgSizer11, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+
+
+    bSizer162->Add( bSizer181, 0, wxEXPAND|wxALL, 5 );
+
+
+    bSizer185->Add( bSizer162, 0, 0, 5 );
+
+    m_staticline381 = new wxStaticLine( m_panelStatistics, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizer185->Add( m_staticline381, 0, wxEXPAND, 5 );
+
+
+    bSizer185->Add( 0, 0, 1, 0, 5 );
+
+
+    bSizer185->Add( 40, 0, 0, 0, 5 );
+
+
+    m_panelStatistics->SetSizer( bSizer185 );
+    m_panelStatistics->Layout();
+    bSizer185->Fit( m_panelStatistics );
+    bSizer134->Add( m_panelStatistics, 0, wxEXPAND, 5 );
+
+    m_staticline12 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer134->Add( m_staticline12, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer164;
+    bSizer164 = new wxBoxSizer( wxVERTICAL );
+
+    m_checkBoxDontShowAgain = new wxCheckBox( this, wxID_ANY, _("&Don't show this dialog again"), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer164->Add( m_checkBoxDontShowAgain, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+
+    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+
+    m_buttonStartSync = new wxButton( this, wxID_OK, _("Start"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_buttonStartSync->SetDefault();
+    m_buttonStartSync->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizerStdButtons->Add( m_buttonStartSync, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 );
+
+
+    bSizer164->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
+
+
+    bSizer134->Add( bSizer164, 1, wxEXPAND, 5 );
+
+
+    this->SetSizer( bSizer134 );
+    this->Layout();
+    bSizer134->Fit( this );
+
+    this->Centre( wxBOTH );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncConfirmationDlgGenerated::OnClose ) );
+    m_buttonStartSync->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncConfirmationDlgGenerated::OnStartSync ), NULL, this );
+    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncConfirmationDlgGenerated::OnCancel ), NULL, this );
 }
 
 SyncConfirmationDlgGenerated::~SyncConfirmationDlgGenerated()
@@ -2740,134 +2760,134 @@ SyncConfirmationDlgGenerated::~SyncConfirmationDlgGenerated()
 
 CompareProgressDlgGenerated::CompareProgressDlgGenerated( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
 {
-	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	wxBoxSizer* bSizer40;
-	bSizer40 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_panelStatistics = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	m_panelStatistics->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer187;
-	bSizer187 = new wxBoxSizer( wxVERTICAL );
-	
-	
-	bSizer187->Add( 0, 5, 0, 0, 5 );
-	
-	wxFlexGridSizer* fgSizer7;
-	fgSizer7 = new wxFlexGridSizer( 0, 2, 5, 5 );
-	fgSizer7->SetFlexibleDirection( wxHORIZONTAL );
-	fgSizer7->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_staticTextItemsFoundLabel = new wxStaticText( m_panelStatistics, wxID_ANY, _("Items found:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextItemsFoundLabel->Wrap( -1 );
-	fgSizer7->Add( m_staticTextItemsFoundLabel, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextItemsFound = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextItemsFound->Wrap( -1 );
-	m_staticTextItemsFound->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	fgSizer7->Add( m_staticTextItemsFound, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextItemsRemainingLabel = new wxStaticText( m_panelStatistics, wxID_ANY, _("Items remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextItemsRemainingLabel->Wrap( -1 );
-	fgSizer7->Add( m_staticTextItemsRemainingLabel, 0, wxALIGN_BOTTOM, 5 );
-	
-	bSizerItemsRemaining = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticTextItemsRemaining = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextItemsRemaining->Wrap( -1 );
-	m_staticTextItemsRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizerItemsRemaining->Add( m_staticTextItemsRemaining, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextBytesRemaining = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextBytesRemaining->Wrap( -1 );
-	bSizerItemsRemaining->Add( m_staticTextBytesRemaining, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-	
-	
-	fgSizer7->Add( bSizerItemsRemaining, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticTextTimeRemainingLabel = new wxStaticText( m_panelStatistics, wxID_ANY, _("Time remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextTimeRemainingLabel->Wrap( -1 );
-	fgSizer7->Add( m_staticTextTimeRemainingLabel, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextTimeRemaining = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextTimeRemaining->Wrap( -1 );
-	m_staticTextTimeRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	fgSizer7->Add( m_staticTextTimeRemaining, 0, wxALIGN_BOTTOM, 5 );
-	
-	wxStaticText* m_staticText37;
-	m_staticText37 = new wxStaticText( m_panelStatistics, wxID_ANY, _("Time elapsed:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText37->Wrap( -1 );
-	fgSizer7->Add( m_staticText37, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextTimeElapsed = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextTimeElapsed->Wrap( -1 );
-	m_staticTextTimeElapsed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	fgSizer7->Add( m_staticTextTimeElapsed, 0, wxALIGN_BOTTOM, 5 );
-	
-	
-	bSizer187->Add( fgSizer7, 0, wxRIGHT|wxLEFT, 5 );
-	
-	
-	bSizer187->Add( 0, 5, 0, 0, 5 );
-	
-	
-	m_panelStatistics->SetSizer( bSizer187 );
-	m_panelStatistics->Layout();
-	bSizer187->Fit( m_panelStatistics );
-	bSizer40->Add( m_panelStatistics, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	wxBoxSizer* bSizer181;
-	bSizer181 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticTextStatus = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextStatus->Wrap( -1 );
-	bSizer181->Add( m_staticTextStatus, 0, 0, 5 );
-	
-	wxBoxSizer* bSizer199;
-	bSizer199 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_panelProgressLabel = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	m_panelProgressLabel->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer201;
-	bSizer201 = new wxBoxSizer( wxVERTICAL );
-	
-	wxStaticText* m_staticText99;
-	m_staticText99 = new wxStaticText( m_panelProgressLabel, wxID_ANY, _("Bytes:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText99->Wrap( -1 );
-	bSizer201->Add( m_staticText99, 0, wxALL, 5 );
-	
-	wxStaticText* m_staticText100;
-	m_staticText100 = new wxStaticText( m_panelProgressLabel, wxID_ANY, _("Items:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText100->Wrap( -1 );
-	bSizer201->Add( m_staticText100, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	
-	m_panelProgressLabel->SetSizer( bSizer201 );
-	m_panelProgressLabel->Layout();
-	bSizer201->Fit( m_panelProgressLabel );
-	bSizer199->Add( m_panelProgressLabel, 0, 0, 5 );
-	
-	m_panelGraphProgress = new zen::Graph2D( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_panelGraphProgress->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	bSizer199->Add( m_panelGraphProgress, 1, wxEXPAND, 5 );
-	
-	
-	bSizer181->Add( bSizer199, 1, wxEXPAND|wxTOP, 5 );
-	
-	
-	bSizer40->Add( bSizer181, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	
-	this->SetSizer( bSizer40 );
-	this->Layout();
-	bSizer40->Fit( this );
+    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    wxBoxSizer* bSizer40;
+    bSizer40 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_panelStatistics = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+    m_panelStatistics->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    wxBoxSizer* bSizer187;
+    bSizer187 = new wxBoxSizer( wxVERTICAL );
+
+
+    bSizer187->Add( 0, 5, 0, 0, 5 );
+
+    wxFlexGridSizer* fgSizer7;
+    fgSizer7 = new wxFlexGridSizer( 0, 2, 5, 5 );
+    fgSizer7->SetFlexibleDirection( wxHORIZONTAL );
+    fgSizer7->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    m_staticTextItemsFoundLabel = new wxStaticText( m_panelStatistics, wxID_ANY, _("Items found:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextItemsFoundLabel->Wrap( -1 );
+    fgSizer7->Add( m_staticTextItemsFoundLabel, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticTextItemsFound = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextItemsFound->Wrap( -1 );
+    m_staticTextItemsFound->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    fgSizer7->Add( m_staticTextItemsFound, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticTextItemsRemainingLabel = new wxStaticText( m_panelStatistics, wxID_ANY, _("Items remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextItemsRemainingLabel->Wrap( -1 );
+    fgSizer7->Add( m_staticTextItemsRemainingLabel, 0, wxALIGN_BOTTOM, 5 );
+
+    bSizerItemsRemaining = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticTextItemsRemaining = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextItemsRemaining->Wrap( -1 );
+    m_staticTextItemsRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizerItemsRemaining->Add( m_staticTextItemsRemaining, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticTextBytesRemaining = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextBytesRemaining->Wrap( -1 );
+    bSizerItemsRemaining->Add( m_staticTextBytesRemaining, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+
+
+    fgSizer7->Add( bSizerItemsRemaining, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticTextTimeRemainingLabel = new wxStaticText( m_panelStatistics, wxID_ANY, _("Time remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextTimeRemainingLabel->Wrap( -1 );
+    fgSizer7->Add( m_staticTextTimeRemainingLabel, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticTextTimeRemaining = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextTimeRemaining->Wrap( -1 );
+    m_staticTextTimeRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    fgSizer7->Add( m_staticTextTimeRemaining, 0, wxALIGN_BOTTOM, 5 );
+
+    wxStaticText* m_staticText37;
+    m_staticText37 = new wxStaticText( m_panelStatistics, wxID_ANY, _("Time elapsed:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText37->Wrap( -1 );
+    fgSizer7->Add( m_staticText37, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticTextTimeElapsed = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextTimeElapsed->Wrap( -1 );
+    m_staticTextTimeElapsed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    fgSizer7->Add( m_staticTextTimeElapsed, 0, wxALIGN_BOTTOM, 5 );
+
+
+    bSizer187->Add( fgSizer7, 0, wxRIGHT|wxLEFT, 5 );
+
+
+    bSizer187->Add( 0, 5, 0, 0, 5 );
+
+
+    m_panelStatistics->SetSizer( bSizer187 );
+    m_panelStatistics->Layout();
+    bSizer187->Fit( m_panelStatistics );
+    bSizer40->Add( m_panelStatistics, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    wxBoxSizer* bSizer181;
+    bSizer181 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticTextStatus = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextStatus->Wrap( -1 );
+    bSizer181->Add( m_staticTextStatus, 0, 0, 5 );
+
+    wxBoxSizer* bSizer199;
+    bSizer199 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_panelProgressLabel = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+    m_panelProgressLabel->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    wxBoxSizer* bSizer201;
+    bSizer201 = new wxBoxSizer( wxVERTICAL );
+
+    wxStaticText* m_staticText99;
+    m_staticText99 = new wxStaticText( m_panelProgressLabel, wxID_ANY, _("Bytes:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText99->Wrap( -1 );
+    bSizer201->Add( m_staticText99, 0, wxALL, 5 );
+
+    wxStaticText* m_staticText100;
+    m_staticText100 = new wxStaticText( m_panelProgressLabel, wxID_ANY, _("Items:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText100->Wrap( -1 );
+    bSizer201->Add( m_staticText100, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+
+    m_panelProgressLabel->SetSizer( bSizer201 );
+    m_panelProgressLabel->Layout();
+    bSizer201->Fit( m_panelProgressLabel );
+    bSizer199->Add( m_panelProgressLabel, 0, 0, 5 );
+
+    m_panelGraphProgress = new zen::Graph2D( this, wxID_ANY, wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_panelGraphProgress->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    bSizer199->Add( m_panelGraphProgress, 1, wxEXPAND, 5 );
+
+
+    bSizer181->Add( bSizer199, 1, wxEXPAND|wxTOP, 5 );
+
+
+    bSizer40->Add( bSizer181, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+
+    this->SetSizer( bSizer40 );
+    this->Layout();
+    bSizer40->Fit( this );
 }
 
 CompareProgressDlgGenerated::~CompareProgressDlgGenerated()
@@ -2876,317 +2896,317 @@ CompareProgressDlgGenerated::~CompareProgressDlgGenerated()
 
 SyncProgressPanelGenerated::SyncProgressPanelGenerated( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
 {
-	bSizerRoot = new wxBoxSizer( wxVERTICAL );
-	
-	bSizer42 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer42->Add( 32, 0, 0, 0, 5 );
-	
-	
-	bSizer42->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_bitmapStatus = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 32,32 ), 0 );
-	bSizer42->Add( m_bitmapStatus, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2 );
-	
-	m_staticTextPhase = new wxStaticText( this, wxID_ANY, _("Synchronizing..."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextPhase->Wrap( -1 );
-	m_staticTextPhase->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer42->Add( m_staticTextPhase, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
-	
-	
-	bSizer42->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_bpButtonMinimizeToTray = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 32,32 ), wxBU_AUTODRAW );
-	m_bpButtonMinimizeToTray->SetToolTip( _("Minimize to notification area") );
-	
-	bSizer42->Add( m_bpButtonMinimizeToTray, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerRoot->Add( bSizer42, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
-	bSizerStatusText = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticTextStatus = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextStatus->Wrap( -1 );
-	bSizerStatusText->Add( m_staticTextStatus, 0, wxEXPAND|wxLEFT, 10 );
-	
-	
-	bSizerStatusText->Add( 0, 5, 0, 0, 5 );
-	
-	
-	bSizerRoot->Add( bSizerStatusText, 0, wxEXPAND, 5 );
-	
-	wxStaticLine* m_staticlineHeader;
-	m_staticlineHeader = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizerRoot->Add( m_staticlineHeader, 0, wxEXPAND, 5 );
-	
-	m_panelProgress = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panelProgress->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	wxBoxSizer* bSizer173;
-	bSizer173 = new wxBoxSizer( wxVERTICAL );
-	
-	bSizer171 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer171->Add( 10, 0, 0, 0, 5 );
-	
-	wxBoxSizer* bSizer164;
-	bSizer164 = new wxBoxSizer( wxVERTICAL );
-	
-	m_panelItemsProcessed = new wxPanel( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	m_panelItemsProcessed->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer165;
-	bSizer165 = new wxBoxSizer( wxVERTICAL );
-	
-	
-	bSizer165->Add( 0, 5, 0, 0, 5 );
-	
-	wxStaticText* m_staticText96;
-	m_staticText96 = new wxStaticText( m_panelItemsProcessed, wxID_ANY, _("Items processed:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText96->Wrap( -1 );
-	bSizer165->Add( m_staticText96, 0, wxRIGHT|wxLEFT, 5 );
-	
-	wxBoxSizer* bSizer169;
-	bSizer169 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticTextItemsProcessed = new wxStaticText( m_panelItemsProcessed, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_staticTextItemsProcessed->Wrap( -1 );
-	m_staticTextItemsProcessed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer169->Add( m_staticTextItemsProcessed, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextBytesProcessed = new wxStaticText( m_panelItemsProcessed, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextBytesProcessed->Wrap( -1 );
-	bSizer169->Add( m_staticTextBytesProcessed, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-	
-	
-	bSizer165->Add( bSizer169, 0, wxRIGHT|wxLEFT, 5 );
-	
-	
-	bSizer165->Add( 0, 5, 0, 0, 5 );
-	
-	
-	m_panelItemsProcessed->SetSizer( bSizer165 );
-	m_panelItemsProcessed->Layout();
-	bSizer165->Fit( m_panelItemsProcessed );
-	bSizer164->Add( m_panelItemsProcessed, 0, wxEXPAND|wxTOP, 7 );
-	
-	m_panelItemsRemaining = new wxPanel( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	m_panelItemsRemaining->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer166;
-	bSizer166 = new wxBoxSizer( wxVERTICAL );
-	
-	
-	bSizer166->Add( 0, 5, 0, 0, 5 );
-	
-	wxStaticText* m_staticText97;
-	m_staticText97 = new wxStaticText( m_panelItemsRemaining, wxID_ANY, _("Items remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText97->Wrap( -1 );
-	bSizer166->Add( m_staticText97, 0, wxRIGHT|wxLEFT, 5 );
-	
-	wxBoxSizer* bSizer170;
-	bSizer170 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticTextItemsRemaining = new wxStaticText( m_panelItemsRemaining, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_staticTextItemsRemaining->Wrap( -1 );
-	m_staticTextItemsRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer170->Add( m_staticTextItemsRemaining, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextBytesRemaining = new wxStaticText( m_panelItemsRemaining, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextBytesRemaining->Wrap( -1 );
-	bSizer170->Add( m_staticTextBytesRemaining, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-	
-	
-	bSizer166->Add( bSizer170, 0, wxRIGHT|wxLEFT, 5 );
-	
-	
-	bSizer166->Add( 0, 5, 0, 0, 5 );
-	
-	
-	m_panelItemsRemaining->SetSizer( bSizer166 );
-	m_panelItemsRemaining->Layout();
-	bSizer166->Fit( m_panelItemsRemaining );
-	bSizer164->Add( m_panelItemsRemaining, 0, wxTOP|wxEXPAND, 7 );
-	
-	m_panelTimeRemaining = new wxPanel( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	m_panelTimeRemaining->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer167;
-	bSizer167 = new wxBoxSizer( wxVERTICAL );
-	
-	
-	bSizer167->Add( 0, 5, 0, 0, 5 );
-	
-	wxStaticText* m_staticText98;
-	m_staticText98 = new wxStaticText( m_panelTimeRemaining, wxID_ANY, _("Time remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText98->Wrap( -1 );
-	bSizer167->Add( m_staticText98, 0, wxRIGHT|wxLEFT, 5 );
-	
-	m_staticTextTimeRemaining = new wxStaticText( m_panelTimeRemaining, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextTimeRemaining->Wrap( -1 );
-	m_staticTextTimeRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer167->Add( m_staticTextTimeRemaining, 0, wxRIGHT|wxLEFT, 5 );
-	
-	
-	bSizer167->Add( 0, 5, 0, 0, 5 );
-	
-	
-	m_panelTimeRemaining->SetSizer( bSizer167 );
-	m_panelTimeRemaining->Layout();
-	bSizer167->Fit( m_panelTimeRemaining );
-	bSizer164->Add( m_panelTimeRemaining, 0, wxTOP|wxEXPAND, 7 );
-	
-	wxPanel* m_panelTimeElapsed;
-	m_panelTimeElapsed = new wxPanel( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	m_panelTimeElapsed->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer168;
-	bSizer168 = new wxBoxSizer( wxVERTICAL );
-	
-	
-	bSizer168->Add( 0, 5, 0, 0, 5 );
-	
-	wxStaticText* m_staticText961;
-	m_staticText961 = new wxStaticText( m_panelTimeElapsed, wxID_ANY, _("Time elapsed:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText961->Wrap( -1 );
-	bSizer168->Add( m_staticText961, 0, wxRIGHT|wxLEFT, 5 );
-	
-	m_staticTextTimeElapsed = new wxStaticText( m_panelTimeElapsed, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextTimeElapsed->Wrap( -1 );
-	m_staticTextTimeElapsed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer168->Add( m_staticTextTimeElapsed, 0, wxRIGHT|wxLEFT, 5 );
-	
-	
-	bSizer168->Add( 0, 5, 0, 0, 5 );
-	
-	
-	m_panelTimeElapsed->SetSizer( bSizer168 );
-	m_panelTimeElapsed->Layout();
-	bSizer168->Fit( m_panelTimeElapsed );
-	bSizer164->Add( m_panelTimeElapsed, 0, wxTOP|wxEXPAND, 7 );
-	
-	
-	bSizer171->Add( bSizer164, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer171->Add( 10, 0, 0, 0, 5 );
-	
-	wxBoxSizer* bSizer161;
-	bSizer161 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer175;
-	bSizer175 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapGraphKeyBytes = new wxStaticBitmap( m_panelProgress, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer175->Add( m_bitmapGraphKeyBytes, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
-	
-	wxStaticText* m_staticText99;
-	m_staticText99 = new wxStaticText( m_panelProgress, wxID_ANY, _("Bytes copied:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText99->Wrap( -1 );
-	bSizer175->Add( m_staticText99, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer161->Add( bSizer175, 0, 0, 5 );
-	
-	m_panelGraphBytes = new zen::Graph2D( m_panelProgress, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_panelGraphBytes->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	bSizer161->Add( m_panelGraphBytes, 1, wxEXPAND, 15 );
-	
-	wxBoxSizer* bSizer174;
-	bSizer174 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapGraphKeyItems = new wxStaticBitmap( m_panelProgress, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer174->Add( m_bitmapGraphKeyItems, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
-	
-	wxStaticText* m_staticText100;
-	m_staticText100 = new wxStaticText( m_panelProgress, wxID_ANY, _("Items processed:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText100->Wrap( -1 );
-	bSizer174->Add( m_staticText100, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer161->Add( bSizer174, 0, 0, 5 );
-	
-	m_panelGraphItems = new zen::Graph2D( m_panelProgress, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_panelGraphItems->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	bSizer161->Add( m_panelGraphItems, 1, wxEXPAND, 15 );
-	
-	
-	bSizer161->Add( 450, 0, 0, 0, 5 );
-	
-	
-	bSizer171->Add( bSizer161, 1, wxEXPAND, 5 );
-	
-	
-	bSizer171->Add( 0, 310, 0, 0, 5 );
-	
-	
-	bSizer173->Add( bSizer171, 1, wxEXPAND, 5 );
-	
-	
-	m_panelProgress->SetSizer( bSizer173 );
-	m_panelProgress->Layout();
-	bSizer173->Fit( m_panelProgress );
-	bSizerRoot->Add( m_panelProgress, 1, wxEXPAND, 5 );
-	
-	m_notebookResult = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_FIXEDWIDTH );
-	
-	bSizerRoot->Add( m_notebookResult, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
-	
-	m_staticlineFooter = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizerRoot->Add( m_staticlineFooter, 0, wxEXPAND, 5 );
-	
-	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer160;
-	bSizer160 = new wxBoxSizer( wxHORIZONTAL );
-	
-	bSizerOnCompletion = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText87 = new wxStaticText( this, wxID_ANY, _("On completion:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText87->Wrap( -1 );
-	bSizerOnCompletion->Add( m_staticText87, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_comboBoxOnCompletion = new OnCompletionBox( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
-	bSizerOnCompletion->Add( m_comboBoxOnCompletion, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer160->Add( bSizerOnCompletion, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer160->Add( 0, 0, 0, 0, 5 );
-	
-	
-	bSizerStdButtons->Add( bSizer160, 1, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
-	m_buttonClose = new wxButton( this, wxID_OK, _("Close"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_buttonClose->SetDefault(); 
-	m_buttonClose->Enable( false );
-	
-	bSizerStdButtons->Add( m_buttonClose, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	m_buttonPause = new wxButton( this, wxID_ANY, _("&Pause"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	bSizerStdButtons->Add( m_buttonPause, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-	
-	m_buttonStop = new wxButton( this, wxID_CANCEL, _("Stop"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	bSizerStdButtons->Add( m_buttonStop, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-	
-	
-	bSizerRoot->Add( bSizerStdButtons, 0, wxEXPAND, 5 );
-	
-	
-	this->SetSizer( bSizerRoot );
-	this->Layout();
-	bSizerRoot->Fit( this );
+    bSizerRoot = new wxBoxSizer( wxVERTICAL );
+
+    bSizer42 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer42->Add( 32, 0, 0, 0, 5 );
+
+
+    bSizer42->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_bitmapStatus = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 32, 32 ), 0 );
+    bSizer42->Add( m_bitmapStatus, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2 );
+
+    m_staticTextPhase = new wxStaticText( this, wxID_ANY, _("Synchronizing..."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextPhase->Wrap( -1 );
+    m_staticTextPhase->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer42->Add( m_staticTextPhase, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
+
+
+    bSizer42->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_bpButtonMinimizeToTray = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 32, 32 ), wxBU_AUTODRAW );
+    m_bpButtonMinimizeToTray->SetToolTip( _("Minimize to notification area") );
+
+    bSizer42->Add( m_bpButtonMinimizeToTray, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerRoot->Add( bSizer42, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 );
+
+    bSizerStatusText = new wxBoxSizer( wxVERTICAL );
+
+    m_staticTextStatus = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextStatus->Wrap( -1 );
+    bSizerStatusText->Add( m_staticTextStatus, 0, wxEXPAND|wxLEFT, 10 );
+
+
+    bSizerStatusText->Add( 0, 5, 0, 0, 5 );
+
+
+    bSizerRoot->Add( bSizerStatusText, 0, wxEXPAND, 5 );
+
+    wxStaticLine* m_staticlineHeader;
+    m_staticlineHeader = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizerRoot->Add( m_staticlineHeader, 0, wxEXPAND, 5 );
+
+    m_panelProgress = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panelProgress->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    wxBoxSizer* bSizer173;
+    bSizer173 = new wxBoxSizer( wxVERTICAL );
+
+    bSizer171 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer171->Add( 10, 0, 0, 0, 5 );
+
+    wxBoxSizer* bSizer164;
+    bSizer164 = new wxBoxSizer( wxVERTICAL );
+
+    m_panelItemsProcessed = new wxPanel( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+    m_panelItemsProcessed->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    wxBoxSizer* bSizer165;
+    bSizer165 = new wxBoxSizer( wxVERTICAL );
+
+
+    bSizer165->Add( 0, 5, 0, 0, 5 );
+
+    wxStaticText* m_staticText96;
+    m_staticText96 = new wxStaticText( m_panelItemsProcessed, wxID_ANY, _("Items processed:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText96->Wrap( -1 );
+    bSizer165->Add( m_staticText96, 0, wxRIGHT|wxLEFT, 5 );
+
+    wxBoxSizer* bSizer169;
+    bSizer169 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticTextItemsProcessed = new wxStaticText( m_panelItemsProcessed, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_staticTextItemsProcessed->Wrap( -1 );
+    m_staticTextItemsProcessed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer169->Add( m_staticTextItemsProcessed, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticTextBytesProcessed = new wxStaticText( m_panelItemsProcessed, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextBytesProcessed->Wrap( -1 );
+    bSizer169->Add( m_staticTextBytesProcessed, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+
+
+    bSizer165->Add( bSizer169, 0, wxRIGHT|wxLEFT, 5 );
+
+
+    bSizer165->Add( 0, 5, 0, 0, 5 );
+
+
+    m_panelItemsProcessed->SetSizer( bSizer165 );
+    m_panelItemsProcessed->Layout();
+    bSizer165->Fit( m_panelItemsProcessed );
+    bSizer164->Add( m_panelItemsProcessed, 0, wxEXPAND|wxTOP, 7 );
+
+    m_panelItemsRemaining = new wxPanel( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+    m_panelItemsRemaining->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    wxBoxSizer* bSizer166;
+    bSizer166 = new wxBoxSizer( wxVERTICAL );
+
+
+    bSizer166->Add( 0, 5, 0, 0, 5 );
+
+    wxStaticText* m_staticText97;
+    m_staticText97 = new wxStaticText( m_panelItemsRemaining, wxID_ANY, _("Items remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText97->Wrap( -1 );
+    bSizer166->Add( m_staticText97, 0, wxRIGHT|wxLEFT, 5 );
+
+    wxBoxSizer* bSizer170;
+    bSizer170 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticTextItemsRemaining = new wxStaticText( m_panelItemsRemaining, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_staticTextItemsRemaining->Wrap( -1 );
+    m_staticTextItemsRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer170->Add( m_staticTextItemsRemaining, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticTextBytesRemaining = new wxStaticText( m_panelItemsRemaining, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextBytesRemaining->Wrap( -1 );
+    bSizer170->Add( m_staticTextBytesRemaining, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+
+
+    bSizer166->Add( bSizer170, 0, wxRIGHT|wxLEFT, 5 );
+
+
+    bSizer166->Add( 0, 5, 0, 0, 5 );
+
+
+    m_panelItemsRemaining->SetSizer( bSizer166 );
+    m_panelItemsRemaining->Layout();
+    bSizer166->Fit( m_panelItemsRemaining );
+    bSizer164->Add( m_panelItemsRemaining, 0, wxTOP|wxEXPAND, 7 );
+
+    m_panelTimeRemaining = new wxPanel( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+    m_panelTimeRemaining->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    wxBoxSizer* bSizer167;
+    bSizer167 = new wxBoxSizer( wxVERTICAL );
+
+
+    bSizer167->Add( 0, 5, 0, 0, 5 );
+
+    wxStaticText* m_staticText98;
+    m_staticText98 = new wxStaticText( m_panelTimeRemaining, wxID_ANY, _("Time remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText98->Wrap( -1 );
+    bSizer167->Add( m_staticText98, 0, wxRIGHT|wxLEFT, 5 );
+
+    m_staticTextTimeRemaining = new wxStaticText( m_panelTimeRemaining, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextTimeRemaining->Wrap( -1 );
+    m_staticTextTimeRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer167->Add( m_staticTextTimeRemaining, 0, wxRIGHT|wxLEFT, 5 );
+
+
+    bSizer167->Add( 0, 5, 0, 0, 5 );
+
+
+    m_panelTimeRemaining->SetSizer( bSizer167 );
+    m_panelTimeRemaining->Layout();
+    bSizer167->Fit( m_panelTimeRemaining );
+    bSizer164->Add( m_panelTimeRemaining, 0, wxTOP|wxEXPAND, 7 );
+
+    wxPanel* m_panelTimeElapsed;
+    m_panelTimeElapsed = new wxPanel( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+    m_panelTimeElapsed->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    wxBoxSizer* bSizer168;
+    bSizer168 = new wxBoxSizer( wxVERTICAL );
+
+
+    bSizer168->Add( 0, 5, 0, 0, 5 );
+
+    wxStaticText* m_staticText961;
+    m_staticText961 = new wxStaticText( m_panelTimeElapsed, wxID_ANY, _("Time elapsed:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText961->Wrap( -1 );
+    bSizer168->Add( m_staticText961, 0, wxRIGHT|wxLEFT, 5 );
+
+    m_staticTextTimeElapsed = new wxStaticText( m_panelTimeElapsed, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextTimeElapsed->Wrap( -1 );
+    m_staticTextTimeElapsed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer168->Add( m_staticTextTimeElapsed, 0, wxRIGHT|wxLEFT, 5 );
+
+
+    bSizer168->Add( 0, 5, 0, 0, 5 );
+
+
+    m_panelTimeElapsed->SetSizer( bSizer168 );
+    m_panelTimeElapsed->Layout();
+    bSizer168->Fit( m_panelTimeElapsed );
+    bSizer164->Add( m_panelTimeElapsed, 0, wxTOP|wxEXPAND, 7 );
+
+
+    bSizer171->Add( bSizer164, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer171->Add( 10, 0, 0, 0, 5 );
+
+    wxBoxSizer* bSizer161;
+    bSizer161 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer175;
+    bSizer175 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapGraphKeyBytes = new wxStaticBitmap( m_panelProgress, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer175->Add( m_bitmapGraphKeyBytes, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
+
+    wxStaticText* m_staticText99;
+    m_staticText99 = new wxStaticText( m_panelProgress, wxID_ANY, _("Bytes copied:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText99->Wrap( -1 );
+    bSizer175->Add( m_staticText99, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer161->Add( bSizer175, 0, 0, 5 );
+
+    m_panelGraphBytes = new zen::Graph2D( m_panelProgress, wxID_ANY, wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_panelGraphBytes->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    bSizer161->Add( m_panelGraphBytes, 1, wxEXPAND, 15 );
+
+    wxBoxSizer* bSizer174;
+    bSizer174 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapGraphKeyItems = new wxStaticBitmap( m_panelProgress, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer174->Add( m_bitmapGraphKeyItems, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
+
+    wxStaticText* m_staticText100;
+    m_staticText100 = new wxStaticText( m_panelProgress, wxID_ANY, _("Items processed:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText100->Wrap( -1 );
+    bSizer174->Add( m_staticText100, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer161->Add( bSizer174, 0, 0, 5 );
+
+    m_panelGraphItems = new zen::Graph2D( m_panelProgress, wxID_ANY, wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_panelGraphItems->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    bSizer161->Add( m_panelGraphItems, 1, wxEXPAND, 15 );
+
+
+    bSizer161->Add( 450, 0, 0, 0, 5 );
+
+
+    bSizer171->Add( bSizer161, 1, wxEXPAND, 5 );
+
+
+    bSizer171->Add( 0, 310, 0, 0, 5 );
+
+
+    bSizer173->Add( bSizer171, 1, wxEXPAND, 5 );
+
+
+    m_panelProgress->SetSizer( bSizer173 );
+    m_panelProgress->Layout();
+    bSizer173->Fit( m_panelProgress );
+    bSizerRoot->Add( m_panelProgress, 1, wxEXPAND, 5 );
+
+    m_notebookResult = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_FIXEDWIDTH );
+
+    bSizerRoot->Add( m_notebookResult, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
+
+    m_staticlineFooter = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizerRoot->Add( m_staticlineFooter, 0, wxEXPAND, 5 );
+
+    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer160;
+    bSizer160 = new wxBoxSizer( wxHORIZONTAL );
+
+    bSizerOnCompletion = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText87 = new wxStaticText( this, wxID_ANY, _("On completion:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText87->Wrap( -1 );
+    bSizerOnCompletion->Add( m_staticText87, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_comboBoxOnCompletion = new OnCompletionBox( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+    bSizerOnCompletion->Add( m_comboBoxOnCompletion, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer160->Add( bSizerOnCompletion, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer160->Add( 0, 0, 0, 0, 5 );
+
+
+    bSizerStdButtons->Add( bSizer160, 1, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+
+    m_buttonClose = new wxButton( this, wxID_OK, _("Close"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_buttonClose->SetDefault();
+    m_buttonClose->Enable( false );
+
+    bSizerStdButtons->Add( m_buttonClose, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    m_buttonPause = new wxButton( this, wxID_ANY, _("&Pause"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    bSizerStdButtons->Add( m_buttonPause, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+
+    m_buttonStop = new wxButton( this, wxID_CANCEL, _("Stop"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    bSizerStdButtons->Add( m_buttonStop, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+
+
+    bSizerRoot->Add( bSizerStdButtons, 0, wxEXPAND, 5 );
+
+
+    this->SetSizer( bSizerRoot );
+    this->Layout();
+    bSizerRoot->Fit( this );
 }
 
 SyncProgressPanelGenerated::~SyncProgressPanelGenerated()
@@ -3195,48 +3215,48 @@ SyncProgressPanelGenerated::~SyncProgressPanelGenerated()
 
 LogPanelGenerated::LogPanelGenerated( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
 {
-	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer179;
-	bSizer179 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer153;
-	bSizer153 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer154;
-	bSizer154 = new wxBoxSizer( wxVERTICAL );
-	
-	m_bpButtonErrors = new ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 49,49 ), wxBU_AUTODRAW );
-	bSizer154->Add( m_bpButtonErrors, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonWarnings = new ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 49,49 ), wxBU_AUTODRAW );
-	bSizer154->Add( m_bpButtonWarnings, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonInfo = new ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 49,49 ), wxBU_AUTODRAW );
-	bSizer154->Add( m_bpButtonInfo, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizer153->Add( bSizer154, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-	
-	m_staticline13 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizer153->Add( m_staticline13, 0, wxEXPAND, 5 );
-	
-	m_gridMessages = new zen::Grid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
-	m_gridMessages->SetScrollRate( 5, 5 );
-	bSizer153->Add( m_gridMessages, 1, wxEXPAND, 5 );
-	
-	
-	bSizer179->Add( bSizer153, 1, wxEXPAND, 5 );
-	
-	
-	this->SetSizer( bSizer179 );
-	this->Layout();
-	bSizer179->Fit( this );
-	
-	// Connect Events
-	m_bpButtonErrors->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogPanelGenerated::OnErrors ), NULL, this );
-	m_bpButtonWarnings->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogPanelGenerated::OnWarnings ), NULL, this );
-	m_bpButtonInfo->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogPanelGenerated::OnInfo ), NULL, this );
+    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    wxBoxSizer* bSizer179;
+    bSizer179 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer153;
+    bSizer153 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer154;
+    bSizer154 = new wxBoxSizer( wxVERTICAL );
+
+    m_bpButtonErrors = new ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 49, 49 ), wxBU_AUTODRAW );
+    bSizer154->Add( m_bpButtonErrors, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonWarnings = new ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 49, 49 ), wxBU_AUTODRAW );
+    bSizer154->Add( m_bpButtonWarnings, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonInfo = new ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 49, 49 ), wxBU_AUTODRAW );
+    bSizer154->Add( m_bpButtonInfo, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizer153->Add( bSizer154, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+    m_staticline13 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizer153->Add( m_staticline13, 0, wxEXPAND, 5 );
+
+    m_gridMessages = new zen::Grid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
+    m_gridMessages->SetScrollRate( 5, 5 );
+    bSizer153->Add( m_gridMessages, 1, wxEXPAND, 5 );
+
+
+    bSizer179->Add( bSizer153, 1, wxEXPAND, 5 );
+
+
+    this->SetSizer( bSizer179 );
+    this->Layout();
+    bSizer179->Fit( this );
+
+    // Connect Events
+    m_bpButtonErrors->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogPanelGenerated::OnErrors ), NULL, this );
+    m_bpButtonWarnings->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogPanelGenerated::OnWarnings ), NULL, this );
+    m_bpButtonInfo->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogPanelGenerated::OnInfo ), NULL, this );
 }
 
 LogPanelGenerated::~LogPanelGenerated()
@@ -3245,175 +3265,175 @@ LogPanelGenerated::~LogPanelGenerated()
 
 BatchDlgGenerated::BatchDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
-	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer54;
-	bSizer54 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer72;
-	bSizer72 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapBatchJob = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	bSizer72->Add( m_bitmapBatchJob, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
-	
-	m_staticTextDescr = new wxStaticText( this, wxID_ANY, _("Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextDescr->Wrap( 520 );
-	bSizer72->Add( m_staticTextDescr, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 10 );
-	
-	
-	bSizer54->Add( bSizer72, 0, 0, 5 );
-	
-	m_staticline18 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer54->Add( m_staticline18, 0, wxEXPAND, 5 );
-	
-	m_panel35 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panel35->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	wxBoxSizer* bSizer172;
-	bSizer172 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer180;
-	bSizer180 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText82 = new wxStaticText( m_panel35, wxID_ANY, _("Handle errors:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText82->Wrap( -1 );
-	bSizer180->Add( m_staticText82, 0, wxTOP|wxBOTTOM|wxLEFT, 10 );
-	
-	wxBoxSizer* bSizer169;
-	bSizer169 = new wxBoxSizer( wxVERTICAL );
-	
-	m_radioBtnPopupOnErrors = new wxRadioButton( m_panel35, wxID_ANY, _("&Pop-up"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_radioBtnPopupOnErrors->SetValue( true ); 
-	m_radioBtnPopupOnErrors->SetToolTip( _("Show pop-up on errors or warnings") );
-	
-	bSizer169->Add( m_radioBtnPopupOnErrors, 0, wxEXPAND|wxALL, 5 );
-	
-	m_radioBtnIgnoreErrors = new wxRadioButton( m_panel35, wxID_ANY, _("&Ignore"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_radioBtnIgnoreErrors->SetToolTip( _("Hide all error and warning messages") );
-	
-	bSizer169->Add( m_radioBtnIgnoreErrors, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	m_radioBtnStopOnError = new wxRadioButton( m_panel35, wxID_ANY, _("&Stop"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_radioBtnStopOnError->SetToolTip( _("Stop synchronization at first error") );
-	
-	bSizer169->Add( m_radioBtnStopOnError, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	
-	bSizer180->Add( bSizer169, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticline26 = new wxStaticLine( m_panel35, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizer180->Add( m_staticline26, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer170;
-	bSizer170 = new wxBoxSizer( wxVERTICAL );
-	
-	m_checkBoxRunMinimized = new wxCheckBox( m_panel35, wxID_ANY, _("Run minimized"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer170->Add( m_checkBoxRunMinimized, 0, wxEXPAND|wxALL, 5 );
-	
-	m_staticText81 = new wxStaticText( m_panel35, wxID_ANY, _("On completion:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText81->Wrap( -1 );
-	bSizer170->Add( m_staticText81, 0, wxALL, 5 );
-	
-	m_comboBoxOnCompletion = new OnCompletionBox( m_panel35, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
-	bSizer170->Add( m_comboBoxOnCompletion, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	
-	bSizer180->Add( bSizer170, 1, wxALL, 5 );
-	
-	
-	bSizer172->Add( bSizer180, 0, wxEXPAND, 5 );
-	
-	m_staticline25 = new wxStaticLine( m_panel35, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer172->Add( m_staticline25, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer191;
-	bSizer191 = new wxBoxSizer( wxVERTICAL );
-	
-	m_checkBoxGenerateLogfile = new wxCheckBox( m_panel35, wxID_ANY, _("Save log:"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer191->Add( m_checkBoxGenerateLogfile, 0, wxEXPAND|wxALL, 5 );
-	
-	m_panelLogfile = new wxPanel( m_panel35, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panelLogfile->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	wxBoxSizer* bSizer1721;
-	bSizer1721 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_logFolderPath = new FolderHistoryBox( m_panelLogfile, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
-	bSizer1721->Add( m_logFolderPath, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonSelectLogFolder = new wxButton( m_panelLogfile, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonSelectLogFolder->SetToolTip( _("Select a folder") );
-	
-	bSizer1721->Add( m_buttonSelectLogFolder, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonSelectAltLogFolder = new wxBitmapButton( m_panelLogfile, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,-1 ), wxBU_AUTODRAW );
-	m_bpButtonSelectAltLogFolder->SetToolTip( _("Access online storage") );
-	
-	bSizer1721->Add( m_bpButtonSelectAltLogFolder, 0, wxEXPAND, 5 );
-	
-	m_checkBoxLogfilesLimit = new wxCheckBox( m_panelLogfile, wxID_ANY, _("Limit:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_checkBoxLogfilesLimit->SetToolTip( _("Limit maximum number of log files") );
-	
-	bSizer1721->Add( m_checkBoxLogfilesLimit, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_spinCtrlLogfileLimit = new wxSpinCtrl( m_panelLogfile, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 70,-1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
-	m_spinCtrlLogfileLimit->SetToolTip( _("Limit maximum number of log files") );
-	
-	bSizer1721->Add( m_spinCtrlLogfileLimit, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	m_panelLogfile->SetSizer( bSizer1721 );
-	m_panelLogfile->Layout();
-	bSizer1721->Fit( m_panelLogfile );
-	bSizer191->Add( m_panelLogfile, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
-	
-	bSizer172->Add( bSizer191, 0, wxEXPAND|wxALL, 5 );
-	
-	m_hyperlink17 = new wxHyperlinkCtrl( m_panel35, wxID_ANY, _("How can I schedule a batch job?"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	bSizer172->Add( m_hyperlink17, 0, wxALL, 10 );
-	
-	
-	m_panel35->SetSizer( bSizer172 );
-	m_panel35->Layout();
-	bSizer172->Fit( m_panel35 );
-	bSizer54->Add( m_panel35, 1, wxEXPAND, 5 );
-	
-	m_staticline13 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer54->Add( m_staticline13, 0, wxEXPAND, 5 );
-	
-	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_buttonSaveAs = new wxButton( this, wxID_SAVE, _("Save &as..."), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_buttonSaveAs->SetDefault(); 
-	m_buttonSaveAs->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizerStdButtons->Add( m_buttonSaveAs, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-	
-	
-	bSizer54->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
-	
-	
-	this->SetSizer( bSizer54 );
-	this->Layout();
-	bSizer54->Fit( this );
-	
-	this->Centre( wxBOTH );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( BatchDlgGenerated::OnClose ) );
-	m_radioBtnPopupOnErrors->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( BatchDlgGenerated::OnErrorPopup ), NULL, this );
-	m_radioBtnIgnoreErrors->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( BatchDlgGenerated::OnErrorIgnore ), NULL, this );
-	m_radioBtnStopOnError->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( BatchDlgGenerated::OnErrorStop ), NULL, this );
-	m_checkBoxGenerateLogfile->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnToggleGenerateLogfile ), NULL, this );
-	m_checkBoxLogfilesLimit->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnToggleLogfilesLimit ), NULL, this );
-	m_hyperlink17->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( BatchDlgGenerated::OnHelpScheduleBatch ), NULL, this );
-	m_buttonSaveAs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnSaveBatchJob ), NULL, this );
-	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnCancel ), NULL, this );
+    this->SetSizeHints( wxSize( -1, -1 ), wxDefaultSize );
+    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    wxBoxSizer* bSizer54;
+    bSizer54 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer72;
+    bSizer72 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapBatchJob = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    bSizer72->Add( m_bitmapBatchJob, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
+
+    m_staticTextDescr = new wxStaticText( this, wxID_ANY, _("Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextDescr->Wrap( 520 );
+    bSizer72->Add( m_staticTextDescr, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 10 );
+
+
+    bSizer54->Add( bSizer72, 0, 0, 5 );
+
+    m_staticline18 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer54->Add( m_staticline18, 0, wxEXPAND, 5 );
+
+    m_panel35 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panel35->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    wxBoxSizer* bSizer172;
+    bSizer172 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer180;
+    bSizer180 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText82 = new wxStaticText( m_panel35, wxID_ANY, _("Handle errors:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText82->Wrap( -1 );
+    bSizer180->Add( m_staticText82, 0, wxTOP|wxBOTTOM|wxLEFT, 10 );
+
+    wxBoxSizer* bSizer169;
+    bSizer169 = new wxBoxSizer( wxVERTICAL );
+
+    m_radioBtnPopupOnErrors = new wxRadioButton( m_panel35, wxID_ANY, _("&Pop-up"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_radioBtnPopupOnErrors->SetValue( true );
+    m_radioBtnPopupOnErrors->SetToolTip( _("Show pop-up on errors or warnings") );
+
+    bSizer169->Add( m_radioBtnPopupOnErrors, 0, wxEXPAND|wxALL, 5 );
+
+    m_radioBtnIgnoreErrors = new wxRadioButton( m_panel35, wxID_ANY, _("&Ignore"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_radioBtnIgnoreErrors->SetToolTip( _("Hide all error and warning messages") );
+
+    bSizer169->Add( m_radioBtnIgnoreErrors, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+    m_radioBtnStopOnError = new wxRadioButton( m_panel35, wxID_ANY, _("&Stop"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_radioBtnStopOnError->SetToolTip( _("Stop synchronization at first error") );
+
+    bSizer169->Add( m_radioBtnStopOnError, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+
+    bSizer180->Add( bSizer169, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticline26 = new wxStaticLine( m_panel35, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizer180->Add( m_staticline26, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer170;
+    bSizer170 = new wxBoxSizer( wxVERTICAL );
+
+    m_checkBoxRunMinimized = new wxCheckBox( m_panel35, wxID_ANY, _("Run minimized"), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer170->Add( m_checkBoxRunMinimized, 0, wxEXPAND|wxALL, 5 );
+
+    m_staticText81 = new wxStaticText( m_panel35, wxID_ANY, _("On completion:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText81->Wrap( -1 );
+    bSizer170->Add( m_staticText81, 0, wxALL, 5 );
+
+    m_comboBoxOnCompletion = new OnCompletionBox( m_panel35, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+    bSizer170->Add( m_comboBoxOnCompletion, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+
+    bSizer180->Add( bSizer170, 1, wxALL, 5 );
+
+
+    bSizer172->Add( bSizer180, 0, wxEXPAND, 5 );
+
+    m_staticline25 = new wxStaticLine( m_panel35, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer172->Add( m_staticline25, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer191;
+    bSizer191 = new wxBoxSizer( wxVERTICAL );
+
+    m_checkBoxGenerateLogfile = new wxCheckBox( m_panel35, wxID_ANY, _("Save log:"), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer191->Add( m_checkBoxGenerateLogfile, 0, wxEXPAND|wxALL, 5 );
+
+    m_panelLogfile = new wxPanel( m_panel35, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panelLogfile->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    wxBoxSizer* bSizer1721;
+    bSizer1721 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_logFolderPath = new FolderHistoryBox( m_panelLogfile, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+    bSizer1721->Add( m_logFolderPath, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonSelectLogFolder = new wxButton( m_panelLogfile, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonSelectLogFolder->SetToolTip( _("Select a folder") );
+
+    bSizer1721->Add( m_buttonSelectLogFolder, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonSelectAltLogFolder = new wxBitmapButton( m_panelLogfile, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30, -1 ), wxBU_AUTODRAW );
+    m_bpButtonSelectAltLogFolder->SetToolTip( _("Access online storage") );
+
+    bSizer1721->Add( m_bpButtonSelectAltLogFolder, 0, wxEXPAND, 5 );
+
+    m_checkBoxLogfilesLimit = new wxCheckBox( m_panelLogfile, wxID_ANY, _("Limit:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_checkBoxLogfilesLimit->SetToolTip( _("Limit maximum number of log files") );
+
+    bSizer1721->Add( m_checkBoxLogfilesLimit, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_spinCtrlLogfileLimit = new wxSpinCtrl( m_panelLogfile, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 70, -1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
+    m_spinCtrlLogfileLimit->SetToolTip( _("Limit maximum number of log files") );
+
+    bSizer1721->Add( m_spinCtrlLogfileLimit, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    m_panelLogfile->SetSizer( bSizer1721 );
+    m_panelLogfile->Layout();
+    bSizer1721->Fit( m_panelLogfile );
+    bSizer191->Add( m_panelLogfile, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+
+
+    bSizer172->Add( bSizer191, 0, wxEXPAND|wxALL, 5 );
+
+    m_hyperlink17 = new wxHyperlinkCtrl( m_panel35, wxID_ANY, _("How can I schedule a batch job?"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    bSizer172->Add( m_hyperlink17, 0, wxALL, 10 );
+
+
+    m_panel35->SetSizer( bSizer172 );
+    m_panel35->Layout();
+    bSizer172->Fit( m_panel35 );
+    bSizer54->Add( m_panel35, 1, wxEXPAND, 5 );
+
+    m_staticline13 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer54->Add( m_staticline13, 0, wxEXPAND, 5 );
+
+    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+
+    m_buttonSaveAs = new wxButton( this, wxID_SAVE, _("Save &as..."), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_buttonSaveAs->SetDefault();
+    m_buttonSaveAs->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizerStdButtons->Add( m_buttonSaveAs, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+
+
+    bSizer54->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
+
+
+    this->SetSizer( bSizer54 );
+    this->Layout();
+    bSizer54->Fit( this );
+
+    this->Centre( wxBOTH );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( BatchDlgGenerated::OnClose ) );
+    m_radioBtnPopupOnErrors->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( BatchDlgGenerated::OnErrorPopup ), NULL, this );
+    m_radioBtnIgnoreErrors->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( BatchDlgGenerated::OnErrorIgnore ), NULL, this );
+    m_radioBtnStopOnError->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( BatchDlgGenerated::OnErrorStop ), NULL, this );
+    m_checkBoxGenerateLogfile->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnToggleGenerateLogfile ), NULL, this );
+    m_checkBoxLogfilesLimit->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnToggleLogfilesLimit ), NULL, this );
+    m_hyperlink17->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( BatchDlgGenerated::OnHelpScheduleBatch ), NULL, this );
+    m_buttonSaveAs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnSaveBatchJob ), NULL, this );
+    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnCancel ), NULL, this );
 }
 
 BatchDlgGenerated::~BatchDlgGenerated()
@@ -3422,81 +3442,81 @@ BatchDlgGenerated::~BatchDlgGenerated()
 
 DeleteDlgGenerated::DeleteDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
-	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer24;
-	bSizer24 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer72;
-	bSizer72 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapDeleteType = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer72->Add( m_bitmapDeleteType, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
-	
-	m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0|wxNO_BORDER );
-	m_staticTextHeader->Wrap( -1 );
-	bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_VERTICAL|wxALL, 10 );
-	
-	
-	bSizer24->Add( bSizer72, 0, 0, 5 );
-	
-	m_staticline91 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer24->Add( m_staticline91, 0, wxEXPAND, 5 );
-	
-	m_panel31 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panel31->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	wxBoxSizer* bSizer185;
-	bSizer185 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer185->Add( 60, 0, 0, 0, 5 );
-	
-	m_staticline42 = new wxStaticLine( m_panel31, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizer185->Add( m_staticline42, 0, wxEXPAND, 5 );
-	
-	m_textCtrlFileList = new wxTextCtrl( m_panel31, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 500,200 ), wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY|wxNO_BORDER );
-	bSizer185->Add( m_textCtrlFileList, 1, wxEXPAND, 5 );
-	
-	
-	m_panel31->SetSizer( bSizer185 );
-	m_panel31->Layout();
-	bSizer185->Fit( m_panel31 );
-	bSizer24->Add( m_panel31, 1, wxEXPAND, 5 );
-	
-	m_staticline9 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer24->Add( m_staticline9, 0, wxEXPAND, 5 );
-	
-	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_checkBoxUseRecycler = new wxCheckBox( this, wxID_ANY, _("&Recycle bin"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizerStdButtons->Add( m_checkBoxUseRecycler, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	m_buttonOK = new wxButton( this, wxID_OK, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_buttonOK->SetDefault(); 
-	m_buttonOK->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizerStdButtons->Add( m_buttonOK, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-	
-	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-	
-	
-	bSizer24->Add( bSizerStdButtons, 0, wxEXPAND, 5 );
-	
-	
-	this->SetSizer( bSizer24 );
-	this->Layout();
-	bSizer24->Fit( this );
-	
-	this->Centre( wxBOTH );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DeleteDlgGenerated::OnClose ) );
-	m_checkBoxUseRecycler->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnUseRecycler ), NULL, this );
-	m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnOK ), NULL, this );
-	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnCancel ), NULL, this );
+    this->SetSizeHints( wxSize( -1, -1 ), wxDefaultSize );
+    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    wxBoxSizer* bSizer24;
+    bSizer24 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer72;
+    bSizer72 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapDeleteType = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer72->Add( m_bitmapDeleteType, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
+
+    m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0|wxNO_BORDER );
+    m_staticTextHeader->Wrap( -1 );
+    bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_VERTICAL|wxALL, 10 );
+
+
+    bSizer24->Add( bSizer72, 0, 0, 5 );
+
+    m_staticline91 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer24->Add( m_staticline91, 0, wxEXPAND, 5 );
+
+    m_panel31 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panel31->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    wxBoxSizer* bSizer185;
+    bSizer185 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer185->Add( 60, 0, 0, 0, 5 );
+
+    m_staticline42 = new wxStaticLine( m_panel31, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizer185->Add( m_staticline42, 0, wxEXPAND, 5 );
+
+    m_textCtrlFileList = new wxTextCtrl( m_panel31, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 500, 200 ), wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY|wxNO_BORDER );
+    bSizer185->Add( m_textCtrlFileList, 1, wxEXPAND, 5 );
+
+
+    m_panel31->SetSizer( bSizer185 );
+    m_panel31->Layout();
+    bSizer185->Fit( m_panel31 );
+    bSizer24->Add( m_panel31, 1, wxEXPAND, 5 );
+
+    m_staticline9 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer24->Add( m_staticline9, 0, wxEXPAND, 5 );
+
+    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+
+    m_checkBoxUseRecycler = new wxCheckBox( this, wxID_ANY, _("&Recycle bin"), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizerStdButtons->Add( m_checkBoxUseRecycler, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    m_buttonOK = new wxButton( this, wxID_OK, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_buttonOK->SetDefault();
+    m_buttonOK->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizerStdButtons->Add( m_buttonOK, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+
+    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+
+
+    bSizer24->Add( bSizerStdButtons, 0, wxEXPAND, 5 );
+
+
+    this->SetSizer( bSizer24 );
+    this->Layout();
+    bSizer24->Fit( this );
+
+    this->Centre( wxBOTH );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DeleteDlgGenerated::OnClose ) );
+    m_checkBoxUseRecycler->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnUseRecycler ), NULL, this );
+    m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnOK ), NULL, this );
+    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnCancel ), NULL, this );
 }
 
 DeleteDlgGenerated::~DeleteDlgGenerated()
@@ -3505,112 +3525,112 @@ DeleteDlgGenerated::~DeleteDlgGenerated()
 
 CopyToDlgGenerated::CopyToDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
-	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer24;
-	bSizer24 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer72;
-	bSizer72 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapCopyTo = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer72->Add( m_bitmapCopyTo, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
-	
-	m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0|wxNO_BORDER );
-	m_staticTextHeader->Wrap( 460 );
-	bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_VERTICAL|wxALL, 10 );
-	
-	
-	bSizer24->Add( bSizer72, 0, 0, 5 );
-	
-	m_staticline91 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer24->Add( m_staticline91, 0, wxEXPAND, 5 );
-	
-	m_panel31 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panel31->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	wxBoxSizer* bSizer185;
-	bSizer185 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer185->Add( 60, 0, 0, 0, 5 );
-	
-	m_staticline42 = new wxStaticLine( m_panel31, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizer185->Add( m_staticline42, 0, wxEXPAND, 5 );
-	
-	m_textCtrlFileList = new wxTextCtrl( m_panel31, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 500,200 ), wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY|wxNO_BORDER );
-	bSizer185->Add( m_textCtrlFileList, 1, wxEXPAND, 5 );
-	
-	
-	m_panel31->SetSizer( bSizer185 );
-	m_panel31->Layout();
-	bSizer185->Fit( m_panel31 );
-	bSizer24->Add( m_panel31, 1, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer182;
-	bSizer182 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_targetFolderPath = new FolderHistoryBox( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
-	bSizer182->Add( m_targetFolderPath, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonSelectTargetFolder = new wxButton( this, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonSelectTargetFolder->SetToolTip( _("Select a folder") );
-	
-	bSizer182->Add( m_buttonSelectTargetFolder, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonSelectAltTargetFolder = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,-1 ), wxBU_AUTODRAW );
-	m_bpButtonSelectAltTargetFolder->SetToolTip( _("Access online storage") );
-	
-	bSizer182->Add( m_bpButtonSelectAltTargetFolder, 0, wxEXPAND, 5 );
-	
-	
-	bSizer24->Add( bSizer182, 0, wxEXPAND|wxALL, 5 );
-	
-	m_staticline9 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer24->Add( m_staticline9, 0, wxEXPAND, 5 );
-	
-	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer189;
-	bSizer189 = new wxBoxSizer( wxVERTICAL );
-	
-	m_checkBoxKeepRelPath = new wxCheckBox( this, wxID_ANY, _("&Keep relative paths"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_checkBoxKeepRelPath->SetValue(true); 
-	bSizer189->Add( m_checkBoxKeepRelPath, 0, wxALL|wxEXPAND, 5 );
-	
-	m_checkBoxOverwriteIfExists = new wxCheckBox( this, wxID_ANY, _("&Overwrite existing files"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_checkBoxOverwriteIfExists->SetValue(true); 
-	bSizer189->Add( m_checkBoxOverwriteIfExists, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
-	
-	bSizerStdButtons->Add( bSizer189, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonOK = new wxButton( this, wxID_OK, _("Copy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_buttonOK->SetDefault(); 
-	m_buttonOK->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizerStdButtons->Add( m_buttonOK, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-	
-	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-	
-	
-	bSizer24->Add( bSizerStdButtons, 0, wxEXPAND, 5 );
-	
-	
-	this->SetSizer( bSizer24 );
-	this->Layout();
-	bSizer24->Fit( this );
-	
-	this->Centre( wxBOTH );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CopyToDlgGenerated::OnClose ) );
-	m_checkBoxKeepRelPath->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CopyToDlgGenerated::OnUseRecycler ), NULL, this );
-	m_checkBoxOverwriteIfExists->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CopyToDlgGenerated::OnUseRecycler ), NULL, this );
-	m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CopyToDlgGenerated::OnOK ), NULL, this );
-	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CopyToDlgGenerated::OnCancel ), NULL, this );
+    this->SetSizeHints( wxSize( -1, -1 ), wxDefaultSize );
+    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    wxBoxSizer* bSizer24;
+    bSizer24 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer72;
+    bSizer72 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapCopyTo = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer72->Add( m_bitmapCopyTo, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
+
+    m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0|wxNO_BORDER );
+    m_staticTextHeader->Wrap( 460 );
+    bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_VERTICAL|wxALL, 10 );
+
+
+    bSizer24->Add( bSizer72, 0, 0, 5 );
+
+    m_staticline91 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer24->Add( m_staticline91, 0, wxEXPAND, 5 );
+
+    m_panel31 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panel31->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    wxBoxSizer* bSizer185;
+    bSizer185 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer185->Add( 60, 0, 0, 0, 5 );
+
+    m_staticline42 = new wxStaticLine( m_panel31, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizer185->Add( m_staticline42, 0, wxEXPAND, 5 );
+
+    m_textCtrlFileList = new wxTextCtrl( m_panel31, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 500, 200 ), wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY|wxNO_BORDER );
+    bSizer185->Add( m_textCtrlFileList, 1, wxEXPAND, 5 );
+
+
+    m_panel31->SetSizer( bSizer185 );
+    m_panel31->Layout();
+    bSizer185->Fit( m_panel31 );
+    bSizer24->Add( m_panel31, 1, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer182;
+    bSizer182 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_targetFolderPath = new FolderHistoryBox( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+    bSizer182->Add( m_targetFolderPath, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonSelectTargetFolder = new wxButton( this, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonSelectTargetFolder->SetToolTip( _("Select a folder") );
+
+    bSizer182->Add( m_buttonSelectTargetFolder, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonSelectAltTargetFolder = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30, -1 ), wxBU_AUTODRAW );
+    m_bpButtonSelectAltTargetFolder->SetToolTip( _("Access online storage") );
+
+    bSizer182->Add( m_bpButtonSelectAltTargetFolder, 0, wxEXPAND, 5 );
+
+
+    bSizer24->Add( bSizer182, 0, wxEXPAND|wxALL, 5 );
+
+    m_staticline9 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer24->Add( m_staticline9, 0, wxEXPAND, 5 );
+
+    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer189;
+    bSizer189 = new wxBoxSizer( wxVERTICAL );
+
+    m_checkBoxKeepRelPath = new wxCheckBox( this, wxID_ANY, _("&Keep relative paths"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_checkBoxKeepRelPath->SetValue(true);
+    bSizer189->Add( m_checkBoxKeepRelPath, 0, wxALL|wxEXPAND, 5 );
+
+    m_checkBoxOverwriteIfExists = new wxCheckBox( this, wxID_ANY, _("&Overwrite existing files"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_checkBoxOverwriteIfExists->SetValue(true);
+    bSizer189->Add( m_checkBoxOverwriteIfExists, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+
+
+    bSizerStdButtons->Add( bSizer189, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonOK = new wxButton( this, wxID_OK, _("Copy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_buttonOK->SetDefault();
+    m_buttonOK->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizerStdButtons->Add( m_buttonOK, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+
+    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+
+
+    bSizer24->Add( bSizerStdButtons, 0, wxEXPAND, 5 );
+
+
+    this->SetSizer( bSizer24 );
+    this->Layout();
+    bSizer24->Fit( this );
+
+    this->Centre( wxBOTH );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CopyToDlgGenerated::OnClose ) );
+    m_checkBoxKeepRelPath->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CopyToDlgGenerated::OnUseRecycler ), NULL, this );
+    m_checkBoxOverwriteIfExists->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CopyToDlgGenerated::OnUseRecycler ), NULL, this );
+    m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CopyToDlgGenerated::OnOK ), NULL, this );
+    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CopyToDlgGenerated::OnCancel ), NULL, this );
 }
 
 CopyToDlgGenerated::~CopyToDlgGenerated()
@@ -3619,258 +3639,258 @@ CopyToDlgGenerated::~CopyToDlgGenerated()
 
 OptionsDlgGenerated::OptionsDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
-	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer95;
-	bSizer95 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer72;
-	bSizer72 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapSettings = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	bSizer72->Add( m_bitmapSettings, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
-	
-	m_staticText44 = new wxStaticText( this, wxID_ANY, _("The following settings are used for all synchronization jobs."), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_staticText44->Wrap( 500 );
-	bSizer72->Add( m_staticText44, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 10 );
-	
-	
-	bSizer95->Add( bSizer72, 0, 0, 5 );
-	
-	m_staticline20 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer95->Add( m_staticline20, 0, wxEXPAND, 5 );
-	
-	m_panel39 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panel39->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	wxBoxSizer* bSizer166;
-	bSizer166 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer186;
-	bSizer186 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer160;
-	bSizer160 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer176;
-	bSizer176 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_checkBoxFailSafe = new wxCheckBox( m_panel39, wxID_ANY, _("Fail-safe file copy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_checkBoxFailSafe->SetValue(true); 
-	m_checkBoxFailSafe->SetToolTip( _("Copy to a temporary file (*.ffs_tmp) before overwriting target.\nThis guarantees a consistent state even in case of a serious error.") );
-	
-	bSizer176->Add( m_checkBoxFailSafe, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticText91 = new wxStaticText( m_panel39, wxID_ANY, _("(recommended)"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText91->Wrap( -1 );
-	m_staticText91->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-	
-	bSizer176->Add( m_staticText91, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-	
-	
-	bSizer160->Add( bSizer176, 0, wxEXPAND, 5 );
-	
-	bSizerLockedFiles = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_checkBoxCopyLocked = new wxCheckBox( m_panel39, wxID_ANY, _("Copy locked files"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_checkBoxCopyLocked->SetValue(true); 
-	m_checkBoxCopyLocked->SetToolTip( _("Copy shared or locked files using the Volume Shadow Copy Service.") );
-	
-	bSizerLockedFiles->Add( m_checkBoxCopyLocked, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticText92 = new wxStaticText( m_panel39, wxID_ANY, _("(requires administrator rights)"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText92->Wrap( -1 );
-	m_staticText92->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-	
-	bSizerLockedFiles->Add( m_staticText92, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-	
-	
-	bSizer160->Add( bSizerLockedFiles, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer178;
-	bSizer178 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_checkBoxCopyPermissions = new wxCheckBox( m_panel39, wxID_ANY, _("Copy file access permissions"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_checkBoxCopyPermissions->SetValue(true); 
-	m_checkBoxCopyPermissions->SetToolTip( _("Transfer file and folder permissions.") );
-	
-	bSizer178->Add( m_checkBoxCopyPermissions, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	m_staticText93 = new wxStaticText( m_panel39, wxID_ANY, _("(requires administrator rights)"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText93->Wrap( -1 );
-	m_staticText93->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-	
-	bSizer178->Add( m_staticText93, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-	
-	
-	bSizer160->Add( bSizer178, 0, wxEXPAND, 5 );
-	
-	
-	bSizer186->Add( bSizer160, 0, wxEXPAND|wxALL, 5 );
-	
-	m_staticline39 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizer186->Add( m_staticline39, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer188;
-	bSizer188 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText95 = new wxStaticText( m_panel39, wxID_ANY, _("Automatic retry on error:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText95->Wrap( -1 );
-	bSizer188->Add( m_staticText95, 0, wxBOTTOM, 5 );
-	
-	wxFlexGridSizer* fgSizer6;
-	fgSizer6 = new wxFlexGridSizer( 0, 2, 5, 5 );
-	fgSizer6->SetFlexibleDirection( wxBOTH );
-	fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_staticText96 = new wxStaticText( m_panel39, wxID_ANY, _("Retry count:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText96->Wrap( -1 );
-	fgSizer6->Add( m_staticText96, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_spinCtrlAutoRetryCount = new wxSpinCtrl( m_panel39, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 60,-1 ), wxSP_ARROW_KEYS, 0, 2000000000, 4 );
-	fgSizer6->Add( m_spinCtrlAutoRetryCount, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticTextAutoRetryDelay = new wxStaticText( m_panel39, wxID_ANY, _("Delay (in seconds):"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextAutoRetryDelay->Wrap( -1 );
-	fgSizer6->Add( m_staticTextAutoRetryDelay, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_spinCtrlAutoRetryDelay = new wxSpinCtrl( m_panel39, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 60,-1 ), wxSP_ARROW_KEYS, 0, 2000000000, 0 );
-	fgSizer6->Add( m_spinCtrlAutoRetryDelay, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer188->Add( fgSizer6, 0, wxLEFT, 10 );
-	
-	
-	bSizer186->Add( bSizer188, 0, wxALL, 10 );
-	
-	
-	bSizer166->Add( bSizer186, 0, wxEXPAND, 5 );
-	
-	m_staticline191 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer166->Add( m_staticline191, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer181;
-	bSizer181 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText85 = new wxStaticText( m_panel39, wxID_ANY, _("Customize context menu:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText85->Wrap( -1 );
-	bSizer181->Add( m_staticText85, 0, wxBOTTOM, 5 );
-	
-	m_gridCustomCommand = new wxGrid( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	
-	// Grid
-	m_gridCustomCommand->CreateGrid( 5, 2 );
-	m_gridCustomCommand->EnableEditing( true );
-	m_gridCustomCommand->EnableGridLines( true );
-	m_gridCustomCommand->EnableDragGridSize( false );
-	m_gridCustomCommand->SetMargins( 0, 0 );
-	
-	// Columns
-	m_gridCustomCommand->SetColSize( 0, 165 );
-	m_gridCustomCommand->SetColSize( 1, 196 );
-	m_gridCustomCommand->EnableDragColMove( false );
-	m_gridCustomCommand->EnableDragColSize( true );
-	m_gridCustomCommand->SetColLabelSize( 20 );
-	m_gridCustomCommand->SetColLabelValue( 0, _("Description") );
-	m_gridCustomCommand->SetColLabelValue( 1, _("Command line") );
-	m_gridCustomCommand->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-	// Rows
-	m_gridCustomCommand->EnableDragRowSize( false );
-	m_gridCustomCommand->SetRowLabelSize( 1 );
-	m_gridCustomCommand->SetRowLabelAlignment( wxALIGN_LEFT, wxALIGN_CENTRE );
-	
-	// Label Appearance
-	
-	// Cell Defaults
-	m_gridCustomCommand->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
-	bSizer181->Add( m_gridCustomCommand, 1, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer193;
-	bSizer193 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bpButtonAddRow = new wxBitmapButton( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25,25 ), wxBU_AUTODRAW );
-	bSizer193->Add( m_bpButtonAddRow, 0, 0, 5 );
-	
-	m_bpButtonRemoveRow = new wxBitmapButton( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25,25 ), wxBU_AUTODRAW );
-	bSizer193->Add( m_bpButtonRemoveRow, 0, 0, 5 );
-	
-	
-	bSizer193->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_hyperlink17 = new wxHyperlinkCtrl( m_panel39, wxID_ANY, _("Show examples"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	bSizer193->Add( m_hyperlink17, 0, wxLEFT, 5 );
-	
-	
-	bSizer181->Add( bSizer193, 0, wxTOP|wxEXPAND, 5 );
-	
-	
-	bSizer166->Add( bSizer181, 1, wxEXPAND|wxALL, 10 );
-	
-	m_staticline192 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer166->Add( m_staticline192, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer1881;
-	bSizer1881 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_buttonResetDialogs = new zen::BitmapTextButton( m_panel39, wxID_ANY, _("Show hidden dialogs again"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_buttonResetDialogs->SetToolTip( _("Show all permanently hidden dialogs and warning messages again") );
-	
-	bSizer1881->Add( m_buttonResetDialogs, 0, wxALL|wxALIGN_CENTER_VERTICAL, 10 );
-	
-	m_staticline40 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizer1881->Add( m_staticline40, 0, wxEXPAND, 5 );
-	
-	
-	bSizer166->Add( bSizer1881, 0, 0, 5 );
-	
-	
-	m_panel39->SetSizer( bSizer166 );
-	m_panel39->Layout();
-	bSizer166->Fit( m_panel39 );
-	bSizer95->Add( m_panel39, 1, wxEXPAND, 5 );
-	
-	m_staticline36 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer95->Add( m_staticline36, 0, wxEXPAND, 5 );
-	
-	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_buttonDefault = new wxButton( this, wxID_DEFAULT, _("&Default"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	bSizerStdButtons->Add( m_buttonDefault, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerStdButtons->Add( 0, 0, 1, 0, 5 );
-	
-	m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_buttonOkay->SetDefault(); 
-	m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizerStdButtons->Add( m_buttonOkay, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-	
-	
-	bSizer95->Add( bSizerStdButtons, 0, wxEXPAND, 5 );
-	
-	
-	this->SetSizer( bSizer95 );
-	this->Layout();
-	bSizer95->Fit( this );
-	
-	this->Centre( wxBOTH );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( OptionsDlgGenerated::OnClose ) );
-	m_spinCtrlAutoRetryCount->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( OptionsDlgGenerated::OnToggleAutoRetryCount ), NULL, this );
-	m_bpButtonAddRow->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnAddRow ), NULL, this );
-	m_bpButtonRemoveRow->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnRemoveRow ), NULL, this );
-	m_hyperlink17->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( OptionsDlgGenerated::OnHelpShowExamples ), NULL, this );
-	m_buttonResetDialogs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnResetDialogs ), NULL, this );
-	m_buttonDefault->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnDefault ), NULL, this );
-	m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnOkay ), NULL, this );
-	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnCancel ), NULL, this );
+    this->SetSizeHints( wxSize( -1, -1 ), wxDefaultSize );
+    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    wxBoxSizer* bSizer95;
+    bSizer95 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer72;
+    bSizer72 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapSettings = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    bSizer72->Add( m_bitmapSettings, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
+
+    m_staticText44 = new wxStaticText( this, wxID_ANY, _("The following settings are used for all synchronization jobs."), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_staticText44->Wrap( 500 );
+    bSizer72->Add( m_staticText44, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 10 );
+
+
+    bSizer95->Add( bSizer72, 0, 0, 5 );
+
+    m_staticline20 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer95->Add( m_staticline20, 0, wxEXPAND, 5 );
+
+    m_panel39 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panel39->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    wxBoxSizer* bSizer166;
+    bSizer166 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer186;
+    bSizer186 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer160;
+    bSizer160 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer176;
+    bSizer176 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_checkBoxFailSafe = new wxCheckBox( m_panel39, wxID_ANY, _("Fail-safe file copy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_checkBoxFailSafe->SetValue(true);
+    m_checkBoxFailSafe->SetToolTip( _("Copy to a temporary file (*.ffs_tmp) before overwriting target.\nThis guarantees a consistent state even in case of a serious error.") );
+
+    bSizer176->Add( m_checkBoxFailSafe, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticText91 = new wxStaticText( m_panel39, wxID_ANY, _("(recommended)"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText91->Wrap( -1 );
+    m_staticText91->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+
+    bSizer176->Add( m_staticText91, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+
+
+    bSizer160->Add( bSizer176, 0, wxEXPAND, 5 );
+
+    bSizerLockedFiles = new wxBoxSizer( wxHORIZONTAL );
+
+    m_checkBoxCopyLocked = new wxCheckBox( m_panel39, wxID_ANY, _("Copy locked files"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_checkBoxCopyLocked->SetValue(true);
+    m_checkBoxCopyLocked->SetToolTip( _("Copy shared or locked files using the Volume Shadow Copy Service.") );
+
+    bSizerLockedFiles->Add( m_checkBoxCopyLocked, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticText92 = new wxStaticText( m_panel39, wxID_ANY, _("(requires administrator rights)"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText92->Wrap( -1 );
+    m_staticText92->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+
+    bSizerLockedFiles->Add( m_staticText92, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+
+
+    bSizer160->Add( bSizerLockedFiles, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer178;
+    bSizer178 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_checkBoxCopyPermissions = new wxCheckBox( m_panel39, wxID_ANY, _("Copy file access permissions"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_checkBoxCopyPermissions->SetValue(true);
+    m_checkBoxCopyPermissions->SetToolTip( _("Transfer file and folder permissions.") );
+
+    bSizer178->Add( m_checkBoxCopyPermissions, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    m_staticText93 = new wxStaticText( m_panel39, wxID_ANY, _("(requires administrator rights)"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText93->Wrap( -1 );
+    m_staticText93->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+
+    bSizer178->Add( m_staticText93, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+
+
+    bSizer160->Add( bSizer178, 0, wxEXPAND, 5 );
+
+
+    bSizer186->Add( bSizer160, 0, wxEXPAND|wxALL, 5 );
+
+    m_staticline39 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizer186->Add( m_staticline39, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer188;
+    bSizer188 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText95 = new wxStaticText( m_panel39, wxID_ANY, _("Automatic retry on error:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText95->Wrap( -1 );
+    bSizer188->Add( m_staticText95, 0, wxBOTTOM, 5 );
+
+    wxFlexGridSizer* fgSizer6;
+    fgSizer6 = new wxFlexGridSizer( 0, 2, 5, 5 );
+    fgSizer6->SetFlexibleDirection( wxBOTH );
+    fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    m_staticText96 = new wxStaticText( m_panel39, wxID_ANY, _("Retry count:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText96->Wrap( -1 );
+    fgSizer6->Add( m_staticText96, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_spinCtrlAutoRetryCount = new wxSpinCtrl( m_panel39, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 60, -1 ), wxSP_ARROW_KEYS, 0, 2000000000, 4 );
+    fgSizer6->Add( m_spinCtrlAutoRetryCount, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticTextAutoRetryDelay = new wxStaticText( m_panel39, wxID_ANY, _("Delay (in seconds):"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextAutoRetryDelay->Wrap( -1 );
+    fgSizer6->Add( m_staticTextAutoRetryDelay, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_spinCtrlAutoRetryDelay = new wxSpinCtrl( m_panel39, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 60, -1 ), wxSP_ARROW_KEYS, 0, 2000000000, 0 );
+    fgSizer6->Add( m_spinCtrlAutoRetryDelay, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer188->Add( fgSizer6, 0, wxLEFT, 10 );
+
+
+    bSizer186->Add( bSizer188, 0, wxALL, 10 );
+
+
+    bSizer166->Add( bSizer186, 0, wxEXPAND, 5 );
+
+    m_staticline191 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer166->Add( m_staticline191, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer181;
+    bSizer181 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText85 = new wxStaticText( m_panel39, wxID_ANY, _("Customize context menu:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText85->Wrap( -1 );
+    bSizer181->Add( m_staticText85, 0, wxBOTTOM, 5 );
+
+    m_gridCustomCommand = new wxGrid( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+
+    // Grid
+    m_gridCustomCommand->CreateGrid( 5, 2 );
+    m_gridCustomCommand->EnableEditing( true );
+    m_gridCustomCommand->EnableGridLines( true );
+    m_gridCustomCommand->EnableDragGridSize( false );
+    m_gridCustomCommand->SetMargins( 0, 0 );
+
+    // Columns
+    m_gridCustomCommand->SetColSize( 0, 165 );
+    m_gridCustomCommand->SetColSize( 1, 196 );
+    m_gridCustomCommand->EnableDragColMove( false );
+    m_gridCustomCommand->EnableDragColSize( true );
+    m_gridCustomCommand->SetColLabelSize( 20 );
+    m_gridCustomCommand->SetColLabelValue( 0, _("Description") );
+    m_gridCustomCommand->SetColLabelValue( 1, _("Command line") );
+    m_gridCustomCommand->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+
+    // Rows
+    m_gridCustomCommand->EnableDragRowSize( false );
+    m_gridCustomCommand->SetRowLabelSize( 1 );
+    m_gridCustomCommand->SetRowLabelAlignment( wxALIGN_LEFT, wxALIGN_CENTRE );
+
+    // Label Appearance
+
+    // Cell Defaults
+    m_gridCustomCommand->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+    bSizer181->Add( m_gridCustomCommand, 1, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer193;
+    bSizer193 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bpButtonAddRow = new wxBitmapButton( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25, 25 ), wxBU_AUTODRAW );
+    bSizer193->Add( m_bpButtonAddRow, 0, 0, 5 );
+
+    m_bpButtonRemoveRow = new wxBitmapButton( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25, 25 ), wxBU_AUTODRAW );
+    bSizer193->Add( m_bpButtonRemoveRow, 0, 0, 5 );
+
+
+    bSizer193->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_hyperlink17 = new wxHyperlinkCtrl( m_panel39, wxID_ANY, _("Show examples"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    bSizer193->Add( m_hyperlink17, 0, wxLEFT, 5 );
+
+
+    bSizer181->Add( bSizer193, 0, wxTOP|wxEXPAND, 5 );
+
+
+    bSizer166->Add( bSizer181, 1, wxEXPAND|wxALL, 10 );
+
+    m_staticline192 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer166->Add( m_staticline192, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer1881;
+    bSizer1881 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_buttonResetDialogs = new zen::BitmapTextButton( m_panel39, wxID_ANY, _("Show hidden dialogs again"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_buttonResetDialogs->SetToolTip( _("Show all permanently hidden dialogs and warning messages again") );
+
+    bSizer1881->Add( m_buttonResetDialogs, 0, wxALL|wxALIGN_CENTER_VERTICAL, 10 );
+
+    m_staticline40 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizer1881->Add( m_staticline40, 0, wxEXPAND, 5 );
+
+
+    bSizer166->Add( bSizer1881, 0, 0, 5 );
+
+
+    m_panel39->SetSizer( bSizer166 );
+    m_panel39->Layout();
+    bSizer166->Fit( m_panel39 );
+    bSizer95->Add( m_panel39, 1, wxEXPAND, 5 );
+
+    m_staticline36 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer95->Add( m_staticline36, 0, wxEXPAND, 5 );
+
+    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+
+    m_buttonDefault = new wxButton( this, wxID_DEFAULT, _("&Default"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    bSizerStdButtons->Add( m_buttonDefault, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerStdButtons->Add( 0, 0, 1, 0, 5 );
+
+    m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_buttonOkay->SetDefault();
+    m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizerStdButtons->Add( m_buttonOkay, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+
+
+    bSizer95->Add( bSizerStdButtons, 0, wxEXPAND, 5 );
+
+
+    this->SetSizer( bSizer95 );
+    this->Layout();
+    bSizer95->Fit( this );
+
+    this->Centre( wxBOTH );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( OptionsDlgGenerated::OnClose ) );
+    m_spinCtrlAutoRetryCount->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( OptionsDlgGenerated::OnToggleAutoRetryCount ), NULL, this );
+    m_bpButtonAddRow->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnAddRow ), NULL, this );
+    m_bpButtonRemoveRow->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnRemoveRow ), NULL, this );
+    m_hyperlink17->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( OptionsDlgGenerated::OnHelpShowExamples ), NULL, this );
+    m_buttonResetDialogs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnResetDialogs ), NULL, this );
+    m_buttonDefault->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnDefault ), NULL, this );
+    m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnOkay ), NULL, this );
+    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnCancel ), NULL, this );
 }
 
 OptionsDlgGenerated::~OptionsDlgGenerated()
@@ -3879,22 +3899,22 @@ OptionsDlgGenerated::~OptionsDlgGenerated()
 
 TooltipDlgGenerated::TooltipDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-	
-	wxBoxSizer* bSizer158;
-	bSizer158 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapLeft = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer158->Add( m_bitmapLeft, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticTextMain = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextMain->Wrap( 600 );
-	bSizer158->Add( m_staticTextMain, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	this->SetSizer( bSizer158 );
-	this->Layout();
-	bSizer158->Fit( this );
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+
+    wxBoxSizer* bSizer158;
+    bSizer158 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapLeft = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer158->Add( m_bitmapLeft, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticTextMain = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextMain->Wrap( 600 );
+    bSizer158->Add( m_staticTextMain, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    this->SetSizer( bSizer158 );
+    this->Layout();
+    bSizer158->Fit( this );
 }
 
 TooltipDlgGenerated::~TooltipDlgGenerated()
@@ -3903,60 +3923,60 @@ TooltipDlgGenerated::~TooltipDlgGenerated()
 
 SelectTimespanDlgGenerated::SelectTimespanDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer96;
-	bSizer96 = new wxBoxSizer( wxVERTICAL );
-	
-	m_panel35 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panel35->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	wxBoxSizer* bSizer98;
-	bSizer98 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_calendarFrom = new wxCalendarCtrl( m_panel35, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxCAL_SHOW_HOLIDAYS|wxNO_BORDER );
-	bSizer98->Add( m_calendarFrom, 0, wxTOP|wxBOTTOM|wxLEFT, 10 );
-	
-	m_calendarTo = new wxCalendarCtrl( m_panel35, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxCAL_SHOW_HOLIDAYS|wxNO_BORDER );
-	bSizer98->Add( m_calendarTo, 0, wxALL, 10 );
-	
-	
-	m_panel35->SetSizer( bSizer98 );
-	m_panel35->Layout();
-	bSizer98->Fit( m_panel35 );
-	bSizer96->Add( m_panel35, 0, wxEXPAND, 5 );
-	
-	m_staticline21 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer96->Add( m_staticline21, 0, wxEXPAND, 5 );
-	
-	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_buttonOkay->SetDefault(); 
-	m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizerStdButtons->Add( m_buttonOkay, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-	
-	
-	bSizer96->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
-	
-	
-	this->SetSizer( bSizer96 );
-	this->Layout();
-	bSizer96->Fit( this );
-	
-	this->Centre( wxBOTH );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SelectTimespanDlgGenerated::OnClose ) );
-	m_calendarFrom->Connect( wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEventHandler( SelectTimespanDlgGenerated::OnChangeSelectionFrom ), NULL, this );
-	m_calendarTo->Connect( wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEventHandler( SelectTimespanDlgGenerated::OnChangeSelectionTo ), NULL, this );
-	m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SelectTimespanDlgGenerated::OnOkay ), NULL, this );
-	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SelectTimespanDlgGenerated::OnCancel ), NULL, this );
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    wxBoxSizer* bSizer96;
+    bSizer96 = new wxBoxSizer( wxVERTICAL );
+
+    m_panel35 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panel35->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    wxBoxSizer* bSizer98;
+    bSizer98 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_calendarFrom = new wxCalendarCtrl( m_panel35, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxCAL_SHOW_HOLIDAYS|wxNO_BORDER );
+    bSizer98->Add( m_calendarFrom, 0, wxTOP|wxBOTTOM|wxLEFT, 10 );
+
+    m_calendarTo = new wxCalendarCtrl( m_panel35, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxCAL_SHOW_HOLIDAYS|wxNO_BORDER );
+    bSizer98->Add( m_calendarTo, 0, wxALL, 10 );
+
+
+    m_panel35->SetSizer( bSizer98 );
+    m_panel35->Layout();
+    bSizer98->Fit( m_panel35 );
+    bSizer96->Add( m_panel35, 0, wxEXPAND, 5 );
+
+    m_staticline21 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer96->Add( m_staticline21, 0, wxEXPAND, 5 );
+
+    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+
+    m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_buttonOkay->SetDefault();
+    m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizerStdButtons->Add( m_buttonOkay, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+
+
+    bSizer96->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
+
+
+    this->SetSizer( bSizer96 );
+    this->Layout();
+    bSizer96->Fit( this );
+
+    this->Centre( wxBOTH );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SelectTimespanDlgGenerated::OnClose ) );
+    m_calendarFrom->Connect( wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEventHandler( SelectTimespanDlgGenerated::OnChangeSelectionFrom ), NULL, this );
+    m_calendarTo->Connect( wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEventHandler( SelectTimespanDlgGenerated::OnChangeSelectionTo ), NULL, this );
+    m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SelectTimespanDlgGenerated::OnOkay ), NULL, this );
+    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SelectTimespanDlgGenerated::OnCancel ), NULL, this );
 }
 
 SelectTimespanDlgGenerated::~SelectTimespanDlgGenerated()
@@ -3965,360 +3985,360 @@ SelectTimespanDlgGenerated::~SelectTimespanDlgGenerated()
 
 AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer31;
-	bSizer31 = new wxBoxSizer( wxVERTICAL );
-	
-	m_panel41 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panel41->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	wxBoxSizer* bSizer162;
-	bSizer162 = new wxBoxSizer( wxVERTICAL );
-	
-	m_bitmapLogo = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	bSizer162->Add( m_bitmapLogo, 0, 0, 5 );
-	
-	m_staticline341 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer162->Add( m_staticline341, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer174;
-	bSizer174 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer181;
-	bSizer181 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer187;
-	bSizer187 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText96 = new wxStaticText( m_panel41, wxID_ANY, _("Source code written in C++ using:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText96->Wrap( -1 );
-	bSizer187->Add( m_staticText96, 0, wxALL, 5 );
-	
-	wxBoxSizer* bSizer171;
-	bSizer171 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_hyperlink11 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("MS Visual C++"), wxT("http://www.visualstudio.com"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink11->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	m_hyperlink11->SetToolTip( _("http://www.visualstudio.com") );
-	
-	bSizer171->Add( m_hyperlink11, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_hyperlink7 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("wxWidgets"), wxT("http://www.wxwidgets.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink7->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	m_hyperlink7->SetToolTip( _("http://www.wxwidgets.org") );
-	
-	bSizer171->Add( m_hyperlink7, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_hyperlink14 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("wxFormBuilder"), wxT("http://wxformbuilder.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink14->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	m_hyperlink14->SetToolTip( _("http://wxformbuilder.org") );
-	
-	bSizer171->Add( m_hyperlink14, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_hyperlink16 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("Artistic Style"), wxT("http://astyle.sourceforge.net"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink16->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	m_hyperlink16->SetToolTip( _("http://astyle.sourceforge.net") );
-	
-	bSizer171->Add( m_hyperlink16, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer187->Add( bSizer171, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	wxBoxSizer* bSizer172;
-	bSizer172 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_hyperlink15 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("zen::Xml"), wxT("http://zenxml.sourceforge.net"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink15->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	m_hyperlink15->SetToolTip( _("http://zenxml.sourceforge.net") );
-	
-	bSizer172->Add( m_hyperlink15, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_hyperlink12 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("Google Test"), wxT("http://code.google.com/p/googletest"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink12->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	m_hyperlink12->SetToolTip( _("http://code.google.com/p/googletest") );
-	
-	bSizer172->Add( m_hyperlink12, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_hyperlink13 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("Boost"), wxT("http://www.boost.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink13->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	m_hyperlink13->SetToolTip( _("http://www.boost.org") );
-	
-	bSizer172->Add( m_hyperlink13, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_hyperlink10 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("libssh2"), wxT("http://www.libssh2.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink10->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	m_hyperlink10->SetToolTip( _("http://www.libssh2.org") );
-	
-	bSizer172->Add( m_hyperlink10, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_hyperlink18 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("NSIS"), wxT("http://nsis.sourceforge.net"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink18->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	m_hyperlink18->SetToolTip( _("http://nsis.sourceforge.net") );
-	
-	bSizer172->Add( m_hyperlink18, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_hyperlink9 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("Inno Setup"), wxT("http://www.jrsoftware.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink9->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	m_hyperlink9->SetToolTip( _("http://www.jrsoftware.org") );
-	
-	bSizer172->Add( m_hyperlink9, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer187->Add( bSizer172, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizer181->Add( bSizer187, 0, wxALL|wxEXPAND, 5 );
-	
-	m_panelThankYou = new wxPanel( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panelThankYou->SetBackgroundColour( wxColour( 153, 170, 187 ) );
-	
-	wxBoxSizer* bSizer1831;
-	bSizer1831 = new wxBoxSizer( wxVERTICAL );
-	
-	m_panel391 = new wxPanel( m_panelThankYou, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panel391->SetBackgroundColour( wxColour( 224, 247, 201 ) );
-	
-	wxBoxSizer* bSizer1841;
-	bSizer1841 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer1841->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_bitmapThanks = new wxStaticBitmap( m_panel391, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer1841->Add( m_bitmapThanks, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxBoxSizer* bSizer1781;
-	bSizer1781 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticTextThanks = new wxStaticText( m_panel391, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
-	m_staticTextThanks->Wrap( -1 );
-	m_staticTextThanks->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
-	m_staticTextThanks->SetForegroundColour( wxColour( 0, 0, 0 ) );
-	
-	bSizer1781->Add( m_staticTextThanks, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_buttonShowDonationDetails = new wxButton( m_panel391, wxID_ANY, _("Donation details"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonShowDonationDetails->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer1781->Add( m_buttonShowDonationDetails, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizer1841->Add( bSizer1781, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer1841->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	m_panel391->SetSizer( bSizer1841 );
-	m_panel391->Layout();
-	bSizer1841->Fit( m_panel391 );
-	bSizer1831->Add( m_panel391, 0, wxEXPAND|wxALL, 5 );
-	
-	
-	m_panelThankYou->SetSizer( bSizer1831 );
-	m_panelThankYou->Layout();
-	bSizer1831->Fit( m_panelThankYou );
-	bSizer181->Add( m_panelThankYou, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-	
-	m_panelDonate = new wxPanel( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panelDonate->SetBackgroundColour( wxColour( 153, 170, 187 ) );
-	
-	wxBoxSizer* bSizer183;
-	bSizer183 = new wxBoxSizer( wxVERTICAL );
-	
-	m_panel39 = new wxPanel( m_panelDonate, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panel39->SetBackgroundColour( wxColour( 221, 221, 255 ) );
-	
-	wxBoxSizer* bSizer184;
-	bSizer184 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer184->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_bitmapDonate = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer184->Add( m_bitmapDonate, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxBoxSizer* bSizer178;
-	bSizer178 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticTextDonate = new wxStaticText( m_panel39, wxID_ANY, _("If you like FreeFileSync:"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
-	m_staticTextDonate->Wrap( -1 );
-	m_staticTextDonate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
-	m_staticTextDonate->SetForegroundColour( wxColour( 0, 0, 0 ) );
-	
-	bSizer178->Add( m_staticTextDonate, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_buttonDonate = new wxButton( m_panel39, wxID_ANY, _("Donate with PayPal"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonDonate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
-	m_buttonDonate->SetToolTip( _("http://www.freefilesync.org/donate.php") );
-	
-	bSizer178->Add( m_buttonDonate, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizer184->Add( bSizer178, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer184->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	m_panel39->SetSizer( bSizer184 );
-	m_panel39->Layout();
-	bSizer184->Fit( m_panel39 );
-	bSizer183->Add( m_panel39, 0, wxEXPAND|wxALL, 5 );
-	
-	
-	m_panelDonate->SetSizer( bSizer183 );
-	m_panelDonate->Layout();
-	bSizer183->Fit( m_panelDonate );
-	bSizer181->Add( m_panelDonate, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-	
-	wxBoxSizer* bSizer186;
-	bSizer186 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText94 = new wxStaticText( m_panel41, wxID_ANY, _("Feedback and suggestions are welcome"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText94->Wrap( -1 );
-	bSizer186->Add( m_staticText94, 0, wxALL, 5 );
-	
-	wxBoxSizer* bSizer166;
-	bSizer166 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer166->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_bitmapHomepage = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_bitmapHomepage->SetToolTip( _("Home page") );
-	
-	bSizer166->Add( m_bitmapHomepage, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-	
-	m_hyperlink1 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("FreeFileSync.org"), wxT("http://www.freefilesync.org/"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink1->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, true, wxEmptyString ) );
-	m_hyperlink1->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	m_hyperlink1->SetToolTip( _("http://www.freefilesync.org") );
-	
-	bSizer166->Add( m_hyperlink1, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer166->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_bitmapEmail = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_bitmapEmail->SetToolTip( _("Email") );
-	
-	bSizer166->Add( m_bitmapEmail, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-	
-	m_hyperlink2 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("zenju@freefilesync.org"), wxT("mailto:zenju@freefilesync.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink2->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, true, wxEmptyString ) );
-	m_hyperlink2->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	m_hyperlink2->SetToolTip( _("mailto:zenju@freefilesync.org") );
-	
-	bSizer166->Add( m_hyperlink2, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer166->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	bSizer186->Add( bSizer166, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	
-	bSizer181->Add( bSizer186, 0, wxALL|wxEXPAND, 5 );
-	
-	m_staticline34 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer181->Add( m_staticline34, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer185;
-	bSizer185 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText93 = new wxStaticText( m_panel41, wxID_ANY, _("Published under the GNU General Public License"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText93->Wrap( -1 );
-	bSizer185->Add( m_staticText93, 0, wxALL, 5 );
-	
-	wxBoxSizer* bSizer1671;
-	bSizer1671 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapGpl = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	bSizer1671->Add( m_bitmapGpl, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_hyperlink5 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("http://www.gnu.org/licenses/gpl-3.0"), wxT("http://www.gnu.org/licenses/gpl-3.0"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink5->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	bSizer1671->Add( m_hyperlink5, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer185->Add( bSizer1671, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	
-	bSizer181->Add( bSizer185, 0, wxALL|wxEXPAND, 5 );
-	
-	
-	bSizer174->Add( bSizer181, 0, 0, 5 );
-	
-	m_staticline37 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizer174->Add( m_staticline37, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer177;
-	bSizer177 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText54 = new wxStaticText( m_panel41, wxID_ANY, _("Many thanks for localization:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText54->Wrap( 200 );
-	m_staticText54->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer177->Add( m_staticText54, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
-	
-	
-	bSizer177->Add( 0, 5, 0, 0, 5 );
-	
-	m_scrolledWindowTranslators = new wxScrolledWindow( m_panel41, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxVSCROLL );
-	m_scrolledWindowTranslators->SetScrollRate( 10, 10 );
-	m_scrolledWindowTranslators->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	m_scrolledWindowTranslators->SetMinSize( wxSize( 220,-1 ) );
-	
-	fgSizerTranslators = new wxFlexGridSizer( 0, 2, 2, 10 );
-	fgSizerTranslators->SetFlexibleDirection( wxBOTH );
-	fgSizerTranslators->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	
-	m_scrolledWindowTranslators->SetSizer( fgSizerTranslators );
-	m_scrolledWindowTranslators->Layout();
-	fgSizerTranslators->Fit( m_scrolledWindowTranslators );
-	bSizer177->Add( m_scrolledWindowTranslators, 1, wxLEFT|wxEXPAND, 5 );
-	
-	
-	bSizer174->Add( bSizer177, 0, wxEXPAND|wxTOP|wxLEFT, 5 );
-	
-	
-	bSizer162->Add( bSizer174, 0, 0, 5 );
-	
-	
-	m_panel41->SetSizer( bSizer162 );
-	m_panel41->Layout();
-	bSizer162->Fit( m_panel41 );
-	bSizer31->Add( m_panel41, 0, wxEXPAND, 5 );
-	
-	m_staticline36 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer31->Add( m_staticline36, 0, wxEXPAND, 5 );
-	
-	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_buttonClose = new wxButton( this, wxID_OK, _("Close"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_buttonClose->SetDefault(); 
-	bSizerStdButtons->Add( m_buttonClose, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer31->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
-	
-	
-	this->SetSizer( bSizer31 );
-	this->Layout();
-	bSizer31->Fit( this );
-	
-	this->Centre( wxBOTH );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( AboutDlgGenerated::OnClose ) );
-	m_buttonShowDonationDetails->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnShowDonationDetails ), NULL, this );
-	m_buttonDonate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnDonate ), NULL, this );
-	m_buttonClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnOK ), NULL, this );
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    wxBoxSizer* bSizer31;
+    bSizer31 = new wxBoxSizer( wxVERTICAL );
+
+    m_panel41 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panel41->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    wxBoxSizer* bSizer162;
+    bSizer162 = new wxBoxSizer( wxVERTICAL );
+
+    m_bitmapLogo = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    bSizer162->Add( m_bitmapLogo, 0, 0, 5 );
+
+    m_staticline341 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer162->Add( m_staticline341, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer174;
+    bSizer174 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer181;
+    bSizer181 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer187;
+    bSizer187 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText96 = new wxStaticText( m_panel41, wxID_ANY, _("Source code written in C++ using:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText96->Wrap( -1 );
+    bSizer187->Add( m_staticText96, 0, wxALL, 5 );
+
+    wxBoxSizer* bSizer171;
+    bSizer171 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_hyperlink11 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("MS Visual C++"), wxT("http://www.visualstudio.com"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink11->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+    m_hyperlink11->SetToolTip( _("http://www.visualstudio.com") );
+
+    bSizer171->Add( m_hyperlink11, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_hyperlink7 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("wxWidgets"), wxT("http://www.wxwidgets.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink7->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+    m_hyperlink7->SetToolTip( _("http://www.wxwidgets.org") );
+
+    bSizer171->Add( m_hyperlink7, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_hyperlink14 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("wxFormBuilder"), wxT("http://wxformbuilder.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink14->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+    m_hyperlink14->SetToolTip( _("http://wxformbuilder.org") );
+
+    bSizer171->Add( m_hyperlink14, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_hyperlink16 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("Artistic Style"), wxT("http://astyle.sourceforge.net"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink16->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+    m_hyperlink16->SetToolTip( _("http://astyle.sourceforge.net") );
+
+    bSizer171->Add( m_hyperlink16, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer187->Add( bSizer171, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+    wxBoxSizer* bSizer172;
+    bSizer172 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_hyperlink15 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("zen::Xml"), wxT("http://zenxml.sourceforge.net"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink15->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+    m_hyperlink15->SetToolTip( _("http://zenxml.sourceforge.net") );
+
+    bSizer172->Add( m_hyperlink15, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_hyperlink12 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("Google Test"), wxT("http://code.google.com/p/googletest"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink12->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+    m_hyperlink12->SetToolTip( _("http://code.google.com/p/googletest") );
+
+    bSizer172->Add( m_hyperlink12, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_hyperlink13 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("Boost"), wxT("http://www.boost.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink13->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+    m_hyperlink13->SetToolTip( _("http://www.boost.org") );
+
+    bSizer172->Add( m_hyperlink13, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_hyperlink10 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("libssh2"), wxT("http://www.libssh2.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink10->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+    m_hyperlink10->SetToolTip( _("http://www.libssh2.org") );
+
+    bSizer172->Add( m_hyperlink10, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_hyperlink18 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("NSIS"), wxT("http://nsis.sourceforge.net"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink18->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+    m_hyperlink18->SetToolTip( _("http://nsis.sourceforge.net") );
+
+    bSizer172->Add( m_hyperlink18, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_hyperlink9 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("Inno Setup"), wxT("http://www.jrsoftware.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink9->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+    m_hyperlink9->SetToolTip( _("http://www.jrsoftware.org") );
+
+    bSizer172->Add( m_hyperlink9, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer187->Add( bSizer172, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizer181->Add( bSizer187, 0, wxALL|wxEXPAND, 5 );
+
+    m_panelThankYou = new wxPanel( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panelThankYou->SetBackgroundColour( wxColour( 153, 170, 187 ) );
+
+    wxBoxSizer* bSizer1831;
+    bSizer1831 = new wxBoxSizer( wxVERTICAL );
+
+    m_panel391 = new wxPanel( m_panelThankYou, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panel391->SetBackgroundColour( wxColour( 224, 247, 201 ) );
+
+    wxBoxSizer* bSizer1841;
+    bSizer1841 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer1841->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_bitmapThanks = new wxStaticBitmap( m_panel391, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer1841->Add( m_bitmapThanks, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxBoxSizer* bSizer1781;
+    bSizer1781 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticTextThanks = new wxStaticText( m_panel391, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
+    m_staticTextThanks->Wrap( -1 );
+    m_staticTextThanks->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
+    m_staticTextThanks->SetForegroundColour( wxColour( 0, 0, 0 ) );
+
+    bSizer1781->Add( m_staticTextThanks, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_buttonShowDonationDetails = new wxButton( m_panel391, wxID_ANY, _("Donation details"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonShowDonationDetails->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer1781->Add( m_buttonShowDonationDetails, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizer1841->Add( bSizer1781, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer1841->Add( 0, 0, 1, wxEXPAND, 5 );
+
+
+    m_panel391->SetSizer( bSizer1841 );
+    m_panel391->Layout();
+    bSizer1841->Fit( m_panel391 );
+    bSizer1831->Add( m_panel391, 0, wxEXPAND|wxALL, 5 );
+
+
+    m_panelThankYou->SetSizer( bSizer1831 );
+    m_panelThankYou->Layout();
+    bSizer1831->Fit( m_panelThankYou );
+    bSizer181->Add( m_panelThankYou, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+    m_panelDonate = new wxPanel( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panelDonate->SetBackgroundColour( wxColour( 153, 170, 187 ) );
+
+    wxBoxSizer* bSizer183;
+    bSizer183 = new wxBoxSizer( wxVERTICAL );
+
+    m_panel39 = new wxPanel( m_panelDonate, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panel39->SetBackgroundColour( wxColour( 221, 221, 255 ) );
+
+    wxBoxSizer* bSizer184;
+    bSizer184 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer184->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_bitmapDonate = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer184->Add( m_bitmapDonate, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxBoxSizer* bSizer178;
+    bSizer178 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticTextDonate = new wxStaticText( m_panel39, wxID_ANY, _("If you like FreeFileSync:"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
+    m_staticTextDonate->Wrap( -1 );
+    m_staticTextDonate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
+    m_staticTextDonate->SetForegroundColour( wxColour( 0, 0, 0 ) );
+
+    bSizer178->Add( m_staticTextDonate, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_buttonDonate = new wxButton( m_panel39, wxID_ANY, _("Donate with PayPal"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonDonate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
+    m_buttonDonate->SetToolTip( _("http://www.freefilesync.org/donate.php") );
+
+    bSizer178->Add( m_buttonDonate, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizer184->Add( bSizer178, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer184->Add( 0, 0, 1, wxEXPAND, 5 );
+
+
+    m_panel39->SetSizer( bSizer184 );
+    m_panel39->Layout();
+    bSizer184->Fit( m_panel39 );
+    bSizer183->Add( m_panel39, 0, wxEXPAND|wxALL, 5 );
+
+
+    m_panelDonate->SetSizer( bSizer183 );
+    m_panelDonate->Layout();
+    bSizer183->Fit( m_panelDonate );
+    bSizer181->Add( m_panelDonate, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+    wxBoxSizer* bSizer186;
+    bSizer186 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText94 = new wxStaticText( m_panel41, wxID_ANY, _("Feedback and suggestions are welcome"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText94->Wrap( -1 );
+    bSizer186->Add( m_staticText94, 0, wxALL, 5 );
+
+    wxBoxSizer* bSizer166;
+    bSizer166 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer166->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_bitmapHomepage = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_bitmapHomepage->SetToolTip( _("Home page") );
+
+    bSizer166->Add( m_bitmapHomepage, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+    m_hyperlink1 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("FreeFileSync.org"), wxT("http://www.freefilesync.org/"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink1->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, true, wxEmptyString ) );
+    m_hyperlink1->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+    m_hyperlink1->SetToolTip( _("http://www.freefilesync.org") );
+
+    bSizer166->Add( m_hyperlink1, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer166->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_bitmapEmail = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_bitmapEmail->SetToolTip( _("Email") );
+
+    bSizer166->Add( m_bitmapEmail, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+    m_hyperlink2 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("zenju@freefilesync.org"), wxT("mailto:zenju@freefilesync.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink2->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, true, wxEmptyString ) );
+    m_hyperlink2->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+    m_hyperlink2->SetToolTip( _("mailto:zenju@freefilesync.org") );
+
+    bSizer166->Add( m_hyperlink2, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer166->Add( 0, 0, 1, wxEXPAND, 5 );
+
+
+    bSizer186->Add( bSizer166, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+
+    bSizer181->Add( bSizer186, 0, wxALL|wxEXPAND, 5 );
+
+    m_staticline34 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer181->Add( m_staticline34, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer185;
+    bSizer185 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText93 = new wxStaticText( m_panel41, wxID_ANY, _("Published under the GNU General Public License"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText93->Wrap( -1 );
+    bSizer185->Add( m_staticText93, 0, wxALL, 5 );
+
+    wxBoxSizer* bSizer1671;
+    bSizer1671 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapGpl = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    bSizer1671->Add( m_bitmapGpl, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_hyperlink5 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("http://www.gnu.org/licenses/gpl-3.0"), wxT("http://www.gnu.org/licenses/gpl-3.0"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink5->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    bSizer1671->Add( m_hyperlink5, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer185->Add( bSizer1671, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+
+    bSizer181->Add( bSizer185, 0, wxALL|wxEXPAND, 5 );
+
+
+    bSizer174->Add( bSizer181, 0, 0, 5 );
+
+    m_staticline37 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizer174->Add( m_staticline37, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer177;
+    bSizer177 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText54 = new wxStaticText( m_panel41, wxID_ANY, _("Many thanks for localization:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText54->Wrap( 200 );
+    m_staticText54->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer177->Add( m_staticText54, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+
+
+    bSizer177->Add( 0, 5, 0, 0, 5 );
+
+    m_scrolledWindowTranslators = new wxScrolledWindow( m_panel41, wxID_ANY, wxDefaultPosition, wxSize( -1, -1 ), wxVSCROLL );
+    m_scrolledWindowTranslators->SetScrollRate( 10, 10 );
+    m_scrolledWindowTranslators->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+    m_scrolledWindowTranslators->SetMinSize( wxSize( 220, -1 ) );
+
+    fgSizerTranslators = new wxFlexGridSizer( 0, 2, 2, 10 );
+    fgSizerTranslators->SetFlexibleDirection( wxBOTH );
+    fgSizerTranslators->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+
+    m_scrolledWindowTranslators->SetSizer( fgSizerTranslators );
+    m_scrolledWindowTranslators->Layout();
+    fgSizerTranslators->Fit( m_scrolledWindowTranslators );
+    bSizer177->Add( m_scrolledWindowTranslators, 1, wxLEFT|wxEXPAND, 5 );
+
+
+    bSizer174->Add( bSizer177, 0, wxEXPAND|wxTOP|wxLEFT, 5 );
+
+
+    bSizer162->Add( bSizer174, 0, 0, 5 );
+
+
+    m_panel41->SetSizer( bSizer162 );
+    m_panel41->Layout();
+    bSizer162->Fit( m_panel41 );
+    bSizer31->Add( m_panel41, 0, wxEXPAND, 5 );
+
+    m_staticline36 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer31->Add( m_staticline36, 0, wxEXPAND, 5 );
+
+    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+
+    m_buttonClose = new wxButton( this, wxID_OK, _("Close"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_buttonClose->SetDefault();
+    bSizerStdButtons->Add( m_buttonClose, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer31->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
+
+
+    this->SetSizer( bSizer31 );
+    this->Layout();
+    bSizer31->Fit( this );
+
+    this->Centre( wxBOTH );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( AboutDlgGenerated::OnClose ) );
+    m_buttonShowDonationDetails->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnShowDonationDetails ), NULL, this );
+    m_buttonDonate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnDonate ), NULL, this );
+    m_buttonClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnOK ), NULL, this );
 }
 
 AboutDlgGenerated::~AboutDlgGenerated()
@@ -4327,60 +4347,60 @@ AboutDlgGenerated::~AboutDlgGenerated()
 
 DownloadProgressDlgGenerated::DownloadProgressDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-	
-	wxBoxSizer* bSizer24;
-	bSizer24 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer72;
-	bSizer72 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapDownloading = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer72->Add( m_bitmapDownloading, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
-	
-	m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0|wxNO_BORDER );
-	m_staticTextHeader->Wrap( 460 );
-	bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_VERTICAL|wxALL, 10 );
-	
-	
-	bSizer72->Add( 20, 0, 0, 0, 5 );
-	
-	
-	bSizer24->Add( bSizer72, 0, 0, 5 );
-	
-	wxBoxSizer* bSizer212;
-	bSizer212 = new wxBoxSizer( wxVERTICAL );
-	
-	m_gaugeProgress = new wxGauge( this, wxID_ANY, 100, wxDefaultPosition, wxDefaultSize, wxGA_HORIZONTAL );
-	m_gaugeProgress->SetValue( 0 ); 
-	bSizer212->Add( m_gaugeProgress, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-	
-	m_staticTextDetails = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextDetails->Wrap( -1 );
-	bSizer212->Add( m_staticTextDetails, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
-	
-	
-	bSizer24->Add( bSizer212, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	m_staticline9 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer24->Add( m_staticline9, 0, wxEXPAND, 5 );
-	
-	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_buttonCancel->SetDefault(); 
-	bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	
-	bSizer24->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
-	
-	
-	this->SetSizer( bSizer24 );
-	this->Layout();
-	bSizer24->Fit( this );
-	
-	// Connect Events
-	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DownloadProgressDlgGenerated::OnCancel ), NULL, this );
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+
+    wxBoxSizer* bSizer24;
+    bSizer24 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer72;
+    bSizer72 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapDownloading = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer72->Add( m_bitmapDownloading, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
+
+    m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0|wxNO_BORDER );
+    m_staticTextHeader->Wrap( 460 );
+    bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_VERTICAL|wxALL, 10 );
+
+
+    bSizer72->Add( 20, 0, 0, 0, 5 );
+
+
+    bSizer24->Add( bSizer72, 0, 0, 5 );
+
+    wxBoxSizer* bSizer212;
+    bSizer212 = new wxBoxSizer( wxVERTICAL );
+
+    m_gaugeProgress = new wxGauge( this, wxID_ANY, 100, wxDefaultPosition, wxDefaultSize, wxGA_HORIZONTAL );
+    m_gaugeProgress->SetValue( 0 );
+    bSizer212->Add( m_gaugeProgress, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+    m_staticTextDetails = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextDetails->Wrap( -1 );
+    bSizer212->Add( m_staticTextDetails, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+
+
+    bSizer24->Add( bSizer212, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+    m_staticline9 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer24->Add( m_staticline9, 0, wxEXPAND, 5 );
+
+    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+
+    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_buttonCancel->SetDefault();
+    bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+
+    bSizer24->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
+
+
+    this->SetSizer( bSizer24 );
+    this->Layout();
+    bSizer24->Fit( this );
+
+    // Connect Events
+    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DownloadProgressDlgGenerated::OnCancel ), NULL, this );
 }
 
 DownloadProgressDlgGenerated::~DownloadProgressDlgGenerated()
@@ -4389,177 +4409,177 @@ DownloadProgressDlgGenerated::~DownloadProgressDlgGenerated()
 
 ActivationDlgGenerated::ActivationDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
-	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer54;
-	bSizer54 = new wxBoxSizer( wxVERTICAL );
-	
-	m_panel35 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panel35->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	wxBoxSizer* bSizer172;
-	bSizer172 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer165;
-	bSizer165 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapActivation = new wxStaticBitmap( m_panel35, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	bSizer165->Add( m_bitmapActivation, 0, wxALL, 10 );
-	
-	
-	bSizer165->Add( 0, 120, 0, 0, 5 );
-	
-	wxBoxSizer* bSizer16;
-	bSizer16 = new wxBoxSizer( wxVERTICAL );
-	
-	
-	bSizer16->Add( 0, 10, 0, 0, 5 );
-	
-	m_textCtrlLastError = new wxTextCtrl( m_panel35, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxNO_BORDER );
-	bSizer16->Add( m_textCtrlLastError, 1, wxEXPAND, 5 );
-	
-	
-	bSizer16->Add( 0, 5, 0, 0, 5 );
-	
-	
-	bSizer165->Add( bSizer16, 1, wxEXPAND, 5 );
-	
-	
-	bSizer172->Add( bSizer165, 1, wxEXPAND, 5 );
-	
-	m_staticTextMain = new wxStaticText( m_panel35, wxID_ANY, _("Activate the FreeFileSync Donation Edition by one of the following methods:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextMain->Wrap( -1 );
-	bSizer172->Add( m_staticTextMain, 0, wxBOTTOM|wxRIGHT|wxLEFT, 10 );
-	
-	
-	m_panel35->SetSizer( bSizer172 );
-	m_panel35->Layout();
-	bSizer172->Fit( m_panel35 );
-	bSizer54->Add( m_panel35, 1, wxEXPAND, 5 );
-	
-	m_staticline181 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer54->Add( m_staticline181, 0, wxEXPAND|wxBOTTOM, 5 );
-	
-	m_staticline18111 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer54->Add( m_staticline18111, 0, wxEXPAND|wxTOP, 5 );
-	
-	m_panel3511 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panel3511->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	wxBoxSizer* bSizer263;
-	bSizer263 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer234;
-	bSizer234 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText136 = new wxStaticText( m_panel3511, wxID_ANY, _("1. Activate via internet now:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText136->Wrap( -1 );
-	bSizer234->Add( m_staticText136, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	m_buttonActivateOnline = new wxButton( m_panel3511, wxID_ANY, _("Activate online"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_buttonActivateOnline->SetDefault(); 
-	m_buttonActivateOnline->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer234->Add( m_buttonActivateOnline, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	
-	bSizer263->Add( bSizer234, 0, wxEXPAND|wxALL, 5 );
-	
-	
-	m_panel3511->SetSizer( bSizer263 );
-	m_panel3511->Layout();
-	bSizer263->Fit( m_panel3511 );
-	bSizer54->Add( m_panel3511, 0, wxEXPAND, 5 );
-	
-	m_staticline181111 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer54->Add( m_staticline181111, 0, wxEXPAND|wxBOTTOM, 5 );
-	
-	m_staticline181112 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer54->Add( m_staticline181112, 0, wxEXPAND|wxTOP, 5 );
-	
-	m_panel351 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panel351->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	wxBoxSizer* bSizer266;
-	bSizer266 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer237;
-	bSizer237 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer236;
-	bSizer236 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText1361 = new wxStaticText( m_panel351, wxID_ANY, _("2. Retrieve an offline activation key from the following URL:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText1361->Wrap( -1 );
-	bSizer236->Add( m_staticText1361, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	m_buttonCopyUrl = new wxButton( m_panel351, wxID_ANY, _("&Copy to clipboard"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_buttonCopyUrl->SetDefault(); 
-	m_buttonCopyUrl->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer236->Add( m_buttonCopyUrl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	
-	bSizer237->Add( bSizer236, 0, wxEXPAND, 5 );
-	
-	m_textCtrlManualActivationUrl = new wxTextCtrl( m_panel351, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 220,-1 ), wxTE_MULTILINE|wxTE_READONLY|wxWANTS_CHARS );
-	m_textCtrlManualActivationUrl->SetMaxLength( 0 ); 
-	bSizer237->Add( m_textCtrlManualActivationUrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	wxBoxSizer* bSizer235;
-	bSizer235 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText13611 = new wxStaticText( m_panel351, wxID_ANY, _("Enter activation key:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText13611->Wrap( -1 );
-	bSizer235->Add( m_staticText13611, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	m_textCtrlOfflineActivationKey = new wxTextCtrl( m_panel351, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 220,-1 ), wxTE_PROCESS_ENTER|wxWANTS_CHARS );
-	m_textCtrlOfflineActivationKey->SetMaxLength( 0 ); 
-	bSizer235->Add( m_textCtrlOfflineActivationKey, 1, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonActivateOffline = new wxButton( m_panel351, wxID_ANY, _("Activate offline"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_buttonActivateOffline->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer235->Add( m_buttonActivateOffline, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer237->Add( bSizer235, 0, wxEXPAND, 5 );
-	
-	
-	bSizer266->Add( bSizer237, 0, wxALL|wxEXPAND, 5 );
-	
-	
-	m_panel351->SetSizer( bSizer266 );
-	m_panel351->Layout();
-	bSizer266->Fit( m_panel351 );
-	bSizer54->Add( m_panel351, 0, wxEXPAND, 5 );
-	
-	m_staticline13 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer54->Add( m_staticline13, 0, wxEXPAND, 5 );
-	
-	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-	
-	
-	bSizer54->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
-	
-	
-	this->SetSizer( bSizer54 );
-	this->Layout();
-	bSizer54->Fit( this );
-	
-	this->Centre( wxBOTH );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( ActivationDlgGenerated::OnClose ) );
-	m_buttonActivateOnline->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ActivationDlgGenerated::OnActivateOnline ), NULL, this );
-	m_buttonCopyUrl->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ActivationDlgGenerated::OnCopyUrl ), NULL, this );
-	m_textCtrlOfflineActivationKey->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( ActivationDlgGenerated::OnOfflineActivationEnter ), NULL, this );
-	m_buttonActivateOffline->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ActivationDlgGenerated::OnActivateOffline ), NULL, this );
-	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ActivationDlgGenerated::OnCancel ), NULL, this );
+    this->SetSizeHints( wxSize( -1, -1 ), wxDefaultSize );
+    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    wxBoxSizer* bSizer54;
+    bSizer54 = new wxBoxSizer( wxVERTICAL );
+
+    m_panel35 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panel35->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    wxBoxSizer* bSizer172;
+    bSizer172 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer165;
+    bSizer165 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapActivation = new wxStaticBitmap( m_panel35, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    bSizer165->Add( m_bitmapActivation, 0, wxALL, 10 );
+
+
+    bSizer165->Add( 0, 120, 0, 0, 5 );
+
+    wxBoxSizer* bSizer16;
+    bSizer16 = new wxBoxSizer( wxVERTICAL );
+
+
+    bSizer16->Add( 0, 10, 0, 0, 5 );
+
+    m_textCtrlLastError = new wxTextCtrl( m_panel35, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxNO_BORDER );
+    bSizer16->Add( m_textCtrlLastError, 1, wxEXPAND, 5 );
+
+
+    bSizer16->Add( 0, 5, 0, 0, 5 );
+
+
+    bSizer165->Add( bSizer16, 1, wxEXPAND, 5 );
+
+
+    bSizer172->Add( bSizer165, 1, wxEXPAND, 5 );
+
+    m_staticTextMain = new wxStaticText( m_panel35, wxID_ANY, _("Activate the FreeFileSync Donation Edition by one of the following methods:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextMain->Wrap( -1 );
+    bSizer172->Add( m_staticTextMain, 0, wxBOTTOM|wxRIGHT|wxLEFT, 10 );
+
+
+    m_panel35->SetSizer( bSizer172 );
+    m_panel35->Layout();
+    bSizer172->Fit( m_panel35 );
+    bSizer54->Add( m_panel35, 1, wxEXPAND, 5 );
+
+    m_staticline181 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer54->Add( m_staticline181, 0, wxEXPAND|wxBOTTOM, 5 );
+
+    m_staticline18111 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer54->Add( m_staticline18111, 0, wxEXPAND|wxTOP, 5 );
+
+    m_panel3511 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panel3511->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    wxBoxSizer* bSizer263;
+    bSizer263 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer234;
+    bSizer234 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText136 = new wxStaticText( m_panel3511, wxID_ANY, _("1. Activate via internet now:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText136->Wrap( -1 );
+    bSizer234->Add( m_staticText136, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    m_buttonActivateOnline = new wxButton( m_panel3511, wxID_ANY, _("Activate online"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_buttonActivateOnline->SetDefault();
+    m_buttonActivateOnline->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer234->Add( m_buttonActivateOnline, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+
+    bSizer263->Add( bSizer234, 0, wxEXPAND|wxALL, 5 );
+
+
+    m_panel3511->SetSizer( bSizer263 );
+    m_panel3511->Layout();
+    bSizer263->Fit( m_panel3511 );
+    bSizer54->Add( m_panel3511, 0, wxEXPAND, 5 );
+
+    m_staticline181111 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer54->Add( m_staticline181111, 0, wxEXPAND|wxBOTTOM, 5 );
+
+    m_staticline181112 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer54->Add( m_staticline181112, 0, wxEXPAND|wxTOP, 5 );
+
+    m_panel351 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panel351->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    wxBoxSizer* bSizer266;
+    bSizer266 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer237;
+    bSizer237 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer236;
+    bSizer236 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText1361 = new wxStaticText( m_panel351, wxID_ANY, _("2. Retrieve an offline activation key from the following URL:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText1361->Wrap( -1 );
+    bSizer236->Add( m_staticText1361, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    m_buttonCopyUrl = new wxButton( m_panel351, wxID_ANY, _("&Copy to clipboard"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_buttonCopyUrl->SetDefault();
+    m_buttonCopyUrl->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer236->Add( m_buttonCopyUrl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+
+    bSizer237->Add( bSizer236, 0, wxEXPAND, 5 );
+
+    m_textCtrlManualActivationUrl = new wxTextCtrl( m_panel351, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 220, -1 ), wxTE_MULTILINE|wxTE_READONLY|wxWANTS_CHARS );
+    m_textCtrlManualActivationUrl->SetMaxLength( 0 );
+    bSizer237->Add( m_textCtrlManualActivationUrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+    wxBoxSizer* bSizer235;
+    bSizer235 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText13611 = new wxStaticText( m_panel351, wxID_ANY, _("Enter activation key:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText13611->Wrap( -1 );
+    bSizer235->Add( m_staticText13611, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    m_textCtrlOfflineActivationKey = new wxTextCtrl( m_panel351, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 220, -1 ), wxTE_PROCESS_ENTER|wxWANTS_CHARS );
+    m_textCtrlOfflineActivationKey->SetMaxLength( 0 );
+    bSizer235->Add( m_textCtrlOfflineActivationKey, 1, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonActivateOffline = new wxButton( m_panel351, wxID_ANY, _("Activate offline"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_buttonActivateOffline->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer235->Add( m_buttonActivateOffline, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer237->Add( bSizer235, 0, wxEXPAND, 5 );
+
+
+    bSizer266->Add( bSizer237, 0, wxALL|wxEXPAND, 5 );
+
+
+    m_panel351->SetSizer( bSizer266 );
+    m_panel351->Layout();
+    bSizer266->Fit( m_panel351 );
+    bSizer54->Add( m_panel351, 0, wxEXPAND, 5 );
+
+    m_staticline13 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer54->Add( m_staticline13, 0, wxEXPAND, 5 );
+
+    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+
+    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+
+
+    bSizer54->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
+
+
+    this->SetSizer( bSizer54 );
+    this->Layout();
+    bSizer54->Fit( this );
+
+    this->Centre( wxBOTH );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( ActivationDlgGenerated::OnClose ) );
+    m_buttonActivateOnline->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ActivationDlgGenerated::OnActivateOnline ), NULL, this );
+    m_buttonCopyUrl->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ActivationDlgGenerated::OnCopyUrl ), NULL, this );
+    m_textCtrlOfflineActivationKey->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( ActivationDlgGenerated::OnOfflineActivationEnter ), NULL, this );
+    m_buttonActivateOffline->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ActivationDlgGenerated::OnActivateOffline ), NULL, this );
+    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ActivationDlgGenerated::OnCancel ), NULL, this );
 }
 
 ActivationDlgGenerated::~ActivationDlgGenerated()
diff --git a/FreeFileSync/Source/ui/gui_generated.h b/FreeFileSync/Source/ui/gui_generated.h
index 35b004c8..99adf914 100755
--- a/FreeFileSync/Source/ui/gui_generated.h
+++ b/FreeFileSync/Source/ui/gui_generated.h
@@ -14,10 +14,10 @@
 class FolderHistoryBox;
 class OnCompletionBox;
 class ToggleButton;
-namespace zen{ class BitmapTextButton; }
-namespace zen{ class Graph2D; }
-namespace zen{ class Grid; }
-namespace zen{ class TripleSplitter; }
+namespace zen { class BitmapTextButton; }
+namespace zen { class Graph2D; }
+namespace zen { class Grid; }
+namespace zen { class TripleSplitter; }
 
 #include <wx/string.h>
 #include <wx/bitmap.h>
@@ -61,1066 +61,1074 @@ namespace zen{ class TripleSplitter; }
 ///////////////////////////////////////////////////////////////////////////////
 /// Class MainDialogGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class MainDialogGenerated : public wxFrame 
+class MainDialogGenerated : public wxFrame
 {
-	private:
-	
-	protected:
-		wxMenuBar* m_menubar1;
-		wxMenu* m_menuFile;
-		wxMenuItem* m_menuItemNew;
-		wxMenuItem* m_menuItemLoad;
-		wxMenuItem* m_menuItemSave;
-		wxMenuItem* m_menuItemSaveAs;
-		wxMenuItem* m_menuItemSaveAsBatch;
-		wxMenu* m_menu4;
-		wxMenuItem* m_menuItemCompare;
-		wxMenuItem* m_menuItemCompSettings;
-		wxMenuItem* m_menuItemFilter;
-		wxMenuItem* m_menuItemSyncSettings;
-		wxMenuItem* m_menuItemSynchronize;
-		wxMenu* m_menuTools;
-		wxMenuItem* m_menuItemOptions;
-		wxMenu* m_menuLanguages;
-		wxMenuItem* m_menuItemFind;
-		wxMenu* m_menuHelp;
-		wxMenuItem* m_menuItemHelp;
-		wxMenuItem* m_menuItemCheckVersionNow;
-		wxMenuItem* m_menuItemCheckVersionAuto;
-		wxMenuItem* m_menuItemAbout;
-		wxBoxSizer* bSizerPanelHolder;
-		wxPanel* m_panelTopButtons;
-		wxBoxSizer* bSizerTopButtons;
-		zen::BitmapTextButton* m_buttonCancel;
-		zen::BitmapTextButton* m_buttonCompare;
-		wxBitmapButton* m_bpButtonCmpConfig;
-		wxBitmapButton* m_bpButtonCmpContext;
-		wxBitmapButton* m_bpButtonFilter;
-		wxBitmapButton* m_bpButtonFilterContext;
-		wxBitmapButton* m_bpButtonSyncConfig;
-		wxBitmapButton* m_bpButtonSyncContext;
-		zen::BitmapTextButton* m_buttonSync;
-		wxPanel* m_panelDirectoryPairs;
-		wxStaticText* m_staticTextResolvedPathL;
-		wxBitmapButton* m_bpButtonAddPair;
-		wxButton* m_buttonSelectFolderLeft;
-		wxPanel* m_panelTopCenter;
-		wxBitmapButton* m_bpButtonSwapSides;
-		wxStaticText* m_staticTextResolvedPathR;
-		wxButton* m_buttonSelectFolderRight;
-		wxScrolledWindow* m_scrolledWindowFolderPairs;
-		wxBoxSizer* bSizerAddFolderPairs;
-		zen::Grid* m_gridNavi;
-		wxPanel* m_panelCenter;
-		zen::TripleSplitter* m_splitterMain;
-		zen::Grid* m_gridMainL;
-		zen::Grid* m_gridMainC;
-		zen::Grid* m_gridMainR;
-		wxPanel* m_panelStatusBar;
-		wxBoxSizer* bSizerFileStatus;
-		wxBoxSizer* bSizerStatusLeft;
-		wxBoxSizer* bSizerStatusLeftDirectories;
-		wxStaticBitmap* m_bitmapSmallDirectoryLeft;
-		wxStaticText* m_staticTextStatusLeftDirs;
-		wxBoxSizer* bSizerStatusLeftFiles;
-		wxStaticBitmap* m_bitmapSmallFileLeft;
-		wxStaticText* m_staticTextStatusLeftFiles;
-		wxStaticText* m_staticTextStatusLeftBytes;
-		wxStaticLine* m_staticline9;
-		wxStaticText* m_staticTextStatusCenter;
-		wxBoxSizer* bSizerStatusRight;
-		wxStaticLine* m_staticline10;
-		wxBoxSizer* bSizerStatusRightDirectories;
-		wxStaticBitmap* m_bitmapSmallDirectoryRight;
-		wxStaticText* m_staticTextStatusRightDirs;
-		wxBoxSizer* bSizerStatusRightFiles;
-		wxStaticBitmap* m_bitmapSmallFileRight;
-		wxStaticText* m_staticTextStatusRightFiles;
-		wxStaticText* m_staticTextStatusRightBytes;
-		wxStaticText* m_staticTextFullStatus;
-		wxPanel* m_panelSearch;
-		wxBitmapButton* m_bpButtonHideSearch;
-		wxStaticText* m_staticText101;
-		wxTextCtrl* m_textCtrlSearchTxt;
-		wxCheckBox* m_checkBoxMatchCase;
-		wxPanel* m_panelConfig;
-		wxBoxSizer* bSizerConfig;
-		wxBitmapButton* m_bpButtonNew;
-		wxStaticText* m_staticText951;
-		wxBitmapButton* m_bpButtonOpen;
-		wxStaticText* m_staticText95;
-		wxBitmapButton* m_bpButtonSave;
-		wxStaticText* m_staticText961;
-		wxBitmapButton* m_bpButtonSaveAs;
-		wxBitmapButton* m_bpButtonSaveAsBatch;
-		wxStaticText* m_staticText97;
-		wxListBox* m_listBoxHistory;
-		wxPanel* m_panelViewFilter;
-		wxBoxSizer* bSizerViewFilter;
-		wxStaticText* m_staticTextViewType;
-		ToggleButton* m_bpButtonViewTypeSyncAction;
-		ToggleButton* m_bpButtonShowExcluded;
-		wxStaticText* m_staticTextSelectView;
-		ToggleButton* m_bpButtonShowDeleteLeft;
-		ToggleButton* m_bpButtonShowUpdateLeft;
-		ToggleButton* m_bpButtonShowCreateLeft;
-		ToggleButton* m_bpButtonShowLeftOnly;
-		ToggleButton* m_bpButtonShowLeftNewer;
-		ToggleButton* m_bpButtonShowEqual;
-		ToggleButton* m_bpButtonShowDoNothing;
-		ToggleButton* m_bpButtonShowDifferent;
-		ToggleButton* m_bpButtonShowRightNewer;
-		ToggleButton* m_bpButtonShowRightOnly;
-		ToggleButton* m_bpButtonShowCreateRight;
-		ToggleButton* m_bpButtonShowUpdateRight;
-		ToggleButton* m_bpButtonShowDeleteRight;
-		ToggleButton* m_bpButtonShowConflict;
-		wxStaticText* m_staticText96;
-		wxPanel* m_panelStatistics;
-		wxBoxSizer* bSizer1801;
-		wxStaticBitmap* m_bitmapDeleteLeft;
-		wxStaticText* m_staticTextDeleteLeft;
-		wxStaticBitmap* m_bitmapUpdateLeft;
-		wxStaticText* m_staticTextUpdateLeft;
-		wxStaticBitmap* m_bitmapCreateLeft;
-		wxStaticText* m_staticTextCreateLeft;
-		wxStaticBitmap* m_bitmapData;
-		wxStaticText* m_staticTextData;
-		wxStaticBitmap* m_bitmapCreateRight;
-		wxStaticText* m_staticTextCreateRight;
-		wxStaticBitmap* m_bitmapUpdateRight;
-		wxStaticText* m_staticTextUpdateRight;
-		wxStaticBitmap* m_bitmapDeleteRight;
-		wxStaticText* m_staticTextDeleteRight;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnConfigNew( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnConfigLoad( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnConfigSave( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnConfigSaveAs( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSaveAsBatchJob( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnMenuQuit( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCompare( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCmpSettings( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnConfigureFilter( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSyncSettings( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnStartSync( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnMenuOptions( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnMenuFindItem( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnMenuResetLayout( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnMenuExportFileList( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnShowHelp( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnMenuCheckVersion( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnMenuCheckVersionAutomatically( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnMenuAbout( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCompSettingsContext( wxMouseEvent& event ) { event.Skip(); }
-		virtual void OnCompSettingsContext( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnGlobalFilterContext( wxMouseEvent& event ) { event.Skip(); }
-		virtual void OnGlobalFilterContext( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSyncSettingsContext( wxMouseEvent& event ) { event.Skip(); }
-		virtual void OnSyncSettingsContext( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnTopFolderPairAdd( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnTopFolderPairRemove( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSwapSides( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnTopLocalCompCfg( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnTopLocalFilterCfg( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnTopLocalSyncCfg( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnHideSearchPanel( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSearchGridEnter( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCfgHistoryKeyEvent( wxKeyEvent& event ) { event.Skip(); }
-		virtual void OnLoadFromHistory( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnLoadFromHistoryDoubleClick( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCfgHistoryRightClick( wxMouseEvent& event ) { event.Skip(); }
-		virtual void OnToggleViewType( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnToggleViewButton( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnViewButtonRightClick( wxMouseEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		wxPanel* m_panelTopLeft;
-		wxBitmapButton* m_bpButtonRemovePair;
-		FolderHistoryBox* m_folderPathLeft;
-		wxBitmapButton* m_bpButtonSelectAltFolderLeft;
-		wxBitmapButton* m_bpButtonAltCompCfg;
-		wxBitmapButton* m_bpButtonLocalFilter;
-		wxBitmapButton* m_bpButtonAltSyncCfg;
-		wxPanel* m_panelTopRight;
-		FolderHistoryBox* m_folderPathRight;
-		wxBitmapButton* m_bpButtonSelectAltFolderRight;
-		wxBoxSizer* bSizerStatistics;
-		wxBoxSizer* bSizerData;
-		
-		MainDialogGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("dummy"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 900,600 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
-		
-		~MainDialogGenerated();
-	
+private:
+
+protected:
+    wxMenuBar* m_menubar1;
+    wxMenu* m_menuFile;
+    wxMenuItem* m_menuItemNew;
+    wxMenuItem* m_menuItemLoad;
+    wxMenuItem* m_menuItemSave;
+    wxMenuItem* m_menuItemSaveAs;
+    wxMenuItem* m_menuItemSaveAsBatch;
+    wxMenu* m_menu4;
+    wxMenuItem* m_menuItemCompare;
+    wxMenuItem* m_menuItemCompSettings;
+    wxMenuItem* m_menuItemFilter;
+    wxMenuItem* m_menuItemSyncSettings;
+    wxMenuItem* m_menuItemSynchronize;
+    wxMenu* m_menuTools;
+    wxMenuItem* m_menuItemOptions;
+    wxMenu* m_menuLanguages;
+    wxMenuItem* m_menuItemFind;
+    wxMenuItem* m_menuItemShowMain;
+    wxMenuItem* m_menuItemShowFolders;
+    wxMenuItem* m_menuItemShowViewFilter;
+    wxMenuItem* m_menuItemShowConfig;
+    wxMenuItem* m_menuItemShowOverview;
+    wxMenu* m_menuHelp;
+    wxMenuItem* m_menuItemHelp;
+    wxMenuItem* m_menuItemCheckVersionNow;
+    wxMenuItem* m_menuItemCheckVersionAuto;
+    wxMenuItem* m_menuItemAbout;
+    wxBoxSizer* bSizerPanelHolder;
+    wxPanel* m_panelTopButtons;
+    wxBoxSizer* bSizerTopButtons;
+    zen::BitmapTextButton* m_buttonCancel;
+    zen::BitmapTextButton* m_buttonCompare;
+    wxBitmapButton* m_bpButtonCmpConfig;
+    wxBitmapButton* m_bpButtonCmpContext;
+    wxBitmapButton* m_bpButtonFilter;
+    wxBitmapButton* m_bpButtonFilterContext;
+    wxBitmapButton* m_bpButtonSyncConfig;
+    wxBitmapButton* m_bpButtonSyncContext;
+    zen::BitmapTextButton* m_buttonSync;
+    wxPanel* m_panelDirectoryPairs;
+    wxStaticText* m_staticTextResolvedPathL;
+    wxBitmapButton* m_bpButtonAddPair;
+    wxButton* m_buttonSelectFolderLeft;
+    wxPanel* m_panelTopCenter;
+    wxBitmapButton* m_bpButtonSwapSides;
+    wxStaticText* m_staticTextResolvedPathR;
+    wxButton* m_buttonSelectFolderRight;
+    wxScrolledWindow* m_scrolledWindowFolderPairs;
+    wxBoxSizer* bSizerAddFolderPairs;
+    zen::Grid* m_gridOverview;
+    wxPanel* m_panelCenter;
+    zen::TripleSplitter* m_splitterMain;
+    zen::Grid* m_gridMainL;
+    zen::Grid* m_gridMainC;
+    zen::Grid* m_gridMainR;
+    wxPanel* m_panelStatusBar;
+    wxBoxSizer* bSizerFileStatus;
+    wxBoxSizer* bSizerStatusLeft;
+    wxBoxSizer* bSizerStatusLeftDirectories;
+    wxStaticBitmap* m_bitmapSmallDirectoryLeft;
+    wxStaticText* m_staticTextStatusLeftDirs;
+    wxBoxSizer* bSizerStatusLeftFiles;
+    wxStaticBitmap* m_bitmapSmallFileLeft;
+    wxStaticText* m_staticTextStatusLeftFiles;
+    wxStaticText* m_staticTextStatusLeftBytes;
+    wxStaticLine* m_staticline9;
+    wxStaticText* m_staticTextStatusCenter;
+    wxBoxSizer* bSizerStatusRight;
+    wxStaticLine* m_staticline10;
+    wxBoxSizer* bSizerStatusRightDirectories;
+    wxStaticBitmap* m_bitmapSmallDirectoryRight;
+    wxStaticText* m_staticTextStatusRightDirs;
+    wxBoxSizer* bSizerStatusRightFiles;
+    wxStaticBitmap* m_bitmapSmallFileRight;
+    wxStaticText* m_staticTextStatusRightFiles;
+    wxStaticText* m_staticTextStatusRightBytes;
+    wxStaticText* m_staticTextFullStatus;
+    wxPanel* m_panelSearch;
+    wxBitmapButton* m_bpButtonHideSearch;
+    wxStaticText* m_staticText101;
+    wxTextCtrl* m_textCtrlSearchTxt;
+    wxCheckBox* m_checkBoxMatchCase;
+    wxPanel* m_panelConfig;
+    wxBoxSizer* bSizerConfig;
+    wxBitmapButton* m_bpButtonNew;
+    wxStaticText* m_staticText951;
+    wxBitmapButton* m_bpButtonOpen;
+    wxStaticText* m_staticText95;
+    wxBitmapButton* m_bpButtonSave;
+    wxStaticText* m_staticText961;
+    wxBitmapButton* m_bpButtonSaveAs;
+    wxBitmapButton* m_bpButtonSaveAsBatch;
+    wxStaticText* m_staticText97;
+    wxListBox* m_listBoxHistory;
+    wxPanel* m_panelViewFilter;
+    wxBoxSizer* bSizerViewFilter;
+    wxStaticText* m_staticTextViewType;
+    ToggleButton* m_bpButtonViewTypeSyncAction;
+    ToggleButton* m_bpButtonShowExcluded;
+    wxStaticText* m_staticTextSelectView;
+    ToggleButton* m_bpButtonShowDeleteLeft;
+    ToggleButton* m_bpButtonShowUpdateLeft;
+    ToggleButton* m_bpButtonShowCreateLeft;
+    ToggleButton* m_bpButtonShowLeftOnly;
+    ToggleButton* m_bpButtonShowLeftNewer;
+    ToggleButton* m_bpButtonShowEqual;
+    ToggleButton* m_bpButtonShowDoNothing;
+    ToggleButton* m_bpButtonShowDifferent;
+    ToggleButton* m_bpButtonShowRightNewer;
+    ToggleButton* m_bpButtonShowRightOnly;
+    ToggleButton* m_bpButtonShowCreateRight;
+    ToggleButton* m_bpButtonShowUpdateRight;
+    ToggleButton* m_bpButtonShowDeleteRight;
+    ToggleButton* m_bpButtonShowConflict;
+    wxStaticText* m_staticText96;
+    wxPanel* m_panelStatistics;
+    wxBoxSizer* bSizer1801;
+    wxStaticBitmap* m_bitmapDeleteLeft;
+    wxStaticText* m_staticTextDeleteLeft;
+    wxStaticBitmap* m_bitmapUpdateLeft;
+    wxStaticText* m_staticTextUpdateLeft;
+    wxStaticBitmap* m_bitmapCreateLeft;
+    wxStaticText* m_staticTextCreateLeft;
+    wxStaticBitmap* m_bitmapData;
+    wxStaticText* m_staticTextData;
+    wxStaticBitmap* m_bitmapCreateRight;
+    wxStaticText* m_staticTextCreateRight;
+    wxStaticBitmap* m_bitmapUpdateRight;
+    wxStaticText* m_staticTextUpdateRight;
+    wxStaticBitmap* m_bitmapDeleteRight;
+    wxStaticText* m_staticTextDeleteRight;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnConfigNew( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnConfigLoad( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnConfigSave( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnConfigSaveAs( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSaveAsBatchJob( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnMenuQuit( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCompare( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCmpSettings( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnConfigureFilter( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSyncSettings( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnStartSync( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnMenuOptions( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnMenuFindItem( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnMenuExportFileList( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnMenuResetLayout( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnShowHelp( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnMenuCheckVersion( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnMenuCheckVersionAutomatically( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnMenuAbout( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCompSettingsContext( wxMouseEvent& event ) { event.Skip(); }
+    virtual void OnCompSettingsContext( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnGlobalFilterContext( wxMouseEvent& event ) { event.Skip(); }
+    virtual void OnGlobalFilterContext( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSyncSettingsContext( wxMouseEvent& event ) { event.Skip(); }
+    virtual void OnSyncSettingsContext( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnTopFolderPairAdd( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnTopFolderPairRemove( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSwapSides( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnTopLocalCompCfg( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnTopLocalFilterCfg( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnTopLocalSyncCfg( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnHideSearchPanel( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSearchGridEnter( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCfgHistoryKeyEvent( wxKeyEvent& event ) { event.Skip(); }
+    virtual void OnLoadFromHistory( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnLoadFromHistoryDoubleClick( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCfgHistoryRightClick( wxMouseEvent& event ) { event.Skip(); }
+    virtual void OnToggleViewType( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnToggleViewButton( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnViewButtonRightClick( wxMouseEvent& event ) { event.Skip(); }
+
+
+public:
+    wxPanel* m_panelTopLeft;
+    wxBitmapButton* m_bpButtonRemovePair;
+    FolderHistoryBox* m_folderPathLeft;
+    wxBitmapButton* m_bpButtonSelectAltFolderLeft;
+    wxBitmapButton* m_bpButtonAltCompCfg;
+    wxBitmapButton* m_bpButtonLocalFilter;
+    wxBitmapButton* m_bpButtonAltSyncCfg;
+    wxPanel* m_panelTopRight;
+    FolderHistoryBox* m_folderPathRight;
+    wxBitmapButton* m_bpButtonSelectAltFolderRight;
+    wxBoxSizer* bSizerStatistics;
+    wxBoxSizer* bSizerData;
+
+    MainDialogGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("dummy"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 900, 600 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
+
+    ~MainDialogGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class ConfigDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class ConfigDlgGenerated : public wxDialog 
+class ConfigDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxStaticText* m_staticTextFolderPairLabel;
-		wxListBox* m_listBoxFolderPair;
-		wxNotebook* m_notebook;
-		wxPanel* m_panelCompSettingsHolder;
-		wxBoxSizer* bSizerHeaderCompSettings;
-		wxStaticText* m_staticTextMainCompSettings;
-		wxCheckBox* m_checkBoxUseLocalCmpOptions;
-		wxStaticLine* m_staticlineCompHeader;
-		wxPanel* m_panelComparisonSettings;
-		wxStaticText* m_staticText91;
-		wxStaticBitmap* m_bitmapByTimeSize;
-		wxToggleButton* m_toggleBtnByTimeSize;
-		wxStaticBitmap* m_bitmapByContent;
-		wxToggleButton* m_toggleBtnByContent;
-		wxStaticBitmap* m_bitmapBySize;
-		wxToggleButton* m_toggleBtnBySize;
-		wxStaticLine* m_staticline42;
-		wxTextCtrl* m_textCtrlCompVarDescription;
-		wxStaticLine* m_staticline33;
-		wxCheckBox* m_checkBoxSymlinksInclude;
-		wxRadioButton* m_radioBtnSymlinksFollow;
-		wxRadioButton* m_radioBtnSymlinksDirect;
-		wxHyperlinkCtrl* m_hyperlink24;
-		wxStaticLine* m_staticline44;
-		wxStaticText* m_staticText112;
-		wxTextCtrl* m_textCtrlTimeShift;
-		wxStaticText* m_staticText1381;
-		wxStaticText* m_staticText13811;
-		wxHyperlinkCtrl* m_hyperlink241;
-		wxStaticLine* m_staticline441;
-		wxStaticLine* m_staticline331;
-		wxPanel* m_panelFilterSettingsHolder;
-		wxBoxSizer* bSizerHeaderFilterSettings;
-		wxStaticText* m_staticTextMainFilterSettings;
-		wxStaticText* m_staticTextLocalFilterSettings;
-		wxStaticLine* m_staticlineFilterHeader;
-		wxPanel* m_panelFilterSettings;
-		wxStaticBitmap* m_bitmapInclude;
-		wxStaticText* m_staticText78;
-		wxTextCtrl* m_textCtrlInclude;
-		wxStaticLine* m_staticline22;
-		wxStaticBitmap* m_bitmapExclude;
-		wxStaticText* m_staticText77;
-		wxHyperlinkCtrl* m_hyperlink171;
-		wxTextCtrl* m_textCtrlExclude;
-		wxStaticLine* m_staticline24;
-		wxStaticBitmap* m_bitmapFilterDate;
-		wxStaticText* m_staticText79;
-		wxSpinCtrl* m_spinCtrlTimespan;
-		wxChoice* m_choiceUnitTimespan;
-		wxStaticLine* m_staticline23;
-		wxStaticBitmap* m_bitmapFilterSize;
-		wxStaticText* m_staticText80;
-		wxStaticText* m_staticText101;
-		wxSpinCtrl* m_spinCtrlMinSize;
-		wxChoice* m_choiceUnitMinSize;
-		wxStaticText* m_staticText102;
-		wxSpinCtrl* m_spinCtrlMaxSize;
-		wxChoice* m_choiceUnitMaxSize;
-		wxStaticLine* m_staticline62;
-		wxStaticText* m_staticText44;
-		wxStaticLine* m_staticline46;
-		wxButton* m_buttonClear;
-		wxPanel* m_panelSyncSettingsHolder;
-		wxBoxSizer* bSizerHeaderSyncSettings;
-		wxStaticText* m_staticTextMainSyncSettings;
-		wxCheckBox* m_checkBoxUseLocalSyncOptions;
-		wxStaticLine* m_staticlineSyncHeader;
-		wxPanel* m_panelSyncSettings;
-		wxStaticText* m_staticText86;
-		wxToggleButton* m_toggleBtnTwoWay;
-		wxToggleButton* m_toggleBtnMirror;
-		wxToggleButton* m_toggleBtnUpdate;
-		wxToggleButton* m_toggleBtnCustom;
-		wxStaticLine* m_staticline53;
-		wxBoxSizer* bSizerSyncConfig;
-		wxStaticText* m_staticText119;
-		wxStaticText* m_staticText120;
-		wxFlexGridSizer* fgSizerSyncDirections;
-		wxStaticBitmap* m_bitmapLeftOnly;
-		wxStaticBitmap* m_bitmapLeftNewer;
-		wxStaticBitmap* m_bitmapDifferent;
-		wxStaticBitmap* m_bitmapConflict;
-		wxStaticBitmap* m_bitmapRightNewer;
-		wxStaticBitmap* m_bitmapRightOnly;
-		wxBitmapButton* m_bpButtonLeftOnly;
-		wxBitmapButton* m_bpButtonLeftNewer;
-		wxBitmapButton* m_bpButtonDifferent;
-		wxBitmapButton* m_bpButtonConflict;
-		wxBitmapButton* m_bpButtonRightNewer;
-		wxBitmapButton* m_bpButtonRightOnly;
-		wxStaticBitmap* m_bitmapDatabase;
-		wxStaticLine* m_staticline431;
-		wxCheckBox* m_checkBoxDetectMove;
-		wxHyperlinkCtrl* m_hyperlink242;
-		wxStaticLine* m_staticline531;
-		wxTextCtrl* m_textCtrlSyncVarDescription;
-		wxStaticLine* m_staticline54;
-		wxBoxSizer* bSizerDelHandling;
-		wxStaticText* m_staticText87;
-		wxBitmapButton* m_bpButtonDeletionType;
-		wxRadioButton* m_radioBtnRecycler;
-		wxRadioButton* m_radioBtnPermanent;
-		wxRadioButton* m_radioBtnVersioning;
-		wxPanel* m_panelVersioning;
-		FolderHistoryBox* m_versioningFolderPath;
-		wxButton* m_buttonSelectVersioningFolder;
-		wxStaticText* m_staticText93;
-		wxChoice* m_choiceVersioningStyle;
-		wxHyperlinkCtrl* m_hyperlink17;
-		wxBoxSizer* bSizer192;
-		wxStaticText* m_staticTextNamingCvtPart1;
-		wxStaticText* m_staticTextNamingCvtPart2Bold;
-		wxStaticText* m_staticTextNamingCvtPart3;
-		wxStaticLine* m_staticline582;
-		wxBoxSizer* bSizerMiscConfig;
-		wxStaticText* m_staticText88;
-		wxRadioButton* m_radioBtnPopupOnErrors;
-		wxRadioButton* m_radioBtnIgnoreErrors;
-		wxStaticLine* m_staticline57;
-		wxBoxSizer* bSizerOnCompletion;
-		wxStaticText* m_staticText89;
-		OnCompletionBox* m_comboBoxOnCompletion;
-		wxBoxSizer* bSizerStdButtons;
-		wxButton* m_buttonOkay;
-		wxButton* m_buttonCancel;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void onListBoxKeyEvent( wxKeyEvent& event ) { event.Skip(); }
-		virtual void OnSelectFolderPair( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnToggleLocalCompSettings( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCompByTimeSizeDouble( wxMouseEvent& event ) { event.Skip(); }
-		virtual void OnCompByTimeSize( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCompByContentDouble( wxMouseEvent& event ) { event.Skip(); }
-		virtual void OnCompByContent( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCompBySizeDouble( wxMouseEvent& event ) { event.Skip(); }
-		virtual void OnCompBySize( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnChangeCompOption( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnHelpComparisonSettings( wxHyperlinkEvent& event ) { event.Skip(); }
-		virtual void onlTimeShiftKeyDown( wxKeyEvent& event ) { event.Skip(); }
-		virtual void OnHelpTimeShift( wxHyperlinkEvent& event ) { event.Skip(); }
-		virtual void OnChangeFilterOption( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnHelpShowExamples( wxHyperlinkEvent& event ) { event.Skip(); }
-		virtual void OnFilterReset( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnToggleLocalSyncSettings( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSyncTwoWayDouble( wxMouseEvent& event ) { event.Skip(); }
-		virtual void OnSyncTwoWay( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSyncMirrorDouble( wxMouseEvent& event ) { event.Skip(); }
-		virtual void OnSyncMirror( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSyncUpdateDouble( wxMouseEvent& event ) { event.Skip(); }
-		virtual void OnSyncUpdate( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSyncCustomDouble( wxMouseEvent& event ) { event.Skip(); }
-		virtual void OnSyncCustom( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnExLeftSideOnly( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnLeftNewer( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnDifferent( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnConflict( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnRightNewer( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnExRightSideOnly( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnToggleDetectMovedFiles( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnHelpDetectMovedFiles( wxHyperlinkEvent& event ) { event.Skip(); }
-		virtual void OnToggleDeletionType( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnDeletionRecycler( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnDeletionPermanent( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnDeletionVersioning( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnChangeSyncOption( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnHelpVersioning( wxHyperlinkEvent& event ) { event.Skip(); }
-		virtual void OnErrorPopup( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnErrorIgnore( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		wxBitmapButton* m_bpButtonSelectAltFolder;
-		
-		ConfigDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("dummy"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER ); 
-		~ConfigDlgGenerated();
-	
+private:
+
+protected:
+    wxStaticText* m_staticTextFolderPairLabel;
+    wxListBox* m_listBoxFolderPair;
+    wxNotebook* m_notebook;
+    wxPanel* m_panelCompSettingsHolder;
+    wxBoxSizer* bSizerHeaderCompSettings;
+    wxStaticText* m_staticTextMainCompSettings;
+    wxCheckBox* m_checkBoxUseLocalCmpOptions;
+    wxStaticLine* m_staticlineCompHeader;
+    wxPanel* m_panelComparisonSettings;
+    wxStaticText* m_staticText91;
+    wxStaticBitmap* m_bitmapByTimeSize;
+    wxToggleButton* m_toggleBtnByTimeSize;
+    wxStaticBitmap* m_bitmapByContent;
+    wxToggleButton* m_toggleBtnByContent;
+    wxStaticBitmap* m_bitmapBySize;
+    wxToggleButton* m_toggleBtnBySize;
+    wxStaticLine* m_staticline42;
+    wxTextCtrl* m_textCtrlCompVarDescription;
+    wxStaticLine* m_staticline33;
+    wxCheckBox* m_checkBoxSymlinksInclude;
+    wxRadioButton* m_radioBtnSymlinksFollow;
+    wxRadioButton* m_radioBtnSymlinksDirect;
+    wxHyperlinkCtrl* m_hyperlink24;
+    wxStaticLine* m_staticline44;
+    wxStaticText* m_staticText112;
+    wxTextCtrl* m_textCtrlTimeShift;
+    wxStaticText* m_staticText1381;
+    wxStaticText* m_staticText13811;
+    wxHyperlinkCtrl* m_hyperlink241;
+    wxStaticLine* m_staticline441;
+    wxStaticLine* m_staticline331;
+    wxPanel* m_panelFilterSettingsHolder;
+    wxBoxSizer* bSizerHeaderFilterSettings;
+    wxStaticText* m_staticTextMainFilterSettings;
+    wxStaticText* m_staticTextLocalFilterSettings;
+    wxStaticLine* m_staticlineFilterHeader;
+    wxPanel* m_panelFilterSettings;
+    wxStaticBitmap* m_bitmapInclude;
+    wxStaticText* m_staticText78;
+    wxTextCtrl* m_textCtrlInclude;
+    wxStaticLine* m_staticline22;
+    wxStaticBitmap* m_bitmapExclude;
+    wxStaticText* m_staticText77;
+    wxHyperlinkCtrl* m_hyperlink171;
+    wxTextCtrl* m_textCtrlExclude;
+    wxStaticLine* m_staticline24;
+    wxStaticBitmap* m_bitmapFilterDate;
+    wxStaticText* m_staticText79;
+    wxSpinCtrl* m_spinCtrlTimespan;
+    wxChoice* m_choiceUnitTimespan;
+    wxStaticLine* m_staticline23;
+    wxStaticBitmap* m_bitmapFilterSize;
+    wxStaticText* m_staticText80;
+    wxStaticText* m_staticText101;
+    wxSpinCtrl* m_spinCtrlMinSize;
+    wxChoice* m_choiceUnitMinSize;
+    wxStaticText* m_staticText102;
+    wxSpinCtrl* m_spinCtrlMaxSize;
+    wxChoice* m_choiceUnitMaxSize;
+    wxStaticLine* m_staticline62;
+    wxStaticText* m_staticText44;
+    wxStaticLine* m_staticline46;
+    wxButton* m_buttonClear;
+    wxPanel* m_panelSyncSettingsHolder;
+    wxBoxSizer* bSizerHeaderSyncSettings;
+    wxStaticText* m_staticTextMainSyncSettings;
+    wxCheckBox* m_checkBoxUseLocalSyncOptions;
+    wxStaticLine* m_staticlineSyncHeader;
+    wxPanel* m_panelSyncSettings;
+    wxStaticText* m_staticText86;
+    wxToggleButton* m_toggleBtnTwoWay;
+    wxToggleButton* m_toggleBtnMirror;
+    wxToggleButton* m_toggleBtnUpdate;
+    wxToggleButton* m_toggleBtnCustom;
+    wxStaticLine* m_staticline53;
+    wxBoxSizer* bSizerSyncConfig;
+    wxStaticText* m_staticText119;
+    wxStaticText* m_staticText120;
+    wxFlexGridSizer* fgSizerSyncDirections;
+    wxStaticBitmap* m_bitmapLeftOnly;
+    wxStaticBitmap* m_bitmapLeftNewer;
+    wxStaticBitmap* m_bitmapDifferent;
+    wxStaticBitmap* m_bitmapConflict;
+    wxStaticBitmap* m_bitmapRightNewer;
+    wxStaticBitmap* m_bitmapRightOnly;
+    wxBitmapButton* m_bpButtonLeftOnly;
+    wxBitmapButton* m_bpButtonLeftNewer;
+    wxBitmapButton* m_bpButtonDifferent;
+    wxBitmapButton* m_bpButtonConflict;
+    wxBitmapButton* m_bpButtonRightNewer;
+    wxBitmapButton* m_bpButtonRightOnly;
+    wxStaticBitmap* m_bitmapDatabase;
+    wxStaticLine* m_staticline431;
+    wxCheckBox* m_checkBoxDetectMove;
+    wxHyperlinkCtrl* m_hyperlink242;
+    wxStaticLine* m_staticline531;
+    wxTextCtrl* m_textCtrlSyncVarDescription;
+    wxStaticLine* m_staticline54;
+    wxBoxSizer* bSizerDelHandling;
+    wxStaticText* m_staticText87;
+    wxBitmapButton* m_bpButtonDeletionType;
+    wxRadioButton* m_radioBtnRecycler;
+    wxRadioButton* m_radioBtnPermanent;
+    wxRadioButton* m_radioBtnVersioning;
+    wxPanel* m_panelVersioning;
+    FolderHistoryBox* m_versioningFolderPath;
+    wxButton* m_buttonSelectVersioningFolder;
+    wxStaticText* m_staticText93;
+    wxChoice* m_choiceVersioningStyle;
+    wxHyperlinkCtrl* m_hyperlink17;
+    wxBoxSizer* bSizer192;
+    wxStaticText* m_staticTextNamingCvtPart1;
+    wxStaticText* m_staticTextNamingCvtPart2Bold;
+    wxStaticText* m_staticTextNamingCvtPart3;
+    wxStaticLine* m_staticline582;
+    wxBoxSizer* bSizerMiscConfig;
+    wxStaticText* m_staticText88;
+    wxRadioButton* m_radioBtnPopupOnErrors;
+    wxRadioButton* m_radioBtnIgnoreErrors;
+    wxStaticLine* m_staticline57;
+    wxBoxSizer* bSizerOnCompletion;
+    wxStaticText* m_staticText89;
+    OnCompletionBox* m_comboBoxOnCompletion;
+    wxBoxSizer* bSizerStdButtons;
+    wxButton* m_buttonOkay;
+    wxButton* m_buttonCancel;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void onListBoxKeyEvent( wxKeyEvent& event ) { event.Skip(); }
+    virtual void OnSelectFolderPair( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnToggleLocalCompSettings( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCompByTimeSizeDouble( wxMouseEvent& event ) { event.Skip(); }
+    virtual void OnCompByTimeSize( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCompByContentDouble( wxMouseEvent& event ) { event.Skip(); }
+    virtual void OnCompByContent( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCompBySizeDouble( wxMouseEvent& event ) { event.Skip(); }
+    virtual void OnCompBySize( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnChangeCompOption( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnHelpComparisonSettings( wxHyperlinkEvent& event ) { event.Skip(); }
+    virtual void onlTimeShiftKeyDown( wxKeyEvent& event ) { event.Skip(); }
+    virtual void OnHelpTimeShift( wxHyperlinkEvent& event ) { event.Skip(); }
+    virtual void OnChangeFilterOption( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnHelpShowExamples( wxHyperlinkEvent& event ) { event.Skip(); }
+    virtual void OnFilterReset( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnToggleLocalSyncSettings( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSyncTwoWayDouble( wxMouseEvent& event ) { event.Skip(); }
+    virtual void OnSyncTwoWay( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSyncMirrorDouble( wxMouseEvent& event ) { event.Skip(); }
+    virtual void OnSyncMirror( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSyncUpdateDouble( wxMouseEvent& event ) { event.Skip(); }
+    virtual void OnSyncUpdate( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSyncCustomDouble( wxMouseEvent& event ) { event.Skip(); }
+    virtual void OnSyncCustom( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnExLeftSideOnly( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnLeftNewer( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnDifferent( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnConflict( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnRightNewer( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnExRightSideOnly( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnToggleDetectMovedFiles( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnHelpDetectMovedFiles( wxHyperlinkEvent& event ) { event.Skip(); }
+    virtual void OnToggleDeletionType( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnDeletionRecycler( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnDeletionPermanent( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnDeletionVersioning( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnChangeSyncOption( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnHelpVersioning( wxHyperlinkEvent& event ) { event.Skip(); }
+    virtual void OnErrorPopup( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnErrorIgnore( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+    wxBitmapButton* m_bpButtonSelectAltFolder;
+
+    ConfigDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("dummy"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1, -1 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER );
+    ~ConfigDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class FolderPairPanelGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class FolderPairPanelGenerated : public wxPanel 
+class FolderPairPanelGenerated : public wxPanel
 {
-	private:
-	
-	protected:
-		wxButton* m_buttonSelectFolderLeft;
-		wxButton* m_buttonSelectFolderRight;
-	
-	public:
-		wxPanel* m_panelLeft;
-		wxBitmapButton* m_bpButtonFolderPairOptions;
-		wxBitmapButton* m_bpButtonRemovePair;
-		FolderHistoryBox* m_folderPathLeft;
-		wxBitmapButton* m_bpButtonSelectAltFolderLeft;
-		wxPanel* m_panel20;
-		wxBitmapButton* m_bpButtonAltCompCfg;
-		wxBitmapButton* m_bpButtonLocalFilter;
-		wxBitmapButton* m_bpButtonAltSyncCfg;
-		wxPanel* m_panelRight;
-		FolderHistoryBox* m_folderPathRight;
-		wxBitmapButton* m_bpButtonSelectAltFolderRight;
-		
-		FolderPairPanelGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0 ); 
-		~FolderPairPanelGenerated();
-	
+private:
+
+protected:
+    wxButton* m_buttonSelectFolderLeft;
+    wxButton* m_buttonSelectFolderRight;
+
+public:
+    wxPanel* m_panelLeft;
+    wxBitmapButton* m_bpButtonFolderPairOptions;
+    wxBitmapButton* m_bpButtonRemovePair;
+    FolderHistoryBox* m_folderPathLeft;
+    wxBitmapButton* m_bpButtonSelectAltFolderLeft;
+    wxPanel* m_panel20;
+    wxBitmapButton* m_bpButtonAltCompCfg;
+    wxBitmapButton* m_bpButtonLocalFilter;
+    wxBitmapButton* m_bpButtonAltSyncCfg;
+    wxPanel* m_panelRight;
+    FolderHistoryBox* m_folderPathRight;
+    wxBitmapButton* m_bpButtonSelectAltFolderRight;
+
+    FolderPairPanelGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0 );
+    ~FolderPairPanelGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class CloudSetupDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class CloudSetupDlgGenerated : public wxDialog 
+class CloudSetupDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxStaticBitmap* m_bitmapCloud;
-		wxStaticText* m_staticTextHeader;
-		wxStaticText* m_staticText136;
-		wxToggleButton* m_toggleBtnSftp;
-		wxToggleButton* m_toggleBtnFtp;
-		wxStaticLine* m_staticline371;
-		wxPanel* m_panel41;
-		wxStaticText* m_staticText12311;
-		wxTextCtrl* m_textCtrlServer;
-		wxStaticText* m_staticText1233;
-		wxTextCtrl* m_textCtrlPort;
-		wxStaticText* m_staticText1381;
-		wxStaticText* m_staticText1382;
-		wxStaticText* m_staticText138;
-		wxStaticLine* m_staticline58;
-		wxBoxSizer* bSizerAuth;
-		wxBoxSizer* bSizerFtpEncrypt;
-		wxStaticText* m_staticText1251;
-		wxRadioButton* m_radioBtnEncryptNone;
-		wxRadioButton* m_radioBtnEncryptSsl;
-		wxStaticLine* m_staticline5721;
-		wxBoxSizer* bSizerSftpAuth;
-		wxStaticText* m_staticText125;
-		wxRadioButton* m_radioBtnPassword;
-		wxRadioButton* m_radioBtnKeyfile;
-		wxStaticLine* m_staticline572;
-		wxPanel* m_panelAuth;
-		wxStaticText* m_staticText123;
-		wxTextCtrl* m_textCtrlUserName;
-		wxStaticText* m_staticTextKeyfile;
-		wxBoxSizer* bSizerKeyFile;
-		wxTextCtrl* m_textCtrlKeyfilePath;
-		wxButton* m_buttonSelectKeyfile;
-		wxStaticText* m_staticTextPassword;
-		wxTextCtrl* m_textCtrlPasswordVisible;
-		wxTextCtrl* m_textCtrlPasswordHidden;
-		wxCheckBox* m_checkBoxShowPassword;
-		wxStaticLine* m_staticline581;
-		wxStaticText* m_staticText1232;
-		wxTextCtrl* m_textCtrlServerPath;
-		wxButton* m_buttonSelectFolder;
-		wxBoxSizer* bSizerSftpTweaks;
-		wxStaticLine* m_staticline571;
-		wxStaticBitmap* m_bitmapSpeed;
-		wxStaticText* m_staticText1361;
-		wxHyperlinkCtrl* m_hyperlink171;
-		wxStaticLine* m_staticline57;
-		wxPanel* m_panel411;
-		wxStaticText* m_staticText12341;
-		wxSpinCtrl* m_spinCtrlConnectionCount;
-		wxStaticText* m_staticText138111;
-		wxStaticText* m_staticText1231111;
-		wxSpinCtrl* m_spinCtrlChannelCount;
-		wxButton* m_button42;
-		wxStaticText* m_staticText138112;
-		wxStaticText* m_staticText13811;
-		wxStaticLine* m_staticline12;
-		wxBoxSizer* bSizerStdButtons;
-		wxButton* m_buttonOkay;
-		wxButton* m_buttonCancel;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnConnectionSftp( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnConnectionFtp( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnAuthPassword( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnAuthKeyfile( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSelectKeyfile( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnToggleShowPassword( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnBrowseCloudFolder( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnHelpSftpPerformance( wxHyperlinkEvent& event ) { event.Skip(); }
-		virtual void OnDetectServerChannelLimit( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		CloudSetupDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Access online storage"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER ); 
-		~CloudSetupDlgGenerated();
-	
+private:
+
+protected:
+    wxStaticBitmap* m_bitmapCloud;
+    wxStaticText* m_staticTextHeader;
+    wxStaticText* m_staticText136;
+    wxToggleButton* m_toggleBtnSftp;
+    wxToggleButton* m_toggleBtnFtp;
+    wxStaticLine* m_staticline371;
+    wxPanel* m_panel41;
+    wxStaticText* m_staticText12311;
+    wxTextCtrl* m_textCtrlServer;
+    wxStaticText* m_staticText1233;
+    wxTextCtrl* m_textCtrlPort;
+    wxStaticText* m_staticText1381;
+    wxStaticText* m_staticText1382;
+    wxStaticText* m_staticText138;
+    wxStaticLine* m_staticline58;
+    wxBoxSizer* bSizerAuth;
+    wxBoxSizer* bSizerFtpEncrypt;
+    wxStaticText* m_staticText1251;
+    wxRadioButton* m_radioBtnEncryptNone;
+    wxRadioButton* m_radioBtnEncryptSsl;
+    wxStaticLine* m_staticline5721;
+    wxBoxSizer* bSizerSftpAuth;
+    wxStaticText* m_staticText125;
+    wxRadioButton* m_radioBtnPassword;
+    wxRadioButton* m_radioBtnKeyfile;
+    wxRadioButton* m_radioBtnAgent;
+    wxStaticLine* m_staticline572;
+    wxPanel* m_panelAuth;
+    wxStaticText* m_staticText123;
+    wxTextCtrl* m_textCtrlUserName;
+    wxStaticText* m_staticTextKeyfile;
+    wxBoxSizer* bSizerKeyFile;
+    wxTextCtrl* m_textCtrlKeyfilePath;
+    wxButton* m_buttonSelectKeyfile;
+    wxStaticText* m_staticTextPassword;
+    wxBoxSizer* bSizerPassword;
+    wxTextCtrl* m_textCtrlPasswordVisible;
+    wxTextCtrl* m_textCtrlPasswordHidden;
+    wxCheckBox* m_checkBoxShowPassword;
+    wxStaticLine* m_staticline581;
+    wxStaticText* m_staticText1232;
+    wxTextCtrl* m_textCtrlServerPath;
+    wxButton* m_buttonSelectFolder;
+    wxBoxSizer* bSizerSftpTweaks;
+    wxStaticLine* m_staticline571;
+    wxStaticBitmap* m_bitmapSpeed;
+    wxStaticText* m_staticText1361;
+    wxHyperlinkCtrl* m_hyperlink171;
+    wxStaticLine* m_staticline57;
+    wxPanel* m_panel411;
+    wxStaticText* m_staticText12341;
+    wxSpinCtrl* m_spinCtrlConnectionCount;
+    wxStaticText* m_staticText138111;
+    wxStaticText* m_staticText1231111;
+    wxSpinCtrl* m_spinCtrlChannelCount;
+    wxButton* m_button42;
+    wxStaticText* m_staticText138112;
+    wxStaticText* m_staticText13811;
+    wxStaticLine* m_staticline12;
+    wxBoxSizer* bSizerStdButtons;
+    wxButton* m_buttonOkay;
+    wxButton* m_buttonCancel;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnConnectionSftp( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnConnectionFtp( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnAuthPassword( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnAuthKeyfile( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnAuthAgent( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSelectKeyfile( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnToggleShowPassword( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnBrowseCloudFolder( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnHelpSftpPerformance( wxHyperlinkEvent& event ) { event.Skip(); }
+    virtual void OnDetectServerChannelLimit( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+
+    CloudSetupDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Access online storage"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1, -1 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER );
+    ~CloudSetupDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class AbstractFolderPickerGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class AbstractFolderPickerGenerated : public wxDialog 
+class AbstractFolderPickerGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxStaticBitmap* m_bitmapServer;
-		wxStaticText* m_staticTextHeader;
-		wxStaticLine* m_staticline371;
-		wxPanel* m_panel41;
-		wxTreeCtrl* m_treeCtrlFileSystem;
-		wxStaticLine* m_staticline12;
-		wxBoxSizer* bSizerStdButtons;
-		wxButton* m_buttonOkay;
-		wxButton* m_buttonCancel;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnExpandNode( wxTreeEvent& event ) { event.Skip(); }
-		virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		AbstractFolderPickerGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER ); 
-		~AbstractFolderPickerGenerated();
-	
+private:
+
+protected:
+    wxStaticBitmap* m_bitmapServer;
+    wxStaticText* m_staticTextHeader;
+    wxStaticLine* m_staticline371;
+    wxPanel* m_panel41;
+    wxTreeCtrl* m_treeCtrlFileSystem;
+    wxStaticLine* m_staticline12;
+    wxBoxSizer* bSizerStdButtons;
+    wxButton* m_buttonOkay;
+    wxButton* m_buttonCancel;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnExpandNode( wxTreeEvent& event ) { event.Skip(); }
+    virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+
+    AbstractFolderPickerGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1, -1 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER );
+    ~AbstractFolderPickerGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class SyncConfirmationDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class SyncConfirmationDlgGenerated : public wxDialog 
+class SyncConfirmationDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxStaticBitmap* m_bitmapSync;
-		wxStaticText* m_staticTextHeader;
-		wxStaticLine* m_staticline371;
-		wxPanel* m_panelStatistics;
-		wxStaticLine* m_staticline38;
-		wxStaticText* m_staticText84;
-		wxStaticText* m_staticTextVariant;
-		wxStaticLine* m_staticline14;
-		wxStaticText* m_staticText83;
-		wxStaticBitmap* m_bitmapDeleteLeft;
-		wxStaticBitmap* m_bitmapUpdateLeft;
-		wxStaticBitmap* m_bitmapCreateLeft;
-		wxStaticBitmap* m_bitmapData;
-		wxStaticBitmap* m_bitmapCreateRight;
-		wxStaticBitmap* m_bitmapUpdateRight;
-		wxStaticBitmap* m_bitmapDeleteRight;
-		wxStaticText* m_staticTextDeleteLeft;
-		wxStaticText* m_staticTextUpdateLeft;
-		wxStaticText* m_staticTextCreateLeft;
-		wxStaticText* m_staticTextData;
-		wxStaticText* m_staticTextCreateRight;
-		wxStaticText* m_staticTextUpdateRight;
-		wxStaticText* m_staticTextDeleteRight;
-		wxStaticLine* m_staticline381;
-		wxStaticLine* m_staticline12;
-		wxCheckBox* m_checkBoxDontShowAgain;
-		wxBoxSizer* bSizerStdButtons;
-		wxButton* m_buttonStartSync;
-		wxButton* m_buttonCancel;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnStartSync( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		SyncConfirmationDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("FreeFileSync"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
-		~SyncConfirmationDlgGenerated();
-	
+private:
+
+protected:
+    wxStaticBitmap* m_bitmapSync;
+    wxStaticText* m_staticTextHeader;
+    wxStaticLine* m_staticline371;
+    wxPanel* m_panelStatistics;
+    wxStaticLine* m_staticline38;
+    wxStaticText* m_staticText84;
+    wxStaticText* m_staticTextVariant;
+    wxStaticLine* m_staticline14;
+    wxStaticText* m_staticText83;
+    wxStaticBitmap* m_bitmapDeleteLeft;
+    wxStaticBitmap* m_bitmapUpdateLeft;
+    wxStaticBitmap* m_bitmapCreateLeft;
+    wxStaticBitmap* m_bitmapData;
+    wxStaticBitmap* m_bitmapCreateRight;
+    wxStaticBitmap* m_bitmapUpdateRight;
+    wxStaticBitmap* m_bitmapDeleteRight;
+    wxStaticText* m_staticTextDeleteLeft;
+    wxStaticText* m_staticTextUpdateLeft;
+    wxStaticText* m_staticTextCreateLeft;
+    wxStaticText* m_staticTextData;
+    wxStaticText* m_staticTextCreateRight;
+    wxStaticText* m_staticTextUpdateRight;
+    wxStaticText* m_staticTextDeleteRight;
+    wxStaticLine* m_staticline381;
+    wxStaticLine* m_staticline12;
+    wxCheckBox* m_checkBoxDontShowAgain;
+    wxBoxSizer* bSizerStdButtons;
+    wxButton* m_buttonStartSync;
+    wxButton* m_buttonCancel;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnStartSync( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+
+    SyncConfirmationDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("FreeFileSync"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+    ~SyncConfirmationDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class CompareProgressDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class CompareProgressDlgGenerated : public wxPanel 
+class CompareProgressDlgGenerated : public wxPanel
 {
-	private:
-	
-	protected:
-		wxPanel* m_panelStatistics;
-		wxStaticText* m_staticTextItemsFoundLabel;
-		wxStaticText* m_staticTextItemsFound;
-		wxStaticText* m_staticTextItemsRemainingLabel;
-		wxBoxSizer* bSizerItemsRemaining;
-		wxStaticText* m_staticTextItemsRemaining;
-		wxStaticText* m_staticTextBytesRemaining;
-		wxStaticText* m_staticTextTimeRemainingLabel;
-		wxStaticText* m_staticTextTimeRemaining;
-		wxStaticText* m_staticTextTimeElapsed;
-		wxStaticText* m_staticTextStatus;
-		wxPanel* m_panelProgressLabel;
-	
-	public:
-		zen::Graph2D* m_panelGraphProgress;
-		
-		CompareProgressDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxRAISED_BORDER ); 
-		~CompareProgressDlgGenerated();
-	
+private:
+
+protected:
+    wxPanel* m_panelStatistics;
+    wxStaticText* m_staticTextItemsFoundLabel;
+    wxStaticText* m_staticTextItemsFound;
+    wxStaticText* m_staticTextItemsRemainingLabel;
+    wxBoxSizer* bSizerItemsRemaining;
+    wxStaticText* m_staticTextItemsRemaining;
+    wxStaticText* m_staticTextBytesRemaining;
+    wxStaticText* m_staticTextTimeRemainingLabel;
+    wxStaticText* m_staticTextTimeRemaining;
+    wxStaticText* m_staticTextTimeElapsed;
+    wxStaticText* m_staticTextStatus;
+    wxPanel* m_panelProgressLabel;
+
+public:
+    zen::Graph2D* m_panelGraphProgress;
+
+    CompareProgressDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1, -1 ), long style = wxRAISED_BORDER );
+    ~CompareProgressDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class SyncProgressPanelGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class SyncProgressPanelGenerated : public wxPanel 
+class SyncProgressPanelGenerated : public wxPanel
 {
-	private:
-	
-	protected:
-		wxBoxSizer* bSizer42;
-		wxBoxSizer* bSizer171;
-		wxStaticText* m_staticText87;
-	
-	public:
-		wxBoxSizer* bSizerRoot;
-		wxStaticBitmap* m_bitmapStatus;
-		wxStaticText* m_staticTextPhase;
-		wxBitmapButton* m_bpButtonMinimizeToTray;
-		wxBoxSizer* bSizerStatusText;
-		wxStaticText* m_staticTextStatus;
-		wxPanel* m_panelProgress;
-		wxPanel* m_panelItemsProcessed;
-		wxStaticText* m_staticTextItemsProcessed;
-		wxStaticText* m_staticTextBytesProcessed;
-		wxPanel* m_panelItemsRemaining;
-		wxStaticText* m_staticTextItemsRemaining;
-		wxStaticText* m_staticTextBytesRemaining;
-		wxPanel* m_panelTimeRemaining;
-		wxStaticText* m_staticTextTimeRemaining;
-		wxStaticText* m_staticTextTimeElapsed;
-		wxStaticBitmap* m_bitmapGraphKeyBytes;
-		zen::Graph2D* m_panelGraphBytes;
-		wxStaticBitmap* m_bitmapGraphKeyItems;
-		zen::Graph2D* m_panelGraphItems;
-		wxNotebook* m_notebookResult;
-		wxStaticLine* m_staticlineFooter;
-		wxBoxSizer* bSizerStdButtons;
-		wxBoxSizer* bSizerOnCompletion;
-		OnCompletionBox* m_comboBoxOnCompletion;
-		wxButton* m_buttonClose;
-		wxButton* m_buttonPause;
-		wxButton* m_buttonStop;
-		
-		SyncProgressPanelGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL ); 
-		~SyncProgressPanelGenerated();
-	
+private:
+
+protected:
+    wxBoxSizer* bSizer42;
+    wxBoxSizer* bSizer171;
+    wxStaticText* m_staticText87;
+
+public:
+    wxBoxSizer* bSizerRoot;
+    wxStaticBitmap* m_bitmapStatus;
+    wxStaticText* m_staticTextPhase;
+    wxBitmapButton* m_bpButtonMinimizeToTray;
+    wxBoxSizer* bSizerStatusText;
+    wxStaticText* m_staticTextStatus;
+    wxPanel* m_panelProgress;
+    wxPanel* m_panelItemsProcessed;
+    wxStaticText* m_staticTextItemsProcessed;
+    wxStaticText* m_staticTextBytesProcessed;
+    wxPanel* m_panelItemsRemaining;
+    wxStaticText* m_staticTextItemsRemaining;
+    wxStaticText* m_staticTextBytesRemaining;
+    wxPanel* m_panelTimeRemaining;
+    wxStaticText* m_staticTextTimeRemaining;
+    wxStaticText* m_staticTextTimeElapsed;
+    wxStaticBitmap* m_bitmapGraphKeyBytes;
+    zen::Graph2D* m_panelGraphBytes;
+    wxStaticBitmap* m_bitmapGraphKeyItems;
+    zen::Graph2D* m_panelGraphItems;
+    wxNotebook* m_notebookResult;
+    wxStaticLine* m_staticlineFooter;
+    wxBoxSizer* bSizerStdButtons;
+    wxBoxSizer* bSizerOnCompletion;
+    OnCompletionBox* m_comboBoxOnCompletion;
+    wxButton* m_buttonClose;
+    wxButton* m_buttonPause;
+    wxButton* m_buttonStop;
+
+    SyncProgressPanelGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1, -1 ), long style = wxTAB_TRAVERSAL );
+    ~SyncProgressPanelGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class LogPanelGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class LogPanelGenerated : public wxPanel 
+class LogPanelGenerated : public wxPanel
 {
-	private:
-	
-	protected:
-		ToggleButton* m_bpButtonErrors;
-		ToggleButton* m_bpButtonWarnings;
-		ToggleButton* m_bpButtonInfo;
-		wxStaticLine* m_staticline13;
-		zen::Grid* m_gridMessages;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnErrors( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnWarnings( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnInfo( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		LogPanelGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL ); 
-		~LogPanelGenerated();
-	
+private:
+
+protected:
+    ToggleButton* m_bpButtonErrors;
+    ToggleButton* m_bpButtonWarnings;
+    ToggleButton* m_bpButtonInfo;
+    wxStaticLine* m_staticline13;
+    zen::Grid* m_gridMessages;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnErrors( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnWarnings( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnInfo( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+
+    LogPanelGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL );
+    ~LogPanelGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class BatchDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class BatchDlgGenerated : public wxDialog 
+class BatchDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxStaticBitmap* m_bitmapBatchJob;
-		wxStaticText* m_staticTextDescr;
-		wxStaticLine* m_staticline18;
-		wxPanel* m_panel35;
-		wxStaticText* m_staticText82;
-		wxRadioButton* m_radioBtnPopupOnErrors;
-		wxRadioButton* m_radioBtnIgnoreErrors;
-		wxRadioButton* m_radioBtnStopOnError;
-		wxStaticLine* m_staticline26;
-		wxCheckBox* m_checkBoxRunMinimized;
-		wxStaticText* m_staticText81;
-		OnCompletionBox* m_comboBoxOnCompletion;
-		wxStaticLine* m_staticline25;
-		wxCheckBox* m_checkBoxGenerateLogfile;
-		wxPanel* m_panelLogfile;
-		wxButton* m_buttonSelectLogFolder;
-		wxCheckBox* m_checkBoxLogfilesLimit;
-		wxSpinCtrl* m_spinCtrlLogfileLimit;
-		wxHyperlinkCtrl* m_hyperlink17;
-		wxStaticLine* m_staticline13;
-		wxBoxSizer* bSizerStdButtons;
-		wxButton* m_buttonSaveAs;
-		wxButton* m_buttonCancel;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnErrorPopup( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnErrorIgnore( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnErrorStop( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnToggleGenerateLogfile( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnToggleLogfilesLimit( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnHelpScheduleBatch( wxHyperlinkEvent& event ) { event.Skip(); }
-		virtual void OnSaveBatchJob( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		FolderHistoryBox* m_logFolderPath;
-		wxBitmapButton* m_bpButtonSelectAltLogFolder;
-		
-		BatchDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Save as Batch Job"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
-		~BatchDlgGenerated();
-	
+private:
+
+protected:
+    wxStaticBitmap* m_bitmapBatchJob;
+    wxStaticText* m_staticTextDescr;
+    wxStaticLine* m_staticline18;
+    wxPanel* m_panel35;
+    wxStaticText* m_staticText82;
+    wxRadioButton* m_radioBtnPopupOnErrors;
+    wxRadioButton* m_radioBtnIgnoreErrors;
+    wxRadioButton* m_radioBtnStopOnError;
+    wxStaticLine* m_staticline26;
+    wxCheckBox* m_checkBoxRunMinimized;
+    wxStaticText* m_staticText81;
+    OnCompletionBox* m_comboBoxOnCompletion;
+    wxStaticLine* m_staticline25;
+    wxCheckBox* m_checkBoxGenerateLogfile;
+    wxPanel* m_panelLogfile;
+    wxButton* m_buttonSelectLogFolder;
+    wxCheckBox* m_checkBoxLogfilesLimit;
+    wxSpinCtrl* m_spinCtrlLogfileLimit;
+    wxHyperlinkCtrl* m_hyperlink17;
+    wxStaticLine* m_staticline13;
+    wxBoxSizer* bSizerStdButtons;
+    wxButton* m_buttonSaveAs;
+    wxButton* m_buttonCancel;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnErrorPopup( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnErrorIgnore( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnErrorStop( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnToggleGenerateLogfile( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnToggleLogfilesLimit( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnHelpScheduleBatch( wxHyperlinkEvent& event ) { event.Skip(); }
+    virtual void OnSaveBatchJob( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+    FolderHistoryBox* m_logFolderPath;
+    wxBitmapButton* m_bpButtonSelectAltLogFolder;
+
+    BatchDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Save as Batch Job"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+    ~BatchDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class DeleteDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class DeleteDlgGenerated : public wxDialog 
+class DeleteDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxStaticBitmap* m_bitmapDeleteType;
-		wxStaticText* m_staticTextHeader;
-		wxStaticLine* m_staticline91;
-		wxPanel* m_panel31;
-		wxStaticLine* m_staticline42;
-		wxTextCtrl* m_textCtrlFileList;
-		wxStaticLine* m_staticline9;
-		wxBoxSizer* bSizerStdButtons;
-		wxCheckBox* m_checkBoxUseRecycler;
-		wxButton* m_buttonOK;
-		wxButton* m_buttonCancel;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnUseRecycler( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnOK( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		DeleteDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Delete Items"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER ); 
-		~DeleteDlgGenerated();
-	
+private:
+
+protected:
+    wxStaticBitmap* m_bitmapDeleteType;
+    wxStaticText* m_staticTextHeader;
+    wxStaticLine* m_staticline91;
+    wxPanel* m_panel31;
+    wxStaticLine* m_staticline42;
+    wxTextCtrl* m_textCtrlFileList;
+    wxStaticLine* m_staticline9;
+    wxBoxSizer* bSizerStdButtons;
+    wxCheckBox* m_checkBoxUseRecycler;
+    wxButton* m_buttonOK;
+    wxButton* m_buttonCancel;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnUseRecycler( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnOK( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+
+    DeleteDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Delete Items"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1, -1 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER );
+    ~DeleteDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class CopyToDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class CopyToDlgGenerated : public wxDialog 
+class CopyToDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxStaticBitmap* m_bitmapCopyTo;
-		wxStaticText* m_staticTextHeader;
-		wxStaticLine* m_staticline91;
-		wxPanel* m_panel31;
-		wxStaticLine* m_staticline42;
-		wxTextCtrl* m_textCtrlFileList;
-		wxButton* m_buttonSelectTargetFolder;
-		wxStaticLine* m_staticline9;
-		wxBoxSizer* bSizerStdButtons;
-		wxCheckBox* m_checkBoxKeepRelPath;
-		wxCheckBox* m_checkBoxOverwriteIfExists;
-		wxButton* m_buttonOK;
-		wxButton* m_buttonCancel;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnUseRecycler( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnOK( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		FolderHistoryBox* m_targetFolderPath;
-		wxBitmapButton* m_bpButtonSelectAltTargetFolder;
-		
-		CopyToDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Copy items"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER ); 
-		~CopyToDlgGenerated();
-	
+private:
+
+protected:
+    wxStaticBitmap* m_bitmapCopyTo;
+    wxStaticText* m_staticTextHeader;
+    wxStaticLine* m_staticline91;
+    wxPanel* m_panel31;
+    wxStaticLine* m_staticline42;
+    wxTextCtrl* m_textCtrlFileList;
+    wxButton* m_buttonSelectTargetFolder;
+    wxStaticLine* m_staticline9;
+    wxBoxSizer* bSizerStdButtons;
+    wxCheckBox* m_checkBoxKeepRelPath;
+    wxCheckBox* m_checkBoxOverwriteIfExists;
+    wxButton* m_buttonOK;
+    wxButton* m_buttonCancel;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnUseRecycler( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnOK( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+    FolderHistoryBox* m_targetFolderPath;
+    wxBitmapButton* m_bpButtonSelectAltTargetFolder;
+
+    CopyToDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Copy items"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1, -1 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER );
+    ~CopyToDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class OptionsDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class OptionsDlgGenerated : public wxDialog 
+class OptionsDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxStaticBitmap* m_bitmapSettings;
-		wxStaticText* m_staticText44;
-		wxStaticLine* m_staticline20;
-		wxPanel* m_panel39;
-		wxCheckBox* m_checkBoxFailSafe;
-		wxStaticText* m_staticText91;
-		wxBoxSizer* bSizerLockedFiles;
-		wxCheckBox* m_checkBoxCopyLocked;
-		wxStaticText* m_staticText92;
-		wxCheckBox* m_checkBoxCopyPermissions;
-		wxStaticText* m_staticText93;
-		wxStaticLine* m_staticline39;
-		wxStaticText* m_staticText95;
-		wxStaticText* m_staticText96;
-		wxSpinCtrl* m_spinCtrlAutoRetryCount;
-		wxStaticText* m_staticTextAutoRetryDelay;
-		wxSpinCtrl* m_spinCtrlAutoRetryDelay;
-		wxStaticLine* m_staticline191;
-		wxStaticText* m_staticText85;
-		wxGrid* m_gridCustomCommand;
-		wxBitmapButton* m_bpButtonAddRow;
-		wxBitmapButton* m_bpButtonRemoveRow;
-		wxHyperlinkCtrl* m_hyperlink17;
-		wxStaticLine* m_staticline192;
-		zen::BitmapTextButton* m_buttonResetDialogs;
-		wxStaticLine* m_staticline40;
-		wxStaticLine* m_staticline36;
-		wxBoxSizer* bSizerStdButtons;
-		wxButton* m_buttonDefault;
-		wxButton* m_buttonOkay;
-		wxButton* m_buttonCancel;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnToggleAutoRetryCount( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnAddRow( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnRemoveRow( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnHelpShowExamples( wxHyperlinkEvent& event ) { event.Skip(); }
-		virtual void OnResetDialogs( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnDefault( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		OptionsDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
-		~OptionsDlgGenerated();
-	
+private:
+
+protected:
+    wxStaticBitmap* m_bitmapSettings;
+    wxStaticText* m_staticText44;
+    wxStaticLine* m_staticline20;
+    wxPanel* m_panel39;
+    wxCheckBox* m_checkBoxFailSafe;
+    wxStaticText* m_staticText91;
+    wxBoxSizer* bSizerLockedFiles;
+    wxCheckBox* m_checkBoxCopyLocked;
+    wxStaticText* m_staticText92;
+    wxCheckBox* m_checkBoxCopyPermissions;
+    wxStaticText* m_staticText93;
+    wxStaticLine* m_staticline39;
+    wxStaticText* m_staticText95;
+    wxStaticText* m_staticText96;
+    wxSpinCtrl* m_spinCtrlAutoRetryCount;
+    wxStaticText* m_staticTextAutoRetryDelay;
+    wxSpinCtrl* m_spinCtrlAutoRetryDelay;
+    wxStaticLine* m_staticline191;
+    wxStaticText* m_staticText85;
+    wxGrid* m_gridCustomCommand;
+    wxBitmapButton* m_bpButtonAddRow;
+    wxBitmapButton* m_bpButtonRemoveRow;
+    wxHyperlinkCtrl* m_hyperlink17;
+    wxStaticLine* m_staticline192;
+    zen::BitmapTextButton* m_buttonResetDialogs;
+    wxStaticLine* m_staticline40;
+    wxStaticLine* m_staticline36;
+    wxBoxSizer* bSizerStdButtons;
+    wxButton* m_buttonDefault;
+    wxButton* m_buttonOkay;
+    wxButton* m_buttonCancel;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnToggleAutoRetryCount( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnAddRow( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnRemoveRow( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnHelpShowExamples( wxHyperlinkEvent& event ) { event.Skip(); }
+    virtual void OnResetDialogs( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnDefault( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+
+    OptionsDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+    ~OptionsDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class TooltipDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class TooltipDlgGenerated : public wxDialog 
+class TooltipDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-	
-	public:
-		wxStaticBitmap* m_bitmapLeft;
-		wxStaticText* m_staticTextMain;
-		
-		TooltipDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
-		~TooltipDlgGenerated();
-	
+private:
+
+protected:
+
+public:
+    wxStaticBitmap* m_bitmapLeft;
+    wxStaticText* m_staticTextMain;
+
+    TooltipDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+    ~TooltipDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class SelectTimespanDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class SelectTimespanDlgGenerated : public wxDialog 
+class SelectTimespanDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxPanel* m_panel35;
-		wxCalendarCtrl* m_calendarFrom;
-		wxCalendarCtrl* m_calendarTo;
-		wxStaticLine* m_staticline21;
-		wxBoxSizer* bSizerStdButtons;
-		wxButton* m_buttonOkay;
-		wxButton* m_buttonCancel;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnChangeSelectionFrom( wxCalendarEvent& event ) { event.Skip(); }
-		virtual void OnChangeSelectionTo( wxCalendarEvent& event ) { event.Skip(); }
-		virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		SelectTimespanDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Select Time Span"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
-		~SelectTimespanDlgGenerated();
-	
+private:
+
+protected:
+    wxPanel* m_panel35;
+    wxCalendarCtrl* m_calendarFrom;
+    wxCalendarCtrl* m_calendarTo;
+    wxStaticLine* m_staticline21;
+    wxBoxSizer* bSizerStdButtons;
+    wxButton* m_buttonOkay;
+    wxButton* m_buttonCancel;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnChangeSelectionFrom( wxCalendarEvent& event ) { event.Skip(); }
+    virtual void OnChangeSelectionTo( wxCalendarEvent& event ) { event.Skip(); }
+    virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+
+    SelectTimespanDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Select Time Span"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+    ~SelectTimespanDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class AboutDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class AboutDlgGenerated : public wxDialog 
+class AboutDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxPanel* m_panel41;
-		wxStaticBitmap* m_bitmapLogo;
-		wxStaticLine* m_staticline341;
-		wxStaticText* m_staticText96;
-		wxHyperlinkCtrl* m_hyperlink11;
-		wxHyperlinkCtrl* m_hyperlink7;
-		wxHyperlinkCtrl* m_hyperlink14;
-		wxHyperlinkCtrl* m_hyperlink16;
-		wxHyperlinkCtrl* m_hyperlink15;
-		wxHyperlinkCtrl* m_hyperlink12;
-		wxHyperlinkCtrl* m_hyperlink13;
-		wxHyperlinkCtrl* m_hyperlink10;
-		wxHyperlinkCtrl* m_hyperlink18;
-		wxHyperlinkCtrl* m_hyperlink9;
-		wxPanel* m_panelThankYou;
-		wxPanel* m_panel391;
-		wxStaticBitmap* m_bitmapThanks;
-		wxStaticText* m_staticTextThanks;
-		wxButton* m_buttonShowDonationDetails;
-		wxPanel* m_panelDonate;
-		wxPanel* m_panel39;
-		wxStaticBitmap* m_bitmapDonate;
-		wxStaticText* m_staticTextDonate;
-		wxButton* m_buttonDonate;
-		wxStaticText* m_staticText94;
-		wxStaticBitmap* m_bitmapHomepage;
-		wxHyperlinkCtrl* m_hyperlink1;
-		wxStaticBitmap* m_bitmapEmail;
-		wxHyperlinkCtrl* m_hyperlink2;
-		wxStaticLine* m_staticline34;
-		wxStaticText* m_staticText93;
-		wxStaticBitmap* m_bitmapGpl;
-		wxHyperlinkCtrl* m_hyperlink5;
-		wxStaticLine* m_staticline37;
-		wxStaticText* m_staticText54;
-		wxScrolledWindow* m_scrolledWindowTranslators;
-		wxFlexGridSizer* fgSizerTranslators;
-		wxStaticLine* m_staticline36;
-		wxBoxSizer* bSizerStdButtons;
-		wxButton* m_buttonClose;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnShowDonationDetails( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnDonate( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnOK( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		AboutDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("About"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
-		~AboutDlgGenerated();
-	
+private:
+
+protected:
+    wxPanel* m_panel41;
+    wxStaticBitmap* m_bitmapLogo;
+    wxStaticLine* m_staticline341;
+    wxStaticText* m_staticText96;
+    wxHyperlinkCtrl* m_hyperlink11;
+    wxHyperlinkCtrl* m_hyperlink7;
+    wxHyperlinkCtrl* m_hyperlink14;
+    wxHyperlinkCtrl* m_hyperlink16;
+    wxHyperlinkCtrl* m_hyperlink15;
+    wxHyperlinkCtrl* m_hyperlink12;
+    wxHyperlinkCtrl* m_hyperlink13;
+    wxHyperlinkCtrl* m_hyperlink10;
+    wxHyperlinkCtrl* m_hyperlink18;
+    wxHyperlinkCtrl* m_hyperlink9;
+    wxPanel* m_panelThankYou;
+    wxPanel* m_panel391;
+    wxStaticBitmap* m_bitmapThanks;
+    wxStaticText* m_staticTextThanks;
+    wxButton* m_buttonShowDonationDetails;
+    wxPanel* m_panelDonate;
+    wxPanel* m_panel39;
+    wxStaticBitmap* m_bitmapDonate;
+    wxStaticText* m_staticTextDonate;
+    wxButton* m_buttonDonate;
+    wxStaticText* m_staticText94;
+    wxStaticBitmap* m_bitmapHomepage;
+    wxHyperlinkCtrl* m_hyperlink1;
+    wxStaticBitmap* m_bitmapEmail;
+    wxHyperlinkCtrl* m_hyperlink2;
+    wxStaticLine* m_staticline34;
+    wxStaticText* m_staticText93;
+    wxStaticBitmap* m_bitmapGpl;
+    wxHyperlinkCtrl* m_hyperlink5;
+    wxStaticLine* m_staticline37;
+    wxStaticText* m_staticText54;
+    wxScrolledWindow* m_scrolledWindowTranslators;
+    wxFlexGridSizer* fgSizerTranslators;
+    wxStaticLine* m_staticline36;
+    wxBoxSizer* bSizerStdButtons;
+    wxButton* m_buttonClose;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnShowDonationDetails( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnDonate( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnOK( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+
+    AboutDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("About"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+    ~AboutDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class DownloadProgressDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class DownloadProgressDlgGenerated : public wxDialog 
+class DownloadProgressDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxStaticBitmap* m_bitmapDownloading;
-		wxStaticText* m_staticTextHeader;
-		wxGauge* m_gaugeProgress;
-		wxStaticText* m_staticTextDetails;
-		wxStaticLine* m_staticline9;
-		wxBoxSizer* bSizerStdButtons;
-		wxButton* m_buttonCancel;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		DownloadProgressDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0 ); 
-		~DownloadProgressDlgGenerated();
-	
+private:
+
+protected:
+    wxStaticBitmap* m_bitmapDownloading;
+    wxStaticText* m_staticTextHeader;
+    wxGauge* m_gaugeProgress;
+    wxStaticText* m_staticTextDetails;
+    wxStaticLine* m_staticline9;
+    wxBoxSizer* bSizerStdButtons;
+    wxButton* m_buttonCancel;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+
+    DownloadProgressDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0 );
+    ~DownloadProgressDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class ActivationDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class ActivationDlgGenerated : public wxDialog 
+class ActivationDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxPanel* m_panel35;
-		wxStaticBitmap* m_bitmapActivation;
-		wxTextCtrl* m_textCtrlLastError;
-		wxStaticText* m_staticTextMain;
-		wxStaticLine* m_staticline181;
-		wxStaticLine* m_staticline18111;
-		wxPanel* m_panel3511;
-		wxStaticText* m_staticText136;
-		wxButton* m_buttonActivateOnline;
-		wxStaticLine* m_staticline181111;
-		wxStaticLine* m_staticline181112;
-		wxPanel* m_panel351;
-		wxStaticText* m_staticText1361;
-		wxButton* m_buttonCopyUrl;
-		wxTextCtrl* m_textCtrlManualActivationUrl;
-		wxStaticText* m_staticText13611;
-		wxTextCtrl* m_textCtrlOfflineActivationKey;
-		wxButton* m_buttonActivateOffline;
-		wxStaticLine* m_staticline13;
-		wxBoxSizer* bSizerStdButtons;
-		wxButton* m_buttonCancel;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnActivateOnline( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCopyUrl( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnOfflineActivationEnter( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnActivateOffline( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		ActivationDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("FreeFileSync Donation Edition"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
-		~ActivationDlgGenerated();
-	
+private:
+
+protected:
+    wxPanel* m_panel35;
+    wxStaticBitmap* m_bitmapActivation;
+    wxTextCtrl* m_textCtrlLastError;
+    wxStaticText* m_staticTextMain;
+    wxStaticLine* m_staticline181;
+    wxStaticLine* m_staticline18111;
+    wxPanel* m_panel3511;
+    wxStaticText* m_staticText136;
+    wxButton* m_buttonActivateOnline;
+    wxStaticLine* m_staticline181111;
+    wxStaticLine* m_staticline181112;
+    wxPanel* m_panel351;
+    wxStaticText* m_staticText1361;
+    wxButton* m_buttonCopyUrl;
+    wxTextCtrl* m_textCtrlManualActivationUrl;
+    wxStaticText* m_staticText13611;
+    wxTextCtrl* m_textCtrlOfflineActivationKey;
+    wxButton* m_buttonActivateOffline;
+    wxStaticLine* m_staticline13;
+    wxBoxSizer* bSizerStdButtons;
+    wxButton* m_buttonCancel;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnActivateOnline( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCopyUrl( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnOfflineActivationEnter( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnActivateOffline( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+
+    ActivationDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("FreeFileSync Donation Edition"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+    ~ActivationDlgGenerated();
+
 };
 
 #endif //__GUI_GENERATED_H__
diff --git a/FreeFileSync/Source/ui/gui_status_handler.cpp b/FreeFileSync/Source/ui/gui_status_handler.cpp
index 77dbed0a..c1f77479 100755
--- a/FreeFileSync/Source/ui/gui_status_handler.cpp
+++ b/FreeFileSync/Source/ui/gui_status_handler.cpp
@@ -23,11 +23,11 @@ using namespace xmlAccess;
 StatusHandlerTemporaryPanel::StatusHandlerTemporaryPanel(MainDialog& dlg) : mainDlg(dlg)
 {
     {
-        mainDlg.compareStatus->init(*this); //clear old values before showing panel
+        mainDlg.compareStatus_->init(*this); //clear old values before showing panel
 
         //------------------------------------------------------------------
-        const wxAuiPaneInfo& topPanel = mainDlg.auiMgr.GetPane(mainDlg.m_panelTopButtons);
-        wxAuiPaneInfo& statusPanel    = mainDlg.auiMgr.GetPane(mainDlg.compareStatus->getAsWindow());
+        const wxAuiPaneInfo& topPanel = mainDlg.auiMgr_.GetPane(mainDlg.m_panelTopButtons);
+        wxAuiPaneInfo& statusPanel    = mainDlg.auiMgr_.GetPane(mainDlg.compareStatus_->getAsWindow());
 
         //determine best status panel row near top panel
         switch (topPanel.dock_direction)
@@ -48,7 +48,7 @@ StatusHandlerTemporaryPanel::StatusHandlerTemporaryPanel(MainDialog& dlg) : main
                 //case wxAUI_DOCK_CENTRE:
         }
 
-        wxAuiPaneInfoArray& paneArray = mainDlg.auiMgr.GetAllPanes();
+        wxAuiPaneInfoArray& paneArray = mainDlg.auiMgr_.GetAllPanes();
 
         const bool statusRowTaken = [&]
         {
@@ -80,7 +80,7 @@ StatusHandlerTemporaryPanel::StatusHandlerTemporaryPanel(MainDialog& dlg) : main
         //------------------------------------------------------------------
 
         statusPanel.Show();
-        mainDlg.auiMgr.Update();
+        mainDlg.auiMgr_.Update();
     }
 
     mainDlg.Update(); //don't wait until idle event!
@@ -97,9 +97,9 @@ StatusHandlerTemporaryPanel::~StatusHandlerTemporaryPanel()
     mainDlg.Disconnect(wxEVT_CHAR_HOOK, wxKeyEventHandler(StatusHandlerTemporaryPanel::OnKeyPressed), nullptr, this);
     mainDlg.m_buttonCancel->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(StatusHandlerTemporaryPanel::OnAbortCompare), nullptr, this);
 
-    mainDlg.auiMgr.GetPane(mainDlg.compareStatus->getAsWindow()).Hide();
-    mainDlg.auiMgr.Update();
-    mainDlg.compareStatus->teardown();
+    mainDlg.auiMgr_.GetPane(mainDlg.compareStatus_->getAsWindow()).Hide();
+    mainDlg.auiMgr_.Update();
+    mainDlg.compareStatus_->teardown();
 }
 
 
@@ -120,7 +120,7 @@ void StatusHandlerTemporaryPanel::initNewPhase(int itemsTotal, int64_t bytesTota
 {
     StatusHandler::initNewPhase(itemsTotal, bytesTotal, phaseID);
 
-    mainDlg.compareStatus->initNewPhase(); //call after "StatusHandler::initNewPhase"
+    mainDlg.compareStatus_->initNewPhase(); //call after "StatusHandler::initNewPhase"
 
     forceUiRefresh(); //throw ?; OS X needs a full yield to update GUI and get rid of "dummy" texts
 }
@@ -225,7 +225,7 @@ void StatusHandlerTemporaryPanel::reportWarning(const std::wstring& warningMessa
 
 void StatusHandlerTemporaryPanel::forceUiRefresh()
 {
-    mainDlg.compareStatus->updateStatusPanelNow();
+    mainDlg.compareStatus_->updateStatusPanelNow();
 }
 
 
@@ -410,7 +410,6 @@ ProcessCallback::Response StatusHandlerFloatingDialog::reportError(const std::ws
         return ProcessCallback::RETRY;
     }
 
-
     //always, except for "retry":
     auto guardWriteLog = zen::makeGuard<ScopeGuardRunMode::ON_EXIT>([&] { errorLog_.logMsg(errorMessage, TYPE_ERROR); });
 
diff --git a/FreeFileSync/Source/ui/main_dlg.cpp b/FreeFileSync/Source/ui/main_dlg.cpp
index 91bf0408..3a280a34 100755
--- a/FreeFileSync/Source/ui/main_dlg.cpp
+++ b/FreeFileSync/Source/ui/main_dlg.cpp
@@ -155,7 +155,7 @@ public:
 private:
     MainConfiguration getMainConfig() const override { return mainDlg_.getConfig().mainCfg; }
     wxWindow* getParentWindow() override { return &mainDlg_; }
-    std::unique_ptr<FilterConfig>& getFilterCfgOnClipboardRef() override { return mainDlg_.filterCfgOnClipboard; }
+    std::unique_ptr<FilterConfig>& getFilterCfgOnClipboardRef() override { return mainDlg_.filterCfgOnClipboard_; }
 
     void onAltCompCfgChange    () override { mainDlg_.applyCompareConfig(false /*setDefaultViewType*/); }
     void onAltSyncCfgChange    () override { mainDlg_.applySyncConfig(); }
@@ -212,19 +212,19 @@ public:
 
         //prepare drag & drop
         folderSelectorLeft_(mainDialog,
-                           *mainDialog.m_panelTopLeft,
-                           *mainDialog.m_buttonSelectFolderLeft,
-                           *mainDialog.m_bpButtonSelectAltFolderLeft,
-                           *mainDialog.m_folderPathLeft,
-                           mainDialog.m_staticTextResolvedPathL,
-                           &mainDialog.m_gridMainL->getMainWin()),
+                            *mainDialog.m_panelTopLeft,
+                            *mainDialog.m_buttonSelectFolderLeft,
+                            *mainDialog.m_bpButtonSelectAltFolderLeft,
+                            *mainDialog.m_folderPathLeft,
+                            mainDialog.m_staticTextResolvedPathL,
+                            &mainDialog.m_gridMainL->getMainWin()),
         folderSelectorRight_(mainDialog,
-                            *mainDialog.m_panelTopRight,
-                            *mainDialog.m_buttonSelectFolderRight,
-                            *mainDialog.m_bpButtonSelectAltFolderRight,
-                            *mainDialog.m_folderPathRight,
-                            mainDialog.m_staticTextResolvedPathR,
-                            &mainDialog.m_gridMainR->getMainWin())
+                             *mainDialog.m_panelTopRight,
+                             *mainDialog.m_buttonSelectFolderRight,
+                             *mainDialog.m_bpButtonSelectAltFolderRight,
+                             *mainDialog.m_folderPathRight,
+                             mainDialog.m_staticTextResolvedPathR,
+                             &mainDialog.m_gridMainR->getMainWin())
     {
         folderSelectorLeft_ .setSiblingSelector(&folderSelectorRight_);
         folderSelectorRight_.setSiblingSelector(&folderSelectorLeft_);
@@ -418,8 +418,8 @@ MainDialog::MainDialog(const Zstring& globalConfigFile,
     globalConfigFile_(globalConfigFile),
     lastRunConfigPath_(getLastRunConfigPath())
 {
-    m_folderPathLeft ->init(folderHistoryLeft);
-    m_folderPathRight->init(folderHistoryRight);
+    m_folderPathLeft ->init(folderHistoryLeft_);
+    m_folderPathRight->init(folderHistoryRight_);
 
     //setup sash: detach + reparent:
     m_splitterMain->SetSizer(nullptr); //alas wxFormbuilder doesn't allow us to have child windows without a sizer, so we have to remove it here
@@ -455,19 +455,19 @@ MainDialog::MainDialog(const Zstring& globalConfigFile,
     //---------------- support for dockable gui style --------------------------------
     bSizerPanelHolder->Detach(m_panelTopButtons);
     bSizerPanelHolder->Detach(m_panelDirectoryPairs);
-    bSizerPanelHolder->Detach(m_gridNavi);
+    bSizerPanelHolder->Detach(m_gridOverview);
     bSizerPanelHolder->Detach(m_panelCenter);
     bSizerPanelHolder->Detach(m_panelConfig);
     bSizerPanelHolder->Detach(m_panelViewFilter);
 
-    auiMgr.SetManagedWindow(this);
-    auiMgr.SetFlags(wxAUI_MGR_DEFAULT | wxAUI_MGR_LIVE_RESIZE);
+    auiMgr_.SetManagedWindow(this);
+    auiMgr_.SetFlags(wxAUI_MGR_DEFAULT | wxAUI_MGR_LIVE_RESIZE);
 
-    compareStatus = std::make_unique<CompareProgressDialog>(*this); //integrate the compare status panel (in hidden state)
+    compareStatus_ = std::make_unique<CompareProgressDialog>(*this); //integrate the compare status panel (in hidden state)
 
     //caption required for all panes that can be manipulated by the users => used by context menu
-    auiMgr.AddPane(m_panelCenter,
-                   wxAuiPaneInfo().Name(L"CenterPanel").CenterPane().PaneBorder(false));
+    auiMgr_.AddPane(m_panelCenter,
+                    wxAuiPaneInfo().Name(L"CenterPanel").CenterPane().PaneBorder(false));
     {
         //set comparison button label tentatively for m_panelTopButtons to receive final height:
         updateTopButton(*m_buttonCompare, getResourceImage(L"compare"), L"Dummy", false);
@@ -477,34 +477,34 @@ MainDialog::MainDialog(const Zstring& globalConfigFile,
         m_buttonCancel->SetMinSize(wxSize(std::max(m_buttonCancel->GetSize().x, TOP_BUTTON_OPTIMAL_WIDTH),
                                           std::max(m_buttonCancel->GetSize().y, m_buttonCompare->GetSize().y)));
 
-        auiMgr.AddPane(m_panelTopButtons,
-                       wxAuiPaneInfo().Name(L"TopPanel").Layer(2).Top().Row(1).Caption(_("Main Bar")).CaptionVisible(false).PaneBorder(false).Gripper().MinSize(TOP_BUTTON_OPTIMAL_WIDTH, m_panelTopButtons->GetSize().GetHeight()));
+        auiMgr_.AddPane(m_panelTopButtons,
+                        wxAuiPaneInfo().Name(L"TopPanel").Layer(2).Top().Row(1).Caption(_("Main Bar")).CaptionVisible(false).PaneBorder(false).Gripper().MinSize(TOP_BUTTON_OPTIMAL_WIDTH, m_panelTopButtons->GetSize().GetHeight()));
         //note: min height is calculated incorrectly by wxAuiManager if panes with and without caption are in the same row => use smaller min-size
 
-        auiMgr.AddPane(compareStatus->getAsWindow(),
-                       wxAuiPaneInfo().Name(L"ProgressPanel").Layer(2).Top().Row(2).CaptionVisible(false).PaneBorder(false).Hide()
-                       //wxAui does not consider the progress panel's wxRAISED_BORDER and set's too small a panel height! => use correct value from wxWindow::GetSize()
-                       .MinSize(200, compareStatus->getAsWindow()->GetSize().GetHeight())); //bonus: minimal height isn't a bad idea anyway
+        auiMgr_.AddPane(compareStatus_->getAsWindow(),
+                        wxAuiPaneInfo().Name(L"ProgressPanel").Layer(2).Top().Row(2).CaptionVisible(false).PaneBorder(false).Hide()
+                        //wxAui does not consider the progress panel's wxRAISED_BORDER and set's too small a panel height! => use correct value from wxWindow::GetSize()
+                        .MinSize(200, compareStatus_->getAsWindow()->GetSize().GetHeight())); //bonus: minimal height isn't a bad idea anyway
     }
 
-    auiMgr.AddPane(m_panelDirectoryPairs,
-                   wxAuiPaneInfo().Name(L"FoldersPanel").Layer(2).Top().Row(3).Caption(_("Folder Pairs")).CaptionVisible(false).PaneBorder(false).Gripper());
+    auiMgr_.AddPane(m_panelDirectoryPairs,
+                    wxAuiPaneInfo().Name(L"FoldersPanel").Layer(2).Top().Row(3).Caption(_("Folder Pairs")).CaptionVisible(false).PaneBorder(false).Gripper());
 
-    auiMgr.AddPane(m_panelSearch,
-                   wxAuiPaneInfo().Name(L"SearchPanel").Layer(2).Bottom().Row(2).Caption(_("Find")).CaptionVisible(false).PaneBorder(false).Gripper().MinSize(200, m_bpButtonHideSearch->GetSize().GetHeight()).Hide());
+    auiMgr_.AddPane(m_panelSearch,
+                    wxAuiPaneInfo().Name(L"SearchPanel").Layer(2).Bottom().Row(2).Caption(_("Find")).CaptionVisible(false).PaneBorder(false).Gripper().MinSize(200, m_bpButtonHideSearch->GetSize().GetHeight()).Hide());
 
-    auiMgr.AddPane(m_panelViewFilter,
-                   wxAuiPaneInfo().Name(L"ViewFilterPanel").Layer(2).Bottom().Row(1).Caption(_("View Settings")).CaptionVisible(false).PaneBorder(false).Gripper().MinSize(m_bpButtonViewTypeSyncAction->GetSize().GetWidth(), m_panelViewFilter->GetSize().GetHeight()));
+    auiMgr_.AddPane(m_panelViewFilter,
+                    wxAuiPaneInfo().Name(L"ViewFilterPanel").Layer(2).Bottom().Row(1).Caption(_("View Settings")).CaptionVisible(false).PaneBorder(false).Gripper().MinSize(m_bpButtonViewTypeSyncAction->GetSize().GetWidth(), m_panelViewFilter->GetSize().GetHeight()));
 
-    auiMgr.AddPane(m_panelConfig,
-                   wxAuiPaneInfo().Name(L"ConfigPanel").Layer(3).Left().Position(1).Caption(_("Configuration")).MinSize(m_listBoxHistory->GetSize().GetWidth(), m_panelConfig->GetSize().GetHeight()));
+    auiMgr_.AddPane(m_panelConfig,
+                    wxAuiPaneInfo().Name(L"ConfigPanel").Layer(3).Left().Position(1).Caption(_("Configuration")).MinSize(m_listBoxHistory->GetSize().GetWidth(), m_panelConfig->GetSize().GetHeight()));
 
-    auiMgr.AddPane(m_gridNavi,
-                   wxAuiPaneInfo().Name(L"OverviewPanel").Layer(3).Left().Position(2).Caption(_("Overview")).MinSize(300, m_gridNavi->GetSize().GetHeight())); //MinSize(): just default size, see comment below
+    auiMgr_.AddPane(m_gridOverview,
+                    wxAuiPaneInfo().Name(L"OverviewPanel").Layer(3).Left().Position(2).Caption(_("Overview")).MinSize(300, m_gridOverview->GetSize().GetHeight())); //MinSize(): just default size, see comment below
 
-    auiMgr.Update();
+    auiMgr_.Update();
 
-    if (wxAuiDockArt* artProvider = auiMgr.GetArtProvider())
+    if (wxAuiDockArt* artProvider = auiMgr_.GetArtProvider())
     {
         wxFont font = artProvider->GetFont(wxAUI_DOCKART_CAPTION_FONT);
         font.SetWeight(wxFONTWEIGHT_BOLD);
@@ -519,10 +519,10 @@ MainDialog::MainDialog(const Zstring& globalConfigFile,
         //wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT) -> better than wxBLACK, but which background to use?
     }
 
-    auiMgr.GetPane(m_gridNavi).MinSize(-1, -1); //we successfully tricked wxAuiManager into setting an initial Window size :> incomplete API anyone??
-    auiMgr.Update(); //
+    auiMgr_.GetPane(m_gridOverview).MinSize(-1, -1); //we successfully tricked wxAuiManager into setting an initial Window size :> incomplete API anyone??
+    auiMgr_.Update(); //
 
-    defaultPerspective = auiMgr.SavePerspective();
+    defaultPerspective_ = auiMgr_.SavePerspective();
     //----------------------------------------------------------------------------------
     //register view layout context menu
     m_panelTopButtons->Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(MainDialog::OnContextSetLayout), nullptr, this);
@@ -541,15 +541,15 @@ MainDialog::MainDialog(const Zstring& globalConfigFile,
     m_gridMainR->Connect(EVENT_GRID_COL_LABEL_MOUSE_RIGHT, GridLabelClickEventHandler(MainDialog::onGridLabelContextR  ), nullptr, this);
 
     //grid context menu
-    m_gridMainL->Connect(EVENT_GRID_MOUSE_RIGHT_UP,   GridClickEventHandler(MainDialog::onMainGridContextL), nullptr, this);
-    m_gridMainC->Connect(EVENT_GRID_MOUSE_RIGHT_DOWN, GridClickEventHandler(MainDialog::onMainGridContextC), nullptr, this);
-    m_gridMainR->Connect(EVENT_GRID_MOUSE_RIGHT_UP,   GridClickEventHandler(MainDialog::onMainGridContextR), nullptr, this);
-    m_gridNavi ->Connect(EVENT_GRID_MOUSE_RIGHT_UP,   GridClickEventHandler(MainDialog::onNaviGridContext ), nullptr, this);
+    m_gridMainL   ->Connect(EVENT_GRID_MOUSE_RIGHT_UP,   GridClickEventHandler(MainDialog::onMainGridContextL), nullptr, this);
+    m_gridMainC   ->Connect(EVENT_GRID_MOUSE_RIGHT_DOWN, GridClickEventHandler(MainDialog::onMainGridContextC), nullptr, this);
+    m_gridMainR   ->Connect(EVENT_GRID_MOUSE_RIGHT_UP,   GridClickEventHandler(MainDialog::onMainGridContextR), nullptr, this);
+    m_gridOverview->Connect(EVENT_GRID_MOUSE_RIGHT_UP,   GridClickEventHandler(MainDialog::onNaviGridContext ), nullptr, this);
 
     m_gridMainL->Connect(EVENT_GRID_MOUSE_LEFT_DOUBLE, GridClickEventHandler(MainDialog::onGridDoubleClickL), nullptr, this );
     m_gridMainR->Connect(EVENT_GRID_MOUSE_LEFT_DOUBLE, GridClickEventHandler(MainDialog::onGridDoubleClickR), nullptr, this );
 
-    m_gridNavi->Connect(EVENT_GRID_SELECT_RANGE, GridRangeSelectEventHandler(MainDialog::onNaviSelection), nullptr, this);
+    m_gridOverview->Connect(EVENT_GRID_SELECT_RANGE, GridRangeSelectEventHandler(MainDialog::onNaviSelection), nullptr, this);
     //----------------------------------------------------------------------------------
 
     m_panelSearch->Connect(wxEVT_CHAR_HOOK, wxKeyEventHandler(MainDialog::OnSearchPanelKeyPressed), nullptr, this);
@@ -569,8 +569,8 @@ MainDialog::MainDialog(const Zstring& globalConfigFile,
     m_bpButtonCmpContext ->SetToolTip(m_bpButtonCmpConfig ->GetToolTipText());
     m_bpButtonSyncContext->SetToolTip(m_bpButtonSyncConfig->GetToolTipText());
 
-    gridDataView = std::make_shared<GridView>();
-    treeDataView = std::make_shared<TreeView>();
+    gridDataView_ = std::make_shared<GridView>();
+    treeDataView_ = std::make_shared<TreeView>();
 
 
     {
@@ -607,14 +607,39 @@ MainDialog::MainDialog(const Zstring& globalConfigFile,
         wxMenuItem* newItem = new wxMenuItem(m_menuLanguages, wxID_ANY, ti.languageName);
         newItem->SetBitmap(getResourceImage(ti.languageFlag));
 
-        //map menu item IDs with language IDs: evaluated when processing event handler
-        languageMenuItemMap.emplace(newItem->GetId(), ti.languageID);
-
-        //connect event
-        this->Connect(newItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainDialog::OnMenuLanguageSwitch), nullptr, this);
+        m_menuLanguages->Bind(wxEVT_COMMAND_MENU_SELECTED, [this, langId = ti.languageID](wxCommandEvent&) { this->switchProgramLanguage(langId); }, newItem->GetId());
         m_menuLanguages->Append(newItem); //pass ownership
     }
 
+
+    //set up layout items to toggle showing hidden panels
+    m_menuItemShowMain      ->SetItemLabel(replaceCpy(_("Show \"%x\""), L"%x", _("Main Bar")));
+    m_menuItemShowFolders   ->SetItemLabel(replaceCpy(_("Show \"%x\""), L"%x", _("Folder Pairs")));
+    m_menuItemShowViewFilter->SetItemLabel(replaceCpy(_("Show \"%x\""), L"%x", _("View Settings")));
+    m_menuItemShowConfig    ->SetItemLabel(replaceCpy(_("Show \"%x\""), L"%x", _("Configuration")));
+    m_menuItemShowOverview  ->SetItemLabel(replaceCpy(_("Show \"%x\""), L"%x", _("Overview")));
+
+    auto setupLayoutMenuEvent = [&](wxMenuItem* menuItem, wxWindow* panelWindow)
+    {
+        m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, [this, panelWindow](wxCommandEvent&)
+        {
+            wxAuiPaneInfo& paneInfo = this->auiMgr_.GetPane(panelWindow);
+            paneInfo.Show();
+            this->auiMgr_.Update();
+        }, menuItem->GetId());
+
+        //"hide" menu items by default
+        detachedMenuItemsLayout_.insert(m_menuTools->Remove(menuItem)); //pass ownership
+    };
+    setupLayoutMenuEvent(m_menuItemShowMain,       m_panelTopButtons);
+    setupLayoutMenuEvent(m_menuItemShowFolders,    m_panelDirectoryPairs);
+    setupLayoutMenuEvent(m_menuItemShowViewFilter, m_panelViewFilter);
+    setupLayoutMenuEvent(m_menuItemShowConfig,     m_panelConfig);
+    setupLayoutMenuEvent(m_menuItemShowOverview,   m_gridOverview);
+
+    m_menuTools->Connect(wxEVT_MENU_OPEN, wxMenuEventHandler(MainDialog::onOpenMenuTools), nullptr, this);
+
+
     //show FreeFileSync update reminder
     if (!globalSettings.gui.lastOnlineVersion.empty() && haveNewerVersionOnline(globalSettings.gui.lastOnlineVersion))
     {
@@ -629,13 +654,13 @@ MainDialog::MainDialog(const Zstring& globalConfigFile,
     zen::setMainWindow(this);
 
     //init handling of first folder pair
-    firstFolderPair = std::make_unique<FolderPairFirst>(*this);
+    firstFolderPair_ = std::make_unique<FolderPairFirst>(*this);
 
     initViewFilterButtons();
 
     //init grid settings
-    gridview::init(*m_gridMainL, *m_gridMainC, *m_gridMainR, gridDataView);
-    treeview::init(*m_gridNavi, treeDataView);
+    gridview::init(*m_gridMainL, *m_gridMainC, *m_gridMainR, gridDataView_);
+    treeview::init(*m_gridOverview, treeDataView_);
 
     //initialize and load configuration
     setGlobalCfgOnInit(globalSettings);
@@ -646,7 +671,7 @@ MainDialog::MainDialog(const Zstring& globalConfigFile,
     m_gridMainC->getMainWin().Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(MainDialog::onGridButtonEventC), nullptr, this);
     m_gridMainR->getMainWin().Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(MainDialog::onGridButtonEventR), nullptr, this);
 
-    m_gridNavi->getMainWin().Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(MainDialog::onTreeButtonEvent), nullptr, this);
+    m_gridOverview->getMainWin().Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(MainDialog::onTreeButtonEvent), nullptr, this);
 
     //enable dialog-specific key local events
     Connect(wxEVT_CHAR_HOOK, wxKeyEventHandler(MainDialog::onLocalKeyEvent), nullptr, this);
@@ -788,7 +813,10 @@ MainDialog::~MainDialog()
     catch (const FileError&) {}
 
 
-    auiMgr.UnInit();
+    auiMgr_.UnInit();
+
+    for (wxMenuItem* item : detachedMenuItemsLayout_)
+        delete item; //something's got to give
 
     //no need for wxEventHandler::Disconnect() here; event sources are components of this window and are destroyed, too
 }
@@ -809,7 +837,7 @@ void MainDialog::onQueryEndSession()
 
 void MainDialog::setGlobalCfgOnInit(const xmlAccess::XmlGlobalSettings& globalSettings)
 {
-    globalCfg = globalSettings;
+    globalCfg_ = globalSettings;
 
     //caveat set/get language asymmmetry! setLanguage(globalSettings.programLanguage); //throw FileError
     //we need to set langugabe before creating this class!
@@ -859,10 +887,10 @@ void MainDialog::setGlobalCfgOnInit(const xmlAccess::XmlGlobalSettings& globalSe
     m_gridMainR   ->setColumnConfig(gridview::convertConfig(globalSettings.gui.mainDlg.columnAttribRight));
     m_splitterMain->setSashOffset(globalSettings.gui.mainDlg.sashOffset);
 
-    m_gridNavi->setColumnConfig(treeview::convertConfig(globalSettings.gui.mainDlg.columnAttribNavi));
-    treeview::setShowPercentage(*m_gridNavi, globalSettings.gui.mainDlg.naviGridShowPercentBar);
+    m_gridOverview->setColumnConfig(treeview::convertConfig(globalSettings.gui.mainDlg.columnAttribNavi));
+    treeview::setShowPercentage(*m_gridOverview, globalSettings.gui.mainDlg.naviGridShowPercentBar);
 
-    treeDataView->setSortDirection(globalSettings.gui.mainDlg.naviGridLastSortColumn, globalSettings.gui.mainDlg.naviGridLastSortAscending);
+    treeDataView_->setSortDirection(globalSettings.gui.mainDlg.naviGridLastSortColumn, globalSettings.gui.mainDlg.naviGridLastSortAscending);
 
     //--------------------------------------------------------------------------------
     //load list of last used configuration files
@@ -881,8 +909,8 @@ void MainDialog::setGlobalCfgOnInit(const xmlAccess::XmlGlobalSettings& globalSe
     //--------------------------------------------------------------------------------
 
     //load list of last used folders
-    *folderHistoryLeft  = FolderHistory(globalSettings.gui.folderHistoryLeft,  globalSettings.gui.folderHistMax);
-    *folderHistoryRight = FolderHistory(globalSettings.gui.folderHistoryRight, globalSettings.gui.folderHistMax);
+    *folderHistoryLeft_  = FolderHistory(globalSettings.gui.folderHistoryLeft,  globalSettings.gui.folderHistMax);
+    *folderHistoryRight_ = FolderHistory(globalSettings.gui.folderHistoryRight, globalSettings.gui.folderHistMax);
 
     //show/hide file icons
     gridview::setupIcons(*m_gridMainL, *m_gridMainC, *m_gridMainR, globalSettings.gui.mainDlg.showIcons, convert(globalSettings.gui.mainDlg.iconSize));
@@ -891,29 +919,29 @@ void MainDialog::setGlobalCfgOnInit(const xmlAccess::XmlGlobalSettings& globalSe
     gridview::setItemPathForm(*m_gridMainR, globalSettings.gui.mainDlg.itemPathFormatRightGrid);
 
     //------------------------------------------------------------------------------------------------
-    m_checkBoxMatchCase->SetValue(globalCfg.gui.mainDlg.textSearchRespectCase);
+    m_checkBoxMatchCase->SetValue(globalCfg_.gui.mainDlg.textSearchRespectCase);
 
     //wxAuiManager erroneously loads panel captions, we don't want that
     std::vector<std::pair<wxString, wxString>>captionNameMap;
-    const wxAuiPaneInfoArray& paneArray = auiMgr.GetAllPanes();
+    const wxAuiPaneInfoArray& paneArray = auiMgr_.GetAllPanes();
     for (size_t i = 0; i < paneArray.size(); ++i)
         captionNameMap.emplace_back(paneArray[i].caption, paneArray[i].name);
 
-    auiMgr.LoadPerspective(globalSettings.gui.mainDlg.guiPerspectiveLast);
+    auiMgr_.LoadPerspective(globalSettings.gui.mainDlg.guiPerspectiveLast);
 
     //restore original captions
     for (const auto& item : captionNameMap)
-        auiMgr.GetPane(item.second).Caption(item.first);
+        auiMgr_.GetPane(item.second).Caption(item.first);
     //------------------------------------------------------------------------------------------------
 
     //if MainDialog::onQueryEndSession() is called while comparison is active, this panel is saved and restored as "visible"
-    auiMgr.GetPane(compareStatus->getAsWindow()).Hide();
+    auiMgr_.GetPane(compareStatus_->getAsWindow()).Hide();
 
-    auiMgr.GetPane(m_panelSearch).Hide(); //no need to show it on startup
+    auiMgr_.GetPane(m_panelSearch).Hide(); //no need to show it on startup
 
-    m_menuItemCheckVersionAuto->Check(updateCheckActive(globalCfg.gui.lastUpdateCheck));
+    m_menuItemCheckVersionAuto->Check(updateCheckActive(globalCfg_.gui.lastUpdateCheck));
 
-    auiMgr.Update();
+    auiMgr_.Update();
 }
 
 
@@ -921,7 +949,7 @@ xmlAccess::XmlGlobalSettings MainDialog::getGlobalCfgBeforeExit()
 {
     Freeze(); //no need to Thaw() again!!
 
-    xmlAccess::XmlGlobalSettings globalSettings = globalCfg;
+    xmlAccess::XmlGlobalSettings globalSettings = globalCfg_;
 
     globalSettings.programLanguage = getLanguage();
 
@@ -930,10 +958,10 @@ xmlAccess::XmlGlobalSettings MainDialog::getGlobalCfgBeforeExit()
     globalSettings.gui.mainDlg.columnAttribRight = gridview::convertConfig(m_gridMainR->getColumnConfig());
     globalSettings.gui.mainDlg.sashOffset        = m_splitterMain->getSashOffset();
 
-    globalSettings.gui.mainDlg.columnAttribNavi       = treeview::convertConfig(m_gridNavi->getColumnConfig());
-    globalSettings.gui.mainDlg.naviGridShowPercentBar = treeview::getShowPercentage(*m_gridNavi);
+    globalSettings.gui.mainDlg.columnAttribNavi       = treeview::convertConfig(m_gridOverview->getColumnConfig());
+    globalSettings.gui.mainDlg.naviGridShowPercentBar = treeview::getShowPercentage(*m_gridOverview);
 
-    const std::pair<ColumnTypeNavi, bool> sortInfo = treeDataView->getSortDirection();
+    const std::pair<ColumnTypeNavi, bool> sortInfo = treeDataView_->getSortDirection();
     globalSettings.gui.mainDlg.naviGridLastSortColumn    = sortInfo.first;
     globalSettings.gui.mainDlg.naviGridLastSortAscending = sortInfo.second;
 
@@ -959,16 +987,16 @@ xmlAccess::XmlGlobalSettings MainDialog::getGlobalCfgBeforeExit()
     globalSettings.gui.cfgFileHistFirstItemPos = m_listBoxHistory->GetTopItem();
     //--------------------------------------------------------------------------------
     globalSettings.gui.lastUsedConfigFiles.clear();
-    for (const Zstring& cfgFilePath : activeConfigFiles)
+    for (const Zstring& cfgFilePath : activeConfigFiles_)
         globalSettings.gui.lastUsedConfigFiles.emplace_back(cfgFilePath);
 
     //write list of last used folders
-    globalSettings.gui.folderHistoryLeft  = folderHistoryLeft ->getList();
-    globalSettings.gui.folderHistoryRight = folderHistoryRight->getList();
+    globalSettings.gui.folderHistoryLeft  = folderHistoryLeft_ ->getList();
+    globalSettings.gui.folderHistoryRight = folderHistoryRight_->getList();
 
     globalSettings.gui.mainDlg.textSearchRespectCase = m_checkBoxMatchCase->GetValue();
 
-    globalSettings.gui.mainDlg.guiPerspectiveLast = auiMgr.SavePerspective();
+    globalSettings.gui.mainDlg.guiPerspectiveLast = auiMgr_.SavePerspective();
 
     //we need to portably retrieve non-iconized, non-maximized size and position (non-portable: GetWindowPlacement())
     //call *after* wxAuiManager::SavePerspective()!
@@ -1090,7 +1118,7 @@ std::vector<FileSystemObject*> MainDialog::getGridSelection(bool fromLeft, bool
     removeDuplicates(selectedRows);
     assert(std::is_sorted(selectedRows.begin(), selectedRows.end()));
 
-    return gridDataView->getAllFileRef(selectedRows);
+    return gridDataView_->getAllFileRef(selectedRows);
 }
 
 
@@ -1098,8 +1126,8 @@ std::vector<FileSystemObject*> MainDialog::getTreeSelection() const
 {
     std::vector<FileSystemObject*> output;
 
-    for (size_t row : m_gridNavi->getSelectedRows())
-        if (std::unique_ptr<TreeView::Node> node = treeDataView->getLine(row))
+    for (size_t row : m_gridOverview->getSelectedRows())
+        if (std::unique_ptr<TreeView::Node> node = treeDataView_->getLine(row))
         {
             if (auto root = dynamic_cast<const TreeView::RootNode*>(node.get()))
             {
@@ -1143,11 +1171,11 @@ void MainDialog::copyToAlternateFolder(const std::vector<zen::FileSystemObject*>
 
     if (zen::showCopyToDialog(this,
                               rowsLeftTmp, rowsRightTmp,
-                              globalCfg.gui.mainDlg.copyToCfg.lastUsedPath,
-                              globalCfg.gui.mainDlg.copyToCfg.folderHistory,
-                              globalCfg.gui.mainDlg.copyToCfg.historySizeMax,
-                              globalCfg.gui.mainDlg.copyToCfg.keepRelPaths,
-                              globalCfg.gui.mainDlg.copyToCfg.overwriteIfExists) != ReturnSmallDlg::BUTTON_OKAY)
+                              globalCfg_.gui.mainDlg.copyToCfg.lastUsedPath,
+                              globalCfg_.gui.mainDlg.copyToCfg.folderHistory,
+                              globalCfg_.gui.mainDlg.copyToCfg.historySizeMax,
+                              globalCfg_.gui.mainDlg.copyToCfg.keepRelPaths,
+                              globalCfg_.gui.mainDlg.copyToCfg.overwriteIfExists) != ReturnSmallDlg::BUTTON_OKAY)
         return;
 
     disableAllElements(true); //StatusHandlerTemporaryPanel will internally process Window messages, so avoid unexpected callbacks!
@@ -1159,10 +1187,10 @@ void MainDialog::copyToAlternateFolder(const std::vector<zen::FileSystemObject*>
         StatusHandlerTemporaryPanel statusHandler(*this); //handle status display and error messages
 
         zen::copyToAlternateFolder(rowsLeftTmp, rowsRightTmp,
-                                   globalCfg.gui.mainDlg.copyToCfg.lastUsedPath,
-                                   globalCfg.gui.mainDlg.copyToCfg.keepRelPaths,
-                                   globalCfg.gui.mainDlg.copyToCfg.overwriteIfExists,
-                                   globalCfg.optDialogs,
+                                   globalCfg_.gui.mainDlg.copyToCfg.lastUsedPath,
+                                   globalCfg_.gui.mainDlg.copyToCfg.keepRelPaths,
+                                   globalCfg_.gui.mainDlg.copyToCfg.overwriteIfExists,
+                                   globalCfg_.optDialogs,
                                    statusHandler);
         //"clearSelection" not needed/desired
     }
@@ -1187,7 +1215,7 @@ void MainDialog::deleteSelectedFiles(const std::vector<FileSystemObject*>& selec
 
     //sigh: do senseless vector<FileSystemObject*> -> vector<const FileSystemObject*> conversion:
     if (zen::showDeleteDialog(this, { rowsLeftTmp.begin(), rowsLeftTmp.end() }, { rowsRightTmp.begin(), rowsRightTmp.end() },
-                              globalCfg.gui.mainDlg.manualDeletionUseRecycler) != ReturnSmallDlg::BUTTON_OKAY)
+                              globalCfg_.gui.mainDlg.manualDeletionUseRecycler) != ReturnSmallDlg::BUTTON_OKAY)
         return;
 
     disableAllElements(true); //StatusHandlerTemporaryPanel will internally process Window messages, so avoid unexpected callbacks!
@@ -1200,22 +1228,22 @@ void MainDialog::deleteSelectedFiles(const std::vector<FileSystemObject*>& selec
         StatusHandlerTemporaryPanel statusHandler(*this); //handle status display and error messages
 
         zen::deleteFromGridAndHD(rowsLeftTmp, rowsRightTmp,
-                                 folderCmp,
+                                 folderCmp_,
                                  extractDirectionCfg(getConfig().mainCfg),
-                                 globalCfg.gui.mainDlg.manualDeletionUseRecycler,
-                                 globalCfg.optDialogs.warnRecyclerMissing,
+                                 globalCfg_.gui.mainDlg.manualDeletionUseRecycler,
+                                 globalCfg_.optDialogs.warnRecyclerMissing,
                                  statusHandler);
 
         m_gridMainL->clearSelection(ALLOW_GRID_EVENT);
         m_gridMainC->clearSelection(ALLOW_GRID_EVENT);
         m_gridMainR->clearSelection(ALLOW_GRID_EVENT);
 
-        m_gridNavi->clearSelection(ALLOW_GRID_EVENT);
+        m_gridOverview->clearSelection(ALLOW_GRID_EVENT);
     }
     catch (GuiAbortProcess&) {} //do not clear grids, if aborted!
 
     //remove rows that are empty: just a beautification, invalid rows shouldn't cause issues
-    gridDataView->removeInvalidRows();
+    gridDataView_->removeInvalidRows();
 
     updateGui();
 }
@@ -1347,8 +1375,8 @@ void MainDialog::openExternalApplication(const Zstring& commandLinePhrase, bool
 
         if (selectionLeft.empty() && selectionRight.empty())
             return openFolderInFileBrowser(leftSide ?
-                                           createAbstractPath(firstFolderPair->getValues().folderPathPhraseLeft_) :
-                                           createAbstractPath(firstFolderPair->getValues().folderPathPhraseRight_));
+                                           createAbstractPath(firstFolderPair_->getValues().folderPathPhraseLeft_) :
+                                           createAbstractPath(firstFolderPair_->getValues().folderPathPhraseRight_));
         //in this context either left or right selection is filled with exactly one item
         if (!selectionLeft.empty())
         {
@@ -1365,7 +1393,7 @@ void MainDialog::openExternalApplication(const Zstring& commandLinePhrase, bool
     //regular command evaluation:
     const size_t invokeCount = selectionLeft.size() + selectionRight.size();
     if (invokeCount > EXT_APP_MASS_INVOKE_THRESHOLD)
-        if (globalCfg.optDialogs.confirmExternalCommandMassInvoke)
+        if (globalCfg_.optDialogs.confirmExternalCommandMassInvoke)
         {
             bool dontAskAgain = false;
             switch (showConfirmationDialog(this, DialogInfoType::WARNING, PopupDialogCfg().
@@ -1377,7 +1405,7 @@ void MainDialog::openExternalApplication(const Zstring& commandLinePhrase, bool
                                            _("&Execute")))
             {
                 case ConfirmationButton::DO_IT:
-                    globalCfg.optDialogs.confirmExternalCommandMassInvoke = !dontAskAgain;
+                    globalCfg_.optDialogs.confirmExternalCommandMassInvoke = !dontAskAgain;
                     break;
                 case ConfirmationButton::CANCEL:
                     return;
@@ -1387,13 +1415,13 @@ void MainDialog::openExternalApplication(const Zstring& commandLinePhrase, bool
     std::set<FileDescriptor> nonNativeFiles;
     if (contains(commandLinePhrase, Zstr("%local_path%")))
     {
-        collectNonNativeFiles< LEFT_SIDE>(selectionLeft,  tempFileBuf, nonNativeFiles);
-        collectNonNativeFiles<RIGHT_SIDE>(selectionRight, tempFileBuf, nonNativeFiles);
+        collectNonNativeFiles< LEFT_SIDE>(selectionLeft,  tempFileBuf_, nonNativeFiles);
+        collectNonNativeFiles<RIGHT_SIDE>(selectionRight, tempFileBuf_, nonNativeFiles);
     }
     if (contains(commandLinePhrase, Zstr("%local_path2%")))
     {
-        collectNonNativeFiles<RIGHT_SIDE>(selectionLeft,  tempFileBuf, nonNativeFiles);
-        collectNonNativeFiles< LEFT_SIDE>(selectionRight, tempFileBuf, nonNativeFiles);
+        collectNonNativeFiles<RIGHT_SIDE>(selectionLeft,  tempFileBuf_, nonNativeFiles);
+        collectNonNativeFiles< LEFT_SIDE>(selectionRight, tempFileBuf_, nonNativeFiles);
     }
 
     //##################### create temporary files for non-native paths ######################
@@ -1410,7 +1438,7 @@ void MainDialog::openExternalApplication(const Zstring& commandLinePhrase, bool
         {
             StatusHandlerTemporaryPanel statusHandler(*this); //throw GuiAbortProcess
 
-            tempFileBuf.createTempFiles(nonNativeFiles, statusHandler);
+            tempFileBuf_.createTempFiles(nonNativeFiles, statusHandler);
             //"clearSelection" not needed/desired
         }
         catch (GuiAbortProcess&) { return; }
@@ -1423,8 +1451,8 @@ void MainDialog::openExternalApplication(const Zstring& commandLinePhrase, bool
 
     try
     {
-        invokeCommandLine< LEFT_SIDE>(cmdExpanded, selectionLeft,  tempFileBuf); //throw FileError
-        invokeCommandLine<RIGHT_SIDE>(cmdExpanded, selectionRight, tempFileBuf); //
+        invokeCommandLine< LEFT_SIDE>(cmdExpanded, selectionLeft,  tempFileBuf_); //throw FileError
+        invokeCommandLine<RIGHT_SIDE>(cmdExpanded, selectionRight, tempFileBuf_); //
     }
     catch (const FileError& e) { showNotificationDialog(this, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(e.toString())); }
 }
@@ -1458,17 +1486,17 @@ void MainDialog::setStatusBarFileStatistics(size_t filesOnLeftView,
     setText(*m_staticTextStatusRightBytes, L"(" + filesizeToShortString(filesizeRightView) + L")");
     //------------------------------------------------------------------------------
     wxString statusCenterNew;
-    if (gridDataView->rowsTotal() > 0)
+    if (gridDataView_->rowsTotal() > 0)
     {
-        statusCenterNew = _P("Showing %y of 1 row", "Showing %y of %x rows", gridDataView->rowsTotal());
-        replace(statusCenterNew, L"%y", toGuiString(gridDataView->rowsOnView())); //%x is already used as plural form placeholder!
+        statusCenterNew = _P("Showing %y of 1 row", "Showing %y of %x rows", gridDataView_->rowsTotal());
+        replace(statusCenterNew, L"%y", toGuiString(gridDataView_->rowsOnView())); //%x is already used as plural form placeholder!
     }
 
     //fill middle text (considering flashStatusInformation())
-    if (oldStatusMsgs.empty())
+    if (oldStatusMsgs_.empty())
         setText(*m_staticTextStatusCenter, statusCenterNew);
     else
-        oldStatusMsgs.front() = statusCenterNew;
+        oldStatusMsgs_.front() = statusCenterNew;
 
     m_panelStatusBar->Layout();
 }
@@ -1492,7 +1520,7 @@ void MainDialog::setStatusBarFileStatistics(size_t filesOnLeftView,
 
 void MainDialog::flashStatusInformation(const wxString& text)
 {
-    oldStatusMsgs.push_back(m_staticTextStatusCenter->GetLabel());
+    oldStatusMsgs_.push_back(m_staticTextStatusCenter->GetLabel());
 
     m_staticTextStatusCenter->SetLabel(text);
     m_staticTextStatusCenter->SetForegroundColour(wxColor(31, 57, 226)); //highlight_ color: blue
@@ -1501,19 +1529,19 @@ void MainDialog::flashStatusInformation(const wxString& text)
     m_panelStatusBar->Layout();
     //if (needLayoutUpdate) auiMgr.Update(); -> not needed here, this is called anyway in updateGui()
 
-    guiQueue.processAsync([] { std::this_thread::sleep_for(std::chrono::milliseconds(2500)); },
-                          [this] { this->restoreStatusInformation(); });
+    guiQueue_.processAsync([] { std::this_thread::sleep_for(std::chrono::milliseconds(2500)); },
+                           [this] { this->restoreStatusInformation(); });
 }
 
 
 void MainDialog::restoreStatusInformation()
 {
-    if (!oldStatusMsgs.empty())
+    if (!oldStatusMsgs_.empty())
     {
-        wxString oldMsg = oldStatusMsgs.back();
-        oldStatusMsgs.pop_back();
+        wxString oldMsg = oldStatusMsgs_.back();
+        oldStatusMsgs_.pop_back();
 
-        if (oldStatusMsgs.empty()) //restore original status text
+        if (oldStatusMsgs_.empty()) //restore original status text
         {
             m_staticTextStatusCenter->SetLabel(oldMsg);
             m_staticTextStatusCenter->SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT)); //reset color
@@ -1537,7 +1565,7 @@ void MainDialog::disableAllElements(bool enableAbort)
 
     //OS X: wxWidgets portability promise is again a mess: http://wxwidgets.10942.n7.nabble.com/Disable-panel-and-appropriate-children-windows-linux-macos-td35357.html
 
-    localKeyEventsEnabled = false;
+    localKeyEventsEnabled_ = false;
 
     for (size_t pos = 0; pos < m_menubar1->GetMenuCount(); ++pos)
         m_menubar1->EnableTop(pos, false);
@@ -1552,7 +1580,7 @@ void MainDialog::disableAllElements(bool enableAbort)
     m_gridMainR          ->Disable(); //
     m_panelViewFilter    ->Disable();
     m_panelConfig        ->Disable();
-    m_gridNavi           ->Disable();
+    m_gridOverview       ->Disable();
     m_panelSearch        ->Disable();
     m_bpButtonCmpContext   ->Disable();
     m_bpButtonFilterContext->Disable();
@@ -1580,7 +1608,7 @@ void MainDialog::enableAllElements()
 
     EnableCloseButton(true);
 
-    localKeyEventsEnabled = true;
+    localKeyEventsEnabled_ = true;
 
     for (size_t pos = 0; pos < m_menubar1->GetMenuCount(); ++pos)
         m_menubar1->EnableTop(pos, true);
@@ -1595,7 +1623,7 @@ void MainDialog::enableAllElements()
     m_gridMainR          ->Enable();
     m_panelViewFilter    ->Enable();
     m_panelConfig        ->Enable();
-    m_gridNavi           ->Enable();
+    m_gridOverview       ->Enable();
     m_panelSearch        ->Enable();
     m_bpButtonCmpContext   ->Enable();
     m_bpButtonFilterContext->Enable();
@@ -1674,7 +1702,7 @@ void MainDialog::OnResizeLeftFolderWidth(wxEvent& event)
 {
     //adapt left-shift display distortion caused by scrollbars for multiple folder pairs
     const int width = m_panelTopLeft->GetSize().GetWidth();
-    for (FolderPairPanel* panel : additionalFolderPairs)
+    for (FolderPairPanel* panel : additionalFolderPairs_)
         panel->m_panelLeft->SetMinSize(wxSize(width, -1));
 
     event.Skip();
@@ -1684,7 +1712,7 @@ void MainDialog::OnResizeLeftFolderWidth(wxEvent& event)
 void MainDialog::onTreeButtonEvent(wxKeyEvent& event)
 {
     int keyCode = event.GetKeyCode();
-    if (m_gridNavi->GetLayoutDirection() == wxLayout_RightToLeft)
+    if (m_gridOverview->GetLayoutDirection() == wxLayout_RightToLeft)
     {
         if (keyCode == WXK_LEFT || keyCode == WXK_NUMPAD_LEFT)
             keyCode = WXK_RIGHT;
@@ -1697,7 +1725,7 @@ void MainDialog::onTreeButtonEvent(wxKeyEvent& event)
         {
             case 'C':
             case WXK_INSERT: //CTRL + C || CTRL + INS
-                copySelectionToClipboard({ m_gridNavi });
+                copySelectionToClipboard({ m_gridOverview });
                 return;
         }
     else if (event.AltDown())
@@ -1808,9 +1836,9 @@ void MainDialog::onGridButtonEvent(wxKeyEvent& event, Grid& grid, bool leftSide)
             return static_cast<size_t>(-1);
         }();
 
-        if (extAppPos < globalCfg.gui.externelApplications.size())
+        if (extAppPos < globalCfg_.gui.externelApplications.size())
         {
-            openExternalApplication(globalCfg.gui.externelApplications[extAppPos].second, leftSide, selectionLeft, selectionRight);
+            openExternalApplication(globalCfg_.gui.externelApplications[extAppPos].second, leftSide, selectionLeft, selectionRight);
             return;
         }
 
@@ -1835,13 +1863,13 @@ void MainDialog::onGridButtonEvent(wxKeyEvent& event, Grid& grid, bool leftSide)
 
 void MainDialog::onLocalKeyEvent(wxKeyEvent& event) //process key events without explicit menu entry :)
 {
-    if (!localKeyEventsEnabled)
+    if (!localKeyEventsEnabled_)
     {
         event.Skip();
         return;
     }
-    localKeyEventsEnabled = false; //avoid recursion
-    ZEN_ON_SCOPE_EXIT(localKeyEventsEnabled = true);
+    localKeyEventsEnabled_ = false; //avoid recursion
+    ZEN_ON_SCOPE_EXIT(localKeyEventsEnabled_ = true);
 
 
     const int keyCode = event.GetKeyCode();
@@ -1913,7 +1941,7 @@ void MainDialog::onLocalKeyEvent(wxKeyEvent& event) //process key events without
             if (!isComponentOf(focus, m_gridMainL     ) && //
                 !isComponentOf(focus, m_gridMainC     ) && //don't propagate keyboard commands if grid is already in focus
                 !isComponentOf(focus, m_gridMainR     ) && //
-                !isComponentOf(focus, m_gridNavi      ) &&
+                !isComponentOf(focus, m_gridOverview  ) &&
                 !isComponentOf(focus, m_listBoxHistory) && //don't propagate if selecting config
                 !isComponentOf(focus, m_panelSearch   ) &&
                 !isComponentOf(focus, m_panelTopLeft  ) &&  //don't propagate if changing directory fields
@@ -1940,24 +1968,24 @@ void MainDialog::onLocalKeyEvent(wxKeyEvent& event) //process key events without
 
 void MainDialog::onNaviSelection(GridRangeSelectEvent& event)
 {
-    //scroll m_gridMain to user's new selection on m_gridNavi
+    //scroll m_gridMain to user's new selection on m_gridOverview
     ptrdiff_t leadRow = -1;
     if (event.positive_ && event.rowFirst_ != event.rowLast_)
-        if (std::unique_ptr<TreeView::Node> node = treeDataView->getLine(event.rowFirst_))
+        if (std::unique_ptr<TreeView::Node> node = treeDataView_->getLine(event.rowFirst_))
         {
             if (const TreeView::RootNode* root = dynamic_cast<const TreeView::RootNode*>(node.get()))
-                leadRow = gridDataView->findRowFirstChild(&(root->baseFolder_));
+                leadRow = gridDataView_->findRowFirstChild(&(root->baseFolder_));
             else if (const TreeView::DirNode* dir = dynamic_cast<const TreeView::DirNode*>(node.get()))
             {
-                leadRow = gridDataView->findRowDirect(&(dir->folder_));
+                leadRow = gridDataView_->findRowDirect(&(dir->folder_));
                 if (leadRow < 0) //directory was filtered out! still on tree view (but NOT on grid view)
-                    leadRow = gridDataView->findRowFirstChild(&(dir->folder_));
+                    leadRow = gridDataView_->findRowFirstChild(&(dir->folder_));
             }
             else if (const TreeView::FilesNode* files = dynamic_cast<const TreeView::FilesNode*>(node.get()))
             {
                 assert(!files->filesAndLinks_.empty());
                 if (!files->filesAndLinks_.empty())
-                    leadRow = gridDataView->findRowDirect(files->filesAndLinks_[0]->getId());
+                    leadRow = gridDataView_->findRowDirect(files->filesAndLinks_[0]->getId());
             }
         }
 
@@ -1969,15 +1997,15 @@ void MainDialog::onNaviSelection(GridRangeSelectEvent& event)
         m_gridMainC->scrollTo(leadRow); //
         m_gridMainR->scrollTo(leadRow); //
 
-        m_gridNavi->getMainWin().Update(); //draw cursor immediately rather than on next idle event (required for slow CPUs, netbook)
+        m_gridOverview->getMainWin().Update(); //draw cursor immediately rather than on next idle event (required for slow CPUs, netbook)
     }
 
     //get selection on navigation tree and set corresponding markers on main grid
     std::unordered_set<const FileSystemObject*> markedFilesAndLinks; //mark files/symlinks directly
     std::unordered_set<const ContainerObject*> markedContainer;      //mark full container including child-objects
 
-    for (size_t row : m_gridNavi->getSelectedRows())
-        if (std::unique_ptr<TreeView::Node> node = treeDataView->getLine(row))
+    for (size_t row : m_gridOverview->getSelectedRows())
+        if (std::unique_ptr<TreeView::Node> node = treeDataView_->getLine(row))
         {
             if (const TreeView::RootNode* root = dynamic_cast<const TreeView::RootNode*>(node.get()))
                 markedContainer.insert(&(root->baseFolder_));
@@ -2092,15 +2120,15 @@ void MainDialog::onMainGridContextC(GridClickEvent& event)
 
     menu.addItem(_("Include all"), [&]
     {
-        zen::setActiveStatus(true, folderCmp);
+        zen::setActiveStatus(true, folderCmp_);
         updateGui();
-    }, nullptr, gridDataView->rowsTotal() > 0);
+    }, nullptr, gridDataView_->rowsTotal() > 0);
 
     menu.addItem(_("Exclude all"), [&]
     {
-        zen::setActiveStatus(false, folderCmp);
+        zen::setActiveStatus(false, folderCmp_);
         updateGuiDelayedIf(!m_bpButtonShowExcluded->isActive()); //show update GUI before removing rows
-    }, nullptr, gridDataView->rowsTotal() > 0);
+    }, nullptr, gridDataView_->rowsTotal() > 0);
 
     menu.popup(*this);
 }
@@ -2207,12 +2235,12 @@ void MainDialog::onMainGridContextRim(bool leftSide)
 
     //----------------------------------------------------------------------------------------------------
 
-    if (!globalCfg.gui.externelApplications.empty())
+    if (!globalCfg_.gui.externelApplications.empty())
     {
         menu.addSeparator();
 
-        for (auto it = globalCfg.gui.externelApplications.begin();
-             it != globalCfg.gui.externelApplications.end();
+        for (auto it = globalCfg_.gui.externelApplications.begin();
+             it != globalCfg_.gui.externelApplications.end();
              ++it)
         {
             //translate default external apps on the fly: 1. "open in explorer" 2. "start directly"
@@ -2222,7 +2250,7 @@ void MainDialog::onMainGridContextRim(bool leftSide)
 
             auto openApp = [this, command = it->second, leftSide, &selectionLeft, &selectionRight] { openExternalApplication(command, leftSide, selectionLeft, selectionRight); };
 
-            const size_t pos = it - globalCfg.gui.externelApplications.begin();
+            const size_t pos = it - globalCfg_.gui.externelApplications.begin();
 
             if (pos == 0)
                 description += L"\tEnter, D-Click";
@@ -2263,13 +2291,13 @@ void MainDialog::addFilterPhrase(const Zstring& phrase, bool include, bool requi
     {
         if (include)
         {
-            Zstring& includeFilter = currentCfg.mainCfg.globalFilter.includeFilter;
+            Zstring& includeFilter = currentCfg_.mainCfg.globalFilter.includeFilter;
             if (NameFilter::isNull(includeFilter, Zstring())) //fancy way of checking for "*" include
                 includeFilter.clear();
             return includeFilter;
         }
         else
-            return currentCfg.mainCfg.globalFilter.excludeFilter;
+            return currentCfg_.mainCfg.globalFilter.excludeFilter;
     }();
 
     if (requireNewLine)
@@ -2292,7 +2320,7 @@ void MainDialog::addFilterPhrase(const Zstring& phrase, bool include, bool requi
         applyFilterConfig(); //user's temporary exclusions lost!
     else //do not fully apply filter, just exclude new items: preserve user's temporary exclusions
     {
-        std::for_each(begin(folderCmp), end(folderCmp), [&](BaseFolderPair& baseFolder) { addHardFiltering(baseFolder, phrase); });
+        std::for_each(begin(folderCmp_), end(folderCmp_), [&](BaseFolderPair& baseFolder) { addHardFiltering(baseFolder, phrase); });
         updateGui();
     }
 }
@@ -2402,7 +2430,7 @@ void MainDialog::onGridLabelContextRim(Grid& grid, ColumnTypeRim type, bool left
     //----------------------------------------------------------------------------------------------
     menu.addSeparator();
 
-    auto& itemPathFormat = left ? globalCfg.gui.mainDlg.itemPathFormatLeftGrid : globalCfg.gui.mainDlg.itemPathFormatRightGrid;
+    auto& itemPathFormat = left ? globalCfg_.gui.mainDlg.itemPathFormatLeftGrid : globalCfg_.gui.mainDlg.itemPathFormatRightGrid;
 
     auto setItemPathFormat = [&](ItemPathFormat fmt)
     {
@@ -2430,19 +2458,19 @@ void MainDialog::onGridLabelContextRim(Grid& grid, ColumnTypeRim type, bool left
     menu.addSeparator();
     menu.addCheckBox(_("Show icons:"), [&]
     {
-        globalCfg.gui.mainDlg.showIcons = !globalCfg.gui.mainDlg.showIcons;
-        gridview::setupIcons(*m_gridMainL, *m_gridMainC, *m_gridMainR, globalCfg.gui.mainDlg.showIcons, convert(globalCfg.gui.mainDlg.iconSize));
+        globalCfg_.gui.mainDlg.showIcons = !globalCfg_.gui.mainDlg.showIcons;
+        gridview::setupIcons(*m_gridMainL, *m_gridMainC, *m_gridMainR, globalCfg_.gui.mainDlg.showIcons, convert(globalCfg_.gui.mainDlg.iconSize));
 
-    }, globalCfg.gui.mainDlg.showIcons);
+    }, globalCfg_.gui.mainDlg.showIcons);
 
     auto setIconSize = [&](xmlAccess::FileIconSize sz)
     {
-        globalCfg.gui.mainDlg.iconSize = sz;
-        gridview::setupIcons(*m_gridMainL, *m_gridMainC, *m_gridMainR, globalCfg.gui.mainDlg.showIcons, convert(sz));
+        globalCfg_.gui.mainDlg.iconSize = sz;
+        gridview::setupIcons(*m_gridMainL, *m_gridMainC, *m_gridMainR, globalCfg_.gui.mainDlg.showIcons, convert(sz));
     };
     auto addSizeEntry = [&](const wxString& label, xmlAccess::FileIconSize sz)
     {
-        menu.addRadio(label, [sz, &setIconSize] { setIconSize(sz); }, globalCfg.gui.mainDlg.iconSize == sz, globalCfg.gui.mainDlg.showIcons);
+        menu.addRadio(label, [sz, &setIconSize] { setIconSize(sz); }, globalCfg_.gui.mainDlg.iconSize == sz, globalCfg_.gui.mainDlg.showIcons);
     };
     addSizeEntry(L"    " + _("Small" ), xmlAccess::ICON_SIZE_SMALL );
     addSizeEntry(L"    " + _("Medium"), xmlAccess::ICON_SIZE_MEDIUM);
@@ -2454,9 +2482,9 @@ void MainDialog::onGridLabelContextRim(Grid& grid, ColumnTypeRim type, bool left
 
         auto selectTimeSpan = [&]
         {
-            if (showSelectTimespanDlg(this, manualTimeSpanFrom, manualTimeSpanTo) == ReturnSmallDlg::BUTTON_OKAY)
+            if (showSelectTimespanDlg(this, manualTimeSpanFrom_, manualTimeSpanTo_) == ReturnSmallDlg::BUTTON_OKAY)
             {
-                applyTimeSpanFilter(folderCmp, manualTimeSpanFrom, manualTimeSpanTo); //overwrite current active/inactive settings
+                applyTimeSpanFilter(folderCmp_, manualTimeSpanFrom_, manualTimeSpanTo_); //overwrite current active/inactive settings
                 //updateGuiDelayedIf(!m_bpButtonShowExcluded->isActive()); //show update GUI before removing rows
                 updateGui();
             }
@@ -2471,11 +2499,36 @@ void MainDialog::onGridLabelContextRim(Grid& grid, ColumnTypeRim type, bool left
 void MainDialog::resetLayout()
 {
     m_splitterMain->setSashOffset(0);
-    auiMgr.LoadPerspective(defaultPerspective);
+    auiMgr_.LoadPerspective(defaultPerspective_);
     updateGuiForFolderPair();
 }
 
 
+void MainDialog::onOpenMenuTools(wxMenuEvent& event)
+{
+    //each layout menu item is either shown and owned by m_menuTools OR detached from m_menuTools and owned by detachedMenuItemsLayout_:
+    auto filterLayoutItems = [&](wxMenuItem* menuItem, wxWindow* panelWindow)
+    {
+        if (detachedMenuItemsLayout_.find(menuItem) == detachedMenuItemsLayout_.end())
+            detachedMenuItemsLayout_.insert(m_menuTools->Remove(menuItem)); //pass ownership
+
+        wxAuiPaneInfo& paneInfo = this->auiMgr_.GetPane(panelWindow);
+        if (!paneInfo.IsShown())
+        {
+            detachedMenuItemsLayout_.erase(menuItem); //pass ownership
+            m_menuTools->Append(menuItem);            //
+        }
+    };
+    filterLayoutItems(m_menuItemShowMain,       m_panelTopButtons);
+    filterLayoutItems(m_menuItemShowFolders,    m_panelDirectoryPairs);
+    filterLayoutItems(m_menuItemShowViewFilter, m_panelViewFilter);
+    filterLayoutItems(m_menuItemShowConfig,     m_panelConfig);
+    filterLayoutItems(m_menuItemShowOverview,   m_gridOverview);
+
+    event.Skip();
+}
+
+
 void MainDialog::OnContextSetLayout(wxMouseEvent& event)
 {
     ContextMenu menu;
@@ -2485,12 +2538,12 @@ void MainDialog::OnContextSetLayout(wxMouseEvent& event)
 
     bool addedSeparator = false;
 
-    const wxAuiPaneInfoArray& paneArray = auiMgr.GetAllPanes();
+    const wxAuiPaneInfoArray& paneArray = auiMgr_.GetAllPanes();
     for (size_t i = 0; i < paneArray.size(); ++i)
     {
         wxAuiPaneInfo& paneInfo = paneArray[i];
         if (!paneInfo.IsShown() &&
-            paneInfo.window != compareStatus->getAsWindow() &&
+            paneInfo.window != compareStatus_->getAsWindow() &&
             paneInfo.window != m_panelSearch)
         {
             if (!addedSeparator)
@@ -2499,11 +2552,10 @@ void MainDialog::OnContextSetLayout(wxMouseEvent& event)
                 addedSeparator = true;
             }
 
-            menu.addItem(replaceCpy(_("Show \"%x\""), L"%x", paneInfo.caption),
-                         [this, &paneInfo]
+            menu.addItem(replaceCpy(_("Show \"%x\""), L"%x", paneInfo.caption), [this, &paneInfo]
             {
                 paneInfo.Show();
-                this->auiMgr.Update();
+                this->auiMgr_.Update();
             });
         }
     }
@@ -2518,7 +2570,7 @@ void MainDialog::OnCompSettingsContext(wxEvent& event)
 
     auto setVariant = [&](CompareVariant var)
     {
-        currentCfg.mainCfg.cmpConfig.compareVar = var;
+        currentCfg_.mainCfg.cmpConfig.compareVar = var;
         applyCompareConfig(true /*setDefaultViewType*/);
     };
 
@@ -2550,7 +2602,7 @@ void MainDialog::OnSyncSettingsContext(wxEvent& event)
 
     auto setVariant = [&](DirectionConfig::Variant var)
     {
-        currentCfg.mainCfg.syncCfg.directionCfg.var = var;
+        currentCfg_.mainCfg.syncCfg.directionCfg.var = var;
         applySyncConfig();
     };
 
@@ -2699,7 +2751,7 @@ void MainDialog::removeObsoleteCfgHistoryItems(const std::vector<Zstring>& fileP
         return filePathsForRemoval;
     };
 
-    guiQueue.processAsync(getUnavailableCfgFilesAsync, [this](const std::vector<Zstring>& files) { removeCfgHistoryItems(files); });
+    guiQueue_.processAsync(getUnavailableCfgFilesAsync, [this](const std::vector<Zstring>& files) { removeCfgHistoryItems(files); });
 }
 
 
@@ -2721,13 +2773,13 @@ void MainDialog::removeCfgHistoryItems(const std::vector<Zstring>& filePaths)
 
 void MainDialog::updateUnsavedCfgStatus()
 {
-    const Zstring activeCfgFilename = activeConfigFiles.size() == 1 && !equalFilePath(activeConfigFiles[0], lastRunConfigPath_) ? activeConfigFiles[0] : Zstring();
+    const Zstring activeCfgFilename = activeConfigFiles_.size() == 1 && !equalFilePath(activeConfigFiles_[0], lastRunConfigPath_) ? activeConfigFiles_[0] : Zstring();
 
-    const bool haveUnsavedCfg = lastConfigurationSaved != getConfig();
+    const bool haveUnsavedCfg = lastConfigurationSaved_ != getConfig();
 
     //update save config button
     const bool allowSave = haveUnsavedCfg ||
-                           activeConfigFiles.size() > 1;
+                           activeConfigFiles_.size() > 1;
 
     auto makeBrightGrey = [](const wxBitmap& bmp) -> wxBitmap
     {
@@ -2747,11 +2799,11 @@ void MainDialog::updateUnsavedCfgStatus()
 
     if (!activeCfgFilename.empty())
         title += utfTo<wxString>(activeCfgFilename);
-    else if (activeConfigFiles.size() > 1)
+    else if (activeConfigFiles_.size() > 1)
     {
         const wchar_t* EM_DASH = L" \u2014 ";
-        title += xmlAccess::extractJobName(activeConfigFiles[0]);
-        std::for_each(activeConfigFiles.begin() + 1, activeConfigFiles.end(), [&](const Zstring& filepath) { title += EM_DASH + xmlAccess::extractJobName(filepath); });
+        title += xmlAccess::extractJobName(activeConfigFiles_[0]);
+        std::for_each(activeConfigFiles_.begin() + 1, activeConfigFiles_.end(), [&](const Zstring& filepath) { title += EM_DASH + xmlAccess::extractJobName(filepath); });
     }
     else
         title += L"FreeFileSync - " + _("Folder Comparison and Synchronization");
@@ -2762,7 +2814,7 @@ void MainDialog::updateUnsavedCfgStatus()
 
 void MainDialog::OnConfigSave(wxCommandEvent& event)
 {
-    const Zstring activeCfgFilename = activeConfigFiles.size() == 1 && !equalFilePath(activeConfigFiles[0], lastRunConfigPath_) ? activeConfigFiles[0] : Zstring();
+    const Zstring activeCfgFilename = activeConfigFiles_.size() == 1 && !equalFilePath(activeConfigFiles_[0], lastRunConfigPath_) ? activeConfigFiles_[0] : Zstring();
 
     using namespace xmlAccess;
 
@@ -2818,7 +2870,7 @@ bool MainDialog::trySaveConfig(const Zstring* guiFilename) //return true if save
     }
     else
     {
-        Zstring defaultFileName = activeConfigFiles.size() == 1 && !equalFilePath(activeConfigFiles[0], lastRunConfigPath_) ? activeConfigFiles[0] : Zstr("SyncSettings.ffs_gui");
+        Zstring defaultFileName = activeConfigFiles_.size() == 1 && !equalFilePath(activeConfigFiles_[0], lastRunConfigPath_) ? activeConfigFiles_[0] : Zstr("SyncSettings.ffs_gui");
         //attention: activeConfigFiles may be an imported *.ffs_batch file! We don't want to overwrite it with a GUI config!
         if (endsWith(defaultFileName, Zstr(".ffs_batch")))
             defaultFileName = beforeLast(defaultFileName, Zstr("."), IF_MISSING_RETURN_NONE) + Zstr(".ffs_gui");
@@ -2859,7 +2911,7 @@ bool MainDialog::trySaveBatchConfig(const Zstring* batchFileToUpdate)
 
     //essentially behave like trySaveConfig(): the collateral damage of not saving GUI-only settings "m_bpButtonViewTypeSyncAction" is negliable
 
-    const Zstring activeCfgFilename = activeConfigFiles.size() == 1 && !equalFilePath(activeConfigFiles[0], lastRunConfigPath_) ? activeConfigFiles[0] : Zstring();
+    const Zstring activeCfgFilename = activeConfigFiles_.size() == 1 && !equalFilePath(activeConfigFiles_[0], lastRunConfigPath_) ? activeConfigFiles_[0] : Zstring();
     const XmlGuiConfig guiCfg = getConfig();
 
     //prepare batch config: reuse existing batch-specific settings from file if available
@@ -2903,8 +2955,8 @@ bool MainDialog::trySaveBatchConfig(const Zstring* batchFileToUpdate)
         //let user update batch config: this should change batch-exclusive settings only, else the "setLastUsedConfig" below would be somewhat of a lie
         if (customizeBatchConfig(this,
                                  batchCfg, //in/out
-                                 globalCfg.gui.onCompletionHistory,
-                                 globalCfg.gui.onCompletionHistoryMax) != ReturnBatchConfig::BUTTON_SAVE_AS)
+                                 globalCfg_.gui.onCompletionHistory,
+                                 globalCfg_.gui.onCompletionHistoryMax) != ReturnBatchConfig::BUTTON_SAVE_AS)
             return false;
 
         Zstring defaultFileName = !activeCfgFilename.empty() ? activeCfgFilename : Zstr("BatchRun.ffs_batch");
@@ -2942,12 +2994,12 @@ bool MainDialog::trySaveBatchConfig(const Zstring* batchFileToUpdate)
 
 bool MainDialog::saveOldConfig() //return false on user abort
 {
-    if (lastConfigurationSaved != getConfig())
+    if (lastConfigurationSaved_ != getConfig())
     {
-        const Zstring activeCfgFilename = activeConfigFiles.size() == 1 && !equalFilePath(activeConfigFiles[0], lastRunConfigPath_) ? activeConfigFiles[0] : Zstring();
+        const Zstring activeCfgFilename = activeConfigFiles_.size() == 1 && !equalFilePath(activeConfigFiles_[0], lastRunConfigPath_) ? activeConfigFiles_[0] : Zstring();
 
         //notify user about changed settings
-        if (globalCfg.optDialogs.popupOnConfigChange)
+        if (globalCfg_.optDialogs.popupOnConfigChange)
             if (!activeCfgFilename.empty())
                 //only if check is active and non-default config file loaded
             {
@@ -2985,7 +3037,7 @@ bool MainDialog::saveOldConfig() //return false on user abort
                         break;
 
                     case ConfirmationButton3::DONT_DO_IT: //don't save
-                        globalCfg.optDialogs.popupOnConfigChange = !neverSaveChanges;
+                        globalCfg_.optDialogs.popupOnConfigChange = !neverSaveChanges;
                         break;
 
                     case ConfirmationButton3::CANCEL:
@@ -2994,7 +3046,7 @@ bool MainDialog::saveOldConfig() //return false on user abort
             }
 
         //discard current reference file(s), this ensures next app start will load <last session> instead of the original non-modified config selection
-        setLastUsedConfig(std::vector<Zstring>(), lastConfigurationSaved);
+        setLastUsedConfig(std::vector<Zstring>(), lastConfigurationSaved_);
         //this seems to make theoretical sense also: the job of this function is to make sure current (volatile) config and reference file name are in sync
         // => if user does not save cfg, it is not attached to a physical file names anymore!
     }
@@ -3004,7 +3056,7 @@ bool MainDialog::saveOldConfig() //return false on user abort
 
 void MainDialog::OnConfigLoad(wxCommandEvent& event)
 {
-    const Zstring activeCfgFilename = activeConfigFiles.size() == 1 && !equalFilePath(activeConfigFiles[0], lastRunConfigPath_) ? activeConfigFiles[0] : Zstring();
+    const Zstring activeCfgFilename = activeConfigFiles_.size() == 1 && !equalFilePath(activeConfigFiles_[0], lastRunConfigPath_) ? activeConfigFiles_[0] : Zstring();
 
     wxFileDialog filePicker(this,
                             wxString(),
@@ -3038,7 +3090,7 @@ void MainDialog::OnConfigNew(wxCommandEvent& event)
     Zstring& excludeFilter = newConfig.mainCfg.globalFilter.excludeFilter;
     if (!excludeFilter.empty() && !endsWith(excludeFilter, Zstr("\n")))
         excludeFilter += Zstr("\n");
-    excludeFilter += globalCfg.gui.defaultExclusionFilter;
+    excludeFilter += globalCfg_.gui.defaultExclusionFilter;
 
     setConfig(newConfig, std::vector<Zstring>());
 }
@@ -3063,7 +3115,7 @@ void MainDialog::OnLoadFromHistory(wxCommandEvent& event)
     //- if user cancelled saving old config
     //- there's an error loading new config
     //- filepaths is empty and user tried to unselect the current config
-    addFileToCfgHistory(activeConfigFiles);
+    addFileToCfgHistory(activeConfigFiles_);
 }
 
 
@@ -3089,7 +3141,7 @@ void MainDialog::OnLoadFromHistoryDoubleClick(wxCommandEvent& event)
         }
 
     //synchronize m_listBoxHistory and activeConfigFiles, see OnLoadFromHistory()
-    addFileToCfgHistory(activeConfigFiles);
+    addFileToCfgHistory(activeConfigFiles_);
 }
 
 
@@ -3194,13 +3246,13 @@ void MainDialog::onCheckRows(CheckRowsEvent& event)
 {
     std::vector<size_t> selectedRows;
 
-    const size_t rowLast = std::min(event.rowLast_, gridDataView->rowsOnView()); //consider dummy rows
+    const size_t rowLast = std::min(event.rowLast_, gridDataView_->rowsOnView()); //consider dummy rows
     for (size_t i = event.rowFirst_; i < rowLast; ++i)
         selectedRows.push_back(i);
 
     if (!selectedRows.empty())
     {
-        std::vector<FileSystemObject*> objects = gridDataView->getAllFileRef(selectedRows);
+        std::vector<FileSystemObject*> objects = gridDataView_->getAllFileRef(selectedRows);
         setFilterManually(objects, event.setIncluded_);
     }
 }
@@ -3210,13 +3262,13 @@ void MainDialog::onSetSyncDirection(SyncDirectionEvent& event)
 {
     std::vector<size_t> selectedRows;
 
-    const size_t rowLast = std::min(event.rowLast_, gridDataView->rowsOnView()); //consider dummy rows
+    const size_t rowLast = std::min(event.rowLast_, gridDataView_->rowsOnView()); //consider dummy rows
     for (size_t i = event.rowFirst_; i < rowLast; ++i)
         selectedRows.push_back(i);
 
     if (!selectedRows.empty())
     {
-        std::vector<FileSystemObject*> objects = gridDataView->getAllFileRef(selectedRows);
+        std::vector<FileSystemObject*> objects = gridDataView_->getAllFileRef(selectedRows);
         setSyncDirManually(objects, event.direction_);
     }
 }
@@ -3225,10 +3277,10 @@ void MainDialog::onSetSyncDirection(SyncDirectionEvent& event)
 void MainDialog::setLastUsedConfig(const std::vector<Zstring>& cfgFilePaths,
                                    const xmlAccess::XmlGuiConfig& guiConfig)
 {
-    activeConfigFiles = cfgFilePaths;
-    lastConfigurationSaved = guiConfig;
+    activeConfigFiles_ = cfgFilePaths;
+    lastConfigurationSaved_ = guiConfig;
 
-    addFileToCfgHistory(activeConfigFiles); //put filepath on list of last used config files
+    addFileToCfgHistory(activeConfigFiles_); //put filepath on list of last used config files
 
     updateUnsavedCfgStatus();
 }
@@ -3236,7 +3288,7 @@ void MainDialog::setLastUsedConfig(const std::vector<Zstring>& cfgFilePaths,
 
 void MainDialog::setConfig(const xmlAccess::XmlGuiConfig& newGuiCfg, const std::vector<Zstring>& referenceFiles)
 {
-    currentCfg = newGuiCfg;
+    currentCfg_ = newGuiCfg;
 
     //evaluate new settings...
 
@@ -3246,14 +3298,14 @@ void MainDialog::setConfig(const xmlAccess::XmlGuiConfig& newGuiCfg, const std::
     updateGlobalFilterButton();
 
     //set first folder pair
-    firstFolderPair->setValues(currentCfg.mainCfg.firstPair);
+    firstFolderPair_->setValues(currentCfg_.mainCfg.firstPair);
 
     //folderHistoryLeft->addItem(currentCfg.mainCfg.firstPair.leftDirectory);
     //folderHistoryRight->addItem(currentCfg.mainCfg.firstPair.rightDirectory);
 
-    setAddFolderPairs(currentCfg.mainCfg.additionalPairs);
+    setAddFolderPairs(currentCfg_.mainCfg.additionalPairs);
 
-    setViewTypeSyncAction(currentCfg.highlightSyncAction);
+    setViewTypeSyncAction(currentCfg_.highlightSyncAction);
 
     clearGrid(); //+ update GUI!
 
@@ -3263,17 +3315,17 @@ void MainDialog::setConfig(const xmlAccess::XmlGuiConfig& newGuiCfg, const std::
 
 xmlAccess::XmlGuiConfig MainDialog::getConfig() const
 {
-    xmlAccess::XmlGuiConfig guiCfg = currentCfg;
+    xmlAccess::XmlGuiConfig guiCfg = currentCfg_;
 
     //load settings whose ownership lies not in currentCfg:
 
     //first folder pair
-    guiCfg.mainCfg.firstPair = firstFolderPair->getValues();
+    guiCfg.mainCfg.firstPair = firstFolderPair_->getValues();
 
     //add additional pairs
     guiCfg.mainCfg.additionalPairs.clear();
 
-    for (const FolderPairPanel* panel : additionalFolderPairs)
+    for (const FolderPairPanel* panel : additionalFolderPairs_)
         guiCfg.mainCfg.additionalPairs.push_back(panel->getValues());
 
     //sync preview
@@ -3325,8 +3377,8 @@ void MainDialog::showConfigDialog(SyncConfigPanel panelToShow, int localPairInde
 
     if (showLocalCfgFirstPair)
     {
-        addPairCfg(firstFolderPair->getValues());
-        for (const FolderPairPanel* panel : additionalFolderPairs)
+        addPairCfg(firstFolderPair_->getValues());
+        for (const FolderPairPanel* panel : additionalFolderPairs_)
             addPairCfg(panel->getValues());
     }
 
@@ -3334,53 +3386,53 @@ void MainDialog::showConfigDialog(SyncConfigPanel panelToShow, int localPairInde
 
     const std::vector<LocalPairConfig> folderPairConfigOld = folderPairConfig;
 
-    const CompConfig    cmpCfgOld    = currentCfg.mainCfg.cmpConfig;
-    const SyncConfig    syncCfgOld   = currentCfg.mainCfg.syncCfg;
-    const FilterConfig  filterCfgOld = currentCfg.mainCfg.globalFilter;
+    const CompConfig    cmpCfgOld    = currentCfg_.mainCfg.cmpConfig;
+    const SyncConfig    syncCfgOld   = currentCfg_.mainCfg.syncCfg;
+    const FilterConfig  filterCfgOld = currentCfg_.mainCfg.globalFilter;
 
-    const xmlAccess::OnGuiError handleErrorOld         = currentCfg.handleError;
-    const Zstring               onCompletionCommandOld = currentCfg.mainCfg.onCompletion;
-    const std::vector<Zstring>  onCompletionHistoryOld = globalCfg.gui.onCompletionHistory;
+    const xmlAccess::OnGuiError handleErrorOld         = currentCfg_.handleError;
+    const Zstring               onCompletionCommandOld = currentCfg_.mainCfg.onCompletion;
+    const std::vector<Zstring>  onCompletionHistoryOld = globalCfg_.gui.onCompletionHistory;
 
     if (showSyncConfigDlg(this,
                           panelToShow,
                           localPairIndexToShow,
                           folderPairConfig,
 
-                          currentCfg.mainCfg.cmpConfig,
-                          currentCfg.mainCfg.syncCfg,
-                          currentCfg.mainCfg.globalFilter,
+                          currentCfg_.mainCfg.cmpConfig,
+                          currentCfg_.mainCfg.syncCfg,
+                          currentCfg_.mainCfg.globalFilter,
 
-                          currentCfg.handleError,
-                          currentCfg.mainCfg.onCompletion,
-                          globalCfg.gui.onCompletionHistory,
-                          globalCfg.gui.onCompletionHistoryMax) == ReturnSyncConfig::BUTTON_OKAY)
+                          currentCfg_.handleError,
+                          currentCfg_.mainCfg.onCompletion,
+                          globalCfg_.gui.onCompletionHistory,
+                          globalCfg_.gui.onCompletionHistoryMax) == ReturnSyncConfig::BUTTON_OKAY)
     {
         assert(folderPairConfig.size() == folderPairConfigOld.size());
 
         if (showLocalCfgFirstPair)
         {
             {
-                auto fp = firstFolderPair->getValues();
+                auto fp = firstFolderPair_->getValues();
                 fp.altCmpConfig  = folderPairConfig[0].altCmpConfig;
                 fp.altSyncConfig = folderPairConfig[0].altSyncConfig;
                 fp.localFilter   = folderPairConfig[0].localFilter;
-                firstFolderPair->setValues(fp);
+                firstFolderPair_->setValues(fp);
             }
 
             for (size_t i = 1; i < folderPairConfig.size(); ++i)
             {
-                auto fp = additionalFolderPairs[i - 1]->getValues();
+                auto fp = additionalFolderPairs_[i - 1]->getValues();
                 fp.altCmpConfig  = folderPairConfig[i].altCmpConfig;
                 fp.altSyncConfig = folderPairConfig[i].altSyncConfig;
                 fp.localFilter   = folderPairConfig[i].localFilter;
-                additionalFolderPairs[i - 1]->setValues(fp);
+                additionalFolderPairs_[i - 1]->setValues(fp);
             }
         }
 
         //------------------------------------------------
 
-        const bool cmpConfigChanged = currentCfg.mainCfg.cmpConfig != cmpCfgOld || [&]
+        const bool cmpConfigChanged = currentCfg_.mainCfg.cmpConfig != cmpCfgOld || [&]
         {
             for (size_t i = 0; i < folderPairConfig.size(); ++i)
             {
@@ -3393,7 +3445,7 @@ void MainDialog::showConfigDialog(SyncConfigPanel panelToShow, int localPairInde
             return false;
         }();
 
-        const bool syncConfigChanged = currentCfg.mainCfg.syncCfg != syncCfgOld || [&]
+        const bool syncConfigChanged = currentCfg_.mainCfg.syncCfg != syncCfgOld || [&]
         {
             for (size_t i = 0; i < folderPairConfig.size(); ++i)
             {
@@ -3406,7 +3458,7 @@ void MainDialog::showConfigDialog(SyncConfigPanel panelToShow, int localPairInde
             return false;
         }();
 
-        const bool filterConfigChanged = currentCfg.mainCfg.globalFilter != filterCfgOld || [&]
+        const bool filterConfigChanged = currentCfg_.mainCfg.globalFilter != filterCfgOld || [&]
         {
             for (size_t i = 0; i < folderPairConfig.size(); ++i)
                 if (folderPairConfig[i].localFilter != folderPairConfigOld[i].localFilter)
@@ -3414,15 +3466,15 @@ void MainDialog::showConfigDialog(SyncConfigPanel panelToShow, int localPairInde
             return false;
         }();
 
-        const bool miscConfigChanged = currentCfg.handleError            != handleErrorOld ||
-                                       currentCfg.mainCfg.onCompletion   != onCompletionCommandOld;
+        const bool miscConfigChanged = currentCfg_.handleError            != handleErrorOld ||
+                                       currentCfg_.mainCfg.onCompletion   != onCompletionCommandOld;
         //globalCfg.gui.onCompletionHistory != onCompletionHistoryOld;
 
         //------------------------------------------------
 
         if (cmpConfigChanged)
         {
-            const bool setDefaultViewType = currentCfg.mainCfg.cmpConfig.compareVar != cmpCfgOld.compareVar;
+            const bool setDefaultViewType = currentCfg_.mainCfg.cmpConfig.compareVar != cmpCfgOld.compareVar;
             applyCompareConfig(setDefaultViewType);
         }
 
@@ -3445,26 +3497,26 @@ void MainDialog::OnGlobalFilterContext(wxEvent& event)
 {
     auto clearFilter = [&]
     {
-        currentCfg.mainCfg.globalFilter = FilterConfig();
+        currentCfg_.mainCfg.globalFilter = FilterConfig();
         updateGlobalFilterButton(); //refresh global filter icon
         applyFilterConfig(); //re-apply filter
     };
-    auto copyFilter  = [&] { filterCfgOnClipboard = std::make_unique<FilterConfig>(currentCfg.mainCfg.globalFilter); };
+    auto copyFilter  = [&] { filterCfgOnClipboard_ = std::make_unique<FilterConfig>(currentCfg_.mainCfg.globalFilter); };
     auto pasteFilter = [&]
     {
-        if (filterCfgOnClipboard)
+        if (filterCfgOnClipboard_)
         {
-            currentCfg.mainCfg.globalFilter = *filterCfgOnClipboard;
+            currentCfg_.mainCfg.globalFilter = *filterCfgOnClipboard_;
             updateGlobalFilterButton(); //refresh global filter icon
             applyFilterConfig(); //re-apply filter
         }
     };
 
     ContextMenu menu;
-    menu.addItem( _("Clear filter"), clearFilter, nullptr, !isNullFilter(currentCfg.mainCfg.globalFilter));
+    menu.addItem( _("Clear filter"), clearFilter, nullptr, !isNullFilter(currentCfg_.mainCfg.globalFilter));
     menu.addSeparator();
-    menu.addItem( _("Copy"),  copyFilter,  nullptr, !isNullFilter(currentCfg.mainCfg.globalFilter));
-    menu.addItem( _("Paste"), pasteFilter, nullptr, filterCfgOnClipboard.get() != nullptr);
+    menu.addItem( _("Copy"),  copyFilter,  nullptr, !isNullFilter(currentCfg_.mainCfg.globalFilter));
+    menu.addItem( _("Paste"), pasteFilter, nullptr, filterCfgOnClipboard_.get() != nullptr);
 
     wxPoint pos = m_bpButtonFilterContext->GetPosition();
     pos.x += m_bpButtonFilterContext->GetSize().GetWidth();
@@ -3542,7 +3594,7 @@ void MainDialog::setViewFilterDefault()
 {
     auto setButton = [](ToggleButton* tb, bool value) { tb->setActive(value); };
 
-    const auto& def = globalCfg.gui.mainDlg.viewFilterDefault;
+    const auto& def = globalCfg_.gui.mainDlg.viewFilterDefault;
     setButton(m_bpButtonShowExcluded,   def.excluded);
     setButton(m_bpButtonShowEqual,      def.equal);
     setButton(m_bpButtonShowConflict,   def.conflict);
@@ -3573,7 +3625,7 @@ void MainDialog::OnViewButtonRightClick(wxMouseEvent& event)
 
     auto saveDefault = [&]
     {
-        auto& def = globalCfg.gui.mainDlg.viewFilterDefault;
+        auto& def = globalCfg_.gui.mainDlg.viewFilterDefault;
         setButtonDefault(m_bpButtonShowExcluded,   def.excluded);
         setButtonDefault(m_bpButtonShowEqual,      def.equal);
         setButtonDefault(m_bpButtonShowConflict,   def.conflict);
@@ -3603,7 +3655,7 @@ void MainDialog::updateGlobalFilterButton()
 {
     //global filter: test for Null-filter
     std::wstring status;
-    if (!isNullFilter(currentCfg.mainCfg.globalFilter))
+    if (!isNullFilter(currentCfg_.mainCfg.globalFilter))
     {
         setImage(*m_bpButtonFilter, getResourceImage(L"filter"));
         status = _("Active");
@@ -3651,15 +3703,15 @@ void MainDialog::OnCompare(wxCommandEvent& event)
         std::unique_ptr<LockHolder> dirLocks;
 
         //COMPARE DIRECTORIES
-        folderCmp = compare(globalCfg.optDialogs,
-                            globalCfg.fileTimeTolerance,
-                            true, //allowUserInteraction
-                            globalCfg.runWithBackgroundPriority,
-                            globalCfg.folderAccessTimeout,
-                            globalCfg.createLockFile,
-                            dirLocks,
-                            cmpConfig,
-                            statusHandler); //throw GuiAbortProcess
+        folderCmp_ = compare(globalCfg_.optDialogs,
+                             globalCfg_.fileTimeTolerance,
+                             true, //allowUserInteraction
+                             globalCfg_.runWithBackgroundPriority,
+                             globalCfg_.folderAccessTimeout,
+                             globalCfg_.createLockFile,
+                             dirLocks,
+                             cmpConfig,
+                             statusHandler); //throw GuiAbortProcess
     }
     catch (GuiAbortProcess&)
     {
@@ -3667,33 +3719,33 @@ void MainDialog::OnCompare(wxCommandEvent& event)
         return;
     }
 
-    gridDataView->setData(folderCmp); //update view on data
-    treeDataView->setData(folderCmp); //
+    gridDataView_->setData(folderCmp_); //update view on data
+    treeDataView_->setData(folderCmp_); //
     updateGui();
 
     m_gridMainL->clearSelection(ALLOW_GRID_EVENT);
     m_gridMainC->clearSelection(ALLOW_GRID_EVENT);
     m_gridMainR->clearSelection(ALLOW_GRID_EVENT);
 
-    m_gridNavi->clearSelection(ALLOW_GRID_EVENT);
+    m_gridOverview->clearSelection(ALLOW_GRID_EVENT);
 
     //play (optional) sound notification
-    if (!globalCfg.soundFileCompareFinished.empty())
+    if (!globalCfg_.soundFileCompareFinished.empty())
     {
-        const Zstring soundFilePath = getResourceDirPf() + globalCfg.soundFileCompareFinished;
+        const Zstring soundFilePath = getResourceDirPf() + globalCfg_.soundFileCompareFinished;
         if (fileAvailable(soundFilePath))
             wxSound::Play(utfTo<wxString>(soundFilePath), wxSOUND_ASYNC); //warning: this may fail and show a wxWidgets error message! => must not play when running FFS as batch!
     }
 
     //add to folder history after successful comparison only
-    folderHistoryLeft ->addItem(utfTo<Zstring>(m_folderPathLeft ->GetValue()));
-    folderHistoryRight->addItem(utfTo<Zstring>(m_folderPathRight->GetValue()));
+    folderHistoryLeft_ ->addItem(utfTo<Zstring>(m_folderPathLeft ->GetValue()));
+    folderHistoryRight_->addItem(utfTo<Zstring>(m_folderPathRight->GetValue()));
 
     if (oldFocus == m_buttonCompare)
         oldFocus = m_buttonSync;
 
     //prepare status information
-    if (allElementsEqual(folderCmp))
+    if (allElementsEqual(folderCmp_))
         flashStatusInformation(_("All files are in sync"));
 }
 
@@ -3701,7 +3753,7 @@ void MainDialog::OnCompare(wxCommandEvent& event)
 void MainDialog::updateTopButtonImages()
 {
     updateTopButton(*m_buttonCompare, getResourceImage(L"compare"), getConfig().mainCfg.getCompVariantName(), false);
-    updateTopButton(*m_buttonSync,    getResourceImage(L"sync"),    getConfig().mainCfg.getSyncVariantName(), folderCmp.empty());
+    updateTopButton(*m_buttonSync,    getResourceImage(L"sync"),    getConfig().mainCfg.getSyncVariantName(), folderCmp_.empty());
 
     m_panelTopButtons->Layout();
 }
@@ -3717,23 +3769,23 @@ void MainDialog::updateGui()
 
     updateTopButtonImages();
 
-    auiMgr.Update(); //fix small display distortion, if view filter panel is empty
+    auiMgr_.Update(); //fix small display distortion, if view filter panel is empty
 }
 
 
 void MainDialog::clearGrid(ptrdiff_t pos)
 {
-    if (!folderCmp.empty())
+    if (!folderCmp_.empty())
     {
-        assert(pos < makeSigned(folderCmp.size()));
+        assert(pos < makeSigned(folderCmp_.size()));
         if (pos < 0)
-            folderCmp.clear();
+            folderCmp_.clear();
         else
-            folderCmp.erase(folderCmp.begin() + pos);
+            folderCmp_.erase(folderCmp_.begin() + pos);
     }
 
-    gridDataView->setData(folderCmp);
-    treeDataView->setData(folderCmp);
+    gridDataView_->setData(folderCmp_);
+    treeDataView_->setData(folderCmp_);
     updateGui();
 }
 
@@ -3760,7 +3812,7 @@ void MainDialog::updateStatistics()
     };
 
     //update preview of item count and bytes to be transferred:
-    const SyncStatistics st(folderCmp);
+    const SyncStatistics st(folderCmp_);
 
     setValue(*m_staticTextData, st.getBytesToProcess() == 0, filesizeToShortString(st.getBytesToProcess()), *m_bitmapData,  L"data");
     setIntValue(*m_staticTextCreateLeft,  st.createCount< LEFT_SIDE>(), *m_bitmapCreateLeft,  L"so_create_left_small");
@@ -3781,7 +3833,7 @@ void MainDialog::applyCompareConfig(bool setDefaultViewType)
 
     //convenience: change sync view
     if (setDefaultViewType)
-        switch (currentCfg.mainCfg.cmpConfig.compareVar)
+        switch (currentCfg_.mainCfg.cmpConfig.compareVar)
         {
             case CompareVariant::TIME_SIZE:
             case CompareVariant::SIZE:
@@ -3797,35 +3849,37 @@ void MainDialog::applyCompareConfig(bool setDefaultViewType)
 
 void MainDialog::OnStartSync(wxCommandEvent& event)
 {
-    if (folderCmp.empty())
+    if (folderCmp_.empty())
     {
         //quick sync: simulate button click on "compare"
         wxCommandEvent dummy2(wxEVT_COMMAND_BUTTON_CLICKED);
         if (wxEvtHandler* evtHandler = m_buttonCompare->GetEventHandler())
             evtHandler->ProcessEvent(dummy2); //synchronous call
 
-        if (folderCmp.empty()) //check if user aborted or error occurred, ect...
+        if (folderCmp_.empty()) //check if user aborted or error occurred, ect...
             return;
     }
 
     //show sync preview/confirmation dialog
-    if (globalCfg.optDialogs.confirmSyncStart)
+    if (globalCfg_.optDialogs.confirmSyncStart)
     {
         bool dontShowAgain = false;
 
         if (zen::showSyncConfirmationDlg(this,
                                          getConfig().mainCfg.getSyncVariantName(),
-                                         zen::SyncStatistics(folderCmp),
+                                         zen::SyncStatistics(folderCmp_),
                                          dontShowAgain) != ReturnSmallDlg::BUTTON_OKAY)
             return;
 
-        globalCfg.optDialogs.confirmSyncStart = !dontShowAgain;
+        globalCfg_.optDialogs.confirmSyncStart = !dontShowAgain;
     }
 
     try
     {
+        const std::chrono::system_clock::time_point syncStartTime = std::chrono::system_clock::now();
+
         //PERF_START;
-        const Zstring activeCfgFilename = activeConfigFiles.size() == 1 && !equalFilePath(activeConfigFiles[0], lastRunConfigPath_) ? activeConfigFiles[0] : Zstring();
+        const Zstring activeCfgFilename = activeConfigFiles_.size() == 1 && !equalFilePath(activeConfigFiles_[0], lastRunConfigPath_) ? activeConfigFiles_[0] : Zstring();
 
         const auto& guiCfg = getConfig();
 
@@ -3834,26 +3888,26 @@ void MainDialog::OnStartSync(wxCommandEvent& event)
 
         //class handling status updates and error messages
         StatusHandlerFloatingDialog statusHandler(this, //throw GuiAbortProcess
-                                                  globalCfg.lastSyncsLogFileSizeMax,
-                                                  currentCfg.handleError,
-                                                  globalCfg.automaticRetryCount,
-                                                  globalCfg.automaticRetryDelay,
+                                                  globalCfg_.lastSyncsLogFileSizeMax,
+                                                  currentCfg_.handleError,
+                                                  globalCfg_.automaticRetryCount,
+                                                  globalCfg_.automaticRetryDelay,
                                                   xmlAccess::extractJobName(activeCfgFilename),
-                                                  globalCfg.soundFileSyncFinished,
+                                                  globalCfg_.soundFileSyncFinished,
                                                   guiCfg.mainCfg.onCompletion,
-                                                  globalCfg.gui.onCompletionHistory);
+                                                  globalCfg_.gui.onCompletionHistory);
 
         //inform about (important) non-default global settings
-        logNonDefaultSettings(globalCfg, statusHandler); //let's report here rather than before comparison (user might have changed global settings in the meantime!)
+        logNonDefaultSettings(globalCfg_, statusHandler); //let's report here rather than before comparison (user might have changed global settings in the meantime!)
 
         //wxBusyCursor dummy; -> redundant: progress already shown in progress dialog!
 
         //GUI mode: place directory locks on directories isolated(!) during both comparison and synchronization
         std::unique_ptr<LockHolder> dirLocks;
-        if (globalCfg.createLockFile)
+        if (globalCfg_.createLockFile)
         {
             std::set<Zstring, LessFilePath> availableDirPaths;
-            for (auto it = begin(folderCmp); it != end(folderCmp); ++it)
+            for (auto it = begin(folderCmp_); it != end(folderCmp_); ++it)
             {
                 if (it->isAvailable<LEFT_SIDE>()) //do NOT check directory existence again!
                     if (Opt<Zstring> nativeFolderPath = AFS::getNativeItemPath(it->getAbstractPath<LEFT_SIDE>())) //restrict directory locking to native paths until further
@@ -3863,25 +3917,25 @@ void MainDialog::OnStartSync(wxCommandEvent& event)
                     if (Opt<Zstring> nativeFolderPath = AFS::getNativeItemPath(it->getAbstractPath<RIGHT_SIDE>()))
                         availableDirPaths.insert(*nativeFolderPath);
             }
-            dirLocks = std::make_unique<LockHolder>(availableDirPaths, globalCfg.optDialogs.warnDirectoryLockFailed, statusHandler);
+            dirLocks = std::make_unique<LockHolder>(availableDirPaths, globalCfg_.optDialogs.warnDirectoryLockFailed, statusHandler);
         }
 
         //START SYNCHRONIZATION
         const std::vector<zen::FolderPairSyncCfg> syncProcessCfg = zen::extractSyncCfg(guiCfg.mainCfg);
-        if (syncProcessCfg.size() != folderCmp.size())
+        if (syncProcessCfg.size() != folderCmp_.size())
             throw std::logic_error("Contract violation! " + std::string(__FILE__) + ":" + numberTo<std::string>(__LINE__));
         //should never happen: sync button is deactivated if they are not in sync
 
-        synchronize(getLocalTime(),
-                    globalCfg.verifyFileCopy,
-                    globalCfg.copyLockedFiles,
-                    globalCfg.copyFilePermissions,
-                    globalCfg.failSafeFileCopy,
-                    globalCfg.runWithBackgroundPriority,
-                    globalCfg.folderAccessTimeout,
+        synchronize(syncStartTime,
+                    globalCfg_.verifyFileCopy,
+                    globalCfg_.copyLockedFiles,
+                    globalCfg_.copyFilePermissions,
+                    globalCfg_.failSafeFileCopy,
+                    globalCfg_.runWithBackgroundPriority,
+                    globalCfg_.folderAccessTimeout,
                     syncProcessCfg,
-                    folderCmp,
-                    globalCfg.optDialogs,
+                    folderCmp_,
+                    globalCfg_.optDialogs,
                     statusHandler);
     }
     catch (GuiAbortProcess&)
@@ -3890,7 +3944,7 @@ void MainDialog::OnStartSync(wxCommandEvent& event)
     }   //enableSynchronization(false);
 
     //remove empty rows: just a beautification, invalid rows shouldn't cause issues
-    gridDataView->removeInvalidRows();
+    gridDataView_->removeInvalidRows();
 
     updateGui();
 }
@@ -3910,29 +3964,29 @@ void MainDialog::onGridDoubleClickR(GridClickEvent& event)
 
 void MainDialog::onGridDoubleClickRim(size_t row, bool leftSide)
 {
-    if (!globalCfg.gui.externelApplications.empty())
+    if (!globalCfg_.gui.externelApplications.empty())
     {
         std::vector<FileSystemObject*> selectionLeft;
         std::vector<FileSystemObject*> selectionRight;
-        if (FileSystemObject* fsObj = gridDataView->getObject(row)) //selection must be a list of BOUND pointers!
+        if (FileSystemObject* fsObj = gridDataView_->getObject(row)) //selection must be a list of BOUND pointers!
             (leftSide ? selectionLeft : selectionRight) = { fsObj };
 
-        openExternalApplication(globalCfg.gui.externelApplications[0].second, leftSide, selectionLeft, selectionRight);
+        openExternalApplication(globalCfg_.gui.externelApplications[0].second, leftSide, selectionLeft, selectionRight);
     }
 }
 
 
 void MainDialog::onGridLabelLeftClick(bool onLeft, ColumnTypeRim type)
 {
-    auto sortInfo = gridDataView->getSortInfo();
+    auto sortInfo = gridDataView_->getSortInfo();
 
     bool sortAscending = GridView::getDefaultSortDirection(type);
     if (sortInfo && sortInfo->onLeft_ == onLeft && sortInfo->type_ == type)
         sortAscending = !sortInfo->ascending_;
 
-    const ItemPathFormat itemPathFormat = onLeft ? globalCfg.gui.mainDlg.itemPathFormatLeftGrid : globalCfg.gui.mainDlg.itemPathFormatRightGrid;
+    const ItemPathFormat itemPathFormat = onLeft ? globalCfg_.gui.mainDlg.itemPathFormatLeftGrid : globalCfg_.gui.mainDlg.itemPathFormatRightGrid;
 
-    gridDataView->sortView(type, itemPathFormat, onLeft, sortAscending);
+    gridDataView_->sortView(type, itemPathFormat, onLeft, sortAscending);
 
     m_gridMainL->clearSelection(ALLOW_GRID_EVENT);
     m_gridMainC->clearSelection(ALLOW_GRID_EVENT);
@@ -3963,11 +4017,11 @@ void MainDialog::onGridLabelLeftClickC(GridLabelClickEvent& event)
 void MainDialog::OnSwapSides(wxCommandEvent& event)
 {
     //swap directory names:
-    FolderPairEnh fp1st = firstFolderPair->getValues();
+    FolderPairEnh fp1st = firstFolderPair_->getValues();
     std::swap(fp1st.folderPathPhraseLeft_, fp1st.folderPathPhraseRight_);
-    firstFolderPair->setValues(fp1st);
+    firstFolderPair_->setValues(fp1st);
 
-    for (FolderPairPanel* panel : additionalFolderPairs)
+    for (FolderPairPanel* panel : additionalFolderPairs_)
     {
         FolderPairEnh fp = panel->getValues();
         std::swap(fp.folderPathPhraseLeft_, fp.folderPathPhraseRight_);
@@ -3997,8 +4051,14 @@ void MainDialog::OnSwapSides(wxCommandEvent& event)
     m_bpButtonShowUpdateRight->setActive(tmp);
     */
 
-    //swap grid information
-    zen::swapGrids(getConfig().mainCfg, folderCmp);
+    try
+    {
+        zen::swapGrids(getConfig().mainCfg, folderCmp_); //throw FileError
+    }
+    catch (const FileError& e)
+    {
+        showNotificationDialog(this, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(e.toString()));
+    }
 
     updateGui();
 }
@@ -4021,16 +4081,16 @@ void MainDialog::updateGridViewData()
 
     if (m_bpButtonViewTypeSyncAction->isActive())
     {
-        const GridView::StatusSyncPreview result = gridDataView->updateSyncPreview(m_bpButtonShowExcluded   ->isActive(),
-                                                                                   m_bpButtonShowCreateLeft ->isActive(),
-                                                                                   m_bpButtonShowCreateRight->isActive(),
-                                                                                   m_bpButtonShowDeleteLeft ->isActive(),
-                                                                                   m_bpButtonShowDeleteRight->isActive(),
-                                                                                   m_bpButtonShowUpdateLeft ->isActive(),
-                                                                                   m_bpButtonShowUpdateRight->isActive(),
-                                                                                   m_bpButtonShowDoNothing  ->isActive(),
-                                                                                   m_bpButtonShowEqual      ->isActive(),
-                                                                                   m_bpButtonShowConflict   ->isActive());
+        const GridView::StatusSyncPreview result = gridDataView_->updateSyncPreview(m_bpButtonShowExcluded   ->isActive(),
+                                                                                    m_bpButtonShowCreateLeft ->isActive(),
+                                                                                    m_bpButtonShowCreateRight->isActive(),
+                                                                                    m_bpButtonShowDeleteLeft ->isActive(),
+                                                                                    m_bpButtonShowDeleteRight->isActive(),
+                                                                                    m_bpButtonShowUpdateLeft ->isActive(),
+                                                                                    m_bpButtonShowUpdateRight->isActive(),
+                                                                                    m_bpButtonShowDoNothing  ->isActive(),
+                                                                                    m_bpButtonShowEqual      ->isActive(),
+                                                                                    m_bpButtonShowConflict   ->isActive());
         filesOnLeftView    = result.filesOnLeftView;
         foldersOnLeftView  = result.foldersOnLeftView;
         filesOnRightView   = result.filesOnRightView;
@@ -4059,14 +4119,14 @@ void MainDialog::updateGridViewData()
     }
     else
     {
-        const GridView::StatusCmpResult result = gridDataView->updateCmpResult(m_bpButtonShowExcluded  ->isActive(),
-                                                                               m_bpButtonShowLeftOnly  ->isActive(),
-                                                                               m_bpButtonShowRightOnly ->isActive(),
-                                                                               m_bpButtonShowLeftNewer ->isActive(),
-                                                                               m_bpButtonShowRightNewer->isActive(),
-                                                                               m_bpButtonShowDifferent ->isActive(),
-                                                                               m_bpButtonShowEqual     ->isActive(),
-                                                                               m_bpButtonShowConflict  ->isActive());
+        const GridView::StatusCmpResult result = gridDataView_->updateCmpResult(m_bpButtonShowExcluded  ->isActive(),
+                                                                                m_bpButtonShowLeftOnly  ->isActive(),
+                                                                                m_bpButtonShowRightOnly ->isActive(),
+                                                                                m_bpButtonShowLeftNewer ->isActive(),
+                                                                                m_bpButtonShowRightNewer->isActive(),
+                                                                                m_bpButtonShowDifferent ->isActive(),
+                                                                                m_bpButtonShowEqual     ->isActive(),
+                                                                                m_bpButtonShowConflict  ->isActive());
         filesOnLeftView    = result.filesOnLeftView;
         foldersOnLeftView  = result.foldersOnLeftView;
         filesOnRightView   = result.filesOnRightView;
@@ -4124,26 +4184,26 @@ void MainDialog::updateGridViewData()
 
     //navigation tree
     if (m_bpButtonViewTypeSyncAction->isActive())
-        treeDataView->updateSyncPreview(m_bpButtonShowExcluded   ->isActive(),
-                                        m_bpButtonShowCreateLeft ->isActive(),
-                                        m_bpButtonShowCreateRight->isActive(),
-                                        m_bpButtonShowDeleteLeft ->isActive(),
-                                        m_bpButtonShowDeleteRight->isActive(),
-                                        m_bpButtonShowUpdateLeft ->isActive(),
-                                        m_bpButtonShowUpdateRight->isActive(),
-                                        m_bpButtonShowDoNothing  ->isActive(),
-                                        m_bpButtonShowEqual      ->isActive(),
-                                        m_bpButtonShowConflict   ->isActive());
+        treeDataView_->updateSyncPreview(m_bpButtonShowExcluded   ->isActive(),
+                                         m_bpButtonShowCreateLeft ->isActive(),
+                                         m_bpButtonShowCreateRight->isActive(),
+                                         m_bpButtonShowDeleteLeft ->isActive(),
+                                         m_bpButtonShowDeleteRight->isActive(),
+                                         m_bpButtonShowUpdateLeft ->isActive(),
+                                         m_bpButtonShowUpdateRight->isActive(),
+                                         m_bpButtonShowDoNothing  ->isActive(),
+                                         m_bpButtonShowEqual      ->isActive(),
+                                         m_bpButtonShowConflict   ->isActive());
     else
-        treeDataView->updateCmpResult(m_bpButtonShowExcluded  ->isActive(),
-                                      m_bpButtonShowLeftOnly  ->isActive(),
-                                      m_bpButtonShowRightOnly ->isActive(),
-                                      m_bpButtonShowLeftNewer ->isActive(),
-                                      m_bpButtonShowRightNewer->isActive(),
-                                      m_bpButtonShowDifferent ->isActive(),
-                                      m_bpButtonShowEqual     ->isActive(),
-                                      m_bpButtonShowConflict  ->isActive());
-    m_gridNavi->Refresh();
+        treeDataView_->updateCmpResult(m_bpButtonShowExcluded  ->isActive(),
+                                       m_bpButtonShowLeftOnly  ->isActive(),
+                                       m_bpButtonShowRightOnly ->isActive(),
+                                       m_bpButtonShowLeftNewer ->isActive(),
+                                       m_bpButtonShowRightNewer->isActive(),
+                                       m_bpButtonShowDifferent ->isActive(),
+                                       m_bpButtonShowEqual     ->isActive(),
+                                       m_bpButtonShowConflict  ->isActive());
+    m_gridOverview->Refresh();
 
     //update status bar information
     setStatusBarFileStatistics(filesOnLeftView,
@@ -4157,7 +4217,7 @@ void MainDialog::updateGridViewData()
 
 void MainDialog::applyFilterConfig()
 {
-    applyFiltering(folderCmp, getConfig().mainCfg);
+    applyFiltering(folderCmp_, getConfig().mainCfg);
     updateGui();
     //updateGuiDelayedIf(currentCfg.hideExcludedItems); //show update GUI before removing rows
 }
@@ -4165,20 +4225,14 @@ void MainDialog::applyFilterConfig()
 
 void MainDialog::applySyncConfig()
 {
-    zen::redetermineSyncDirection(getConfig().mainCfg, folderCmp,
-                                  [&](const std::wstring& warning)
+    try
     {
-        bool& warningActive = globalCfg.optDialogs.warnDatabaseError;
-        if (warningActive)
-        {
-            bool dontWarnAgain = false;
-
-            showNotificationDialog(this, DialogInfoType::WARNING, PopupDialogCfg().setDetailInstructions(warning).setCheckBox(dontWarnAgain, _("&Don't show this warning again")));
-            warningActive = !dontWarnAgain;
-        }
-    },
-    nullptr //[&](const std::wstring& statusMsg){ } -> status update while loading db file
-                                 );
+        zen::redetermineSyncDirection(getConfig().mainCfg, folderCmp_, nullptr /*notifyStatus*/); //throw FileError
+    }
+    catch (const FileError& e)
+    {
+        showNotificationDialog(this, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(e.toString()));
+    }
 
     updateGui();
 }
@@ -4220,14 +4274,14 @@ void MainDialog::OnSearchPanelKeyPressed(wxKeyEvent& event)
 
 void MainDialog::showFindPanel() //CTRL + F or F3 with empty search phrase
 {
-    auiMgr.GetPane(m_panelSearch).Show();
-    auiMgr.Update();
+    auiMgr_.GetPane(m_panelSearch).Show();
+    auiMgr_.Update();
 
     m_textCtrlSearchTxt->SelectAll();
 
     wxWindow* focus = wxWindow::FindFocus(); //restore when closing panel!
     if (!isComponentOf(focus, m_panelSearch))
-        focusWindowAfterSearch = focus == &m_gridMainR->getMainWin() ? focus : &m_gridMainL->getMainWin();
+        focusWindowAfterSearch_ = focus == &m_gridMainR->getMainWin() ? focus : &m_gridMainL->getMainWin();
     //don't save pointer to arbitrary window: it might not exist anymore when hideFindPanel() uses it!!! (e.g. some folder pair panel)
     m_textCtrlSearchTxt->SetFocus();
 }
@@ -4235,13 +4289,13 @@ void MainDialog::showFindPanel() //CTRL + F or F3 with empty search phrase
 
 void MainDialog::hideFindPanel()
 {
-    auiMgr.GetPane(m_panelSearch).Hide();
-    auiMgr.Update();
+    auiMgr_.GetPane(m_panelSearch).Hide();
+    auiMgr_.Update();
 
-    if (focusWindowAfterSearch)
+    if (focusWindowAfterSearch_)
     {
-        focusWindowAfterSearch->SetFocus();
-        focusWindowAfterSearch = nullptr;
+        focusWindowAfterSearch_->SetFocus();
+        focusWindowAfterSearch_ = nullptr;
     }
 }
 
@@ -4259,7 +4313,7 @@ void MainDialog::startFindNext(bool searchAscending) //F3 or ENTER in m_textCtrl
         Grid* grid2 = m_gridMainR;
 
         wxWindow* focus = wxWindow::FindFocus();
-        if ((isComponentOf(focus, m_panelSearch) ? focusWindowAfterSearch : focus) == &m_gridMainR->getMainWin())
+        if ((isComponentOf(focus, m_panelSearch) ? focusWindowAfterSearch_ : focus) == &m_gridMainR->getMainWin())
             std::swap(grid1, grid2); //select side to start search at grid cursor position
 
         wxBeginBusyCursor(wxHOURGLASS_CURSOR);
@@ -4274,7 +4328,7 @@ void MainDialog::startFindNext(bool searchAscending) //F3 or ENTER in m_textCtrl
             gridview::setScrollMaster(*grid);
             grid->setGridCursor(result.second);
 
-            focusWindowAfterSearch = &grid->getMainWin();
+            focusWindowAfterSearch_ = &grid->getMainWin();
 
             if (!isComponentOf(wxWindow::FindFocus(), m_panelSearch))
                 grid->getMainWin().SetFocus();
@@ -4301,8 +4355,8 @@ void MainDialog::OnTopFolderPairAdd(wxCommandEvent& event)
 void MainDialog::OnTopFolderPairRemove(wxCommandEvent& event)
 {
 
-    assert(!additionalFolderPairs.empty());
-    if (!additionalFolderPairs.empty())
+    assert(!additionalFolderPairs_.empty());
+    if (!additionalFolderPairs_.empty())
     {
         moveAddFolderPairUp(0);
         removeAddFolderPair(0);
@@ -4313,10 +4367,10 @@ void MainDialog::OnTopFolderPairRemove(wxCommandEvent& event)
 void MainDialog::OnLocalCompCfg(wxCommandEvent& event)
 {
     const wxObject* const eventObj = event.GetEventObject(); //find folder pair originating the event
-    for (auto it = additionalFolderPairs.begin(); it != additionalFolderPairs.end(); ++it)
+    for (auto it = additionalFolderPairs_.begin(); it != additionalFolderPairs_.end(); ++it)
         if (eventObj == (*it)->m_bpButtonAltCompCfg)
         {
-            showConfigDialog(SyncConfigPanel::COMPARISON, (it - additionalFolderPairs.begin()) + 1);
+            showConfigDialog(SyncConfigPanel::COMPARISON, (it - additionalFolderPairs_.begin()) + 1);
             break;
         }
 }
@@ -4325,10 +4379,10 @@ void MainDialog::OnLocalCompCfg(wxCommandEvent& event)
 void MainDialog::OnLocalSyncCfg(wxCommandEvent& event)
 {
     const wxObject* const eventObj = event.GetEventObject(); //find folder pair originating the event
-    for (auto it = additionalFolderPairs.begin(); it != additionalFolderPairs.end(); ++it)
+    for (auto it = additionalFolderPairs_.begin(); it != additionalFolderPairs_.end(); ++it)
         if (eventObj == (*it)->m_bpButtonAltSyncCfg)
         {
-            showConfigDialog(SyncConfigPanel::SYNC, (it - additionalFolderPairs.begin()) + 1);
+            showConfigDialog(SyncConfigPanel::SYNC, (it - additionalFolderPairs_.begin()) + 1);
             break;
         }
 }
@@ -4337,10 +4391,10 @@ void MainDialog::OnLocalSyncCfg(wxCommandEvent& event)
 void MainDialog::OnLocalFilterCfg(wxCommandEvent& event)
 {
     const wxObject* const eventObj = event.GetEventObject(); //find folder pair originating the event
-    for (auto it = additionalFolderPairs.begin(); it != additionalFolderPairs.end(); ++it)
+    for (auto it = additionalFolderPairs_.begin(); it != additionalFolderPairs_.end(); ++it)
         if (eventObj == (*it)->m_bpButtonLocalFilter)
         {
-            showConfigDialog(SyncConfigPanel::FILTER, (it - additionalFolderPairs.begin()) + 1);
+            showConfigDialog(SyncConfigPanel::FILTER, (it - additionalFolderPairs_.begin()) + 1);
             break;
         }
 }
@@ -4350,10 +4404,10 @@ void MainDialog::OnRemoveFolderPair(wxCommandEvent& event)
 {
 
     const wxObject* const eventObj = event.GetEventObject(); //find folder pair originating the event
-    for (auto it = additionalFolderPairs.begin(); it != additionalFolderPairs.end(); ++it)
+    for (auto it = additionalFolderPairs_.begin(); it != additionalFolderPairs_.end(); ++it)
         if (eventObj == (*it)->m_bpButtonRemovePair)
         {
-            removeAddFolderPair(it - additionalFolderPairs.begin());
+            removeAddFolderPair(it - additionalFolderPairs_.begin());
             break;
         }
 }
@@ -4363,16 +4417,16 @@ void MainDialog::OnShowFolderPairOptions(wxEvent& event)
 {
 
     const wxObject* const eventObj = event.GetEventObject(); //find folder pair originating the event
-    for (auto it = additionalFolderPairs.begin(); it != additionalFolderPairs.end(); ++it)
+    for (auto it = additionalFolderPairs_.begin(); it != additionalFolderPairs_.end(); ++it)
         if (eventObj == (*it)->m_bpButtonFolderPairOptions)
         {
-            const ptrdiff_t pos = it - additionalFolderPairs.begin();
+            const ptrdiff_t pos = it - additionalFolderPairs_.begin();
 
             ContextMenu menu;
             menu.addItem(_("Add folder pair"), [this, pos] { insertAddFolderPair({ FolderPairEnh() },  pos); }, &getResourceImage(L"item_add_small"));
             menu.addSeparator();
             menu.addItem(_("Move up"  ) + L"\tAlt+Page Up",   [this, pos] { moveAddFolderPairUp(pos);     }, &getResourceImage(L"move_up_small"));
-            menu.addItem(_("Move down") + L"\tAlt+Page Down", [this, pos] { moveAddFolderPairUp(pos + 1); }, &getResourceImage(L"move_down_small"), pos + 1 < makeSigned(additionalFolderPairs.size()));
+            menu.addItem(_("Move down") + L"\tAlt+Page Down", [this, pos] { moveAddFolderPairUp(pos + 1); }, &getResourceImage(L"move_down_small"), pos + 1 < makeSigned(additionalFolderPairs_.size()));
 
             wxPoint ctxPos = (*it)->m_bpButtonFolderPairOptions->GetPosition();
             ctxPos.x += (*it)->m_bpButtonFolderPairOptions->GetSize().GetWidth();
@@ -4391,10 +4445,10 @@ void MainDialog::onTopFolderPairKeyEvent(wxKeyEvent& event)
         {
             case WXK_PAGEDOWN: //Alt + Page Down
             case WXK_NUMPAD_PAGEDOWN:
-                if (!additionalFolderPairs.empty())
+                if (!additionalFolderPairs_.empty())
                 {
                     moveAddFolderPairUp(0);
-                    additionalFolderPairs[0]->m_folderPathLeft->SetFocus();
+                    additionalFolderPairs_[0]->m_folderPathLeft->SetFocus();
                 }
                 return;
         }
@@ -4410,9 +4464,9 @@ void MainDialog::onAddFolderPairKeyEvent(wxKeyEvent& event)
     auto getAddFolderPairPos = [&]() -> ptrdiff_t //find folder pair originating the event
     {
         if (auto eventObj = dynamic_cast<const wxWindow*>(event.GetEventObject()))
-            for (auto it = additionalFolderPairs.begin(); it != additionalFolderPairs.end(); ++it)
+            for (auto it = additionalFolderPairs_.begin(); it != additionalFolderPairs_.end(); ++it)
                 if (isComponentOf(eventObj, *it))
-                    return it - additionalFolderPairs.begin();
+                    return it - additionalFolderPairs_.begin();
         return -1;
     };
 
@@ -4426,7 +4480,7 @@ void MainDialog::onAddFolderPairKeyEvent(wxKeyEvent& event)
                 if (pos >= 0)
                 {
                     moveAddFolderPairUp(pos);
-                    (pos == 0 ? m_folderPathLeft : additionalFolderPairs[pos - 1]->m_folderPathLeft)->SetFocus();
+                    (pos == 0 ? m_folderPathLeft : additionalFolderPairs_[pos - 1]->m_folderPathLeft)->SetFocus();
                 }
             }
             return;
@@ -4434,10 +4488,10 @@ void MainDialog::onAddFolderPairKeyEvent(wxKeyEvent& event)
             case WXK_NUMPAD_PAGEDOWN:
             {
                 const ptrdiff_t pos = getAddFolderPairPos();
-                if (0 <= pos && pos + 1 < makeSigned(additionalFolderPairs.size()))
+                if (0 <= pos && pos + 1 < makeSigned(additionalFolderPairs_.size()))
                 {
                     moveAddFolderPairUp(pos + 1);
-                    additionalFolderPairs[pos + 1]->m_folderPathLeft->SetFocus();
+                    additionalFolderPairs_[pos + 1]->m_folderPathLeft->SetFocus();
                 }
             }
             return;
@@ -4451,14 +4505,14 @@ void MainDialog::updateGuiForFolderPair()
 {
 
     //adapt delete top folder pair button
-    m_bpButtonRemovePair->Show(!additionalFolderPairs.empty());
+    m_bpButtonRemovePair->Show(!additionalFolderPairs_.empty());
     m_panelTopLeft->Layout();
 
     //adapt local filter and sync cfg for first folder pair
-    const bool showLocalCfgFirstPair = !additionalFolderPairs.empty()                       ||
-                                       firstFolderPair->getAltCompConfig().get() != nullptr ||
-                                       firstFolderPair->getAltSyncConfig().get() != nullptr ||
-                                       !isNullFilter(firstFolderPair->getAltFilterConfig());
+    const bool showLocalCfgFirstPair = !additionalFolderPairs_.empty()                       ||
+                                       firstFolderPair_->getAltCompConfig().get() != nullptr ||
+                                       firstFolderPair_->getAltSyncConfig().get() != nullptr ||
+                                       !isNullFilter(firstFolderPair_->getAltFilterConfig());
     //harmonize with MainDialog::showConfigDialog()!
 
     m_bpButtonAltCompCfg ->Show(showLocalCfgFirstPair);
@@ -4471,12 +4525,12 @@ void MainDialog::updateGuiForFolderPair()
 
     int addPairMinimalHeight = 0;
     int addPairOptimalHeight = 0;
-    if (!additionalFolderPairs.empty())
+    if (!additionalFolderPairs_.empty())
     {
-        const int pairHeight = additionalFolderPairs[0]->GetSize().GetHeight();
-        addPairMinimalHeight = std::min<double>(1.5, additionalFolderPairs.size()) * pairHeight; //have 1.5 * height indicate that more folders are there
-        addPairOptimalHeight = std::min<double>(globalCfg.gui.mainDlg.maxFolderPairsVisible - 1 + 0.5, //subtract first/main folder pair and add 0.5 to indicate additional folders
-                                                additionalFolderPairs.size()) * pairHeight;
+        const int pairHeight = additionalFolderPairs_[0]->GetSize().GetHeight();
+        addPairMinimalHeight = std::min<double>(1.5, additionalFolderPairs_.size()) * pairHeight; //have 1.5 * height indicate that more folders are there
+        addPairOptimalHeight = std::min<double>(globalCfg_.gui.mainDlg.maxFolderPairsVisible - 1 + 0.5, //subtract first/main folder pair and add 0.5 to indicate additional folders
+                                                additionalFolderPairs_.size()) * pairHeight;
 
         addPairOptimalHeight = std::max(addPairOptimalHeight, addPairMinimalHeight); //implicitly handle corrupted values for "maxFolderPairsVisible"
     }
@@ -4486,18 +4540,18 @@ void MainDialog::updateGuiForFolderPair()
 
     //########################################################################################################################
     //wxAUI hack: set minimum height to desired value, then call wxAuiPaneInfo::Fixed() to apply it
-    auiMgr.GetPane(m_panelDirectoryPairs).MinSize(-1, firstPairHeight + addPairOptimalHeight);
-    auiMgr.GetPane(m_panelDirectoryPairs).Fixed();
-    auiMgr.Update();
+    auiMgr_.GetPane(m_panelDirectoryPairs).MinSize(-1, firstPairHeight + addPairOptimalHeight);
+    auiMgr_.GetPane(m_panelDirectoryPairs).Fixed();
+    auiMgr_.Update();
 
     //now make resizable again
-    auiMgr.GetPane(m_panelDirectoryPairs).Resizable();
-    auiMgr.Update();
+    auiMgr_.GetPane(m_panelDirectoryPairs).Resizable();
+    auiMgr_.Update();
     //########################################################################################################################
 
     //make sure user cannot fully shrink additional folder pairs
-    auiMgr.GetPane(m_panelDirectoryPairs).MinSize(-1, firstPairHeight + addPairMinimalHeight);
-    auiMgr.Update();
+    auiMgr_.GetPane(m_panelDirectoryPairs).MinSize(-1, firstPairHeight + addPairMinimalHeight);
+    auiMgr_.Update();
 
     //it seems there is no GetSizer()->SetSizeHints(this)/Fit() required due to wxAui "magic"
     //=> *massive* perf improvement on OS X!
@@ -4506,23 +4560,23 @@ void MainDialog::updateGuiForFolderPair()
 
 void MainDialog::insertAddFolderPair(const std::vector<FolderPairEnh>& newPairs, size_t pos)
 {
-    assert(pos <= additionalFolderPairs.size() && additionalFolderPairs.size() == bSizerAddFolderPairs->GetItemCount());
-    pos = std::min(pos, additionalFolderPairs.size());
+    assert(pos <= additionalFolderPairs_.size() && additionalFolderPairs_.size() == bSizerAddFolderPairs->GetItemCount());
+    pos = std::min(pos, additionalFolderPairs_.size());
 
     for (size_t i = 0; i < newPairs.size(); ++i)
     {
         FolderPairPanel* newPair = new FolderPairPanel(m_scrolledWindowFolderPairs, *this);
 
         //init dropdown history
-        newPair->m_folderPathLeft ->init(folderHistoryLeft);
-        newPair->m_folderPathRight->init(folderHistoryRight);
+        newPair->m_folderPathLeft ->init(folderHistoryLeft_);
+        newPair->m_folderPathRight->init(folderHistoryRight_);
 
         //set width of left folder panel
         const int width = m_panelTopLeft->GetSize().GetWidth();
         newPair->m_panelLeft->SetMinSize(wxSize(width, -1));
 
         bSizerAddFolderPairs->Insert(pos, newPair, 0, wxEXPAND);
-        additionalFolderPairs.insert(additionalFolderPairs.begin() + pos, newPair);
+        additionalFolderPairs_.insert(additionalFolderPairs_.begin() + pos, newPair);
 
         //register events
         newPair->m_bpButtonFolderPairOptions->Connect(wxEVT_COMMAND_BUTTON_CLICKED,        wxEventHandler(MainDialog::OnShowFolderPairOptions), nullptr, this);
@@ -4540,34 +4594,34 @@ void MainDialog::insertAddFolderPair(const std::vector<FolderPairEnh>& newPairs,
     //wxComboBox screws up miserably if width/height is smaller than the magic number 4! Problem occurs when trying to set tooltip
     //so we have to update window sizes before setting configuration:
     for (auto it = newPairs.begin(); it != newPairs.end(); ++it)//set alternate configuration
-        additionalFolderPairs[pos + (it - newPairs.begin())]->setValues(*it);
+        additionalFolderPairs_[pos + (it - newPairs.begin())]->setValues(*it);
     clearGrid(); //+ GUI update
 }
 
 
 void MainDialog::moveAddFolderPairUp(size_t pos)
 {
-    assert(pos < additionalFolderPairs.size());
-    if (pos < additionalFolderPairs.size())
+    assert(pos < additionalFolderPairs_.size());
+    if (pos < additionalFolderPairs_.size())
     {
-        const FolderPairEnh cfgTmp = additionalFolderPairs[pos]->getValues();
+        const FolderPairEnh cfgTmp = additionalFolderPairs_[pos]->getValues();
         if (pos == 0)
         {
-            additionalFolderPairs[pos]->setValues(firstFolderPair->getValues());
-            firstFolderPair->setValues(cfgTmp);
+            additionalFolderPairs_[pos]->setValues(firstFolderPair_->getValues());
+            firstFolderPair_->setValues(cfgTmp);
         }
         else
         {
-            additionalFolderPairs[pos]->setValues(additionalFolderPairs[pos - 1]->getValues());
-            additionalFolderPairs[pos - 1]->setValues(cfgTmp);
+            additionalFolderPairs_[pos]->setValues(additionalFolderPairs_[pos - 1]->getValues());
+            additionalFolderPairs_[pos - 1]->setValues(cfgTmp);
         }
 
         //move comparison results, too!
-        if (!folderCmp.empty())
-            std::swap(folderCmp[pos], folderCmp[pos + 1]); //invariant: folderCmp is empty or matches number of all folder pairs
+        if (!folderCmp_.empty())
+            std::swap(folderCmp_[pos], folderCmp_[pos + 1]); //invariant: folderCmp is empty or matches number of all folder pairs
 
-        gridDataView->setData(folderCmp);
-        treeDataView->setData(folderCmp);
+        gridDataView_->setData(folderCmp_);
+        treeDataView_->setData(folderCmp_);
         updateGui();
     }
 }
@@ -4575,18 +4629,18 @@ void MainDialog::moveAddFolderPairUp(size_t pos)
 
 void MainDialog::removeAddFolderPair(size_t pos)
 {
-    assert(pos < additionalFolderPairs.size());
-    if (pos < additionalFolderPairs.size())
+    assert(pos < additionalFolderPairs_.size());
+    if (pos < additionalFolderPairs_.size())
     {
-        FolderPairPanel* panel = additionalFolderPairs[pos];
+        FolderPairPanel* panel = additionalFolderPairs_[pos];
 
         bSizerAddFolderPairs->Detach(panel); //Remove() does not work on wxWindow*, so do it manually
-        additionalFolderPairs.erase(additionalFolderPairs.begin() + pos);
+        additionalFolderPairs_.erase(additionalFolderPairs_.begin() + pos);
         //more (non-portable) wxWidgets bullshit: on OS X wxWindow::Destroy() screws up and calls "operator delete" directly rather than
         //the deferred deletion it is expected to do (and which is implemented correctly on Windows and Linux)
         //http://bb10.com/python-wxpython-devel/2012-09/msg00004.html
         //=> since we're in a mouse button callback of a sub-component of "panel" we need to delay deletion ourselves:
-        guiQueue.processAsync([] {}, [panel] { panel->Destroy(); });
+        guiQueue_.processAsync([] {}, [panel] { panel->Destroy(); });
 
         updateGuiForFolderPair();
         clearGrid(pos + 1); //+ GUI update
@@ -4597,7 +4651,7 @@ void MainDialog::removeAddFolderPair(size_t pos)
 void MainDialog::setAddFolderPairs(const std::vector<zen::FolderPairEnh>& newPairs)
 {
 
-    additionalFolderPairs.clear();
+    additionalFolderPairs_.clear();
     bSizerAddFolderPairs->Clear(true);
 
     //updateGuiForFolderPair(); -> already called in insertAddFolderPair()
@@ -4611,7 +4665,7 @@ void MainDialog::setAddFolderPairs(const std::vector<zen::FolderPairEnh>& newPai
 //menu events
 void MainDialog::OnMenuOptions(wxCommandEvent& event)
 {
-    zen::showOptionsDlg(this, globalCfg);
+    zen::showOptionsDlg(this, globalCfg_);
 }
 
 
@@ -4652,7 +4706,7 @@ void MainDialog::OnMenuExportFileList(wxCommandEvent& event)
 
     //base folders
     header += fmtValue(_("Folder Pairs")) + LINE_BREAK;
-    std::for_each(begin(folderCmp), end(folderCmp), [&](BaseFolderPair& baseFolder)
+    std::for_each(begin(folderCmp_), end(folderCmp_), [&](BaseFolderPair& baseFolder)
     {
         header += utfTo<std::string>(AFS::getDisplayPath(baseFolder.getAbstractPath< LEFT_SIDE>())) + CSV_SEP;
         header += utfTo<std::string>(AFS::getDisplayPath(baseFolder.getAbstractPath<RIGHT_SIDE>())) + LINE_BREAK;
@@ -4748,30 +4802,30 @@ void MainDialog::OnMenuExportFileList(wxCommandEvent& event)
 
 void MainDialog::OnMenuCheckVersion(wxCommandEvent& event)
 {
-    zen::checkForUpdateNow(this, globalCfg.gui.lastOnlineVersion);
+    zen::checkForUpdateNow(this, globalCfg_.gui.lastOnlineVersion);
 }
 
 
 void MainDialog::OnMenuUpdateAvailable(wxCommandEvent& event)
 {
-    zen::checkForUpdateNow(this, globalCfg.gui.lastOnlineVersion); //show changelog + handle Donation Edition auto-updater (including expiration)
+    zen::checkForUpdateNow(this, globalCfg_.gui.lastOnlineVersion); //show changelog + handle Donation Edition auto-updater (including expiration)
 }
 
 
 void MainDialog::OnMenuCheckVersionAutomatically(wxCommandEvent& event)
 {
-    if (updateCheckActive(globalCfg.gui.lastUpdateCheck))
-        disableUpdateCheck(globalCfg.gui.lastUpdateCheck);
+    if (updateCheckActive(globalCfg_.gui.lastUpdateCheck))
+        disableUpdateCheck(globalCfg_.gui.lastUpdateCheck);
     else
-        globalCfg.gui.lastUpdateCheck = 0; //reset to GlobalSettings.xml default value!
+        globalCfg_.gui.lastUpdateCheck = 0; //reset to GlobalSettings.xml default value!
 
-    m_menuItemCheckVersionAuto->Check(updateCheckActive(globalCfg.gui.lastUpdateCheck));
+    m_menuItemCheckVersionAuto->Check(updateCheckActive(globalCfg_.gui.lastUpdateCheck));
 
-    if (shouldRunPeriodicUpdateCheck(globalCfg.gui.lastUpdateCheck))
+    if (shouldRunPeriodicUpdateCheck(globalCfg_.gui.lastUpdateCheck))
     {
         flashStatusInformation(_("Searching for program updates..."));
         //synchronous update check is sufficient here:
-        periodicUpdateCheckEval(this, globalCfg.gui.lastUpdateCheck, globalCfg.gui.lastOnlineVersion,
+        periodicUpdateCheckEval(this, globalCfg_.gui.lastUpdateCheck, globalCfg_.gui.lastOnlineVersion,
                                 periodicUpdateCheckRunAsync(periodicUpdateCheckPrepare().get()).get());
     }
 }
@@ -4782,16 +4836,16 @@ void MainDialog::OnRegularUpdateCheck(wxIdleEvent& event)
     //execute just once per startup!
     Disconnect(wxEVT_IDLE, wxIdleEventHandler(MainDialog::OnRegularUpdateCheck), nullptr, this);
 
-    if (shouldRunPeriodicUpdateCheck(globalCfg.gui.lastUpdateCheck))
+    if (shouldRunPeriodicUpdateCheck(globalCfg_.gui.lastUpdateCheck))
     {
         flashStatusInformation(_("Searching for program updates..."));
 
         std::shared_ptr<UpdateCheckResultPrep> resultPrep = periodicUpdateCheckPrepare(); //run on main thread:
 
-        guiQueue.processAsync([resultPrep] { return periodicUpdateCheckRunAsync(resultPrep.get()); }, //run on worker thread: (long-running part of the check)
-                              [this] (std::shared_ptr<UpdateCheckResult>&& resultAsync)
+        guiQueue_.processAsync([resultPrep] { return periodicUpdateCheckRunAsync(resultPrep.get()); }, //run on worker thread: (long-running part of the check)
+                               [this] (std::shared_ptr<UpdateCheckResult>&& resultAsync)
         {
-            periodicUpdateCheckEval(this, globalCfg.gui.lastUpdateCheck, globalCfg.gui.lastOnlineVersion,
+            periodicUpdateCheckEval(this, globalCfg_.gui.lastUpdateCheck, globalCfg_.gui.lastOnlineVersion,
                                     resultAsync.get()); //run on main thread:
         });
     }
@@ -4805,12 +4859,12 @@ void MainDialog::OnLayoutWindowAsync(wxIdleEvent& event)
 
 
     //adjust folder pair distortion on startup
-    for (FolderPairPanel* panel : additionalFolderPairs)
+    for (FolderPairPanel* panel : additionalFolderPairs_)
         panel->Layout();
 
     m_panelTopButtons->Layout();
     Layout(); //strangely this layout call works if called in next idle event only
-    auiMgr.Update(); //fix view filter distortion
+    auiMgr_.Update(); //fix view filter distortion
 }
 
 
@@ -4835,7 +4889,7 @@ void MainDialog::switchProgramLanguage(wxLanguage langId)
     newGlobalCfg.programLanguage = langId;
 
     //show new dialog, then delete old one
-    MainDialog::create(globalConfigFile_, &newGlobalCfg, getConfig(), activeConfigFiles, false);
+    MainDialog::create(globalConfigFile_, &newGlobalCfg, getConfig(), activeConfigFiles_, false);
 
     //we don't use Close():
     //1. we don't want to show the prompt to save current config in OnClose()
@@ -4844,13 +4898,6 @@ void MainDialog::switchProgramLanguage(wxLanguage langId)
 }
 
 
-void MainDialog::OnMenuLanguageSwitch(wxCommandEvent& event)
-{
-    auto it = languageMenuItemMap.find(event.GetId());
-    if (it != languageMenuItemMap.end())
-        switchProgramLanguage(it->second);
-}
-
 //#########################################################################################################
 
 void MainDialog::setViewTypeSyncAction(bool value)
diff --git a/FreeFileSync/Source/ui/main_dlg.h b/FreeFileSync/Source/ui/main_dlg.h
index 983adfdc..fc0e4cd8 100755
--- a/FreeFileSync/Source/ui/main_dlg.h
+++ b/FreeFileSync/Source/ui/main_dlg.h
@@ -20,7 +20,7 @@
 #include "sync_cfg.h"
 #include "tree_view.h"
 #include "folder_history_box.h"
-#include "../lib/process_xml.h"
+//#include "../lib/process_xml.h"
 #include "../algorithm.h"
 
 class FolderPairFirst;
@@ -257,6 +257,7 @@ private:
     void OnSearchPanelKeyPressed(wxKeyEvent& event);
 
     //menu events
+    void onOpenMenuTools(wxMenuEvent& event);
     void OnMenuOptions        (wxCommandEvent& event) override;
     void OnMenuExportFileList (wxCommandEvent& event) override;
     void OnMenuResetLayout    (wxCommandEvent& event) override { resetLayout(); }
@@ -268,79 +269,77 @@ private:
     void OnShowHelp           (wxCommandEvent& event) override;
     void OnMenuQuit           (wxCommandEvent& event) override { Close(); }
 
-    void OnMenuLanguageSwitch(wxCommandEvent& event);
-
     void switchProgramLanguage(wxLanguage langId);
 
-    void clearGrid(ptrdiff_t pos = -1);
+    std::set<wxMenuItem*> detachedMenuItemsLayout_; //owning pointers!!!
+    //alternatives: 1. std::set<unique_ptr<>>? key is const => no support for moving items out! 2. std::map<wxMenuItem*, unique_ptr<>>: redundant info, inconvenient use
 
-    using MenuItemID = int;
-    std::map<MenuItemID, wxLanguage> languageMenuItemMap; //needed to attach menu item events
+    void clearGrid(ptrdiff_t pos = -1);
 
     //***********************************************
     //application variables are stored here:
 
     //global settings shared by GUI and batch mode
-    xmlAccess::XmlGlobalSettings globalCfg;
+    xmlAccess::XmlGlobalSettings globalCfg_;
 
     const Zstring globalConfigFile_;
 
     //-------------------------------------
     //program configuration
-    xmlAccess::XmlGuiConfig currentCfg;
+    xmlAccess::XmlGuiConfig currentCfg_;
 
     //used when saving configuration
-    std::vector<Zstring> activeConfigFiles; //name of currently loaded config file (may be more than 1)
+    std::vector<Zstring> activeConfigFiles_; //name of currently loaded config file (may be more than 1)
 
-    xmlAccess::XmlGuiConfig lastConfigurationSaved; //support for: "Save changed configuration?" dialog
+    xmlAccess::XmlGuiConfig lastConfigurationSaved_; //support for: "Save changed configuration?" dialog
 
     static Zstring getLastRunConfigPath();
     const Zstring lastRunConfigPath_; //let's not use another static...
     //-------------------------------------
 
     //UI view of FolderComparison structure (partially owns folderCmp)
-    std::shared_ptr<zen::GridView> gridDataView; //always bound!
-    std::shared_ptr<zen::TreeView> treeDataView; //
+    std::shared_ptr<zen::GridView> gridDataView_; //always bound!
+    std::shared_ptr<zen::TreeView> treeDataView_; //
 
     //the prime data structure of this tool *bling*:
-    zen::FolderComparison folderCmp; //optional!: sync button not available if empty
+    zen::FolderComparison folderCmp_; //optional!: sync button not available if empty
 
     //folder pairs:
-    std::unique_ptr<FolderPairFirst> firstFolderPair; //always bound!!!
-    std::vector<FolderPairPanel*> additionalFolderPairs; //additional pairs to the first pair
+    std::unique_ptr<FolderPairFirst> firstFolderPair_; //always bound!!!
+    std::vector<FolderPairPanel*> additionalFolderPairs_; //additional pairs to the first pair
     //-------------------------------------
 
     //***********************************************
     //status information
-    std::list<wxString> oldStatusMsgs; //the first one is the original/non-flash status message
+    std::list<wxString> oldStatusMsgs_; //the first one is the original/non-flash status message
 
     //compare status panel (hidden on start, shown when comparing)
-    std::unique_ptr<CompareProgressDialog> compareStatus; //always bound
+    std::unique_ptr<CompareProgressDialog> compareStatus_; //always bound
 
     //toggle to display configuration preview instead of comparison result:
     //for read access use: m_bpButtonViewTypeSyncAction->isActive()
     //when changing value use:
     void setViewTypeSyncAction(bool value);
 
-    wxAuiManager auiMgr; //implement dockable GUI design
+    wxAuiManager auiMgr_; //implement dockable GUI design
 
-    wxString defaultPerspective;
+    wxString defaultPerspective_;
 
-    int64_t manualTimeSpanFrom = 0;
-    int64_t manualTimeSpanTo   = 0; //buffer manual time span selection at session level
+    time_t manualTimeSpanFrom_ = 0;
+    time_t manualTimeSpanTo_   = 0; //buffer manual time span selection at session level
 
-    std::shared_ptr<FolderHistory> folderHistoryLeft  = std::make_shared<FolderHistory>();  //shared by all wxComboBox dropdown controls
-    std::shared_ptr<FolderHistory> folderHistoryRight = std::make_shared<FolderHistory>(); //always bound!
+    std::shared_ptr<FolderHistory> folderHistoryLeft_  = std::make_shared<FolderHistory>();  //shared by all wxComboBox dropdown controls
+    std::shared_ptr<FolderHistory> folderHistoryRight_ = std::make_shared<FolderHistory>(); //always bound!
 
-    zen::AsyncGuiQueue guiQueue; //schedule and run long-running tasks asynchronously, but process results on GUI queue
+    zen::AsyncGuiQueue guiQueue_; //schedule and run long-running tasks asynchronously, but process results on GUI queue
 
-    std::unique_ptr<zen::FilterConfig> filterCfgOnClipboard; //copy/paste of filter config
+    std::unique_ptr<zen::FilterConfig> filterCfgOnClipboard_; //copy/paste of filter config
 
-    wxWindow* focusWindowAfterSearch = nullptr; //used to restore focus after search panel is closed
+    wxWindow* focusWindowAfterSearch_ = nullptr; //used to restore focus after search panel is closed
 
-    bool localKeyEventsEnabled = true;
+    bool localKeyEventsEnabled_ = true;
 
-    zen::TempFileBuffer tempFileBuf; //buffer temporary copies of non-native files for %local_path%
+    zen::TempFileBuffer tempFileBuf_; //buffer temporary copies of non-native files for %local_path%
 };
 
 #endif //MAIN_DLG_H_8910481324545644545
diff --git a/FreeFileSync/Source/ui/progress_indicator.cpp b/FreeFileSync/Source/ui/progress_indicator.cpp
index b389273e..90ee11d7 100755
--- a/FreeFileSync/Source/ui/progress_indicator.cpp
+++ b/FreeFileSync/Source/ui/progress_indicator.cpp
@@ -1230,17 +1230,17 @@ public:
     void notifyProgressChange() override;
     void updateGui           () override { updateGuiInt(true); }
 
-    Zstring getExecWhenFinishedCommand() const override { return pnl.m_comboBoxOnCompletion->getValue(); }
+    Zstring getExecWhenFinishedCommand() const override { return pnl_.m_comboBoxOnCompletion->getValue(); }
 
     void stopTimer() override //halt all internal counters!
     {
         //pnl.m_animCtrlSyncing->Stop();
-        timeElapsed.pause();
+        timeElapsed_.pause();
     }
     void resumeTimer() override
     {
         //pnl.m_animCtrlSyncing->Play();
-        timeElapsed.resume();
+        timeElapsed_.resume();
     }
 
 private:
@@ -1260,30 +1260,30 @@ private:
     void updateDialogStatus();
     void setExternalStatus(const wxString& status, const wxString& progress); //progress may be empty!
 
-    SyncProgressPanelGenerated& pnl; //wxPanel containing the GUI controls of *this
+    SyncProgressPanelGenerated& pnl_; //wxPanel containing the GUI controls of *this
 
     const wxString jobName_;
     const Zstring soundFileSyncComplete_;
-    StopWatch timeElapsed;
+    StopWatch timeElapsed_;
 
     wxFrame* parentFrame_; //optional
 
     std::function<void()> notifyWindowTerminate_; //call once in OnClose(), NOT in destructor which is called far too late somewhere in wxWidgets main loop!
 
-    bool wereDead = false; //set after wxWindow::Delete(), which equals "delete this" on OS X!
+    bool wereDead_ = false; //set after wxWindow::Delete(), which equals "delete this" on OS X!
 
     //status variables
     const Statistics* syncStat_;                  //
     AbortCallback*    abortCb_;                   //valid only while sync is running
     bool paused_ = false; //valid only while sync is running
-    SyncResult finalResult = RESULT_ABORTED; //set after sync
+    SyncResult finalResult_ = RESULT_ABORTED; //set after sync
 
     //remaining time
-    std::unique_ptr<PerfCheck> perf;
-    int64_t timeLastSpeedEstimateMs = -1000000; //used for calculating intervals between collecting perf samples
+    std::unique_ptr<PerfCheck> perf_;
+    int64_t timeLastSpeedEstimateMs_ = -1000000; //used for calculating intervals between collecting perf samples
 
     //help calculate total speed
-    int64_t phaseStartMs = 0; //begin of current phase in [ms]
+    int64_t phaseStartMs_ = 0; //begin of current phase in [ms]
 
     std::shared_ptr<CurveDataStatistics   > curveDataBytes       { std::make_shared<CurveDataStatistics>() };
     std::shared_ptr<CurveDataStatistics   > curveDataItems       { std::make_shared<CurveDataStatistics>() };
@@ -1292,8 +1292,8 @@ private:
     std::shared_ptr<CurveDataRectangleArea> curveDataBytesTotal  { std::make_shared<CurveDataRectangleArea>() };
     std::shared_ptr<CurveDataRectangleArea> curveDataItemsTotal  { std::make_shared<CurveDataRectangleArea>() };
 
-    wxString parentFrameTitleBackup;
-    std::unique_ptr<FfsTrayIcon> trayIcon; //optional: if filled all other windows should be hidden and conversely
+    wxString parentFrameTitleBackup_;
+    std::unique_ptr<FfsTrayIcon> trayIcon_; //optional: if filled all other windows should be hidden and conversely
     std::unique_ptr<Taskbar> taskbar_;
 };
 
@@ -1311,7 +1311,7 @@ SyncProgressDialogImpl<TopLevelDialog>::SyncProgressDialogImpl(long style, //wxF
                                                                const Zstring& onCompletion,
                                                                std::vector<Zstring>& onCompletionHistory) :
     TopLevelDialog(parentFrame, wxID_ANY, wxString(), wxDefaultPosition, wxDefaultSize, style), //title is overwritten anyway in setExternalStatus()
-    pnl(*new SyncProgressPanelGenerated(this)), //ownership passed to "this"
+    pnl_(*new SyncProgressPanelGenerated(this)), //ownership passed to "this"
     jobName_  (jobName),
     soundFileSyncComplete_(soundFileSyncComplete),
     parentFrame_(parentFrame),
@@ -1326,32 +1326,32 @@ SyncProgressDialogImpl<TopLevelDialog>::SyncProgressDialogImpl(long style, //wxF
     //finish construction of this dialog:
     this->SetMinSize(wxSize(470, 280)); //== minimum size! no idea why SetMinSize() is not used...
     wxBoxSizer* bSizer170 = new wxBoxSizer(wxVERTICAL);
-    bSizer170->Add(&pnl, 1, wxEXPAND);
+    bSizer170->Add(&pnl_, 1, wxEXPAND);
     this->SetSizer(bSizer170); //pass ownership
 
     //lifetime of event sources is subset of this instance's lifetime => no wxEvtHandler::Disconnect() needed
     this->Connect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler  (SyncProgressDialogImpl<TopLevelDialog>::OnClose));
     this->Connect(wxEVT_ICONIZE,      wxIconizeEventHandler(SyncProgressDialogImpl<TopLevelDialog>::OnIconize));
     this->Connect(wxEVT_CHAR_HOOK, wxKeyEventHandler(SyncProgressDialogImpl::OnKeyPressed), nullptr, this);
-    pnl.m_buttonClose->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SyncProgressDialogImpl::OnOkay  ), NULL, this);
-    pnl.m_buttonPause->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SyncProgressDialogImpl::OnPause ), NULL, this);
-    pnl.m_buttonStop ->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SyncProgressDialogImpl::OnCancel), NULL, this);
-    pnl.m_bpButtonMinimizeToTray->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SyncProgressDialogImpl::OnMinimizeToTray), NULL, this);
+    pnl_.m_buttonClose->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SyncProgressDialogImpl::OnOkay  ), NULL, this);
+    pnl_.m_buttonPause->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SyncProgressDialogImpl::OnPause ), NULL, this);
+    pnl_.m_buttonStop ->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SyncProgressDialogImpl::OnCancel), NULL, this);
+    pnl_.m_bpButtonMinimizeToTray->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SyncProgressDialogImpl::OnMinimizeToTray), NULL, this);
 
 
-    assert(pnl.m_buttonClose->GetId() == wxID_OK); //we cannot use wxID_CLOSE else Esc key won't work: yet another wxWidgets bug??
+    assert(pnl_.m_buttonClose->GetId() == wxID_OK); //we cannot use wxID_CLOSE else Esc key won't work: yet another wxWidgets bug??
 
-    setRelativeFontSize(*pnl.m_staticTextPhase, 1.5);
+    setRelativeFontSize(*pnl_.m_staticTextPhase, 1.5);
 
     if (parentFrame_)
-        parentFrameTitleBackup = parentFrame_->GetTitle(); //save old title (will be used as progress indicator)
+        parentFrameTitleBackup_ = parentFrame_->GetTitle(); //save old title (will be used as progress indicator)
 
     //pnl.m_animCtrlSyncing->SetAnimation(getResourceAnimation(L"working"));
     //pnl.m_animCtrlSyncing->Play();
 
     this->EnableCloseButton(false); //this is NOT honored on OS X or during system shutdown on Windows!
 
-    timeElapsed.restart(); //measure total time
+    timeElapsed_.restart(); //measure total time
 
     if (wxFrame* frame = getTaskbarFrame(*this))
         try //try to get access to Windows 7/Ubuntu taskbar
@@ -1361,37 +1361,37 @@ SyncProgressDialogImpl<TopLevelDialog>::SyncProgressDialogImpl(long style, //wxF
         catch (const TaskbarNotAvailable&) {}
 
     //hide "processed" statistics until end of process
-    pnl.m_notebookResult     ->Hide();
-    pnl.m_panelItemsProcessed->Hide();
-    pnl.m_buttonClose        ->Show(false);
+    pnl_.m_notebookResult     ->Hide();
+    pnl_.m_panelItemsProcessed->Hide();
+    pnl_.m_buttonClose        ->Show(false);
     //set std order after button visibility was set
-    setStandardButtonLayout(*pnl.bSizerStdButtons, StdButtons().setAffirmative(pnl.m_buttonPause).setCancel(pnl.m_buttonStop));
+    setStandardButtonLayout(*pnl_.bSizerStdButtons, StdButtons().setAffirmative(pnl_.m_buttonPause).setCancel(pnl_.m_buttonStop));
 
-    pnl.m_bpButtonMinimizeToTray->SetBitmapLabel(getResourceImage(L"minimize_to_tray"));
+    pnl_.m_bpButtonMinimizeToTray->SetBitmapLabel(getResourceImage(L"minimize_to_tray"));
 
     //init graph
     const int xLabelHeight = this->GetCharHeight() + 2 * 1 /*border*/; //use same height for both graphs to make sure they stretch evenly
     const int yLabelWidth  = 70;
-    pnl.m_panelGraphBytes->setAttributes(Graph2D::MainAttributes().
-                                         setLabelX(Graph2D::LABEL_X_BOTTOM, xLabelHeight, std::make_shared<LabelFormatterTimeElapsed>(true)).
-                                         setLabelY(Graph2D::LABEL_Y_RIGHT,  yLabelWidth,  std::make_shared<LabelFormatterBytes>()).
-                                         setBackgroundColor(wxColor(208, 208, 208)). //light grey
-                                         setSelectionMode(Graph2D::SELECT_NONE));
+    pnl_.m_panelGraphBytes->setAttributes(Graph2D::MainAttributes().
+                                          setLabelX(Graph2D::LABEL_X_BOTTOM, xLabelHeight, std::make_shared<LabelFormatterTimeElapsed>(true)).
+                                          setLabelY(Graph2D::LABEL_Y_RIGHT,  yLabelWidth,  std::make_shared<LabelFormatterBytes>()).
+                                          setBackgroundColor(wxColor(208, 208, 208)). //light grey
+                                          setSelectionMode(Graph2D::SELECT_NONE));
 
-    pnl.m_panelGraphItems->setAttributes(Graph2D::MainAttributes().
-                                         setLabelX(Graph2D::LABEL_X_BOTTOM, xLabelHeight, std::make_shared<LabelFormatterTimeElapsed>(false)).
-                                         setLabelY(Graph2D::LABEL_Y_RIGHT,  yLabelWidth,  std::make_shared<LabelFormatterItemCount>()).
-                                         setBackgroundColor(wxColor(208, 208, 208)). //light grey
-                                         setSelectionMode(Graph2D::SELECT_NONE));
+    pnl_.m_panelGraphItems->setAttributes(Graph2D::MainAttributes().
+                                          setLabelX(Graph2D::LABEL_X_BOTTOM, xLabelHeight, std::make_shared<LabelFormatterTimeElapsed>(false)).
+                                          setLabelY(Graph2D::LABEL_Y_RIGHT,  yLabelWidth,  std::make_shared<LabelFormatterItemCount>()).
+                                          setBackgroundColor(wxColor(208, 208, 208)). //light grey
+                                          setSelectionMode(Graph2D::SELECT_NONE));
 
-    pnl.m_panelGraphBytes->setCurve(curveDataBytesTotal, Graph2D::CurveAttributes().setLineWidth(1).fillCurveArea(*wxWHITE).setColor(wxColor(192, 192, 192))); //medium grey
-    pnl.m_panelGraphItems->setCurve(curveDataItemsTotal, Graph2D::CurveAttributes().setLineWidth(1).fillCurveArea(*wxWHITE).setColor(wxColor(192, 192, 192))); //medium grey
+    pnl_.m_panelGraphBytes->setCurve(curveDataBytesTotal, Graph2D::CurveAttributes().setLineWidth(1).fillCurveArea(*wxWHITE).setColor(wxColor(192, 192, 192))); //medium grey
+    pnl_.m_panelGraphItems->setCurve(curveDataItemsTotal, Graph2D::CurveAttributes().setLineWidth(1).fillCurveArea(*wxWHITE).setColor(wxColor(192, 192, 192))); //medium grey
 
-    pnl.m_panelGraphBytes->addCurve(curveDataBytesCurrent, Graph2D::CurveAttributes().setLineWidth(1).fillCurveArea(getColorBytesBackground()).setColor(getColorBytesBackgroundRim()));
-    pnl.m_panelGraphItems->addCurve(curveDataItemsCurrent, Graph2D::CurveAttributes().setLineWidth(1).fillCurveArea(getColorItemsBackground()).setColor(getColorItemsBackgroundRim()));
+    pnl_.m_panelGraphBytes->addCurve(curveDataBytesCurrent, Graph2D::CurveAttributes().setLineWidth(1).fillCurveArea(getColorBytesBackground()).setColor(getColorBytesBackgroundRim()));
+    pnl_.m_panelGraphItems->addCurve(curveDataItemsCurrent, Graph2D::CurveAttributes().setLineWidth(1).fillCurveArea(getColorItemsBackground()).setColor(getColorItemsBackgroundRim()));
 
-    pnl.m_panelGraphBytes->addCurve(curveDataBytes, Graph2D::CurveAttributes().setLineWidth(2).fillCurveArea(getColorBytes()).setColor(getColorBytesRim()));
-    pnl.m_panelGraphItems->addCurve(curveDataItems, Graph2D::CurveAttributes().setLineWidth(2).fillCurveArea(getColorItems()).setColor(getColorItemsRim()));
+    pnl_.m_panelGraphBytes->addCurve(curveDataBytes, Graph2D::CurveAttributes().setLineWidth(2).fillCurveArea(getColorBytes()).setColor(getColorBytesRim()));
+    pnl_.m_panelGraphItems->addCurve(curveDataItems, Graph2D::CurveAttributes().setLineWidth(2).fillCurveArea(getColorItems()).setColor(getColorItemsRim()));
 
     //graph legend:
     auto generateSquareBitmap = [&](const wxColor& fillCol, const wxColor& borderCol)
@@ -1405,23 +1405,23 @@ SyncProgressDialogImpl<TopLevelDialog>::SyncProgressDialogImpl(long style, //wxF
         }
         return bmpSquare;
     };
-    pnl.m_bitmapGraphKeyBytes->SetBitmap(generateSquareBitmap(getColorBytes(), getColorBytesRim()));
-    pnl.m_bitmapGraphKeyItems->SetBitmap(generateSquareBitmap(getColorItems(), getColorItemsRim()));
+    pnl_.m_bitmapGraphKeyBytes->SetBitmap(generateSquareBitmap(getColorBytes(), getColorBytesRim()));
+    pnl_.m_bitmapGraphKeyItems->SetBitmap(generateSquareBitmap(getColorItems(), getColorItemsRim()));
 
     //allow changing the "on completion" command
-    pnl.m_comboBoxOnCompletion->setHistory(onCompletionHistory, onCompletionHistory.size()); //-> we won't use addItemHistory() later
-    pnl.m_comboBoxOnCompletion->setValue(onCompletion);
+    pnl_.m_comboBoxOnCompletion->setHistory(onCompletionHistory, onCompletionHistory.size()); //-> we won't use addItemHistory() later
+    pnl_.m_comboBoxOnCompletion->setValue(onCompletion);
 
     updateDialogStatus(); //null-status will be shown while waiting for dir locks
 
     this->GetSizer()->SetSizeHints(this); //~=Fit() + SetMinSize()
-    pnl.Layout();
+    pnl_.Layout();
     this->Center(); //call *after* dialog layout update and *before* wxWindow::Show()!
 
     if (showProgress)
     {
         this->Show();
-        pnl.m_buttonStop->SetFocus(); //don't steal focus when starting in sys-tray!
+        pnl_.m_buttonStop->SetFocus(); //don't steal focus when starting in sys-tray!
 
         //clear gui flicker, remove dummy texts: window must be visible to make this work!
         updateGuiInt(true); //at least on OS X a real Yield() is required to flush pending GUI updates; Update() is not enough
@@ -1436,7 +1436,7 @@ SyncProgressDialogImpl<TopLevelDialog>::~SyncProgressDialogImpl()
 {
     if (parentFrame_)
     {
-        parentFrame_->SetTitle(parentFrameTitleBackup); //restore title text
+        parentFrame_->SetTitle(parentFrameTitleBackup_); //restore title text
 
         //make sure main dialog is shown again if still "minimized to systray"! see SyncProgressDialog::closeWindowDirectly()
         parentFrame_->Show();
@@ -1457,15 +1457,15 @@ void SyncProgressDialogImpl<TopLevelDialog>::OnKeyPressed(wxKeyEvent& event)
         wxCommandEvent dummy(wxEVT_COMMAND_BUTTON_CLICKED);
 
         //simulate click on abort button
-        if (pnl.m_buttonStop->IsShown()) //delegate to "cancel" button if available
+        if (pnl_.m_buttonStop->IsShown()) //delegate to "cancel" button if available
         {
-            if (wxEvtHandler* handler = pnl.m_buttonStop->GetEventHandler())
+            if (wxEvtHandler* handler = pnl_.m_buttonStop->GetEventHandler())
                 handler->ProcessEvent(dummy);
             return;
         }
-        else if (pnl.m_buttonClose->IsShown())
+        else if (pnl_.m_buttonClose->IsShown())
         {
-            if (wxEvtHandler* handler = pnl.m_buttonClose->GetEventHandler())
+            if (wxEvtHandler* handler = pnl_.m_buttonClose->GetEventHandler())
                 handler->ProcessEvent(dummy);
             return;
         }
@@ -1491,10 +1491,10 @@ void SyncProgressDialogImpl<TopLevelDialog>::initNewPhase()
     notifyProgressChange(); //make sure graphs get initial values
 
     //start new measurement
-    perf = std::make_unique<PerfCheck>(WINDOW_REMAINING_TIME_MS, WINDOW_BYTES_PER_SEC);
-    timeLastSpeedEstimateMs = -1000000; //some big number
+    perf_ = std::make_unique<PerfCheck>(WINDOW_REMAINING_TIME_MS, WINDOW_BYTES_PER_SEC);
+    timeLastSpeedEstimateMs_ = -1000000; //some big number
 
-    phaseStartMs = timeElapsed.timeMs();
+    phaseStartMs_ = timeElapsed_.timeMs();
 
     updateGuiInt(false /*allowYield*/);
 }
@@ -1516,8 +1516,8 @@ void SyncProgressDialogImpl<TopLevelDialog>::notifyProgressChange() //noexcept!
                 const int64_t bytesCurrent = syncStat_->getBytesCurrent(syncStat_->currentPhase());
                 const int     itemsCurrent = syncStat_->getItemsCurrent(syncStat_->currentPhase());
 
-                curveDataBytes->addRecord(timeElapsed.timeMs(), bytesCurrent);
-                curveDataItems->addRecord(timeElapsed.timeMs(), itemsCurrent);
+                curveDataBytes->addRecord(timeElapsed_.timeMs(), bytesCurrent);
+                curveDataItems->addRecord(timeElapsed_.timeMs(), itemsCurrent);
             }
             break;
         }
@@ -1543,8 +1543,8 @@ void SyncProgressDialogImpl<TopLevelDialog>::setExternalStatus(const wxString& s
         title += L" - \"" + jobName_ + L"\"";
 
     //systray tooltip, if window is minimized
-    if (trayIcon.get())
-        trayIcon->setToolTip(systrayTooltip);
+    if (trayIcon_.get())
+        trayIcon_->setToolTip(systrayTooltip);
 
     //show text in dialog title (and at the same time in taskbar)
     if (parentFrame_)
@@ -1564,31 +1564,31 @@ void SyncProgressDialogImpl<TopLevelDialog>::updateGuiInt(bool allowYield)
         return;
 
     bool layoutChanged = false; //avoid screen flicker by calling layout() only if necessary
-    const int64_t timeNowMs = timeElapsed.timeMs();
+    const int64_t timeNowMs = timeElapsed_.timeMs();
 
     //sync status text
-    setText(*pnl.m_staticTextStatus, replaceCpy(syncStat_->currentStatusText(), L'\n', L' ')); //no layout update for status texts!
+    setText(*pnl_.m_staticTextStatus, replaceCpy(syncStat_->currentStatusText(), L'\n', L' ')); //no layout update for status texts!
 
     switch (syncStat_->currentPhase()) //no matter if paused or not
     {
         case ProcessCallback::PHASE_NONE:
         case ProcessCallback::PHASE_SCANNING:
             //dialog caption, taskbar, systray tooltip
-            setExternalStatus(getDialogPhaseText(syncStat_, paused_, finalResult), toGuiString(syncStat_->getItemsCurrent(ProcessCallback::PHASE_SCANNING))); //status text may be "paused"!
+            setExternalStatus(getDialogPhaseText(syncStat_, paused_, finalResult_), toGuiString(syncStat_->getItemsCurrent(ProcessCallback::PHASE_SCANNING))); //status text may be "paused"!
 
             //progress indicators
-            if (trayIcon.get()) trayIcon->setProgress(1); //100% = regular FFS logo
+            if (trayIcon_.get()) trayIcon_->setProgress(1); //100% = regular FFS logo
 
             //ignore graphs: should already have been cleared in initNewPhase()
 
             //remaining objects and data
-            setText(*pnl.m_staticTextItemsRemaining, L"-", &layoutChanged);
-            setText(*pnl.m_staticTextBytesRemaining, L"", &layoutChanged);
+            setText(*pnl_.m_staticTextItemsRemaining, L"-", &layoutChanged);
+            setText(*pnl_.m_staticTextBytesRemaining, L"", &layoutChanged);
 
             //remaining time and speed
-            setText(*pnl.m_staticTextTimeRemaining, L"-", &layoutChanged);
-            pnl.m_panelGraphBytes->setAttributes(pnl.m_panelGraphBytes->getAttributes().setCornerText(wxString(), Graph2D::CORNER_TOP_LEFT));
-            pnl.m_panelGraphItems->setAttributes(pnl.m_panelGraphItems->getAttributes().setCornerText(wxString(), Graph2D::CORNER_TOP_LEFT));
+            setText(*pnl_.m_staticTextTimeRemaining, L"-", &layoutChanged);
+            pnl_.m_panelGraphBytes->setAttributes(pnl_.m_panelGraphBytes->getAttributes().setCornerText(wxString(), Graph2D::CORNER_TOP_LEFT));
+            pnl_.m_panelGraphItems->setAttributes(pnl_.m_panelGraphItems->getAttributes().setCornerText(wxString(), Graph2D::CORNER_TOP_LEFT));
             break;
 
         case ProcessCallback::PHASE_COMPARING_CONTENT:
@@ -1604,10 +1604,10 @@ void SyncProgressDialogImpl<TopLevelDialog>::updateGuiInt(bool allowYield)
             //----------------------------------------------------------------------------------------------------
 
             //dialog caption, taskbar, systray tooltip
-            setExternalStatus(getDialogPhaseText(syncStat_, paused_, finalResult), fractionToString(fractionTotal)); //status text may be "paused"!
+            setExternalStatus(getDialogPhaseText(syncStat_, paused_, finalResult_), fractionToString(fractionTotal)); //status text may be "paused"!
 
             //progress indicators
-            if (trayIcon.get()) trayIcon->setProgress(fractionTotal);
+            if (trayIcon_.get()) trayIcon_->setProgress(fractionTotal);
             if (taskbar_.get()) taskbar_->setProgress(fractionTotal);
 
             //constant line graph
@@ -1625,30 +1625,30 @@ void SyncProgressDialogImpl<TopLevelDialog>::updateGuiInt(bool allowYield)
             curveDataItems->addRecord(timeNowMs, itemsCurrent);
 
             //remaining item and byte count
-            setText(*pnl.m_staticTextItemsRemaining, toGuiString(itemsTotal - itemsCurrent), &layoutChanged);
-            setText(*pnl.m_staticTextBytesRemaining, L"(" + filesizeToShortString(bytesTotal - bytesCurrent) + L")", &layoutChanged);
+            setText(*pnl_.m_staticTextItemsRemaining, toGuiString(itemsTotal - itemsCurrent), &layoutChanged);
+            setText(*pnl_.m_staticTextBytesRemaining, L"(" + filesizeToShortString(bytesTotal - bytesCurrent) + L")", &layoutChanged);
             //it's possible data remaining becomes shortly negative if last file synced has ADS data and the bytesTotal was not yet corrected!
 
             //remaining time and speed
-            assert(perf);
-            if (perf)
-                if (numeric::dist(timeLastSpeedEstimateMs, timeNowMs) >= 500)
+            assert(perf_);
+            if (perf_)
+                if (numeric::dist(timeLastSpeedEstimateMs_, timeNowMs) >= 500)
                 {
-                    timeLastSpeedEstimateMs = timeNowMs;
+                    timeLastSpeedEstimateMs_ = timeNowMs;
 
-                    if (numeric::dist(phaseStartMs, timeNowMs) >= 1000) //discard stats for first second: probably messy
-                        perf->addSample(itemsCurrent, bytesCurrent, timeNowMs);
+                    if (numeric::dist(phaseStartMs_, timeNowMs) >= 1000) //discard stats for first second: probably messy
+                        perf_->addSample(itemsCurrent, bytesCurrent, timeNowMs);
 
                     //current speed -> Win 7 copy uses 1 sec update interval instead
-                    Opt<std::wstring> bps = perf->getBytesPerSecond();
-                    Opt<std::wstring> ips = perf->getItemsPerSecond();
-                    pnl.m_panelGraphBytes->setAttributes(pnl.m_panelGraphBytes->getAttributes().setCornerText(bps ? *bps : L"", Graph2D::CORNER_TOP_LEFT));
-                    pnl.m_panelGraphItems->setAttributes(pnl.m_panelGraphItems->getAttributes().setCornerText(ips ? *ips : L"", Graph2D::CORNER_TOP_LEFT));
+                    Opt<std::wstring> bps = perf_->getBytesPerSecond();
+                    Opt<std::wstring> ips = perf_->getItemsPerSecond();
+                    pnl_.m_panelGraphBytes->setAttributes(pnl_.m_panelGraphBytes->getAttributes().setCornerText(bps ? *bps : L"", Graph2D::CORNER_TOP_LEFT));
+                    pnl_.m_panelGraphItems->setAttributes(pnl_.m_panelGraphItems->getAttributes().setCornerText(ips ? *ips : L"", Graph2D::CORNER_TOP_LEFT));
 
                     //remaining time: display with relative error of 10% - based on samples taken every 0.5 sec only
                     //-> call more often than once per second to correctly show last few seconds countdown, but don't call too often to avoid occasional jitter
-                    Opt<double> remTimeSec = perf->getRemainingTimeSec(bytesTotal - bytesCurrent);
-                    setText(*pnl.m_staticTextTimeRemaining, remTimeSec ? remainingTimeToString(*remTimeSec) : L"-", &layoutChanged);
+                    Opt<double> remTimeSec = perf_->getRemainingTimeSec(bytesTotal - bytesCurrent);
+                    setText(*pnl_.m_staticTextTimeRemaining, remTimeSec ? remainingTimeToString(*remTimeSec) : L"-", &layoutChanged);
 
                     //update estimated total time marker with precision of "10% remaining time" only to avoid needless jumping around:
                     const double timeRemainingSec = remTimeSec ? *remTimeSec : 0;
@@ -1664,12 +1664,12 @@ void SyncProgressDialogImpl<TopLevelDialog>::updateGuiInt(bool allowYield)
         }
     }
 
-    pnl.m_panelGraphBytes->Refresh();
-    pnl.m_panelGraphItems->Refresh();
+    pnl_.m_panelGraphBytes->Refresh();
+    pnl_.m_panelGraphItems->Refresh();
 
     //time elapsed
     const int64_t timeElapSec = timeNowMs / 1000;
-    setText(*pnl.m_staticTextTimeElapsed,
+    setText(*pnl_.m_staticTextTimeElapsed,
             timeElapSec < 3600 ?
             wxTimeSpan::Seconds(timeElapSec).Format(   L"%M:%S") :
             wxTimeSpan::Seconds(timeElapSec).Format(L"%H:%M:%S"), &layoutChanged);
@@ -1677,11 +1677,11 @@ void SyncProgressDialogImpl<TopLevelDialog>::updateGuiInt(bool allowYield)
     //adapt layout after content changes above
     if (layoutChanged)
     {
-        pnl.m_panelProgress->Layout();
+        pnl_.m_panelProgress->Layout();
         //small statistics panels:
         //pnl.m_panelItemsProcessed->Layout();
-        pnl.m_panelItemsRemaining->Layout();
-        pnl.m_panelTimeRemaining ->Layout();
+        pnl_.m_panelItemsRemaining->Layout();
+        pnl_.m_panelTimeRemaining ->Layout();
         //pnl.m_panelTimeElapsed->Layout(); -> needed?
     }
 
@@ -1709,7 +1709,7 @@ void SyncProgressDialogImpl<TopLevelDialog>::updateGuiInt(bool allowYield)
                 std::this_thread::sleep_for(std::chrono::milliseconds(UI_UPDATE_INTERVAL_MS));
             }
             //after SyncProgressDialogImpl::OnClose() called wxWindow::Destroy() on OS X this instance is instantly toast!
-            if (wereDead)
+            if (wereDead_)
                 return; //GTFO and don't call this->resumeTimer()
 
             resumeTimer();
@@ -1732,15 +1732,15 @@ void SyncProgressDialogImpl<TopLevelDialog>::updateDialogStatus() //depends on "
 {
     auto setStatusBitmap = [&](const wchar_t* bmpName, const wxString& tooltip)
     {
-        pnl.m_bitmapStatus->SetBitmap(getResourceImage(bmpName));
-        pnl.m_bitmapStatus->SetToolTip(tooltip);
-        pnl.m_bitmapStatus->Show();
+        pnl_.m_bitmapStatus->SetBitmap(getResourceImage(bmpName));
+        pnl_.m_bitmapStatus->SetToolTip(tooltip);
+        pnl_.m_bitmapStatus->Show();
         //pnl.m_animCtrlSyncing->Hide();
     };
 
-    const wxString dlgStatusTxt = getDialogPhaseText(syncStat_, paused_, finalResult);
+    const wxString dlgStatusTxt = getDialogPhaseText(syncStat_, paused_, finalResult_);
 
-    pnl.m_staticTextPhase->SetLabel(dlgStatusTxt);
+    pnl_.m_staticTextPhase->SetLabel(dlgStatusTxt);
 
     //status bitmap
     if (syncStat_) //sync running
@@ -1752,7 +1752,7 @@ void SyncProgressDialogImpl<TopLevelDialog>::updateDialogStatus() //depends on "
             {
                 case ProcessCallback::PHASE_NONE:
                     //pnl.m_animCtrlSyncing->Hide();
-                    pnl.m_bitmapStatus->Hide();
+                    pnl_.m_bitmapStatus->Hide();
                     break;
 
                 case ProcessCallback::PHASE_SCANNING:
@@ -1764,16 +1764,16 @@ void SyncProgressDialogImpl<TopLevelDialog>::updateDialogStatus() //depends on "
                     break;
 
                 case ProcessCallback::PHASE_SYNCHRONIZING:
-                    pnl.m_bitmapStatus->SetBitmap(getResourceImage(L"status_syncing"));
-                    pnl.m_bitmapStatus->SetToolTip(dlgStatusTxt);
-                    pnl.m_bitmapStatus->Show();
+                    pnl_.m_bitmapStatus->SetBitmap(getResourceImage(L"status_syncing"));
+                    pnl_.m_bitmapStatus->SetToolTip(dlgStatusTxt);
+                    pnl_.m_bitmapStatus->Show();
                     //pnl.m_animCtrlSyncing->Show();
                     //pnl.m_animCtrlSyncing->SetToolTip(dlgStatusTxt);
                     break;
             }
     }
     else //sync finished
-        switch (finalResult)
+        switch (finalResult_)
         {
             case RESULT_ABORTED:
                 setStatusBitmap(L"status_aborted", _("Synchronization stopped"));
@@ -1814,7 +1814,7 @@ void SyncProgressDialogImpl<TopLevelDialog>::updateDialogStatus() //depends on "
                 }
         }
         else //sync finished
-            switch (finalResult)
+            switch (finalResult_)
             {
                 case RESULT_ABORTED:
                 case RESULT_FINISHED_WITH_ERROR:
@@ -1830,9 +1830,9 @@ void SyncProgressDialogImpl<TopLevelDialog>::updateDialogStatus() //depends on "
 
     //pause button
     if (syncStat_) //sync running
-        pnl.m_buttonPause->SetLabel(paused_ ? _("&Continue") : _("&Pause"));
+        pnl_.m_buttonPause->SetLabel(paused_ ? _("&Continue") : _("&Pause"));
 
-    pnl.Layout();
+    pnl_.Layout();
     this->Refresh(); //a few pixels below the status text need refreshing
 }
 
@@ -1883,97 +1883,97 @@ void SyncProgressDialogImpl<TopLevelDialog>::processHasFinished(SyncResult resul
             assert(bytesCurrent <= bytesTotal);
 
             //set overall speed (instead of current speed)
-            const int64_t timeDelta = timeElapsed.timeMs() - phaseStartMs; //we need to consider "time within current phase" not total "timeElapsed"!
+            const int64_t timeDelta = timeElapsed_.timeMs() - phaseStartMs_; //we need to consider "time within current phase" not total "timeElapsed"!
 
             const wxString overallBytesPerSecond = timeDelta == 0 ? std::wstring() : filesizeToShortString(bytesCurrent * 1000 / timeDelta) + _("/sec");
             const wxString overallItemsPerSecond = timeDelta == 0 ? std::wstring() : replaceCpy(_("%x items/sec"), L"%x", formatThreeDigitPrecision(itemsCurrent * 1000.0 / timeDelta));
 
-            pnl.m_panelGraphBytes->setAttributes(pnl.m_panelGraphBytes->getAttributes().setCornerText(overallBytesPerSecond, Graph2D::CORNER_TOP_LEFT));
-            pnl.m_panelGraphItems->setAttributes(pnl.m_panelGraphItems->getAttributes().setCornerText(overallItemsPerSecond, Graph2D::CORNER_TOP_LEFT));
+            pnl_.m_panelGraphBytes->setAttributes(pnl_.m_panelGraphBytes->getAttributes().setCornerText(overallBytesPerSecond, Graph2D::CORNER_TOP_LEFT));
+            pnl_.m_panelGraphItems->setAttributes(pnl_.m_panelGraphItems->getAttributes().setCornerText(overallItemsPerSecond, Graph2D::CORNER_TOP_LEFT));
 
             //show new element "items processed"
-            pnl.m_panelItemsProcessed->Show();
-            pnl.m_staticTextItemsProcessed->SetLabel(toGuiString(itemsCurrent));
-            pnl.m_staticTextBytesProcessed->SetLabel(L"(" + filesizeToShortString(bytesCurrent) + L")");
+            pnl_.m_panelItemsProcessed->Show();
+            pnl_.m_staticTextItemsProcessed->SetLabel(toGuiString(itemsCurrent));
+            pnl_.m_staticTextBytesProcessed->SetLabel(L"(" + filesizeToShortString(bytesCurrent) + L")");
 
             //hide remaining elements...
             if (itemsCurrent == itemsTotal && //...if everything was processed successfully
                 bytesCurrent == bytesTotal)
-                pnl.m_panelItemsRemaining->Hide();
+                pnl_.m_panelItemsRemaining->Hide();
         }
         break;
     }
 
     //------- change class state -------
-    finalResult = resultId;
+    finalResult_ = resultId;
 
     syncStat_ = nullptr;
     abortCb_  = nullptr;
     //----------------------------------
 
     updateDialogStatus();
-    setExternalStatus(getDialogPhaseText(syncStat_, paused_, finalResult), wxString());
+    setExternalStatus(getDialogPhaseText(syncStat_, paused_, finalResult_), wxString());
 
     resumeFromSystray(); //if in tray mode...
 
     this->EnableCloseButton(true);
 
-    pnl.m_bpButtonMinimizeToTray->Hide();
-    pnl.m_buttonStop->Disable();
-    pnl.m_buttonStop->Hide();
-    pnl.m_buttonPause->Disable();
-    pnl.m_buttonPause->Hide();
-    pnl.m_buttonClose->Show();
-    pnl.m_buttonClose->Enable();
+    pnl_.m_bpButtonMinimizeToTray->Hide();
+    pnl_.m_buttonStop->Disable();
+    pnl_.m_buttonStop->Hide();
+    pnl_.m_buttonPause->Disable();
+    pnl_.m_buttonPause->Hide();
+    pnl_.m_buttonClose->Show();
+    pnl_.m_buttonClose->Enable();
 
-    pnl.m_buttonClose->SetFocus();
+    pnl_.m_buttonClose->SetFocus();
 
-    pnl.bSizerOnCompletion->Show(false);
+    pnl_.bSizerOnCompletion->Show(false);
 
     //set std order after button visibility was set
-    setStandardButtonLayout(*pnl.bSizerStdButtons, StdButtons().setAffirmative(pnl.m_buttonClose));
+    setStandardButtonLayout(*pnl_.bSizerStdButtons, StdButtons().setAffirmative(pnl_.m_buttonClose));
 
     //hide current operation status
-    pnl.bSizerStatusText->Show(false);
+    pnl_.bSizerStatusText->Show(false);
 
     //show and prepare final statistics
-    pnl.m_notebookResult->Show();
+    pnl_.m_notebookResult->Show();
 
-    pnl.m_staticlineFooter->Hide(); //win: m_notebookResult already has a window frame
+    pnl_.m_staticlineFooter->Hide(); //win: m_notebookResult already has a window frame
 
     //hide remaining time
-    pnl.m_panelTimeRemaining->Hide();
+    pnl_.m_panelTimeRemaining->Hide();
 
     //1. re-arrange graph into results listbook
-    const bool wasDetached = pnl.bSizerRoot->Detach(pnl.m_panelProgress);
+    const bool wasDetached = pnl_.bSizerRoot->Detach(pnl_.m_panelProgress);
     assert(wasDetached);
     (void)wasDetached;
-    pnl.m_panelProgress->Reparent(pnl.m_notebookResult);
-    pnl.m_notebookResult->AddPage(pnl.m_panelProgress, _("Progress"), true);
+    pnl_.m_panelProgress->Reparent(pnl_.m_notebookResult);
+    pnl_.m_notebookResult->AddPage(pnl_.m_panelProgress, _("Progress"), true);
 
     //2. log file
     const size_t posLog = 1;
-    assert(pnl.m_notebookResult->GetPageCount() == 1);
-    LogPanel* logPanel = new LogPanel(pnl.m_notebookResult, log); //owned by m_notebookResult
-    pnl.m_notebookResult->AddPage(logPanel, _("Log"), false);
+    assert(pnl_.m_notebookResult->GetPageCount() == 1);
+    LogPanel* logPanel = new LogPanel(pnl_.m_notebookResult, log); //owned by m_notebookResult
+    pnl_.m_notebookResult->AddPage(logPanel, _("Log"), false);
     //bSizerHoldStretch->Insert(0, logPanel, 1, wxEXPAND);
 
     //show log instead of graph if errors occurred! (not required for ignored warnings)
     if (log.getItemCount(TYPE_ERROR | TYPE_FATAL_ERROR) > 0)
-        pnl.m_notebookResult->ChangeSelection(posLog);
+        pnl_.m_notebookResult->ChangeSelection(posLog);
 
     //GetSizer()->SetSizeHints(this); //~=Fit() //not a good idea: will shrink even if window is maximized or was enlarged by the user
-    pnl.Layout();
+    pnl_.Layout();
 
-    pnl.m_panelProgress->Layout();
+    pnl_.m_panelProgress->Layout();
     //small statistics panels:
-    pnl.m_panelItemsProcessed->Layout();
-    pnl.m_panelItemsRemaining->Layout();
+    pnl_.m_panelItemsProcessed->Layout();
+    pnl_.m_panelItemsRemaining->Layout();
     //pnl.m_panelTimeRemaining->Layout();
     //pnl.m_panelTimeElapsed->Layout(); -> needed?
 
     //play (optional) sound notification after sync has completed -> only play when waiting on results dialog, seems to be pointless otherwise!
-    switch (finalResult)
+    switch (finalResult_)
     {
         case SyncProgressDialog::RESULT_ABORTED:
             break;
@@ -2038,7 +2038,7 @@ void SyncProgressDialogImpl<TopLevelDialog>::OnClose(wxCloseEvent& event)
     syncStat_ = nullptr;
     abortCb_  = nullptr;
 
-    wereDead = true;
+    wereDead_ = true;
     this->Destroy(); //wxWidgets OS X: simple "delete"!!!!!!!
 }
 
@@ -2077,9 +2077,9 @@ void SyncProgressDialogImpl<TopLevelDialog>::OnIconize(wxIconizeEvent& event)
 template <class TopLevelDialog>
 void SyncProgressDialogImpl<TopLevelDialog>::minimizeToTray()
 {
-    if (!trayIcon.get())
+    if (!trayIcon_.get())
     {
-        trayIcon = std::make_unique<FfsTrayIcon>([this] { this->resumeFromSystray(); }); //FfsTrayIcon lifetime is a subset of "this"'s lifetime!
+        trayIcon_ = std::make_unique<FfsTrayIcon>([this] { this->resumeFromSystray(); }); //FfsTrayIcon lifetime is a subset of "this"'s lifetime!
         //we may destroy FfsTrayIcon even while in the FfsTrayIcon callback!!!!
 
         updateGuiInt(false); //set tray tooltip + progress: e.g. no updates while paused
@@ -2094,9 +2094,9 @@ void SyncProgressDialogImpl<TopLevelDialog>::minimizeToTray()
 template <class TopLevelDialog>
 void SyncProgressDialogImpl<TopLevelDialog>::resumeFromSystray()
 {
-    if (trayIcon)
+    if (trayIcon_)
     {
-        trayIcon.reset();
+        trayIcon_.reset();
 
         if (parentFrame_)
         {
diff --git a/FreeFileSync/Source/ui/small_dlgs.cpp b/FreeFileSync/Source/ui/small_dlgs.cpp
index 5e06f286..1f947671 100755
--- a/FreeFileSync/Source/ui/small_dlgs.cpp
+++ b/FreeFileSync/Source/ui/small_dlgs.cpp
@@ -5,7 +5,8 @@
 // *****************************************************************************
 
 #include "small_dlgs.h"
-#include <chrono>
+//#include <chrono>
+#include <zen/time.h>
 #include <zen/format_unit.h>
 #include <zen/build_info.h>
 #include <zen/stl_tools.h>
@@ -726,7 +727,7 @@ ReturnSmallDlg::ButtonPressed zen::showOptionsDlg(wxWindow* parent, xmlAccess::X
 class SelectTimespanDlg : public SelectTimespanDlgGenerated
 {
 public:
-    SelectTimespanDlg(wxWindow* parent, int64_t& timeFrom, int64_t& timeTo);
+    SelectTimespanDlg(wxWindow* parent, time_t& timeFrom, time_t& timeTo);
 
 private:
     void OnOkay  (wxCommandEvent& event) override;
@@ -745,12 +746,12 @@ private:
     }
 
     //output-only parameters:
-    int64_t& timeFromOut;
-    int64_t& timeToOut;
+    time_t& timeFromOut;
+    time_t& timeToOut;
 };
 
 
-SelectTimespanDlg::SelectTimespanDlg(wxWindow* parent, int64_t& timeFrom, int64_t& timeTo) :
+SelectTimespanDlg::SelectTimespanDlg(wxWindow* parent, time_t& timeFrom, time_t& timeTo) :
     SelectTimespanDlgGenerated(parent),
     timeFromOut(timeFrom),
     timeToOut(timeTo)
@@ -765,8 +766,8 @@ SelectTimespanDlg::SelectTimespanDlg(wxWindow* parent, int64_t& timeFrom, int64_
     m_calendarTo  ->SetWindowStyleFlag(style);
 
     //set default values
-    int64_t timeFromTmp = timeFrom;
-    int64_t timeToTmp   = timeTo;
+    time_t timeFromTmp = timeFrom;
+    time_t timeToTmp   = timeTo;
 
     if (timeToTmp == 0)
         timeToTmp = std::time(nullptr); //
@@ -774,8 +775,8 @@ SelectTimespanDlg::SelectTimespanDlg(wxWindow* parent, int64_t& timeFrom, int64_
         timeFromTmp = timeToTmp - 7 * 24 * 3600; //default time span: one week from "now"
 
     //wxDateTime models local(!) time (in contrast to what documentation says), but it has a constructor taking time_t UTC
-    m_calendarFrom->SetDate(static_cast<time_t>(timeFromTmp));
-    m_calendarTo  ->SetDate(static_cast<time_t>(timeToTmp  ));
+    m_calendarFrom->SetDate(timeFromTmp);
+    m_calendarTo  ->SetDate(timeToTmp  );
 
     GetSizer()->SetSizeHints(this); //~=Fit() + SetMinSize()
     //=> works like a charm for GTK2 with window resizing problems and title bar corruption; e.g. Debian!!!
@@ -816,7 +817,7 @@ void SelectTimespanDlg::OnOkay(wxCommandEvent& event)
 }
 
 
-ReturnSmallDlg::ButtonPressed zen::showSelectTimespanDlg(wxWindow* parent, int64_t& timeFrom, int64_t& timeTo)
+ReturnSmallDlg::ButtonPressed zen::showSelectTimespanDlg(wxWindow* parent, time_t& timeFrom, time_t& timeTo)
 {
     SelectTimespanDlg timeSpanDlg(parent, timeFrom, timeTo);
     return static_cast<ReturnSmallDlg::ButtonPressed>(timeSpanDlg.ShowModal());
diff --git a/FreeFileSync/Source/ui/small_dlgs.h b/FreeFileSync/Source/ui/small_dlgs.h
index fea73b4c..c7c3f9c4 100755
--- a/FreeFileSync/Source/ui/small_dlgs.h
+++ b/FreeFileSync/Source/ui/small_dlgs.h
@@ -48,7 +48,7 @@ ReturnSmallDlg::ButtonPressed showSyncConfirmationDlg(wxWindow* parent,
 
 ReturnSmallDlg::ButtonPressed showOptionsDlg(wxWindow* parent, xmlAccess::XmlGlobalSettings& globalSettings);
 
-ReturnSmallDlg::ButtonPressed showSelectTimespanDlg(wxWindow* parent, int64_t& timeFrom, int64_t& timeTo);
+ReturnSmallDlg::ButtonPressed showSelectTimespanDlg(wxWindow* parent, time_t& timeFrom, time_t& timeTo);
 
 
 enum class ReturnActivationDlg
diff --git a/FreeFileSync/Source/version/version.h b/FreeFileSync/Source/version/version.h
index 8a090dce..a32b3e5d 100755
--- a/FreeFileSync/Source/version/version.h
+++ b/FreeFileSync/Source/version/version.h
@@ -3,7 +3,7 @@
 
 namespace zen
 {
-const char ffsVersion[] = "9.1"; //internal linkage!
+const char ffsVersion[] = "9.2"; //internal linkage!
 const char FFS_VERSION_SEPARATOR = '.';
 }
 
diff --git a/wx+/context_menu.h b/wx+/context_menu.h
index bd77100c..41d2bf71 100755
--- a/wx+/context_menu.h
+++ b/wx+/context_menu.h
@@ -28,60 +28,63 @@ namespace zen
 class ContextMenu : private wxEvtHandler
 {
 public:
-    ContextMenu() : menu(std::make_unique<wxMenu>()) {}
+    ContextMenu() {}
 
     void addItem(const wxString& label, const std::function<void()>& command, const wxBitmap* bmp = nullptr, bool enabled = true)
     {
-        wxMenuItem* newItem = new wxMenuItem(menu.get(), wxID_ANY, label); //menu owns item!
+        wxMenuItem* newItem = new wxMenuItem(menu_.get(), wxID_ANY, label); //menu owns item!
         if (bmp) newItem->SetBitmap(*bmp); //do not set AFTER appending item! wxWidgets screws up for yet another crappy reason
-        menu->Append(newItem);
+        menu_->Append(newItem);
         if (!enabled) newItem->Enable(false); //do not enable BEFORE appending item! wxWidgets screws up for yet another crappy reason
-        commandList[newItem->GetId()] = command; //defer event connection, this may be a submenu only!
+        commandList_[newItem->GetId()] = command; //defer event connection, this may be a submenu only!
     }
 
     void addCheckBox(const wxString& label, const std::function<void()>& command, bool checked, bool enabled = true)
     {
-        wxMenuItem* newItem = menu->AppendCheckItem(wxID_ANY, label);
+        wxMenuItem* newItem = menu_->AppendCheckItem(wxID_ANY, label);
         newItem->Check(checked);
         if (!enabled) newItem->Enable(false);
-        commandList[newItem->GetId()] = command;
+        commandList_[newItem->GetId()] = command;
     }
 
     void addRadio(const wxString& label, const std::function<void()>& command, bool selected, bool enabled = true)
     {
-        wxMenuItem* newItem = menu->AppendRadioItem(wxID_ANY, label);
+        wxMenuItem* newItem = menu_->AppendRadioItem(wxID_ANY, label);
         newItem->Check(selected);
         if (!enabled) newItem->Enable(false);
-        commandList[newItem->GetId()] = command;
+        commandList_[newItem->GetId()] = command;
     }
 
-    void addSeparator() { menu->AppendSeparator(); }
+    void addSeparator() { menu_->AppendSeparator(); }
 
     void addSubmenu(const wxString& label, ContextMenu& submenu, const wxBitmap* bmp = nullptr) //invalidates submenu!
     {
         //transfer submenu commands:
-        commandList.insert(submenu.commandList.begin(), submenu.commandList.end());
-        submenu.commandList.clear();
+        commandList_.insert(submenu.commandList_.begin(), submenu.commandList_.end());
+        submenu.commandList_.clear();
 
-        submenu.menu->SetNextHandler(menu.get()); //on wxGTK submenu events are not propagated to their parent menu by default!
+        submenu.menu_->SetNextHandler(menu_.get()); //on wxGTK submenu events are not propagated to their parent menu by default!
 
-        wxMenuItem* newItem = new wxMenuItem(menu.get(), wxID_ANY, label, L"", wxITEM_NORMAL, submenu.menu.release()); //menu owns item, item owns submenu!
+        wxMenuItem* newItem = new wxMenuItem(menu_.get(), wxID_ANY, label, L"", wxITEM_NORMAL, submenu.menu_.release()); //menu owns item, item owns submenu!
         if (bmp) newItem->SetBitmap(*bmp); //do not set AFTER appending item! wxWidgets screws up for yet another crappy reason
-        menu->Append(newItem);
+        menu_->Append(newItem);
     }
 
     void popup(wxWindow& wnd, const wxPoint& pos = wxDefaultPosition) //show popup menu + process lambdas
     {
         //eventually all events from submenu items will be received by this menu
-        for (const auto& item : commandList)
-            menu->Connect(item.first, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(ContextMenu::onSelection), new GenericCommand(item.second) /*pass ownership*/, this);
+        for (const auto& item : commandList_)
+            menu_->Connect(item.first, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(ContextMenu::onSelection), new GenericCommand(item.second) /*pass ownership*/, this);
 
-        wnd.PopupMenu(menu.get(), pos);
+        wnd.PopupMenu(menu_.get(), pos);
         wxTheApp->ProcessPendingEvents(); //make sure lambdas are evaluated before going out of scope;
         //although all events seem to be processed within wxWindows::PopupMenu, we shouldn't trust wxWidgets in this regard
     }
 
 private:
+	ContextMenu           (const ContextMenu&) = delete;
+	ContextMenu& operator=(const ContextMenu&) = delete;
+
     void onSelection(wxCommandEvent& event)
     {
         if (auto cmd = dynamic_cast<GenericCommand*>(event.m_callbackUserData))
@@ -94,8 +97,8 @@ private:
         std::function<void()> fun_;
     };
 
-    std::unique_ptr<wxMenu> menu;
-    std::map<int, std::function<void()>> commandList; //(item id, command)
+	std::unique_ptr<wxMenu> menu_ = std::make_unique<wxMenu>();
+    std::map<int, std::function<void()>> commandList_; //(item id, command)
 };
 }
 
diff --git a/wx+/popup_dlg.cpp b/wx+/popup_dlg.cpp
index 120bf852..5eeebf5e 100755
--- a/wx+/popup_dlg.cpp
+++ b/wx+/popup_dlg.cpp
@@ -76,6 +76,8 @@ public:
         PopupDialogGenerated(parent),
         checkBoxValue_(cfg.checkBoxValue)
     {
+
+
         wxBitmap iconTmp;
         wxString titleTmp;
         switch (type)
@@ -83,7 +85,7 @@ public:
             case DialogInfoType::INFO:
                 //"Information" is meaningless as caption text!
                 //confirmation doesn't use info icon
-                //iconTmp  = getResourceImage(L"msg_info");
+                //iconTmp = getResourceImage(L"msg_info");
                 break;
             case DialogInfoType::WARNING:
                 iconTmp  = getResourceImage(L"msg_warning");
diff --git a/wx+/popup_dlg_generated.cpp b/wx+/popup_dlg_generated.cpp
index a79ffa52..2c2da65c 100755
--- a/wx+/popup_dlg_generated.cpp
+++ b/wx+/popup_dlg_generated.cpp
@@ -11,85 +11,85 @@
 
 PopupDialogGenerated::PopupDialogGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxSize( -1, -1 ), wxDefaultSize );
-    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-
-    wxBoxSizer* bSizer24;
-    bSizer24 = new wxBoxSizer( wxVERTICAL );
-
-    m_panel33 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel33->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-
-    wxBoxSizer* bSizer165;
-    bSizer165 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmapMsgType = new wxStaticBitmap( m_panel33, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer165->Add( m_bitmapMsgType, 0, wxALL, 10 );
-
-    wxBoxSizer* bSizer16;
-    bSizer16 = new wxBoxSizer( wxVERTICAL );
-
-
-    bSizer16->Add( 0, 10, 0, 0, 5 );
-
-    m_staticTextMain = new wxStaticText( m_panel33, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextMain->Wrap( -1 );
-    bSizer16->Add( m_staticTextMain, 0, wxRIGHT, 10 );
-
-
-    bSizer16->Add( 0, 5, 0, 0, 5 );
-
-    m_textCtrlTextDetail = new wxTextCtrl( m_panel33, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxNO_BORDER );
-    bSizer16->Add( m_textCtrlTextDetail, 1, wxEXPAND, 5 );
-
-
-    bSizer165->Add( bSizer16, 1, wxEXPAND, 5 );
-
-
-    m_panel33->SetSizer( bSizer165 );
-    m_panel33->Layout();
-    bSizer165->Fit( m_panel33 );
-    bSizer24->Add( m_panel33, 1, wxEXPAND, 5 );
-
-    m_staticline6 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer24->Add( m_staticline6, 0, wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer25;
-    bSizer25 = new wxBoxSizer( wxVERTICAL );
-
-    m_checkBoxCustom = new wxCheckBox( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer25->Add( m_checkBoxCustom, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
-
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
-
-    m_buttonAffirmative = new wxButton( this, wxID_YES, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizerStdButtons->Add( m_buttonAffirmative, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
-    m_buttonNegative = new wxButton( this, wxID_NO, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizerStdButtons->Add( m_buttonNegative, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 );
-
-    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 );
-
-
-    bSizer25->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
-
-
-    bSizer24->Add( bSizer25, 0, wxEXPAND, 5 );
-
-
-    this->SetSizer( bSizer24 );
-    this->Layout();
-    bSizer24->Fit( this );
-
-    this->Centre( wxBOTH );
-
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( PopupDialogGenerated::OnClose ) );
-    m_checkBoxCustom->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PopupDialogGenerated::OnCheckBoxClick ), NULL, this );
-    m_buttonAffirmative->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PopupDialogGenerated::OnButtonAffirmative ), NULL, this );
-    m_buttonNegative->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PopupDialogGenerated::OnButtonNegative ), NULL, this );
-    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PopupDialogGenerated::OnCancel ), NULL, this );
+	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	
+	wxBoxSizer* bSizer24;
+	bSizer24 = new wxBoxSizer( wxVERTICAL );
+	
+	m_panel33 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel33->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	
+	wxBoxSizer* bSizer165;
+	bSizer165 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapMsgType = new wxStaticBitmap( m_panel33, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer165->Add( m_bitmapMsgType, 0, wxALL, 10 );
+	
+	wxBoxSizer* bSizer16;
+	bSizer16 = new wxBoxSizer( wxVERTICAL );
+	
+	
+	bSizer16->Add( 0, 10, 0, 0, 5 );
+	
+	m_staticTextMain = new wxStaticText( m_panel33, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextMain->Wrap( -1 );
+	bSizer16->Add( m_staticTextMain, 0, wxRIGHT, 10 );
+	
+	
+	bSizer16->Add( 0, 5, 0, 0, 5 );
+	
+	m_textCtrlTextDetail = new wxTextCtrl( m_panel33, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxNO_BORDER );
+	bSizer16->Add( m_textCtrlTextDetail, 1, wxEXPAND, 5 );
+	
+	
+	bSizer165->Add( bSizer16, 1, wxEXPAND, 5 );
+	
+	
+	m_panel33->SetSizer( bSizer165 );
+	m_panel33->Layout();
+	bSizer165->Fit( m_panel33 );
+	bSizer24->Add( m_panel33, 1, wxEXPAND, 5 );
+	
+	m_staticline6 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer24->Add( m_staticline6, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer25;
+	bSizer25 = new wxBoxSizer( wxVERTICAL );
+	
+	m_checkBoxCustom = new wxCheckBox( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer25->Add( m_checkBoxCustom, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+	
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_buttonAffirmative = new wxButton( this, wxID_YES, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizerStdButtons->Add( m_buttonAffirmative, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	m_buttonNegative = new wxButton( this, wxID_NO, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizerStdButtons->Add( m_buttonNegative, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 );
+	
+	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 );
+	
+	
+	bSizer25->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
+	
+	
+	bSizer24->Add( bSizer25, 0, wxEXPAND, 5 );
+	
+	
+	this->SetSizer( bSizer24 );
+	this->Layout();
+	bSizer24->Fit( this );
+	
+	this->Centre( wxBOTH );
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( PopupDialogGenerated::OnClose ) );
+	m_checkBoxCustom->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PopupDialogGenerated::OnCheckBoxClick ), NULL, this );
+	m_buttonAffirmative->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PopupDialogGenerated::OnButtonAffirmative ), NULL, this );
+	m_buttonNegative->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PopupDialogGenerated::OnButtonNegative ), NULL, this );
+	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PopupDialogGenerated::OnCancel ), NULL, this );
 }
 
 PopupDialogGenerated::~PopupDialogGenerated()
diff --git a/wx+/popup_dlg_generated.h b/wx+/popup_dlg_generated.h
index bef871c7..51a045ad 100755
--- a/wx+/popup_dlg_generated.h
+++ b/wx+/popup_dlg_generated.h
@@ -37,35 +37,35 @@
 ///////////////////////////////////////////////////////////////////////////////
 /// Class PopupDialogGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class PopupDialogGenerated : public wxDialog
+class PopupDialogGenerated : public wxDialog 
 {
-private:
-
-protected:
-    wxPanel* m_panel33;
-    wxStaticBitmap* m_bitmapMsgType;
-    wxStaticText* m_staticTextMain;
-    wxTextCtrl* m_textCtrlTextDetail;
-    wxStaticLine* m_staticline6;
-    wxCheckBox* m_checkBoxCustom;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonAffirmative;
-    wxButton* m_buttonNegative;
-    wxButton* m_buttonCancel;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnCheckBoxClick( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnButtonAffirmative( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnButtonNegative( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-
-    PopupDialogGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("dummy"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
-    ~PopupDialogGenerated();
-
+	private:
+	
+	protected:
+		wxPanel* m_panel33;
+		wxStaticBitmap* m_bitmapMsgType;
+		wxStaticText* m_staticTextMain;
+		wxTextCtrl* m_textCtrlTextDetail;
+		wxStaticLine* m_staticline6;
+		wxCheckBox* m_checkBoxCustom;
+		wxBoxSizer* bSizerStdButtons;
+		wxButton* m_buttonAffirmative;
+		wxButton* m_buttonNegative;
+		wxButton* m_buttonCancel;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnCheckBoxClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnButtonAffirmative( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnButtonNegative( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		PopupDialogGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("dummy"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
+		~PopupDialogGenerated();
+	
 };
 
 #endif //__POPUP_DLG_GENERATED_H__
diff --git a/zen/file_access.cpp b/zen/file_access.cpp
index b894645c..7d57045d 100755
--- a/zen/file_access.cpp
+++ b/zen/file_access.cpp
@@ -15,6 +15,7 @@
 #include "file_id_def.h"
 #include "file_io.h"
 #include "crc.h"
+#include "guid.h"
 
     #include <sys/vfs.h> //statfs
     #include <sys/time.h> //lutimes
@@ -315,7 +316,7 @@ void renameFile_sub(const Zstring& pathSource, const Zstring& pathTarget) //thro
     if (!equalFilePath(pathSource, pathTarget)) //exception for OS X: changing file name case is not an "already exists" situation!
     {
         bool alreadyExists = true;
-        try {  /*ItemType type = */getItemType(pathTarget); } /*throw FileError*/ catch (FileError&) { alreadyExists = false; }
+        try { /*ItemType type = */getItemType(pathTarget); } /*throw FileError*/ catch (FileError&) { alreadyExists = false; }
 
         if (alreadyExists)
             throwException(EEXIST);
@@ -408,7 +409,7 @@ void setWriteTimeNative(const Zstring& itemPath, const struct ::timespec& modTim
 }
 
 
-void zen::setFileTime(const Zstring& filePath, int64_t modTime, ProcSymlink procSl) //throw FileError
+void zen::setFileTime(const Zstring& filePath, time_t modTime, ProcSymlink procSl) //throw FileError
 {
     struct ::timespec writeTime = {};
     writeTime.tv_sec = modTime;
@@ -470,10 +471,11 @@ void copySecurityContext(const Zstring& source, const Zstring& target, ProcSymli
         THROW_LAST_FILE_ERROR(replaceCpy(_("Cannot write security context of %x."), L"%x", fmtPath(target)), L"setfilecon");
 }
 #endif
+}
 
 
 //copy permissions for files, directories or symbolic links: requires admin rights
-void copyItemPermissions(const Zstring& sourcePath, const Zstring& targetPath, ProcSymlink procSl) //throw FileError
+void zen::copyItemPermissions(const Zstring& sourcePath, const Zstring& targetPath, ProcSymlink procSl) //throw FileError
 {
 
 #ifdef HAVE_SELINUX  //copy SELinux security context
@@ -507,6 +509,24 @@ void copyItemPermissions(const Zstring& sourcePath, const Zstring& targetPath, P
     }
 
 }
+
+
+void zen::createDirectory(const Zstring& dirPath) //throw FileError, ErrorTargetExisting
+{
+    const mode_t mode = S_IRWXU | S_IRWXG | S_IRWXO; //0777, default for newly created directories
+
+	if (::mkdir(dirPath.c_str(), mode) != 0)
+    {
+        const int lastError = errno; //copy before directly or indirectly making other system calls!
+        const std::wstring errorMsg = replaceCpy(_("Cannot create directory %x."), L"%x", fmtPath(dirPath));
+        const std::wstring errorDescr = formatSystemError(L"mkdir", lastError);
+
+        if (lastError == EEXIST)
+            throw ErrorTargetExisting(errorMsg, errorDescr);
+        //else if (lastError == ENOENT)
+        //    throw ErrorTargetPathMissing(errorMsg, errorDescr);
+        throw FileError(errorMsg, errorDescr);
+    }
 }
 
 
@@ -517,7 +537,7 @@ void zen::createDirectoryIfMissingRecursion(const Zstring& dirPath) //throw File
 
     try
     {
-        copyNewDirectory(Zstring(), dirPath, false /*copyFilePermissions*/); //throw FileError, ErrorTargetExisting
+		createDirectory(dirPath); //throw FileError, ErrorTargetExisting
     }
     catch (FileError&)
     {
@@ -525,13 +545,15 @@ void zen::createDirectoryIfMissingRecursion(const Zstring& dirPath) //throw File
         try { pd = getPathStatus(dirPath); /*throw FileError*/ }
         catch (FileError&) {} //previous exception is more relevant
 
-        if (pd && pd->existingType != ItemType::FILE)
+        if (pd &&
+            pd->existingType != ItemType::FILE &&
+            pd->relPath.size() != 1) //don't repeat the very same createDirectory() call from above!
         {
             Zstring intermediatePath = pd->existingPath;
             for (const Zstring& itemName : pd->relPath)
             {
                 intermediatePath = appendSeparator(intermediatePath) + itemName;
-                copyNewDirectory(Zstring(), intermediatePath, false /*copyFilePermissions*/); //throw FileError, (ErrorTargetExisting)
+                createDirectory(intermediatePath); //throw FileError, (ErrorTargetExisting)
             }
             return;
         }
@@ -540,44 +562,8 @@ void zen::createDirectoryIfMissingRecursion(const Zstring& dirPath) //throw File
 }
 
 
-//source path is optional (may be empty)
-void zen::copyNewDirectory(const Zstring& sourcePath, const Zstring& targetPath, //throw FileError, ErrorTargetExisting
-                           bool copyFilePermissions)
+void zen::tryCopyDirectoryAttributes(const Zstring& sourcePath, const Zstring& targetPath) //throw FileError
 {
-    mode_t mode = S_IRWXU | S_IRWXG | S_IRWXO; //0777, default for newly created directories
-
-    struct ::stat dirInfo = {};
-    if (!sourcePath.empty())
-        if (::stat(sourcePath.c_str(), &dirInfo) == 0)
-        {
-            mode = dirInfo.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO); //analog to "cp" which copies "mode" (considering umask) by default
-            mode |= S_IRWXU; //FFS only: we need full access to copy child items! "cp" seems to apply permissions *after* copying child items
-        }
-    //=> need copyItemPermissions() only for "chown" and umask-agnostic permissions
-
-    if (::mkdir(targetPath.c_str(), mode) != 0)
-    {
-        const int lastError = errno; //copy before directly or indirectly making other system calls!
-        const std::wstring errorMsg = replaceCpy(_("Cannot create directory %x."), L"%x", fmtPath(targetPath));
-        const std::wstring errorDescr = formatSystemError(L"mkdir", lastError);
-
-        if (lastError == EEXIST)
-            throw ErrorTargetExisting(errorMsg, errorDescr);
-        //else if (lastError == ENOENT)
-        //    throw ErrorTargetPathMissing(errorMsg, errorDescr);
-        throw FileError(errorMsg, errorDescr);
-    }
-
-    if (!sourcePath.empty())
-    {
-
-        ZEN_ON_SCOPE_FAIL(try { removeDirectoryPlain(targetPath); }
-        catch (FileError&) {});   //ensure cleanup:
-
-        //enforce copying file permissions: it's advertized on GUI...
-        if (copyFilePermissions)
-            copyItemPermissions(sourcePath, targetPath, ProcSymlink::FOLLOW); //throw FileError
-    }
 }
 
 
diff --git a/zen/file_access.h b/zen/file_access.h
index a06e5b17..0a9b2d0c 100755
--- a/zen/file_access.h
+++ b/zen/file_access.h
@@ -56,7 +56,7 @@ enum class ProcSymlink
     DIRECT,
     FOLLOW
 };
-void setFileTime(const Zstring& filePath, int64_t modTime, ProcSymlink procSl); //throw FileError
+void setFileTime(const Zstring& filePath, time_t modTime, ProcSymlink procSl); //throw FileError
 
 //symlink handling: always evaluate target
 uint64_t getFileSize(const Zstring& filePath); //throw FileError
@@ -73,22 +73,27 @@ void removeDirectoryPlainRecursion(const Zstring& dirPath); //throw FileError; E
 //rename file or directory: no copying!!!
 void renameFile(const Zstring& itemPathOld, const Zstring& itemPathNew); //throw FileError, ErrorDifferentVolume, ErrorTargetExisting
 
-bool supportsPermissions(const Zstring& dirPath); //throw FileError, dereferences symlinks
+bool supportsPermissions(const Zstring& dirPath); //throw FileError, follows symlinks
+//copy permissions for files, directories or symbolic links: requires admin rights
+void copyItemPermissions(const Zstring& sourcePath, const Zstring& targetPath, ProcSymlink procSl); //throw FileError
+
+void createDirectory(const Zstring& dirPath); //throw FileError, ErrorTargetExisting
 
 //- no error if already existing
 //- create recursively if parent directory is not existing
 void createDirectoryIfMissingRecursion(const Zstring& dirPath); //throw FileError
 
-//fail if already existing or parent directory not existing:
-//source path is optional (may be empty)
-void copyNewDirectory(const Zstring& sourcePath, const Zstring& targetPath, bool copyFilePermissions); //throw FileError, ErrorTargetExisting
+//symlink handling: follow link!
+//expects existing source/target directories
+//reports note-worthy errors only
+void tryCopyDirectoryAttributes(const Zstring& sourcePath, const Zstring& targetPath); //throw FileError
 
 void copySymlink(const Zstring& sourceLink, const Zstring& targetLink, bool copyFilePermissions); //throw FileError
 
 struct FileCopyResult
 {
     uint64_t fileSize = 0;
-    int64_t modTime = 0; //time_t-compatible (UTC)
+    time_t modTime = 0; //number of seconds since Jan. 1st 1970 UTC
     FileId sourceFileId;
     FileId targetFileId;
     Opt<FileError> errorModTime; //failure to set modification time
diff --git a/zen/file_traverser.h b/zen/file_traverser.h
index e2085698..1f7142de 100755
--- a/zen/file_traverser.h
+++ b/zen/file_traverser.h
@@ -19,7 +19,7 @@ struct FileInfo
     Zstring itemName;
     Zstring fullPath;
     uint64_t fileSize;     //[bytes]
-    int64_t modTime; //number of seconds since Jan. 1st 1970 UTC
+    time_t modTime; //number of seconds since Jan. 1st 1970 UTC
 };
 
 struct FolderInfo
@@ -32,7 +32,7 @@ struct SymlinkInfo
 {
     Zstring itemName;
     Zstring fullPath;
-    int64_t modTime; //number of seconds since Jan. 1st 1970 UTC
+    time_t modTime; //number of seconds since Jan. 1st 1970 UTC
 };
 
 //- non-recursive
diff --git a/zen/guid.h b/zen/guid.h
index d88578a6..b34c3cbf 100755
--- a/zen/guid.h
+++ b/zen/guid.h
@@ -20,9 +20,11 @@ namespace zen
 inline
 std::string generateGUID() //creates a 16-byte GUID
 {
-    boost::uuids::uuid nativeRep = boost::uuids::random_generator()();
-    //generator is only thread-safe like an int, so we keep it local until we need to optimize perf
-    //perf: generator: 0.22ms per call; retrieve GUID: 0.12µs per call
+    //perf: generator:		0.38ms per creation;
+	//		retrieve GUID:	0.13µs per call
+    //generator is only thread-safe like an int => keep thread-local
+    thread_local boost::uuids::random_generator gen;
+	const boost::uuids::uuid nativeRep = gen();
     return std::string(nativeRep.begin(), nativeRep.end());
 }
 }