add upstream 11.2811.28

57 files changed, 5365 insertions, 5205 deletions

diff --git a/Bugs.txt b/Bugs.txt
index 1c9ba9c2..ffc9056a 100644
--- a/Bugs.txt
+++ b/Bugs.txt
@@ -5,7 +5,7 @@ the ones mentioned below. The remaining issues that are yet to be fixed are list
 
 
 ----------------
-| libcurl 7.84|
+| libcurl 7.86|
 ----------------
 __________________________________________________________________________________________________________
 /lib/ftp.c
@@ -46,9 +46,9 @@ https://github.com/curl/curl/issues/4342
 __________________________________________________________________________________________________________
 
 
---------------------------
-| libssh2 1.9.0-20201014 |
---------------------------
+-----------------------------
+| libssh2 master 2022-11-11 |
+-----------------------------
 __________________________________________________________________________________________________________
 src/session.c
 memory leak: https://github.com/libssh2/libssh2/issues/28
@@ -58,27 +58,14 @@ memory leak: https://github.com/libssh2/libssh2/issues/28
 
 __________________________________________________________________________________________________________
 move the following constants from src/sftp.h to include/libssh2_sftp.h:
+
 	#define MAX_SFTP_OUTGOING_SIZE 30000
 	#define MAX_SFTP_READ_SIZE 30000
