Merge branch '11.12' into 'master'

add upstream 11.12

See merge request opensource-tracking/FreeFileSync!35

36 files changed, 4929 insertions, 5090 deletions

diff --git a/Changelog.txt b/Changelog.txt
index 9102f8a4..75a491f5 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,3 +1,15 @@
+FreeFileSync 11.12
+------------------
+Native ARM64 build to support Apple silicon M1 (macOS)
+Non-intrusive mouse highlight on file grid
+Fixed /lib/i386-linux-gnu/libgcc_s.so.1: version `GCC_7.0.0' not found
+Parse file times with no limits on time span (e.g. year 0, year 3000)
+Show folder icon during drag and drop (Windows)
+Show user name for (S)FTP display paths
+Fixed FTP connection lost error with TLS 1.3
+Present file sizes in powers of 1000 bytes (Linux, macOS)
+
+
 FreeFileSync 11.11 [2021-06-11]
 -------------------------------
 Fixed Shared Drive synchronization with Google Drive
diff --git a/FreeFileSync/Build/Resources/Icons.zip b/FreeFileSync/Build/Resources/Icons.zip
index a0acf0c7..01de02e0 100644
--- a/FreeFileSync/Build/Resources/Icons.zip
+++ b/FreeFileSync/Build/Resources/Icons.zip
diff --git a/FreeFileSync/Build/Resources/Languages.zip b/FreeFileSync/Build/Resources/Languages.zip
index e120e1f2..a1f78f7b 100644
--- a/FreeFileSync/Build/Resources/Languages.zip
+++ b/FreeFileSync/Build/Resources/Languages.zip
diff --git a/FreeFileSync/Build/Resources/cacert.pem b/FreeFileSync/Build/Resources/cacert.pem
index 264923b3..fdb454dc 100644
--- a/FreeFileSync/Build/Resources/cacert.pem
+++ b/FreeFileSync/Build/Resources/cacert.pem
@@ -1,7 +1,7 @@
 ##
 ## Bundle of CA Root Certificates
 ##
-## Certificate data from Mozilla as of: Tue May 25 03:12:05 2021 GMT
+## Certificate data from Mozilla as of: Mon Jul  5 21:35:54 2021 GMT
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates
@@ -14,7 +14,7 @@
 ## Just configure this file as the SSLCACertificateFile.
 ##
 ## Conversion done with mk-ca-bundle.pl version 1.28.
-## SHA256: e292bd4e2d500c86df45b830d89417be5c42ee670408f1d2c454c63d8a782865
+## SHA256: c8f6733d1ff4e6a4769c182971a1234f95ae079247a9c439a13423fe8ba5c24f
 ##
 
 
@@ -156,38 +156,6 @@ Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2G9w84FoVxp7Z
 12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
 -----END CERTIFICATE-----
 
-QuoVadis Root CA
-================
------BEGIN CERTIFICATE-----
-MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJCTTEZMBcGA1UE
-ChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
-eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAz
-MTkxODMzMzNaFw0yMTAzMTcxODMzMzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRp
-cyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQD
-EyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Ypli4kVEAkOPcahdxYTMuk
-J0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2DrOpm2RgbaIr1VxqYuvXtdj182d6UajtL
-F8HVj71lODqV0D1VNk7feVcxKh7YWWVJWCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeL
-YzcS19Dsw3sgQUSj7cugF+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWen
-AScOospUxbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCCAk4w
-PQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVvdmFkaXNvZmZzaG9y
-ZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREwggENMIIBCQYJKwYBBAG+WAABMIH7
-MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNlIG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmlj
-YXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJs
-ZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
-Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYIKwYBBQUHAgEW
-Fmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3TKbkGGew5Oanwl4Rqy+/fMIGu
-BgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rqy+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkw
-FwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5MS4wLAYDVQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6
-tlCLMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSkfnIYj9lo
-fFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf87C9TqnN7Az10buYWnuul
-LsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1RcHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2x
-gI4JVrmcGmD+XcHXetwReNDWXcG31a0ymQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi
-5upZIof4l/UO/erMkqQWxFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi
-5nrQNiOKSnQ2+Q==
------END CERTIFICATE-----
-
 QuoVadis Root CA 2
 ==================
 -----BEGIN CERTIFICATE-----
@@ -275,26 +243,6 @@ s58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJUJRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ
 FL39vmwLAw==
 -----END CERTIFICATE-----
 
-Sonera Class 2 Root CA
-======================
------BEGIN CERTIFICATE-----
-MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEPMA0GA1UEChMG
-U29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAxMDQwNjA3Mjk0MFoXDTIxMDQw
-NjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJh
-IENsYXNzMiBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3
-/Ei9vX+ALTU74W+oZ6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybT
-dXnt5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s3TmVToMG
-f+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2EjvOr7nQKV0ba5cTppCD8P
-tOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu8nYybieDwnPz3BjotJPqdURrBGAgcVeH
-nfO+oJAjPYok4doh28MCAwEAAaMzMDEwDwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITT
-XjwwCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt
-0jSv9zilzqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/3DEI
-cbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvDFNr450kkkdAdavph
-Oe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6Tk6ezAyNlNzZRZxe7EJQY670XcSx
-EtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLH
-llpwrN9M
------END CERTIFICATE-----
-
 XRamp Global CA Root
 ====================
 -----BEGIN CERTIFICATE-----
@@ -1194,27 +1142,6 @@ OR/qnuOf0GZvBeyqdn6/axag67XH/JJULysRJyU3eExRarDzzFhdFPFqSBX/wge2sY0PjlxQRrM9
 vwGYT7JZVEc+NHt4bVaTLnPqZih4zR0Uv6CPLy64Lo7yFIrM6bV8+2ydDKXhlg==
 -----END CERTIFICATE-----
 
-Trustis FPS Root CA
-===================
------BEGIN CERTIFICATE-----
-MIIDZzCCAk+gAwIBAgIQGx+ttiD5JNM2a/fH8YygWTANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQG
-EwJHQjEYMBYGA1UEChMPVHJ1c3RpcyBMaW1pdGVkMRwwGgYDVQQLExNUcnVzdGlzIEZQUyBSb290
-IENBMB4XDTAzMTIyMzEyMTQwNloXDTI0MDEyMTExMzY1NFowRTELMAkGA1UEBhMCR0IxGDAWBgNV
-BAoTD1RydXN0aXMgTGltaXRlZDEcMBoGA1UECxMTVHJ1c3RpcyBGUFMgUm9vdCBDQTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMVQe547NdDfxIzNjpvto8A2mfRC6qc+gIMPpqdZh8mQ
-RUN+AOqGeSoDvT03mYlmt+WKVoaTnGhLaASMk5MCPjDSNzoiYYkchU59j9WvezX2fihHiTHcDnlk
-H5nSW7r+f2C/revnPDgpai/lkQtV/+xvWNUtyd5MZnGPDNcE2gfmHhjjvSkCqPoc4Vu5g6hBSLwa
-cY3nYuUtsuvffM/bq1rKMfFMIvMFE/eC+XN5DL7XSxzA0RU8k0Fk0ea+IxciAIleH2ulrG6nS4zt
-o3Lmr2NNL4XSFDWaLk6M6jKYKIahkQlBOrTh4/L68MkKokHdqeMDx4gVOxzUGpTXn2RZEm0CAwEA
-AaNTMFEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBS6+nEleYtXQSUhhgtx67JkDoshZzAd
-BgNVHQ4EFgQUuvpxJXmLV0ElIYYLceuyZA6LIWcwDQYJKoZIhvcNAQEFBQADggEBAH5Y//01GX2c
-GE+esCu8jowU/yyg2kdbw++BLa8F6nRIW/M+TgfHbcWzk88iNVy2P3UnXwmWzaD+vkAMXBJV+JOC
-yinpXj9WV4s4NvdFGkwozZ5BuO1WTISkQMi4sKUraXAEasP41BIy+Q7DsdwyhEQsb8tGD+pmQQ9P
-8Vilpg0ND2HepZ5dfWWhPBfnqFVO76DH7cZEf1T1o+CP8HxVIo8ptoGj4W1OLBuAZ+ytIJ8MYmHV
-l/9D7S3B2l0pKoU/rGXuhg8FjZBf3+6f9L/uHfuY5H+QK4R4EA5sSVPvFVtlRkpdr7r7OnIdzfYl
-iB6XzCGcKQENZetX2fNXlrtIzYE=
------END CERTIFICATE-----
-
 Buypass Class 2 Root CA
 =======================
 -----BEGIN CERTIFICATE-----
@@ -3136,3 +3063,112 @@ gLWi5h+xEk8blTAKBggqhkjOPQQDAwNoADBlAjEA31SQ7Zvvi5QCkxeCmb6zniz2C5GMn0oUsfZk
 vLtoURMMA/cVi4RguYv/Uo7njLwcAjA8+RHUjE7AwWHCFUyqqx0LMV87HOIAl0Qx5v5zli/altP+
 CAezNIm8BZ/3Hobui3A=
 -----END CERTIFICATE-----
+
+GLOBALTRUST 2020
+================
+-----BEGIN CERTIFICATE-----
+MIIFgjCCA2qgAwIBAgILWku9WvtPilv6ZeUwDQYJKoZIhvcNAQELBQAwTTELMAkGA1UEBhMCQVQx
+IzAhBgNVBAoTGmUtY29tbWVyY2UgbW9uaXRvcmluZyBHbWJIMRkwFwYDVQQDExBHTE9CQUxUUlVT
+VCAyMDIwMB4XDTIwMDIxMDAwMDAwMFoXDTQwMDYxMDAwMDAwMFowTTELMAkGA1UEBhMCQVQxIzAh
+BgNVBAoTGmUtY29tbWVyY2UgbW9uaXRvcmluZyBHbWJIMRkwFwYDVQQDExBHTE9CQUxUUlVTVCAy
+MDIwMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAri5WrRsc7/aVj6B3GyvTY4+ETUWi
+D59bRatZe1E0+eyLinjF3WuvvcTfk0Uev5E4C64OFudBc/jbu9G4UeDLgztzOG53ig9ZYybNpyrO
+VPu44sB8R85gfD+yc/LAGbaKkoc1DZAoouQVBGM+uq/ufF7MpotQsjj3QWPKzv9pj2gOlTblzLmM
+CcpL3TGQlsjMH/1WljTbjhzqLL6FLmPdqqmV0/0plRPwyJiT2S0WR5ARg6I6IqIoV6Lr/sCMKKCm
+fecqQjuCgGOlYx8ZzHyyZqjC0203b+J+BlHZRYQfEs4kUmSFC0iAToexIiIwquuuvuAC4EDosEKA
+A1GqtH6qRNdDYfOiaxaJSaSjpCuKAsR49GiKweR6NrFvG5Ybd0mN1MkGco/PU+PcF4UgStyYJ9OR
+JitHHmkHr96i5OTUawuzXnzUJIBHKWk7buis/UDr2O1xcSvy6Fgd60GXIsUf1DnQJ4+H4xj04KlG
+DfV0OoIu0G4skaMxXDtG6nsEEFZegB31pWXogvziB4xiRfUg3kZwhqG8k9MedKZssCz3AwyIDMvU
+clOGvGBG85hqwvG/Q/lwIHfKN0F5VVJjjVsSn8VoxIidrPIwq7ejMZdnrY8XD2zHc+0klGvIg5rQ
+mjdJBKuxFshsSUktq6HQjJLyQUp5ISXbY9e2nKd+Qmn7OmMCAwEAAaNjMGEwDwYDVR0TAQH/BAUw
+AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFNwuH9FhN3nkq9XVsxJxaD1qaJwiMB8GA1Ud
+IwQYMBaAFNwuH9FhN3nkq9XVsxJxaD1qaJwiMA0GCSqGSIb3DQEBCwUAA4ICAQCR8EICaEDuw2jA
+VC/f7GLDw56KoDEoqoOOpFaWEhCGVrqXctJUMHytGdUdaG/7FELYjQ7ztdGl4wJCXtzoRlgHNQIw
+4Lx0SsFDKv/bGtCwr2zD/cuz9X9tAy5ZVp0tLTWMstZDFyySCstd6IwPS3BD0IL/qMy/pJTAvoe9
+iuOTe8aPmxadJ2W8esVCgmxcB9CpwYhgROmYhRZf+I/KARDOJcP5YBugxZfD0yyIMaK9MOzQ0MAS
+8cE54+X1+NZK3TTN+2/BT+MAi1bikvcoskJ3ciNnxz8RFbLEAwW+uxF7Cr+obuf/WEPPm2eggAe2
+HcqtbepBEX4tdJP7wry+UUTF72glJ4DjyKDUEuzZpTcdN3y0kcra1LGWge9oXHYQSa9+pTeAsRxS
+vTOBTI/53WXZFM2KJVj04sWDpQmQ1GwUY7VA3+vA/MRYfg0UFodUJ25W5HCEuGwyEn6CMUO+1918
+oa2u1qsgEu8KwxCMSZY13At1XrFP1U80DhEgB3VDRemjEdqso5nCtnkn4rnvyOL2NSl6dPrFf4IF
+YqYK6miyeUcGbvJXqBUzxvd4Sj1Ce2t+/vdG6tHrju+IaFvowdlxfv1k7/9nR4hYJS8+hge9+6jl
+gqispdNpQ80xiEmEU5LAsTkbOYMBMMTyqfrQA71yN2BWHzZ8vTmR9W0Nv3vXkg==
+-----END CERTIFICATE-----
+
+ANF Secure Server Root CA
+=========================
+-----BEGIN CERTIFICATE-----
+MIIF7zCCA9egAwIBAgIIDdPjvGz5a7EwDQYJKoZIhvcNAQELBQAwgYQxEjAQBgNVBAUTCUc2MzI4
+NzUxMDELMAkGA1UEBhMCRVMxJzAlBgNVBAoTHkFORiBBdXRvcmlkYWQgZGUgQ2VydGlmaWNhY2lv
+bjEUMBIGA1UECxMLQU5GIENBIFJhaXoxIjAgBgNVBAMTGUFORiBTZWN1cmUgU2VydmVyIFJvb3Qg
+Q0EwHhcNMTkwOTA0MTAwMDM4WhcNMzkwODMwMTAwMDM4WjCBhDESMBAGA1UEBRMJRzYzMjg3NTEw
+MQswCQYDVQQGEwJFUzEnMCUGA1UEChMeQU5GIEF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uMRQw
+EgYDVQQLEwtBTkYgQ0EgUmFpejEiMCAGA1UEAxMZQU5GIFNlY3VyZSBTZXJ2ZXIgUm9vdCBDQTCC
+AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANvrayvmZFSVgpCjcqQZAZ2cC4Ffc0m6p6zz
+BE57lgvsEeBbphzOG9INgxwruJ4dfkUyYA8H6XdYfp9qyGFOtibBTI3/TO80sh9l2Ll49a2pcbnv
+T1gdpd50IJeh7WhM3pIXS7yr/2WanvtH2Vdy8wmhrnZEE26cLUQ5vPnHO6RYPUG9tMJJo8gN0pcv
+B2VSAKduyK9o7PQUlrZXH1bDOZ8rbeTzPvY1ZNoMHKGESy9LS+IsJJ1tk0DrtSOOMspvRdOoiXse
+zx76W0OLzc2oD2rKDF65nkeP8Nm2CgtYZRczuSPkdxl9y0oukntPLxB3sY0vaJxizOBQ+OyRp1RM
+VwnVdmPF6GUe7m1qzwmd+nxPrWAI/VaZDxUse6mAq4xhj0oHdkLePfTdsiQzW7i1o0TJrH93PB0j
+7IKppuLIBkwC/qxcmZkLLxCKpvR/1Yd0DVlJRfbwcVw5Kda/SiOL9V8BY9KHcyi1Swr1+KuCLH5z
+JTIdC2MKF4EA/7Z2Xue0sUDKIbvVgFHlSFJnLNJhiQcND85Cd8BEc5xEUKDbEAotlRyBr+Qc5RQe
+8TZBAQIvfXOn3kLMTOmJDVb3n5HUA8ZsyY/b2BzgQJhdZpmYgG4t/wHFzstGH6wCxkPmrqKEPMVO
+Hj1tyRRM4y5Bu8o5vzY8KhmqQYdOpc5LMnndkEl/AgMBAAGjYzBhMB8GA1UdIwQYMBaAFJxf0Gxj
+o1+TypOYCK2Mh6UsXME3MB0GA1UdDgQWBBScX9BsY6Nfk8qTmAitjIelLFzBNzAOBgNVHQ8BAf8E
+BAMCAYYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEATh65isagmD9uw2nAalxJ
+UqzLK114OMHVVISfk/CHGT0sZonrDUL8zPB1hT+L9IBdeeUXZ701guLyPI59WzbLWoAAKfLOKyzx
+j6ptBZNscsdW699QIyjlRRA96Gejrw5VD5AJYu9LWaL2U/HANeQvwSS9eS9OICI7/RogsKQOLHDt
+dD+4E5UGUcjohybKpFtqFiGS3XNgnhAY3jyB6ugYw3yJ8otQPr0R4hUDqDZ9MwFsSBXXiJCZBMXM
+5gf0vPSQ7RPi6ovDj6MzD8EpTBNO2hVWcXNyglD2mjN8orGoGjR0ZVzO0eurU+AagNjqOknkJjCb
+5RyKqKkVMoaZkgoQI1YS4PbOTOK7vtuNknMBZi9iPrJyJ0U27U1W45eZ/zo1PqVUSlJZS2Db7v54
+EX9K3BR5YLZrZAPbFYPhor72I5dQ8AkzNqdxliXzuUJ92zg/LFis6ELhDtjTO0wugumDLmsx2d1H
+hk9tl5EuT+IocTUW0fJz/iUrB0ckYyfI+PbZa/wSMVYIwFNCr5zQM378BvAxRAMU8Vjq8moNqRGy
+g77FGr8H6lnco4g175x2MjxNBiLOFeXdntiP2t7SxDnlF4HPOEfrf4htWRvfn0IUrn7PqLBmZdo3
+r5+qPeoott7VMVgWglvquxl1AnMaykgaIZOQCo6ThKd9OyMYkomgjaw=
+-----END CERTIFICATE-----
+
+Certum EC-384 CA
+================
+-----BEGIN CERTIFICATE-----
+MIICZTCCAeugAwIBAgIQeI8nXIESUiClBNAt3bpz9DAKBggqhkjOPQQDAzB0MQswCQYDVQQGEwJQ
+TDEhMB8GA1UEChMYQXNzZWNvIERhdGEgU3lzdGVtcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2Vy
+dGlmaWNhdGlvbiBBdXRob3JpdHkxGTAXBgNVBAMTEENlcnR1bSBFQy0zODQgQ0EwHhcNMTgwMzI2
+MDcyNDU0WhcNNDMwMzI2MDcyNDU0WjB0MQswCQYDVQQGEwJQTDEhMB8GA1UEChMYQXNzZWNvIERh
+dGEgU3lzdGVtcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkx
+GTAXBgNVBAMTEENlcnR1bSBFQy0zODQgQ0EwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAATEKI6rGFtq
+vm5kN2PkzeyrOvfMobgOgknXhimfoZTy42B4mIF4Bk3y7JoOV2CDn7TmFy8as10CW4kjPMIRBSqn
+iBMY81CE1700LCeJVf/OTOffph8oxPBUw7l8t1Ot68KjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
+VR0OBBYEFI0GZnQkdjrzife81r1HfS+8EF9LMA4GA1UdDwEB/wQEAwIBBjAKBggqhkjOPQQDAwNo
+ADBlAjADVS2m5hjEfO/JUG7BJw+ch69u1RsIGL2SKcHvlJF40jocVYli5RsJHrpka/F2tNQCMQC0
+QoSZ/6vnnvuRlydd3LBbMHHOXjgaatkl5+r3YZJW+OraNsKHZZYuciUvf9/DE8k=
+-----END CERTIFICATE-----
+
+Certum Trusted Root CA
+======================
+-----BEGIN CERTIFICATE-----
+MIIFwDCCA6igAwIBAgIQHr9ZULjJgDdMBvfrVU+17TANBgkqhkiG9w0BAQ0FADB6MQswCQYDVQQG
+EwJQTDEhMB8GA1UEChMYQXNzZWNvIERhdGEgU3lzdGVtcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0g
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkxHzAdBgNVBAMTFkNlcnR1bSBUcnVzdGVkIFJvb3QgQ0Ew
+HhcNMTgwMzE2MTIxMDEzWhcNNDMwMzE2MTIxMDEzWjB6MQswCQYDVQQGEwJQTDEhMB8GA1UEChMY
+QXNzZWNvIERhdGEgU3lzdGVtcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkxHzAdBgNVBAMTFkNlcnR1bSBUcnVzdGVkIFJvb3QgQ0EwggIiMA0GCSqGSIb3DQEB
+AQUAA4ICDwAwggIKAoICAQDRLY67tzbqbTeRn06TpwXkKQMlzhyC93yZn0EGze2jusDbCSzBfN8p
+fktlL5On1AFrAygYo9idBcEq2EXxkd7fO9CAAozPOA/qp1x4EaTByIVcJdPTsuclzxFUl6s1wB52
+HO8AU5853BSlLCIls3Jy/I2z5T4IHhQqNwuIPMqw9MjCoa68wb4pZ1Xi/K1ZXP69VyywkI3C7Te2
+fJmItdUDmj0VDT06qKhF8JVOJVkdzZhpu9PMMsmN74H+rX2Ju7pgE8pllWeg8xn2A1bUatMn4qGt
+g/BKEiJ3HAVz4hlxQsDsdUaakFjgao4rpUYwBI4Zshfjvqm6f1bxJAPXsiEodg42MEx51UGamqi4
+NboMOvJEGyCI98Ul1z3G4z5D3Yf+xOr1Uz5MZf87Sst4WmsXXw3Hw09Omiqi7VdNIuJGmj8PkTQk
+fVXjjJU30xrwCSss0smNtA0Aq2cpKNgB9RkEth2+dv5yXMSFytKAQd8FqKPVhJBPC/PgP5sZ0jeJ
+P/J7UhyM9uH3PAeXjA6iWYEMspA90+NZRu0PqafegGtaqge2Gcu8V/OXIXoMsSt0Puvap2ctTMSY
+njYJdmZm/Bo/6khUHL4wvYBQv3y1zgD2DGHZ5yQD4OMBgQ692IU0iL2yNqh7XAjlRICMb/gv1SHK
+HRzQ+8S1h9E6Tsd2tTVItQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSM+xx1
+vALTn04uSNn5YFSqxLNP+jAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQENBQADggIBAEii1QAL
+LtA/vBzVtVRJHlpr9OTy4EA34MwUe7nJ+jW1dReTagVphZzNTxl4WxmB82M+w85bj/UvXgF2Ez8s
+ALnNllI5SW0ETsXpD4YN4fqzX4IS8TrOZgYkNCvozMrnadyHncI013nR03e4qllY/p0m+jiGPp2K
+h2RX5Rc64vmNueMzeMGQ2Ljdt4NR5MTMI9UGfOZR0800McD2RrsLrfw9EAUqO0qRJe6M1ISHgCq8
+CYyqOhNf6DR5UMEQGfnTKB7U0VEwKbOukGfWHwpjscWpxkIxYxeU72nLL/qMFH3EQxiJ2fAyQOaA
+4kZf5ePBAFmo+eggvIksDkc0C+pXwlM2/KfUrzHN/gLldfq5Jwn58/U7yn2fqSLLiMmq0Uc9Nneo
+WWRrJ8/vJ8HjJLWG965+Mk2weWjROeiQWMODvA8s1pfrzgzhIMfatz7DP78v3DSk+yshzWePS/Tj
+6tQ/50+6uaWTRRxmHyH6ZF5v4HaUMst19W7l9o/HuKTMqJZ9ZPskWkoDbGs4xugDQ5r3V7mzKWmT
+OPQD8rv7gmsHINFSH5pkAnuYZttcTVoP0ISVoDwUQwbKytu4QTbaakRnh6+v40URFWkIsr4WOZck
+bxJF0WddCajJFdr60qZfE2Efv4WstK2tBZQIgx51F9NxO5NQI1mg7TyRVJ12AMXDuDjb
+-----END CERTIFICATE-----
diff --git a/FreeFileSync/Source/RealTimeSync/main_dlg.cpp b/FreeFileSync/Source/RealTimeSync/main_dlg.cpp
index f308d0fa..0e4c21df 100644
--- a/FreeFileSync/Source/RealTimeSync/main_dlg.cpp
+++ b/FreeFileSync/Source/RealTimeSync/main_dlg.cpp
@@ -187,14 +187,7 @@ void MainDialog::onMenuAbout(wxCommandEvent& event)
     build += SPACED_BULLET;
 
     build += LTR_MARK; //fix Arabic
-#ifndef ZEN_BUILD_ARCH
-#error include <zen/build_info.h>
-#endif
-#if ZEN_BUILD_ARCH == ZEN_ARCH_32BIT
-    build += L"32 Bit";
-#else
-    build += L"64 Bit";
-#endif
+    build += utfTo<wxString>(cpuArchName);
 
     build += SPACED_BULLET;
     build += utfTo<wxString>(formatTime(formatDateTag, getCompileTime()));
diff --git a/FreeFileSync/Source/afs/ftp.cpp b/FreeFileSync/Source/afs/ftp.cpp
index d9c41e7d..bedd811f 100644
--- a/FreeFileSync/Source/afs/ftp.cpp
+++ b/FreeFileSync/Source/afs/ftp.cpp
@@ -22,6 +22,21 @@ using namespace fff;
 using AFS = AbstractFileSystem;
 
 
+namespace fff
+{
+std::weak_ordering operator<=>(const FtpSessionId& lhs, const FtpSessionId& rhs)
+{
+    //exactly the type of case insensitive comparison we need for server names!
+    if (const std::weak_ordering cmp = compareAsciiNoCase(lhs.server, rhs.server); //https://docs.microsoft.com/en-us/windows/win32/api/ws2tcpip/nf-ws2tcpip-getaddrinfow#IDNs
+        std::is_neq(cmp))
+        return cmp;
+
+    return std::tie(lhs.port, lhs.username, lhs.password, lhs.useTls) <=> //username, password: case sensitive!
+           std::tie(rhs.port, rhs.username, rhs.password, rhs.useTls);
+}
+}
+
+
 namespace
 {
 //Extensions to FTP: https://tools.ietf.org/html/rfc3659
@@ -42,36 +57,6 @@ enum class ServerEncoding
 };
 
 
-//use all configuration data that *defines* an SFTP session as key when buffering sessions! This is what user expects, e.g. when changing settings in FTP login dialog
-struct FtpSessionId
-{
-    /*explicit*/ FtpSessionId(const FtpLogin& login) :
-        server(login.server),
-        port(login.port),
-        username(login.username),
-        password(login.password),
-        useTls(login.useTls) {}
-
-    Zstring server;
-    int     port = 0;
-    Zstring username;
-    Zstring password;
-    bool useTls = false;
-    //timeoutSec => irrelevant for session equality
-};
-
-std::weak_ordering operator<=>(const FtpSessionId& lhs, const FtpSessionId& rhs)
-{
-    //exactly the type of case insensitive comparison we need for server names!
-    if (const std::weak_ordering cmp = compareAsciiNoCase(lhs.server, rhs.server); //https://docs.microsoft.com/en-us/windows/win32/api/ws2tcpip/nf-ws2tcpip-getaddrinfow#IDNs
-        std::is_neq(cmp))
-        return cmp;
-
-    return std::tie(lhs.port, lhs.username, lhs.password, lhs.useTls) <=> //username, password: case sensitive!
-           std::tie(rhs.port, rhs.username, rhs.password, rhs.useTls);
-}
-
-
 Zstring concatenateFtpFolderPathPhrase(const FtpLogin& login, const AfsPath& afsPath); //noexcept
 
 
@@ -151,9 +136,13 @@ std::string utfToServerEncoding(const Zstring& str, ServerEncoding enc) //throw
 }
 
 
-std::wstring getCurlDisplayPath(const Zstring& serverName, const AfsPath& afsPath)
+std::wstring getCurlDisplayPath(const FtpSessionId& sessionId, const AfsPath& afsPath)
 {
-    Zstring displayPath = Zstring(ftpPrefix) + Zstr("//") + serverName;
+    Zstring displayPath = Zstring(ftpPrefix) + Zstr("//");
+    if (!sessionId.username.empty()) //show username! consider AFS::compareDeviceSameAfsType()
+        displayPath += sessionId.username + Zstr('@');
+    displayPath += sessionId.server;
+
     const Zstring relPath = getServerRelPath(afsPath);
     if (relPath != Zstr("/"))
         displayPath += relPath;
@@ -455,10 +444,10 @@ public:
         options.emplace_back(CURLOPT_CAINFO, 0L); //be explicit: "even when [CURLOPT_SSL_VERIFYPEER] is disabled [...] curl may still load the certificate file specified in CURLOPT_CAINFO."
 
         //check if server certificate can be trusted? (Default: 1L)
-        //  => may fail with: CURLE_PEER_FAILED_VERIFICATION: SSL certificate problem: certificate has expired
+        //  => may fail with: "CURLE_PEER_FAILED_VERIFICATION: SSL certificate problem: certificate has expired"
         options.emplace_back(CURLOPT_SSL_VERIFYPEER, 0L);
         //check that server name matches the name in the certificate? (Default: 2L)
-        //  => may fail with: CURLE_PEER_FAILED_VERIFICATION: SSL: no alternative certificate subject name matches target host name 'freefilesync.org'
+        //  => may fail with: "CURLE_PEER_FAILED_VERIFICATION: SSL: no alternative certificate subject name matches target host name 'freefilesync.org'"
         options.emplace_back(CURLOPT_SSL_VERIFYHOST, 0L);
 #endif
         if (sessionId_.useTls) //https://tools.ietf.org/html/rfc4217
@@ -1017,7 +1006,7 @@ FtpItem getFtpSymlinkInfo(const FtpLogin& login, const AfsPath& linkPath) //thro
     }
     catch (const SysError& e)
     {
-        throw FileError(replaceCpy(_("Cannot resolve symbolic link %x."), L"%x", fmtPath(getCurlDisplayPath(login.server, linkPath))), e.toString());
+        throw FileError(replaceCpy(_("Cannot resolve symbolic link %x."), L"%x", fmtPath(getCurlDisplayPath(login, linkPath))), e.toString());
     }
 }
 
@@ -1089,7 +1078,7 @@ public:
         }
         catch (const SysError& e)
         {
-            throw FileError(replaceCpy(_("Cannot read directory %x."), L"%x", fmtPath(getCurlDisplayPath(login.server, afsDirPath))), e.toString());
+            throw FileError(replaceCpy(_("Cannot read directory %x."), L"%x", fmtPath(getCurlDisplayPath(login, afsDirPath))), e.toString());
         }
         return output;
     }
@@ -1663,7 +1652,7 @@ void ftpFileDownload(const FtpLogin& login, const AfsPath& afsFilePath, //throw
         if (exception)
             std::rethrow_exception(exception);
 
-        throw FileError(replaceCpy(_("Cannot read file %x."), L"%x", fmtPath(getCurlDisplayPath(login.server, afsFilePath))), e.toString());
+        throw FileError(replaceCpy(_("Cannot read file %x."), L"%x", fmtPath(getCurlDisplayPath(login, afsFilePath))), e.toString());
     }
 }
 
@@ -1732,7 +1721,7 @@ void ftpFileUpload(const FtpLogin& login, const AfsPath& afsFilePath, //throw Fi
         if (exception)
             std::rethrow_exception(exception);
 
-        throw FileError(replaceCpy(_("Cannot write file %x."), L"%x", fmtPath(getCurlDisplayPath(login.server, afsFilePath))), e.toString());
+        throw FileError(replaceCpy(_("Cannot write file %x."), L"%x", fmtPath(getCurlDisplayPath(login, afsFilePath))), e.toString());
     }
 }
 
@@ -1747,7 +1736,7 @@ struct InputStreamFtp : public AFS::InputStream
     {
         worker_ = InterruptibleThread([asyncStreamOut = this->asyncStreamIn_, login, afsPath]
         {
-            setCurrentThreadName(Zstr("Istream[FTP] ") + utfTo<Zstring>(getCurlDisplayPath(login.server, afsPath)));
+            setCurrentThreadName(Zstr("Istream[FTP] ") + utfTo<Zstring>(getCurlDisplayPath(login, afsPath)));
             try
             {
                 auto writeBlock = [&](const void* buffer, size_t bytesToWrite)
@@ -1821,7 +1810,7 @@ struct OutputStreamFtp : public AFS::OutputStreamImpl
                                               asyncStreamIn = this->asyncStreamOut_,
                                               pUploadDone   = std::move(pUploadDone)]() mutable
         {
-            setCurrentThreadName(Zstr("Ostream[FTP] ") + utfTo<Zstring>(getCurlDisplayPath(login.server, afsPath)));
+            setCurrentThreadName(Zstr("Ostream[FTP] ") + utfTo<Zstring>(getCurlDisplayPath(login, afsPath)));
             try
             {
                 auto readBlock = [&](void* buffer, size_t bytesToRead)
@@ -1912,7 +1901,7 @@ private:
             }
             catch (const SysError& e)
             {
-                throw FileError(replaceCpy(_("Cannot write modification time of %x."), L"%x", fmtPath(getCurlDisplayPath(login_.server, afsPath_))), e.toString());
+                throw FileError(replaceCpy(_("Cannot write modification time of %x."), L"%x", fmtPath(getCurlDisplayPath(login_, afsPath_))), e.toString());
             }
     }
 
@@ -1939,7 +1928,7 @@ public:
 private:
     Zstring getInitPathPhrase(const AfsPath& afsPath) const override { return concatenateFtpFolderPathPhrase(login_, afsPath); }
 
-    std::wstring getDisplayPath(const AfsPath& afsPath) const override { return getCurlDisplayPath(login_.server, afsPath); }
+    std::wstring getDisplayPath(const AfsPath& afsPath) const override { return getCurlDisplayPath(login_, afsPath); }
 
     bool isNullFileSystem() const override { return login_.server.empty(); }
 
@@ -1975,7 +1964,7 @@ private:
                 });
                 return ItemType::folder;
             }
-            catch (const SysError& e) { throw FileError(replaceCpy(_("Cannot read directory %x."), L"%x", fmtPath(getCurlDisplayPath(login_.server, afsPath))), e.toString()); }
+            catch (const SysError& e) { throw FileError(replaceCpy(_("Cannot read directory %x."), L"%x", fmtPath(getCurlDisplayPath(login_, afsPath))), e.toString()); }
 
         const Zstring itemName = getItemName(afsPath);
         assert(!itemName.empty());
@@ -2302,7 +2291,7 @@ AfsPath fff::getFtpHomePath(const FtpLogin& login) //throw FileError
         });
         return homePath;
     }
-    catch (const SysError& e) { throw FileError(replaceCpy(_("Cannot determine final path for %x."), L"%x", fmtPath(getCurlDisplayPath(login.server, AfsPath(Zstr("~"))))), e.toString()); }
+    catch (const SysError& e) { throw FileError(replaceCpy(_("Cannot determine final path for %x."), L"%x", fmtPath(getCurlDisplayPath(login, AfsPath(Zstr("~"))))), e.toString()); }
 }
 
 
diff --git a/FreeFileSync/Source/afs/ftp.h b/FreeFileSync/Source/afs/ftp.h
index 91dbf47a..f0e8a142 100644
--- a/FreeFileSync/Source/afs/ftp.h
+++ b/FreeFileSync/Source/afs/ftp.h
@@ -20,14 +20,18 @@ void ftpTeardown();
 
 //-------------------------------------------------------
 
-struct FtpLogin
+//use all configuration data that *defines* an SFTP session as key when buffering sessions! This is what user expects, e.g. when changing settings in FTP login dialog
+struct FtpSessionId
 {
     Zstring server;
     int port = 0; // > 0 if set
     Zstring username;
     Zstring password;
     bool useTls = false;
+};
 
+struct FtpLogin : FtpSessionId
+{
     //other settings not specific to FTP session:
     int timeoutSec = 15;
 };
diff --git a/FreeFileSync/Source/afs/gdrive.cpp b/FreeFileSync/Source/afs/gdrive.cpp
index 0526c183..f6a9424c 100644
--- a/FreeFileSync/Source/afs/gdrive.cpp
+++ b/FreeFileSync/Source/afs/gdrive.cpp
@@ -835,42 +835,14 @@ GdriveItemDetails extractItemDetails(const JsonValue& jvalue) //throw SysError
     const FileOwner owner = ownedByMe ? (*ownedByMe == "true" ? FileOwner::me : FileOwner::other) : FileOwner::none; //"Not populated for items in Shared Drives"
     const uint64_t fileSize = size ? stringTo<uint64_t>(*size) : 0; //not available for folders and shortcuts
 
-#if 0
-    warn_static("remove after test")
-    {
-        //RFC 3339 date-time: e.g. "2018-09-29T08:39:12.053Z"
-        const TimeComp tc = parseTime("%Y-%m-%dT%H:%M:%S", "1968-05-03T11:30:00");
-        if (tc == TimeComp() )
-            throw SysError(L"Modification time could not be parsed. (" + utfTo<std::wstring>(*modifiedTime) + L')');
-
-        time_t modTime = utcToTimeT(tc); //returns -1 on error
-        if (modTime == -1)
-        {
-            warn_static("should utcToTimeT handle this, too?")
-
-            if (tc.year == 1) //WTF: 0001-01-01T00:00:00.000Z https://freefilesync.org/forum/viewtopic.php?t=7403
-                modTime = 0;
-            else
-                throw SysError(L"Modification time could not be parsed. (" + utfTo<std::wstring>(*modifiedTime) + L')');
-        }
-    }
-#endif
-
     //RFC 3339 date-time: e.g. "2018-09-29T08:39:12.053Z"
     const TimeComp tc = parseTime("%Y-%m-%dT%H:%M:%S", beforeLast(*modifiedTime, '.', IfNotFoundReturn::all));
     if (tc == TimeComp() || !endsWith(*modifiedTime, 'Z')) //'Z' means "UTC" => it seems Google doesn't use the time-zone offset postfix
         throw SysError(L"Modification time could not be parsed. (" + utfTo<std::wstring>(*modifiedTime) + L')');
 
-    time_t modTime = utcToTimeT(tc); //returns -1 on error
+    const time_t modTime = utcToTimeT(tc); //returns -1 on error
     if (modTime == -1)
-    {
-        warn_static("should utcToTimeT handle this, too?")
-
-        if (tc.year == 1) //WTF: 0001-01-01T00:00:00.000Z https://freefilesync.org/forum/viewtopic.php?t=7403
-            modTime = 0;
-        else
-            throw SysError(L"Modification time could not be parsed. (" + utfTo<std::wstring>(*modifiedTime) + L')');
-    }
+        throw SysError(L"Modification time could not be parsed. (" + utfTo<std::wstring>(*modifiedTime) + L')');
 
     std::vector<std::string> parentIds;
     if (parents) //item without parents is possible! e.g. shared item located in "Shared with me", referenced via a Shortcut
diff --git a/FreeFileSync/Source/afs/sftp.cpp b/FreeFileSync/Source/afs/sftp.cpp
index 92a48420..9588813a 100644
--- a/FreeFileSync/Source/afs/sftp.cpp
+++ b/FreeFileSync/Source/afs/sftp.cpp
@@ -24,6 +24,41 @@ using namespace fff;
 using AFS = AbstractFileSystem;
 
 
+namespace fff
+{
+std::weak_ordering operator<=>(const SshSessionId& lhs, const SshSessionId& rhs)
+{
+    //exactly the type of case insensitive comparison we need for server names!
+    if (const std::weak_ordering cmp = compareAsciiNoCase(lhs.server, rhs.server); //https://docs.microsoft.com/en-us/windows/win32/api/ws2tcpip/nf-ws2tcpip-getaddrinfow#IDNs
+        std::is_neq(cmp))
+        return cmp;
+
+    if (const std::strong_ordering cmp = std::tie(lhs.port, lhs.username, lhs.authType, lhs.allowZlib) <=> //username: case sensitive!
+                                         std::tie(rhs.port, rhs.username, rhs.authType, rhs.allowZlib);
+        std::is_neq(cmp))
+        return cmp;
+
+    switch (lhs.authType)
+    {
+        case SftpAuthType::password:
+            return lhs.password <=> rhs.password; //case sensitive!
+
+        case SftpAuthType::keyFile:
+            if (const std::strong_ordering cmp = lhs.password <=> rhs.password; //case sensitive!
+                std::is_neq(cmp))
+                return cmp;
+
+            return lhs.privateKeyFilePath <=> rhs.privateKeyFilePath; //case sensitive!
+
+        case SftpAuthType::agent:
+            return std::weak_ordering::equivalent;
+    }
+    assert(false);
+    return std::weak_ordering::equivalent;
+}
+}
+
+
 namespace
 {
 Zstring concatenateSftpFolderPathPhrase(const SftpLogin& login, const AfsPath& afsPath); //noexcept
@@ -103,75 +138,24 @@ SFTP_OPTIMAL_BLOCK_SIZE_READ:              SFTP_OPTIMAL_BLOCK_SIZE_WRITE:
 => libssh2_sftp_read/libssh2_sftp_write may take quite long for 16x and larger => use smallest multiple that fills bandwidth!            */
 
 
-//use all configuration data that *defines* an SSH session as key when buffering sessions! This is what user expects, e.g. when changing settings in SFTP login dialog
-struct SshSessionId
-{
-    /*explicit*/ SshSessionId(const SftpLogin& login) :
-        server(login.server),
-        port(login.port),
-        username(login.username),
-        authType(login.authType),
-        password(login.password),
-        privateKeyFilePath(login.privateKeyFilePath),
-        allowZlib(login.allowZlib) {}
-
-    Zstring server;
-    int     port = 0;
-    Zstring username;
-    SftpAuthType authType = SftpAuthType::password;
-    Zstring password;
-    Zstring privateKeyFilePath;
-    bool allowZlib = false;
-    //timeoutSec, traverserChannelsPerConnection => irrelevant for session equality
-};
-
-std::weak_ordering operator<=>(const SshSessionId& lhs, const SshSessionId& rhs)
-{
-    //exactly the type of case insensitive comparison we need for server names!
-    if (const std::weak_ordering cmp = compareAsciiNoCase(lhs.server, rhs.server); //https://docs.microsoft.com/en-us/windows/win32/api/ws2tcpip/nf-ws2tcpip-getaddrinfow#IDNs
-        std::is_neq(cmp))
-        return cmp;
-
-    if (const std::strong_ordering cmp = std::tie(lhs.port, lhs.username, lhs.authType, lhs.allowZlib) <=> //username: case sensitive!
-                                         std::tie(rhs.port, rhs.username, rhs.authType, rhs.allowZlib);
-        std::is_neq(cmp))
-        return cmp;
-
-    switch (lhs.authType)
-    {
-        case SftpAuthType::password:
-            return lhs.password <=> rhs.password; //case sensitive!
-
-        case SftpAuthType::keyFile:
-            if (const std::strong_ordering cmp = lhs.password <=> rhs.password; //case sensitive!
-                std::is_neq(cmp))
-                return cmp;
-
-            return lhs.privateKeyFilePath <=> rhs.privateKeyFilePath; //case sensitive!
-
-        case SftpAuthType::agent:
-            return std::weak_ordering::equivalent;
-    }
-    assert(false);
-    return std::weak_ordering::equivalent;
-}
-
-
 std::string getLibssh2Path(const AfsPath& afsPath)
 {
     return utfTo<std::string>(getServerRelPath(afsPath));
 }
 
 
-std::wstring getSftpDisplayPath(const Zstring& serverName, const AfsPath& afsPath)
+std::wstring getSftpDisplayPath(const SshSessionId& sessionId, const AfsPath& afsPath)
 {
-    Zstring displayPath = Zstring(sftpPrefix) + Zstr("//") + serverName;
+    Zstring displayPath = Zstring(sftpPrefix) + Zstr("//");
+    if (!sessionId.username.empty()) //show username! consider AFS::compareDeviceSameAfsType()
+        displayPath += sessionId.username + Zstr('@');
+    displayPath += sessionId.server;
+
     const Zstring relPath = getServerRelPath(afsPath);
     if (relPath != Zstr("/"))
         displayPath += relPath;
     return utfTo<std::wstring>(displayPath);
 }
-//don't show username and password!
 
 //===========================================================================================================================
 
@@ -799,7 +783,7 @@ public:
             SshSession::waitForTraffic(sshSessions, timeoutSec); //throw FatalSshError
         }
 
-        Zstring getServerName() const { return session_->getSessionId().server; }
+        const SshSessionId& getSessionId() const { return session_->getSessionId(); }
 
     private:
         std::unique_ptr<SshSession, ReUseOnDelete> session_; //bound!
@@ -1028,7 +1012,7 @@ std::vector<SftpItem> getDirContentFlat(const SftpLogin& login, const AfsPath& d
             return LIBSSH2_ERROR_NONE;
         });
     }
-    catch (const SysError& e) { throw FileError(replaceCpy(_("Cannot open directory %x."), L"%x", fmtPath(getSftpDisplayPath(login.server, dirPath))), e.toString()); }
+    catch (const SysError& e) { throw FileError(replaceCpy(_("Cannot open directory %x."), L"%x", fmtPath(getSftpDisplayPath(login, dirPath))), e.toString()); }
 
     ZEN_ON_SCOPE_EXIT(try
     {
@@ -1048,7 +1032,7 @@ std::vector<SftpItem> getDirContentFlat(const SftpLogin& login, const AfsPath& d
             runSftpCommand(login, "libssh2_sftp_readdir", //throw SysError
             [&](const SshSession::Details& sd) { return rc = ::libssh2_sftp_readdir(dirHandle, &buf[0], buf.size(), &attribs); }); //noexcept!
         }
-        catch (const SysError& e) { throw FileError(replaceCpy(_("Cannot read directory %x."), L"%x", fmtPath(getSftpDisplayPath(login.server, dirPath))), e.toString()); }
+        catch (const SysError& e) { throw FileError(replaceCpy(_("Cannot read directory %x."), L"%x", fmtPath(getSftpDisplayPath(login, dirPath))), e.toString()); }
 
         if (rc == 0) //no more items
             return output;
@@ -1062,12 +1046,12 @@ std::vector<SftpItem> getDirContentFlat(const SftpLogin& login, const AfsPath& d
         const AfsPath itemPath(nativeAppendPaths(dirPath.value, itemName));
 
         if ((attribs.flags & LIBSSH2_SFTP_ATTR_PERMISSIONS) == 0) //server probably does not support these attributes => fail at folder level
-            throw FileError(replaceCpy(_("Cannot read file attributes of %x."), L"%x", fmtPath(getSftpDisplayPath(login.server, itemPath))), L"File attributes not available.");
+            throw FileError(replaceCpy(_("Cannot read file attributes of %x."), L"%x", fmtPath(getSftpDisplayPath(login, itemPath))), L"File attributes not available.");
 
         if (LIBSSH2_SFTP_S_ISLNK(attribs.permissions))
         {
             if ((attribs.flags & LIBSSH2_SFTP_ATTR_ACMODTIME) == 0) //server probably does not support these attributes => fail at folder level
-                throw FileError(replaceCpy(_("Cannot read file attributes of %x."), L"%x", fmtPath(getSftpDisplayPath(login.server, itemPath))), L"Modification time not supported.");
+                throw FileError(replaceCpy(_("Cannot read file attributes of %x."), L"%x", fmtPath(getSftpDisplayPath(login, itemPath))), L"Modification time not supported.");
             output.push_back({itemName, {AFS::ItemType::symlink, 0, static_cast<time_t>(attribs.mtime)}});
         }
         else if (LIBSSH2_SFTP_S_ISDIR(attribs.permissions))
@@ -1075,9 +1059,9 @@ std::vector<SftpItem> getDirContentFlat(const SftpLogin& login, const AfsPath& d
         else //a file or named pipe, ect: LIBSSH2_SFTP_S_ISREG, LIBSSH2_SFTP_S_ISCHR, LIBSSH2_SFTP_S_ISBLK, LIBSSH2_SFTP_S_ISFIFO, LIBSSH2_SFTP_S_ISSOCK
         {
             if ((attribs.flags & LIBSSH2_SFTP_ATTR_ACMODTIME) == 0) //server probably does not support these attributes => fail at folder level
-                throw FileError(replaceCpy(_("Cannot read file attributes of %x."), L"%x", fmtPath(getSftpDisplayPath(login.server, itemPath))), L"Modification time not supported.");
+                throw FileError(replaceCpy(_("Cannot read file attributes of %x."), L"%x", fmtPath(getSftpDisplayPath(login, itemPath))), L"Modification time not supported.");
             if ((attribs.flags & LIBSSH2_SFTP_ATTR_SIZE) == 0)
-                throw FileError(replaceCpy(_("Cannot read file attributes of %x."), L"%x", fmtPath(getSftpDisplayPath(login.server, itemPath))), L"File size not supported.");
+                throw FileError(replaceCpy(_("Cannot read file attributes of %x."), L"%x", fmtPath(getSftpDisplayPath(login, itemPath))), L"File size not supported.");
             output.push_back({itemName, {AFS::ItemType::file, attribs.filesize, static_cast<time_t>(attribs.mtime)}});
         }
     }
@@ -1092,19 +1076,19 @@ SftpItemDetails getSymlinkTargetDetails(const SftpLogin& login, const AfsPath& l
         runSftpCommand(login, "libssh2_sftp_stat", //throw SysError
         [&](const SshSession::Details& sd) { return ::libssh2_sftp_stat(sd.sftpChannel, getLibssh2Path(linkPath), &attribsTrg); }); //noexcept!
     }
-    catch (const SysError& e) { throw FileError(replaceCpy(_("Cannot resolve symbolic link %x."), L"%x", fmtPath(getSftpDisplayPath(login.server, linkPath))), e.toString()); }
+    catch (const SysError& e) { throw FileError(replaceCpy(_("Cannot resolve symbolic link %x."), L"%x", fmtPath(getSftpDisplayPath(login, linkPath))), e.toString()); }
 
     if ((attribsTrg.flags & LIBSSH2_SFTP_ATTR_PERMISSIONS) == 0)
-        throw FileError(replaceCpy(_("Cannot read file attributes of %x."), L"%x", fmtPath(getSftpDisplayPath(login.server, linkPath))), L"File attributes not available.");
+        throw FileError(replaceCpy(_("Cannot read file attributes of %x."), L"%x", fmtPath(getSftpDisplayPath(login, linkPath))), L"File attributes not available.");
 
     if (LIBSSH2_SFTP_S_ISDIR(attribsTrg.permissions))
         return {AFS::ItemType::folder, 0, static_cast<time_t>(attribsTrg.mtime)};
     else
     {
         if ((attribsTrg.flags & LIBSSH2_SFTP_ATTR_ACMODTIME) == 0) //server probably does not support these attributes => should fail at folder level!
-            throw FileError(replaceCpy(_("Cannot read file attributes of %x."), L"%x", fmtPath(getSftpDisplayPath(login.server, linkPath))), L"Modification time not supported.");
+            throw FileError(replaceCpy(_("Cannot read file attributes of %x."), L"%x", fmtPath(getSftpDisplayPath(login, linkPath))), L"Modification time not supported.");
         if ((attribsTrg.flags & LIBSSH2_SFTP_ATTR_SIZE) == 0)
-            throw FileError(replaceCpy(_("Cannot read file attributes of %x."), L"%x", fmtPath(getSftpDisplayPath(login.server, linkPath))), L"File size not supported.");
+            throw FileError(replaceCpy(_("Cannot read file attributes of %x."), L"%x", fmtPath(getSftpDisplayPath(login., linkPath))), L"File size not supported.");
 
         return {AFS::ItemType::file, attribsTrg.filesize, static_cast<time_t>(attribsTrg.mtime)};
     }
@@ -1201,7 +1185,7 @@ void traverseFolderRecursiveSftp(const SftpLogin& login, const std::vector<std::
 struct InputStreamSftp : public AFS::InputStream
 {
     InputStreamSftp(const SftpLogin& login, const AfsPath& filePath, const IoCallback& notifyUnbufferedIO /*throw X*/) : //throw FileError
-        displayPath_(getSftpDisplayPath(login.server, filePath)),
+        displayPath_(getSftpDisplayPath(login, filePath)),
         notifyUnbufferedIO_(notifyUnbufferedIO)
     {
         try
@@ -1317,7 +1301,7 @@ struct OutputStreamSftp : public AFS::OutputStreamImpl
                      std::optional<time_t> modTime,
                      const IoCallback& notifyUnbufferedIO /*throw X*/) :
         filePath_(filePath),
-        displayPath_(getSftpDisplayPath(login.server, filePath)),
+        displayPath_(getSftpDisplayPath(login, filePath)),
         modTime_(modTime),
         notifyUnbufferedIO_(notifyUnbufferedIO)
     {
@@ -1514,7 +1498,7 @@ public:
 private:
     Zstring getInitPathPhrase(const AfsPath& afsPath) const override { return concatenateSftpFolderPathPhrase(login_, afsPath); }
 
-    std::wstring getDisplayPath(const AfsPath& afsPath) const override { return getSftpDisplayPath(login_.server, afsPath); }
+    std::wstring getDisplayPath(const AfsPath& afsPath) const override { return getSftpDisplayPath(login_, afsPath); }
 
     bool isNullFileSystem() const override { return login_.server.empty(); }
 
diff --git a/FreeFileSync/Source/afs/sftp.h b/FreeFileSync/Source/afs/sftp.h
index fce5fc67..a7c1d45a 100644
--- a/FreeFileSync/Source/afs/sftp.h
+++ b/FreeFileSync/Source/afs/sftp.h
@@ -27,18 +27,20 @@ enum class SftpAuthType
     agent,
 };
 
-struct SftpLogin
+//use all configuration data that *defines* an SSH session as key when buffering sessions! This is what user expects, e.g. when changing settings in SFTP login dialog
+struct SshSessionId
 {
     Zstring server;
-    int     port = 0; // > 0 if set
+    int port = 0; // > 0 if set
     Zstring username;
-
     SftpAuthType authType = SftpAuthType::password;
     Zstring password;           //authType == password or keyFile
     Zstring privateKeyFilePath; //authType == keyFile: use PEM-encoded private key (protected by password) for authentication
-
     bool allowZlib = false;
+};
 
+struct SftpLogin : SshSessionId
+{
     //other settings not specific to SFTP session:
     int timeoutSec = 15;                    //valid range: [1, inf)
     int traverserChannelsPerConnection = 1; //valid range: [1, inf)
diff --git a/FreeFileSync/Source/base/algorithm.cpp b/FreeFileSync/Source/base/algorithm.cpp
index 0a2cf79f..55c6ee35 100644
--- a/FreeFileSync/Source/base/algorithm.cpp
+++ b/FreeFileSync/Source/base/algorithm.cpp
@@ -1688,26 +1688,26 @@ TempFileBuffer::~TempFileBuffer()
 
 void TempFileBuffer::createTempFolderPath() //throw FileError
 {
-        if (tempFolderPath_.empty())
+    if (tempFolderPath_.empty())
     {
-            //generate random temp folder path e.g. C:\Users\Zenju\AppData\Local\Temp\FFS-068b2e88
-            const uint32_t shortGuid = getCrc32(generateGUID()); //no need for full-blown (pseudo-)random numbers for this one-time invocation
+        //generate random temp folder path e.g. C:\Users\Zenju\AppData\Local\Temp\FFS-068b2e88
+        const uint32_t shortGuid = getCrc32(generateGUID()); //no need for full-blown (pseudo-)random numbers for this one-time invocation
 
-            const Zstring& tempPathTmp = appendSeparator(getTempFolderPath()) + //throw FileError
-            Zstr("FFS-") + printNumber<Zstring>(Zstr("%08x"), static_cast<unsigned int>(shortGuid));
+        const Zstring& tempPathTmp = appendSeparator(getTempFolderPath()) + //throw FileError
+                                     Zstr("FFS-") + printNumber<Zstring>(Zstr("%08x"), static_cast<unsigned int>(shortGuid));
 
-            createDirectoryIfMissingRecursion(tempPathTmp); //throw FileError
+        createDirectoryIfMissingRecursion(tempPathTmp); //throw FileError
 
-            tempFolderPath_ = tempPathTmp;
-        }
+        tempFolderPath_ = tempPathTmp;
+    }
 }
 
 
-    Zstring TempFileBuffer::getAndCreateFolderPath() //throw FileError
-    {
-        createTempFolderPath(); //throw FileError
-            return tempFolderPath_; 
-    }
+Zstring TempFileBuffer::getAndCreateFolderPath() //throw FileError
+{
+    createTempFolderPath(); //throw FileError
+    return tempFolderPath_;
+}
 
 
 //returns empty if not available (item not existing, error during copy)
@@ -1731,11 +1731,11 @@ void TempFileBuffer::createTempFiles(const std::set<FileDescriptor>& workLoad, P
     callback.initNewPhase(itemTotal, bytesTotal, ProcessPhase::none); //throw X
     //------------------------------------------------------------------------------
 
-        const std::wstring errMsg = tryReportingError([&]
-        {
-                createTempFolderPath(); //throw FileError
-        }, callback); //throw X
-        if (!errMsg.empty()) return;
+    const std::wstring errMsg = tryReportingError([&]
+    {
+        createTempFolderPath(); //throw FileError
+    }, callback); //throw X
+    if (!errMsg.empty()) return;
 
     for (const FileDescriptor& descr : workLoad)
     {
diff --git a/FreeFileSync/Source/base/algorithm.h b/FreeFileSync/Source/base/algorithm.h
index 75b7e7a6..4ef7f9bb 100644
--- a/FreeFileSync/Source/base/algorithm.h
+++ b/FreeFileSync/Source/base/algorithm.h
@@ -102,7 +102,7 @@ private:
     TempFileBuffer           (const TempFileBuffer&) = delete;
     TempFileBuffer& operator=(const TempFileBuffer&) = delete;
 
-void createTempFolderPath(); //throw FileError
+    void createTempFolderPath(); //throw FileError
 
     std::map<FileDescriptor, Zstring> tempFilePaths_;
     Zstring tempFolderPath_;
diff --git a/FreeFileSync/Source/base/structures.cpp b/FreeFileSync/Source/base/structures.cpp
index e1973ab3..4681c2ea 100644
--- a/FreeFileSync/Source/base/structures.cpp
+++ b/FreeFileSync/Source/base/structures.cpp
@@ -269,11 +269,11 @@ uint64_t resolve(size_t value, UnitSize unit, uint64_t defaultVal)
         case UnitSize::byte:
             return value;
         case UnitSize::kb:
-            return value > maxVal / 1024U ? maxVal : //prevent overflow!!!
-                   1024U * value;
+            return value > maxVal / bytesPerKilo ? maxVal : //prevent overflow!!!
+                   value * bytesPerKilo;
         case UnitSize::mb:
-            return value > maxVal / (1024 * 1024U) ? maxVal : //prevent overflow!!!
-                   1024 * 1024U * value;
+            return value > maxVal / (bytesPerKilo * bytesPerKilo) ? maxVal : //prevent overflow!!!
+                   value * bytesPerKilo * bytesPerKilo;
     }
     assert(false);
     return defaultVal;
diff --git a/FreeFileSync/Source/config.cpp b/FreeFileSync/Source/config.cpp
index c9383329..46e2d6ba 100644
--- a/FreeFileSync/Source/config.cpp
+++ b/FreeFileSync/Source/config.cpp
@@ -1860,12 +1860,10 @@ void readConfig(const XmlIn& in, XmlGlobalSettings& cfg, int formatVer)
 
     if (formatVer < 20) //TODO: remove old parameter after migration! 2020-12-03
     {
-        in["Gui"]["CsvExport"  ].attribute("LastSelected", cfg.csvFileLastSelected);
         in["Gui"]["SftpKeyFile"].attribute("LastSelected", cfg.sftpKeyFileLastSelected);
     }
     else
     {
-        in["CsvExport"  ].attribute("LastSelected", cfg.csvFileLastSelected);
         in["SftpKeyFile"].attribute("LastSelected", cfg.sftpKeyFileLastSelected);
     }
 
@@ -2075,7 +2073,7 @@ ConfigType parseConfig(const XmlDoc& doc, const Zstring& filePath, int currentXm
         //(try to) migrate old configuration if needed
         if (formatVer < currentXmlFormatVer)
             try { fff::writeConfig(cfg, filePath); /*throw FileError*/ }
-            catch (FileError&) { assert(false); }     //don't bother user!
+            catch (FileError&) { assert(false); } //don't bother user!
     }
     catch (const FileError& e)
     {
@@ -2426,9 +2424,6 @@ void writeConfig(const XmlGlobalSettings& cfg, XmlOut& out)
 
     out["FolderHistory" ].attribute("MaxSize", cfg.folderHistoryMax);
 
-     warn_static("csvFileLastSelected is obsolete: get rid?")
-
-    out["CsvExport"  ].attribute("LastSelected", cfg.csvFileLastSelected);
     out["SftpKeyFile"].attribute("LastSelected", cfg.sftpKeyFileLastSelected);
 
     out["DefaultExclusionFilter"](splitFilterByLines(cfg.defaultExclusionFilter));
diff --git a/FreeFileSync/Source/config.h b/FreeFileSync/Source/config.h
index ce58e7bf..06167622 100644
--- a/FreeFileSync/Source/config.h
+++ b/FreeFileSync/Source/config.h
@@ -223,7 +223,6 @@ struct XmlGlobalSettings
                                      "*/.recycle/";
     size_t folderHistoryMax = 20;
 
-    Zstring csvFileLastSelected;
     Zstring sftpKeyFileLastSelected;
 
     std::vector<Zstring> versioningFolderHistory;
diff --git a/FreeFileSync/Source/ffs_paths.cpp b/FreeFileSync/Source/ffs_paths.cpp
index 44b80f6f..a21bb26c 100644
--- a/FreeFileSync/Source/ffs_paths.cpp
+++ b/FreeFileSync/Source/ffs_paths.cpp
@@ -31,7 +31,7 @@ Zstring getProcessParentFolderPath()
         }
         catch (const FileError& e)
         {
-            throw std::runtime_error(std::string(__FILE__) + '[' + numberTo<std::string>(__LINE__) + "] " + utfTo<std::string>(e.toString()));
+            throw std::runtime_error(std::string(__FILE__) + '[' + numberTo<std::string>(__LINE__) + "] Failed to get process parent folder. " + utfTo<std::string>(e.toString()));
         }
     }();
     return exeFolderParentPath;
@@ -71,7 +71,7 @@ Zstring fff::getConfigDirPathPf()
             }
             catch (const FileError& e)
             {
-                throw std::runtime_error(std::string(__FILE__) + '[' + numberTo<std::string>(__LINE__) + "] " + utfTo<std::string>(e.toString()));
+                throw std::runtime_error(std::string(__FILE__) + '[' + numberTo<std::string>(__LINE__) + "] Failed to get config path. " + utfTo<std::string>(e.toString()));
             }
         }();
 
diff --git a/FreeFileSync/Source/ui/file_grid.cpp b/FreeFileSync/Source/ui/file_grid.cpp
index d54a9368..62648336 100644
--- a/FreeFileSync/Source/ui/file_grid.cpp
+++ b/FreeFileSync/Source/ui/file_grid.cpp
@@ -61,23 +61,6 @@ const int FILE_GRID_GAP_SIZE_WIDE_DIP = 6;
          |                    |                      |
    GridDataLeft         GridDataRight          GridDataCenter               */
 
-std::pair<ptrdiff_t, ptrdiff_t> getVisibleRows(const Grid& grid) //returns range [from, to)
-{
-    const wxSize clientSize = grid.getMainWin().GetClientSize();
-    if (clientSize.GetHeight() > 0)
-    {
-        const wxPoint topLeft = grid.CalcUnscrolledPosition(wxPoint(0, 0));
-        const wxPoint bottom  = grid.CalcUnscrolledPosition(wxPoint(0, clientSize.GetHeight() - 1));
-
-        const ptrdiff_t rowCount = grid.getRowCount();
-        const ptrdiff_t rowFrom  = grid.getRowAtPos(topLeft.y); //return -1 for invalid position, rowCount if out of range
-        const ptrdiff_t rowTo    = grid.getRowAtPos(bottom.y);
-        if (rowFrom >= 0 && rowTo >= 0)
-            return {rowFrom, std::min(rowTo + 1, rowCount)};
-    }
-    return {};
-}
-
 
 //accessibility, support high-contrast schemes => work with user-defined background color!
 wxColor getAlternateBackgroundColor()
@@ -387,8 +370,8 @@ public:
     {
         if (IconBuffer* iconBuf = getIconManager().getIconBuffer())
         {
-            const auto& rowsOnScreen = getVisibleRows(refGrid());
-            const ptrdiff_t visibleRowCount = rowsOnScreen.second - rowsOnScreen.first;
+            const auto& [rowFirst, rowLast] = refGrid().getVisibleRows(refGrid().getMainWin().GetClientSize());
+            const ptrdiff_t visibleRowCount = rowLast - rowFirst;
 
             //preload icons not yet on screen:
             const int preloadSize = 2 * std::max<ptrdiff_t>(20, visibleRowCount); //:= sum of lines above and below of visible range to preload
@@ -396,7 +379,7 @@ public:
 
             for (ptrdiff_t i = 0; i < preloadSize; ++i)
             {
-                const ptrdiff_t currentRow = rowsOnScreen.first - (preloadSize + 1) / 2 + getAlternatingPos(i, visibleRowCount + preloadSize); //for odd preloadSize start one row earlier
+                const ptrdiff_t currentRow = rowFirst - (preloadSize + 1) / 2 + getAlternatingPos(i, visibleRowCount + preloadSize); //for odd preloadSize start one row earlier
 
                 if (const FileSystemObject* fsObj = getFsObject(currentRow))
                     if (getIconInfo(*fsObj).type == IconType::standard)
@@ -411,14 +394,13 @@ public:
     {
         if (IconBuffer* iconBuf = getIconManager().getIconBuffer())
         {
-            const auto& rowsOnScreen = getVisibleRows(refGrid());
-            const ptrdiff_t visibleRowCount = rowsOnScreen.second - rowsOnScreen.first;
+            const auto& [rowFirst, rowLast] = refGrid().getVisibleRows(refGrid().getMainWin().GetClientSize());
+            const ptrdiff_t visibleRowCount = rowLast - rowFirst;
 
-            //loop over all visible rows
             for (ptrdiff_t i = 0; i < visibleRowCount; ++i)
             {
                 //alternate when adding rows: first, last, first + 1, last - 1 ...
-                const ptrdiff_t currentRow = rowsOnScreen.first + getAlternatingPos(i, visibleRowCount);
+                const ptrdiff_t currentRow = rowFirst + getAlternatingPos(i, visibleRowCount);
 
                 if (isFailedLoad(currentRow)) //find failed attempts to load icon
                     if (const FileSystemObject* fsObj = getFsObject(currentRow))
@@ -620,7 +602,7 @@ private:
         //--------------------------------------------------------------------
 
         //exception for readability: top row is always group start!
-        const size_t groupFirstRow = std::max(pdi.groupFirstRow, refGrid().getTopRow());
+        const size_t groupFirstRow = std::max<size_t>(pdi.groupFirstRow, refGrid().getRowAtWinPos(0));
 
         const bool multiItemGroup = pdi.groupLastRow - groupFirstRow > 1;
 
@@ -935,19 +917,13 @@ private:
                         if (!groupName.empty() && row == groupFirstRow)
                         {
                             wxRect rectGroupNameBack = rectGroupName;
-                            rectGroupNameBack.width += 2 * gapSize_; //include gap left of vline
+
+                            if (!itemName.empty()) 
+                                rectGroupNameBack.width += 2 * gapSize_; //include gap left of item vline
                             rectGroupNameBack.height -= fastFromDIP(1); //harmonize with item separation lines
 
-                            //mouse highlight: group name
                             wxDCTextColourChanger textColorGroupName(dc);
-                            if (static_cast<HoverAreaGroup>(rowHover) == HoverAreaGroup::groupName ||
-                                (static_cast<HoverAreaGroup>(rowHover) == HoverAreaGroup::item && pdi.fsObj == pdi.folderGroupObj /*exception: extend highlight*/))
-                            {
-                                clearArea(dc, rectGroupNameBack, getColorSelectionGradientTo());
-                                textColorGroupName.Set(*wxBLACK);
-                            }
-                            else //folder background: coordinate with renderRowBackgound()
-                            {
+                            //folder background: coordinate with renderRowBackgound()
                                 if (!enabled || !selected)
                                     if (!pdi.folderGroupObj->isEmpty<side>() &&
                                         !pdi.folderGroupObj->isActive())
@@ -955,9 +931,7 @@ private:
                                         clearArea(dc, rectGroupNameBack, getColorInactiveBack(false /*faint*/));
                                         textColorGroupName.Set(getColorInactiveText());
                                     }
-
                                 drawCudHighlight(rectGroupNameBack, pdi.folderGroupObj->getSyncOperation());
-                            }
 
                             wxImage folderIcon;
                             bool drawAsLink = false;
@@ -970,6 +944,11 @@ private:
                             rectGroupName.x     += gapSize_ + getIconManager().getIconSize() + gapSize_;
                             rectGroupName.width -= gapSize_ + getIconManager().getIconSize() + gapSize_;
 
+                            //mouse highlight: group name
+                            if (static_cast<HoverAreaGroup>(rowHover) == HoverAreaGroup::groupName ||
+                                (static_cast<HoverAreaGroup>(rowHover) == HoverAreaGroup::item && pdi.fsObj == pdi.folderGroupObj /*exception: extend highlight*/))
+                                drawInsetRectangle(dc, rectGroupNameBack, fastFromDIP(1), *wxBLUE);
+                            
                             if (!pdi.folderGroupObj->isEmpty<side>())
                                 drawCellText(dc, rectGroupName, groupName, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, &getTextExtentBuffered(dc, groupName));
                         }
@@ -1007,14 +986,6 @@ private:
                         wxRect rectItemsBack = rectGroupItems;
                         rectItemsBack.height -= fastFromDIP(1); //preserve item separation lines!
 
-                        //mouse highlight: item name
-                        wxDCTextColourChanger textColorGroupItems(dc);
-                        if (static_cast<HoverAreaGroup>(rowHover) == HoverAreaGroup::item)
-                        {
-                            clearArea(dc, rectItemsBack, getColorSelectionGradientTo());
-                            textColorGroupItems.Set(*wxBLACK);
-                        }
-                        else
                             drawCudHighlight(rectItemsBack, pdi.fsObj->getSyncOperation());
 
                         if (IconBuffer* iconBuf = getIconManager().getIconBuffer()) //=> draw file icons
@@ -1056,6 +1027,10 @@ private:
                         rectGroupItems.x     += gapSize_;
                         rectGroupItems.width -= gapSize_;
 
+                                //mouse highlight: item name
+                        if (static_cast<HoverAreaGroup>(rowHover) == HoverAreaGroup::item)
+                                drawInsetRectangle(dc, rectItemsBack, fastFromDIP(1), *wxBLUE);
+
                         if (!pdi.fsObj->isEmpty<side>())
                             drawCellText(dc, rectGroupItems, itemName, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, &getTextExtentBuffered(dc, itemName));
                     }
@@ -1369,9 +1344,8 @@ public:
         //manage block highlighting and custom tooltip
         if (!selectionInProgress_)
         {
-            const wxPoint& topLeftAbs = refGrid().CalcUnscrolledPosition(clientPos);
-            const size_t row = refGrid().getRowAtPos(topLeftAbs.y); //return -1 for invalid position, rowCount if one past the end
-            const Grid::ColumnPosInfo cpi = refGrid().getColumnAtPos(topLeftAbs.x); //returns ColumnType::none if no column at x position!
+            const size_t              row = refGrid().getRowAtWinPos   (clientPos.y); //return -1 for invalid position, rowCount if past the end
+            const Grid::ColumnPosInfo cpi = refGrid().getColumnAtWinPos(clientPos.x); //returns ColumnType::none if no column at x position!
 
             if (row < refGrid().getRowCount() && cpi.colType != ColumnType::none &&
                 refGrid().getMainWin().GetClientRect().Contains(clientPos)) //cursor might have moved outside visible client area
diff --git a/FreeFileSync/Source/ui/gui_generated.cpp b/FreeFileSync/Source/ui/gui_generated.cpp
index 558ff915..56448cb3 100644
--- a/FreeFileSync/Source/ui/gui_generated.cpp
+++ b/FreeFileSync/Source/ui/gui_generated.cpp
@@ -11,1202 +11,1201 @@
 
 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( wxDefaultSize, wxDefaultSize );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
 
-    m_menubar = 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_menubar = 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_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_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_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_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_menuItemSaveAsBatch = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("Save as &batch job...") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuFile->Append( m_menuItemSaveAsBatch );
 
-    m_menuFile->AppendSeparator();
+	m_menuFile->AppendSeparator();
 
-    m_menuItemQuit = new wxMenuItem( m_menuFile, wxID_EXIT, wxString( _("E&xit") ), wxEmptyString, wxITEM_NORMAL );
-    m_menuFile->Append( m_menuItemQuit );
+	m_menuItemQuit = new wxMenuItem( m_menuFile, wxID_EXIT, wxString( _("E&xit") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuFile->Append( m_menuItemQuit );
 
-    m_menubar->Append( m_menuFile, _("&File") );
+	m_menubar->Append( m_menuFile, _("&File") );
 
-    m_menuActions = new wxMenu();
-    m_menuItemShowLog = new wxMenuItem( m_menuActions, wxID_ANY, wxString( _("Show &log") ) + wxT('\t') + wxT("F4"), wxEmptyString, wxITEM_NORMAL );
-    m_menuActions->Append( m_menuItemShowLog );
+	m_menuActions = new wxMenu();
+	m_menuItemShowLog = new wxMenuItem( m_menuActions, wxID_ANY, wxString( _("Show &log") ) + wxT('\t') + wxT("F4"), wxEmptyString, wxITEM_NORMAL );
+	m_menuActions->Append( m_menuItemShowLog );
 
-    m_menuActions->AppendSeparator();
+	m_menuActions->AppendSeparator();
 
-    m_menuItemCompare = new wxMenuItem( m_menuActions, wxID_ANY, wxString( _("Start &comparison") ) + wxT('\t') + wxT("F5"), wxEmptyString, wxITEM_NORMAL );
-    m_menuActions->Append( m_menuItemCompare );
+	m_menuItemCompare = new wxMenuItem( m_menuActions, wxID_ANY, wxString( _("Start &comparison") ) + wxT('\t') + wxT("F5"), wxEmptyString, wxITEM_NORMAL );
+	m_menuActions->Append( m_menuItemCompare );
 
-    m_menuActions->AppendSeparator();
+	m_menuActions->AppendSeparator();
 
-    m_menuItemCompSettings = new wxMenuItem( m_menuActions, wxID_ANY, wxString( _("C&omparison settings") ) + wxT('\t') + wxT("F6"), wxEmptyString, wxITEM_NORMAL );
-    m_menuActions->Append( m_menuItemCompSettings );
+	m_menuItemCompSettings = new wxMenuItem( m_menuActions, wxID_ANY, wxString( _("C&omparison settings") ) + wxT('\t') + wxT("F6"), wxEmptyString, wxITEM_NORMAL );
+	m_menuActions->Append( m_menuItemCompSettings );
 
-    m_menuItemFilter = new wxMenuItem( m_menuActions, wxID_ANY, wxString( _("&Filter settings") ) + wxT('\t') + wxT("F7"), wxEmptyString, wxITEM_NORMAL );
-    m_menuActions->Append( m_menuItemFilter );
+	m_menuItemFilter = new wxMenuItem( m_menuActions, wxID_ANY, wxString( _("&Filter settings") ) + wxT('\t') + wxT("F7"), wxEmptyString, wxITEM_NORMAL );
+	m_menuActions->Append( m_menuItemFilter );
 
-    m_menuItemSyncSettings = new wxMenuItem( m_menuActions, wxID_ANY, wxString( _("S&ynchronization settings") ) + wxT('\t') + wxT("F8"), wxEmptyString, wxITEM_NORMAL );
-    m_menuActions->Append( m_menuItemSyncSettings );
+	m_menuItemSyncSettings = new wxMenuItem( m_menuActions, wxID_ANY, wxString( _("S&ynchronization settings") ) + wxT('\t') + wxT("F8"), wxEmptyString, wxITEM_NORMAL );
+	m_menuActions->Append( m_menuItemSyncSettings );
 
-    m_menuActions->AppendSeparator();
+	m_menuActions->AppendSeparator();
 
-    m_menuItemSynchronize = new wxMenuItem( m_menuActions, wxID_ANY, wxString( _("Start &synchronization") ) + wxT('\t') + wxT("F9"), wxEmptyString, wxITEM_NORMAL );
-    m_menuActions->Append( m_menuItemSynchronize );
+	m_menuItemSynchronize = new wxMenuItem( m_menuActions, wxID_ANY, wxString( _("Start &synchronization") ) + wxT('\t') + wxT("F9"), wxEmptyString, wxITEM_NORMAL );
+	m_menuActions->Append( m_menuItemSynchronize );
 
-    m_menubar->Append( m_menuActions, _("&Actions") );
+	m_menubar->Append( m_menuActions, _("&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_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_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_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 );
+	m_menuItemFind = new wxMenuItem( m_menuTools, wxID_FIND, wxString( _("&Find...") ) + wxT('\t') + wxT("Ctrl+F"), wxEmptyString, wxITEM_NORMAL );
+	m_menuTools->Append( m_menuItemFind );
 
-    m_menuItemExportList = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("&Export file list...") ), wxEmptyString, wxITEM_NORMAL );
-    m_menuTools->Append( m_menuItemExportList );
+	m_menuItemExportList = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("&Export file list...") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuTools->Append( m_menuItemExportList );
 
-    m_menuTools->AppendSeparator();
+	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_menuItemResetLayout = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("&Reset layout") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuTools->Append( m_menuItemResetLayout );
 
-    m_menuItemShowMain = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("dummy") ), wxEmptyString, wxITEM_NORMAL );
-    m_menuTools->Append( m_menuItemShowMain );
+	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_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_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_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_menuItemShowOverview = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("dummy") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuTools->Append( m_menuItemShowOverview );
 
-    m_menubar->Append( m_menuTools, _("&Tools") );
+	m_menubar->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 = 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_menuHelp->AppendSeparator();
 
-    m_menuItemCheckVersionNow = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("&Check for updates now") ), wxEmptyString, wxITEM_NORMAL );
-    m_menuHelp->Append( m_menuItemCheckVersionNow );
+	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_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_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_menuItemAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About") ) + wxT('\t') + wxT("Shift+F1"), wxEmptyString, wxITEM_NORMAL );
+	m_menuHelp->Append( m_menuItemAbout );
 
-    m_menubar->Append( m_menuHelp, _("&Help") );
+	m_menubar->Append( m_menuHelp, _("&Help") );
 
-    this->SetMenuBar( m_menubar );
+	this->SetMenuBar( m_menubar );
 
-    bSizerPanelHolder = new wxBoxSizer( wxVERTICAL );
+	bSizerPanelHolder = new wxBoxSizer( wxVERTICAL );
 
-    m_panelTopButtons = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelTopButtons->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panelTopButtons = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelTopButtons->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer1791;
-    bSizer1791 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer1791;
+	bSizer1791 = new wxBoxSizer( wxVERTICAL );
 
-    bSizerTopButtons = new wxBoxSizer( wxHORIZONTAL );
+	bSizerTopButtons = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer261;
-    bSizer261 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer261;
+	bSizer261 = new wxBoxSizer( wxHORIZONTAL );
 
 
-    bSizer261->Add( 0, 0, 1, 0, 5 );
+	bSizer261->Add( 0, 0, 1, 0, 5 );
 
-    m_bpButtonCmpConfig = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonCmpConfig->SetToolTip( _("dummy") );
+	m_bpButtonCmpConfig = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonCmpConfig->SetToolTip( _("dummy") );
 
-    bSizer261->Add( m_bpButtonCmpConfig, 0, wxEXPAND, 5 );
+	bSizer261->Add( m_bpButtonCmpConfig, 0, wxEXPAND, 5 );
 
 
-    bSizer261->Add( 4, 0, 0, 0, 5 );
+	bSizer261->Add( 4, 0, 0, 0, 5 );
 
-    m_buttonCancel = new wxButton( m_panelTopButtons, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_buttonCancel->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-    m_buttonCancel->Enable( false );
-    m_buttonCancel->Hide();
+	m_buttonCancel = new wxButton( m_panelTopButtons, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_buttonCancel->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonCancel->Enable( false );
+	m_buttonCancel->Hide();
 
-    bSizer261->Add( m_buttonCancel, 0, wxEXPAND, 5 );
+	bSizer261->Add( m_buttonCancel, 0, wxEXPAND, 5 );
 
-    m_buttonCompare = new zen::BitmapTextButton( m_panelTopButtons, wxID_ANY, _("Compare"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	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(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-    m_buttonCompare->SetToolTip( _("dummy") );
+	m_buttonCompare->SetDefault();
+	m_buttonCompare->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonCompare->SetToolTip( _("dummy") );
 
-    bSizer261->Add( m_buttonCompare, 0, wxEXPAND, 5 );
+	bSizer261->Add( m_buttonCompare, 0, wxEXPAND, 5 );
 
-    m_bpButtonCmpContext = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonCmpContext->SetToolTip( _("dummy") );
+	m_bpButtonCmpContext = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonCmpContext->SetToolTip( _("dummy") );
 
-    bSizer261->Add( m_bpButtonCmpContext, 0, wxEXPAND, 5 );
+	bSizer261->Add( m_bpButtonCmpContext, 0, wxEXPAND, 5 );
 
 
-    bSizer261->Add( 0, 0, 1, 0, 5 );
+	bSizer261->Add( 0, 0, 1, 0, 5 );
 
 
-    bSizerTopButtons->Add( bSizer261, 1, wxEXPAND, 5 );
+	bSizerTopButtons->Add( bSizer261, 1, wxEXPAND, 5 );
 
 
-    bSizerTopButtons->Add( 5, 2, 0, 0, 5 );
+	bSizerTopButtons->Add( 5, 2, 0, 0, 5 );
 
-    wxBoxSizer* bSizer199;
-    bSizer199 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer199;
+	bSizer199 = new wxBoxSizer( wxHORIZONTAL );
 
 
-    bSizer199->Add( 0, 0, 1, 0, 5 );
+	bSizer199->Add( 0, 0, 1, 0, 5 );
 
-    m_bpButtonFilter = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0|wxFULL_REPAINT_ON_RESIZE );
-    m_bpButtonFilter->SetToolTip( _("dummy") );
+	m_bpButtonFilter = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0|wxFULL_REPAINT_ON_RESIZE );
+	m_bpButtonFilter->SetToolTip( _("dummy") );
 
-    bSizer199->Add( m_bpButtonFilter, 0, wxEXPAND, 5 );
+	bSizer199->Add( m_bpButtonFilter, 0, wxEXPAND, 5 );
 
-    m_bpButtonFilterContext = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonFilterContext->SetToolTip( _("dummy") );
+	m_bpButtonFilterContext = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonFilterContext->SetToolTip( _("dummy") );
 
-    bSizer199->Add( m_bpButtonFilterContext, 0, wxEXPAND, 5 );
+	bSizer199->Add( m_bpButtonFilterContext, 0, wxEXPAND, 5 );
 
 
-    bSizer199->Add( 0, 0, 1, 0, 5 );
+	bSizer199->Add( 0, 0, 1, 0, 5 );
 
 
-    bSizerTopButtons->Add( bSizer199, 0, wxEXPAND, 5 );
+	bSizerTopButtons->Add( bSizer199, 0, wxEXPAND, 5 );
 
 
-    bSizerTopButtons->Add( 5, 2, 0, 0, 5 );
+	bSizerTopButtons->Add( 5, 2, 0, 0, 5 );
 
-    wxBoxSizer* bSizer262;
-    bSizer262 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer262;
+	bSizer262 = new wxBoxSizer( wxHORIZONTAL );
 
 
-    bSizer262->Add( 0, 0, 1, 0, 5 );
+	bSizer262->Add( 0, 0, 1, 0, 5 );
 
-    m_bpButtonSyncConfig = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonSyncConfig->SetToolTip( _("dummy") );
+	m_bpButtonSyncConfig = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonSyncConfig->SetToolTip( _("dummy") );
 
-    bSizer262->Add( m_bpButtonSyncConfig, 0, wxEXPAND, 5 );
+	bSizer262->Add( m_bpButtonSyncConfig, 0, wxEXPAND, 5 );
 
 
-    bSizer262->Add( 4, 0, 0, 0, 5 );
+	bSizer262->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(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-    m_buttonSync->SetToolTip( _("dummy") );
+	m_buttonSync = new zen::BitmapTextButton( m_panelTopButtons, wxID_ANY, _("Synchronize"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_buttonSync->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonSync->SetToolTip( _("dummy") );
 
-    bSizer262->Add( m_buttonSync, 0, wxEXPAND, 5 );
+	bSizer262->Add( m_buttonSync, 0, wxEXPAND, 5 );
 
-    m_bpButtonSyncContext = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonSyncContext->SetToolTip( _("dummy") );
+	m_bpButtonSyncContext = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonSyncContext->SetToolTip( _("dummy") );
 
-    bSizer262->Add( m_bpButtonSyncContext, 0, wxEXPAND, 5 );
+	bSizer262->Add( m_bpButtonSyncContext, 0, wxEXPAND, 5 );
 
 
-    bSizer262->Add( 0, 0, 1, 0, 5 );
+	bSizer262->Add( 0, 0, 1, 0, 5 );
 
 
-    bSizerTopButtons->Add( bSizer262, 1, wxEXPAND, 5 );
+	bSizerTopButtons->Add( bSizer262, 1, wxEXPAND, 5 );
 
 
-    bSizer1791->Add( bSizerTopButtons, 1, wxEXPAND, 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_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, wxTAB_TRAVERSAL|wxBORDER_STATIC );
-    wxBoxSizer* bSizer1601;
-    bSizer1601 = new wxBoxSizer( wxVERTICAL );
+	m_panelDirectoryPairs = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL|wxBORDER_STATIC );
+	wxBoxSizer* bSizer1601;
+	bSizer1601 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer91;
-    bSizer91 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer91;
+	bSizer91 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_panelTopLeft = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelTopLeft->SetMinSize( wxSize( 1, -1 ) );
+	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 );
+	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 );
+	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 );
+	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 );
+	wxBoxSizer* bSizer159;
+	bSizer159 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bpButtonAddPair = new wxBitmapButton( m_panelTopLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonAddPair->SetToolTip( _("Add folder pair") );
+	m_bpButtonAddPair = new wxBitmapButton( m_panelTopLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonAddPair->SetToolTip( _("Add folder pair") );
 
-    bSizer159->Add( m_bpButtonAddPair, 0, wxEXPAND, 5 );
+	bSizer159->Add( m_bpButtonAddPair, 0, wxEXPAND, 5 );
 
-    m_bpButtonRemovePair = new wxBitmapButton( m_panelTopLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
+	m_bpButtonRemovePair = new wxBitmapButton( m_panelTopLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
 
-    bSizer159->Add( m_bpButtonRemovePair, 0, wxEXPAND, 5 );
+	bSizer159->Add( m_bpButtonRemovePair, 0, wxEXPAND, 5 );
 
 
-    fgSizer8->Add( bSizer159, 0, wxEXPAND, 5 );
+	fgSizer8->Add( bSizer159, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer182;
-    bSizer182 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer182;
+	bSizer182 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_folderPathLeft = new fff::FolderHistoryBox( m_panelTopLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
-    bSizer182->Add( m_folderPathLeft, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	m_folderPathLeft = new fff::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") );
+	m_buttonSelectFolderLeft = new wxButton( m_panelTopLeft, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonSelectFolderLeft->SetToolTip( _("Select a folder") );
 
-    bSizer182->Add( m_buttonSelectFolderLeft, 0, wxEXPAND, 5 );
+	bSizer182->Add( m_buttonSelectFolderLeft, 0, wxEXPAND, 5 );
 
-    m_bpButtonSelectAltFolderLeft = new wxBitmapButton( m_panelTopLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonSelectAltFolderLeft->SetToolTip( _("Access online storage") );
+	m_bpButtonSelectAltFolderLeft = new wxBitmapButton( m_panelTopLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonSelectAltFolderLeft->SetToolTip( _("Access online storage") );
 
-    bSizer182->Add( m_bpButtonSelectAltFolderLeft, 0, wxEXPAND, 5 );
+	bSizer182->Add( m_bpButtonSelectAltFolderLeft, 0, wxEXPAND, 5 );
 
 
-    fgSizer8->Add( bSizer182, 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_BOTTOM, 5 );
+	m_panelTopLeft->SetSizer( fgSizer8 );
+	m_panelTopLeft->Layout();
+	fgSizer8->Fit( m_panelTopLeft );
+	bSizer91->Add( m_panelTopLeft, 1, wxLEFT|wxALIGN_BOTTOM, 5 );
 
-    m_panelTopCenter = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    wxBoxSizer* bSizer1771;
-    bSizer1771 = new wxBoxSizer( wxVERTICAL );
+	m_panelTopCenter = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer1771;
+	bSizer1771 = new wxBoxSizer( wxVERTICAL );
 
-    m_bpButtonSwapSides = new wxBitmapButton( m_panelTopCenter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonSwapSides->SetToolTip( _("dummy") );
+	m_bpButtonSwapSides = new wxBitmapButton( m_panelTopCenter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonSwapSides->SetToolTip( _("dummy") );
 
-    bSizer1771->Add( m_bpButtonSwapSides, 0, wxEXPAND, 5 );
+	bSizer1771->Add( m_bpButtonSwapSides, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer160;
-    bSizer160 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer160;
+	bSizer160 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bpButtonLocalCompCfg = new wxBitmapButton( m_panelTopCenter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonLocalCompCfg->SetToolTip( _("dummy") );
+	m_bpButtonLocalCompCfg = new wxBitmapButton( m_panelTopCenter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonLocalCompCfg->SetToolTip( _("dummy") );
 
-    bSizer160->Add( m_bpButtonLocalCompCfg, 0, wxEXPAND, 5 );
+	bSizer160->Add( m_bpButtonLocalCompCfg, 0, wxEXPAND, 5 );
 
-    m_bpButtonLocalFilter = new wxBitmapButton( m_panelTopCenter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonLocalFilter->SetToolTip( _("dummy") );
+	m_bpButtonLocalFilter = new wxBitmapButton( m_panelTopCenter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonLocalFilter->SetToolTip( _("dummy") );
 
-    bSizer160->Add( m_bpButtonLocalFilter, 0, wxEXPAND, 5 );
+	bSizer160->Add( m_bpButtonLocalFilter, 0, wxEXPAND, 5 );
 
-    m_bpButtonLocalSyncCfg = new wxBitmapButton( m_panelTopCenter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonLocalSyncCfg->SetToolTip( _("dummy") );
+	m_bpButtonLocalSyncCfg = new wxBitmapButton( m_panelTopCenter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonLocalSyncCfg->SetToolTip( _("dummy") );
 
-    bSizer160->Add( m_bpButtonLocalSyncCfg, 0, wxEXPAND, 5 );
+	bSizer160->Add( m_bpButtonLocalSyncCfg, 0, wxEXPAND, 5 );
 
 
-    bSizer1771->Add( bSizer160, 1, wxALIGN_CENTER_HORIZONTAL, 5 );
+	bSizer1771->Add( bSizer160, 1, wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-    m_panelTopCenter->SetSizer( bSizer1771 );
-    m_panelTopCenter->Layout();
-    bSizer1771->Fit( m_panelTopCenter );
-    bSizer91->Add( m_panelTopCenter, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+	m_panelTopCenter->SetSizer( bSizer1771 );
+	m_panelTopCenter->Layout();
+	bSizer1771->Fit( m_panelTopCenter );
+	bSizer91->Add( m_panelTopCenter, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_panelTopRight = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelTopRight->SetMinSize( wxSize( 1, -1 ) );
+	m_panelTopRight = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelTopRight->SetMinSize( wxSize( 1,-1 ) );
 
-    wxBoxSizer* bSizer183;
-    bSizer183 = new wxBoxSizer( wxVERTICAL );
+	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 );
+	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 );
+	wxBoxSizer* bSizer179;
+	bSizer179 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_folderPathRight = new fff::FolderHistoryBox( m_panelTopRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
-    bSizer179->Add( m_folderPathRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	m_folderPathRight = new fff::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") );
+	m_buttonSelectFolderRight = new wxButton( m_panelTopRight, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonSelectFolderRight->SetToolTip( _("Select a folder") );
 
-    bSizer179->Add( m_buttonSelectFolderRight, 0, wxEXPAND, 5 );
+	bSizer179->Add( m_buttonSelectFolderRight, 0, wxEXPAND, 5 );
 
-    m_bpButtonSelectAltFolderRight = new wxBitmapButton( m_panelTopRight, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonSelectAltFolderRight->SetToolTip( _("Access online storage") );
+	m_bpButtonSelectAltFolderRight = new wxBitmapButton( m_panelTopRight, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonSelectAltFolderRight->SetToolTip( _("Access online storage") );
 
-    bSizer179->Add( m_bpButtonSelectAltFolderRight, 0, wxEXPAND, 5 );
+	bSizer179->Add( m_bpButtonSelectAltFolderRight, 0, wxEXPAND, 5 );
 
 
-    bSizer183->Add( bSizer179, 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, wxRIGHT|wxALIGN_BOTTOM, 5 );
+	m_panelTopRight->SetSizer( bSizer183 );
+	m_panelTopRight->Layout();
+	bSizer183->Fit( m_panelTopRight );
+	bSizer91->Add( m_panelTopRight, 1, wxRIGHT|wxALIGN_BOTTOM, 5 );
 
 
-    bSizer1601->Add( bSizer91, 0, wxEXPAND, 5 );
+	bSizer1601->Add( bSizer91, 0, wxEXPAND, 5 );
 
-    m_scrolledWindowFolderPairs = new wxScrolledWindow( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxSize( -1, -1 ), wxHSCROLL|wxVSCROLL );
-    m_scrolledWindowFolderPairs->SetScrollRate( 5, 5 );
-    m_scrolledWindowFolderPairs->SetMinSize( wxSize( -1, 0 ) );
+	m_scrolledWindowFolderPairs = new wxScrolledWindow( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxHSCROLL|wxVSCROLL );
+	m_scrolledWindowFolderPairs->SetScrollRate( 5, 5 );
+	m_scrolledWindowFolderPairs->SetMinSize( wxSize( -1,0 ) );
 
-    bSizerAddFolderPairs = new wxBoxSizer( wxVERTICAL );
+	bSizerAddFolderPairs = new wxBoxSizer( wxVERTICAL );
 
 
-    m_scrolledWindowFolderPairs->SetSizer( bSizerAddFolderPairs );
-    m_scrolledWindowFolderPairs->Layout();
-    bSizerAddFolderPairs->Fit( m_scrolledWindowFolderPairs );
-    bSizer1601->Add( m_scrolledWindowFolderPairs, 1, wxEXPAND, 5 );
+	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_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, 0, 0, 5 );
+	m_gridOverview = new zen::Grid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
+	m_gridOverview->SetScrollRate( 5, 5 );
+	bSizerPanelHolder->Add( m_gridOverview, 0, 0, 5 );
 
-    m_panelCenter = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    wxBoxSizer* bSizer1711;
-    bSizer1711 = new wxBoxSizer( wxVERTICAL );
+	m_panelCenter = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer1711;
+	bSizer1711 = new wxBoxSizer( wxVERTICAL );
 
-    m_splitterMain = new fff::TripleSplitter( m_panelCenter, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    wxBoxSizer* bSizer1781;
-    bSizer1781 = new wxBoxSizer( wxHORIZONTAL );
+	m_splitterMain = new fff::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_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_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_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_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, wxTAB_TRAVERSAL|wxBORDER_STATIC );
-    wxBoxSizer* bSizer451;
-    bSizer451 = new wxBoxSizer( wxHORIZONTAL );
+	m_panelStatusBar = new wxPanel( m_panelCenter, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL|wxBORDER_STATIC );
+	wxBoxSizer* bSizer451;
+	bSizer451 = new wxBoxSizer( wxHORIZONTAL );
 
-    bSizerFileStatus = new wxBoxSizer( wxHORIZONTAL );
+	bSizerFileStatus = new wxBoxSizer( wxHORIZONTAL );
 
-    bSizerStatusLeft = new wxBoxSizer( wxHORIZONTAL );
+	bSizerStatusLeft = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer53;
-    bSizer53 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer53;
+	bSizer53 = new wxBoxSizer( wxHORIZONTAL );
 
 
-    bSizer53->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer53->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
 
-    bSizerStatusLeftDirectories = new wxBoxSizer( wxHORIZONTAL );
+	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 );
+	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 );
+	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 );
+	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 );
+	bSizer53->Add( bSizerStatusLeftDirectories, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    bSizerStatusLeftFiles = new wxBoxSizer( wxHORIZONTAL );
+	bSizerStatusLeftFiles = new wxBoxSizer( wxHORIZONTAL );
 
 
-    bSizerStatusLeftFiles->Add( 10, 0, 0, 0, 5 );
+	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 );
+	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 );
+	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 );
+	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 );
+	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 );
+	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( bSizerStatusLeftFiles, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer53->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer53->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizerStatusLeft->Add( bSizer53, 1, wxEXPAND, 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 );
+	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( bSizerStatusLeft, 1, wxEXPAND, 5 );
 
 
-    bSizerFileStatus->Add( 26, 0, 0, wxALIGN_CENTER_VERTICAL, 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 );
+	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 );
+	bSizerFileStatus->Add( 26, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    bSizerStatusRight = new wxBoxSizer( wxHORIZONTAL );
+	bSizerStatusRight = new wxBoxSizer( wxHORIZONTAL );
 
-    m_staticline10 = new wxStaticLine( m_panelStatusBar, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizerStatusRight->Add( m_staticline10, 0, wxEXPAND|wxTOP, 2 );
+	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 );
+	wxBoxSizer* bSizer52;
+	bSizer52 = new wxBoxSizer( wxHORIZONTAL );
 
 
-    bSizer52->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer52->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
 
-    bSizerStatusRightDirectories = new wxBoxSizer( wxHORIZONTAL );
+	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 );
+	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 );
+	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 );
+	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 );
+	bSizer52->Add( bSizerStatusRightDirectories, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    bSizerStatusRightFiles = new wxBoxSizer( wxHORIZONTAL );
+	bSizerStatusRightFiles = new wxBoxSizer( wxHORIZONTAL );
 
 
-    bSizerStatusRightFiles->Add( 10, 0, 0, 0, 5 );
+	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 );
+	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 );
+	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 );
+	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 );
+	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 );
+	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( bSizerStatusRightFiles, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer52->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer52->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizerStatusRight->Add( bSizer52, 1, wxEXPAND, 5 );
+	bSizerStatusRight->Add( bSizer52, 1, wxEXPAND, 5 );
 
 
-    bSizerFileStatus->Add( bSizerStatusRight, 1, wxEXPAND, 5 );
+	bSizerFileStatus->Add( bSizerStatusRight, 1, wxEXPAND, 5 );
 
 
-    bSizer451->Add( bSizerFileStatus, 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(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_staticTextFullStatus = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextFullStatus->Wrap( -1 );
+	m_staticTextFullStatus->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizer451->Add( m_staticTextFullStatus, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	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_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_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_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( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonHideSearch->SetToolTip( _("Close search bar") );
+	m_bpButtonHideSearch = new wxBitmapButton( m_panelSearch, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonHideSearch->SetToolTip( _("Close search bar") );
 
-    bSizer1713->Add( m_bpButtonHideSearch, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer1713->Add( m_bpButtonHideSearch, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 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_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( -1, -1 ), wxTE_PROCESS_ENTER|wxWANTS_CHARS );
-    bSizer1713->Add( m_textCtrlSearchTxt, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+	m_textCtrlSearchTxt = new wxTextCtrl( m_panelSearch, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_PROCESS_ENTER|wxWANTS_CHARS );
+	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_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_panelSearch->SetSizer( bSizer1713 );
+	m_panelSearch->Layout();
+	bSizer1713->Fit( m_panelSearch );
+	bSizerPanelHolder->Add( m_panelSearch, 0, 0, 5 );
 
-    m_panelLog = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelLog->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panelLog = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelLog->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    bSizerLog = new wxBoxSizer( wxVERTICAL );
+	bSizerLog = new wxBoxSizer( wxVERTICAL );
 
-    bSizer42 = new wxBoxSizer( wxHORIZONTAL );
+	bSizer42 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapSyncResult = new wxStaticBitmap( m_panelLog, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer42->Add( m_bitmapSyncResult, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	m_bitmapSyncResult = new wxStaticBitmap( m_panelLog, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer42->Add( m_bitmapSyncResult, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    m_staticTextSyncResult = new wxStaticText( m_panelLog, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextSyncResult->Wrap( -1 );
-    m_staticTextSyncResult->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_staticTextSyncResult = new wxStaticText( m_panelLog, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextSyncResult->Wrap( -1 );
+	m_staticTextSyncResult->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizer42->Add( m_staticTextSyncResult, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
+	bSizer42->Add( m_staticTextSyncResult, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
 
 
-    bSizer42->Add( 10, 0, 0, 0, 5 );
+	bSizer42->Add( 10, 0, 0, 0, 5 );
 
-    ffgSizer11 = new wxFlexGridSizer( 2, 0, 5, 5 );
-    ffgSizer11->SetFlexibleDirection( wxBOTH );
-    ffgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	ffgSizer11 = new wxFlexGridSizer( 2, 0, 5, 5 );
+	ffgSizer11->SetFlexibleDirection( wxBOTH );
+	ffgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    m_staticTextProcessed = new wxStaticText( m_panelLog, wxID_ANY, _("Processed:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextProcessed->Wrap( -1 );
-    ffgSizer11->Add( m_staticTextProcessed, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT, 5 );
+	m_staticTextProcessed = new wxStaticText( m_panelLog, wxID_ANY, _("Processed:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextProcessed->Wrap( -1 );
+	ffgSizer11->Add( m_staticTextProcessed, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT, 5 );
 
-    m_staticTextRemaining = new wxStaticText( m_panelLog, wxID_ANY, _("Remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextRemaining->Wrap( -1 );
-    ffgSizer11->Add( m_staticTextRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	m_staticTextRemaining = new wxStaticText( m_panelLog, wxID_ANY, _("Remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextRemaining->Wrap( -1 );
+	ffgSizer11->Add( m_staticTextRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
 
-    bSizer42->Add( ffgSizer11, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 10 );
+	bSizer42->Add( ffgSizer11, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 10 );
 
-    m_panelItemStats = new wxPanel( m_panelLog, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelItemStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	m_panelItemStats = new wxPanel( m_panelLog, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_panelItemStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer291;
-    bSizer291 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer291;
+	bSizer291 = new wxBoxSizer( wxVERTICAL );
 
-    ffgSizer111 = new wxFlexGridSizer( 0, 2, 5, 5 );
-    ffgSizer111->SetFlexibleDirection( wxBOTH );
-    ffgSizer111->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	ffgSizer111 = new wxFlexGridSizer( 0, 2, 5, 5 );
+	ffgSizer111->SetFlexibleDirection( wxBOTH );
+	ffgSizer111->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    wxBoxSizer* bSizer293;
-    bSizer293 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer293;
+	bSizer293 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapItemStat = new wxStaticBitmap( m_panelItemStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer293->Add( m_bitmapItemStat, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	m_bitmapItemStat = new wxStaticBitmap( m_panelItemStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer293->Add( m_bitmapItemStat, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
 
-    bSizer293->Add( 0, 0, 1, 0, 5 );
+	bSizer293->Add( 0, 0, 1, 0, 5 );
 
-    m_staticTextItemsProcessed = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_staticTextItemsProcessed->Wrap( -1 );
-    m_staticTextItemsProcessed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_staticTextItemsProcessed = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_staticTextItemsProcessed->Wrap( -1 );
+	m_staticTextItemsProcessed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizer293->Add( m_staticTextItemsProcessed, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer293->Add( m_staticTextItemsProcessed, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    ffgSizer111->Add( bSizer293, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	ffgSizer111->Add( bSizer293, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 
-    m_staticTextBytesProcessed = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextBytesProcessed->Wrap( -1 );
-    ffgSizer111->Add( m_staticTextBytesProcessed, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
+	m_staticTextBytesProcessed = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextBytesProcessed->Wrap( -1 );
+	ffgSizer111->Add( m_staticTextBytesProcessed, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
 
-    m_staticTextItemsRemaining = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_staticTextItemsRemaining->Wrap( -1 );
-    m_staticTextItemsRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_staticTextItemsRemaining = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_staticTextItemsRemaining->Wrap( -1 );
+	m_staticTextItemsRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    ffgSizer111->Add( m_staticTextItemsRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	ffgSizer111->Add( m_staticTextItemsRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticTextBytesRemaining = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextBytesRemaining->Wrap( -1 );
-    ffgSizer111->Add( m_staticTextBytesRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticTextBytesRemaining = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextBytesRemaining->Wrap( -1 );
+	ffgSizer111->Add( m_staticTextBytesRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer291->Add( ffgSizer111, 0, wxALL, 5 );
+	bSizer291->Add( ffgSizer111, 0, wxALL, 5 );
 
 
-    m_panelItemStats->SetSizer( bSizer291 );
-    m_panelItemStats->Layout();
-    bSizer291->Fit( m_panelItemStats );
-    bSizer42->Add( m_panelItemStats, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
+	m_panelItemStats->SetSizer( bSizer291 );
+	m_panelItemStats->Layout();
+	bSizer291->Fit( m_panelItemStats );
+	bSizer42->Add( m_panelItemStats, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
 
-    m_panelTimeStats = new wxPanel( m_panelLog, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelTimeStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	m_panelTimeStats = new wxPanel( m_panelLog, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_panelTimeStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer292;
-    bSizer292 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer292;
+	bSizer292 = new wxBoxSizer( wxVERTICAL );
 
-    ffgSizer112 = new wxFlexGridSizer( 0, 1, 5, 5 );
-    ffgSizer112->SetFlexibleDirection( wxBOTH );
-    ffgSizer112->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	ffgSizer112 = new wxFlexGridSizer( 0, 1, 5, 5 );
+	ffgSizer112->SetFlexibleDirection( wxBOTH );
+	ffgSizer112->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    wxBoxSizer* bSizer294;
-    bSizer294 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer294;
+	bSizer294 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapTimeStat = new wxStaticBitmap( m_panelTimeStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer294->Add( m_bitmapTimeStat, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	m_bitmapTimeStat = new wxStaticBitmap( m_panelTimeStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer294->Add( m_bitmapTimeStat, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
 
-    bSizer294->Add( 0, 0, 1, 0, 5 );
+	bSizer294->Add( 0, 0, 1, 0, 5 );
 
-    m_staticTextTimeElapsed = new wxStaticText( m_panelTimeStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextTimeElapsed->Wrap( -1 );
-    m_staticTextTimeElapsed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_staticTextTimeElapsed = new wxStaticText( m_panelTimeStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextTimeElapsed->Wrap( -1 );
+	m_staticTextTimeElapsed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizer294->Add( m_staticTextTimeElapsed, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer294->Add( m_staticTextTimeElapsed, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    ffgSizer112->Add( bSizer294, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	ffgSizer112->Add( bSizer294, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 
 
-    bSizer292->Add( ffgSizer112, 0, wxALL, 5 );
+	bSizer292->Add( ffgSizer112, 0, wxALL, 5 );
 
 
-    m_panelTimeStats->SetSizer( bSizer292 );
-    m_panelTimeStats->Layout();
-    bSizer292->Fit( m_panelTimeStats );
-    bSizer42->Add( m_panelTimeStats, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
+	m_panelTimeStats->SetSizer( bSizer292 );
+	m_panelTimeStats->Layout();
+	bSizer292->Fit( m_panelTimeStats );
+	bSizer42->Add( m_panelTimeStats, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
 
 
-    bSizerLog->Add( bSizer42, 0, wxLEFT, 5 );
+	bSizerLog->Add( bSizer42, 0, wxLEFT, 5 );
 
-    m_staticline70 = new wxStaticLine( m_panelLog, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerLog->Add( m_staticline70, 0, wxEXPAND, 5 );
+	m_staticline70 = new wxStaticLine( m_panelLog, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerLog->Add( m_staticline70, 0, wxEXPAND, 5 );
 
 
-    m_panelLog->SetSizer( bSizerLog );
-    m_panelLog->Layout();
-    bSizerLog->Fit( m_panelLog );
-    bSizerPanelHolder->Add( m_panelLog, 0, 0, 5 );
+	m_panelLog->SetSizer( bSizerLog );
+	m_panelLog->Layout();
+	bSizerLog->Fit( m_panelLog );
+	bSizerPanelHolder->Add( m_panelLog, 0, 0, 5 );
 
-    m_panelConfig = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelConfig->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panelConfig = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelConfig->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    bSizerConfig = new wxBoxSizer( wxHORIZONTAL );
+	bSizerConfig = new wxBoxSizer( wxHORIZONTAL );
 
-    bSizerCfgHistoryButtons = new wxBoxSizer( wxHORIZONTAL );
+	bSizerCfgHistoryButtons = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer17611;
-    bSizer17611 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer17611;
+	bSizer17611 = new wxBoxSizer( wxVERTICAL );
 
-    m_bpButtonNew = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonNew->SetToolTip( _("dummy") );
+	m_bpButtonNew = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonNew->SetToolTip( _("dummy") );
 
-    bSizer17611->Add( m_bpButtonNew, 0, wxEXPAND, 5 );
+	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 );
+	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 );
 
 
-    bSizerCfgHistoryButtons->Add( bSizer17611, 0, 0, 5 );
+	bSizerCfgHistoryButtons->Add( bSizer17611, 0, 0, 5 );
 
-    wxBoxSizer* bSizer1761;
-    bSizer1761 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer1761;
+	bSizer1761 = new wxBoxSizer( wxVERTICAL );
 
-    m_bpButtonOpen = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonOpen->SetToolTip( _("dummy") );
+	m_bpButtonOpen = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonOpen->SetToolTip( _("dummy") );
 
-    bSizer1761->Add( m_bpButtonOpen, 0, wxEXPAND, 5 );
+	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 );
+	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 );
 
 
-    bSizerCfgHistoryButtons->Add( bSizer1761, 0, 0, 5 );
+	bSizerCfgHistoryButtons->Add( bSizer1761, 0, 0, 5 );
 
-    wxBoxSizer* bSizer175;
-    bSizer175 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer175;
+	bSizer175 = new wxBoxSizer( wxVERTICAL );
 
-    m_bpButtonSave = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonSave->SetToolTip( _("dummy") );
+	m_bpButtonSave = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonSave->SetToolTip( _("dummy") );
 
-    bSizer175->Add( m_bpButtonSave, 0, wxEXPAND, 5 );
+	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 );
+	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 );
 
 
-    bSizerCfgHistoryButtons->Add( bSizer175, 0, 0, 5 );
+	bSizerCfgHistoryButtons->Add( bSizer175, 0, 0, 5 );
 
-    wxBoxSizer* bSizer174;
-    bSizer174 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer174;
+	bSizer174 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer1772;
-    bSizer1772 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer1772;
+	bSizer1772 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bpButtonSaveAs = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonSaveAs->SetToolTip( _("dummy") );
+	m_bpButtonSaveAs = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonSaveAs->SetToolTip( _("dummy") );
 
-    bSizer1772->Add( m_bpButtonSaveAs, 1, 0, 5 );
+	bSizer1772->Add( m_bpButtonSaveAs, 1, 0, 5 );
 
-    m_bpButtonSaveAsBatch = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonSaveAsBatch->SetToolTip( _("dummy") );
+	m_bpButtonSaveAsBatch = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonSaveAsBatch->SetToolTip( _("dummy") );
 
-    bSizer1772->Add( m_bpButtonSaveAsBatch, 1, 0, 5 );
+	bSizer1772->Add( m_bpButtonSaveAsBatch, 1, 0, 5 );
 
 
-    bSizer174->Add( bSizer1772, 0, wxEXPAND, 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 );
+	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 );
 
 
-    bSizerCfgHistoryButtons->Add( bSizer174, 0, 0, 5 );
+	bSizerCfgHistoryButtons->Add( bSizer174, 0, 0, 5 );
 
 
-    bSizerConfig->Add( bSizerCfgHistoryButtons, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizerConfig->Add( bSizerCfgHistoryButtons, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticline81 = new wxStaticLine( m_panelConfig, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerConfig->Add( m_staticline81, 0, wxEXPAND|wxTOP, 5 );
+	m_staticline81 = new wxStaticLine( m_panelConfig, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerConfig->Add( m_staticline81, 0, wxEXPAND|wxTOP, 5 );
 
-    m_gridCfgHistory = new zen::Grid( m_panelConfig, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
-    m_gridCfgHistory->SetScrollRate( 5, 5 );
-    bSizerConfig->Add( m_gridCfgHistory, 1, wxEXPAND, 5 );
+	m_gridCfgHistory = new zen::Grid( m_panelConfig, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
+	m_gridCfgHistory->SetScrollRate( 5, 5 );
+	bSizerConfig->Add( m_gridCfgHistory, 1, wxEXPAND, 5 );
 
 
-    m_panelConfig->SetSizer( bSizerConfig );
-    m_panelConfig->Layout();
-    bSizerConfig->Fit( m_panelConfig );
-    bSizerPanelHolder->Add( m_panelConfig, 0, 0, 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 );
-    m_panelViewFilter->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panelViewFilter = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelViewFilter->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    bSizerViewFilter = new wxBoxSizer( wxHORIZONTAL );
+	bSizerViewFilter = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bpButtonToggleLog = new wxBitmapButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
-    bSizerViewFilter->Add( m_bpButtonToggleLog, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bpButtonToggleLog = new wxBitmapButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+	bSizerViewFilter->Add( m_bpButtonToggleLog, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-    bSizerViewFilter->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizerViewFilter->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_bpButtonViewType = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizerViewFilter->Add( m_bpButtonViewType, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	m_bpButtonViewType = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizerViewFilter->Add( m_bpButtonViewType, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
-    wxBoxSizer* bSizer300;
-    bSizer300 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer300;
+	bSizer300 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bpButtonShowExcluded = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizer300->Add( m_bpButtonShowExcluded, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT, 5 );
+	m_bpButtonShowExcluded = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizer300->Add( m_bpButtonShowExcluded, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT, 5 );
 
-    m_bpButtonShowDeleteLeft = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizer300->Add( m_bpButtonShowDeleteLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bpButtonShowDeleteLeft = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizer300->Add( m_bpButtonShowDeleteLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_bpButtonShowUpdateLeft = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizer300->Add( m_bpButtonShowUpdateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bpButtonShowUpdateLeft = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizer300->Add( m_bpButtonShowUpdateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_bpButtonShowCreateLeft = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizer300->Add( m_bpButtonShowCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bpButtonShowCreateLeft = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizer300->Add( m_bpButtonShowCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_bpButtonShowLeftOnly = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizer300->Add( m_bpButtonShowLeftOnly, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bpButtonShowLeftOnly = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizer300->Add( m_bpButtonShowLeftOnly, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_bpButtonShowLeftNewer = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizer300->Add( m_bpButtonShowLeftNewer, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bpButtonShowLeftNewer = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizer300->Add( m_bpButtonShowLeftNewer, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_bpButtonShowEqual = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizer300->Add( m_bpButtonShowEqual, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bpButtonShowEqual = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizer300->Add( m_bpButtonShowEqual, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_bpButtonShowDoNothing = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizer300->Add( m_bpButtonShowDoNothing, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bpButtonShowDoNothing = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizer300->Add( m_bpButtonShowDoNothing, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_bpButtonShowDifferent = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizer300->Add( m_bpButtonShowDifferent, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bpButtonShowDifferent = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizer300->Add( m_bpButtonShowDifferent, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_bpButtonShowRightNewer = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizer300->Add( m_bpButtonShowRightNewer, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bpButtonShowRightNewer = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizer300->Add( m_bpButtonShowRightNewer, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_bpButtonShowRightOnly = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizer300->Add( m_bpButtonShowRightOnly, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bpButtonShowRightOnly = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizer300->Add( m_bpButtonShowRightOnly, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_bpButtonShowCreateRight = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizer300->Add( m_bpButtonShowCreateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bpButtonShowCreateRight = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizer300->Add( m_bpButtonShowCreateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_bpButtonShowUpdateRight = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizer300->Add( m_bpButtonShowUpdateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bpButtonShowUpdateRight = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizer300->Add( m_bpButtonShowUpdateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_bpButtonShowDeleteRight = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizer300->Add( m_bpButtonShowDeleteRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bpButtonShowDeleteRight = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizer300->Add( m_bpButtonShowDeleteRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_bpButtonShowConflict = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizer300->Add( m_bpButtonShowConflict, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bpButtonShowConflict = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizer300->Add( m_bpButtonShowConflict, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_bpButtonViewFilterContext = new wxBitmapButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizer300->Add( m_bpButtonViewFilterContext, 0, wxEXPAND, 5 );
+	m_bpButtonViewFilterContext = new wxBitmapButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizer300->Add( m_bpButtonViewFilterContext, 0, wxEXPAND, 5 );
 
 
-    bSizerViewFilter->Add( bSizer300, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizerViewFilter->Add( bSizer300, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizerViewFilter->Add( 0, 0, 1, wxEXPAND, 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_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, wxTAB_TRAVERSAL|wxBORDER_SUNKEN );
-    m_panelStatistics->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panelStatistics = new wxPanel( m_panelViewFilter, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL|wxBORDER_SUNKEN );
+	m_panelStatistics->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    bSizer1801 = new wxBoxSizer( wxVERTICAL );
+	bSizer1801 = new wxBoxSizer( wxVERTICAL );
 
-    bSizerStatistics = new wxBoxSizer( wxHORIZONTAL );
+	bSizerStatistics = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer173;
-    bSizer173 = new wxBoxSizer( wxVERTICAL );
+	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") );
+	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( m_bitmapDeleteLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer173->Add( 5, 2, 0, 0, 5 );
+	bSizer173->Add( 5, 2, 0, 0, 5 );
 
 
-    bSizer173->Add( 0, 0, 1, wxEXPAND, 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") );
+	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 );
+	bSizer173->Add( m_staticTextDeleteLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizerStatistics->Add( bSizer173, 0, wxEXPAND, 5 );
+	bSizerStatistics->Add( bSizer173, 0, wxEXPAND, 5 );
 
 
-    bSizerStatistics->Add( 5, 5, 0, 0, 5 );
+	bSizerStatistics->Add( 5, 5, 0, 0, 5 );
 
-    wxBoxSizer* bSizer172;
-    bSizer172 = new wxBoxSizer( wxVERTICAL );
+	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") );
+	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( m_bitmapUpdateLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer172->Add( 5, 2, 0, 0, 5 );
+	bSizer172->Add( 5, 2, 0, 0, 5 );
 
 
-    bSizer172->Add( 0, 0, 1, wxEXPAND, 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") );
+	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 );
+	bSizer172->Add( m_staticTextUpdateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-    bSizerStatistics->Add( bSizer172, 0, wxEXPAND, 5 );
+	bSizerStatistics->Add( bSizer172, 0, wxEXPAND, 5 );
 
 
-    bSizerStatistics->Add( 5, 5, 0, 0, 5 );
+	bSizerStatistics->Add( 5, 5, 0, 0, 5 );
 
-    wxBoxSizer* bSizer1712;
-    bSizer1712 = new wxBoxSizer( wxVERTICAL );
+	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") );
+	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( m_bitmapCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-    bSizer1712->Add( 5, 2, 0, 0, 5 );
+	bSizer1712->Add( 5, 2, 0, 0, 5 );
 
 
-    bSizer1712->Add( 0, 0, 1, wxEXPAND, 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") );
+	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 );
+	bSizer1712->Add( m_staticTextCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-    bSizerStatistics->Add( bSizer1712, 0, wxEXPAND, 5 );
+	bSizerStatistics->Add( bSizer1712, 0, wxEXPAND, 5 );
 
 
-    bSizerStatistics->Add( 5, 5, 0, 0, 5 );
+	bSizerStatistics->Add( 5, 5, 0, 0, 5 );
 
-    bSizerData = new wxBoxSizer( wxVERTICAL );
+	bSizerData = new wxBoxSizer( wxVERTICAL );
 
-    m_bitmapData = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapData->SetToolTip( _("Total bytes to copy") );
+	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( m_bitmapData, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-    bSizerData->Add( 5, 2, 0, 0, 5 );
+	bSizerData->Add( 5, 2, 0, 0, 5 );
 
 
-    bSizerData->Add( 0, 0, 1, wxEXPAND, 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") );
+	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 );
+	bSizerData->Add( m_staticTextData, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizerStatistics->Add( bSizerData, 0, wxEXPAND, 5 );
+	bSizerStatistics->Add( bSizerData, 0, wxEXPAND, 5 );
 
 
-    bSizerStatistics->Add( 5, 5, 0, 0, 5 );
+	bSizerStatistics->Add( 5, 5, 0, 0, 5 );
 
-    wxBoxSizer* bSizer178;
-    bSizer178 = new wxBoxSizer( wxVERTICAL );
+	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") );
+	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( m_bitmapCreateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-    bSizer178->Add( 5, 2, 0, 0, 5 );
+	bSizer178->Add( 5, 2, 0, 0, 5 );
 
 
-    bSizer178->Add( 0, 0, 1, wxEXPAND, 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") );
+	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 );
+	bSizer178->Add( m_staticTextCreateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizerStatistics->Add( bSizer178, 0, wxEXPAND, 5 );
+	bSizerStatistics->Add( bSizer178, 0, wxEXPAND, 5 );
 
 
-    bSizerStatistics->Add( 5, 5, 0, 0, 5 );
+	bSizerStatistics->Add( 5, 5, 0, 0, 5 );
 
-    wxBoxSizer* bSizer177;
-    bSizer177 = new wxBoxSizer( wxVERTICAL );
+	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") );
+	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( m_bitmapUpdateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-    bSizer177->Add( 5, 2, 0, 0, 5 );
+	bSizer177->Add( 5, 2, 0, 0, 5 );
 
 
-    bSizer177->Add( 0, 0, 1, wxEXPAND, 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") );
+	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 );
+	bSizer177->Add( m_staticTextUpdateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizerStatistics->Add( bSizer177, 0, wxEXPAND, 5 );
+	bSizerStatistics->Add( bSizer177, 0, wxEXPAND, 5 );
 
 
-    bSizerStatistics->Add( 5, 5, 0, 0, 5 );
+	bSizerStatistics->Add( 5, 5, 0, 0, 5 );
 
-    wxBoxSizer* bSizer176;
-    bSizer176 = new wxBoxSizer( wxVERTICAL );
+	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") );
+	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( m_bitmapDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer176->Add( 5, 2, 0, 0, 5 );
+	bSizer176->Add( 5, 2, 0, 0, 5 );
 
 
-    bSizer176->Add( 0, 0, 1, wxEXPAND, 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") );
+	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 );
+	bSizer176->Add( m_staticTextDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizerStatistics->Add( bSizer176, 0, wxEXPAND, 5 );
+	bSizerStatistics->Add( bSizer176, 0, wxEXPAND, 5 );
 
 
-    bSizer1801->Add( bSizerStatistics, 0, wxALL, 4 );
+	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_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 );
+	m_panelViewFilter->SetSizer( bSizerViewFilter );
+	m_panelViewFilter->Layout();
+	bSizerViewFilter->Fit( m_panelViewFilter );
+	bSizerPanelHolder->Add( m_panelViewFilter, 0, 0, 5 );
 
 
-    this->SetSizer( bSizerPanelHolder );
-    this->Layout();
-    bSizerPanelHolder->Fit( this );
+	this->SetSizer( bSizerPanelHolder );
+	this->Layout();
+	bSizerPanelHolder->Fit( this );
 
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainDialogGenerated::onClose ) );
-    m_menuFile->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onConfigNew ), this, m_menuItemNew->GetId());
-    m_menuFile->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onConfigLoad ), this, m_menuItemLoad->GetId());
-    m_menuFile->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onConfigSave ), this, m_menuItemSave->GetId());
-    m_menuFile->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onConfigSaveAs ), this, m_menuItemSaveAs->GetId());
-    m_menuFile->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onSaveAsBatchJob ), this, m_menuItemSaveAsBatch->GetId());
-    m_menuFile->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuQuit ), this, m_menuItemQuit->GetId());
-    m_menuActions->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onToggleLog ), this, m_menuItemShowLog->GetId());
-    m_menuActions->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onCompare ), this, m_menuItemCompare->GetId());
-    m_menuActions->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onCmpSettings ), this, m_menuItemCompSettings->GetId());
-    m_menuActions->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onConfigureFilter ), this, m_menuItemFilter->GetId());
-    m_menuActions->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onSyncSettings ), this, m_menuItemSyncSettings->GetId());
-    m_menuActions->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onStartSync ), this, m_menuItemSynchronize->GetId());
-    m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuOptions ), this, m_menuItemOptions->GetId());
-    m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuFindItem ), this, m_menuItemFind->GetId());
-    m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuExportFileList ), this, m_menuItemExportList->GetId());
-    m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuResetLayout ), this, m_menuItem51->GetId());
-    m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onShowHelp ), this, m_menuItemHelp->GetId());
-    m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuCheckVersion ), this, m_menuItemCheckVersionNow->GetId());
-    m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuCheckVersionAutomatically ), this, m_menuItemCheckVersionAuto->GetId());
-    m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuAbout ), this, m_menuItemAbout->GetId());
-    m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCmpSettings ), NULL, this );
-    m_bpButtonCmpConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onCompSettingsContextMouse ), NULL, this );
-    m_buttonCompare->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCompare ), NULL, this );
-    m_buttonCompare->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onCompSettingsContextMouse ), NULL, this );
-    m_bpButtonCmpContext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCompSettingsContext ), NULL, this );
-    m_bpButtonCmpContext->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onCompSettingsContextMouse ), NULL, this );
-    m_bpButtonFilter->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onConfigureFilter ), NULL, this );
-    m_bpButtonFilter->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onGlobalFilterContextMouse ), NULL, this );
-    m_bpButtonFilterContext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onGlobalFilterContext ), NULL, this );
-    m_bpButtonFilterContext->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onGlobalFilterContextMouse ), NULL, this );
-    m_bpButtonSyncConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onSyncSettings ), NULL, this );
-    m_bpButtonSyncConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onSyncSettingsContextMouse ), NULL, this );
-    m_buttonSync->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onStartSync ), NULL, this );
-    m_buttonSync->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onSyncSettingsContextMouse ), NULL, this );
-    m_bpButtonSyncContext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onSyncSettingsContext ), NULL, this );
-    m_bpButtonSyncContext->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onSyncSettingsContextMouse ), 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_bpButtonLocalCompCfg->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onTopLocalCompCfg ), NULL, this );
-    m_bpButtonLocalFilter->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onTopLocalFilterCfg ), NULL, this );
-    m_bpButtonLocalSyncCfg->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_bpButtonToggleLog->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onToggleLog ), NULL, this );
-    m_bpButtonViewType->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onToggleViewType ), NULL, this );
-    m_bpButtonViewType->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onViewTypeContextMouse ), NULL, this );
-    m_bpButtonShowExcluded->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onToggleViewButton ), NULL, this );
-    m_bpButtonShowExcluded->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onViewFilterContextMouse ), NULL, this );
-    m_bpButtonShowDeleteLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onToggleViewButton ), NULL, this );
-    m_bpButtonShowDeleteLeft->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onViewFilterContextMouse ), NULL, this );
-    m_bpButtonShowUpdateLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onToggleViewButton ), NULL, this );
-    m_bpButtonShowUpdateLeft->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onViewFilterContextMouse ), NULL, this );
-    m_bpButtonShowCreateLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onToggleViewButton ), NULL, this );
-    m_bpButtonShowCreateLeft->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onViewFilterContextMouse ), NULL, this );
-    m_bpButtonShowLeftOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onToggleViewButton ), NULL, this );
-    m_bpButtonShowLeftOnly->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onViewFilterContextMouse ), NULL, this );
-    m_bpButtonShowLeftNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onToggleViewButton ), NULL, this );
-    m_bpButtonShowLeftNewer->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onViewFilterContextMouse ), NULL, this );
-    m_bpButtonShowEqual->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onToggleViewButton ), NULL, this );
-    m_bpButtonShowEqual->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onViewFilterContextMouse ), NULL, this );
-    m_bpButtonShowDoNothing->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onToggleViewButton ), NULL, this );
-    m_bpButtonShowDoNothing->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onViewFilterContextMouse ), NULL, this );
-    m_bpButtonShowDifferent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onToggleViewButton ), NULL, this );
-    m_bpButtonShowDifferent->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onViewFilterContextMouse ), NULL, this );
-    m_bpButtonShowRightNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onToggleViewButton ), NULL, this );
-    m_bpButtonShowRightNewer->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onViewFilterContextMouse ), NULL, this );
-    m_bpButtonShowRightOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onToggleViewButton ), NULL, this );
-    m_bpButtonShowRightOnly->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onViewFilterContextMouse ), NULL, this );
-    m_bpButtonShowCreateRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onToggleViewButton ), NULL, this );
-    m_bpButtonShowCreateRight->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onViewFilterContextMouse ), NULL, this );
-    m_bpButtonShowUpdateRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onToggleViewButton ), NULL, this );
-    m_bpButtonShowUpdateRight->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onViewFilterContextMouse ), NULL, this );
-    m_bpButtonShowDeleteRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onToggleViewButton ), NULL, this );
-    m_bpButtonShowDeleteRight->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onViewFilterContextMouse ), NULL, this );
-    m_bpButtonShowConflict->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onToggleViewButton ), NULL, this );
-    m_bpButtonShowConflict->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onViewFilterContextMouse ), NULL, this );
-    m_bpButtonViewFilterContext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onViewFilterContext ), NULL, this );
-    m_bpButtonViewFilterContext->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onViewFilterContextMouse ), NULL, this );
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainDialogGenerated::onClose ) );
+	m_menuFile->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onConfigNew ), this, m_menuItemNew->GetId());
+	m_menuFile->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onConfigLoad ), this, m_menuItemLoad->GetId());
+	m_menuFile->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onConfigSave ), this, m_menuItemSave->GetId());
+	m_menuFile->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onConfigSaveAs ), this, m_menuItemSaveAs->GetId());
+	m_menuFile->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onSaveAsBatchJob ), this, m_menuItemSaveAsBatch->GetId());
+	m_menuFile->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuQuit ), this, m_menuItemQuit->GetId());
+	m_menuActions->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onToggleLog ), this, m_menuItemShowLog->GetId());
+	m_menuActions->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onCompare ), this, m_menuItemCompare->GetId());
+	m_menuActions->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onCmpSettings ), this, m_menuItemCompSettings->GetId());
+	m_menuActions->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onConfigureFilter ), this, m_menuItemFilter->GetId());
+	m_menuActions->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onSyncSettings ), this, m_menuItemSyncSettings->GetId());
+	m_menuActions->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onStartSync ), this, m_menuItemSynchronize->GetId());
+	m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuOptions ), this, m_menuItemOptions->GetId());
+	m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuFindItem ), this, m_menuItemFind->GetId());
+	m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuExportFileList ), this, m_menuItemExportList->GetId());
+	m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuResetLayout ), this, m_menuItemResetLayout->GetId());
+	m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onShowHelp ), this, m_menuItemHelp->GetId());
+	m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuCheckVersion ), this, m_menuItemCheckVersionNow->GetId());
+	m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuCheckVersionAutomatically ), this, m_menuItemCheckVersionAuto->GetId());
+	m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuAbout ), this, m_menuItemAbout->GetId());
+	m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCmpSettings ), NULL, this );
+	m_bpButtonCmpConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onCompSettingsContextMouse ), NULL, this );
+	m_buttonCompare->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCompare ), NULL, this );
+	m_buttonCompare->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onCompSettingsContextMouse ), NULL, this );
+	m_bpButtonCmpContext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCompSettingsContext ), NULL, this );
+	m_bpButtonCmpContext->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onCompSettingsContextMouse ), NULL, this );
+	m_bpButtonFilter->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onConfigureFilter ), NULL, this );
+	m_bpButtonFilter->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onGlobalFilterContextMouse ), NULL, this );
+	m_bpButtonFilterContext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onGlobalFilterContext ), NULL, this );
+	m_bpButtonFilterContext->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onGlobalFilterContextMouse ), NULL, this );
+	m_bpButtonSyncConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onSyncSettings ), NULL, this );
+	m_bpButtonSyncConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onSyncSettingsContextMouse ), NULL, this );
+	m_buttonSync->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onStartSync ), NULL, this );
+	m_buttonSync->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onSyncSettingsContextMouse ), NULL, this );
+	m_bpButtonSyncContext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onSyncSettingsContext ), NULL, this );
+	m_bpButtonSyncContext->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onSyncSettingsContextMouse ), 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_bpButtonLocalCompCfg->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onTopLocalCompCfg ), NULL, this );
+	m_bpButtonLocalFilter->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onTopLocalFilterCfg ), NULL, this );
+	m_bpButtonLocalSyncCfg->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_bpButtonToggleLog->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onToggleLog ), NULL, this );
+	m_bpButtonViewType->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onToggleViewType ), NULL, this );
+	m_bpButtonViewType->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onViewTypeContextMouse ), NULL, this );
+	m_bpButtonShowExcluded->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onToggleViewButton ), NULL, this );
+	m_bpButtonShowExcluded->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onViewFilterContextMouse ), NULL, this );
+	m_bpButtonShowDeleteLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onToggleViewButton ), NULL, this );
+	m_bpButtonShowDeleteLeft->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onViewFilterContextMouse ), NULL, this );
+	m_bpButtonShowUpdateLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onToggleViewButton ), NULL, this );
+	m_bpButtonShowUpdateLeft->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onViewFilterContextMouse ), NULL, this );
+	m_bpButtonShowCreateLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onToggleViewButton ), NULL, this );
+	m_bpButtonShowCreateLeft->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onViewFilterContextMouse ), NULL, this );
+	m_bpButtonShowLeftOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onToggleViewButton ), NULL, this );
+	m_bpButtonShowLeftOnly->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onViewFilterContextMouse ), NULL, this );
+	m_bpButtonShowLeftNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onToggleViewButton ), NULL, this );
+	m_bpButtonShowLeftNewer->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onViewFilterContextMouse ), NULL, this );
+	m_bpButtonShowEqual->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onToggleViewButton ), NULL, this );
+	m_bpButtonShowEqual->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onViewFilterContextMouse ), NULL, this );
+	m_bpButtonShowDoNothing->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onToggleViewButton ), NULL, this );
+	m_bpButtonShowDoNothing->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onViewFilterContextMouse ), NULL, this );
+	m_bpButtonShowDifferent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onToggleViewButton ), NULL, this );
+	m_bpButtonShowDifferent->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onViewFilterContextMouse ), NULL, this );
+	m_bpButtonShowRightNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onToggleViewButton ), NULL, this );
+	m_bpButtonShowRightNewer->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onViewFilterContextMouse ), NULL, this );
+	m_bpButtonShowRightOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onToggleViewButton ), NULL, this );
+	m_bpButtonShowRightOnly->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onViewFilterContextMouse ), NULL, this );
+	m_bpButtonShowCreateRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onToggleViewButton ), NULL, this );
+	m_bpButtonShowCreateRight->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onViewFilterContextMouse ), NULL, this );
+	m_bpButtonShowUpdateRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onToggleViewButton ), NULL, this );
+	m_bpButtonShowUpdateRight->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onViewFilterContextMouse ), NULL, this );
+	m_bpButtonShowDeleteRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onToggleViewButton ), NULL, this );
+	m_bpButtonShowDeleteRight->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onViewFilterContextMouse ), NULL, this );
+	m_bpButtonShowConflict->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onToggleViewButton ), NULL, this );
+	m_bpButtonShowConflict->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onViewFilterContextMouse ), NULL, this );
+	m_bpButtonViewFilterContext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onViewFilterContext ), NULL, this );
+	m_bpButtonViewFilterContext->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onViewFilterContextMouse ), NULL, this );
 }
 
 MainDialogGenerated::~MainDialogGenerated()
@@ -1215,98 +1214,98 @@ MainDialogGenerated::~MainDialogGenerated()
 
 FolderPairPanelGenerated::FolderPairPanelGenerated( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name )
 {
-    wxBoxSizer* bSizer74;
-    bSizer74 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer74;
+	bSizer74 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_panelLeft = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelLeft->SetMinSize( wxSize( 1, -1 ) );
+	m_panelLeft = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelLeft->SetMinSize( wxSize( 1,-1 ) );
 
-    wxBoxSizer* bSizer134;
-    bSizer134 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer134;
+	bSizer134 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bpButtonFolderPairOptions = new wxBitmapButton( m_panelLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonFolderPairOptions->SetToolTip( _("Arrange folder pair") );
+	m_bpButtonFolderPairOptions = new wxBitmapButton( m_panelLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonFolderPairOptions->SetToolTip( _("Arrange folder pair") );
 
-    bSizer134->Add( m_bpButtonFolderPairOptions, 0, wxEXPAND, 5 );
+	bSizer134->Add( m_bpButtonFolderPairOptions, 0, wxEXPAND, 5 );
 
-    m_bpButtonRemovePair = new wxBitmapButton( m_panelLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
+	m_bpButtonRemovePair = new wxBitmapButton( m_panelLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
 
-    bSizer134->Add( m_bpButtonRemovePair, 0, wxEXPAND, 5 );
+	bSizer134->Add( m_bpButtonRemovePair, 0, wxEXPAND, 5 );
 
-    m_folderPathLeft = new fff::FolderHistoryBox( m_panelLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
-    bSizer134->Add( m_folderPathLeft, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	m_folderPathLeft = new fff::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, wxSize( -1, -1 ), 0 );
-    m_buttonSelectFolderLeft->SetToolTip( _("Select a folder") );
+	m_buttonSelectFolderLeft = new wxButton( m_panelLeft, wxID_ANY, _("Browse"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_buttonSelectFolderLeft->SetToolTip( _("Select a folder") );
 
-    bSizer134->Add( m_buttonSelectFolderLeft, 0, wxEXPAND, 5 );
+	bSizer134->Add( m_buttonSelectFolderLeft, 0, wxEXPAND, 5 );
 
-    m_bpButtonSelectAltFolderLeft = new wxBitmapButton( m_panelLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonSelectAltFolderLeft->SetToolTip( _("Access online storage") );
+	m_bpButtonSelectAltFolderLeft = new wxBitmapButton( m_panelLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonSelectAltFolderLeft->SetToolTip( _("Access online storage") );
 
-    bSizer134->Add( m_bpButtonSelectAltFolderLeft, 0, wxEXPAND, 5 );
+	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_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 );
+	m_panel20 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer95;
+	bSizer95 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bpButtonLocalCompCfg = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonLocalCompCfg->SetToolTip( _("dummy") );
+	m_bpButtonLocalCompCfg = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonLocalCompCfg->SetToolTip( _("dummy") );
 
-    bSizer95->Add( m_bpButtonLocalCompCfg, 0, wxEXPAND, 5 );
+	bSizer95->Add( m_bpButtonLocalCompCfg, 0, wxEXPAND, 5 );
 
-    m_bpButtonLocalFilter = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonLocalFilter->SetToolTip( _("dummy") );
+	m_bpButtonLocalFilter = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonLocalFilter->SetToolTip( _("dummy") );
 
-    bSizer95->Add( m_bpButtonLocalFilter, 0, wxEXPAND, 5 );
+	bSizer95->Add( m_bpButtonLocalFilter, 0, wxEXPAND, 5 );
 
-    m_bpButtonLocalSyncCfg = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonLocalSyncCfg->SetToolTip( _("dummy") );
+	m_bpButtonLocalSyncCfg = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonLocalSyncCfg->SetToolTip( _("dummy") );
 
-    bSizer95->Add( m_bpButtonLocalSyncCfg, 0, wxEXPAND, 5 );
+	bSizer95->Add( m_bpButtonLocalSyncCfg, 0, wxEXPAND, 5 );
 
 
-    m_panel20->SetSizer( bSizer95 );
-    m_panel20->Layout();
-    bSizer95->Fit( m_panel20 );
-    bSizer74->Add( m_panel20, 0, wxRIGHT|wxLEFT|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 ) );
+	m_panelRight = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelRight->SetMinSize( wxSize( 1,-1 ) );
 
-    wxBoxSizer* bSizer135;
-    bSizer135 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer135;
+	bSizer135 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_folderPathRight = new fff::FolderHistoryBox( m_panelRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
-    bSizer135->Add( m_folderPathRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	m_folderPathRight = new fff::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") );
+	m_buttonSelectFolderRight = new wxButton( m_panelRight, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonSelectFolderRight->SetToolTip( _("Select a folder") );
 
-    bSizer135->Add( m_buttonSelectFolderRight, 0, wxEXPAND, 5 );
+	bSizer135->Add( m_buttonSelectFolderRight, 0, wxEXPAND, 5 );
 
-    m_bpButtonSelectAltFolderRight = new wxBitmapButton( m_panelRight, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonSelectAltFolderRight->SetToolTip( _("Access online storage") );
+	m_bpButtonSelectAltFolderRight = new wxBitmapButton( m_panelRight, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonSelectAltFolderRight->SetToolTip( _("Access online storage") );
 
-    bSizer135->Add( m_bpButtonSelectAltFolderRight, 0, wxEXPAND, 5 );
+	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 );
+	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 );
+	this->SetSizer( bSizer74 );
+	this->Layout();
+	bSizer74->Fit( this );
 }
 
 FolderPairPanelGenerated::~FolderPairPanelGenerated()
@@ -1315,1243 +1314,1243 @@ FolderPairPanelGenerated::~FolderPairPanelGenerated()
 
 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 ) );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer7;
-    bSizer7 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer7;
+	bSizer7 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer190;
-    bSizer190 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer190;
+	bSizer190 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer1911;
-    bSizer1911 = new wxBoxSizer( wxVERTICAL );
+	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_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 );
+	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 );
+	bSizer190->Add( bSizer1911, 0, wxEXPAND|wxLEFT, 5 );
 
-    m_notebook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelCompSettingsTab = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelCompSettingsTab->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_notebook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_panelCompSettingsTab = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelCompSettingsTab->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer275;
-    bSizer275 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer275;
+	bSizer275 = new wxBoxSizer( wxVERTICAL );
 
-    bSizerHeaderCompSettings = new wxBoxSizer( wxVERTICAL );
+	bSizerHeaderCompSettings = new wxBoxSizer( wxVERTICAL );
 
-    m_staticTextMainCompSettings = new wxStaticText( m_panelCompSettingsTab, wxID_ANY, _("Main settings:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextMainCompSettings->Wrap( -1 );
-    bSizerHeaderCompSettings->Add( m_staticTextMainCompSettings, 0, wxALL, 10 );
+	m_staticTextMainCompSettings = new wxStaticText( m_panelCompSettingsTab, wxID_ANY, _("Main settings:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextMainCompSettings->Wrap( -1 );
+	bSizerHeaderCompSettings->Add( m_staticTextMainCompSettings, 0, wxALL, 10 );
 
-    m_checkBoxUseLocalCmpOptions = new wxCheckBox( m_panelCompSettingsTab, wxID_ANY, _("Use local settings:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_checkBoxUseLocalCmpOptions->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_checkBoxUseLocalCmpOptions = new wxCheckBox( m_panelCompSettingsTab, wxID_ANY, _("Use local settings:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_checkBoxUseLocalCmpOptions->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    bSizerHeaderCompSettings->Add( m_checkBoxUseLocalCmpOptions, 0, wxALL|wxEXPAND, 10 );
+	bSizerHeaderCompSettings->Add( m_checkBoxUseLocalCmpOptions, 0, wxALL|wxEXPAND, 10 );
 
-    m_staticlineCompHeader = new wxStaticLine( m_panelCompSettingsTab, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerHeaderCompSettings->Add( m_staticlineCompHeader, 0, wxEXPAND, 5 );
+	m_staticlineCompHeader = new wxStaticLine( m_panelCompSettingsTab, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerHeaderCompSettings->Add( m_staticlineCompHeader, 0, wxEXPAND, 5 );
 
 
-    bSizer275->Add( bSizerHeaderCompSettings, 0, wxEXPAND, 5 );
+	bSizer275->Add( bSizerHeaderCompSettings, 0, wxEXPAND, 5 );
 
-    m_panelComparisonSettings = new wxPanel( m_panelCompSettingsTab, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelComparisonSettings->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panelComparisonSettings = new wxPanel( m_panelCompSettingsTab, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelComparisonSettings->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer2561;
-    bSizer2561 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer2561;
+	bSizer2561 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer159;
-    bSizer159 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer159;
+	bSizer159 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer178;
-    bSizer178 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer178;
+	bSizer178 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer182;
-    bSizer182 = new wxBoxSizer( wxVERTICAL );
+	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 );
+	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 );
 
-    wxGridSizer* gSizer2;
-    gSizer2 = new wxGridSizer( 0, 1, 0, 0 );
+	wxGridSizer* gSizer2;
+	gSizer2 = new wxGridSizer( 0, 1, 0, 0 );
 
-    m_buttonByTimeSize = new zen::ToggleButton( m_panelComparisonSettings, wxID_ANY, _("File time and size"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonByTimeSize = new zen::ToggleButton( m_panelComparisonSettings, wxID_ANY, _("File time and size"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
 
-    m_buttonByTimeSize->SetDefault();
-    m_buttonByTimeSize->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-    m_buttonByTimeSize->SetToolTip( _("dummy") );
+	m_buttonByTimeSize->SetDefault();
+	m_buttonByTimeSize->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonByTimeSize->SetToolTip( _("dummy") );
 
-    gSizer2->Add( m_buttonByTimeSize, 0, wxEXPAND, 5 );
+	gSizer2->Add( m_buttonByTimeSize, 0, wxEXPAND, 5 );
 
-    m_buttonByContent = new zen::ToggleButton( m_panelComparisonSettings, wxID_ANY, _("File content"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonByContent = new zen::ToggleButton( m_panelComparisonSettings, wxID_ANY, _("File content"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
 
-    m_buttonByContent->SetDefault();
-    m_buttonByContent->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-    m_buttonByContent->SetToolTip( _("dummy") );
+	m_buttonByContent->SetDefault();
+	m_buttonByContent->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonByContent->SetToolTip( _("dummy") );
 
-    gSizer2->Add( m_buttonByContent, 0, wxEXPAND, 5 );
+	gSizer2->Add( m_buttonByContent, 0, wxEXPAND, 5 );
 
-    m_buttonBySize = new zen::ToggleButton( m_panelComparisonSettings, wxID_ANY, _("File size"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonBySize = new zen::ToggleButton( m_panelComparisonSettings, wxID_ANY, _("File size"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
 
-    m_buttonBySize->SetDefault();
-    m_buttonBySize->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-    m_buttonBySize->SetToolTip( _("dummy") );
+	m_buttonBySize->SetDefault();
+	m_buttonBySize->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonBySize->SetToolTip( _("dummy") );
 
-    gSizer2->Add( m_buttonBySize, 0, wxEXPAND, 5 );
+	gSizer2->Add( m_buttonBySize, 0, wxEXPAND, 5 );
 
 
-    bSizer182->Add( gSizer2, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	bSizer182->Add( gSizer2, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 
-    bSizer178->Add( bSizer182, 0, wxALL, 5 );
+	bSizer178->Add( bSizer182, 0, wxALL, 5 );
 
-    wxBoxSizer* bSizer2371;
-    bSizer2371 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer2371;
+	bSizer2371 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapCompVariant = new wxStaticBitmap( m_panelComparisonSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer2371->Add( m_bitmapCompVariant, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_bitmapCompVariant = new wxStaticBitmap( m_panelComparisonSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer2371->Add( m_bitmapCompVariant, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticTextCompVarDescription = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextCompVarDescription->Wrap( -1 );
-    m_staticTextCompVarDescription->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticTextCompVarDescription = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextCompVarDescription->Wrap( -1 );
+	m_staticTextCompVarDescription->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    bSizer2371->Add( m_staticTextCompVarDescription, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer2371->Add( m_staticTextCompVarDescription, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer178->Add( bSizer2371, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	bSizer178->Add( bSizer2371, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
 
-    bSizer159->Add( bSizer178, 0, wxEXPAND, 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 );
+	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* bSizer1734;
+	bSizer1734 = new wxBoxSizer( wxHORIZONTAL );
 
 
-    bSizer1734->Add( 0, 0, 1, 0, 5 );
+	bSizer1734->Add( 0, 0, 1, 0, 5 );
 
-    wxBoxSizer* bSizer1721;
-    bSizer1721 = new wxBoxSizer( wxVERTICAL );
+	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 );
+	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 );
+	wxBoxSizer* bSizer176;
+	bSizer176 = new wxBoxSizer( wxVERTICAL );
 
-    m_radioBtnSymlinksFollow = new wxRadioButton( m_panelComparisonSettings, wxID_ANY, _("&Follow"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
-    m_radioBtnSymlinksFollow->SetValue( true );
-    bSizer176->Add( m_radioBtnSymlinksFollow, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	m_radioBtnSymlinksFollow = new wxRadioButton( m_panelComparisonSettings, wxID_ANY, _("&Follow"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
+	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 );
+	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, wxLEFT|wxEXPAND, 15 );
+	bSizer1721->Add( bSizer176, 0, wxLEFT|wxEXPAND, 15 );
 
 
-    bSizer1721->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizer1721->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_hyperlink24 = new wxHyperlinkCtrl( m_panelComparisonSettings, wxID_ANY, _("More information"), wxT("https://freefilesync.org/manual.php?topic=comparison-settings"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink24->SetToolTip( _("https://freefilesync.org/manual.php?topic=comparison-settings") );
+	m_hyperlink24 = new wxHyperlinkCtrl( m_panelComparisonSettings, wxID_ANY, _("More information"), wxT("https://freefilesync.org/manual.php?topic=comparison-settings"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink24->SetToolTip( _("https://freefilesync.org/manual.php?topic=comparison-settings") );
 
-    bSizer1721->Add( m_hyperlink24, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	bSizer1721->Add( m_hyperlink24, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 
-    bSizer1734->Add( bSizer1721, 0, wxALL|wxEXPAND, 5 );
+	bSizer1734->Add( bSizer1721, 0, wxALL|wxEXPAND, 5 );
 
 
-    bSizer1734->Add( 0, 0, 1, 0, 5 );
+	bSizer1734->Add( 0, 0, 1, 0, 5 );
 
-    m_staticline44 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer1734->Add( m_staticline44, 0, wxEXPAND, 5 );
+	m_staticline44 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer1734->Add( m_staticline44, 0, wxEXPAND, 5 );
 
 
-    bSizer1734->Add( 0, 0, 1, 0, 5 );
+	bSizer1734->Add( 0, 0, 1, 0, 5 );
 
-    wxBoxSizer* bSizer1733;
-    bSizer1733 = new wxBoxSizer( wxVERTICAL );
+	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_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") );
+	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, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	bSizer1733->Add( m_textCtrlTimeShift, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer197;
-    bSizer197 = new wxBoxSizer( wxHORIZONTAL );
+	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 ) );
+	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 );
+	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 ) );
+	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 );
+	bSizer197->Add( m_staticText13811, 0, wxBOTTOM|wxRIGHT, 5 );
 
 
-    bSizer1733->Add( bSizer197, 0, 0, 5 );
+	bSizer1733->Add( bSizer197, 0, 0, 5 );
 
 
-    bSizer1733->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizer1733->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_hyperlink241 = new wxHyperlinkCtrl( m_panelComparisonSettings, wxID_ANY, _("Handle daylight saving time"), wxT("https://freefilesync.org/manual.php?topic=daylight-saving-time"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink241->SetToolTip( _("https://freefilesync.org/manual.php?topic=daylight-saving-time") );
+	m_hyperlink241 = new wxHyperlinkCtrl( m_panelComparisonSettings, wxID_ANY, _("Handle daylight saving time"), wxT("https://freefilesync.org/manual.php?topic=daylight-saving-time"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink241->SetToolTip( _("https://freefilesync.org/manual.php?topic=daylight-saving-time") );
 
-    bSizer1733->Add( m_hyperlink241, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	bSizer1733->Add( m_hyperlink241, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 
-    bSizer1734->Add( bSizer1733, 0, wxALL|wxEXPAND, 5 );
+	bSizer1734->Add( bSizer1733, 0, wxALL|wxEXPAND, 5 );
 
 
-    bSizer1734->Add( 0, 0, 1, 0, 5 );
+	bSizer1734->Add( 0, 0, 1, 0, 5 );
 
 
-    bSizer159->Add( bSizer1734, 0, wxEXPAND, 5 );
+	bSizer159->Add( bSizer1734, 0, wxEXPAND, 5 );
 
-    m_staticline331 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer159->Add( m_staticline331, 0, wxEXPAND, 5 );
+	m_staticline331 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer159->Add( m_staticline331, 0, wxEXPAND, 5 );
 
-    bSizerCompMisc = new wxBoxSizer( wxVERTICAL );
+	bSizerCompMisc = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer2781;
-    bSizer2781 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer2781;
+	bSizer2781 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxFlexGridSizer* fgSizer61;
-    fgSizer61 = new wxFlexGridSizer( 0, 2, 5, 5 );
-    fgSizer61->SetFlexibleDirection( wxBOTH );
-    fgSizer61->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	wxFlexGridSizer* fgSizer61;
+	fgSizer61 = new wxFlexGridSizer( 0, 2, 5, 5 );
+	fgSizer61->SetFlexibleDirection( wxBOTH );
+	fgSizer61->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    m_bitmapIgnoreErrors = new wxStaticBitmap( m_panelComparisonSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    fgSizer61->Add( m_bitmapIgnoreErrors, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_bitmapIgnoreErrors = new wxStaticBitmap( m_panelComparisonSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer61->Add( m_bitmapIgnoreErrors, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_checkBoxIgnoreErrors = new wxCheckBox( m_panelComparisonSettings, wxID_ANY, _("Ignore errors"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    fgSizer61->Add( m_checkBoxIgnoreErrors, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	m_checkBoxIgnoreErrors = new wxCheckBox( m_panelComparisonSettings, wxID_ANY, _("Ignore errors"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	fgSizer61->Add( m_checkBoxIgnoreErrors, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 
-    m_bitmapRetryErrors = new wxStaticBitmap( m_panelComparisonSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    fgSizer61->Add( m_bitmapRetryErrors, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bitmapRetryErrors = new wxStaticBitmap( m_panelComparisonSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer61->Add( m_bitmapRetryErrors, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_checkBoxAutoRetry = new wxCheckBox( m_panelComparisonSettings, wxID_ANY, _("Automatic retry"), wxDefaultPosition, wxDefaultSize, 0 );
-    fgSizer61->Add( m_checkBoxAutoRetry, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	m_checkBoxAutoRetry = new wxCheckBox( m_panelComparisonSettings, wxID_ANY, _("Automatic retry"), wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer61->Add( m_checkBoxAutoRetry, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 
 
-    bSizer2781->Add( fgSizer61, 0, wxALIGN_CENTER_VERTICAL|wxALL, 10 );
+	bSizer2781->Add( fgSizer61, 0, wxALIGN_CENTER_VERTICAL|wxALL, 10 );
 
-    fgSizerAutoRetry = new wxFlexGridSizer( 0, 2, 5, 10 );
-    fgSizerAutoRetry->SetFlexibleDirection( wxBOTH );
-    fgSizerAutoRetry->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	fgSizerAutoRetry = new wxFlexGridSizer( 0, 2, 5, 10 );
+	fgSizerAutoRetry->SetFlexibleDirection( wxBOTH );
+	fgSizerAutoRetry->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    m_staticText96 = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("Retry count:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText96->Wrap( -1 );
-    fgSizerAutoRetry->Add( m_staticText96, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticText96 = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("Retry count:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText96->Wrap( -1 );
+	fgSizerAutoRetry->Add( m_staticText96, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticTextAutoRetryDelay = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("Delay (in seconds):"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextAutoRetryDelay->Wrap( -1 );
-    fgSizerAutoRetry->Add( m_staticTextAutoRetryDelay, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticTextAutoRetryDelay = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("Delay (in seconds):"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextAutoRetryDelay->Wrap( -1 );
+	fgSizerAutoRetry->Add( m_staticTextAutoRetryDelay, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_spinCtrlAutoRetryCount = new wxSpinCtrl( m_panelComparisonSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
-    fgSizerAutoRetry->Add( m_spinCtrlAutoRetryCount, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_spinCtrlAutoRetryCount = new wxSpinCtrl( m_panelComparisonSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
+	fgSizerAutoRetry->Add( m_spinCtrlAutoRetryCount, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_spinCtrlAutoRetryDelay = new wxSpinCtrl( m_panelComparisonSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), wxSP_ARROW_KEYS, 0, 2000000000, 0 );
-    fgSizerAutoRetry->Add( m_spinCtrlAutoRetryDelay, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_spinCtrlAutoRetryDelay = new wxSpinCtrl( m_panelComparisonSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxSP_ARROW_KEYS, 0, 2000000000, 0 );
+	fgSizerAutoRetry->Add( m_spinCtrlAutoRetryDelay, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer2781->Add( fgSizerAutoRetry, 0, wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL, 10 );
+	bSizer2781->Add( fgSizerAutoRetry, 0, wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL, 10 );
 
 
-    bSizerCompMisc->Add( bSizer2781, 0, wxEXPAND, 5 );
+	bSizerCompMisc->Add( bSizer2781, 0, wxEXPAND, 5 );
 
-    m_staticline3311 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerCompMisc->Add( m_staticline3311, 0, wxEXPAND, 5 );
+	m_staticline3311 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerCompMisc->Add( m_staticline3311, 0, wxEXPAND, 5 );
 
 
-    bSizer159->Add( bSizerCompMisc, 0, wxEXPAND, 5 );
+	bSizer159->Add( bSizerCompMisc, 0, wxEXPAND, 5 );
 
 
-    bSizer2561->Add( bSizer159, 0, wxEXPAND, 5 );
+	bSizer2561->Add( bSizer159, 0, wxEXPAND, 5 );
 
-    m_staticline751 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer2561->Add( m_staticline751, 0, wxEXPAND, 5 );
+	m_staticline751 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer2561->Add( m_staticline751, 0, wxEXPAND, 5 );
 
-    bSizerPerformance = new wxBoxSizer( wxVERTICAL );
+	bSizerPerformance = new wxBoxSizer( wxVERTICAL );
 
-    m_panel57 = new wxPanel( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel57->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	m_panel57 = new wxPanel( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel57->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer2191;
-    bSizer2191 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer2191;
+	bSizer2191 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapPerf = new wxStaticBitmap( m_panel57, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer2191->Add( m_bitmapPerf, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	m_bitmapPerf = new wxStaticBitmap( m_panel57, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer2191->Add( m_bitmapPerf, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    m_staticText13611 = new wxStaticText( m_panel57, wxID_ANY, _("Performance improvements:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText13611->Wrap( -1 );
-    bSizer2191->Add( m_staticText13611, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
+	m_staticText13611 = new wxStaticText( m_panel57, wxID_ANY, _("Performance improvements:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText13611->Wrap( -1 );
+	bSizer2191->Add( m_staticText13611, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
 
 
-    m_panel57->SetSizer( bSizer2191 );
-    m_panel57->Layout();
-    bSizer2191->Fit( m_panel57 );
-    bSizerPerformance->Add( m_panel57, 0, wxEXPAND, 5 );
+	m_panel57->SetSizer( bSizer2191 );
+	m_panel57->Layout();
+	bSizer2191->Fit( m_panel57 );
+	bSizerPerformance->Add( m_panel57, 0, wxEXPAND, 5 );
 
-    wxStaticLine* m_staticline75;
-    m_staticline75 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerPerformance->Add( m_staticline75, 0, wxEXPAND, 5 );
+	wxStaticLine* m_staticline75;
+	m_staticline75 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerPerformance->Add( m_staticline75, 0, wxEXPAND, 5 );
 
-    m_hyperlinkPerfDeRequired = new wxHyperlinkCtrl( m_panelComparisonSettings, wxID_ANY, _("Requires FreeFileSync Donation Edition"), wxT("https://freefilesync.org/faq.php#donation-edition"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlinkPerfDeRequired->SetToolTip( _("https://freefilesync.org/faq.php#donation-edition") );
+	m_hyperlinkPerfDeRequired = new wxHyperlinkCtrl( m_panelComparisonSettings, wxID_ANY, _("Requires FreeFileSync Donation Edition"), wxT("https://freefilesync.org/faq.php#donation-edition"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlinkPerfDeRequired->SetToolTip( _("https://freefilesync.org/faq.php#donation-edition") );
 
-    bSizerPerformance->Add( m_hyperlinkPerfDeRequired, 0, wxALL, 10 );
+	bSizerPerformance->Add( m_hyperlinkPerfDeRequired, 0, wxALL, 10 );
 
-    bSizer260 = new wxBoxSizer( wxVERTICAL );
+	bSizer260 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticTextPerfParallelOps = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("Parallel file operations:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextPerfParallelOps->Wrap( -1 );
-    bSizer260->Add( m_staticTextPerfParallelOps, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	m_staticTextPerfParallelOps = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("Parallel file operations:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextPerfParallelOps->Wrap( -1 );
+	bSizer260->Add( m_staticTextPerfParallelOps, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 
-    m_scrolledWindowPerf = new wxScrolledWindow( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
-    m_scrolledWindowPerf->SetScrollRate( 5, 5 );
-    m_scrolledWindowPerf->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_scrolledWindowPerf = new wxScrolledWindow( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
+	m_scrolledWindowPerf->SetScrollRate( 5, 5 );
+	m_scrolledWindowPerf->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    fgSizerPerf = new wxFlexGridSizer( 0, 2, 5, 5 );
-    fgSizerPerf->SetFlexibleDirection( wxBOTH );
-    fgSizerPerf->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	fgSizerPerf = new wxFlexGridSizer( 0, 2, 5, 5 );
+	fgSizerPerf->SetFlexibleDirection( wxBOTH );
+	fgSizerPerf->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
 
-    m_scrolledWindowPerf->SetSizer( fgSizerPerf );
-    m_scrolledWindowPerf->Layout();
-    fgSizerPerf->Fit( m_scrolledWindowPerf );
-    bSizer260->Add( m_scrolledWindowPerf, 1, wxALL|wxEXPAND, 5 );
+	m_scrolledWindowPerf->SetSizer( fgSizerPerf );
+	m_scrolledWindowPerf->Layout();
+	fgSizerPerf->Fit( m_scrolledWindowPerf );
+	bSizer260->Add( m_scrolledWindowPerf, 1, wxALL|wxEXPAND, 5 );
 
 
-    bSizerPerformance->Add( bSizer260, 1, wxALL|wxEXPAND, 5 );
+	bSizerPerformance->Add( bSizer260, 1, wxALL|wxEXPAND, 5 );
 
-    m_hyperlink1711 = new wxHyperlinkCtrl( m_panelComparisonSettings, wxID_ANY, _("How to get best performance?"), wxT("https://freefilesync.org/manual.php?topic=performance"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink1711->SetToolTip( _("https://freefilesync.org/manual.php?topic=performance") );
+	m_hyperlink1711 = new wxHyperlinkCtrl( m_panelComparisonSettings, wxID_ANY, _("How to get best performance?"), wxT("https://freefilesync.org/manual.php?topic=performance"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink1711->SetToolTip( _("https://freefilesync.org/manual.php?topic=performance") );
 
-    bSizerPerformance->Add( m_hyperlink1711, 0, wxBOTTOM|wxRIGHT|wxLEFT, 10 );
+	bSizerPerformance->Add( m_hyperlink1711, 0, wxBOTTOM|wxRIGHT|wxLEFT, 10 );
 
 
-    bSizer2561->Add( bSizerPerformance, 1, wxEXPAND, 5 );
+	bSizer2561->Add( bSizerPerformance, 1, wxEXPAND, 5 );
 
 
-    m_panelComparisonSettings->SetSizer( bSizer2561 );
-    m_panelComparisonSettings->Layout();
-    bSizer2561->Fit( m_panelComparisonSettings );
-    bSizer275->Add( m_panelComparisonSettings, 1, wxEXPAND, 5 );
+	m_panelComparisonSettings->SetSizer( bSizer2561 );
+	m_panelComparisonSettings->Layout();
+	bSizer2561->Fit( m_panelComparisonSettings );
+	bSizer275->Add( m_panelComparisonSettings, 1, wxEXPAND, 5 );
 
 
-    m_panelCompSettingsTab->SetSizer( bSizer275 );
-    m_panelCompSettingsTab->Layout();
-    bSizer275->Fit( m_panelCompSettingsTab );
-    m_notebook->AddPage( m_panelCompSettingsTab, _("dummy"), false );
-    m_panelFilterSettingsTab = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelFilterSettingsTab->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panelCompSettingsTab->SetSizer( bSizer275 );
+	m_panelCompSettingsTab->Layout();
+	bSizer275->Fit( m_panelCompSettingsTab );
+	m_notebook->AddPage( m_panelCompSettingsTab, _("dummy"), false );
+	m_panelFilterSettingsTab = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelFilterSettingsTab->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer278;
-    bSizer278 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer278;
+	bSizer278 = new wxBoxSizer( wxVERTICAL );
 
-    bSizerHeaderFilterSettings = new wxBoxSizer( wxVERTICAL );
+	bSizerHeaderFilterSettings = new wxBoxSizer( wxVERTICAL );
 
-    m_staticTextMainFilterSettings = new wxStaticText( m_panelFilterSettingsTab, wxID_ANY, _("Main settings:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextMainFilterSettings->Wrap( -1 );
-    bSizerHeaderFilterSettings->Add( m_staticTextMainFilterSettings, 0, wxALL, 10 );
+	m_staticTextMainFilterSettings = new wxStaticText( m_panelFilterSettingsTab, wxID_ANY, _("Main settings:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextMainFilterSettings->Wrap( -1 );
+	bSizerHeaderFilterSettings->Add( m_staticTextMainFilterSettings, 0, wxALL, 10 );
 
-    m_staticTextLocalFilterSettings = new wxStaticText( m_panelFilterSettingsTab, wxID_ANY, _("Local settings:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextLocalFilterSettings->Wrap( -1 );
-    bSizerHeaderFilterSettings->Add( m_staticTextLocalFilterSettings, 0, wxALL, 10 );
+	m_staticTextLocalFilterSettings = new wxStaticText( m_panelFilterSettingsTab, wxID_ANY, _("Local settings:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextLocalFilterSettings->Wrap( -1 );
+	bSizerHeaderFilterSettings->Add( m_staticTextLocalFilterSettings, 0, wxALL, 10 );
 
-    m_staticlineFilterHeader = new wxStaticLine( m_panelFilterSettingsTab, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerHeaderFilterSettings->Add( m_staticlineFilterHeader, 0, wxEXPAND, 5 );
+	m_staticlineFilterHeader = new wxStaticLine( m_panelFilterSettingsTab, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerHeaderFilterSettings->Add( m_staticlineFilterHeader, 0, wxEXPAND, 5 );
 
 
-    bSizer278->Add( bSizerHeaderFilterSettings, 0, wxEXPAND, 5 );
+	bSizer278->Add( bSizerHeaderFilterSettings, 0, wxEXPAND, 5 );
 
-    m_panelFilterSettings = new wxPanel( m_panelFilterSettingsTab, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelFilterSettings->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panelFilterSettings = new wxPanel( m_panelFilterSettingsTab, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelFilterSettings->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer1591;
-    bSizer1591 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer1591;
+	bSizer1591 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer166;
-    bSizer166 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer166;
+	bSizer166 = new wxBoxSizer( wxVERTICAL );
 
 
-    bSizer166->Add( 0, 10, 0, 0, 5 );
+	bSizer166->Add( 0, 10, 0, 0, 5 );
 
-    wxBoxSizer* bSizer1661;
-    bSizer1661 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer1661;
+	bSizer1661 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapInclude = new wxStaticBitmap( m_panelFilterSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer1661->Add( m_bitmapInclude, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+	m_bitmapInclude = new wxStaticBitmap( m_panelFilterSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer1661->Add( m_bitmapInclude, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
 
-    wxBoxSizer* bSizer1731;
-    bSizer1731 = new wxBoxSizer( wxVERTICAL );
+	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_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 );
-    bSizer1731->Add( m_textCtrlInclude, 1, wxEXPAND|wxTOP, 5 );
+	m_textCtrlInclude = new wxTextCtrl( m_panelFilterSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE );
+	bSizer1731->Add( m_textCtrlInclude, 1, wxEXPAND|wxTOP, 5 );
 
 
-    bSizer1661->Add( bSizer1731, 1, wxEXPAND, 5 );
+	bSizer1661->Add( bSizer1731, 1, wxEXPAND, 5 );
 
 
-    bSizer166->Add( bSizer1661, 3, wxEXPAND|wxLEFT, 5 );
+	bSizer166->Add( bSizer1661, 3, wxEXPAND|wxLEFT, 5 );
 
 
-    bSizer166->Add( 0, 10, 0, 0, 5 );
+	bSizer166->Add( 0, 10, 0, 0, 5 );
 
-    wxBoxSizer* bSizer1651;
-    bSizer1651 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer1651;
+	bSizer1651 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapExclude = new wxStaticBitmap( m_panelFilterSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer1651->Add( m_bitmapExclude, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	m_bitmapExclude = new wxStaticBitmap( m_panelFilterSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer1651->Add( m_bitmapExclude, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    wxBoxSizer* bSizer1742;
-    bSizer1742 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer1742;
+	bSizer1742 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer189;
-    bSizer189 = new wxBoxSizer( wxHORIZONTAL );
+	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 );
+	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 );
+	bSizer189->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_hyperlink171 = new wxHyperlinkCtrl( m_panelFilterSettings, wxID_ANY, _("Show examples"), wxT("https://freefilesync.org/manual.php?topic=exclude-files"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink171->SetToolTip( _("https://freefilesync.org/manual.php?topic=exclude-files") );
+	m_hyperlink171 = new wxHyperlinkCtrl( m_panelFilterSettings, wxID_ANY, _("Show examples"), wxT("https://freefilesync.org/manual.php?topic=exclude-files"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink171->SetToolTip( _("https://freefilesync.org/manual.php?topic=exclude-files") );
 
-    bSizer189->Add( m_hyperlink171, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+	bSizer189->Add( m_hyperlink171, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
 
 
-    bSizer1742->Add( bSizer189, 0, wxEXPAND, 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 );
+	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 );
+	bSizer1651->Add( bSizer1742, 1, wxEXPAND, 5 );
 
 
-    bSizer166->Add( bSizer1651, 5, wxEXPAND|wxLEFT, 5 );
+	bSizer166->Add( bSizer1651, 5, wxEXPAND|wxLEFT, 5 );
 
-    m_staticTextFilterDescr = new wxStaticText( m_panelFilterSettings, 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_staticTextFilterDescr->Wrap( -1 );
-    m_staticTextFilterDescr->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticTextFilterDescr = new wxStaticText( m_panelFilterSettings, 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_staticTextFilterDescr->Wrap( -1 );
+	m_staticTextFilterDescr->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    bSizer166->Add( m_staticTextFilterDescr, 0, wxALL, 10 );
+	bSizer166->Add( m_staticTextFilterDescr, 0, wxALL, 10 );
 
 
-    bSizer1591->Add( bSizer166, 1, wxEXPAND, 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 );
+	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* bSizer160;
+	bSizer160 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer168;
-    bSizer168 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer168;
+	bSizer168 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapFilterSize = new wxStaticBitmap( m_panelFilterSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer168->Add( m_bitmapFilterSize, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+	m_bitmapFilterSize = new wxStaticBitmap( m_panelFilterSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer168->Add( m_bitmapFilterSize, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
 
-    wxBoxSizer* bSizer158;
-    bSizer158 = new wxBoxSizer( wxVERTICAL );
+	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 );
+	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 );
+	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_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 );
+	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 );
+	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 );
+	bSizer158->Add( bSizer162, 0, wxBOTTOM|wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer163;
-    bSizer163 = new wxBoxSizer( wxVERTICAL );
+	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_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 );
+	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 );
+	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 );
+	bSizer158->Add( bSizer163, 0, wxEXPAND, 5 );
 
 
-    bSizer168->Add( bSizer158, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	bSizer168->Add( bSizer158, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
 
-    bSizer160->Add( bSizer168, 2, wxEXPAND|wxALL, 5 );
+	bSizer160->Add( bSizer168, 2, wxEXPAND|wxALL, 5 );
 
-    m_staticline23 = new wxStaticLine( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer160->Add( m_staticline23, 0, wxEXPAND, 5 );
+	m_staticline23 = new wxStaticLine( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer160->Add( m_staticline23, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer167;
-    bSizer167 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer167;
+	bSizer167 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapFilterDate = new wxStaticBitmap( m_panelFilterSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer167->Add( m_bitmapFilterDate, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	m_bitmapFilterDate = new wxStaticBitmap( m_panelFilterSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer167->Add( m_bitmapFilterDate, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    wxBoxSizer* bSizer165;
-    bSizer165 = new wxBoxSizer( wxVERTICAL );
+	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_staticText79 = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("Time span:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText79->Wrap( -1 );
+	bSizer165->Add( m_staticText79, 0, wxBOTTOM, 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 );
+	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 );
 
-    m_spinCtrlTimespan = new wxSpinCtrl( m_panelFilterSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
-    bSizer165->Add( m_spinCtrlTimespan, 0, wxEXPAND, 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 );
 
 
-    bSizer167->Add( bSizer165, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	bSizer167->Add( bSizer165, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
 
-    bSizer160->Add( bSizer167, 1, wxEXPAND|wxALL, 5 );
+	bSizer160->Add( bSizer167, 1, wxEXPAND|wxALL, 5 );
 
-    m_staticline231 = new wxStaticLine( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer160->Add( m_staticline231, 0, wxEXPAND, 5 );
+	m_staticline231 = new wxStaticLine( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer160->Add( m_staticline231, 0, wxEXPAND, 5 );
 
-    m_buttonClear = new wxButton( m_panelFilterSettings, wxID_ANY, _("C&lear"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer160->Add( m_buttonClear, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 10 );
+	m_buttonClear = new wxButton( m_panelFilterSettings, wxID_ANY, _("C&lear"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer160->Add( m_buttonClear, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 10 );
 
 
-    bSizer1591->Add( bSizer160, 0, wxEXPAND, 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_panelFilterSettings->SetSizer( bSizer1591 );
+	m_panelFilterSettings->Layout();
+	bSizer1591->Fit( m_panelFilterSettings );
+	bSizer278->Add( m_panelFilterSettings, 1, wxEXPAND, 5 );
 
 
-    m_panelFilterSettingsTab->SetSizer( bSizer278 );
-    m_panelFilterSettingsTab->Layout();
-    bSizer278->Fit( m_panelFilterSettingsTab );
-    m_notebook->AddPage( m_panelFilterSettingsTab, _("dummy"), true );
-    m_panelSyncSettingsTab = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelSyncSettingsTab->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panelFilterSettingsTab->SetSizer( bSizer278 );
+	m_panelFilterSettingsTab->Layout();
+	bSizer278->Fit( m_panelFilterSettingsTab );
+	m_notebook->AddPage( m_panelFilterSettingsTab, _("dummy"), true );
+	m_panelSyncSettingsTab = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelSyncSettingsTab->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer276;
-    bSizer276 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer276;
+	bSizer276 = new wxBoxSizer( wxVERTICAL );
 
-    bSizerHeaderSyncSettings = new wxBoxSizer( wxVERTICAL );
+	bSizerHeaderSyncSettings = new wxBoxSizer( wxVERTICAL );
 
-    m_staticTextMainSyncSettings = new wxStaticText( m_panelSyncSettingsTab, wxID_ANY, _("Main settings:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextMainSyncSettings->Wrap( -1 );
-    bSizerHeaderSyncSettings->Add( m_staticTextMainSyncSettings, 0, wxALL, 10 );
+	m_staticTextMainSyncSettings = new wxStaticText( m_panelSyncSettingsTab, wxID_ANY, _("Main settings:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextMainSyncSettings->Wrap( -1 );
+	bSizerHeaderSyncSettings->Add( m_staticTextMainSyncSettings, 0, wxALL, 10 );
 
-    m_checkBoxUseLocalSyncOptions = new wxCheckBox( m_panelSyncSettingsTab, wxID_ANY, _("Use local settings:"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizerHeaderSyncSettings->Add( m_checkBoxUseLocalSyncOptions, 0, wxALL|wxEXPAND, 10 );
+	m_checkBoxUseLocalSyncOptions = new wxCheckBox( m_panelSyncSettingsTab, wxID_ANY, _("Use local settings:"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerHeaderSyncSettings->Add( m_checkBoxUseLocalSyncOptions, 0, wxALL|wxEXPAND, 10 );
 
-    m_staticlineSyncHeader = new wxStaticLine( m_panelSyncSettingsTab, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerHeaderSyncSettings->Add( m_staticlineSyncHeader, 0, wxEXPAND, 5 );
+	m_staticlineSyncHeader = new wxStaticLine( m_panelSyncSettingsTab, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerHeaderSyncSettings->Add( m_staticlineSyncHeader, 0, wxEXPAND, 5 );
 
 
-    bSizer276->Add( bSizerHeaderSyncSettings, 0, wxEXPAND, 5 );
+	bSizer276->Add( bSizerHeaderSyncSettings, 0, wxEXPAND, 5 );
 
-    m_panelSyncSettings = new wxPanel( m_panelSyncSettingsTab, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelSyncSettings->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panelSyncSettings = new wxPanel( m_panelSyncSettingsTab, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelSyncSettings->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer232;
-    bSizer232 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer232;
+	bSizer232 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer237;
-    bSizer237 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer237;
+	bSizer237 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer235;
-    bSizer235 = new wxBoxSizer( wxVERTICAL );
+	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 );
+	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 );
 
-    wxGridSizer* gSizer1;
-    gSizer1 = new wxGridSizer( 0, 1, 0, 0 );
+	wxGridSizer* gSizer1;
+	gSizer1 = new wxGridSizer( 0, 1, 0, 0 );
 
-    m_buttonTwoWay = new zen::ToggleButton( m_panelSyncSettings, wxID_ANY, _("Two way"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonTwoWay = new zen::ToggleButton( m_panelSyncSettings, wxID_ANY, _("Two way"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
 
-    m_buttonTwoWay->SetDefault();
-    m_buttonTwoWay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-    m_buttonTwoWay->SetToolTip( _("dummy") );
+	m_buttonTwoWay->SetDefault();
+	m_buttonTwoWay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonTwoWay->SetToolTip( _("dummy") );
 
-    gSizer1->Add( m_buttonTwoWay, 0, wxEXPAND, 5 );
+	gSizer1->Add( m_buttonTwoWay, 0, wxEXPAND, 5 );
 
-    m_buttonMirror = new zen::ToggleButton( m_panelSyncSettings, wxID_ANY, _("Mirror"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonMirror = new zen::ToggleButton( m_panelSyncSettings, wxID_ANY, _("Mirror"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
 
-    m_buttonMirror->SetDefault();
-    m_buttonMirror->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-    m_buttonMirror->SetToolTip( _("dummy") );
+	m_buttonMirror->SetDefault();
+	m_buttonMirror->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonMirror->SetToolTip( _("dummy") );
 
-    gSizer1->Add( m_buttonMirror, 0, wxEXPAND, 5 );
+	gSizer1->Add( m_buttonMirror, 0, wxEXPAND, 5 );
 
-    m_buttonUpdate = new zen::ToggleButton( m_panelSyncSettings, wxID_ANY, _("Update"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonUpdate = new zen::ToggleButton( m_panelSyncSettings, wxID_ANY, _("Update"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
 
-    m_buttonUpdate->SetDefault();
-    m_buttonUpdate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-    m_buttonUpdate->SetToolTip( _("dummy") );
+	m_buttonUpdate->SetDefault();
+	m_buttonUpdate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonUpdate->SetToolTip( _("dummy") );
 
-    gSizer1->Add( m_buttonUpdate, 0, wxEXPAND, 5 );
+	gSizer1->Add( m_buttonUpdate, 0, wxEXPAND, 5 );
 
-    m_buttonCustom = new zen::ToggleButton( m_panelSyncSettings, wxID_ANY, _("Custom"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonCustom = new zen::ToggleButton( m_panelSyncSettings, wxID_ANY, _("Custom"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
 
-    m_buttonCustom->SetDefault();
-    m_buttonCustom->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-    m_buttonCustom->SetToolTip( _("dummy") );
+	m_buttonCustom->SetDefault();
+	m_buttonCustom->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonCustom->SetToolTip( _("dummy") );
 
-    gSizer1->Add( m_buttonCustom, 0, wxEXPAND, 5 );
+	gSizer1->Add( m_buttonCustom, 0, wxEXPAND, 5 );
 
 
-    bSizer235->Add( gSizer1, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	bSizer235->Add( gSizer1, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 
-    bSizer237->Add( bSizer235, 0, wxALL, 5 );
+	bSizer237->Add( bSizer235, 0, wxALL, 5 );
 
 
-    bSizer237->Add( 10, 0, 0, 0, 5 );
+	bSizer237->Add( 10, 0, 0, 0, 5 );
 
-    wxBoxSizer* bSizer238;
-    bSizer238 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer238;
+	bSizer238 = new wxBoxSizer( wxVERTICAL );
 
 
-    bSizer238->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizer238->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    bSizerSyncDirHolder = new wxBoxSizer( wxHORIZONTAL );
+	bSizerSyncDirHolder = new wxBoxSizer( wxHORIZONTAL );
 
-    bSizerSyncDirections = new wxBoxSizer( wxVERTICAL );
+	bSizerSyncDirections = new wxBoxSizer( wxVERTICAL );
 
-    m_staticText184 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Difference"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText184->Wrap( -1 );
-    bSizerSyncDirections->Add( m_staticText184, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_staticText184 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Difference"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText184->Wrap( -1 );
+	bSizerSyncDirections->Add( m_staticText184, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    ffgSizer11 = new wxFlexGridSizer( 2, 0, 5, 5 );
-    ffgSizer11->SetFlexibleDirection( wxBOTH );
-    ffgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	ffgSizer11 = new wxFlexGridSizer( 2, 0, 5, 5 );
+	ffgSizer11->SetFlexibleDirection( wxBOTH );
+	ffgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    m_bitmapLeftOnly = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_bitmapLeftOnly->SetToolTip( _("Item exists on left side only") );
+	m_bitmapLeftOnly = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_bitmapLeftOnly->SetToolTip( _("Item exists on left side only") );
 
-    ffgSizer11->Add( m_bitmapLeftOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	ffgSizer11->Add( m_bitmapLeftOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_bitmapLeftNewer = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_bitmapLeftNewer->SetToolTip( _("Left side is newer") );
+	m_bitmapLeftNewer = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_bitmapLeftNewer->SetToolTip( _("Left side is newer") );
 
-    ffgSizer11->Add( m_bitmapLeftNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	ffgSizer11->Add( m_bitmapLeftNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_bitmapDifferent = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_bitmapDifferent->SetToolTip( _("Items have different content") );
+	m_bitmapDifferent = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_bitmapDifferent->SetToolTip( _("Items have different content") );
 
-    ffgSizer11->Add( m_bitmapDifferent, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	ffgSizer11->Add( m_bitmapDifferent, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_bitmapConflict = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_bitmapConflict->SetToolTip( _("Conflict/item cannot be categorized") );
+	m_bitmapConflict = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_bitmapConflict->SetToolTip( _("Conflict/item cannot be categorized") );
 
-    ffgSizer11->Add( m_bitmapConflict, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	ffgSizer11->Add( m_bitmapConflict, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_bitmapRightNewer = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_bitmapRightNewer->SetToolTip( _("Right side is newer") );
+	m_bitmapRightNewer = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_bitmapRightNewer->SetToolTip( _("Right side is newer") );
 
-    ffgSizer11->Add( m_bitmapRightNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	ffgSizer11->Add( m_bitmapRightNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_bitmapRightOnly = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_bitmapRightOnly->SetToolTip( _("Item exists on right side only") );
+	m_bitmapRightOnly = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_bitmapRightOnly->SetToolTip( _("Item exists on right side only") );
 
-    ffgSizer11->Add( m_bitmapRightOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	ffgSizer11->Add( m_bitmapRightOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_bpButtonLeftOnly = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    ffgSizer11->Add( m_bpButtonLeftOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_bpButtonLeftOnly = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	ffgSizer11->Add( m_bpButtonLeftOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_bpButtonLeftNewer = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    ffgSizer11->Add( m_bpButtonLeftNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_bpButtonLeftNewer = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	ffgSizer11->Add( m_bpButtonLeftNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_bpButtonDifferent = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    ffgSizer11->Add( m_bpButtonDifferent, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_bpButtonDifferent = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	ffgSizer11->Add( m_bpButtonDifferent, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_bpButtonConflict = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    ffgSizer11->Add( m_bpButtonConflict, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_bpButtonConflict = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	ffgSizer11->Add( m_bpButtonConflict, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_bpButtonRightNewer = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    ffgSizer11->Add( m_bpButtonRightNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_bpButtonRightNewer = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	ffgSizer11->Add( m_bpButtonRightNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_bpButtonRightOnly = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    ffgSizer11->Add( m_bpButtonRightOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_bpButtonRightOnly = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	ffgSizer11->Add( m_bpButtonRightOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizerSyncDirections->Add( ffgSizer11, 0, 0, 5 );
+	bSizerSyncDirections->Add( ffgSizer11, 0, 0, 5 );
 
-    m_staticText120 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Action"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText120->Wrap( -1 );
-    bSizerSyncDirections->Add( m_staticText120, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP, 5 );
+	m_staticText120 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Action"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText120->Wrap( -1 );
+	bSizerSyncDirections->Add( m_staticText120, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP, 5 );
 
 
-    bSizerSyncDirHolder->Add( bSizerSyncDirections, 0, 0, 5 );
+	bSizerSyncDirHolder->Add( bSizerSyncDirections, 0, 0, 5 );
 
-    bSizerDatabase = new wxBoxSizer( wxVERTICAL );
+	bSizerDatabase = new wxBoxSizer( wxVERTICAL );
 
-    m_bitmapDatabase = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizerDatabase->Add( m_bitmapDatabase, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bitmapDatabase = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizerDatabase->Add( m_bitmapDatabase, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-    bSizerDatabase->Add( 0, 3, 0, 0, 5 );
+	bSizerDatabase->Add( 0, 3, 0, 0, 5 );
 
-    m_staticText145 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("sync.ffs_db"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText145->Wrap( -1 );
-    m_staticText145->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_SWISS, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL, false, wxT("Arial") ) );
-    m_staticText145->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticText145 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("sync.ffs_db"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText145->Wrap( -1 );
+	m_staticText145->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_SWISS, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL, false, wxT("Arial") ) );
+	m_staticText145->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    bSizerDatabase->Add( m_staticText145, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	bSizerDatabase->Add( m_staticText145, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-    bSizerSyncDirHolder->Add( bSizerDatabase, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizerSyncDirHolder->Add( bSizerDatabase, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticTextSyncVarDescription = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_staticTextSyncVarDescription->Wrap( -1 );
-    m_staticTextSyncVarDescription->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticTextSyncVarDescription = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_staticTextSyncVarDescription->Wrap( -1 );
+	m_staticTextSyncVarDescription->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    bSizerSyncDirHolder->Add( m_staticTextSyncVarDescription, 0, wxALL|wxALIGN_CENTER_VERTICAL, 10 );
+	bSizerSyncDirHolder->Add( m_staticTextSyncVarDescription, 0, wxALL|wxALIGN_CENTER_VERTICAL, 10 );
 
 
-    bSizer238->Add( bSizerSyncDirHolder, 0, wxTOP|wxBOTTOM|wxRIGHT, 10 );
+	bSizer238->Add( bSizerSyncDirHolder, 0, wxTOP|wxBOTTOM|wxRIGHT, 10 );
 
 
-    bSizer238->Add( 0, 0, 1, wxEXPAND, 5 );
+	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 );
+	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 );
+	wxBoxSizer* bSizer201;
+	bSizer201 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_staticline72 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer201->Add( m_staticline72, 0, wxEXPAND, 5 );
+	m_staticline72 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer201->Add( m_staticline72, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer249;
-    bSizer249 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer249;
+	bSizer249 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_checkBoxDetectMove = new wxCheckBox( m_panelSyncSettings, wxID_ANY, _("Detect moved files"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_checkBoxDetectMove->SetToolTip( _("- Not supported by all file systems\n- Requires and creates database files\n- Detection not available for first sync") );
+	m_checkBoxDetectMove = new wxCheckBox( m_panelSyncSettings, wxID_ANY, _("Detect moved files"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_checkBoxDetectMove->SetToolTip( _("- Not supported by all file systems\n- Requires and creates database files\n- Detection not available for first sync") );
 
-    bSizer249->Add( m_checkBoxDetectMove, 0, wxALL|wxEXPAND, 5 );
+	bSizer249->Add( m_checkBoxDetectMove, 0, wxALL|wxEXPAND, 5 );
 
-    m_hyperlink242 = new wxHyperlinkCtrl( m_panelSyncSettings, wxID_ANY, _("More information"), wxT("https://freefilesync.org/manual.php?topic=synchronization-settings"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink242->SetToolTip( _("https://freefilesync.org/manual.php?topic=synchronization-settings") );
+	m_hyperlink242 = new wxHyperlinkCtrl( m_panelSyncSettings, wxID_ANY, _("More information"), wxT("https://freefilesync.org/manual.php?topic=synchronization-settings"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink242->SetToolTip( _("https://freefilesync.org/manual.php?topic=synchronization-settings") );
 
-    bSizer249->Add( m_hyperlink242, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	bSizer249->Add( m_hyperlink242, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
 
-    bSizer201->Add( bSizer249, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer201->Add( bSizer249, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer238->Add( bSizer201, 0, 0, 5 );
+	bSizer238->Add( bSizer201, 0, 0, 5 );
 
 
-    bSizer237->Add( bSizer238, 1, wxEXPAND, 5 );
+	bSizer237->Add( bSizer238, 1, wxEXPAND, 5 );
 
 
-    bSizer232->Add( bSizer237, 0, 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 );
+	m_staticline54 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer232->Add( m_staticline54, 0, wxEXPAND, 5 );
 
-    bSizer2361 = new wxBoxSizer( wxHORIZONTAL );
+	bSizer2361 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer202;
-    bSizer202 = new wxBoxSizer( wxVERTICAL );
+	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_staticText87 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Delete files:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText87->Wrap( -1 );
+	bSizer202->Add( m_staticText87, 0, wxALL, 5 );
 
-    wxBoxSizer* bSizer234;
-    bSizer234 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer234;
+	bSizer234 = new wxBoxSizer( wxVERTICAL );
 
-    m_buttonRecycler = new zen::ToggleButton( m_panelSyncSettings, wxID_ANY, _("&Recycle bin"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonRecycler = new zen::ToggleButton( m_panelSyncSettings, wxID_ANY, _("&Recycle bin"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
 
-    m_buttonRecycler->SetDefault();
-    m_buttonRecycler->SetToolTip( _("dummy") );
+	m_buttonRecycler->SetDefault();
+	m_buttonRecycler->SetToolTip( _("dummy") );
 
-    bSizer234->Add( m_buttonRecycler, 0, wxEXPAND, 5 );
+	bSizer234->Add( m_buttonRecycler, 0, wxEXPAND, 5 );
 
-    m_buttonPermanent = new zen::ToggleButton( m_panelSyncSettings, wxID_ANY, _("&Permanent"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonPermanent = new zen::ToggleButton( m_panelSyncSettings, wxID_ANY, _("&Permanent"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
 
-    m_buttonPermanent->SetDefault();
-    m_buttonPermanent->SetToolTip( _("dummy") );
+	m_buttonPermanent->SetDefault();
+	m_buttonPermanent->SetToolTip( _("dummy") );
 
-    bSizer234->Add( m_buttonPermanent, 0, wxEXPAND, 5 );
+	bSizer234->Add( m_buttonPermanent, 0, wxEXPAND, 5 );
 
-    m_buttonVersioning = new zen::ToggleButton( m_panelSyncSettings, wxID_ANY, _("&Versioning"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonVersioning = new zen::ToggleButton( m_panelSyncSettings, wxID_ANY, _("&Versioning"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
 
-    m_buttonVersioning->SetDefault();
-    m_buttonVersioning->SetToolTip( _("dummy") );
+	m_buttonVersioning->SetDefault();
+	m_buttonVersioning->SetToolTip( _("dummy") );
 
-    bSizer234->Add( m_buttonVersioning, 0, wxEXPAND, 5 );
+	bSizer234->Add( m_buttonVersioning, 0, wxEXPAND, 5 );
 
 
-    bSizer202->Add( bSizer234, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	bSizer202->Add( bSizer234, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 
-    bSizer2361->Add( bSizer202, 0, wxALL, 5 );
+	bSizer2361->Add( bSizer202, 0, wxALL, 5 );
 
-    bSizerVersioningHolder = new wxBoxSizer( wxVERTICAL );
+	bSizerVersioningHolder = new wxBoxSizer( wxVERTICAL );
 
 
-    bSizerVersioningHolder->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizerVersioningHolder->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer2331;
-    bSizer2331 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer2331;
+	bSizer2331 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapDeletionType = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer2331->Add( m_bitmapDeletionType, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	m_bitmapDeletionType = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer2331->Add( m_bitmapDeletionType, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    m_staticTextDeletionTypeDescription = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextDeletionTypeDescription->Wrap( -1 );
-    m_staticTextDeletionTypeDescription->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticTextDeletionTypeDescription = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextDeletionTypeDescription->Wrap( -1 );
+	m_staticTextDeletionTypeDescription->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    bSizer2331->Add( m_staticTextDeletionTypeDescription, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	bSizer2331->Add( m_staticTextDeletionTypeDescription, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
 
-    bSizerVersioningHolder->Add( bSizer2331, 0, wxALL|wxEXPAND, 5 );
+	bSizerVersioningHolder->Add( bSizer2331, 0, wxALL|wxEXPAND, 5 );
 
-    m_panelVersioning = new wxPanel( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelVersioning->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	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* bSizer191;
+	bSizer191 = new wxBoxSizer( wxVERTICAL );
 
 
-    bSizer191->Add( 0, 5, 0, 0, 5 );
+	bSizer191->Add( 0, 5, 0, 0, 5 );
 
-    wxBoxSizer* bSizer252;
-    bSizer252 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer252;
+	bSizer252 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapVersioning = new wxStaticBitmap( m_panelVersioning, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer252->Add( m_bitmapVersioning, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	m_bitmapVersioning = new wxStaticBitmap( m_panelVersioning, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer252->Add( m_bitmapVersioning, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
-    wxBoxSizer* bSizer253;
-    bSizer253 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer253;
+	bSizer253 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer254;
-    bSizer254 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer254;
+	bSizer254 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_staticText155 = new wxStaticText( m_panelVersioning, wxID_ANY, _("Move files to a user-defined folder"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText155->Wrap( -1 );
-    m_staticText155->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticText155 = new wxStaticText( m_panelVersioning, wxID_ANY, _("Move files to a user-defined folder"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText155->Wrap( -1 );
+	m_staticText155->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    bSizer254->Add( m_staticText155, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	bSizer254->Add( m_staticText155, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
 
-    bSizer254->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizer254->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_hyperlink243 = new wxHyperlinkCtrl( m_panelVersioning, wxID_ANY, _("Show examples"), wxT("https://freefilesync.org/manual.php?topic=versioning"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink243->SetToolTip( _("https://freefilesync.org/manual.php?topic=versioning") );
+	m_hyperlink243 = new wxHyperlinkCtrl( m_panelVersioning, wxID_ANY, _("Show examples"), wxT("https://freefilesync.org/manual.php?topic=versioning"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink243->SetToolTip( _("https://freefilesync.org/manual.php?topic=versioning") );
 
-    bSizer254->Add( m_hyperlink243, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+	bSizer254->Add( m_hyperlink243, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
 
 
-    bSizer253->Add( bSizer254, 0, wxEXPAND|wxBOTTOM, 5 );
+	bSizer253->Add( bSizer254, 0, wxEXPAND|wxBOTTOM, 5 );
 
-    wxBoxSizer* bSizer156;
-    bSizer156 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer156;
+	bSizer156 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_versioningFolderPath = new fff::FolderHistoryBox( m_panelVersioning, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
-    bSizer156->Add( m_versioningFolderPath, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	m_versioningFolderPath = new fff::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") );
+	m_buttonSelectVersioningFolder = new wxButton( m_panelVersioning, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonSelectVersioningFolder->SetToolTip( _("Select a folder") );
 
-    bSizer156->Add( m_buttonSelectVersioningFolder, 0, wxEXPAND, 5 );
+	bSizer156->Add( m_buttonSelectVersioningFolder, 0, wxEXPAND, 5 );
 
-    m_bpButtonSelectVersioningAltFolder = new wxBitmapButton( m_panelVersioning, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonSelectVersioningAltFolder->SetToolTip( _("Access online storage") );
+	m_bpButtonSelectVersioningAltFolder = new wxBitmapButton( m_panelVersioning, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonSelectVersioningAltFolder->SetToolTip( _("Access online storage") );
 
-    bSizer156->Add( m_bpButtonSelectVersioningAltFolder, 0, wxEXPAND, 5 );
+	bSizer156->Add( m_bpButtonSelectVersioningAltFolder, 0, wxEXPAND, 5 );
 
 
-    bSizer253->Add( bSizer156, 0, wxEXPAND, 5 );
+	bSizer253->Add( bSizer156, 0, wxEXPAND, 5 );
 
 
-    bSizer252->Add( bSizer253, 1, wxRIGHT, 5 );
+	bSizer252->Add( bSizer253, 1, wxRIGHT, 5 );
 
 
-    bSizer191->Add( bSizer252, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
+	bSizer191->Add( bSizer252, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
 
-    wxBoxSizer* bSizer198;
-    bSizer198 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer198;
+	bSizer198 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer255;
-    bSizer255 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer255;
+	bSizer255 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer256;
-    bSizer256 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer256;
+	bSizer256 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_staticText93 = new wxStaticText( m_panelVersioning, wxID_ANY, _("Naming convention:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText93->Wrap( -1 );
-    bSizer256->Add( m_staticText93, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	m_staticText93 = new wxStaticText( m_panelVersioning, wxID_ANY, _("Naming convention:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText93->Wrap( -1 );
+	bSizer256->Add( m_staticText93, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
-    wxArrayString m_choiceVersioningStyleChoices;
-    m_choiceVersioningStyle = new wxChoice( m_panelVersioning, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceVersioningStyleChoices, 0 );
-    m_choiceVersioningStyle->SetSelection( 0 );
-    bSizer256->Add( m_choiceVersioningStyle, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	wxArrayString m_choiceVersioningStyleChoices;
+	m_choiceVersioningStyle = new wxChoice( m_panelVersioning, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceVersioningStyleChoices, 0 );
+	m_choiceVersioningStyle->SetSelection( 0 );
+	bSizer256->Add( m_choiceVersioningStyle, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer255->Add( bSizer256, 0, wxALL, 5 );
+	bSizer255->Add( bSizer256, 0, wxALL, 5 );
 
-    wxBoxSizer* bSizer257;
-    bSizer257 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer257;
+	bSizer257 = 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 ) );
+	m_staticTextNamingCvtPart1 = new wxStaticText( m_panelVersioning, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextNamingCvtPart1->Wrap( -1 );
+	m_staticTextNamingCvtPart1->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    bSizer257->Add( m_staticTextNamingCvtPart1, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer257->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(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-    m_staticTextNamingCvtPart2Bold->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticTextNamingCvtPart2Bold = new wxStaticText( m_panelVersioning, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextNamingCvtPart2Bold->Wrap( -1 );
+	m_staticTextNamingCvtPart2Bold->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_staticTextNamingCvtPart2Bold->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    bSizer257->Add( m_staticTextNamingCvtPart2Bold, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer257->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 ) );
+	m_staticTextNamingCvtPart3 = new wxStaticText( m_panelVersioning, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextNamingCvtPart3->Wrap( -1 );
+	m_staticTextNamingCvtPart3->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    bSizer257->Add( m_staticTextNamingCvtPart3, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer257->Add( m_staticTextNamingCvtPart3, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer255->Add( bSizer257, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	bSizer255->Add( bSizer257, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 
-    bSizer198->Add( bSizer255, 0, wxALL, 5 );
+	bSizer198->Add( bSizer255, 0, wxALL, 5 );
 
-    m_staticline69 = new wxStaticLine( m_panelVersioning, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer198->Add( m_staticline69, 0, wxEXPAND, 5 );
+	m_staticline69 = new wxStaticLine( m_panelVersioning, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer198->Add( m_staticline69, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer258;
-    bSizer258 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer258;
+	bSizer258 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticTextLimitVersions = new wxStaticText( m_panelVersioning, wxID_ANY, _("Limit file versions:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextLimitVersions->Wrap( -1 );
-    bSizer258->Add( m_staticTextLimitVersions, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	m_staticTextLimitVersions = new wxStaticText( m_panelVersioning, wxID_ANY, _("Limit file versions:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextLimitVersions->Wrap( -1 );
+	bSizer258->Add( m_staticTextLimitVersions, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 
-    fgSizer15 = new wxFlexGridSizer( 0, 3, 5, 10 );
-    fgSizer15->SetFlexibleDirection( wxBOTH );
-    fgSizer15->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	fgSizer15 = new wxFlexGridSizer( 0, 3, 5, 10 );
+	fgSizer15->SetFlexibleDirection( wxBOTH );
+	fgSizer15->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    m_checkBoxVersionMaxDays = new wxCheckBox( m_panelVersioning, wxID_ANY, _("Last x days:"), wxDefaultPosition, wxDefaultSize, 0 );
-    fgSizer15->Add( m_checkBoxVersionMaxDays, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_checkBoxVersionMaxDays = new wxCheckBox( m_panelVersioning, wxID_ANY, _("Last x days:"), wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer15->Add( m_checkBoxVersionMaxDays, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_checkBoxVersionCountMin = new wxCheckBox( m_panelVersioning, wxID_ANY, _("Minimum:"), wxDefaultPosition, wxDefaultSize, 0 );
-    fgSizer15->Add( m_checkBoxVersionCountMin, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_checkBoxVersionCountMin = new wxCheckBox( m_panelVersioning, wxID_ANY, _("Minimum:"), wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer15->Add( m_checkBoxVersionCountMin, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_checkBoxVersionCountMax = new wxCheckBox( m_panelVersioning, wxID_ANY, _("Maximum:"), wxDefaultPosition, wxDefaultSize, 0 );
-    fgSizer15->Add( m_checkBoxVersionCountMax, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_checkBoxVersionCountMax = new wxCheckBox( m_panelVersioning, wxID_ANY, _("Maximum:"), wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer15->Add( m_checkBoxVersionCountMax, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_spinCtrlVersionMaxDays = new wxSpinCtrl( m_panelVersioning, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
-    fgSizer15->Add( m_spinCtrlVersionMaxDays, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_spinCtrlVersionMaxDays = new wxSpinCtrl( m_panelVersioning, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
+	fgSizer15->Add( m_spinCtrlVersionMaxDays, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_spinCtrlVersionCountMin = new wxSpinCtrl( m_panelVersioning, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
-    fgSizer15->Add( m_spinCtrlVersionCountMin, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_spinCtrlVersionCountMin = new wxSpinCtrl( m_panelVersioning, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
+	fgSizer15->Add( m_spinCtrlVersionCountMin, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_spinCtrlVersionCountMax = new wxSpinCtrl( m_panelVersioning, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 1, 2000000000, 1 );
-    fgSizer15->Add( m_spinCtrlVersionCountMax, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_spinCtrlVersionCountMax = new wxSpinCtrl( m_panelVersioning, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 1, 2000000000, 1 );
+	fgSizer15->Add( m_spinCtrlVersionCountMax, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer258->Add( fgSizer15, 0, wxALL, 5 );
+	bSizer258->Add( fgSizer15, 0, wxALL, 5 );
 
 
-    bSizer198->Add( bSizer258, 0, wxALL, 5 );
+	bSizer198->Add( bSizer258, 0, wxALL, 5 );
 
 
-    bSizer191->Add( bSizer198, 0, wxEXPAND, 5 );
+	bSizer191->Add( bSizer198, 0, wxEXPAND, 5 );
 
 
-    m_panelVersioning->SetSizer( bSizer191 );
-    m_panelVersioning->Layout();
-    bSizer191->Fit( m_panelVersioning );
-    bSizerVersioningHolder->Add( m_panelVersioning, 0, wxEXPAND, 5 );
+	m_panelVersioning->SetSizer( bSizer191 );
+	m_panelVersioning->Layout();
+	bSizer191->Fit( m_panelVersioning );
+	bSizerVersioningHolder->Add( m_panelVersioning, 0, wxEXPAND, 5 );
 
 
-    bSizerVersioningHolder->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizerVersioningHolder->Add( 0, 0, 1, wxEXPAND, 5 );
 
 
-    bSizer2361->Add( bSizerVersioningHolder, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer2361->Add( bSizerVersioningHolder, 1, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer232->Add( bSizer2361, 0, wxEXPAND, 5 );
+	bSizer232->Add( bSizer2361, 0, wxEXPAND, 5 );
 
-    m_staticline582 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer232->Add( m_staticline582, 0, wxEXPAND, 5 );
+	m_staticline582 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer232->Add( m_staticline582, 0, wxEXPAND, 5 );
 
-    bSizerSyncMisc = new wxBoxSizer( wxHORIZONTAL );
+	bSizerSyncMisc = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer292;
-    bSizer292 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer292;
+	bSizer292 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer287;
-    bSizer287 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer287;
+	bSizer287 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer290;
-    bSizer290 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer290;
+	bSizer290 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer291;
-    bSizer291 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer291;
+	bSizer291 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapEmail = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer291->Add( m_bitmapEmail, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_bitmapEmail = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer291->Add( m_bitmapEmail, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_checkBoxSendEmail = new wxCheckBox( m_panelSyncSettings, wxID_ANY, _("Send email notification:"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer291->Add( m_checkBoxSendEmail, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+	m_checkBoxSendEmail = new wxCheckBox( m_panelSyncSettings, wxID_ANY, _("Send email notification:"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer291->Add( m_checkBoxSendEmail, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
 
-    bSizer290->Add( bSizer291, 0, 0, 5 );
+	bSizer290->Add( bSizer291, 0, 0, 5 );
 
-    m_comboBoxEmail = new fff::CommandBox( m_panelSyncSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
-    bSizer290->Add( m_comboBoxEmail, 0, wxEXPAND|wxTOP, 5 );
+	m_comboBoxEmail = new fff::CommandBox( m_panelSyncSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+	bSizer290->Add( m_comboBoxEmail, 0, wxEXPAND|wxTOP, 5 );
 
 
-    bSizer287->Add( bSizer290, 1, wxRIGHT, 5 );
+	bSizer287->Add( bSizer290, 1, wxRIGHT, 5 );
 
-    wxBoxSizer* bSizer289;
-    bSizer289 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer289;
+	bSizer289 = new wxBoxSizer( wxVERTICAL );
 
-    m_bpButtonEmailAlways = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
-    bSizer289->Add( m_bpButtonEmailAlways, 0, 0, 5 );
+	m_bpButtonEmailAlways = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+	bSizer289->Add( m_bpButtonEmailAlways, 0, 0, 5 );
 
-    m_bpButtonEmailErrorWarning = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
-    bSizer289->Add( m_bpButtonEmailErrorWarning, 0, 0, 5 );
+	m_bpButtonEmailErrorWarning = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+	bSizer289->Add( m_bpButtonEmailErrorWarning, 0, 0, 5 );
 
-    m_bpButtonEmailErrorOnly = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
-    bSizer289->Add( m_bpButtonEmailErrorOnly, 0, 0, 5 );
+	m_bpButtonEmailErrorOnly = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+	bSizer289->Add( m_bpButtonEmailErrorOnly, 0, 0, 5 );
 
 
-    bSizer287->Add( bSizer289, 0, wxLEFT, 5 );
+	bSizer287->Add( bSizer289, 0, wxLEFT, 5 );
 
 
-    bSizer292->Add( bSizer287, 0, wxEXPAND, 5 );
+	bSizer292->Add( bSizer287, 0, wxEXPAND, 5 );
 
-    m_hyperlinkPerfDeRequired2 = new wxHyperlinkCtrl( m_panelSyncSettings, wxID_ANY, _("Requires FreeFileSync Donation Edition"), wxT("https://freefilesync.org/faq.php#donation-edition"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlinkPerfDeRequired2->SetToolTip( _("https://freefilesync.org/faq.php#donation-edition") );
+	m_hyperlinkPerfDeRequired2 = new wxHyperlinkCtrl( m_panelSyncSettings, wxID_ANY, _("Requires FreeFileSync Donation Edition"), wxT("https://freefilesync.org/faq.php#donation-edition"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlinkPerfDeRequired2->SetToolTip( _("https://freefilesync.org/faq.php#donation-edition") );
 
-    bSizer292->Add( m_hyperlinkPerfDeRequired2, 0, wxALL, 5 );
+	bSizer292->Add( m_hyperlinkPerfDeRequired2, 0, wxALL, 5 );
 
 
-    bSizerSyncMisc->Add( bSizer292, 0, wxEXPAND|wxALL, 10 );
+	bSizerSyncMisc->Add( bSizer292, 0, wxEXPAND|wxALL, 10 );
 
-    m_staticline57 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizerSyncMisc->Add( m_staticline57, 0, wxEXPAND, 5 );
+	m_staticline57 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizerSyncMisc->Add( m_staticline57, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer293;
-    bSizer293 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer293;
+	bSizer293 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer2372;
-    bSizer2372 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer2372;
+	bSizer2372 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_panelLogfile = new wxPanel( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelLogfile->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panelLogfile = new wxPanel( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelLogfile->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer1912;
-    bSizer1912 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer1912;
+	bSizer1912 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer279;
-    bSizer279 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer279;
+	bSizer279 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapLogFile = new wxStaticBitmap( m_panelLogfile, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer279->Add( m_bitmapLogFile, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_bitmapLogFile = new wxStaticBitmap( m_panelLogfile, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer279->Add( m_bitmapLogFile, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_checkBoxOverrideLogPath = new wxCheckBox( m_panelLogfile, wxID_ANY, _("&Override default log path:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_checkBoxOverrideLogPath->SetValue(true);
-    bSizer279->Add( m_checkBoxOverrideLogPath, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+	m_checkBoxOverrideLogPath = new wxCheckBox( m_panelLogfile, wxID_ANY, _("&Override default log path:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_checkBoxOverrideLogPath->SetValue(true);
+	bSizer279->Add( m_checkBoxOverrideLogPath, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
 
-    m_buttonSelectLogFolder = new wxButton( m_panelLogfile, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_buttonSelectLogFolder->SetToolTip( _("Select a folder") );
+	m_buttonSelectLogFolder = new wxButton( m_panelLogfile, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonSelectLogFolder->SetToolTip( _("Select a folder") );
 
-    bSizer279->Add( m_buttonSelectLogFolder, 0, wxEXPAND, 5 );
+	bSizer279->Add( m_buttonSelectLogFolder, 0, wxEXPAND, 5 );
 
-    m_bpButtonSelectAltLogFolder = new wxBitmapButton( m_panelLogfile, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonSelectAltLogFolder->SetToolTip( _("Access online storage") );
+	m_bpButtonSelectAltLogFolder = new wxBitmapButton( m_panelLogfile, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonSelectAltLogFolder->SetToolTip( _("Access online storage") );
 
-    bSizer279->Add( m_bpButtonSelectAltLogFolder, 0, wxEXPAND, 5 );
+	bSizer279->Add( m_bpButtonSelectAltLogFolder, 0, wxEXPAND, 5 );
 
 
-    bSizer1912->Add( bSizer279, 0, wxEXPAND, 5 );
+	bSizer1912->Add( bSizer279, 0, wxEXPAND, 5 );
 
-    m_logFolderPath = new fff::FolderHistoryBox( m_panelLogfile, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
-    bSizer1912->Add( m_logFolderPath, 0, wxEXPAND|wxTOP, 5 );
+	m_logFolderPath = new fff::FolderHistoryBox( m_panelLogfile, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+	bSizer1912->Add( m_logFolderPath, 0, wxEXPAND|wxTOP, 5 );
 
 
-    m_panelLogfile->SetSizer( bSizer1912 );
-    m_panelLogfile->Layout();
-    bSizer1912->Fit( m_panelLogfile );
-    bSizer2372->Add( m_panelLogfile, 1, 0, 5 );
+	m_panelLogfile->SetSizer( bSizer1912 );
+	m_panelLogfile->Layout();
+	bSizer1912->Fit( m_panelLogfile );
+	bSizer2372->Add( m_panelLogfile, 1, 0, 5 );
 
 
-    bSizer293->Add( bSizer2372, 0, wxALL|wxEXPAND, 10 );
+	bSizer293->Add( bSizer2372, 0, wxALL|wxEXPAND, 10 );
 
-    m_staticline80 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer293->Add( m_staticline80, 0, wxEXPAND, 5 );
+	m_staticline80 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer293->Add( m_staticline80, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer247;
-    bSizer247 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer247;
+	bSizer247 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_staticTextPostSync = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Run a command:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextPostSync->Wrap( -1 );
-    bSizer247->Add( m_staticTextPostSync, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticTextPostSync = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Run a command:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextPostSync->Wrap( -1 );
+	bSizer247->Add( m_staticTextPostSync, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxArrayString m_choicePostSyncConditionChoices;
-    m_choicePostSyncCondition = new wxChoice( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choicePostSyncConditionChoices, 0 );
-    m_choicePostSyncCondition->SetSelection( 0 );
-    bSizer247->Add( m_choicePostSyncCondition, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	wxArrayString m_choicePostSyncConditionChoices;
+	m_choicePostSyncCondition = new wxChoice( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choicePostSyncConditionChoices, 0 );
+	m_choicePostSyncCondition->SetSelection( 0 );
+	bSizer247->Add( m_choicePostSyncCondition, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_comboBoxPostSyncCommand = new fff::CommandBox( m_panelSyncSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
-    bSizer247->Add( m_comboBoxPostSyncCommand, 1, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+	m_comboBoxPostSyncCommand = new fff::CommandBox( m_panelSyncSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+	bSizer247->Add( m_comboBoxPostSyncCommand, 1, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer293->Add( bSizer247, 0, wxALL|wxEXPAND, 10 );
+	bSizer293->Add( bSizer247, 0, wxALL|wxEXPAND, 10 );
 
 
-    bSizerSyncMisc->Add( bSizer293, 1, 0, 5 );
+	bSizerSyncMisc->Add( bSizer293, 1, 0, 5 );
 
 
-    bSizer232->Add( bSizerSyncMisc, 1, wxEXPAND, 5 );
+	bSizer232->Add( bSizerSyncMisc, 1, wxEXPAND, 5 );
 
 
-    m_panelSyncSettings->SetSizer( bSizer232 );
-    m_panelSyncSettings->Layout();
-    bSizer232->Fit( m_panelSyncSettings );
-    bSizer276->Add( m_panelSyncSettings, 1, wxEXPAND, 5 );
+	m_panelSyncSettings->SetSizer( bSizer232 );
+	m_panelSyncSettings->Layout();
+	bSizer232->Fit( m_panelSyncSettings );
+	bSizer276->Add( m_panelSyncSettings, 1, wxEXPAND, 5 );
 
 
-    m_panelSyncSettingsTab->SetSizer( bSizer276 );
-    m_panelSyncSettingsTab->Layout();
-    bSizer276->Fit( m_panelSyncSettingsTab );
-    m_notebook->AddPage( m_panelSyncSettingsTab, _("dummy"), false );
+	m_panelSyncSettingsTab->SetSizer( bSizer276 );
+	m_panelSyncSettingsTab->Layout();
+	bSizer276->Fit( m_panelSyncSettingsTab );
+	m_notebook->AddPage( m_panelSyncSettingsTab, _("dummy"), false );
 
-    bSizer190->Add( m_notebook, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
+	bSizer190->Add( m_notebook, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
 
 
-    bSizer7->Add( bSizer190, 1, wxEXPAND, 5 );
+	bSizer7->Add( bSizer190, 1, wxEXPAND, 5 );
 
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
 
-    m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
 
-    m_buttonOkay->SetDefault();
-    m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonOkay->SetDefault();
+	m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizerStdButtons->Add( m_buttonOkay, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	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 );
+	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 );
+	bSizer7->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
 
 
-    this->SetSizer( bSizer7 );
-    this->Layout();
-    bSizer7->Fit( this );
+	this->SetSizer( bSizer7 );
+	this->Layout();
+	bSizer7->Fit( this );
 
-    this->Centre( wxBOTH );
+	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_buttonByTimeSize->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onCompByTimeSize ), NULL, this );
-    m_buttonByTimeSize->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::onCompByTimeSizeDouble ), NULL, this );
-    m_buttonByContent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onCompByContent ), NULL, this );
-    m_buttonByContent->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::onCompByContentDouble ), NULL, this );
-    m_buttonBySize->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onCompBySize ), NULL, this );
-    m_buttonBySize->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::onCompBySizeDouble ), NULL, this );
-    m_checkBoxSymlinksInclude->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onChangeCompOption ), NULL, this );
-    m_checkBoxIgnoreErrors->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onToggleIgnoreErrors ), NULL, this );
-    m_checkBoxAutoRetry->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onToggleAutoRetry ), NULL, this );
-    m_textCtrlInclude->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( ConfigDlgGenerated::onChangeFilterOption ), NULL, this );
-    m_textCtrlExclude->Connect( wxEVT_COMMAND_TEXT_UPDATED, 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_choiceUnitTimespan->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_buttonTwoWay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onSyncTwoWay ), NULL, this );
-    m_buttonTwoWay->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::onSyncTwoWayDouble ), NULL, this );
-    m_buttonMirror->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onSyncMirror ), NULL, this );
-    m_buttonMirror->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::onSyncMirrorDouble ), NULL, this );
-    m_buttonUpdate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onSyncUpdate ), NULL, this );
-    m_buttonUpdate->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::onSyncUpdateDouble ), NULL, this );
-    m_buttonCustom->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onSyncCustom ), NULL, this );
-    m_buttonCustom->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::onSyncCustomDouble ), 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_buttonRecycler->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onDeletionRecycler ), NULL, this );
-    m_buttonPermanent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onDeletionPermanent ), NULL, this );
-    m_buttonVersioning->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onDeletionVersioning ), NULL, this );
-    m_choiceVersioningStyle->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::onChanegVersioningStyle ), NULL, this );
-    m_checkBoxVersionMaxDays->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onToggleVersioningLimit ), NULL, this );
-    m_checkBoxVersionCountMin->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onToggleVersioningLimit ), NULL, this );
-    m_checkBoxVersionCountMax->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onToggleVersioningLimit ), NULL, this );
-    m_checkBoxSendEmail->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onToggleMiscEmail ), NULL, this );
-    m_bpButtonEmailAlways->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onEmailAlways ), NULL, this );
-    m_bpButtonEmailErrorWarning->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onEmailErrorWarning ), NULL, this );
-    m_bpButtonEmailErrorOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onEmailErrorOnly ), NULL, this );
-    m_checkBoxOverrideLogPath->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onToggleMiscOption ), 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 );
+	// 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_buttonByTimeSize->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onCompByTimeSize ), NULL, this );
+	m_buttonByTimeSize->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::onCompByTimeSizeDouble ), NULL, this );
+	m_buttonByContent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onCompByContent ), NULL, this );
+	m_buttonByContent->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::onCompByContentDouble ), NULL, this );
+	m_buttonBySize->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onCompBySize ), NULL, this );
+	m_buttonBySize->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::onCompBySizeDouble ), NULL, this );
+	m_checkBoxSymlinksInclude->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onChangeCompOption ), NULL, this );
+	m_checkBoxIgnoreErrors->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onToggleIgnoreErrors ), NULL, this );
+	m_checkBoxAutoRetry->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onToggleAutoRetry ), NULL, this );
+	m_textCtrlInclude->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( ConfigDlgGenerated::onChangeFilterOption ), NULL, this );
+	m_textCtrlExclude->Connect( wxEVT_COMMAND_TEXT_UPDATED, 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_choiceUnitTimespan->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_buttonTwoWay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onSyncTwoWay ), NULL, this );
+	m_buttonTwoWay->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::onSyncTwoWayDouble ), NULL, this );
+	m_buttonMirror->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onSyncMirror ), NULL, this );
+	m_buttonMirror->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::onSyncMirrorDouble ), NULL, this );
+	m_buttonUpdate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onSyncUpdate ), NULL, this );
+	m_buttonUpdate->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::onSyncUpdateDouble ), NULL, this );
+	m_buttonCustom->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onSyncCustom ), NULL, this );
+	m_buttonCustom->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::onSyncCustomDouble ), 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_buttonRecycler->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onDeletionRecycler ), NULL, this );
+	m_buttonPermanent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onDeletionPermanent ), NULL, this );
+	m_buttonVersioning->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onDeletionVersioning ), NULL, this );
+	m_choiceVersioningStyle->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::onChanegVersioningStyle ), NULL, this );
+	m_checkBoxVersionMaxDays->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onToggleVersioningLimit ), NULL, this );
+	m_checkBoxVersionCountMin->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onToggleVersioningLimit ), NULL, this );
+	m_checkBoxVersionCountMax->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onToggleVersioningLimit ), NULL, this );
+	m_checkBoxSendEmail->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onToggleMiscEmail ), NULL, this );
+	m_bpButtonEmailAlways->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onEmailAlways ), NULL, this );
+	m_bpButtonEmailErrorWarning->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onEmailErrorWarning ), NULL, this );
+	m_bpButtonEmailErrorOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onEmailErrorOnly ), NULL, this );
+	m_checkBoxOverrideLogPath->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onToggleMiscOption ), 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()
@@ -2560,515 +2559,515 @@ ConfigDlgGenerated::~ConfigDlgGenerated()
 
 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 ) );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer134;
-    bSizer134 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer134;
+	bSizer134 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer72;
-    bSizer72 = new wxBoxSizer( wxHORIZONTAL );
+	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_bitmapCloud = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer72->Add( m_bitmapCloud, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
 
-    wxBoxSizer* bSizer272;
-    bSizer272 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer272;
+	bSizer272 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticText136 = new wxStaticText( this, wxID_ANY, _("Connection type:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText136->Wrap( -1 );
-    bSizer272->Add( m_staticText136, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	m_staticText136 = new wxStaticText( this, wxID_ANY, _("Connection type:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText136->Wrap( -1 );
+	bSizer272->Add( m_staticText136, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 
-    wxBoxSizer* bSizer231;
-    bSizer231 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer231;
+	bSizer231 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_toggleBtnGdrive = new wxToggleButton( this, wxID_ANY, _("Google Drive"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_toggleBtnGdrive->SetValue( true );
-    m_toggleBtnGdrive->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_toggleBtnGdrive = new wxToggleButton( this, wxID_ANY, _("Google Drive"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_toggleBtnGdrive->SetValue( true );
+	m_toggleBtnGdrive->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizer231->Add( m_toggleBtnGdrive, 0, wxTOP|wxBOTTOM|wxLEFT|wxEXPAND, 5 );
+	bSizer231->Add( m_toggleBtnGdrive, 0, wxTOP|wxBOTTOM|wxLEFT|wxEXPAND, 5 );
 
-    m_toggleBtnSftp = new wxToggleButton( this, wxID_ANY, _("SFTP"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_toggleBtnSftp->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_toggleBtnSftp = new wxToggleButton( this, wxID_ANY, _("SFTP"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_toggleBtnSftp->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizer231->Add( m_toggleBtnSftp, 0, wxTOP|wxBOTTOM|wxLEFT|wxEXPAND, 5 );
+	bSizer231->Add( m_toggleBtnSftp, 0, wxTOP|wxBOTTOM|wxLEFT|wxEXPAND, 5 );
 
-    m_toggleBtnFtp = new wxToggleButton( this, wxID_ANY, _("FTP"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_toggleBtnFtp->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_toggleBtnFtp = new wxToggleButton( this, wxID_ANY, _("FTP"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_toggleBtnFtp->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizer231->Add( m_toggleBtnFtp, 0, wxALL|wxEXPAND, 5 );
+	bSizer231->Add( m_toggleBtnFtp, 0, wxALL|wxEXPAND, 5 );
 
 
-    bSizer272->Add( bSizer231, 0, 0, 5 );
+	bSizer272->Add( bSizer231, 0, 0, 5 );
 
 
-    bSizer72->Add( bSizer272, 0, wxALL, 5 );
+	bSizer72->Add( bSizer272, 0, wxALL, 5 );
 
 
-    bSizer134->Add( bSizer72, 0, wxEXPAND, 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_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, wxTAB_TRAVERSAL );
-    m_panel41->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panel41 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel41->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer185;
-    bSizer185 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer185;
+	bSizer185 = new wxBoxSizer( wxVERTICAL );
 
-    bSizerGdrive = new wxBoxSizer( wxVERTICAL );
+	bSizerGdrive = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer284;
-    bSizer284 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer284;
+	bSizer284 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer307;
-    bSizer307 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer307;
+	bSizer307 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer306;
-    bSizer306 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer306;
+	bSizer306 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapGdriveUser = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer306->Add( m_bitmapGdriveUser, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	m_bitmapGdriveUser = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer306->Add( m_bitmapGdriveUser, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
-    m_staticText166 = new wxStaticText( m_panel41, wxID_ANY, _("Connected user accounts:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText166->Wrap( -1 );
-    bSizer306->Add( m_staticText166, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticText166 = new wxStaticText( m_panel41, wxID_ANY, _("Connected user accounts:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText166->Wrap( -1 );
+	bSizer306->Add( m_staticText166, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer307->Add( bSizer306, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	bSizer307->Add( bSizer306, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_listBoxGdriveUsers = new wxListBox( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_NEEDED_SB|wxLB_SINGLE|wxLB_SORT );
-    bSizer307->Add( m_listBoxGdriveUsers, 1, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	m_listBoxGdriveUsers = new wxListBox( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_NEEDED_SB|wxLB_SINGLE|wxLB_SORT );
+	bSizer307->Add( m_listBoxGdriveUsers, 1, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer3002;
-    bSizer3002 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer3002;
+	bSizer3002 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_buttonGdriveAddUser = new zen::BitmapTextButton( m_panel41, wxID_ANY, _("&Add connection"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer3002->Add( m_buttonGdriveAddUser, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	m_buttonGdriveAddUser = new zen::BitmapTextButton( m_panel41, wxID_ANY, _("&Add connection"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer3002->Add( m_buttonGdriveAddUser, 1, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_buttonGdriveRemoveUser = new zen::BitmapTextButton( m_panel41, wxID_ANY, _("&Disconnect"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer3002->Add( m_buttonGdriveRemoveUser, 1, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+	m_buttonGdriveRemoveUser = new zen::BitmapTextButton( m_panel41, wxID_ANY, _("&Disconnect"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer3002->Add( m_buttonGdriveRemoveUser, 1, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
 
-    bSizer307->Add( bSizer3002, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL, 5 );
+	bSizer307->Add( bSizer3002, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-    bSizer284->Add( bSizer307, 0, wxALL|wxEXPAND, 5 );
+	bSizer284->Add( bSizer307, 0, wxALL|wxEXPAND, 5 );
 
-    m_staticline841 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer284->Add( m_staticline841, 0, wxEXPAND, 5 );
+	m_staticline841 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer284->Add( m_staticline841, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer3041;
-    bSizer3041 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer3041;
+	bSizer3041 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer305;
-    bSizer305 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer305;
+	bSizer305 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapGdriveDrive = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer305->Add( m_bitmapGdriveDrive, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	m_bitmapGdriveDrive = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer305->Add( m_bitmapGdriveDrive, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText186 = new wxStaticText( m_panel41, wxID_ANY, _("Select drive:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText186->Wrap( -1 );
-    bSizer305->Add( m_staticText186, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticText186 = new wxStaticText( m_panel41, wxID_ANY, _("Select drive:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText186->Wrap( -1 );
+	bSizer305->Add( m_staticText186, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer3041->Add( bSizer305, 0, wxALL, 5 );
+	bSizer3041->Add( bSizer305, 0, wxALL, 5 );
 
-    m_listBoxGdriveDrives = new wxListBox( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_NEEDED_SB|wxLB_SINGLE|wxLB_SORT );
-    bSizer3041->Add( m_listBoxGdriveDrives, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	m_listBoxGdriveDrives = new wxListBox( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_NEEDED_SB|wxLB_SINGLE|wxLB_SORT );
+	bSizer3041->Add( m_listBoxGdriveDrives, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 
-    bSizer284->Add( bSizer3041, 1, wxALL|wxEXPAND, 5 );
+	bSizer284->Add( bSizer3041, 1, wxALL|wxEXPAND, 5 );
 
 
-    bSizerGdrive->Add( bSizer284, 1, wxEXPAND, 5 );
+	bSizerGdrive->Add( bSizer284, 1, wxEXPAND, 5 );
 
-    m_staticline73 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerGdrive->Add( m_staticline73, 0, wxEXPAND, 5 );
+	m_staticline73 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerGdrive->Add( m_staticline73, 0, wxEXPAND, 5 );
 
 
-    bSizer185->Add( bSizerGdrive, 1, wxEXPAND, 5 );
+	bSizer185->Add( bSizerGdrive, 1, wxEXPAND, 5 );
 
-    bSizerServer = new wxBoxSizer( wxVERTICAL );
+	bSizerServer = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer276;
-    bSizer276 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer276;
+	bSizer276 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapServer = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer276->Add( m_bitmapServer, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+	m_bitmapServer = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer276->Add( m_bitmapServer, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText12311 = new wxStaticText( m_panel41, wxID_ANY, _("Server name or IP address:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText12311->Wrap( -1 );
-    bSizer276->Add( m_staticText12311, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	m_staticText12311 = new wxStaticText( m_panel41, wxID_ANY, _("Server name or IP address:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText12311->Wrap( -1 );
+	bSizer276->Add( m_staticText12311, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
 
-    m_textCtrlServer = new wxTextCtrl( m_panel41, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer276->Add( m_textCtrlServer, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_textCtrlServer = new wxTextCtrl( m_panel41, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer276->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 );
-    bSizer276->Add( m_staticText1233, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	m_staticText1233 = new wxStaticText( m_panel41, wxID_ANY, _("Port:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText1233->Wrap( -1 );
+	bSizer276->Add( m_staticText1233, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
 
-    m_textCtrlPort = new wxTextCtrl( m_panel41, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer276->Add( m_textCtrlPort, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_textCtrlPort = new wxTextCtrl( m_panel41, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer276->Add( m_textCtrlPort, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizerServer->Add( bSizer276, 0, wxALL|wxEXPAND, 5 );
+	bSizerServer->Add( bSizer276, 0, wxALL|wxEXPAND, 5 );
 
-    m_staticline58 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerServer->Add( m_staticline58, 0, wxEXPAND, 5 );
+	m_staticline58 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerServer->Add( m_staticline58, 0, wxEXPAND, 5 );
 
 
-    bSizer185->Add( bSizerServer, 0, wxEXPAND, 5 );
+	bSizer185->Add( bSizerServer, 0, wxEXPAND, 5 );
 
-    bSizerAuth = new wxBoxSizer( wxVERTICAL );
+	bSizerAuth = new wxBoxSizer( wxVERTICAL );
 
-    bSizerAuthInner = new wxBoxSizer( wxHORIZONTAL );
+	bSizerAuthInner = new wxBoxSizer( wxHORIZONTAL );
 
-    bSizerFtpEncrypt = new wxBoxSizer( wxHORIZONTAL );
+	bSizerFtpEncrypt = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer2181;
-    bSizer2181 = new wxBoxSizer( wxVERTICAL );
+	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_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_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 );
+	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 );
+	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 );
+	m_staticline5721 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizerFtpEncrypt->Add( m_staticline5721, 0, wxEXPAND, 5 );
 
 
-    bSizerAuthInner->Add( bSizerFtpEncrypt, 0, wxEXPAND, 5 );
+	bSizerAuthInner->Add( bSizerFtpEncrypt, 0, wxEXPAND, 5 );
 
-    bSizerSftpAuth = new wxBoxSizer( wxHORIZONTAL );
+	bSizerSftpAuth = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer218;
-    bSizer218 = new wxBoxSizer( wxVERTICAL );
+	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_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_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_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 );
+	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 );
+	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 );
+	m_staticline572 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizerSftpAuth->Add( m_staticline572, 0, wxEXPAND, 5 );
 
 
-    bSizerAuthInner->Add( bSizerSftpAuth, 0, wxEXPAND, 5 );
+	bSizerAuthInner->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 ) );
+	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 );
+	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 );
+	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_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_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 );
+	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 );
+	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_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") );
+	m_buttonSelectKeyfile = new wxButton( m_panelAuth, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonSelectKeyfile->SetToolTip( _("Select a folder") );
 
-    bSizerKeyFile->Add( m_buttonSelectKeyfile, 0, wxEXPAND, 5 );
+	bSizerKeyFile->Add( m_buttonSelectKeyfile, 0, wxEXPAND, 5 );
 
 
-    fgSizer161->Add( bSizerKeyFile, 0, wxALL|wxEXPAND, 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 );
+	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 );
+	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_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_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 );
+	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 );
+	fgSizer161->Add( bSizerPassword, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 
 
-    bSizer221->Add( fgSizer161, 0, wxALL|wxEXPAND, 5 );
+	bSizer221->Add( fgSizer161, 0, wxALL|wxEXPAND, 5 );
 
 
-    m_panelAuth->SetSizer( bSizer221 );
-    m_panelAuth->Layout();
-    bSizer221->Fit( m_panelAuth );
-    bSizerAuthInner->Add( m_panelAuth, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	m_panelAuth->SetSizer( bSizer221 );
+	m_panelAuth->Layout();
+	bSizer221->Fit( m_panelAuth );
+	bSizerAuthInner->Add( m_panelAuth, 1, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizerAuth->Add( bSizerAuthInner, 0, wxEXPAND, 5 );
+	bSizerAuth->Add( bSizerAuthInner, 0, wxEXPAND, 5 );
 
-    m_staticline581 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerAuth->Add( m_staticline581, 0, wxEXPAND, 5 );
+	m_staticline581 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerAuth->Add( m_staticline581, 0, wxEXPAND, 5 );
 
 
-    bSizer185->Add( bSizerAuth, 0, wxEXPAND, 5 );
+	bSizer185->Add( bSizerAuth, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer269;
-    bSizer269 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer269;
+	bSizer269 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer270;
-    bSizer270 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer270;
+	bSizer270 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapServerDir = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer270->Add( m_bitmapServerDir, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+	m_bitmapServerDir = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer270->Add( m_bitmapServerDir, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText1232 = new wxStaticText( m_panel41, wxID_ANY, _("Directory on server:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText1232->Wrap( -1 );
-    bSizer270->Add( m_staticText1232, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticText1232 = new wxStaticText( m_panel41, wxID_ANY, _("Directory on server:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText1232->Wrap( -1 );
+	bSizer270->Add( m_staticText1232, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer269->Add( bSizer270, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	bSizer269->Add( bSizer270, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 
-    wxBoxSizer* bSizer217;
-    bSizer217 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer217;
+	bSizer217 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_textCtrlServerPath = new wxTextCtrl( m_panel41, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer217->Add( m_textCtrlServerPath, 1, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+	m_textCtrlServerPath = new wxTextCtrl( m_panel41, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer217->Add( m_textCtrlServerPath, 1, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
-    m_buttonSelectFolder = new wxButton( m_panel41, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_buttonSelectFolder->SetToolTip( _("Select a folder") );
+	m_buttonSelectFolder = new wxButton( m_panel41, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonSelectFolder->SetToolTip( _("Select a folder") );
 
-    bSizer217->Add( m_buttonSelectFolder, 0, wxRIGHT|wxEXPAND, 5 );
+	bSizer217->Add( m_buttonSelectFolder, 0, wxRIGHT|wxEXPAND, 5 );
 
 
-    bSizer269->Add( bSizer217, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	bSizer269->Add( bSizer217, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer298;
-    bSizer298 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer298;
+	bSizer298 = new wxBoxSizer( wxHORIZONTAL );
 
 
-    bSizer298->Add( 0, 10, 0, 0, 5 );
+	bSizer298->Add( 0, 10, 0, 0, 5 );
 
-    bSizerAccessTimeout = new wxBoxSizer( wxHORIZONTAL );
+	bSizerAccessTimeout = new wxBoxSizer( wxHORIZONTAL );
 
-    m_staticTextTimeout = new wxStaticText( m_panel41, wxID_ANY, _("Access timeout (in seconds):"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextTimeout->Wrap( -1 );
-    bSizerAccessTimeout->Add( m_staticTextTimeout, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	m_staticTextTimeout = new wxStaticText( m_panel41, wxID_ANY, _("Access timeout (in seconds):"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextTimeout->Wrap( -1 );
+	bSizerAccessTimeout->Add( m_staticTextTimeout, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
 
-    m_spinCtrlTimeout = new wxSpinCtrl( m_panel41, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
-    bSizerAccessTimeout->Add( m_spinCtrlTimeout, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_spinCtrlTimeout = new wxSpinCtrl( m_panel41, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
+	bSizerAccessTimeout->Add( m_spinCtrlTimeout, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer298->Add( bSizerAccessTimeout, 0, wxALL, 5 );
+	bSizer298->Add( bSizerAccessTimeout, 0, wxALL, 5 );
 
 
-    bSizer269->Add( bSizer298, 0, 0, 5 );
+	bSizer269->Add( bSizer298, 0, 0, 5 );
 
 
-    bSizer185->Add( bSizer269, 0, wxEXPAND, 5 );
+	bSizer185->Add( bSizer269, 0, wxEXPAND, 5 );
 
 
-    m_panel41->SetSizer( bSizer185 );
-    m_panel41->Layout();
-    bSizer185->Fit( m_panel41 );
-    bSizer134->Add( m_panel41, 1, wxEXPAND, 5 );
+	m_panel41->SetSizer( bSizer185 );
+	m_panel41->Layout();
+	bSizer185->Fit( m_panel41 );
+	bSizer134->Add( m_panel41, 1, wxEXPAND, 5 );
 
-    m_staticline571 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer134->Add( m_staticline571, 0, wxEXPAND, 5 );
+	m_staticline571 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer134->Add( m_staticline571, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer219;
-    bSizer219 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer219;
+	bSizer219 = new wxBoxSizer( wxHORIZONTAL );
 
 
-    bSizer219->Add( 5, 0, 0, 0, 5 );
+	bSizer219->Add( 5, 0, 0, 0, 5 );
 
-    m_bitmapPerf = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer219->Add( m_bitmapPerf, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	m_bitmapPerf = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer219->Add( m_bitmapPerf, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    m_staticText1361 = new wxStaticText( this, wxID_ANY, _("Performance improvements:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText1361->Wrap( -1 );
-    bSizer219->Add( m_staticText1361, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
+	m_staticText1361 = new wxStaticText( this, wxID_ANY, _("Performance improvements:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText1361->Wrap( -1 );
+	bSizer219->Add( m_staticText1361, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
 
 
-    bSizer219->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizer219->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_hyperlink171 = new wxHyperlinkCtrl( this, wxID_ANY, _("How to get best performance?"), wxT("https://freefilesync.org/manual.php?topic=ftp-setup"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink171->SetToolTip( _("https://freefilesync.org/manual.php?topic=ftp-setup") );
+	m_hyperlink171 = new wxHyperlinkCtrl( this, wxID_ANY, _("How to get best performance?"), wxT("https://freefilesync.org/manual.php?topic=ftp-setup"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink171->SetToolTip( _("https://freefilesync.org/manual.php?topic=ftp-setup") );
 
-    bSizer219->Add( m_hyperlink171, 0, wxALL|wxALIGN_CENTER_VERTICAL, 10 );
+	bSizer219->Add( m_hyperlink171, 0, wxALL|wxALIGN_CENTER_VERTICAL, 10 );
 
 
-    bSizer134->Add( bSizer219, 0, wxEXPAND, 5 );
+	bSizer134->Add( bSizer219, 0, wxEXPAND, 5 );
 
-    m_staticline57 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer134->Add( m_staticline57, 0, wxEXPAND, 5 );
+	m_staticline57 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer134->Add( m_staticline57, 0, wxEXPAND, 5 );
 
-    m_panel411 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel411->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panel411 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel411->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer1851;
-    bSizer1851 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer1851;
+	bSizer1851 = new wxBoxSizer( wxVERTICAL );
 
-    wxFlexGridSizer* fgSizer1611;
-    fgSizer1611 = new wxFlexGridSizer( 0, 2, 0, 0 );
-    fgSizer1611->AddGrowableCol( 1 );
-    fgSizer1611->SetFlexibleDirection( wxBOTH );
-    fgSizer1611->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	wxFlexGridSizer* fgSizer1611;
+	fgSizer1611 = new wxFlexGridSizer( 0, 2, 0, 0 );
+	fgSizer1611->AddGrowableCol( 1 );
+	fgSizer1611->SetFlexibleDirection( wxBOTH );
+	fgSizer1611->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    bSizerConnectionsLabel = new wxBoxSizer( wxVERTICAL );
+	bSizerConnectionsLabel = new wxBoxSizer( wxVERTICAL );
 
-    m_staticTextConnectionsLabel = new wxStaticText( m_panel411, wxID_ANY, _("Parallel file operations:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextConnectionsLabel->Wrap( -1 );
-    bSizerConnectionsLabel->Add( m_staticTextConnectionsLabel, 0, 0, 5 );
+	m_staticTextConnectionsLabel = new wxStaticText( m_panel411, wxID_ANY, _("Parallel file operations:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextConnectionsLabel->Wrap( -1 );
+	bSizerConnectionsLabel->Add( m_staticTextConnectionsLabel, 0, 0, 5 );
 
-    m_staticTextConnectionsLabelSub = new wxStaticText( m_panel411, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextConnectionsLabelSub->Wrap( -1 );
-    bSizerConnectionsLabel->Add( m_staticTextConnectionsLabelSub, 0, wxALIGN_RIGHT, 5 );
+	m_staticTextConnectionsLabelSub = new wxStaticText( m_panel411, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextConnectionsLabelSub->Wrap( -1 );
+	bSizerConnectionsLabel->Add( m_staticTextConnectionsLabelSub, 0, wxALIGN_RIGHT, 5 );
 
 
-    fgSizer1611->Add( bSizerConnectionsLabel, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	fgSizer1611->Add( bSizerConnectionsLabel, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxBoxSizer* bSizer300;
-    bSizer300 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer300;
+	bSizer300 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_spinCtrlConnectionCount = new wxSpinCtrl( m_panel411, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
-    bSizer300->Add( m_spinCtrlConnectionCount, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_spinCtrlConnectionCount = new wxSpinCtrl( m_panel411, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
+	bSizer300->Add( m_spinCtrlConnectionCount, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticTextConnectionCountDescr = new wxStaticText( m_panel411, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextConnectionCountDescr->Wrap( -1 );
-    m_staticTextConnectionCountDescr->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticTextConnectionCountDescr = new wxStaticText( m_panel411, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextConnectionCountDescr->Wrap( -1 );
+	m_staticTextConnectionCountDescr->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    bSizer300->Add( m_staticTextConnectionCountDescr, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	bSizer300->Add( m_staticTextConnectionCountDescr, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    m_hyperlinkDeRequired = new wxHyperlinkCtrl( m_panel411, wxID_ANY, _("Requires FreeFileSync Donation Edition"), wxT("https://freefilesync.org/faq.php#donation-edition"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlinkDeRequired->SetToolTip( _("https://freefilesync.org/faq.php#donation-edition") );
+	m_hyperlinkDeRequired = new wxHyperlinkCtrl( m_panel411, wxID_ANY, _("Requires FreeFileSync Donation Edition"), wxT("https://freefilesync.org/faq.php#donation-edition"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlinkDeRequired->SetToolTip( _("https://freefilesync.org/faq.php#donation-edition") );
 
-    bSizer300->Add( m_hyperlinkDeRequired, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer300->Add( m_hyperlinkDeRequired, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    fgSizer1611->Add( bSizer300, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	fgSizer1611->Add( bSizer300, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticTextChannelCountSftp = new wxStaticText( m_panel411, wxID_ANY, _("SFTP channels per connection:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextChannelCountSftp->Wrap( -1 );
-    fgSizer1611->Add( m_staticTextChannelCountSftp, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	m_staticTextChannelCountSftp = new wxStaticText( m_panel411, wxID_ANY, _("SFTP channels per connection:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextChannelCountSftp->Wrap( -1 );
+	fgSizer1611->Add( m_staticTextChannelCountSftp, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT, 5 );
 
-    wxBoxSizer* bSizer3001;
-    bSizer3001 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer3001;
+	bSizer3001 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_spinCtrlChannelCountSftp = new wxSpinCtrl( m_panel411, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
-    bSizer3001->Add( m_spinCtrlChannelCountSftp, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_spinCtrlChannelCountSftp = new wxSpinCtrl( m_panel411, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
+	bSizer3001->Add( m_spinCtrlChannelCountSftp, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_buttonChannelCountSftp = new wxButton( m_panel411, wxID_ANY, _("Detect server limit"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer3001->Add( m_buttonChannelCountSftp, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	m_buttonChannelCountSftp = new wxButton( m_panel411, wxID_ANY, _("Detect server limit"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer3001->Add( m_buttonChannelCountSftp, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
 
-    fgSizer1611->Add( bSizer3001, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	fgSizer1611->Add( bSizer3001, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    fgSizer1611->Add( 0, 0, 0, 0, 5 );
+	fgSizer1611->Add( 0, 0, 0, 0, 5 );
 
-    wxBoxSizer* bSizer304;
-    bSizer304 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer304;
+	bSizer304 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_checkBoxAllowZlib = new wxCheckBox( m_panel411, wxID_ANY, _("Enable &compression"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer304->Add( m_checkBoxAllowZlib, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	m_checkBoxAllowZlib = new wxCheckBox( m_panel411, wxID_ANY, _("Enable &compression"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer304->Add( m_checkBoxAllowZlib, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    m_staticTextZlibDescr = new wxStaticText( m_panel411, wxID_ANY, _("(zlib)"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextZlibDescr->Wrap( -1 );
-    m_staticTextZlibDescr->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticTextZlibDescr = new wxStaticText( m_panel411, wxID_ANY, _("(zlib)"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextZlibDescr->Wrap( -1 );
+	m_staticTextZlibDescr->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    bSizer304->Add( m_staticTextZlibDescr, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	bSizer304->Add( m_staticTextZlibDescr, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
 
-    fgSizer1611->Add( bSizer304, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	fgSizer1611->Add( bSizer304, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer1851->Add( fgSizer1611, 0, wxALL, 5 );
+	bSizer1851->Add( fgSizer1611, 0, wxALL, 5 );
 
 
-    m_panel411->SetSizer( bSizer1851 );
-    m_panel411->Layout();
-    bSizer1851->Fit( m_panel411 );
-    bSizer134->Add( m_panel411, 0, wxEXPAND, 5 );
+	m_panel411->SetSizer( bSizer1851 );
+	m_panel411->Layout();
+	bSizer1851->Fit( m_panel411 );
+	bSizer134->Add( m_panel411, 0, wxEXPAND, 5 );
 
-    m_staticline12 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer134->Add( m_staticline12, 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 );
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
 
-    m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
 
-    m_buttonOkay->SetDefault();
-    m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonOkay->SetDefault();
+	m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizerStdButtons->Add( m_buttonOkay, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizerStdButtons->Add( m_buttonOkay, 0, wxALL|wxALIGN_CENTER_VERTICAL, 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 );
+	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 );
+	bSizer134->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
 
 
-    this->SetSizer( bSizer134 );
-    this->Layout();
-    bSizer134->Fit( this );
+	this->SetSizer( bSizer134 );
+	this->Layout();
+	bSizer134->Fit( this );
 
-    this->Centre( wxBOTH );
+	this->Centre( wxBOTH );
 
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CloudSetupDlgGenerated::onClose ) );
-    m_toggleBtnGdrive->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::onConnectionGdrive ), NULL, this );
-    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_listBoxGdriveUsers->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( CloudSetupDlgGenerated::onGdriveUserSelect ), NULL, this );
-    m_buttonGdriveAddUser->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::onGdriveUserAdd ), NULL, this );
-    m_buttonGdriveRemoveUser->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::onGdriveUserRemove ), 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_buttonChannelCountSftp->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 );
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CloudSetupDlgGenerated::onClose ) );
+	m_toggleBtnGdrive->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::onConnectionGdrive ), NULL, this );
+	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_listBoxGdriveUsers->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( CloudSetupDlgGenerated::onGdriveUserSelect ), NULL, this );
+	m_buttonGdriveAddUser->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::onGdriveUserAdd ), NULL, this );
+	m_buttonGdriveRemoveUser->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::onGdriveUserRemove ), 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_buttonChannelCountSftp->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()
@@ -3077,61 +3076,61 @@ 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 ) );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer134;
-    bSizer134 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer134;
+	bSizer134 = new wxBoxSizer( wxVERTICAL );
 
-    m_panel41 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel41->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panel41 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel41->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer185;
-    bSizer185 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer185;
+	bSizer185 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticTextStatus = new wxStaticText( m_panel41, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextStatus->Wrap( -1 );
-    bSizer185->Add( m_staticTextStatus, 0, wxALL, 5 );
+	m_staticTextStatus = new wxStaticText( m_panel41, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextStatus->Wrap( -1 );
+	bSizer185->Add( m_staticTextStatus, 0, wxALL, 5 );
 
-    m_treeCtrlFileSystem = new wxTreeCtrl( m_panel41, wxID_ANY, wxDefaultPosition, wxSize( -1, -1 ), wxTR_FULL_ROW_HIGHLIGHT|wxTR_HAS_BUTTONS|wxTR_LINES_AT_ROOT|wxTR_NO_LINES|wxBORDER_NONE );
-    bSizer185->Add( m_treeCtrlFileSystem, 1, wxEXPAND, 5 );
+	m_treeCtrlFileSystem = new wxTreeCtrl( m_panel41, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxTR_FULL_ROW_HIGHLIGHT|wxTR_HAS_BUTTONS|wxTR_LINES_AT_ROOT|wxTR_NO_LINES|wxBORDER_NONE );
+	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_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 );
+	m_staticline12 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer134->Add( m_staticline12, 0, wxEXPAND, 5 );
 
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
 
-    m_buttonOkay = new wxButton( this, wxID_OK, _("Select Folder"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonOkay = new wxButton( this, wxID_OK, _("Select Folder"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
 
-    m_buttonOkay->SetDefault();
-    m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonOkay->SetDefault();
+	m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizerStdButtons->Add( m_buttonOkay, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizerStdButtons->Add( m_buttonOkay, 0, wxALL|wxALIGN_CENTER_VERTICAL, 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 );
+	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 );
+	bSizer134->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
 
 
-    this->SetSizer( bSizer134 );
-    this->Layout();
-    bSizer134->Fit( this );
+	this->SetSizer( bSizer134 );
+	this->Layout();
+	bSizer134->Fit( this );
 
-    this->Centre( wxBOTH );
+	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 );
+	// 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()
@@ -3140,225 +3139,225 @@ 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 ) );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer134;
-    bSizer134 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer134;
+	bSizer134 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer72;
-    bSizer72 = new wxBoxSizer( wxHORIZONTAL );
+	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_bitmapSync = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer72->Add( m_bitmapSync, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
 
-    m_staticTextCaption = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextCaption->Wrap( -1 );
-    bSizer72->Add( m_staticTextCaption, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 10 );
+	m_staticTextCaption = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextCaption->Wrap( -1 );
+	bSizer72->Add( m_staticTextCaption, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 10 );
 
 
-    bSizer134->Add( bSizer72, 0, 0, 5 );
+	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_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 ) );
+	m_panelStatistics = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_panelStatistics->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer185;
-    bSizer185 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer185;
+	bSizer185 = new wxBoxSizer( wxHORIZONTAL );
 
 
-    bSizer185->Add( 40, 0, 0, 0, 5 );
+	bSizer185->Add( 40, 0, 0, 0, 5 );
 
 
-    bSizer185->Add( 0, 0, 1, 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 );
+	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* bSizer162;
+	bSizer162 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer182;
-    bSizer182 = new wxBoxSizer( wxHORIZONTAL );
+	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 );
+	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 );
+	bSizer182->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_staticTextSyncVar = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextSyncVar->Wrap( -1 );
-    m_staticTextSyncVar->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_staticTextSyncVar = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextSyncVar->Wrap( -1 );
+	m_staticTextSyncVar->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizer182->Add( m_staticTextSyncVar, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	bSizer182->Add( m_staticTextSyncVar, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    m_bitmapSyncVar = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer182->Add( m_bitmapSyncVar, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	m_bitmapSyncVar = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer182->Add( m_bitmapSyncVar, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
 
-    bSizer182->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizer182->Add( 0, 0, 1, wxEXPAND, 5 );
 
 
-    bSizer162->Add( bSizer182, 0, wxALL|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 );
+	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 );
+	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 );
+	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 );
+	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") );
+	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 );
+	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") );
+	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 );
+	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") );
+	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 );
+	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") );
+	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 );
+	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") );
+	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 );
+	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") );
+	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 );
+	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") );
+	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 );
+	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") );
+	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 );
+	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") );
+	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 );
+	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") );
+	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 );
+	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") );
+	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 );
+	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") );
+	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 );
+	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") );
+	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 );
+	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") );
+	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 );
+	fgSizer11->Add( m_staticTextDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer181->Add( fgSizer11, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	bSizer181->Add( fgSizer11, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
 
 
-    bSizer162->Add( bSizer181, 0, wxEXPAND|wxALL, 5 );
+	bSizer162->Add( bSizer181, 0, wxEXPAND|wxALL, 5 );
 
 
-    bSizer185->Add( bSizer162, 0, 0, 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 );
+	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( 0, 0, 1, 0, 5 );
 
 
-    bSizer185->Add( 40, 0, 0, 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_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 );
+	m_staticline12 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer134->Add( m_staticline12, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer164;
-    bSizer164 = new wxBoxSizer( wxVERTICAL );
+	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 );
+	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 );
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
 
-    m_buttonStartSync = new wxButton( this, wxID_OK, _("Start"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonStartSync = new wxButton( this, wxID_OK, _("Start"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
 
-    m_buttonStartSync->SetDefault();
-    m_buttonStartSync->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonStartSync->SetDefault();
+	m_buttonStartSync->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizerStdButtons->Add( m_buttonStartSync, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	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 );
+	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 );
+	bSizer164->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
 
 
-    bSizer134->Add( bSizer164, 1, wxEXPAND, 5 );
+	bSizer134->Add( bSizer164, 1, wxEXPAND, 5 );
 
 
-    this->SetSizer( bSizer134 );
-    this->Layout();
-    bSizer134->Fit( this );
+	this->SetSizer( bSizer134 );
+	this->Layout();
+	bSizer134->Fit( this );
 
-    this->Centre( wxBOTH );
+	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 );
+	// 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()
@@ -3367,198 +3366,198 @@ SyncConfirmationDlgGenerated::~SyncConfirmationDlgGenerated()
 
 CompareProgressDlgGenerated::CompareProgressDlgGenerated( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name )
 {
-    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer1811;
-    bSizer1811 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer1811;
+	bSizer1811 = new wxBoxSizer( wxVERTICAL );
 
 
-    bSizer1811->Add( 0, 0, 1, 0, 5 );
+	bSizer1811->Add( 0, 0, 1, 0, 5 );
 
-    m_staticTextStatus = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextStatus->Wrap( -1 );
-    bSizer1811->Add( m_staticTextStatus, 0, wxTOP|wxRIGHT|wxLEFT, 10 );
+	m_staticTextStatus = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextStatus->Wrap( -1 );
+	bSizer1811->Add( m_staticTextStatus, 0, wxTOP|wxRIGHT|wxLEFT, 10 );
 
-    wxBoxSizer* bSizer199;
-    bSizer199 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer199;
+	bSizer199 = new wxBoxSizer( wxHORIZONTAL );
 
 
-    bSizer199->Add( 10, 0, 0, 0, 5 );
+	bSizer199->Add( 10, 0, 0, 0, 5 );
 
-    ffgSizer11 = new wxFlexGridSizer( 2, 0, 5, 5 );
-    ffgSizer11->SetFlexibleDirection( wxBOTH );
-    ffgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	ffgSizer11 = new wxFlexGridSizer( 2, 0, 5, 5 );
+	ffgSizer11->SetFlexibleDirection( wxBOTH );
+	ffgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    m_staticTextProcessed = new wxStaticText( this, wxID_ANY, _("Processed:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextProcessed->Wrap( -1 );
-    ffgSizer11->Add( m_staticTextProcessed, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT, 5 );
+	m_staticTextProcessed = new wxStaticText( this, wxID_ANY, _("Processed:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextProcessed->Wrap( -1 );
+	ffgSizer11->Add( m_staticTextProcessed, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT, 5 );
 
-    m_staticTextRemaining = new wxStaticText( this, wxID_ANY, _("Remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextRemaining->Wrap( -1 );
-    ffgSizer11->Add( m_staticTextRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	m_staticTextRemaining = new wxStaticText( this, wxID_ANY, _("Remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextRemaining->Wrap( -1 );
+	ffgSizer11->Add( m_staticTextRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
 
-    bSizer199->Add( ffgSizer11, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 10 );
+	bSizer199->Add( ffgSizer11, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 10 );
 
-    m_panelItemStats = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelItemStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	m_panelItemStats = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_panelItemStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer291;
-    bSizer291 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer291;
+	bSizer291 = new wxBoxSizer( wxVERTICAL );
 
-    ffgSizer111 = new wxFlexGridSizer( 0, 2, 5, 5 );
-    ffgSizer111->SetFlexibleDirection( wxBOTH );
-    ffgSizer111->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	ffgSizer111 = new wxFlexGridSizer( 0, 2, 5, 5 );
+	ffgSizer111->SetFlexibleDirection( wxBOTH );
+	ffgSizer111->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    wxBoxSizer* bSizer293;
-    bSizer293 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer293;
+	bSizer293 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapItemStat = new wxStaticBitmap( m_panelItemStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer293->Add( m_bitmapItemStat, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	m_bitmapItemStat = new wxStaticBitmap( m_panelItemStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer293->Add( m_bitmapItemStat, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
 
-    bSizer293->Add( 0, 0, 1, 0, 5 );
+	bSizer293->Add( 0, 0, 1, 0, 5 );
 
-    m_staticTextItemsProcessed = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_staticTextItemsProcessed->Wrap( -1 );
-    m_staticTextItemsProcessed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_staticTextItemsProcessed = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_staticTextItemsProcessed->Wrap( -1 );
+	m_staticTextItemsProcessed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizer293->Add( m_staticTextItemsProcessed, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer293->Add( m_staticTextItemsProcessed, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    ffgSizer111->Add( bSizer293, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	ffgSizer111->Add( bSizer293, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 
-    m_staticTextBytesProcessed = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextBytesProcessed->Wrap( -1 );
-    ffgSizer111->Add( m_staticTextBytesProcessed, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
+	m_staticTextBytesProcessed = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextBytesProcessed->Wrap( -1 );
+	ffgSizer111->Add( m_staticTextBytesProcessed, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
 
-    m_staticTextItemsRemaining = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_staticTextItemsRemaining->Wrap( -1 );
-    m_staticTextItemsRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_staticTextItemsRemaining = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_staticTextItemsRemaining->Wrap( -1 );
+	m_staticTextItemsRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    ffgSizer111->Add( m_staticTextItemsRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	ffgSizer111->Add( m_staticTextItemsRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticTextBytesRemaining = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextBytesRemaining->Wrap( -1 );
-    ffgSizer111->Add( m_staticTextBytesRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticTextBytesRemaining = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextBytesRemaining->Wrap( -1 );
+	ffgSizer111->Add( m_staticTextBytesRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer291->Add( ffgSizer111, 0, wxALL, 5 );
+	bSizer291->Add( ffgSizer111, 0, wxALL, 5 );
 
 
-    m_panelItemStats->SetSizer( bSizer291 );
-    m_panelItemStats->Layout();
-    bSizer291->Fit( m_panelItemStats );
-    bSizer199->Add( m_panelItemStats, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
+	m_panelItemStats->SetSizer( bSizer291 );
+	m_panelItemStats->Layout();
+	bSizer291->Fit( m_panelItemStats );
+	bSizer199->Add( m_panelItemStats, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
 
-    m_panelTimeStats = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelTimeStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	m_panelTimeStats = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_panelTimeStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer292;
-    bSizer292 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer292;
+	bSizer292 = new wxBoxSizer( wxVERTICAL );
 
-    ffgSizer112 = new wxFlexGridSizer( 0, 1, 5, 5 );
-    ffgSizer112->SetFlexibleDirection( wxBOTH );
-    ffgSizer112->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	ffgSizer112 = new wxFlexGridSizer( 0, 1, 5, 5 );
+	ffgSizer112->SetFlexibleDirection( wxBOTH );
+	ffgSizer112->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    wxBoxSizer* bSizer294;
-    bSizer294 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer294;
+	bSizer294 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapTimeStat = new wxStaticBitmap( m_panelTimeStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer294->Add( m_bitmapTimeStat, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	m_bitmapTimeStat = new wxStaticBitmap( m_panelTimeStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer294->Add( m_bitmapTimeStat, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
 
-    bSizer294->Add( 0, 0, 1, 0, 5 );
+	bSizer294->Add( 0, 0, 1, 0, 5 );
 
-    m_staticTextTimeElapsed = new wxStaticText( m_panelTimeStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextTimeElapsed->Wrap( -1 );
-    m_staticTextTimeElapsed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_staticTextTimeElapsed = new wxStaticText( m_panelTimeStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextTimeElapsed->Wrap( -1 );
+	m_staticTextTimeElapsed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizer294->Add( m_staticTextTimeElapsed, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer294->Add( m_staticTextTimeElapsed, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    ffgSizer112->Add( bSizer294, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	ffgSizer112->Add( bSizer294, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 
-    m_staticTextTimeRemaining = new wxStaticText( m_panelTimeStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextTimeRemaining->Wrap( -1 );
-    m_staticTextTimeRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_staticTextTimeRemaining = new wxStaticText( m_panelTimeStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextTimeRemaining->Wrap( -1 );
+	m_staticTextTimeRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    ffgSizer112->Add( m_staticTextTimeRemaining, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
+	ffgSizer112->Add( m_staticTextTimeRemaining, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
 
 
-    bSizer292->Add( ffgSizer112, 0, wxALL, 5 );
+	bSizer292->Add( ffgSizer112, 0, wxALL, 5 );
 
 
-    m_panelTimeStats->SetSizer( bSizer292 );
-    m_panelTimeStats->Layout();
-    bSizer292->Fit( m_panelTimeStats );
-    bSizer199->Add( m_panelTimeStats, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
+	m_panelTimeStats->SetSizer( bSizer292 );
+	m_panelTimeStats->Layout();
+	bSizer292->Fit( m_panelTimeStats );
+	bSizer199->Add( m_panelTimeStats, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
 
-    bSizerErrorsRetry = new wxBoxSizer( wxHORIZONTAL );
+	bSizerErrorsRetry = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapRetryErrors = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizerErrorsRetry->Add( m_bitmapRetryErrors, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_bitmapRetryErrors = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerErrorsRetry->Add( m_bitmapRetryErrors, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText1461 = new wxStaticText( this, wxID_ANY, _("Automatic retry"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText1461->Wrap( -1 );
-    bSizerErrorsRetry->Add( m_staticText1461, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+	m_staticText1461 = new wxStaticText( this, wxID_ANY, _("Automatic retry"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText1461->Wrap( -1 );
+	bSizerErrorsRetry->Add( m_staticText1461, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
 
-    m_staticTextRetryCount = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextRetryCount->Wrap( -1 );
-    bSizerErrorsRetry->Add( m_staticTextRetryCount, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticTextRetryCount = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextRetryCount->Wrap( -1 );
+	bSizerErrorsRetry->Add( m_staticTextRetryCount, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer199->Add( bSizerErrorsRetry, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
+	bSizer199->Add( bSizerErrorsRetry, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
 
-    bSizerErrorsIgnore = new wxBoxSizer( wxHORIZONTAL );
+	bSizerErrorsIgnore = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapIgnoreErrors = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizerErrorsIgnore->Add( m_bitmapIgnoreErrors, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_bitmapIgnoreErrors = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerErrorsIgnore->Add( m_bitmapIgnoreErrors, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText146 = new wxStaticText( this, wxID_ANY, _("Ignore errors"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText146->Wrap( -1 );
-    bSizerErrorsIgnore->Add( m_staticText146, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+	m_staticText146 = new wxStaticText( this, wxID_ANY, _("Ignore errors"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText146->Wrap( -1 );
+	bSizerErrorsIgnore->Add( m_staticText146, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
 
-    bSizer199->Add( bSizerErrorsIgnore, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
+	bSizer199->Add( bSizerErrorsIgnore, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
 
-    bSizerProgressGraph = new wxBoxSizer( wxHORIZONTAL );
+	bSizerProgressGraph = new wxBoxSizer( wxHORIZONTAL );
 
-    ffgSizer113 = new wxFlexGridSizer( 2, 0, 5, 5 );
-    ffgSizer113->SetFlexibleDirection( wxBOTH );
-    ffgSizer113->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	ffgSizer113 = new wxFlexGridSizer( 2, 0, 5, 5 );
+	ffgSizer113->SetFlexibleDirection( wxBOTH );
+	ffgSizer113->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    wxStaticText* m_staticText99;
-    m_staticText99 = new wxStaticText( this, wxID_ANY, _("Bytes:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText99->Wrap( -1 );
-    ffgSizer113->Add( m_staticText99, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	wxStaticText* m_staticText99;
+	m_staticText99 = new wxStaticText( this, wxID_ANY, _("Bytes:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText99->Wrap( -1 );
+	ffgSizer113->Add( m_staticText99, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxStaticText* m_staticText100;
-    m_staticText100 = new wxStaticText( this, wxID_ANY, _("Items:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText100->Wrap( -1 );
-    ffgSizer113->Add( m_staticText100, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	wxStaticText* m_staticText100;
+	m_staticText100 = new wxStaticText( this, wxID_ANY, _("Items:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText100->Wrap( -1 );
+	ffgSizer113->Add( m_staticText100, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizerProgressGraph->Add( ffgSizer113, 0, wxALL, 5 );
+	bSizerProgressGraph->Add( ffgSizer113, 0, wxALL, 5 );
 
-    m_panelProgressGraph = new zen::Graph2D( this, wxID_ANY, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_panelProgressGraph->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	m_panelProgressGraph = new zen::Graph2D( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_panelProgressGraph->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    bSizerProgressGraph->Add( m_panelProgressGraph, 1, wxEXPAND, 5 );
+	bSizerProgressGraph->Add( m_panelProgressGraph, 1, wxEXPAND, 5 );
 
 
-    bSizer199->Add( bSizerProgressGraph, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
+	bSizer199->Add( bSizerProgressGraph, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
 
 
-    bSizer1811->Add( bSizer199, 0, wxEXPAND, 5 );
+	bSizer1811->Add( bSizer199, 0, wxEXPAND, 5 );
 
 
-    bSizer1811->Add( 0, 0, 1, 0, 5 );
+	bSizer1811->Add( 0, 0, 1, 0, 5 );
 
 
-    this->SetSizer( bSizer1811 );
-    this->Layout();
-    bSizer1811->Fit( this );
+	this->SetSizer( bSizer1811 );
+	this->Layout();
+	bSizer1811->Fit( this );
 }
 
 CompareProgressDlgGenerated::~CompareProgressDlgGenerated()
@@ -3567,336 +3566,336 @@ CompareProgressDlgGenerated::~CompareProgressDlgGenerated()
 
 SyncProgressPanelGenerated::SyncProgressPanelGenerated( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name )
 {
-    bSizerRoot = new wxBoxSizer( wxVERTICAL );
+	bSizerRoot = new wxBoxSizer( wxVERTICAL );
 
-    m_panel53 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel53->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panel53 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel53->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer301;
-    bSizer301 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer301;
+	bSizer301 = new wxBoxSizer( wxVERTICAL );
 
-    bSizer42 = new wxBoxSizer( wxHORIZONTAL );
+	bSizer42 = new wxBoxSizer( wxHORIZONTAL );
 
 
-    bSizer42->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizer42->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_bitmapStatus = new wxStaticBitmap( m_panel53, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer42->Add( m_bitmapStatus, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2 );
+	m_bitmapStatus = new wxStaticBitmap( m_panel53, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer42->Add( m_bitmapStatus, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2 );
 
-    m_staticTextPhase = new wxStaticText( m_panel53, wxID_ANY, _("Synchronizing..."), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextPhase->Wrap( -1 );
-    m_staticTextPhase->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_staticTextPhase = new wxStaticText( m_panel53, wxID_ANY, _("Synchronizing..."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextPhase->Wrap( -1 );
+	m_staticTextPhase->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizer42->Add( m_staticTextPhase, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	bSizer42->Add( m_staticTextPhase, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
-    wxBoxSizer* bSizer247;
-    bSizer247 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer247;
+	bSizer247 = new wxBoxSizer( wxHORIZONTAL );
 
 
-    bSizer247->Add( 0, 0, 1, 0, 5 );
+	bSizer247->Add( 0, 0, 1, 0, 5 );
 
-    m_bpButtonMinimizeToTray = new wxBitmapButton( m_panel53, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonMinimizeToTray->SetToolTip( _("Minimize to notification area") );
+	m_bpButtonMinimizeToTray = new wxBitmapButton( m_panel53, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonMinimizeToTray->SetToolTip( _("Minimize to notification area") );
 
-    bSizer247->Add( m_bpButtonMinimizeToTray, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
+	bSizer247->Add( m_bpButtonMinimizeToTray, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
 
 
-    bSizer42->Add( bSizer247, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer42->Add( bSizer247, 1, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer301->Add( bSizer42, 0, wxEXPAND, 5 );
+	bSizer301->Add( bSizer42, 0, wxEXPAND, 5 );
 
-    bSizerStatusText = new wxBoxSizer( wxVERTICAL );
+	bSizerStatusText = new wxBoxSizer( wxVERTICAL );
 
-    m_staticTextStatus = new wxStaticText( m_panel53, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextStatus->Wrap( -1 );
-    bSizerStatusText->Add( m_staticTextStatus, 0, wxEXPAND|wxLEFT, 15 );
+	m_staticTextStatus = new wxStaticText( m_panel53, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextStatus->Wrap( -1 );
+	bSizerStatusText->Add( m_staticTextStatus, 0, wxEXPAND|wxLEFT, 15 );
 
 
-    bSizerStatusText->Add( 0, 10, 0, 0, 5 );
+	bSizerStatusText->Add( 0, 10, 0, 0, 5 );
 
 
-    bSizer301->Add( bSizerStatusText, 0, wxEXPAND, 5 );
+	bSizer301->Add( bSizerStatusText, 0, wxEXPAND, 5 );
 
 
-    m_panel53->SetSizer( bSizer301 );
-    m_panel53->Layout();
-    bSizer301->Fit( m_panel53 );
-    bSizerRoot->Add( m_panel53, 0, wxEXPAND, 5 );
+	m_panel53->SetSizer( bSizer301 );
+	m_panel53->Layout();
+	bSizer301->Fit( m_panel53 );
+	bSizerRoot->Add( m_panel53, 0, wxEXPAND, 5 );
 
-    m_panelProgress = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelProgress->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panelProgress = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelProgress->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer173;
-    bSizer173 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer173;
+	bSizer173 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer161;
-    bSizer161 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer161;
+	bSizer161 = new wxBoxSizer( wxVERTICAL );
 
-    m_panelGraphBytes = new zen::Graph2D( m_panelProgress, wxID_ANY, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_panelGraphBytes->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	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|wxLEFT, 10 );
+	bSizer161->Add( m_panelGraphBytes, 1, wxEXPAND|wxLEFT, 10 );
 
-    wxBoxSizer* bSizer232;
-    bSizer232 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer232;
+	bSizer232 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer233;
-    bSizer233 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer233;
+	bSizer233 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer175;
-    bSizer175 = new wxBoxSizer( wxHORIZONTAL );
+	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|wxRIGHT, 5 );
+	m_bitmapGraphKeyBytes = new wxStaticBitmap( m_panelProgress, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer175->Add( m_bitmapGraphKeyBytes, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
-    wxStaticText* m_staticText99;
-    m_staticText99 = new wxStaticText( m_panelProgress, wxID_ANY, _("Bytes"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText99->Wrap( -1 );
-    bSizer175->Add( m_staticText99, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	wxStaticText* m_staticText99;
+	m_staticText99 = new wxStaticText( m_panelProgress, wxID_ANY, _("Bytes"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText99->Wrap( -1 );
+	bSizer175->Add( m_staticText99, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer233->Add( bSizer175, 0, wxALL, 5 );
+	bSizer233->Add( bSizer175, 0, wxALL, 5 );
 
 
-    bSizer233->Add( 0, 0, 1, 0, 5 );
+	bSizer233->Add( 0, 0, 1, 0, 5 );
 
-    wxBoxSizer* bSizer174;
-    bSizer174 = new wxBoxSizer( wxHORIZONTAL );
+	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|wxRIGHT, 5 );
+	m_bitmapGraphKeyItems = new wxStaticBitmap( m_panelProgress, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer174->Add( m_bitmapGraphKeyItems, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
-    wxStaticText* m_staticText100;
-    m_staticText100 = new wxStaticText( m_panelProgress, wxID_ANY, _("Items"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText100->Wrap( -1 );
-    bSizer174->Add( m_staticText100, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	wxStaticText* m_staticText100;
+	m_staticText100 = new wxStaticText( m_panelProgress, wxID_ANY, _("Items"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText100->Wrap( -1 );
+	bSizer174->Add( m_staticText100, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer233->Add( bSizer174, 0, wxALL, 5 );
+	bSizer233->Add( bSizer174, 0, wxALL, 5 );
 
 
-    bSizer232->Add( bSizer233, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+	bSizer232->Add( bSizer233, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );
 
-    ffgSizer11 = new wxFlexGridSizer( 2, 0, 5, 5 );
-    ffgSizer11->SetFlexibleDirection( wxBOTH );
-    ffgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	ffgSizer11 = new wxFlexGridSizer( 2, 0, 5, 5 );
+	ffgSizer11->SetFlexibleDirection( wxBOTH );
+	ffgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    m_staticTextProcessed = new wxStaticText( m_panelProgress, wxID_ANY, _("Processed:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextProcessed->Wrap( -1 );
-    ffgSizer11->Add( m_staticTextProcessed, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT, 5 );
+	m_staticTextProcessed = new wxStaticText( m_panelProgress, wxID_ANY, _("Processed:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextProcessed->Wrap( -1 );
+	ffgSizer11->Add( m_staticTextProcessed, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT, 5 );
 
-    m_staticTextRemaining = new wxStaticText( m_panelProgress, wxID_ANY, _("Remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextRemaining->Wrap( -1 );
-    ffgSizer11->Add( m_staticTextRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	m_staticTextRemaining = new wxStaticText( m_panelProgress, wxID_ANY, _("Remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextRemaining->Wrap( -1 );
+	ffgSizer11->Add( m_staticTextRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
 
-    bSizer232->Add( ffgSizer11, 0, wxTOP|wxBOTTOM|wxALIGN_CENTER_VERTICAL, 10 );
+	bSizer232->Add( ffgSizer11, 0, wxTOP|wxBOTTOM|wxALIGN_CENTER_VERTICAL, 10 );
 
-    m_panelItemStats = new wxPanel( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelItemStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	m_panelItemStats = new wxPanel( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_panelItemStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer291;
-    bSizer291 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer291;
+	bSizer291 = new wxBoxSizer( wxVERTICAL );
 
-    ffgSizer111 = new wxFlexGridSizer( 2, 0, 5, 5 );
-    ffgSizer111->SetFlexibleDirection( wxBOTH );
-    ffgSizer111->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	ffgSizer111 = new wxFlexGridSizer( 2, 0, 5, 5 );
+	ffgSizer111->SetFlexibleDirection( wxBOTH );
+	ffgSizer111->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    wxBoxSizer* bSizer293;
-    bSizer293 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer293;
+	bSizer293 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapItemStat = new wxStaticBitmap( m_panelItemStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer293->Add( m_bitmapItemStat, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	m_bitmapItemStat = new wxStaticBitmap( m_panelItemStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer293->Add( m_bitmapItemStat, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
 
-    bSizer293->Add( 0, 0, 1, 0, 5 );
+	bSizer293->Add( 0, 0, 1, 0, 5 );
 
-    m_staticTextItemsProcessed = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_staticTextItemsProcessed->Wrap( -1 );
-    m_staticTextItemsProcessed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_staticTextItemsProcessed = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_staticTextItemsProcessed->Wrap( -1 );
+	m_staticTextItemsProcessed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizer293->Add( m_staticTextItemsProcessed, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer293->Add( m_staticTextItemsProcessed, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    ffgSizer111->Add( bSizer293, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	ffgSizer111->Add( bSizer293, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 
-    m_staticTextBytesProcessed = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextBytesProcessed->Wrap( -1 );
-    ffgSizer111->Add( m_staticTextBytesProcessed, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
+	m_staticTextBytesProcessed = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextBytesProcessed->Wrap( -1 );
+	ffgSizer111->Add( m_staticTextBytesProcessed, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
 
-    m_staticTextItemsRemaining = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_staticTextItemsRemaining->Wrap( -1 );
-    m_staticTextItemsRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_staticTextItemsRemaining = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_staticTextItemsRemaining->Wrap( -1 );
+	m_staticTextItemsRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    ffgSizer111->Add( m_staticTextItemsRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	ffgSizer111->Add( m_staticTextItemsRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticTextBytesRemaining = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextBytesRemaining->Wrap( -1 );
-    ffgSizer111->Add( m_staticTextBytesRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticTextBytesRemaining = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextBytesRemaining->Wrap( -1 );
+	ffgSizer111->Add( m_staticTextBytesRemaining, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer291->Add( ffgSizer111, 0, wxALL, 5 );
+	bSizer291->Add( ffgSizer111, 0, wxALL, 5 );
 
 
-    m_panelItemStats->SetSizer( bSizer291 );
-    m_panelItemStats->Layout();
-    bSizer291->Fit( m_panelItemStats );
-    bSizer232->Add( m_panelItemStats, 0, wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL, 10 );
+	m_panelItemStats->SetSizer( bSizer291 );
+	m_panelItemStats->Layout();
+	bSizer291->Fit( m_panelItemStats );
+	bSizer232->Add( m_panelItemStats, 0, wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL, 10 );
 
-    m_panelTimeStats = new wxPanel( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelTimeStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	m_panelTimeStats = new wxPanel( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_panelTimeStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer292;
-    bSizer292 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer292;
+	bSizer292 = new wxBoxSizer( wxVERTICAL );
 
-    ffgSizer112 = new wxFlexGridSizer( 2, 0, 5, 5 );
-    ffgSizer112->SetFlexibleDirection( wxBOTH );
-    ffgSizer112->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	ffgSizer112 = new wxFlexGridSizer( 2, 0, 5, 5 );
+	ffgSizer112->SetFlexibleDirection( wxBOTH );
+	ffgSizer112->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    wxBoxSizer* bSizer294;
-    bSizer294 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer294;
+	bSizer294 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapTimeStat = new wxStaticBitmap( m_panelTimeStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer294->Add( m_bitmapTimeStat, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	m_bitmapTimeStat = new wxStaticBitmap( m_panelTimeStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer294->Add( m_bitmapTimeStat, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
 
-    bSizer294->Add( 0, 0, 1, 0, 5 );
+	bSizer294->Add( 0, 0, 1, 0, 5 );
 
-    m_staticTextTimeElapsed = new wxStaticText( m_panelTimeStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextTimeElapsed->Wrap( -1 );
-    m_staticTextTimeElapsed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_staticTextTimeElapsed = new wxStaticText( m_panelTimeStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextTimeElapsed->Wrap( -1 );
+	m_staticTextTimeElapsed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizer294->Add( m_staticTextTimeElapsed, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer294->Add( m_staticTextTimeElapsed, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    ffgSizer112->Add( bSizer294, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	ffgSizer112->Add( bSizer294, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 
-    m_staticTextTimeRemaining = new wxStaticText( m_panelTimeStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextTimeRemaining->Wrap( -1 );
-    m_staticTextTimeRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_staticTextTimeRemaining = new wxStaticText( m_panelTimeStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextTimeRemaining->Wrap( -1 );
+	m_staticTextTimeRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    ffgSizer112->Add( m_staticTextTimeRemaining, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
+	ffgSizer112->Add( m_staticTextTimeRemaining, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
 
 
-    bSizer292->Add( ffgSizer112, 0, wxALL, 5 );
+	bSizer292->Add( ffgSizer112, 0, wxALL, 5 );
 
 
-    m_panelTimeStats->SetSizer( bSizer292 );
-    m_panelTimeStats->Layout();
-    bSizer292->Fit( m_panelTimeStats );
-    bSizer232->Add( m_panelTimeStats, 0, wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL, 10 );
+	m_panelTimeStats->SetSizer( bSizer292 );
+	m_panelTimeStats->Layout();
+	bSizer292->Fit( m_panelTimeStats );
+	bSizer232->Add( m_panelTimeStats, 0, wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL, 10 );
 
 
-    bSizer232->Add( 0, 0, 1, 0, 5 );
+	bSizer232->Add( 0, 0, 1, 0, 5 );
 
-    bSizerDynSpace = new wxBoxSizer( wxVERTICAL );
+	bSizerDynSpace = new wxBoxSizer( wxVERTICAL );
 
 
-    bSizerDynSpace->Add( 0, 0, 0, 0, 5 );
+	bSizerDynSpace->Add( 0, 0, 0, 0, 5 );
 
 
-    bSizer232->Add( bSizerDynSpace, 0, 0, 5 );
+	bSizer232->Add( bSizerDynSpace, 0, 0, 5 );
 
 
-    bSizer161->Add( bSizer232, 0, wxEXPAND, 5 );
+	bSizer161->Add( bSizer232, 0, wxEXPAND, 5 );
 
-    m_panelGraphItems = new zen::Graph2D( m_panelProgress, wxID_ANY, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_panelGraphItems->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	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|wxLEFT, 10 );
+	bSizer161->Add( m_panelGraphItems, 1, wxEXPAND|wxLEFT, 10 );
 
-    bSizerProgressFooter = new wxBoxSizer( wxHORIZONTAL );
+	bSizerProgressFooter = new wxBoxSizer( wxHORIZONTAL );
 
-    bSizerErrorsRetry = new wxBoxSizer( wxHORIZONTAL );
+	bSizerErrorsRetry = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapRetryErrors = new wxStaticBitmap( m_panelProgress, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizerErrorsRetry->Add( m_bitmapRetryErrors, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_bitmapRetryErrors = new wxStaticBitmap( m_panelProgress, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerErrorsRetry->Add( m_bitmapRetryErrors, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText1461 = new wxStaticText( m_panelProgress, wxID_ANY, _("Automatic retry"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText1461->Wrap( -1 );
-    bSizerErrorsRetry->Add( m_staticText1461, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+	m_staticText1461 = new wxStaticText( m_panelProgress, wxID_ANY, _("Automatic retry"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText1461->Wrap( -1 );
+	bSizerErrorsRetry->Add( m_staticText1461, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
 
-    m_staticTextRetryCount = new wxStaticText( m_panelProgress, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextRetryCount->Wrap( -1 );
-    bSizerErrorsRetry->Add( m_staticTextRetryCount, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	m_staticTextRetryCount = new wxStaticText( m_panelProgress, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextRetryCount->Wrap( -1 );
+	bSizerErrorsRetry->Add( m_staticTextRetryCount, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
 
-    bSizerProgressFooter->Add( bSizerErrorsRetry, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	bSizerProgressFooter->Add( bSizerErrorsRetry, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
-    bSizerErrorsIgnore = new wxBoxSizer( wxHORIZONTAL );
+	bSizerErrorsIgnore = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapIgnoreErrors = new wxStaticBitmap( m_panelProgress, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizerErrorsIgnore->Add( m_bitmapIgnoreErrors, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_bitmapIgnoreErrors = new wxStaticBitmap( m_panelProgress, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerErrorsIgnore->Add( m_bitmapIgnoreErrors, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText146 = new wxStaticText( m_panelProgress, wxID_ANY, _("Ignore errors"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText146->Wrap( -1 );
-    bSizerErrorsIgnore->Add( m_staticText146, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+	m_staticText146 = new wxStaticText( m_panelProgress, wxID_ANY, _("Ignore errors"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText146->Wrap( -1 );
+	bSizerErrorsIgnore->Add( m_staticText146, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
 
 
-    bSizerProgressFooter->Add( bSizerErrorsIgnore, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	bSizerProgressFooter->Add( bSizerErrorsIgnore, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
 
-    bSizerProgressFooter->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizerProgressFooter->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_staticText137 = new wxStaticText( m_panelProgress, wxID_ANY, _("When finished:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText137->Wrap( -1 );
-    bSizerProgressFooter->Add( m_staticText137, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	m_staticText137 = new wxStaticText( m_panelProgress, wxID_ANY, _("When finished:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText137->Wrap( -1 );
+	bSizerProgressFooter->Add( m_staticText137, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
-    wxArrayString m_choicePostSyncActionChoices;
-    m_choicePostSyncAction = new wxChoice( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choicePostSyncActionChoices, 0 );
-    m_choicePostSyncAction->SetSelection( 0 );
-    bSizerProgressFooter->Add( m_choicePostSyncAction, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	wxArrayString m_choicePostSyncActionChoices;
+	m_choicePostSyncAction = new wxChoice( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choicePostSyncActionChoices, 0 );
+	m_choicePostSyncAction->SetSelection( 0 );
+	bSizerProgressFooter->Add( m_choicePostSyncAction, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer161->Add( bSizerProgressFooter, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 10 );
+	bSizer161->Add( bSizerProgressFooter, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 10 );
 
 
-    bSizer173->Add( bSizer161, 1, wxEXPAND|wxLEFT, 5 );
+	bSizer173->Add( bSizer161, 1, wxEXPAND|wxLEFT, 5 );
 
 
-    m_panelProgress->SetSizer( bSizer173 );
-    m_panelProgress->Layout();
-    bSizer173->Fit( m_panelProgress );
-    bSizerRoot->Add( m_panelProgress, 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 );
-    m_notebookResult->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_notebookResult = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_FIXEDWIDTH );
+	m_notebookResult->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
 
-    bSizerRoot->Add( m_notebookResult, 1, wxEXPAND, 5 );
+	bSizerRoot->Add( m_notebookResult, 1, wxEXPAND, 5 );
 
-    m_staticlineFooter = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerRoot->Add( m_staticlineFooter, 0, wxEXPAND, 5 );
+	m_staticlineFooter = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerRoot->Add( m_staticlineFooter, 0, wxEXPAND, 5 );
 
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
 
-    m_checkBoxAutoClose = new wxCheckBox( this, wxID_ANY, _("Auto-close"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizerStdButtons->Add( m_checkBoxAutoClose, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	m_checkBoxAutoClose = new wxCheckBox( this, wxID_ANY, _("Auto-close"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerStdButtons->Add( m_checkBoxAutoClose, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
 
-    bSizerStdButtons->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizerStdButtons->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_buttonClose = new wxButton( this, wxID_OK, _("Close"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonClose = new wxButton( this, wxID_OK, _("Close"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
 
-    m_buttonClose->SetDefault();
-    m_buttonClose->Enable( false );
+	m_buttonClose->SetDefault();
+	m_buttonClose->Enable( false );
 
-    bSizerStdButtons->Add( m_buttonClose, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	bSizerStdButtons->Add( m_buttonClose, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 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_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 );
+	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 );
+	bSizerRoot->Add( bSizerStdButtons, 0, wxEXPAND, 5 );
 
 
-    this->SetSizer( bSizerRoot );
-    this->Layout();
-    bSizerRoot->Fit( this );
+	this->SetSizer( bSizerRoot );
+	this->Layout();
+	bSizerRoot->Fit( this );
 }
 
 SyncProgressPanelGenerated::~SyncProgressPanelGenerated()
@@ -3905,42 +3904,42 @@ SyncProgressPanelGenerated::~SyncProgressPanelGenerated()
 
 LogPanelGenerated::LogPanelGenerated( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name )
 {
-    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer153;
-    bSizer153 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer153;
+	bSizer153 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer154;
-    bSizer154 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer154;
+	bSizer154 = new wxBoxSizer( wxVERTICAL );
 
-    m_bpButtonErrors = new zen::ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizer154->Add( m_bpButtonErrors, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bpButtonErrors = new zen::ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizer154->Add( m_bpButtonErrors, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_bpButtonWarnings = new zen::ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizer154->Add( m_bpButtonWarnings, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bpButtonWarnings = new zen::ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizer154->Add( m_bpButtonWarnings, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_bpButtonInfo = new zen::ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizer154->Add( m_bpButtonInfo, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_bpButtonInfo = new zen::ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizer154->Add( m_bpButtonInfo, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-    bSizer153->Add( bSizer154, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 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_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 );
+	m_gridMessages = new zen::Grid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
+	m_gridMessages->SetScrollRate( 5, 5 );
+	bSizer153->Add( m_gridMessages, 1, wxEXPAND, 5 );
 
 
-    this->SetSizer( bSizer153 );
-    this->Layout();
-    bSizer153->Fit( this );
+	this->SetSizer( bSizer153 );
+	this->Layout();
+	bSizer153->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 );
+	// 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()
@@ -3949,173 +3948,173 @@ 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 ) );
+	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer54;
-    bSizer54 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer54;
+	bSizer54 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer72;
-    bSizer72 = new wxBoxSizer( wxHORIZONTAL );
+	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_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_staticTextHeader = 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_staticTextHeader->Wrap( -1 );
-    bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 10 );
+	m_staticTextHeader = 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_staticTextHeader->Wrap( -1 );
+	bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 10 );
 
 
-    bSizer54->Add( bSizer72, 0, 0, 5 );
+	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_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 ) );
+	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* bSizer172;
+	bSizer172 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer180;
-    bSizer180 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer180;
+	bSizer180 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer2361;
-    bSizer2361 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer2361;
+	bSizer2361 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticText146 = new wxStaticText( m_panel35, wxID_ANY, _("Progress dialog:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText146->Wrap( -1 );
-    bSizer2361->Add( m_staticText146, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	m_staticText146 = new wxStaticText( m_panel35, wxID_ANY, _("Progress dialog:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText146->Wrap( -1 );
+	bSizer2361->Add( m_staticText146, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 
-    ffgSizer11 = new wxFlexGridSizer( 0, 2, 5, 5 );
-    ffgSizer11->SetFlexibleDirection( wxBOTH );
-    ffgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	ffgSizer11 = new wxFlexGridSizer( 0, 2, 5, 5 );
+	ffgSizer11->SetFlexibleDirection( wxBOTH );
+	ffgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    m_bitmapMinimizeToTray = new wxStaticBitmap( m_panel35, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    ffgSizer11->Add( m_bitmapMinimizeToTray, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_bitmapMinimizeToTray = new wxStaticBitmap( m_panel35, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	ffgSizer11->Add( m_bitmapMinimizeToTray, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_checkBoxRunMinimized = new wxCheckBox( m_panel35, wxID_ANY, _("Run minimized"), wxDefaultPosition, wxDefaultSize, 0 );
-    ffgSizer11->Add( m_checkBoxRunMinimized, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+	m_checkBoxRunMinimized = new wxCheckBox( m_panel35, wxID_ANY, _("Run minimized"), wxDefaultPosition, wxDefaultSize, 0 );
+	ffgSizer11->Add( m_checkBoxRunMinimized, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    ffgSizer11->Add( 0, 0, 1, wxEXPAND, 5 );
+	ffgSizer11->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_checkBoxAutoClose = new wxCheckBox( m_panel35, wxID_ANY, _("Auto-close"), wxDefaultPosition, wxDefaultSize, 0 );
-    ffgSizer11->Add( m_checkBoxAutoClose, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	m_checkBoxAutoClose = new wxCheckBox( m_panel35, wxID_ANY, _("Auto-close"), wxDefaultPosition, wxDefaultSize, 0 );
+	ffgSizer11->Add( m_checkBoxAutoClose, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 
 
-    bSizer2361->Add( ffgSizer11, 0, wxEXPAND|wxALL, 5 );
+	bSizer2361->Add( ffgSizer11, 0, wxEXPAND|wxALL, 5 );
 
 
-    bSizer180->Add( bSizer2361, 0, wxALL, 5 );
+	bSizer180->Add( bSizer2361, 0, wxALL, 5 );
 
-    m_staticline26 = new wxStaticLine( m_panel35, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer180->Add( m_staticline26, 0, wxEXPAND, 5 );
+	m_staticline26 = new wxStaticLine( m_panel35, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer180->Add( m_staticline26, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer242;
-    bSizer242 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer242;
+	bSizer242 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer243;
-    bSizer243 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer243;
+	bSizer243 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapIgnoreErrors = new wxStaticBitmap( m_panel35, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer243->Add( m_bitmapIgnoreErrors, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_bitmapIgnoreErrors = new wxStaticBitmap( m_panel35, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer243->Add( m_bitmapIgnoreErrors, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_checkBoxIgnoreErrors = new wxCheckBox( m_panel35, wxID_ANY, _("Ignore errors"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer243->Add( m_checkBoxIgnoreErrors, 1, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+	m_checkBoxIgnoreErrors = new wxCheckBox( m_panel35, wxID_ANY, _("Ignore errors"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer243->Add( m_checkBoxIgnoreErrors, 1, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
 
-    bSizer242->Add( bSizer243, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	bSizer242->Add( bSizer243, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 
-    wxBoxSizer* bSizer246;
-    bSizer246 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer246;
+	bSizer246 = new wxBoxSizer( wxVERTICAL );
 
-    m_radioBtnErrorDialogShow = new wxRadioButton( m_panel35, wxID_ANY, _("&Show error message"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
-    m_radioBtnErrorDialogShow->SetValue( true );
-    m_radioBtnErrorDialogShow->SetToolTip( _("Show pop-up on errors or warnings") );
+	m_radioBtnErrorDialogShow = new wxRadioButton( m_panel35, wxID_ANY, _("&Show error message"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
+	m_radioBtnErrorDialogShow->SetValue( true );
+	m_radioBtnErrorDialogShow->SetToolTip( _("Show pop-up on errors or warnings") );
 
-    bSizer246->Add( m_radioBtnErrorDialogShow, 0, wxALL|wxEXPAND, 5 );
+	bSizer246->Add( m_radioBtnErrorDialogShow, 0, wxALL|wxEXPAND, 5 );
 
-    m_radioBtnErrorDialogCancel = new wxRadioButton( m_panel35, wxID_ANY, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_radioBtnErrorDialogCancel->SetToolTip( _("Stop synchronization at first error") );
+	m_radioBtnErrorDialogCancel = new wxRadioButton( m_panel35, wxID_ANY, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_radioBtnErrorDialogCancel->SetToolTip( _("Stop synchronization at first error") );
 
-    bSizer246->Add( m_radioBtnErrorDialogCancel, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	bSizer246->Add( m_radioBtnErrorDialogCancel, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
 
 
-    bSizer242->Add( bSizer246, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT, 15 );
+	bSizer242->Add( bSizer246, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT, 15 );
 
 
-    bSizer180->Add( bSizer242, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer180->Add( bSizer242, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticline261 = new wxStaticLine( m_panel35, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer180->Add( m_staticline261, 0, wxEXPAND, 5 );
+	m_staticline261 = new wxStaticLine( m_panel35, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer180->Add( m_staticline261, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer247;
-    bSizer247 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer247;
+	bSizer247 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticText137 = new wxStaticText( m_panel35, wxID_ANY, _("When finished:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText137->Wrap( -1 );
-    bSizer247->Add( m_staticText137, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	m_staticText137 = new wxStaticText( m_panel35, wxID_ANY, _("When finished:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText137->Wrap( -1 );
+	bSizer247->Add( m_staticText137, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 
-    wxArrayString m_choicePostSyncActionChoices;
-    m_choicePostSyncAction = new wxChoice( m_panel35, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choicePostSyncActionChoices, 0 );
-    m_choicePostSyncAction->SetSelection( 0 );
-    bSizer247->Add( m_choicePostSyncAction, 0, wxALL, 5 );
+	wxArrayString m_choicePostSyncActionChoices;
+	m_choicePostSyncAction = new wxChoice( m_panel35, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choicePostSyncActionChoices, 0 );
+	m_choicePostSyncAction->SetSelection( 0 );
+	bSizer247->Add( m_choicePostSyncAction, 0, wxALL, 5 );
 
 
-    bSizer180->Add( bSizer247, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer180->Add( bSizer247, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticline262 = new wxStaticLine( m_panel35, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer180->Add( m_staticline262, 0, wxEXPAND, 5 );
+	m_staticline262 = new wxStaticLine( m_panel35, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer180->Add( m_staticline262, 0, wxEXPAND, 5 );
 
 
-    bSizer172->Add( bSizer180, 0, 0, 5 );
+	bSizer172->Add( bSizer180, 0, 0, 5 );
 
-    m_staticline25 = new wxStaticLine( m_panel35, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer172->Add( m_staticline25, 0, wxEXPAND, 5 );
+	m_staticline25 = new wxStaticLine( m_panel35, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer172->Add( m_staticline25, 0, wxEXPAND, 5 );
 
-    m_hyperlink17 = new wxHyperlinkCtrl( m_panel35, wxID_ANY, _("How can I schedule a batch job?"), wxT("https://freefilesync.org/manual.php?topic=schedule-a-batch-job"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink17->SetToolTip( _("https://freefilesync.org/manual.php?topic=schedule-a-batch-job") );
+	m_hyperlink17 = new wxHyperlinkCtrl( m_panel35, wxID_ANY, _("How can I schedule a batch job?"), wxT("https://freefilesync.org/manual.php?topic=schedule-a-batch-job"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink17->SetToolTip( _("https://freefilesync.org/manual.php?topic=schedule-a-batch-job") );
 
-    bSizer172->Add( m_hyperlink17, 0, wxALL, 10 );
+	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_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 );
+	m_staticline13 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer54->Add( m_staticline13, 0, wxEXPAND, 5 );
 
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
 
-    m_buttonSaveAs = new wxButton( this, wxID_SAVE, _("Save &as..."), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonSaveAs = new wxButton( this, wxID_SAVE, _("Save &as..."), wxDefaultPosition, wxSize( -1,-1 ), 0 );
 
-    m_buttonSaveAs->SetDefault();
-    m_buttonSaveAs->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonSaveAs->SetDefault();
+	m_buttonSaveAs->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizerStdButtons->Add( m_buttonSaveAs, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	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 );
+	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 );
+	bSizer54->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
 
 
-    this->SetSizer( bSizer54 );
-    this->Layout();
-    bSizer54->Fit( this );
+	this->SetSizer( bSizer54 );
+	this->Layout();
+	bSizer54->Fit( this );
 
-    this->Centre( wxBOTH );
+	this->Centre( wxBOTH );
 
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( BatchDlgGenerated::onClose ) );
-    m_checkBoxRunMinimized->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( BatchDlgGenerated::onToggleRunMinimized ), NULL, this );
-    m_checkBoxIgnoreErrors->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( BatchDlgGenerated::onToggleIgnoreErrors ), 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 );
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( BatchDlgGenerated::onClose ) );
+	m_checkBoxRunMinimized->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( BatchDlgGenerated::onToggleRunMinimized ), NULL, this );
+	m_checkBoxIgnoreErrors->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( BatchDlgGenerated::onToggleIgnoreErrors ), 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()
@@ -4124,85 +4123,85 @@ 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 ) );
+	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer24;
-    bSizer24 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer24;
+	bSizer24 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer72;
-    bSizer72 = new wxBoxSizer( wxHORIZONTAL );
+	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_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 );
-    m_staticTextHeader->Wrap( -1 );
-    bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_VERTICAL|wxALL, 10 );
+	m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextHeader->Wrap( -1 );
+	bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_VERTICAL|wxALL, 10 );
 
 
-    bSizer24->Add( bSizer72, 0, 0, 5 );
+	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_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 ) );
+	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 );
+	wxBoxSizer* bSizer185;
+	bSizer185 = new wxBoxSizer( wxHORIZONTAL );
 
 
-    bSizer185->Add( 60, 0, 0, 0, 5 );
+	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_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( -1, -1 ), wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY|wxBORDER_NONE );
-    bSizer185->Add( m_textCtrlFileList, 1, wxEXPAND, 5 );
+	m_textCtrlFileList = new wxTextCtrl( m_panel31, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY|wxBORDER_NONE );
+	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_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 );
+	m_staticline9 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer24->Add( m_staticline9, 0, wxEXPAND, 5 );
 
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
 
-    m_checkBoxUseRecycler = new wxCheckBox( this, wxID_ANY, _("&Recycle bin"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizerStdButtons->Add( m_checkBoxUseRecycler, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	m_checkBoxUseRecycler = new wxCheckBox( this, wxID_ANY, _("&Recycle bin"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerStdButtons->Add( m_checkBoxUseRecycler, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
 
-    bSizerStdButtons->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizerStdButtons->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_buttonOK = new wxButton( this, wxID_OK, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonOK = new wxButton( this, wxID_OK, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
 
-    m_buttonOK->SetDefault();
-    m_buttonOK->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonOK->SetDefault();
+	m_buttonOK->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizerStdButtons->Add( m_buttonOK, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	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 );
+	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 );
+	bSizer24->Add( bSizerStdButtons, 0, wxEXPAND, 5 );
 
 
-    this->SetSizer( bSizer24 );
-    this->Layout();
-    bSizer24->Fit( this );
+	this->SetSizer( bSizer24 );
+	this->Layout();
+	bSizer24->Fit( this );
 
-    this->Centre( wxBOTH );
+	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::onOkay ), NULL, this );
-    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::onCancel ), NULL, this );
+	// 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::onOkay ), NULL, this );
+	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::onCancel ), NULL, this );
 }
 
 DeleteDlgGenerated::~DeleteDlgGenerated()
@@ -4211,120 +4210,120 @@ 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 ) );
+	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer24;
-    bSizer24 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer24;
+	bSizer24 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer72;
-    bSizer72 = new wxBoxSizer( wxHORIZONTAL );
+	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_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 );
-    m_staticTextHeader->Wrap( -1 );
-    bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_VERTICAL|wxALL, 10 );
+	m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextHeader->Wrap( -1 );
+	bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_VERTICAL|wxALL, 10 );
 
 
-    bSizer24->Add( bSizer72, 0, 0, 5 );
+	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_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 ) );
+	m_panel31 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel31->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer242;
-    bSizer242 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer242;
+	bSizer242 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer185;
-    bSizer185 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer185;
+	bSizer185 = new wxBoxSizer( wxHORIZONTAL );
 
 
-    bSizer185->Add( 60, 0, 0, 0, 5 );
+	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_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( -1, -1 ), wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY|wxBORDER_NONE );
-    bSizer185->Add( m_textCtrlFileList, 1, wxEXPAND, 5 );
+	m_textCtrlFileList = new wxTextCtrl( m_panel31, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY|wxBORDER_NONE );
+	bSizer185->Add( m_textCtrlFileList, 1, wxEXPAND, 5 );
 
 
-    bSizer242->Add( bSizer185, 1, wxEXPAND, 5 );
+	bSizer242->Add( bSizer185, 1, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer182;
-    bSizer182 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer182;
+	bSizer182 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_targetFolderPath = new fff::FolderHistoryBox( m_panel31, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
-    bSizer182->Add( m_targetFolderPath, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	m_targetFolderPath = new fff::FolderHistoryBox( m_panel31, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+	bSizer182->Add( m_targetFolderPath, 1, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_buttonSelectTargetFolder = new wxButton( m_panel31, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_buttonSelectTargetFolder->SetToolTip( _("Select a folder") );
+	m_buttonSelectTargetFolder = new wxButton( m_panel31, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonSelectTargetFolder->SetToolTip( _("Select a folder") );
 
-    bSizer182->Add( m_buttonSelectTargetFolder, 0, wxEXPAND, 5 );
+	bSizer182->Add( m_buttonSelectTargetFolder, 0, wxEXPAND, 5 );
 
-    m_bpButtonSelectAltTargetFolder = new wxBitmapButton( m_panel31, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonSelectAltTargetFolder->SetToolTip( _("Access online storage") );
+	m_bpButtonSelectAltTargetFolder = new wxBitmapButton( m_panel31, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonSelectAltTargetFolder->SetToolTip( _("Access online storage") );
 
-    bSizer182->Add( m_bpButtonSelectAltTargetFolder, 0, wxEXPAND, 5 );
+	bSizer182->Add( m_bpButtonSelectAltTargetFolder, 0, wxEXPAND, 5 );
 
 
-    bSizer242->Add( bSizer182, 0, wxALL|wxEXPAND, 10 );
+	bSizer242->Add( bSizer182, 0, wxALL|wxEXPAND, 10 );
 
 
-    m_panel31->SetSizer( bSizer242 );
-    m_panel31->Layout();
-    bSizer242->Fit( m_panel31 );
-    bSizer24->Add( m_panel31, 1, wxEXPAND, 5 );
+	m_panel31->SetSizer( bSizer242 );
+	m_panel31->Layout();
+	bSizer242->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 );
+	m_staticline9 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer24->Add( m_staticline9, 0, wxEXPAND, 5 );
 
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer189;
-    bSizer189 = new wxBoxSizer( wxVERTICAL );
+	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_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 );
+	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, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizerStdButtons->Add( bSizer189, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizerStdButtons->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizerStdButtons->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_buttonOK = new wxButton( this, wxID_OK, _("Copy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonOK = new wxButton( this, wxID_OK, _("Copy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
 
-    m_buttonOK->SetDefault();
-    m_buttonOK->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonOK->SetDefault();
+	m_buttonOK->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizerStdButtons->Add( m_buttonOK, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	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 );
+	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 );
+	bSizer24->Add( bSizerStdButtons, 0, wxEXPAND, 5 );
 
 
-    this->SetSizer( bSizer24 );
-    this->Layout();
-    bSizer24->Fit( this );
+	this->SetSizer( bSizer24 );
+	this->Layout();
+	bSizer24->Fit( this );
 
-    this->Centre( wxBOTH );
+	this->Centre( wxBOTH );
 
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CopyToDlgGenerated::onClose ) );
-    m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CopyToDlgGenerated::onOkay ), NULL, this );
-    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CopyToDlgGenerated::onCancel ), NULL, this );
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CopyToDlgGenerated::onClose ) );
+	m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CopyToDlgGenerated::onOkay ), NULL, this );
+	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CopyToDlgGenerated::onCancel ), NULL, this );
 }
 
 CopyToDlgGenerated::~CopyToDlgGenerated()
@@ -4333,556 +4332,556 @@ 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 ) );
+	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer95;
-    bSizer95 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer95;
+	bSizer95 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer72;
-    bSizer72 = new wxBoxSizer( wxHORIZONTAL );
+	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_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( -1 );
-    bSizer72->Add( m_staticText44, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 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( -1 );
+	bSizer72->Add( m_staticText44, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 10 );
 
 
-    bSizer95->Add( bSizer72, 0, 0, 5 );
+	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_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 ) );
+	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* bSizer166;
+	bSizer166 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer186;
-    bSizer186 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer186;
+	bSizer186 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer160;
-    bSizer160 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer160;
+	bSizer160 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer176;
-    bSizer176 = new wxBoxSizer( wxHORIZONTAL );
+	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.") );
+	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 );
+	bSizer176->Add( m_checkBoxFailSafe, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText911 = new wxStaticText( m_panel39, wxID_ANY, _("("), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText911->Wrap( -1 );
-    m_staticText911->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticText911 = new wxStaticText( m_panel39, wxID_ANY, _("("), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText911->Wrap( -1 );
+	m_staticText911->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    bSizer176->Add( m_staticText911, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
+	bSizer176->Add( m_staticText911, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 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 ) );
+	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, 5 );
+	bSizer176->Add( m_staticText91, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
 
-    m_staticText9111 = new wxStaticText( m_panel39, wxID_ANY, _(")"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText9111->Wrap( -1 );
-    m_staticText9111->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticText9111 = new wxStaticText( m_panel39, wxID_ANY, _(")"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText9111->Wrap( -1 );
+	m_staticText9111->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    bSizer176->Add( m_staticText9111, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	bSizer176->Add( m_staticText9111, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
 
-    bSizer160->Add( bSizer176, 0, wxEXPAND, 5 );
+	bSizer160->Add( bSizer176, 0, wxEXPAND, 5 );
 
-    bSizerLockedFiles = new wxBoxSizer( wxHORIZONTAL );
+	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.") );
+	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 );
+	bSizerLockedFiles->Add( m_checkBoxCopyLocked, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText921 = new wxStaticText( m_panel39, wxID_ANY, _("("), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText921->Wrap( -1 );
-    m_staticText921->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticText921 = new wxStaticText( m_panel39, wxID_ANY, _("("), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText921->Wrap( -1 );
+	m_staticText921->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    bSizerLockedFiles->Add( m_staticText921, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
+	bSizerLockedFiles->Add( m_staticText921, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 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 ) );
+	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, 5 );
+	bSizerLockedFiles->Add( m_staticText92, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
 
-    m_staticText922 = new wxStaticText( m_panel39, wxID_ANY, _(")"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText922->Wrap( -1 );
-    m_staticText922->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticText922 = new wxStaticText( m_panel39, wxID_ANY, _(")"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText922->Wrap( -1 );
+	m_staticText922->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    bSizerLockedFiles->Add( m_staticText922, 0, wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizerLockedFiles->Add( m_staticText922, 0, wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer160->Add( bSizerLockedFiles, 0, wxEXPAND, 5 );
+	bSizer160->Add( bSizerLockedFiles, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer178;
-    bSizer178 = new wxBoxSizer( wxHORIZONTAL );
+	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.") );
+	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 );
+	bSizer178->Add( m_checkBoxCopyPermissions, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    m_staticText931 = new wxStaticText( m_panel39, wxID_ANY, _("("), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText931->Wrap( -1 );
-    m_staticText931->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticText931 = new wxStaticText( m_panel39, wxID_ANY, _("("), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText931->Wrap( -1 );
+	m_staticText931->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    bSizer178->Add( m_staticText931, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
+	bSizer178->Add( m_staticText931, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 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 ) );
+	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, 5 );
+	bSizer178->Add( m_staticText93, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
 
-    m_staticText932 = new wxStaticText( m_panel39, wxID_ANY, _(")"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText932->Wrap( -1 );
-    m_staticText932->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticText932 = new wxStaticText( m_panel39, wxID_ANY, _(")"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText932->Wrap( -1 );
+	m_staticText932->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    bSizer178->Add( m_staticText932, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	bSizer178->Add( m_staticText932, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
 
-    bSizer160->Add( bSizer178, 0, wxEXPAND, 5 );
+	bSizer160->Add( bSizer178, 0, wxEXPAND, 5 );
 
 
-    bSizer186->Add( bSizer160, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	bSizer186->Add( bSizer160, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    m_staticline39 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer186->Add( m_staticline39, 0, wxEXPAND, 5 );
+	m_staticline39 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer186->Add( m_staticline39, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer293;
-    bSizer293 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer293;
+	bSizer293 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapWarnings = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer293->Add( m_bitmapWarnings, 0, wxALL, 5 );
+	m_bitmapWarnings = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer293->Add( m_bitmapWarnings, 0, wxALL, 5 );
 
-    wxBoxSizer* bSizer1881;
-    bSizer1881 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer1881;
+	bSizer1881 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticTextResetDialogs = new wxStaticText( m_panel39, wxID_ANY, _("Show all permanently hidden dialogs and warning messages again"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextResetDialogs->Wrap( -1 );
-    m_staticTextResetDialogs->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticTextResetDialogs = new wxStaticText( m_panel39, wxID_ANY, _("Show all permanently hidden dialogs and warning messages again"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextResetDialogs->Wrap( -1 );
+	m_staticTextResetDialogs->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    bSizer1881->Add( m_staticTextResetDialogs, 0, 0, 5 );
+	bSizer1881->Add( m_staticTextResetDialogs, 0, 0, 5 );
 
-    wxBoxSizer* bSizer292;
-    bSizer292 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer292;
+	bSizer292 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_buttonRestoreDialogs = new wxButton( m_panel39, wxID_ANY, _("&Restore"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer292->Add( m_buttonRestoreDialogs, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_buttonRestoreDialogs = new wxButton( m_panel39, wxID_ANY, _("&Restore"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer292->Add( m_buttonRestoreDialogs, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticTextAllDialogsShown = new wxStaticText( m_panel39, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextAllDialogsShown->Wrap( -1 );
-    bSizer292->Add( m_staticTextAllDialogsShown, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+	m_staticTextAllDialogsShown = new wxStaticText( m_panel39, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextAllDialogsShown->Wrap( -1 );
+	bSizer292->Add( m_staticTextAllDialogsShown, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
 
-    bSizer1881->Add( bSizer292, 0, wxTOP, 5 );
+	bSizer1881->Add( bSizer292, 0, wxTOP, 5 );
 
 
-    bSizer293->Add( bSizer1881, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	bSizer293->Add( bSizer1881, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
 
-    bSizer186->Add( bSizer293, 0, wxALL, 5 );
+	bSizer186->Add( bSizer293, 0, wxALL, 5 );
 
 
-    bSizer166->Add( bSizer186, 0, wxEXPAND, 5 );
+	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 );
+	m_staticline191 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer166->Add( m_staticline191, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer259;
-    bSizer259 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer259;
+	bSizer259 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer258;
-    bSizer258 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer258;
+	bSizer258 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapLogFile = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer258->Add( m_bitmapLogFile, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	m_bitmapLogFile = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer258->Add( m_bitmapLogFile, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    m_staticText163 = new wxStaticText( m_panel39, wxID_ANY, _("Default log path:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText163->Wrap( -1 );
-    bSizer258->Add( m_staticText163, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	m_staticText163 = new wxStaticText( m_panel39, wxID_ANY, _("Default log path:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText163->Wrap( -1 );
+	bSizer258->Add( m_staticText163, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
-    m_hyperlinkLogFolder = new wxHyperlinkCtrl( m_panel39, wxID_ANY, _("dummy"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_ALIGN_CENTRE|wxBORDER_NONE );
-    bSizer258->Add( m_hyperlinkLogFolder, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	m_hyperlinkLogFolder = new wxHyperlinkCtrl( m_panel39, wxID_ANY, _("dummy"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_ALIGN_CENTRE|wxBORDER_NONE );
+	bSizer258->Add( m_hyperlinkLogFolder, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
 
-    bSizer259->Add( bSizer258, 0, wxALL, 5 );
+	bSizer259->Add( bSizer258, 0, wxALL, 5 );
 
-    wxBoxSizer* bSizer299;
-    bSizer299 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer299;
+	bSizer299 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticline83 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer299->Add( m_staticline83, 0, wxEXPAND, 5 );
+	m_staticline83 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer299->Add( m_staticline83, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer297;
-    bSizer297 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer297;
+	bSizer297 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_staticline82 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer297->Add( m_staticline82, 0, wxEXPAND, 5 );
+	m_staticline82 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer297->Add( m_staticline82, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer282;
-    bSizer282 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer282;
+	bSizer282 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_checkBoxLogFilesMaxAge = new wxCheckBox( m_panel39, wxID_ANY, _("&Delete logs after x days:"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer282->Add( m_checkBoxLogFilesMaxAge, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	m_checkBoxLogFilesMaxAge = new wxCheckBox( m_panel39, wxID_ANY, _("&Delete logs after x days:"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer282->Add( m_checkBoxLogFilesMaxAge, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    m_spinCtrlLogFilesMaxAge = new wxSpinCtrl( m_panel39, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
-    bSizer282->Add( m_spinCtrlLogFilesMaxAge, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	m_spinCtrlLogFilesMaxAge = new wxSpinCtrl( m_panel39, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
+	bSizer282->Add( m_spinCtrlLogFilesMaxAge, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
 
-    bSizer297->Add( bSizer282, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	bSizer297->Add( bSizer282, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    m_staticline81 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer297->Add( m_staticline81, 0, wxEXPAND, 5 );
+	m_staticline81 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer297->Add( m_staticline81, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer296;
-    bSizer296 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer296;
+	bSizer296 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_staticText184 = new wxStaticText( m_panel39, wxID_ANY, _("Log file format:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText184->Wrap( -1 );
-    bSizer296->Add( m_staticText184, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	m_staticText184 = new wxStaticText( m_panel39, wxID_ANY, _("Log file format:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText184->Wrap( -1 );
+	bSizer296->Add( m_staticText184, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    wxFlexGridSizer* fgSizer251;
-    fgSizer251 = new wxFlexGridSizer( 0, 1, 5, 0 );
-    fgSizer251->SetFlexibleDirection( wxBOTH );
-    fgSizer251->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	wxFlexGridSizer* fgSizer251;
+	fgSizer251 = new wxFlexGridSizer( 0, 1, 5, 0 );
+	fgSizer251->SetFlexibleDirection( wxBOTH );
+	fgSizer251->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    m_radioBtnLogHtml = new wxRadioButton( m_panel39, wxID_ANY, _("&HTML"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
-    m_radioBtnLogHtml->SetValue( true );
-    fgSizer251->Add( m_radioBtnLogHtml, 0, wxEXPAND, 5 );
+	m_radioBtnLogHtml = new wxRadioButton( m_panel39, wxID_ANY, _("&HTML"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
+	m_radioBtnLogHtml->SetValue( true );
+	fgSizer251->Add( m_radioBtnLogHtml, 0, wxEXPAND, 5 );
 
-    m_radioBtnLogText = new wxRadioButton( m_panel39, wxID_ANY, _("&Plain text"), wxDefaultPosition, wxDefaultSize, 0 );
-    fgSizer251->Add( m_radioBtnLogText, 0, wxEXPAND, 5 );
+	m_radioBtnLogText = new wxRadioButton( m_panel39, wxID_ANY, _("&Plain text"), wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer251->Add( m_radioBtnLogText, 0, wxEXPAND, 5 );
 
 
-    bSizer296->Add( fgSizer251, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	bSizer296->Add( fgSizer251, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
 
-    bSizer297->Add( bSizer296, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	bSizer297->Add( bSizer296, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
 
-    bSizer299->Add( bSizer297, 0, 0, 5 );
+	bSizer299->Add( bSizer297, 0, 0, 5 );
 
 
-    bSizer259->Add( bSizer299, 0, wxALIGN_RIGHT|wxLEFT, 15 );
+	bSizer259->Add( bSizer299, 0, wxALIGN_RIGHT|wxLEFT, 15 );
 
 
-    bSizer166->Add( bSizer259, 0, wxEXPAND, 5 );
+	bSizer166->Add( bSizer259, 0, wxEXPAND, 5 );
 
-    m_staticline361 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer166->Add( m_staticline361, 0, wxEXPAND, 5 );
+	m_staticline361 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer166->Add( m_staticline361, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer288;
-    bSizer288 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer288;
+	bSizer288 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer300;
-    bSizer300 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer300;
+	bSizer300 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapNotificationSounds = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer300->Add( m_bitmapNotificationSounds, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_bitmapNotificationSounds = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer300->Add( m_bitmapNotificationSounds, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText851 = new wxStaticText( m_panel39, wxID_ANY, _("Notification sounds:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText851->Wrap( -1 );
-    bSizer300->Add( m_staticText851, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+	m_staticText851 = new wxStaticText( m_panel39, wxID_ANY, _("Notification sounds:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText851->Wrap( -1 );
+	bSizer300->Add( m_staticText851, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
 
-    bSizer288->Add( bSizer300, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	bSizer288->Add( bSizer300, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 
-    wxBoxSizer* bSizer301;
-    bSizer301 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer301;
+	bSizer301 = new wxBoxSizer( wxHORIZONTAL );
 
 
-    bSizer301->Add( 15, 0, 0, 0, 5 );
+	bSizer301->Add( 15, 0, 0, 0, 5 );
 
-    ffgSizer11 = new wxFlexGridSizer( 0, 3, 0, 5 );
-    ffgSizer11->AddGrowableCol( 2 );
-    ffgSizer11->SetFlexibleDirection( wxBOTH );
-    ffgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	ffgSizer11 = new wxFlexGridSizer( 0, 3, 0, 5 );
+	ffgSizer11->AddGrowableCol( 2 );
+	ffgSizer11->SetFlexibleDirection( wxBOTH );
+	ffgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    m_bitmapCompareDone = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    ffgSizer11->Add( m_bitmapCompareDone, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_bitmapCompareDone = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	ffgSizer11->Add( m_bitmapCompareDone, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText171 = new wxStaticText( m_panel39, wxID_ANY, _("Comparison finished:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText171->Wrap( -1 );
-    m_staticText171->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticText171 = new wxStaticText( m_panel39, wxID_ANY, _("Comparison finished:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText171->Wrap( -1 );
+	m_staticText171->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    ffgSizer11->Add( m_staticText171, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	ffgSizer11->Add( m_staticText171, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxBoxSizer* bSizer290;
-    bSizer290 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer290;
+	bSizer290 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_textCtrlSoundPathCompareDone = new wxTextCtrl( m_panel39, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer290->Add( m_textCtrlSoundPathCompareDone, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	m_bpButtonPlayCompareDone = new wxBitmapButton( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+	bSizer290->Add( m_bpButtonPlayCompareDone, 0, wxEXPAND, 5 );
 
-    m_buttonSelectSoundCompareDone = new wxButton( m_panel39, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_buttonSelectSoundCompareDone->SetToolTip( _("Select a folder") );
+	m_textCtrlSoundPathCompareDone = new wxTextCtrl( m_panel39, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer290->Add( m_textCtrlSoundPathCompareDone, 1, wxALIGN_CENTER_VERTICAL, 5 );
 
-    bSizer290->Add( m_buttonSelectSoundCompareDone, 0, wxEXPAND, 5 );
+	m_buttonSelectSoundCompareDone = new wxButton( m_panel39, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonSelectSoundCompareDone->SetToolTip( _("Select a folder") );
 
-    m_bpButtonPlayCompareDone = new wxBitmapButton( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
-    bSizer290->Add( m_bpButtonPlayCompareDone, 0, wxEXPAND, 5 );
+	bSizer290->Add( m_buttonSelectSoundCompareDone, 0, wxEXPAND, 5 );
 
 
-    ffgSizer11->Add( bSizer290, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	ffgSizer11->Add( bSizer290, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 
-    m_bitmapSyncDone = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    ffgSizer11->Add( m_bitmapSyncDone, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_bitmapSyncDone = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	ffgSizer11->Add( m_bitmapSyncDone, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText1711 = new wxStaticText( m_panel39, wxID_ANY, _("Synchronization finished:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText1711->Wrap( -1 );
-    m_staticText1711->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticText1711 = new wxStaticText( m_panel39, wxID_ANY, _("Synchronization finished:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText1711->Wrap( -1 );
+	m_staticText1711->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    ffgSizer11->Add( m_staticText1711, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	ffgSizer11->Add( m_staticText1711, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxBoxSizer* bSizer2901;
-    bSizer2901 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer2901;
+	bSizer2901 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_textCtrlSoundPathSyncDone = new wxTextCtrl( m_panel39, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer2901->Add( m_textCtrlSoundPathSyncDone, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	m_bpButtonPlaySyncDone = new wxBitmapButton( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+	bSizer2901->Add( m_bpButtonPlaySyncDone, 0, wxEXPAND, 5 );
 
-    m_buttonSelectSoundSyncDone = new wxButton( m_panel39, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_buttonSelectSoundSyncDone->SetToolTip( _("Select a folder") );
+	m_textCtrlSoundPathSyncDone = new wxTextCtrl( m_panel39, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer2901->Add( m_textCtrlSoundPathSyncDone, 1, wxALIGN_CENTER_VERTICAL, 5 );
 
-    bSizer2901->Add( m_buttonSelectSoundSyncDone, 0, wxEXPAND, 5 );
+	m_buttonSelectSoundSyncDone = new wxButton( m_panel39, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonSelectSoundSyncDone->SetToolTip( _("Select a folder") );
 
-    m_bpButtonPlaySyncDone = new wxBitmapButton( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
-    bSizer2901->Add( m_bpButtonPlaySyncDone, 0, wxEXPAND, 5 );
+	bSizer2901->Add( m_buttonSelectSoundSyncDone, 0, wxEXPAND, 5 );
 
 
-    ffgSizer11->Add( bSizer2901, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	ffgSizer11->Add( bSizer2901, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 
 
-    bSizer301->Add( ffgSizer11, 1, wxALL, 5 );
+	bSizer301->Add( ffgSizer11, 1, wxALL, 5 );
 
 
-    bSizer288->Add( bSizer301, 0, wxEXPAND, 5 );
+	bSizer288->Add( bSizer301, 0, wxEXPAND, 5 );
 
 
-    bSizer166->Add( bSizer288, 0, wxEXPAND|wxALL, 5 );
+	bSizer166->Add( bSizer288, 0, wxEXPAND|wxALL, 5 );
 
-    m_staticline3611 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer166->Add( m_staticline3611, 0, wxEXPAND, 5 );
+	m_staticline3611 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer166->Add( m_staticline3611, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer181;
-    bSizer181 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer181;
+	bSizer181 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer289;
-    bSizer289 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer289;
+	bSizer289 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer2991;
-    bSizer2991 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer2991;
+	bSizer2991 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer2971;
-    bSizer2971 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer2971;
+	bSizer2971 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapConsole = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer2971->Add( m_bitmapConsole, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_bitmapConsole = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer2971->Add( m_bitmapConsole, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText85 = new wxStaticText( m_panel39, wxID_ANY, _("Customize context menu:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText85->Wrap( -1 );
-    bSizer2971->Add( m_staticText85, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+	m_staticText85 = new wxStaticText( m_panel39, wxID_ANY, _("Customize context menu:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText85->Wrap( -1 );
+	bSizer2971->Add( m_staticText85, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
 
-    bSizer2991->Add( bSizer2971, 0, 0, 5 );
+	bSizer2991->Add( bSizer2971, 0, 0, 5 );
 
 
-    bSizer2991->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizer2991->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer193;
-    bSizer193 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer193;
+	bSizer193 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bpButtonAddRow = new wxBitmapButton( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizer193->Add( m_bpButtonAddRow, 0, wxALIGN_BOTTOM, 5 );
+	m_bpButtonAddRow = new wxBitmapButton( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizer193->Add( m_bpButtonAddRow, 0, wxALIGN_BOTTOM, 5 );
 
-    m_bpButtonRemoveRow = new wxBitmapButton( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizer193->Add( m_bpButtonRemoveRow, 0, wxALIGN_BOTTOM, 5 );
+	m_bpButtonRemoveRow = new wxBitmapButton( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizer193->Add( m_bpButtonRemoveRow, 0, wxALIGN_BOTTOM, 5 );
 
 
-    bSizer2991->Add( bSizer193, 0, 0, 5 );
+	bSizer2991->Add( bSizer193, 0, 0, 5 );
 
 
-    bSizer289->Add( bSizer2991, 1, wxEXPAND, 5 );
+	bSizer289->Add( bSizer2991, 1, wxEXPAND, 5 );
 
-    wxFlexGridSizer* fgSizer25;
-    fgSizer25 = new wxFlexGridSizer( 0, 2, 0, 10 );
-    fgSizer25->SetFlexibleDirection( wxBOTH );
-    fgSizer25->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	wxFlexGridSizer* fgSizer25;
+	fgSizer25 = new wxFlexGridSizer( 0, 2, 0, 10 );
+	fgSizer25->SetFlexibleDirection( wxBOTH );
+	fgSizer25->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    m_staticText174 = new wxStaticText( m_panel39, wxID_ANY, _("%item_path%"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText174->Wrap( -1 );
-    m_staticText174->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
-    m_staticText174->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticText174 = new wxStaticText( m_panel39, wxID_ANY, _("%item_path%"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText174->Wrap( -1 );
+	m_staticText174->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	m_staticText174->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    fgSizer25->Add( m_staticText174, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	fgSizer25->Add( m_staticText174, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText175 = new wxStaticText( m_panel39, wxID_ANY, _("Full file or folder path"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText175->Wrap( -1 );
-    m_staticText175->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticText175 = new wxStaticText( m_panel39, wxID_ANY, _("Full file or folder path"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText175->Wrap( -1 );
+	m_staticText175->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    fgSizer25->Add( m_staticText175, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	fgSizer25->Add( m_staticText175, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText178 = new wxStaticText( m_panel39, wxID_ANY, _("%local_path%"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText178->Wrap( -1 );
-    m_staticText178->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
-    m_staticText178->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticText178 = new wxStaticText( m_panel39, wxID_ANY, _("%local_path%"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText178->Wrap( -1 );
+	m_staticText178->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	m_staticText178->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    fgSizer25->Add( m_staticText178, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	fgSizer25->Add( m_staticText178, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText179 = new wxStaticText( m_panel39, wxID_ANY, _("Temporary local copy for SFTP and MTP storage"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText179->Wrap( -1 );
-    m_staticText179->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticText179 = new wxStaticText( m_panel39, wxID_ANY, _("Temporary local copy for SFTP and MTP storage"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText179->Wrap( -1 );
+	m_staticText179->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    fgSizer25->Add( m_staticText179, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	fgSizer25->Add( m_staticText179, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText189 = new wxStaticText( m_panel39, wxID_ANY, _("%item_name%"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText189->Wrap( -1 );
-    m_staticText189->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
-    m_staticText189->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticText189 = new wxStaticText( m_panel39, wxID_ANY, _("%item_name%"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText189->Wrap( -1 );
+	m_staticText189->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	m_staticText189->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    fgSizer25->Add( m_staticText189, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	fgSizer25->Add( m_staticText189, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText190 = new wxStaticText( m_panel39, wxID_ANY, _("File or folder name"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText190->Wrap( -1 );
-    m_staticText190->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticText190 = new wxStaticText( m_panel39, wxID_ANY, _("File or folder name"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText190->Wrap( -1 );
+	m_staticText190->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    fgSizer25->Add( m_staticText190, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	fgSizer25->Add( m_staticText190, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText176 = new wxStaticText( m_panel39, wxID_ANY, _("%parent_path%"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText176->Wrap( -1 );
-    m_staticText176->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
-    m_staticText176->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticText176 = new wxStaticText( m_panel39, wxID_ANY, _("%parent_path%"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText176->Wrap( -1 );
+	m_staticText176->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	m_staticText176->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    fgSizer25->Add( m_staticText176, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	fgSizer25->Add( m_staticText176, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxBoxSizer* bSizer298;
-    bSizer298 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer298;
+	bSizer298 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_staticText177 = new wxStaticText( m_panel39, wxID_ANY, _("Parent folder path"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText177->Wrap( -1 );
-    m_staticText177->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticText177 = new wxStaticText( m_panel39, wxID_ANY, _("Parent folder path"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText177->Wrap( -1 );
+	m_staticText177->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    bSizer298->Add( m_staticText177, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer298->Add( m_staticText177, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer298->Add( 0, 0, 1, 0, 5 );
+	bSizer298->Add( 0, 0, 1, 0, 5 );
 
-    m_hyperlink17 = new wxHyperlinkCtrl( m_panel39, wxID_ANY, _("Show examples"), wxT("https://freefilesync.org/manual.php?topic=external-applications"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink17->SetToolTip( _("https://freefilesync.org/manual.php?topic=external-applications") );
+	m_hyperlink17 = new wxHyperlinkCtrl( m_panel39, wxID_ANY, _("Show examples"), wxT("https://freefilesync.org/manual.php?topic=external-applications"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink17->SetToolTip( _("https://freefilesync.org/manual.php?topic=external-applications") );
 
-    bSizer298->Add( m_hyperlink17, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+	bSizer298->Add( m_hyperlink17, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
 
 
-    fgSizer25->Add( bSizer298, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	fgSizer25->Add( bSizer298, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 
 
-    fgSizer25->Add( 0, 10, 0, 0, 5 );
+	fgSizer25->Add( 0, 10, 0, 0, 5 );
 
 
-    fgSizer25->Add( 0, 0, 0, 0, 5 );
+	fgSizer25->Add( 0, 0, 0, 0, 5 );
 
 
-    bSizer289->Add( fgSizer25, 0, wxLEFT, 5 );
+	bSizer289->Add( fgSizer25, 0, wxLEFT, 5 );
 
 
-    bSizer181->Add( bSizer289, 0, wxEXPAND, 5 );
+	bSizer181->Add( bSizer289, 0, wxEXPAND, 5 );
 
-    m_gridCustomCommand = new wxGrid( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_gridCustomCommand = new wxGrid( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
 
-    // Grid
-    m_gridCustomCommand->CreateGrid( 3, 2 );
-    m_gridCustomCommand->EnableEditing( true );
-    m_gridCustomCommand->EnableGridLines( true );
-    m_gridCustomCommand->EnableDragGridSize( false );
-    m_gridCustomCommand->SetMargins( 0, 0 );
+	// Grid
+	m_gridCustomCommand->CreateGrid( 3, 2 );
+	m_gridCustomCommand->EnableEditing( true );
+	m_gridCustomCommand->EnableGridLines( true );
+	m_gridCustomCommand->EnableDragGridSize( false );
+	m_gridCustomCommand->SetMargins( 0, 0 );
 
-    // Columns
-    m_gridCustomCommand->EnableDragColMove( false );
-    m_gridCustomCommand->EnableDragColSize( true );
-    m_gridCustomCommand->SetColLabelSize( -1 );
-    m_gridCustomCommand->SetColLabelValue( 0, _("Description") );
-    m_gridCustomCommand->SetColLabelValue( 1, _("Command line") );
-    m_gridCustomCommand->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
+	// Columns
+	m_gridCustomCommand->EnableDragColMove( false );
+	m_gridCustomCommand->EnableDragColSize( true );
+	m_gridCustomCommand->SetColLabelSize( -1 );
+	m_gridCustomCommand->SetColLabelValue( 0, _("Description") );
+	m_gridCustomCommand->SetColLabelValue( 1, _("Command line") );
+	m_gridCustomCommand->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
 
-    // Rows
-    m_gridCustomCommand->EnableDragRowSize( false );
-    m_gridCustomCommand->SetRowLabelSize( 1 );
-    m_gridCustomCommand->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
+	// Rows
+	m_gridCustomCommand->EnableDragRowSize( false );
+	m_gridCustomCommand->SetRowLabelSize( 1 );
+	m_gridCustomCommand->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
 
-    // Label Appearance
+	// Label Appearance
 
-    // Cell Defaults
-    m_gridCustomCommand->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
-    bSizer181->Add( m_gridCustomCommand, 1, wxEXPAND, 5 );
+	// Cell Defaults
+	m_gridCustomCommand->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	bSizer181->Add( m_gridCustomCommand, 1, wxEXPAND, 5 );
 
 
-    bSizer166->Add( bSizer181, 1, wxEXPAND|wxALL, 10 );
+	bSizer166->Add( bSizer181, 1, wxEXPAND|wxALL, 10 );
 
 
-    m_panel39->SetSizer( bSizer166 );
-    m_panel39->Layout();
-    bSizer166->Fit( m_panel39 );
-    bSizer95->Add( m_panel39, 1, wxEXPAND, 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 );
+	m_staticline36 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer95->Add( m_staticline36, 0, wxEXPAND, 5 );
 
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	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 );
+	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 );
+	bSizerStdButtons->Add( 0, 0, 1, 0, 5 );
 
-    m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
 
-    m_buttonOkay->SetDefault();
-    m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonOkay->SetDefault();
+	m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizerStdButtons->Add( m_buttonOkay, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	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 );
+	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 );
+	bSizer95->Add( bSizerStdButtons, 0, wxEXPAND, 5 );
 
 
-    this->SetSizer( bSizer95 );
-    this->Layout();
-    bSizer95->Fit( this );
+	this->SetSizer( bSizer95 );
+	this->Layout();
+	bSizer95->Fit( this );
 
-    this->Centre( wxBOTH );
+	this->Centre( wxBOTH );
 
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( OptionsDlgGenerated::onClose ) );
-    m_buttonRestoreDialogs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::onRestoreDialogs ), NULL, this );
-    m_hyperlinkLogFolder->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( OptionsDlgGenerated::onShowLogFolder ), NULL, this );
-    m_checkBoxLogFilesMaxAge->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::onToggleLogfilesLimit ), NULL, this );
-    m_textCtrlSoundPathCompareDone->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( OptionsDlgGenerated::onChangeSoundFilePath ), NULL, this );
-    m_buttonSelectSoundCompareDone->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::onSelectSoundCompareDone ), NULL, this );
-    m_bpButtonPlayCompareDone->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::onPlayCompareDone ), NULL, this );
-    m_textCtrlSoundPathSyncDone->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( OptionsDlgGenerated::onChangeSoundFilePath ), NULL, this );
-    m_buttonSelectSoundSyncDone->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::onSelectSoundSyncDone ), NULL, this );
-    m_bpButtonPlaySyncDone->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::onPlaySyncDone ), 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_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 );
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( OptionsDlgGenerated::onClose ) );
+	m_buttonRestoreDialogs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::onRestoreDialogs ), NULL, this );
+	m_hyperlinkLogFolder->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( OptionsDlgGenerated::onShowLogFolder ), NULL, this );
+	m_checkBoxLogFilesMaxAge->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::onToggleLogfilesLimit ), NULL, this );
+	m_bpButtonPlayCompareDone->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::onPlayCompareDone ), NULL, this );
+	m_textCtrlSoundPathCompareDone->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( OptionsDlgGenerated::onChangeSoundFilePath ), NULL, this );
+	m_buttonSelectSoundCompareDone->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::onSelectSoundCompareDone ), NULL, this );
+	m_bpButtonPlaySyncDone->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::onPlaySyncDone ), NULL, this );
+	m_textCtrlSoundPathSyncDone->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( OptionsDlgGenerated::onChangeSoundFilePath ), NULL, this );
+	m_buttonSelectSoundSyncDone->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::onSelectSoundSyncDone ), 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_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()
@@ -4891,22 +4890,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 );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
 
-    wxBoxSizer* bSizer158;
-    bSizer158 = new wxBoxSizer( wxHORIZONTAL );
+	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_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 );
+	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->SetSizer( bSizer158 );
+	this->Layout();
+	bSizer158->Fit( this );
 }
 
 TooltipDlgGenerated::~TooltipDlgGenerated()
@@ -4915,61 +4914,61 @@ 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 ) );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer96;
-    bSizer96 = new wxBoxSizer( wxVERTICAL );
+	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 ) );
+	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 );
+	wxBoxSizer* bSizer98;
+	bSizer98 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_calendarFrom = new wxCalendarCtrl( m_panel35, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxCAL_SHOW_HOLIDAYS|wxCAL_SHOW_SURROUNDING_WEEKS|wxBORDER_NONE );
-    bSizer98->Add( m_calendarFrom, 0, wxTOP|wxBOTTOM|wxLEFT, 10 );
+	m_calendarFrom = new wxCalendarCtrl( m_panel35, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxCAL_SHOW_HOLIDAYS|wxCAL_SHOW_SURROUNDING_WEEKS|wxBORDER_NONE );
+	bSizer98->Add( m_calendarFrom, 0, wxTOP|wxBOTTOM|wxLEFT, 10 );
 
-    m_calendarTo = new wxCalendarCtrl( m_panel35, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxCAL_SHOW_HOLIDAYS|wxCAL_SHOW_SURROUNDING_WEEKS|wxBORDER_NONE );
-    bSizer98->Add( m_calendarTo, 0, wxALL, 10 );
+	m_calendarTo = new wxCalendarCtrl( m_panel35, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxCAL_SHOW_HOLIDAYS|wxCAL_SHOW_SURROUNDING_WEEKS|wxBORDER_NONE );
+	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_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 );
+	m_staticline21 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer96->Add( m_staticline21, 0, wxEXPAND, 5 );
 
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
 
-    m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
 
-    m_buttonOkay->SetDefault();
-    m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonOkay->SetDefault();
+	m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizerStdButtons->Add( m_buttonOkay, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	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 );
+	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 );
+	bSizer96->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
 
 
-    this->SetSizer( bSizer96 );
-    this->Layout();
-    bSizer96->Fit( this );
+	this->SetSizer( bSizer96 );
+	this->Layout();
+	bSizer96->Fit( this );
 
-    this->Centre( wxBOTH );
+	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 );
+	// 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()
@@ -4978,265 +4977,265 @@ 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 ) );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer31;
-    bSizer31 = new wxBoxSizer( wxVERTICAL );
+	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 ) );
+	m_panel41 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel41->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer174;
-    bSizer174 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer174;
+	bSizer174 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapLogoLeft = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer174->Add( m_bitmapLogoLeft, 0, wxBOTTOM, 5 );
+	m_bitmapLogoLeft = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer174->Add( m_bitmapLogoLeft, 0, wxBOTTOM, 5 );
 
-    m_staticline81 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer174->Add( m_staticline81, 0, wxEXPAND, 5 );
+	m_staticline81 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer174->Add( m_staticline81, 0, wxEXPAND, 5 );
 
-    bSizerMainSection = new wxBoxSizer( wxVERTICAL );
+	bSizerMainSection = new wxBoxSizer( wxVERTICAL );
 
-    m_staticline82 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerMainSection->Add( m_staticline82, 0, wxEXPAND, 5 );
+	m_staticline82 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerMainSection->Add( m_staticline82, 0, wxEXPAND, 5 );
 
-    m_bitmapLogo = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizerMainSection->Add( m_bitmapLogo, 0, 0, 5 );
+	m_bitmapLogo = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizerMainSection->Add( m_bitmapLogo, 0, 0, 5 );
 
-    m_staticline341 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerMainSection->Add( m_staticline341, 0, wxEXPAND, 5 );
+	m_staticline341 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerMainSection->Add( m_staticline341, 0, wxEXPAND, 5 );
 
-    m_staticTextVersion = new wxStaticText( m_panel41, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextVersion->Wrap( -1 );
-    bSizerMainSection->Add( m_staticTextVersion, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+	m_staticTextVersion = new wxStaticText( m_panel41, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextVersion->Wrap( -1 );
+	bSizerMainSection->Add( m_staticTextVersion, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
 
-    m_staticline3411 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerMainSection->Add( m_staticline3411, 0, wxEXPAND, 5 );
+	m_staticline3411 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerMainSection->Add( m_staticline3411, 0, wxEXPAND, 5 );
 
-    m_panelDonate = new wxPanel( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelDonate->SetBackgroundColour( wxColour( 153, 170, 187 ) );
+	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 );
+	wxBoxSizer* bSizer183;
+	bSizer183 = new wxBoxSizer( wxVERTICAL );
 
-    m_panel39 = new wxPanel( m_panelDonate, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel39->SetBackgroundColour( wxColour( 248, 248, 248 ) );
+	m_panel39 = new wxPanel( m_panelDonate, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel39->SetBackgroundColour( wxColour( 248, 248, 248 ) );
 
-    wxBoxSizer* bSizer184;
-    bSizer184 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer184;
+	bSizer184 = new wxBoxSizer( wxHORIZONTAL );
 
 
-    bSizer184->Add( 0, 0, 1, wxEXPAND, 5 );
+	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|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	m_bitmapDonate = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer184->Add( m_bitmapDonate, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
 
-    wxBoxSizer* bSizer178;
-    bSizer178 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer178;
+	bSizer178 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticTextDonate = new wxStaticText( m_panel39, wxID_ANY, _("If you like FreeFileSync:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextDonate->Wrap( -1 );
-    m_staticTextDonate->SetForegroundColour( wxColour( 0, 0, 0 ) );
+	m_staticTextDonate = new wxStaticText( m_panel39, wxID_ANY, _("If you like FreeFileSync:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextDonate->Wrap( -1 );
+	m_staticTextDonate->SetForegroundColour( wxColour( 0, 0, 0 ) );
 
-    bSizer178->Add( m_staticTextDonate, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	bSizer178->Add( m_staticTextDonate, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_buttonDonate = new wxButton( m_panel39, wxID_ANY, _("Support with a donation"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_buttonDonate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-    m_buttonDonate->SetToolTip( _("https://freefilesync.org/donate") );
+	m_buttonDonate = new wxButton( m_panel39, wxID_ANY, _("Support with a donation"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonDonate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonDonate->SetToolTip( _("https://freefilesync.org/donate") );
 
-    bSizer178->Add( m_buttonDonate, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL, 5 );
+	bSizer178->Add( m_buttonDonate, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-    bSizer184->Add( bSizer178, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	bSizer184->Add( bSizer178, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
 
-    bSizer184->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizer184->Add( 0, 0, 1, wxEXPAND, 5 );
 
 
-    m_panel39->SetSizer( bSizer184 );
-    m_panel39->Layout();
-    bSizer184->Fit( m_panel39 );
-    bSizer183->Add( m_panel39, 0, wxALL|wxEXPAND, 5 );
+	m_panel39->SetSizer( bSizer184 );
+	m_panel39->Layout();
+	bSizer184->Fit( m_panel39 );
+	bSizer183->Add( m_panel39, 0, wxALL|wxEXPAND, 5 );
 
 
-    m_panelDonate->SetSizer( bSizer183 );
-    m_panelDonate->Layout();
-    bSizer183->Fit( m_panelDonate );
-    bSizerMainSection->Add( m_panelDonate, 0, wxEXPAND|wxALL, 10 );
+	m_panelDonate->SetSizer( bSizer183 );
+	m_panelDonate->Layout();
+	bSizer183->Fit( m_panelDonate );
+	bSizerMainSection->Add( m_panelDonate, 0, wxEXPAND|wxALL, 10 );
 
-    m_panelThankYou = new wxPanel( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelThankYou->SetBackgroundColour( wxColour( 153, 170, 187 ) );
+	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 );
+	wxBoxSizer* bSizer1831;
+	bSizer1831 = new wxBoxSizer( wxVERTICAL );
 
-    m_panel391 = new wxPanel( m_panelThankYou, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel391->SetBackgroundColour( wxColour( 248, 248, 248 ) );
+	m_panel391 = new wxPanel( m_panelThankYou, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel391->SetBackgroundColour( wxColour( 248, 248, 248 ) );
 
-    wxBoxSizer* bSizer243;
-    bSizer243 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer243;
+	bSizer243 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer1841;
-    bSizer1841 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer1841;
+	bSizer1841 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapThanks = new wxStaticBitmap( m_panel391, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer1841->Add( m_bitmapThanks, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	m_bitmapThanks = new wxStaticBitmap( m_panel391, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer1841->Add( m_bitmapThanks, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
 
-    m_staticTextThanks = new wxStaticText( m_panel391, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextThanks->Wrap( -1 );
-    m_staticTextThanks->SetForegroundColour( wxColour( 0, 0, 0 ) );
+	m_staticTextThanks = new wxStaticText( m_panel391, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextThanks->Wrap( -1 );
+	m_staticTextThanks->SetForegroundColour( wxColour( 0, 0, 0 ) );
 
-    bSizer1841->Add( m_staticTextThanks, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer1841->Add( m_staticTextThanks, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer243->Add( bSizer1841, 1, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 5 );
+	bSizer243->Add( bSizer1841, 1, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 5 );
 
-    m_staticTextNoAutoUpdate = new wxStaticText( m_panel391, wxID_ANY, _("The auto updater was disabled by the administrator."), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextNoAutoUpdate->Wrap( -1 );
-    m_staticTextNoAutoUpdate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	m_staticTextNoAutoUpdate = new wxStaticText( m_panel391, wxID_ANY, _("The auto updater was disabled by the administrator."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextNoAutoUpdate->Wrap( -1 );
+	m_staticTextNoAutoUpdate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
 
-    bSizer243->Add( m_staticTextNoAutoUpdate, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	bSizer243->Add( m_staticTextNoAutoUpdate, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
-    m_buttonShowDonationDetails = new wxButton( m_panel391, wxID_ANY, _("Donation details"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer243->Add( m_buttonShowDonationDetails, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	m_buttonShowDonationDetails = new wxButton( m_panel391, wxID_ANY, _("Donation details"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer243->Add( m_buttonShowDonationDetails, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
 
 
-    m_panel391->SetSizer( bSizer243 );
-    m_panel391->Layout();
-    bSizer243->Fit( m_panel391 );
-    bSizer1831->Add( m_panel391, 0, wxEXPAND|wxALL, 5 );
+	m_panel391->SetSizer( bSizer243 );
+	m_panel391->Layout();
+	bSizer243->Fit( m_panel391 );
+	bSizer1831->Add( m_panel391, 0, wxEXPAND|wxALL, 5 );
 
 
-    m_panelThankYou->SetSizer( bSizer1831 );
-    m_panelThankYou->Layout();
-    bSizer1831->Fit( m_panelThankYou );
-    bSizerMainSection->Add( m_panelThankYou, 0, wxEXPAND|wxALL, 10 );
+	m_panelThankYou->SetSizer( bSizer1831 );
+	m_panelThankYou->Layout();
+	bSizer1831->Fit( m_panelThankYou );
+	bSizerMainSection->Add( m_panelThankYou, 0, wxEXPAND|wxALL, 10 );
 
-    m_staticline3412 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerMainSection->Add( m_staticline3412, 0, wxEXPAND, 5 );
+	m_staticline3412 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerMainSection->Add( m_staticline3412, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer186;
-    bSizer186 = new wxBoxSizer( wxVERTICAL );
+	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, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT, 5 );
+	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, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT, 5 );
 
-    wxBoxSizer* bSizer289;
-    bSizer289 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer289;
+	bSizer289 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bpButtonForum = new wxBitmapButton( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
-    m_bpButtonForum->SetToolTip( _("https://freefilesync.org/forum/") );
+	m_bpButtonForum = new wxBitmapButton( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+	m_bpButtonForum->SetToolTip( _("https://freefilesync.org/forum/") );
 
-    bSizer289->Add( m_bpButtonForum, 0, wxALL|wxEXPAND, 5 );
+	bSizer289->Add( m_bpButtonForum, 0, wxALL|wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer290;
-    bSizer290 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer290;
+	bSizer290 = new wxBoxSizer( wxVERTICAL );
 
-    m_bpButtonHomepage = new wxBitmapButton( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
-    m_bpButtonHomepage->SetToolTip( _("https://freefilesync.org") );
+	m_bpButtonHomepage = new wxBitmapButton( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+	m_bpButtonHomepage->SetToolTip( _("https://freefilesync.org") );
 
-    bSizer290->Add( m_bpButtonHomepage, 1, wxTOP|wxRIGHT|wxEXPAND, 5 );
+	bSizer290->Add( m_bpButtonHomepage, 1, wxTOP|wxRIGHT|wxEXPAND, 5 );
 
 
-    bSizer290->Add( 0, 5, 0, 0, 5 );
+	bSizer290->Add( 0, 5, 0, 0, 5 );
 
-    m_bpButtonEmail = new wxBitmapButton( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
-    bSizer290->Add( m_bpButtonEmail, 1, wxEXPAND|wxBOTTOM|wxRIGHT, 5 );
+	m_bpButtonEmail = new wxBitmapButton( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+	bSizer290->Add( m_bpButtonEmail, 1, wxEXPAND|wxBOTTOM|wxRIGHT, 5 );
 
 
-    bSizer289->Add( bSizer290, 0, wxEXPAND, 5 );
+	bSizer289->Add( bSizer290, 0, wxEXPAND, 5 );
 
 
-    bSizer186->Add( bSizer289, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	bSizer186->Add( bSizer289, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-    bSizerMainSection->Add( bSizer186, 0, wxALL|wxEXPAND, 5 );
+	bSizerMainSection->Add( bSizer186, 0, wxALL|wxEXPAND, 5 );
 
-    m_staticline34 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerMainSection->Add( m_staticline34, 0, wxEXPAND, 5 );
+	m_staticline34 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerMainSection->Add( m_staticline34, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer185;
-    bSizer185 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer185;
+	bSizer185 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_staticTextGpl = new wxStaticText( m_panel41, wxID_ANY, _("Published under the GNU General Public License:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextGpl->Wrap( -1 );
-    bSizer185->Add( m_staticTextGpl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	m_staticTextGpl = new wxStaticText( m_panel41, wxID_ANY, _("Published under the GNU General Public License:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextGpl->Wrap( -1 );
+	bSizer185->Add( m_staticTextGpl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    m_bpButtonGpl = new wxBitmapButton( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
-    m_bpButtonGpl->SetToolTip( _("https://www.gnu.org/licenses/gpl-3.0") );
+	m_bpButtonGpl = new wxBitmapButton( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+	m_bpButtonGpl->SetToolTip( _("https://www.gnu.org/licenses/gpl-3.0") );
 
-    bSizer185->Add( m_bpButtonGpl, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	bSizer185->Add( m_bpButtonGpl, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
 
-    bSizerMainSection->Add( bSizer185, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	bSizerMainSection->Add( bSizer185, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-    bSizer174->Add( bSizerMainSection, 0, 0, 5 );
+	bSizer174->Add( bSizerMainSection, 0, 0, 5 );
 
-    m_staticline37 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer174->Add( m_staticline37, 0, wxEXPAND, 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 );
+	wxBoxSizer* bSizer177;
+	bSizer177 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticTextThanksForLoc = new wxStaticText( m_panel41, wxID_ANY, _("Many thanks for localization:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextThanksForLoc->Wrap( -1 );
-    bSizer177->Add( m_staticTextThanksForLoc, 0, wxALL, 5 );
+	m_staticTextThanksForLoc = new wxStaticText( m_panel41, wxID_ANY, _("Many thanks for localization:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextThanksForLoc->Wrap( -1 );
+	bSizer177->Add( m_staticTextThanksForLoc, 0, wxALL, 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 = new wxScrolledWindow( m_panel41, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxVSCROLL );
+	m_scrolledWindowTranslators->SetScrollRate( 10, 10 );
+	m_scrolledWindowTranslators->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    fgSizerTranslators = new wxFlexGridSizer( 0, 2, 2, 10 );
-    fgSizerTranslators->SetFlexibleDirection( wxBOTH );
-    fgSizerTranslators->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	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, wxEXPAND|wxLEFT, 5 );
+	m_scrolledWindowTranslators->SetSizer( fgSizerTranslators );
+	m_scrolledWindowTranslators->Layout();
+	fgSizerTranslators->Fit( m_scrolledWindowTranslators );
+	bSizer177->Add( m_scrolledWindowTranslators, 1, wxEXPAND|wxLEFT, 5 );
 
 
-    bSizer174->Add( bSizer177, 0, wxEXPAND|wxLEFT, 5 );
+	bSizer174->Add( bSizer177, 0, wxEXPAND|wxLEFT, 5 );
 
 
-    m_panel41->SetSizer( bSizer174 );
-    m_panel41->Layout();
-    bSizer174->Fit( m_panel41 );
-    bSizer31->Add( m_panel41, 0, wxEXPAND, 5 );
+	m_panel41->SetSizer( bSizer174 );
+	m_panel41->Layout();
+	bSizer174->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 );
+	m_staticline36 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer31->Add( m_staticline36, 0, wxEXPAND, 5 );
 
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
 
-    m_buttonClose = new wxButton( this, wxID_OK, _("Close"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	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 );
+	m_buttonClose->SetDefault();
+	bSizerStdButtons->Add( m_buttonClose, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer31->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
+	bSizer31->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
 
 
-    this->SetSizer( bSizer31 );
-    this->Layout();
-    bSizer31->Fit( this );
+	this->SetSizer( bSizer31 );
+	this->Layout();
+	bSizer31->Fit( this );
 
-    this->Centre( wxBOTH );
+	this->Centre( wxBOTH );
 
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( AboutDlgGenerated::onClose ) );
-    m_buttonDonate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::onDonate ), NULL, this );
-    m_buttonShowDonationDetails->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::onShowDonationDetails ), NULL, this );
-    m_bpButtonForum->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::onOpenForum ), NULL, this );
-    m_bpButtonHomepage->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::onOpenHomepage ), NULL, this );
-    m_bpButtonEmail->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::onSendEmail ), NULL, this );
-    m_bpButtonGpl->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::onShowGpl ), NULL, this );
-    m_buttonClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::onOkay ), NULL, this );
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( AboutDlgGenerated::onClose ) );
+	m_buttonDonate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::onDonate ), NULL, this );
+	m_buttonShowDonationDetails->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::onShowDonationDetails ), NULL, this );
+	m_bpButtonForum->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::onOpenForum ), NULL, this );
+	m_bpButtonHomepage->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::onOpenHomepage ), NULL, this );
+	m_bpButtonEmail->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::onSendEmail ), NULL, this );
+	m_bpButtonGpl->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::onShowGpl ), NULL, this );
+	m_buttonClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::onOkay ), NULL, this );
 }
 
 AboutDlgGenerated::~AboutDlgGenerated()
@@ -5245,61 +5244,61 @@ 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 );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
 
-    wxBoxSizer* bSizer24;
-    bSizer24 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer24;
+	bSizer24 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer72;
-    bSizer72 = new wxBoxSizer( wxHORIZONTAL );
+	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_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 );
-    m_staticTextHeader->Wrap( -1 );
-    bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_VERTICAL|wxALL, 10 );
+	m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextHeader->Wrap( -1 );
+	bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_VERTICAL|wxALL, 10 );
 
 
-    bSizer72->Add( 20, 0, 0, 0, 5 );
+	bSizer72->Add( 20, 0, 0, 0, 5 );
 
 
-    bSizer24->Add( bSizer72, 0, 0, 5 );
+	bSizer24->Add( bSizer72, 0, 0, 5 );
 
-    wxBoxSizer* bSizer212;
-    bSizer212 = new wxBoxSizer( wxVERTICAL );
+	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_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 );
+	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 );
+	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 );
+	m_staticline9 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer24->Add( m_staticline9, 0, wxEXPAND, 5 );
 
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
 
-    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	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 );
+	m_buttonCancel->SetDefault();
+	bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
 
-    bSizer24->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
+	bSizer24->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
 
 
-    this->SetSizer( bSizer24 );
-    this->Layout();
-    bSizer24->Fit( this );
+	this->SetSizer( bSizer24 );
+	this->Layout();
+	bSizer24->Fit( this );
 
-    // Connect Events
-    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DownloadProgressDlgGenerated::onCancel ), NULL, this );
+	// Connect Events
+	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DownloadProgressDlgGenerated::onCancel ), NULL, this );
 }
 
 DownloadProgressDlgGenerated::~DownloadProgressDlgGenerated()
@@ -5308,178 +5307,178 @@ 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 ) );
+	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer54;
-    bSizer54 = new wxBoxSizer( wxVERTICAL );
+	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 ) );
+	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* bSizer172;
+	bSizer172 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer165;
-    bSizer165 = new wxBoxSizer( wxHORIZONTAL );
+	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 );
+	m_bitmapActivation = new wxStaticBitmap( m_panel35, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer165->Add( m_bitmapActivation, 0, wxALL, 10 );
 
-    wxBoxSizer* bSizer16;
-    bSizer16 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer16;
+	bSizer16 = new wxBoxSizer( wxVERTICAL );
 
 
-    bSizer16->Add( 0, 10, 0, 0, 5 );
+	bSizer16->Add( 0, 10, 0, 0, 5 );
 
-    m_richTextLastError = new wxRichTextCtrl( m_panel35, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY|wxBORDER_NONE|wxVSCROLL|wxWANTS_CHARS );
-    bSizer16->Add( m_richTextLastError, 1, wxEXPAND, 5 );
+	m_richTextLastError = new wxRichTextCtrl( m_panel35, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY|wxBORDER_NONE|wxVSCROLL|wxWANTS_CHARS );
+	bSizer16->Add( m_richTextLastError, 1, wxEXPAND, 5 );
 
 
-    bSizer165->Add( bSizer16, 1, wxEXPAND, 5 );
+	bSizer165->Add( bSizer16, 1, wxEXPAND, 5 );
 
 
-    bSizer172->Add( bSizer165, 1, wxEXPAND, 5 );
+	bSizer172->Add( bSizer165, 1, wxEXPAND, 5 );
 
-    m_staticline82 = new wxStaticLine( m_panel35, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer172->Add( m_staticline82, 0, wxEXPAND, 5 );
+	m_staticline82 = new wxStaticLine( m_panel35, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer172->Add( m_staticline82, 0, 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, wxALL, 10 );
+	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, wxALL, 10 );
 
 
-    m_panel35->SetSizer( bSizer172 );
-    m_panel35->Layout();
-    bSizer172->Fit( m_panel35 );
-    bSizer54->Add( m_panel35, 1, wxEXPAND, 5 );
+	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_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_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 ) );
+	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* bSizer263;
+	bSizer263 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer234;
-    bSizer234 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer234;
+	bSizer234 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_staticTextMain1 = new wxStaticText( m_panel3511, wxID_ANY, _("1."), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextMain1->Wrap( -1 );
-    bSizer234->Add( m_staticTextMain1, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticTextMain1 = new wxStaticText( m_panel3511, wxID_ANY, _("1."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextMain1->Wrap( -1 );
+	bSizer234->Add( m_staticTextMain1, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText136 = new wxStaticText( m_panel3511, wxID_ANY, _("Activate via internet now:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText136->Wrap( -1 );
-    bSizer234->Add( m_staticText136, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	m_staticText136 = new wxStaticText( m_panel3511, wxID_ANY, _("Activate via internet now:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText136->Wrap( -1 );
+	bSizer234->Add( m_staticText136, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
-    m_buttonActivateOnline = new wxButton( m_panel3511, wxID_ANY, _("Activate online"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	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(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonActivateOnline->SetDefault();
+	m_buttonActivateOnline->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizer234->Add( m_buttonActivateOnline, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer234->Add( m_buttonActivateOnline, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer263->Add( bSizer234, 0, wxEXPAND|wxALL, 10 );
+	bSizer263->Add( bSizer234, 0, wxEXPAND|wxALL, 10 );
 
 
-    m_panel3511->SetSizer( bSizer263 );
-    m_panel3511->Layout();
-    bSizer263->Fit( m_panel3511 );
-    bSizer54->Add( m_panel3511, 0, wxEXPAND, 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_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_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 ) );
+	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* bSizer266;
+	bSizer266 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer237;
-    bSizer237 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer237;
+	bSizer237 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer236;
-    bSizer236 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer236;
+	bSizer236 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_staticText175 = new wxStaticText( m_panel351, wxID_ANY, _("2."), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText175->Wrap( -1 );
-    bSizer236->Add( m_staticText175, 0, wxRIGHT|wxALIGN_BOTTOM, 5 );
+	m_staticText175 = new wxStaticText( m_panel351, wxID_ANY, _("2."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText175->Wrap( -1 );
+	bSizer236->Add( m_staticText175, 0, wxRIGHT|wxALIGN_BOTTOM, 5 );
 
-    m_staticText1361 = new wxStaticText( m_panel351, wxID_ANY, _("Retrieve an offline activation key from the following URL:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText1361->Wrap( -1 );
-    bSizer236->Add( m_staticText1361, 1, wxRIGHT|wxALIGN_BOTTOM, 5 );
+	m_staticText1361 = new wxStaticText( m_panel351, wxID_ANY, _("Retrieve an offline activation key from the following URL:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText1361->Wrap( -1 );
+	bSizer236->Add( m_staticText1361, 1, wxRIGHT|wxALIGN_BOTTOM, 5 );
 
-    m_buttonCopyUrl = new wxButton( m_panel351, wxID_ANY, _("&Copy to clipboard"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer236->Add( m_buttonCopyUrl, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_buttonCopyUrl = new wxButton( m_panel351, wxID_ANY, _("&Copy to clipboard"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer236->Add( m_buttonCopyUrl, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer237->Add( bSizer236, 0, wxEXPAND|wxBOTTOM, 5 );
+	bSizer237->Add( bSizer236, 0, wxEXPAND|wxBOTTOM, 5 );
 
-    m_richTextManualActivationUrl = new wxRichTextCtrl( m_panel351, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY|wxBORDER_NONE|wxVSCROLL|wxWANTS_CHARS );
-    bSizer237->Add( m_richTextManualActivationUrl, 0, wxEXPAND|wxBOTTOM, 5 );
+	m_richTextManualActivationUrl = new wxRichTextCtrl( m_panel351, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY|wxBORDER_NONE|wxVSCROLL|wxWANTS_CHARS );
+	bSizer237->Add( m_richTextManualActivationUrl, 0, wxEXPAND|wxBOTTOM, 5 );
 
-    wxBoxSizer* bSizer235;
-    bSizer235 = new wxBoxSizer( wxHORIZONTAL );
+	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|wxRIGHT, 5 );
+	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|wxRIGHT, 5 );
 
-    m_textCtrlOfflineActivationKey = new wxTextCtrl( m_panel351, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), wxTE_PROCESS_ENTER );
-    bSizer235->Add( m_textCtrlOfflineActivationKey, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	m_textCtrlOfflineActivationKey = new wxTextCtrl( m_panel351, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_PROCESS_ENTER );
+	bSizer235->Add( m_textCtrlOfflineActivationKey, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
-    m_buttonActivateOffline = new wxButton( m_panel351, wxID_ANY, _("Activate offline"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_buttonActivateOffline->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonActivateOffline = new wxButton( m_panel351, wxID_ANY, _("Activate offline"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_buttonActivateOffline->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizer235->Add( m_buttonActivateOffline, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer235->Add( m_buttonActivateOffline, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer237->Add( bSizer235, 0, wxEXPAND|wxTOP, 5 );
+	bSizer237->Add( bSizer235, 0, wxEXPAND|wxTOP, 5 );
 
 
-    bSizer266->Add( bSizer237, 0, wxALL|wxEXPAND, 10 );
+	bSizer266->Add( bSizer237, 0, wxALL|wxEXPAND, 10 );
 
 
-    m_panel351->SetSizer( bSizer266 );
-    m_panel351->Layout();
-    bSizer266->Fit( m_panel351 );
-    bSizer54->Add( m_panel351, 0, 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 );
+	m_staticline13 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer54->Add( m_staticline13, 0, wxEXPAND, 5 );
 
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	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 );
+	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 );
+	bSizer54->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
 
 
-    this->SetSizer( bSizer54 );
-    this->Layout();
-    bSizer54->Fit( this );
+	this->SetSizer( bSizer54 );
+	this->Layout();
+	bSizer54->Fit( this );
 
-    this->Centre( wxBOTH );
+	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 );
+	// 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()
@@ -5488,66 +5487,66 @@ ActivationDlgGenerated::~ActivationDlgGenerated()
 
 CfgHighlightDlgGenerated::CfgHighlightDlgGenerated( 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 ) );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer96;
-    bSizer96 = new wxBoxSizer( wxVERTICAL );
+	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 ) );
+	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 );
+	wxBoxSizer* bSizer98;
+	bSizer98 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer238;
-    bSizer238 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer238;
+	bSizer238 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticTextHighlight = new wxStaticText( m_panel35, wxID_ANY, _("Highlight configurations that have not been run for more than the following number of days:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextHighlight->Wrap( -1 );
-    bSizer238->Add( m_staticTextHighlight, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	m_staticTextHighlight = new wxStaticText( m_panel35, wxID_ANY, _("Highlight configurations that have not been run for more than the following number of days:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextHighlight->Wrap( -1 );
+	bSizer238->Add( m_staticTextHighlight, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 
-    m_spinCtrlOverdueDays = new wxSpinCtrl( m_panel35, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), wxSP_ARROW_KEYS, 0, 2000000000, 0 );
-    bSizer238->Add( m_spinCtrlOverdueDays, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_spinCtrlOverdueDays = new wxSpinCtrl( m_panel35, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxSP_ARROW_KEYS, 0, 2000000000, 0 );
+	bSizer238->Add( m_spinCtrlOverdueDays, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-    bSizer98->Add( bSizer238, 1, wxALL|wxEXPAND, 5 );
+	bSizer98->Add( bSizer238, 1, wxALL|wxEXPAND, 5 );
 
 
-    m_panel35->SetSizer( bSizer98 );
-    m_panel35->Layout();
-    bSizer98->Fit( m_panel35 );
-    bSizer96->Add( m_panel35, 0, 0, 5 );
+	m_panel35->SetSizer( bSizer98 );
+	m_panel35->Layout();
+	bSizer98->Fit( m_panel35 );
+	bSizer96->Add( m_panel35, 0, 0, 5 );
 
-    m_staticline21 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer96->Add( m_staticline21, 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 );
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
 
-    m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
 
-    m_buttonOkay->SetDefault();
-    m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonOkay->SetDefault();
+	m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    bSizerStdButtons->Add( m_buttonOkay, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	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 );
+	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 );
+	bSizer96->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
 
 
-    this->SetSizer( bSizer96 );
-    this->Layout();
-    bSizer96->Fit( this );
+	this->SetSizer( bSizer96 );
+	this->Layout();
+	bSizer96->Fit( this );
 
-    this->Centre( wxBOTH );
+	this->Centre( wxBOTH );
 
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CfgHighlightDlgGenerated::onClose ) );
-    m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CfgHighlightDlgGenerated::onOkay ), NULL, this );
-    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CfgHighlightDlgGenerated::onCancel ), NULL, this );
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CfgHighlightDlgGenerated::onClose ) );
+	m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CfgHighlightDlgGenerated::onOkay ), NULL, this );
+	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CfgHighlightDlgGenerated::onCancel ), NULL, this );
 }
 
 CfgHighlightDlgGenerated::~CfgHighlightDlgGenerated()
@@ -5556,112 +5555,112 @@ CfgHighlightDlgGenerated::~CfgHighlightDlgGenerated()
 
 WarnAccessRightsMissingDlgGenerated::WarnAccessRightsMissingDlgGenerated( 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 ) );
+	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer330;
-    bSizer330 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer330;
+	bSizer330 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapGrantAccess = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer330->Add( m_bitmapGrantAccess, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
+	m_bitmapGrantAccess = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer330->Add( m_bitmapGrantAccess, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
 
-    wxBoxSizer* bSizer95;
-    bSizer95 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer95;
+	bSizer95 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticTextDescr = new wxStaticText( this, wxID_ANY, _("FreeFileSync requires access rights to avoid \"Operation not permitted\" errors when synchronizing your data (e.g. Mail, Messages, Calendars)."), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_staticTextDescr->Wrap( -1 );
-    bSizer95->Add( m_staticTextDescr, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 10 );
+	m_staticTextDescr = new wxStaticText( this, wxID_ANY, _("FreeFileSync requires access rights to avoid \"Operation not permitted\" errors when synchronizing your data (e.g. Mail, Messages, Calendars)."), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_staticTextDescr->Wrap( -1 );
+	bSizer95->Add( m_staticTextDescr, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 10 );
 
-    m_staticline20 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer95->Add( m_staticline20, 0, wxEXPAND, 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 ) );
+	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* bSizer166;
+	bSizer166 = new wxBoxSizer( wxVERTICAL );
 
-    ffgSizer11 = new wxFlexGridSizer( 0, 2, 5, 5 );
-    ffgSizer11->SetFlexibleDirection( wxBOTH );
-    ffgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	ffgSizer11 = new wxFlexGridSizer( 0, 2, 5, 5 );
+	ffgSizer11->SetFlexibleDirection( wxBOTH );
+	ffgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    m_staticTextStep1 = new wxStaticText( m_panel39, wxID_ANY, _("1."), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextStep1->Wrap( -1 );
-    ffgSizer11->Add( m_staticTextStep1, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_staticTextStep1 = new wxStaticText( m_panel39, wxID_ANY, _("1."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextStep1->Wrap( -1 );
+	ffgSizer11->Add( m_staticTextStep1, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_buttonLocateBundle = new wxButton( m_panel39, wxID_ANY, _("Locate the FreeFileSync app"), wxDefaultPosition, wxDefaultSize, 0 );
-    ffgSizer11->Add( m_buttonLocateBundle, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	m_buttonLocateBundle = new wxButton( m_panel39, wxID_ANY, _("Locate the FreeFileSync app"), wxDefaultPosition, wxDefaultSize, 0 );
+	ffgSizer11->Add( m_buttonLocateBundle, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 
-    m_staticTextStep2 = new wxStaticText( m_panel39, wxID_ANY, _("2."), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextStep2->Wrap( -1 );
-    ffgSizer11->Add( m_staticTextStep2, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_staticTextStep2 = new wxStaticText( m_panel39, wxID_ANY, _("2."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextStep2->Wrap( -1 );
+	ffgSizer11->Add( m_staticTextStep2, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_buttonOpenSecurity = new wxButton( m_panel39, wxID_ANY, _("Open Security && Privacy"), wxDefaultPosition, wxDefaultSize, 0 );
-    ffgSizer11->Add( m_buttonOpenSecurity, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	m_buttonOpenSecurity = new wxButton( m_panel39, wxID_ANY, _("Open Security && Privacy"), wxDefaultPosition, wxDefaultSize, 0 );
+	ffgSizer11->Add( m_buttonOpenSecurity, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 
-    m_staticTextStep3 = new wxStaticText( m_panel39, wxID_ANY, _("3."), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextStep3->Wrap( -1 );
-    ffgSizer11->Add( m_staticTextStep3, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_staticTextStep3 = new wxStaticText( m_panel39, wxID_ANY, _("3."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextStep3->Wrap( -1 );
+	ffgSizer11->Add( m_staticTextStep3, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_staticTextAllowChanges = new wxStaticText( m_panel39, wxID_ANY, _("Click the lock to allow changes."), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextAllowChanges->Wrap( -1 );
-    ffgSizer11->Add( m_staticTextAllowChanges, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticTextAllowChanges = new wxStaticText( m_panel39, wxID_ANY, _("Click the lock to allow changes."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextAllowChanges->Wrap( -1 );
+	ffgSizer11->Add( m_staticTextAllowChanges, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticTextStep4 = new wxStaticText( m_panel39, wxID_ANY, _("4."), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextStep4->Wrap( -1 );
-    ffgSizer11->Add( m_staticTextStep4, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_staticTextStep4 = new wxStaticText( m_panel39, wxID_ANY, _("4."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextStep4->Wrap( -1 );
+	ffgSizer11->Add( m_staticTextStep4, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_staticTextGrantAccess = new wxStaticText( m_panel39, wxID_ANY, _("Drag FreeFileSync into the panel."), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextGrantAccess->Wrap( -1 );
-    ffgSizer11->Add( m_staticTextGrantAccess, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticTextGrantAccess = new wxStaticText( m_panel39, wxID_ANY, _("Drag FreeFileSync into the panel."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextGrantAccess->Wrap( -1 );
+	ffgSizer11->Add( m_staticTextGrantAccess, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer166->Add( ffgSizer11, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 10 );
+	bSizer166->Add( ffgSizer11, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 10 );
 
 
-    m_panel39->SetSizer( bSizer166 );
-    m_panel39->Layout();
-    bSizer166->Fit( m_panel39 );
-    bSizer95->Add( m_panel39, 1, wxEXPAND, 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 );
+	m_staticline36 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer95->Add( m_staticline36, 0, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer25;
-    bSizer25 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer25;
+	bSizer25 = new wxBoxSizer( wxVERTICAL );
 
-    m_checkBoxDontShowAgain = new wxCheckBox( this, wxID_ANY, _("&Don't show this dialog again"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer25->Add( m_checkBoxDontShowAgain, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+	m_checkBoxDontShowAgain = new wxCheckBox( this, wxID_ANY, _("&Don't show this dialog again"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer25->Add( m_checkBoxDontShowAgain, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
 
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
 
-    m_buttonClose = new wxButton( this, wxID_OK, _("Close"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonClose = new wxButton( this, wxID_OK, _("Close"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
 
-    m_buttonClose->SetDefault();
-    bSizerStdButtons->Add( m_buttonClose, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	m_buttonClose->SetDefault();
+	bSizerStdButtons->Add( m_buttonClose, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 
-    bSizer25->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
+	bSizer25->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
 
 
-    bSizer95->Add( bSizer25, 0, wxEXPAND, 5 );
+	bSizer95->Add( bSizer25, 0, wxEXPAND, 5 );
 
 
-    bSizer330->Add( bSizer95, 1, wxEXPAND, 5 );
+	bSizer330->Add( bSizer95, 1, wxEXPAND, 5 );
 
 
-    this->SetSizer( bSizer330 );
-    this->Layout();
-    bSizer330->Fit( this );
+	this->SetSizer( bSizer330 );
+	this->Layout();
+	bSizer330->Fit( this );
 
-    this->Centre( wxBOTH );
+	this->Centre( wxBOTH );
 
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( WarnAccessRightsMissingDlgGenerated::onClose ) );
-    m_buttonLocateBundle->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarnAccessRightsMissingDlgGenerated::onShowAppBundle ), NULL, this );
-    m_buttonOpenSecurity->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarnAccessRightsMissingDlgGenerated::onOpenSecuritySettings ), NULL, this );
-    m_checkBoxDontShowAgain->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( WarnAccessRightsMissingDlgGenerated::onCheckBoxClick ), NULL, this );
-    m_buttonClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarnAccessRightsMissingDlgGenerated::onOkay ), NULL, this );
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( WarnAccessRightsMissingDlgGenerated::onClose ) );
+	m_buttonLocateBundle->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarnAccessRightsMissingDlgGenerated::onShowAppBundle ), NULL, this );
+	m_buttonOpenSecurity->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarnAccessRightsMissingDlgGenerated::onOpenSecuritySettings ), NULL, this );
+	m_checkBoxDontShowAgain->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( WarnAccessRightsMissingDlgGenerated::onCheckBoxClick ), NULL, this );
+	m_buttonClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarnAccessRightsMissingDlgGenerated::onOkay ), NULL, this );
 }
 
 WarnAccessRightsMissingDlgGenerated::~WarnAccessRightsMissingDlgGenerated()
diff --git a/FreeFileSync/Source/ui/gui_generated.h b/FreeFileSync/Source/ui/gui_generated.h
index dc6e7c48..6b61cf0b 100644
--- a/FreeFileSync/Source/ui/gui_generated.h
+++ b/FreeFileSync/Source/ui/gui_generated.h
@@ -62,226 +62,227 @@
 ///////////////////////////////////////////////////////////////////////////////
 class MainDialogGenerated : public wxFrame
 {
-private:
-
-protected:
-    wxMenuBar* m_menubar;
-    wxMenu* m_menuFile;
-    wxMenuItem* m_menuItemNew;
-    wxMenuItem* m_menuItemLoad;
-    wxMenuItem* m_menuItemSave;
-    wxMenuItem* m_menuItemSaveAs;
-    wxMenuItem* m_menuItemSaveAsBatch;
-    wxMenuItem* m_menuItemQuit;
-    wxMenu* m_menuActions;
-    wxMenuItem* m_menuItemShowLog;
-    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_menuItemExportList;
-    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;
-    wxBitmapButton* m_bpButtonCmpConfig;
-    wxButton* m_buttonCancel;
-    zen::BitmapTextButton* m_buttonCompare;
-    wxBitmapButton* m_bpButtonCmpContext;
-    wxBitmapButton* m_bpButtonFilter;
-    wxBitmapButton* m_bpButtonFilterContext;
-    wxBitmapButton* m_bpButtonSyncConfig;
-    zen::BitmapTextButton* m_buttonSync;
-    wxBitmapButton* m_bpButtonSyncContext;
-    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;
-    fff::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_panelLog;
-    wxBoxSizer* bSizerLog;
-    wxBoxSizer* bSizer42;
-    wxFlexGridSizer* ffgSizer11;
-    wxFlexGridSizer* ffgSizer111;
-    wxFlexGridSizer* ffgSizer112;
-    wxStaticLine* m_staticline70;
-    wxPanel* m_panelConfig;
-    wxBoxSizer* bSizerConfig;
-    wxBoxSizer* bSizerCfgHistoryButtons;
-    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;
-    wxStaticLine* m_staticline81;
-    zen::Grid* m_gridCfgHistory;
-    wxPanel* m_panelViewFilter;
-    wxBoxSizer* bSizerViewFilter;
-    wxBitmapButton* m_bpButtonToggleLog;
-    zen::ToggleButton* m_bpButtonViewType;
-    zen::ToggleButton* m_bpButtonShowExcluded;
-    zen::ToggleButton* m_bpButtonShowDeleteLeft;
-    zen::ToggleButton* m_bpButtonShowUpdateLeft;
-    zen::ToggleButton* m_bpButtonShowCreateLeft;
-    zen::ToggleButton* m_bpButtonShowLeftOnly;
-    zen::ToggleButton* m_bpButtonShowLeftNewer;
-    zen::ToggleButton* m_bpButtonShowEqual;
-    zen::ToggleButton* m_bpButtonShowDoNothing;
-    zen::ToggleButton* m_bpButtonShowDifferent;
-    zen::ToggleButton* m_bpButtonShowRightNewer;
-    zen::ToggleButton* m_bpButtonShowRightOnly;
-    zen::ToggleButton* m_bpButtonShowCreateRight;
-    zen::ToggleButton* m_bpButtonShowUpdateRight;
-    zen::ToggleButton* m_bpButtonShowDeleteRight;
-    zen::ToggleButton* m_bpButtonShowConflict;
-    wxBitmapButton* m_bpButtonViewFilterContext;
-    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 onToggleLog( 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 onCompSettingsContextMouse( wxMouseEvent& event ) { event.Skip(); }
-    virtual void onCompSettingsContext( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onGlobalFilterContextMouse( wxMouseEvent& event ) { event.Skip(); }
-    virtual void onGlobalFilterContext( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onSyncSettingsContextMouse( 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 onToggleViewType( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onViewTypeContextMouse( wxMouseEvent& event ) { event.Skip(); }
-    virtual void onToggleViewButton( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onViewFilterContextMouse( wxMouseEvent& event ) { event.Skip(); }
-    virtual void onViewFilterContext( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-    wxPanel* m_panelTopLeft;
-    wxBitmapButton* m_bpButtonRemovePair;
-    fff::FolderHistoryBox* m_folderPathLeft;
-    wxBitmapButton* m_bpButtonSelectAltFolderLeft;
-    wxBitmapButton* m_bpButtonLocalCompCfg;
-    wxBitmapButton* m_bpButtonLocalFilter;
-    wxBitmapButton* m_bpButtonLocalSyncCfg;
-    wxPanel* m_panelTopRight;
-    fff::FolderHistoryBox* m_folderPathRight;
-    wxBitmapButton* m_bpButtonSelectAltFolderRight;
-    wxStaticBitmap* m_bitmapSyncResult;
-    wxStaticText* m_staticTextSyncResult;
-    wxStaticText* m_staticTextProcessed;
-    wxStaticText* m_staticTextRemaining;
-    wxPanel* m_panelItemStats;
-    wxStaticBitmap* m_bitmapItemStat;
-    wxStaticText* m_staticTextItemsProcessed;
-    wxStaticText* m_staticTextBytesProcessed;
-    wxStaticText* m_staticTextItemsRemaining;
-    wxStaticText* m_staticTextBytesRemaining;
-    wxPanel* m_panelTimeStats;
-    wxStaticBitmap* m_bitmapTimeStat;
-    wxStaticText* m_staticTextTimeElapsed;
-    wxBoxSizer* bSizerStatistics;
-    wxBoxSizer* bSizerData;
-
-    MainDialogGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("dummy"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1, -1 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
-
-    ~MainDialogGenerated();
+	private:
+
+	protected:
+		wxMenuBar* m_menubar;
+		wxMenu* m_menuFile;
+		wxMenuItem* m_menuItemNew;
+		wxMenuItem* m_menuItemLoad;
+		wxMenuItem* m_menuItemSave;
+		wxMenuItem* m_menuItemSaveAs;
+		wxMenuItem* m_menuItemSaveAsBatch;
+		wxMenuItem* m_menuItemQuit;
+		wxMenu* m_menuActions;
+		wxMenuItem* m_menuItemShowLog;
+		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_menuItemExportList;
+		wxMenuItem* m_menuItemResetLayout;
+		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;
+		wxBitmapButton* m_bpButtonCmpConfig;
+		wxButton* m_buttonCancel;
+		zen::BitmapTextButton* m_buttonCompare;
+		wxBitmapButton* m_bpButtonCmpContext;
+		wxBitmapButton* m_bpButtonFilter;
+		wxBitmapButton* m_bpButtonFilterContext;
+		wxBitmapButton* m_bpButtonSyncConfig;
+		zen::BitmapTextButton* m_buttonSync;
+		wxBitmapButton* m_bpButtonSyncContext;
+		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;
+		fff::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_panelLog;
+		wxBoxSizer* bSizerLog;
+		wxBoxSizer* bSizer42;
+		wxFlexGridSizer* ffgSizer11;
+		wxFlexGridSizer* ffgSizer111;
+		wxFlexGridSizer* ffgSizer112;
+		wxStaticLine* m_staticline70;
+		wxPanel* m_panelConfig;
+		wxBoxSizer* bSizerConfig;
+		wxBoxSizer* bSizerCfgHistoryButtons;
+		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;
+		wxStaticLine* m_staticline81;
+		zen::Grid* m_gridCfgHistory;
+		wxPanel* m_panelViewFilter;
+		wxBoxSizer* bSizerViewFilter;
+		wxBitmapButton* m_bpButtonToggleLog;
+		zen::ToggleButton* m_bpButtonViewType;
+		zen::ToggleButton* m_bpButtonShowExcluded;
+		zen::ToggleButton* m_bpButtonShowDeleteLeft;
+		zen::ToggleButton* m_bpButtonShowUpdateLeft;
+		zen::ToggleButton* m_bpButtonShowCreateLeft;
+		zen::ToggleButton* m_bpButtonShowLeftOnly;
+		zen::ToggleButton* m_bpButtonShowLeftNewer;
+		zen::ToggleButton* m_bpButtonShowEqual;
+		zen::ToggleButton* m_bpButtonShowDoNothing;
+		zen::ToggleButton* m_bpButtonShowDifferent;
+		zen::ToggleButton* m_bpButtonShowRightNewer;
+		zen::ToggleButton* m_bpButtonShowRightOnly;
+		zen::ToggleButton* m_bpButtonShowCreateRight;
+		zen::ToggleButton* m_bpButtonShowUpdateRight;
+		zen::ToggleButton* m_bpButtonShowDeleteRight;
+		zen::ToggleButton* m_bpButtonShowConflict;
+		wxBitmapButton* m_bpButtonViewFilterContext;
+		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 onToggleLog( 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 onCompSettingsContextMouse( wxMouseEvent& event ) { event.Skip(); }
+		virtual void onCompSettingsContext( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onGlobalFilterContextMouse( wxMouseEvent& event ) { event.Skip(); }
+		virtual void onGlobalFilterContext( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onSyncSettingsContextMouse( 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 onToggleViewType( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onViewTypeContextMouse( wxMouseEvent& event ) { event.Skip(); }
+		virtual void onToggleViewButton( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onViewFilterContextMouse( wxMouseEvent& event ) { event.Skip(); }
+		virtual void onViewFilterContext( wxCommandEvent& event ) { event.Skip(); }
+
+
+	public:
+		wxPanel* m_panelTopLeft;
+		wxBitmapButton* m_bpButtonRemovePair;
+		fff::FolderHistoryBox* m_folderPathLeft;
+		wxBitmapButton* m_bpButtonSelectAltFolderLeft;
+		wxBitmapButton* m_bpButtonLocalCompCfg;
+		wxBitmapButton* m_bpButtonLocalFilter;
+		wxBitmapButton* m_bpButtonLocalSyncCfg;
+		wxPanel* m_panelTopRight;
+		fff::FolderHistoryBox* m_folderPathRight;
+		wxBitmapButton* m_bpButtonSelectAltFolderRight;
+		wxStaticBitmap* m_bitmapSyncResult;
+		wxStaticText* m_staticTextSyncResult;
+		wxStaticText* m_staticTextProcessed;
+		wxStaticText* m_staticTextRemaining;
+		wxPanel* m_panelItemStats;
+		wxStaticBitmap* m_bitmapItemStat;
+		wxStaticText* m_staticTextItemsProcessed;
+		wxStaticText* m_staticTextBytesProcessed;
+		wxStaticText* m_staticTextItemsRemaining;
+		wxStaticText* m_staticTextBytesRemaining;
+		wxPanel* m_panelTimeStats;
+		wxStaticBitmap* m_bitmapTimeStat;
+		wxStaticText* m_staticTextTimeElapsed;
+		wxBoxSizer* bSizerStatistics;
+		wxBoxSizer* bSizerData;
+
+		MainDialogGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("dummy"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
+
+		~MainDialogGenerated();
 
 };
 
@@ -290,28 +291,28 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class FolderPairPanelGenerated : public wxPanel
 {
-private:
-
-protected:
-    wxButton* m_buttonSelectFolderLeft;
-    wxButton* m_buttonSelectFolderRight;
-
-public:
-    wxPanel* m_panelLeft;
-    wxBitmapButton* m_bpButtonFolderPairOptions;
-    wxBitmapButton* m_bpButtonRemovePair;
-    fff::FolderHistoryBox* m_folderPathLeft;
-    wxBitmapButton* m_bpButtonSelectAltFolderLeft;
-    wxPanel* m_panel20;
-    wxBitmapButton* m_bpButtonLocalCompCfg;
-    wxBitmapButton* m_bpButtonLocalFilter;
-    wxBitmapButton* m_bpButtonLocalSyncCfg;
-    wxPanel* m_panelRight;
-    fff::FolderHistoryBox* m_folderPathRight;
-    wxBitmapButton* m_bpButtonSelectAltFolderRight;
-
-    FolderPairPanelGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxEmptyString );
-    ~FolderPairPanelGenerated();
+	private:
+
+	protected:
+		wxButton* m_buttonSelectFolderLeft;
+		wxButton* m_buttonSelectFolderRight;
+
+	public:
+		wxPanel* m_panelLeft;
+		wxBitmapButton* m_bpButtonFolderPairOptions;
+		wxBitmapButton* m_bpButtonRemovePair;
+		fff::FolderHistoryBox* m_folderPathLeft;
+		wxBitmapButton* m_bpButtonSelectAltFolderLeft;
+		wxPanel* m_panel20;
+		wxBitmapButton* m_bpButtonLocalCompCfg;
+		wxBitmapButton* m_bpButtonLocalFilter;
+		wxBitmapButton* m_bpButtonLocalSyncCfg;
+		wxPanel* m_panelRight;
+		fff::FolderHistoryBox* m_folderPathRight;
+		wxBitmapButton* m_bpButtonSelectAltFolderRight;
+
+		FolderPairPanelGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxEmptyString );
+		~FolderPairPanelGenerated();
 
 };
 
@@ -320,228 +321,228 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class ConfigDlgGenerated : public wxDialog
 {
-private:
-
-protected:
-    wxStaticText* m_staticTextFolderPairLabel;
-    wxListBox* m_listBoxFolderPair;
-    wxNotebook* m_notebook;
-    wxPanel* m_panelCompSettingsTab;
-    wxBoxSizer* bSizerHeaderCompSettings;
-    wxStaticText* m_staticTextMainCompSettings;
-    wxCheckBox* m_checkBoxUseLocalCmpOptions;
-    wxStaticLine* m_staticlineCompHeader;
-    wxPanel* m_panelComparisonSettings;
-    wxStaticText* m_staticText91;
-    zen::ToggleButton* m_buttonByTimeSize;
-    zen::ToggleButton* m_buttonByContent;
-    zen::ToggleButton* m_buttonBySize;
-    wxStaticBitmap* m_bitmapCompVariant;
-    wxStaticText* m_staticTextCompVarDescription;
-    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_staticline331;
-    wxBoxSizer* bSizerCompMisc;
-    wxStaticBitmap* m_bitmapIgnoreErrors;
-    wxCheckBox* m_checkBoxIgnoreErrors;
-    wxCheckBox* m_checkBoxAutoRetry;
-    wxFlexGridSizer* fgSizerAutoRetry;
-    wxStaticText* m_staticText96;
-    wxStaticText* m_staticTextAutoRetryDelay;
-    wxSpinCtrl* m_spinCtrlAutoRetryCount;
-    wxSpinCtrl* m_spinCtrlAutoRetryDelay;
-    wxStaticLine* m_staticline3311;
-    wxStaticLine* m_staticline751;
-    wxBoxSizer* bSizerPerformance;
-    wxPanel* m_panel57;
-    wxStaticBitmap* m_bitmapPerf;
-    wxStaticText* m_staticText13611;
-    wxHyperlinkCtrl* m_hyperlinkPerfDeRequired;
-    wxBoxSizer* bSizer260;
-    wxStaticText* m_staticTextPerfParallelOps;
-    wxScrolledWindow* m_scrolledWindowPerf;
-    wxFlexGridSizer* fgSizerPerf;
-    wxHyperlinkCtrl* m_hyperlink1711;
-    wxPanel* m_panelFilterSettingsTab;
-    wxBoxSizer* bSizerHeaderFilterSettings;
-    wxStaticText* m_staticTextMainFilterSettings;
-    wxStaticText* m_staticTextLocalFilterSettings;
-    wxStaticLine* m_staticlineFilterHeader;
-    wxPanel* m_panelFilterSettings;
-    wxStaticBitmap* m_bitmapInclude;
-    wxStaticText* m_staticText78;
-    wxTextCtrl* m_textCtrlInclude;
-    wxStaticBitmap* m_bitmapExclude;
-    wxStaticText* m_staticText77;
-    wxHyperlinkCtrl* m_hyperlink171;
-    wxTextCtrl* m_textCtrlExclude;
-    wxStaticLine* m_staticline24;
-    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_staticline23;
-    wxStaticBitmap* m_bitmapFilterDate;
-    wxStaticText* m_staticText79;
-    wxChoice* m_choiceUnitTimespan;
-    wxSpinCtrl* m_spinCtrlTimespan;
-    wxStaticLine* m_staticline231;
-    wxButton* m_buttonClear;
-    wxPanel* m_panelSyncSettingsTab;
-    wxBoxSizer* bSizerHeaderSyncSettings;
-    wxStaticText* m_staticTextMainSyncSettings;
-    wxCheckBox* m_checkBoxUseLocalSyncOptions;
-    wxStaticLine* m_staticlineSyncHeader;
-    wxPanel* m_panelSyncSettings;
-    wxStaticText* m_staticText86;
-    zen::ToggleButton* m_buttonTwoWay;
-    zen::ToggleButton* m_buttonMirror;
-    zen::ToggleButton* m_buttonUpdate;
-    zen::ToggleButton* m_buttonCustom;
-    wxBoxSizer* bSizerSyncDirHolder;
-    wxBoxSizer* bSizerSyncDirections;
-    wxStaticText* m_staticText184;
-    wxFlexGridSizer* ffgSizer11;
-    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;
-    wxStaticText* m_staticText120;
-    wxBoxSizer* bSizerDatabase;
-    wxStaticBitmap* m_bitmapDatabase;
-    wxStaticText* m_staticText145;
-    wxStaticText* m_staticTextSyncVarDescription;
-    wxStaticLine* m_staticline431;
-    wxStaticLine* m_staticline72;
-    wxCheckBox* m_checkBoxDetectMove;
-    wxHyperlinkCtrl* m_hyperlink242;
-    wxStaticLine* m_staticline54;
-    wxBoxSizer* bSizer2361;
-    wxStaticText* m_staticText87;
-    zen::ToggleButton* m_buttonRecycler;
-    zen::ToggleButton* m_buttonPermanent;
-    zen::ToggleButton* m_buttonVersioning;
-    wxBoxSizer* bSizerVersioningHolder;
-    wxStaticBitmap* m_bitmapDeletionType;
-    wxStaticText* m_staticTextDeletionTypeDescription;
-    wxPanel* m_panelVersioning;
-    wxStaticBitmap* m_bitmapVersioning;
-    wxStaticText* m_staticText155;
-    wxHyperlinkCtrl* m_hyperlink243;
-    fff::FolderHistoryBox* m_versioningFolderPath;
-    wxButton* m_buttonSelectVersioningFolder;
-    wxStaticText* m_staticText93;
-    wxChoice* m_choiceVersioningStyle;
-    wxStaticText* m_staticTextNamingCvtPart1;
-    wxStaticText* m_staticTextNamingCvtPart2Bold;
-    wxStaticText* m_staticTextNamingCvtPart3;
-    wxStaticLine* m_staticline69;
-    wxStaticText* m_staticTextLimitVersions;
-    wxFlexGridSizer* fgSizer15;
-    wxCheckBox* m_checkBoxVersionMaxDays;
-    wxCheckBox* m_checkBoxVersionCountMin;
-    wxCheckBox* m_checkBoxVersionCountMax;
-    wxSpinCtrl* m_spinCtrlVersionMaxDays;
-    wxSpinCtrl* m_spinCtrlVersionCountMin;
-    wxSpinCtrl* m_spinCtrlVersionCountMax;
-    wxStaticLine* m_staticline582;
-    wxBoxSizer* bSizerSyncMisc;
-    wxStaticBitmap* m_bitmapEmail;
-    wxCheckBox* m_checkBoxSendEmail;
-    fff::CommandBox* m_comboBoxEmail;
-    wxBitmapButton* m_bpButtonEmailAlways;
-    wxBitmapButton* m_bpButtonEmailErrorWarning;
-    wxBitmapButton* m_bpButtonEmailErrorOnly;
-    wxHyperlinkCtrl* m_hyperlinkPerfDeRequired2;
-    wxStaticLine* m_staticline57;
-    wxPanel* m_panelLogfile;
-    wxStaticBitmap* m_bitmapLogFile;
-    wxCheckBox* m_checkBoxOverrideLogPath;
-    wxButton* m_buttonSelectLogFolder;
-    wxStaticLine* m_staticline80;
-    wxStaticText* m_staticTextPostSync;
-    fff::CommandBox* m_comboBoxPostSyncCommand;
-    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 onCompByTimeSize( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onCompByTimeSizeDouble( wxMouseEvent& event ) { event.Skip(); }
-    virtual void onCompByContent( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onCompByContentDouble( wxMouseEvent& event ) { event.Skip(); }
-    virtual void onCompBySize( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onCompBySizeDouble( wxMouseEvent& event ) { event.Skip(); }
-    virtual void onChangeCompOption( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onToggleIgnoreErrors( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onToggleAutoRetry( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onChangeFilterOption( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onFilterReset( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onToggleLocalSyncSettings( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onSyncTwoWay( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onSyncTwoWayDouble( wxMouseEvent& event ) { event.Skip(); }
-    virtual void onSyncMirror( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onSyncMirrorDouble( wxMouseEvent& event ) { event.Skip(); }
-    virtual void onSyncUpdate( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onSyncUpdateDouble( wxMouseEvent& event ) { event.Skip(); }
-    virtual void onSyncCustom( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onSyncCustomDouble( wxMouseEvent& 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 onDeletionRecycler( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onDeletionPermanent( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onDeletionVersioning( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onChanegVersioningStyle( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onToggleVersioningLimit( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onToggleMiscEmail( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onEmailAlways( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onEmailErrorWarning( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onEmailErrorOnly( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onToggleMiscOption( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onOkay( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onCancel( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-    wxStaticBitmap* m_bitmapRetryErrors;
-    wxStaticText* m_staticTextFilterDescr;
-    wxBitmapButton* m_bpButtonSelectVersioningAltFolder;
-    wxBitmapButton* m_bpButtonSelectAltLogFolder;
-    fff::FolderHistoryBox* m_logFolderPath;
-    wxChoice* m_choicePostSyncCondition;
-
-    ConfigDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Synchronization Settings"), 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_panelCompSettingsTab;
+		wxBoxSizer* bSizerHeaderCompSettings;
+		wxStaticText* m_staticTextMainCompSettings;
+		wxCheckBox* m_checkBoxUseLocalCmpOptions;
+		wxStaticLine* m_staticlineCompHeader;
+		wxPanel* m_panelComparisonSettings;
+		wxStaticText* m_staticText91;
+		zen::ToggleButton* m_buttonByTimeSize;
+		zen::ToggleButton* m_buttonByContent;
+		zen::ToggleButton* m_buttonBySize;
+		wxStaticBitmap* m_bitmapCompVariant;
+		wxStaticText* m_staticTextCompVarDescription;
+		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_staticline331;
+		wxBoxSizer* bSizerCompMisc;
+		wxStaticBitmap* m_bitmapIgnoreErrors;
+		wxCheckBox* m_checkBoxIgnoreErrors;
+		wxCheckBox* m_checkBoxAutoRetry;
+		wxFlexGridSizer* fgSizerAutoRetry;
+		wxStaticText* m_staticText96;
+		wxStaticText* m_staticTextAutoRetryDelay;
+		wxSpinCtrl* m_spinCtrlAutoRetryCount;
+		wxSpinCtrl* m_spinCtrlAutoRetryDelay;
+		wxStaticLine* m_staticline3311;
+		wxStaticLine* m_staticline751;
+		wxBoxSizer* bSizerPerformance;
+		wxPanel* m_panel57;
+		wxStaticBitmap* m_bitmapPerf;
+		wxStaticText* m_staticText13611;
+		wxHyperlinkCtrl* m_hyperlinkPerfDeRequired;
+		wxBoxSizer* bSizer260;
+		wxStaticText* m_staticTextPerfParallelOps;
+		wxScrolledWindow* m_scrolledWindowPerf;
+		wxFlexGridSizer* fgSizerPerf;
+		wxHyperlinkCtrl* m_hyperlink1711;
+		wxPanel* m_panelFilterSettingsTab;
+		wxBoxSizer* bSizerHeaderFilterSettings;
+		wxStaticText* m_staticTextMainFilterSettings;
+		wxStaticText* m_staticTextLocalFilterSettings;
+		wxStaticLine* m_staticlineFilterHeader;
+		wxPanel* m_panelFilterSettings;
+		wxStaticBitmap* m_bitmapInclude;
+		wxStaticText* m_staticText78;
+		wxTextCtrl* m_textCtrlInclude;
+		wxStaticBitmap* m_bitmapExclude;
+		wxStaticText* m_staticText77;
+		wxHyperlinkCtrl* m_hyperlink171;
+		wxTextCtrl* m_textCtrlExclude;
+		wxStaticLine* m_staticline24;
+		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_staticline23;
+		wxStaticBitmap* m_bitmapFilterDate;
+		wxStaticText* m_staticText79;
+		wxChoice* m_choiceUnitTimespan;
+		wxSpinCtrl* m_spinCtrlTimespan;
+		wxStaticLine* m_staticline231;
+		wxButton* m_buttonClear;
+		wxPanel* m_panelSyncSettingsTab;
+		wxBoxSizer* bSizerHeaderSyncSettings;
+		wxStaticText* m_staticTextMainSyncSettings;
+		wxCheckBox* m_checkBoxUseLocalSyncOptions;
+		wxStaticLine* m_staticlineSyncHeader;
+		wxPanel* m_panelSyncSettings;
+		wxStaticText* m_staticText86;
+		zen::ToggleButton* m_buttonTwoWay;
+		zen::ToggleButton* m_buttonMirror;
+		zen::ToggleButton* m_buttonUpdate;
+		zen::ToggleButton* m_buttonCustom;
+		wxBoxSizer* bSizerSyncDirHolder;
+		wxBoxSizer* bSizerSyncDirections;
+		wxStaticText* m_staticText184;
+		wxFlexGridSizer* ffgSizer11;
+		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;
+		wxStaticText* m_staticText120;
+		wxBoxSizer* bSizerDatabase;
+		wxStaticBitmap* m_bitmapDatabase;
+		wxStaticText* m_staticText145;
+		wxStaticText* m_staticTextSyncVarDescription;
+		wxStaticLine* m_staticline431;
+		wxStaticLine* m_staticline72;
+		wxCheckBox* m_checkBoxDetectMove;
+		wxHyperlinkCtrl* m_hyperlink242;
+		wxStaticLine* m_staticline54;
+		wxBoxSizer* bSizer2361;
+		wxStaticText* m_staticText87;
+		zen::ToggleButton* m_buttonRecycler;
+		zen::ToggleButton* m_buttonPermanent;
+		zen::ToggleButton* m_buttonVersioning;
+		wxBoxSizer* bSizerVersioningHolder;
+		wxStaticBitmap* m_bitmapDeletionType;
+		wxStaticText* m_staticTextDeletionTypeDescription;
+		wxPanel* m_panelVersioning;
+		wxStaticBitmap* m_bitmapVersioning;
+		wxStaticText* m_staticText155;
+		wxHyperlinkCtrl* m_hyperlink243;
+		fff::FolderHistoryBox* m_versioningFolderPath;
+		wxButton* m_buttonSelectVersioningFolder;
+		wxStaticText* m_staticText93;
+		wxChoice* m_choiceVersioningStyle;
+		wxStaticText* m_staticTextNamingCvtPart1;
+		wxStaticText* m_staticTextNamingCvtPart2Bold;
+		wxStaticText* m_staticTextNamingCvtPart3;
+		wxStaticLine* m_staticline69;
+		wxStaticText* m_staticTextLimitVersions;
+		wxFlexGridSizer* fgSizer15;
+		wxCheckBox* m_checkBoxVersionMaxDays;
+		wxCheckBox* m_checkBoxVersionCountMin;
+		wxCheckBox* m_checkBoxVersionCountMax;
+		wxSpinCtrl* m_spinCtrlVersionMaxDays;
+		wxSpinCtrl* m_spinCtrlVersionCountMin;
+		wxSpinCtrl* m_spinCtrlVersionCountMax;
+		wxStaticLine* m_staticline582;
+		wxBoxSizer* bSizerSyncMisc;
+		wxStaticBitmap* m_bitmapEmail;
+		wxCheckBox* m_checkBoxSendEmail;
+		fff::CommandBox* m_comboBoxEmail;
+		wxBitmapButton* m_bpButtonEmailAlways;
+		wxBitmapButton* m_bpButtonEmailErrorWarning;
+		wxBitmapButton* m_bpButtonEmailErrorOnly;
+		wxHyperlinkCtrl* m_hyperlinkPerfDeRequired2;
+		wxStaticLine* m_staticline57;
+		wxPanel* m_panelLogfile;
+		wxStaticBitmap* m_bitmapLogFile;
+		wxCheckBox* m_checkBoxOverrideLogPath;
+		wxButton* m_buttonSelectLogFolder;
+		wxStaticLine* m_staticline80;
+		wxStaticText* m_staticTextPostSync;
+		fff::CommandBox* m_comboBoxPostSyncCommand;
+		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 onCompByTimeSize( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onCompByTimeSizeDouble( wxMouseEvent& event ) { event.Skip(); }
+		virtual void onCompByContent( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onCompByContentDouble( wxMouseEvent& event ) { event.Skip(); }
+		virtual void onCompBySize( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onCompBySizeDouble( wxMouseEvent& event ) { event.Skip(); }
+		virtual void onChangeCompOption( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onToggleIgnoreErrors( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onToggleAutoRetry( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onChangeFilterOption( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onFilterReset( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onToggleLocalSyncSettings( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onSyncTwoWay( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onSyncTwoWayDouble( wxMouseEvent& event ) { event.Skip(); }
+		virtual void onSyncMirror( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onSyncMirrorDouble( wxMouseEvent& event ) { event.Skip(); }
+		virtual void onSyncUpdate( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onSyncUpdateDouble( wxMouseEvent& event ) { event.Skip(); }
+		virtual void onSyncCustom( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onSyncCustomDouble( wxMouseEvent& 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 onDeletionRecycler( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onDeletionPermanent( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onDeletionVersioning( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onChanegVersioningStyle( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onToggleVersioningLimit( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onToggleMiscEmail( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onEmailAlways( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onEmailErrorWarning( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onEmailErrorOnly( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onToggleMiscOption( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onOkay( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+	public:
+		wxStaticBitmap* m_bitmapRetryErrors;
+		wxStaticText* m_staticTextFilterDescr;
+		wxBitmapButton* m_bpButtonSelectVersioningAltFolder;
+		wxBitmapButton* m_bpButtonSelectAltLogFolder;
+		fff::FolderHistoryBox* m_logFolderPath;
+		wxChoice* m_choicePostSyncCondition;
+
+		ConfigDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Synchronization Settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER );
+		~ConfigDlgGenerated();
 
 };
 
@@ -550,112 +551,112 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class CloudSetupDlgGenerated : public wxDialog
 {
-private:
-
-protected:
-    wxStaticBitmap* m_bitmapCloud;
-    wxStaticText* m_staticText136;
-    wxToggleButton* m_toggleBtnGdrive;
-    wxToggleButton* m_toggleBtnSftp;
-    wxToggleButton* m_toggleBtnFtp;
-    wxStaticLine* m_staticline371;
-    wxPanel* m_panel41;
-    wxBoxSizer* bSizerGdrive;
-    wxStaticBitmap* m_bitmapGdriveUser;
-    wxStaticText* m_staticText166;
-    wxListBox* m_listBoxGdriveUsers;
-    zen::BitmapTextButton* m_buttonGdriveAddUser;
-    zen::BitmapTextButton* m_buttonGdriveRemoveUser;
-    wxStaticLine* m_staticline841;
-    wxStaticBitmap* m_bitmapGdriveDrive;
-    wxStaticText* m_staticText186;
-    wxListBox* m_listBoxGdriveDrives;
-    wxStaticLine* m_staticline73;
-    wxBoxSizer* bSizerServer;
-    wxStaticBitmap* m_bitmapServer;
-    wxStaticText* m_staticText12311;
-    wxTextCtrl* m_textCtrlServer;
-    wxStaticText* m_staticText1233;
-    wxTextCtrl* m_textCtrlPort;
-    wxStaticLine* m_staticline58;
-    wxBoxSizer* bSizerAuth;
-    wxBoxSizer* bSizerAuthInner;
-    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;
-    wxStaticBitmap* m_bitmapServerDir;
-    wxStaticText* m_staticText1232;
-    wxTextCtrl* m_textCtrlServerPath;
-    wxButton* m_buttonSelectFolder;
-    wxBoxSizer* bSizerAccessTimeout;
-    wxStaticText* m_staticTextTimeout;
-    wxSpinCtrl* m_spinCtrlTimeout;
-    wxStaticLine* m_staticline571;
-    wxStaticBitmap* m_bitmapPerf;
-    wxStaticText* m_staticText1361;
-    wxHyperlinkCtrl* m_hyperlink171;
-    wxStaticLine* m_staticline57;
-    wxPanel* m_panel411;
-    wxBoxSizer* bSizerConnectionsLabel;
-    wxStaticText* m_staticTextConnectionsLabel;
-    wxStaticText* m_staticTextConnectionsLabelSub;
-    wxSpinCtrl* m_spinCtrlConnectionCount;
-    wxStaticText* m_staticTextConnectionCountDescr;
-    wxHyperlinkCtrl* m_hyperlinkDeRequired;
-    wxStaticText* m_staticTextChannelCountSftp;
-    wxSpinCtrl* m_spinCtrlChannelCountSftp;
-    wxButton* m_buttonChannelCountSftp;
-    wxCheckBox* m_checkBoxAllowZlib;
-    wxStaticText* m_staticTextZlibDescr;
-    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 onConnectionGdrive( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onConnectionSftp( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onConnectionFtp( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onGdriveUserSelect( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onGdriveUserAdd( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onGdriveUserRemove( 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 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|wxRESIZE_BORDER );
-    ~CloudSetupDlgGenerated();
+	private:
+
+	protected:
+		wxStaticBitmap* m_bitmapCloud;
+		wxStaticText* m_staticText136;
+		wxToggleButton* m_toggleBtnGdrive;
+		wxToggleButton* m_toggleBtnSftp;
+		wxToggleButton* m_toggleBtnFtp;
+		wxStaticLine* m_staticline371;
+		wxPanel* m_panel41;
+		wxBoxSizer* bSizerGdrive;
+		wxStaticBitmap* m_bitmapGdriveUser;
+		wxStaticText* m_staticText166;
+		wxListBox* m_listBoxGdriveUsers;
+		zen::BitmapTextButton* m_buttonGdriveAddUser;
+		zen::BitmapTextButton* m_buttonGdriveRemoveUser;
+		wxStaticLine* m_staticline841;
+		wxStaticBitmap* m_bitmapGdriveDrive;
+		wxStaticText* m_staticText186;
+		wxListBox* m_listBoxGdriveDrives;
+		wxStaticLine* m_staticline73;
+		wxBoxSizer* bSizerServer;
+		wxStaticBitmap* m_bitmapServer;
+		wxStaticText* m_staticText12311;
+		wxTextCtrl* m_textCtrlServer;
+		wxStaticText* m_staticText1233;
+		wxTextCtrl* m_textCtrlPort;
+		wxStaticLine* m_staticline58;
+		wxBoxSizer* bSizerAuth;
+		wxBoxSizer* bSizerAuthInner;
+		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;
+		wxStaticBitmap* m_bitmapServerDir;
+		wxStaticText* m_staticText1232;
+		wxTextCtrl* m_textCtrlServerPath;
+		wxButton* m_buttonSelectFolder;
+		wxBoxSizer* bSizerAccessTimeout;
+		wxStaticText* m_staticTextTimeout;
+		wxSpinCtrl* m_spinCtrlTimeout;
+		wxStaticLine* m_staticline571;
+		wxStaticBitmap* m_bitmapPerf;
+		wxStaticText* m_staticText1361;
+		wxHyperlinkCtrl* m_hyperlink171;
+		wxStaticLine* m_staticline57;
+		wxPanel* m_panel411;
+		wxBoxSizer* bSizerConnectionsLabel;
+		wxStaticText* m_staticTextConnectionsLabel;
+		wxStaticText* m_staticTextConnectionsLabelSub;
+		wxSpinCtrl* m_spinCtrlConnectionCount;
+		wxStaticText* m_staticTextConnectionCountDescr;
+		wxHyperlinkCtrl* m_hyperlinkDeRequired;
+		wxStaticText* m_staticTextChannelCountSftp;
+		wxSpinCtrl* m_spinCtrlChannelCountSftp;
+		wxButton* m_buttonChannelCountSftp;
+		wxCheckBox* m_checkBoxAllowZlib;
+		wxStaticText* m_staticTextZlibDescr;
+		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 onConnectionGdrive( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onConnectionSftp( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onConnectionFtp( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onGdriveUserSelect( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onGdriveUserAdd( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onGdriveUserRemove( 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 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|wxRESIZE_BORDER );
+		~CloudSetupDlgGenerated();
 
 };
 
@@ -664,28 +665,28 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class AbstractFolderPickerGenerated : public wxDialog
 {
-private:
+	private:
 
-protected:
-    wxPanel* m_panel41;
-    wxStaticText* m_staticTextStatus;
-    wxTreeCtrl* m_treeCtrlFileSystem;
-    wxStaticLine* m_staticline12;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonOkay;
-    wxButton* m_buttonCancel;
+	protected:
+		wxPanel* m_panel41;
+		wxStaticText* m_staticTextStatus;
+		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(); }
+		// 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:
+	public:
 
-    AbstractFolderPickerGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Select a folder"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1, -1 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER );
-    ~AbstractFolderPickerGenerated();
+		AbstractFolderPickerGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Select a folder"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER );
+		~AbstractFolderPickerGenerated();
 
 };
 
@@ -694,50 +695,50 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class SyncConfirmationDlgGenerated : public wxDialog
 {
-private:
-
-protected:
-    wxStaticBitmap* m_bitmapSync;
-    wxStaticText* m_staticTextCaption;
-    wxStaticLine* m_staticline371;
-    wxPanel* m_panelStatistics;
-    wxStaticLine* m_staticline38;
-    wxStaticText* m_staticText84;
-    wxStaticText* m_staticTextSyncVar;
-    wxStaticBitmap* m_bitmapSyncVar;
-    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 = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
-    ~SyncConfirmationDlgGenerated();
+	private:
+
+	protected:
+		wxStaticBitmap* m_bitmapSync;
+		wxStaticText* m_staticTextCaption;
+		wxStaticLine* m_staticline371;
+		wxPanel* m_panelStatistics;
+		wxStaticLine* m_staticline38;
+		wxStaticText* m_staticText84;
+		wxStaticText* m_staticTextSyncVar;
+		wxStaticBitmap* m_bitmapSyncVar;
+		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 = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+		~SyncConfirmationDlgGenerated();
 
 };
 
@@ -746,40 +747,40 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class CompareProgressDlgGenerated : public wxPanel
 {
-private:
-
-protected:
-    wxStaticText* m_staticTextStatus;
-    wxFlexGridSizer* ffgSizer11;
-    wxFlexGridSizer* ffgSizer111;
-    wxFlexGridSizer* ffgSizer112;
-    wxStaticText* m_staticText1461;
-    wxStaticText* m_staticTextRetryCount;
-    wxStaticText* m_staticText146;
-    wxBoxSizer* bSizerProgressGraph;
-    wxFlexGridSizer* ffgSizer113;
-    zen::Graph2D* m_panelProgressGraph;
-
-public:
-    wxStaticText* m_staticTextProcessed;
-    wxStaticText* m_staticTextRemaining;
-    wxPanel* m_panelItemStats;
-    wxStaticBitmap* m_bitmapItemStat;
-    wxStaticText* m_staticTextItemsProcessed;
-    wxStaticText* m_staticTextBytesProcessed;
-    wxStaticText* m_staticTextItemsRemaining;
-    wxStaticText* m_staticTextBytesRemaining;
-    wxPanel* m_panelTimeStats;
-    wxStaticBitmap* m_bitmapTimeStat;
-    wxStaticText* m_staticTextTimeElapsed;
-    wxStaticText* m_staticTextTimeRemaining;
-    wxBoxSizer* bSizerErrorsRetry;
-    wxStaticBitmap* m_bitmapRetryErrors;
-    wxBoxSizer* bSizerErrorsIgnore;
-    wxStaticBitmap* m_bitmapIgnoreErrors;
-
-    CompareProgressDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1, -1 ), long style = wxBORDER_RAISED, const wxString& name = wxEmptyString );
-    ~CompareProgressDlgGenerated();
+	private:
+
+	protected:
+		wxStaticText* m_staticTextStatus;
+		wxFlexGridSizer* ffgSizer11;
+		wxFlexGridSizer* ffgSizer111;
+		wxFlexGridSizer* ffgSizer112;
+		wxStaticText* m_staticText1461;
+		wxStaticText* m_staticTextRetryCount;
+		wxStaticText* m_staticText146;
+		wxBoxSizer* bSizerProgressGraph;
+		wxFlexGridSizer* ffgSizer113;
+		zen::Graph2D* m_panelProgressGraph;
+
+	public:
+		wxStaticText* m_staticTextProcessed;
+		wxStaticText* m_staticTextRemaining;
+		wxPanel* m_panelItemStats;
+		wxStaticBitmap* m_bitmapItemStat;
+		wxStaticText* m_staticTextItemsProcessed;
+		wxStaticText* m_staticTextBytesProcessed;
+		wxStaticText* m_staticTextItemsRemaining;
+		wxStaticText* m_staticTextBytesRemaining;
+		wxPanel* m_panelTimeStats;
+		wxStaticBitmap* m_bitmapTimeStat;
+		wxStaticText* m_staticTextTimeElapsed;
+		wxStaticText* m_staticTextTimeRemaining;
+		wxBoxSizer* bSizerErrorsRetry;
+		wxStaticBitmap* m_bitmapRetryErrors;
+		wxBoxSizer* bSizerErrorsIgnore;
+		wxStaticBitmap* m_bitmapIgnoreErrors;
+
+		CompareProgressDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxBORDER_RAISED, const wxString& name = wxEmptyString );
+		~CompareProgressDlgGenerated();
 
 };
 
@@ -788,60 +789,60 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class SyncProgressPanelGenerated : public wxPanel
 {
-private:
-
-protected:
-    wxPanel* m_panel53;
-    wxBoxSizer* bSizer42;
-    wxFlexGridSizer* ffgSizer11;
-    wxFlexGridSizer* ffgSizer111;
-    wxFlexGridSizer* ffgSizer112;
-    wxStaticText* m_staticText1461;
-    wxStaticText* m_staticText146;
-    wxStaticText* m_staticText137;
-
-public:
-    wxBoxSizer* bSizerRoot;
-    wxStaticBitmap* m_bitmapStatus;
-    wxStaticText* m_staticTextPhase;
-    wxBitmapButton* m_bpButtonMinimizeToTray;
-    wxBoxSizer* bSizerStatusText;
-    wxStaticText* m_staticTextStatus;
-    wxPanel* m_panelProgress;
-    zen::Graph2D* m_panelGraphBytes;
-    wxStaticBitmap* m_bitmapGraphKeyBytes;
-    wxStaticBitmap* m_bitmapGraphKeyItems;
-    wxStaticText* m_staticTextProcessed;
-    wxStaticText* m_staticTextRemaining;
-    wxPanel* m_panelItemStats;
-    wxStaticBitmap* m_bitmapItemStat;
-    wxStaticText* m_staticTextItemsProcessed;
-    wxStaticText* m_staticTextBytesProcessed;
-    wxStaticText* m_staticTextItemsRemaining;
-    wxStaticText* m_staticTextBytesRemaining;
-    wxPanel* m_panelTimeStats;
-    wxStaticBitmap* m_bitmapTimeStat;
-    wxStaticText* m_staticTextTimeElapsed;
-    wxStaticText* m_staticTextTimeRemaining;
-    wxBoxSizer* bSizerDynSpace;
-    zen::Graph2D* m_panelGraphItems;
-    wxBoxSizer* bSizerProgressFooter;
-    wxBoxSizer* bSizerErrorsRetry;
-    wxStaticBitmap* m_bitmapRetryErrors;
-    wxStaticText* m_staticTextRetryCount;
-    wxBoxSizer* bSizerErrorsIgnore;
-    wxStaticBitmap* m_bitmapIgnoreErrors;
-    wxChoice* m_choicePostSyncAction;
-    wxNotebook* m_notebookResult;
-    wxStaticLine* m_staticlineFooter;
-    wxBoxSizer* bSizerStdButtons;
-    wxCheckBox* m_checkBoxAutoClose;
-    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, const wxString& name = wxEmptyString );
-    ~SyncProgressPanelGenerated();
+	private:
+
+	protected:
+		wxPanel* m_panel53;
+		wxBoxSizer* bSizer42;
+		wxFlexGridSizer* ffgSizer11;
+		wxFlexGridSizer* ffgSizer111;
+		wxFlexGridSizer* ffgSizer112;
+		wxStaticText* m_staticText1461;
+		wxStaticText* m_staticText146;
+		wxStaticText* m_staticText137;
+
+	public:
+		wxBoxSizer* bSizerRoot;
+		wxStaticBitmap* m_bitmapStatus;
+		wxStaticText* m_staticTextPhase;
+		wxBitmapButton* m_bpButtonMinimizeToTray;
+		wxBoxSizer* bSizerStatusText;
+		wxStaticText* m_staticTextStatus;
+		wxPanel* m_panelProgress;
+		zen::Graph2D* m_panelGraphBytes;
+		wxStaticBitmap* m_bitmapGraphKeyBytes;
+		wxStaticBitmap* m_bitmapGraphKeyItems;
+		wxStaticText* m_staticTextProcessed;
+		wxStaticText* m_staticTextRemaining;
+		wxPanel* m_panelItemStats;
+		wxStaticBitmap* m_bitmapItemStat;
+		wxStaticText* m_staticTextItemsProcessed;
+		wxStaticText* m_staticTextBytesProcessed;
+		wxStaticText* m_staticTextItemsRemaining;
+		wxStaticText* m_staticTextBytesRemaining;
+		wxPanel* m_panelTimeStats;
+		wxStaticBitmap* m_bitmapTimeStat;
+		wxStaticText* m_staticTextTimeElapsed;
+		wxStaticText* m_staticTextTimeRemaining;
+		wxBoxSizer* bSizerDynSpace;
+		zen::Graph2D* m_panelGraphItems;
+		wxBoxSizer* bSizerProgressFooter;
+		wxBoxSizer* bSizerErrorsRetry;
+		wxStaticBitmap* m_bitmapRetryErrors;
+		wxStaticText* m_staticTextRetryCount;
+		wxBoxSizer* bSizerErrorsIgnore;
+		wxStaticBitmap* m_bitmapIgnoreErrors;
+		wxChoice* m_choicePostSyncAction;
+		wxNotebook* m_notebookResult;
+		wxStaticLine* m_staticlineFooter;
+		wxBoxSizer* bSizerStdButtons;
+		wxCheckBox* m_checkBoxAutoClose;
+		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, const wxString& name = wxEmptyString );
+		~SyncProgressPanelGenerated();
 
 };
 
@@ -850,25 +851,25 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class LogPanelGenerated : public wxPanel
 {
-private:
+	private:
 
-protected:
-    zen::ToggleButton* m_bpButtonErrors;
-    zen::ToggleButton* m_bpButtonWarnings;
-    zen::ToggleButton* m_bpButtonInfo;
-    wxStaticLine* m_staticline13;
+	protected:
+		zen::ToggleButton* m_bpButtonErrors;
+		zen::ToggleButton* m_bpButtonWarnings;
+		zen::ToggleButton* m_bpButtonInfo;
+		wxStaticLine* m_staticline13;
 
-    // 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(); }
+		// 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:
-    zen::Grid* m_gridMessages;
+	public:
+		zen::Grid* m_gridMessages;
 
-    LogPanelGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
-    ~LogPanelGenerated();
+		LogPanelGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
+		~LogPanelGenerated();
 
 };
 
@@ -877,46 +878,46 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class BatchDlgGenerated : public wxDialog
 {
-private:
-
-protected:
-    wxStaticBitmap* m_bitmapBatchJob;
-    wxStaticText* m_staticTextHeader;
-    wxStaticLine* m_staticline18;
-    wxPanel* m_panel35;
-    wxStaticText* m_staticText146;
-    wxFlexGridSizer* ffgSizer11;
-    wxStaticBitmap* m_bitmapMinimizeToTray;
-    wxCheckBox* m_checkBoxRunMinimized;
-    wxStaticLine* m_staticline26;
-    wxStaticBitmap* m_bitmapIgnoreErrors;
-    wxCheckBox* m_checkBoxIgnoreErrors;
-    wxRadioButton* m_radioBtnErrorDialogShow;
-    wxRadioButton* m_radioBtnErrorDialogCancel;
-    wxStaticLine* m_staticline261;
-    wxStaticText* m_staticText137;
-    wxStaticLine* m_staticline262;
-    wxStaticLine* m_staticline25;
-    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 onToggleRunMinimized( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onToggleIgnoreErrors( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onSaveBatchJob( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onCancel( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-    wxCheckBox* m_checkBoxAutoClose;
-    wxChoice* m_choicePostSyncAction;
-
-    BatchDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Save as a 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_staticTextHeader;
+		wxStaticLine* m_staticline18;
+		wxPanel* m_panel35;
+		wxStaticText* m_staticText146;
+		wxFlexGridSizer* ffgSizer11;
+		wxStaticBitmap* m_bitmapMinimizeToTray;
+		wxCheckBox* m_checkBoxRunMinimized;
+		wxStaticLine* m_staticline26;
+		wxStaticBitmap* m_bitmapIgnoreErrors;
+		wxCheckBox* m_checkBoxIgnoreErrors;
+		wxRadioButton* m_radioBtnErrorDialogShow;
+		wxRadioButton* m_radioBtnErrorDialogCancel;
+		wxStaticLine* m_staticline261;
+		wxStaticText* m_staticText137;
+		wxStaticLine* m_staticline262;
+		wxStaticLine* m_staticline25;
+		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 onToggleRunMinimized( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onToggleIgnoreErrors( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onSaveBatchJob( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+	public:
+		wxCheckBox* m_checkBoxAutoClose;
+		wxChoice* m_choicePostSyncAction;
+
+		BatchDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Save as a Batch Job"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+		~BatchDlgGenerated();
 
 };
 
@@ -925,32 +926,32 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class DeleteDlgGenerated : public wxDialog
 {
-private:
+	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;
+	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 onOkay( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onCancel( wxCommandEvent& event ) { event.Skip(); }
+		// 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 onOkay( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onCancel( wxCommandEvent& event ) { event.Skip(); }
 
 
-public:
+	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();
+		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();
 
 };
 
@@ -959,35 +960,35 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 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 onOkay( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onCancel( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-    fff::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 onOkay( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+	public:
+		fff::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();
 
 };
 
@@ -996,99 +997,99 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class OptionsDlgGenerated : public wxDialog
 {
-private:
-
-protected:
-    wxStaticBitmap* m_bitmapSettings;
-    wxStaticText* m_staticText44;
-    wxStaticLine* m_staticline20;
-    wxPanel* m_panel39;
-    wxCheckBox* m_checkBoxFailSafe;
-    wxStaticText* m_staticText911;
-    wxStaticText* m_staticText91;
-    wxStaticText* m_staticText9111;
-    wxBoxSizer* bSizerLockedFiles;
-    wxCheckBox* m_checkBoxCopyLocked;
-    wxStaticText* m_staticText921;
-    wxStaticText* m_staticText92;
-    wxStaticText* m_staticText922;
-    wxCheckBox* m_checkBoxCopyPermissions;
-    wxStaticText* m_staticText931;
-    wxStaticText* m_staticText93;
-    wxStaticText* m_staticText932;
-    wxStaticLine* m_staticline39;
-    wxStaticBitmap* m_bitmapWarnings;
-    wxStaticText* m_staticTextResetDialogs;
-    wxButton* m_buttonRestoreDialogs;
-    wxStaticText* m_staticTextAllDialogsShown;
-    wxStaticLine* m_staticline191;
-    wxStaticBitmap* m_bitmapLogFile;
-    wxStaticText* m_staticText163;
-    wxHyperlinkCtrl* m_hyperlinkLogFolder;
-    wxStaticLine* m_staticline83;
-    wxStaticLine* m_staticline82;
-    wxCheckBox* m_checkBoxLogFilesMaxAge;
-    wxSpinCtrl* m_spinCtrlLogFilesMaxAge;
-    wxStaticLine* m_staticline81;
-    wxStaticText* m_staticText184;
-    wxRadioButton* m_radioBtnLogHtml;
-    wxRadioButton* m_radioBtnLogText;
-    wxStaticLine* m_staticline361;
-    wxStaticBitmap* m_bitmapNotificationSounds;
-    wxStaticText* m_staticText851;
-    wxFlexGridSizer* ffgSizer11;
-    wxStaticBitmap* m_bitmapCompareDone;
-    wxStaticText* m_staticText171;
-    wxTextCtrl* m_textCtrlSoundPathCompareDone;
-    wxButton* m_buttonSelectSoundCompareDone;
-    wxBitmapButton* m_bpButtonPlayCompareDone;
-    wxStaticBitmap* m_bitmapSyncDone;
-    wxStaticText* m_staticText1711;
-    wxTextCtrl* m_textCtrlSoundPathSyncDone;
-    wxButton* m_buttonSelectSoundSyncDone;
-    wxBitmapButton* m_bpButtonPlaySyncDone;
-    wxStaticLine* m_staticline3611;
-    wxStaticBitmap* m_bitmapConsole;
-    wxStaticText* m_staticText85;
-    wxBitmapButton* m_bpButtonAddRow;
-    wxBitmapButton* m_bpButtonRemoveRow;
-    wxStaticText* m_staticText174;
-    wxStaticText* m_staticText175;
-    wxStaticText* m_staticText178;
-    wxStaticText* m_staticText179;
-    wxStaticText* m_staticText189;
-    wxStaticText* m_staticText190;
-    wxStaticText* m_staticText176;
-    wxStaticText* m_staticText177;
-    wxHyperlinkCtrl* m_hyperlink17;
-    wxGrid* m_gridCustomCommand;
-    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 onRestoreDialogs( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onShowLogFolder( wxHyperlinkEvent& event ) { event.Skip(); }
-    virtual void onToggleLogfilesLimit( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onChangeSoundFilePath( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onSelectSoundCompareDone( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onPlayCompareDone( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onSelectSoundSyncDone( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onPlaySyncDone( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onAddRow( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onRemoveRow( 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_staticText911;
+		wxStaticText* m_staticText91;
+		wxStaticText* m_staticText9111;
+		wxBoxSizer* bSizerLockedFiles;
+		wxCheckBox* m_checkBoxCopyLocked;
+		wxStaticText* m_staticText921;
+		wxStaticText* m_staticText92;
+		wxStaticText* m_staticText922;
+		wxCheckBox* m_checkBoxCopyPermissions;
+		wxStaticText* m_staticText931;
+		wxStaticText* m_staticText93;
+		wxStaticText* m_staticText932;
+		wxStaticLine* m_staticline39;
+		wxStaticBitmap* m_bitmapWarnings;
+		wxStaticText* m_staticTextResetDialogs;
+		wxButton* m_buttonRestoreDialogs;
+		wxStaticText* m_staticTextAllDialogsShown;
+		wxStaticLine* m_staticline191;
+		wxStaticBitmap* m_bitmapLogFile;
+		wxStaticText* m_staticText163;
+		wxHyperlinkCtrl* m_hyperlinkLogFolder;
+		wxStaticLine* m_staticline83;
+		wxStaticLine* m_staticline82;
+		wxCheckBox* m_checkBoxLogFilesMaxAge;
+		wxSpinCtrl* m_spinCtrlLogFilesMaxAge;
+		wxStaticLine* m_staticline81;
+		wxStaticText* m_staticText184;
+		wxRadioButton* m_radioBtnLogHtml;
+		wxRadioButton* m_radioBtnLogText;
+		wxStaticLine* m_staticline361;
+		wxStaticBitmap* m_bitmapNotificationSounds;
+		wxStaticText* m_staticText851;
+		wxFlexGridSizer* ffgSizer11;
+		wxStaticBitmap* m_bitmapCompareDone;
+		wxStaticText* m_staticText171;
+		wxBitmapButton* m_bpButtonPlayCompareDone;
+		wxTextCtrl* m_textCtrlSoundPathCompareDone;
+		wxButton* m_buttonSelectSoundCompareDone;
+		wxStaticBitmap* m_bitmapSyncDone;
+		wxStaticText* m_staticText1711;
+		wxBitmapButton* m_bpButtonPlaySyncDone;
+		wxTextCtrl* m_textCtrlSoundPathSyncDone;
+		wxButton* m_buttonSelectSoundSyncDone;
+		wxStaticLine* m_staticline3611;
+		wxStaticBitmap* m_bitmapConsole;
+		wxStaticText* m_staticText85;
+		wxBitmapButton* m_bpButtonAddRow;
+		wxBitmapButton* m_bpButtonRemoveRow;
+		wxStaticText* m_staticText174;
+		wxStaticText* m_staticText175;
+		wxStaticText* m_staticText178;
+		wxStaticText* m_staticText179;
+		wxStaticText* m_staticText189;
+		wxStaticText* m_staticText190;
+		wxStaticText* m_staticText176;
+		wxStaticText* m_staticText177;
+		wxHyperlinkCtrl* m_hyperlink17;
+		wxGrid* m_gridCustomCommand;
+		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 onRestoreDialogs( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onShowLogFolder( wxHyperlinkEvent& event ) { event.Skip(); }
+		virtual void onToggleLogfilesLimit( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onPlayCompareDone( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onChangeSoundFilePath( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onSelectSoundCompareDone( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onPlaySyncDone( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onSelectSoundSyncDone( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onAddRow( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onRemoveRow( 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();
 
 };
 
@@ -1097,16 +1098,16 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class TooltipDlgGenerated : public wxDialog
 {
-private:
+	private:
 
-protected:
+	protected:
 
-public:
-    wxStaticBitmap* m_bitmapLeft;
-    wxStaticText* m_staticTextMain;
+	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();
+		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();
 
 };
 
@@ -1115,29 +1116,29 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class SelectTimespanDlgGenerated : public wxDialog
 {
-private:
+	private:
 
-protected:
-    wxPanel* m_panel35;
-    wxCalendarCtrl* m_calendarFrom;
-    wxCalendarCtrl* m_calendarTo;
-    wxStaticLine* m_staticline21;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonOkay;
-    wxButton* m_buttonCancel;
+	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(); }
+		// 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:
+	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();
+		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();
 
 };
 
@@ -1146,60 +1147,60 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class AboutDlgGenerated : public wxDialog
 {
-private:
-
-protected:
-    wxPanel* m_panel41;
-    wxStaticBitmap* m_bitmapLogoLeft;
-    wxStaticLine* m_staticline81;
-    wxBoxSizer* bSizerMainSection;
-    wxStaticLine* m_staticline82;
-    wxStaticBitmap* m_bitmapLogo;
-    wxStaticLine* m_staticline341;
-    wxStaticText* m_staticTextVersion;
-    wxStaticLine* m_staticline3411;
-    wxPanel* m_panelDonate;
-    wxPanel* m_panel39;
-    wxStaticBitmap* m_bitmapDonate;
-    wxStaticText* m_staticTextDonate;
-    wxButton* m_buttonDonate;
-    wxPanel* m_panelThankYou;
-    wxPanel* m_panel391;
-    wxStaticBitmap* m_bitmapThanks;
-    wxStaticText* m_staticTextThanks;
-    wxStaticText* m_staticTextNoAutoUpdate;
-    wxButton* m_buttonShowDonationDetails;
-    wxStaticLine* m_staticline3412;
-    wxStaticText* m_staticText94;
-    wxBitmapButton* m_bpButtonForum;
-    wxBitmapButton* m_bpButtonHomepage;
-    wxBitmapButton* m_bpButtonEmail;
-    wxStaticLine* m_staticline34;
-    wxStaticText* m_staticTextGpl;
-    wxBitmapButton* m_bpButtonGpl;
-    wxStaticLine* m_staticline37;
-    wxStaticText* m_staticTextThanksForLoc;
-    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 onDonate( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onShowDonationDetails( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onOpenForum( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onOpenHomepage( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onSendEmail( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onShowGpl( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onOkay( 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_bitmapLogoLeft;
+		wxStaticLine* m_staticline81;
+		wxBoxSizer* bSizerMainSection;
+		wxStaticLine* m_staticline82;
+		wxStaticBitmap* m_bitmapLogo;
+		wxStaticLine* m_staticline341;
+		wxStaticText* m_staticTextVersion;
+		wxStaticLine* m_staticline3411;
+		wxPanel* m_panelDonate;
+		wxPanel* m_panel39;
+		wxStaticBitmap* m_bitmapDonate;
+		wxStaticText* m_staticTextDonate;
+		wxButton* m_buttonDonate;
+		wxPanel* m_panelThankYou;
+		wxPanel* m_panel391;
+		wxStaticBitmap* m_bitmapThanks;
+		wxStaticText* m_staticTextThanks;
+		wxStaticText* m_staticTextNoAutoUpdate;
+		wxButton* m_buttonShowDonationDetails;
+		wxStaticLine* m_staticline3412;
+		wxStaticText* m_staticText94;
+		wxBitmapButton* m_bpButtonForum;
+		wxBitmapButton* m_bpButtonHomepage;
+		wxBitmapButton* m_bpButtonEmail;
+		wxStaticLine* m_staticline34;
+		wxStaticText* m_staticTextGpl;
+		wxBitmapButton* m_bpButtonGpl;
+		wxStaticLine* m_staticline37;
+		wxStaticText* m_staticTextThanksForLoc;
+		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 onDonate( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onShowDonationDetails( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onOpenForum( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onOpenHomepage( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onSendEmail( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onShowGpl( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onOkay( 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();
 
 };
 
@@ -1208,25 +1209,25 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class DownloadProgressDlgGenerated : public wxDialog
 {
-private:
+	private:
 
-protected:
-    wxStaticBitmap* m_bitmapDownloading;
-    wxStaticText* m_staticTextHeader;
-    wxGauge* m_gaugeProgress;
-    wxStaticText* m_staticTextDetails;
-    wxStaticLine* m_staticline9;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonCancel;
+	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(); }
+		// Virtual event handlers, overide them in your derived class
+		virtual void onCancel( wxCommandEvent& event ) { event.Skip(); }
 
 
-public:
+	public:
 
-    DownloadProgressDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0 );
-    ~DownloadProgressDlgGenerated();
+		DownloadProgressDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0 );
+		~DownloadProgressDlgGenerated();
 
 };
 
@@ -1235,47 +1236,47 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class ActivationDlgGenerated : public wxDialog
 {
-private:
-
-protected:
-    wxPanel* m_panel35;
-    wxStaticBitmap* m_bitmapActivation;
-    wxRichTextCtrl* m_richTextLastError;
-    wxStaticLine* m_staticline82;
-    wxStaticText* m_staticTextMain;
-    wxStaticLine* m_staticline181;
-    wxStaticLine* m_staticline18111;
-    wxPanel* m_panel3511;
-    wxStaticText* m_staticTextMain1;
-    wxStaticText* m_staticText136;
-    wxButton* m_buttonActivateOnline;
-    wxStaticLine* m_staticline181111;
-    wxStaticLine* m_staticline181112;
-    wxPanel* m_panel351;
-    wxStaticText* m_staticText175;
-    wxStaticText* m_staticText1361;
-    wxButton* m_buttonCopyUrl;
-    wxRichTextCtrl* m_richTextManualActivationUrl;
-    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 = _("dummy"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
-    ~ActivationDlgGenerated();
+	private:
+
+	protected:
+		wxPanel* m_panel35;
+		wxStaticBitmap* m_bitmapActivation;
+		wxRichTextCtrl* m_richTextLastError;
+		wxStaticLine* m_staticline82;
+		wxStaticText* m_staticTextMain;
+		wxStaticLine* m_staticline181;
+		wxStaticLine* m_staticline18111;
+		wxPanel* m_panel3511;
+		wxStaticText* m_staticTextMain1;
+		wxStaticText* m_staticText136;
+		wxButton* m_buttonActivateOnline;
+		wxStaticLine* m_staticline181111;
+		wxStaticLine* m_staticline181112;
+		wxPanel* m_panel351;
+		wxStaticText* m_staticText175;
+		wxStaticText* m_staticText1361;
+		wxButton* m_buttonCopyUrl;
+		wxRichTextCtrl* m_richTextManualActivationUrl;
+		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 = _("dummy"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+		~ActivationDlgGenerated();
 
 };
 
@@ -1284,27 +1285,27 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class CfgHighlightDlgGenerated : public wxDialog
 {
-private:
+	private:
 
-protected:
-    wxPanel* m_panel35;
-    wxStaticText* m_staticTextHighlight;
-    wxSpinCtrl* m_spinCtrlOverdueDays;
-    wxStaticLine* m_staticline21;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonOkay;
-    wxButton* m_buttonCancel;
+	protected:
+		wxPanel* m_panel35;
+		wxStaticText* m_staticTextHighlight;
+		wxSpinCtrl* m_spinCtrlOverdueDays;
+		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 onOkay( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onCancel( wxCommandEvent& event ) { event.Skip(); }
+		// Virtual event handlers, overide them in your derived class
+		virtual void onClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void onOkay( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onCancel( wxCommandEvent& event ) { event.Skip(); }
 
 
-public:
+	public:
 
-    CfgHighlightDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Highlight Configurations"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
-    ~CfgHighlightDlgGenerated();
+		CfgHighlightDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Highlight Configurations"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+		~CfgHighlightDlgGenerated();
 
 };
 
@@ -1313,39 +1314,39 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class WarnAccessRightsMissingDlgGenerated : public wxDialog
 {
-private:
-
-protected:
-    wxStaticBitmap* m_bitmapGrantAccess;
-    wxStaticText* m_staticTextDescr;
-    wxStaticLine* m_staticline20;
-    wxPanel* m_panel39;
-    wxFlexGridSizer* ffgSizer11;
-    wxStaticText* m_staticTextStep1;
-    wxButton* m_buttonLocateBundle;
-    wxStaticText* m_staticTextStep2;
-    wxButton* m_buttonOpenSecurity;
-    wxStaticText* m_staticTextStep3;
-    wxStaticText* m_staticTextAllowChanges;
-    wxStaticText* m_staticTextStep4;
-    wxStaticText* m_staticTextGrantAccess;
-    wxStaticLine* m_staticline36;
-    wxCheckBox* m_checkBoxDontShowAgain;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonClose;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void onClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void onShowAppBundle( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onOpenSecuritySettings( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onCheckBoxClick( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onOkay( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-
-    WarnAccessRightsMissingDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Grant Full Disk Access"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
-    ~WarnAccessRightsMissingDlgGenerated();
+	private:
+
+	protected:
+		wxStaticBitmap* m_bitmapGrantAccess;
+		wxStaticText* m_staticTextDescr;
+		wxStaticLine* m_staticline20;
+		wxPanel* m_panel39;
+		wxFlexGridSizer* ffgSizer11;
+		wxStaticText* m_staticTextStep1;
+		wxButton* m_buttonLocateBundle;
+		wxStaticText* m_staticTextStep2;
+		wxButton* m_buttonOpenSecurity;
+		wxStaticText* m_staticTextStep3;
+		wxStaticText* m_staticTextAllowChanges;
+		wxStaticText* m_staticTextStep4;
+		wxStaticText* m_staticTextGrantAccess;
+		wxStaticLine* m_staticline36;
+		wxCheckBox* m_checkBoxDontShowAgain;
+		wxBoxSizer* bSizerStdButtons;
+		wxButton* m_buttonClose;
+
+		// Virtual event handlers, overide them in your derived class
+		virtual void onClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void onShowAppBundle( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onOpenSecuritySettings( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onCheckBoxClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onOkay( wxCommandEvent& event ) { event.Skip(); }
+
+
+	public:
+
+		WarnAccessRightsMissingDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Grant Full Disk Access"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+		~WarnAccessRightsMissingDlgGenerated();
 
 };
 
diff --git a/FreeFileSync/Source/ui/log_panel.cpp b/FreeFileSync/Source/ui/log_panel.cpp
index cd61b9bd..a57181f3 100644
--- a/FreeFileSync/Source/ui/log_panel.cpp
+++ b/FreeFileSync/Source/ui/log_panel.cpp
@@ -462,7 +462,8 @@ void LogPanel::onMsgGridContext(GridContextMenuEvent& event)
     menu.addSeparator();
 
     menu.addItem(_("Select all") + L"\tCtrl+A", [this] { m_gridMessages->selectAllRows(GridEventPolicy::allow); }, wxNullImage, rowCount > 0);
-    menu.popup(*m_gridMessages);
+
+    menu.popup(*m_gridMessages, event.mousePos_);
 }
 
 
diff --git a/FreeFileSync/Source/ui/main_dlg.cpp b/FreeFileSync/Source/ui/main_dlg.cpp
index a5d8d1c1..2b1a39ed 100644
--- a/FreeFileSync/Source/ui/main_dlg.cpp
+++ b/FreeFileSync/Source/ui/main_dlg.cpp
@@ -701,8 +701,9 @@ MainDialog::MainDialog(const Zstring& globalConfigFilePath,
     m_menuItemSyncSettings->SetBitmap(loadImage("options_sync_sicon"));
     m_menuItemSynchronize ->SetBitmap(loadImage("start_sync_sicon"));
 
-    m_menuItemOptions     ->SetBitmap(loadImage("settings_sicon"));
-    m_menuItemFind        ->SetBitmap(loadImage("find_sicon"));
+    m_menuItemOptions    ->SetBitmap(loadImage("settings_sicon"));
+    m_menuItemFind       ->SetBitmap(loadImage("find_sicon"));
+    m_menuItemResetLayout->SetBitmap(loadImage("reset_sicon"));
 
     m_menuItemHelp ->SetBitmap(loadImage("help_sicon"));
     m_menuItemAbout->SetBitmap(loadImage("about_sicon"));
@@ -1125,7 +1126,7 @@ XmlGlobalSettings MainDialog::getGlobalCfgBeforeExit()
         cfgHistory.resize(globalSettings.mainDlg.config.histItemsMax);
 
     globalSettings.mainDlg.config.fileHistory         = std::move(cfgHistory);
-    globalSettings.mainDlg.config.topRowPos       = m_gridCfgHistory->getTopRow();
+    globalSettings.mainDlg.config.topRowPos       = m_gridCfgHistory->getRowAtWinPos(0);
     globalSettings.dpiLayouts[getDpiScalePercent()].configColumnAttribs = convertColAttributes<ColAttributesCfg>(m_gridCfgHistory->getColumnConfig());
     globalSettings.mainDlg.config.syncOverdueDays = cfggrid::getSyncOverdueDays(*m_gridCfgHistory);
 
@@ -2314,7 +2315,7 @@ void MainDialog::onTreeGridContext(GridContextMenuEvent& event)
     menu.addSeparator();
     menu.addItem(_("&Delete") + L"\t(Shift+)Del", [&] { deleteSelectedFiles(selection, selection, true /*moveToRecycler*/); }, imgTrashSmall_, haveNonEmptyItems);
 
-    menu.popup(*m_gridOverview);
+    menu.popup(*m_gridOverview, event.mousePos_);
 }
 
 
@@ -2326,7 +2327,7 @@ void MainDialog::onGridContextRim(GridContextMenuEvent& event, bool leftSide)
 
     onGridContextRim(getGridSelection(),
                      getGridSelection(true, false),
-                     getGridSelection(false, true), leftSide);
+                     getGridSelection(false, true), leftSide, event.mousePos_);
 }
 
 
@@ -2346,7 +2347,7 @@ void MainDialog::onGridGroupContextRim(GridClickEvent& event, bool leftSide)
 
             onGridContextRim({pdi.folderGroupObj},
                              selectionLeft,
-                             selectionRight, leftSide);
+                             selectionRight, leftSide, event.mousePos_);
             return; //"swallow" event => suppress default context menu handling
         }
 
@@ -2357,7 +2358,7 @@ void MainDialog::onGridGroupContextRim(GridClickEvent& event, bool leftSide)
 
 void MainDialog::onGridContextRim(const std::vector<FileSystemObject*>& selection,
                                   const std::vector<FileSystemObject*>& selectionLeft,
-                                  const std::vector<FileSystemObject*>& selectionRight, bool leftSide)
+                                  const std::vector<FileSystemObject*>& selectionRight, bool leftSide, wxPoint mousePos)
 {
     ContextMenu menu;
 
@@ -2493,7 +2494,7 @@ void MainDialog::onGridContextRim(const std::vector<FileSystemObject*>& selectio
     menu.addSeparator();
     menu.addItem(_("&Delete") + L"\t(Shift+)Del", [&] { deleteSelectedFiles(selectionLeft, selectionRight, true /*moveToRecycler*/); }, imgTrashSmall_, haveNonEmptyItemsL || haveNonEmptyItemsR);
 
-    menu.popup(leftSide ? *m_gridMainL : *m_gridMainR);
+    menu.popup(leftSide ? *m_gridMainL : *m_gridMainR, mousePos);
 }
 
 
@@ -2593,7 +2594,7 @@ void MainDialog::onGridLabelContextC(GridLabelClickEvent& event)
     const GridViewType viewType = m_bpButtonViewType->isActive() ? GridViewType::action : GridViewType::difference;
     menu.addItem(_("Difference") + (viewType != GridViewType::difference ? L"\tF11" : L""), [&] { setGridViewType(GridViewType::difference); }, greyScaleIfDisabled(loadImage("compare_sicon"   ), viewType == GridViewType::difference));
     menu.addItem(_("Action")     + (viewType != GridViewType::action     ? L"\tF11" : L""), [&] { setGridViewType(GridViewType::action    ); }, greyScaleIfDisabled(loadImage("start_sync_sicon"), viewType == GridViewType::action));
-    menu.popup(*m_gridMainC, {m_gridMainC->GetSize().x, 0});
+    menu.popup(*m_gridMainC, {event.mousePos_.x, m_gridMainC->getColumnLabelHeight()});
 }
 
 
@@ -2654,8 +2655,6 @@ void MainDialog::onGridLabelContextRim(GridLabelClickEvent& event, bool leftSide
     addFormatEntry(_("Full path"    ), ItemPathFormat::full);
 
     //----------------------------------------------------------------------------------------------
-    menu.addSeparator();
-
     auto setIconSize = [&](FileIconSize sz, bool showIcons)
     {
         globalCfg_.mainDlg.iconSize  = sz;
@@ -2663,17 +2662,6 @@ void MainDialog::onGridLabelContextRim(GridLabelClickEvent& event, bool leftSide
         filegrid::setupIcons(*m_gridMainL, *m_gridMainC, *m_gridMainR, globalCfg_.mainDlg.showIcons, convert(globalCfg_.mainDlg.iconSize));
     };
 
-    auto setDefault = [&]
-    {
-        grid.setColumnConfig(convertColAttributes(leftSide ? getFileGridDefaultColAttribsLeft() : getFileGridDefaultColAttribsRight(), getFileGridDefaultColAttribsLeft()));
-
-        const XmlGlobalSettings defaultCfg;
-        setItemPathFormat(leftSide ? defaultCfg.mainDlg.itemPathFormatLeftGrid : defaultCfg.mainDlg.itemPathFormatRightGrid);
-
-        setIconSize(defaultCfg.mainDlg.iconSize, defaultCfg.mainDlg.showIcons);
-    };
-    menu.addItem(_("&Default"), setDefault); //'&' -> reuse text from "default" buttons elsewhere
-    //----------------------------------------------------------------------------------------------
     menu.addSeparator();
     menu.addCheckBox(_("Show icons:"), [&] { setIconSize(globalCfg_.mainDlg.iconSize, !globalCfg_.mainDlg.showIcons); }, globalCfg_.mainDlg.showIcons);
 
@@ -2684,11 +2672,23 @@ void MainDialog::onGridLabelContextRim(GridLabelClickEvent& event, bool leftSide
     addSizeEntry(L"    " + _("Small" ), FileIconSize::small );
     addSizeEntry(L"    " + _("Medium"), FileIconSize::medium);
     addSizeEntry(L"    " + _("Large" ), FileIconSize::large );
+
     //----------------------------------------------------------------------------------------------
-    //    if (type == ColumnTypeRim::date)
+    auto setDefault = [&]
     {
-        menu.addSeparator();
+        grid.setColumnConfig(convertColAttributes(leftSide ? getFileGridDefaultColAttribsLeft() : getFileGridDefaultColAttribsRight(), getFileGridDefaultColAttribsLeft()));
+
+        const XmlGlobalSettings defaultCfg;
+        setItemPathFormat(leftSide ? defaultCfg.mainDlg.itemPathFormatLeftGrid : defaultCfg.mainDlg.itemPathFormatRightGrid);
+
+        setIconSize(defaultCfg.mainDlg.iconSize, defaultCfg.mainDlg.showIcons);
+    };
+
+    menu.addSeparator();
+    menu.addItem(_("&Default"), setDefault, loadImage("reset_sicon"));
 
+    //    if (type == ColumnTypeRim::date)
+    {
         auto selectTimeSpan = [&]
         {
             if (showSelectTimespanDlg(this, manualTimeSpanFrom_, manualTimeSpanTo_) == ConfirmationButton::accept)
@@ -2698,6 +2698,8 @@ void MainDialog::onGridLabelContextRim(GridLabelClickEvent& event, bool leftSide
                 updateGui();
             }
         };
+
+        menu.addSeparator();
         menu.addItem(_("Select time span..."), selectTimeSpan);
     }
     //--------------------------------------------------------------------------------------------------------
@@ -2744,7 +2746,7 @@ void MainDialog::onSetLayoutContext(wxMouseEvent& event)
 {
     ContextMenu menu;
 
-    menu.addItem(replaceCpy(_("&Reset layout"), L"&", L""), [&] { resetLayout(); }); //reuse translation from GUI builder
+    menu.addItem(replaceCpy(_("&Reset layout"), L"&", L""), [&] { resetLayout(); }, loadImage("reset_sicon"));
     //----------------------------------------------------------------------------------------
 
     bool addedSeparator = false;
@@ -3477,7 +3479,7 @@ void MainDialog::onCfgGridContext(GridContextMenuEvent& event)
             wxMemoryDC dc(bmpSquare);
             const wxColor borderCol(0xdd, 0xdd, 0xdd); //light grey
             const wxColor fillCol = col.Ok() ? col : wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
-            drawFilledRectangle(dc, wxRect(bmpSquare.GetSize()), fastFromDIP(1), borderCol, fillCol);
+            drawInsetRectangle(dc, wxRect(bmpSquare.GetSize()), fastFromDIP(1), borderCol, fillCol);
         }
         submenu.addItem(name, applyBackColor, bmpSquare.ConvertToImage(), !selectedRows.empty());
     };
@@ -3527,7 +3529,7 @@ void MainDialog::onCfgGridContext(GridContextMenuEvent& event)
     menu.addItem(_("Hide configuration") + L"\tDel", [this] { removeSelectedCfgHistoryItems(false /*deleteFromDisk*/); }, wxNullImage,    !selectedRows.empty());
     menu.addItem(_("&Delete") +      L"\tShift+Del", [this] { removeSelectedCfgHistoryItems(true  /*deleteFromDisk*/); }, imgTrashSmall_, !selectedRows.empty());
     //--------------------------------------------------------------------------------------------------------
-    menu.popup(*m_gridCfgHistory);
+    menu.popup(*m_gridCfgHistory, event.mousePos_);
     //event.Skip();
 }
 
@@ -3576,7 +3578,7 @@ void MainDialog::onCfgGridLabelContext(GridLabelClickEvent& event)
         const DpiLayout defaultLayout;
         m_gridCfgHistory->setColumnConfig(convertColAttributes(defaultLayout.configColumnAttribs, getCfgGridDefaultColAttribs()));
     };
-    menu.addItem(_("&Default"), setDefault); //'&' -> reuse text from "default" buttons elsewhere
+    menu.addItem(_("&Default"), setDefault, loadImage("reset_sicon")); //'&' -> reuse text from "default" buttons elsewhere
     //--------------------------------------------------------------------------------------------------------
     menu.addSeparator();
 
diff --git a/FreeFileSync/Source/ui/main_dlg.h b/FreeFileSync/Source/ui/main_dlg.h
index 2064d156..1934464c 100644
--- a/FreeFileSync/Source/ui/main_dlg.h
+++ b/FreeFileSync/Source/ui/main_dlg.h
@@ -146,7 +146,7 @@ private:
 
     void onGridContextRim(const std::vector<FileSystemObject*>& selection,
                           const std::vector<FileSystemObject*>& selectionLeft,
-                          const std::vector<FileSystemObject*>& selectionRight, bool leftSide);
+                          const std::vector<FileSystemObject*>& selectionRight, bool leftSide, wxPoint mousePos);
 
     void onTreeGridContext(zen::GridContextMenuEvent& event);
 
diff --git a/FreeFileSync/Source/ui/progress_indicator.cpp b/FreeFileSync/Source/ui/progress_indicator.cpp
index 48ba3b87..b5b14bb5 100644
--- a/FreeFileSync/Source/ui/progress_indicator.cpp
+++ b/FreeFileSync/Source/ui/progress_indicator.cpp
@@ -872,7 +872,7 @@ dlgSizeBuf_(dlgSize)
         wxBitmap bmpSquare(this->GetCharHeight(), this->GetCharHeight()); //seems we don't need to pass 24-bit depth here even for high-contrast color schemes
         {
             wxMemoryDC dc(bmpSquare);
-            drawFilledRectangle(dc, wxRect(bmpSquare.GetSize()), fastFromDIP(1), borderCol, fillCol);
+            drawInsetRectangle(dc, wxRect(bmpSquare.GetSize()), fastFromDIP(1), borderCol, fillCol);
         }
         return bmpSquare;
     };
diff --git a/FreeFileSync/Source/ui/small_dlgs.cpp b/FreeFileSync/Source/ui/small_dlgs.cpp
index f1d7c501..799b6cc8 100644
--- a/FreeFileSync/Source/ui/small_dlgs.cpp
+++ b/FreeFileSync/Source/ui/small_dlgs.cpp
@@ -91,14 +91,7 @@ AboutDlg::AboutDlg(wxWindow* parent) : AboutDlgGenerated(parent)
     build += SPACED_BULLET;
 
     build += LTR_MARK; //fix Arabic
-#ifndef ZEN_BUILD_ARCH
-#error include <zen/build_info.h>
-#endif
-#if ZEN_BUILD_ARCH == ZEN_ARCH_32BIT
-    build += L"32 Bit";
-#else
-    build += L"64 Bit";
-#endif
+    build += utfTo<wxString>(cpuArchName);
 
     build += SPACED_BULLET;
     build += utfTo<wxString>(formatTime(formatDateTag, getCompileTime()));
diff --git a/FreeFileSync/Source/ui/tree_grid.cpp b/FreeFileSync/Source/ui/tree_grid.cpp
index 107ab151..76d4c95b 100644
--- a/FreeFileSync/Source/ui/tree_grid.cpp
+++ b/FreeFileSync/Source/ui/tree_grid.cpp
@@ -850,7 +850,7 @@ private:
                     {
                         wxRect areaPerc(rectTmp.x, rectTmp.y + fastFromDIP(2), percentageBarWidth_, rectTmp.height - fastFromDIP(4));
                         //clear background
-                        drawFilledRectangle(dc, areaPerc, fastFromDIP(1), getColorPercentBorder(), getColorPercentBackground());
+                        drawInsetRectangle(dc, areaPerc, fastFromDIP(1), getColorPercentBorder(), getColorPercentBackground());
                         areaPerc.Deflate(fastFromDIP(1));
 
                         //inner area
@@ -1128,7 +1128,7 @@ private:
             setShowPercentage(overviewPanelShowPercentageDefault);
             grid_.setColumnConfig(convertColAttributes(getOverviewDefaultColAttribs(), getOverviewDefaultColAttribs()));
         };
-        menu.addItem(_("&Default"), setDefaultColumns); //'&' -> reuse text from "default" buttons elsewhere
+        menu.addItem(_("&Default"), setDefaultColumns, loadImage("reset_sicon")); //'&' -> reuse text from "default" buttons elsewhere
         //--------------------------------------------------------------------------------------------------------
 
         menu.popup(grid_, {event.mousePos_.x, grid_.getColumnLabelHeight()});
diff --git a/FreeFileSync/Source/version/version.h b/FreeFileSync/Source/version/version.h
index b34f3ea4..f4dd709b 100644
--- a/FreeFileSync/Source/version/version.h
+++ b/FreeFileSync/Source/version/version.h
@@ -3,7 +3,7 @@
 
 namespace fff
 {
-const char ffsVersion[] = "11.11"; //internal linkage!
+const char ffsVersion[] = "11.12"; //internal linkage!
 const char FFS_VERSION_SEPARATOR = '.';
 }
 
diff --git a/wx+/bitmap_button.h b/wx+/bitmap_button.h
index 8fe8e146..a3e6b0f6 100644
--- a/wx+/bitmap_button.h
+++ b/wx+/bitmap_button.h
@@ -101,7 +101,7 @@ wxBitmap renderSelectedButton(const wxSize& sz)
 
         const wxColor borderCol(0x79, 0xbc, 0xed); //medium blue
         const wxColor innerCol (0xcc, 0xe4, 0xf8); //light blue
-        drawFilledRectangle(dc, wxRect(bmp.GetSize()), fastFromDIP(1), borderCol, innerCol);
+        drawInsetRectangle(dc, wxRect(bmp.GetSize()), fastFromDIP(1), borderCol, innerCol);
     }
     return bmp;
 }
diff --git a/wx+/dc.h b/wx+/dc.h
index e12c04e3..c5b78119 100644
--- a/wx+/dc.h
+++ b/wx+/dc.h
@@ -37,6 +37,7 @@ void clearArea(wxDC& dc, const wxRect& rect, const wxColor& col)
     if (rect.width  > 0 && //clearArea() is surprisingly expensive
         rect.height > 0)
     {
+        assert(col.IsSolid());
         //wxDC::DrawRectangle() just widens inner area if wxTRANSPARENT_PEN is used!
         //bonus: wxTRANSPARENT_PEN is about 2x faster than redundantly drawing with col!
         wxDCPenChanger   areaPen  (dc, *wxTRANSPARENT_PEN);
@@ -48,16 +49,37 @@ void clearArea(wxDC& dc, const wxRect& rect, const wxColor& col)
 
 //properly draw rectangle respecting high DPI (and avoiding wxPen position fuzzyness)
 inline
-void drawFilledRectangle(wxDC& dc, wxRect rect, int borderWidth, const wxColor& borderCol, const wxColor& innerCol)
+void drawInsetRectangle(wxDC& dc, wxRect rect, int borderWidth, const wxColor& borderCol, const wxColor& innerCol)
 {
-    assert(borderCol.IsSolid() && innerCol.IsSolid());
-    wxDCPenChanger   rectPen  (dc, *wxTRANSPARENT_PEN);
-    wxDCBrushChanger rectBrush(dc, borderCol);
-    dc.DrawRectangle(rect);
-    rect.Deflate(borderWidth); //attention, more wxWidgets design mistakes: behavior of wxRect::Deflate depends on object being const/non-const!!!
-
-    dc.SetBrush(innerCol);
-    dc.DrawRectangle(rect);
+    if (rect.width  > 0 &&
+        rect.height > 0)
+    {
+        assert(borderCol.IsSolid() && innerCol.IsSolid());
+        wxDCPenChanger   rectPen  (dc, *wxTRANSPARENT_PEN);
+        wxDCBrushChanger rectBrush(dc, borderCol);
+        dc.DrawRectangle(rect);
+        rect.Deflate(borderWidth); //attention, more wxWidgets design mistakes: behavior of wxRect::Deflate depends on object being const/non-const!!!
+
+        dc.SetBrush(innerCol);
+        dc.DrawRectangle(rect);
+    }
+}
+
+
+inline
+void drawInsetRectangle(wxDC& dc, const wxRect& rect, int borderWidth, const wxColor& col)
+{
+    if (rect.width  > 0 &&
+        rect.height > 0)
+    {
+        assert(col.IsSolid());
+        wxDCPenChanger   areaPen  (dc, *wxTRANSPARENT_PEN);
+        wxDCBrushChanger areaBrush(dc, col);
+        dc.DrawRectangle(rect.GetTopLeft(),                                         {borderWidth, rect.height});
+        dc.DrawRectangle(rect.GetTopLeft() + wxPoint{rect.width - borderWidth, 0},  {borderWidth, rect.height});
+        dc.DrawRectangle(rect.GetTopLeft(),                                         {rect.width, borderWidth});
+        dc.DrawRectangle(rect.GetTopLeft() + wxPoint{0, rect.height - borderWidth}, {rect.width, borderWidth});
+    }
 }
 
 
diff --git a/wx+/graph.cpp b/wx+/graph.cpp
index 8dec2074..0f9cffef 100644
--- a/wx+/graph.cpp
+++ b/wx+/graph.cpp
@@ -576,7 +576,7 @@ void Graph2D::render(wxDC& dc) const
     assert(attr_.yLabelpos == YLabelPos::none || attr_.labelFmtY);
 
     //paint graph background (excluding label area)
-    drawFilledRectangle(dc, graphArea, fastFromDIP(1), getBorderColor(), attr_.colorBack);
+    drawInsetRectangle(dc, graphArea, fastFromDIP(1), getBorderColor(), attr_.colorBack);
     graphArea.Deflate(fastFromDIP(1));
 
     //set label areas respecting graph area border!
diff --git a/wx+/grid.cpp b/wx+/grid.cpp
index fb9aacbc..80e9d1d6 100644
--- a/wx+/grid.cpp
+++ b/wx+/grid.cpp
@@ -409,7 +409,7 @@ private:
 class Grid::CornerWin : public SubWindow
 {
 public:
-    CornerWin(Grid& parent) : SubWindow(parent) {}
+    explicit CornerWin(Grid& parent) : SubWindow(parent) {}
 
 private:
     bool AcceptsFocus() const override { return false; }
@@ -447,7 +447,7 @@ private:
 class Grid::RowLabelWin : public SubWindow
 {
 public:
-    RowLabelWin(Grid& parent) :
+    explicit RowLabelWin(Grid& parent) :
         SubWindow(parent),
         rowHeight_(parent.GetCharHeight() + 2 + 1) {} //default height; don't call any functions on "parent" other than those from wxWindow during construction!
     //2 for some more space, 1 for bottom border (gives 15 + 2 + 1 on Windows, 17 + 2 + 1 on Ubuntu)
@@ -468,12 +468,11 @@ public:
 
     ptrdiff_t getRowAtPos(ptrdiff_t posY) const //returns < 0 on invalid input, else row number within: [0, rowCount]; rowCount if out of range
     {
-        if (posY >= 0 && rowHeight_ > 0)
-        {
-            const size_t row = posY / rowHeight_;
-            return std::min(row, refParent().getRowCount());
-        }
-        return -1;
+        if (posY < 0)
+            return -1;
+
+        const size_t row = posY / rowHeight_;
+        return std::min(row, refParent().getRowCount());
     }
 
     int getRowHeight() const { return rowHeight_; } //guarantees to return size >= 1 !
@@ -488,15 +487,6 @@ public:
         return wxRect();
     }
 
-    std::pair<ptrdiff_t, ptrdiff_t> getRowsOnClient(const wxRect& clientRect) const //returns range [begin, end)
-    {
-        const int yFrom = refParent().CalcUnscrolledPosition(clientRect.GetTopLeft    ()).y;
-        const int yTo   = refParent().CalcUnscrolledPosition(clientRect.GetBottomRight()).y;
-
-        return {std::max(yFrom / rowHeight_, 0),
-                std::min<ptrdiff_t>((yTo  / rowHeight_) + 1, refParent().getRowCount())};
-    }
-
 private:
     static std::wstring formatRowNum(size_t row) { return formatNumber(row + 1); } //convert number to std::wstring including thousands separator
 
@@ -510,8 +500,8 @@ private:
 
         dc.SetFont(GetFont()); //harmonize with RowLabelWin::getBestWidth()!
 
-        auto rowRange = getRowsOnClient(rect); //returns range [begin, end)
-        for (auto row = rowRange.first; row < rowRange.second; ++row)
+        const auto& [rowFirst, rowLast] = refParent().getVisibleRows(rect);
+        for (auto row = rowFirst; row < rowLast; ++row)
         {
             wxRect rectRowLabel = getRowLabelArea(row); //returns empty rect if row not found
             if (rectRowLabel.height > 0)
@@ -631,7 +621,7 @@ private:
 class Grid::ColLabelWin : public SubWindow
 {
 public:
-    ColLabelWin(Grid& parent) : SubWindow(parent)
+    explicit ColLabelWin(Grid& parent) : SubWindow(parent)
     {
         //coordinate with ColLabelWin::render():
         wxFont labelFont = GetFont();
@@ -915,9 +905,8 @@ private:
 
         const std::wstring toolTip = [&]
         {
-            const wxPoint absPos = refParent().CalcUnscrolledPosition(clientPos);
-            const ColumnType colType = refParent().getColumnAtPos(absPos.x).colType; //returns ColumnType::none if no column at x position!
-            if (colType != ColumnType::none)
+            if (const ColumnType colType = refParent().getColumnAtWinPos(clientPos.x).colType; //returns ColumnType::none if no column at x position!
+                colType != ColumnType::none)
                 if (auto prov = refParent().getDataProvider())
                     return prov->getToolTip(colType);
             return std::wstring();
@@ -1021,9 +1010,9 @@ private:
 
             const wxPoint gridAreaTL(refParent().CalcScrolledPosition(wxPoint(0, 0))); //client coordinates
             const int rowHeight = rowLabelWin_.getRowHeight();
-            const auto rowRange = rowLabelWin_.getRowsOnClient(rect); //returns range [begin, end)
+            const auto& [rowFirst, rowLast] = refParent().getVisibleRows(rect);
 
-            for (auto row = rowRange.first; row < rowRange.second; ++row)
+            for (auto row = rowFirst; row < rowLast; ++row)
             {
                 //draw background lines
                 const wxRect rowRect(gridAreaTL + wxPoint(0, row * rowHeight), wxSize(totalRowWidth, rowHeight));
@@ -1089,9 +1078,8 @@ private:
         {
             const wxPoint   mousePos = GetPosition() + event.GetPosition();
             const ptrdiff_t rowCount = refParent().getRowCount();
-            const wxPoint     absPos = refParent().CalcUnscrolledPosition(event.GetPosition());
-            const ptrdiff_t      row = rowLabelWin_.getRowAtPos(absPos.y); //return -1 for invalid position; >= rowCount if out of range
-            const ColumnPosInfo  cpi = refParent().getColumnAtPos(absPos.x); //returns ColumnType::none if no column at x position!
+            const ptrdiff_t      row = refParent().getRowAtWinPos   (event.GetPosition().y); //return -1 for invalid position; >= rowCount if out of range
+            const ColumnPosInfo  cpi = refParent().getColumnAtWinPos(event.GetPosition().x); //returns ColumnType::none if no column at x position!
             const HoverArea rowHover = [&]
             {
                 if (0 <= row && row < rowCount && cpi.colType != ColumnType::none)
@@ -1124,9 +1112,8 @@ private:
 
             const wxPoint   mousePos = GetPosition() + event.GetPosition();
             const ptrdiff_t rowCount = refParent().getRowCount();
-            const wxPoint     absPos = refParent().CalcUnscrolledPosition(event.GetPosition());
-            const ptrdiff_t      row = rowLabelWin_.getRowAtPos(absPos.y); //return -1 for invalid position; >= rowCount if out of range
-            const ColumnPosInfo  cpi = refParent().getColumnAtPos(absPos.x); //returns ColumnType::none if no column at x position!
+            const ptrdiff_t      row = refParent().getRowAtWinPos   (event.GetPosition().y); //return -1 for invalid position; >= rowCount if out of range
+            const ColumnPosInfo  cpi = refParent().getColumnAtWinPos(event.GetPosition().x); //returns ColumnType::none if no column at x position!
             const HoverArea rowHover = [&]
             {
                 if (0 <= row && row < rowCount && cpi.colType != ColumnType::none)
@@ -1196,7 +1183,7 @@ private:
                     selectionAnchor_ = cursorRow_;
             }
             //slight deviation from Explorer: change cursor while dragging mouse! -> unify behavior with shift + direction keys
-
+            const wxPoint mousePos = GetPosition() + event.GetPosition();
             const size_t            rowFrom = activeSelection_->getStartRow();
             const size_t              rowTo = activeSelection_->getCurrentRow();
             const bool             positive = activeSelection_->isPositiveSelect();
@@ -1210,7 +1197,7 @@ private:
             refParent().selectRange2(rowFirst, rowLast, positive, &mouseClick, GridEventPolicy::allow);
 
             if (mouseClick.GetEventType() == EVENT_GRID_MOUSE_RIGHT_DOWN)
-                sendEventToParent(GridContextMenuEvent(mouseClick.mousePos_));
+                sendEventToParent(GridContextMenuEvent(mousePos)); //... *not* mouseClick.mousePos_
         }
 #if 0
         if (!event.RightUp())
@@ -1219,9 +1206,8 @@ private:
                 //this one may point to row which is not in visible area!
                 const wxPoint   mousePos = GetPosition() + event.GetPosition();
                 const ptrdiff_t rowCount = refParent().getRowCount();
-                const wxPoint     absPos = refParent().CalcUnscrolledPosition(event.GetPosition());
-                const ptrdiff_t      row = rowLabelWin_.getRowAtPos(absPos.y); //return -1 for invalid position; >= rowCount if out of range
-                const ColumnPosInfo  cpi = refParent().getColumnAtPos(absPos.x); //returns ColumnType::none if no column at x position!
+                const ptrdiff_t      row = refParent().getRowAtWinPos   (event.GetPosition().y); //return -1 for invalid position; >= rowCount if out of range
+                const ColumnPosInfo  cpi = refParent().getColumnAtWinPos(event.GetPosition().x); //returns ColumnType::none if no column at x position!
                 const HoverArea rowHover = [&]
                 {
                     if (0 <= row && row < rowCount && cpi.colType != ColumnType::none)
@@ -1254,9 +1240,8 @@ private:
         if (auto prov = refParent().getDataProvider())
         {
             const ptrdiff_t rowCount = refParent().getRowCount();
-            const wxPoint     absPos = refParent().CalcUnscrolledPosition(clientPos);
-            const ptrdiff_t      row = rowLabelWin_.getRowAtPos(absPos.y); //return -1 for invalid position; >= rowCount if out of range
-            const ColumnPosInfo  cpi = refParent().getColumnAtPos(absPos.x); //returns ColumnType::none if no column at x position!
+            const ptrdiff_t      row = refParent().getRowAtWinPos   (clientPos.y); //return -1 for invalid position; >= rowCount if out of range
+            const ColumnPosInfo  cpi = refParent().getColumnAtWinPos(clientPos.x); //returns ColumnType::none if no column at x position!
             const HoverArea rowHover = [&]
             {
                 if (0 <= row && row < rowCount && cpi.colType != ColumnType::none)
@@ -1378,8 +1363,7 @@ private:
             wxPoint clientPosTrimmed = clientPos;
             clientPosTrimmed.y = std::clamp(clientPosTrimmed.y, 0, clientSize.GetHeight() - 1); //do not select row outside client window!
 
-            const wxPoint absPos = wnd_.refParent().CalcUnscrolledPosition(clientPosTrimmed);
-            const ptrdiff_t newRow = wnd_.rowLabelWin_.getRowAtPos(absPos.y); //return -1 for invalid position; >= rowCount if out of range
+            const ptrdiff_t newRow = wnd_.refParent().getRowAtWinPos(clientPosTrimmed.y); //return -1 for invalid position; >= rowCount if out of range
             assert(newRow >= 0);
             if (newRow >= 0)
                 if (rowCurrent_ != newRow)
@@ -1435,7 +1419,7 @@ private:
     void refreshRow(size_t row)
     {
         const wxRect& rowArea = rowLabelWin_.getRowLabelArea(row); //returns empty rect if row not found
-        const wxPoint topLeft = refParent().CalcScrolledPosition(wxPoint(0, rowArea.y)); //absolute -> client coordinates
+        const wxPoint topLeft = refParent().CalcScrolledPosition(wxPoint(0, rowArea.y)); //logical -> window coordinates
         wxRect cellArea(topLeft, wxSize(refParent().getColWidthsSum(GetClientSize().GetWidth()), rowArea.height));
         RefreshRect(cellArea);
     }
@@ -1470,7 +1454,7 @@ private:
     MouseHighlight highlight_; //current mouse highlight
     bool freezeMouseHighlight_ = false;
 
-    ptrdiff_t cursorRow_ = 0;
+    size_t cursorRow_ = 0;
     size_t selectionAnchor_ = 0;
     bool gridUpdatePending_ = false;
 };
@@ -1535,7 +1519,7 @@ void Grid::updateWindowSizes(bool updateScrollbar)
 
     //1. calculate row label width independent from scrollbars
     const int mainWinHeightGross = std::max(0, GetSize().GetHeight() - getColumnLabelHeight()); //independent from client sizes and scrollbars!
-    const ptrdiff_t logicalHeight = rowLabelWin_->getLogicalHeight();                    //
+    const ptrdiff_t logicalHeight = rowLabelWin_->getLogicalHeight();                           //
 
     const int rowLabelWidth = [&]
     {
@@ -1641,10 +1625,10 @@ void Grid::updateWindowSizes(bool updateScrollbar)
 
 wxSize Grid::GetSizeAvailableForScrollTarget(const wxSize& size)
 {
-        //1. "size == GetSize() == (0, 0)" happens temporarily during initialization
-        //2. often it's even (0, 20)
-        //3. fuck knows why, but we *temporarily* get "size == GetSize() == (1, 1)" when wxAUI panel containing Grid is dropped
-    if (size.x <= 1 || size.y <= 1) 
+    //1. "size == GetSize() == (0, 0)" happens temporarily during initialization
+    //2. often it's even (0, 20)
+    //3. fuck knows why, but we *temporarily* get "size == GetSize() == (1, 1)" when wxAUI panel containing Grid is dropped
+    if (size.x <= 1 || size.y <= 1)
         return {}; //probably best considering calling code in generic/scrlwing.cpp: wxScrollHelper::AdjustScrollbars()
 
     //1. calculate row label width independent from scrollbars
@@ -1771,12 +1755,14 @@ void Grid::onKeyDown(wxKeyEvent& event)
 
     switch (keyCode)
     {
-        case WXK_MENU:         //
-        case WXK_WINDOWS_MENU: //simulate right mouse click at cursor row (+1) position
+        case WXK_MENU:         //simulate right mouse click at cursor row position (on lower edge)
+        case WXK_WINDOWS_MENU: //(but truncate to window if cursor is out of view)
         {
-            const int cursorNextPosY = rowLabelWin_->getRowHeight() * std::min(getRowCount(), mainWin_->getCursor() + 1);
-            const int clientPosMainWinY = std::clamp(CalcScrolledPosition(wxPoint(0, cursorNextPosY)).y, //absolute -> client coordinates
-                                                     0, mainWin_->GetClientSize().GetHeight() - 1);
+            const size_t row = std::min(mainWin_->getCursor(), getRowCount());
+
+            const int clientPosMainWinY = std::clamp(CalcScrolledPosition(wxPoint(0, rowLabelWin_->getRowHeight() * (row + 1))).y - 1, //logical -> window coordinates
+                                                    0, mainWin_->GetClientSize().GetHeight() - 1);
+
             const wxPoint mousePos = mainWin_->GetPosition() + wxPoint(0, clientPosMainWinY); //mainWin_-relative to Grid-relative
 
             GridContextMenuEvent contextEvent(mousePos);
@@ -2096,25 +2082,44 @@ ColumnType Grid::colToType(size_t col) const
 }
 
 
-ptrdiff_t Grid::getRowAtPos(int posY) const { return rowLabelWin_->getRowAtPos(posY); }
-
-
-Grid::ColumnPosInfo Grid::getColumnAtPos(int posX) const
+Grid::ColumnPosInfo Grid::getColumnAtWinPos(int posX) const
 {
-    if (posX >= 0)
+    if (const int absX = CalcUnscrolledPosition(wxPoint(posX, 0)).x;
+        absX >= 0)
     {
         int accWidth = 0;
         for (const ColumnWidth& cw : getColWidths())
         {
             accWidth += cw.width;
-            if (posX < accWidth)
-                return {cw.type, posX + cw.width - accWidth, cw.width};
+            if (absX < accWidth)
+                return {cw.type, absX + cw.width - accWidth, cw.width};
         }
     }
     return {ColumnType::none, 0, 0};
 }
 
 
+ptrdiff_t Grid::getRowAtWinPos(int posY) const
+{
+    const int absY = CalcUnscrolledPosition(wxPoint(0, posY)).y;
+    return rowLabelWin_->getRowAtPos(absY); //return -1 for invalid position, rowCount if past the end
+}
+
+
+std::pair<ptrdiff_t, ptrdiff_t> Grid::getVisibleRows(const wxRect& clientRect) const //returns range [begin, end)
+{
+    if (clientRect.height > 0)
+    {
+        const int rowFrom = getRowAtWinPos(clientRect.y);
+        const int rowTo   = getRowAtWinPos(clientRect.GetBottom());
+
+        return {std::max(rowFrom, 0),
+                std::min<ptrdiff_t>((rowTo) + 1, getRowCount())};
+    }
+    return {};
+}
+
+
 wxRect Grid::getColumnLabelArea(ColumnType colType) const
 {
     const std::vector<ColumnWidth>& absWidths = getColWidths(); //resolve negative/stretched widths
@@ -2139,9 +2144,9 @@ void Grid::refreshCell(size_t row, ColumnType colType)
 {
     const wxRect& colArea = getColumnLabelArea(colType); //returns empty rect if column not found
     const wxRect& rowArea = rowLabelWin_->getRowLabelArea(row); //returns empty rect if row not found
-    if (colArea.height > 0 && rowArea.height > 0)
+    if (colArea.width > 0 && rowArea.height > 0)
     {
-        const wxPoint topLeft = CalcScrolledPosition(wxPoint(colArea.x, rowArea.y)); //absolute -> client coordinates
+        const wxPoint topLeft = CalcScrolledPosition(wxPoint(colArea.x, rowArea.y)); //logical -> window coordinates
         const wxRect cellArea(topLeft, wxSize(colArea.width, rowArea.height));
 
         getMainWin().RefreshRect(cellArea);
@@ -2224,15 +2229,6 @@ void Grid::scrollTo(size_t row)
 }
 
 
-size_t Grid::getTopRow() const
-{
-    const wxPoint absPos = CalcUnscrolledPosition(wxPoint(0, 0));
-    const ptrdiff_t row = rowLabelWin_->getRowAtPos(absPos.y); //return -1 for invalid position; >= rowCount if out of range
-    assert((getRowCount() == 0 && row == 0) || (0 <= row && row < static_cast<ptrdiff_t>(getRowCount())));
-    return row;
-}
-
-
 bool Grid::Enable(bool enable)
 {
     Refresh();
@@ -2255,10 +2251,10 @@ int Grid::getBestColumnSize(size_t col) const
         wxClientDC dc(mainWin_);
         dc.SetFont(mainWin_->GetFont()); //harmonize with MainWin::render()
 
-        int maxSize = 0;
+        const auto& [rowFirst, rowLast] = getVisibleRows(mainWin_->GetClientRect());
 
-        auto rowRange = rowLabelWin_->getRowsOnClient(mainWin_->GetClientRect()); //returns range [begin, end)
-        for (auto row = rowRange.first; row < rowRange.second; ++row)
+        int maxSize = 0;
+        for (auto row = rowFirst; row < rowLast; ++row)
             maxSize = std::max(maxSize, dataView_->getBestSize(dc, row, type));
 
         return maxSize;
diff --git a/wx+/grid.h b/wx+/grid.h
index 8ab03932..42fffd18 100644
--- a/wx+/grid.h
+++ b/wx+/grid.h
@@ -13,7 +13,6 @@
 #include <set>
 #include <vector>
 #include <zen/stl_tools.h>
-//#include <zen/basic_math.h>
 #include <wx/scrolwin.h>
 
 
@@ -56,7 +55,7 @@ struct GridClickEvent : public wxEvent
 
     const ptrdiff_t row_; //-1 for invalid position, >= rowCount if out of range
     const HoverArea hoverArea_; //may be HoverArea::none
-    const wxPoint mousePos_; //client coordinates
+    const wxPoint mousePos_; //Grid-relative coordinates
 };
 
 struct GridSelectEvent : public wxEvent
@@ -78,7 +77,7 @@ struct GridLabelClickEvent : public wxEvent
     GridLabelClickEvent* Clone() const override { return new GridLabelClickEvent(*this); }
 
     const ColumnType colType_; //may be ColumnType::none
-    const wxPoint mousePos_; //client coordinates
+    const wxPoint mousePos_; //Grid-relative coordinates
 };
 
 struct GridColumnResizeEvent : public wxEvent
@@ -92,10 +91,10 @@ struct GridColumnResizeEvent : public wxEvent
 
 struct GridContextMenuEvent : public wxEvent
 {
-    explicit GridContextMenuEvent(const wxPoint& mousePos) : wxEvent(0 /*winid*/, EVENT_GRID_CONTEXT_MENU), mousePos_(mousePos) {}
+    GridContextMenuEvent(const wxPoint& mousePos) : wxEvent(0 /*winid*/, EVENT_GRID_CONTEXT_MENU), mousePos_(mousePos) {}
     GridContextMenuEvent* Clone() const override { return new GridContextMenuEvent(*this); }
 
-    const wxPoint mousePos_; //client coordinates
+    const wxPoint mousePos_; //Grid-relative coordinates
 };
 //------------------------------------------------------------------------------------------------------------
 
@@ -203,15 +202,16 @@ public:
     wxWindow& getMainWin    ();
     const wxWindow& getMainWin() const;
 
-    ptrdiff_t getRowAtPos(int posY) const; //return -1 for invalid position, >= rowCount if out of range; absolute coordinates!
-
     struct ColumnPosInfo
     {
-        ColumnType colType   = ColumnType::none; //ColumnType::none no column at x position!
+        ColumnType colType   = ColumnType::none; //ColumnType::none => no column at posX!
         int cellRelativePosX = 0;
         int colWidth         = 0;
     };
-    ColumnPosInfo getColumnAtPos(int posX) const; //absolute position!
+    ColumnPosInfo getColumnAtWinPos(int posX) const;
+    ptrdiff_t getRowAtWinPos(int posY) const; //return -1 for invalid position, >= rowCount if out of range
+
+    std::pair<ptrdiff_t, ptrdiff_t> getVisibleRows(const wxRect& clientRect) const; //returns range [begin, end)
 
     void refreshCell(size_t row, ColumnType colType);
 
@@ -222,7 +222,6 @@ public:
     size_t getGridCursor() const; //returns row
 
     void scrollTo(size_t row);
-    size_t getTopRow() const;
 
     void makeRowVisible(size_t row);
 
diff --git a/zen/build_info.h b/zen/build_info.h
index adb19f86..5a1d1635 100644
--- a/zen/build_info.h
+++ b/zen/build_info.h
@@ -7,6 +7,7 @@
 #ifndef BUILD_INFO_H_5928539285603428657
 #define BUILD_INFO_H_5928539285603428657
 
+
 #define ZEN_ARCH_32BIT 32
 #define ZEN_ARCH_64BIT 64
 
@@ -18,4 +19,15 @@
 
 static_assert(ZEN_BUILD_ARCH == sizeof(void*) * 8);
 
+
+namespace zen
+{
+    #if ZEN_BUILD_ARCH == ZEN_ARCH_32BIT
+        const char cpuArchName[] = "i686";
+    #else
+        const char cpuArchName[] = "x86-64";
+    #endif
+
+}
+
 #endif //BUILD_INFO_H_5928539285603428657
diff --git a/zen/format_unit.cpp b/zen/format_unit.cpp
index b2d1b59a..d546124f 100644
--- a/zen/format_unit.cpp
+++ b/zen/format_unit.cpp
@@ -54,23 +54,23 @@ std::wstring zen::formatFilesizeShort(int64_t size)
 
     auto formatUnit = [&](const std::wstring& unitTxt) { return replaceCpy(unitTxt, L"%x", formatThreeDigitPrecision(sizeInUnit)); };
 
-    sizeInUnit /= 1024;
+    sizeInUnit /= bytesPerKilo;
     if (std::abs(sizeInUnit) < 999.5)
         return formatUnit(_("%x KB"));
 
-    sizeInUnit /= 1024;
+    sizeInUnit /= bytesPerKilo;
     if (std::abs(sizeInUnit) < 999.5)
         return formatUnit(_("%x MB"));
 
-    sizeInUnit /= 1024;
+    sizeInUnit /= bytesPerKilo;
     if (std::abs(sizeInUnit) < 999.5)
         return formatUnit(_("%x GB"));
 
-    sizeInUnit /= 1024;
+    sizeInUnit /= bytesPerKilo;
     if (std::abs(sizeInUnit) < 999.5)
         return formatUnit(_("%x TB"));
 
-    sizeInUnit /= 1024;
+    sizeInUnit /= bytesPerKilo;
     return formatUnit(_("%x PB"));
 }
 
diff --git a/zen/format_unit.h b/zen/format_unit.h
index 1c96da51..4a839855 100644
--- a/zen/format_unit.h
+++ b/zen/format_unit.h
@@ -14,6 +14,7 @@
 
 namespace zen
 {
+    const int bytesPerKilo = 1000;
 std::wstring formatFilesizeShort(int64_t filesize);
 std::wstring formatRemainingTime(double timeInSec);
 std::wstring formatFraction(double fraction); //within [0, 1]
diff --git a/zen/sys_version.cpp b/zen/sys_version.cpp
index f7e4ffc8..7355ef1a 100644
--- a/zen/sys_version.cpp
+++ b/zen/sys_version.cpp
@@ -94,3 +94,5 @@ OsVersion zen::getOsVersion()
     }();
     return verDetail.version;
 }
+
+
diff --git a/zen/time.h b/zen/time.h
index 9b5f670e..c5b6f23c 100644
--- a/zen/time.h
+++ b/zen/time.h
@@ -8,6 +8,7 @@
 #define TIME_H_8457092814324342453627
 
 #include <ctime>
+#include "basic_math.h"
 #include "zstring.h"
 
 
@@ -147,160 +148,8 @@ TimeComp getLocalTime(time_t utc)
 }
 
 
-//FILETIME: number of 100-nanosecond intervals since January 1, 1601 UTC
-//time_t:   number of seconds since Jan. 1st 1970 UTC
-constexpr auto fileTimeTimetOffset = 11'644'473'600;
-
-
-#if 0
-warn_static("remove after test")
-inline
-TimeComp getUtcTime2(time_t utc)
-{
-    //1. convert: seconds since year 1:
-    //...
-    //assert(time_t is signed)
-
-    //TODO: what if < 0?
-    long long remDays = utc / (24 * 3600);
-    long long remSecs = utc % (24 * 3600);
-
-    //days per year
-    const int dpYearStd  = 365;
-    const int dpYearLeap = dpYearStd + 1;
-    const int dp4Years = 3 * dpYearStd + dpYearLeap;
-    const int dp100YearsStd = 25 * dp4Years - 1; //no leap days for centuries...
-    const int dp100YearsExc = 25 * dp4Years; //...except if divisible by 400
-    const int dp400Years = 3 * dp100YearsStd + dp100YearsExc;
-
-
-
-
-    const int daysPer4Years = 4 * 365 /*usual days per year*/ + 1 /*including leap day*/;
-    const int daysPerYear = 365; //non-leap
-    const int daysPer100Years = 25 * daysPer4Years - 1;
-    const int daysPer400Years = 100 * daysPer4Years - 3 /*no leap days for centuries, except if divisible by 400 */;
-
-    const lldiv_t cycles400 = std::lldiv(remDays, daysPer400Years);
-    remDays = cycles400.rem;
-
-
-    int cycles100 = (remDays / daysPer100Years);
-    if (cycles100 == 4)
-        --cycles100;
-
-    remDays -= cycles100 * daysPer100Years;
-
-
-    int cycles4 = (remDays / daysPer4Years);
-    if (cycles4 == 25)
-        --cycles4;
-
-    remDays -= cycles4 * daysPer4Years;
-
-
-    int cycles1 = remDays / daysPerYear;
-    if (cycles1 == 4)
-        --cycles1;
-
-    remDays -= cycles1 * daysPerYears;
-
-    const int year = 1 + cycles400.quot * 400 + cycles100 * 100; + cycles4 * 4 + cycles1;;
-
-
-
-    const char daysPerMonth[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
-
-
-
-    //first four years of century:
-    if (skipCenturyLeapDay)
-    {
-        if (remDays < 4 * daysPerYear)
-        {
-            year += remDays / daysPerYear;
-            remDays %= daysPerYear;
-        }
-        else
-        {
-            remDays -= 4 * daysPerYear;
-            year += 4;
-            => go to if block;
-        }
-    }
-    else
-    {
-        year += (remDays / daysPer4Years) * 4;
-        remDays %= daysPer4Years;
-
-        if (remDays < daysPerYear + 1 /*including leap day*/)
-            isLeapYear = true;
-        else
-        {
-            remDays -= daysPerYear + 1;
-            ++year;
-
-            year += remDays / daysPerYear;
-            remDays %= daysPerYear;
-        }
-    }
-
-
-
-
-
-
-
-
-    const int daysPer100Years = 25 * (4 * 365 /*usual days per year*/ +  1)/*leap days */;
-
-
-    const int daysPer100Years = 100 * 365 /*usual days per year*/ +  25 /*leap days */;
-    const int daysPer200Years = 200 * 365 /*usual days per year*/ +  50 /*leap days */ - 1 /*no leap days for centuries, except if divisible by 400 */;
-    const int daysPer300Years = 300 * 365 /*usual days per year*/ +  75 /*leap days */ - 2 /*no leap days for centuries, except if divisible by 400 */;
-
-    if (remDays >= daysPer300Years)
-    {
-        year += 300;
-        remDays -= daysPer300Years;
-    }
-    else if (remDays >= daysPer200Years)
-    {
-        year += 200;
-        remDays -= daysPer200Years;
-    }
-    else if (remDays >= daysPer100Years)
-    {
-        year += 100;
-        remDays -= daysPer100Years;
-    }
-
-
-
-    constexpr int daysPer100Years = 100 * 365 /*usual days per year*/ + 25 /*leap days */ - 1 /*no leap days for centuries not divisible by 400 */;
-
-    int addCenturies = remDays / daysPer100Years;
-    if (addCenturies == 4)
-        --addCenturies;
-
-    year += addCenturies * 100;
-    remDays -= addCenturies * daysPer100Years;
-
-    constexpr int daysPer4Years = 4 * 365 /*usual days per year*/ + 1 /*leap day */;
-
-
-
-    constexpr int daysPer100Years = 100 * 365 /*usual days per year*/ + 25 /*leap days */ - 1 /*no leap days for centuries not divisible by 400 */;
-    constexpr int daysPer100Years = 100 * 365 /*usual days per year*/ + 25 /*leap days */ - 1 /*no leap days for centuries not divisible by 400 */;
-    constexpr int daysPer100Years = 100 * 365 /*usual days per year*/ + 25 /*leap days */ - 1 /*no leap days for centuries not divisible by 400 */;
-    constexpr int daysPer100Years = 100 * 365 /*usual days per year*/ + 25 /*leap days */;
-
-
-
-}
-
-warn_static("get rid of fileTimeTimetOffset!")
-#endif
+constexpr auto daysPer400Years = 100 * (4 * 365 /*usual days per year*/ + 1 /*including leap day*/) - 3 /*no leap days for centuries, except if divisible by 400 */;
+constexpr auto secsPer400Years = 3600LL * 24 * daysPer400Years;
 
 
 inline
@@ -309,9 +158,8 @@ TimeComp getUtcTime(time_t utc)
     if (utc == -1) //failure code from std::time(nullptr)
         return TimeComp();
 
-
     std::tm ctc = {};
-    if (::gmtime_r(&utc, &ctc) == nullptr)
+    if (::gmtime_r(&utc, &ctc) == nullptr) //Linux, macOS: apparently NO limits (tested years 0 to 10.000!)
         return TimeComp();
 
     return impl::toZenTimeComponents(ctc);
@@ -335,10 +183,13 @@ time_t utcToTimeT(const TimeComp& tc) //returns -1 on error
     if (tc == TimeComp())
         return -1;
 
-
     std::tm ctc = impl::toClibTimeComponents(tc);
     ctc.tm_isdst = 0; //"Zero (0) to indicate that standard time is in effect" => unused by _mkgmtime, but take no chances
-    return ::timegm(&ctc);
+
+
+    time_t utc = ::timegm(&ctc);
+
+    return utc;
 }