-
-__________________________________________________________________________________________________________
-src/userauth.c
-buffer overflow: https://github.com/libssh2/libssh2/pull/693
-
--if (banner_len >= session->userauth_list_data_len - 5) {
-+if (banner_len > session->userauth_list_data_len - 5) {
-
--session->userauth_banner = LIBSSH2_ALLOC(session, banner_len);
-+session->userauth_banner = LIBSSH2_ALLOC(session, banner_len + 1);
-
--memmove(session->userauth_banner, session->userauth_list_data + 5,
-+memcpy(session->userauth_banner, session->userauth_list_data + 5,
-
 __________________________________________________________________________________________________________
 
 
 -------------------
-| wxWidgets 3.1.7 |
+| wxWidgets 3.2.1 |
 -------------------
 __________________________________________________________________________________________________________
 /include/wx/features.h
diff --git a/Changelog.txt b/Changelog.txt
index a7c8c7ad..440b752a 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,6 +1,17 @@
+FreeFileSync 11.28 [2022-11-16]
+-------------------------------
+Recover from corrupted database file
+Save database files pair-wise as a transaction
+Fixed FTP access for Xiaomi "File Manager"
+Fixed filter full path detection for root directory (Linux/macOS)
+Fixed recycle bin double initialization bug (Windows)
+Fixed incorrect case-insensitive string comparison for i and ı
+Round progress percentage numbers down
+
+
 FreeFileSync 11.27 [2022-10-17]
 -------------------------------
-Fixed a "Some files will be synchronized as part of multiple base folders" false-negative
+Fixed "Some files will be synchronized as part of multiple base folders" false-negative
 Fixed "Unexpected size of data stream" for Google Drive
 Fixed crash when downloading empty file from Google Drive
 RealTimeSync: fixed ffs_batch not accepted as valid configuration
@@ -37,7 +48,7 @@ FreeFileSync 11.24 [2022-08-28]
 -------------------------------
 Enhanced filter syntax to match files only (append ':')
 Fixed "Some files will be synchronized as part of multiple base folders": no more false-positives
-Detect full path filter items and convert to relative path 
+Detect full path filter items and convert to relative path
 Auto-detect FTP server character encoding (UTF8 or ANSI)
 Cancel grid selection via Escape key or second mouse button
 Apply conflict preview limit accross all folder pairs
@@ -156,7 +167,7 @@ Fixed E_NOINTERFACE error after synchronization
 Preempt crashes due to Nahimic Sonic Studio 3
 Hide main window when minimizing progress window (macOS)
 Avoid second dock icon when minimizing progress window (macOS)
- 
+
 
 FreeFileSync 11.13 [2021-08-17]
 -------------------------------
diff --git a/FreeFileSync/Build/Resources/Languages.zip b/FreeFileSync/Build/Resources/Languages.zip
index 8b9924eb..691dbce3 100644
--- a/FreeFileSync/Build/Resources/Languages.zip
+++ b/FreeFileSync/Build/Resources/Languages.zip
diff --git a/FreeFileSync/Source/afs/abstract.cpp b/FreeFileSync/Source/afs/abstract.cpp
index f34ebfbe..a6b8ae1a 100644
--- a/FreeFileSync/Source/afs/abstract.cpp
+++ b/FreeFileSync/Source/afs/abstract.cpp
@@ -305,8 +305,8 @@ std::optional<AFS::ItemType> AFS::itemStillExists(const AfsPath& itemPath) const
         if (parentType && *parentType != ItemType::file /*obscure, but possible (and not an error)*/)
             try
             {
-        const Zstring itemName = getItemName(itemPath);
-        assert(!itemName.empty());
+                const Zstring itemName = getItemName(itemPath);
+                assert(!itemName.empty());
 
                 traverseFolderFlat(*parentAfsPath, //throw FileError
                 [&](const    FileInfo& fi) { if (fi.itemName == itemName) throw ItemType::file;    },
diff --git a/FreeFileSync/Source/afs/abstract.h b/FreeFileSync/Source/afs/abstract.h
index e58868f2..64a58042 100644
--- a/FreeFileSync/Source/afs/abstract.h
+++ b/FreeFileSync/Source/afs/abstract.h
@@ -311,7 +311,8 @@ struct AbstractFileSystem //THREAD-SAFETY: "const" member functions must model t
         virtual void tryCleanup(const std::function<void(const std::wstring& displayPath)>& notifyDeletionStatus /*throw X*; displayPath may be empty*/) = 0; //throw FileError, X
     };
 
-    //return value always bound!
+    //- return value always bound!
+    //- constructor will be running on main thread => *no* file I/O!
     static std::unique_ptr<RecycleSession> createRecyclerSession(const AbstractPath& folderPath) { return folderPath.afsDevice.ref().createRecyclerSession(folderPath.afsPath); } //throw FileError, RecycleBinUnavailable
 
     //- returns empty on success, item type if recycle bin is not available
diff --git a/FreeFileSync/Source/afs/ftp.cpp b/FreeFileSync/Source/afs/ftp.cpp
index 0c7a24e4..4d95a8a3 100644
--- a/FreeFileSync/Source/afs/ftp.cpp
+++ b/FreeFileSync/Source/afs/ftp.cpp
@@ -79,7 +79,7 @@ namespace
 Zstring concatenateFtpFolderPathPhrase(const FtpLogin& login, const AfsPath& itemPath); //noexcept
 
 
-Zstring ansiToUtfEncoding(const std::string& str) //throw SysError
+Zstring ansiToUtfEncoding(const std::string_view& str) //throw SysError
 {
     if (str.empty()) return {};
 
@@ -89,7 +89,7 @@ Zstring ansiToUtfEncoding(const std::string& str) //throw SysError
     ZEN_ON_SCOPE_EXIT(if (error) ::g_error_free(error));
 
     //https://developer.gnome.org/glib/stable/glib-Character-Set-Conversion.html#g-convert
-    gchar* utfStr = ::g_convert(str.c_str(),   //const gchar* str
+    gchar* utfStr = ::g_convert(str.data(),    //const gchar* str
                                 str.size(),    //gssize len
                                 "UTF-8",       //const gchar* to_codeset
                                 "LATIN1",      //const gchar* from_codeset
@@ -97,7 +97,7 @@ Zstring ansiToUtfEncoding(const std::string& str) //throw SysError
                                 &bytesWritten, //gsize* bytes_written
                                 &error);       //GError** error
     if (!utfStr)
-        throw SysError(formatGlibError("g_convert(" + utfTo<std::string>(str) + ", LATIN1 -> UTF-8)", error));
+        throw SysError(formatGlibError("g_convert(" + std::string(str) + ", LATIN1 -> UTF-8)", error));
     ZEN_ON_SCOPE_EXIT(::g_free(utfStr));
 
     return {utfStr, bytesWritten};
@@ -155,15 +155,17 @@ std::wstring getCurlDisplayPath(const FtpSessionId& sessionId, const AfsPath& it
 }
 
 
-std::vector<std::string> splitFtpResponse(const std::string& buf)
+std::vector<std::string_view> splitFtpResponse(std::string&&) = delete;
+
+std::vector<std::string_view> splitFtpResponse(const std::string& buf)
 {
-    std::vector<std::string> lines;
+    std::vector<std::string_view> lines;
 
     split2(buf, [](char c) { return isLineBreak(c) || c == '\0'; }, //is 0-char check even needed?
-    [&lines](const char* blockFirst, const char* blockLast)
+    [&lines](const std::string_view block)
     {
-        if (blockFirst != blockLast) //consider Windows' <CR><LF>
-            lines.emplace_back(blockFirst, blockLast);
+        if (!block.empty()) //consider Windows' <CR><LF>
+            lines.push_back(block);
     });
 
     return lines;
@@ -173,37 +175,39 @@ std::vector<std::string> splitFtpResponse(const std::string& buf)
 class FtpLineParser
 {
 public:
-    explicit FtpLineParser(const std::string& line) : line_(line), it_(line_.begin()) {}
+    explicit FtpLineParser(const std::string_view& line) : it_(line.begin()), itEnd_(line.end()) {}
+    /**/     FtpLineParser(std::string_view&&) = delete;
 
     template <class Function>
-    std::string readRange(size_t count, Function acceptChar) //throw SysError
+    std::string_view readRange(size_t count, Function acceptChar) //throw SysError
     {
-        if (static_cast<ptrdiff_t>(count) > line_.end() - it_)
+        if (static_cast<ptrdiff_t>(count) > itEnd_ - it_)
             throw SysError(L"Unexpected end of line.");
 
-        if (!std::all_of(it_, it_ + count, acceptChar))
+        const auto rngEnd = it_ + count;
+
+        if (!std::all_of(it_, rngEnd, acceptChar))
             throw SysError(L"Expected char type not found.");
 
-        std::string output(it_, it_ + count);
-        it_ += count;
-        return output;
+        return makeStringView(std::exchange(it_, rngEnd), rngEnd);
     }
 
     template <class Function> //expects non-empty range!
-    std::string readRange(Function acceptChar) //throw SysError
+    std::string_view readRange(Function acceptChar) //throw SysError
     {
-        auto itEnd = std::find_if_not(it_, line_.end(), acceptChar);
-        if (itEnd == it_)
+        auto rngEnd = std::find_if_not(it_, itEnd_, acceptChar);
+        if (rngEnd == it_)
             throw SysError(L"Expected char range not found.");
 
-        return {std::exchange(it_, itEnd), itEnd};
+        return makeStringView(std::exchange(it_, rngEnd), rngEnd);
     }
 
-    char peekNextChar() const { return it_ == line_.end() ? '\0' : *it_; }
+    char peekNextChar() const { return it_ == itEnd_ ? '\0' : *it_; }
 
 private:
-    const std::string line_;
-    std::string::const_iterator it_;
+    /**/
+    std::string_view::const_iterator it_;
+    const std::string_view::const_iterator itEnd_;
 };
 
 //----------------------------------------------------------------------------------------------------------------
@@ -267,9 +271,10 @@ class FtpSession
 {
 public:
     explicit FtpSession(const FtpSessionId& sessionId) : //throw SysError
-        sessionId_(sessionId),
-        libsshCurlUnifiedInitCookie_(getLibsshCurlUnifiedInitCookie(globalFtpSessionCount)), //throw SysError
-        lastSuccessfulUseTime_(std::chrono::steady_clock::now()) {}
+        sessionId_(sessionId) 
+    {
+        lastSuccessfulUseTime_ = std::chrono::steady_clock::now();
+    }
 
     ~FtpSession()
     {
@@ -488,9 +493,9 @@ public:
         {
             std::wstring errorMsg = trimCpy(utfTo<std::wstring>(curlErrorBuf)); //optional
 
-            if (const std::vector<std::string>& headerLines = splitFtpResponse(headerData);
+            if (const std::vector<std::string_view>& headerLines = splitFtpResponse(headerData);
                 !headerLines.empty())
-                if (const std::string& response = trimCpy(headerLines.back()); //that *should* be the server's error response
+                if (const std::string_view& response = trimCpy(headerLines.back()); //that *should* be the server's error response
                     !response.empty())
                     errorMsg += (errorMsg.empty() ? L"" : L"\n") + utfTo<std::wstring>(response);
 #if 0
@@ -536,7 +541,7 @@ public:
         //=> * to the rescue: as long as we get an FTP response - *any* FTP response (including 550) - the connection itself is fine!
         const std::string& featBuf = runSingleFtpCommand("*FEAT", false /*requiresUtf8*/); //throw SysError
 
-        for (const std::string& line : splitFtpResponse(featBuf))
+        for (const std::string_view& line : splitFtpResponse(featBuf))
             if (startsWith(line, "211-") ||
                 startsWith(line, "211 ") ||
                 startsWith(line, "500 ") ||
@@ -570,7 +575,7 @@ public:
 
             const std::string& pwdBuf = runSingleFtpCommand("PWD", true /*requiresUtf8*/); //throw SysError
 
-            for (const std::string& line : splitFtpResponse(pwdBuf))
+            for (const std::string_view& line : splitFtpResponse(pwdBuf))
                 if (startsWith(line, "257 "))
                 {
                     /* 257<space>[rubbish]"<directory-name>"<space><commentary>        according to libcurl
@@ -638,7 +643,7 @@ public:
         return utfToServerEncoding(serverPath); //throw SysError
     }
 
-    Zstring serverToUtfEncoding(const std::string& str) //throw SysError
+    Zstring serverToUtfEncoding(const std::string_view& str) //throw SysError
     {
         if (isAsciiString(str)) //fast path
             return {str.begin(), str.end()};
@@ -704,17 +709,21 @@ private:
     {
         std::string curlRelPath; //libcurl expects encoded paths (except for '/' char!!!) => bug: https://github.com/curl/curl/pull/4423
 
-        for (const std::string& comp : split(getServerPathInternal(itemPath), '/', SplitOnEmpty::skip)) //throw SysError
+        split(getServerPathInternal(itemPath), //throw SysError
+              '/', [&](std::string_view comp)
         {
-            char* compFmt = ::curl_easy_escape(easyHandle_, comp.c_str(), static_cast<int>(comp.size()));
-            if (!compFmt)
-                throw SysError(formatSystemError("curl_easy_escape(" + comp + ')', L"", L"Conversion failure"));
-            ZEN_ON_SCOPE_EXIT(::curl_free(compFmt));
-
-            if (!curlRelPath.empty())
-                curlRelPath += '/';
-            curlRelPath += compFmt;
-        }
+            if (!comp.empty())
+            {
+                char* compFmt = ::curl_easy_escape(easyHandle_, comp.data(), static_cast<int>(comp.size()));
+                if (!compFmt)
+                    throw SysError(formatSystemError(std::string("curl_easy_escape(") + comp + ')', L"", L"Conversion failure"));
+                ZEN_ON_SCOPE_EXIT(::curl_free(compFmt));
+
+                if (!curlRelPath.empty())
+                    curlRelPath += '/';
+                curlRelPath += compFmt;
+            }
+        });
 
         static_assert(LIBCURL_VERSION_MAJOR > 7 || (LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR >= 67));
         /*  1. CURLFTPMETHOD_NOCWD requires absolute paths to unconditionally skip CWDs: https://github.com/curl/curl/pull/4382
@@ -812,19 +821,19 @@ private:
     static Features parseFeatResponse(const std::string& featResponse)
     {
         Features output; //FEAT command: https://tools.ietf.org/html/rfc2389#page-4
-        std::vector<std::string> lines = splitFtpResponse(featResponse);
+        std::vector<std::string_view> lines = splitFtpResponse(featResponse);
 
-        auto it = std::find_if(lines.begin(), lines.end(), [](const std::string& line) { return startsWith(line, "211-") || startsWith(line, "211 "); });
+        auto it = std::find_if(lines.begin(), lines.end(), [](const std::string_view& line) { return startsWith(line, "211-") || startsWith(line, "211 "); });
         if (it != lines.end())
         {
             ++it;
             for (; it != lines.end(); ++it)
             {
-                std::string& line = *it;
-                if (equalAsciiNoCase     (line, "211 End") ||
-                    startsWithAsciiNoCase(line, "211 End ")) //Serv-U: "211 End (for details use "HELP commmand" where command is the command of interest)"
-                    break;                                   //Home Ftp Server: "211 End of extentions."
+                if (equalAsciiNoCase     (*it, "211 End") || //Serv-U: "211 End (for details use "HELP commmand" where command is the command of interest)"
+                    startsWithAsciiNoCase(*it, "211 End "))  //Home Ftp Server: "211 End of extentions."
+                    break;
 
+                std::string line(*it);
                 //suppport ProFTPD with "MultilineRFC2228 = on" https://freefilesync.org/forum/viewtopic.php?t=7243
                 if (startsWith(line, "211-"))
                     line = ' ' + afterFirst(line, '-', IfNotFoundReturn::none);
@@ -833,10 +842,9 @@ private:
                 //"a server-FTP process that supports MLST, and MLSD [...] MUST indicate that this support exists"
                 //"there is no distinct FEAT output for MLSD. The presence of the MLST feature indicates that both MLST and MLSD are supported"
                 if (equalAsciiNoCase     (line, " MLST") ||
-                    startsWithAsciiNoCase(line, " MLST ")) //SP "MLST" [SP factlist] CRLF
-                    output.mlsd = true;
-                //so much the theory. In practice FTP server implementers can't read specs, of course: https://freefilesync.org/forum/viewtopic.php?t=6752
-                if (equalAsciiNoCase(line, " MLSD"))
+                    startsWithAsciiNoCase(line, " MLST ") || //SP "MLST" [SP factlist] CRLF
+                    //so much the theory. In practice FTP server implementers can't read (specs): https://freefilesync.org/forum/viewtopic.php?t=6752
+                    equalAsciiNoCase(line, " MLSD"))
                     output.mlsd = true;
 
                 //https://tools.ietf.org/html/draft-somers-ftp-mfxx-04#section-3.3
@@ -845,7 +853,8 @@ private:
                     output.mfmt = true;
 
                 else if (equalAsciiNoCase(line, " UTF8") ||
-                         equalAsciiNoCase(line, " UTF8 ON")) //support non-compliant servers: https://freefilesync.org/forum/viewtopic.php?t=7355#p24694
+                         equalAsciiNoCase(line, " UTF8 ON") || //support non-compliant servers: https://freefilesync.org/forum/viewtopic.php?t=7355#p24694
+                         equalAsciiNoCase(line, " UTF-8"))     //Android 12: "File Manager" by Xiaomi
                     output.utf8 = true;
 
                 else if (equalAsciiNoCase(line, " CLNT"))
@@ -866,7 +875,7 @@ private:
     std::optional<Features> featureCache_;
     std::optional<AfsPath> homePathCached_;
 
-    const std::shared_ptr<UniCounterCookie> libsshCurlUnifiedInitCookie_;
+            const std::shared_ptr<UniCounterCookie> libsshCurlUnifiedInitCookie_{getLibsshCurlUnifiedInitCookie(globalFtpSessionCount)}; //throw SysError
     std::chrono::steady_clock::time_point lastSuccessfulUseTime_;
     std::weak_ptr<int> timeoutSec_;
 };
@@ -1026,7 +1035,7 @@ FtpItem getFtpSymlinkInfo(const FtpLogin& login, const AfsPath& linkPath) //thro
             const std::string sizeBuf = session.runSingleFtpCommand("*SIZE " + session.getServerPathInternal(linkPath),
                                                                     true /*requiresUtf8*/); //throw SysError
             //alternative: use libcurl + CURLINFO_CONTENT_LENGTH_DOWNLOAD_T? => nah, suprise (motherfucker)! libcurl adds needless "REST 0" command!
-            for (const std::string& line : splitFtpResponse(sizeBuf))
+            for (const std::string_view& line : splitFtpResponse(sizeBuf))
                 if (startsWith(line, "213 ")) // 213<space>[rubbish]<file size>        according to libcurl
                 {
                     if (isDigit(line.back())) //https://tools.ietf.org/html/rfc3659#section-4
@@ -1053,7 +1062,7 @@ FtpItem getFtpSymlinkInfo(const FtpLogin& login, const AfsPath& linkPath) //thro
 
         output.modTime = [&] //https://tools.ietf.org/html/rfc3659#section-3
         {
-            for (const std::string& line : splitFtpResponse(mdtmBuf))
+            for (const std::string_view& line : splitFtpResponse(mdtmBuf))
                 if (startsWith(line, "213 ")) // 213<space> YYYYMMDDHHMMSS[.sss]       "Time values are always represented in UTC (GMT)" ...and libcurl thinks so, too
                 {
                     const auto itStart = line.begin() + 4;
@@ -1116,16 +1125,10 @@ public:
                     //      ? (not between brackets) matches any single character
                     //
                     //of course this "helpfulness" blows up with MLSD + paths that incidentally contain wildcards: https://freefilesync.org/forum/viewtopic.php?t=5575
-                    const bool pathHasWildcards = [&] //=> globbing is reproducible even with freefilesync.org's FTP!
-                    {
-                        const size_t pos = afsDirPath.value.find(Zstr('['));
-                        if (pos != Zstring::npos)
-                            if (afsDirPath.value.find(Zstr(']'), pos + 1) != Zstring::npos)
-                                return true;
-
-                        return contains(afsDirPath.value, Zstr('*')) ||
-                        /**/   contains(afsDirPath.value, Zstr('?'));
-                    }();
+                    const bool pathHasWildcards = //=> globbing is reproducible even with freefilesync.org's FTP!
+                        contains(afterFirst<ZstringView>(afsDirPath.value, Zstr('['), IfNotFoundReturn::none), Zstr(']')) ||
+                        contains(afsDirPath.value, Zstr('*')) ||
+                        contains(afsDirPath.value, Zstr('?'));
 
                     if (!pathHasWildcards)
                         pathMethod = CURLFTPMETHOD_NOCWD; //16% faster traversal compared to CURLFTPMETHOD_SINGLECWD (35% faster than CURLFTPMETHOD_MULTICWD)
@@ -1155,17 +1158,17 @@ private:
     static std::vector<FtpItem> parseMlsd(const std::string& buf, FtpSession& session) //throw SysError
     {
         std::vector<FtpItem> output;
-        for (const std::string& line : splitFtpResponse(buf))
+        for (const std::string_view& line : splitFtpResponse(buf))
         {
-            const FtpItem item = parseMlstLine(line, session); //throw SysError
+            FtpItem item = parseMlstLine(line, session); //throw SysError
             if (item.itemName != Zstr(".") &&
                 item.itemName != Zstr(".."))
-                output.push_back(item);
+                output.push_back(std::move(item));
         }
         return output;
     }
 
-    static FtpItem parseMlstLine(const std::string& rawLine, FtpSession& session) //throw SysError
+    static FtpItem parseMlstLine(const std::string_view& rawLine, FtpSession& session) //throw SysError
     {
         /*  https://tools.ietf.org/html/rfc3659
             type=cdir;sizd=4096;modify=20170116230740;UNIX.mode=0755;UNIX.uid=874;UNIX.gid=869;unique=902g36e1c55; .
@@ -1183,48 +1186,53 @@ private:
             if (itBlank == rawLine.end())
                 throw SysError(L"Item name not available.");
 
-            const std::string facts(itBegin, itBlank);
-            item.itemName = session.serverToUtfEncoding(std::string(itBlank + 1, rawLine.end())); //throw SysError
+            const std::string_view facts = makeStringView(itBegin, itBlank);
+            item.itemName = session.serverToUtfEncoding(makeStringView(itBlank + 1, rawLine.end())); //throw SysError
 
-            std::string typeFact;
-            std::optional<uint64_t> fileSize;
+            std::string_view typeFact;
+            std::string_view fileSize;
 
-            for (const std::string& fact : split(facts, ';', SplitOnEmpty::skip))
-                if (startsWithAsciiNoCase(fact, "type=")) //must be case-insensitive!!!
-                {
-                    const std::string tmp = afterFirst(fact, '=', IfNotFoundReturn::none);
-                    typeFact = beforeFirst(tmp, ':', IfNotFoundReturn::all);
-                }
-                else if (startsWithAsciiNoCase(fact, "size="))
-                    fileSize = stringTo<uint64_t>(afterFirst(fact, '=', IfNotFoundReturn::none));
-                else if (startsWithAsciiNoCase(fact, "modify="))
-                {
-                    std::string modifyFact = afterFirst(fact, '=', IfNotFoundReturn::none);
-                    modifyFact = beforeLast(modifyFact, '.', IfNotFoundReturn::all); //truncate millisecond precision if available
-
-                    const TimeComp tc = parseTime("%Y%m%d%H%M%S", modifyFact);
-                    if (tc == TimeComp())
-                        throw SysError(L"Modification time could not be parsed.");
-
-                    if (const auto [modTime, timeValid] = utcToTimeT(tc);
-                        timeValid)
-                        item.modTime = modTime;
-                    else
-                        throw SysError(L"Modification time could not be parsed.");
-                }
-                else if (startsWithAsciiNoCase(fact, "unique="))
+            split(facts, ';', [&](const std::string_view fact)
+            {
+                if (!fact.empty())
                 {
-                    /*  https://tools.ietf.org/html/rfc3659#section-7.5.2
-                        "The mapping between files, and unique fact tokens should be maintained, [...] for
-                         *at least* the lifetime of the control connection from user-PI to server-PI."
-
-                        => not necessarily *persistent* as far as the RFC goes!
-                           BUT: practially this will be the inode ID/file index, so we can assume persistence */
-                    const std::string uniqueId = afterFirst(fact, '=', IfNotFoundReturn::none);
-                    assert(!uniqueId.empty());
-                    item.filePrint = hashString<AFS::FingerPrint>(uniqueId);
-                    //other metadata to hash e.g. create fact? => not available on Linux-hosted FTP!
+                    if (startsWithAsciiNoCase(fact, "type=")) //must be case-insensitive!!!
+                    {
+                        const std::string_view tmp = afterFirst(fact, '=', IfNotFoundReturn::none);
+                        typeFact = beforeFirst(tmp, ':', IfNotFoundReturn::all);
+                    }
+                    else if (startsWithAsciiNoCase(fact, "size="))
+                        fileSize = afterFirst(fact, '=', IfNotFoundReturn::none);
+                    else if (startsWithAsciiNoCase(fact, "modify="))
+                    {
+                        std::string_view modifyFact = afterFirst(fact, '=', IfNotFoundReturn::none);
+                        modifyFact = beforeLast(modifyFact, '.', IfNotFoundReturn::all); //truncate millisecond precision if available
+
+                        const TimeComp tc = parseTime("%Y%m%d%H%M%S", modifyFact);
+                        if (tc == TimeComp())
+                            throw SysError(L"Modification time is invalid.");
+
+                        if (const auto [modTime, timeValid] = utcToTimeT(tc);
+                            timeValid)
+                            item.modTime = modTime;
+                        else
+                            throw SysError(L"Modification time is invalid.");
+                    }
+                    else if (startsWithAsciiNoCase(fact, "unique="))
+                    {
+                        /*  https://tools.ietf.org/html/rfc3659#section-7.5.2
+                            "The mapping between files, and unique fact tokens should be maintained, [...] for
+                             *at least* the lifetime of the control connection from user-PI to server-PI."
+
+                            => not necessarily *persistent* as far as the RFC goes!
+                               BUT: practially this will be the inode ID/file index, so we can assume persistence */
+                        const std::string_view uniqueId = afterFirst(fact, '=', IfNotFoundReturn::none);
+                        assert(!uniqueId.empty());
+                        item.filePrint = hashString<AFS::FingerPrint>(uniqueId);
+                        //other metadata to hash e.g. create fact? => not available on Linux-hosted FTP!
+                    }
                 }
+            });
 
             if (equalAsciiNoCase(typeFact, "cdir"))
                 return {AFS::ItemType::folder, Zstr("."), 0, 0};
@@ -1244,9 +1252,9 @@ private:
 
             if (item.type == AFS::ItemType::file)
             {
-                if (!fileSize)
-                    throw SysError(L"File size not available.");
-                item.fileSize = *fileSize;
+                if (fileSize.empty() || !std::all_of(fileSize.begin(), fileSize.end(), &isDigit<char>))
+                    throw SysError(L"File size not available."); //crazy, but can be "-1": https://freefilesync.org/forum/viewtopic.php?t=9720#p35757
+                item.fileSize = stringTo<uint64_t>(fileSize);
             }
             return item;
         }
@@ -1266,7 +1274,7 @@ private:
     //"ls -l"
     static std::vector<FtpItem> parseUnix(const std::string& buf, FtpSession& session) //throw SysError
     {
-        const std::vector<std::string> lines = splitFtpResponse(buf);
+        const std::vector<std::string_view> lines = splitFtpResponse(buf);
         auto it = lines.begin();
 
         if (it != lines.end() && startsWith(*it, "total "))
@@ -1314,7 +1322,7 @@ private:
         return output;
     }
 
-    static FtpItem parseUnixLine(const std::string& rawLine, time_t utcTimeNow, int utcCurrentYear, bool haveGroup, FtpSession& session) //throw SysError
+    static FtpItem parseUnixLine(const std::string_view& rawLine, time_t utcTimeNow, int utcCurrentYear, bool haveGroup, FtpSession& session) //throw SysError
     {
         /*  total 4953                                                  <- optional first line
             drwxr-xr-x 1 root root    4096 Jan 10 11:58 version
@@ -1344,7 +1352,7 @@ private:
         {
             FtpLineParser parser(rawLine);
 
-            const std::string typeTag = parser.readRange(1, [](char c) //throw SysError
+            const std::string_view typeTag = parser.readRange(1, [](char c) //throw SysError
             {
                 return c == '-' || c == 'b' || c == 'c' || c == 'd' || c == 'l' || c == 'p' || c == 's';
             });
@@ -1375,8 +1383,8 @@ private:
             const uint64_t fileSize = stringTo<uint64_t>(parser.readRange(&isDigit<char>)); //throw SysError
             parser.readRange(&isWhiteSpace<char>);                                          //throw SysError
             //------------------------------------------------------------------------------------
-            const std::string monthStr = parser.readRange(std::not_fn(isWhiteSpace<char>)); //throw SysError
-            parser.readRange(&isWhiteSpace<char>);                                                  //throw SysError
+            const std::string_view monthStr = parser.readRange(std::not_fn(isWhiteSpace<char>)); //throw SysError
+            parser.readRange(&isWhiteSpace<char>);                                               //throw SysError
 
             const char* months[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
             auto itMonth = std::find_if(std::begin(months), std::end(months), [&](const char* name) { return equalAsciiNoCase(name, monthStr); });
@@ -1388,8 +1396,8 @@ private:
             if (day < 1 || day > 31)
                 throw SysError(L"Failed to parse day of month.");
             //------------------------------------------------------------------------------------
-            const std::string timeOrYear = parser.readRange([](char c) { return c == ':' || isDigit(c); }); //throw SysError
-            parser.readRange(&isWhiteSpace<char>);                                                          //throw SysError
+            const std::string_view timeOrYear = parser.readRange([](char c) { return c == ':' || isDigit(c); }); //throw SysError
+            parser.readRange(&isWhiteSpace<char>);                                                               //throw SysError
 
             TimeComp timeComp;
             timeComp.month = 1 + static_cast<int>(itMonth - std::begin(months));
@@ -1400,7 +1408,7 @@ private:
                 const int hour   = stringTo<int>(beforeFirst(timeOrYear, ':', IfNotFoundReturn::none));
                 const int minute = stringTo<int>(afterFirst (timeOrYear, ':', IfNotFoundReturn::none));
                 if (hour < 0 || hour > 23 || minute < 0 || minute > 59)
-                    throw SysError(L"Failed to parse file time.");
+                    throw SysError(L"Failed to parse modification time.");
 
                 timeComp.hour   = hour;
                 timeComp.minute = minute;
@@ -1408,7 +1416,7 @@ private:
 
                 const auto [serverLocalTime, timeValid] = utcToTimeT(timeComp);
                 if (!timeValid)
-                    throw SysError(L"Modification time could not be parsed.");
+                    throw SysError(L"Modification time is invalid.");
 
                 if (serverLocalTime > utcTimeNow + 24 * 3600 ) //time-zones range from UTC-12:00 to UTC+14:00, consider DST; FileZilla uses 1 day tolerance
                     --timeComp.year; //"more likely" this time is from last year
@@ -1418,19 +1426,19 @@ private:
                 timeComp.year = stringTo<int>(timeOrYear);
 
                 if (timeComp.year < 1600 || timeComp.year > utcCurrentYear + 1 /*leeway*/)
-                    throw SysError(L"Failed to parse file time.");
+                    throw SysError(L"Failed to parse modification time.");
             }
             else
-                throw SysError(L"Failed to parse file time.");
+                throw SysError(L"Failed to parse modification time.");
 
             //let's pretend the time listing is UTC (same behavior as FileZilla): hopefully MLSD will make this mess obsolete soon...
             //  => find exact offset with some MDTM hackery? yes, could do that, but this doesn't solve the bigger problem of imprecise LIST file times, so why bother?
             const auto [modTime, timeValid] = utcToTimeT(timeComp);
             if (!timeValid)
-                throw SysError(L"Modification time could not be parsed.");
+                throw SysError(L"Modification time is invalid.");
             //------------------------------------------------------------------------------------
-            const std::string trail = parser.readRange([](char) { return true; }); //throw SysError
-            std::string itemName;
+            const std::string_view trail = parser.readRange([](char) { return true; }); //throw SysError
+            std::string_view itemName;
             if (typeTag == "l")
                 itemName = beforeFirst(trail, " -> ", IfNotFoundReturn::none);
             else
@@ -1492,21 +1500,21 @@ private:
         const int utcCurrentYear = tc.year;
 
         std::vector<FtpItem> output;
-        for (const std::string& line : splitFtpResponse(buf))
+        for (const std::string_view& line : splitFtpResponse(buf))
         {
             try
             {
                 FtpLineParser parser(line);
 
-                const int month = stringTo<int>(parser.readRange(2, &isDigit<char>));     //throw SysError
-                parser.readRange(1, [](char c) { return c == '-' || c == '/'; });         //throw SysError
-                const int day = stringTo<int>(parser.readRange(2, &isDigit<char>));       //throw SysError
-                parser.readRange(1, [](char c) { return c == '-' || c == '/'; });         //throw SysError
-                const std::string yearString = parser.readRange(&isDigit<char>);          //throw SysError
-                parser.readRange(&isWhiteSpace<char>);                                    //throw SysError
+                const int month = stringTo<int>(parser.readRange(2, &isDigit<char>)); //throw SysError
+                parser.readRange(1, [](char c) { return c == '-' || c == '/'; });     //throw SysError
+                const int day = stringTo<int>(parser.readRange(2, &isDigit<char>));   //throw SysError
+                parser.readRange(1, [](char c) { return c == '-' || c == '/'; });     //throw SysError
+                const std::string_view yearString = parser.readRange(&isDigit<char>); //throw SysError
+                parser.readRange(&isWhiteSpace<char>);                                //throw SysError
 
                 if (month < 1 || month > 12 || day < 1 || day > 31)
-                    throw SysError(L"Failed to parse file time.");
+                    throw SysError(L"Failed to parse modification time.");
 
                 int year = 0;
                 if (yearString.size() == 2)
@@ -1518,14 +1526,14 @@ private:
                 else if (yearString.size() == 4)
                     year = stringTo<int>(yearString);
                 else
-                    throw SysError(L"Failed to parse file time.");
+                    throw SysError(L"Failed to parse modification time.");
                 //------------------------------------------------------------------------------------
                 int hour = stringTo<int>(parser.readRange(2, &isDigit<char>));         //throw SysError
                 parser.readRange(1, [](char c) { return c == ':'; });                  //throw SysError
                 const int minute = stringTo<int>(parser.readRange(2, &isDigit<char>)); //throw SysError
                 if (!isWhiteSpace(parser.peekNextChar()))
                 {
-                    const std::string period = parser.readRange(2, [](char c) { return c == 'A' || c == 'P' || c == 'M'; }); //throw SysError
+                    const std::string_view period = parser.readRange(2, [](char c) { return c == 'A' || c == 'P' || c == 'M'; }); //throw SysError
                     if (period == "PM")
                     {
                         if (0 <= hour && hour < 12)
@@ -1537,7 +1545,7 @@ private:
                 parser.readRange(&isWhiteSpace<char>); //throw SysError
 
                 if (hour < 0 || hour > 23 || minute < 0 || minute > 59)
-                    throw SysError(L"Failed to parse file time.");
+                    throw SysError(L"Failed to parse modification time.");
                 //------------------------------------------------------------------------------------
                 TimeComp timeComp;
                 timeComp.year   = year;
@@ -1549,24 +1557,24 @@ private:
                 //  => find exact offset with some MDTM hackery? yes, could do that, but this doesn't solve the bigger problem of imprecise LIST file times, so why bother?
                 const auto [modTime, timeValid] = utcToTimeT(timeComp);
                 if (!timeValid)
-                    throw SysError(L"Modification time could not be parsed.");
+                    throw SysError(L"Modification time is invalid.");
                 //------------------------------------------------------------------------------------
-                const std::string dirTagOrSize = parser.readRange(std::not_fn(isWhiteSpace<char>)); //throw SysError
+                const std::string_view dirTagOrSize = parser.readRange(std::not_fn(isWhiteSpace<char>)); //throw SysError
                 parser.readRange(&isWhiteSpace<char>); //throw SysError
 
                 const bool isDir = dirTagOrSize == "<DIR>";
                 uint64_t fileSize = 0;
                 if (!isDir)
                 {
-                    std::string sizeStr = dirTagOrSize;
+                    std::string sizeStr(dirTagOrSize);
                     replace(sizeStr, ',', "");
                     replace(sizeStr, '.', "");
-                    if (!std::all_of(sizeStr.begin(), sizeStr.end(), &isDigit<char>))
+                    if (sizeStr.empty() || !std::all_of(sizeStr.begin(), sizeStr.end(), &isDigit<char>))
                         throw SysError(L"Failed to parse file size.");
                     fileSize = stringTo<uint64_t>(sizeStr);
                 }
                 //------------------------------------------------------------------------------------
-                const std::string itemName = parser.readRange([](char) { return true; }); //throw SysError
+                const std::string_view itemName = parser.readRange([](char) { return true; }); //throw SysError
                 if (itemName.empty())
                     throw SysError(L"Folder contains an item without name.");
 
@@ -2065,10 +2073,10 @@ private:
 
         try
         {
-        const Zstring itemName = getItemName(itemPath);
-        assert(!itemName.empty());
+            const Zstring itemName = getItemName(itemPath);
+            assert(!itemName.empty());
 
-        traverseFolderFlat(*parentAfsPath, //throw FileError
+            traverseFolderFlat(*parentAfsPath, //throw FileError
             [&](const    FileInfo& fi) { if (fi.itemName == itemName) throw ItemType::file;    },
             [&](const  FolderInfo& fi) { if (fi.itemName == itemName) throw ItemType::folder;  },
             [&](const SymlinkInfo& si) { if (si.itemName == itemName) throw ItemType::symlink; });
@@ -2424,33 +2432,37 @@ AbstractPath fff::createItemPathFtp(const Zstring& itemPathPhrase) //noexcept
         pathPhrase = pathPhrase.c_str() + strLength(ftpPrefix);
     trim(pathPhrase, true, false, [](Zchar c) { return c == Zstr('/') || c == Zstr('\\'); });
 
-    const Zstring credentials = beforeFirst(pathPhrase, Zstr('@'), IfNotFoundReturn::none);
-    const Zstring fullPathOpt =  afterFirst(pathPhrase, Zstr('@'), IfNotFoundReturn::all);
+    const ZstringView credentials = beforeFirst<ZstringView>(pathPhrase, Zstr('@'), IfNotFoundReturn::none);
+    const ZstringView fullPathOpt =  afterFirst<ZstringView>(pathPhrase, Zstr('@'), IfNotFoundReturn::all);
 
     FtpLogin login;
-    login.username = decodeFtpUsername(beforeFirst(credentials, Zstr(':'), IfNotFoundReturn::all)); //support standard FTP syntax, even though
-    login.password =                    afterFirst(credentials, Zstr(':'), IfNotFoundReturn::none); //concatenateFtpFolderPathPhrase() uses "pass64" instead
+    login.username = decodeFtpUsername(Zstring(beforeFirst(credentials, Zstr(':'), IfNotFoundReturn::all))); //support standard FTP syntax, even though
+    login.password =                   Zstring( afterFirst(credentials, Zstr(':'), IfNotFoundReturn::none)); //concatenateFtpFolderPathPhrase() uses "pass64" instead
 
-    const Zstring fullPath = beforeFirst(fullPathOpt, Zstr('|'), IfNotFoundReturn::all);
-    const Zstring options  =  afterFirst(fullPathOpt, Zstr('|'), IfNotFoundReturn::none);
+    const ZstringView fullPath = beforeFirst(fullPathOpt, Zstr('|'), IfNotFoundReturn::all);
+    const ZstringView options  =  afterFirst(fullPathOpt, Zstr('|'), IfNotFoundReturn::none);
 
     auto it = std::find_if(fullPath.begin(), fullPath.end(), [](Zchar c) { return c == '/' || c == '\\'; });
-    const Zstring serverPort(fullPath.begin(), it);
+    const ZstringView serverPort = makeStringView(fullPath.begin(), it);
     const AfsPath serverRelPath = sanitizeDeviceRelativePath({it, fullPath.end()});
 
-    login.server       = beforeLast(serverPort, Zstr(':'), IfNotFoundReturn::all);
-    const Zstring port =  afterLast(serverPort, Zstr(':'), IfNotFoundReturn::none);
+    login.server           = Zstring(beforeLast(serverPort, Zstr(':'), IfNotFoundReturn::all));
+    const ZstringView port =          afterLast(serverPort, Zstr(':'), IfNotFoundReturn::none);
     login.port = stringTo<int>(port); //0 if empty
 
-    for (const Zstring& optPhrase : split(options, Zstr('|'), SplitOnEmpty::skip))
-        if (startsWith(optPhrase, Zstr("timeout=")))
-            login.timeoutSec = stringTo<int>(afterFirst(optPhrase, Zstr("="), IfNotFoundReturn::none));
-        else if (optPhrase == Zstr("ssl"))
-            login.useTls = true;
-        else if (startsWith(optPhrase, Zstr("pass64=")))
-            login.password = decodePasswordBase64(afterFirst(optPhrase, Zstr("="), IfNotFoundReturn::none));
-        else
-            assert(false);
-
+    split(options, Zstr('|'), [&](const ZstringView optPhrase)
+    {
+        if (!optPhrase.empty())
+        {
+            if (startsWith(optPhrase, Zstr("timeout=")))
+                login.timeoutSec = stringTo<int>(afterFirst(optPhrase, Zstr("="), IfNotFoundReturn::none));
+            else if (optPhrase == Zstr("ssl"))
+                login.useTls = true;
+            else if (startsWith(optPhrase, Zstr("pass64=")))
+                login.password = decodePasswordBase64(afterFirst(optPhrase, Zstr("="), IfNotFoundReturn::none));
+            else
+                assert(false);
+        }
+    });
     return AbstractPath(makeSharedRef<FtpFileSystem>(login), serverRelPath);
 }
diff --git a/FreeFileSync/Source/afs/ftp_common.h b/FreeFileSync/Source/afs/ftp_common.h
index c843a943..211844c0 100644
--- a/FreeFileSync/Source/afs/ftp_common.h
+++ b/FreeFileSync/Source/afs/ftp_common.h
@@ -14,7 +14,7 @@
 namespace fff
 {
 inline
-Zstring encodePasswordBase64(const Zstring& pass)
+Zstring encodePasswordBase64(const ZstringView pass)
 {
     using namespace zen;
     return utfTo<Zstring>(stringEncodeBase64(utfTo<std::string>(pass))); //nothrow
@@ -22,7 +22,7 @@ Zstring encodePasswordBase64(const Zstring& pass)
 
 
 inline
-Zstring decodePasswordBase64(const Zstring& pass)
+Zstring decodePasswordBase64(const ZstringView pass)
 {
     using namespace zen;
     return utfTo<Zstring>(stringDecodeBase64(utfTo<std::string>(pass))); //nothrow
diff --git a/FreeFileSync/Source/afs/gdrive.cpp b/FreeFileSync/Source/afs/gdrive.cpp
index bb367484..ae89f367 100644
--- a/FreeFileSync/Source/afs/gdrive.cpp
+++ b/FreeFileSync/Source/afs/gdrive.cpp
@@ -213,7 +213,7 @@ public:
 
         //create new HTTP session outside the lock: 1. don't block other threads 2. non-atomic regarding "sessionStore"! => one session too many is not a problem!
         if (!httpSession)
-            httpSession = std::make_unique<HttpInitSession>(getLibsshCurlUnifiedInitCookie(httpSessionCount), login.server, caCertFilePath_); //throw SysError
+            httpSession = std::make_unique<HttpInitSession>(login.server, caCertFilePath_); //throw SysError
 
         ZEN_ON_SCOPE_EXIT(
             if (isHealthy(httpSession->session)) //thread that created the "!isHealthy()" session is responsible for clean up (avoid hitting server connection limits!)
@@ -229,10 +229,10 @@ private:
     //associate session counting (for initialization/teardown)
     struct HttpInitSession
     {
-        HttpInitSession(std::shared_ptr<UniCounterCookie> cook, const Zstring& server, const Zstring& caCertFilePath) :
-            cookie(std::move(cook)), session(server, true /*useTls*/, caCertFilePath) {}
+        HttpInitSession(const Zstring& server, const Zstring& caCertFilePath) :
+            session(server, true /*useTls*/, caCertFilePath) {}
 
-        std::shared_ptr<UniCounterCookie> cookie;
+        const std::shared_ptr<UniCounterCookie> cookie{getLibsshCurlUnifiedInitCookie(httpSessionCount)}; //throw SysError
         HttpSession session; //life time must be subset of UniCounterCookie
     };
     static bool isHealthy(const HttpSession& s) { return std::chrono::steady_clock::now() - s.getLastUseTime() <= HTTP_SESSION_MAX_IDLE_TIME; }
@@ -595,7 +595,7 @@ GdriveAccessInfo gdriveAuthorizeAccess(const std::string& gdriveLoginHint, const
         std::string error;
 
         //parse header; e.g.: GET http://127.0.0.1:62054/?code=4/ZgBRsB9k68sFzc1Pz1q0__Kh17QK1oOmetySrGiSliXt6hZtTLUlYzm70uElNTH9vt1OqUMzJVeFfplMsYsn4uI HTTP/1.1
-        const std::vector<std::string> statusItems = split(reqLine, ' ', SplitOnEmpty::allow); //Method SP Request-URI SP HTTP-Version CRLF
+        const std::vector<std::string_view> statusItems = splitCpy<std::string_view>(reqLine, ' ', SplitOnEmpty::allow); //Method SP Request-URI SP HTTP-Version CRLF
 
         if (statusItems.size() == 3 && statusItems[0] == "GET" && startsWith(statusItems[2], "HTTP/"))
         {
@@ -947,11 +947,11 @@ GdriveItemDetails extractItemDetails(const JsonValue& jvalue) //throw SysError
     //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')');
+        throw SysError(L"Modification time is invalid. (" + utfTo<std::wstring>(*modifiedTime) + L')');
 
     const auto [modTime, timeValid] = utcToTimeT(tc);
     if (!timeValid)
-        throw SysError(L"Modification time could not be parsed. (" + utfTo<std::wstring>(*modifiedTime) + L')');
+        throw SysError(L"Modification time is invalid. (" + utfTo<std::wstring>(*modifiedTime) + L')');
 
     std::vector<std::string> parentIds;
     if (parents) //item without "parents" array is possible! e.g. 1. shared item located in "Shared with me", referenced via a Shortcut 2. root folder under "Computers"
@@ -1957,7 +1957,7 @@ public:
     };
     PathStatus getPathStatus(const std::string& locationRootId, const AfsPath& itemPath, bool followLeafShortcut) //throw SysError
     {
-        const std::vector<Zstring> relPath = split(itemPath.value, FILE_NAME_SEPARATOR, SplitOnEmpty::skip);
+        const std::vector<Zstring> relPath = splitCpy(itemPath.value, FILE_NAME_SEPARATOR, SplitOnEmpty::skip);
         if (relPath.empty())
             return {locationRootId, GdriveItemType::folder, AfsPath(), {}};
         else
@@ -4033,22 +4033,28 @@ AbstractPath fff::createItemPathGdrive(const Zstring& itemPathPhrase) //noexcept
         pathPhrase = pathPhrase.c_str() + strLength(gdrivePrefix);
     trim(pathPhrase, true, false, [](Zchar c) { return c == Zstr('/') || c == Zstr('\\'); });
 
-    const Zstring fullPath = beforeFirst(pathPhrase, Zstr('|'), IfNotFoundReturn::all);
-    const Zstring options  =  afterFirst(pathPhrase, Zstr('|'), IfNotFoundReturn::none);
+    const ZstringView fullPath = beforeFirst<ZstringView>(pathPhrase, Zstr('|'), IfNotFoundReturn::all);
+    const ZstringView options  =  afterFirst<ZstringView>(pathPhrase, Zstr('|'), IfNotFoundReturn::none);
 
     auto it = std::find_if(fullPath.begin(), fullPath.end(), [](Zchar c) { return c == '/' || c == '\\'; });
-    const Zstring emailAndDrive(fullPath.begin(), it);
+    const ZstringView emailAndDrive = makeStringView(fullPath.begin(), it);
     const AfsPath itemPath = sanitizeDeviceRelativePath({it, fullPath.end()});
 
-    GdriveLogin login;
-    login.email        = utfTo<std::string>(beforeFirst(emailAndDrive, Zstr(':'), IfNotFoundReturn::all));
-    login.locationName =                    afterFirst (emailAndDrive, Zstr(':'), IfNotFoundReturn::none);
-
-    for (const Zstring& optPhrase : split(options, Zstr('|'), SplitOnEmpty::skip))
-        if (startsWith(optPhrase, Zstr("timeout=")))
-            login.timeoutSec = stringTo<int>(afterFirst(optPhrase, Zstr("="), IfNotFoundReturn::none));
-        else
-            assert(false);
+    GdriveLogin login
+    {
+        .email        = utfTo<std::string>(beforeFirst(emailAndDrive, Zstr(':'), IfNotFoundReturn::all)),
+        .locationName =            Zstring(afterFirst (emailAndDrive, Zstr(':'), IfNotFoundReturn::none)),
+    };
 
+    split(options, Zstr('|'), [&](const ZstringView optPhrase)
+    {
+        if (!optPhrase.empty())
+        {
+            if (startsWith(optPhrase, Zstr("timeout=")))
+                login.timeoutSec = stringTo<int>(afterFirst(optPhrase, Zstr("="), IfNotFoundReturn::none));
+            else
+                assert(false);
+        }
+    });
     return AbstractPath(makeSharedRef<GdriveFileSystem>(login), itemPath);
 }
diff --git a/FreeFileSync/Source/afs/native.cpp b/FreeFileSync/Source/afs/native.cpp
index 9b65dc4a..e62df793 100644
--- a/FreeFileSync/Source/afs/native.cpp
+++ b/FreeFileSync/Source/afs/native.cpp
@@ -309,12 +309,14 @@ void traverseFolderRecursiveNative(const std::vector<std::pair<Zstring, std::sha
 class RecycleSessionNative : public AFS::RecycleSession
 {
 public:
-    explicit RecycleSessionNative(const Zstring& baseFolderPath); //throw FileError, RecycleBinUnavailable
+    explicit RecycleSessionNative(const Zstring& baseFolderPath) : baseFolderPath_(baseFolderPath) {}
+    //constructor will be running on main thread => keep trivial and defer work to getRecyclerTempPath()!
 
     void moveToRecycleBin(const AbstractPath& itemPath, const Zstring& logicalRelPath) override; //throw FileError, RecycleBinUnavailable
     void tryCleanup(const std::function<void(const std::wstring& displayPath)>& notifyDeletionStatus /*throw X*/) override; //throw FileError, X
 
 private:
+    const Zstring baseFolderPath_;
 };
 
 //===========================================================================================================================
@@ -622,7 +624,10 @@ private:
                                        _("Operation not supported between different devices."));
         initComForThread(); //throw FileError
         const Zstring nativePathTarget = static_cast<const NativeFileSystem&>(pathTo.afsDevice.ref()).getNativePath(pathTo.afsPath);
+
         zen::moveAndRenameItem(getNativePath(pathFrom), nativePathTarget, false /*replaceExisting*/); //throw FileError, ErrorTargetExisting, ErrorMoveUnsupported
+        //may fail with ERROR_ALREADY_EXISTS despite previously existing file already deleted
+        //=> reason: corrupted disk, fixable via Windows error checking! https://freefilesync.org/forum/viewtopic.php?t=9776
     }
 
     bool supportsPermissions(const AfsPath& folderPath) const override //throw FileError
@@ -667,10 +672,10 @@ private:
         return zen::getFreeDiskSpace(getNativePath(folderPath)); //throw FileError
     }
 
-    std::unique_ptr<RecycleSession> createRecyclerSession(const AfsPath& folderPath) const override //throw FileError, RecycleBinUnavailable
+    std::unique_ptr<RecycleSession> createRecyclerSession(const AfsPath& folderPath) const override //throw FileError, (RecycleBinUnavailable)
     {
         initComForThread(); //throw FileError
-        return std::make_unique<RecycleSessionNative>(getNativePath(folderPath)); //throw FileError, RecycleBinUnavailable
+        return std::make_unique<RecycleSessionNative>(getNativePath(folderPath));
     }
 
     //fails if item is not existing
@@ -685,8 +690,6 @@ private:
 
 //===========================================================================================================================
 
-RecycleSessionNative::RecycleSessionNative(const Zstring& baseFolderPath)
-{}
 
 
 //- fails if item is not existing
diff --git a/FreeFileSync/Source/afs/sftp.cpp b/FreeFileSync/Source/afs/sftp.cpp
index 0cf5c43b..2a35587d 100644
--- a/FreeFileSync/Source/afs/sftp.cpp
+++ b/FreeFileSync/Source/afs/sftp.cpp
@@ -198,8 +198,7 @@ class SshSession
 {
 public:
     SshSession(const SshSessionId& sessionId, int timeoutSec) : //throw SysError
-        sessionId_(sessionId),
-        libsshCurlUnifiedInitCookie_(getLibsshCurlUnifiedInitCookie(globalSftpSessionCount)) //throw SysError
+        sessionId_(sessionId)
     {
         ZEN_ON_SCOPE_FAIL(cleanup()); //destructor call would lead to member double clean-up!!!
 
@@ -244,16 +243,19 @@ public:
             bool supportAuthPassword    = false;
             bool supportAuthKeyfile     = false;
             bool supportAuthInteractive = false;
-            for (const std::string& str : split<std::string>(authList, ',', SplitOnEmpty::skip))
+            split(authList, ',', [&](std::string_view authMethod)
             {
-                const std::string authMethod = trimCpy(str);
-                if (authMethod == "password")
-                    supportAuthPassword = true;
-                else if (authMethod == "publickey")
-                    supportAuthKeyfile = true;
-                else if (authMethod == "keyboard-interactive")
-                    supportAuthInteractive = true;
-            }
+                authMethod = trimCpy(authMethod);
+                if (!authMethod.empty())
+                {
+                    if (authMethod == "password")
+                        supportAuthPassword = true;
+                    else if (authMethod == "publickey")
+                        supportAuthKeyfile = true;
+                    else if (authMethod == "keyboard-interactive")
+                        supportAuthInteractive = true;
+                }
+            });
 
             switch (sessionId_.authType)
             {
@@ -280,7 +282,7 @@ public:
                             }
                             else
                                 for (int i = 0; i < num_prompts; ++i)
-                                    unexpectedPrompts += (unexpectedPrompts.empty() ? L"" : L"|") + utfTo<std::wstring>(std::string(prompts[i].text, prompts[i].length));
+                                    unexpectedPrompts += (unexpectedPrompts.empty() ? L"" : L"|") + utfTo<std::wstring>(makeStringView(reinterpret_cast<const char*>(prompts[i].text), prompts[i].length));
                         };
                         using AuthCbType = decltype(authCallback);
 
@@ -689,7 +691,7 @@ private:
     SftpNonBlockInfo nbInfo_; //for SSH session, e.g. libssh2_sftp_init()
 
     const SshSessionId sessionId_;
-    const std::shared_ptr<UniCounterCookie> libsshCurlUnifiedInitCookie_;
+    const std::shared_ptr<UniCounterCookie> libsshCurlUnifiedInitCookie_{(getLibsshCurlUnifiedInitCookie(globalSftpSessionCount))}; //throw SysError
     std::chrono::steady_clock::time_point lastSuccessfulUseTime_; //...of the SSH session (but not necessarily the SFTP functionality!)
 };
 
@@ -1937,44 +1939,48 @@ AbstractPath fff::createItemPathSftp(const Zstring& itemPathPhrase) //noexcept
         pathPhrase = pathPhrase.c_str() + strLength(sftpPrefix);
     trim(pathPhrase, true, false, [](Zchar c) { return c == Zstr('/') || c == Zstr('\\'); });
 
-    const Zstring credentials = beforeFirst(pathPhrase, Zstr('@'), IfNotFoundReturn::none);
-    const Zstring fullPathOpt =  afterFirst(pathPhrase, Zstr('@'), IfNotFoundReturn::all);
+    const ZstringView credentials = beforeFirst<ZstringView>(pathPhrase, Zstr('@'), IfNotFoundReturn::none);
+    const ZstringView fullPathOpt =  afterFirst<ZstringView>(pathPhrase, Zstr('@'), IfNotFoundReturn::all);
 
     SftpLogin login;
-    login.username = decodeFtpUsername(beforeFirst(credentials, Zstr(':'), IfNotFoundReturn::all)); //support standard FTP syntax, even though
-    login.password =                    afterFirst(credentials, Zstr(':'), IfNotFoundReturn::none); //concatenateSftpFolderPathPhrase() uses "pass64" instead
+    login.username = decodeFtpUsername(Zstring(beforeFirst(credentials, Zstr(':'), IfNotFoundReturn::all))); //support standard FTP syntax, even though
+    login.password =                   Zstring( afterFirst(credentials, Zstr(':'), IfNotFoundReturn::none)); //concatenateSftpFolderPathPhrase() uses "pass64" instead
 
-    const Zstring fullPath = beforeFirst(fullPathOpt, Zstr('|'), IfNotFoundReturn::all);
-    const Zstring options  =  afterFirst(fullPathOpt, Zstr('|'), IfNotFoundReturn::none);
+    const ZstringView fullPath = beforeFirst(fullPathOpt, Zstr('|'), IfNotFoundReturn::all);
+    const ZstringView options  =  afterFirst(fullPathOpt, Zstr('|'), IfNotFoundReturn::none);
 
     auto it = std::find_if(fullPath.begin(), fullPath.end(), [](Zchar c) { return c == '/' || c == '\\'; });
-    const Zstring serverPort(fullPath.begin(), it);
+    const ZstringView serverPort = makeStringView(fullPath.begin(), it);
     const AfsPath serverRelPath = sanitizeDeviceRelativePath({it, fullPath.end()});
 
-    login.server       = beforeLast(serverPort, Zstr(':'), IfNotFoundReturn::all);
-    const Zstring port =  afterLast(serverPort, Zstr(':'), IfNotFoundReturn::none);
+    login.server           = Zstring(beforeLast(serverPort, Zstr(':'), IfNotFoundReturn::all));
+    const ZstringView port =          afterLast(serverPort, Zstr(':'), IfNotFoundReturn::none);
     login.port = stringTo<int>(port); //0 if empty
 
     assert(login.allowZlib == false);
 
-    for (const Zstring& optPhrase : split(options, Zstr('|'), SplitOnEmpty::skip))
-        if (startsWith(optPhrase, Zstr("timeout=")))
-            login.timeoutSec = stringTo<int>(afterFirst(optPhrase, Zstr("="), IfNotFoundReturn::none));
-        else if (startsWith(optPhrase, Zstr("chan=")))
-            login.traverserChannelsPerConnection = stringTo<int>(afterFirst(optPhrase, Zstr("="), IfNotFoundReturn::none));
-        else if (startsWith(optPhrase, Zstr("keyfile=")))
+    split(options, Zstr('|'), [&](const ZstringView optPhrase)
+    {
+        if (!optPhrase.empty())
         {
-            login.authType = SftpAuthType::keyFile;
-            login.privateKeyFilePath = getResolvedFilePath(afterFirst(optPhrase, Zstr("="), IfNotFoundReturn::none));
+            if (startsWith(optPhrase, Zstr("timeout=")))
+                login.timeoutSec = stringTo<int>(afterFirst(optPhrase, Zstr("="), IfNotFoundReturn::none));
+            else if (startsWith(optPhrase, Zstr("chan=")))
+                login.traverserChannelsPerConnection = stringTo<int>(afterFirst(optPhrase, Zstr("="), IfNotFoundReturn::none));
+            else if (startsWith(optPhrase, Zstr("keyfile=")))
+            {
+                login.authType = SftpAuthType::keyFile;
+                login.privateKeyFilePath = getResolvedFilePath(Zstring(afterFirst(optPhrase, Zstr("="), IfNotFoundReturn::none)));
+            }
+            else if (optPhrase == Zstr("agent"))
+                login.authType = SftpAuthType::agent;
+            else if (startsWith(optPhrase, Zstr("pass64=")))
+                login.password = decodePasswordBase64(afterFirst(optPhrase, Zstr("="), IfNotFoundReturn::none));
+            else if (optPhrase == Zstr("zlib"))
+                login.allowZlib = true;
+            else
+                assert(false);
         }
-        else if (optPhrase == Zstr("agent"))
-            login.authType = SftpAuthType::agent;
-        else if (startsWith(optPhrase, Zstr("pass64=")))
-            login.password = decodePasswordBase64(afterFirst(optPhrase, Zstr("="), IfNotFoundReturn::none));
-        else if (optPhrase == Zstr("zlib"))
-            login.allowZlib = true;
-        else
-            assert(false);
-
+    });
     return AbstractPath(makeSharedRef<SftpFileSystem>(login), serverRelPath);
 }
diff --git a/FreeFileSync/Source/base/algorithm.cpp b/FreeFileSync/Source/base/algorithm.cpp
index ac80d5c0..7a1bde0b 100644
--- a/FreeFileSync/Source/base/algorithm.cpp
+++ b/FreeFileSync/Source/base/algorithm.cpp
@@ -1071,8 +1071,8 @@ std::optional<PathDependency> fff::getPathDependency(const AbstractPath& folderP
     {
         if (folderPathL.afsDevice == folderPathR.afsDevice)
         {
-            const std::vector<Zstring> relPathL = split(folderPathL.afsPath.value, FILE_NAME_SEPARATOR, SplitOnEmpty::skip);
-            const std::vector<Zstring> relPathR = split(folderPathR.afsPath.value, FILE_NAME_SEPARATOR, SplitOnEmpty::skip);
+            const std::vector<Zstring> relPathL = splitCpy(folderPathL.afsPath.value, FILE_NAME_SEPARATOR, SplitOnEmpty::skip);
+            const std::vector<Zstring> relPathR = splitCpy(folderPathR.afsPath.value, FILE_NAME_SEPARATOR, SplitOnEmpty::skip);
 
             const bool leftParent = relPathL.size() <= relPathR.size();
 
@@ -1520,7 +1520,7 @@ void fff::deleteListOfFiles(const std::vector<Zstring>& filesToDeletePaths,
                     cb.reportWarning(e.toString() + L"\n\n" + _("Ignore and delete permanently each time recycle bin is unavailable?"), warnRecyclerMissing); //throw X
                 }
                 cb.logMessage(replaceCpy(_("Deleting file %x"), L"%x", fmtPath(AFS::getDisplayPath(cfgPath))) +
-                                    L" [" + _("The recycle bin is not available") + L']', PhaseCallback::MsgType::warning); //throw X
+                              L" [" + _("The recycle bin is not available") + L']', PhaseCallback::MsgType::warning); //throw X
                 AFS::removeFileIfExists(cfgPath); //throw FileError
             }
         else
diff --git a/FreeFileSync/Source/base/comparison.cpp b/FreeFileSync/Source/base/comparison.cpp
index 220da036..51ee0237 100644
--- a/FreeFileSync/Source/base/comparison.cpp
+++ b/FreeFileSync/Source/base/comparison.cpp
@@ -765,13 +765,13 @@ void matchFolders(const MapType& mapLeft, const MapType& mapRight, ProcessLeftOn
     {
         //perf: buffer ZstringNoCase instead of compareNoCase()/equalNoCase()? => makes no (significant) difference!
         const typename MapType::value_type* ref;
-        bool leftSide;
+        SelectSide side;
     };
     std::vector<FileRef> fileList;
     fileList.reserve(mapLeft.size() + mapRight.size()); //perf: ~5% shorter runtime
 
-    for (const auto& item : mapLeft ) fileList.push_back({&item, true });
-    for (const auto& item : mapRight) fileList.push_back({&item, false});
+    for (const auto& item : mapLeft ) fileList.push_back({&item, SelectSide::left});
+    for (const auto& item : mapRight) fileList.push_back({&item, SelectSide::right});
 
     //primary sort: ignore Unicode normal form and upper/lower case
     //bonus: natural default sequence on UI file grid
@@ -780,12 +780,12 @@ void matchFolders(const MapType& mapLeft, const MapType& mapRight, ProcessLeftOn
     using ItType = typename std::vector<FileRef>::iterator;
     auto tryMatchRange = [&](ItType it, ItType itLast) //auto parameters? compiler error on VS 17.2...
     {
-        const size_t equalCountL = std::count_if(it, itLast, [](const FileRef& fr) { return fr.leftSide; });
+        const size_t equalCountL = std::count_if(it, itLast, [](const FileRef& fr) { return fr.side == SelectSide::left; });
         const size_t equalCountR = itLast - it - equalCountL;
 
         if (equalCountL == 1 && equalCountR == 1) //we have a match
         {
-            if (it->leftSide)
+            if (it->side == SelectSide::left)
                 bo(*it[0].ref, *it[1].ref);
             else
                 bo(*it[1].ref, *it[0].ref);
@@ -817,7 +817,7 @@ void matchFolders(const MapType& mapLeft, const MapType& mapRight, ProcessLeftOn
                     const Zstringc& conflictMsg = getConflictAmbiguousItemName(itCase->ref->first);
                     std::for_each(itCase, itEndCase, [&](const FileRef& fr)
                     {
-                        if (fr.leftSide)
+                        if (fr.side == SelectSide::left)
                             lo(*fr.ref, &conflictMsg);
                         else
                             ro(*fr.ref, &conflictMsg);
diff --git a/FreeFileSync/Source/base/db_file.cpp b/FreeFileSync/Source/base/db_file.cpp
index 3af5a36b..2f8b1048 100644
--- a/FreeFileSync/Source/base/db_file.cpp
+++ b/FreeFileSync/Source/base/db_file.cpp
@@ -27,8 +27,6 @@ const int DB_FILE_VERSION   = 11; //2020-02-07
 const int DB_STREAM_VERSION =  4; //2021-02-14
 //-------------------------------------------------------------------------------------------------------------------------------
 
-DEFINE_NEW_FILE_ERROR(FileErrorDatabaseNotExisting)
-
 struct SessionData
 {
     bool isLeadStream = false;
@@ -104,7 +102,10 @@ void saveStreams(const DbStreams& streamList, const AbstractPath& dbPath, const
 }
 
 
-DbStreams loadStreams(const AbstractPath& dbPath, const IoCallback& notifyUnbufferedIO /*throw X*/) //throw FileError, FileErrorDatabaseNotExisting, X
+DEFINE_NEW_FILE_ERROR(FileErrorDatabaseNotExisting)
+DEFINE_NEW_FILE_ERROR(FileErrorDatabaseCorrupted)
+
+DbStreams loadStreams(const AbstractPath& dbPath, const IoCallback& notifyUnbufferedIO /*throw X*/) //throw FileError, FileErrorDatabaseNotExisting, FileErrorDatabaseCorrupted, X
 {
     std::string byteStream;
     try
@@ -190,7 +191,7 @@ DbStreams loadStreams(const AbstractPath& dbPath, const IoCallback& notifyUnbuff
     }
     catch (const SysError& e)
     {
-        throw FileError(replaceCpy(_("Cannot read database file %x."), L"%x", fmtPath(AFS::getDisplayPath(dbPath))), e.toString());
+        throw FileErrorDatabaseCorrupted(replaceCpy(_("Cannot read database file %x."), L"%x", fmtPath(AFS::getDisplayPath(dbPath))), e.toString());
     }
 }
 
@@ -810,17 +811,16 @@ std::unordered_map<const BaseFolderPair*, SharedRef<const InSyncFolder>> fff::lo
         for (const AbstractPath& dbPath : dbFilePaths)
             parallelWorkload.emplace_back(dbPath, [&dbStreamsByPathShared](ParallelContext& ctx) //throw ThreadStopRequest
         {
-            StreamStatusNotifier notifyLoad(replaceCpy(_("Loading file %x..."), L"%x", fmtPath(AFS::getDisplayPath(ctx.itemPath))), ctx.acb);
-
             tryReportingError([&] //throw ThreadStopRequest
             {
+                StreamStatusNotifier notifyLoad(replaceCpy(_("Loading file %x..."), L"%x", fmtPath(AFS::getDisplayPath(ctx.itemPath))), ctx.acb);
                 try
                 {
-                    DbStreams dbStreams = ::loadStreams(ctx.itemPath, notifyLoad); //throw FileError, FileErrorDatabaseNotExisting, ThreadStopRequest
+                    DbStreams dbStreams = ::loadStreams(ctx.itemPath, notifyLoad); //throw FileError, FileErrorDatabaseNotExisting, FileErrorDatabaseCorrupted, ThreadStopRequest
 
                     dbStreamsByPathShared.access([&](auto& dbStreamsByPath2) { dbStreamsByPath2.emplace(ctx.itemPath, std::move(dbStreams)); });
                 }
-                catch (const FileErrorDatabaseNotExisting&) {} //redundant info => no reportInfo()
+                catch (FileErrorDatabaseNotExisting&) {} //redundant info => no reportInfo()
             }, ctx.acb);
         });
 
@@ -891,13 +891,15 @@ void fff::saveLastSynchronousState(const BaseFolderPair& baseFolder, bool transa
              })
             parallelWorkload.emplace_back(dbPath, [&streamsOut = *streamsOut, &loadSuccess = *loadSuccess](ParallelContext& ctx) //throw ThreadStopRequest
         {
-            StreamStatusNotifier notifyLoad(replaceCpy(_("Loading file %x..."), L"%x", fmtPath(AFS::getDisplayPath(ctx.itemPath))), ctx.acb);
-
             const std::wstring errMsg = tryReportingError([&] //throw ThreadStopRequest
             {
-                try { streamsOut = ::loadStreams(ctx.itemPath, notifyLoad); } //throw FileError, FileErrorDatabaseNotExisting, ThreadStopRequest
+                StreamStatusNotifier notifyLoad(replaceCpy(_("Loading file %x..."), L"%x", fmtPath(AFS::getDisplayPath(ctx.itemPath))), ctx.acb);
+
+                try { streamsOut = ::loadStreams(ctx.itemPath, notifyLoad); } //throw FileError, FileErrorDatabaseNotExisting, FileErrorDatabaseCorrupted, ThreadStopRequest
                 catch (FileErrorDatabaseNotExisting&) {}
+                catch (FileErrorDatabaseCorrupted&) {} //=> just overwrite corrupted DB file: error already reported by loadLastSynchronousState()
             }, ctx.acb);
+
             loadSuccess = errMsg.empty();
         });
 
@@ -963,41 +965,51 @@ void fff::saveLastSynchronousState(const BaseFolderPair& baseFolder, bool transa
         streamsR.erase(itStreamOldR);
 
     //create new session data
-    const std::string sessionID = zen::generateGUID();
+    const std::string sessionID = generateGUID();
 
     streamsL[sessionID] = std::move(sessionDataL);
     streamsR[sessionID] = std::move(sessionDataR);
 
     //------------ save DB files in parallel -------------------------
+    //1. create *both* ffs_tmp files first (caveat: *not* necessarily in parallel, depending on deviceParallelOps!)
+    //2. if successful, rename both files (almost) transactionally!
+    bool saveSuccessL = false;
+    bool saveSuccessR = false;
+    std::optional<AbstractPath> dbPathTmpL;
+    std::optional<AbstractPath> dbPathTmpR;
+    ZEN_ON_SCOPE_EXIT
+    (
+        //*INDENT-OFF*
+        if (dbPathTmpL) try { AFS::removeFilePlain(*dbPathTmpL); } catch (FileError&) {}
+        if (dbPathTmpR) try { AFS::removeFilePlain(*dbPathTmpR); } catch (FileError&) {}
+        //*INDENT-ON*
+    )
+    warn_static("log it!")
+
+    std::vector<std::pair<AbstractPath, ParallelWorkItem>> parallelWorkloadSave, parallelWorkloadMove;
+
+    for (const auto& [dbPath, streams, saveSuccess, dbPathTmp] :
+         {
+             std::tuple(dbPathL, &streamsL, &saveSuccessL, &dbPathTmpL),
+             std::tuple(dbPathR, &streamsR, &saveSuccessR, &dbPathTmpR)
+         })
     {
-        std::vector<std::pair<AbstractPath, ParallelWorkItem>> parallelWorkload;
-
-        for (const auto& [dbPath, streams] :
-             {
-                 std::pair(dbPathL, &streamsL),
-                 std::pair(dbPathR, &streamsR)
-             })
-            parallelWorkload.emplace_back(dbPath, [&streams = *streams, transactionalCopy](ParallelContext& ctx) //throw ThreadStopRequest
+        parallelWorkloadSave.emplace_back(dbPath, [&streams = *streams,
+                                                            &saveSuccess = *saveSuccess,
+                                                            &dbPathTmp = *dbPathTmp,
+                                                            transactionalCopy](ParallelContext& ctx) //throw ThreadStopRequest
         {
-            tryReportingError([&] //throw ThreadStopRequest
+            const std::wstring errMsg = tryReportingError([&] //throw ThreadStopRequest
             {
                 StreamStatusNotifier notifySave(replaceCpy(_("Saving file %x..."), L"%x", fmtPath(AFS::getDisplayPath(ctx.itemPath))), ctx.acb);
 
-                if (transactionalCopy && !AFS::hasNativeTransactionalCopy(ctx.itemPath))
+                if (transactionalCopy && !AFS::hasNativeTransactionalCopy(ctx.itemPath)) //=> write (both?) DB files as a transaction
                 {
-                    //write (temp-) files as a transaction
                     const Zstring shortGuid = printNumber<Zstring>(Zstr("%04x"), static_cast<unsigned int>(getCrc16(generateGUID())));
-                    const AbstractPath dbPathTmp = AFS::appendRelPath(*AFS::getParentPath(ctx.itemPath), AFS::getItemName(ctx.itemPath) + Zstr('.') + shortGuid + AFS::TEMP_FILE_ENDING);
-
-                    saveStreams(streams, dbPathTmp, notifySave); //throw FileError, ThreadStopRequest
-                    ZEN_ON_SCOPE_FAIL(try { AFS::removeFilePlain(dbPathTmp); }
-                    catch (FileError&) {});
-                    warn_static("log it!")
+                    const AbstractPath tmpPath = AFS::appendRelPath(*AFS::getParentPath(ctx.itemPath), AFS::getItemName(ctx.itemPath) + Zstr('.') + shortGuid + AFS::TEMP_FILE_ENDING);
 
-                    //operation finished: rename temp file -> this should work (almost) transactionally:
-                    //if there were no write access, creation of temp file would have failed
-                    AFS::removeFileIfExists(ctx.itemPath);           //throw FileError
-                    AFS::moveAndRenameItem(dbPathTmp, ctx.itemPath); //throw FileError, (ErrorMoveUnsupported)
+                    saveStreams(streams, tmpPath, notifySave); //throw FileError, ThreadStopRequest
+                    dbPathTmp = tmpPath; //pass file ownership
                 }
                 else //some MTP devices don't even allow renaming files: https://freefilesync.org/forum/viewtopic.php?t=6531
                 {
@@ -1005,10 +1017,30 @@ void fff::saveLastSynchronousState(const BaseFolderPair& baseFolder, bool transa
                     saveStreams(streams, ctx.itemPath, notifySave); //throw FileError, ThreadStopRequest
                 }
             }, ctx.acb);
+
+            saveSuccess = errMsg.empty();
         });
+        //----------------------------------------------------------------------------
+        if (transactionalCopy && !AFS::hasNativeTransactionalCopy(dbPath))
+            parallelWorkloadMove.emplace_back(dbPath, [&dbPathTmp = *dbPathTmp,
+                                                                  transactionalCopy](ParallelContext& ctx) //throw ThreadStopRequest
+        {
+            tryReportingError([&] //throw ThreadStopRequest
+            {
+                //rename temp file (almost) transactionally: without write access, file creation would have failed
+                AFS::removeFileIfExists(ctx.itemPath);            //throw FileError
+                AFS::moveAndRenameItem(*dbPathTmp, ctx.itemPath); //throw FileError, (ErrorMoveUnsupported)
 
-        massParallelExecute(parallelWorkload,
-                            Zstr("Save sync.ffs_db"), callback /*throw X*/); //throw X
+                dbPathTmp = std::nullopt; //basically a "ScopeGuard::dismiss()"
+            }, ctx.acb);
+        });
     }
+
+    massParallelExecute(parallelWorkloadSave,
+                        Zstr("Save sync.ffs_db"), callback /*throw X*/); //throw X
+
+    if (saveSuccessL && saveSuccessR)
+        massParallelExecute(parallelWorkloadMove,
+                            Zstr("Move sync.ffs_db"), callback /*throw X*/); //throw X
     //----------------------------------------------------------------
 }
diff --git a/FreeFileSync/Source/base/path_filter.cpp b/FreeFileSync/Source/base/path_filter.cpp
index 207a4fc6..55cc0cf5 100644
--- a/FreeFileSync/Source/base/path_filter.cpp
+++ b/FreeFileSync/Source/base/path_filter.cpp
@@ -24,22 +24,6 @@ std::strong_ordering fff::operator<=>(const FilterRef& lhs, const FilterRef& rhs
 }
 
 
-std::vector<Zstring> fff::splitByDelimiter(const Zstring& filterPhrase)
-{
-    std::vector<Zstring> output;
-
-    split2(filterPhrase, [](Zchar c) { return c == FILTER_ITEM_SEPARATOR || c == Zstr('\n'); }, //delimiters
-    [&output](const Zchar* blockFirst, const Zchar* blockLast)
-    {
-        std::tie(blockFirst, blockLast) = trimCpy(blockFirst, blockLast, true /*fromLeft*/, true /*fromRight*/, [](Zchar c) { return isWhiteSpace(c); });
-        if (blockFirst != blockLast)
-            output.emplace_back(blockFirst, blockLast);
-    });
-
-    return output;
-}
-
-
 void NameFilter::parseFilterPhrase(const Zstring& filterPhrase, FilterSet& filter)
 {
     //normalize filter: 1. ignore Unicode normalization form 2. ignore case
@@ -52,51 +36,58 @@ void NameFilter::parseFilterPhrase(const Zstring& filterPhrase, FilterSet& filte
     const Zstring sepAsterisk = Zstr("/*");
     const Zstring asteriskSep = Zstr("*/");
 
-    auto processTail = [&](const Zstring& phrase)
+    auto processTail = [&](const ZstringView phrase)
     {
         if (endsWith(phrase, Zstr(':'))) //file-only tag
             filter.fileMasks.insert({phrase.begin(), phrase.end() - 1});
         else if (endsWith(phrase, FILE_NAME_SEPARATOR) || //folder-only tag
                  endsWith(phrase, sepAsterisk)) // abc\*
-            filter.folderMasks.insert(beforeLast(phrase, FILE_NAME_SEPARATOR, IfNotFoundReturn::none));
+            filter.folderMasks.insert(Zstring(beforeLast(phrase, FILE_NAME_SEPARATOR, IfNotFoundReturn::none)));
         else
         {
-            filter.fileMasks  .insert(phrase);
-            filter.folderMasks.insert(phrase);
+            filter.fileMasks  .insert(Zstring(phrase));
+            filter.folderMasks.insert(Zstring(phrase));
         }
     };
 
-    for (const Zstring& itemPhrase : splitByDelimiter(filterPhraseNorm))
-        /*    phrase  | action
-            +---------+--------
-            | \blah   | remove \
-            | \*blah  | remove \
-            | \*\blah | remove \
-            | \*\*    | remove \
-            +---------+--------
-            | *blah   |
-            | *\blah  | -> add blah
-            | *\*blah | -> add *blah
-            +---------+--------
-            | blah:   | remove : (file only)
-            | blah\*: | remove : (file only)
-            +---------+--------
-            | blah\   | remove \ (folder only)
-            | blah*\  | remove \ (folder only)
-            | blah\*\ | remove \ (folder only)
-            +---------+--------
-            | blah*   |
-            | blah\*  | remove \* (folder only)
-            | blah*\* | remove \* (folder only)
-            +---------+--------                    */
-        if (startsWith(itemPhrase, FILE_NAME_SEPARATOR)) // \abc
-            processTail(afterFirst(itemPhrase, FILE_NAME_SEPARATOR, IfNotFoundReturn::none));
-        else
+    split2(filterPhraseNorm, [](Zchar c) { return c == FILTER_ITEM_SEPARATOR || c == Zstr('\n'); }, //delimiters
+    [&](ZstringView itemPhrase)
+    {
+        itemPhrase = trimCpy(itemPhrase);
+        if (!itemPhrase.empty())
         {
-            processTail(itemPhrase);
-            if (startsWith(itemPhrase, asteriskSep)) // *\abc
-                processTail(afterFirst(itemPhrase, asteriskSep, IfNotFoundReturn::none));
+            /*    phrase  | action
+                +---------+--------
+                | \blah   | remove \
+                | \*blah  | remove \
+                | \*\blah | remove \
+                | \*\*    | remove \
+                +---------+--------
+                | *blah   |
+                | *\blah  | -> add blah
+                | *\*blah | -> add *blah
+                +---------+--------
+                | blah:   | remove : (file only)
+                | blah\*: | remove : (file only)
+                +---------+--------
+                | blah\   | remove \ (folder only)
+                | blah*\  | remove \ (folder only)
+                | blah\*\ | remove \ (folder only)
+                +---------+--------
+                | blah*   |
+                | blah\*  | remove \* (folder only)
+                | blah*\* | remove \* (folder only)
+                +---------+--------                    */
+            if (startsWith(itemPhrase, FILE_NAME_SEPARATOR)) // \abc
+                processTail(afterFirst(itemPhrase, FILE_NAME_SEPARATOR, IfNotFoundReturn::none));
+            else
+            {
+                processTail(itemPhrase);
+                if (startsWith(itemPhrase, asteriskSep)) // *\abc
+                    processTail(afterFirst(itemPhrase, asteriskSep, IfNotFoundReturn::none));
+            }
         }
+    });
 }
 
 
@@ -169,10 +160,10 @@ bool matchesMask(const Zchar* path, const Zchar* const pathEnd, const Zchar* mas
 
 
 //"true" if path matches (only!) the beginning of mask
-template <bool haveWildcards> bool matchesMaskBegin(const Zstring& relPath, const Zstring& mask);
+template <bool haveWildcards> bool matchesMaskBegin(const ZstringView relPath, const Zstring& mask);
 
 template <> inline
-bool matchesMaskBegin<true /*haveWildcards*/>(const Zstring& relPath, const Zstring& mask)
+bool matchesMaskBegin<true /*haveWildcards*/>(const ZstringView relPath, const Zstring& mask)
 {
     auto itP = relPath.begin();
     for (auto itM = mask.begin(); itM != mask.end(); ++itM, ++itP)
@@ -200,7 +191,7 @@ bool matchesMaskBegin<true /*haveWildcards*/>(const Zstring& relPath, const Zstr
 }
 
 template <> inline //perf: going overboard? remaining fruits are hanging higher and higher...
-bool matchesMaskBegin<false /*haveWildcards*/>(const Zstring& relPath, const Zstring& mask)
+bool matchesMaskBegin<false /*haveWildcards*/>(const ZstringView relPath, const Zstring& mask)
 {
     return mask.size() > relPath.size() + 1 && //room for FILE_NAME_SEPARATOR *and* at least one more char
            mask[relPath.size()] == FILE_NAME_SEPARATOR &&
@@ -209,28 +200,29 @@ bool matchesMaskBegin<false /*haveWildcards*/>(const Zstring& relPath, const Zst
 }
 
 
-bool NameFilter::MaskMatcher::matches(const Zchar* pathFirst, const Zchar* pathLast) const
+bool NameFilter::MaskMatcher::matches(const ZstringView relPath) const
 {
-    if (std::any_of(realMasks_.begin(), realMasks_.end(), [&](const Zstring& mask) { return matchesMask(pathFirst, pathLast, mask.c_str()); }))
+    assert(!relPath.empty());
+
+    if (std::any_of(realMasks_.begin(), realMasks_.end(), [&](const Zstring& mask) { return matchesMask(relPath.data(), relPath.data() + relPath.size(), mask.c_str()); }))
     /**/return true;
 
     //perf: for relPaths_ we can go from linear to *constant* time!!! => annihilates https://freefilesync.org/forum/viewtopic.php?t=7768#p26519
-    const Zchar* sepPos = pathFirst;
+
+    ZstringView parentPath = relPath;
     for (;;) //check all parent paths!
     {
-        sepPos = std::find(sepPos, pathLast, FILE_NAME_SEPARATOR);
-
-        if (relPaths_.contains(makeStringView(pathFirst, sepPos))) //heterogenous lookup!
+        if (relPaths_.contains(parentPath)) //heterogenous lookup!
             return true;
 
-        if (sepPos == pathLast)
+        parentPath = beforeLast(parentPath, FILE_NAME_SEPARATOR, IfNotFoundReturn::none);
+        if (parentPath.empty())
             return false;
-
-        ++sepPos;
     }
 }
 
-bool NameFilter::MaskMatcher::matchesBegin(const Zstring& relPath) const
+
+bool NameFilter::MaskMatcher::matchesBegin(const ZstringView relPath) const
 {
     return std::any_of(realMasks_.begin(), realMasks_.end(), [&](const Zstring& mask) { return matchesMaskBegin<true  /*haveWildcards*/>(relPath, mask); }) ||
     /**/   std::any_of(relPaths_ .begin(), relPaths_ .end(), [&](const Zstring& mask) { return matchesMaskBegin<false /*haveWildcards*/>(relPath, mask); });
@@ -258,14 +250,14 @@ bool NameFilter::passFileFilter(const Zstring& relFilePath) const
     //normalize input: 1. ignore Unicode normalization form 2. ignore case
     const Zstring& pathFmt = getUpperCase(relFilePath);
 
-    const Zchar* sepPos = findLast(pathFmt.begin(), pathFmt.end(), FILE_NAME_SEPARATOR);
+    const ZstringView parentPath = beforeLast<ZstringView>(pathFmt, FILE_NAME_SEPARATOR, IfNotFoundReturn::none);
 
-    if (excludeFilter.fileMasks.matches(pathFmt.begin(), pathFmt.end()) || //either match on file or any parent folder
-        (sepPos != pathFmt.end() && excludeFilter.folderMasks.matches(pathFmt.begin(), sepPos))) //match on any parent folder only
+    if (excludeFilter.fileMasks.matches(pathFmt) || //either match on file or any parent folder
+        (!parentPath.empty() && excludeFilter.folderMasks.matches(parentPath))) //match on any parent folder only
         return false;
 
-    return includeFilter.fileMasks.matches(pathFmt.begin(), pathFmt.end()) ||
-           (sepPos != pathFmt.end() && includeFilter.folderMasks.matches(pathFmt.begin(), sepPos));
+    return includeFilter.fileMasks.matches(pathFmt) ||
+           (!parentPath.empty() && includeFilter.folderMasks.matches(parentPath));
 }
 
 
@@ -277,7 +269,7 @@ bool NameFilter::passDirFilter(const Zstring& relDirPath, bool* childItemMightMa
     //normalize input: 1. ignore Unicode normalization form 2. ignore case
     const Zstring& pathFmt = getUpperCase(relDirPath);
 
-    if (excludeFilter.folderMasks.matches(pathFmt.begin(), pathFmt.end()))
+    if (excludeFilter.folderMasks.matches(pathFmt))
     {
         if (childItemMightMatch)
             *childItemMightMatch = false; //perf: no need to traverse deeper; subfolders/subfiles would be excluded by filter anyway!
@@ -289,7 +281,7 @@ bool NameFilter::passDirFilter(const Zstring& relDirPath, bool* childItemMightMa
         return false;
     }
 
-    if (includeFilter.folderMasks.matches(pathFmt.begin(), pathFmt.end()))
+    if (includeFilter.folderMasks.matches(pathFmt))
         return true;
 
     if (childItemMightMatch)
diff --git a/FreeFileSync/Source/base/path_filter.h b/FreeFileSync/Source/base/path_filter.h
index f7ca25c8..fbdc567d 100644
--- a/FreeFileSync/Source/base/path_filter.h
+++ b/FreeFileSync/Source/base/path_filter.h
@@ -92,8 +92,8 @@ private:
     {
     public:
         void insert(const Zstring& mask); //expected: upper-case + Unicode-normalized!
-        bool matches(const Zchar* pathFirst, const Zchar* pathLast) const;
-        bool matchesBegin(const Zstring& relPath) const;
+        bool matches(const ZstringView relPath) const;
+        bool matchesBegin(const ZstringView relPath) const;
 
         inline friend std::strong_ordering operator<=>(const MaskMatcher& lhs, const MaskMatcher& rhs)
         {
@@ -255,9 +255,6 @@ FilterRef constructFilter(const Zstring& includePhrase,
             return zen::makeSharedRef<CombinedFilter>(NameFilter(includePhrase, excludePhrase + Zstr('\n') + excludePhrase2), NameFilter(includePhrase2, Zstring()));
     }
 }
-
-
-std::vector<Zstring> splitByDelimiter(const Zstring& filterPhrase); //keep external linkage for unit test
 }
 
 #endif //HARD_FILTER_H_825780275842758345
diff --git a/FreeFileSync/Source/base/status_handler_impl.h b/FreeFileSync/Source/base/status_handler_impl.h
index 6f7e1a34..88ee5e12 100644
--- a/FreeFileSync/Source/base/status_handler_impl.h
+++ b/FreeFileSync/Source/base/status_handler_impl.h
@@ -449,15 +449,17 @@ private:
     {
         const double totalSecs = numeric::isNull(bytesPerSec) ? 0 : bytesTotal / bytesPerSec;
         const double expectedSteps = totalSecs * STATUS_PERCENT_MIN_CHANGES_PER_SEC;
-
-        const wchar_t* format = [&] //TODO? protect against format flickering!?
+       
+        const int decPlaces = [&] //TODO? protect against format flickering!?
         {
-            if (expectedSteps <=   100) return L"%.0f";
-            if (expectedSteps <=  1000) return L"%.1f";
-            if (expectedSteps <= 10000) return L"%.2f";
-            /**/                        return L"%.3f";
+            if (expectedSteps <=    100) return 0;
+            if (expectedSteps <=   1000) return 1;
+            if (expectedSteps <=  10000) return 2;
+            if (expectedSteps <= 100000) return 3;
+            /**/                         return 4;
         }();
-        return zen::printNumber<std::wstring>(format, fraction * 100) + L'%'; //need to localize percent!?
+        //const int decPlaces = expectedSteps <= 100 ? 0 : static_cast<int>(std::ceil(std::log10(expectedSteps))) - 2; -> overkill?
+        return zen::formatProgressPercent(fraction,  decPlaces);
     }
 
     bool showPercent_ = false;
diff --git a/FreeFileSync/Source/base/synchronization.cpp b/FreeFileSync/Source/base/synchronization.cpp
index d666b015..e92cfecf 100644
--- a/FreeFileSync/Source/base/synchronization.cpp
+++ b/FreeFileSync/Source/base/synchronization.cpp
@@ -602,8 +602,8 @@ void getPathRaceCondition(const BaseFolderPair& baseFolderP, const BaseFolderPai
             if (basePathP.afsPath.value.size() > basePathC.afsPath.value.size())
                 return getPathRaceCondition<sideC, sideP>(baseFolderC, baseFolderP, result);
 
-            const std::vector<Zstring> relPathP = split(basePathP.afsPath.value, FILE_NAME_SEPARATOR, SplitOnEmpty::skip);
-            const std::vector<Zstring> relPathC = split(basePathC.afsPath.value, FILE_NAME_SEPARATOR, SplitOnEmpty::skip);
+            const std::vector<Zstring> relPathP = splitCpy(basePathP.afsPath.value, FILE_NAME_SEPARATOR, SplitOnEmpty::skip);
+            const std::vector<Zstring> relPathC = splitCpy(basePathC.afsPath.value, FILE_NAME_SEPARATOR, SplitOnEmpty::skip);
 
             if (relPathP.size() <= relPathC.size() &&
             /**/std::equal(relPathP.begin(), relPathP.end(), relPathC.begin(), [](const Zstring& lhs, const Zstring& rhs) { return equalNoCase(lhs, rhs); }))
@@ -722,10 +722,6 @@ inline
 void removeFilePlain(const AbstractPath& filePath, std::mutex& singleThread) //throw FileError
 { parallelScope([filePath] { AFS::removeFilePlain(filePath); /*throw FileError*/ }, singleThread); }
 
-inline
-std::unique_ptr<AFS::RecycleSession> createRecyclerSession(const AbstractPath& folderPath, std::mutex& singleThread) //throw FileError, RecycleBinUnavailable
-{ return parallelScope([folderPath] { return AFS::createRecyclerSession(folderPath); /*throw FileError, RecycleBinUnavailable*/ }, singleThread); }
-
 //--------------------------------------------------------------
 //ATTENTION CALLBACKS: they also run asynchronously *outside* the singleThread lock!
 //--------------------------------------------------------------
@@ -805,14 +801,16 @@ private:
     DeletionHandler& operator=(const DeletionHandler&) = delete;
 
     //might not be needed => create lazily:
-    AFS::RecycleSession& getOrCreateRecyclerSession(std::mutex& singleThread) //throw FileError, RecycleBinUnavailable
+    AFS::RecycleSession& getOrCreateRecyclerSession() //throw FileError, RecycleBinUnavailable
     {
         assert(deletionVariant_ == DeletionVariant::recycler);
 
         if (!recyclerSession_ && !recyclerUnavailableExcept_)
             try
             {
-                recyclerSession_ = parallel::createRecyclerSession(baseFolderPath_, singleThread); //throw FileError, RecycleBinUnavailable
+                recyclerSession_ = AFS::createRecyclerSession(baseFolderPath_); //throw FileError, RecycleBinUnavailable
+                //double-initialization caveat: do NOT run session initialization in parallel!
+                // => createRecyclerSession must *not* do file I/O!
             }
             catch (const RecycleBinUnavailable& e) { recyclerUnavailableExcept_ = e; }
 
@@ -935,7 +933,7 @@ void DeletionHandler::removeFileWithCallback(const FileDescriptor& fileDescr, co
                 if (!beforeOverwrite) reportInfo(replaceCpy(txtDelFileRecycler_, L"%x", fmtPath(AFS::getDisplayPath(fileDescr.path))), statReporter); //throw ThreadStopRequest
                 try
                 {
-                    parallel::moveToRecycleBinIfExists(getOrCreateRecyclerSession(singleThread), fileDescr.path, relPath, singleThread); //throw FileError, RecycleBinUnavailable
+                    parallel::moveToRecycleBinIfExists(getOrCreateRecyclerSession(), fileDescr.path, relPath, singleThread); //throw FileError, RecycleBinUnavailable
                 }
                 catch (const RecycleBinUnavailable& e)
                 {
@@ -993,7 +991,7 @@ void DeletionHandler::removeLinkWithCallback(const AbstractPath& linkPath, const
             if (!beforeOverwrite) reportInfo(replaceCpy(txtDelSymlinkRecycler_, L"%x", fmtPath(AFS::getDisplayPath(linkPath))), statReporter); //throw ThreadStopRequest
             try
             {
-                parallel::moveToRecycleBinIfExists(getOrCreateRecyclerSession(singleThread), linkPath, relPath, singleThread); //throw FileError, RecycleBinUnavailable
+                parallel::moveToRecycleBinIfExists(getOrCreateRecyclerSession(), linkPath, relPath, singleThread); //throw FileError, RecycleBinUnavailable
             }
             catch (const RecycleBinUnavailable& e)
             {
@@ -1051,7 +1049,7 @@ void DeletionHandler::removeDirWithCallback(const AbstractPath& folderPath, cons
             reportInfo(replaceCpy(txtDelFolderRecycler_, L"%x", fmtPath(AFS::getDisplayPath(folderPath))), statReporter); //throw ThreadStopRequest
             try
             {
-                parallel::moveToRecycleBinIfExists(getOrCreateRecyclerSession(singleThread), folderPath, relPath, singleThread); //throw FileError, RecycleBinUnavailable
+                parallel::moveToRecycleBinIfExists(getOrCreateRecyclerSession(), folderPath, relPath, singleThread); //throw FileError, RecycleBinUnavailable
                 statReporter.reportDelta(1, 0); //moving to recycler is ONE logical operation, irrespective of the number of child elements!
             }
             catch (const RecycleBinUnavailable& e)
@@ -2523,7 +2521,7 @@ void fff::synchronize(const std::chrono::system_clock::time_point& syncStartTime
         checkBaseFolderRaceCondition.emplace_back(&baseFolder, SelectSide::left,  writeLeft);
         checkBaseFolderRaceCondition.emplace_back(&baseFolder, SelectSide::right, writeRight);
 
-            //prepare: check if versioning path itself will be synchronized (and was not excluded via filter)
+        //prepare: check if versioning path itself will be synchronized (and was not excluded via filter)
         if (folderPairCfg.handleDeletion == DeletionVariant::versioning)
             checkVersioningPaths.insert(versioningFolderPath);
 
@@ -2583,7 +2581,7 @@ void fff::synchronize(const std::chrono::system_clock::time_point& syncStartTime
             continue;
         }
 
-            //check if user-defined directory for deletion was specified
+        //check if user-defined directory for deletion was specified
         if (folderPairCfg.handleDeletion == DeletionVariant::versioning)
             if (AFS::isNullPath(versioningFolderPath))
             {
diff --git a/FreeFileSync/Source/base/versioning.h b/FreeFileSync/Source/base/versioning.h
index 8f9be3ff..10dec67d 100644
--- a/FreeFileSync/Source/base/versioning.h
+++ b/FreeFileSync/Source/base/versioning.h
@@ -37,8 +37,7 @@ public:
                   time_t syncStartTime) :
         versioningFolderPath_(versioningFolderPath),
         versioningStyle_(versioningStyle),
-        syncStartTime_(syncStartTime),
-        timeStamp_(zen::formatTime(Zstr("%Y-%m-%d %H%M%S"), zen::getLocalTime(syncStartTime))) //e.g. "2012-05-15 131513"
+        syncStartTime_(syncStartTime)
     {
         using namespace zen;
 
@@ -84,7 +83,7 @@ private:
     const AbstractPath versioningFolderPath_;
     const VersioningStyle versioningStyle_;
     const time_t syncStartTime_;
-    const Zstring timeStamp_;
+    const Zstring timeStamp_{zen::formatTime(Zstr("%Y-%m-%d %H%M%S"), zen::getLocalTime(syncStartTime_))}; //e.g. "2012-05-15 131513"
 };
 
 //--------------------------------------------------------------------------------
diff --git a/FreeFileSync/Source/base_tools.cpp b/FreeFileSync/Source/base_tools.cpp
index ee7de8cd..5477ddc5 100644
--- a/FreeFileSync/Source/base_tools.cpp
+++ b/FreeFileSync/Source/base_tools.cpp
@@ -17,11 +17,11 @@ std::vector<unsigned int> fff::fromTimeShiftPhrase(const std::wstring& timeShift
     std::vector<unsigned int> minutes;
 
     split2(timeShiftPhrase, [](wchar_t c) { return c == L',' || c == L';' || c == L' '; }, //delimiters
-    [&minutes](const wchar_t* blockFirst, const wchar_t* blockLast)
+    [&minutes](const std::wstring_view block)
     {
-        if (blockFirst != blockLast)
+        if (!block.empty())
         {
-            std::wstring part(blockFirst, blockLast);
+            std::wstring part(block);
             replace(part, L'-', L""); //there is no negative shift => treat as positive!
 
             const unsigned int timeShift = stringTo<unsigned int>(beforeFirst(part, L':', IfNotFoundReturn::all)) * 60 +
diff --git a/FreeFileSync/Source/config.cpp b/FreeFileSync/Source/config.cpp
index 04e42abf..6bc8e0c5 100644
--- a/FreeFileSync/Source/config.cpp
+++ b/FreeFileSync/Source/config.cpp
@@ -78,7 +78,7 @@ std::vector<Zstring> splitFilterByLines(Zstring filterPhrase)
     if (filterPhrase.empty())
         return {};
 
-    return split(filterPhrase, Zstr('\n'), SplitOnEmpty::allow);
+    return splitCpy(filterPhrase, Zstr('\n'), SplitOnEmpty::allow);
 }
 
 Zstring mergeFilterLines(const std::vector<Zstring>& filterLines)
@@ -1136,11 +1136,11 @@ void readConfig(const XmlIn& in, LocalPairConfig& lpc, std::map<AfsDevice, size_
         {
             if (startsWithAsciiNoCase(folderPathPhrase, "sftp:") ||
                 startsWithAsciiNoCase(folderPathPhrase,  "ftp:"))
+                split(folderPathPhrase, Zstr('|'), [&](const ZstringView optPhrase)
             {
-                for (const Zstring& optPhrase : split(folderPathPhrase, Zstr('|'), SplitOnEmpty::skip))
                     if (startsWith(optPhrase, Zstr("con=")))
                         parallelOps = stringTo<int>(afterFirst(optPhrase, Zstr("con="), IfNotFoundReturn::none));
-            }
+            });
         };
         getParallelOps(lpc.folderPathPhraseLeft,  parallelOpsL);
         getParallelOps(lpc.folderPathPhraseRight, parallelOpsR);
@@ -1170,26 +1170,6 @@ void readConfig(const XmlIn& in, LocalPairConfig& lpc, std::map<AfsDevice, size_
     ciReplace(lpc.folderPathPhraseRight, Zstr("%csidl_MyPictures%" ), Zstr("%csidl_Pictures%"));
     ciReplace(lpc.folderPathPhraseRight, Zstr("%csidl_MyVideos%"   ), Zstr("%csidl_Videos%"));
 
-    //TODO: remove after migration 2016-09-27
-    if (formatVer < 6) //the-base64-encoded password is now stored as an option at the string end
-    {
-        //sftp://username:[base64]c2VjcmV0c@private.example.com ->
-        //sftp://username@private.example.com|pass64=c2VjcmV0c
-        auto updateSftpSyntax = [](Zstring& pathPhrase)
-        {
-            const size_t pos = pathPhrase.find(Zstr(":[base64]"));
-            if (pos != Zstring::npos)
-            {
-                const size_t posEnd = pathPhrase.find(Zstr("@"), pos);
-                if (posEnd != Zstring::npos)
-                    pathPhrase = Zstring(pathPhrase.begin(), pathPhrase.begin() + pos) + (pathPhrase.c_str() + posEnd) +
-                                 Zstr("|pass64=") + Zstring(pathPhrase.begin() + pos + strLength(Zstr(":[base64]")), pathPhrase.begin() + posEnd);
-            }
-        };
-        updateSftpSyntax(lpc.folderPathPhraseLeft);
-        updateSftpSyntax(lpc.folderPathPhraseRight);
-    }
-
     //TODO: remove after migration! 2020-04-24
     if (formatVer < 16)
     {
@@ -1805,7 +1785,7 @@ void readConfig(const XmlIn& in, XmlGlobalSettings& cfg, int formatVer)
     //TODO: remove after migration! 2019-11-30
     auto splitEditMerge = [](wxString& perspective, wchar_t delim, const std::function<void(wxString& item)>& editItem)
     {
-        std::vector<wxString> v = split(perspective, delim, SplitOnEmpty::allow);
+        std::vector<wxString> v = splitCpy(perspective, delim, SplitOnEmpty::allow);
         assert(!v.empty());
         perspective.clear();
 
diff --git a/FreeFileSync/Source/log_file.cpp b/FreeFileSync/Source/log_file.cpp
index 410c78d9..dfd27019 100644
--- a/FreeFileSync/Source/log_file.cpp
+++ b/FreeFileSync/Source/log_file.cpp
@@ -466,33 +466,29 @@ std::vector<LogFileInfo> getLogFiles(const AbstractPath& logFolderPath) //throw
         if (endsWith(fi.itemName, Zstr(".log")) || //case-sensitive: e.g. ".LOG" is not from FFS, right?
             endsWith(fi.itemName, Zstr(".html")))
         {
-            auto tsBegin = fi.itemName.begin();
-            auto tsEnd   = tsBegin + fi.itemName.rfind('.');
-
-            if (tsBegin != tsEnd && tsEnd[-1] == STATUS_END_TOKEN)
-                tsEnd = searchLast(tsBegin, tsEnd,
-                                   std::begin(STATUS_BEGIN_TOKEN), std::end(STATUS_BEGIN_TOKEN) - 1);
-
-            if (tsEnd - tsBegin >= TIME_STAMP_LENGTH &&
-                tsEnd[-4] == Zstr('.') &&
-                isdigit(tsEnd[-3]) &&
-                isdigit(tsEnd[-2]) &&
-                isdigit(tsEnd[-1]))
+            ZstringView itemPhrase = beforeLast<ZstringView>(fi.itemName, Zstr('.'), IfNotFoundReturn::none);
+            
+            if (endsWith(itemPhrase, STATUS_END_TOKEN))
+                itemPhrase = beforeLast(itemPhrase, STATUS_BEGIN_TOKEN, IfNotFoundReturn::all);
+
+            if (itemPhrase.size() >= TIME_STAMP_LENGTH &&
+                itemPhrase.end()[-4] == Zstr('.') &&
+                isdigit(itemPhrase.end()[-3]) &&
+                isdigit(itemPhrase.end()[-2]) &&
+                isdigit(itemPhrase.end()[-1]))
             {
-                tsBegin = tsEnd - TIME_STAMP_LENGTH;
-                const TimeComp tc = parseTime(Zstr("%Y-%m-%d %H%M%S"), makeStringView(tsBegin, 17)); //returns TimeComp() on error
-
+                const TimeComp tc = parseTime(Zstr("%Y-%m-%d %H%M%S"), makeStringView(itemPhrase.end() - TIME_STAMP_LENGTH, 17)); //returns TimeComp() on error
                 if (const auto [localTime, timeValid] = localToTimeT(tc);
                     timeValid)
                 {
-                    Zstring jobNames(fi.itemName.begin(), tsBegin);
-                    if (!jobNames.empty())
+                    itemPhrase.remove_suffix(TIME_STAMP_LENGTH);
+                    if (!itemPhrase.empty())
                     {
-                        assert(jobNames.size() >= 2 && endsWith(jobNames, Zstr(' ')));
-                        jobNames.pop_back();
+                        assert(itemPhrase.size() >= 2 && endsWith(itemPhrase, Zstr(' ')));
+                        itemPhrase = trimCpy(itemPhrase);
                     }
 
-                    logfiles.push_back({AFS::appendRelPath(logFolderPath, fi.itemName), localTime, utfTo<std::wstring>(jobNames)});
+                    logfiles.push_back({AFS::appendRelPath(logFolderPath, fi.itemName), localTime, utfTo<std::wstring>(itemPhrase)});
                 }
             }
         }
diff --git a/FreeFileSync/Source/ui/abstract_folder_picker.cpp b/FreeFileSync/Source/ui/abstract_folder_picker.cpp
index 468ccf6f..f5e8721e 100644
--- a/FreeFileSync/Source/ui/abstract_folder_picker.cpp
+++ b/FreeFileSync/Source/ui/abstract_folder_picker.cpp
@@ -117,7 +117,7 @@ AbstractFolderPickerDlg::AbstractFolderPickerDlg(wxWindow* parent, AbstractPath&
             //1. test server connection:
             const AFS::ItemType type = AFS::getItemType(folderPath); //throw FileError
             //2. navigate + select path
-            navigateToExistingPath(rootId, split(folderPath.afsPath.value, FILE_NAME_SEPARATOR, SplitOnEmpty::skip), type);
+            navigateToExistingPath(rootId, splitCpy(folderPath.afsPath.value, FILE_NAME_SEPARATOR, SplitOnEmpty::skip), type);
         }
         catch (const FileError& e) //not existing or access error
         {
@@ -269,7 +269,7 @@ void AbstractFolderPickerDlg::findAndNavigateToExistingPath(const AbstractPath&
         if (type)
         {
             m_staticTextStatus->SetLabel(L"");
-            navigateToExistingPath(m_treeCtrlFileSystem->GetRootItem(), split(folderPath.afsPath.value, FILE_NAME_SEPARATOR, SplitOnEmpty::skip), *type);
+            navigateToExistingPath(m_treeCtrlFileSystem->GetRootItem(), splitCpy(folderPath.afsPath.value, FILE_NAME_SEPARATOR, SplitOnEmpty::skip), *type);
         }
         else //split into multiple small async tasks rather than a single large one!
             findAndNavigateToExistingPath(*AFS::getParentPath(folderPath));
diff --git a/FreeFileSync/Source/ui/file_grid.cpp b/FreeFileSync/Source/ui/file_grid.cpp
index 6c8a1f4a..c350548f 100644
--- a/FreeFileSync/Source/ui/file_grid.cpp
+++ b/FreeFileSync/Source/ui/file_grid.cpp
@@ -1165,7 +1165,9 @@ private:
             if (const ColumnTypeRim* sortType = std::get_if<ColumnTypeRim>(&sortInfo->sortCol))
                 if (*sortType == static_cast<ColumnTypeRim>(colType) && sortInfo->onLeft == (side == SelectSide::left))
                 {
-                    const wxImage sortMarker = loadImage(sortInfo->ascending ? "sort_ascending" : "sort_descending");
+                      bool ascending = sortInfo->ascending; //work around MSVC 17.4 compiler bug :( "error C2039: 'sortCol': is not a member of 'fff::FileView::SortInfo'"
+
+                    const wxImage sortMarker = loadImage(ascending ? "sort_ascending" : "sort_descending");
                     drawBitmapRtlNoMirror(dc, enabled ? sortMarker : sortMarker.ConvertToDisabled(), rectInner, wxALIGN_CENTER_HORIZONTAL);
                 }
     }
diff --git a/FreeFileSync/Source/ui/file_view.h b/FreeFileSync/Source/ui/file_view.h
index 47be4875..45baf2d7 100644
--- a/FreeFileSync/Source/ui/file_view.h
+++ b/FreeFileSync/Source/ui/file_view.h
@@ -113,7 +113,7 @@ public:
     struct SortInfo
     {
         std::variant<ColumnTypeRim, ColumnTypeCenter> sortCol;
-        bool onLeft    = false; //if sortCol is ColumnTypeRim
+        bool onLeft    = false; //only use if sortCol is ColumnTypeRim
         bool ascending = false;
     };
     const SortInfo* getSortConfig() const { return zen::get(currentSort_); } //return nullptr if currently not sorted
diff --git a/FreeFileSync/Source/ui/folder_selector.cpp b/FreeFileSync/Source/ui/folder_selector.cpp
index 1ce778b3..a180ed8a 100644
--- a/FreeFileSync/Source/ui/folder_selector.cpp
+++ b/FreeFileSync/Source/ui/folder_selector.cpp
@@ -44,8 +44,17 @@ void setFolderPathPhrase(const Zstring& folderPathPhrase, FolderHistoryBox* comb
     else
         tooltipWnd.SetToolTip(utfTo<wxString>(folderPathPhraseFmt));
 
+    auto trimTrailingSep = [](Zstring path)
+    {
+        if (endsWith(path, Zstr('/')) ||
+            endsWith(path, Zstr('\\')))
+            path.pop_back();
+        return path;
+    };
+
     if (staticText) //change static box label only if there is a real difference to what is shown in wxTextCtrl anyway
-        staticText->SetLabel(equalNoCase(appendSeparator(trimCpy(folderPathPhrase)), appendSeparator(folderPathPhraseFmt)) ?
+        staticText->SetLabel(equalNoCase(trimTrailingSep(trimCpy(folderPathPhrase)),
+                                         trimTrailingSep(folderPathPhraseFmt)) ?
                              wxString(_("Drag && drop")) : utfTo<wxString>(folderPathPhraseFmt));
 }
 
diff --git a/FreeFileSync/Source/ui/gui_generated.cpp b/FreeFileSync/Source/ui/gui_generated.cpp
index 6823b710..9ebf45d3 100644
--- a/FreeFileSync/Source/ui/gui_generated.cpp
+++ b/FreeFileSync/Source/ui/gui_generated.cpp
@@ -11,1189 +11,1189 @@
 
 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();
 
-	m_menuItemResetLayout = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("&Reset layout") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menuTools->Append( m_menuItemResetLayout );
+    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( wxHORIZONTAL );
+    wxBoxSizer* bSizer1791;
+    bSizer1791 = new wxBoxSizer( wxHORIZONTAL );
 
-	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_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->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-	m_buttonCompare->SetToolTip( _("dummy") );
+    m_buttonCompare = new zen::BitmapTextButton( m_panelTopButtons, wxID_ANY, _("Compare"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    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 );
 
 
-	bSizerTopButtons->Add( bSizer261, 1, wxEXPAND, 5 );
+    bSizerTopButtons->Add( bSizer261, 1, wxEXPAND, 5 );
 
 
-	bSizerTopButtons->Add( 8, 8, 0, 0, 5 );
+    bSizerTopButtons->Add( 8, 8, 0, 0, 5 );
 
-	wxBoxSizer* bSizer2942;
-	bSizer2942 = new wxBoxSizer( wxHORIZONTAL );
+    wxBoxSizer* bSizer2942;
+    bSizer2942 = new wxBoxSizer( wxHORIZONTAL );
 
-	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") );
 
-	bSizer2942->Add( m_bpButtonCmpConfig, 0, wxEXPAND, 5 );
+    bSizer2942->Add( m_bpButtonCmpConfig, 0, wxEXPAND, 5 );
 
-	m_bpButtonCmpContext = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
-	bSizer2942->Add( m_bpButtonCmpContext, 0, wxEXPAND, 5 );
+    m_bpButtonCmpContext = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
+    bSizer2942->Add( m_bpButtonCmpContext, 0, wxEXPAND, 5 );
 
 
-	bSizer2942->Add( 0, 0, 1, 0, 5 );
+    bSizer2942->Add( 0, 0, 1, 0, 5 );
 
 
-	bSizer2942->Add( 8, 0, 0, 0, 5 );
+    bSizer2942->Add( 8, 0, 0, 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") );
 
-	bSizer2942->Add( m_bpButtonFilter, 0, wxEXPAND, 5 );
+    bSizer2942->Add( m_bpButtonFilter, 0, wxEXPAND, 5 );
 
-	m_bpButtonFilterContext = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
-	bSizer2942->Add( m_bpButtonFilterContext, 0, wxEXPAND, 5 );
+    m_bpButtonFilterContext = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
+    bSizer2942->Add( m_bpButtonFilterContext, 0, wxEXPAND, 5 );
 
 
-	bSizer2942->Add( 8, 0, 0, 0, 5 );
+    bSizer2942->Add( 8, 0, 0, 0, 5 );
 
 
-	bSizer2942->Add( 0, 0, 1, 0, 5 );
+    bSizer2942->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") );
 
-	bSizer2942->Add( m_bpButtonSyncConfig, 0, wxEXPAND, 5 );
+    bSizer2942->Add( m_bpButtonSyncConfig, 0, wxEXPAND, 5 );
 
-	m_bpButtonSyncContext = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
-	bSizer2942->Add( m_bpButtonSyncContext, 0, wxEXPAND, 5 );
+    m_bpButtonSyncContext = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
+    bSizer2942->Add( m_bpButtonSyncContext, 0, wxEXPAND, 5 );
 
 
-	bSizerTopButtons->Add( bSizer2942, 1, wxEXPAND, 5 );
+    bSizerTopButtons->Add( bSizer2942, 1, wxEXPAND, 5 );
 
 
-	bSizerTopButtons->Add( 8, 8, 0, 0, 5 );
+    bSizerTopButtons->Add( 8, 8, 0, 0, 5 );
 
-	wxBoxSizer* bSizer262;
-	bSizer262 = new wxBoxSizer( wxHORIZONTAL );
+    wxBoxSizer* bSizer262;
+    bSizer262 = new wxBoxSizer( wxHORIZONTAL );
 
-	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 );
 
 
-	bSizerTopButtons->Add( bSizer262, 1, wxEXPAND, 5 );
+    bSizerTopButtons->Add( bSizer262, 1, wxEXPAND, 5 );
 
 
-	bSizer1791->Add( bSizerTopButtons, 1, wxALIGN_CENTER_VERTICAL, 5 );
+    bSizer1791->Add( bSizerTopButtons, 1, wxALIGN_CENTER_VERTICAL, 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( wxVERTICAL );
+    bSizerConfig = new wxBoxSizer( wxVERTICAL );
 
-	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 );
 
-	bSizerSaveAs = new wxBoxSizer( wxHORIZONTAL );
+    bSizerSaveAs = 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") );
 
-	bSizerSaveAs->Add( m_bpButtonSaveAs, 1, 0, 5 );
+    bSizerSaveAs->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") );
 
-	bSizerSaveAs->Add( m_bpButtonSaveAsBatch, 1, 0, 5 );
+    bSizerSaveAs->Add( m_bpButtonSaveAsBatch, 1, 0, 5 );
 
 
-	bSizer174->Add( bSizerSaveAs, 0, wxEXPAND, 5 );
+    bSizer174->Add( bSizerSaveAs, 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, 5 );
+    bSizerConfig->Add( bSizerCfgHistoryButtons, 0, wxALIGN_CENTER_HORIZONTAL, 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 );
 
 
-	bSizerConfig->Add( 10, 0, 0, 0, 5 );
+    bSizerConfig->Add( 10, 0, 0, 0, 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 );
 
-	bSizerViewButtons = new wxBoxSizer( wxHORIZONTAL );
+    bSizerViewButtons = new wxBoxSizer( wxHORIZONTAL );
 
-	m_bpButtonViewType = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
-	bSizerViewButtons->Add( m_bpButtonViewType, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+    m_bpButtonViewType = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
+    bSizerViewButtons->Add( m_bpButtonViewType, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-	bSizerViewButtons->Add( 10, 10, 0, 0, 5 );
+    bSizerViewButtons->Add( 10, 10, 0, 0, 5 );
 
-	m_bpButtonShowExcluded = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
-	bSizerViewButtons->Add( m_bpButtonShowExcluded, 0, wxEXPAND, 5 );
+    m_bpButtonShowExcluded = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
+    bSizerViewButtons->Add( m_bpButtonShowExcluded, 0, wxEXPAND, 5 );
 
 
-	bSizerViewButtons->Add( 10, 10, 0, 0, 5 );
+    bSizerViewButtons->Add( 10, 10, 0, 0, 5 );
 
-	m_bpButtonShowDeleteLeft = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
-	bSizerViewButtons->Add( m_bpButtonShowDeleteLeft, 0, wxEXPAND, 5 );
+    m_bpButtonShowDeleteLeft = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
+    bSizerViewButtons->Add( m_bpButtonShowDeleteLeft, 0, wxEXPAND, 5 );
 
-	m_bpButtonShowUpdateLeft = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
-	bSizerViewButtons->Add( m_bpButtonShowUpdateLeft, 0, wxEXPAND, 5 );
+    m_bpButtonShowUpdateLeft = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
+    bSizerViewButtons->Add( m_bpButtonShowUpdateLeft, 0, wxEXPAND, 5 );
 
-	m_bpButtonShowCreateLeft = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
-	bSizerViewButtons->Add( m_bpButtonShowCreateLeft, 0, wxEXPAND, 5 );
+    m_bpButtonShowCreateLeft = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
+    bSizerViewButtons->Add( m_bpButtonShowCreateLeft, 0, wxEXPAND, 5 );
 
-	m_bpButtonShowLeftOnly = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
-	bSizerViewButtons->Add( m_bpButtonShowLeftOnly, 0, wxEXPAND, 5 );
+    m_bpButtonShowLeftOnly = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
+    bSizerViewButtons->Add( m_bpButtonShowLeftOnly, 0, wxEXPAND, 5 );
 
-	m_bpButtonShowLeftNewer = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
-	bSizerViewButtons->Add( m_bpButtonShowLeftNewer, 0, wxEXPAND, 5 );
+    m_bpButtonShowLeftNewer = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
+    bSizerViewButtons->Add( m_bpButtonShowLeftNewer, 0, wxEXPAND, 5 );
 
-	m_bpButtonShowEqual = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
-	bSizerViewButtons->Add( m_bpButtonShowEqual, 0, wxEXPAND, 5 );
+    m_bpButtonShowEqual = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
+    bSizerViewButtons->Add( m_bpButtonShowEqual, 0, wxEXPAND, 5 );
 
-	m_bpButtonShowDoNothing = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
-	bSizerViewButtons->Add( m_bpButtonShowDoNothing, 0, wxEXPAND, 5 );
+    m_bpButtonShowDoNothing = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
+    bSizerViewButtons->Add( m_bpButtonShowDoNothing, 0, wxEXPAND, 5 );
 
-	m_bpButtonShowDifferent = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
-	bSizerViewButtons->Add( m_bpButtonShowDifferent, 0, wxEXPAND, 5 );
+    m_bpButtonShowDifferent = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
+    bSizerViewButtons->Add( m_bpButtonShowDifferent, 0, wxEXPAND, 5 );
 
-	m_bpButtonShowRightNewer = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
-	bSizerViewButtons->Add( m_bpButtonShowRightNewer, 0, wxEXPAND, 5 );
+    m_bpButtonShowRightNewer = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
+    bSizerViewButtons->Add( m_bpButtonShowRightNewer, 0, wxEXPAND, 5 );
 
-	m_bpButtonShowRightOnly = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
-	bSizerViewButtons->Add( m_bpButtonShowRightOnly, 0, wxEXPAND, 5 );
+    m_bpButtonShowRightOnly = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
+    bSizerViewButtons->Add( m_bpButtonShowRightOnly, 0, wxEXPAND, 5 );
 
-	m_bpButtonShowCreateRight = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
-	bSizerViewButtons->Add( m_bpButtonShowCreateRight, 0, wxEXPAND, 5 );
+    m_bpButtonShowCreateRight = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
+    bSizerViewButtons->Add( m_bpButtonShowCreateRight, 0, wxEXPAND, 5 );
 
-	m_bpButtonShowUpdateRight = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
-	bSizerViewButtons->Add( m_bpButtonShowUpdateRight, 0, wxEXPAND, 5 );
+    m_bpButtonShowUpdateRight = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
+    bSizerViewButtons->Add( m_bpButtonShowUpdateRight, 0, wxEXPAND, 5 );
 
-	m_bpButtonShowDeleteRight = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
-	bSizerViewButtons->Add( m_bpButtonShowDeleteRight, 0, wxEXPAND, 5 );
+    m_bpButtonShowDeleteRight = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
+    bSizerViewButtons->Add( m_bpButtonShowDeleteRight, 0, wxEXPAND, 5 );
 
-	m_bpButtonShowConflict = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
-	bSizerViewButtons->Add( m_bpButtonShowConflict, 0, wxEXPAND, 5 );
+    m_bpButtonShowConflict = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
+    bSizerViewButtons->Add( m_bpButtonShowConflict, 0, wxEXPAND, 5 );
 
-	m_bpButtonViewFilterContext = new wxBitmapButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
-	bSizerViewButtons->Add( m_bpButtonViewFilterContext, 0, wxEXPAND, 5 );
+    m_bpButtonViewFilterContext = new wxBitmapButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
+    bSizerViewButtons->Add( m_bpButtonViewFilterContext, 0, wxEXPAND, 5 );
 
 
-	bSizerViewFilter->Add( bSizerViewButtons, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+    bSizerViewFilter->Add( bSizerViewButtons, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 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_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_buttonCompare->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCompare ), NULL, this );
-	m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCmpSettings ), NULL, this );
-	m_bpButtonCmpConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::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_bpButtonSyncContext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onSyncSettingsContext ), NULL, this );
-	m_bpButtonSyncContext->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onSyncSettingsContextMouse ), NULL, this );
-	m_buttonSync->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onStartSync ), NULL, this );
-	m_bpButtonAddPair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onTopFolderPairAdd ), NULL, this );
-	m_bpButtonRemovePair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onTopFolderPairRemove ), NULL, this );
-	m_bpButtonSwapSides->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onSwapSides ), NULL, this );
-	m_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_buttonCompare->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCompare ), NULL, this );
+    m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCmpSettings ), NULL, this );
+    m_bpButtonCmpConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::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_bpButtonSyncContext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onSyncSettingsContext ), NULL, this );
+    m_bpButtonSyncContext->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onSyncSettingsContextMouse ), NULL, this );
+    m_buttonSync->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onStartSync ), NULL, this );
+    m_bpButtonAddPair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onTopFolderPairAdd ), NULL, this );
+    m_bpButtonRemovePair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onTopFolderPairRemove ), NULL, this );
+    m_bpButtonSwapSides->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onSwapSides ), NULL, this );
+    m_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()
@@ -1202,97 +1202,97 @@ 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();
+    this->SetSizer( bSizer74 );
+    this->Layout();
 }
 
 FolderPairPanelGenerated::~FolderPairPanelGenerated()
@@ -1301,1277 +1301,1277 @@ 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 );
 
 
-	bSizer159->Add( 0, 0, 1, 0, 5 );
+    bSizer159->Add( 0, 0, 1, 0, 5 );
 
-	bSizerCompMisc = new wxBoxSizer( wxVERTICAL );
+    bSizerCompMisc = new wxBoxSizer( wxVERTICAL );
 
-	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 );
 
-	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 );
 
 
-	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"), true );
-	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"), true );
+    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 );
 
-	wxBoxSizer* bSizer301;
-	bSizer301 = new wxBoxSizer( wxHORIZONTAL );
+    wxBoxSizer* bSizer301;
+    bSizer301 = 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_panelFilterSettingsTab, 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_panelFilterSettingsTab, 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_panelFilterSettingsTab, wxID_ANY, _("Include:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText78->Wrap( -1 );
-	bSizer1731->Add( m_staticText78, 0, 0, 5 );
+    m_staticText78 = new wxStaticText( m_panelFilterSettingsTab, wxID_ANY, _("Include:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText78->Wrap( -1 );
+    bSizer1731->Add( m_staticText78, 0, 0, 5 );
 
-	m_textCtrlInclude = new wxTextCtrl( m_panelFilterSettingsTab, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE );
-	bSizer1731->Add( m_textCtrlInclude, 1, wxEXPAND|wxTOP, 5 );
+    m_textCtrlInclude = new wxTextCtrl( m_panelFilterSettingsTab, 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_panelFilterSettingsTab, 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_panelFilterSettingsTab, 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_panelFilterSettingsTab, wxID_ANY, _("Exclude:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText77->Wrap( -1 );
-	bSizer189->Add( m_staticText77, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    m_staticText77 = new wxStaticText( m_panelFilterSettingsTab, 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_panelFilterSettingsTab, 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_panelFilterSettingsTab, 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_panelFilterSettingsTab, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE );
-	bSizer1742->Add( m_textCtrlExclude, 1, wxEXPAND|wxTOP, 5 );
+    m_textCtrlExclude = new wxTextCtrl( m_panelFilterSettingsTab, 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 );
 
 
-	bSizer301->Add( bSizer166, 1, wxEXPAND, 5 );
+    bSizer301->Add( bSizer166, 1, wxEXPAND, 5 );
 
-	m_staticline24 = new wxStaticLine( m_panelFilterSettingsTab, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizer301->Add( m_staticline24, 0, wxEXPAND, 5 );
+    m_staticline24 = new wxStaticLine( m_panelFilterSettingsTab, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizer301->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_panelFilterSettingsTab, 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_panelFilterSettingsTab, 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_panelFilterSettingsTab, wxID_ANY, _("File size:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText80->Wrap( -1 );
-	bSizer158->Add( m_staticText80, 0, wxBOTTOM, 5 );
+    m_staticText80 = new wxStaticText( m_panelFilterSettingsTab, 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_panelFilterSettingsTab, wxID_ANY, _("Minimum:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText101->Wrap( -1 );
-	bSizer162->Add( m_staticText101, 0, wxBOTTOM, 2 );
+    m_staticText101 = new wxStaticText( m_panelFilterSettingsTab, wxID_ANY, _("Minimum:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText101->Wrap( -1 );
+    bSizer162->Add( m_staticText101, 0, wxBOTTOM, 2 );
 
-	m_spinCtrlMinSize = new wxSpinCtrl( m_panelFilterSettingsTab, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
-	bSizer162->Add( m_spinCtrlMinSize, 0, wxEXPAND, 5 );
+    m_spinCtrlMinSize = new wxSpinCtrl( m_panelFilterSettingsTab, 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_panelFilterSettingsTab, 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_panelFilterSettingsTab, 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_panelFilterSettingsTab, wxID_ANY, _("Maximum:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText102->Wrap( -1 );
-	bSizer163->Add( m_staticText102, 0, wxBOTTOM, 2 );
+    m_staticText102 = new wxStaticText( m_panelFilterSettingsTab, wxID_ANY, _("Maximum:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText102->Wrap( -1 );
+    bSizer163->Add( m_staticText102, 0, wxBOTTOM, 2 );
 
-	m_spinCtrlMaxSize = new wxSpinCtrl( m_panelFilterSettingsTab, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
-	bSizer163->Add( m_spinCtrlMaxSize, 0, wxEXPAND, 5 );
+    m_spinCtrlMaxSize = new wxSpinCtrl( m_panelFilterSettingsTab, 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_panelFilterSettingsTab, 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_panelFilterSettingsTab, 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_panelFilterSettingsTab, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer160->Add( m_staticline23, 0, wxEXPAND, 5 );
+    m_staticline23 = new wxStaticLine( m_panelFilterSettingsTab, 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_panelFilterSettingsTab, 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_panelFilterSettingsTab, 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_panelFilterSettingsTab, wxID_ANY, _("Time span:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText79->Wrap( -1 );
-	bSizer165->Add( m_staticText79, 0, wxBOTTOM, 5 );
+    m_staticText79 = new wxStaticText( m_panelFilterSettingsTab, 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_panelFilterSettingsTab, 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_panelFilterSettingsTab, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitTimespanChoices, 0 );
+    m_choiceUnitTimespan->SetSelection( 0 );
+    bSizer165->Add( m_choiceUnitTimespan, 0, wxEXPAND, 5 );
 
-	m_spinCtrlTimespan = new wxSpinCtrl( m_panelFilterSettingsTab, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
-	bSizer165->Add( m_spinCtrlTimespan, 0, wxEXPAND, 5 );
+    m_spinCtrlTimespan = new wxSpinCtrl( m_panelFilterSettingsTab, 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_panelFilterSettingsTab, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer160->Add( m_staticline231, 0, wxEXPAND, 5 );
+    m_staticline231 = new wxStaticLine( m_panelFilterSettingsTab, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer160->Add( m_staticline231, 0, wxEXPAND, 5 );
 
 
-	bSizer301->Add( bSizer160, 0, wxEXPAND, 5 );
+    bSizer301->Add( bSizer160, 0, wxEXPAND, 5 );
 
 
-	bSizer278->Add( bSizer301, 1, wxEXPAND, 5 );
+    bSizer278->Add( bSizer301, 1, wxEXPAND, 5 );
 
-	wxBoxSizer* bSizer302;
-	bSizer302 = new wxBoxSizer( wxHORIZONTAL );
+    wxBoxSizer* bSizer302;
+    bSizer302 = new wxBoxSizer( wxHORIZONTAL );
 
-	m_staticTextFilterDescr = new wxStaticText( m_panelFilterSettingsTab, 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_panelFilterSettingsTab, 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 ) );
 
-	bSizer302->Add( m_staticTextFilterDescr, 1, wxALL|wxALIGN_CENTER_VERTICAL, 10 );
+    bSizer302->Add( m_staticTextFilterDescr, 1, wxALL|wxALIGN_CENTER_VERTICAL, 10 );
 
-	wxBoxSizer* bSizer303;
-	bSizer303 = new wxBoxSizer( wxHORIZONTAL );
+    wxBoxSizer* bSizer303;
+    bSizer303 = new wxBoxSizer( wxHORIZONTAL );
 
-	m_buttonDefault = new wxButton( m_panelFilterSettingsTab, wxID_ANY, _("&Default"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	bSizer303->Add( m_buttonDefault, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    m_buttonDefault = new wxButton( m_panelFilterSettingsTab, wxID_ANY, _("&Default"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    bSizer303->Add( m_buttonDefault, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_bpButtonDefaultContext = new wxBitmapButton( m_panelFilterSettingsTab, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
-	bSizer303->Add( m_bpButtonDefaultContext, 0, wxEXPAND, 5 );
+    m_bpButtonDefaultContext = new wxBitmapButton( m_panelFilterSettingsTab, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
+    bSizer303->Add( m_bpButtonDefaultContext, 0, wxEXPAND, 5 );
 
 
-	bSizer302->Add( bSizer303, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 10 );
+    bSizer302->Add( bSizer303, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 10 );
 
-	m_buttonClear = new wxButton( m_panelFilterSettingsTab, wxID_ANY, _("C&lear"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	bSizer302->Add( m_buttonClear, 0, wxALL|wxALIGN_CENTER_VERTICAL, 10 );
+    m_buttonClear = new wxButton( m_panelFilterSettingsTab, wxID_ANY, _("C&lear"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    bSizer302->Add( m_buttonClear, 0, wxALL|wxALIGN_CENTER_VERTICAL, 10 );
 
 
-	bSizer278->Add( bSizer302, 0, wxEXPAND, 5 );
+    bSizer278->Add( bSizer302, 0, wxEXPAND, 5 );
 
 
-	m_panelFilterSettingsTab->SetSizer( bSizer278 );
-	m_panelFilterSettingsTab->Layout();
-	bSizer278->Fit( m_panelFilterSettingsTab );
-	m_notebook->AddPage( m_panelFilterSettingsTab, _("dummy"), false );
-	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"), false );
+    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_DEFAULT, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+    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, _("&Change log folder:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_checkBoxOverrideLogPath->SetValue(true);
-	bSizer279->Add( m_checkBoxOverrideLogPath, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+    m_checkBoxOverrideLogPath = new wxCheckBox( m_panelLogfile, wxID_ANY, _("&Change log folder:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_checkBoxOverrideLogPath->SetValue(true);
+    bSizer279->Add( m_checkBoxOverrideLogPath, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
 
 
-	bSizer279->Add( 0, 0, 1, 0, 5 );
+    bSizer279->Add( 0, 0, 1, 0, 5 );
 
-	m_bpButtonShowLogFolder = new wxBitmapButton( m_panelLogfile, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
-	m_bpButtonShowLogFolder->SetToolTip( _("dummy") );
+    m_bpButtonShowLogFolder = new wxBitmapButton( m_panelLogfile, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
+    m_bpButtonShowLogFolder->SetToolTip( _("dummy") );
 
-	bSizer279->Add( m_bpButtonShowLogFolder, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    bSizer279->Add( m_bpButtonShowLogFolder, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-	bSizer1912->Add( bSizer279, 0, wxEXPAND, 5 );
+    bSizer1912->Add( bSizer279, 0, wxEXPAND, 5 );
 
-	wxBoxSizer* bSizer297;
-	bSizer297 = new wxBoxSizer( wxHORIZONTAL );
+    wxBoxSizer* bSizer297;
+    bSizer297 = new wxBoxSizer( wxHORIZONTAL );
 
-	m_logFolderPath = new fff::FolderHistoryBox( m_panelLogfile, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
-	bSizer297->Add( m_logFolderPath, 1, wxALIGN_CENTER_VERTICAL, 5 );
+    m_logFolderPath = new fff::FolderHistoryBox( m_panelLogfile, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+    bSizer297->Add( m_logFolderPath, 1, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_buttonSelectLogFolder = new wxButton( m_panelLogfile, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonSelectLogFolder->SetToolTip( _("Select a folder") );
+    m_buttonSelectLogFolder = new wxButton( m_panelLogfile, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonSelectLogFolder->SetToolTip( _("Select a folder") );
 
-	bSizer297->Add( m_buttonSelectLogFolder, 0, wxEXPAND, 5 );
+    bSizer297->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") );
 
-	bSizer297->Add( m_bpButtonSelectAltLogFolder, 0, wxEXPAND, 5 );
+    bSizer297->Add( m_bpButtonSelectAltLogFolder, 0, wxEXPAND, 5 );
 
 
-	bSizer1912->Add( bSizer297, 0, wxEXPAND|wxTOP, 5 );
+    bSizer1912->Add( bSizer297, 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_buttonDefault->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onFilterDefault ), NULL, this );
-	m_buttonDefault->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( ConfigDlgGenerated::onFilterDefaultContextMouse ), NULL, this );
-	m_bpButtonDefaultContext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onFilterDefaultContext ), NULL, this );
-	m_bpButtonDefaultContext->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( ConfigDlgGenerated::onFilterDefaultContextMouse ), NULL, this );
-	m_buttonClear->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onFilterClear ), 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_bpButtonShowLogFolder->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onShowLogFolder ), 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_buttonDefault->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onFilterDefault ), NULL, this );
+    m_buttonDefault->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( ConfigDlgGenerated::onFilterDefaultContextMouse ), NULL, this );
+    m_bpButtonDefaultContext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onFilterDefaultContext ), NULL, this );
+    m_bpButtonDefaultContext->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( ConfigDlgGenerated::onFilterDefaultContextMouse ), NULL, this );
+    m_buttonClear->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onFilterClear ), 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_bpButtonShowLogFolder->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onShowLogFolder ), 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()
@@ -2580,537 +2580,537 @@ 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 );
-	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 );
+    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* bSizer3051;
-	bSizer3051 = new wxBoxSizer( wxHORIZONTAL );
+    wxBoxSizer* bSizer3051;
+    bSizer3051 = new wxBoxSizer( wxHORIZONTAL );
 
-	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 );
 
 
-	bSizer3051->Add( bSizer270, 0, wxTOP|wxRIGHT|wxLEFT|wxALIGN_BOTTOM, 5 );
+    bSizer3051->Add( bSizer270, 0, wxTOP|wxRIGHT|wxLEFT|wxALIGN_BOTTOM, 5 );
 
 
-	bSizer3051->Add( 0, 0, 1, 0, 5 );
+    bSizer3051->Add( 0, 0, 1, 0, 5 );
 
-	wxBoxSizer* bSizer3031;
-	bSizer3031 = new wxBoxSizer( wxVERTICAL );
+    wxBoxSizer* bSizer3031;
+    bSizer3031 = new wxBoxSizer( wxVERTICAL );
 
-	wxBoxSizer* bSizer303;
-	bSizer303 = new wxBoxSizer( wxHORIZONTAL );
+    wxBoxSizer* bSizer303;
+    bSizer303 = new wxBoxSizer( wxHORIZONTAL );
 
-	m_staticline83 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizer303->Add( m_staticline83, 0, wxEXPAND, 5 );
+    m_staticline83 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizer303->Add( m_staticline83, 0, wxEXPAND, 5 );
 
-	wxBoxSizer* bSizer3042;
-	bSizer3042 = new wxBoxSizer( wxHORIZONTAL );
+    wxBoxSizer* bSizer3042;
+    bSizer3042 = new wxBoxSizer( wxHORIZONTAL );
 
-	m_staticTextTimeout = new wxStaticText( m_panel41, wxID_ANY, _("Access timeout (in seconds):"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextTimeout->Wrap( -1 );
-	bSizer3042->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 );
+    bSizer3042->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 );
-	bSizer3042->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 );
+    bSizer3042->Add( m_spinCtrlTimeout, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-	bSizer303->Add( bSizer3042, 0, wxALL, 5 );
+    bSizer303->Add( bSizer3042, 0, wxALL, 5 );
 
 
-	bSizer3031->Add( bSizer303, 0, wxALIGN_RIGHT, 5 );
+    bSizer3031->Add( bSizer303, 0, wxALIGN_RIGHT, 5 );
 
-	m_staticline82 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer3031->Add( m_staticline82, 0, wxEXPAND, 5 );
+    m_staticline82 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer3031->Add( m_staticline82, 0, wxEXPAND, 5 );
 
 
-	bSizer3051->Add( bSizer3031, 0, wxBOTTOM, 10 );
+    bSizer3051->Add( bSizer3031, 0, wxBOTTOM, 10 );
 
 
-	bSizer269->Add( bSizer3051, 0, wxEXPAND, 5 );
+    bSizer269->Add( bSizer3051, 0, wxEXPAND, 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 );
 
 
-	bSizer269->Add( 0, 10, 0, 0, 5 );
+    bSizer269->Add( 0, 10, 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()
@@ -3119,61 +3119,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()
@@ -3182,225 +3182,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()
@@ -3409,198 +3409,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( wxHORIZONTAL );
+    wxBoxSizer* bSizer291;
+    bSizer291 = new wxBoxSizer( wxHORIZONTAL );
 
-	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|wxALIGN_CENTER_VERTICAL, 5 );
+    bSizer291->Add( ffgSizer111, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-	m_panelItemStats->SetSizer( bSizer291 );
-	m_panelItemStats->Layout();
-	bSizer291->Fit( m_panelItemStats );
-	bSizer199->Add( m_panelItemStats, 0, wxTOP|wxBOTTOM|wxRIGHT|wxEXPAND, 10 );
+    m_panelItemStats->SetSizer( bSizer291 );
+    m_panelItemStats->Layout();
+    bSizer291->Fit( m_panelItemStats );
+    bSizer199->Add( m_panelItemStats, 0, wxTOP|wxBOTTOM|wxRIGHT|wxEXPAND, 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( wxHORIZONTAL );
+    wxBoxSizer* bSizer292;
+    bSizer292 = new wxBoxSizer( wxHORIZONTAL );
 
-	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|wxALIGN_CENTER_VERTICAL, 5 );
+    bSizer292->Add( ffgSizer112, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-	m_panelTimeStats->SetSizer( bSizer292 );
-	m_panelTimeStats->Layout();
-	bSizer292->Fit( m_panelTimeStats );
-	bSizer199->Add( m_panelTimeStats, 0, wxTOP|wxBOTTOM|wxRIGHT|wxEXPAND, 10 );
+    m_panelTimeStats->SetSizer( bSizer292 );
+    m_panelTimeStats->Layout();
+    bSizer292->Fit( m_panelTimeStats );
+    bSizer199->Add( m_panelTimeStats, 0, wxTOP|wxBOTTOM|wxRIGHT|wxEXPAND, 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()
@@ -3609,336 +3609,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 );
 
 
-	bSizerStdButtons->Add( 0, 0, 1, wxEXPAND, 5 );
+    bSizerStdButtons->Add( 0, 0, 1, wxEXPAND, 5 );
 
-	m_checkBoxAutoClose = new wxCheckBox( this, wxID_ANY, _("Auto-close"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizerStdButtons->Add( m_checkBoxAutoClose, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+    m_checkBoxAutoClose = new wxCheckBox( this, wxID_ANY, _("Auto-close"), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizerStdButtons->Add( m_checkBoxAutoClose, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 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()
@@ -3947,42 +3947,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()
@@ -3991,173 +3991,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()
@@ -4166,85 +4166,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()
@@ -4253,120 +4253,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()
@@ -4375,583 +4375,583 @@ 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 );
 
 
-	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* bSizer292;
-	bSizer292 = new wxBoxSizer( wxHORIZONTAL );
+    wxBoxSizer* bSizer292;
+    bSizer292 = new wxBoxSizer( wxHORIZONTAL );
 
-	m_bitmapWarnings = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer292->Add( m_bitmapWarnings, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+    m_bitmapWarnings = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer292->Add( m_bitmapWarnings, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
-	m_staticText182 = new wxStaticText( m_panel39, wxID_ANY, _("Show hidden dialogs and warning messages again:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText182->Wrap( -1 );
-	bSizer292->Add( m_staticText182, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    m_staticText182 = new wxStaticText( m_panel39, wxID_ANY, _("Show hidden dialogs and warning messages again:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText182->Wrap( -1 );
+    bSizer292->Add( m_staticText182, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_staticTextHiddenDialogsCount = new wxStaticText( m_panel39, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextHiddenDialogsCount->Wrap( -1 );
-	m_staticTextHiddenDialogsCount->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+    m_staticTextHiddenDialogsCount = new wxStaticText( m_panel39, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextHiddenDialogsCount->Wrap( -1 );
+    m_staticTextHiddenDialogsCount->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-	bSizer292->Add( m_staticTextHiddenDialogsCount, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+    bSizer292->Add( m_staticTextHiddenDialogsCount, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_buttonShowHiddenDialogs = new wxButton( m_panel39, wxID_ANY, _("&Show details"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	bSizer292->Add( m_buttonShowHiddenDialogs, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+    m_buttonShowHiddenDialogs = new wxButton( m_panel39, wxID_ANY, _("&Show details"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    bSizer292->Add( m_buttonShowHiddenDialogs, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
 
-	bSizer166->Add( bSizer292, 0, wxALL, 10 );
+    bSizer166->Add( bSizer292, 0, wxALL, 10 );
 
-	wxArrayString m_checkListHiddenDialogsChoices;
-	m_checkListHiddenDialogs = new wxCheckListBox( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_checkListHiddenDialogsChoices, wxLB_EXTENDED );
-	bSizer166->Add( m_checkListHiddenDialogs, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 10 );
+    wxArrayString m_checkListHiddenDialogsChoices;
+    m_checkListHiddenDialogs = new wxCheckListBox( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_checkListHiddenDialogsChoices, wxLB_EXTENDED );
+    bSizer166->Add( m_checkListHiddenDialogs, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 10 );
 
-	m_staticline1911 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer166->Add( m_staticline1911, 0, wxEXPAND, 5 );
+    m_staticline1911 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer166->Add( m_staticline1911, 0, wxEXPAND, 5 );
 
-	wxFlexGridSizer* fgSizer25111;
-	fgSizer25111 = new wxFlexGridSizer( 0, 2, 0, 0 );
-	fgSizer25111->AddGrowableCol( 1 );
-	fgSizer25111->AddGrowableRow( 0 );
-	fgSizer25111->SetFlexibleDirection( wxBOTH );
-	fgSizer25111->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+    wxFlexGridSizer* fgSizer25111;
+    fgSizer25111 = new wxFlexGridSizer( 0, 2, 0, 0 );
+    fgSizer25111->AddGrowableCol( 1 );
+    fgSizer25111->AddGrowableRow( 0 );
+    fgSizer25111->SetFlexibleDirection( wxBOTH );
+    fgSizer25111->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-	m_bitmapLogFile = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer25111->Add( m_bitmapLogFile, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+    m_bitmapLogFile = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    fgSizer25111->Add( m_bitmapLogFile, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
-	wxBoxSizer* bSizer296;
-	bSizer296 = new wxBoxSizer( wxHORIZONTAL );
+    wxBoxSizer* bSizer296;
+    bSizer296 = new wxBoxSizer( wxHORIZONTAL );
 
-	m_staticText163 = new wxStaticText( m_panel39, wxID_ANY, _("Default log folder:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText163->Wrap( -1 );
-	bSizer296->Add( m_staticText163, 1, wxALIGN_CENTER_VERTICAL, 5 );
+    m_staticText163 = new wxStaticText( m_panel39, wxID_ANY, _("Default log folder:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText163->Wrap( -1 );
+    bSizer296->Add( m_staticText163, 1, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_bpButtonShowLogFolder = new wxBitmapButton( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
-	m_bpButtonShowLogFolder->SetToolTip( _("dummy") );
+    m_bpButtonShowLogFolder = new wxBitmapButton( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
+    m_bpButtonShowLogFolder->SetToolTip( _("dummy") );
 
-	bSizer296->Add( m_bpButtonShowLogFolder, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+    bSizer296->Add( m_bpButtonShowLogFolder, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-	fgSizer25111->Add( bSizer296, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+    fgSizer25111->Add( bSizer296, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 
 
-	fgSizer25111->Add( 0, 0, 0, 0, 5 );
+    fgSizer25111->Add( 0, 0, 0, 0, 5 );
 
-	m_panelLogfile = new wxPanel( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panelLogfile->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+    m_panelLogfile = new wxPanel( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panelLogfile->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-	wxBoxSizer* bSizer279;
-	bSizer279 = new wxBoxSizer( wxHORIZONTAL );
+    wxBoxSizer* bSizer279;
+    bSizer279 = new wxBoxSizer( wxHORIZONTAL );
 
-	m_logFolderPath = new fff::FolderHistoryBox( m_panelLogfile, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
-	bSizer279->Add( m_logFolderPath, 1, wxALIGN_CENTER_VERTICAL, 5 );
+    m_logFolderPath = new fff::FolderHistoryBox( m_panelLogfile, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+    bSizer279->Add( m_logFolderPath, 1, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_buttonSelectLogFolder = new wxButton( m_panelLogfile, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonSelectLogFolder->SetToolTip( _("Select a folder") );
+    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 );
 
 
-	m_panelLogfile->SetSizer( bSizer279 );
-	m_panelLogfile->Layout();
-	bSizer279->Fit( m_panelLogfile );
-	fgSizer25111->Add( m_panelLogfile, 0, wxEXPAND, 5 );
+    m_panelLogfile->SetSizer( bSizer279 );
+    m_panelLogfile->Layout();
+    bSizer279->Fit( m_panelLogfile );
+    fgSizer25111->Add( m_panelLogfile, 0, wxEXPAND, 5 );
 
 
-	fgSizer25111->Add( 0, 0, 0, 0, 5 );
+    fgSizer25111->Add( 0, 0, 0, 0, 5 );
 
-	wxBoxSizer* bSizer297;
-	bSizer297 = new wxBoxSizer( wxHORIZONTAL );
+    wxBoxSizer* bSizer297;
+    bSizer297 = new wxBoxSizer( wxHORIZONTAL );
 
-	m_checkBoxLogFilesMaxAge = new wxCheckBox( m_panel39, wxID_ANY, _("&Delete logs after x days:"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer297->Add( m_checkBoxLogFilesMaxAge, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    m_checkBoxLogFilesMaxAge = new wxCheckBox( m_panel39, wxID_ANY, _("&Delete logs after x days:"), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer297->Add( m_checkBoxLogFilesMaxAge, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_spinCtrlLogFilesMaxAge = new wxSpinCtrl( m_panel39, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
-	bSizer297->Add( m_spinCtrlLogFilesMaxAge, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+    m_spinCtrlLogFilesMaxAge = new wxSpinCtrl( m_panel39, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
+    bSizer297->Add( m_spinCtrlLogFilesMaxAge, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
 
-	m_staticline81 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizer297->Add( m_staticline81, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+    m_staticline81 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizer297->Add( m_staticline81, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
 
-	m_staticText184 = new wxStaticText( m_panel39, wxID_ANY, _("Log file format:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText184->Wrap( -1 );
-	bSizer297->Add( m_staticText184, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+    m_staticText184 = new wxStaticText( m_panel39, wxID_ANY, _("Log file format:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText184->Wrap( -1 );
+    bSizer297->Add( m_staticText184, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 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 );
 
 
-	bSizer297->Add( fgSizer251, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+    bSizer297->Add( fgSizer251, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-	fgSizer25111->Add( bSizer297, 0, wxTOP, 5 );
+    fgSizer25111->Add( bSizer297, 0, wxTOP, 5 );
 
 
-	bSizer166->Add( fgSizer25111, 0, wxALL|wxEXPAND, 10 );
+    bSizer166->Add( fgSizer25111, 0, wxALL|wxEXPAND, 10 );
 
-	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 );
 
-	wxFlexGridSizer* fgSizer251111;
-	fgSizer251111 = new wxFlexGridSizer( 0, 2, 0, 0 );
-	fgSizer251111->AddGrowableCol( 1 );
-	fgSizer251111->AddGrowableRow( 0 );
-	fgSizer251111->SetFlexibleDirection( wxBOTH );
-	fgSizer251111->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+    wxFlexGridSizer* fgSizer251111;
+    fgSizer251111 = new wxFlexGridSizer( 0, 2, 0, 0 );
+    fgSizer251111->AddGrowableCol( 1 );
+    fgSizer251111->AddGrowableRow( 0 );
+    fgSizer251111->SetFlexibleDirection( wxBOTH );
+    fgSizer251111->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-	m_bitmapNotificationSounds = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer251111->Add( m_bitmapNotificationSounds, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+    m_bitmapNotificationSounds = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    fgSizer251111->Add( m_bitmapNotificationSounds, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_staticText851 = new wxStaticText( m_panel39, wxID_ANY, _("Notification sounds:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText851->Wrap( -1 );
-	fgSizer251111->Add( m_staticText851, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    m_staticText851 = new wxStaticText( m_panel39, wxID_ANY, _("Notification sounds:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText851->Wrap( -1 );
+    fgSizer251111->Add( m_staticText851, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-	fgSizer251111->Add( 0, 0, 0, 0, 5 );
+    fgSizer251111->Add( 0, 0, 0, 0, 5 );
 
-	ffgSizer11 = new wxFlexGridSizer( 0, 3, 0, 10 );
-	ffgSizer11->AddGrowableCol( 2 );
-	ffgSizer11->SetFlexibleDirection( wxBOTH );
-	ffgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+    ffgSizer11 = new wxFlexGridSizer( 0, 3, 0, 10 );
+    ffgSizer11->AddGrowableCol( 2 );
+    ffgSizer11->SetFlexibleDirection( wxBOTH );
+    ffgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-	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 );
 
-	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 );
 
-	wxBoxSizer* bSizer290;
-	bSizer290 = new wxBoxSizer( wxHORIZONTAL );
+    wxBoxSizer* bSizer290;
+    bSizer290 = new wxBoxSizer( wxHORIZONTAL );
 
-	m_bpButtonPlayCompareDone = new wxBitmapButton( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
-	bSizer290->Add( m_bpButtonPlayCompareDone, 0, wxEXPAND, 5 );
+    m_bpButtonPlayCompareDone = new wxBitmapButton( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+    bSizer290->Add( m_bpButtonPlayCompareDone, 0, wxEXPAND, 5 );
 
-	m_textCtrlSoundPathCompareDone = new wxTextCtrl( m_panel39, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer290->Add( m_textCtrlSoundPathCompareDone, 1, wxALIGN_CENTER_VERTICAL, 5 );
+    m_textCtrlSoundPathCompareDone = new wxTextCtrl( m_panel39, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer290->Add( m_textCtrlSoundPathCompareDone, 1, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_buttonSelectSoundCompareDone = new wxButton( m_panel39, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonSelectSoundCompareDone->SetToolTip( _("Select a folder") );
+    m_buttonSelectSoundCompareDone = new wxButton( m_panel39, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonSelectSoundCompareDone->SetToolTip( _("Select a folder") );
 
-	bSizer290->Add( m_buttonSelectSoundCompareDone, 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_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 );
 
-	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 );
 
-	wxBoxSizer* bSizer2901;
-	bSizer2901 = new wxBoxSizer( wxHORIZONTAL );
+    wxBoxSizer* bSizer2901;
+    bSizer2901 = new wxBoxSizer( wxHORIZONTAL );
 
-	m_bpButtonPlaySyncDone = new wxBitmapButton( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
-	bSizer2901->Add( m_bpButtonPlaySyncDone, 0, wxEXPAND, 5 );
+    m_bpButtonPlaySyncDone = new wxBitmapButton( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+    bSizer2901->Add( m_bpButtonPlaySyncDone, 0, wxEXPAND, 5 );
 
-	m_textCtrlSoundPathSyncDone = new wxTextCtrl( m_panel39, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer2901->Add( m_textCtrlSoundPathSyncDone, 1, wxALIGN_CENTER_VERTICAL, 5 );
+    m_textCtrlSoundPathSyncDone = new wxTextCtrl( m_panel39, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer2901->Add( m_textCtrlSoundPathSyncDone, 1, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_buttonSelectSoundSyncDone = new wxButton( m_panel39, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonSelectSoundSyncDone->SetToolTip( _("Select a folder") );
+    m_buttonSelectSoundSyncDone = new wxButton( m_panel39, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonSelectSoundSyncDone->SetToolTip( _("Select a folder") );
 
-	bSizer2901->Add( m_buttonSelectSoundSyncDone, 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 );
 
-	m_staticText17111 = new wxStaticText( m_panel39, wxID_ANY, _("Unattended error message:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText17111->Wrap( -1 );
-	m_staticText17111->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+    m_staticText17111 = new wxStaticText( m_panel39, wxID_ANY, _("Unattended error message:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText17111->Wrap( -1 );
+    m_staticText17111->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-	ffgSizer11->Add( m_staticText17111, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    ffgSizer11->Add( m_staticText17111, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_bitmapAlertPending = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	ffgSizer11->Add( m_bitmapAlertPending, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    m_bitmapAlertPending = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    ffgSizer11->Add( m_bitmapAlertPending, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	wxBoxSizer* bSizer29011;
-	bSizer29011 = new wxBoxSizer( wxHORIZONTAL );
+    wxBoxSizer* bSizer29011;
+    bSizer29011 = new wxBoxSizer( wxHORIZONTAL );
 
-	m_bpButtonPlayAlertPending = new wxBitmapButton( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
-	bSizer29011->Add( m_bpButtonPlayAlertPending, 0, wxEXPAND, 5 );
+    m_bpButtonPlayAlertPending = new wxBitmapButton( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+    bSizer29011->Add( m_bpButtonPlayAlertPending, 0, wxEXPAND, 5 );
 
-	m_textCtrlSoundPathAlertPending = new wxTextCtrl( m_panel39, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer29011->Add( m_textCtrlSoundPathAlertPending, 1, wxALIGN_CENTER_VERTICAL, 5 );
+    m_textCtrlSoundPathAlertPending = new wxTextCtrl( m_panel39, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer29011->Add( m_textCtrlSoundPathAlertPending, 1, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_buttonSelectSoundAlertPending = new wxButton( m_panel39, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonSelectSoundAlertPending->SetToolTip( _("Select a folder") );
+    m_buttonSelectSoundAlertPending = new wxButton( m_panel39, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonSelectSoundAlertPending->SetToolTip( _("Select a folder") );
 
-	bSizer29011->Add( m_buttonSelectSoundAlertPending, 0, wxEXPAND, 5 );
+    bSizer29011->Add( m_buttonSelectSoundAlertPending, 0, wxEXPAND, 5 );
 
 
-	ffgSizer11->Add( bSizer29011, 1, wxEXPAND, 5 );
+    ffgSizer11->Add( bSizer29011, 1, wxEXPAND, 5 );
 
 
-	fgSizer251111->Add( ffgSizer11, 0, wxEXPAND|wxTOP, 5 );
+    fgSizer251111->Add( ffgSizer11, 0, wxEXPAND|wxTOP, 5 );
 
 
-	bSizer166->Add( fgSizer251111, 0, wxALL|wxEXPAND, 10 );
+    bSizer166->Add( fgSizer251111, 0, wxALL|wxEXPAND, 10 );
 
-	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* 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 );
 
-	m_buttonShowCtxCustomize = new wxButton( m_panel39, wxID_ANY, _("&Show details"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	bSizer2971->Add( m_buttonShowCtxCustomize, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+    m_buttonShowCtxCustomize = new wxButton( m_panel39, wxID_ANY, _("&Show details"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    bSizer2971->Add( m_buttonShowCtxCustomize, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
 
-	bSizer166->Add( bSizer2971, 0, wxALL, 10 );
+    bSizer166->Add( bSizer2971, 0, wxALL, 10 );
 
-	bSizerContextCustomize = new wxBoxSizer( wxVERTICAL );
+    bSizerContextCustomize = new wxBoxSizer( wxVERTICAL );
 
-	wxBoxSizer* bSizer181;
-	bSizer181 = new wxBoxSizer( wxHORIZONTAL );
+    wxBoxSizer* bSizer181;
+    bSizer181 = new wxBoxSizer( wxHORIZONTAL );
 
-	wxBoxSizer* bSizer2991;
-	bSizer2991 = new wxBoxSizer( wxVERTICAL );
+    wxBoxSizer* bSizer2991;
+    bSizer2991 = new wxBoxSizer( wxVERTICAL );
 
 
-	bSizer2991->Add( 0, 0, 1, 0, 5 );
+    bSizer2991->Add( 0, 0, 1, 0, 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 );
 
 
-	bSizer181->Add( bSizer2991, 1, wxEXPAND, 5 );
+    bSizer181->Add( bSizer2991, 1, wxEXPAND, 5 );
 
-	wxFlexGridSizer* fgSizer37;
-	fgSizer37 = new wxFlexGridSizer( 0, 2, 0, 10 );
-	fgSizer37->SetFlexibleDirection( wxBOTH );
-	fgSizer37->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+    wxFlexGridSizer* fgSizer37;
+    fgSizer37 = new wxFlexGridSizer( 0, 2, 0, 10 );
+    fgSizer37->SetFlexibleDirection( wxBOTH );
+    fgSizer37->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 ) );
 
-	fgSizer37->Add( m_staticText174, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    fgSizer37->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 ) );
 
-	fgSizer37->Add( m_staticText175, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    fgSizer37->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 ) );
 
-	fgSizer37->Add( m_staticText178, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    fgSizer37->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 ) );
 
-	fgSizer37->Add( m_staticText179, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    fgSizer37->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 ) );
 
-	fgSizer37->Add( m_staticText189, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    fgSizer37->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 ) );
 
-	fgSizer37->Add( m_staticText190, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    fgSizer37->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 ) );
 
-	fgSizer37->Add( m_staticText176, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    fgSizer37->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 );
 
 
-	fgSizer37->Add( bSizer298, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+    fgSizer37->Add( bSizer298, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 
 
-	bSizer181->Add( fgSizer37, 0, wxBOTTOM|wxLEFT, 10 );
+    bSizer181->Add( fgSizer37, 0, wxBOTTOM|wxLEFT, 10 );
 
 
-	bSizerContextCustomize->Add( bSizer181, 0, wxEXPAND, 5 );
+    bSizerContextCustomize->Add( bSizer181, 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( false );
-	m_gridCustomCommand->SetColLabelValue( 0, _("Description") );
-	m_gridCustomCommand->SetColLabelValue( 1, _("Command line") );
-	m_gridCustomCommand->SetColLabelSize( -1 );
-	m_gridCustomCommand->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
+    // Columns
+    m_gridCustomCommand->EnableDragColMove( false );
+    m_gridCustomCommand->EnableDragColSize( false );
+    m_gridCustomCommand->SetColLabelValue( 0, _("Description") );
+    m_gridCustomCommand->SetColLabelValue( 1, _("Command line") );
+    m_gridCustomCommand->SetColLabelSize( -1 );
+    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 );
-	bSizerContextCustomize->Add( m_gridCustomCommand, 1, wxEXPAND, 5 );
+    // Cell Defaults
+    m_gridCustomCommand->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+    bSizerContextCustomize->Add( m_gridCustomCommand, 1, wxEXPAND, 5 );
 
 
-	bSizer166->Add( bSizerContextCustomize, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 10 );
+    bSizer166->Add( bSizerContextCustomize, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 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_buttonShowHiddenDialogs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::onShowHiddenDialogs ), NULL, this );
-	m_checkListHiddenDialogs->Connect( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, wxCommandEventHandler( OptionsDlgGenerated::onToggleHiddenDialog ), NULL, this );
-	m_bpButtonShowLogFolder->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( 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_bpButtonPlayAlertPending->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::onPlayAlertPending ), NULL, this );
-	m_textCtrlSoundPathAlertPending->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( OptionsDlgGenerated::onChangeSoundFilePath ), NULL, this );
-	m_buttonSelectSoundAlertPending->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::onSelectSoundAlertPending ), NULL, this );
-	m_buttonShowCtxCustomize->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::onShowContextCustomize ), 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_buttonShowHiddenDialogs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::onShowHiddenDialogs ), NULL, this );
+    m_checkListHiddenDialogs->Connect( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, wxCommandEventHandler( OptionsDlgGenerated::onToggleHiddenDialog ), NULL, this );
+    m_bpButtonShowLogFolder->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( 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_bpButtonPlayAlertPending->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::onPlayAlertPending ), NULL, this );
+    m_textCtrlSoundPathAlertPending->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( OptionsDlgGenerated::onChangeSoundFilePath ), NULL, this );
+    m_buttonSelectSoundAlertPending->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::onSelectSoundAlertPending ), NULL, this );
+    m_buttonShowCtxCustomize->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::onShowContextCustomize ), 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()
@@ -4960,22 +4960,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()
@@ -4984,61 +4984,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()
@@ -5047,210 +5047,210 @@ 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 );
 
-	wxBoxSizer* bSizer298;
-	bSizer298 = new wxBoxSizer( wxHORIZONTAL );
+    wxBoxSizer* bSizer298;
+    bSizer298 = new wxBoxSizer( wxHORIZONTAL );
 
-	m_staticFfsTextVersion = new wxStaticText( m_panel41, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticFfsTextVersion->Wrap( -1 );
-	bSizer298->Add( m_staticFfsTextVersion, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    m_staticFfsTextVersion = new wxStaticText( m_panel41, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticFfsTextVersion->Wrap( -1 );
+    bSizer298->Add( m_staticFfsTextVersion, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_staticTextFfsVariant = new wxStaticText( m_panel41, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextFfsVariant->Wrap( -1 );
-	m_staticTextFfsVariant->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+    m_staticTextFfsVariant = new wxStaticText( m_panel41, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextFfsVariant->Wrap( -1 );
+    m_staticTextFfsVariant->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-	bSizer298->Add( m_staticTextFfsVariant, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 10 );
+    bSizer298->Add( m_staticTextFfsVariant, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 10 );
 
 
-	bSizerMainSection->Add( bSizer298, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+    bSizerMainSection->Add( bSizer298, 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 );
 
-	bSizerDonate = new wxBoxSizer( wxVERTICAL );
+    bSizerDonate = new wxBoxSizer( wxVERTICAL );
 
 
-	bSizerDonate->Add( 0, 0, 1, 0, 5 );
+    bSizerDonate->Add( 0, 0, 1, 0, 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( wxHORIZONTAL );
+    wxBoxSizer* bSizer183;
+    bSizer183 = new wxBoxSizer( wxHORIZONTAL );
 
-	m_bitmapAnimalSmall = new wxStaticBitmap( m_panelDonate, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer183->Add( m_bitmapAnimalSmall, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    m_bitmapAnimalSmall = new wxStaticBitmap( m_panelDonate, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer183->Add( m_bitmapAnimalSmall, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-	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 );
 
-	m_staticTextDonate = new wxStaticText( m_panel39, wxID_ANY, _("Get the Donation Edition with bonus features and help keep FreeFileSync ad-free."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextDonate->Wrap( -1 );
-	m_staticTextDonate->SetForegroundColour( wxColour( 0, 0, 0 ) );
+    m_staticTextDonate = new wxStaticText( m_panel39, wxID_ANY, _("Get the Donation Edition with bonus features and help keep FreeFileSync ad-free."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextDonate->Wrap( -1 );
+    m_staticTextDonate->SetForegroundColour( wxColour( 0, 0, 0 ) );
 
-	bSizer184->Add( m_staticTextDonate, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxALIGN_CENTER_VERTICAL, 10 );
+    bSizer184->Add( m_staticTextDonate, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxALIGN_CENTER_VERTICAL, 10 );
 
 
-	m_panel39->SetSizer( bSizer184 );
-	m_panel39->Layout();
-	bSizer184->Fit( m_panel39 );
-	bSizer183->Add( m_panel39, 1, wxTOP|wxBOTTOM|wxRIGHT|wxEXPAND, 5 );
+    m_panel39->SetSizer( bSizer184 );
+    m_panel39->Layout();
+    bSizer184->Fit( m_panel39 );
+    bSizer183->Add( m_panel39, 1, wxTOP|wxBOTTOM|wxRIGHT|wxEXPAND, 5 );
 
 
-	m_panelDonate->SetSizer( bSizer183 );
-	m_panelDonate->Layout();
-	bSizer183->Fit( m_panelDonate );
-	bSizerDonate->Add( m_panelDonate, 0, wxEXPAND, 5 );
+    m_panelDonate->SetSizer( bSizer183 );
+    m_panelDonate->Layout();
+    bSizer183->Fit( m_panelDonate );
+    bSizerDonate->Add( m_panelDonate, 0, wxEXPAND, 5 );
 
-	m_buttonDonate1 = new zen::BitmapTextButton( m_panel41, wxID_ANY, _("Support with a donation"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_buttonDonate1->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-	m_buttonDonate1->SetToolTip( _("https://freefilesync.org/donate") );
+    m_buttonDonate1 = new zen::BitmapTextButton( m_panel41, wxID_ANY, _("Support with a donation"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_buttonDonate1->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+    m_buttonDonate1->SetToolTip( _("https://freefilesync.org/donate") );
 
-	bSizerDonate->Add( m_buttonDonate1, 0, wxEXPAND|wxALL, 10 );
+    bSizerDonate->Add( m_buttonDonate1, 0, wxEXPAND|wxALL, 10 );
 
 
-	bSizerDonate->Add( 0, 0, 1, 0, 5 );
+    bSizerDonate->Add( 0, 0, 1, 0, 5 );
 
 
-	bSizerMainSection->Add( bSizerDonate, 1, wxEXPAND, 5 );
+    bSizerMainSection->Add( bSizerDonate, 1, wxEXPAND, 5 );
 
-	m_bitmapAnimalBig = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizerMainSection->Add( m_bitmapAnimalBig, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+    m_bitmapAnimalBig = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizerMainSection->Add( m_bitmapAnimalBig, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
 
-	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, _("Share your feedback and ideas:"), 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, _("Share your feedback and ideas:"), 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 );
 
-	m_bpButtonEmail = new wxBitmapButton( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
-	bSizer289->Add( m_bpButtonEmail, 0, wxTOP|wxBOTTOM|wxRIGHT|wxEXPAND, 5 );
+    m_bpButtonEmail = new wxBitmapButton( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+    bSizer289->Add( m_bpButtonEmail, 0, wxTOP|wxBOTTOM|wxRIGHT|wxEXPAND, 5 );
 
 
-	bSizer186->Add( bSizer289, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+    bSizer186->Add( bSizer289, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-	bSizerMainSection->Add( bSizer186, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+    bSizerMainSection->Add( bSizer186, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
 
 
-	bSizer174->Add( bSizerMainSection, 0, wxEXPAND, 5 );
+    bSizer174->Add( bSizerMainSection, 0, wxEXPAND, 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_buttonShowDonationDetails = new wxButton( this, wxID_ANY, _("Thank you, %x, for your support!"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizerStdButtons->Add( m_buttonShowDonationDetails, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+    m_buttonShowDonationDetails = new wxButton( this, wxID_ANY, _("Thank you, %x, for your support!"), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizerStdButtons->Add( m_buttonShowDonationDetails, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
 
 
-	bSizerStdButtons->Add( 0, 0, 1, 0, 5 );
+    bSizerStdButtons->Add( 0, 0, 1, 0, 5 );
 
-	m_buttonDonate2 = new zen::BitmapTextButton( this, wxID_ANY, _("&Donate"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_buttonDonate2->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-	m_buttonDonate2->SetToolTip( _("https://freefilesync.org/donate") );
+    m_buttonDonate2 = new zen::BitmapTextButton( this, wxID_ANY, _("&Donate"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+    m_buttonDonate2->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+    m_buttonDonate2->SetToolTip( _("https://freefilesync.org/donate") );
 
-	bSizerStdButtons->Add( m_buttonDonate2, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+    bSizerStdButtons->Add( m_buttonDonate2, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 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();
-	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, wxEXPAND, 5 );
+    bSizer31->Add( bSizerStdButtons, 0, wxEXPAND, 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_buttonDonate1->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::onDonate ), NULL, this );
-	m_bpButtonForum->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::onOpenForum ), NULL, this );
-	m_bpButtonEmail->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::onSendEmail ), NULL, this );
-	m_buttonShowDonationDetails->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::onShowDonationDetails ), NULL, this );
-	m_buttonDonate2->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::onDonate ), 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_buttonDonate1->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::onDonate ), NULL, this );
+    m_bpButtonForum->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::onOpenForum ), NULL, this );
+    m_bpButtonEmail->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::onSendEmail ), NULL, this );
+    m_buttonShowDonationDetails->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::onShowDonationDetails ), NULL, this );
+    m_buttonDonate2->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::onDonate ), NULL, this );
+    m_buttonClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::onOkay ), NULL, this );
 }
 
 AboutDlgGenerated::~AboutDlgGenerated()
@@ -5259,61 +5259,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()
@@ -5322,178 +5322,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()
@@ -5502,66 +5502,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()
@@ -5570,106 +5570,106 @@ 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 );
 
-	m_checkBoxDontShowAgain = new wxCheckBox( this, wxID_ANY, _("&Don't show this dialog again"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer95->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 );
+    bSizer95->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|wxALL, 5 );
+    m_buttonClose->SetDefault();
+    bSizerStdButtons->Add( m_buttonClose, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
 
-	bSizer95->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
+    bSizer95->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 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 62015c50..a352e8d7 100644
--- a/FreeFileSync/Source/ui/gui_generated.h
+++ b/FreeFileSync/Source/ui/gui_generated.h
@@ -10,7 +10,7 @@
 #include <wx/artprov.h>
 #include <wx/xrc/xmlres.h>
 #include <wx/intl.h>
-namespace zen{ class BitmapTextButton; }
+namespace zen { class BitmapTextButton; }
 
 #include "wx+/bitmap_button.h"
 #include "folder_history_box.h"
@@ -65,229 +65,229 @@ namespace zen{ class BitmapTextButton; }
 ///////////////////////////////////////////////////////////////////////////////
 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_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;
-		wxButton* m_buttonCancel;
-		zen::BitmapTextButton* m_buttonCompare;
-		wxBitmapButton* m_bpButtonCmpConfig;
-		wxBitmapButton* m_bpButtonCmpContext;
-		wxBitmapButton* m_bpButtonFilter;
-		wxBitmapButton* m_bpButtonFilterContext;
-		wxBitmapButton* m_bpButtonSyncConfig;
-		wxBitmapButton* m_bpButtonSyncContext;
-		zen::BitmapTextButton* m_buttonSync;
-		wxPanel* m_panelDirectoryPairs;
-		wxStaticText* m_staticTextResolvedPathL;
-		wxBitmapButton* m_bpButtonAddPair;
-		wxButton* m_buttonSelectFolderLeft;
-		wxPanel* m_panelTopCenter;
-		wxBitmapButton* m_bpButtonSwapSides;
-		wxStaticText* m_staticTextResolvedPathR;
-		wxButton* m_buttonSelectFolderRight;
-		wxScrolledWindow* m_scrolledWindowFolderPairs;
-		wxBoxSizer* bSizerAddFolderPairs;
-		zen::Grid* m_gridOverview;
-		wxPanel* m_panelCenter;
-		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;
-		wxBoxSizer* bSizerSaveAs;
-		wxBitmapButton* m_bpButtonSaveAs;
-		wxBitmapButton* m_bpButtonSaveAsBatch;
-		wxStaticText* m_staticText97;
-		wxStaticLine* m_staticline81;
-		zen::Grid* m_gridCfgHistory;
-		wxPanel* m_panelViewFilter;
-		wxBoxSizer* bSizerViewFilter;
-		wxBitmapButton* m_bpButtonToggleLog;
-		wxBoxSizer* bSizerViewButtons;
-		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, override 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;
+    wxButton* m_buttonCancel;
+    zen::BitmapTextButton* m_buttonCompare;
+    wxBitmapButton* m_bpButtonCmpConfig;
+    wxBitmapButton* m_bpButtonCmpContext;
+    wxBitmapButton* m_bpButtonFilter;
+    wxBitmapButton* m_bpButtonFilterContext;
+    wxBitmapButton* m_bpButtonSyncConfig;
+    wxBitmapButton* m_bpButtonSyncContext;
+    zen::BitmapTextButton* m_buttonSync;
+    wxPanel* m_panelDirectoryPairs;
+    wxStaticText* m_staticTextResolvedPathL;
+    wxBitmapButton* m_bpButtonAddPair;
+    wxButton* m_buttonSelectFolderLeft;
+    wxPanel* m_panelTopCenter;
+    wxBitmapButton* m_bpButtonSwapSides;
+    wxStaticText* m_staticTextResolvedPathR;
+    wxButton* m_buttonSelectFolderRight;
+    wxScrolledWindow* m_scrolledWindowFolderPairs;
+    wxBoxSizer* bSizerAddFolderPairs;
+    zen::Grid* m_gridOverview;
+    wxPanel* m_panelCenter;
+    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;
+    wxBoxSizer* bSizerSaveAs;
+    wxBitmapButton* m_bpButtonSaveAs;
+    wxBitmapButton* m_bpButtonSaveAsBatch;
+    wxStaticText* m_staticText97;
+    wxStaticLine* m_staticline81;
+    zen::Grid* m_gridCfgHistory;
+    wxPanel* m_panelViewFilter;
+    wxBoxSizer* bSizerViewFilter;
+    wxBitmapButton* m_bpButtonToggleLog;
+    wxBoxSizer* bSizerViewButtons;
+    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, override 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();
 
 };
 
@@ -296,29 +296,29 @@ class MainDialogGenerated : public wxFrame
 ///////////////////////////////////////////////////////////////////////////////
 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 = wxSize( 698,67 ), 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 = wxSize( 698, 67 ), long style = 0, const wxString& name = wxEmptyString );
+
+    ~FolderPairPanelGenerated();
 
 };
 
@@ -327,235 +327,235 @@ class FolderPairPanelGenerated : public wxPanel
 ///////////////////////////////////////////////////////////////////////////////
 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;
-		wxStaticLine* m_staticline3311;
-		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_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;
-		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_buttonDefault;
-		wxBitmapButton* m_bpButtonDefaultContext;
-		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, override 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 onFilterDefault( wxCommandEvent& event ) { event.Skip(); }
-		virtual void onFilterDefaultContextMouse( wxMouseEvent& event ) { event.Skip(); }
-		virtual void onFilterDefaultContext( wxCommandEvent& event ) { event.Skip(); }
-		virtual void onFilterClear( 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 onShowLogFolder( 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_bpButtonShowLogFolder;
-		fff::FolderHistoryBox* m_logFolderPath;
-		wxBitmapButton* m_bpButtonSelectAltLogFolder;
-		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;
+    wxStaticLine* m_staticline3311;
+    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_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;
+    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_buttonDefault;
+    wxBitmapButton* m_bpButtonDefaultContext;
+    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, override 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 onFilterDefault( wxCommandEvent& event ) { event.Skip(); }
+    virtual void onFilterDefaultContextMouse( wxMouseEvent& event ) { event.Skip(); }
+    virtual void onFilterDefaultContext( wxCommandEvent& event ) { event.Skip(); }
+    virtual void onFilterClear( 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 onShowLogFolder( 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_bpButtonShowLogFolder;
+    fff::FolderHistoryBox* m_logFolderPath;
+    wxBitmapButton* m_bpButtonSelectAltLogFolder;
+    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();
 
 };
 
@@ -564,114 +564,114 @@ class ConfigDlgGenerated : public wxDialog
 ///////////////////////////////////////////////////////////////////////////////
 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;
-		wxStaticLine* m_staticline83;
-		wxStaticText* m_staticTextTimeout;
-		wxSpinCtrl* m_spinCtrlTimeout;
-		wxStaticLine* m_staticline82;
-		wxTextCtrl* m_textCtrlServerPath;
-		wxButton* m_buttonSelectFolder;
-		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, override 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;
+    wxStaticLine* m_staticline83;
+    wxStaticText* m_staticTextTimeout;
+    wxSpinCtrl* m_spinCtrlTimeout;
+    wxStaticLine* m_staticline82;
+    wxTextCtrl* m_textCtrlServerPath;
+    wxButton* m_buttonSelectFolder;
+    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, override 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();
 
 };
 
@@ -680,29 +680,29 @@ class CloudSetupDlgGenerated : public wxDialog
 ///////////////////////////////////////////////////////////////////////////////
 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, override 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, override 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( 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();
 
 };
 
@@ -711,51 +711,51 @@ class AbstractFolderPickerGenerated : public wxDialog
 ///////////////////////////////////////////////////////////////////////////////
 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, override 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, override 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();
 
 };
 
@@ -764,41 +764,41 @@ class SyncConfirmationDlgGenerated : public wxDialog
 ///////////////////////////////////////////////////////////////////////////////
 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();
 
 };
 
@@ -807,61 +807,61 @@ class CompareProgressDlgGenerated : public wxPanel
 ///////////////////////////////////////////////////////////////////////////////
 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();
 
 };
 
@@ -870,26 +870,26 @@ class SyncProgressPanelGenerated : public wxPanel
 ///////////////////////////////////////////////////////////////////////////////
 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, override 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, override 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( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
 
-		~LogPanelGenerated();
+    ~LogPanelGenerated();
 
 };
 
@@ -898,47 +898,47 @@ class LogPanelGenerated : public wxPanel
 ///////////////////////////////////////////////////////////////////////////////
 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, override 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, override 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();
 
 };
 
@@ -947,33 +947,33 @@ class BatchDlgGenerated : public wxDialog
 ///////////////////////////////////////////////////////////////////////////////
 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, override 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, override 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( 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();
 
 };
 
@@ -982,36 +982,36 @@ class DeleteDlgGenerated : public wxDialog
 ///////////////////////////////////////////////////////////////////////////////
 class CopyToDlgGenerated : public wxDialog
 {
-	private:
+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;
+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, override 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, override 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;
+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( 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();
+    ~CopyToDlgGenerated();
 
 };
 
@@ -1020,115 +1020,115 @@ class CopyToDlgGenerated : public wxDialog
 ///////////////////////////////////////////////////////////////////////////////
 class OptionsDlgGenerated : public wxDialog
 {
-	private:
-
-	protected:
-		wxStaticBitmap* m_bitmapSettings;
-		wxStaticText* m_staticText44;
-		wxStaticLine* m_staticline20;
-		wxPanel* m_panel39;
-		wxCheckBox* m_checkBoxFailSafe;
-		wxStaticText* m_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;
-		wxStaticLine* m_staticline191;
-		wxStaticBitmap* m_bitmapWarnings;
-		wxStaticText* m_staticText182;
-		wxStaticText* m_staticTextHiddenDialogsCount;
-		wxButton* m_buttonShowHiddenDialogs;
-		wxCheckListBox* m_checkListHiddenDialogs;
-		wxStaticLine* m_staticline1911;
-		wxStaticBitmap* m_bitmapLogFile;
-		wxStaticText* m_staticText163;
-		wxPanel* m_panelLogfile;
-		wxButton* m_buttonSelectLogFolder;
-		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;
-		wxStaticText* m_staticText171;
-		wxStaticBitmap* m_bitmapCompareDone;
-		wxBitmapButton* m_bpButtonPlayCompareDone;
-		wxTextCtrl* m_textCtrlSoundPathCompareDone;
-		wxButton* m_buttonSelectSoundCompareDone;
-		wxStaticText* m_staticText1711;
-		wxStaticBitmap* m_bitmapSyncDone;
-		wxBitmapButton* m_bpButtonPlaySyncDone;
-		wxTextCtrl* m_textCtrlSoundPathSyncDone;
-		wxButton* m_buttonSelectSoundSyncDone;
-		wxStaticText* m_staticText17111;
-		wxStaticBitmap* m_bitmapAlertPending;
-		wxBitmapButton* m_bpButtonPlayAlertPending;
-		wxTextCtrl* m_textCtrlSoundPathAlertPending;
-		wxButton* m_buttonSelectSoundAlertPending;
-		wxStaticLine* m_staticline3611;
-		wxStaticBitmap* m_bitmapConsole;
-		wxStaticText* m_staticText85;
-		wxButton* m_buttonShowCtxCustomize;
-		wxBoxSizer* bSizerContextCustomize;
-		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, override them in your derived class
-		virtual void onClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void onShowHiddenDialogs( wxCommandEvent& event ) { event.Skip(); }
-		virtual void onToggleHiddenDialog( wxCommandEvent& event ) { event.Skip(); }
-		virtual void onShowLogFolder( wxCommandEvent& 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 onPlayAlertPending( wxCommandEvent& event ) { event.Skip(); }
-		virtual void onSelectSoundAlertPending( wxCommandEvent& event ) { event.Skip(); }
-		virtual void onShowContextCustomize( 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:
-		wxBitmapButton* m_bpButtonShowLogFolder;
-		fff::FolderHistoryBox* m_logFolderPath;
-		wxBitmapButton* m_bpButtonSelectAltLogFolder;
-
-		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;
+    wxStaticLine* m_staticline191;
+    wxStaticBitmap* m_bitmapWarnings;
+    wxStaticText* m_staticText182;
+    wxStaticText* m_staticTextHiddenDialogsCount;
+    wxButton* m_buttonShowHiddenDialogs;
+    wxCheckListBox* m_checkListHiddenDialogs;
+    wxStaticLine* m_staticline1911;
+    wxStaticBitmap* m_bitmapLogFile;
+    wxStaticText* m_staticText163;
+    wxPanel* m_panelLogfile;
+    wxButton* m_buttonSelectLogFolder;
+    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;
+    wxStaticText* m_staticText171;
+    wxStaticBitmap* m_bitmapCompareDone;
+    wxBitmapButton* m_bpButtonPlayCompareDone;
+    wxTextCtrl* m_textCtrlSoundPathCompareDone;
+    wxButton* m_buttonSelectSoundCompareDone;
+    wxStaticText* m_staticText1711;
+    wxStaticBitmap* m_bitmapSyncDone;
+    wxBitmapButton* m_bpButtonPlaySyncDone;
+    wxTextCtrl* m_textCtrlSoundPathSyncDone;
+    wxButton* m_buttonSelectSoundSyncDone;
+    wxStaticText* m_staticText17111;
+    wxStaticBitmap* m_bitmapAlertPending;
+    wxBitmapButton* m_bpButtonPlayAlertPending;
+    wxTextCtrl* m_textCtrlSoundPathAlertPending;
+    wxButton* m_buttonSelectSoundAlertPending;
+    wxStaticLine* m_staticline3611;
+    wxStaticBitmap* m_bitmapConsole;
+    wxStaticText* m_staticText85;
+    wxButton* m_buttonShowCtxCustomize;
+    wxBoxSizer* bSizerContextCustomize;
+    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, override them in your derived class
+    virtual void onClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void onShowHiddenDialogs( wxCommandEvent& event ) { event.Skip(); }
+    virtual void onToggleHiddenDialog( wxCommandEvent& event ) { event.Skip(); }
+    virtual void onShowLogFolder( wxCommandEvent& 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 onPlayAlertPending( wxCommandEvent& event ) { event.Skip(); }
+    virtual void onSelectSoundAlertPending( wxCommandEvent& event ) { event.Skip(); }
+    virtual void onShowContextCustomize( 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:
+    wxBitmapButton* m_bpButtonShowLogFolder;
+    fff::FolderHistoryBox* m_logFolderPath;
+    wxBitmapButton* m_bpButtonSelectAltLogFolder;
+
+    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();
 
 };
 
@@ -1137,17 +1137,17 @@ class OptionsDlgGenerated : public wxDialog
 ///////////////////////////////////////////////////////////////////////////////
 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( 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();
 
 };
 
@@ -1156,30 +1156,30 @@ class TooltipDlgGenerated : public wxDialog
 ///////////////////////////////////////////////////////////////////////////////
 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, override 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, override 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( 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();
 
 };
 
@@ -1188,54 +1188,54 @@ class SelectTimespanDlgGenerated : public wxDialog
 ///////////////////////////////////////////////////////////////////////////////
 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_staticFfsTextVersion;
-		wxStaticText* m_staticTextFfsVariant;
-		wxStaticLine* m_staticline3411;
-		wxBoxSizer* bSizerDonate;
-		wxPanel* m_panelDonate;
-		wxStaticBitmap* m_bitmapAnimalSmall;
-		wxPanel* m_panel39;
-		wxStaticText* m_staticTextDonate;
-		zen::BitmapTextButton* m_buttonDonate1;
-		wxStaticBitmap* m_bitmapAnimalBig;
-		wxStaticLine* m_staticline3412;
-		wxStaticText* m_staticText94;
-		wxBitmapButton* m_bpButtonForum;
-		wxBitmapButton* m_bpButtonEmail;
-		wxStaticLine* m_staticline37;
-		wxStaticText* m_staticTextThanksForLoc;
-		wxScrolledWindow* m_scrolledWindowTranslators;
-		wxFlexGridSizer* fgSizerTranslators;
-		wxStaticLine* m_staticline36;
-		wxBoxSizer* bSizerStdButtons;
-		wxButton* m_buttonShowDonationDetails;
-		zen::BitmapTextButton* m_buttonDonate2;
-		wxButton* m_buttonClose;
-
-		// Virtual event handlers, override them in your derived class
-		virtual void onClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void onDonate( wxCommandEvent& event ) { event.Skip(); }
-		virtual void onOpenForum( wxCommandEvent& event ) { event.Skip(); }
-		virtual void onSendEmail( wxCommandEvent& event ) { event.Skip(); }
-		virtual void onShowDonationDetails( 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_staticFfsTextVersion;
+    wxStaticText* m_staticTextFfsVariant;
+    wxStaticLine* m_staticline3411;
+    wxBoxSizer* bSizerDonate;
+    wxPanel* m_panelDonate;
+    wxStaticBitmap* m_bitmapAnimalSmall;
+    wxPanel* m_panel39;
+    wxStaticText* m_staticTextDonate;
+    zen::BitmapTextButton* m_buttonDonate1;
+    wxStaticBitmap* m_bitmapAnimalBig;
+    wxStaticLine* m_staticline3412;
+    wxStaticText* m_staticText94;
+    wxBitmapButton* m_bpButtonForum;
+    wxBitmapButton* m_bpButtonEmail;
+    wxStaticLine* m_staticline37;
+    wxStaticText* m_staticTextThanksForLoc;
+    wxScrolledWindow* m_scrolledWindowTranslators;
+    wxFlexGridSizer* fgSizerTranslators;
+    wxStaticLine* m_staticline36;
+    wxBoxSizer* bSizerStdButtons;
+    wxButton* m_buttonShowDonationDetails;
+    zen::BitmapTextButton* m_buttonDonate2;
+    wxButton* m_buttonClose;
+
+    // Virtual event handlers, override them in your derived class
+    virtual void onClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void onDonate( wxCommandEvent& event ) { event.Skip(); }
+    virtual void onOpenForum( wxCommandEvent& event ) { event.Skip(); }
+    virtual void onSendEmail( wxCommandEvent& event ) { event.Skip(); }
+    virtual void onShowDonationDetails( 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();
 
 };
 
@@ -1244,26 +1244,26 @@ class AboutDlgGenerated : public wxDialog
 ///////////////////////////////////////////////////////////////////////////////
 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, override them in your derived class
-		virtual void onCancel( wxCommandEvent& event ) { event.Skip(); }
+    // Virtual event handlers, override 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( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0 );
 
-		~DownloadProgressDlgGenerated();
+    ~DownloadProgressDlgGenerated();
 
 };
 
@@ -1272,48 +1272,48 @@ class DownloadProgressDlgGenerated : public wxDialog
 ///////////////////////////////////////////////////////////////////////////////
 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, override 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, override 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();
 
 };
 
@@ -1322,28 +1322,28 @@ class ActivationDlgGenerated : public wxDialog
 ///////////////////////////////////////////////////////////////////////////////
 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, override 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, override 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( 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();
 
 };
 
@@ -1352,40 +1352,40 @@ class CfgHighlightDlgGenerated : public wxDialog
 ///////////////////////////////////////////////////////////////////////////////
 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, override 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, override 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/main_dlg.cpp b/FreeFileSync/Source/ui/main_dlg.cpp
index a9c51191..c991fa0f 100644
--- a/FreeFileSync/Source/ui/main_dlg.cpp
+++ b/FreeFileSync/Source/ui/main_dlg.cpp
@@ -4055,6 +4055,8 @@ void MainDialog::showConfigDialog(SyncConfigPanel panelToShow, int localPairInde
 
 void MainDialog::onGlobalFilterContext(wxEvent& event)
 {
+    warn_static("why not support clipboard instead of filterCfgOnClipboard_!")
+
     auto cutFilter = [&]
     {
         filterCfgOnClipboard_ = std::exchange(currentCfg_.mainCfg.globalFilter, FilterConfig());
diff --git a/FreeFileSync/Source/ui/progress_indicator.cpp b/FreeFileSync/Source/ui/progress_indicator.cpp
index 58125051..d10a21db 100644
--- a/FreeFileSync/Source/ui/progress_indicator.cpp
+++ b/FreeFileSync/Source/ui/progress_indicator.cpp
@@ -16,7 +16,6 @@
 #include <wx+/graph.h>
 #include <wx+/no_flicker.h>
 #include <wx+/font_size.h>
-//#include <wx+/std_button_layout.h>
 #include <zen/file_access.h>
 #include <zen/thread.h>
 #include <zen/perf.h>
@@ -336,7 +335,7 @@ void CompareProgressPanel::Impl::updateProgressGui()
         const double fractionItems = itemsTotal == 0 ? 0 : 1.0 * itemsCurrent / itemsTotal;
 
         //dialog caption, taskbar
-        setTitle(formatPercent0(fractionTotal) + L' ' + getDialogPhaseText(*syncStat_, false /*paused*/));
+        setTitle(formatProgressPercent(fractionTotal) + L' ' + getDialogPhaseText(*syncStat_, false /*paused*/));
 
         //progress indicators
         if (taskbar_.get()) taskbar_->setProgress(fractionTotal);
@@ -571,7 +570,7 @@ struct LabelFormatterBytes : public LabelFormatter
         const double a = bytesProposed / e; //bytesProposed = a * 2^k with a in [1, 2)
         assert(1 <= a && a < 2);
         const double steps[] = {1, 2};
-        return e * numeric::nearMatch(a, std::begin(steps), std::end(steps));
+        return e * numeric::roundToGrid(a, std::begin(steps), std::end(steps));
     }
 
     wxString formatText(double value, double optimalBlockSize) const override { return formatFilesizeShort(static_cast<int64_t>(value)); }
@@ -586,7 +585,7 @@ struct LabelFormatterItemCount : public LabelFormatter
 
         const double steps[] = {1, 2, 5, 10};
         if (itemsProposed <= 10)
-            return numeric::nearMatch(itemsProposed, std::begin(steps), std::end(steps)); //like nextNiceNumber(), but without the 2.5 step!
+            return numeric::roundToGrid(itemsProposed, std::begin(steps), std::end(steps)); //like nextNiceNumber(), but without the 2.5 step!
         return nextNiceNumber(itemsProposed);
     }
 
@@ -599,30 +598,25 @@ struct LabelFormatterItemCount : public LabelFormatter
 
 struct LabelFormatterTimeElapsed : public LabelFormatter
 {
-    explicit LabelFormatterTimeElapsed(bool drawLabel) : drawLabel_(drawLabel) {}
-
     double getOptimalBlockSize(double secProposed) const override
     {
         //5 sec minimum block size
         const double stepsSec[] = {5, 10, 20, 30, 60}; //nice numbers for seconds
         if (secProposed <= 60)
-            return numeric::nearMatch(secProposed, std::begin(stepsSec), std::end(stepsSec));
+            return numeric::roundToGrid(secProposed, std::begin(stepsSec), std::end(stepsSec));
 
         const double stepsMin[] = {1, 2, 5, 10, 15, 20, 30, 60}; //nice numbers for minutes
         if (secProposed <= 3600)
-            return 60 * numeric::nearMatch(secProposed / 60, std::begin(stepsMin), std::end(stepsMin));
+            return 60 * numeric::roundToGrid(secProposed / 60, std::begin(stepsMin), std::end(stepsMin));
 
         if (secProposed <= 3600 * 24)
-            return 3600 * nextNiceNumber(secProposed / 3600); //round up to full hours
+            return 3600 * nextNiceNumber(secProposed / 3600); //round to full hours
 
         return 24 * 3600 * nextNiceNumber(secProposed / (24 * 3600)); //round to full days
     }
 
     wxString formatText(double timeElapsed, double optimalBlockSize) const override
     {
-        if (!drawLabel_)
-            return wxString();
-
         const int64_t timeElapsedSec = std::round(timeElapsed);
 
         return timeElapsedSec < 60 ?
@@ -631,20 +625,16 @@ struct LabelFormatterTimeElapsed : public LabelFormatter
                wxTimeSpan::Seconds(timeElapsedSec).Format(   L"%M:%S") :
                wxTimeSpan::Seconds(timeElapsedSec).Format(L"%H:%M:%S");
     }
-
-private:
-    const bool drawLabel_;
 };
 }
 
 
 template <class TopLevelDialog> //can be a wxFrame or wxDialog
 class SyncProgressDialogImpl : public TopLevelDialog, public SyncProgressDialog
-/*we need derivation, not composition!
+/*  we need derivation, not composition:
       1. SyncProgressDialogImpl IS a wxFrame/wxDialog
       2. implement virtual ~wxFrame()
-      3. event handling below assumes lifetime is larger-equal than wxFrame's
-*/
+      3. event handling below assumes lifetime is larger-equal than wxFrame's      */
 {
 public:
     SyncProgressDialogImpl(long style, //wxFrame/wxDialog style
@@ -851,19 +841,19 @@ dlgSizeBuf_(dlgSize)
     const int xLabelHeight = this->GetCharHeight() + fastFromDIP(2) /*margin*/; //use same height for both graphs to make sure they stretch evenly
     const int yLabelWidth  = fastFromDIP(70);
     pnl_.m_panelGraphBytes->setAttributes(Graph2D::MainAttributes().
-                                          setLabelX(XLabelPos::top,   xLabelHeight, std::make_shared<LabelFormatterTimeElapsed>(true)).
+                                          setLabelX(XLabelPos::top,   xLabelHeight, std::make_shared<LabelFormatterTimeElapsed>()).
                                           setLabelY(YLabelPos::right, yLabelWidth,  std::make_shared<LabelFormatterBytes>()).
                                           setBaseColors(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT), wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)).
                                           setSelectionMode(GraphSelMode::none));
 
     pnl_.m_panelGraphItems->setAttributes(Graph2D::MainAttributes().
-                                          setLabelX(XLabelPos::bottom, xLabelHeight, std::make_shared<LabelFormatterTimeElapsed>(true)).
+                                          setLabelX(XLabelPos::bottom, xLabelHeight, std::make_shared<LabelFormatterTimeElapsed>()).
                                           setLabelY(YLabelPos::right,  yLabelWidth,  std::make_shared<LabelFormatterItemCount>()).
                                           setBaseColors(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT), wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)).
                                           setSelectionMode(GraphSelMode::none));
 
-    pnl_.m_panelGraphBytes->addCurve(curveBytes_, Graph2D::CurveAttributes().setLineWidth(fastFromDIP(2)).fillCurveArea(getColorBytes()).setColor(getColorBytesRim()));
-    pnl_.m_panelGraphItems->addCurve(curveItems_, Graph2D::CurveAttributes().setLineWidth(fastFromDIP(2)).fillCurveArea(getColorItems()).setColor(getColorItemsRim()));
+    pnl_.m_panelGraphBytes->addCurve(curveBytes_, Graph2D::CurveAttributes().setLineWidth(fastFromDIP(1)).fillCurveArea(getColorBytes()).setColor(getColorBytesRim()));
+    pnl_.m_panelGraphItems->addCurve(curveItems_, Graph2D::CurveAttributes().setLineWidth(fastFromDIP(1)).fillCurveArea(getColorItems()).setColor(getColorItemsRim()));
 
     pnl_.m_panelGraphBytes->addCurve(curveBytesEstim_, Graph2D::CurveAttributes().setLineWidth(fastFromDIP(1)).fillCurveArea(getColorLightGrey()).setColor(getColorDarkGrey()));
     pnl_.m_panelGraphItems->addCurve(curveItemsEstim_, Graph2D::CurveAttributes().setLineWidth(fastFromDIP(1)).fillCurveArea(getColorLightGrey()).setColor(getColorDarkGrey()));
@@ -871,8 +861,8 @@ dlgSizeBuf_(dlgSize)
     pnl_.m_panelGraphBytes->addCurve(curveBytesTimeNow_, Graph2D::CurveAttributes().setLineWidth(fastFromDIP(2)).setColor(getColorBytesDark()));
     pnl_.m_panelGraphItems->addCurve(curveItemsTimeNow_, Graph2D::CurveAttributes().setLineWidth(fastFromDIP(2)).setColor(getColorItemsDark()));
 
-    pnl_.m_panelGraphBytes->addCurve(curveBytesTimeEstim_, Graph2D::CurveAttributes().setLineWidth(fastFromDIP(3)).setColor(getColorDarkGrey()));
-    pnl_.m_panelGraphItems->addCurve(curveItemsTimeEstim_, Graph2D::CurveAttributes().setLineWidth(fastFromDIP(3)).setColor(getColorDarkGrey()));
+    pnl_.m_panelGraphBytes->addCurve(curveBytesTimeEstim_, Graph2D::CurveAttributes().setLineWidth(fastFromDIP(2)).setColor(getColorDarkGrey()));
+    pnl_.m_panelGraphItems->addCurve(curveItemsTimeEstim_, Graph2D::CurveAttributes().setLineWidth(fastFromDIP(2)).setColor(getColorDarkGrey()));
 
     //graph legend:
     auto generateSquareBitmap = [&](const wxColor& fillCol, const wxColor& borderCol)
@@ -1105,7 +1095,7 @@ void SyncProgressDialogImpl<TopLevelDialog>::updateProgressGui(bool allowYield)
         const double fractionTotal = bytesTotal + itemsTotal == 0 ? 0 : 1.0 * (bytesCurrent + itemsCurrent) / (bytesTotal + itemsTotal);
         //add both data + obj-count, to handle "deletion-only" cases
 
-        setExternalStatus(getDialogPhaseText(*syncStat_, paused_), formatPercent0(fractionTotal)); //status text may be "paused"!
+        setExternalStatus(getDialogPhaseText(*syncStat_, paused_), formatProgressPercent(fractionTotal)); //status text may be "paused"!
 
         //progress indicators
         if (trayIcon_.get()) trayIcon_->setProgress(fractionTotal);
diff --git a/FreeFileSync/Source/ui/small_dlgs.cpp b/FreeFileSync/Source/ui/small_dlgs.cpp
index 76461a90..07546c05 100644
--- a/FreeFileSync/Source/ui/small_dlgs.cpp
+++ b/FreeFileSync/Source/ui/small_dlgs.cpp
@@ -1904,8 +1904,7 @@ private:
     void updateGui()
     {
         const double fraction = bytesTotal_ == 0 ? 0 : 1.0 * bytesCurrent_ / bytesTotal_;
-        m_staticTextHeader->SetLabelText(_("Downloading update...") + L' ' +
-                                         numberTo<std::wstring>(std::lround(fraction * 100)) + L"% (" + formatFilesizeShort(bytesCurrent_) + L')');
+        m_staticTextHeader->SetLabelText(_("Downloading update...") + L' ' + formatProgressPercent(fraction) + L" (" + formatFilesizeShort(bytesCurrent_) + L')');
         m_gaugeProgress->SetValue(std::round(fraction * GAUGE_FULL_RANGE));
 
         m_staticTextDetails->SetLabelText(utfTo<std::wstring>(filePath_));
diff --git a/FreeFileSync/Source/ui/sync_cfg.cpp b/FreeFileSync/Source/ui/sync_cfg.cpp
index dfdb4bc0..69833505 100644
--- a/FreeFileSync/Source/ui/sync_cfg.cpp
+++ b/FreeFileSync/Source/ui/sync_cfg.cpp
@@ -90,7 +90,7 @@ void initBitmapRadioButtons(const std::vector<std::pair<ToggleButton*, std::stri
 }
 
 
-bool sanitizeFilter(FilterConfig& filterCfg, const std::vector<std::wstring>& folderDisplayPaths, wxWindow* parent)
+bool sanitizeFilter(FilterConfig& filterCfg, const std::vector<AbstractPath>& baseFolderPaths, wxWindow* parent)
 {
     //include filter must not be empty!
     if (trimCpy(filterCfg.includeFilter).empty())
@@ -114,12 +114,15 @@ bool sanitizeFilter(FilterConfig& filterCfg, const std::vector<std::wstring>& fo
         const Zstring includeFilterNorm = normalizeForSearch(filterCfg.includeFilter);
         const Zstring excludeFilterNorm = normalizeForSearch(filterCfg.excludeFilter);
 
-        for (const std::wstring& displayPath : folderDisplayPaths)
-            if (!displayPath.empty())
-                if (const Zstring pathNormPf = appendSeparator(normalizeForSearch(utfTo<Zstring>(displayPath)));
-                    contains(includeFilterNorm, pathNormPf) || //perf!?
-                    contains(excludeFilterNorm, pathNormPf))   //
-                    folderPathsPf.push_back(pathNormPf);
+        for (const AbstractPath& folderPath : baseFolderPaths)
+            if (!AFS::isNullPath(folderPath))
+                if (const std::wstring& displayPath = AFS::getDisplayPath(folderPath);
+                    !displayPath.empty())
+                    if (displayPath != L"/") //Linux/macOS: https://freefilesync.org/forum/viewtopic.php?t=9713
+                        if (const Zstring pathNormPf = appendSeparator(normalizeForSearch(utfTo<Zstring>(displayPath)));
+                            contains(includeFilterNorm, pathNormPf) || //perf!?
+                            contains(excludeFilterNorm, pathNormPf))   //
+                            folderPathsPf.push_back(pathNormPf);
 
         removeDuplicates(folderPathsPf);
     }
@@ -134,15 +137,15 @@ bool sanitizeFilter(FilterConfig& filterCfg, const std::vector<std::wstring>& fo
             const Zchar* itFilterOrig = filterPhrase.begin();
 
             split2(filterPhrase, [](Zchar c) { return c == FILTER_ITEM_SEPARATOR || c == Zstr('\n'); }, //delimiters
-            [&](const Zchar* blockFirst, const Zchar* blockLast)
+            [&](ZstringView phrase)
             {
-                std::tie(blockFirst, blockLast) = trimCpy(blockFirst, blockLast, true /*fromLeft*/, true /*fromRight*/, [](Zchar c) { return isWhiteSpace(c); });
-                if (blockFirst != blockLast)
+                phrase = trimCpy(phrase);
+                if (!phrase.empty())
                 {
-                    const Zstring phrase{blockFirst, blockLast};
+                    const Zstring phraseNorm = normalizeForSearch(Zstring{phrase});
 
                     for (const Zstring& pathNormPf : folderPathsPf)
-                        if (startsWith(normalizeForSearch(phrase), pathNormPf))
+                        if (startsWith(phraseNorm, pathNormPf))
                         {
                             //emulate a "normalized afterFirst()":
                             ptrdiff_t sepCount = std::count(pathNormPf.begin(), pathNormPf.end(), FILE_NAME_SEPARATOR);
@@ -155,9 +158,9 @@ bool sanitizeFilter(FilterConfig& filterCfg, const std::vector<std::wstring>& fo
                                     {
                                         const Zstring relPath(it, phrase.end()); //include first path separator
 
-                                        filterPhraseNew.append(itFilterOrig, blockFirst);
+                                        filterPhraseNew.append(itFilterOrig, phrase.data());
                                         filterPhraseNew += relPath;
-                                        itFilterOrig = blockLast;
+                                        itFilterOrig = phrase.data() + phrase.size();
 
                                         replacements.emplace_back(phrase, relPath);
                                         return; //... to next block
@@ -362,9 +365,6 @@ private:
     GlobalPairConfig globalPairCfg_;
     std::vector<LocalPairConfig> localPairCfg_;
 
-    //display paths to fix filter if user pastes full folder paths
-    std::vector<std::wstring> folderDisplayPaths_;
-
     int selectedPairIndexToShow_ = EMPTY_PAIR_INDEX_SELECTED;
     static const int EMPTY_PAIR_INDEX_SELECTED = -2;
 
@@ -646,18 +646,12 @@ globalLogFolderPhrase_(globalLogFolderPhrase)
     m_listBoxFolderPair->Append(_("All folder pairs"));
     for (const LocalPairConfig& lpc : localPairCfg)
     {
-        const AbstractPath folderPathL= createAbstractPath(lpc.folderPathPhraseLeft);
-        const AbstractPath folderPathR= createAbstractPath(lpc.folderPathPhraseRight);
-
-        std::wstring fpName = getShortDisplayNameForFolderPair(folderPathL, folderPathR);
+        std::wstring fpName = getShortDisplayNameForFolderPair(createAbstractPath(lpc.folderPathPhraseLeft),
+                                                               createAbstractPath(lpc.folderPathPhraseRight));
         if (trimCpy(fpName).empty())
             fpName = L"<" + _("empty") + L">";
 
         m_listBoxFolderPair->Append(TAB_SPACE + fpName);
-
-        //collect display paths for filter correction
-        if (!AFS::isNullPath(folderPathL)) folderDisplayPaths_.push_back(AFS::getDisplayPath(folderPathL));
-        if (!AFS::isNullPath(folderPathR)) folderDisplayPaths_.push_back(AFS::getDisplayPath(folderPathR));
     }
 
     if (!showMultipleCfgs)
@@ -1635,7 +1629,20 @@ bool ConfigDialog::unselectFolderPairConfig(bool validateParams)
     if (validateParams)
     {
         //parameter validation and correction:
-        if (!sanitizeFilter(filterCfg, folderDisplayPaths_, this))
+
+        std::vector<AbstractPath> baseFolderPaths; //display paths to fix filter if user pastes full folder paths
+        if (selectedPairIndexToShow_ < 0)
+            for (const LocalPairConfig& lpc : localPairCfg_)
+            {
+                baseFolderPaths.push_back(createAbstractPath(lpc.folderPathPhraseLeft));
+                baseFolderPaths.push_back(createAbstractPath(lpc.folderPathPhraseRight));
+            }
+        else
+        {
+            baseFolderPaths.push_back(createAbstractPath(localPairCfg_[selectedPairIndexToShow_].folderPathPhraseLeft));
+            baseFolderPaths.push_back(createAbstractPath(localPairCfg_[selectedPairIndexToShow_].folderPathPhraseRight));
+        }
+        if (!sanitizeFilter(filterCfg, baseFolderPaths, this))
         {
             m_notebook->ChangeSelection(static_cast<size_t>(SyncConfigPanel::filter));
             m_textCtrlExclude->SetFocus();
diff --git a/FreeFileSync/Source/ui/tree_grid.cpp b/FreeFileSync/Source/ui/tree_grid.cpp
index 6658d172..313b5097 100644
--- a/FreeFileSync/Source/ui/tree_grid.cpp
+++ b/FreeFileSync/Source/ui/tree_grid.cpp
@@ -136,24 +136,25 @@ void TreeView::extractVisibleSubtree(ContainerObject& hierObj,  //in
 
 namespace
 {
-//generate nice percentage numbers which precisely sum up to 100
+//generate nice percentage numbers which precisely add up to 100
 void calcPercentage(std::vector<std::pair<uint64_t, int*>>& workList)
 {
-    const uint64_t total = std::accumulate(workList.begin(), workList.end(), uint64_t(),
-    [](uint64_t sum, const std::pair<uint64_t, int*>& pair) { return sum + pair.first; });
+    uint64_t bytesTotal = 0;
+    for (const auto& [bytes, percentOut] : workList)
+        bytesTotal += bytes;
 
-    if (total == 0U) //this case doesn't work with the error minimizing algorithm below
+    if (bytesTotal == 0U) //this case doesn't work with the error minimizing algorithm below
     {
-        for (auto& [bytes, percent] : workList)
-            *percent = 0;
+        for (auto& [bytes, percentOut] : workList)
+            *percentOut = 0;
         return;
     }
 
     int remainingPercent = 100;
-    for (auto& [bytes, percent] : workList)
+    for (auto& [bytes, percentOut] : workList)
     {
-        *percent = static_cast<int>(bytes * 100U / total); //round down
-        remainingPercent -= *percent;
+        *percentOut = static_cast<int>(bytes * 100U / bytesTotal); //round down
+        remainingPercent -= *percentOut;
     }
     assert(remainingPercent >= 0);
     assert(remainingPercent < std::ssize(workList));
@@ -163,9 +164,9 @@ void calcPercentage(std::vector<std::pair<uint64_t, int*>>& workList)
     if (remainingPercent > 0)
     {
         std::nth_element(workList.begin(), workList.begin() + remainingPercent - 1, workList.end(),
-                         [total](const std::pair<uint64_t, int*>& lhs, const std::pair<uint64_t, int*>& rhs)
+                         [bytesTotal](const std::pair<uint64_t, int*>& lhs, const std::pair<uint64_t, int*>& rhs)
         {
-            return lhs.first * 100U % total > rhs.first * 100U % total;
+            return lhs.first * 100U % bytesTotal > rhs.first * 100U % bytesTotal;
         });
 
         std::for_each(workList.begin(), workList.begin() + remainingPercent, [&](std::pair<uint64_t, int*>& pair) { ++*pair.second; });
diff --git a/FreeFileSync/Source/ui/version_check.cpp b/FreeFileSync/Source/ui/version_check.cpp
index a3656012..d3dc4685 100644
--- a/FreeFileSync/Source/ui/version_check.cpp
+++ b/FreeFileSync/Source/ui/version_check.cpp
@@ -216,11 +216,11 @@ std::string getOnlineVersion(const std::vector<std::pair<std::string, std::strin
 
 bool fff::haveNewerVersionOnline(const std::string& onlineVersion)
 {
-    auto parseVersion = [](const std::string& version)
+    auto parseVersion = [](const std::string_view& version)
     {
         std::vector<size_t> output;
-        for (const std::string& digit : split(version, FFS_VERSION_SEPARATOR, SplitOnEmpty::allow))
-            output.push_back(stringTo<size_t>(digit));
+        split(version, FFS_VERSION_SEPARATOR, 
+            [&](const std::string_view digit) { output.push_back(stringTo<size_t>(digit)); });
         assert(!output.empty());
         return output;
     };
diff --git a/FreeFileSync/Source/version/version.h b/FreeFileSync/Source/version/version.h
index 4e2fddd0..4b92f750 100644
--- a/FreeFileSync/Source/version/version.h
+++ b/FreeFileSync/Source/version/version.h
@@ -3,7 +3,7 @@
 
 namespace fff
 {
-const char ffsVersion[] = "11.27"; //internal linkage!
+const char ffsVersion[] = "11.28"; //internal linkage!
 const char FFS_VERSION_SEPARATOR = '.';
 }
 
diff --git a/libcurl/curl_wrap.cpp b/libcurl/curl_wrap.cpp
index 5ec56ed3..f9a60233 100644
--- a/libcurl/curl_wrap.cpp
+++ b/libcurl/curl_wrap.cpp
@@ -221,7 +221,7 @@ HttpSession::Result HttpSession::perform(const std::string& serverRelPath,
         options.emplace_back(CURLOPT_READFUNCTION, getBytesToSendWrapper);
         //{CURLOPT_UPLOAD_BUFFERSIZE, 256 * 1024} -> default is 64 kB. apparently no performance improvement for larger buffers like 256 kB
 
-         //Contradicting options: CURLOPT_READFUNCTION, CURLOPT_POSTFIELDS:
+        //Contradicting options: CURLOPT_READFUNCTION, CURLOPT_POSTFIELDS:
         if (std::any_of(extraOptions.begin(), extraOptions.end(), [](const CurlOption& o) { return o.option == CURLOPT_POSTFIELDS; }))
         /**/ throw std::logic_error("Contract violation! " + std::string(__FILE__) + ':' + numberTo<std::string>(__LINE__));
     }
diff --git a/wx+/graph.cpp b/wx+/graph.cpp
index bf30843d..ce65d299 100644
--- a/wx+/graph.cpp
+++ b/wx+/graph.cpp
@@ -37,7 +37,7 @@ double zen::nextNiceNumber(double blockSize) //round to next number which is a c
 
     //have a look at leading two digits: "nice" numbers start with 1, 2, 2.5 and 5
     const double steps[] = {1, 2, 2.5, 5, 10};
-    return e * numeric::nearMatch(a, std::begin(steps), std::end(steps));
+    return e * numeric::roundToGrid(a, std::begin(steps), std::end(steps));
 }
 
 
diff --git a/wx+/image_tools.cpp b/wx+/image_tools.cpp
index 2df24b6e..72c7dc74 100644
--- a/wx+/image_tools.cpp
+++ b/wx+/image_tools.cpp
@@ -173,7 +173,7 @@ wxImage zen::createImageFromText(const wxString& text, const wxFont& font, const
     dc.SetFont(font); //the font parameter of GetMultiLineTextExtent() is not evaluated on OS X, wxWidgets 2.9.5, so apply it to the DC directly!
 
     std::vector<std::pair<wxString, wxSize>> lineInfo; //text + extent
-    for (const wxString& line : split(text, L'\n', SplitOnEmpty::allow))
+    for (const wxString& line : splitCpy(text, L'\n', SplitOnEmpty::allow))
         lineInfo.emplace_back(line, line.empty() ? wxSize() : dc.GetTextExtent(line));
     //------------------------------------------------------------------------------------------------
 
diff --git a/zen/basic_math.h b/zen/basic_math.h
index c8a06b78..7258128f 100644
--- a/zen/basic_math.h
+++ b/zen/basic_math.h
@@ -20,7 +20,7 @@ template <class T> int sign(T value); //returns one of {-1, 0, 1}
 template <class T> bool isNull(T value); //...definitively fishy...
 
 template <class T, class InputIterator> //precondition: range must be sorted!
-auto nearMatch(const T& val, InputIterator first, InputIterator last);
+auto roundToGrid(T val, InputIterator first, InputIterator last);
 
 template <class N, class D> auto intDivRound(N numerator, D denominator);
 template <class N, class D> auto intDivCeil (N numerator, D denominator);
@@ -122,12 +122,12 @@ std::pair<InputIterator, InputIterator> minMaxElement(InputIterator first, Input
 */
 
 template <class T, class InputIterator> inline
-auto nearMatch(const T& val, InputIterator first, InputIterator last)
+auto roundToGrid(T val, InputIterator first, InputIterator last)
 {
+    assert(std::is_sorted(first, last));
     if (first == last)
-        return static_cast<decltype(*first)>(0);
+        return static_cast<decltype(*first)>(val);
 
-    assert(std::is_sorted(first, last));
     InputIterator it = std::lower_bound(first, last, val);
     if (it == last)
         return *--last;
diff --git a/zen/crc.h b/zen/crc.h
index c65ce2e7..009ff9da 100644
--- a/zen/crc.h
+++ b/zen/crc.h
@@ -12,8 +12,8 @@
 
 namespace zen
 {
-uint16_t getCrc16(const std::string& str);
-uint32_t getCrc32(const std::string& str);
+uint16_t getCrc16(const std::string_view& str);
+uint32_t getCrc32(const std::string_view& str);
 template <class ByteIterator> uint16_t getCrc16(ByteIterator first, ByteIterator last);
 template <class ByteIterator> uint32_t getCrc32(ByteIterator first, ByteIterator last);
 
@@ -21,8 +21,8 @@ template <class ByteIterator> uint32_t getCrc32(ByteIterator first, ByteIterator
 
 
 //------------------------- implementation -------------------------------
-inline uint16_t getCrc16(const std::string& str) { return getCrc16(str.begin(), str.end()); }
-inline uint32_t getCrc32(const std::string& str) { return getCrc32(str.begin(), str.end()); }
+inline uint16_t getCrc16(const std::string_view& str) { return getCrc16(str.begin(), str.end()); }
+inline uint32_t getCrc32(const std::string_view& str) { return getCrc32(str.begin(), str.end()); }
 
 
 template <class ByteIterator> inline
diff --git a/zen/file_access.cpp b/zen/file_access.cpp
index a52ea9b8..01dda68c 100644
--- a/zen/file_access.cpp
+++ b/zen/file_access.cpp
@@ -126,9 +126,6 @@ namespace
 int64_t zen::getFreeDiskSpace(const Zstring& folderPath) //throw FileError
 {
     const auto& [existingPath, existingType] = getExistingPath(folderPath); //throw FileError
-
-    warn_static("what if existingType is symlink?")
-
     try
     {
         struct statfs info = {};
diff --git a/zen/file_path.cpp b/zen/file_path.cpp
index 912d5a37..73a3e923 100644
--- a/zen/file_path.cpp
+++ b/zen/file_path.cpp
@@ -77,6 +77,8 @@ std::optional<Zstring> zen::getParentFolderPath(const Zstring& itemPath)
 
 Zstring zen::appendSeparator(Zstring path) //support rvalue references!
 {
+    assert(!endsWith(path, FILE_NAME_SEPARATOR == Zstr('/') ? Zstr('\\' ) : Zstr('/' )));
+
     if (!endsWith(path, FILE_NAME_SEPARATOR))
         path += FILE_NAME_SEPARATOR;
     return path; //returning a by-value parameter => RVO if possible, r-value otherwise!
@@ -156,8 +158,8 @@ Zstring zen::getFileExtension(const Zstring& filePath)
 
 std::weak_ordering zen::compareNativePath(const Zstring& lhs, const Zstring& rhs)
 {
-    assert(lhs.find(Zchar('\0')) == Zstring::npos); //don't expect embedded nulls!
-    assert(rhs.find(Zchar('\0')) == Zstring::npos); //
+    assert(!contains(lhs, Zchar('\0'))); //don't expect embedded nulls!
+    assert(!contains(rhs, Zchar('\0'))); //
 
     return lhs <=> rhs;
 
diff --git a/zen/format_unit.cpp b/zen/format_unit.cpp
index 8b3fccfe..a5dd5152 100644
--- a/zen/format_unit.cpp
+++ b/zen/format_unit.cpp
@@ -111,8 +111,8 @@ std::wstring roundToBlock(double timeInHigh,
     const double granularity = 0.1;
     const double timeInLow = timeInHigh * unitLowPerHigh;
     const int blockSizeLow = granularity * timeInHigh < 1 ?
-                             numeric::nearMatch(granularity * timeInLow,  std::begin(stepsLow),  std::end(stepsLow)):
-                             numeric::nearMatch(granularity * timeInHigh, std::begin(stepsHigh), std::end(stepsHigh)) * unitLowPerHigh;
+                             numeric::roundToGrid(granularity * timeInLow,  std::begin(stepsLow),  std::end(stepsLow)):
+                             numeric::roundToGrid(granularity * timeInHigh, std::begin(stepsHigh), std::end(stepsHigh)) * unitLowPerHigh;
     const int roundedtimeInLow = std::lround(timeInLow / blockSizeLow) * blockSizeLow;
 
     std::wstring output = formatUnitTime(roundedtimeInLow / unitLowPerHigh, unitHigh);
@@ -149,10 +149,21 @@ std::wstring zen::formatRemainingTime(double timeInSec)
 }
 
 
-std::wstring zen::formatPercent0(double fraction)
+std::wstring zen::formatProgressPercent(double fraction, int decPlaces)
 {
-    return numberTo<std::wstring>(std::lround(fraction * 100)) + L'%'; //need to localize percent!?
-    //return printNumber<std::wstring>(L"%.2f", fraction * 100) + L'%';
+#if 0 //special case for perf!?
+    if (decPlaces == 0)
+        return numberTo<std::wstring>(static_cast<int>(fraction * 100)) + L'%';
+#endif
+    //round down! don't show 100% when not actually done: https://freefilesync.org/forum/viewtopic.php?t=9781
+    const double blocks = std::pow(10, decPlaces);
+    const double percent = std::floor(fraction * 100 * blocks) / blocks;
+
+    assert(0 <= decPlaces && decPlaces <= 9);
+    wchar_t format[] = L"%.0f" L"%%" /*literal %: need to localize?*/;
+    format[2] += static_cast<wchar_t>(std::clamp(decPlaces, 0, 9));
+
+    return printNumber<std::wstring>(format, percent);
 }
 
 
diff --git a/zen/format_unit.h b/zen/format_unit.h
index d1ebc28c..5498e8c2 100644
--- a/zen/format_unit.h
+++ b/zen/format_unit.h
@@ -18,7 +18,7 @@ namespace zen
     const int bytesPerKilo = 1000;
 std::wstring formatFilesizeShort(int64_t filesize);
 std::wstring formatRemainingTime(double timeInSec);
-std::wstring formatPercent0(double fraction /*within [0, 1]*/); //zero decimal places
+std::wstring formatProgressPercent(double fraction /*[0, 1]*/, int decPlaces = 0 /*[0, 9]*/); //rounded down!
 std::wstring formatUtcToLocalTime(time_t utcTime); //like Windows Explorer would...
 
 std::wstring formatTwoDigitPrecision  (double value); //format with fixed number of digits
diff --git a/zen/http.cpp b/zen/http.cpp
index 5054ef3f..540b4ef6 100644
--- a/zen/http.cpp
+++ b/zen/http.cpp
@@ -90,10 +90,10 @@ public:
                     readRequest = [&, postBufStream{MemoryStreamIn(*postBuf)}](std::span<char> buf) mutable
                     {
                         const size_t bytesRead = postBufStream.read(buf.data(), buf.size());
-                        *postBytesSent += bytesRead;
+                        * postBytesSent += bytesRead;
                         return bytesRead;
                     };
-                    extraOptions.emplace_back(CURLOPT_POST, 1); 
+                    extraOptions.emplace_back(CURLOPT_POST, 1);
                     extraOptions.emplace_back(CURLOPT_POSTFIELDSIZE_LARGE, postBuf->size()); //avoid HTTP chunked transfer encoding?
                 }
 
@@ -162,19 +162,21 @@ public:
 
         const std::string headBuf = futHeader.get(); //throw SysError
         //parse header: https://www.w3.org/Protocols/HTTP/1.0/spec.html#Request-Line
-        const std::string& statusBuf  = beforeFirst(headBuf, "\r\n", IfNotFoundReturn::all);
-        const std::string& headersBuf = afterFirst (headBuf, "\r\n", IfNotFoundReturn::none);
+        const std::string_view& statusBuf  = beforeFirst<std::string_view>(headBuf, "\r\n", IfNotFoundReturn::all);
+        const std::string_view& headersBuf = afterFirst <std::string_view>(headBuf, "\r\n", IfNotFoundReturn::none);
 
-        const std::vector<std::string> statusItems = split(statusBuf, ' ', SplitOnEmpty::allow); //HTTP-Version SP Status-Code SP Reason-Phrase CRLF
+        const std::vector<std::string_view> statusItems = splitCpy(statusBuf, ' ', SplitOnEmpty::allow); //HTTP-Version SP Status-Code SP Reason-Phrase CRLF
         if (statusItems.size() < 2 || !startsWith(statusItems[0], "HTTP/"))
             throw SysError(L"Invalid HTTP response: \"" + utfTo<std::wstring>(statusBuf) + L'"');
 
         statusCode_ = stringTo<int>(statusItems[1]);
 
-        for (const std::string& line : split(headersBuf, '\n', SplitOnEmpty::skip)) //careful: actual line separator is "\r\n"!
-            responseHeaders_[trimCpy(beforeFirst(line, ':', IfNotFoundReturn::all))] =
-                /**/         trimCpy(afterFirst (line, ':', IfNotFoundReturn::none));
-
+        split(headersBuf, '\n', [&](const std::string_view line)
+        {
+            if (!line.empty()) //careful: actual line separator is "\r\n"!
+                responseHeaders_.emplace(trimCpy(beforeFirst(line, ':', IfNotFoundReturn::all)),
+                                         trimCpy(afterFirst (line, ':', IfNotFoundReturn::none)));
+        });
         /* let's NOT consider "Content-Length" header:
             - may be unavailable ("Transfer-Encoding: chunked")
             - may refer to compressed data size ("Content-Encoding: gzip") */
@@ -274,7 +276,7 @@ std::unique_ptr<HttpInputStream::Impl> sendHttpRequestImpl(const Zstring& url,
 
 
 //encode for "application/x-www-form-urlencoded"
-std::string urlencode(const std::string& str)
+std::string urlencode(const std::string_view& str)
 {
     std::string output;
     for (const char c : str) //follow PHP spec: https://github.com/php/php-src/blob/e99d5d39239c611e1e7304e79e88545c4e71a073/ext/standard/url.c#L455
@@ -296,7 +298,7 @@ std::string urlencode(const std::string& str)
 }
 
 
-std::string urldecode(const std::string& str)
+std::string urldecode(const std::string_view& str)
 {
     std::string output;
     for (size_t i = 0; i < str.size(); ++i)
@@ -331,13 +333,16 @@ std::string zen::xWwwFormUrlEncode(const std::vector<std::pair<std::string, std:
 }
 
 
-std::vector<std::pair<std::string, std::string>> zen::xWwwFormUrlDecode(const std::string& str)
+std::vector<std::pair<std::string, std::string>> zen::xWwwFormUrlDecode(const std::string_view str)
 {
     std::vector<std::pair<std::string, std::string>> output;
 
-    for (const std::string& nvPair : split(str, '&', SplitOnEmpty::skip))
-        output.emplace_back(urldecode(beforeFirst(nvPair, '=', IfNotFoundReturn::all)),
-                            urldecode(afterFirst (nvPair, '=', IfNotFoundReturn::none)));
+    split(str, '&', [&](const std::string_view nvPair)
+    {
+        if (!nvPair.empty())
+            output.emplace_back(urldecode(beforeFirst(nvPair, '=', IfNotFoundReturn::all)),
+                                urldecode(afterFirst (nvPair, '=', IfNotFoundReturn::none)));
+    });
     return output;
 }
 
@@ -469,16 +474,16 @@ std::wstring zen::formatHttpError(int sc)
 }
 
 
-bool zen::isValidEmail(const std::string& email)
+bool zen::isValidEmail(const std::string_view& email)
 {
     //https://en.wikipedia.org/wiki/Email_address#Syntax
     //https://tools.ietf.org/html/rfc3696 => note errata! https://www.rfc-editor.org/errata_search.php?rfc=3696
     //https://tools.ietf.org/html/rfc5321
-    std::string local  = beforeLast(email, '@', IfNotFoundReturn::none);
-    std::string domain =  afterLast(email, '@', IfNotFoundReturn::none);
+    std::string_view local  = beforeLast(email, '@', IfNotFoundReturn::none);
+    std::string_view domain =  afterLast(email, '@', IfNotFoundReturn::none);
     //consider: "t@st"@email.com t\@st@email.com"
 
-    auto stripComments = [](std::string& part)
+    auto stripComments = [](std::string_view& part)
     {
         if (startsWith(part, '('))
             part = afterFirst(part, ')', IfNotFoundReturn::none);
@@ -494,15 +499,16 @@ bool zen::isValidEmail(const std::string& email)
         return false;
     //---------------------------------------------------------------------
 
+    //not going to parse and validate this!
     const bool quoted = (startsWith(local, '"') && endsWith(local, '"')) ||
                         contains(local, '\\'); //e.g. "t\@st@email.com"
-    if (!quoted) //I'm not going to parse and validate this!
-        for (const std::string& comp : split(local, '.', SplitOnEmpty::allow))
+    if (!quoted)
+        for (const std::string_view& comp : splitCpy(local, '.', SplitOnEmpty::allow))
             if (comp.empty() || !std::all_of(comp.begin(), comp.end(), [](char c)
         {
-            const char printable[] = "!#$%&'*+-/=?^_`{|}~";
+            constexpr std::string_view printable("!#$%&'*+-/=?^_`{|}~");
                 return isAsciiAlpha(c) || isDigit(c) || !isAsciiChar(c) ||
-                       std::find(std::begin(printable), std::end(printable), c) != std::end(printable);
+                       contains(printable, c);
             }))
     return false;
     //---------------------------------------------------------------------
@@ -514,7 +520,7 @@ bool zen::isValidEmail(const std::string& email)
         if (!contains(domain, '.'))
             return false;
 
-        for (const std::string& comp : split(domain, '.', SplitOnEmpty::allow))
+        for (const std::string_view& comp : splitCpy(domain, '.', SplitOnEmpty::allow))
             if (comp.empty() || comp.size() > 63 ||
             !std::all_of(comp.begin(), comp.end(), [](char c) { return isAsciiAlpha(c) ||isDigit(c) || !isAsciiChar(c) || c ==  '-'; }))
         return false;
diff --git a/zen/http.h b/zen/http.h
index ebbb8bd8..1943b129 100644
--- a/zen/http.h
+++ b/zen/http.h
@@ -50,11 +50,11 @@ HttpInputStream sendHttpPost(const Zstring& url,
 
 bool internetIsAlive(); //noexcept
 std::wstring formatHttpError(int httpStatus);
-bool isValidEmail(const std::string& email);
+bool isValidEmail(const std::string_view& email);
 std::string htmlSpecialChars(const std::string_view& str);
 
 std::string xWwwFormUrlEncode(const std::vector<std::pair<std::string, std::string>>& paramPairs);
-std::vector<std::pair<std::string, std::string>> xWwwFormUrlDecode(const std::string& str);
+std::vector<std::pair<std::string, std::string>> xWwwFormUrlDecode(const std::string_view str);
 }
 
 #endif //HTTP_H_879083425703425702
diff --git a/zen/legacy_compiler.h b/zen/legacy_compiler.h
index 33394de3..8f93153e 100644
--- a/zen/legacy_compiler.h
+++ b/zen/legacy_compiler.h
@@ -8,6 +8,7 @@
 #define LEGACY_COMPILER_H_839567308565656789
 
 #include <version> //contains all __cpp_lib_<feature> macros
+#include <string>
 
 /*  C++ standard conformance:
     https://en.cppreference.com/w/cpp/feature_test
@@ -25,6 +26,16 @@
 
 namespace std
 {
+
+
+//W(hy)TF is this not standard? https://stackoverflow.com/a/47735624
+template <class Char, class Traits, class Alloc> inline
+basic_string<Char, Traits, Alloc> operator+(basic_string<Char, Traits, Alloc>&& lhs, const basic_string_view<Char> rhs)
+{ return move(lhs.append(rhs.begin(), rhs.end())); } //the move *is* needed!!!
+
+//template <class Char> inline
+//basic_string<Char> operator+(const basic_string<Char>& lhs, const basic_string_view<Char>& rhs) { return basic_string<Char>(lhs) + rhs; }
+//-> somewhat inefficient: enable + optimize when needed
 }
 //---------------------------------------------------------------------------------
 
diff --git a/zen/open_ssl.cpp b/zen/open_ssl.cpp
index 6a5be3e8..1f556656 100644
--- a/zen/open_ssl.cpp
+++ b/zen/open_ssl.cpp
@@ -419,30 +419,29 @@ bool zen::isPuttyKeyStream(const std::string& keyStream)
 
 std::string zen::convertPuttyKeyToPkix(const std::string& keyStream, const std::string& passphrase) //throw SysError
 {
-    std::vector<std::string> lines;
+    std::vector<std::string_view> lines;
 
-    split2(keyStream, isLineBreak<char>,
-           [&lines](const char* blockFirst, const char* blockLast)
+    split2(keyStream, isLineBreak<char>, [&lines](const std::string_view block)
     {
-        if (blockFirst != blockLast) //consider Windows' <CR><LF>
-            lines.emplace_back(blockFirst, blockLast);
+        if (!block.empty()) //consider Windows' <CR><LF>
+            lines.push_back(block);
     });
 
     //----------- parse PuTTY ppk structure ----------------------------------
     auto itLine = lines.begin();
     if (itLine == lines.end() || !startsWith(*itLine, "PuTTY-User-Key-File-2: "))
         throw SysError(L"Unknown key file format");
-    const std::string algorithm = afterFirst(*itLine, ' ', IfNotFoundReturn::none);
+    const std::string_view algorithm = afterFirst(*itLine, ' ', IfNotFoundReturn::none);
     ++itLine;
 
     if (itLine == lines.end() || !startsWith(*itLine, "Encryption: "))
         throw SysError(L"Unknown key encryption");
-    const std::string keyEncryption = afterFirst(*itLine, ' ', IfNotFoundReturn::none);
+    const std::string_view keyEncryption = afterFirst(*itLine, ' ', IfNotFoundReturn::none);
     ++itLine;
 
     if (itLine == lines.end() || !startsWith(*itLine, "Comment: "))
         throw SysError(L"Invalid key comment");
-    const std::string comment = afterFirst(*itLine, ' ', IfNotFoundReturn::none);
+    const std::string_view comment = afterFirst(*itLine, ' ', IfNotFoundReturn::none);
     ++itLine;
 
     if (itLine == lines.end() || !startsWith(*itLine, "Public-Lines: "))
@@ -471,7 +470,7 @@ std::string zen::convertPuttyKeyToPkix(const std::string& keyStream, const std::
 
     if (itLine == lines.end() || !startsWith(*itLine, "Private-MAC: "))
         throw SysError(L"Invalid key: MAC missing");
-    const std::string macHex = afterFirst(*itLine, ' ', IfNotFoundReturn::none);
+    const std::string_view macHex = afterFirst(*itLine, ' ', IfNotFoundReturn::none);
     ++itLine;
 
     //----------- unpack key file elements ---------------------
@@ -784,7 +783,7 @@ std::string zen::convertPuttyKeyToPkix(const std::string& keyStream, const std::
              algorithm == "ecdsa-sha2-nistp384" ||
              algorithm == "ecdsa-sha2-nistp521")
     {
-        const std::string algoShort = afterLast(algorithm, '-', IfNotFoundReturn::none);
+        const std::string_view algoShort = afterLast(algorithm, '-', IfNotFoundReturn::none);
         if (extractStringPub() != algoShort)
             throw SysError(L"Invalid public key stream (header)");
 
diff --git a/zen/process_exec.cpp b/zen/process_exec.cpp
index a2c02eb0..ffc90b4f 100644
--- a/zen/process_exec.cpp
+++ b/zen/process_exec.cpp
@@ -21,19 +21,20 @@ Zstring zen::escapeCommandArg(const Zstring& arg)
 {
 //*INDENT-OFF*    if not put exactly here, Astyle will seriously mess this .cpp file up!
     Zstring output;
-    for (const Zchar c : arg)
+    for (const char c : arg)
         switch (c)
         {
+            //case  ' ': output += "\\ "; break; -> maybe nicer to use quotes instead?
             case  '"': output += "\\\""; break; //Windows: not needed; " cannot be used as file name
             case '\\': output += "\\\\"; break; //Windows: path separator! => don't escape
             case '`':  output += "\\`";  break; //yes, used in some paths => Windows: no escaping required
             default:   output += c; break;
         }
-//*INDENT-ON*
-    if (contains(output, Zstr(' ')))
-        output = Zstr('"') + output + Zstr('"'); //Windows: escaping a single blank instead would not work
+    if (contains(arg, ' '))
+        output = '"' + output + '"'; //caveat: single-quotes not working on macOS if string contains escaped chars! no such issue on Linux
 
     return output;
+//*INDENT-ON*
 }
 
 
diff --git a/zen/serialize.h b/zen/serialize.h
index 53a6fc62..dd393422 100644
--- a/zen/serialize.h
+++ b/zen/serialize.h
@@ -79,7 +79,7 @@ template <         class BufferedInputStream> void readArray    (BufferedInputSt
 struct IOCallbackDivider
 {
     IOCallbackDivider(const IoCallback& notifyUnbufferedIO, int64_t& totalBytesNotified) :
-        totalBytesNotified_(totalBytesNotified), 
+        totalBytesNotified_(totalBytesNotified),
         notifyUnbufferedIO_(notifyUnbufferedIO) { assert(totalBytesNotified == 0); }
 
     void operator()(int64_t bytesDelta) //throw X!
diff --git a/zen/stl_tools.h b/zen/stl_tools.h
index 66af8551..bb005e34 100644
--- a/zen/stl_tools.h
+++ b/zen/stl_tools.h
@@ -58,14 +58,22 @@ void removeDuplicatesStable(std::vector<T, Alloc>& v);
 template <class BidirectionalIterator, class T>
 BidirectionalIterator findLast(BidirectionalIterator first, BidirectionalIterator last, const T& value);
 
+template <class RandomAccessIterator1, class RandomAccessIterator2> inline
+RandomAccessIterator1 searchFirst(const RandomAccessIterator1 first,       const RandomAccessIterator1 last,
+                                  const RandomAccessIterator2 needleFirst, const RandomAccessIterator2 needleLast);
+
+template <class RandomAccessIterator1, class RandomAccessIterator2, class IsEq> inline
+RandomAccessIterator1 searchFirst(const RandomAccessIterator1 first,       const RandomAccessIterator1 last,
+                                  const RandomAccessIterator2 needleFirst, const RandomAccessIterator2 needleLast, IsEq isEqual);
+
 //replacement for std::find_end taking advantage of bidirectional iterators (and giving the algorithm a reasonable name)
-template <class BidirectionalIterator1, class BidirectionalIterator2>
-BidirectionalIterator1 searchLast(BidirectionalIterator1 first1, BidirectionalIterator1 last1,
-                                  BidirectionalIterator2 first2, BidirectionalIterator2 last2);
+template <class RandomAccessIterator1, class RandomAccessIterator2>
+RandomAccessIterator1 searchLast(RandomAccessIterator1 first, RandomAccessIterator1 last,
+                                 RandomAccessIterator2 needleFirst, RandomAccessIterator2 needleLast);
 
 //binary search returning an iterator
-template <class Iterator, class T, class CompLess>
-Iterator binarySearch(Iterator first, Iterator last, const T& value, CompLess less);
+template <class RandomAccessIterator, class T, class CompLess>
+RandomAccessIterator binarySearch(RandomAccessIterator first, RandomAccessIterator last, const T& value, CompLess less);
 
 //read-only variant of std::merge; input: two sorted ranges
 template <class Iterator, class FunctionLeftOnly, class FunctionBoth, class FunctionRightOnly, class Compare>
@@ -199,10 +207,10 @@ void removeDuplicatesStable(std::vector<T, Alloc>& v)
 }
 
 
-template <class Iterator, class T, class CompLess> inline
-Iterator binarySearch(Iterator first, Iterator last, const T& value, CompLess less)
+template <class RandomAccessIterator, class T, class CompLess> inline
+RandomAccessIterator binarySearch(RandomAccessIterator first, RandomAccessIterator last, const T& value, CompLess less)
 {
-    static_assert(std::is_same_v<typename std::iterator_traits<Iterator>::iterator_category, std::random_access_iterator_tag>);
+    static_assert(std::is_same_v<typename std::iterator_traits<RandomAccessIterator>::iterator_category, std::random_access_iterator_tag>);
 
     first = std::lower_bound(first, last, value, less); //alternative: std::partition_point
     if (first != last && !less(value, *first))
@@ -226,29 +234,56 @@ BidirectionalIterator findLast(const BidirectionalIterator first, const Bidirect
 }
 
 
-template <class BidirectionalIterator1, class BidirectionalIterator2> inline
-BidirectionalIterator1 searchLast(const BidirectionalIterator1 first1,       BidirectionalIterator1 last1,
-                                  const BidirectionalIterator2 first2, const BidirectionalIterator2 last2)
+template <class RandomAccessIterator1, class RandomAccessIterator2> inline
+RandomAccessIterator1 searchFirst(const RandomAccessIterator1 first,       const RandomAccessIterator1 last,
+                                  const RandomAccessIterator2 needleFirst, const RandomAccessIterator2 needleLast)
+{
+    if (needleLast - needleFirst == 1) //don't use expensive std::search unless required!
+        return std::find(first, last, *needleFirst);
+
+    return std::search(first, last,
+                       needleFirst, needleLast);
+}
+
+
+template <class RandomAccessIterator1, class RandomAccessIterator2, class IsEq> inline
+RandomAccessIterator1 searchFirst(const RandomAccessIterator1 first,       const RandomAccessIterator1 last,
+                                  const RandomAccessIterator2 needleFirst, const RandomAccessIterator2 needleLast, IsEq isEqual)
 {
-    const BidirectionalIterator1 itNotFound = last1;
+    if (needleLast - needleFirst == 1) //don't use expensive std::search unless required!
+        return std::find_if(first, last, [needleFirst, isEqual](const auto c){ return isEqual(*needleFirst, c); });
+
+    return std::search(first, last,
+                       needleFirst, needleLast, isEqual);
+}
+
+
+template <class RandomAccessIterator1, class RandomAccessIterator2> inline
+RandomAccessIterator1 searchLast(const RandomAccessIterator1 first,       RandomAccessIterator1 last,
+                                 const RandomAccessIterator2 needleFirst, const RandomAccessIterator2 needleLast)
+{
+    if (needleLast - needleFirst == 1) //fast-path
+        return findLast(first, last, *needleFirst);
+
+    const RandomAccessIterator1 itNotFound = last;
 
     //reverse iteration: 1. check 2. decrement 3. evaluate
     for (;;)
     {
-        BidirectionalIterator1 it1 = last1;
-        BidirectionalIterator2 it2 = last2;
+        RandomAccessIterator1 it1 = last;
+        RandomAccessIterator2 it2 = needleLast;
 
         for (;;)
         {
-            if (it2 == first2) return it1;
-            if (it1 == first1) return itNotFound;
+            if (it2 == needleFirst) return it1;
+            if (it1 == first) return itNotFound;
 
             --it1;
             --it2;
 
             if (*it1 != *it2) break;
         }
-        --last1;
+        --last;
     }
 }
 
diff --git a/zen/string_base.h b/zen/string_base.h
index a87827e6..3ebf848a 100644
--- a/zen/string_base.h
+++ b/zen/string_base.h
@@ -92,7 +92,7 @@ protected:
 
     //this needs to be checked before writing to "ptr"
     static bool canWrite(const Char* ptr, size_t minCapacity) { return minCapacity <= descr(ptr)->capacity; }
-    static size_t length(const Char* ptr) { return descr(ptr)->length; }
+    static size_t size(const Char* ptr) { return descr(ptr)->length; }
 
     static void setLength(Char* ptr, size_t newLength)
     {
@@ -174,7 +174,7 @@ protected:
         return d->refCount == 1 && minCapacity <= d->capacity;
     }
 
-    static size_t length(const Char* ptr) { return descr(ptr)->length; }
+    static size_t size(const Char* ptr) { return descr(ptr)->length; }
 
     static void setLength(Char* ptr, size_t newLength)
     {
@@ -228,17 +228,21 @@ public:
     Zbase();
     Zbase(const Char* str) : Zbase(str, str + strLength(str)) {} //implicit conversion from a C-string!
     Zbase(const Char* str, size_t len) : Zbase(str, str + len) {}
+    explicit Zbase(const std::basic_string_view<Char> view) : Zbase(view.begin(), view.end()) {}
     Zbase(size_t count, Char fillChar);
-    Zbase(const Zbase& str);
-    Zbase(Zbase&& tmp) noexcept;
     template <class InputIterator>
     Zbase(InputIterator first, InputIterator last);
+    Zbase(const Zbase& str);
+    Zbase(Zbase&& tmp) noexcept;
     //explicit Zbase(Char ch); //dangerous if implicit: Char buffer[]; return buffer[0]; ups... forgot &, but not a compiler error! //-> non-standard extension!!!
 
     ~Zbase();
 
     //operator const Char* () const; //NO implicit conversion to a C-string!! Many problems... one of them: if we forget to provide operator overloads, it'll just work with a Char*...
 
+    operator std::basic_string_view<Char>() const& noexcept { return {data(), size()}; }
+    operator std::basic_string_view<Char>() const&& = delete; //=> probably a bug!
+
     //STL accessors
     using iterator        = Char*;
     using const_iterator  = const Char*;
@@ -250,25 +254,28 @@ public:
     iterator end  ();
 
     const_iterator begin () const { return rawStr_; }
-    const_iterator end   () const { return rawStr_ + length(); }
+    const_iterator end   () const { return rawStr_ + size(); }
 
     const_iterator cbegin() const { return begin(); }
     const_iterator cend  () const { return end  (); }
 
     //std::string functions
-    size_t length() const;
-    size_t size  () const { return length(); }
+    size_t length() const { return size(); }
+    size_t size  () const;
     const Char* c_str() const { return rawStr_; } //C-string format with 0-termination
-    /**/  Char* data() { return &*begin(); }
+    const Char* data() const { return &*begin(); }
+    /**/  Char* data()       { return &*begin(); }
     const Char& operator[](size_t pos) const;
     /**/  Char& operator[](size_t pos);
-    bool empty() const { return length() == 0; }
+    bool empty() const { return size() == 0; }
     void clear();
+#if 0 //avoid redundant std::string API bloat!
     size_t find (const Zbase& str, size_t pos = 0)    const; //
     size_t find (const Char* str,  size_t pos = 0)    const; //
     size_t find (Char  ch,         size_t pos = 0)    const; //returns "npos" if not found
     size_t rfind(Char  ch,         size_t pos = npos) const; //
     size_t rfind(const Char* str,  size_t pos = npos) const; //
+#endif
     //Zbase& replace(size_t pos1, size_t n1, const Zbase& str);
     void reserve(size_t minCapacity);
     Zbase& assign(const Char* str, size_t len) { return assign(str, str + len); }
@@ -286,7 +293,7 @@ public:
     Zbase& operator=(const Zbase& str);
     Zbase& operator=(const Char* str)   { return assign(str, strLength(str)); }
     Zbase& operator=(Char ch)           { return assign(&ch, 1); }
-    Zbase& operator+=(const Zbase& str) { return append(str.c_str(), str.length()); }
+    Zbase& operator+=(const Zbase& str) { return append(str.c_str(), str.size()); }
     Zbase& operator+=(const Char* str)  { return append(str, strLength(str)); }
     Zbase& operator+=(Char ch)          { return append(&ch, 1); }
 
@@ -355,7 +362,7 @@ template <class Char, template <class> class SP>
 template <class InputIterator> inline
 Zbase<Char, SP>::Zbase(InputIterator first, InputIterator last)
 {
-    rawStr_ = this->create(std::distance(first, last));
+    rawStr_ = this->create(last - first);
     *std::copy(first, last, rawStr_) = 0;
 }
 
@@ -394,35 +401,36 @@ Zbase<Char, SP>::~Zbase()
 }
 
 
+#if 0 //avoid redundant std::string API bloat!
 template <class Char, template <class> class SP> inline
-size_t Zbase<Char, SP>::find(const Zbase& str, size_t pos) const
+size_t Zbase<Char, SP>::find(const Zbase& str, size_t pos) const //returns "npos" if not found
 {
-    assert(pos <= length());
-    const size_t len = length();
+    assert(pos <= size());
+    const size_t len = size();
     const Char* thisEnd = begin() + len; //respect embedded 0
-    const Char* it = std::search(begin() + std::min(pos, len), thisEnd,
+    const Char* it = searchFirst(begin() + std::min(pos, len), thisEnd,
                                  str.begin(), str.end());
     return it == thisEnd ? npos : it - begin();
 }
 
 
 template <class Char, template <class> class SP> inline
-size_t Zbase<Char, SP>::find(const Char* str, size_t pos) const
+size_t Zbase<Char, SP>::find(const Char* str, size_t pos) const //returns "npos" if not found
 {
-    assert(pos <= length());
-    const size_t len = length();
+    assert(pos <= size());
+    const size_t len = size();
     const Char* thisEnd = begin() + len; //respect embedded 0
-    const Char* it = std::search(begin() + std::min(pos, len), thisEnd,
+    const Char* it = searchFirst(begin() + std::min(pos, len), thisEnd,
                                  str, str + strLength(str));
     return it == thisEnd ? npos : it - begin();
 }
 
 
 template <class Char, template <class> class SP> inline
-size_t Zbase<Char, SP>::find(Char ch, size_t pos) const
+size_t Zbase<Char, SP>::find(Char ch, size_t pos) const //returns "npos" if not found
 {
-    assert(pos <= length());
-    const size_t len = length();
+    assert(pos <= size());
+    const size_t len = size();
     const Char* thisEnd = begin() + len; //respect embedded 0
     const Char* it = std::find(begin() + std::min(pos, len), thisEnd, ch);
     return it == thisEnd ? npos : it - begin();
@@ -430,10 +438,10 @@ size_t Zbase<Char, SP>::find(Char ch, size_t pos) const
 
 
 template <class Char, template <class> class SP> inline
-size_t Zbase<Char, SP>::rfind(Char ch, size_t pos) const
+size_t Zbase<Char, SP>::rfind(Char ch, size_t pos) const //returns "npos" if not found
 {
-    assert(pos == npos || pos <= length());
-    const size_t len = length();
+    assert(pos == npos || pos <= size());
+    const size_t len = size();
     const Char* currEnd = begin() + (pos == npos ? len : std::min(pos + 1, len));
     const Char* it = findLast(begin(), currEnd, ch);
     return it == currEnd ? npos : it - begin();
@@ -441,22 +449,23 @@ size_t Zbase<Char, SP>::rfind(Char ch, size_t pos) const
 
 
 template <class Char, template <class> class SP> inline
-size_t Zbase<Char, SP>::rfind(const Char* str, size_t pos) const
+size_t Zbase<Char, SP>::rfind(const Char* str, size_t pos) const //returns "npos" if not found
 {
-    assert(pos == npos || pos <= length());
+    assert(pos == npos || pos <= size());
     const size_t strLen = strLength(str);
-    const size_t len = length();
+    const size_t len = size();
     const Char* currEnd = begin() + (pos == npos ? len : std::min(pos + strLen, len));
     const Char* it = searchLast(begin(), currEnd,
                                 str, str + strLen);
     return it == currEnd ? npos : it - begin();
 }
+#endif
 
 
 template <class Char, template <class> class SP> inline
 void Zbase<Char, SP>::resize(size_t newSize, Char fillChar)
 {
-    const size_t oldSize = length();
+    const size_t oldSize = size();
     if (this->canWrite(rawStr_, newSize))
     {
         if (oldSize < newSize)
@@ -485,28 +494,28 @@ void Zbase<Char, SP>::resize(size_t newSize, Char fillChar)
 template <class Char, template <class> class SP> inline
 bool operator==(const Zbase<Char, SP>& lhs, const Zbase<Char, SP>& rhs)
 {
-    return lhs.length() == rhs.length() && std::equal(lhs.begin(), lhs.end(), rhs.begin()); //respect embedded 0
+    return lhs.size() == rhs.size() && std::equal(lhs.begin(), lhs.end(), rhs.begin()); //respect embedded 0
 }
 
 
 template <class Char, template <class> class SP> inline
 bool operator==(const Zbase<Char, SP>& lhs, const Char* rhs)
 {
-    return lhs.length() == strLength(rhs) && std::equal(lhs.begin(), lhs.end(), rhs); //respect embedded 0
+    return lhs.size() == strLength(rhs) && std::equal(lhs.begin(), lhs.end(), rhs); //respect embedded 0
 }
 
 
 template <class Char, template <class> class SP> inline
-size_t Zbase<Char, SP>::length() const
+size_t Zbase<Char, SP>::size() const
 {
-    return SP<Char>::length(rawStr_);
+    return SP<Char>::size(rawStr_);
 }
 
 
 template <class Char, template <class> class SP> inline
 const Char& Zbase<Char, SP>::operator[](size_t pos) const
 {
-    assert(pos < length()); //design by contract! no runtime check!
+    assert(pos < size()); //design by contract! no runtime check!
     return rawStr_[pos];
 }
 
@@ -514,8 +523,8 @@ const Char& Zbase<Char, SP>::operator[](size_t pos) const
 template <class Char, template <class> class SP> inline
 Char& Zbase<Char, SP>::operator[](size_t pos)
 {
-    reserve(length()); //make unshared!
-    assert(pos < length()); //design by contract! no runtime check!
+    reserve(size()); //make unshared!
+    assert(pos < size()); //design by contract! no runtime check!
     return rawStr_[pos];
 }
 
@@ -523,7 +532,7 @@ Char& Zbase<Char, SP>::operator[](size_t pos)
 template <class Char, template <class> class SP> inline
 auto Zbase<Char, SP>::begin() -> iterator
 {
-    reserve(length()); //make unshared!
+    reserve(size()); //make unshared!
     return rawStr_;
 }
 
@@ -531,7 +540,7 @@ auto Zbase<Char, SP>::begin() -> iterator
 template <class Char, template <class> class SP> inline
 auto Zbase<Char, SP>::end() -> iterator
 {
-    return begin() + length();
+    return begin() + size();
 }
 
 
@@ -557,7 +566,7 @@ void Zbase<Char, SP>::reserve(size_t minCapacity) //make unshared and check capa
     if (!this->canWrite(rawStr_, minCapacity))
     {
         //allocate a new string
-        const size_t len = length();
+        const size_t len = size();
         Char* newStr = this->create(len, std::max(len, minCapacity)); //reserve() must NEVER shrink the string: logical const!
         std::copy(rawStr_, rawStr_ + len + 1 /*0-termination*/, newStr);
 
@@ -591,7 +600,7 @@ Zbase<Char, SP>& Zbase<Char, SP>::append(InputIterator first, InputIterator last
     const size_t len = std::distance(first, last);
     if (len > 0) //avoid making this string unshared for no reason
     {
-        const size_t thisLen = length();
+        const size_t thisLen = size();
         reserve(thisLen + len); //make unshared and check capacity
 
         *std::copy(first, last, rawStr_ + thisLen) = 0;
@@ -624,7 +633,7 @@ Zbase<Char, SP>& Zbase<Char, SP>::operator=(Zbase<Char, SP>&& tmp) noexcept
 template <class Char, template <class> class SP> inline
 void Zbase<Char, SP>::pop_back()
 {
-    const size_t len = length();
+    const size_t len = size();
     assert(len > 0);
     if (len > 0)
         resize(len - 1);
diff --git a/zen/string_tools.h b/zen/string_tools.h
index 364a9a26..3975cc92 100644
--- a/zen/string_tools.h
+++ b/zen/string_tools.h
@@ -70,11 +70,11 @@ enum class SplitOnEmpty
     allow,
     skip
 };
-template <class S, class Char> [[nodiscard]] std::vector<S> split(const S& str, Char delimiter, SplitOnEmpty soe);
+template <class S, class Char, class Function> void split(const S& str, Char delimiter, Function onStringPart);
 template <class S, class Function1, class Function2> void split2(const S& str, Function1 isDelimiter, Function2 onStringPart);
+template <class S, class Char> [[nodiscard]] std::vector<S> splitCpy(const S& str, Char delimiter, SplitOnEmpty soe);
 
-template <class S> [[nodiscard]] S trimCpy(S  str, bool fromLeft = true, bool fromRight = true);
-template <class Char, class Function> [[nodiscard]] std::pair<Char*, Char*> trimCpy(Char* first, Char* last, bool fromLeft, bool fromRight, Function trimThisChar);
+template <class S> [[nodiscard]] S trimCpy(const S& str, bool fromLeft = true, bool fromRight = true);
 template <class S>                 void trim   (S& str, bool fromLeft = true, bool fromRight = true);
 template <class S, class Function> void trim(S& str, bool fromLeft, bool fromRight, Function trimThisChar);
 
@@ -315,8 +315,8 @@ bool contains(const S& str, const T& term)
     const auto* const strFirst  = strBegin(str);
     const auto* const strLast   = strFirst + strLen;
     const auto* const termFirst = strBegin(term);
-
-    return std::search(strFirst, strLast,
+     
+    return searchFirst(strFirst, strLast,
                        termFirst, termFirst + termLen) != strLast;
 }
 
@@ -331,7 +331,7 @@ S afterLast(const S& str, const T& term, IfNotFoundReturn infr)
     const auto* const strFirst  = strBegin(str);
     const auto* const strLast   = strFirst + strLength(str);
     const auto* const termFirst = strBegin(term);
-
+     
     const auto* it = searchLast(strFirst, strLast,
                                 termFirst, termFirst + termLen);
     if (it == strLast)
@@ -348,7 +348,7 @@ S beforeLast(const S& str, const T& term, IfNotFoundReturn infr)
     static_assert(std::is_same_v<GetCharTypeT<S>, GetCharTypeT<T>>);
     const size_t termLen = strLength(term);
     assert(termLen > 0);
-
+     
     const auto* const strFirst  = strBegin(str);
     const auto* const strLast   = strFirst + strLength(str);
     const auto* const termFirst = strBegin(term);
@@ -372,8 +372,8 @@ S afterFirst(const S& str, const T& term, IfNotFoundReturn infr)
     const auto* const strFirst  = strBegin(str);
     const auto* const strLast   = strFirst + strLength(str);
     const auto* const termFirst = strBegin(term);
-
-    const auto* it = std::search(strFirst, strLast,
+     
+    const auto* it = searchFirst(strFirst, strLast,
                                  termFirst, termFirst + termLen);
     if (it == strLast)
         return infr == IfNotFoundReturn::all ? str : S();
@@ -393,8 +393,8 @@ S beforeFirst(const S& str, const T& term, IfNotFoundReturn infr)
     const auto* const strFirst  = strBegin(str);
     const auto* const strLast   = strFirst + strLength(str);
     const auto* const termFirst = strBegin(term);
-
-    auto it = std::search(strFirst, strLast,
+     
+    auto it = searchFirst(strFirst, strLast,
                           termFirst,  termFirst  + termLen);
     if (it == strLast)
         return infr == IfNotFoundReturn::all ? str : S();
@@ -412,7 +412,7 @@ void split2(const S& str, Function1 isDelimiter, Function2 onStringPart)
     for (;;)
     {
         const auto* const blockLast = std::find_if(blockFirst, strEnd, isDelimiter);
-        onStringPart(blockFirst, blockLast);
+        onStringPart(makeStringView(blockFirst, blockLast));
 
         if (blockLast == strEnd)
             return;
@@ -422,16 +422,24 @@ void split2(const S& str, Function1 isDelimiter, Function2 onStringPart)
 }
 
 
+template <class S, class Char, class Function> inline
+void split(const S& str, Char delimiter, Function onStringPart)
+{
+    static_assert(std::is_same_v<GetCharTypeT<S>, Char>);
+    split2(str, [delimiter](Char c) { return c == delimiter; }, onStringPart);
+}
+
+
 template <class S, class Char> inline
-std::vector<S> split(const S& str, Char delimiter, SplitOnEmpty soe)
+std::vector<S> splitCpy(const S& str, Char delimiter, SplitOnEmpty soe)
 {
     static_assert(std::is_same_v<GetCharTypeT<S>, Char>);
     std::vector<S> output;
 
-    split2(str, [delimiter](Char c) { return c == delimiter; }, [&](const Char* blockFirst, const Char* blockLast)
+    split2(str, [delimiter](Char c) { return c == delimiter; }, [&, soe](std::basic_string_view<Char> block)
     {
-        if (blockFirst != blockLast || soe == SplitOnEmpty::allow)
-            output.emplace_back(blockFirst, blockLast);
+        if (!block.empty() || soe == SplitOnEmpty::allow)
+            output.emplace_back(block.data(), block.size());
     });
     return output;
 }
@@ -474,7 +482,7 @@ void replace(S& str, const T& oldTerm, const U& newTerm, CharEq charEqual)
     auto* it = strBegin(str); //don't use str.begin() or wxString will return this wxUni* nonsense!
     auto* const strEnd = it + strLength(str);
 
-    auto itFound = std::search(it, strEnd,
+    auto itFound = searchFirst(it, strEnd,
                                oldBegin, oldEnd, charEqual);
     if (itFound == strEnd)
         return; //optimize "oldTerm not found"
@@ -489,7 +497,7 @@ void replace(S& str, const T& oldTerm, const U& newTerm, CharEq charEqual)
             itFound = strEnd;
         else
 #endif
-            itFound = std::search(it, strEnd,
+            itFound = searchFirst(it, strEnd,
                                   oldBegin, oldEnd, charEqual);
 
         impl::stringAppend(output, it, itFound);
@@ -531,8 +539,9 @@ S replaceCpyAsciiNoCase(S str, const T& oldTerm, const U& newTerm)
 }
 
 
-template <class Char, class Function> inline
-std::pair<Char*, Char*> trimCpy(Char* first, Char* last, bool fromLeft, bool fromRight, Function trimThisChar)
+template <class Char, class Function>
+[[nodiscard]] inline
+std::pair<Char*, Char*> trimCpy2(Char* first, Char* last, bool fromLeft, bool fromRight, Function trimThisChar)
 {
     assert(fromLeft || fromRight);
 
@@ -554,7 +563,7 @@ void trim(S& str, bool fromLeft, bool fromRight, Function trimThisChar)
     assert(fromLeft || fromRight);
 
     const auto* const oldBegin = strBegin(str);
-    const auto& [newBegin, newEnd] = trimCpy(oldBegin, oldBegin + strLength(str), fromLeft, fromRight, trimThisChar);
+    const auto& [newBegin, newEnd] = trimCpy2(oldBegin, oldBegin + strLength(str), fromLeft, fromRight, trimThisChar);
 
     if (newBegin != oldBegin)
         str = S(newBegin, newEnd); //minor inefficiency: in case "str" is not shared, we could save an allocation and do a memory move only
@@ -572,11 +581,18 @@ void trim(S& str, bool fromLeft, bool fromRight)
 
 
 template <class S> inline
-S trimCpy(S str, bool fromLeft, bool fromRight)
+S trimCpy(const S& str, bool fromLeft, bool fromRight)
 {
-    //implementing trimCpy() in terms of trim(), instead of the other way round, avoids memory allocations when trimming from right!
-    trim(str, fromLeft, fromRight);
-    return str;
+    using CharType = GetCharTypeT<S>;
+    const auto* const oldBegin = strBegin(str);
+    const auto* const oldEnd = oldBegin + strLength(str);
+
+    const auto& [newBegin, newEnd] = trimCpy2(oldBegin, oldEnd, fromLeft, fromRight, [](CharType c) { return isWhiteSpace(c); });
+
+    if (newBegin == oldBegin && newEnd == oldEnd)
+        return str;
+    else
+        return S(newBegin, newEnd - newBegin);
 }
 
 
@@ -626,6 +642,7 @@ S printNumber(const T& format, const Num& number) //format a single number using
 #error refactor?
 #endif
     static_assert(std::is_same_v<GetCharTypeT<S>, GetCharTypeT<T>>);
+        assert(strBegin(format)[strLength(format)] == 0); //format must be null-terminated!
 
     S buf(128, static_cast<GetCharTypeT<S>>('0'));
     const int charsWritten = impl::saferPrintf(buf.data(), buf.size(), strBegin(format), number);
@@ -634,7 +651,7 @@ S printNumber(const T& format, const Num& number) //format a single number using
         return S();
 
     buf.resize(charsWritten);
-        return buf;
+    return buf;
 }
 
 
@@ -849,7 +866,7 @@ Num stringTo(const S& str, std::integral_constant<NumberType, NumberType::unsign
     if (hasMinusSign)
     {
         assert(false);
-        return 0U;
+        return -makeSigned(number); //at least make some noise
     }
     return number;
 }
diff --git a/zen/sys_info.cpp b/zen/sys_info.cpp
index 87e07f91..5a044c3a 100644
--- a/zen/sys_info.cpp
+++ b/zen/sys_info.cpp
@@ -131,10 +131,28 @@ ComputerModel zen::getComputerModel() //throw FileError
         cm.model  = beforeFirst(cm.model,  L'\u00ff', IfNotFoundReturn::all); //fix broken BIOS entries:
         cm.vendor = beforeFirst(cm.vendor, L'\u00ff', IfNotFoundReturn::all); //0xff can be considered 0
 
+        trim(cm.model,  false, true, [](wchar_t c) { return c == L'_'; }); //e.g. "CBX3___" or just "_"
+        trim(cm.vendor, false, true, [](wchar_t c) { return c == L'_'; }); //e.g. "DELL__"  or just "_"
+
         for (const char* dummyModel :
              {
-                 "To Be Filled By O.E.M.", "Default string", "$(DEFAULT_STRING)", "Undefined", "empty", "O.E.M", "OEM", "NA",
-                 "System Product Name", "Please change product name", "INVALID",
+                 "Please change product name",
+                 "SYSTEM_PRODUCT_NAME",
+                 "System Product Name",
+                 "To Be Filled By O.E.M.",
+                 "Default string",
+                 "$(DEFAULT_STRING)",
+                 "<null string>",
+                 "Product Name",
+                 "Undefined",
+                 "INVALID",
+                 "Unknow",
+                 "empty",
+                 "O.E.M.",
+                 "O.E.M",
+                 "OEM",
+                 "NA",
+                 ".",
              })
             if (equalAsciiNoCase(cm.model, dummyModel))
             {
@@ -144,8 +162,21 @@ ComputerModel zen::getComputerModel() //throw FileError
 
         for (const char* dummyVendor :
              {
-                 "To Be Filled By O.E.M.", "Default string", "$(DEFAULT_STRING)", "Undefined",  "empty", "O.E.M", "OEM", "NA",
-                 "System manufacturer", "OEM Manufacturer",
+                 "OEM Manufacturer",
+                 "SYSTEM_MANUFACTURER",
+                 "System manufacturer",
+                 "System Manufacter",
+                 "To Be Filled By O.E.M.",
+                 "Default string",
+                 "$(DEFAULT_STRING)",
+                 "Undefined",
+                 "Unknow",
+                 "empty",
+                 "O.E.M.",
+                 "O.E.M",
+                 "OEM",
+                 "NA",
+                 ".",
              })
             if (equalAsciiNoCase(cm.vendor, dummyVendor))
             {
diff --git a/zen/sys_version.cpp b/zen/sys_version.cpp
index d187e0f0..b123ba07 100644
--- a/zen/sys_version.cpp
+++ b/zen/sys_version.cpp
@@ -47,13 +47,14 @@ OsVersionDetail zen::getOsVersionDetail() //throw SysError
         }
         catch (const FileError& e) { throw SysError(replaceCpy(e.toString(), L"\n\n", L'\n')); } //errors should be further enriched by context info => SysError
 
-        for (const std::string& line : split(releaseInfo, '\n', SplitOnEmpty::skip))
+        split(releaseInfo, '\n', [&](const std::string_view line)
+        {
             if (startsWith(line, "NAME="))
                 osName = utfTo<std::wstring>(afterFirst(line, '=', IfNotFoundReturn::none));
             else if (startsWith(line, "VERSION_ID="))
                 osVersion = utfTo<std::wstring>(afterFirst(line, '=', IfNotFoundReturn::none));
-        //PRETTY_NAME? too wordy! e.g. "Fedora 17 (Beefy Miracle)"
-
+            //PRETTY_NAME? too wordy! e.g. "Fedora 17 (Beefy Miracle)"
+        });
         trim(osName,    true, true, [](char c) { return c == L'"' || c == L'\''; });
         trim(osVersion, true, true, [](char c) { return c == L'"' || c == L'\''; });
     }
@@ -64,7 +65,7 @@ OsVersionDetail zen::getOsVersionDetail() //throw SysError
     //  lsb_release Release is "rolling"
     //  etc/os-release: VERSION_ID is missing
 
-    std::vector<std::wstring> verDigits = split<std::wstring>(osVersion, L'.', SplitOnEmpty::allow); //e.g. "7.7.1908"
+    std::vector<std::wstring_view> verDigits = splitCpy<std::wstring_view>(osVersion, L'.', SplitOnEmpty::allow); //e.g. "7.7.1908"
     verDigits.resize(2);
 
     return OsVersionDetail
diff --git a/zen/zstring.cpp b/zen/zstring.cpp
index 73f18cd1..59e90956 100644
--- a/zen/zstring.cpp
+++ b/zen/zstring.cpp
@@ -18,7 +18,7 @@ Zstring getUnicodeNormalForm_NonAsciiValidUtf(const Zstring& str, UnicodeNormalF
     //Example: const char* decomposed  = "\x6f\xcc\x81"; //ó
     //         const char* precomposed = "\xc3\xb3"; //ó
     assert(!isAsciiString(str)); //includes "not-empty" check
-    assert(str.find(Zchar('\0')) == Zstring::npos); //don't expect embedded nulls!
+    assert(!contains(str, Zchar('\0'))); //don't expect embedded nulls!
 
     try
     {
@@ -75,6 +75,17 @@ Zstring getUnicodeNormalFormNonAscii(const Zstring& str, UnicodeNormalForm form)
 }
 
 
+Zstring getUpperCaseAscii(const Zstring& str)
+{
+    assert(isAsciiString(str));
+
+    Zstring output = str;
+    for (Zchar& c : output)  //identical to LCMapStringEx(), g_unichar_toupper(), CFStringUppercase() [verified!]
+        c = asciiToUpper(c); //
+    return output;
+}
+
+
 Zstring getUpperCaseNonAscii(const Zstring& str)
 {
     Zstring strNorm = getUnicodeNormalFormNonAscii(str, UnicodeNormalForm::native);
@@ -102,27 +113,20 @@ Zstring getUpperCaseNonAscii(const Zstring& str)
 
 Zstring getUnicodeNormalForm(const Zstring& str, UnicodeNormalForm form)
 {
-    //fast pre-check:
-    if (isAsciiString(str)) //perf: in the range of 3.5ns
-        return str;
     static_assert(std::is_same_v<decltype(str), const Zbase<Zchar>&>, "god bless our ref-counting! => save needless memory allocation!");
 
-    return getUnicodeNormalFormNonAscii(str, form);
+    if (isAsciiString(str)) //fast path: in the range of 3.5ns
+        return str;
+
+    return getUnicodeNormalFormNonAscii(str, form); //slow path
 }
 
 
 Zstring getUpperCase(const Zstring& str)
 {
-    if (isAsciiString(str)) //fast path: in the range of 3.5ns
-    {
-        Zstring output = str;
-        for (Zchar& c : output)  //identical to LCMapStringEx(), g_unichar_toupper(), CFStringUppercase() [verified!]
-            c = asciiToUpper(c); //
-        return output;
-    }
-    //else: slow path --------------------------------------
-
-    return getUpperCaseNonAscii(str);
+    return isAsciiString(str) ? //fast path: in the range of 3.5ns
+           getUpperCaseAscii(str) :
+           getUpperCaseNonAscii(str); //slow path
 }
 
 
@@ -252,8 +256,11 @@ std::weak_ordering compareNatural(const Zstring& lhs, const Zstring& rhs)
 
 std::weak_ordering compareNoCase(const Zstring& lhs, const Zstring& rhs)
 {
+    const bool isAsciiL = isAsciiString(lhs);
+    const bool isAsciiR = isAsciiString(rhs);
+
     //fast path: no memory allocations => ~ 6x speedup
-    if (isAsciiString(lhs) && isAsciiString(rhs))
+    if (isAsciiL && isAsciiR)
     {
         const size_t minSize = std::min(lhs.size(), rhs.size());
         for (size_t i = 0; i < minSize; ++i)
@@ -271,19 +278,19 @@ std::weak_ordering compareNoCase(const Zstring& lhs, const Zstring& rhs)
     //can't we instead skip isAsciiString() and compare chars as long as isAsciiChar()?
     // => NOPE! e.g. decomposed Unicode! A seemingly single isAsciiChar() might be followed by a combining character!!!
 
-    return getUpperCase(lhs) <=> getUpperCase(rhs);
+    return (isAsciiL ? getUpperCaseAscii(lhs) : getUpperCaseNonAscii(lhs)) <=>
+           (isAsciiR ? getUpperCaseAscii(rhs) : getUpperCaseNonAscii(rhs));
 }
 
 
 bool equalNoCase(const Zstring& lhs, const Zstring& rhs)
 {
-    //fast-path: no need for extra memory allocations
     const bool isAsciiL = isAsciiString(lhs);
     const bool isAsciiR = isAsciiString(rhs);
-    if (isAsciiL != isAsciiR)
-        return false;
 
-    if (isAsciiL)
+    //fast-path: no extra memory allocations
+    //caveat: ASCII-char and non-ASCII Unicode *can* compare case-insensitive equal!!! e.g. i and ı https://freefilesync.org/forum/viewtopic.php?t=9718
+    if (isAsciiL && isAsciiR)
     {
         if (lhs.size() != rhs.size())
             return false;
@@ -295,5 +302,6 @@ bool equalNoCase(const Zstring& lhs, const Zstring& rhs)
         return true;
     }
 
-    return getUpperCaseNonAscii(lhs) == getUpperCaseNonAscii(rhs);
+    return (isAsciiL ? getUpperCaseAscii(lhs) : getUpperCaseNonAscii(lhs)) ==
+           (isAsciiR ? getUpperCaseAscii(rhs) : getUpperCaseNonAscii(rhs));
 }
diff --git a/zen/zstring.h b/zen/zstring.h
index d0a8eb4c..5bcc8b34 100644
--- a/zen/zstring.h
+++ b/zen/zstring.h
@@ -20,13 +20,13 @@
 //a high-performance string for interfacing with native OS APIs in multithreaded contexts
 using Zstring = zen::Zbase<Zchar>;
 
+using ZstringView = std::basic_string_view<Zchar>;
+
 //for special UI-contexts: guaranteed exponential growth + ref-counting + COW + no SSO overhead
 using Zstringc = zen::Zbase<char>;
 //using Zstringw = zen::Zbase<wchar_t>;
 
 
-//Windows, Linux: precomposed
-//macOS: decomposed
 enum class UnicodeNormalForm
 {
     nfc, //precomposed
diff --git a/zenXml/zenxml/dom.h b/zenXml/zenxml/dom.h
index 5befdd7f..b42d05d8 100644
--- a/zenXml/zenxml/dom.h
+++ b/zenXml/zenxml/dom.h
@@ -248,7 +248,7 @@ private:
     std::list<Attribute>                                            attributes_;      //attributes in order of creation
     std::unordered_map<std::string, std::list<Attribute>::iterator> attributesByName; //alternate view for lookup
 
-    std::list<XmlElement>                             childElements_;       //child elements in order of creation
+    std::list<XmlElement>                   childElements_;       //child elements in order of creation
     std::multimap<std::string, XmlElement*> childElementsByName_; //alternate view for lookup
     //alternative: std::unordered_map => but let's keep std::map, so which guarantees consistent order of duplicate items!
     //e.g. std::unordered_map on Linux inserts duplicates in reverse!