add upstream 13.213.2

57 files changed, 5547 insertions, 5508 deletions

diff --git a/Changelog.txt b/Changelog.txt
index 4262c40f..063a76eb 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,3 +1,15 @@
+FreeFileSync 13.2
+------------------------------
+Complete high-DPI/Retina display support (macOS)
+Prevent versioning files from being moved to versioning recursively
+Fixed tooltip line wrap bug for moved files (Windows)
+Return first FTP parsing error when trying multiple variants
+Allow file times from the future for Linux-style FTP listing
+Fixed setting modification times on certain storage devices (Windows)
+Fixed bogus "Sound playback failed" error message (macOS)
+Fixed rename dialog text selection wobble (macOS)
+
+
 FreeFileSync 13.1 [2023-10-23]
 ------------------------------
 Keep comparison results when only changing cloud connection settings
diff --git a/FreeFileSync/Build/Resources/Languages.zip b/FreeFileSync/Build/Resources/Languages.zip
index 3437d30b..c63556fe 100644
--- a/FreeFileSync/Build/Resources/Languages.zip
+++ b/FreeFileSync/Build/Resources/Languages.zip
diff --git a/FreeFileSync/Source/RealTimeSync/app_icon.h b/FreeFileSync/Source/RealTimeSync/app_icon.h
index 55ae348b..2e473223 100644
--- a/FreeFileSync/Source/RealTimeSync/app_icon.h
+++ b/FreeFileSync/Source/RealTimeSync/app_icon.h
@@ -16,9 +16,9 @@ inline
 wxIcon getRtsIcon() //see FFS/app_icon.h
 {
     assert(loadImage("RealTimeSync").GetWidth () == loadImage("RealTimeSync").GetHeight() &&
-           loadImage("RealTimeSync").GetWidth() == fastFromDIP(128));
+           loadImage("RealTimeSync").GetWidth() == dipToScreen(128));
     wxIcon icon;
-    icon.CopyFromBitmap(loadImage("RealTimeSync", fastFromDIP(64)));
+    icon.CopyFromBitmap(loadImage("RealTimeSync", dipToScreen(64)));
     return icon;
 
 }
diff --git a/FreeFileSync/Source/RealTimeSync/main_dlg.cpp b/FreeFileSync/Source/RealTimeSync/main_dlg.cpp
index 6fac6eb5..0e27a74f 100644
--- a/FreeFileSync/Source/RealTimeSync/main_dlg.cpp
+++ b/FreeFileSync/Source/RealTimeSync/main_dlg.cpp
@@ -104,19 +104,19 @@ MainDialog::MainDialog(const Zstring& cfgFilePath) :
     const int scrollDelta = m_buttonSelectFolderMain->GetSize().y; //more approriate than GetCharHeight() here
     m_scrolledWinFolders->SetScrollRate(scrollDelta, scrollDelta);
 
-    m_txtCtrlDirectoryMain->SetMinSize({fastFromDIP(300), -1});
+    m_txtCtrlDirectoryMain->SetMinSize({dipToWxsize(300), -1});
     setDefaultWidth(*m_spinCtrlDelay);
 
     m_bpButtonRemoveTopFolder->Hide();
     m_panelMainFolder->Layout();
 
-    setImage(*m_bitmapBatch,   loadImage("cfg_batch", fastFromDIP(20)));
+    setImage(*m_bitmapBatch,   loadImage("cfg_batch", dipToScreen(20)));
     setImage(*m_bitmapFolders, fff::IconBuffer::genericDirIcon(fff::IconBuffer::IconSize::small));
-    setImage(*m_bitmapConsole, loadImage("command_line", fastFromDIP(20)));
+    setImage(*m_bitmapConsole, loadImage("command_line", dipToScreen(20)));
 
     setImage(*m_bpButtonAddFolder,       loadImage("item_add"));
     setImage(*m_bpButtonRemoveTopFolder, loadImage("item_remove"));
-    setBitmapTextLabel(*m_buttonStart, loadImage("start_rts"), m_buttonStart->GetLabelText(), fastFromDIP(5), fastFromDIP(8));
+    setBitmapTextLabel(*m_buttonStart, loadImage("start_rts"), m_buttonStart->GetLabelText(), dipToWxsize(5), dipToWxsize(8));
 
     Bind(wxEVT_CHAR_HOOK, [this](wxKeyEvent& event) { onLocalKeyEvent(event); });
 
diff --git a/FreeFileSync/Source/RealTimeSync/tray_menu.cpp b/FreeFileSync/Source/RealTimeSync/tray_menu.cpp
index 2209385c..7725f1d2 100644
--- a/FreeFileSync/Source/RealTimeSync/tray_menu.cpp
+++ b/FreeFileSync/Source/RealTimeSync/tray_menu.cpp
@@ -176,7 +176,7 @@ private:
 
     const wxString jobName_; //RTS job name, may be empty
 
-    const wxImage trayImg_ = loadImage("start_rts", fastFromDIP(24)); //use 24x24 bitmap for perfect fit
+    const wxImage trayImg_ = loadImage("start_rts", dipToScreen(24)); //use 24x24 bitmap for perfect fit
 };
 
 
diff --git a/FreeFileSync/Source/afs/ftp.cpp b/FreeFileSync/Source/afs/ftp.cpp
index d72daf92..55bf79bf 100644
--- a/FreeFileSync/Source/afs/ftp.cpp
+++ b/FreeFileSync/Source/afs/ftp.cpp
@@ -390,19 +390,25 @@ public:
 
         //CURLOPT_TIMEOUT: "Since this puts a hard limit for how long time a request is allowed to take, it has limited use in dynamic use cases with varying transfer times."
         setCurlOption({CURLOPT_LOW_SPEED_TIME, *timeoutSec}); //throw SysError
-        setCurlOption({CURLOPT_LOW_SPEED_LIMIT, 1}); //throw SysError
-        ; //[bytes], can't use "0" which means "inactive", so use some low number
+        setCurlOption({CURLOPT_LOW_SPEED_LIMIT, 1 /*[bytes]*/}); //throw SysError
+        //can't use "0" which means "inactive", so use some low number
 
-        //unlike CURLOPT_TIMEOUT, this one is NOT a limit on the total transfer time
         setCurlOption({CURLOPT_SERVER_RESPONSE_TIMEOUT, *timeoutSec}); //throw SysError
-        //== alias of CURLOPT_SERVER_RESPONSE_TIMEOUT
+        //FTP only; unlike CURLOPT_TIMEOUT, this one is NOT a limit on the total transfer time
 
         //CURLOPT_ACCEPTTIMEOUT_MS? => only relevant for "active" FTP connections
 
-        //long-running file uploads require us to send keep-alives for the TCP control connection: https://freefilesync.org/forum/viewtopic.php?t=6928
+        //long-running file uploads require keep-alives for the TCP control connection: https://freefilesync.org/forum/viewtopic.php?t=6928
         setCurlOption({CURLOPT_TCP_KEEPALIVE, 1}); //throw SysError
         //=> CURLOPT_TCP_KEEPIDLE (=delay) and CURLOPT_TCP_KEEPINTVL both default to 60 sec
 
+warn_static("remove after test") //https://freefilesync.org/forum/viewtopic.php?p=41482#p41482
+#if 0
+        setCurlOption({CURLOPT_TCP_KEEPIDLE,  30 /*[sec]*/}); //throw SysError
+        setCurlOption({CURLOPT_TCP_KEEPINTVL, 30 /*[sec]*/}); //throw SysError
+#endif
+
+
 
         std::optional<SysError> socketException;
         //libcurl does *not* set FD_CLOEXEC for us! https://github.com/curl/curl/issues/2252
@@ -1443,9 +1449,9 @@ private:
                 switch (line[0])
                 {
                     //*INDENT-OFF*
-                    case 'd': return dirOwnerGroupCount;
+                    case 'd': return  dirOwnerGroupCount;
                     case 'l': return linkOwnerGroupCount;
-                    default: return fileOwnerGroupCount;
+                    default : return fileOwnerGroupCount;
                     //*INDENT-ON*
                 }
             }();
@@ -1454,19 +1460,20 @@ private:
             if (!ownerGroupCount)
                 ownerGroupCount = [&]
             {
+                std::optional<SysError> firstError;
+
                 for (int i = 3; i-- > 0;)
                     try
                     {
                         parseUnixLine(line, utcTimeNow, utcCurrentYear, i /*ownerGroupCount*/, session); //throw SysError
                         return i;
                     }
-                    catch (SysError&)
+                    catch (const SysError& e)
                     {
-                        if (i == 0)
-                            throw;
+                        if (!firstError)
+                            firstError = e;
                     }
-                assert(false);
-                return 1234; //placate bogus compiler warning: "not all control paths return a value"
+                throw* firstError; //most likely the relevant one: https://freefilesync.org/forum/viewtopic.php?t=10798
             }();
 
             const FtpItem item = parseUnixLine(line, utcTimeNow, utcCurrentYear, *ownerGroupCount, session); //throw SysError
@@ -1585,7 +1592,7 @@ private:
             {
                 timeComp.year = stringTo<int>(timeOrYear);
 
-                if (timeComp.year < 1600 || timeComp.year > utcCurrentYear + 1 /*leeway*/)
+                if (timeComp.year < 1600 || timeComp.year >= 3000)
                     throw SysError(L"Failed to parse modification time.");
             }
             else
diff --git a/FreeFileSync/Source/afs/native.cpp b/FreeFileSync/Source/afs/native.cpp
index cbcce134..8b58ec10 100644
--- a/FreeFileSync/Source/afs/native.cpp
+++ b/FreeFileSync/Source/afs/native.cpp
@@ -380,13 +380,15 @@ struct OutputStreamNative : public AFS::OutputStreamImpl
 
         fileOut_.close(); //throw FileError
         /* is setting modtime after closing the file handle a pessimization?
-           no, needed for functional correctness, see file_access.cpp::copyNewFile() for macOS/Linux */
+           no, needed for functional correctness, see file_access.cpp::copyNewFile() for macOS/Linux
+           even required on Windows: https://freefilesync.org/forum/viewtopic.php?t=10781 */
         try
         {
             if (modTime_)
                 setFileTime(fileOut_.getFilePath(), *modTime_, ProcSymlink::follow); //throw FileError
         }
         catch (const FileError& e) { result.errorModTime = e; /*might slice derived class?*/ }
+
         return result;
     }
 
diff --git a/FreeFileSync/Source/base/algorithm.cpp b/FreeFileSync/Source/base/algorithm.cpp
index 753f0509..5526f0f9 100644
--- a/FreeFileSync/Source/base/algorithm.cpp
+++ b/FreeFileSync/Source/base/algorithm.cpp
@@ -1184,15 +1184,14 @@ void fff::applyTimeSpanFilter(FolderComparison& folderCmp, time_t timeFrom, time
 }
 
 
-std::optional<PathDependency> fff::getPathDependency(const AbstractPath& folderPathL, const PathFilter& filterL,
-                                                     const AbstractPath& folderPathR, const PathFilter& filterR)
+std::optional<PathDependency> fff::getPathDependency(const AbstractPath& itemPathL, const AbstractPath& itemPathR)
 {
-    if (!AFS::isNullPath(folderPathL) && !AFS::isNullPath(folderPathR))
+    if (!AFS::isNullPath(itemPathL) && !AFS::isNullPath(itemPathR))
     {
-        if (folderPathL.afsDevice == folderPathR.afsDevice)
+        if (itemPathL.afsDevice == itemPathR.afsDevice)
         {
-            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 std::vector<Zstring> relPathL = splitCpy(itemPathL.afsPath.value, FILE_NAME_SEPARATOR, SplitOnEmpty::skip);
+            const std::vector<Zstring> relPathR = splitCpy(itemPathR.afsPath.value, FILE_NAME_SEPARATOR, SplitOnEmpty::skip);
 
             const bool leftParent = relPathL.size() <= relPathR.size();
 
@@ -1207,16 +1206,27 @@ std::optional<PathDependency> fff::getPathDependency(const AbstractPath& folderP
                     relDirPath = appendPath(relDirPath, itemName);
                 });
 
-                const PathFilter& filterP = leftParent ? filterL : filterR;
+               return PathDependency{leftParent ? itemPathL : itemPathR, relDirPath};
+            }
+        }
+    }
+    return {};
+}
+
+
+std::optional<PathDependency> fff::getFolderPathDependency(const AbstractPath& folderPathL, const PathFilter& filterL,
+                                                     const AbstractPath& folderPathR, const PathFilter& filterR)
+{
+    if (std::optional<PathDependency> pd = getPathDependency(folderPathL, folderPathR))
+    {        
+                const PathFilter& filterP = pd->itemPathParent == folderPathL ? filterL : filterR;
                 //if there's a dependency, check if the sub directory is (fully) excluded via filter
                 //=> easy to check but still insufficient in general:
                 // - one folder may have a *.txt include-filter, the other a *.lng include filter => no dependencies, but "childItemMightMatch = true" below!
                 // - user may have manually excluded the conflicting items or changed the filter settings without running a re-compare
                 bool childItemMightMatch = true;
-                if (relDirPath.empty() || filterP.passDirFilter(relDirPath, &childItemMightMatch) || childItemMightMatch)
-                    return PathDependency{leftParent ? folderPathL : folderPathR, relDirPath};
-            }
-        }
+                if (pd->relPath.empty() || filterP.passDirFilter(pd->relPath, &childItemMightMatch) || childItemMightMatch)
+                    return pd;
     }
     return {};
 }
diff --git a/FreeFileSync/Source/base/algorithm.h b/FreeFileSync/Source/base/algorithm.h
index 11aaad95..71f20b57 100644
--- a/FreeFileSync/Source/base/algorithm.h
+++ b/FreeFileSync/Source/base/algorithm.h
@@ -41,10 +41,11 @@ void setActiveStatus(bool newStatus, FileSystemObject& fsObj);     //activate or
 
 struct PathDependency
 {
-    AbstractPath folderPathParent;
+    AbstractPath itemPathParent;
     Zstring relPath; //filled if child path is subfolder of parent path; empty if child path == parent path
 };
-std::optional<PathDependency> getPathDependency(const AbstractPath& folderPathL, const PathFilter& filterL,
+std::optional<PathDependency> getPathDependency(const AbstractPath& itemPathL, const AbstractPath& itemPathR);
+std::optional<PathDependency> getFolderPathDependency(const AbstractPath& folderPathL, const PathFilter& filterL,
                                                 const AbstractPath& folderPathR, const PathFilter& filterR);
 
 //manual copy to alternate folder:
diff --git a/FreeFileSync/Source/base/comparison.cpp b/FreeFileSync/Source/base/comparison.cpp
index cb491cc0..974664ae 100644
--- a/FreeFileSync/Source/base/comparison.cpp
+++ b/FreeFileSync/Source/base/comparison.cpp
@@ -1122,7 +1122,7 @@ FolderComparison fff::compare(WarningDialogs& warnings,
         bool shouldExclude = false;
 
         for (const auto& [folderPair, fpCfg] : workLoad)
-            if (std::optional<PathDependency> pd = getPathDependency(folderPair.folderPathLeft,  fpCfg.filter.nameFilter.ref(),
+            if (std::optional<PathDependency> pd = getFolderPathDependency(folderPair.folderPathLeft,  fpCfg.filter.nameFilter.ref(),
                                                                      folderPair.folderPathRight, fpCfg.filter.nameFilter.ref()))
             {
                 msg += L"\n\n" +
diff --git a/FreeFileSync/Source/base/synchronization.cpp b/FreeFileSync/Source/base/synchronization.cpp
index 0180043d..f72430f3 100644
--- a/FreeFileSync/Source/base/synchronization.cpp
+++ b/FreeFileSync/Source/base/synchronization.cpp
@@ -2580,7 +2580,7 @@ void fff::synchronize(const std::chrono::system_clock::time_point& syncStartTime
                 continue;
             }
 
-        //============ Warnings (*after* potential folder pair skips) ============
+        //================= Warnings (*after* folder pair skips) =================
         //========================================================================
 
         //prepare conflict preview:
@@ -2612,7 +2612,7 @@ void fff::synchronize(const std::chrono::system_clock::time_point& syncStartTime
             if (folderPairCfg.versionMaxAgeDays > 0 || folderPairCfg.versionCountMax > 0) //same check as in applyVersioningLimit()
                 checkVersioningLimitPaths.insert(versioningFolderPath);
 
-        //check if more than 50% of total number of files/dirs are to be created/overwritten/deleted
+        //check if more than 50% of total number of files/dirs will be created/overwritten/deleted
         if (significantDifferenceDetected(folderPairStat))
             checkSignificantDiffPairs.emplace_back(baseFolder.getAbstractPath<SelectSide::left >(),
                                                    baseFolder.getAbstractPath<SelectSide::right>());
@@ -2793,7 +2793,7 @@ break2:
             std::set<AbstractPath> foldersWithWarnings; //=> at most one msg per base folder (*and* per versioningFolderPath)
 
             for (const auto& [folderPath, filter] : checkVersioningBasePaths) //may contain duplicate paths, but with *different* hard filter!
-                if (std::optional<PathDependency> pd = getPathDependency(versioningFolderPath, NullFilter(), folderPath, *filter))
+                if (std::optional<PathDependency> pd = getFolderPathDependency(versioningFolderPath, NullFilter(), folderPath, *filter))
                     if (const auto [it, inserted] = foldersWithWarnings.insert(folderPath);
                         inserted)
                     {
@@ -2801,12 +2801,13 @@ break2:
                                _("Selected folder:")   + L" \t" + AFS::getDisplayPath(folderPath) + L'\n' +
                                _("Versioning folder:") + L" \t" + AFS::getDisplayPath(versioningFolderPath);
 
-                        if (pd->folderPathParent == folderPath) //if versioning folder is a subfolder of a base folder
+                        if (pd->itemPathParent == folderPath) //if versioning folder is a subfolder of a base folder
                             if (!pd->relPath.empty())           //this can be fixed via an exclude filter
                             {
+                assert(pd->itemPathParent == folderPath); //otherwise: what the fuck!?
                                 shouldExclude = true;
-                                msg += std::wstring() + L'\n' + L"⇒ " +
-                                       _("Exclude:") + L" \t" + utfTo<std::wstring>(FILE_NAME_SEPARATOR + pd->relPath + FILE_NAME_SEPARATOR);
+                                msg += std::wstring() + L'\n' + 
+                                    L"⇒ " + _("Exclude:") + L" \t" + utfTo<std::wstring>(FILE_NAME_SEPARATOR + pd->relPath + FILE_NAME_SEPARATOR);
                             }
                     }
         }
diff --git a/FreeFileSync/Source/base/versioning.cpp b/FreeFileSync/Source/base/versioning.cpp
index 3417bebc..5c33541d 100644
--- a/FreeFileSync/Source/base/versioning.cpp
+++ b/FreeFileSync/Source/base/versioning.cpp
@@ -181,8 +181,25 @@ void moveExistingItemToVersioning(const AbstractPath& sourcePath, const Abstract
 }
 
 
+void FileVersioner::checkPathConflict(const AbstractPath& itemPath) const //throw FileError
+{
+    if (std::optional<PathDependency> pd = getPathDependency(itemPath, versioningFolderPath_))
+    {
+        assert(pd->itemPathParent == versioningFolderPath_); //otherwise: what the fuck!?
+        //user ignored warning about versioning folder being part of sync =>
+        //prevent files from being moved to versioning recursively:
+        throw FileError(trimCpy(replaceCpy(replaceCpy(_("Cannot move %x to %y."),
+                                                      L"%x", L'\n' + fmtPath(AFS::getDisplayPath(itemPath))),
+                                           L"%y", L'\n' + fmtPath(AFS::getDisplayPath(versioningFolderPath_)))),
+                        _("Item already located in the versioning folder."));
+    }
+}
+
+
 void FileVersioner::revisionFile(const FileDescriptor& fileDescr, const Zstring& relativePath, const IoCallback& notifyUnbufferedIO /*throw X*/) const //throw FileError, X
 {
+    checkPathConflict(fileDescr.path); //throw FileError
+
     if (const std::optional<AFS::ItemType> type = AFS::getItemTypeIfExists(fileDescr.path)) //throw FileError
     {
         assert(*type != AFS::ItemType::symlink);
@@ -224,6 +241,8 @@ void FileVersioner::revisionFileImpl(const FileDescriptor& fileDescr, const Zstr
 
 void FileVersioner::revisionSymlink(const AbstractPath& linkPath, const Zstring& relativePath) const //throw FileError
 {
+    checkPathConflict(linkPath); //throw FileError
+
     if (AFS::itemExists(linkPath)) //throw FileError
         revisionSymlinkImpl(linkPath, relativePath, nullptr /*onBeforeMove*/); //throw FileError
     //else -> missing source item is not an error => check BEFORE deleting target
@@ -248,6 +267,8 @@ void FileVersioner::revisionFolder(const AbstractPath& folderPath, const Zstring
                                    const std::function<void(const std::wstring& displayPathFrom, const std::wstring& displayPathTo)>& onBeforeFolderMove /*throw X*/,
                                    const IoCallback& notifyUnbufferedIO /*throw X*/) const
 {
+    checkPathConflict(folderPath); //throw FileError
+
     //no error situation if directory is not existing! manual deletion relies on it!
     if (const std::optional<AFS::ItemType> type = AFS::getItemTypeIfExists(folderPath)) //throw FileError
     {
diff --git a/FreeFileSync/Source/base/versioning.h b/FreeFileSync/Source/base/versioning.h
index 49c864e9..3512e24a 100644
--- a/FreeFileSync/Source/base/versioning.h
+++ b/FreeFileSync/Source/base/versioning.h
@@ -66,6 +66,8 @@ private:
     FileVersioner           (const FileVersioner&) = delete;
     FileVersioner& operator=(const FileVersioner&) = delete;
 
+    void checkPathConflict(const AbstractPath& itemPath) const; //throw FileError
+
     void revisionFileImpl(const FileDescriptor& fileDescr, const Zstring& relativePath, //throw FileError, X
                           const std::function<void(const std::wstring& displayPathFrom, const std::wstring& displayPathTo)>& onBeforeMove,
                           const zen::IoCallback& notifyUnbufferedIO) const;
diff --git a/FreeFileSync/Source/config.cpp b/FreeFileSync/Source/config.cpp
index afa5aba8..45849bd1 100644
--- a/FreeFileSync/Source/config.cpp
+++ b/FreeFileSync/Source/config.cpp
@@ -1015,24 +1015,6 @@ void readConfig(const XmlIn& in, SyncDirectionConfig& dirCfg, int formatVer)
             inCustDir["RightNewer"](std::get<DirectionByDiff>(dirCfg.dirs).rightNewer); //
         }
     }
-    else if (formatVer < 22) //TODO: remove if parameter migration after some time! 2023-08-20
-    {
-        warn_static("formatVer == 21 was development-internal => get rid, once the betas are out of likely use")
-
-        if (XmlIn inDir = in["Differences"])
-        {
-            dirCfg.dirs = DirectionByDiff();
-            inDir["LeftOnly"  ](std::get<DirectionByDiff>(dirCfg.dirs).leftOnly);
-            inDir["RightOnly" ](std::get<DirectionByDiff>(dirCfg.dirs).rightOnly);
-            inDir["LeftNewer" ](std::get<DirectionByDiff>(dirCfg.dirs).leftNewer);
-            inDir["RightNewer"](std::get<DirectionByDiff>(dirCfg.dirs).rightNewer);
-        }
-        else
-        {
-            assert(in["Changes"]);
-            dirCfg = getDefaultSyncCfg(SyncVariant::twoWay);
-        }
-    }
     else
     {
         if (XmlIn inDirs = in["Differences"])
diff --git a/FreeFileSync/Source/icon_buffer.cpp b/FreeFileSync/Source/icon_buffer.cpp
index f8325a3b..64eb55c5 100644
--- a/FreeFileSync/Source/icon_buffer.cpp
+++ b/FreeFileSync/Source/icon_buffer.cpp
@@ -42,7 +42,7 @@ std::variant<ImageHolder, FileIconHolder> getDisplayIcon(const AbstractPath& ite
         case IconBuffer::IconSize::large:
             try
             {
-                if (ImageHolder ih = AFS::getThumbnailImage(itemPath, IconBuffer::getSize(sz))) //throw FileError; optional return value
+                if (ImageHolder ih = AFS::getThumbnailImage(itemPath, IconBuffer::getPixSize(sz))) //throw FileError; optional return value
                     return ih;
             }
             catch (FileError&) {}
@@ -54,7 +54,7 @@ std::variant<ImageHolder, FileIconHolder> getDisplayIcon(const AbstractPath& ite
     //2. retrieve file icons
         try
         {
-            if (FileIconHolder fih = AFS::getFileIcon(itemPath, IconBuffer::getSize(sz))) //throw FileError; optional return value
+            if (FileIconHolder fih = AFS::getFileIcon(itemPath, IconBuffer::getPixSize(sz))) //throw FileError; optional return value
                 return fih;
         }
         catch (FileError&) {}
@@ -318,17 +318,17 @@ IconBuffer::~IconBuffer()
 }
 
 
-int IconBuffer::getSize(IconSize sz)
+int IconBuffer::getPixSize(IconSize sz)
 {
     //coordinate with getIconByIndexImpl() and linkOverlayIcon()!
     switch (sz)
     {
         case IconSize::small:
-            return getDefaultMenuIconSize();
+            return dipToScreen(getMenuIconDipSize());
         case IconSize::medium:
-            return fastFromDIP(48);
+            return dipToScreen(48);
         case IconSize::large:
-            return fastFromDIP(128);
+            return dipToScreen(128);
     }
     assert(false);
     return 0;
@@ -384,7 +384,7 @@ wxImage IconBuffer::getIconByExtension(const Zstring& filePath)
         wxImage img;
         try
         {
-            img = extractWxImage(getIconByTemplatePath(templateName, getSize(iconSizeType_))); //throw SysError
+            img = extractWxImage(getIconByTemplatePath(templateName, getPixSize(iconSizeType_))); //throw SysError
         }
         catch (SysError&) {}
         if (!img.IsOk()) //Linux: not all MIME types have icons!
@@ -401,7 +401,7 @@ wxImage IconBuffer::genericFileIcon(IconSize sz)
 {
     try
     {
-        return extractWxImage(fff::genericFileIcon(IconBuffer::getSize(sz))); //throw SysError
+        return extractWxImage(fff::genericFileIcon(IconBuffer::getPixSize(sz))); //throw SysError
     }
     catch (SysError&) { assert(false); return wxNullImage; }
 }
@@ -411,7 +411,7 @@ wxImage IconBuffer::genericDirIcon(IconSize sz)
 {
     try
     {
-        return extractWxImage(fff::genericDirIcon(IconBuffer::getSize(sz))); //throw SysError
+        return extractWxImage(fff::genericDirIcon(IconBuffer::getPixSize(sz))); //throw SysError
     }
     catch (SysError&) { assert(false); return wxNullImage; }
 }
@@ -419,14 +419,14 @@ wxImage IconBuffer::genericDirIcon(IconSize sz)
 
 wxImage IconBuffer::linkOverlayIcon(IconSize sz)
 {
-    //coordinate with IconBuffer::getSize()!
+    //coordinate with IconBuffer::getPixSize()!
     return loadImage([sz]
     {
-        const int iconSize = IconBuffer::getSize(sz);
+        const int iconSize = IconBuffer::getPixSize(sz);
 
-        if (iconSize >= fastFromDIP(128)) return "file_link_128";
-        if (iconSize >= fastFromDIP( 48)) return "file_link_48";
-        if (iconSize >= fastFromDIP( 20)) return "file_link_20";
+        if (iconSize >= dipToScreen(128)) return "file_link_128";
+        if (iconSize >= dipToScreen( 48)) return "file_link_48";
+        if (iconSize >= dipToScreen( 20)) return "file_link_20";
         return "file_link_16";
     }());
 }
@@ -434,14 +434,14 @@ wxImage IconBuffer::linkOverlayIcon(IconSize sz)
 
 wxImage IconBuffer::plusOverlayIcon(IconSize sz)
 {
-    //coordinate with IconBuffer::getSize()!
+    //coordinate with IconBuffer::getPixSize()!
     return loadImage([sz]
     {
-        const int iconSize = IconBuffer::getSize(sz);
+        const int iconSize = IconBuffer::getPixSize(sz);
 
-        if (iconSize >= fastFromDIP(128)) return "file_plus_128";
-        if (iconSize >= fastFromDIP( 48)) return "file_plus_48";
-        if (iconSize >= fastFromDIP( 20)) return "file_plus_20";
+        if (iconSize >= dipToScreen(128)) return "file_plus_128";
+        if (iconSize >= dipToScreen( 48)) return "file_plus_48";
+        if (iconSize >= dipToScreen( 20)) return "file_plus_20";
         return "file_plus_16";
     }());
 }
@@ -449,14 +449,14 @@ wxImage IconBuffer::plusOverlayIcon(IconSize sz)
 
 wxImage IconBuffer::minusOverlayIcon(IconSize sz)
 {
-    //coordinate with IconBuffer::getSize()!
+    //coordinate with IconBuffer::getPixSize()!
     return loadImage([sz]
     {
-        const int iconSize = IconBuffer::getSize(sz);
+        const int iconSize = IconBuffer::getPixSize(sz);
 
-        if (iconSize >= fastFromDIP(128)) return "file_minus_128";
-        if (iconSize >= fastFromDIP( 48)) return "file_minus_48";
-        if (iconSize >= fastFromDIP( 20)) return "file_minus_20";
+        if (iconSize >= dipToScreen(128)) return "file_minus_128";
+        if (iconSize >= dipToScreen( 48)) return "file_minus_48";
+        if (iconSize >= dipToScreen( 20)) return "file_minus_20";
         return "file_minus_16";
     }());
 }
diff --git a/FreeFileSync/Source/icon_buffer.h b/FreeFileSync/Source/icon_buffer.h
index af6620aa..cb665087 100644
--- a/FreeFileSync/Source/icon_buffer.h
+++ b/FreeFileSync/Source/icon_buffer.h
@@ -29,8 +29,8 @@ public:
     explicit IconBuffer(IconSize sz);
     ~IconBuffer();
 
-    static int getSize(IconSize sz); //expected and *maximum* icon size in pixel
-    int getSize() const { return getSize(iconSizeType_); } //
+    static int getPixSize(IconSize sz); //expected and *maximum* icon size in pixel
+    int getPixSize() const { return getPixSize(iconSizeType_); } //
 
     void                   setWorkload      (const std::vector<AbstractPath>& load); //(re-)set new workload of icons to be retrieved;
     bool                   readyForRetrieval(const AbstractPath& filePath);
diff --git a/FreeFileSync/Source/ui/abstract_folder_picker.cpp b/FreeFileSync/Source/ui/abstract_folder_picker.cpp
index 6ebb5024..0d971f32 100644
--- a/FreeFileSync/Source/ui/abstract_folder_picker.cpp
+++ b/FreeFileSync/Source/ui/abstract_folder_picker.cpp
@@ -87,17 +87,17 @@ AbstractFolderPickerDlg::AbstractFolderPickerDlg(wxWindow* parent, AbstractPath&
     setStandardButtonLayout(*bSizerStdButtons, StdButtons().setAffirmative(m_buttonOkay).setCancel(m_buttonCancel));
 
     m_staticTextStatus->SetLabel(L"");
-    m_treeCtrlFileSystem->SetMinSize({fastFromDIP(350), fastFromDIP(400)});
+    m_treeCtrlFileSystem->SetMinSize({dipToWxsize(350), dipToWxsize(400)});
 
-    const int iconSize = IconBuffer::getSize(IconBuffer::IconSize::small);
+    const int iconSize = screenToWxsize(IconBuffer::getPixSize(IconBuffer::IconSize::small));
     auto imgList = std::make_unique<wxImageList>(iconSize, iconSize);
 
     //add images in same sequence like TreeNodeImage enum!!!
-    imgList->Add(loadImage("server", iconSize));
-    imgList->Add(        IconBuffer::genericDirIcon (IconBuffer::IconSize::small));
-    imgList->Add(layOver(IconBuffer::genericDirIcon (IconBuffer::IconSize::small),
-                         IconBuffer::linkOverlayIcon(IconBuffer::IconSize::small)));
-    imgList->Add(loadImage("msg_error", iconSize));
+    imgList->Add(toScaledBitmap(loadImage("server", wxsizeToScreen(iconSize))));
+    imgList->Add(toScaledBitmap(        IconBuffer::genericDirIcon (IconBuffer::IconSize::small)));
+    imgList->Add(toScaledBitmap(layOver(IconBuffer::genericDirIcon (IconBuffer::IconSize::small),
+                                        IconBuffer::linkOverlayIcon(IconBuffer::IconSize::small))));
+    imgList->Add(toScaledBitmap(loadImage("msg_error", wxsizeToScreen(iconSize))));
     assert(imgList->GetImageCount() == static_cast<int>(TreeNodeImage::error) + 1);
 
     m_treeCtrlFileSystem->AssignImageList(imgList.release()); //pass ownership
diff --git a/FreeFileSync/Source/ui/app_icon.h b/FreeFileSync/Source/ui/app_icon.h
index 7eff5a03..4dc9f614 100644
--- a/FreeFileSync/Source/ui/app_icon.h
+++ b/FreeFileSync/Source/ui/app_icon.h
@@ -19,10 +19,9 @@ wxIcon getFfsIcon()
     using namespace zen;
     //wxWidgets' bitmap to icon conversion on macOS can only deal with very specific sizes => check on all platforms!
     assert(loadImage("FreeFileSync").GetWidth () == loadImage("FreeFileSync").GetHeight() &&
-           loadImage("FreeFileSync").GetWidth() == fastFromDIP(128));
+           loadImage("FreeFileSync").GetWidth() == dipToScreen(128));
     wxIcon icon; //Ubuntu-Linux does a bad job at down-scaling in Unity dash (blocky icons!) => prepare:
-    icon.CopyFromBitmap(loadImage("FreeFileSync", fastFromDIP(64)));
-    //no discernable difference bewteen wxIMAGE_QUALITY_HIGH/wxIMAGE_QUALITY_BILINEAR in this case
+    icon.CopyFromBitmap(loadImage("FreeFileSync", dipToScreen(64)));
     return icon;
 
 }
diff --git a/FreeFileSync/Source/ui/batch_config.cpp b/FreeFileSync/Source/ui/batch_config.cpp
index 054134ef..bbc59171 100644
--- a/FreeFileSync/Source/ui/batch_config.cpp
+++ b/FreeFileSync/Source/ui/batch_config.cpp
@@ -67,7 +67,7 @@ BatchDialog::BatchDialog(wxWindow* parent, BatchDialogConfig& dlgCfg) :
     setStandardButtonLayout(*bSizerStdButtons, StdButtons().setAffirmative(m_buttonSaveAs).setCancel(m_buttonCancel));
 
     m_staticTextHeader->SetLabelText(replaceCpy(m_staticTextHeader->GetLabelText(), L"%x", L"FreeFileSync.exe <" + _("configuration file") + L">.ffs_batch"));
-    m_staticTextHeader->Wrap(fastFromDIP(520));
+    m_staticTextHeader->Wrap(dipToWxsize(520));
 
     setImage(*m_bitmapBatchJob, loadImage("cfg_batch"));
 
diff --git a/FreeFileSync/Source/ui/cfg_grid.cpp b/FreeFileSync/Source/ui/cfg_grid.cpp
index 4078a5c0..3e686986 100644
--- a/FreeFileSync/Source/ui/cfg_grid.cpp
+++ b/FreeFileSync/Source/ui/cfg_grid.cpp
@@ -337,7 +337,8 @@ public:
 
     static int getRowDefaultHeight(const Grid& grid)
     {
-        return std::max(getDefaultMenuIconSize(), grid.getMainWin().GetCharHeight()) + fastFromDIP(1) /*extra space*/;
+        return std::max(dipToWxsize(getMenuIconDipSize()),
+                        grid.getMainWin().GetCharHeight()) + dipToWxsize(1) /*extra space*/;
     }
 
     int  getSyncOverdueDays() const { return syncOverdueDays_; }
@@ -401,7 +402,7 @@ private:
     {
         if (selected)
             clearArea(dc, rect, wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT));
-        //else: clearArea(dc, rect, wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); -> already the default
+        //else: wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW) already the default!
     }
 
     enum class HoverAreaConfig
@@ -415,8 +416,7 @@ private:
         wxDCTextColourChanger textColor(dc); //accessibility: always set both foreground AND background colors!
         if (selected)
             textColor.Set(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT));
-        else
-            textColor.Set(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
+        //else: wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT) already the default!
 
         if (const ConfigView::Details* item = cfgView_.getItem(row))
             switch (static_cast<ColumnTypeCfg>(colType))
@@ -442,7 +442,7 @@ private:
                         }
                         else //always show a glimpse of the background color
                         {
-                            rectTmp.width = getColumnGapLeft() + getDefaultMenuIconSize();
+                            rectTmp.width = getColumnGapLeft() + dipToWxsize(getMenuIconDipSize());
                             clearArea(dc, rectTmp, backColor);
 
                             rectTmp.x += rectTmp.width;
@@ -451,7 +451,7 @@ private:
                         }
                     }
                     if (!selected && static_cast<HoverAreaConfig>(rowHover) == HoverAreaConfig::name)
-                        drawRectangleBorder(dc, rect, wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT), fastFromDIP(1));
+                        drawRectangleBorder(dc, rect, wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT), dipToWxsize(1));
 
                     //-------------------------------------------------------------------------------------
                     wxRect rectTmp = rect;
@@ -465,9 +465,9 @@ private:
                             case ConfigView::Details::CFG_TYPE_NONE:
                                 return wxNullImage;
                             case ConfigView::Details::CFG_TYPE_GUI:
-                                return loadImage("start_sync", getDefaultMenuIconSize());
+                                return loadImage("start_sync", dipToScreen(getMenuIconDipSize()));
                             case ConfigView::Details::CFG_TYPE_BATCH:
-                                return loadImage("cfg_batch", getDefaultMenuIconSize());
+                                return loadImage("cfg_batch", dipToScreen(getMenuIconDipSize()));
                         }
                         assert(false);
                         return wxNullImage;
@@ -475,20 +475,20 @@ private:
                     if (cfgIcon.IsOk())
                         drawBitmapRtlNoMirror(dc, enabled ? cfgIcon : cfgIcon.ConvertToDisabled(), rectTmp, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL);
 
-                    rectTmp.x     += getDefaultMenuIconSize() + getColumnGapLeft();
-                    rectTmp.width -= getDefaultMenuIconSize() + getColumnGapLeft();
+                    rectTmp.x     += dipToWxsize(getMenuIconDipSize()) + getColumnGapLeft();
+                    rectTmp.width -= dipToWxsize(getMenuIconDipSize()) + getColumnGapLeft();
 
                     if (!item->notes.empty())
-                        rectTmp.width -= getDefaultMenuIconSize() + getColumnGapLeft();
+                        rectTmp.width -= dipToWxsize(getMenuIconDipSize()) + getColumnGapLeft();
 
                     drawCellText(dc, rectTmp, getValue(row, colType));
 
                     if (!item->notes.empty())
                     {
                         rectTmp.x += rectTmp.width;
-                        rectTmp.width = getDefaultMenuIconSize();
+                        rectTmp.width = dipToWxsize(getMenuIconDipSize());
 
-                        const wxImage notesIcon = loadImage("notes", getDefaultMenuIconSize());
+                        const wxImage notesIcon = loadImage("notes", dipToScreen(getMenuIconDipSize()));
                         drawBitmapRtlNoMirror(dc, enabled ? notesIcon : notesIcon.ConvertToDisabled(), rectTmp, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL);
                     }
                 }
@@ -513,12 +513,12 @@ private:
                             switch (item->cfgItem.lastRunStats.syncResult)
                             {
                                 case TaskResult::success:
-                                    return loadImage("msg_success", getDefaultMenuIconSize());
+                                    return loadImage("msg_success", dipToScreen(getMenuIconDipSize()));
                                 case TaskResult::warning:
-                                    return loadImage("msg_warning", getDefaultMenuIconSize());
+                                    return loadImage("msg_warning", dipToScreen(getMenuIconDipSize()));
                                 case TaskResult::error:
                                 case TaskResult::cancelled:
-                                    return loadImage("msg_error", getDefaultMenuIconSize());
+                                    return loadImage("msg_error", dipToScreen(getMenuIconDipSize()));
                             }
                             assert(false);
                             return wxNullImage;
@@ -538,13 +538,13 @@ private:
         switch (static_cast<ColumnTypeCfg>(colType))
         {
             case ColumnTypeCfg::name:
-                return getColumnGapLeft() + getDefaultMenuIconSize() + getColumnGapLeft() + dc.GetTextExtent(getValue(row, colType)).GetWidth() + getColumnGapLeft();
+                return getColumnGapLeft() + dipToWxsize(getMenuIconDipSize()) + getColumnGapLeft() + dc.GetTextExtent(getValue(row, colType)).GetWidth() + getColumnGapLeft();
 
             case ColumnTypeCfg::lastSync:
                 return getColumnGapLeft() + dc.GetTextExtent(getValue(row, colType)).GetWidth() + getColumnGapLeft();
 
             case ColumnTypeCfg::lastLog:
-                return getDefaultMenuIconSize();
+                return dipToWxsize(getMenuIconDipSize());
         }
         assert(false);
         return 0;
@@ -558,7 +558,7 @@ private:
             {
                 case ColumnTypeCfg::name:
                 case ColumnTypeCfg::lastSync:
-                    //if (!item->notes.empty() && cellRelativePosX >= cellWidth - (getColumnGapLeft() + getDefaultMenuIconSize() + getColumnGapLeft()))
+                    //if (!item->notes.empty() && cellRelativePosX >= cellWidth - (getColumnGapLeft() + dipToWxsize(getMenuIconDipSize()) + getColumnGapLeft()))
                     break;
                 case ColumnTypeCfg::lastLog:
                     if (!item->isLastRunCfg && !getNativeItemPath(item->cfgItem.lastRunStats.logFilePath).empty())
@@ -600,7 +600,7 @@ private:
 
             case ColumnTypeCfg::lastLog:
             {
-                const wxImage logIcon = loadImage("log_file", getDefaultMenuIconSize());
+                const wxImage logIcon = loadImage("log_file", dipToScreen(getMenuIconDipSize()));
                 drawBitmapRtlNoMirror(dc, enabled ? logIcon : logIcon.ConvertToDisabled(), rectInner, wxALIGN_CENTER);
 
                 if (sortMarker.IsOk())
@@ -727,7 +727,7 @@ void cfggrid::init(Grid& grid)
     grid.setDataProvider(std::make_shared<GridDataCfg>(grid));
     grid.showRowLabel(false);
     grid.setRowHeight(rowHeight);
-    grid.setColumnLabelHeight(rowHeight + fastFromDIP(2));
+    grid.setColumnLabelHeight(rowHeight + dipToWxsize(2));
 }
 
 
diff --git a/FreeFileSync/Source/ui/cfg_grid.h b/FreeFileSync/Source/ui/cfg_grid.h
index 97589a56..6a40f190 100644
--- a/FreeFileSync/Source/ui/cfg_grid.h
+++ b/FreeFileSync/Source/ui/cfg_grid.h
@@ -66,9 +66,9 @@ std::vector<ColAttributesCfg> getCfgGridDefaultColAttribs()
     using namespace zen;
     return
     {
-        {ColumnTypeCfg::name,     -fastFromDIP(75) - fastFromDIP(42), 1, true},
-        {ColumnTypeCfg::lastSync, fastFromDIP(75), 0, true},
-        {ColumnTypeCfg::lastLog,  fastFromDIP(42), 0, true}, //leave some room for the sort direction indicator
+        {ColumnTypeCfg::name,    -dipToWxsize(75) - dipToWxsize(42), 1, true},
+        {ColumnTypeCfg::lastSync, dipToWxsize(75), 0, true},
+        {ColumnTypeCfg::lastLog,  dipToWxsize(42), 0, true}, //leave some room for the sort direction indicator
     };
 }
 
diff --git a/FreeFileSync/Source/ui/command_box.cpp b/FreeFileSync/Source/ui/command_box.cpp
index ca12ebe4..119ce833 100644
--- a/FreeFileSync/Source/ui/command_box.cpp
+++ b/FreeFileSync/Source/ui/command_box.cpp
@@ -36,7 +36,7 @@ CommandBox::CommandBox(wxWindow* parent,
     wxComboBox(parent, id, value, pos, size, n, choices, style, validator, name)
 {
     //####################################
-    /*#*/ SetMinSize({fastFromDIP(150), -1}); //# workaround yet another wxWidgets bug: default minimum size is much too large for a wxComboBox
+    /*#*/ SetMinSize({dipToWxsize(150), -1}); //# workaround yet another wxWidgets bug: default minimum size is much too large for a wxComboBox
     //####################################
 
     Bind(wxEVT_KEY_DOWN,                  [this](wxKeyEvent&     event) { onKeyEvent  (event); });
diff --git a/FreeFileSync/Source/ui/file_grid.cpp b/FreeFileSync/Source/ui/file_grid.cpp
index 96cf7fb2..5041b5d5 100644
--- a/FreeFileSync/Source/ui/file_grid.cpp
+++ b/FreeFileSync/Source/ui/file_grid.cpp
@@ -236,7 +236,7 @@ struct IconManager
         }
     }
 
-    int getIconSize() const { return iconBuffer_ ? iconBuffer_->getSize() : IconBuffer::getSize(IconBuffer::IconSize::small); }
+    int getIconWxsize() const { return screenToWxsize(iconBuffer_ ? iconBuffer_->getPixSize() : IconBuffer::getPixSize(IconBuffer::IconSize::small)); }
 
     IconBuffer* getIconBuffer() { return iconBuffer_.get(); }
     void startIconUpdater() { assert(iconUpdater_); if (iconUpdater_) iconUpdater_->start(); }
@@ -549,7 +549,7 @@ private:
             GridData::renderRowBackgound(dc, rect, row, true /*enabled*/, true /*selected*/, rowHover);
 
         //----------------------------------------------------------------------------------
-        const wxRect rectLine(rect.x, rect.y + rect.height - fastFromDIP(1), rect.width, fastFromDIP(1));
+        const wxRect rectLine(rect.x, rect.y + rect.height - dipToWxsize(1), rect.width, dipToWxsize(1));
         clearArea(dc, rectLine, row == pdi.groupLastRow - 1 /*last group item*/ ?
                   getColorGridLine() : getDefaultBackgroundColorAlternating(pdi.groupIdx % 2 != 0));
     }
@@ -616,7 +616,7 @@ private:
         assert(pdi.fsObj);
 
         const bool drawFileIcons = getIconManager().getIconBuffer();
-        const int iconSize       = getIconManager().getIconSize();
+        const int iconSize       = getIconManager().getIconWxsize();
 
         //--------------------------------------------------------------------
         const int ellipsisWidth = getTextExtentBuffered(dc, ELLIPSIS).x;
@@ -683,7 +683,7 @@ private:
         int       groupNameWidth    = groupName.empty() ? 0 : (gapSize_ + iconSize + gapSize_ + getTextExtentBuffered(dc, groupName).x);
         const int groupNameMinWidth = groupName.empty() ? 0 : (gapSize_ + iconSize + gapSize_ + ellipsisWidth);
 
-        const int groupSepWidth = (groupParentFolder.empty() && groupName.empty()) ? 0 : (2 * gapSize_ + fastFromDIP(1));
+        const int groupSepWidth = (groupParentFolder.empty() && groupName.empty()) ? 0 : (2 * gapSize_ + dipToWxsize(1));
 
         int       groupItemsWidth    = groupSepWidth + (drawFileIcons ? gapSize_ + iconSize : 0) + gapSize_ + groupItemNamesWidth;
         const int groupItemsMinWidth = groupSepWidth + (drawFileIcons ? gapSize_ + iconSize : 0) + gapSize_ + ellipsisWidth;
@@ -802,12 +802,12 @@ private:
                                 if (const auto& [cudAction, cudSide] = getCudAction(syncOp);
                                     cudAction != CudAction::noChange && side == cudSide)
                                 {
-                                    rectCud.width = gapSize_ + IconBuffer::getSize(IconBuffer::IconSize::small);
+                                    rectCud.width = gapSize_ + screenToWxsize(IconBuffer::getPixSize(IconBuffer::IconSize::small));
                                     //fixed-size looks fine for all icon sizes! use same width even if file icons are disabled!
                                     clearArea(dc, rectCud, getBackGroundColorSyncAction(syncOp));
 
                                     rectCud.x += rectCud.width;
-                                    rectCud.width = gapSize_ + fastFromDIP(2);
+                                    rectCud.width = gapSize_ + dipToWxsize(2);
 
 #if 0 //wxDC::GetPixel() is broken in GTK3! https://github.com/wxWidgets/wxWidgets/issues/14067
                                     wxColor backCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
@@ -827,10 +827,10 @@ private:
                             isNavMarked(*pdi.fsObj) &&
                             (!enabled || !selected))
                         {
-                            rectNav.width = std::min(rectNav.width, fastFromDIP(10));
+                            rectNav.width = std::min(rectNav.width, dipToWxsize(10));
 
                             if (row == pdi.groupLastRow - 1 /*last group item*/) //preserve the group separation line!
-                                rectNav.height -= fastFromDIP(1);
+                                rectNav.height -= dipToWxsize(1);
 
                             dc.GradientFillLinear(rectNav, getColorSelectionGradientFrom(), getColorSelectionGradientTo(), wxEAST);
                             navMarkerDrawn = true;
@@ -846,7 +846,7 @@ private:
                             icon = icon.ConvertToDisabled();
 
                         rectIcon.x += gapSize_;
-                        rectIcon.width = getIconManager().getIconSize(); //center smaller-than-default icons
+                        rectIcon.width = getIconManager().getIconWxsize(); //center smaller-than-default icons
                         drawBitmapRtlNoMirror(dc, icon, rectIcon, wxALIGN_CENTER);
                     };
 
@@ -928,7 +928,7 @@ private:
                             rectGroupBack.width += 2 * gapSize_; //include gap before vline
 
                             if (row == pdi.groupLastRow - 1 /*last group item*/) //preserve the group separation line!
-                                rectGroupBack.height -= fastFromDIP(1);
+                                rectGroupBack.height -= dipToWxsize(1);
 
                             clearArea(dc, rectGroupBack, getDefaultBackgroundColorAlternating(pdi.groupIdx % 2 == 0));
                             //clearArea() is surprisingly expensive => call just once!
@@ -957,7 +957,7 @@ private:
 
                             if (!itemName.empty())
                                 rectGroupNameBack.width += 2 * gapSize_; //include gap left of item vline
-                            rectGroupNameBack.height -= fastFromDIP(1); //harmonize with item separation lines
+                            rectGroupNameBack.height -= dipToWxsize(1); //harmonize with item separation lines
 
                             wxDCTextColourChanger textColorGroupName(dc);
                             //folder background: coordinate with renderRowBackgound()
@@ -979,13 +979,13 @@ private:
                                 drawAsLink = pdi.folderGroupObj->isFollowedSymlink<side>();
                             }
                             drawFileIcon(folderIcon, drawAsLink, rectGroupName, *pdi.folderGroupObj);
-                            rectGroupName.x     += gapSize_ + getIconManager().getIconSize() + gapSize_;
-                            rectGroupName.width -= gapSize_ + getIconManager().getIconSize() + gapSize_;
+                            rectGroupName.x     += gapSize_ + getIconManager().getIconWxsize() + gapSize_;
+                            rectGroupName.width -= gapSize_ + getIconManager().getIconWxsize() + gapSize_;
 
                             //mouse highlight: group name
                             if (static_cast<HoverAreaGroup>(rowHover) == HoverAreaGroup::groupName ||
                                 (static_cast<HoverAreaGroup>(rowHover) == HoverAreaGroup::item && pdi.fsObj == pdi.folderGroupObj /*exception: extend highlight*/))
-                                drawRectangleBorder(dc, rectGroupNameBack, *wxBLUE, fastFromDIP(1));
+                                drawRectangleBorder(dc, rectGroupNameBack, *wxBLUE, dipToWxsize(1));
 
                             if (!pdi.folderGroupObj->isEmpty<side>())
                                 drawCellText(dc, rectGroupName, groupName, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, &getTextExtentBuffered(dc, groupName));
@@ -1001,16 +1001,17 @@ private:
                             rectGroupItems.x     += 2 * gapSize_;
                             rectGroupItems.width -= 2 * gapSize_;
 
-                            wxDCPenChanger dummy(dc, wxPen(getColorGridLine(), fastFromDIP(1)));
-                            dc.DrawLine(rectGroupItems.GetTopLeft(), rectGroupItems.GetBottomLeft() + wxPoint(0, 1)); //DrawLine() doesn't draw last pixel!
+                            wxRect rectLine = rectGroupItems;
+                            rectLine.width = dipToWxsize(1);
+                            clearArea(dc, rectLine, getColorGridLine());
 
-                            rectGroupItems.x     += fastFromDIP(1);
-                            rectGroupItems.width -= fastFromDIP(1);
+                            rectGroupItems.x     += dipToWxsize(1);
+                            rectGroupItems.width -= dipToWxsize(1);
                         }
                         //-------------------------------------------------------------------------
 
                         wxRect rectItemsBack = rectGroupItems;
-                        rectItemsBack.height -= fastFromDIP(1); //preserve item separation lines!
+                        rectItemsBack.height -= dipToWxsize(1); //preserve item separation lines!
 
                         drawCudHighlight(rectItemsBack, pdi.fsObj->getSyncOperation());
                         tryDrawNavMarker(rectGroupItems);
@@ -1047,8 +1048,8 @@ private:
                                     break;
                             }
                             drawFileIcon(fileIcon, ii.drawAsLink, rectGroupItems, *pdi.fsObj);
-                            rectGroupItems.x     += gapSize_ + getIconManager().getIconSize();
-                            rectGroupItems.width -= gapSize_ + getIconManager().getIconSize();
+                            rectGroupItems.x     += gapSize_ + getIconManager().getIconWxsize();
+                            rectGroupItems.width -= gapSize_ + getIconManager().getIconWxsize();
                         }
 
                         rectGroupItems.x     += gapSize_;
@@ -1056,7 +1057,7 @@ private:
 
                         //mouse highlight: item name
                         if (static_cast<HoverAreaGroup>(rowHover) == HoverAreaGroup::item)
-                            drawRectangleBorder(dc, rectItemsBack, *wxBLUE, fastFromDIP(1));
+                            drawRectangleBorder(dc, rectItemsBack, *wxBLUE, dipToWxsize(1));
 
                         if (!pdi.fsObj->isEmpty<side>())
                             drawCellText(dc, rectGroupItems, itemName, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, &getTextExtentBuffered(dc, itemName));
@@ -1141,8 +1142,8 @@ private:
                              groupNameWidth] = getGroupRenderLayout(dc, row, pdi, insanelyHugeWidth);
                 assert(!stackedGroupRender);
 
-                const int groupSepWidth = (groupParentFolder.empty() && groupName.empty()) ? 0 : (2 * gapSize_ + fastFromDIP(1));
-                const int fileIconWidth = getIconManager().getIconBuffer() ? gapSize_ + getIconManager().getIconSize() : 0;
+                const int groupSepWidth = (groupParentFolder.empty() && groupName.empty()) ? 0 : (2 * gapSize_ + dipToWxsize(1));
+                const int fileIconWidth = getIconManager().getIconBuffer() ? gapSize_ + getIconManager().getIconWxsize() : 0;
                 const int ellipsisWidth = getTextExtentBuffered(dc, ELLIPSIS).x;
                 const int itemWidth = itemName.empty() ? 0 :
                                       (groupSepWidth + fileIconWidth + gapSize_ +
@@ -1284,8 +1285,8 @@ private:
         return out;
     }
 
-    const int gapSize_     = fastFromDIP(FILE_GRID_GAP_SIZE_DIP);
-    const int gapSizeWide_ = fastFromDIP(FILE_GRID_GAP_SIZE_WIDE_DIP);
+    const int gapSize_     = dipToWxsize(FILE_GRID_GAP_SIZE_DIP);
+    const int gapSizeWide_ = dipToWxsize(FILE_GRID_GAP_SIZE_WIDE_DIP);
 
     ItemPathFormat itemPathFormat_ = ItemPathFormat::full;
 
@@ -1430,7 +1431,7 @@ private:
             GridData::renderRowBackgound(dc, rect, row, true /*enabled*/, true /*selected*/, rowHover);
 
         //----------------------------------------------------------------------------------
-        const wxRect rectLine(rect.x, rect.y + rect.height - fastFromDIP(1), rect.width, fastFromDIP(1));
+        const wxRect rectLine(rect.x, rect.y + rect.height - dipToWxsize(1), rect.width, dipToWxsize(1));
         clearArea(dc, rectLine, row == pdi.groupLastRow - 1 /*last group item*/ ?
                   getColorGridLine() : getDefaultBackgroundColorAlternating(pdi.groupIdx % 2 != 0));
     }
@@ -1454,7 +1455,7 @@ private:
                 {
                     wxRect rectBack = rect;
                     if (row == pdi.groupLastRow - 1 /*last group item*/) //preserve the group separation line!
-                        rectBack.height -= fastFromDIP(1);
+                        rectBack.height -= dipToWxsize(1);
 
                     clearArea(dc, rectBack, col);
                 }
@@ -1484,13 +1485,14 @@ private:
                     wxRect rectTmp = rect;
                     {
                         //draw notch on left side
-                        if (notch_.GetHeight() != rectTmp.height)
-                            notch_ = notch_.Scale(notch_.GetWidth(), rectTmp.height);
+                        if (notch_.GetHeight() != wxsizeToScreen(rectTmp.height))
+                            notch_ = notch_.Scale(notch_.GetWidth(), wxsizeToScreen(rectTmp.height));
 
                         //wxWidgets screws up again and has wxALIGN_RIGHT off by one pixel! -> use wxALIGN_LEFT instead
-                        const wxRect rectNotch(rectTmp.x + rectTmp.width - notch_.GetWidth(), rectTmp.y, notch_.GetWidth(), rectTmp.height);
+                        const wxRect rectNotch(rectTmp.x + rectTmp.width - screenToWxsize(notch_.GetWidth()), rectTmp.y,
+                                               screenToWxsize(notch_.GetWidth()), rectTmp.height);
                         drawBitmapRtlNoMirror(dc, notch_, rectNotch, wxALIGN_LEFT);
-                        rectTmp.width -= notch_.GetWidth();
+                        rectTmp.width -= screenToWxsize(notch_.GetWidth());
                     }
 
                     auto drawIcon = [&](wxImage icon, int alignment)
@@ -1605,11 +1607,11 @@ private:
                 break;
 
             case ColumnTypeCenter::difference:
-                colIcon = greyScaleIfDisabled(loadImage("compare", getDefaultMenuIconSize()), getViewType() == GridViewType::difference);
+                colIcon = greyScaleIfDisabled(loadImage("compare", dipToScreen(getMenuIconDipSize())), getViewType() == GridViewType::difference);
                 break;
 
             case ColumnTypeCenter::action:
-                colIcon = greyScaleIfDisabled(loadImage("start_sync", getDefaultMenuIconSize()), getViewType() == GridViewType::action);
+                colIcon = greyScaleIfDisabled(loadImage("start_sync", dipToScreen(getMenuIconDipSize())), getViewType() == GridViewType::action);
                 break;
         }
 
@@ -1621,7 +1623,7 @@ private:
             if (const ColumnTypeCenter* sortType = std::get_if<ColumnTypeCenter>(&sortInfo->sortCol))
                 if (*sortType == colTypeCenter)
                 {
-                    const int gapLeft = (rectInner.width + colIcon.GetWidth()) / 2;
+                    const int gapLeft = (rectInner.width + screenToWxsize(colIcon.GetWidth())) / 2;
                     wxRect rectRemain = rectInner;
                     rectRemain.x     += gapLeft;
                     rectRemain.width -= gapLeft;
@@ -2041,9 +2043,9 @@ void filegrid::init(Grid& gridLeft, Grid& gridCenter, Grid& gridRight)
     //gridLeft  .showScrollBars(Grid::SB_SHOW_AUTOMATIC, Grid::SB_SHOW_NEVER); -> redundant: configuration happens in GridEventManager::onAlignScrollBars()
     //gridCenter.showScrollBars(Grid::SB_SHOW_NEVER,     Grid::SB_SHOW_NEVER);
 
-    const int widthCheckbox =       loadImage("checkbox_true").GetWidth() + fastFromDIP(3);
-    const int widthDifference = 2 * loadImage("sort_ascending").GetWidth() + loadImage("cat_left_only_sicon").GetWidth() + loadImage("notch").GetWidth();
-    const int widthAction     = 3 * loadImage("so_create_left_sicon").GetWidth();
+    const int widthCheckbox   = screenToWxsize(    loadImage("checkbox_true").GetWidth() + dipToScreen(3));
+    const int widthDifference = screenToWxsize(2 * loadImage("sort_ascending").GetWidth() + loadImage("cat_left_only_sicon").GetWidth() + loadImage("notch").GetWidth());
+    const int widthAction     = screenToWxsize(3 * loadImage("so_create_left_sicon").GetWidth());
     gridCenter.SetSize(widthDifference + widthCheckbox + widthAction, -1);
 
     gridCenter.setColumnConfig(
@@ -2112,7 +2114,7 @@ void filegrid::setupIcons(Grid& gridLeft, Grid& gridCenter, Grid& gridRight, boo
         auto iconMgr = makeSharedRef<IconManager>(*provLeft, *provRight, sz, showFileIcons);
         provLeft ->setIconManager(iconMgr);
 
-        const int newRowHeight = std::max(iconMgr.ref().getIconSize(), gridLeft.getMainWin().GetCharHeight()) + fastFromDIP(1); //add some space
+        const int newRowHeight = std::max(iconMgr.ref().getIconWxsize(), gridLeft.getMainWin().GetCharHeight()) + dipToWxsize(1); //add some space
 
         gridLeft  .setRowHeight(newRowHeight);
         gridCenter.setRowHeight(newRowHeight);
diff --git a/FreeFileSync/Source/ui/file_grid_attr.h b/FreeFileSync/Source/ui/file_grid_attr.h
index 012724ad..4f5f6386 100644
--- a/FreeFileSync/Source/ui/file_grid_attr.h
+++ b/FreeFileSync/Source/ui/file_grid_attr.h
@@ -42,10 +42,10 @@ std::vector<ColAttributesRim> getFileGridDefaultColAttribsLeft()
     using namespace zen;
     return //harmonize with main_dlg.cpp::onGridLabelContextRim() => expects stretched path and non-stretched other columns!
     {
-        {ColumnTypeRim::path,      -fastFromDIP(100), 1, true },
-        {ColumnTypeRim::extension, fastFromDIP(  60), 0, false},
-        {ColumnTypeRim::date,      fastFromDIP( 140), 0, false},
-        {ColumnTypeRim::size,      fastFromDIP( 100), 0, true },
+        {ColumnTypeRim::path,     -dipToWxsize(100), 1, true },
+        {ColumnTypeRim::extension, dipToWxsize( 60), 0, false},
+        {ColumnTypeRim::date,      dipToWxsize(140), 0, false},
+        {ColumnTypeRim::size,      dipToWxsize(100), 0, true },
     };
 }
 
diff --git a/FreeFileSync/Source/ui/folder_history_box.cpp b/FreeFileSync/Source/ui/folder_history_box.cpp
index cd028c4a..2508f45a 100644
--- a/FreeFileSync/Source/ui/folder_history_box.cpp
+++ b/FreeFileSync/Source/ui/folder_history_box.cpp
@@ -27,7 +27,7 @@ FolderHistoryBox::FolderHistoryBox(wxWindow* parent,
     wxComboBox(parent, id, value, pos, size, n, choices, style, validator, name)
 {
     //#####################################
-    /*##*/ SetMinSize({fastFromDIP(150), -1}); //## workaround yet another wxWidgets bug: default minimum size is much too large for a wxComboBox
+    /*##*/ SetMinSize({dipToWxsize(150), -1}); //## workaround yet another wxWidgets bug: default minimum size is much too large for a wxComboBox
     //#####################################
 
     Bind(wxEVT_KEY_DOWN, [this](wxKeyEvent& event) { onKeyEvent(event); });
diff --git a/FreeFileSync/Source/ui/folder_pair.h b/FreeFileSync/Source/ui/folder_pair.h
index c7e26164..4fbb3f64 100644
--- a/FreeFileSync/Source/ui/folder_pair.h
+++ b/FreeFileSync/Source/ui/folder_pair.h
@@ -152,9 +152,9 @@ private:
     std::optional<SyncConfig> localSyncCfg_;
     FilterConfig              localFilter_;
 
-    const wxImage imgCmp_    = zen::loadImage("options_compare", zen::fastFromDIP(20));
-    const wxImage imgSync_   = zen::loadImage("options_sync",    zen::fastFromDIP(20));
-    const wxImage imgFilter_ = zen::loadImage("options_filter",  zen::fastFromDIP(20));
+    const wxImage imgCmp_    = zen::loadImage("options_compare", zen::dipToScreen(20));
+    const wxImage imgSync_   = zen::loadImage("options_sync",    zen::dipToScreen(20));
+    const wxImage imgFilter_ = zen::loadImage("options_filter",  zen::dipToScreen(20));
 };
 }
 
diff --git a/FreeFileSync/Source/ui/gui_generated.cpp b/FreeFileSync/Source/ui/gui_generated.cpp
index b4a75b9d..53620a64 100644
--- a/FreeFileSync/Source/ui/gui_generated.cpp
+++ b/FreeFileSync/Source/ui/gui_generated.cpp
@@ -11,1184 +11,1178 @@
 
 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_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_RIGHT|wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticTextProcessed = new wxStaticText( m_panelLog, wxID_ANY, _("Processed:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextProcessed->Wrap( -1 );
+	ffgSizer11->Add( m_staticTextProcessed, 0, wxALIGN_RIGHT|wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticTextRemaining = new wxStaticText( m_panelLog, wxID_ANY, _("Remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextRemaining->Wrap( -1 );
-    ffgSizer11->Add( m_staticTextRemaining, 0, wxALIGN_RIGHT|wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticTextRemaining = new wxStaticText( m_panelLog, wxID_ANY, _("Remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextRemaining->Wrap( -1 );
+	ffgSizer11->Add( m_staticTextRemaining, 0, wxALIGN_RIGHT|wxRIGHT|wxALIGN_CENTER_VERTICAL, 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, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	m_bitmapItemStat = new wxStaticBitmap( m_panelItemStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer293->Add( m_bitmapItemStat, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 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 ) );
 
-    bSizer293->Add( 0, 0, 1, 0, 5 );
+	bSizer293->Add( m_staticTextItemsProcessed, 0, wxALIGN_BOTTOM, 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 ) );
 
-    bSizer293->Add( m_staticTextItemsProcessed, 0, wxALIGN_BOTTOM, 5 );
+	ffgSizer111->Add( bSizer293, 0, wxEXPAND|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_RIGHT|wxALIGN_BOTTOM, 5 );
 
-    ffgSizer111->Add( bSizer293, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 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_staticTextBytesProcessed = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextBytesProcessed->Wrap( -1 );
-    ffgSizer111->Add( m_staticTextBytesProcessed, 0, wxALIGN_RIGHT|wxALIGN_BOTTOM, 5 );
+	ffgSizer111->Add( m_staticTextItemsRemaining, 0, wxALIGN_RIGHT|wxALIGN_BOTTOM, 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_staticTextBytesRemaining = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextBytesRemaining->Wrap( -1 );
+	ffgSizer111->Add( m_staticTextBytesRemaining, 0, wxALIGN_RIGHT|wxALIGN_BOTTOM, 5 );
 
-    ffgSizer111->Add( m_staticTextItemsRemaining, 0, wxALIGN_RIGHT|wxALIGN_BOTTOM, 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_BOTTOM, 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_panelTimeStats = new wxPanel( m_panelLog, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_panelTimeStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    m_panelItemStats->SetSizer( bSizer291 );
-    m_panelItemStats->Layout();
-    bSizer291->Fit( m_panelItemStats );
-    bSizer42->Add( m_panelItemStats, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
+	wxBoxSizer* bSizer292;
+	bSizer292 = new wxBoxSizer( wxVERTICAL );
 
-    m_panelTimeStats = new wxPanel( m_panelLog, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelTimeStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	ffgSizer112 = new wxFlexGridSizer( 0, 1, 5, 5 );
+	ffgSizer112->SetFlexibleDirection( wxBOTH );
+	ffgSizer112->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    wxBoxSizer* bSizer292;
-    bSizer292 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer294;
+	bSizer294 = new wxBoxSizer( wxHORIZONTAL );
 
-    ffgSizer112 = new wxFlexGridSizer( 0, 1, 5, 5 );
-    ffgSizer112->SetFlexibleDirection( wxBOTH );
-    ffgSizer112->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	m_bitmapTimeStat = new wxStaticBitmap( m_panelTimeStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer294->Add( m_bitmapTimeStat, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
-    wxBoxSizer* bSizer294;
-    bSizer294 = new wxBoxSizer( wxHORIZONTAL );
+	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_bitmapTimeStat = new wxStaticBitmap( m_panelTimeStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer294->Add( m_bitmapTimeStat, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	bSizer294->Add( m_staticTextTimeElapsed, 0, wxALIGN_BOTTOM, 5 );
 
 
-    bSizer294->Add( 0, 0, 1, 0, 5 );
+	ffgSizer112->Add( bSizer294, 0, wxEXPAND|wxALIGN_RIGHT, 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 ) );
 
-    bSizer294->Add( m_staticTextTimeElapsed, 0, wxALIGN_BOTTOM, 5 );
+	bSizer292->Add( ffgSizer112, 0, wxALL, 5 );
 
 
-    ffgSizer112->Add( bSizer294, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	m_panelTimeStats->SetSizer( bSizer292 );
+	m_panelTimeStats->Layout();
+	bSizer292->Fit( m_panelTimeStats );
+	bSizer42->Add( m_panelTimeStats, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
 
 
-    bSizer292->Add( ffgSizer112, 0, wxALL, 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_panelTimeStats->SetSizer( bSizer292 );
-    m_panelTimeStats->Layout();
-    bSizer292->Fit( m_panelTimeStats );
-    bSizer42->Add( m_panelTimeStats, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
 
+	m_panelLog->SetSizer( bSizerLog );
+	m_panelLog->Layout();
+	bSizerLog->Fit( m_panelLog );
+	bSizerPanelHolder->Add( m_panelLog, 0, 0, 5 );
 
-    bSizerLog->Add( bSizer42, 0, wxLEFT, 5 );
+	m_panelConfig = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelConfig->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    m_staticline70 = new wxStaticLine( m_panelLog, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerLog->Add( m_staticline70, 0, wxEXPAND, 5 );
+	bSizerConfig = new wxBoxSizer( wxVERTICAL );
 
+	bSizerCfgHistoryButtons = new wxBoxSizer( wxHORIZONTAL );
 
-    m_panelLog->SetSizer( bSizerLog );
-    m_panelLog->Layout();
-    bSizerLog->Fit( m_panelLog );
-    bSizerPanelHolder->Add( m_panelLog, 0, 0, 5 );
+	wxBoxSizer* bSizer17611;
+	bSizer17611 = new wxBoxSizer( wxVERTICAL );
 
-    m_panelConfig = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelConfig->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_bpButtonNew = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonNew->SetToolTip( _("dummy") );
 
-    bSizerConfig = new wxBoxSizer( wxVERTICAL );
+	bSizer17611->Add( m_bpButtonNew, 0, wxEXPAND, 5 );
 
-    bSizerCfgHistoryButtons = new wxBoxSizer( wxHORIZONTAL );
+	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 );
 
-    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") );
+	bSizerCfgHistoryButtons->Add( bSizer17611, 0, 0, 5 );
 
-    bSizer17611->Add( m_bpButtonNew, 0, wxEXPAND, 5 );
+	wxBoxSizer* bSizer1761;
+	bSizer1761 = new wxBoxSizer( wxVERTICAL );
 
-    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_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 );
 
-    bSizerCfgHistoryButtons->Add( bSizer17611, 0, 0, 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 );
 
-    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") );
+	bSizerCfgHistoryButtons->Add( bSizer1761, 0, 0, 5 );
 
-    bSizer1761->Add( m_bpButtonOpen, 0, wxEXPAND, 5 );
+	wxBoxSizer* bSizer175;
+	bSizer175 = new wxBoxSizer( wxVERTICAL );
 
-    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_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 );
 
-    bSizerCfgHistoryButtons->Add( bSizer1761, 0, 0, 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 );
 
-    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") );
+	bSizerCfgHistoryButtons->Add( bSizer175, 0, 0, 5 );
 
-    bSizer175->Add( m_bpButtonSave, 0, wxEXPAND, 5 );
+	wxBoxSizer* bSizer174;
+	bSizer174 = new wxBoxSizer( wxVERTICAL );
 
-    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 );
+	bSizerSaveAs = new wxBoxSizer( wxHORIZONTAL );
 
+	m_bpButtonSaveAs = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonSaveAs->SetToolTip( _("dummy") );
 
-    bSizerCfgHistoryButtons->Add( bSizer175, 0, 0, 5 );
+	bSizerSaveAs->Add( m_bpButtonSaveAs, 1, 0, 5 );
 
-    wxBoxSizer* bSizer174;
-    bSizer174 = new wxBoxSizer( wxVERTICAL );
+	m_bpButtonSaveAsBatch = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	m_bpButtonSaveAsBatch->SetToolTip( _("dummy") );
 
-    bSizerSaveAs = new wxBoxSizer( wxHORIZONTAL );
+	bSizerSaveAs->Add( m_bpButtonSaveAsBatch, 1, 0, 5 );
 
-    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 );
+	bSizer174->Add( bSizerSaveAs, 0, wxEXPAND, 5 );
 
-    m_bpButtonSaveAsBatch = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    m_bpButtonSaveAsBatch->SetToolTip( _("dummy") );
+	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 );
 
-    bSizerSaveAs->Add( m_bpButtonSaveAsBatch, 1, 0, 5 );
 
+	bSizerCfgHistoryButtons->Add( bSizer174, 0, 0, 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 );
+	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 );
 
-    bSizerCfgHistoryButtons->Add( bSizer174, 0, 0, 5 );
 
+	bSizerConfig->Add( 10, 0, 0, 0, 5 );
 
-    bSizerConfig->Add( bSizerCfgHistoryButtons, 0, wxALIGN_CENTER_HORIZONTAL, 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_staticline81 = new wxStaticLine( m_panelConfig, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerConfig->Add( m_staticline81, 0, wxEXPAND|wxTOP, 5 );
 
+	m_panelConfig->SetSizer( bSizerConfig );
+	m_panelConfig->Layout();
+	bSizerConfig->Fit( m_panelConfig );
+	bSizerPanelHolder->Add( m_panelConfig, 0, 0, 5 );
 
-    bSizerConfig->Add( 10, 0, 0, 0, 5 );
+	m_panelViewFilter = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelViewFilter->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    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 );
+	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_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 ) );
+	bSizerViewFilter->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    bSizerViewFilter = new wxBoxSizer( wxHORIZONTAL );
+	bSizerViewButtons = 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_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 );
 
 
-    bSizerViewFilter->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizerViewButtons->Add( 10, 10, 0, 0, 5 );
 
-    bSizerViewButtons = new wxBoxSizer( wxHORIZONTAL );
+	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_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_bpButtonShowDeleteLeft = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizerViewButtons->Add( m_bpButtonShowDeleteLeft, 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 );
+	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 );
 
-    bSizerViewButtons->Add( 10, 10, 0, 0, 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_bpButtonShowDeleteLeft = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizerViewButtons->Add( m_bpButtonShowDeleteLeft, 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_bpButtonShowUpdateLeft = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizerViewButtons->Add( m_bpButtonShowUpdateLeft, 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_bpButtonShowCreateLeft = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizerViewButtons->Add( m_bpButtonShowCreateLeft, 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_bpButtonShowLeftOnly = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizerViewButtons->Add( m_bpButtonShowLeftOnly, 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_bpButtonShowLeftNewer = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizerViewButtons->Add( m_bpButtonShowLeftNewer, 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_bpButtonShowEqual = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizerViewButtons->Add( m_bpButtonShowEqual, 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_bpButtonShowDoNothing = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizerViewButtons->Add( m_bpButtonShowDoNothing, 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_bpButtonShowDifferent = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizerViewButtons->Add( m_bpButtonShowDifferent, 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_bpButtonShowRightNewer = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizerViewButtons->Add( m_bpButtonShowRightNewer, 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_bpButtonShowRightOnly = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizerViewButtons->Add( m_bpButtonShowRightOnly, 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_bpButtonShowCreateRight = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizerViewButtons->Add( m_bpButtonShowCreateRight, 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_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 );
+	bSizerViewFilter->Add( bSizerViewButtons, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_bpButtonShowConflict = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    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 );
+	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 );
 
-    bSizerViewFilter->Add( bSizerViewButtons, 0, 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 ) );
 
+	bSizer1801 = new wxBoxSizer( wxVERTICAL );
 
-    bSizerViewFilter->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizerStatistics = new wxBoxSizer( wxHORIZONTAL );
 
-    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 );
+	wxBoxSizer* bSizer173;
+	bSizer173 = new wxBoxSizer( wxVERTICAL );
 
-    m_panelStatistics = new wxPanel( m_panelViewFilter, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL|wxBORDER_SUNKEN );
-    m_panelStatistics->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_bitmapDeleteLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapDeleteLeft->SetToolTip( _("Number of files and folders that will be deleted") );
 
-    bSizer1801 = new wxBoxSizer( wxVERTICAL );
+	bSizer173->Add( m_bitmapDeleteLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    bSizerStatistics = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer173;
-    bSizer173 = new wxBoxSizer( wxVERTICAL );
+	bSizer173->Add( 5, 2, 0, 0, 5 );
 
-    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( 0, 0, 1, wxEXPAND, 5 );
 
+	m_staticTextDeleteLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextDeleteLeft->Wrap( -1 );
+	m_staticTextDeleteLeft->SetToolTip( _("Number of files and folders that will be deleted") );
 
-    bSizer173->Add( 5, 2, 0, 0, 5 );
+	bSizer173->Add( m_staticTextDeleteLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer173->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizerStatistics->Add( bSizer173, 0, wxEXPAND, 5 );
 
-    m_staticTextDeleteLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextDeleteLeft->Wrap( -1 );
-    m_staticTextDeleteLeft->SetToolTip( _("Number of files and folders that will be deleted") );
 
-    bSizer173->Add( m_staticTextDeleteLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizerStatistics->Add( 5, 5, 0, 0, 5 );
 
+	wxBoxSizer* bSizer172;
+	bSizer172 = new wxBoxSizer( wxVERTICAL );
 
-    bSizerStatistics->Add( bSizer173, 0, wxEXPAND, 5 );
+	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 );
 
-    bSizerStatistics->Add( 5, 5, 0, 0, 5 );
 
-    wxBoxSizer* bSizer172;
-    bSizer172 = new wxBoxSizer( wxVERTICAL );
+	bSizer172->Add( 5, 2, 0, 0, 5 );
 
-    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( 0, 0, 1, wxEXPAND, 5 );
 
+	m_staticTextUpdateLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextUpdateLeft->Wrap( -1 );
+	m_staticTextUpdateLeft->SetToolTip( _("Number of files that will be updated") );
 
-    bSizer172->Add( 5, 2, 0, 0, 5 );
+	bSizer172->Add( m_staticTextUpdateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-    bSizer172->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizerStatistics->Add( bSizer172, 0, wxEXPAND, 5 );
 
-    m_staticTextUpdateLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextUpdateLeft->Wrap( -1 );
-    m_staticTextUpdateLeft->SetToolTip( _("Number of files that will be updated") );
 
-    bSizer172->Add( m_staticTextUpdateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	bSizerStatistics->Add( 5, 5, 0, 0, 5 );
 
+	wxBoxSizer* bSizer1712;
+	bSizer1712 = new wxBoxSizer( wxVERTICAL );
 
-    bSizerStatistics->Add( bSizer172, 0, wxEXPAND, 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") );
 
+	bSizer1712->Add( m_bitmapCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    bSizerStatistics->Add( 5, 5, 0, 0, 5 );
 
-    wxBoxSizer* bSizer1712;
-    bSizer1712 = new wxBoxSizer( wxVERTICAL );
+	bSizer1712->Add( 5, 2, 0, 0, 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") );
 
-    bSizer1712->Add( m_bitmapCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	bSizer1712->Add( 0, 0, 1, wxEXPAND, 5 );
 
+	m_staticTextCreateLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextCreateLeft->Wrap( -1 );
+	m_staticTextCreateLeft->SetToolTip( _("Number of files and folders that will be created") );
 
-    bSizer1712->Add( 5, 2, 0, 0, 5 );
+	bSizer1712->Add( m_staticTextCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-    bSizer1712->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizerStatistics->Add( bSizer1712, 0, wxEXPAND, 5 );
 
-    m_staticTextCreateLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextCreateLeft->Wrap( -1 );
-    m_staticTextCreateLeft->SetToolTip( _("Number of files and folders that will be created") );
 
-    bSizer1712->Add( m_staticTextCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	bSizerStatistics->Add( 5, 5, 0, 0, 5 );
 
+	bSizerData = new wxBoxSizer( wxVERTICAL );
 
-    bSizerStatistics->Add( bSizer1712, 0, wxEXPAND, 5 );
+	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 );
 
-    bSizerStatistics->Add( 5, 5, 0, 0, 5 );
 
-    bSizerData = new wxBoxSizer( wxVERTICAL );
+	bSizerData->Add( 5, 2, 0, 0, 5 );
 
-    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( 0, 0, 1, wxEXPAND, 5 );
 
+	m_staticTextData = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextData->Wrap( -1 );
+	m_staticTextData->SetToolTip( _("Total bytes to copy") );
 
-    bSizerData->Add( 5, 2, 0, 0, 5 );
+	bSizerData->Add( m_staticTextData, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizerData->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizerStatistics->Add( bSizerData, 0, wxEXPAND, 5 );
 
-    m_staticTextData = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextData->Wrap( -1 );
-    m_staticTextData->SetToolTip( _("Total bytes to copy") );
 
-    bSizerData->Add( m_staticTextData, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizerStatistics->Add( 5, 5, 0, 0, 5 );
 
+	wxBoxSizer* bSizer178;
+	bSizer178 = new wxBoxSizer( wxVERTICAL );
 
-    bSizerStatistics->Add( bSizerData, 0, wxEXPAND, 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") );
 
+	bSizer178->Add( m_bitmapCreateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    bSizerStatistics->Add( 5, 5, 0, 0, 5 );
 
-    wxBoxSizer* bSizer178;
-    bSizer178 = new wxBoxSizer( wxVERTICAL );
+	bSizer178->Add( 5, 2, 0, 0, 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") );
 
-    bSizer178->Add( m_bitmapCreateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	bSizer178->Add( 0, 0, 1, wxEXPAND, 5 );
 
+	m_staticTextCreateRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextCreateRight->Wrap( -1 );
+	m_staticTextCreateRight->SetToolTip( _("Number of files and folders that will be created") );
 
-    bSizer178->Add( 5, 2, 0, 0, 5 );
+	bSizer178->Add( m_staticTextCreateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer178->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizerStatistics->Add( bSizer178, 0, wxEXPAND, 5 );
 
-    m_staticTextCreateRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextCreateRight->Wrap( -1 );
-    m_staticTextCreateRight->SetToolTip( _("Number of files and folders that will be created") );
 
-    bSizer178->Add( m_staticTextCreateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizerStatistics->Add( 5, 5, 0, 0, 5 );
 
+	wxBoxSizer* bSizer177;
+	bSizer177 = new wxBoxSizer( wxVERTICAL );
 
-    bSizerStatistics->Add( bSizer178, 0, wxEXPAND, 5 );
+	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 );
 
-    bSizerStatistics->Add( 5, 5, 0, 0, 5 );
 
-    wxBoxSizer* bSizer177;
-    bSizer177 = new wxBoxSizer( wxVERTICAL );
+	bSizer177->Add( 5, 2, 0, 0, 5 );
 
-    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( 0, 0, 1, wxEXPAND, 5 );
 
+	m_staticTextUpdateRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextUpdateRight->Wrap( -1 );
+	m_staticTextUpdateRight->SetToolTip( _("Number of files that will be updated") );
 
-    bSizer177->Add( 5, 2, 0, 0, 5 );
+	bSizer177->Add( m_staticTextUpdateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer177->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizerStatistics->Add( bSizer177, 0, wxEXPAND, 5 );
 
-    m_staticTextUpdateRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextUpdateRight->Wrap( -1 );
-    m_staticTextUpdateRight->SetToolTip( _("Number of files that will be updated") );
 
-    bSizer177->Add( m_staticTextUpdateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizerStatistics->Add( 5, 5, 0, 0, 5 );
 
+	wxBoxSizer* bSizer176;
+	bSizer176 = new wxBoxSizer( wxVERTICAL );
 
-    bSizerStatistics->Add( bSizer177, 0, wxEXPAND, 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") );
 
+	bSizer176->Add( m_bitmapDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    bSizerStatistics->Add( 5, 5, 0, 0, 5 );
 
-    wxBoxSizer* bSizer176;
-    bSizer176 = new wxBoxSizer( wxVERTICAL );
+	bSizer176->Add( 5, 2, 0, 0, 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") );
 
-    bSizer176->Add( m_bitmapDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer176->Add( 0, 0, 1, wxEXPAND, 5 );
 
+	m_staticTextDeleteRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextDeleteRight->Wrap( -1 );
+	m_staticTextDeleteRight->SetToolTip( _("Number of files and folders that will be deleted") );
 
-    bSizer176->Add( 5, 2, 0, 0, 5 );
+	bSizer176->Add( m_staticTextDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer176->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizerStatistics->Add( bSizer176, 0, wxEXPAND, 5 );
 
-    m_staticTextDeleteRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextDeleteRight->Wrap( -1 );
-    m_staticTextDeleteRight->SetToolTip( _("Number of files and folders that will be deleted") );
 
-    bSizer176->Add( m_staticTextDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer1801->Add( bSizerStatistics, 0, wxALL, 4 );
 
 
-    bSizerStatistics->Add( bSizer176, 0, wxEXPAND, 5 );
+	m_panelStatistics->SetSizer( bSizer1801 );
+	m_panelStatistics->Layout();
+	bSizer1801->Fit( m_panelStatistics );
+	bSizerViewFilter->Add( m_panelStatistics, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
 
-    bSizer1801->Add( bSizerStatistics, 0, wxALL, 4 );
+	m_panelViewFilter->SetSizer( bSizerViewFilter );
+	m_panelViewFilter->Layout();
+	bSizerViewFilter->Fit( m_panelViewFilter );
+	bSizerPanelHolder->Add( m_panelViewFilter, 0, 0, 5 );
 
 
-    m_panelStatistics->SetSizer( bSizer1801 );
-    m_panelStatistics->Layout();
-    bSizer1801->Fit( m_panelStatistics );
-    bSizerViewFilter->Add( m_panelStatistics, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	this->SetSizer( bSizerPanelHolder );
+	this->Layout();
+	bSizerPanelHolder->Fit( this );
 
-
-    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 );
-
-    // 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::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::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()
@@ -1197,97 +1191,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()
@@ -1296,1399 +1290,1399 @@ 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, 5 );
+	bSizer190->Add( bSizer1911, 0, wxEXPAND, 5 );
 
-    m_notebook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_NOPAGETHEME );
-    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, wxNB_NOPAGETHEME );
+	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, _("Common settings:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextMainCompSettings->Wrap( -1 );
-    bSizerHeaderCompSettings->Add( m_staticTextMainCompSettings, 0, wxALL, 10 );
+	m_staticTextMainCompSettings = new wxStaticText( m_panelCompSettingsTab, wxID_ANY, _("Common 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, _("As &link"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer176->Add( m_radioBtnSymlinksDirect, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	m_radioBtnSymlinksDirect = new wxRadioButton( m_panelComparisonSettings, wxID_ANY, _("As &link"), 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 exact 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 exact 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 the 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 the best performance?"), wxT("https://freefilesync.org/manual.php?topic=performance"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink1711->SetToolTip( _("https://freefilesync.org/manual.php?topic=performance") );
 
-    bSizerPerformance->Add( m_hyperlink1711, 0, wxBOTTOM|wxRIGHT|wxLEFT, 10 );
+	bSizerPerformance->Add( m_hyperlink1711, 0, wxBOTTOM|wxRIGHT|wxLEFT, 10 );
 
 
-    bSizer2561->Add( bSizerPerformance, 1, wxEXPAND, 5 );
+	bSizer2561->Add( bSizerPerformance, 1, wxEXPAND, 5 );
 
 
-    m_panelComparisonSettings->SetSizer( bSizer2561 );
-    m_panelComparisonSettings->Layout();
-    bSizer2561->Fit( m_panelComparisonSettings );
-    bSizer275->Add( m_panelComparisonSettings, 1, wxEXPAND, 5 );
+	m_panelComparisonSettings->SetSizer( bSizer2561 );
+	m_panelComparisonSettings->Layout();
+	bSizer2561->Fit( m_panelComparisonSettings );
+	bSizer275->Add( m_panelComparisonSettings, 1, wxEXPAND, 5 );
 
 
-    m_panelCompSettingsTab->SetSizer( bSizer275 );
-    m_panelCompSettingsTab->Layout();
-    bSizer275->Fit( m_panelCompSettingsTab );
-    m_notebook->AddPage( m_panelCompSettingsTab, _("dummy"), false );
-    m_panelFilterSettingsTab = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelFilterSettingsTab->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panelCompSettingsTab->SetSizer( bSizer275 );
+	m_panelCompSettingsTab->Layout();
+	bSizer275->Fit( m_panelCompSettingsTab );
+	m_notebook->AddPage( m_panelCompSettingsTab, _("dummy"), false );
+	m_panelFilterSettingsTab = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelFilterSettingsTab->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer278;
-    bSizer278 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer278;
+	bSizer278 = new wxBoxSizer( wxVERTICAL );
 
-    bSizerHeaderFilterSettings = new wxBoxSizer( wxVERTICAL );
+	bSizerHeaderFilterSettings = new wxBoxSizer( wxVERTICAL );
 
-    m_staticTextMainFilterSettings = new wxStaticText( m_panelFilterSettingsTab, wxID_ANY, _("Common settings:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextMainFilterSettings->Wrap( -1 );
-    bSizerHeaderFilterSettings->Add( m_staticTextMainFilterSettings, 0, wxALL, 10 );
+	m_staticTextMainFilterSettings = new wxStaticText( m_panelFilterSettingsTab, wxID_ANY, _("Common settings:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextMainFilterSettings->Wrap( -1 );
+	bSizerHeaderFilterSettings->Add( m_staticTextMainFilterSettings, 0, wxALL, 10 );
 
-    m_staticTextLocalFilterSettings = new wxStaticText( m_panelFilterSettingsTab, wxID_ANY, _("Local settings:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextLocalFilterSettings->Wrap( -1 );
-    bSizerHeaderFilterSettings->Add( m_staticTextLocalFilterSettings, 0, wxALL, 10 );
+	m_staticTextLocalFilterSettings = new wxStaticText( m_panelFilterSettingsTab, wxID_ANY, _("Local settings:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextLocalFilterSettings->Wrap( -1 );
+	bSizerHeaderFilterSettings->Add( m_staticTextLocalFilterSettings, 0, wxALL, 10 );
 
-    m_staticlineFilterHeader = new wxStaticLine( m_panelFilterSettingsTab, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerHeaderFilterSettings->Add( m_staticlineFilterHeader, 0, wxEXPAND, 5 );
+	m_staticlineFilterHeader = new wxStaticLine( m_panelFilterSettingsTab, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerHeaderFilterSettings->Add( m_staticlineFilterHeader, 0, wxEXPAND, 5 );
 
 
-    bSizer278->Add( bSizerHeaderFilterSettings, 0, wxEXPAND, 5 );
+	bSizer278->Add( bSizerHeaderFilterSettings, 0, wxEXPAND, 5 );
 
-    m_panel571 = new wxPanel( m_panelFilterSettingsTab, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel571->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panel571 = new wxPanel( m_panelFilterSettingsTab, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel571->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer307;
-    bSizer307 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer307;
+	bSizer307 = new wxBoxSizer( wxVERTICAL );
 
-    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_panel571, 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_panel571, 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_panel571, wxID_ANY, _("Include:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText78->Wrap( -1 );
-    bSizer1731->Add( m_staticText78, 0, 0, 5 );
+	m_staticText78 = new wxStaticText( m_panel571, wxID_ANY, _("Include:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText78->Wrap( -1 );
+	bSizer1731->Add( m_staticText78, 0, 0, 5 );
 
-    m_textCtrlInclude = new wxTextCtrl( m_panel571, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), wxTE_MULTILINE );
-    bSizer1731->Add( m_textCtrlInclude, 1, wxEXPAND|wxTOP, 5 );
+	m_textCtrlInclude = new wxTextCtrl( m_panel571, 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_panel571, 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_panel571, 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_panel571, wxID_ANY, _("Exclude:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText77->Wrap( -1 );
-    bSizer189->Add( m_staticText77, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticText77 = new wxStaticText( m_panel571, 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_panel571, 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_panel571, 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_panel571, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), wxTE_MULTILINE );
-    bSizer1742->Add( m_textCtrlExclude, 1, wxEXPAND|wxTOP, 5 );
+	m_textCtrlExclude = new wxTextCtrl( m_panel571, 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_panel571, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer301->Add( m_staticline24, 0, wxEXPAND, 5 );
+	m_staticline24 = new wxStaticLine( m_panel571, 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_panel571, 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_panel571, 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_panel571, wxID_ANY, _("File size:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText80->Wrap( -1 );
-    bSizer158->Add( m_staticText80, 0, wxBOTTOM, 5 );
+	m_staticText80 = new wxStaticText( m_panel571, 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_panel571, wxID_ANY, _("Minimum:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText101->Wrap( -1 );
-    bSizer162->Add( m_staticText101, 0, wxBOTTOM, 2 );
+	m_staticText101 = new wxStaticText( m_panel571, wxID_ANY, _("Minimum:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText101->Wrap( -1 );
+	bSizer162->Add( m_staticText101, 0, wxBOTTOM, 2 );
 
-    m_spinCtrlMinSize = new wxSpinCtrl( m_panel571, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
-    bSizer162->Add( m_spinCtrlMinSize, 0, wxEXPAND, 5 );
+	m_spinCtrlMinSize = new wxSpinCtrl( m_panel571, 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_panel571, 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_panel571, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitMinSizeChoices, 0 );
+	m_choiceUnitMinSize->SetSelection( 0 );
+	bSizer162->Add( m_choiceUnitMinSize, 0, wxEXPAND, 5 );
 
 
-    bSizer158->Add( bSizer162, 0, wxEXPAND, 5 );
+	bSizer158->Add( bSizer162, 0, wxEXPAND, 5 );
 
 
-    bSizer158->Add( 0, 10, 0, 0, 5 );
+	bSizer158->Add( 0, 10, 0, 0, 5 );
 
-    wxBoxSizer* bSizer163;
-    bSizer163 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer163;
+	bSizer163 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticText102 = new wxStaticText( m_panel571, wxID_ANY, _("Maximum:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText102->Wrap( -1 );
-    bSizer163->Add( m_staticText102, 0, wxBOTTOM, 2 );
+	m_staticText102 = new wxStaticText( m_panel571, wxID_ANY, _("Maximum:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText102->Wrap( -1 );
+	bSizer163->Add( m_staticText102, 0, wxBOTTOM, 2 );
 
-    m_spinCtrlMaxSize = new wxSpinCtrl( m_panel571, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
-    bSizer163->Add( m_spinCtrlMaxSize, 0, wxEXPAND, 5 );
+	m_spinCtrlMaxSize = new wxSpinCtrl( m_panel571, 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_panel571, 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_panel571, 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_panel571, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer160->Add( m_staticline23, 0, wxEXPAND, 5 );
+	m_staticline23 = new wxStaticLine( m_panel571, 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_panel571, 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_panel571, 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_panel571, wxID_ANY, _("Time span:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText79->Wrap( -1 );
-    bSizer165->Add( m_staticText79, 0, wxBOTTOM, 5 );
+	m_staticText79 = new wxStaticText( m_panel571, 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_panel571, 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_panel571, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitTimespanChoices, 0 );
+	m_choiceUnitTimespan->SetSelection( 0 );
+	bSizer165->Add( m_choiceUnitTimespan, 0, wxEXPAND, 5 );
 
-    m_spinCtrlTimespan = new wxSpinCtrl( m_panel571, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
-    bSizer165->Add( m_spinCtrlTimespan, 0, wxEXPAND, 5 );
+	m_spinCtrlTimespan = new wxSpinCtrl( m_panel571, 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_panel571, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer160->Add( m_staticline231, 0, wxEXPAND, 5 );
+	m_staticline231 = new wxStaticLine( m_panel571, 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 );
 
 
-    bSizer307->Add( bSizer301, 1, wxEXPAND, 5 );
+	bSizer307->Add( bSizer301, 1, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer302;
-    bSizer302 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer302;
+	bSizer302 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_staticTextFilterDescr = new wxStaticText( m_panel571, 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_panel571, 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_panel571, wxID_ANY, _("&Default"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer303->Add( m_buttonDefault, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_buttonDefault = new wxButton( m_panel571, wxID_ANY, _("&Default"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer303->Add( m_buttonDefault, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_bpButtonDefaultContext = new wxBitmapButton( m_panel571, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    bSizer303->Add( m_bpButtonDefaultContext, 0, wxEXPAND, 5 );
+	m_bpButtonDefaultContext = new wxBitmapButton( m_panel571, 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_panel571, wxID_ANY, _("C&lear"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer302->Add( m_buttonClear, 0, wxALL|wxALIGN_CENTER_VERTICAL, 10 );
+	m_buttonClear = new wxButton( m_panel571, wxID_ANY, _("C&lear"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer302->Add( m_buttonClear, 0, wxALL|wxALIGN_CENTER_VERTICAL, 10 );
 
 
-    bSizer307->Add( bSizer302, 0, wxEXPAND, 5 );
+	bSizer307->Add( bSizer302, 0, wxEXPAND, 5 );
 
 
-    m_panel571->SetSizer( bSizer307 );
-    m_panel571->Layout();
-    bSizer307->Fit( m_panel571 );
-    bSizer278->Add( m_panel571, 1, wxEXPAND, 5 );
+	m_panel571->SetSizer( bSizer307 );
+	m_panel571->Layout();
+	bSizer307->Fit( m_panel571 );
+	bSizer278->Add( m_panel571, 1, 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, _("Common settings:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextMainSyncSettings->Wrap( -1 );
-    bSizerHeaderSyncSettings->Add( m_staticTextMainSyncSettings, 0, wxALL, 10 );
+	m_staticTextMainSyncSettings = new wxStaticText( m_panelSyncSettingsTab, wxID_ANY, _("Common 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* bSizer312;
-    bSizer312 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer312;
+	bSizer312 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer311;
-    bSizer311 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer311;
+	bSizer311 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapDatabase = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_bitmapDatabase->SetToolTip( _("sync.ffs_db") );
+	m_bitmapDatabase = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_bitmapDatabase->SetToolTip( _("sync.ffs_db") );
 
-    bSizer311->Add( m_bitmapDatabase, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer311->Add( m_bitmapDatabase, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_checkBoxUseDatabase = new wxCheckBox( m_panelSyncSettings, wxID_ANY, _("Use database file to detect changes"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer311->Add( m_checkBoxUseDatabase, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_checkBoxUseDatabase = new wxCheckBox( m_panelSyncSettings, wxID_ANY, _("Use database file to detect changes"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer311->Add( m_checkBoxUseDatabase, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer312->Add( bSizer311, 0, wxTOP|wxRIGHT|wxLEFT, 10 );
+	bSizer312->Add( bSizer311, 0, wxTOP|wxRIGHT|wxLEFT, 10 );
 
 
-    bSizer312->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizer312->Add( 0, 0, 1, wxEXPAND, 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 ) );
 
-    bSizer312->Add( m_staticTextSyncVarDescription, 0, wxALL, 10 );
+	bSizer312->Add( m_staticTextSyncVarDescription, 0, wxALL, 10 );
 
 
-    bSizer312->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizer312->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    wxBoxSizer* bSizer310;
-    bSizer310 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer310;
+	bSizer310 = new wxBoxSizer( wxVERTICAL );
 
-    m_staticline431 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer310->Add( m_staticline431, 0, wxEXPAND, 5 );
+	m_staticline431 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer310->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* bSizer3121;
-    bSizer3121 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer3121;
+	bSizer3121 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapMoveLeft = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_bitmapMoveLeft->SetToolTip( _("- Not supported by all file systems\n- Requires and creates database files\n- Detection not available for first sync") );
+	m_bitmapMoveLeft = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_bitmapMoveLeft->SetToolTip( _("- Not supported by all file systems\n- Requires and creates database files\n- Detection not available for first sync") );
 
-    bSizer3121->Add( m_bitmapMoveLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer3121->Add( m_bitmapMoveLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_bitmapMoveRight = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_bitmapMoveRight->SetToolTip( _("- Not supported by all file systems\n- Requires and creates database files\n- Detection not available for first sync") );
+	m_bitmapMoveRight = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_bitmapMoveRight->SetToolTip( _("- Not supported by all file systems\n- Requires and creates database files\n- Detection not available for first sync") );
 
-    bSizer3121->Add( m_bitmapMoveRight, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	bSizer3121->Add( m_bitmapMoveRight, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
-    m_staticTextDetectMove = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Detect moved files"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextDetectMove->Wrap( -1 );
-    m_staticTextDetectMove->SetToolTip( _("- Not supported by all file systems\n- Requires and creates database files\n- Detection not available for first sync") );
+	m_staticTextDetectMove = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Detect moved files"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextDetectMove->Wrap( -1 );
+	m_staticTextDetectMove->SetToolTip( _("- Not supported by all file systems\n- Requires and creates database files\n- Detection not available for first sync") );
 
-    bSizer3121->Add( m_staticTextDetectMove, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer3121->Add( m_staticTextDetectMove, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer201->Add( bSizer3121, 0, wxALL, 10 );
+	bSizer201->Add( bSizer3121, 0, wxALL, 10 );
 
-    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") );
 
-    bSizer201->Add( m_hyperlink242, 0, wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL, 10 );
+	bSizer201->Add( m_hyperlink242, 0, wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL, 10 );
 
-    m_staticline721 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer201->Add( m_staticline721, 0, wxEXPAND, 5 );
+	m_staticline721 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer201->Add( m_staticline721, 0, wxEXPAND, 5 );
 
 
-    bSizer310->Add( bSizer201, 0, 0, 5 );
+	bSizer310->Add( bSizer201, 0, 0, 5 );
 
 
-    bSizer312->Add( bSizer310, 0, 0, 5 );
+	bSizer312->Add( bSizer310, 0, 0, 5 );
 
 
-    bSizer237->Add( bSizer312, 0, wxEXPAND, 5 );
+	bSizer237->Add( bSizer312, 0, wxEXPAND, 5 );
 
-    bSizerSyncDirHolder = new wxBoxSizer( wxHORIZONTAL );
+	bSizerSyncDirHolder = new wxBoxSizer( wxHORIZONTAL );
 
-    bSizerSyncDirsDiff = new wxBoxSizer( wxVERTICAL );
+	bSizerSyncDirsDiff = new wxBoxSizer( wxVERTICAL );
 
-    m_staticText184 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Difference"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText184->Wrap( -1 );
-    bSizerSyncDirsDiff->Add( m_staticText184, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_staticText184 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Difference"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText184->Wrap( -1 );
+	bSizerSyncDirsDiff->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_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_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 );
 
 
-    bSizerSyncDirsDiff->Add( ffgSizer11, 0, 0, 5 );
+	bSizerSyncDirsDiff->Add( ffgSizer11, 0, 0, 5 );
 
-    m_staticText120 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Action"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText120->Wrap( -1 );
-    bSizerSyncDirsDiff->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 );
+	bSizerSyncDirsDiff->Add( m_staticText120, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP, 5 );
 
 
-    bSizerSyncDirHolder->Add( bSizerSyncDirsDiff, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizerSyncDirHolder->Add( bSizerSyncDirsDiff, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    bSizerSyncDirsChanges = new wxBoxSizer( wxVERTICAL );
+	bSizerSyncDirsChanges = new wxBoxSizer( wxVERTICAL );
 
-    ffgSizer111 = new wxFlexGridSizer( 0, 3, 5, 5 );
-    ffgSizer111->SetFlexibleDirection( wxBOTH );
-    ffgSizer111->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	ffgSizer111 = new wxFlexGridSizer( 0, 3, 5, 5 );
+	ffgSizer111->SetFlexibleDirection( wxBOTH );
+	ffgSizer111->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    m_staticText12011 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Create:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText12011->Wrap( -1 );
-    ffgSizer111->Add( m_staticText12011, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
+	m_staticText12011 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Create:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText12011->Wrap( -1 );
+	ffgSizer111->Add( m_staticText12011, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
 
-    m_bpButtonLeftCreate = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    ffgSizer111->Add( m_bpButtonLeftCreate, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_bpButtonLeftCreate = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	ffgSizer111->Add( m_bpButtonLeftCreate, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_bpButtonRightCreate = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    ffgSizer111->Add( m_bpButtonRightCreate, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_bpButtonRightCreate = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	ffgSizer111->Add( m_bpButtonRightCreate, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText12012 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Update:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText12012->Wrap( -1 );
-    ffgSizer111->Add( m_staticText12012, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticText12012 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Update:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText12012->Wrap( -1 );
+	ffgSizer111->Add( m_staticText12012, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_bpButtonLeftUpdate = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    ffgSizer111->Add( m_bpButtonLeftUpdate, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_bpButtonLeftUpdate = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	ffgSizer111->Add( m_bpButtonLeftUpdate, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_bpButtonRightUpdate = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    ffgSizer111->Add( m_bpButtonRightUpdate, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_bpButtonRightUpdate = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	ffgSizer111->Add( m_bpButtonRightUpdate, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticText12013 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Delete:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText12013->Wrap( -1 );
-    ffgSizer111->Add( m_staticText12013, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
+	m_staticText12013 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Delete:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText12013->Wrap( -1 );
+	ffgSizer111->Add( m_staticText12013, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
 
-    m_bpButtonLeftDelete = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    ffgSizer111->Add( m_bpButtonLeftDelete, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_bpButtonLeftDelete = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	ffgSizer111->Add( m_bpButtonLeftDelete, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_bpButtonRightDelete = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|0 );
-    ffgSizer111->Add( m_bpButtonRightDelete, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_bpButtonRightDelete = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	ffgSizer111->Add( m_bpButtonRightDelete, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    ffgSizer111->Add( 0, 0, 0, 0, 5 );
+	ffgSizer111->Add( 0, 0, 0, 0, 5 );
 
-    m_staticText1201 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Left"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText1201->Wrap( -1 );
-    ffgSizer111->Add( m_staticText1201, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	m_staticText1201 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Left"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText1201->Wrap( -1 );
+	ffgSizer111->Add( m_staticText1201, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_staticText1202 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Right"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText1202->Wrap( -1 );
-    ffgSizer111->Add( m_staticText1202, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticText1202 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Right"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText1202->Wrap( -1 );
+	ffgSizer111->Add( m_staticText1202, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizerSyncDirsChanges->Add( ffgSizer111, 0, 0, 5 );
+	bSizerSyncDirsChanges->Add( ffgSizer111, 0, 0, 5 );
 
 
-    bSizerSyncDirHolder->Add( bSizerSyncDirsChanges, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizerSyncDirHolder->Add( bSizerSyncDirsChanges, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer237->Add( bSizerSyncDirHolder, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
+	bSizer237->Add( bSizerSyncDirHolder, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
 
 
-    bSizer237->Add( 0, 0, 1, 0, 5 );
+	bSizer237->Add( 0, 0, 1, 0, 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 and overwrite:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText87->Wrap( -1 );
-    bSizer202->Add( m_staticText87, 0, wxALL, 5 );
+	m_staticText87 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Delete and overwrite:"), 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"), true );
+	m_panelSyncSettingsTab->SetSizer( bSizer276 );
+	m_panelSyncSettingsTab->Layout();
+	bSizer276->Fit( m_panelSyncSettingsTab );
+	m_notebook->AddPage( m_panelSyncSettingsTab, _("dummy"), true );
 
-    bSizer190->Add( m_notebook, 1, wxEXPAND, 5 );
+	bSizer190->Add( m_notebook, 1, wxEXPAND, 5 );
 
 
-    bSizer7->Add( bSizer190, 1, wxEXPAND, 5 );
+	bSizer7->Add( bSizer190, 1, wxEXPAND, 5 );
 
-    m_panelNotes = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelNotes->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_panelNotes = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelNotes->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer3021;
-    bSizer3021 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer3021;
+	bSizer3021 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer17311;
-    bSizer17311 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer17311;
+	bSizer17311 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapNotes = new wxStaticBitmap( m_panelNotes, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer17311->Add( m_bitmapNotes, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
+	m_bitmapNotes = new wxStaticBitmap( m_panelNotes, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer17311->Add( m_bitmapNotes, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
 
-    m_staticText781 = new wxStaticText( m_panelNotes, wxID_ANY, _("Notes:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText781->Wrap( -1 );
-    bSizer17311->Add( m_staticText781, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	m_staticText781 = new wxStaticText( m_panelNotes, wxID_ANY, _("Notes:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText781->Wrap( -1 );
+	bSizer17311->Add( m_staticText781, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    m_textCtrNotes = new wxTextCtrl( m_panelNotes, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), wxTE_MULTILINE );
-    bSizer17311->Add( m_textCtrNotes, 1, wxEXPAND, 5 );
+	m_textCtrNotes = new wxTextCtrl( m_panelNotes, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE );
+	bSizer17311->Add( m_textCtrNotes, 1, wxEXPAND, 5 );
 
 
-    bSizer3021->Add( bSizer17311, 1, wxEXPAND, 5 );
+	bSizer3021->Add( bSizer17311, 1, wxEXPAND, 5 );
 
-    m_staticline83 = new wxStaticLine( m_panelNotes, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer3021->Add( m_staticline83, 0, wxEXPAND, 5 );
+	m_staticline83 = new wxStaticLine( m_panelNotes, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer3021->Add( m_staticline83, 0, wxEXPAND, 5 );
 
 
-    m_panelNotes->SetSizer( bSizer3021 );
-    m_panelNotes->Layout();
-    bSizer3021->Fit( m_panelNotes );
-    bSizer7->Add( m_panelNotes, 0, wxEXPAND, 5 );
+	m_panelNotes->SetSizer( bSizer3021 );
+	m_panelNotes->Layout();
+	bSizer3021->Fit( m_panelNotes );
+	bSizer7->Add( m_panelNotes, 0, wxEXPAND, 5 );
 
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
 
-    m_buttonAddNotes = new zen::BitmapTextButton( this, wxID_ANY, _("Add &notes"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizerStdButtons->Add( m_buttonAddNotes, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_buttonAddNotes = new zen::BitmapTextButton( this, wxID_ANY, _("Add &notes"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizerStdButtons->Add( m_buttonAddNotes, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizerStdButtons->Add( 0, 0, 1, wxEXPAND, 5 );
+	bSizerStdButtons->Add( 0, 0, 1, wxEXPAND, 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 );
 
 
-    bSizer7->Add( bSizerStdButtons, 0, wxEXPAND, 5 );
+	bSizer7->Add( bSizerStdButtons, 0, wxEXPAND, 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_checkBoxUseDatabase->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onToggleUseDatabase ), NULL, this );
-    m_bpButtonLeftOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onLeftOnly ), 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_bpButtonRightNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onRightNewer ), NULL, this );
-    m_bpButtonRightOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onRightOnly ), NULL, this );
-    m_bpButtonLeftCreate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onLeftCreate ), NULL, this );
-    m_bpButtonRightCreate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onRightCreate ), NULL, this );
-    m_bpButtonLeftUpdate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onLeftUpdate ), NULL, this );
-    m_bpButtonRightUpdate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onRightUpdate ), NULL, this );
-    m_bpButtonLeftDelete->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onLeftDelete ), NULL, this );
-    m_bpButtonRightDelete->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onRightDelete ), 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_buttonAddNotes->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onAddNotes ), 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_checkBoxUseDatabase->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onToggleUseDatabase ), NULL, this );
+	m_bpButtonLeftOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onLeftOnly ), 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_bpButtonRightNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onRightNewer ), NULL, this );
+	m_bpButtonRightOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onRightOnly ), NULL, this );
+	m_bpButtonLeftCreate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onLeftCreate ), NULL, this );
+	m_bpButtonRightCreate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onRightCreate ), NULL, this );
+	m_bpButtonLeftUpdate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onLeftUpdate ), NULL, this );
+	m_bpButtonRightUpdate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onRightUpdate ), NULL, this );
+	m_bpButtonLeftDelete->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onLeftDelete ), NULL, this );
+	m_bpButtonRightDelete->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onRightDelete ), 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_buttonAddNotes->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::onAddNotes ), 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()
@@ -2697,543 +2691,543 @@ 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, _("Username:"), 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, _("Username:"), 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 );
 
-    m_checkBoxPasswordPrompt = new wxCheckBox( m_panelAuth, wxID_ANY, _("Prompt during login"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizerPassword->Add( m_checkBoxPasswordPrompt, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_checkBoxPasswordPrompt = new wxCheckBox( m_panelAuth, wxID_ANY, _("Prompt during login"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerPassword->Add( m_checkBoxPasswordPrompt, 0, wxALL|wxALIGN_CENTER_VERTICAL, 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 the 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 the 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_textCtrlPasswordVisible->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( CloudSetupDlgGenerated::onTypingPassword ), NULL, this );
-    m_textCtrlPasswordHidden->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( CloudSetupDlgGenerated::onTypingPassword ), NULL, this );
-    m_checkBoxShowPassword->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::onToggleShowPassword ), NULL, this );
-    m_checkBoxPasswordPrompt->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::onTogglePasswordPrompt ), 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_textCtrlPasswordVisible->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( CloudSetupDlgGenerated::onTypingPassword ), NULL, this );
+	m_textCtrlPasswordHidden->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( CloudSetupDlgGenerated::onTypingPassword ), NULL, this );
+	m_checkBoxShowPassword->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::onToggleShowPassword ), NULL, this );
+	m_checkBoxPasswordPrompt->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::onTogglePasswordPrompt ), 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()
@@ -3242,61 +3236,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()
@@ -3305,225 +3299,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()
@@ -3532,257 +3526,251 @@ 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 ) );
-
-    wxBoxSizer* bSizer1811;
-    bSizer1811 = new wxBoxSizer( wxVERTICAL );
-
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    bSizer1811->Add( 0, 0, 1, 0, 5 );
+	wxBoxSizer* bSizer1811;
+	bSizer1811 = new wxBoxSizer( wxVERTICAL );
 
-    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 );
+	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 );
 
-    bSizer199->Add( 10, 0, 0, 0, 5 );
+	wxBoxSizer* bSizer199;
+	bSizer199 = new wxBoxSizer( wxHORIZONTAL );
 
-    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 );
+	bSizer199->Add( 10, 0, 0, 0, 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 );
+	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 );
 
-    bSizer199->Add( ffgSizer11, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 10 );
+	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_panelItemStats = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelItemStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer291;
-    bSizer291 = new wxBoxSizer( wxHORIZONTAL );
+	bSizer199->Add( ffgSizer11, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 10 );
 
-    ffgSizer111 = new wxFlexGridSizer( 0, 2, 5, 5 );
-    ffgSizer111->SetFlexibleDirection( wxBOTH );
-    ffgSizer111->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	m_panelItemStats = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_panelItemStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer293;
-    bSizer293 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer291;
+	bSizer291 = 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 );
+	ffgSizer111 = new wxFlexGridSizer( 0, 2, 5, 5 );
+	ffgSizer111->SetFlexibleDirection( wxBOTH );
+	ffgSizer111->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
+	wxBoxSizer* bSizer293;
+	bSizer293 = new wxBoxSizer( wxHORIZONTAL );
 
-    bSizer293->Add( 0, 0, 1, 0, 5 );
+	m_bitmapItemStat = new wxStaticBitmap( m_panelItemStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer293->Add( m_bitmapItemStat, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 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_BOTTOM, 5 );
+	bSizer293->Add( m_staticTextItemsProcessed, 0, wxALIGN_BOTTOM, 5 );
 
 
-    ffgSizer111->Add( bSizer293, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	ffgSizer111->Add( bSizer293, 0, wxEXPAND|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_RIGHT|wxALIGN_BOTTOM, 5 );
+	m_staticTextBytesProcessed = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextBytesProcessed->Wrap( -1 );
+	ffgSizer111->Add( m_staticTextBytesProcessed, 0, wxALIGN_RIGHT|wxALIGN_BOTTOM, 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_BOTTOM, 5 );
+	ffgSizer111->Add( m_staticTextItemsRemaining, 0, wxALIGN_RIGHT|wxALIGN_BOTTOM, 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_BOTTOM, 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_BOTTOM, 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 );
 
+	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( 0, 0, 1, 0, 5 );
+	bSizer294->Add( m_staticTextTimeElapsed, 0, wxALIGN_BOTTOM, 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 ) );
 
-    bSizer294->Add( m_staticTextTimeElapsed, 0, wxALIGN_BOTTOM, 5 );
+	ffgSizer112->Add( bSizer294, 0, wxEXPAND|wxALIGN_RIGHT, 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 ) );
 
-    ffgSizer112->Add( bSizer294, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	ffgSizer112->Add( m_staticTextTimeRemaining, 0, wxALIGN_RIGHT|wxALIGN_BOTTOM, 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 ) );
 
-    ffgSizer112->Add( m_staticTextTimeRemaining, 0, wxALIGN_RIGHT|wxALIGN_BOTTOM, 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 );
 
+	ffgSizer114 = new wxFlexGridSizer( 2, 0, 5, 5 );
+	ffgSizer114->SetFlexibleDirection( wxBOTH );
+	ffgSizer114->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    m_panelTimeStats->SetSizer( bSizer292 );
-    m_panelTimeStats->Layout();
-    bSizer292->Fit( m_panelTimeStats );
-    bSizer199->Add( m_panelTimeStats, 0, wxTOP|wxBOTTOM|wxRIGHT|wxEXPAND, 10 );
+	m_staticTextErrors = new wxStaticText( this, wxID_ANY, _("Errors:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextErrors->Wrap( -1 );
+	ffgSizer114->Add( m_staticTextErrors, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT, 5 );
 
-    ffgSizer114 = new wxFlexGridSizer( 2, 0, 5, 5 );
-    ffgSizer114->SetFlexibleDirection( wxBOTH );
-    ffgSizer114->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	m_staticTextWarnings = new wxStaticText( this, wxID_ANY, _("Warnings:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextWarnings->Wrap( -1 );
+	ffgSizer114->Add( m_staticTextWarnings, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
-    m_staticTextErrors = new wxStaticText( this, wxID_ANY, _("Errors:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextErrors->Wrap( -1 );
-    ffgSizer114->Add( m_staticTextErrors, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT, 5 );
 
-    m_staticTextWarnings = new wxStaticText( this, wxID_ANY, _("Warnings:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextWarnings->Wrap( -1 );
-    ffgSizer114->Add( m_staticTextWarnings, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	bSizer199->Add( ffgSizer114, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 10 );
 
+	m_panelErrorStats = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_panelErrorStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    bSizer199->Add( ffgSizer114, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 10 );
+	wxBoxSizer* bSizer2921;
+	bSizer2921 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_panelErrorStats = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelErrorStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	ffgSizer1121 = new wxFlexGridSizer( 0, 2, 5, 5 );
+	ffgSizer1121->SetFlexibleDirection( wxBOTH );
+	ffgSizer1121->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    wxBoxSizer* bSizer2921;
-    bSizer2921 = new wxBoxSizer( wxHORIZONTAL );
+	m_bitmapErrors = new wxStaticBitmap( m_panelErrorStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	ffgSizer1121->Add( m_bitmapErrors, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    ffgSizer1121 = new wxFlexGridSizer( 0, 2, 5, 5 );
-    ffgSizer1121->SetFlexibleDirection( wxBOTH );
-    ffgSizer1121->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	m_staticTextErrorCount = new wxStaticText( m_panelErrorStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextErrorCount->Wrap( -1 );
+	m_staticTextErrorCount->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    m_bitmapErrors = new wxStaticBitmap( m_panelErrorStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    ffgSizer1121->Add( m_bitmapErrors, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	ffgSizer1121->Add( m_staticTextErrorCount, 0, wxALIGN_RIGHT|wxALIGN_BOTTOM, 5 );
 
-    m_staticTextErrorCount = new wxStaticText( m_panelErrorStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextErrorCount->Wrap( -1 );
-    m_staticTextErrorCount->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_bitmapWarnings = new wxStaticBitmap( m_panelErrorStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	ffgSizer1121->Add( m_bitmapWarnings, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    ffgSizer1121->Add( m_staticTextErrorCount, 0, wxALIGN_RIGHT|wxALIGN_BOTTOM, 5 );
+	m_staticTextWarningCount = new wxStaticText( m_panelErrorStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextWarningCount->Wrap( -1 );
+	m_staticTextWarningCount->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    m_bitmapWarnings = new wxStaticBitmap( m_panelErrorStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    ffgSizer1121->Add( m_bitmapWarnings, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	ffgSizer1121->Add( m_staticTextWarningCount, 0, wxALIGN_BOTTOM|wxALIGN_RIGHT, 5 );
 
-    m_staticTextWarningCount = new wxStaticText( m_panelErrorStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextWarningCount->Wrap( -1 );
-    m_staticTextWarningCount->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    ffgSizer1121->Add( m_staticTextWarningCount, 0, wxALIGN_BOTTOM|wxALIGN_RIGHT, 5 );
+	bSizer2921->Add( ffgSizer1121, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizer2921->Add( ffgSizer1121, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_panelErrorStats->SetSizer( bSizer2921 );
+	m_panelErrorStats->Layout();
+	bSizer2921->Fit( m_panelErrorStats );
+	bSizer199->Add( m_panelErrorStats, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 10 );
 
+	ffgSizer1141 = new wxFlexGridSizer( 2, 0, 5, 5 );
+	ffgSizer1141->SetFlexibleDirection( wxBOTH );
+	ffgSizer1141->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    m_panelErrorStats->SetSizer( bSizer2921 );
-    m_panelErrorStats->Layout();
-    bSizer2921->Fit( m_panelErrorStats );
-    bSizer199->Add( m_panelErrorStats, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 10 );
+	bSizerErrorsRetry = new wxBoxSizer( wxHORIZONTAL );
 
-    ffgSizer1141 = new wxFlexGridSizer( 2, 0, 5, 5 );
-    ffgSizer1141->SetFlexibleDirection( wxBOTH );
-    ffgSizer1141->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	m_bitmapRetryErrors = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerErrorsRetry->Add( m_bitmapRetryErrors, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    bSizerErrorsRetry = new wxBoxSizer( wxHORIZONTAL );
+	m_staticText1461 = new wxStaticText( this, wxID_ANY, _("Automatic retry"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText1461->Wrap( -1 );
+	bSizerErrorsRetry->Add( m_staticText1461, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
-    m_bitmapRetryErrors = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizerErrorsRetry->Add( m_bitmapRetryErrors, 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|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|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|wxLEFT, 5 );
+	ffgSizer1141->Add( bSizerErrorsRetry, 0, wxALIGN_CENTER_VERTICAL, 10 );
 
+	bSizerErrorsIgnore = new wxBoxSizer( wxHORIZONTAL );
 
-    ffgSizer1141->Add( bSizerErrorsRetry, 0, wxALIGN_CENTER_VERTICAL, 10 );
+	m_bitmapIgnoreErrors = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerErrorsIgnore->Add( m_bitmapIgnoreErrors, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    bSizerErrorsIgnore = new wxBoxSizer( wxHORIZONTAL );
+	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_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 );
+	ffgSizer1141->Add( bSizerErrorsIgnore, 0, wxALIGN_CENTER_VERTICAL, 10 );
 
 
-    ffgSizer1141->Add( bSizerErrorsIgnore, 0, wxALIGN_CENTER_VERTICAL, 10 );
+	bSizer199->Add( ffgSizer1141, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
 
+	bSizerProgressGraph = new wxBoxSizer( wxHORIZONTAL );
 
-    bSizer199->Add( ffgSizer1141, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
+	ffgSizer113 = new wxFlexGridSizer( 2, 0, 5, 5 );
+	ffgSizer113->SetFlexibleDirection( wxBOTH );
+	ffgSizer113->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    bSizerProgressGraph = new wxBoxSizer( wxHORIZONTAL );
+	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|wxRIGHT, 5 );
 
-    ffgSizer113 = new wxFlexGridSizer( 2, 0, 5, 5 );
-    ffgSizer113->SetFlexibleDirection( wxBOTH );
-    ffgSizer113->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	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|wxRIGHT, 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|wxRIGHT, 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|wxRIGHT, 5 );
+	bSizerProgressGraph->Add( ffgSizer113, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
 
+	m_panelProgressGraph = new zen::Graph2D( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_panelProgressGraph->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    bSizerProgressGraph->Add( ffgSizer113, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
+	bSizerProgressGraph->Add( m_panelProgressGraph, 1, wxEXPAND, 5 );
 
-    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 );
+	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()
@@ -3791,404 +3779,398 @@ 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 );
-
-    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 );
-
-    bSizer42 = new wxBoxSizer( wxHORIZONTAL );
-
+	bSizerRoot = new wxBoxSizer( wxVERTICAL );
 
-    bSizer42->Add( 0, 0, 1, 0, 5 );
+	m_panel53 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel53->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    m_bitmapStatus = new wxStaticBitmap( m_panel53, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer42->Add( m_bitmapStatus, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	wxBoxSizer* bSizer301;
+	bSizer301 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer305;
-    bSizer305 = new wxBoxSizer( wxHORIZONTAL );
+	bSizer42 = new wxBoxSizer( wxHORIZONTAL );
 
-    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 ) );
 
-    bSizer305->Add( m_staticTextPhase, 0, wxALIGN_BOTTOM, 5 );
+	bSizer42->Add( 0, 0, 1, 0, 5 );
 
-    m_staticTextPercentTotal = new wxStaticText( m_panel53, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextPercentTotal->Wrap( -1 );
-    bSizer305->Add( m_staticTextPercentTotal, 0, wxALIGN_BOTTOM, 5 );
+	m_bitmapStatus = new wxStaticBitmap( m_panel53, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer42->Add( m_bitmapStatus, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
+	wxBoxSizer* bSizer305;
+	bSizer305 = new wxBoxSizer( wxHORIZONTAL );
 
-    bSizer42->Add( bSizer305, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+	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 ) );
 
-    wxBoxSizer* bSizer247;
-    bSizer247 = new wxBoxSizer( wxHORIZONTAL );
+	bSizer305->Add( m_staticTextPhase, 0, wxALIGN_BOTTOM, 5 );
 
+	m_staticTextPercentTotal = new wxStaticText( m_panel53, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextPercentTotal->Wrap( -1 );
+	bSizer305->Add( m_staticTextPercentTotal, 0, wxALIGN_BOTTOM, 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") );
+	bSizer42->Add( bSizer305, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
-    bSizer247->Add( m_bpButtonMinimizeToTray, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	wxBoxSizer* bSizer247;
+	bSizer247 = new wxBoxSizer( wxHORIZONTAL );
 
 
-    bSizer42->Add( bSizer247, 1, wxALIGN_CENTER_VERTICAL, 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") );
 
-    bSizer301->Add( bSizer42, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
+	bSizer247->Add( m_bpButtonMinimizeToTray, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    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 );
+	bSizer42->Add( bSizer247, 1, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    bSizerStatusText->Add( 0, 10, 0, 0, 5 );
+	bSizer301->Add( bSizer42, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
 
+	bSizerStatusText = new wxBoxSizer( wxVERTICAL );
 
-    bSizer301->Add( bSizerStatusText, 0, wxEXPAND, 5 );
+	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_panel53->SetSizer( bSizer301 );
-    m_panel53->Layout();
-    bSizer301->Fit( m_panel53 );
-    bSizerRoot->Add( m_panel53, 0, wxEXPAND, 5 );
+	bSizerStatusText->Add( 0, 10, 0, 0, 5 );
 
-    m_panelProgress = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelProgress->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer173;
-    bSizer173 = new wxBoxSizer( wxHORIZONTAL );
+	bSizer301->Add( bSizerStatusText, 0, wxEXPAND, 5 );
 
-    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_panel53->SetSizer( bSizer301 );
+	m_panel53->Layout();
+	bSizer301->Fit( m_panel53 );
+	bSizerRoot->Add( m_panel53, 0, wxEXPAND, 5 );
 
-    bSizer161->Add( m_panelGraphBytes, 1, wxEXPAND|wxLEFT, 10 );
+	m_panelProgress = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelProgress->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    wxBoxSizer* bSizer232;
-    bSizer232 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer173;
+	bSizer173 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer* bSizer233;
-    bSizer233 = new wxBoxSizer( wxVERTICAL );
+	wxBoxSizer* bSizer161;
+	bSizer161 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer* bSizer175;
-    bSizer175 = new wxBoxSizer( wxHORIZONTAL );
+	m_panelGraphBytes = new zen::Graph2D( m_panelProgress, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_panelGraphBytes->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
-    m_bitmapGraphKeyBytes = new wxStaticBitmap( m_panelProgress, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer175->Add( m_bitmapGraphKeyBytes, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	bSizer161->Add( m_panelGraphBytes, 1, wxEXPAND|wxLEFT, 10 );
 
-    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 );
+	wxBoxSizer* bSizer232;
+	bSizer232 = new wxBoxSizer( wxHORIZONTAL );
 
+	wxBoxSizer* bSizer233;
+	bSizer233 = new wxBoxSizer( wxVERTICAL );
 
-    bSizer233->Add( bSizer175, 0, wxALL, 5 );
+	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 );
 
-    bSizer233->Add( 0, 0, 1, 0, 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 );
 
-    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 );
+	bSizer233->Add( bSizer175, 0, wxALL, 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( 0, 0, 1, 0, 5 );
 
-    bSizer233->Add( bSizer174, 0, wxALL, 5 );
+	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 );
 
-    bSizer232->Add( bSizer233, 1, wxEXPAND|wxRIGHT|wxLEFT, 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 );
 
-    wxBoxSizer* bSizer304;
-    bSizer304 = new wxBoxSizer( wxHORIZONTAL );
 
-    ffgSizer11 = new wxFlexGridSizer( 2, 0, 5, 5 );
-    ffgSizer11->SetFlexibleDirection( wxBOTH );
-    ffgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	bSizer233->Add( bSizer174, 0, wxALL, 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 );
+	bSizer232->Add( bSizer233, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );
 
+	wxBoxSizer* bSizer304;
+	bSizer304 = new wxBoxSizer( wxHORIZONTAL );
 
-    bSizer304->Add( ffgSizer11, 0, wxTOP|wxBOTTOM|wxALIGN_CENTER_VERTICAL, 10 );
+	ffgSizer11 = new wxFlexGridSizer( 2, 0, 5, 5 );
+	ffgSizer11->SetFlexibleDirection( wxBOTH );
+	ffgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    m_panelItemStats = new wxPanel( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelItemStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	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 );
 
-    wxBoxSizer* bSizer291;
-    bSizer291 = new wxBoxSizer( wxHORIZONTAL );
+	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 );
 
-    ffgSizer111 = new wxFlexGridSizer( 2, 0, 5, 5 );
-    ffgSizer111->SetFlexibleDirection( wxBOTH );
-    ffgSizer111->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    wxBoxSizer* bSizer293;
-    bSizer293 = new wxBoxSizer( wxHORIZONTAL );
+	bSizer304->Add( ffgSizer11, 0, wxTOP|wxBOTTOM|wxALIGN_CENTER_VERTICAL, 10 );
 
-    m_bitmapItemStat = new wxStaticBitmap( m_panelItemStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer293->Add( m_bitmapItemStat, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	m_panelItemStats = new wxPanel( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_panelItemStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
+	wxBoxSizer* bSizer291;
+	bSizer291 = new wxBoxSizer( wxHORIZONTAL );
 
-    bSizer293->Add( 0, 0, 1, 0, 5 );
+	ffgSizer111 = new wxFlexGridSizer( 2, 0, 5, 5 );
+	ffgSizer111->SetFlexibleDirection( wxBOTH );
+	ffgSizer111->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    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 ) );
+	wxBoxSizer* bSizer293;
+	bSizer293 = new wxBoxSizer( wxHORIZONTAL );
 
-    bSizer293->Add( m_staticTextItemsProcessed, 0, wxALIGN_BOTTOM, 5 );
+	m_bitmapItemStat = new wxStaticBitmap( m_panelItemStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer293->Add( m_bitmapItemStat, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 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 ) );
 
-    ffgSizer111->Add( bSizer293, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	bSizer293->Add( m_staticTextItemsProcessed, 0, wxALIGN_BOTTOM, 5 );
 
-    m_staticTextBytesProcessed = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextBytesProcessed->Wrap( -1 );
-    ffgSizer111->Add( m_staticTextBytesProcessed, 0, wxALIGN_RIGHT|wxALIGN_BOTTOM, 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 ) );
+	ffgSizer111->Add( bSizer293, 0, wxEXPAND|wxALIGN_RIGHT, 5 );
 
-    ffgSizer111->Add( m_staticTextItemsRemaining, 0, wxALIGN_RIGHT|wxALIGN_BOTTOM, 5 );
+	m_staticTextBytesProcessed = new wxStaticText( m_panelItemStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextBytesProcessed->Wrap( -1 );
+	ffgSizer111->Add( m_staticTextBytesProcessed, 0, wxALIGN_RIGHT|wxALIGN_BOTTOM, 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_BOTTOM, 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 ) );
 
+	ffgSizer111->Add( m_staticTextItemsRemaining, 0, wxALIGN_RIGHT|wxALIGN_BOTTOM, 5 );
 
-    bSizer291->Add( ffgSizer111, 0, wxALL|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_BOTTOM, 5 );
 
 
-    m_panelItemStats->SetSizer( bSizer291 );
-    m_panelItemStats->Layout();
-    bSizer291->Fit( m_panelItemStats );
-    bSizer304->Add( m_panelItemStats, 0, wxTOP|wxBOTTOM|wxRIGHT|wxEXPAND, 10 );
+	bSizer291->Add( ffgSizer111, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_panelTimeStats = new wxPanel( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelTimeStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer292;
-    bSizer292 = new wxBoxSizer( wxHORIZONTAL );
+	m_panelItemStats->SetSizer( bSizer291 );
+	m_panelItemStats->Layout();
+	bSizer291->Fit( m_panelItemStats );
+	bSizer304->Add( m_panelItemStats, 0, wxTOP|wxBOTTOM|wxRIGHT|wxEXPAND, 10 );
 
-    ffgSizer112 = new wxFlexGridSizer( 2, 0, 5, 5 );
-    ffgSizer112->SetFlexibleDirection( wxBOTH );
-    ffgSizer112->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	m_panelTimeStats = new wxPanel( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_panelTimeStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer294;
-    bSizer294 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer292;
+	bSizer292 = 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 );
+	ffgSizer112 = new wxFlexGridSizer( 2, 0, 5, 5 );
+	ffgSizer112->SetFlexibleDirection( wxBOTH );
+	ffgSizer112->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
+	wxBoxSizer* bSizer294;
+	bSizer294 = new wxBoxSizer( wxHORIZONTAL );
 
-    bSizer294->Add( 0, 0, 1, 0, 5 );
+	m_bitmapTimeStat = new wxStaticBitmap( m_panelTimeStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer294->Add( m_bitmapTimeStat, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 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_BOTTOM, 5 );
+	bSizer294->Add( m_staticTextTimeElapsed, 0, wxALIGN_BOTTOM, 5 );
 
 
-    ffgSizer112->Add( bSizer294, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	ffgSizer112->Add( bSizer294, 0, wxEXPAND|wxALIGN_RIGHT, 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_RIGHT|wxALIGN_BOTTOM, 5 );
+	ffgSizer112->Add( m_staticTextTimeRemaining, 0, wxALIGN_RIGHT|wxALIGN_BOTTOM, 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 );
-    bSizer304->Add( m_panelTimeStats, 0, wxTOP|wxBOTTOM|wxRIGHT|wxEXPAND, 10 );
+	m_panelTimeStats->SetSizer( bSizer292 );
+	m_panelTimeStats->Layout();
+	bSizer292->Fit( m_panelTimeStats );
+	bSizer304->Add( m_panelTimeStats, 0, wxTOP|wxBOTTOM|wxRIGHT|wxEXPAND, 10 );
 
-    ffgSizer114 = new wxFlexGridSizer( 2, 0, 5, 5 );
-    ffgSizer114->SetFlexibleDirection( wxBOTH );
-    ffgSizer114->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	ffgSizer114 = new wxFlexGridSizer( 2, 0, 5, 5 );
+	ffgSizer114->SetFlexibleDirection( wxBOTH );
+	ffgSizer114->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    m_staticTextErrors = new wxStaticText( m_panelProgress, wxID_ANY, _("Errors:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextErrors->Wrap( -1 );
-    ffgSizer114->Add( m_staticTextErrors, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT, 5 );
+	m_staticTextErrors = new wxStaticText( m_panelProgress, wxID_ANY, _("Errors:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextErrors->Wrap( -1 );
+	ffgSizer114->Add( m_staticTextErrors, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT, 5 );
 
-    m_staticTextWarnings = new wxStaticText( m_panelProgress, wxID_ANY, _("Warnings:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextWarnings->Wrap( -1 );
-    ffgSizer114->Add( m_staticTextWarnings, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	m_staticTextWarnings = new wxStaticText( m_panelProgress, wxID_ANY, _("Warnings:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextWarnings->Wrap( -1 );
+	ffgSizer114->Add( m_staticTextWarnings, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
 
-    bSizer304->Add( ffgSizer114, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 10 );
+	bSizer304->Add( ffgSizer114, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 10 );
 
-    m_panelErrorStats = new wxPanel( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelErrorStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	m_panelErrorStats = new wxPanel( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_panelErrorStats->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 
-    wxBoxSizer* bSizer2921;
-    bSizer2921 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer2921;
+	bSizer2921 = new wxBoxSizer( wxHORIZONTAL );
 
-    ffgSizer1121 = new wxFlexGridSizer( 0, 2, 5, 5 );
-    ffgSizer1121->SetFlexibleDirection( wxBOTH );
-    ffgSizer1121->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	ffgSizer1121 = new wxFlexGridSizer( 0, 2, 5, 5 );
+	ffgSizer1121->SetFlexibleDirection( wxBOTH );
+	ffgSizer1121->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    m_bitmapErrors = new wxStaticBitmap( m_panelErrorStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    ffgSizer1121->Add( m_bitmapErrors, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_bitmapErrors = new wxStaticBitmap( m_panelErrorStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	ffgSizer1121->Add( m_bitmapErrors, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticTextErrorCount = new wxStaticText( m_panelErrorStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextErrorCount->Wrap( -1 );
-    m_staticTextErrorCount->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_staticTextErrorCount = new wxStaticText( m_panelErrorStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextErrorCount->Wrap( -1 );
+	m_staticTextErrorCount->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    ffgSizer1121->Add( m_staticTextErrorCount, 0, wxALIGN_BOTTOM|wxALIGN_RIGHT, 5 );
+	ffgSizer1121->Add( m_staticTextErrorCount, 0, wxALIGN_BOTTOM|wxALIGN_RIGHT, 5 );
 
-    m_bitmapWarnings = new wxStaticBitmap( m_panelErrorStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    ffgSizer1121->Add( m_bitmapWarnings, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	m_bitmapWarnings = new wxStaticBitmap( m_panelErrorStats, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	ffgSizer1121->Add( m_bitmapWarnings, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticTextWarningCount = new wxStaticText( m_panelErrorStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextWarningCount->Wrap( -1 );
-    m_staticTextWarningCount->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_staticTextWarningCount = new wxStaticText( m_panelErrorStats, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextWarningCount->Wrap( -1 );
+	m_staticTextWarningCount->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 
-    ffgSizer1121->Add( m_staticTextWarningCount, 0, wxALIGN_RIGHT|wxALIGN_BOTTOM, 5 );
+	ffgSizer1121->Add( m_staticTextWarningCount, 0, wxALIGN_RIGHT|wxALIGN_BOTTOM, 5 );
 
 
-    bSizer2921->Add( ffgSizer1121, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer2921->Add( ffgSizer1121, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    m_panelErrorStats->SetSizer( bSizer2921 );
-    m_panelErrorStats->Layout();
-    bSizer2921->Fit( m_panelErrorStats );
-    bSizer304->Add( m_panelErrorStats, 0, wxTOP|wxBOTTOM|wxRIGHT|wxEXPAND, 10 );
+	m_panelErrorStats->SetSizer( bSizer2921 );
+	m_panelErrorStats->Layout();
+	bSizer2921->Fit( m_panelErrorStats );
+	bSizer304->Add( m_panelErrorStats, 0, wxTOP|wxBOTTOM|wxRIGHT|wxEXPAND, 10 );
 
 
-    bSizer232->Add( bSizer304, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bSizer232->Add( bSizer304, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 
-    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|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|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|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|wxLEFT, 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()
@@ -4197,42 +4179,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()
@@ -4241,173 +4223,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()
@@ -4416,85 +4398,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()
@@ -4503,120 +4485,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()
@@ -4625,85 +4607,85 @@ CopyToDlgGenerated::~CopyToDlgGenerated()
 
 RenameDlgGenerated::RenameDlgGenerated( 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_bitmapRename = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer72->Add( m_bitmapRename, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
+	m_bitmapRename = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer72->Add( m_bitmapRename, 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 );
 
-    m_gridRenamePreview = new zen::Grid( m_panel31, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
-    m_gridRenamePreview->SetScrollRate( 5, 5 );
-    bSizer242->Add( m_gridRenamePreview, 1, wxEXPAND, 5 );
+	m_gridRenamePreview = new zen::Grid( m_panel31, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
+	m_gridRenamePreview->SetScrollRate( 5, 5 );
+	bSizer242->Add( m_gridRenamePreview, 1, wxEXPAND, 5 );
 
-    m_staticlinePreview = new wxStaticLine( m_panel31, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer242->Add( m_staticlinePreview, 0, wxEXPAND, 5 );
+	m_staticlinePreview = new wxStaticLine( m_panel31, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer242->Add( m_staticlinePreview, 0, wxEXPAND, 5 );
 
-    m_staticTextPlaceholderDescription = new wxStaticText( m_panel31, wxID_ANY, _("Placeholders represent differences between the names."), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextPlaceholderDescription->Wrap( -1 );
-    m_staticTextPlaceholderDescription->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	m_staticTextPlaceholderDescription = new wxStaticText( m_panel31, wxID_ANY, _("Placeholders represent differences between the names."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextPlaceholderDescription->Wrap( -1 );
+	m_staticTextPlaceholderDescription->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
 
-    bSizer242->Add( m_staticTextPlaceholderDescription, 0, wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL, 10 );
+	bSizer242->Add( m_staticTextPlaceholderDescription, 0, wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL, 10 );
 
-    m_textCtrlNewName = new wxTextCtrl( m_panel31, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer242->Add( m_textCtrlNewName, 0, wxEXPAND|wxALL, 10 );
+	m_textCtrlNewName = new wxTextCtrl( m_panel31, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer242->Add( m_textCtrlNewName, 0, wxEXPAND|wxALL, 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 );
 
-    m_buttonOK = new wxButton( this, wxID_OK, _("&Rename"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
+	m_buttonOK = new wxButton( this, wxID_OK, _("&Rename"), 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|wxALL, 5 );
+	bSizerStdButtons->Add( m_buttonOK, 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 );
 
 
-    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 );
 
-    this->Centre( wxBOTH );
+	this->Centre( wxBOTH );
 
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( RenameDlgGenerated::onClose ) );
-    m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( RenameDlgGenerated::onOkay ), NULL, this );
-    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( RenameDlgGenerated::onCancel ), NULL, this );
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( RenameDlgGenerated::onClose ) );
+	m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( RenameDlgGenerated::onOkay ), NULL, this );
+	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( RenameDlgGenerated::onCancel ), NULL, this );
 }
 
 RenameDlgGenerated::~RenameDlgGenerated()
@@ -4712,583 +4694,583 @@ RenameDlgGenerated::~RenameDlgGenerated()
 
 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()
@@ -5297,61 +5279,61 @@ OptionsDlgGenerated::~OptionsDlgGenerated()
 
 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()
@@ -5360,210 +5342,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_BOTTOM, 5 );
+	m_staticFfsTextVersion = new wxStaticText( m_panel41, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticFfsTextVersion->Wrap( -1 );
+	bSizer298->Add( m_staticFfsTextVersion, 0, wxALIGN_BOTTOM, 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, wxLEFT|wxALIGN_BOTTOM, 10 );
+	bSizer298->Add( m_staticTextFfsVariant, 0, wxLEFT|wxALIGN_BOTTOM, 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 translation:"), 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 translation:"), 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_buttonShowSupporterDetails = new wxButton( this, wxID_ANY, _("Thank you, %x, for your support!"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizerStdButtons->Add( m_buttonShowSupporterDetails, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	m_buttonShowSupporterDetails = new wxButton( this, wxID_ANY, _("Thank you, %x, for your support!"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerStdButtons->Add( m_buttonShowSupporterDetails, 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_buttonShowSupporterDetails->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::onShowSupporterDetails ), 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_buttonShowSupporterDetails->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::onShowSupporterDetails ), 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()
@@ -5572,61 +5554,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()
@@ -5635,66 +5617,66 @@ DownloadProgressDlgGenerated::~DownloadProgressDlgGenerated()
 
 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()
@@ -5703,97 +5685,97 @@ CfgHighlightDlgGenerated::~CfgHighlightDlgGenerated()
 
 PasswordPromptDlgGenerated::PasswordPromptDlgGenerated( 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_staticTextMain = new wxStaticText( m_panel35, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextMain->Wrap( -1 );
-    bSizer238->Add( m_staticTextMain, 1, wxALL, 5 );
+	m_staticTextMain = new wxStaticText( m_panel35, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextMain->Wrap( -1 );
+	bSizer238->Add( m_staticTextMain, 1, wxALL, 5 );
 
-    wxBoxSizer* bSizer305;
-    bSizer305 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer305;
+	bSizer305 = new wxBoxSizer( wxHORIZONTAL );
 
-    m_staticTextPassword = new wxStaticText( m_panel35, wxID_ANY, _("Password:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextPassword->Wrap( -1 );
-    bSizer305->Add( m_staticTextPassword, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	m_staticTextPassword = new wxStaticText( m_panel35, wxID_ANY, _("Password:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextPassword->Wrap( -1 );
+	bSizer305->Add( m_staticTextPassword, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
 
-    m_textCtrlPasswordVisible = new wxTextCtrl( m_panel35, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer305->Add( m_textCtrlPasswordVisible, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	m_textCtrlPasswordVisible = new wxTextCtrl( m_panel35, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer305->Add( m_textCtrlPasswordVisible, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
 
-    m_textCtrlPasswordHidden = new wxTextCtrl( m_panel35, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD );
-    bSizer305->Add( m_textCtrlPasswordHidden, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	m_textCtrlPasswordHidden = new wxTextCtrl( m_panel35, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD );
+	bSizer305->Add( m_textCtrlPasswordHidden, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
 
-    m_checkBoxShowPassword = new wxCheckBox( m_panel35, wxID_ANY, _("&Show password"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer305->Add( m_checkBoxShowPassword, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	m_checkBoxShowPassword = new wxCheckBox( m_panel35, wxID_ANY, _("&Show password"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer305->Add( m_checkBoxShowPassword, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
 
-    bSizer238->Add( bSizer305, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
+	bSizer238->Add( bSizer305, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
 
-    bSizerError = new wxBoxSizer( wxHORIZONTAL );
+	bSizerError = new wxBoxSizer( wxHORIZONTAL );
 
-    m_bitmapError = new wxStaticBitmap( m_panel35, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizerError->Add( m_bitmapError, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_bitmapError = new wxStaticBitmap( m_panel35, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerError->Add( m_bitmapError, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_staticTextError = new wxStaticText( m_panel35, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextError->Wrap( -1 );
-    bSizerError->Add( m_staticTextError, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	m_staticTextError = new wxStaticText( m_panel35, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextError->Wrap( -1 );
+	bSizerError->Add( m_staticTextError, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
 
-    bSizer238->Add( bSizerError, 0, 0, 5 );
+	bSizer238->Add( bSizerError, 0, 0, 5 );
 
 
-    bSizer98->Add( bSizer238, 1, wxALL, 5 );
+	bSizer98->Add( bSizer238, 1, wxALL, 5 );
 
 
-    m_panel35->SetSizer( bSizer98 );
-    m_panel35->Layout();
-    bSizer98->Fit( m_panel35 );
-    bSizer96->Add( m_panel35, 1, wxEXPAND, 5 );
+	m_panel35->SetSizer( bSizer98 );
+	m_panel35->Layout();
+	bSizer98->Fit( m_panel35 );
+	bSizer96->Add( m_panel35, 1, 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( PasswordPromptDlgGenerated::onClose ) );
-    m_textCtrlPasswordVisible->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( PasswordPromptDlgGenerated::onTypingPassword ), NULL, this );
-    m_textCtrlPasswordHidden->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( PasswordPromptDlgGenerated::onTypingPassword ), NULL, this );
-    m_checkBoxShowPassword->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PasswordPromptDlgGenerated::onToggleShowPassword ), NULL, this );
-    m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PasswordPromptDlgGenerated::onOkay ), NULL, this );
-    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PasswordPromptDlgGenerated::onCancel ), NULL, this );
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( PasswordPromptDlgGenerated::onClose ) );
+	m_textCtrlPasswordVisible->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( PasswordPromptDlgGenerated::onTypingPassword ), NULL, this );
+	m_textCtrlPasswordHidden->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( PasswordPromptDlgGenerated::onTypingPassword ), NULL, this );
+	m_checkBoxShowPassword->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PasswordPromptDlgGenerated::onToggleShowPassword ), NULL, this );
+	m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PasswordPromptDlgGenerated::onOkay ), NULL, this );
+	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PasswordPromptDlgGenerated::onCancel ), NULL, this );
 }
 
 PasswordPromptDlgGenerated::~PasswordPromptDlgGenerated()
@@ -5802,178 +5784,178 @@ PasswordPromptDlgGenerated::~PasswordPromptDlgGenerated()
 
 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 FreeFileSync 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 FreeFileSync 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()
@@ -5982,106 +5964,106 @@ ActivationDlgGenerated::~ActivationDlgGenerated()
 
 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 bdb2fca7..42b1f9d5 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,227 +65,227 @@ 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_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 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_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 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();
 
 };
 
@@ -294,29 +294,29 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class FolderPairPanelGenerated : public wxPanel
 {
-private:
-
-protected:
-    wxButton* m_buttonSelectFolderLeft;
-    wxButton* m_buttonSelectFolderRight;
-
-public:
-    wxPanel* m_panelLeft;
-    wxBitmapButton* m_bpButtonFolderPairOptions;
-    wxBitmapButton* m_bpButtonRemovePair;
-    fff::FolderHistoryBox* m_folderPathLeft;
-    wxBitmapButton* m_bpButtonSelectAltFolderLeft;
-    wxPanel* m_panel20;
-    wxBitmapButton* m_bpButtonLocalCompCfg;
-    wxBitmapButton* m_bpButtonLocalFilter;
-    wxBitmapButton* m_bpButtonLocalSyncCfg;
-    wxPanel* m_panelRight;
-    fff::FolderHistoryBox* m_folderPathRight;
-    wxBitmapButton* m_bpButtonSelectAltFolderRight;
-
-    FolderPairPanelGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = 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();
 
 };
 
@@ -325,261 +325,261 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class ConfigDlgGenerated : public wxDialog
 {
-private:
-
-protected:
-    wxStaticText* m_staticTextFolderPairLabel;
-    wxListBox* m_listBoxFolderPair;
-    wxNotebook* m_notebook;
-    wxPanel* m_panelCompSettingsTab;
-    wxBoxSizer* bSizerHeaderCompSettings;
-    wxStaticText* m_staticTextMainCompSettings;
-    wxCheckBox* m_checkBoxUseLocalCmpOptions;
-    wxStaticLine* m_staticlineCompHeader;
-    wxPanel* m_panelComparisonSettings;
-    wxStaticText* m_staticText91;
-    zen::ToggleButton* m_buttonByTimeSize;
-    zen::ToggleButton* m_buttonByContent;
-    zen::ToggleButton* m_buttonBySize;
-    wxStaticBitmap* m_bitmapCompVariant;
-    wxStaticText* m_staticTextCompVarDescription;
-    wxStaticLine* m_staticline33;
-    wxCheckBox* m_checkBoxSymlinksInclude;
-    wxRadioButton* m_radioBtnSymlinksFollow;
-    wxRadioButton* m_radioBtnSymlinksDirect;
-    wxHyperlinkCtrl* m_hyperlink24;
-    wxStaticLine* m_staticline44;
-    wxStaticText* m_staticText112;
-    wxTextCtrl* m_textCtrlTimeShift;
-    wxStaticText* m_staticText1381;
-    wxStaticText* m_staticText13811;
-    wxHyperlinkCtrl* m_hyperlink241;
-    wxStaticLine* m_staticline331;
-    wxBoxSizer* bSizerCompMisc;
-    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;
-    wxPanel* m_panel571;
-    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;
-    wxStaticBitmap* m_bitmapDatabase;
-    wxCheckBox* m_checkBoxUseDatabase;
-    wxStaticText* m_staticTextSyncVarDescription;
-    wxStaticLine* m_staticline431;
-    wxStaticLine* m_staticline72;
-    wxStaticBitmap* m_bitmapMoveLeft;
-    wxStaticBitmap* m_bitmapMoveRight;
-    wxStaticText* m_staticTextDetectMove;
-    wxHyperlinkCtrl* m_hyperlink242;
-    wxStaticLine* m_staticline721;
-    wxBoxSizer* bSizerSyncDirHolder;
-    wxBoxSizer* bSizerSyncDirsDiff;
-    wxStaticText* m_staticText184;
-    wxFlexGridSizer* ffgSizer11;
-    wxStaticBitmap* m_bitmapLeftOnly;
-    wxStaticBitmap* m_bitmapLeftNewer;
-    wxStaticBitmap* m_bitmapDifferent;
-    wxStaticBitmap* m_bitmapRightNewer;
-    wxStaticBitmap* m_bitmapRightOnly;
-    wxBitmapButton* m_bpButtonLeftOnly;
-    wxBitmapButton* m_bpButtonLeftNewer;
-    wxBitmapButton* m_bpButtonDifferent;
-    wxBitmapButton* m_bpButtonRightNewer;
-    wxBitmapButton* m_bpButtonRightOnly;
-    wxStaticText* m_staticText120;
-    wxFlexGridSizer* ffgSizer111;
-    wxStaticText* m_staticText12011;
-    wxBitmapButton* m_bpButtonLeftCreate;
-    wxBitmapButton* m_bpButtonRightCreate;
-    wxStaticText* m_staticText12012;
-    wxBitmapButton* m_bpButtonLeftUpdate;
-    wxBitmapButton* m_bpButtonRightUpdate;
-    wxStaticText* m_staticText12013;
-    wxBitmapButton* m_bpButtonLeftDelete;
-    wxBitmapButton* m_bpButtonRightDelete;
-    wxStaticText* m_staticText1201;
-    wxStaticText* m_staticText1202;
-    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;
-    wxPanel* m_panelNotes;
-    wxStaticBitmap* m_bitmapNotes;
-    wxStaticText* m_staticText781;
-    wxTextCtrl* m_textCtrNotes;
-    wxStaticLine* m_staticline83;
-    wxBoxSizer* bSizerStdButtons;
-    zen::BitmapTextButton* m_buttonAddNotes;
-    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 onToggleUseDatabase( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onLeftOnly( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onLeftNewer( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onDifferent( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onRightNewer( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onRightOnly( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onLeftCreate( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onRightCreate( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onLeftUpdate( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onRightUpdate( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onLeftDelete( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onRightDelete( 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 onAddNotes( 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;
-    wxBoxSizer* bSizerSyncDirsChanges;
-    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;
+		wxPanel* m_panel571;
+		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;
+		wxStaticBitmap* m_bitmapDatabase;
+		wxCheckBox* m_checkBoxUseDatabase;
+		wxStaticText* m_staticTextSyncVarDescription;
+		wxStaticLine* m_staticline431;
+		wxStaticLine* m_staticline72;
+		wxStaticBitmap* m_bitmapMoveLeft;
+		wxStaticBitmap* m_bitmapMoveRight;
+		wxStaticText* m_staticTextDetectMove;
+		wxHyperlinkCtrl* m_hyperlink242;
+		wxStaticLine* m_staticline721;
+		wxBoxSizer* bSizerSyncDirHolder;
+		wxBoxSizer* bSizerSyncDirsDiff;
+		wxStaticText* m_staticText184;
+		wxFlexGridSizer* ffgSizer11;
+		wxStaticBitmap* m_bitmapLeftOnly;
+		wxStaticBitmap* m_bitmapLeftNewer;
+		wxStaticBitmap* m_bitmapDifferent;
+		wxStaticBitmap* m_bitmapRightNewer;
+		wxStaticBitmap* m_bitmapRightOnly;
+		wxBitmapButton* m_bpButtonLeftOnly;
+		wxBitmapButton* m_bpButtonLeftNewer;
+		wxBitmapButton* m_bpButtonDifferent;
+		wxBitmapButton* m_bpButtonRightNewer;
+		wxBitmapButton* m_bpButtonRightOnly;
+		wxStaticText* m_staticText120;
+		wxFlexGridSizer* ffgSizer111;
+		wxStaticText* m_staticText12011;
+		wxBitmapButton* m_bpButtonLeftCreate;
+		wxBitmapButton* m_bpButtonRightCreate;
+		wxStaticText* m_staticText12012;
+		wxBitmapButton* m_bpButtonLeftUpdate;
+		wxBitmapButton* m_bpButtonRightUpdate;
+		wxStaticText* m_staticText12013;
+		wxBitmapButton* m_bpButtonLeftDelete;
+		wxBitmapButton* m_bpButtonRightDelete;
+		wxStaticText* m_staticText1201;
+		wxStaticText* m_staticText1202;
+		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;
+		wxPanel* m_panelNotes;
+		wxStaticBitmap* m_bitmapNotes;
+		wxStaticText* m_staticText781;
+		wxTextCtrl* m_textCtrNotes;
+		wxStaticLine* m_staticline83;
+		wxBoxSizer* bSizerStdButtons;
+		zen::BitmapTextButton* m_buttonAddNotes;
+		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 onToggleUseDatabase( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onLeftOnly( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onLeftNewer( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onDifferent( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onRightNewer( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onRightOnly( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onLeftCreate( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onRightCreate( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onLeftUpdate( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onRightUpdate( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onLeftDelete( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onRightDelete( 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 onAddNotes( 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;
+		wxBoxSizer* bSizerSyncDirsChanges;
+		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();
 
 };
 
@@ -588,117 +588,117 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class CloudSetupDlgGenerated : public wxDialog
 {
-private:
-
-protected:
-    wxStaticBitmap* m_bitmapCloud;
-    wxStaticText* m_staticText136;
-    wxToggleButton* m_toggleBtnGdrive;
-    wxToggleButton* m_toggleBtnSftp;
-    wxToggleButton* m_toggleBtnFtp;
-    wxStaticLine* m_staticline371;
-    wxPanel* m_panel41;
-    wxBoxSizer* bSizerGdrive;
-    wxStaticBitmap* m_bitmapGdriveUser;
-    wxStaticText* m_staticText166;
-    wxListBox* m_listBoxGdriveUsers;
-    zen::BitmapTextButton* m_buttonGdriveAddUser;
-    zen::BitmapTextButton* m_buttonGdriveRemoveUser;
-    wxStaticLine* m_staticline841;
-    wxStaticBitmap* m_bitmapGdriveDrive;
-    wxStaticText* m_staticText186;
-    wxListBox* m_listBoxGdriveDrives;
-    wxStaticLine* m_staticline73;
-    wxBoxSizer* bSizerServer;
-    wxStaticBitmap* m_bitmapServer;
-    wxStaticText* m_staticText12311;
-    wxTextCtrl* m_textCtrlServer;
-    wxStaticText* m_staticText1233;
-    wxTextCtrl* m_textCtrlPort;
-    wxStaticLine* m_staticline58;
-    wxBoxSizer* bSizerAuth;
-    wxBoxSizer* bSizerAuthInner;
-    wxBoxSizer* bSizerFtpEncrypt;
-    wxStaticText* m_staticText1251;
-    wxRadioButton* m_radioBtnEncryptNone;
-    wxRadioButton* m_radioBtnEncryptSsl;
-    wxStaticLine* m_staticline5721;
-    wxBoxSizer* bSizerSftpAuth;
-    wxStaticText* m_staticText125;
-    wxRadioButton* m_radioBtnPassword;
-    wxRadioButton* m_radioBtnKeyfile;
-    wxRadioButton* m_radioBtnAgent;
-    wxStaticLine* m_staticline572;
-    wxPanel* m_panelAuth;
-    wxStaticText* m_staticText123;
-    wxTextCtrl* m_textCtrlUserName;
-    wxStaticText* m_staticTextKeyfile;
-    wxBoxSizer* bSizerKeyFile;
-    wxTextCtrl* m_textCtrlKeyfilePath;
-    wxButton* m_buttonSelectKeyfile;
-    wxStaticText* m_staticTextPassword;
-    wxBoxSizer* bSizerPassword;
-    wxTextCtrl* m_textCtrlPasswordVisible;
-    wxTextCtrl* m_textCtrlPasswordHidden;
-    wxCheckBox* m_checkBoxShowPassword;
-    wxCheckBox* m_checkBoxPasswordPrompt;
-    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 onTypingPassword( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onToggleShowPassword( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onTogglePasswordPrompt( 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;
+		wxCheckBox* m_checkBoxPasswordPrompt;
+		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 onTypingPassword( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onToggleShowPassword( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onTogglePasswordPrompt( 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();
 
 };
 
@@ -707,29 +707,29 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class AbstractFolderPickerGenerated : public wxDialog
 {
-private:
+	private:
 
-protected:
-    wxPanel* m_panel41;
-    wxStaticText* m_staticTextStatus;
-    wxTreeCtrl* m_treeCtrlFileSystem;
-    wxStaticLine* m_staticline12;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonOkay;
-    wxButton* m_buttonCancel;
+	protected:
+		wxPanel* m_panel41;
+		wxStaticText* m_staticTextStatus;
+		wxTreeCtrl* m_treeCtrlFileSystem;
+		wxStaticLine* m_staticline12;
+		wxBoxSizer* bSizerStdButtons;
+		wxButton* m_buttonOkay;
+		wxButton* m_buttonCancel;
 
-    // Virtual event handlers, 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();
 
 };
 
@@ -738,51 +738,51 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class SyncConfirmationDlgGenerated : public wxDialog
 {
-private:
-
-protected:
-    wxStaticBitmap* m_bitmapSync;
-    wxStaticText* m_staticTextCaption;
-    wxStaticLine* m_staticline371;
-    wxPanel* m_panelStatistics;
-    wxStaticLine* m_staticline38;
-    wxStaticText* m_staticText84;
-    wxStaticText* m_staticTextSyncVar;
-    wxStaticBitmap* m_bitmapSyncVar;
-    wxStaticLine* m_staticline14;
-    wxStaticText* m_staticText83;
-    wxStaticBitmap* m_bitmapDeleteLeft;
-    wxStaticBitmap* m_bitmapUpdateLeft;
-    wxStaticBitmap* m_bitmapCreateLeft;
-    wxStaticBitmap* m_bitmapData;
-    wxStaticBitmap* m_bitmapCreateRight;
-    wxStaticBitmap* m_bitmapUpdateRight;
-    wxStaticBitmap* m_bitmapDeleteRight;
-    wxStaticText* m_staticTextDeleteLeft;
-    wxStaticText* m_staticTextUpdateLeft;
-    wxStaticText* m_staticTextCreateLeft;
-    wxStaticText* m_staticTextData;
-    wxStaticText* m_staticTextCreateRight;
-    wxStaticText* m_staticTextUpdateRight;
-    wxStaticText* m_staticTextDeleteRight;
-    wxStaticLine* m_staticline381;
-    wxStaticLine* m_staticline12;
-    wxCheckBox* m_checkBoxDontShowAgain;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonStartSync;
-    wxButton* m_buttonCancel;
-
-    // Virtual event handlers, 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();
 
 };
 
@@ -791,51 +791,51 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class CompareProgressDlgGenerated : public wxPanel
 {
-private:
-
-protected:
-    wxStaticText* m_staticTextStatus;
-    wxFlexGridSizer* ffgSizer11;
-    wxFlexGridSizer* ffgSizer111;
-    wxFlexGridSizer* ffgSizer112;
-    wxFlexGridSizer* ffgSizer114;
-    wxFlexGridSizer* ffgSizer1121;
-    wxFlexGridSizer* ffgSizer1141;
-    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;
-    wxStaticText* m_staticTextErrors;
-    wxStaticText* m_staticTextWarnings;
-    wxPanel* m_panelErrorStats;
-    wxStaticBitmap* m_bitmapErrors;
-    wxStaticText* m_staticTextErrorCount;
-    wxStaticBitmap* m_bitmapWarnings;
-    wxStaticText* m_staticTextWarningCount;
-    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;
+		wxFlexGridSizer* ffgSizer114;
+		wxFlexGridSizer* ffgSizer1121;
+		wxFlexGridSizer* ffgSizer1141;
+		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;
+		wxStaticText* m_staticTextErrors;
+		wxStaticText* m_staticTextWarnings;
+		wxPanel* m_panelErrorStats;
+		wxStaticBitmap* m_bitmapErrors;
+		wxStaticText* m_staticTextErrorCount;
+		wxStaticBitmap* m_bitmapWarnings;
+		wxStaticText* m_staticTextWarningCount;
+		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();
 
 };
 
@@ -844,71 +844,71 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class SyncProgressPanelGenerated : public wxPanel
 {
-private:
-
-protected:
-    wxPanel* m_panel53;
-    wxBoxSizer* bSizer42;
-    wxFlexGridSizer* ffgSizer11;
-    wxFlexGridSizer* ffgSizer111;
-    wxFlexGridSizer* ffgSizer112;
-    wxFlexGridSizer* ffgSizer114;
-    wxFlexGridSizer* ffgSizer1121;
-    wxStaticText* m_staticText1461;
-    wxStaticText* m_staticText146;
-    wxStaticText* m_staticText137;
-
-public:
-    wxBoxSizer* bSizerRoot;
-    wxStaticBitmap* m_bitmapStatus;
-    wxStaticText* m_staticTextPhase;
-    wxStaticText* m_staticTextPercentTotal;
-    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;
-    wxStaticText* m_staticTextErrors;
-    wxStaticText* m_staticTextWarnings;
-    wxPanel* m_panelErrorStats;
-    wxStaticBitmap* m_bitmapErrors;
-    wxStaticText* m_staticTextErrorCount;
-    wxStaticBitmap* m_bitmapWarnings;
-    wxStaticText* m_staticTextWarningCount;
-    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;
+		wxFlexGridSizer* ffgSizer114;
+		wxFlexGridSizer* ffgSizer1121;
+		wxStaticText* m_staticText1461;
+		wxStaticText* m_staticText146;
+		wxStaticText* m_staticText137;
+
+	public:
+		wxBoxSizer* bSizerRoot;
+		wxStaticBitmap* m_bitmapStatus;
+		wxStaticText* m_staticTextPhase;
+		wxStaticText* m_staticTextPercentTotal;
+		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;
+		wxStaticText* m_staticTextErrors;
+		wxStaticText* m_staticTextWarnings;
+		wxPanel* m_panelErrorStats;
+		wxStaticBitmap* m_bitmapErrors;
+		wxStaticText* m_staticTextErrorCount;
+		wxStaticBitmap* m_bitmapWarnings;
+		wxStaticText* m_staticTextWarningCount;
+		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();
 
 };
 
@@ -917,26 +917,26 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class LogPanelGenerated : public wxPanel
 {
-private:
+	private:
 
-protected:
-    zen::ToggleButton* m_bpButtonErrors;
-    zen::ToggleButton* m_bpButtonWarnings;
-    zen::ToggleButton* m_bpButtonInfo;
-    wxStaticLine* m_staticline13;
+	protected:
+		zen::ToggleButton* m_bpButtonErrors;
+		zen::ToggleButton* m_bpButtonWarnings;
+		zen::ToggleButton* m_bpButtonInfo;
+		wxStaticLine* m_staticline13;
 
-    // Virtual event handlers, 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();
 
 };
 
@@ -945,47 +945,47 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class BatchDlgGenerated : public wxDialog
 {
-private:
-
-protected:
-    wxStaticBitmap* m_bitmapBatchJob;
-    wxStaticText* m_staticTextHeader;
-    wxStaticLine* m_staticline18;
-    wxPanel* m_panel35;
-    wxStaticText* m_staticText146;
-    wxFlexGridSizer* ffgSizer11;
-    wxStaticBitmap* m_bitmapMinimizeToTray;
-    wxCheckBox* m_checkBoxRunMinimized;
-    wxStaticLine* m_staticline26;
-    wxStaticBitmap* m_bitmapIgnoreErrors;
-    wxCheckBox* m_checkBoxIgnoreErrors;
-    wxRadioButton* m_radioBtnErrorDialogShow;
-    wxRadioButton* m_radioBtnErrorDialogCancel;
-    wxStaticLine* m_staticline261;
-    wxStaticText* m_staticText137;
-    wxStaticLine* m_staticline262;
-    wxStaticLine* m_staticline25;
-    wxHyperlinkCtrl* m_hyperlink17;
-    wxStaticLine* m_staticline13;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonSaveAs;
-    wxButton* m_buttonCancel;
-
-    // Virtual event handlers, 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();
 
 };
 
@@ -994,33 +994,33 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class DeleteDlgGenerated : public wxDialog
 {
-private:
+	private:
 
-protected:
-    wxStaticBitmap* m_bitmapDeleteType;
-    wxStaticText* m_staticTextHeader;
-    wxStaticLine* m_staticline91;
-    wxPanel* m_panel31;
-    wxStaticLine* m_staticline42;
-    wxTextCtrl* m_textCtrlFileList;
-    wxStaticLine* m_staticline9;
-    wxBoxSizer* bSizerStdButtons;
-    wxCheckBox* m_checkBoxUseRecycler;
-    wxButton* m_buttonOK;
-    wxButton* m_buttonCancel;
+	protected:
+		wxStaticBitmap* m_bitmapDeleteType;
+		wxStaticText* m_staticTextHeader;
+		wxStaticLine* m_staticline91;
+		wxPanel* m_panel31;
+		wxStaticLine* m_staticline42;
+		wxTextCtrl* m_textCtrlFileList;
+		wxStaticLine* m_staticline9;
+		wxBoxSizer* bSizerStdButtons;
+		wxCheckBox* m_checkBoxUseRecycler;
+		wxButton* m_buttonOK;
+		wxButton* m_buttonCancel;
 
-    // Virtual event handlers, 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();
 
 };
 
@@ -1029,36 +1029,36 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 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();
 
 };
 
@@ -1067,33 +1067,33 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class RenameDlgGenerated : public wxDialog
 {
-private:
+	private:
 
-protected:
-    wxStaticBitmap* m_bitmapRename;
-    wxStaticText* m_staticTextHeader;
-    wxStaticLine* m_staticline91;
-    wxPanel* m_panel31;
-    zen::Grid* m_gridRenamePreview;
-    wxStaticLine* m_staticlinePreview;
-    wxStaticText* m_staticTextPlaceholderDescription;
-    wxTextCtrl* m_textCtrlNewName;
-    wxStaticLine* m_staticline9;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonOK;
-    wxButton* m_buttonCancel;
+	protected:
+		wxStaticBitmap* m_bitmapRename;
+		wxStaticText* m_staticTextHeader;
+		wxStaticLine* m_staticline91;
+		wxPanel* m_panel31;
+		zen::Grid* m_gridRenamePreview;
+		wxStaticLine* m_staticlinePreview;
+		wxStaticText* m_staticTextPlaceholderDescription;
+		wxTextCtrl* m_textCtrlNewName;
+		wxStaticLine* m_staticline9;
+		wxBoxSizer* bSizerStdButtons;
+		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:
+	public:
 
-    RenameDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Rename Items"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1, -1 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER );
+		RenameDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Rename Items"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER );
 
-    ~RenameDlgGenerated();
+		~RenameDlgGenerated();
 
 };
 
@@ -1102,115 +1102,115 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class OptionsDlgGenerated : public wxDialog
 {
-private:
-
-protected:
-    wxStaticBitmap* m_bitmapSettings;
-    wxStaticText* m_staticText44;
-    wxStaticLine* m_staticline20;
-    wxPanel* m_panel39;
-    wxCheckBox* m_checkBoxFailSafe;
-    wxStaticText* m_staticText911;
-    wxStaticText* m_staticText91;
-    wxStaticText* m_staticText9111;
-    wxBoxSizer* bSizerLockedFiles;
-    wxCheckBox* m_checkBoxCopyLocked;
-    wxStaticText* m_staticText921;
-    wxStaticText* m_staticText92;
-    wxStaticText* m_staticText922;
-    wxCheckBox* m_checkBoxCopyPermissions;
-    wxStaticText* m_staticText931;
-    wxStaticText* m_staticText93;
-    wxStaticText* m_staticText932;
-    wxStaticLine* m_staticline39;
-    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();
 
 };
 
@@ -1219,30 +1219,30 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class SelectTimespanDlgGenerated : public wxDialog
 {
-private:
+	private:
 
-protected:
-    wxPanel* m_panel35;
-    wxCalendarCtrl* m_calendarFrom;
-    wxCalendarCtrl* m_calendarTo;
-    wxStaticLine* m_staticline21;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonOkay;
-    wxButton* m_buttonCancel;
+	protected:
+		wxPanel* m_panel35;
+		wxCalendarCtrl* m_calendarFrom;
+		wxCalendarCtrl* m_calendarTo;
+		wxStaticLine* m_staticline21;
+		wxBoxSizer* bSizerStdButtons;
+		wxButton* m_buttonOkay;
+		wxButton* m_buttonCancel;
 
-    // Virtual event handlers, 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();
 
 };
 
@@ -1251,54 +1251,54 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class AboutDlgGenerated : public wxDialog
 {
-private:
-
-protected:
-    wxPanel* m_panel41;
-    wxStaticBitmap* m_bitmapLogoLeft;
-    wxStaticLine* m_staticline81;
-    wxBoxSizer* bSizerMainSection;
-    wxStaticLine* m_staticline82;
-    wxStaticBitmap* m_bitmapLogo;
-    wxStaticLine* m_staticline341;
-    wxStaticText* m_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_buttonShowSupporterDetails;
-    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 onShowSupporterDetails( 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_buttonShowSupporterDetails;
+		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 onShowSupporterDetails( 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();
 
 };
 
@@ -1307,26 +1307,26 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class DownloadProgressDlgGenerated : public wxDialog
 {
-private:
+	private:
 
-protected:
-    wxStaticBitmap* m_bitmapDownloading;
-    wxStaticText* m_staticTextHeader;
-    wxGauge* m_gaugeProgress;
-    wxStaticText* m_staticTextDetails;
-    wxStaticLine* m_staticline9;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonCancel;
+	protected:
+		wxStaticBitmap* m_bitmapDownloading;
+		wxStaticText* m_staticTextHeader;
+		wxGauge* m_gaugeProgress;
+		wxStaticText* m_staticTextDetails;
+		wxStaticLine* m_staticline9;
+		wxBoxSizer* bSizerStdButtons;
+		wxButton* m_buttonCancel;
 
-    // Virtual event handlers, 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();
 
 };
 
@@ -1335,28 +1335,28 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class CfgHighlightDlgGenerated : public wxDialog
 {
-private:
+	private:
 
-protected:
-    wxPanel* m_panel35;
-    wxStaticText* m_staticTextHighlight;
-    wxSpinCtrl* m_spinCtrlOverdueDays;
-    wxStaticLine* m_staticline21;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonOkay;
-    wxButton* m_buttonCancel;
+	protected:
+		wxPanel* m_panel35;
+		wxStaticText* m_staticTextHighlight;
+		wxSpinCtrl* m_spinCtrlOverdueDays;
+		wxStaticLine* m_staticline21;
+		wxBoxSizer* bSizerStdButtons;
+		wxButton* m_buttonOkay;
+		wxButton* m_buttonCancel;
 
-    // Virtual event handlers, 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();
 
 };
 
@@ -1365,36 +1365,36 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class PasswordPromptDlgGenerated : public wxDialog
 {
-private:
+	private:
 
-protected:
-    wxPanel* m_panel35;
-    wxStaticText* m_staticTextMain;
-    wxStaticText* m_staticTextPassword;
-    wxTextCtrl* m_textCtrlPasswordVisible;
-    wxTextCtrl* m_textCtrlPasswordHidden;
-    wxCheckBox* m_checkBoxShowPassword;
-    wxBoxSizer* bSizerError;
-    wxStaticBitmap* m_bitmapError;
-    wxStaticText* m_staticTextError;
-    wxStaticLine* m_staticline21;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonOkay;
-    wxButton* m_buttonCancel;
+	protected:
+		wxPanel* m_panel35;
+		wxStaticText* m_staticTextMain;
+		wxStaticText* m_staticTextPassword;
+		wxTextCtrl* m_textCtrlPasswordVisible;
+		wxTextCtrl* m_textCtrlPasswordHidden;
+		wxCheckBox* m_checkBoxShowPassword;
+		wxBoxSizer* bSizerError;
+		wxStaticBitmap* m_bitmapError;
+		wxStaticText* m_staticTextError;
+		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 onTypingPassword( wxCommandEvent& event ) { event.Skip(); }
-    virtual void onToggleShowPassword( 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 onTypingPassword( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onToggleShowPassword( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onOkay( wxCommandEvent& event ) { event.Skip(); }
+		virtual void onCancel( wxCommandEvent& event ) { event.Skip(); }
 
 
-public:
+	public:
 
-    PasswordPromptDlgGenerated( 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 );
+		PasswordPromptDlgGenerated( 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 );
 
-    ~PasswordPromptDlgGenerated();
+		~PasswordPromptDlgGenerated();
 
 };
 
@@ -1403,48 +1403,48 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class ActivationDlgGenerated : public wxDialog
 {
-private:
-
-protected:
-    wxPanel* m_panel35;
-    wxStaticBitmap* m_bitmapActivation;
-    wxRichTextCtrl* m_richTextLastError;
-    wxStaticLine* m_staticline82;
-    wxStaticText* m_staticTextMain;
-    wxStaticLine* m_staticline181;
-    wxStaticLine* m_staticline18111;
-    wxPanel* m_panel3511;
-    wxStaticText* m_staticTextMain1;
-    wxStaticText* m_staticText136;
-    wxButton* m_buttonActivateOnline;
-    wxStaticLine* m_staticline181111;
-    wxStaticLine* m_staticline181112;
-    wxPanel* m_panel351;
-    wxStaticText* m_staticText175;
-    wxStaticText* m_staticText1361;
-    wxButton* m_buttonCopyUrl;
-    wxRichTextCtrl* m_richTextManualActivationUrl;
-    wxStaticText* m_staticText13611;
-    wxTextCtrl* m_textCtrlOfflineActivationKey;
-    wxButton* m_buttonActivateOffline;
-    wxStaticLine* m_staticline13;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonCancel;
-
-    // Virtual event handlers, 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();
 
 };
 
@@ -1453,40 +1453,40 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class WarnAccessRightsMissingDlgGenerated : public wxDialog
 {
-private:
-
-protected:
-    wxStaticBitmap* m_bitmapGrantAccess;
-    wxStaticText* m_staticTextDescr;
-    wxStaticLine* m_staticline20;
-    wxPanel* m_panel39;
-    wxFlexGridSizer* ffgSizer11;
-    wxStaticText* m_staticTextStep1;
-    wxButton* m_buttonLocateBundle;
-    wxStaticText* m_staticTextStep2;
-    wxButton* m_buttonOpenSecurity;
-    wxStaticText* m_staticTextStep3;
-    wxStaticText* m_staticTextAllowChanges;
-    wxStaticText* m_staticTextStep4;
-    wxStaticText* m_staticTextGrantAccess;
-    wxStaticLine* m_staticline36;
-    wxCheckBox* m_checkBoxDontShowAgain;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonClose;
-
-    // Virtual event handlers, 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/log_panel.cpp b/FreeFileSync/Source/ui/log_panel.cpp
index 256c2db4..84a5263c 100644
--- a/FreeFileSync/Source/ui/log_panel.cpp
+++ b/FreeFileSync/Source/ui/log_panel.cpp
@@ -192,7 +192,6 @@ public:
             GridData::renderRowBackgound(dc, rect, row, true /*enabled*/, true /*selected*/, rowHover);
 
         //-------------- draw item separation line -----------------
-        wxDCPenChanger dummy2(dc, wxPen(getColorGridLine(), fastFromDIP(1)));
         const bool drawBottomLine = [&] //don't separate multi-line messages
         {
             if (std::optional<MessageView::LogEntryView> nextEntry = msgView_.getEntry(row + 1))
@@ -201,7 +200,7 @@ public:
         }();
 
         if (drawBottomLine)
-            dc.DrawLine(rect.GetBottomLeft(), rect.GetBottomRight() + wxPoint(1, 0)); //DrawLine() doesn't draw last pixel!
+            clearArea(dc, {rect.x, rect.y + rect.height - dipToWxsize(1), rect.width, dipToWxsize(1)}, getColorGridLine());
         //--------------------------------------------------------
     }
 
@@ -228,11 +227,11 @@ public:
                             switch (entry->type)
                             {
                                 case MSG_TYPE_INFO:
-                                    return loadImage("msg_info", getDefaultMenuIconSize());
+                                    return loadImage("msg_info", dipToScreen(getMenuIconDipSize()));
                                 case MSG_TYPE_WARNING:
-                                    return loadImage("msg_warning", getDefaultMenuIconSize());
+                                    return loadImage("msg_warning", dipToScreen(getMenuIconDipSize()));
                                 case MSG_TYPE_ERROR:
-                                    return loadImage("msg_error", getDefaultMenuIconSize());
+                                    return loadImage("msg_error", dipToScreen(getMenuIconDipSize()));
                             }
                             assert(false);
                             return wxNullImage;
@@ -260,7 +259,7 @@ public:
                     return 2 * getColumnGapLeft() + dc.GetTextExtent(getValue(row, colType)).GetWidth();
 
                 case ColumnTypeLog::severity:
-                    return getDefaultMenuIconSize();
+                    return dipToWxsize(getMenuIconDipSize());
 
                 case ColumnTypeLog::text:
                     return getColumnGapLeft() + dc.GetTextExtent(getValue(row, colType)).GetWidth();
@@ -277,12 +276,12 @@ public:
 
     static int getColumnSeverityDefaultWidth()
     {
-        return getDefaultMenuIconSize();
+        return dipToWxsize(getMenuIconDipSize());
     }
 
     static int getRowDefaultHeight(const Grid& grid)
     {
-        return std::max(getDefaultMenuIconSize(), grid.getMainWin().GetCharHeight() + fastFromDIP(2) /*extra space*/) + fastFromDIP(1) /*bottom border*/;
+        return std::max(dipToWxsize(getMenuIconDipSize()), grid.getMainWin().GetCharHeight() + dipToWxsize(2) /*extra space*/) + dipToWxsize(1) /*bottom border*/;
     }
 
     std::wstring getToolTip(size_t row, ColumnType colType, HoverArea rowHover) override
diff --git a/FreeFileSync/Source/ui/main_dlg.cpp b/FreeFileSync/Source/ui/main_dlg.cpp
index 13c5a411..446baa4c 100644
--- a/FreeFileSync/Source/ui/main_dlg.cpp
+++ b/FreeFileSync/Source/ui/main_dlg.cpp
@@ -319,34 +319,34 @@ void updateTopButton(wxBitmapButton& btn,
     wxImage varImg = varLabelImg;
     if (varIconName)
     {
-        wxImage varIcon = mirrorIfRtl(loadImage(varIconName, -1 /*maxWidth*/, getDefaultMenuIconSize()));
+        wxImage varIcon = mirrorIfRtl(loadImage(varIconName, -1 /*maxWidth*/, dipToScreen(getMenuIconDipSize())));
 
         //if (!highlightCol.IsOk())
         //    varIcon = greyScale(varIcon);
 
         varImg = btn.GetLayoutDirection() != wxLayout_RightToLeft ?
-                 stackImages(varLabelImg, varIcon, ImageStackLayout::horizontal, ImageStackAlignment::center, fastFromDIP(5)) :
-                 stackImages(varIcon, varLabelImg, ImageStackLayout::horizontal, ImageStackAlignment::center, fastFromDIP(5));
+                 stackImages(varLabelImg, varIcon, ImageStackLayout::horizontal, ImageStackAlignment::center, dipToScreen(5)) :
+                 stackImages(varIcon, varLabelImg, ImageStackLayout::horizontal, ImageStackAlignment::center, dipToScreen(5));
     }
 
     wxImage btnImg = stackImages(btnLabelImg, varImg, ImageStackLayout::vertical, ImageStackAlignment::center);
 
     btnImg = btn.GetLayoutDirection() != wxLayout_RightToLeft ?
-             stackImages(iconImg, btnImg, ImageStackLayout::horizontal, ImageStackAlignment::center, fastFromDIP(5)) :
-             stackImages(btnImg, iconImg, ImageStackLayout::horizontal, ImageStackAlignment::center, fastFromDIP(5));
+             stackImages(iconImg, btnImg, ImageStackLayout::horizontal, ImageStackAlignment::center, dipToScreen(5)) :
+             stackImages(btnImg, iconImg, ImageStackLayout::horizontal, ImageStackAlignment::center, dipToScreen(5));
 
     if (extraIconName)
     {
-        const wxImage exImg = loadImage(extraIconName, fastFromDIP(20));
+        const wxImage exImg = loadImage(extraIconName, dipToScreen(20));
 
         btnImg = btn.GetLayoutDirection() != wxLayout_RightToLeft ?
-                 stackImages(btnImg, exImg, ImageStackLayout::horizontal, ImageStackAlignment::center, fastFromDIP(5)) :
-                 stackImages(exImg, btnImg, ImageStackLayout::horizontal, ImageStackAlignment::center, fastFromDIP(5));
+                 stackImages(btnImg, exImg, ImageStackLayout::horizontal, ImageStackAlignment::center, dipToScreen(5)) :
+                 stackImages(exImg, btnImg, ImageStackLayout::horizontal, ImageStackAlignment::center, dipToScreen(5));
     }
 
-    wxSize btnSize = btnImg.GetSize() + wxSize(fastFromDIP(10), 0) /*border space*/;
-    btnSize.x = std::max(btnSize.x, fastFromDIP(TOP_BUTTON_OPTIMAL_WIDTH_DIP));
-
+    wxSize btnSize = btnImg.GetSize() + wxSize(dipToScreen(5 + 5), 0) /*border space*/;
+    btnSize.x = std::max(btnSize.x, dipToScreen(TOP_BUTTON_OPTIMAL_WIDTH_DIP));
+    btnSize.y += dipToScreen(2 + 2); //border space
     btnImg = resizeCanvas(btnImg, btnSize, wxALIGN_CENTER);
 
     if (highlightCol.IsOk())
@@ -554,18 +554,18 @@ MainDialog::MainDialog(const Zstring& globalConfigFilePath,
     folderHistoryRight_(std::make_shared<HistoryList>(globalSettings.mainDlg.folderHistoryRight, globalSettings.folderHistoryMax)),
     imgTrashSmall_([]
 {
-    try { return extractWxImage(fff::getTrashIcon(getDefaultMenuIconSize())); /*throw SysError*/ }
-    catch (SysError&) { assert(false); return loadImage("delete_recycler", getDefaultMenuIconSize()); }
+    try { return extractWxImage(fff::getTrashIcon(dipToScreen(getMenuIconDipSize()))); /*throw SysError*/ }
+    catch (SysError&) { assert(false); return loadImage("delete_recycler", dipToScreen(getMenuIconDipSize())); }
 }
 ()),
 
 imgFileManagerSmall_([]
 {
-    try { return extractWxImage(fff::getFileManagerIcon(getDefaultMenuIconSize())); /*throw SysError*/ }
-    catch (SysError&) { assert(false); return loadImage("file_manager", getDefaultMenuIconSize()); }
+    try { return extractWxImage(fff::getFileManagerIcon(dipToScreen(getMenuIconDipSize()))); /*throw SysError*/ }
+    catch (SysError&) { assert(false); return loadImage("file_manager", dipToScreen(getMenuIconDipSize())); }
 }())
 {
-    SetSizeHints(fastFromDIP(640), fastFromDIP(400));
+    SetSizeHints(dipToWxsize(640), dipToWxsize(400));
 
     //setup sash: detach + reparent:
     m_splitterMain->SetSizer(nullptr); //alas wxFormbuilder doesn't allow us to have child windows without a sizer, so we have to remove it here
@@ -605,13 +605,13 @@ imgFileManagerSmall_([]
     setImage(*m_bpButtonHideSearch, loadImage("close_panel"));
     setImage(*m_bpButtonToggleLog,  loadImage("log_file"));
 
-    m_bpButtonFilter   ->SetMinSize({loadImage("options_filter").GetWidth() + fastFromDIP(27), -1}); //make the filter button wider
-    m_textCtrlSearchTxt->SetMinSize({fastFromDIP(220), -1});
+    m_bpButtonFilter   ->SetMinSize({screenToWxsize(loadImage("options_filter").GetWidth()) + dipToWxsize(27), -1}); //make the filter button wider
+    m_textCtrlSearchTxt->SetMinSize({dipToWxsize(220), -1});
 
     //----------------------------------------------------------------------------------------
     wxImage labelImage = createImageFromText(_("Select view:"), m_bpButtonViewType->GetFont(), wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT));
 
-    labelImage = resizeCanvas(labelImage, labelImage.GetSize() + wxSize(fastFromDIP(10), 0), wxALIGN_CENTER); //add border space
+    labelImage = resizeCanvas(labelImage, labelImage.GetSize() + wxSize(dipToScreen(10), 0), wxALIGN_CENTER); //add border space
 
     auto generateViewTypeImage = [&](const char* imgName)
     {
@@ -650,7 +650,7 @@ imgFileManagerSmall_([]
 
     wxImage imgTime = loadImage("time", -1 /*maxWidth*/, imgFile.GetHeight());
     setImage(*m_bitmapTimeStat, imgTime);
-    m_bitmapTimeStat->SetMinSize({-1, imgFile.GetHeight()});
+    m_bitmapTimeStat->SetMinSize({-1, screenToWxsize(imgFile.GetHeight())});
 
     logPanel_ = new LogPanel(m_panelLog); //pass ownership
     bSizerLog->Add(logPanel_, 1, wxEXPAND);
@@ -711,15 +711,15 @@ imgFileManagerSmall_([]
     updateTopButton(*m_buttonCompare, loadImage("compare"), getVariantName(CompareVariant::timeSize), "cmp_time", nullptr /*extraIconName*/, wxNullColour);
     m_panelTopButtons->GetSizer()->SetSizeHints(m_panelTopButtons); //~=Fit() + SetMinSize()
 
-    m_buttonCancel->SetMinSize({std::max(m_buttonCancel->GetSize().x, fastFromDIP(TOP_BUTTON_OPTIMAL_WIDTH_DIP)),
+    m_buttonCancel->SetMinSize({std::max(m_buttonCancel->GetSize().x, dipToWxsize(TOP_BUTTON_OPTIMAL_WIDTH_DIP)),
                                 std::max(m_buttonCancel->GetSize().y, m_buttonCompare->GetSize().y)
                                });
 
     auiMgr_.AddPane(m_panelTopButtons,
                     wxAuiPaneInfo().Name(L"TopPanel").Layer(2).Top().Row(1).Caption(_("Main Bar")).CaptionVisible(false).
                     PaneBorder(false).Gripper().
-                    //BestSize(-1, m_panelTopButtons->GetSize().GetHeight() + fastFromDIP(10)).
-                    MinSize(fastFromDIP(TOP_BUTTON_OPTIMAL_WIDTH_DIP), m_panelTopButtons->GetSize().GetHeight())
+                    //BestSize(-1, m_panelTopButtons->GetSize().GetHeight() + dipToWxsize(10)).
+                    MinSize(dipToWxsize(TOP_BUTTON_OPTIMAL_WIDTH_DIP), m_panelTopButtons->GetSize().GetHeight())
                    );
     //note: min height is calculated incorrectly by wxAuiManager if panes with and without caption are in the same row => use smaller min-size
 
@@ -734,22 +734,22 @@ imgFileManagerSmall_([]
                     /* yes, m_panelDirectoryPairs's min height is overwritten in updateGuiForFolderPair(), but the default height might be wrong
                        after increasing text size (Win10 Settings -> Accessibility -> Text size), e.g. to 150%:
                        auiMgr_.LoadPerspective will load a too small "dock_size", so m_panelTopLeft/m_panelTopCenter will have squashed height */
-                    MinSize(fastFromDIP(100), m_panelDirectoryPairs->GetSize().y));
+                    MinSize(dipToWxsize(100), m_panelDirectoryPairs->GetSize().y));
 
     m_panelSearch->GetSizer()->SetSizeHints(m_panelSearch); //~=Fit() + SetMinSize()
     auiMgr_.AddPane(m_panelSearch,
                     wxAuiPaneInfo().Name(L"SearchPanel").Layer(2).Bottom().Row(3).Caption(_("Find")).CaptionVisible(false).PaneBorder(false).Gripper().
-                    MinSize(fastFromDIP(100), m_panelSearch->GetSize().y).Hide());
+                    MinSize(dipToWxsize(100), m_panelSearch->GetSize().y).Hide());
 
     auiMgr_.AddPane(m_panelLog,
                     wxAuiPaneInfo().Name(L"LogPanel").Layer(2).Bottom().Row(2).Caption(_("Log")).MaximizeButton().Hide().
-                    MinSize (fastFromDIP(100), fastFromDIP(100)).
-                    BestSize(fastFromDIP(600), fastFromDIP(300)));
+                    MinSize (dipToWxsize(100), dipToWxsize(100)).
+                    BestSize(dipToWxsize(600), dipToWxsize(300)));
 
     m_panelViewFilter->GetSizer()->SetSizeHints(m_panelViewFilter); //~=Fit() + SetMinSize()
     auiMgr_.AddPane(m_panelViewFilter,
                     wxAuiPaneInfo().Name(L"ViewFilterPanel").Layer(2).Bottom().Row(1).Caption(_("View Settings")).CaptionVisible(false).
-                    PaneBorder(false).Gripper().MinSize(fastFromDIP(80), m_panelViewFilter->GetSize().y));
+                    PaneBorder(false).Gripper().MinSize(dipToWxsize(80), m_panelViewFilter->GetSize().y));
 
     m_panelConfig->GetSizer()->SetSizeHints(m_panelConfig); //~=Fit() + SetMinSize()
     auiMgr_.AddPane(m_panelConfig,
@@ -757,8 +757,8 @@ imgFileManagerSmall_([]
 
     auiMgr_.AddPane(m_gridOverview,
                     wxAuiPaneInfo().Name(L"OverviewPanel").Layer(3).Left().Position(2).Caption(_("Overview")).
-                    MinSize (fastFromDIP(100), fastFromDIP(100)).
-                    BestSize(fastFromDIP(300), -1));
+                    MinSize (dipToWxsize(100), dipToWxsize(100)).
+                    BestSize(dipToWxsize(300), -1));
     {
         wxAuiDockArt* artProvider = auiMgr_.GetArtProvider();
 
@@ -766,7 +766,7 @@ imgFileManagerSmall_([]
         font.SetWeight(wxFONTWEIGHT_BOLD);
         font.SetPointSize(wxNORMAL_FONT->GetPointSize()); //= larger than the wxAuiDockArt default; looks better on OS X
         artProvider->SetFont(wxAUI_DOCKART_CAPTION_FONT, font);
-        artProvider->SetMetric(wxAUI_DOCKART_CAPTION_SIZE, font.GetPixelSize().GetHeight() + fastFromDIP(2 + 2));
+        artProvider->SetMetric(wxAUI_DOCKART_CAPTION_SIZE, font.GetPixelSize().GetHeight() + dipToWxsize(2 + 2));
 
         //- fix wxWidgets 3.1.0 insane color scheme
         artProvider->SetColor(wxAUI_DOCKART_INACTIVE_CAPTION_TEXT_COLOUR, *wxWHITE); //accessibility: always set both foreground AND background colors!
@@ -853,25 +853,25 @@ imgFileManagerSmall_([]
     setImage(*m_bitmapSmallFileRight,      imgFile);
 
     //---------------------- menu bar----------------------------
-    setImage(*m_menuItemNew,         loadImage("cfg_new",   getDefaultMenuIconSize()));
-    setImage(*m_menuItemLoad,        loadImage("cfg_load",  getDefaultMenuIconSize()));
-    setImage(*m_menuItemSave,        loadImage("cfg_save",  getDefaultMenuIconSize()));
-    setImage(*m_menuItemSaveAsBatch, loadImage("cfg_batch", getDefaultMenuIconSize()));
-
-    setImage(*m_menuItemShowLog,      loadImage("log_file",        getDefaultMenuIconSize()));
-    setImage(*m_menuItemCompare,      loadImage("compare",         getDefaultMenuIconSize()));
-    setImage(*m_menuItemCompSettings, loadImage("options_compare", getDefaultMenuIconSize()));
-    setImage(*m_menuItemFilter,       loadImage("options_filter",  getDefaultMenuIconSize()));
-    setImage(*m_menuItemSyncSettings, loadImage("options_sync",    getDefaultMenuIconSize()));
-    setImage(*m_menuItemSynchronize,  loadImage("start_sync",      getDefaultMenuIconSize()));
-
-    setImage(*m_menuItemOptions,     loadImage("settings", getDefaultMenuIconSize()));
+    setImage(*m_menuItemNew,         loadImage("cfg_new",   dipToScreen(getMenuIconDipSize())));
+    setImage(*m_menuItemLoad,        loadImage("cfg_load",  dipToScreen(getMenuIconDipSize())));
+    setImage(*m_menuItemSave,        loadImage("cfg_save",  dipToScreen(getMenuIconDipSize())));
+    setImage(*m_menuItemSaveAsBatch, loadImage("cfg_batch", dipToScreen(getMenuIconDipSize())));
+
+    setImage(*m_menuItemShowLog,      loadImage("log_file",        dipToScreen(getMenuIconDipSize())));
+    setImage(*m_menuItemCompare,      loadImage("compare",         dipToScreen(getMenuIconDipSize())));
+    setImage(*m_menuItemCompSettings, loadImage("options_compare", dipToScreen(getMenuIconDipSize())));
+    setImage(*m_menuItemFilter,       loadImage("options_filter",  dipToScreen(getMenuIconDipSize())));
+    setImage(*m_menuItemSyncSettings, loadImage("options_sync",    dipToScreen(getMenuIconDipSize())));
+    setImage(*m_menuItemSynchronize,  loadImage("start_sync",      dipToScreen(getMenuIconDipSize())));
+
+    setImage(*m_menuItemOptions,     loadImage("settings", dipToScreen(getMenuIconDipSize())));
     setImage(*m_menuItemFind,        loadImage("find_sicon"));
     setImage(*m_menuItemResetLayout, loadImage("reset_sicon"));
 
-    setImage(*m_menuItemHelp,            loadImage("help",         getDefaultMenuIconSize()));
-    setImage(*m_menuItemAbout,           loadImage("about",        getDefaultMenuIconSize()));
-    setImage(*m_menuItemCheckVersionNow, loadImage("update_check", getDefaultMenuIconSize()));
+    setImage(*m_menuItemHelp,            loadImage("help",         dipToScreen(getMenuIconDipSize())));
+    setImage(*m_menuItemAbout,           loadImage("about",        dipToScreen(getMenuIconDipSize())));
+    setImage(*m_menuItemCheckVersionNow, loadImage("update_check", dipToScreen(getMenuIconDipSize())));
 
     fixMenuIcons(*m_menuFile);
     fixMenuIcons(*m_menuActions);
@@ -1114,7 +1114,7 @@ void MainDialog::setGlobalCfgOnInit(const XmlGlobalSettings& globalSettings)
     //caveat: set/get language asymmmetry! setLanguage(globalSettings.programLanguage); //throw FileError
     //we need to set language before creating this class!
 
-    WindowLayout::setInitial(*this, {layout.mainDlg.size, layout.mainDlg.pos, layout.mainDlg.isMaximized}, {fastFromDIP(900), fastFromDIP(600)} /*defaultSize*/);
+    WindowLayout::setInitial(*this, {layout.mainDlg.size, layout.mainDlg.pos, layout.mainDlg.isMaximized}, {dipToWxsize(900), dipToWxsize(600)} /*defaultSize*/);
 
     //set column attributes
     m_gridMainL   ->setColumnConfig(convertColAttributes(layout.fileColumnAttribsLeft,  getFileGridDefaultColAttribsLeft()));
@@ -2693,8 +2693,8 @@ void MainDialog::onTreeGridContext(GridContextMenuEvent& event)
             menu.addItem(label + L" <" + _("multiple selection") + L">",
                          [this, &selection, include] { addFilterPhrase(getFilterPhraseRel(selection, selection), include, true /*requireNewLine*/); }, img);
     };
-    addFilterMenu(_("&Include via filter:"), loadImage("filter_include", getDefaultMenuIconSize()), true);
-    addFilterMenu(_("&Exclude via filter:"), loadImage("filter_exclude", getDefaultMenuIconSize()), false);
+    addFilterMenu(_("&Include via filter:"), loadImage("filter_include", dipToScreen(getMenuIconDipSize())), true);
+    addFilterMenu(_("&Exclude via filter:"), loadImage("filter_exclude", dipToScreen(getMenuIconDipSize())), false);
     //----------------------------------------------------------------------------------------------------
     if (m_bpButtonShowExcluded->isActive() && !selection.empty() && !selection[0]->isActive())
         menu.addItem(_("Include temporarily") + L"\tSpace", [this, &selection] { setIncludedManually(selection, true); }, loadImage("checkbox_true"));
@@ -2709,7 +2709,8 @@ void MainDialog::onTreeGridContext(GridContextMenuEvent& event)
         return false;
     }();
     menu.addSeparator();
-    menu.addItem(_("&Synchronize selection") + L"\tEnter", [&] { startSyncForSelecction(selection); }, loadImage("start_sync_selection", getDefaultMenuIconSize()), selectionContainsItemsToSync);
+    menu.addItem(_("&Synchronize selection") + L"\tEnter", [&] { startSyncForSelecction(selection); },
+                 loadImage("start_sync_selection", dipToScreen(getMenuIconDipSize())), selectionContainsItemsToSync);
     //----------------------------------------------------------------------------------------------------
     const ptrdiff_t itemsSelected =
     std::count_if(selection.begin(), selection.end(), [](const FileSystemObject* fsObj) { return !fsObj->isEmpty<SelectSide::left >(); }) +
@@ -2721,7 +2722,7 @@ void MainDialog::onTreeGridContext(GridContextMenuEvent& event)
     menu.addSeparator();
 
     menu.addItem((itemsSelected > 1 ? _("Multi-&Rename") : _("&Rename")) + L"\tF2",
-                 [&] { renameSelectedFiles(selection, selection); }, loadImage("rename", getDefaultMenuIconSize()), itemsSelected > 0);
+                 [&] { renameSelectedFiles(selection, selection); }, loadImage("rename", dipToScreen(getMenuIconDipSize())), itemsSelected > 0);
 
     menu.addItem(_("&Delete") + L"\t(Shift+)Del", [&] { deleteSelectedFiles(selection, selection, true /*moveToRecycler*/); }, imgTrashSmall_, itemsSelected > 0);
 
@@ -2836,8 +2837,8 @@ void MainDialog::onGridContextRim(const std::vector<FileSystemObject*>& selectio
             menu.addItem(label + L" <" + _("multiple selection") + L">",
                          [this, &selectionL, &selectionR, include] { addFilterPhrase(getFilterPhraseRel(selectionL, selectionR), include, true /*requireNewLine*/); }, img);
     };
-    addFilterMenu(_("&Include via filter:"), loadImage("filter_include", getDefaultMenuIconSize()), true);
-    addFilterMenu(_("&Exclude via filter:"), loadImage("filter_exclude", getDefaultMenuIconSize()), false);
+    addFilterMenu(_("&Include via filter:"), loadImage("filter_include", dipToScreen(getMenuIconDipSize())), true);
+    addFilterMenu(_("&Exclude via filter:"), loadImage("filter_exclude", dipToScreen(getMenuIconDipSize())), false);
     //----------------------------------------------------------------------------------------------------
     if (m_bpButtonShowExcluded->isActive() && !selection.empty() && !selection[0]->isActive())
         menu.addItem(_("Include temporarily") + L"\tSpace", [this, &selection] { setIncludedManually(selection, true); }, loadImage("checkbox_true"));
@@ -2852,7 +2853,7 @@ void MainDialog::onGridContextRim(const std::vector<FileSystemObject*>& selectio
         return false;
     }();
     menu.addSeparator();
-    menu.addItem(_("&Synchronize selection") + L"\tEnter", [&] { startSyncForSelecction(selection); }, loadImage("start_sync_selection", getDefaultMenuIconSize()), selectionContainsItemsToSync);
+    menu.addItem(_("&Synchronize selection") + L"\tEnter", [&] { startSyncForSelecction(selection); }, loadImage("start_sync_selection", dipToScreen(getMenuIconDipSize())), selectionContainsItemsToSync);
     //----------------------------------------------------------------------------------------------------
     if (!globalCfg_.externalApps.empty())
     {
@@ -2890,7 +2891,7 @@ void MainDialog::onGridContextRim(const std::vector<FileSystemObject*>& selectio
     menu.addSeparator();
 
     menu.addItem((itemsSelected > 1 ? _("Multi-&Rename") : _("&Rename")) + L"\tF2",
-                 [&] { renameSelectedFiles(selectionL, selectionR); }, loadImage("rename", getDefaultMenuIconSize()), itemsSelected > 0);
+                 [&] { renameSelectedFiles(selectionL, selectionR); }, loadImage("rename", dipToScreen(getMenuIconDipSize())), itemsSelected > 0);
 
     menu.addItem(_("&Delete") + L"\t(Shift+)Del", [&] { deleteSelectedFiles(selectionL, selectionR, true /*moveToRecycler*/); }, imgTrashSmall_, itemsSelected > 0);
 
@@ -2956,8 +2957,11 @@ void MainDialog::onGridLabelContextC(GridLabelClickEvent& event)
     ContextMenu menu;
 
     const GridViewType viewType = m_bpButtonViewType->isActive() ? GridViewType::action : GridViewType::difference;
-    menu.addItem(_("Difference") + (viewType != GridViewType::difference ? L"\tF11" : L""), [&] { setGridViewType(GridViewType::difference); }, greyScaleIfDisabled(loadImage("compare", getDefaultMenuIconSize()), viewType == GridViewType::difference));
-    menu.addItem(_("Action")     + (viewType != GridViewType::action     ? L"\tF11" : L""), [&] { setGridViewType(GridViewType::action    ); }, greyScaleIfDisabled(loadImage("start_sync", getDefaultMenuIconSize()), viewType == GridViewType::action));
+    menu.addItem(_("Difference") + (viewType != GridViewType::difference ? L"\tF11" : L""),
+                 [&] { setGridViewType(GridViewType::difference); }, greyScaleIfDisabled(loadImage("compare", dipToScreen(getMenuIconDipSize())), viewType == GridViewType::difference));
+
+    menu.addItem(_("Action")     + (viewType != GridViewType::action ? L"\tF11" : L""),
+                 [&] { setGridViewType(GridViewType::action); }, greyScaleIfDisabled(loadImage("start_sync", dipToScreen(getMenuIconDipSize())), viewType == GridViewType::action));
     menu.popup(*m_gridMainC, {event.mousePos_.x, m_gridMainC->getColumnLabelHeight()});
 }
 
@@ -3166,7 +3170,7 @@ void MainDialog::onCompSettingsContext(wxEvent& event)
 
     auto addVariantItem = [&](CompareVariant cmpVar, const char* iconName)
     {
-        const wxImage imgSel = loadImage(iconName, -1 /*maxWidth*/, getDefaultMenuIconSize());
+        const wxImage imgSel = loadImage(iconName, -1 /*maxWidth*/, dipToScreen(getMenuIconDipSize()));
 
         menu.addItem(getVariantName(cmpVar), [&setVariant, cmpVar] { setVariant(cmpVar); }, greyScaleIfDisabled(imgSel, activeCmpVar == cmpVar));
     };
@@ -3192,7 +3196,7 @@ void MainDialog::onSyncSettingsContext(wxEvent& event)
 
     auto addVariantItem = [&](SyncVariant syncVar, const char* iconName)
     {
-        const wxImage imgSel = mirrorIfRtl(loadImage(iconName, -1 /*maxWidth*/, getDefaultMenuIconSize()));
+        const wxImage imgSel = mirrorIfRtl(loadImage(iconName, -1 /*maxWidth*/, dipToScreen(getMenuIconDipSize())));
 
         menu.addItem(getVariantName(syncVar), [&setVariant, syncVar] { setVariant(syncVar); }, greyScaleIfDisabled(imgSel, activeSyncVar == syncVar));
     };
@@ -3902,12 +3906,15 @@ void MainDialog::onCfgGridContext(GridContextMenuEvent& event)
         //m_gridCfgHistory->Refresh(); <- implicit in last call
     };
 
+    const wxSize colSize{this->GetCharHeight(), this->GetCharHeight()};
+
     auto addColorOption = [&](const wxColor& col, const wxString& name)
     {
         submenu.addItem(name, [&, col] { applyBackColor(col); },
-                        rectangleImage({this->GetCharHeight(), this->GetCharHeight()},
+                        rectangleImage({wxsizeToScreen(this->GetCharHeight()),
+                                        wxsizeToScreen(this->GetCharHeight())},
                                        col.Ok() ? col : wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW),
-        {0xdd, 0xdd, 0xdd} /*light grey*/, fastFromDIP(1)),
+        {0xdd, 0xdd, 0xdd} /*light grey*/, dipToScreen(1)),
         !selectedRows.empty());
     };
 
@@ -3933,15 +3940,16 @@ void MainDialog::onCfgGridContext(GridContextMenuEvent& event)
     }
 
     //show color picker
-    wxBitmap bmpColorPicker(this->GetCharHeight(), this->GetCharHeight()); //seems we don't need to pass 24-bit depth here even for high-contrast color schemes
-    bmpColorPicker.SetScaleFactor(getDisplayScaleFactor());
+    wxBitmap bmpColorPicker(wxsizeToScreen(colSize.x),
+                            wxsizeToScreen(colSize.y)); //seems we don't need to pass 24-bit depth here even for high-contrast color schemes
+    bmpColorPicker.SetScaleFactor(getScreenDpiScale());
     {
         wxMemoryDC dc(bmpColorPicker);
         const wxColor borderCol(0xdd, 0xdd, 0xdd); //light grey
-        drawFilledRectangle(dc, wxRect(bmpColorPicker.GetSize()), wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW), borderCol, fastFromDIP(1));
+        drawFilledRectangle(dc, wxRect(colSize), wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW), borderCol, dipToWxsize(1));
 
         dc.SetFont(dc.GetFont().Bold());
-        dc.DrawText(L"?", wxPoint() + (bmpColorPicker.GetSize() - dc.GetTextExtent(L"?")) / 2);
+        dc.DrawText(L"?", wxPoint() + (colSize - dc.GetTextExtent(L"?")) / 2);
     }
 
     submenu.addItem(_("Different color..."), [&]
@@ -3991,7 +3999,7 @@ void MainDialog::onCfgGridContext(GridContextMenuEvent& event)
                 inserted)
                 addColorOption(item.backColor, item.backColor.GetAsString(wxC2S_HTML_SYNTAX)); //#RRGGBB
 
-    menu.addSubmenu(_("Background color"), submenu, loadImage("color", getDefaultMenuIconSize()), !selectedRows.empty());
+    menu.addSubmenu(_("Background color"), submenu, loadImage("color", dipToScreen(getMenuIconDipSize())), !selectedRows.empty());
     menu.addSeparator();
     //--------------------------------------------------------------------------------------------------------
 
@@ -4029,7 +4037,7 @@ void MainDialog::onCfgGridContext(GridContextMenuEvent& event)
                 return !cfg->isLastRunCfg;
         return false;
     }();
-    menu.addItem(_("&Rename") + L"\tF2",  [this] { renameSelectedCfgHistoryItem (); }, loadImage("rename", getDefaultMenuIconSize()), renameEnabled);
+    menu.addItem(_("&Rename") + L"\tF2",  [this] { renameSelectedCfgHistoryItem (); }, loadImage("rename", dipToScreen(getMenuIconDipSize())), renameEnabled);
 
     //--------------------------------------------------------------------------------------------------------
     menu.addItem(_("&Hide")   + L"\tDel",       [this] { removeSelectedCfgHistoryItems(false /*deleteFromDisk*/); }, wxNullImage,    !selectedRows.empty());
@@ -4445,8 +4453,12 @@ void MainDialog::onViewTypeContextMouse(wxMouseEvent& event)
     ContextMenu menu;
 
     const GridViewType viewType = m_bpButtonViewType->isActive() ? GridViewType::action : GridViewType::difference;
-    menu.addItem(_("Difference") + (viewType != GridViewType::difference ? L"\tF11" : L""), [&] { setGridViewType(GridViewType::difference); }, greyScaleIfDisabled(loadImage("compare", getDefaultMenuIconSize()), viewType == GridViewType::difference));
-    menu.addItem(_("Action")     + (viewType != GridViewType::action     ? L"\tF11" : L""), [&] { setGridViewType(GridViewType::action    ); }, greyScaleIfDisabled(loadImage("start_sync", getDefaultMenuIconSize()), viewType == GridViewType::action));
+
+    menu.addItem(_("Difference") + (viewType != GridViewType::difference ? L"\tF11" : L""),
+                 [&] { setGridViewType(GridViewType::difference); }, greyScaleIfDisabled(loadImage("compare", dipToScreen(getMenuIconDipSize())), viewType == GridViewType::difference));
+
+    menu.addItem(_("Action")     + (viewType != GridViewType::action     ? L"\tF11" : L""),
+                 [&] { setGridViewType(GridViewType::action); }, greyScaleIfDisabled(loadImage("start_sync", dipToScreen(getMenuIconDipSize())), viewType == GridViewType::action));
 
     menu.popup(*m_bpButtonViewType, {m_bpButtonViewType->GetSize().x, 0});
 }
@@ -4486,7 +4498,7 @@ void MainDialog::onViewFilterContext(wxEvent& event)
         flashStatusInfo(_("View settings saved"));
     };
 
-    menu.addItem(_("&Save as default"), saveDefault, loadImage("cfg_save", getDefaultMenuIconSize()));
+    menu.addItem(_("&Save as default"), saveDefault, loadImage("cfg_save", dipToScreen(getMenuIconDipSize())));
     menu.popup(*m_bpButtonViewFilterContext, {m_bpButtonViewFilterContext->GetSize().x, 0});
 }
 
@@ -5199,11 +5211,11 @@ void MainDialog::setLastOperationLog(const ProcessSummary& summary, const std::s
         {
             const ErrorLogStats logCount = getStats(*errorLog);
             if (logCount.error > 0)
-                return loadImage("msg_error", getDefaultMenuIconSize());
+                return loadImage("msg_error", dipToScreen(getMenuIconDipSize()));
             if (logCount.warning > 0)
-                return loadImage("msg_warning", getDefaultMenuIconSize());
+                return loadImage("msg_warning", dipToScreen(getMenuIconDipSize()));
 
-            //return loadImage("msg_success", getDefaultMenuIconSize()); -> too noisy?
+            //return loadImage("msg_success", dipToScreen(getMenuIconDipSize())); -> too noisy?
         }
         return wxNullImage;
     }();
@@ -5452,11 +5464,11 @@ void MainDialog::updateGridViewData()
                 imgCountReleased = resizeCanvas(imgCountReleased, imgCountPressed.GetSize(), wxALIGN_CENTER); //match with imgCountPressed's bold font
 
                 //add bottom/right border space
-                imgCountPressed  = resizeCanvas(imgCountPressed,  imgCountPressed .GetSize() + wxSize(fastFromDIP(5), fastFromDIP(5)), wxALIGN_TOP | wxALIGN_LEFT);
-                imgCountReleased = resizeCanvas(imgCountReleased, imgCountReleased.GetSize() + wxSize(fastFromDIP(5), fastFromDIP(5)), wxALIGN_TOP | wxALIGN_LEFT);
+                imgCountPressed  = resizeCanvas(imgCountPressed,  imgCountPressed .GetSize() + wxSize(dipToScreen(5), dipToScreen(5)), wxALIGN_TOP | wxALIGN_LEFT);
+                imgCountReleased = resizeCanvas(imgCountReleased, imgCountReleased.GetSize() + wxSize(dipToScreen(5), dipToScreen(5)), wxALIGN_TOP | wxALIGN_LEFT);
 
                 wxImage imgCategory = loadImage(imgName);
-                imgCategory = resizeCanvas(imgCategory, imgCategory.GetSize() + wxSize(fastFromDIP(5), fastFromDIP(2)), wxALIGN_CENTER);
+                imgCategory = resizeCanvas(imgCategory, imgCategory.GetSize() + wxSize(dipToScreen(5), dipToScreen(2)), wxALIGN_CENTER);
 
                 wxImage imgIconReleased = imgCategory.ConvertToGreyscale(1.0/3, 1.0/3, 1.0/3); //treat all channels equally!
                 brighten(imgIconReleased, 80);
@@ -5956,8 +5968,8 @@ void MainDialog::updateGuiForFolderPair()
     wxAuiPaneInfo& dirPane = auiMgr_.GetPane(m_panelDirectoryPairs);
 
     //make sure user cannot fully shrink additional folder pairs
-    dirPane.MinSize(fastFromDIP(100), firstPairHeight + addPairCountMin * addPairHeight);
-    dirPane.BestSize(-1,              firstPairHeight + addPairCountOpt * addPairHeight);
+    dirPane.MinSize(dipToWxsize(100), firstPairHeight + addPairCountMin * addPairHeight);
+    dirPane.BestSize(-1,            firstPairHeight + addPairCountOpt * addPairHeight);
 
     //########################################################################################################################
     //wxAUI hack: call wxAuiPaneInfo::Fixed() to apply best size:
diff --git a/FreeFileSync/Source/ui/progress_indicator.cpp b/FreeFileSync/Source/ui/progress_indicator.cpp
index 8aaa5b22..47d196ae 100644
--- a/FreeFileSync/Source/ui/progress_indicator.cpp
+++ b/FreeFileSync/Source/ui/progress_indicator.cpp
@@ -189,14 +189,14 @@ CompareProgressPanel::Impl::Impl(wxFrame& parentWindow) :
     parentWindow_(parentWindow)
 {
     setImage(*m_bitmapItemStat, IconBuffer::genericFileIcon(IconBuffer::IconSize::small));
-    setImage(*m_bitmapTimeStat, loadImage("time", -1 /*maxWidth*/, IconBuffer::getSize(IconBuffer::IconSize::small)));
-    m_bitmapTimeStat->SetMinSize({-1, IconBuffer::getSize(IconBuffer::IconSize::small)});
+    setImage(*m_bitmapTimeStat, loadImage("time", -1 /*maxWidth*/, IconBuffer::getPixSize(IconBuffer::IconSize::small)));
+    m_bitmapTimeStat->SetMinSize({-1, screenToWxsize(IconBuffer::getPixSize(IconBuffer::IconSize::small))});
 
-    setImage(*m_bitmapErrors,   loadImage("msg_error",   getDefaultMenuIconSize()));
-    setImage(*m_bitmapWarnings, loadImage("msg_warning", getDefaultMenuIconSize()));
+    setImage(*m_bitmapErrors,   loadImage("msg_error",   dipToScreen(getMenuIconDipSize())));
+    setImage(*m_bitmapWarnings, loadImage("msg_warning", dipToScreen(getMenuIconDipSize())));
 
-    setImage(*m_bitmapIgnoreErrors, loadImage("error_ignore_active", getDefaultMenuIconSize()));
-    setImage(*m_bitmapRetryErrors,  loadImage("error_retry",         getDefaultMenuIconSize()));
+    setImage(*m_bitmapIgnoreErrors, loadImage("error_ignore_active", dipToScreen(getMenuIconDipSize())));
+    setImage(*m_bitmapRetryErrors,  loadImage("error_retry",         dipToScreen(getMenuIconDipSize())));
 
     //make sure standard height matches ProcessPhase::binaryCompare statistics layout (== largest)
 
@@ -207,10 +207,10 @@ CompareProgressPanel::Impl::Impl(wxFrame& parentWindow) :
                                         setBaseColors(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT), wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)).
                                         setSelectionMode(GraphSelMode::none));
 
-    m_panelProgressGraph->addCurve(curveDataBytes_, Graph2D::CurveAttributes().setLineWidth(fastFromDIP(1)).fillPolygonArea(getColorBytes()).setColor(Graph2D::getBorderColor()));
-    m_panelProgressGraph->addCurve(curveDataItems_, Graph2D::CurveAttributes().setLineWidth(fastFromDIP(1)).fillPolygonArea(getColorItems()).setColor(Graph2D::getBorderColor()));
+    m_panelProgressGraph->addCurve(curveDataBytes_, Graph2D::CurveAttributes().setLineWidth(dipToWxsize(1)).fillPolygonArea(getColorBytes()).setColor(Graph2D::getBorderColor()));
+    m_panelProgressGraph->addCurve(curveDataItems_, Graph2D::CurveAttributes().setLineWidth(dipToWxsize(1)).fillPolygonArea(getColorItems()).setColor(Graph2D::getBorderColor()));
 
-    m_panelProgressGraph->addCurve(makeSharedRef<CurveDataProgressSeparatorLine>(), Graph2D::CurveAttributes().setLineWidth(fastFromDIP(1)).setColor(Graph2D::getBorderColor()));
+    m_panelProgressGraph->addCurve(makeSharedRef<CurveDataProgressSeparatorLine>(), Graph2D::CurveAttributes().setLineWidth(dipToWxsize(1)).setColor(Graph2D::getBorderColor()));
 
     Layout();
     m_panelItemStats->Layout();
@@ -810,7 +810,7 @@ syncStat_(&syncStat)
     assert((std::is_same_v<TopLevelDialog, wxFrame> == !parentFrame));
 
     //finish construction of this dialog:
-    this->pnl_.m_panelProgress->SetMinSize({fastFromDIP(550), fastFromDIP(340)});
+    this->pnl_.m_panelProgress->SetMinSize({dipToWxsize(550), dipToWxsize(340)});
 
     wxBoxSizer* bSizer170 = new wxBoxSizer(wxVERTICAL);
     bSizer170->Add(&pnl_, 1, wxEXPAND);
@@ -858,18 +858,18 @@ syncStat_(&syncStat)
     setImage(*pnl_.m_bpButtonMinimizeToTray, loadImage("minimize_to_tray"));
 
     setImage(*pnl_.m_bitmapItemStat, IconBuffer::genericFileIcon(IconBuffer::IconSize::small));
-    setImage(*pnl_.m_bitmapTimeStat, loadImage("time", -1 /*maxWidth*/, IconBuffer::getSize(IconBuffer::IconSize::small)));
-    pnl_.m_bitmapTimeStat->SetMinSize({-1, IconBuffer::getSize(IconBuffer::IconSize::small)});
+    setImage(*pnl_.m_bitmapTimeStat, loadImage("time", -1 /*maxWidth*/, IconBuffer::getPixSize(IconBuffer::IconSize::small)));
+    pnl_.m_bitmapTimeStat->SetMinSize({-1, screenToWxsize(IconBuffer::getPixSize(IconBuffer::IconSize::small))});
 
-    setImage(*pnl_.m_bitmapErrors,   loadImage("msg_error",   getDefaultMenuIconSize()));
-    setImage(*pnl_.m_bitmapWarnings, loadImage("msg_warning", getDefaultMenuIconSize()));
+    setImage(*pnl_.m_bitmapErrors,   loadImage("msg_error",   dipToScreen(getMenuIconDipSize())));
+    setImage(*pnl_.m_bitmapWarnings, loadImage("msg_warning", dipToScreen(getMenuIconDipSize())));
 
-    setImage(*pnl_.m_bitmapIgnoreErrors, loadImage("error_ignore_active", getDefaultMenuIconSize()));
-    setImage(*pnl_.m_bitmapRetryErrors,  loadImage("error_retry", getDefaultMenuIconSize()));
+    setImage(*pnl_.m_bitmapIgnoreErrors, loadImage("error_ignore_active", dipToScreen(getMenuIconDipSize())));
+    setImage(*pnl_.m_bitmapRetryErrors,  loadImage("error_retry",         dipToScreen(getMenuIconDipSize())));
 
     //init graph
-    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);
+    const int xLabelHeight = this->GetCharHeight() + dipToWxsize(2) /*margin*/; //use same height for both graphs to make sure they stretch evenly
+    const int yLabelWidth  = dipToWxsize(70);
     pnl_.m_panelGraphBytes->setAttributes(Graph2D::MainAttributes().
                                           setLabelX(XLabelPos::top,   xLabelHeight, std::make_shared<LabelFormatterTimeElapsed>()).
                                           setLabelY(YLabelPos::right, yLabelWidth,  std::make_shared<LabelFormatterBytes>()).
@@ -882,21 +882,22 @@ syncStat_(&syncStat)
                                           setBaseColors(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT), wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)).
                                           setSelectionMode(GraphSelMode::none));
 
-    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(curveBytes_, Graph2D::CurveAttributes().setLineWidth(dipToWxsize(1)).fillCurveArea(getColorBytes()).setColor(getColorBytesRim()));
+    pnl_.m_panelGraphItems->addCurve(curveItems_, Graph2D::CurveAttributes().setLineWidth(dipToWxsize(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()));
+    pnl_.m_panelGraphBytes->addCurve(curveBytesEstim_, Graph2D::CurveAttributes().setLineWidth(dipToWxsize(1)).fillCurveArea(getColorLightGrey()).setColor(getColorDarkGrey()));
+    pnl_.m_panelGraphItems->addCurve(curveItemsEstim_, Graph2D::CurveAttributes().setLineWidth(dipToWxsize(1)).fillCurveArea(getColorLightGrey()).setColor(getColorDarkGrey()));
 
-    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(curveBytesTimeNow_, Graph2D::CurveAttributes().setLineWidth(dipToWxsize(2)).setColor(getColorBytesDark()));
+    pnl_.m_panelGraphItems->addCurve(curveItemsTimeNow_, Graph2D::CurveAttributes().setLineWidth(dipToWxsize(2)).setColor(getColorItemsDark()));
 
-    pnl_.m_panelGraphBytes->addCurve(curveBytesTimeEstim_, Graph2D::CurveAttributes().setLineWidth(fastFromDIP(2)).setColor(getColorDarkGrey()));
-    pnl_.m_panelGraphItems->addCurve(curveItemsTimeEstim_, Graph2D::CurveAttributes().setLineWidth(fastFromDIP(2)).setColor(getColorDarkGrey()));
+    pnl_.m_panelGraphBytes->addCurve(curveBytesTimeEstim_, Graph2D::CurveAttributes().setLineWidth(dipToWxsize(2)).setColor(getColorDarkGrey()));
+    pnl_.m_panelGraphItems->addCurve(curveItemsTimeEstim_, Graph2D::CurveAttributes().setLineWidth(dipToWxsize(2)).setColor(getColorDarkGrey()));
 
     //graph legend:
-    setImage(*pnl_.m_bitmapGraphKeyBytes, rectangleImage({this->GetCharHeight(), this->GetCharHeight()}, getColorBytes(), getColorBytesRim(), fastFromDIP(1)));
-    setImage(*pnl_.m_bitmapGraphKeyItems, rectangleImage({this->GetCharHeight(), this->GetCharHeight()}, getColorItems(), getColorItemsRim(), fastFromDIP(1)));
+    const wxSize squareSize{this->GetCharHeight(), this->GetCharHeight()};
+    setImage(*pnl_.m_bitmapGraphKeyBytes, rectangleImage({wxsizeToScreen(squareSize.x), wxsizeToScreen(squareSize.y)}, getColorBytes(), getColorBytesRim(), dipToScreen(1)));
+    setImage(*pnl_.m_bitmapGraphKeyItems, rectangleImage({wxsizeToScreen(squareSize.x), wxsizeToScreen(squareSize.y)}, getColorItems(), getColorItemsRim(), dipToScreen(1)));
 
     pnl_.bSizerDynSpace->SetMinSize(yLabelWidth, -1); //ensure item/time stats are nicely centered
 
@@ -1485,7 +1486,7 @@ void SyncProgressDialogImpl<TopLevelDialog>::showSummary(TaskResult syncResult,
 
     //-------------------------------------------------------------
 
-    pnl_.m_notebookResult->SetPadding(wxSize(fastFromDIP(2), 0)); //height cannot be changed
+    pnl_.m_notebookResult->SetPadding(wxSize(dipToWxsize(2), 0)); //height cannot be changed
 
     //1. re-arrange graph into results listbook
     const size_t pagePosProgress = 0;
@@ -1508,11 +1509,11 @@ void SyncProgressDialogImpl<TopLevelDialog>::showSummary(TaskResult syncResult,
         pnl_.m_notebookResult->ChangeSelection(pagePosLog);
 
     //fill image list to cope with wxNotebook image setting design desaster...
-    const int imgListSize = fastFromDIP(16); //also required by GTK => don't use getDefaultMenuIconSize()
+    const int imgListSize = dipToWxsize(16); //also required by GTK => don't use getMenuIconDipSize()
     auto imgList = std::make_unique<wxImageList>(imgListSize, imgListSize);
 
-    imgList->Add(toScaledBitmap(loadImage("progress", imgListSize)));
-    imgList->Add(toScaledBitmap(loadImage("log_file", imgListSize)));
+    imgList->Add(toScaledBitmap(loadImage("progress", wxsizeToScreen(imgListSize))));
+    imgList->Add(toScaledBitmap(loadImage("log_file", wxsizeToScreen(imgListSize))));
 
     pnl_.m_notebookResult->AssignImageList(imgList.release()); //pass ownership
 
diff --git a/FreeFileSync/Source/ui/rename_dlg.cpp b/FreeFileSync/Source/ui/rename_dlg.cpp
index 62f2abe9..42f133ba 100644
--- a/FreeFileSync/Source/ui/rename_dlg.cpp
+++ b/FreeFileSync/Source/ui/rename_dlg.cpp
@@ -103,11 +103,11 @@ public:
     void renderCell(wxDC& dc, const wxRect& rect, size_t row, ColumnType colType, bool enabled, bool selected, HoverArea rowHover) override
     {
         //draw border on right
-        clearArea(dc, {rect.x + rect.width - fastFromDIP(1), rect.y, fastFromDIP(1), rect.height}, wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW));
-        wxRect rectTmp = wxRect(rect.GetTopLeft(), wxSize(rect.width - fastFromDIP(1), rect.height));
+        clearArea(dc, {rect.x + rect.width - dipToWxsize(1), rect.y, dipToWxsize(1), rect.height}, wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW));
 
+        wxRect rectTmp = rect;
         rectTmp.x     += getColumnGapLeft();
-        rectTmp.width -= getColumnGapLeft();
+        rectTmp.width -= getColumnGapLeft() + dipToWxsize(1);
 
         switch (static_cast<ColumnTypeRename>(colType))
         {
@@ -117,30 +117,38 @@ public:
 
             case ColumnTypeRename::newName:
             {
-                const wxSize extentBefore = dc.GetTextExtent(fileNamesNewSelectBefore_[row]);
-                drawCellText(dc, rectTmp, fileNamesNewSelectBefore_[row], wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, &extentBefore);
-                rectTmp.x     += extentBefore.GetWidth();
-                rectTmp.width -= extentBefore.GetWidth();
+                const std::wstring& fulltext = fileNamesNewSelectBefore_[row] + fileNamesNewSelected_[row] + fileNamesNewSelectAfter_[row];
+                //macOS: drawCellText() is not accurate for partial strings => draw full text + calculate deltas:
+                const wxSize extentBefore   = dc.GetTextExtent(fileNamesNewSelectBefore_[row]);
+                const wxSize extentFullText = dc.GetTextExtent(fulltext);
+
+                drawCellText(dc, rectTmp, fulltext, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, &extentFullText);
 
                 if (!fileNamesNewSelected_[row].empty()) //highlight text selection:
                 {
-                    const wxSize extentSelect = dc.GetTextExtent(fileNamesNewSelected_[row]);
-                    clearArea(dc, {rectTmp.x, rectTmp.y, extentSelect.GetWidth(), rectTmp.height}, wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT));
+                    const wxSize extentBeforeAndSel = dc.GetTextExtent(fileNamesNewSelectBefore_[row] + fileNamesNewSelected_[row]);
 
-                    wxDCTextColourChanger textColor(dc, wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT)); //accessibility: always set both foreground AND background colors!
-                    drawCellText(dc, rectTmp, fileNamesNewSelected_[row], wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, &extentSelect);
-                    rectTmp.x     += extentSelect.GetWidth();
-                    rectTmp.width -= extentSelect.GetWidth();
-                }
+                    const wxRect rectSel{rectTmp.x + extentBefore.GetWidth(),
+                                         rectTmp.y,
+                                         extentBeforeAndSel.GetWidth() - extentBefore.GetWidth(),
+                                         rectTmp.height};
 
-                drawCellText(dc, rectTmp, fileNamesNewSelectAfter_[row]);
+                    clearArea(dc, rectSel, wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT));
 
-                if (fileNamesNewSelected_[row].empty() && //draw input cursor
-                    (showCursor_ || std::chrono::steady_clock::now() < previewChangeTime_ + std::chrono::milliseconds(400)))
-                {
-                    wxDCPenChanger dummy(dc, wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT), fastFromDIP(1)));
-                    dc.DrawLine(rectTmp.GetTopLeft(), rectTmp.GetBottomLeft() + wxPoint(0, 1)); //DrawLine() doesn't draw last pixel!
+                    RecursiveDcClipper dummy(dc, rectSel);
+
+                    wxDCTextColourChanger textColor(dc, wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT)); //accessibility: always set both foreground AND background colors!
+                    drawCellText(dc, rectTmp, fulltext, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, &extentFullText); //draw everything: might fix partially cleared character
                 }
+                else //draw input cursor
+                    if (showCursor_ || std::chrono::steady_clock::now() < previewChangeTime_ + std::chrono::milliseconds(400))
+                    {
+                        const wxRect rectLine{rectTmp.x + extentBefore.GetWidth(),
+                                              rectTmp.y,
+                                              dipToWxsize(1),
+                                              rectTmp.height};
+                        clearArea(dc, rectLine, wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
+                    }
             }
             break;
         }
@@ -149,7 +157,7 @@ public:
     int getBestSize(wxDC& dc, size_t row, ColumnType colType) override
     {
         // -> synchronize renderCell() <-> getBestSize()
-        return dc.GetTextExtent(getValue(row, colType)).GetWidth() + 2 * getColumnGapLeft() + fastFromDIP(1); //gap on left and right side + border
+        return dc.GetTextExtent(getValue(row, colType)).GetWidth() + 2 * getColumnGapLeft() + dipToWxsize(1); //gap on left and right side + border
     }
 
     std::wstring getToolTip(size_t row, ColumnType colType, HoverArea rowHover) override { return std::wstring(); }
@@ -259,7 +267,7 @@ RenameDialog::RenameDialog(wxWindow* parent,
     //-----------------------------------------------------------
     m_gridRenamePreview->setDataProvider(std::make_shared<GridDataRename>(fileNamesOld, renameBuf));
     m_gridRenamePreview->showRowLabel(false);
-    m_gridRenamePreview->setRowHeight(m_gridRenamePreview->getMainWin().GetCharHeight() + fastFromDIP(1) /*extra space*/);
+    m_gridRenamePreview->setRowHeight(m_gridRenamePreview->getMainWin().GetCharHeight() + dipToWxsize(1) /*extra space*/);
 
     //-----------------------------------------------------------
     if (fileNamesOld.size() > 1) //calculate reasonable default preview grid size
@@ -272,7 +280,7 @@ RenameDialog::RenameDialog(wxWindow* parent,
             /**/[](const std::wstring& lhs, const std::wstring& rhs) { return lhs.size() < rhs.size(); }); //complexity: O(n)
 
         wxMemoryDC dc; //the context used for bitmaps
-        setScaleFactor(dc, getDisplayScaleFactor());
+        setScaleFactor(dc, getScreenDpiScale());
         dc.SetFont(m_gridRenamePreview->GetFont()); //the font parameter of GetTextExtent() is not evaluated on OS X, wxWidgets 2.9.5, so apply it to the DC directly!
 
         int maxStringWidth = 0;
@@ -281,8 +289,8 @@ RenameDialog::RenameDialog(wxWindow* parent,
             maxStringWidth = std::max(maxStringWidth, dc.GetTextExtent(str).GetWidth());
         });
 
-        const int defaultColWidthOld = maxStringWidth + 2 * GridData::getColumnGapLeft() + fastFromDIP(1) /*border*/ + fastFromDIP(10) /*extra space: less cramped*/;
-        const int defaultColWidthNew = maxStringWidth + 2 * GridData::getColumnGapLeft() + fastFromDIP(1) /*border*/ + fastFromDIP(50) /*extra space: for longer new name*/;
+        const int defaultColWidthOld = maxStringWidth + 2 * GridData::getColumnGapLeft() + dipToWxsize(1) /*border*/ + dipToWxsize(10) /*extra space: less cramped*/;
+        const int defaultColWidthNew = maxStringWidth + 2 * GridData::getColumnGapLeft() + dipToWxsize(1) /*border*/ + dipToWxsize(50) /*extra space: for longer new name*/;
 
         m_gridRenamePreview->setColumnConfig(
         {
@@ -290,16 +298,16 @@ RenameDialog::RenameDialog(wxWindow* parent,
             {static_cast<ColumnType>(ColumnTypeRename::newName), -defaultColWidthOld, 1, true}, //stretch "new name" only
         });
 
-        const int previewDefaultWidth = std::min(defaultColWidthOld + defaultColWidthNew + fastFromDIP(25), //scroll bar width (guess!)
-                                                 fastFromDIP(900));
+        const int previewDefaultWidth = std::min(defaultColWidthOld + defaultColWidthNew + dipToWxsize(25), //scroll bar width (guess!)
+                                                 dipToWxsize(900));
 
         const int previewDefaultHeight = std::min(m_gridRenamePreview->getColumnLabelHeight() +
                                                   static_cast<int>(fileNamesOld.size()) * m_gridRenamePreview->getRowHeight(),
-                                                  fastFromDIP(400));
+                                                  dipToWxsize(400));
 
         m_gridRenamePreview->SetMinSize({previewDefaultWidth, previewDefaultHeight});
 
-        m_staticTextHeader->Wrap(std::max(previewDefaultWidth, fastFromDIP(400))); //needs to be reapplied after SetLabel()
+        m_staticTextHeader->Wrap(std::max(previewDefaultWidth, dipToWxsize(400))); //needs to be reapplied after SetLabel()
     }
     else //renaming single file
     {
@@ -308,15 +316,15 @@ RenameDialog::RenameDialog(wxWindow* parent,
         m_staticTextPlaceholderDescription->Hide();
 
         wxMemoryDC dc; //the context used for bitmaps
-        setScaleFactor(dc, getDisplayScaleFactor());
+        setScaleFactor(dc, getScreenDpiScale());
         dc.SetFont(m_textCtrlNewName->GetFont()); //the font parameter of GetTextExtent() is not evaluated on OS X, wxWidgets 2.9.5, so apply it to the DC directly!
 
         const int textCtrlDefaultWidth = std::min(dc.GetTextExtent(renamePhrase).GetWidth() + 20 /*borders (non-DIP!)*/ +
-                                                  fastFromDIP(50) /*extra space: for longer new name*/,
-                                                  fastFromDIP(900));
+                                                  dipToWxsize(50) /*extra space: for longer new name*/,
+                                                  dipToWxsize(900));
         m_textCtrlNewName->SetMinSize({textCtrlDefaultWidth, -1});
 
-        m_staticTextHeader->Wrap(std::max(textCtrlDefaultWidth, fastFromDIP(400))); //needs to be reapplied after SetLabel()
+        m_staticTextHeader->Wrap(std::max(textCtrlDefaultWidth, dipToWxsize(400))); //needs to be reapplied after SetLabel()
     }
     //-----------------------------------------------------------
 
diff --git a/FreeFileSync/Source/ui/small_dlgs.cpp b/FreeFileSync/Source/ui/small_dlgs.cpp
index 163a9e2e..ca90fde2 100644
--- a/FreeFileSync/Source/ui/small_dlgs.cpp
+++ b/FreeFileSync/Source/ui/small_dlgs.cpp
@@ -55,11 +55,15 @@ public:
     AboutDlg(wxWindow* parent);
 
 private:
-    void onOkay  (wxCommandEvent& event) override { EndModal(static_cast<int>(ConfirmationButton::accept)); }
-    void onClose (wxCloseEvent&   event) override { EndModal(static_cast<int>(ConfirmationButton::cancel)); }
+    void onOkay (wxCommandEvent& event) override { EndModal(static_cast<int>(ConfirmationButton::accept)); }
+    void onClose(wxCloseEvent&   event) override { EndModal(static_cast<int>(ConfirmationButton::cancel)); }
     void onOpenForum(wxCommandEvent& event) override { wxLaunchDefaultBrowser(L"https://freefilesync.org/forum"); }
-    void onSendEmail(wxCommandEvent& event) override { wxLaunchDefaultBrowser(wxString() + L"mailto:zenju@" + /*don't leave full email in either source or binary*/ L"freefilesync.org"); }
     void onDonate   (wxCommandEvent& event) override { wxLaunchDefaultBrowser(L"https://freefilesync.org/donate"); }
+    void onSendEmail(wxCommandEvent& event) override
+    {
+        wxLaunchDefaultBrowser(wxString() + L"mailto:zenju@" +
+                               /*don't leave full email in either source or binary*/ L"freefilesync.org");
+    }
 
     void onLocalKeyEvent(wxKeyEvent& event);
 };
@@ -105,15 +109,15 @@ AboutDlg::AboutDlg(wxWindow* parent) : AboutDlgGenerated(parent)
         m_staticTextDonate->Hide(); //temporarily! => avoid impact to dialog width
 
         setRelativeFontSize(*m_buttonDonate1, 1.25);
-        setBitmapTextLabel(*m_buttonDonate1, loadImage("ffs_heart", fastFromDIP(28)), m_buttonDonate1->GetLabelText());
+        setBitmapTextLabel(*m_buttonDonate1, loadImage("ffs_heart", dipToScreen(28)), m_buttonDonate1->GetLabelText());
 
         m_buttonShowSupporterDetails->Hide();
         m_buttonDonate2->Hide();
     }
 
     //--------------------------------------------------------------------------
-    m_staticTextThanksForLoc->SetMinSize({fastFromDIP(200), -1});
-    m_staticTextThanksForLoc->Wrap(fastFromDIP(200));
+    m_staticTextThanksForLoc->SetMinSize({dipToWxsize(200), -1});
+    m_staticTextThanksForLoc->Wrap(dipToWxsize(200));
 
     const int scrollDelta = GetCharHeight();
     m_scrolledWindowTranslators->SetScrollRate(scrollDelta, scrollDelta);
@@ -152,7 +156,7 @@ AboutDlg::AboutDlg(wxWindow* parent) : AboutDlgGenerated(parent)
         const int imageWidth = (m_panelDonate->GetSize().GetWidth() - 5 - 5 - 5 /* grey border*/) / 2;
         const int textWidth  =  m_panelDonate->GetSize().GetWidth() - 5 - 5 - 5 - imageWidth;
 
-        setImage(*m_bitmapAnimalSmall, shrinkImage(animalImg, imageWidth, -1 /*maxHeight*/));
+        setImage(*m_bitmapAnimalSmall, shrinkImage(animalImg, wxsizeToScreen(imageWidth), -1 /*maxHeight*/));
 
         m_staticTextDonate->Show();
         m_staticTextDonate->Wrap(textWidth - 10 /*left gap*/); //wrap *after* changing font size
@@ -269,12 +273,12 @@ CloudSetupDlg::CloudSetupDlg(wxWindow* parent, Zstring& folderPathPhrase, Zstrin
     setRelativeFontSize(*m_toggleBtnSftp,   1.25);
     setRelativeFontSize(*m_toggleBtnFtp,    1.25);
 
-    setBitmapTextLabel(*m_buttonGdriveAddUser,    loadImage("user_add",    fastFromDIP(20)), m_buttonGdriveAddUser   ->GetLabelText());
-    setBitmapTextLabel(*m_buttonGdriveRemoveUser, loadImage("user_remove", fastFromDIP(20)), m_buttonGdriveRemoveUser->GetLabelText());
+    setBitmapTextLabel(*m_buttonGdriveAddUser,    loadImage("user_add",    dipToScreen(20)), m_buttonGdriveAddUser   ->GetLabelText());
+    setBitmapTextLabel(*m_buttonGdriveRemoveUser, loadImage("user_remove", dipToScreen(20)), m_buttonGdriveRemoveUser->GetLabelText());
 
-    setImage(*m_bitmapGdriveUser,  loadImage("user",   fastFromDIP(20)));
-    setImage(*m_bitmapGdriveDrive, loadImage("drive",  fastFromDIP(20)));
-    setImage(*m_bitmapServer,      loadImage("server", fastFromDIP(20)));
+    setImage(*m_bitmapGdriveUser,  loadImage("user",   dipToScreen(20)));
+    setImage(*m_bitmapGdriveDrive, loadImage("drive",  dipToScreen(20)));
+    setImage(*m_bitmapServer,      loadImage("server", dipToScreen(20)));
     setImage(*m_bitmapCloud,       loadImage("cloud"));
     setImage(*m_bitmapPerf,        loadImage("speed"));
     setImage(*m_bitmapServerDir, IconBuffer::genericDirIcon(IconBuffer::IconSize::small));
@@ -282,9 +286,9 @@ CloudSetupDlg::CloudSetupDlg(wxWindow* parent, Zstring& folderPathPhrase, Zstrin
     m_checkBoxPasswordPrompt->SetValue(false);
 
     m_textCtrlServer->SetHint(_("Example:") + L"    website.com    66.198.240.22");
-    m_textCtrlServer->SetMinSize({fastFromDIP(260), -1});
+    m_textCtrlServer->SetMinSize({dipToWxsize(260), -1});
 
-    m_textCtrlPort->SetMinSize({fastFromDIP(60), -1});
+    m_textCtrlPort->SetMinSize({dipToWxsize(60), -1});
     setDefaultWidth(*m_spinCtrlConnectionCount);
     setDefaultWidth(*m_spinCtrlChannelCountSftp);
     setDefaultWidth(*m_spinCtrlTimeout);
@@ -944,7 +948,7 @@ CopyToDialog::CopyToDialog(wxWindow* parent,
 
     m_targetFolderPath->setHistory(std::make_shared<HistoryList>(folderHistory, folderHistoryMax));
 
-    m_textCtrlFileList->SetMinSize({fastFromDIP(500), fastFromDIP(200)});
+    m_textCtrlFileList->SetMinSize({dipToWxsize(500), dipToWxsize(200)});
 
     /*  There is a nasty bug on wxGTK under Ubuntu: If a multi-line wxTextCtrl contains so many lines that scrollbars are shown,
         it re-enables all windows that are supposed to be disabled during the current modal loop!
@@ -954,7 +958,7 @@ CopyToDialog::CopyToDialog(wxWindow* parent,
 
     m_staticTextHeader->SetLabelText(_P("Copy the following item to another folder?",
                                         "Copy the following %x items to another folder?", itemCount));
-    m_staticTextHeader->Wrap(fastFromDIP(460)); //needs to be reapplied after SetLabel()
+    m_staticTextHeader->Wrap(dipToWxsize(460)); //needs to be reapplied after SetLabel()
 
     m_textCtrlFileList->ChangeValue(itemList);
 
@@ -1066,7 +1070,7 @@ DeleteDialog::DeleteDialog(wxWindow* parent,
 
     setMainInstructionFont(*m_staticTextHeader);
 
-    m_textCtrlFileList->SetMinSize({fastFromDIP(500), fastFromDIP(200)});
+    m_textCtrlFileList->SetMinSize({dipToWxsize(500), dipToWxsize(200)});
 
     wxString itemList2(itemList);
     trim(itemList2); //remove trailing newline
@@ -1110,7 +1114,7 @@ void DeleteDialog::updateGui()
                                             "Do you really want to delete the following %x items?", itemCount_));
         m_buttonOK->SetLabelText(wxControl::RemoveMnemonics(_("&Delete"))); //no access key needed: use ENTER!
     }
-    m_staticTextHeader->Wrap(fastFromDIP(460)); //needs to be reapplied after SetLabel()
+    m_staticTextHeader->Wrap(dipToWxsize(460)); //needs to be reapplied after SetLabel()
 
     Layout();
     Refresh(); //needed after m_buttonOK label change
@@ -1195,7 +1199,7 @@ SyncConfirmationDlg::SyncConfirmationDlg(wxWindow* parent,
             //*INDENT-ON*
         }
     if (varImgName)
-        setImage(*m_bitmapSyncVar, loadImage(varImgName, -1 /*maxWidth*/, getDefaultMenuIconSize()));
+        setImage(*m_bitmapSyncVar, loadImage(varImgName, -1 /*maxWidth*/, dipToScreen(getMenuIconDipSize())));
 
     m_checkBoxDontShowAgain->SetValue(dontShowAgain);
 
@@ -1381,8 +1385,8 @@ OptionsDlg::OptionsDlg(wxWindow* parent, XmlGlobalSettings& globalCfg) :
 
     const wxImage imgFileManagerSmall_([]
     {
-        try { return extractWxImage(fff::getFileManagerIcon(fastFromDIP(20))); /*throw SysError*/ }
-        catch (SysError&) { assert(false); return loadImage("file_manager", fastFromDIP(20)); }
+        try { return extractWxImage(fff::getFileManagerIcon(dipToScreen(20))); /*throw SysError*/ }
+        catch (SysError&) { assert(false); return loadImage("file_manager", dipToScreen(20)); }
     }());
     setImage(*m_bpButtonShowLogFolder, imgFileManagerSmall_);
     m_bpButtonShowLogFolder->SetToolTip(translate(extCommandFileManager.description));//translate default external apps on the fly: "Show in Explorer"
@@ -1397,13 +1401,13 @@ OptionsDlg::OptionsDlg(wxWindow* parent, XmlGlobalSettings& globalCfg) :
     setDefaultWidth(*m_spinCtrlLogFilesMaxAge);
 
     setImage(*m_bitmapSettings,           loadImage("settings"));
-    setImage(*m_bitmapWarnings,           loadImage("msg_warning", fastFromDIP(20)));
-    setImage(*m_bitmapLogFile,            loadImage("log_file",    fastFromDIP(20)));
+    setImage(*m_bitmapWarnings,           loadImage("msg_warning", dipToScreen(20)));
+    setImage(*m_bitmapLogFile,            loadImage("log_file",    dipToScreen(20)));
     setImage(*m_bitmapNotificationSounds, loadImage("notification_sounds"));
-    setImage(*m_bitmapConsole,            loadImage("command_line", fastFromDIP(20)));
-    setImage(*m_bitmapCompareDone,        loadImage("compare", fastFromDIP(20)));
-    setImage(*m_bitmapSyncDone,           loadImage("start_sync", fastFromDIP(20)));
-    setImage(*m_bitmapAlertPending,       loadImage("msg_error", fastFromDIP(20)));
+    setImage(*m_bitmapConsole,            loadImage("command_line", dipToScreen(20)));
+    setImage(*m_bitmapCompareDone,        loadImage("compare",      dipToScreen(20)));
+    setImage(*m_bitmapSyncDone,           loadImage("start_sync",   dipToScreen(20)));
+    setImage(*m_bitmapAlertPending,       loadImage("msg_error",    dipToScreen(20)));
     setImage(*m_bpButtonPlayCompareDone,  loadImage("play_sound"));
     setImage(*m_bpButtonPlaySyncDone,     loadImage("play_sound"));
     setImage(*m_bpButtonPlayAlertPending, loadImage("play_sound"));
@@ -1579,7 +1583,7 @@ void OptionsDlg::playSoundWithDiagnostics(const wxString& filePath)
     try
     {
         //::PlaySound() on Windows does not set last error!
-        //wxSound::Play(..., wxSOUND_SYNC) can return false, but also without details!
+        //wxSound::Play(..., wxSOUND_SYNC) can return "false", but also without details!
         //=> check file access manually:
         [[maybe_unused]] const std::string& stream = getFileContent(utfTo<Zstring>(filePath), nullptr /*notifyUnbufferedIO*/); //throw FileError
 
@@ -1897,7 +1901,7 @@ PasswordPromptDlg::PasswordPromptDlg(wxWindow* parent, const std::wstring& msg,
     const int maxWidthDip = 600;
 
     m_staticTextMain->SetLabelText(msg);
-    m_staticTextMain->Wrap(fastFromDIP(maxWidthDip));
+    m_staticTextMain->Wrap(dipToWxsize(maxWidthDip));
 
     m_checkBoxShowPassword->SetValue(false);
 
@@ -1906,10 +1910,10 @@ PasswordPromptDlg::PasswordPromptDlg(wxWindow* parent, const std::wstring& msg,
     bSizerError->Show(!lastErrorMsg.empty());
     if (!lastErrorMsg.empty())
     {
-        setImage(*m_bitmapError, loadImage("msg_error", fastFromDIP(32)));
+        setImage(*m_bitmapError, loadImage("msg_error", dipToWxsize(32)));
 
         m_staticTextError->SetLabelText(lastErrorMsg);
-        m_staticTextError->Wrap(fastFromDIP(maxWidthDip) - m_bitmapError->GetSize().x - 10 /*border in non-DIP pixel*/);
+        m_staticTextError->Wrap(dipToWxsize(maxWidthDip) - m_bitmapError->GetSize().x - 10 /*border in non-DIP pixel*/);
     }
 
     //set up default view for dialog size calculation
@@ -1995,7 +1999,7 @@ CfgHighlightDlg::CfgHighlightDlg(wxWindow* parent, int& cfgHistSyncOverdueDays)
 {
     setStandardButtonLayout(*bSizerStdButtons, StdButtons().setAffirmative(m_buttonOkay).setCancel(m_buttonCancel));
 
-    m_staticTextHighlight->Wrap(fastFromDIP(300));
+    m_staticTextHighlight->Wrap(dipToWxsize(300));
 
     setDefaultWidth(*m_spinCtrlOverdueDays);
 
@@ -2060,9 +2064,9 @@ ActivationDlg::ActivationDlg(wxWindow* parent,
 
     //setMainInstructionFont(*m_staticTextMain);
 
-    m_richTextLastError          ->SetMinSize({-1, m_richTextLastError          ->GetCharHeight() * 7});
+    m_richTextLastError          ->SetMinSize({-1, m_richTextLastError          ->GetCharHeight() * 8});
     m_richTextManualActivationUrl->SetMinSize({-1, m_richTextManualActivationUrl->GetCharHeight() * 4});
-    m_textCtrlOfflineActivationKey->SetMinSize({fastFromDIP(260), -1});
+    m_textCtrlOfflineActivationKey->SetMinSize({dipToWxsize(260), -1});
 
     setImage(*m_bitmapActivation, loadImage("internet"));
     m_textCtrlOfflineActivationKey->ForceUpper();
@@ -2170,9 +2174,9 @@ DownloadProgressWindow::Impl::Impl(wxWindow* parent, int64_t fileSizeTotal) :
     setStandardButtonLayout(*bSizerStdButtons, StdButtons().setCancel(m_buttonCancel));
 
     setMainInstructionFont(*m_staticTextHeader);
-    m_staticTextHeader->Wrap(fastFromDIP(460)); //*after* font change!
+    m_staticTextHeader->Wrap(dipToWxsize(460)); //*after* font change!
 
-    m_staticTextDetails->SetMinSize({fastFromDIP(550), -1});
+    m_staticTextDetails->SetMinSize({dipToWxsize(550), -1});
 
     setImage(*m_bitmapDownloading, loadImage("internet"));
 
diff --git a/FreeFileSync/Source/ui/sync_cfg.cpp b/FreeFileSync/Source/ui/sync_cfg.cpp
index 0a2a7baa..d699abe9 100644
--- a/FreeFileSync/Source/ui/sync_cfg.cpp
+++ b/FreeFileSync/Source/ui/sync_cfg.cpp
@@ -49,20 +49,20 @@ void initBitmapRadioButtons(const std::vector<std::pair<ToggleButton*, std::stri
                                              selected ? *wxBLACK : //accessibility: always set both foreground AND background colors! see renderSelectedButton()
                                              btn.GetForegroundColour());
 
-        wxImage imgIco = mirrorIfRtl(loadImage(imgName, -1 /*maxWidth*/, getDefaultMenuIconSize()));
+        wxImage imgIco = mirrorIfRtl(loadImage(imgName, -1 /*maxWidth*/, dipToScreen(getMenuIconDipSize())));
 
         if (imgName == "delete_recycler") //use system icon if available (can fail on Linux??)
-            try { imgIco = extractWxImage(fff::getTrashIcon(getDefaultMenuIconSize())); /*throw SysError*/ }
+            try { imgIco = extractWxImage(fff::getTrashIcon(dipToScreen(getMenuIconDipSize()))); /*throw SysError*/ }
             catch (SysError&) { assert(false); }
 
         if (!selected)
             imgIco = greyScale(imgIco);
 
         wxImage imgStack = physicalLeft ?
-                           stackImages(imgIco, imgTxt, ImageStackLayout::horizontal, ImageStackAlignment::center, fastFromDIP(5)) :
-                           stackImages(imgTxt, imgIco, ImageStackLayout::horizontal, ImageStackAlignment::center, fastFromDIP(5));
+                           stackImages(imgIco, imgTxt, ImageStackLayout::horizontal, ImageStackAlignment::center, dipToScreen(5)) :
+                           stackImages(imgTxt, imgIco, ImageStackLayout::horizontal, ImageStackAlignment::center, dipToScreen(5));
 
-        return resizeCanvas(imgStack, imgStack.GetSize() + wxSize(fastFromDIP(14), fastFromDIP(12)), wxALIGN_CENTER);
+        return resizeCanvas(imgStack, imgStack.GetSize() + wxSize(dipToScreen(14), dipToScreen(12)), wxALIGN_CENTER);
     };
 
     wxSize maxExtent;
@@ -78,11 +78,12 @@ void initBitmapRadioButtons(const std::vector<std::pair<ToggleButton*, std::stri
 
     for (auto& [btn, imgName] : buttons)
     {
-        btn->init(layOver(rectangleImage(maxExtent, getColorToggleButtonFill(), getColorToggleButtonBorder(), fastFromDIP(1)),
+        btn->init(layOver(rectangleImage(maxExtent, getColorToggleButtonFill(), getColorToggleButtonBorder(), dipToScreen(1)),
                           generateSelectImage(*btn, imgName, true /*selected*/), wxALIGN_CENTER_VERTICAL | (physicalLeft ? wxALIGN_LEFT : wxALIGN_RIGHT)),
                   resizeCanvas(labelsNotSel[btn], maxExtent,                     wxALIGN_CENTER_VERTICAL | (physicalLeft ? wxALIGN_LEFT : wxALIGN_RIGHT)));
 
-        btn->SetMinSize(maxExtent); //get rid of selection border on Windows :)
+        btn->SetMinSize({screenToWxsize(maxExtent.x),
+                         screenToWxsize(maxExtent.y)}); //get rid of selection border on Windows :)
         //SetMinSize() instead of SetSize() is needed here for wxWindows layout determination to work correctly
     }
 }
@@ -485,9 +486,9 @@ globalLogFolderPhrase_(globalLogFolderPhrase)
     setStandardButtonLayout(*bSizerStdButtons, StdButtons().setAffirmative(m_buttonOkay).setCancel(m_buttonCancel));
 
 
-    setBitmapTextLabel(*m_buttonAddNotes, loadImage("notes", fastFromDIP(16)), m_buttonAddNotes->GetLabelText());
+    setBitmapTextLabel(*m_buttonAddNotes, loadImage("notes", dipToScreen(16)), m_buttonAddNotes->GetLabelText());
 
-    setImage(*m_bitmapNotes, loadImage("notes", fastFromDIP(20)));
+    setImage(*m_bitmapNotes, loadImage("notes", dipToScreen(20)));
 
     //set reasonable default height for notes: simplistic algorithm neglecting line-wrap!
     int notesRows = 1;
@@ -501,10 +502,10 @@ globalLogFolderPhrase_(globalLogFolderPhrase)
     m_textCtrNotes->SetMinSize({-1, getTextCtrlHeight(*m_textCtrNotes, visibleRows)});
 
 
-    m_notebook->SetPadding(wxSize(fastFromDIP(2), 0)); //height cannot be changed
+    m_notebook->SetPadding(wxSize(dipToWxsize(2), 0)); //height cannot be changed
 
     //fill image list to cope with wxNotebook image setting design desaster...
-    const int imgListSize = fastFromDIP(16); //also required by GTK => don't use getDefaultMenuIconSize()
+    const int imgListSize = dipToWxsize(16); //also required by GTK => don't use getMenuIconDipSize()
     auto imgList = std::make_unique<wxImageList>(imgListSize, imgListSize);
 
     auto addToImageList = [&](const wxImage& img)
@@ -513,9 +514,9 @@ globalLogFolderPhrase_(globalLogFolderPhrase)
         imgList->Add(toScaledBitmap(greyScale(img)));
     };
     //add images in same sequence like ConfigTypeImage enum!!!
-    addToImageList(loadImage("options_compare", imgListSize));
-    addToImageList(loadImage("options_filter",  imgListSize));
-    addToImageList(loadImage("options_sync",    imgListSize));
+    addToImageList(loadImage("options_compare", wxsizeToScreen(imgListSize)));
+    addToImageList(loadImage("options_filter",  wxsizeToScreen(imgListSize)));
+    addToImageList(loadImage("options_sync",    wxsizeToScreen(imgListSize)));
     assert(imgList->GetImageCount() == static_cast<int>(ConfigTypeImage::syncGrey) + 1);
 
     m_notebook->AssignImageList(imgList.release()); //pass ownership
@@ -542,9 +543,9 @@ globalLogFolderPhrase_(globalLogFolderPhrase)
     m_buttonByContent ->SetToolTip(getCompVariantDescription(CompareVariant::content));
     m_buttonBySize    ->SetToolTip(getCompVariantDescription(CompareVariant::size));
 
-    m_staticTextCompVarDescription->SetMinSize({fastFromDIP(CFG_DESCRIPTION_WIDTH_DIP), -1});
+    m_staticTextCompVarDescription->SetMinSize({dipToWxsize(CFG_DESCRIPTION_WIDTH_DIP), -1});
 
-    m_scrolledWindowPerf->SetMinSize({fastFromDIP(220), -1});
+    m_scrolledWindowPerf->SetMinSize({dipToWxsize(220), -1});
     setImage(*m_bitmapPerf, greyScaleIfDisabled(loadImage("speed"), enableExtraFeatures_));
 
     const int scrollDelta = GetCharHeight();
@@ -559,7 +560,7 @@ globalLogFolderPhrase_(globalLogFolderPhrase)
     m_textCtrlTimeShift->SetValidator(inputValidator);
 
     //------------- filter panel --------------------------
-    m_textCtrlInclude->SetMinSize({fastFromDIP(280), -1});
+    m_textCtrlInclude->SetMinSize({dipToWxsize(280), -1});
 
     assert(!contains(m_buttonClear->GetLabel(), L"&C") && !contains(m_buttonClear->GetLabel(), L"&c")); //gazillionth wxWidgets bug on OS X: Command + C mistakenly hits "&C" access key!
 
@@ -567,7 +568,7 @@ globalLogFolderPhrase_(globalLogFolderPhrase)
     setDefaultWidth(*m_spinCtrlMaxSize);
     setDefaultWidth(*m_spinCtrlTimespan);
 
-    m_staticTextFilterDescr->Wrap(fastFromDIP(450));
+    m_staticTextFilterDescr->Wrap(dipToWxsize(450));
 
     setImage(*m_bpButtonDefaultContext, mirrorIfRtl(loadImage("button_arrow_right")));
 
@@ -611,7 +612,7 @@ globalLogFolderPhrase_(globalLogFolderPhrase)
         {m_buttonCustom, "sync_custom"},
     }, false /*alignLeft*/);
 
-    m_staticTextSyncVarDescription->SetMinSize({fastFromDIP(CFG_DESCRIPTION_WIDTH_DIP), -1});
+    m_staticTextSyncVarDescription->SetMinSize({dipToWxsize(CFG_DESCRIPTION_WIDTH_DIP), -1});
 
     m_buttonRecycler  ->SetToolTip(_("Retain deleted and overwritten files in the recycle bin"));
     m_buttonPermanent ->SetToolTip(_("Delete and overwrite files permanently"));
@@ -638,8 +639,8 @@ globalLogFolderPhrase_(globalLogFolderPhrase)
 
     const wxImage imgFileManagerSmall_([]
     {
-        try { return extractWxImage(fff::getFileManagerIcon(fastFromDIP(20))); /*throw SysError*/ }
-        catch (SysError&) { assert(false); return loadImage("file_manager", fastFromDIP(20)); }
+        try { return extractWxImage(fff::getFileManagerIcon(dipToScreen(20))); /*throw SysError*/ }
+        catch (SysError&) { assert(false); return loadImage("file_manager", dipToScreen(20)); }
     }());
     setImage(*m_bpButtonShowLogFolder, imgFileManagerSmall_);
     m_bpButtonShowLogFolder->SetToolTip(translate(extCommandFileManager.description));//translate default external apps on the fly: "Show in Explorer"
@@ -657,7 +658,7 @@ globalLogFolderPhrase_(globalLogFolderPhrase)
     m_bpButtonEmailErrorWarning ->Enable(enableExtraFeatures_);
     m_bpButtonEmailErrorOnly    ->Enable(enableExtraFeatures_);
 
-    //m_staticTextPostSync->SetMinSize({fastFromDIP(180), -1});
+    //m_staticTextPostSync->SetMinSize({dipToWxsize(180), -1});
 
     enumPostSyncCondition_.
     add(PostSyncCondition::completion, _("On completion:")).
@@ -919,7 +920,7 @@ void ConfigDialog::updateCompGui()
 
     //active variant description:
     setText(*m_staticTextCompVarDescription, getCompVariantDescription(localCmpVar_));
-    m_staticTextCompVarDescription->Wrap(fastFromDIP(CFG_DESCRIPTION_WIDTH_DIP)); //needs to be reapplied after SetLabel()
+    m_staticTextCompVarDescription->Wrap(dipToWxsize(CFG_DESCRIPTION_WIDTH_DIP)); //needs to be reapplied after SetLabel()
 
     m_radioBtnSymlinksDirect->Enable(m_checkBoxSymlinksInclude->GetValue() && compOptionsEnabled); //help wxWidgets a little to render inactive config state (needed on Windows, NOT on Linux!)
     m_radioBtnSymlinksFollow->Enable(m_checkBoxSymlinksInclude->GetValue() && compOptionsEnabled); //
@@ -932,7 +933,9 @@ void ConfigDialog::onFilterDefaultContext(wxEvent& event)
     const FilterConfig defaultFilter = XmlGlobalSettings().defaultFilter;
 
     ContextMenu menu;
-    menu.addItem(_("&Save"),                 [&] { defaultFilterOut_ = activeCfg; updateFilterGui(); }, loadImage("cfg_save", getDefaultMenuIconSize()), defaultFilterOut_ != activeCfg);
+    menu.addItem(_("&Save"), [&] { defaultFilterOut_ = activeCfg; updateFilterGui(); },
+                 loadImage("cfg_save", dipToScreen(getMenuIconDipSize())), defaultFilterOut_ != activeCfg);
+
     menu.addItem(_("&Load factory default"), [&] { setFilterConfig(defaultFilter); }, wxNullImage, activeCfg != defaultFilter);
 
     menu.popup(*m_bpButtonDefaultContext, {m_bpButtonDefaultContext->GetSize().x, 0});
@@ -1294,18 +1297,18 @@ void ConfigDialog::updateSyncGui()
 
     const bool useDatabaseFile = std::get_if<DirectionByChange>(&directionsCfg_.dirs);
 
-    setImage(*m_bitmapDatabase, greyScaleIfDisabled(loadImage("database", fastFromDIP(22)), useDatabaseFile && syncOptionsEnabled));
+    setImage(*m_bitmapDatabase, greyScaleIfDisabled(loadImage("database", dipToScreen(22)), useDatabaseFile && syncOptionsEnabled));
 
     //"detect move files" is always active iff database is used:
-    setImage(*m_bitmapMoveLeft,  greyScaleIfDisabled(loadImage("so_move_left",  fastFromDIP(20)), useDatabaseFile && syncOptionsEnabled));
-    setImage(*m_bitmapMoveRight, greyScaleIfDisabled(loadImage("so_move_right", fastFromDIP(20)), useDatabaseFile && syncOptionsEnabled));
+    setImage(*m_bitmapMoveLeft,  greyScaleIfDisabled(loadImage("so_move_left",  dipToScreen(20)), useDatabaseFile && syncOptionsEnabled));
+    setImage(*m_bitmapMoveRight, greyScaleIfDisabled(loadImage("so_move_right", dipToScreen(20)), useDatabaseFile && syncOptionsEnabled));
     m_staticTextDetectMove->Enable(useDatabaseFile);
 
     const SyncVariant syncVar = getSyncVariant(directionsCfg_);
 
     //active variant description:
     setText(*m_staticTextSyncVarDescription, getSyncVariantDescription(syncVar));
-    m_staticTextSyncVarDescription->Wrap(fastFromDIP(CFG_DESCRIPTION_WIDTH_DIP)); //needs to be reapplied after SetLabel()
+    m_staticTextSyncVarDescription->Wrap(dipToWxsize(CFG_DESCRIPTION_WIDTH_DIP)); //needs to be reapplied after SetLabel()
 
     //update toggle buttons -> they have no parameter-ownership at all!
     m_buttonTwoWay->setActive(SyncVariant::twoWay == syncVar && syncOptionsEnabled);
@@ -1339,7 +1342,7 @@ void ConfigDialog::updateSyncGui()
             setImage(*m_bitmapVersioning, greyScaleIfDisabled(loadImage("delete_versioning"), syncOptionsEnabled));
             break;
     }
-    //m_staticTextDeletionTypeDescription->Wrap(fastFromDIP(200)); //needs to be reapplied after SetLabel()
+    //m_staticTextDeletionTypeDescription->Wrap(dipToWxsize(200)); //needs to be reapplied after SetLabel()
 
     const bool versioningSelected = deletionVariant_ == DeletionVariant::versioning;
 
@@ -1529,9 +1532,9 @@ void ConfigDialog::updateMiscGui()
         setImage(*m_bitmapEmail, greyScaleIfDisabled(loadImage("email"), sendEmailEnabled));
         m_comboBoxEmail->Show(sendEmailEnabled);
 
-        auto updateButton = [successIcon = loadImage("msg_success", getDefaultMenuIconSize()),
-                                         warningIcon = loadImage("msg_warning", getDefaultMenuIconSize()),
-                                         errorIcon   = loadImage("msg_error",   getDefaultMenuIconSize()),
+        auto updateButton = [successIcon = loadImage("msg_success", dipToScreen(getMenuIconDipSize())),
+                                         warningIcon = loadImage("msg_warning", dipToScreen(getMenuIconDipSize())),
+                                         errorIcon   = loadImage("msg_error",   dipToScreen(getMenuIconDipSize())),
                                          sendEmailEnabled, this](wxBitmapButton& button, ResultsNotification notifyCondition)
         {
             button.Show(sendEmailEnabled);
@@ -1570,7 +1573,7 @@ void ConfigDialog::updateMiscGui()
         m_hyperlinkPerfDeRequired2->Show(!enableExtraFeatures_); //required after each bSizerSyncMisc->Show()
 
         //----------------------------------------------------------------------------
-        setImage(*m_bitmapLogFile, greyScaleIfDisabled(loadImage("log_file", fastFromDIP(20)), m_checkBoxOverrideLogPath->GetValue()));
+        setImage(*m_bitmapLogFile, greyScaleIfDisabled(loadImage("log_file", dipToScreen(20)), m_checkBoxOverrideLogPath->GetValue()));
         m_logFolderPath             ->Enable(m_checkBoxOverrideLogPath->GetValue()); //
         m_buttonSelectLogFolder     ->Show(m_checkBoxOverrideLogPath->GetValue()); //enabled status can't be derived from resolved config!
         m_bpButtonSelectAltLogFolder->Show(m_checkBoxOverrideLogPath->GetValue()); //
diff --git a/FreeFileSync/Source/ui/tray_icon.cpp b/FreeFileSync/Source/ui/tray_icon.cpp
index 2036fd9c..0dc606b1 100644
--- a/FreeFileSync/Source/ui/tray_icon.cpp
+++ b/FreeFileSync/Source/ui/tray_icon.cpp
@@ -177,7 +177,7 @@ private:
 
 FfsTrayIcon::FfsTrayIcon(const std::function<void()>& requestResume) :
     trayIcon_(new TaskBarImpl(requestResume)),
-    iconGenerator_(std::make_unique<ProgressIconGenerator>(loadImage("start_sync", fastFromDIP(24))))
+    iconGenerator_(std::make_unique<ProgressIconGenerator>(loadImage("start_sync", dipToScreen(24))))
 {
     [[maybe_unused]] const bool rv = trayIcon_->SetIcon(iconGenerator_->get(activeFraction_), activeToolTip_);
     assert(rv); //caveat wxTaskBarIcon::SetIcon() can return true, even if not wxTaskBarIcon::IsAvailable()!!!
diff --git a/FreeFileSync/Source/ui/tree_grid.cpp b/FreeFileSync/Source/ui/tree_grid.cpp
index 6f32a746..a024015d 100644
--- a/FreeFileSync/Source/ui/tree_grid.cpp
+++ b/FreeFileSync/Source/ui/tree_grid.cpp
@@ -27,7 +27,7 @@ namespace
 {
 //let's NOT create wxWidgets objects statically:
 const int PERCENTAGE_BAR_WIDTH_DIP = 60;
-const int TREE_GRID_GAP_SIZE_DIP   = 2;
+const int TREE_GRID_GAP_SIZE_DIP   = 4;
 
 inline wxColor getColorPercentBorder    () { return {198, 198, 198}; }
 inline wxColor getColorPercentBackground() { return {0xf8, 0xf8, 0xf8}; }
@@ -696,10 +696,10 @@ class GridDataTree : private wxEvtHandler, public GridData
 {
 public:
     GridDataTree(Grid& grid) :
-        widthNodeIcon_(IconBuffer::getSize(IconBuffer::IconSize::small)),
+        widthNodeIcon_(screenToWxsize(IconBuffer::getPixSize(IconBuffer::IconSize::small))),
         widthLevelStep_(widthNodeIcon_),
-        widthNodeStatus_(loadImage("node_expanded").GetWidth()),
-        rootIcon_(loadImage("root_folder", widthNodeIcon_)),
+        widthNodeStatus_(screenToWxsize(loadImage("node_expanded").GetWidth())),
+        rootIcon_(loadImage("root_folder", wxsizeToScreen(widthNodeIcon_))),
         grid_(grid)
     {
         grid.Bind(wxEVT_KEY_DOWN,                   [this](wxKeyEvent& event) { onKeyDown(event); });
@@ -852,10 +852,10 @@ private:
                     //percentage bar
                     if (showPercentBar_)
                     {
-                        wxRect areaPerc(rectTmp.x, rectTmp.y + fastFromDIP(2), percentageBarWidth_, rectTmp.height - fastFromDIP(4));
+                        wxRect areaPerc(rectTmp.x, rectTmp.y + dipToWxsize(2), percentageBarWidth_, rectTmp.height - dipToWxsize(4));
                         //clear background
-                        drawFilledRectangle(dc, areaPerc, getColorPercentBackground(), getColorPercentBorder(), fastFromDIP(1));
-                        areaPerc.Deflate(fastFromDIP(1));
+                        drawFilledRectangle(dc, areaPerc, getColorPercentBackground(), getColorPercentBorder(), dipToWxsize(1));
+                        areaPerc.Deflate(dipToWxsize(1));
 
                         //inner area
                         wxRect areaPercTmp = areaPerc;
@@ -904,7 +904,7 @@ private:
                             drawIcon(nodeIcon, rectTmp, isActive);
 
                             if (static_cast<HoverAreaTree>(rowHover) == HoverAreaTree::item)
-                                drawRectangleBorder(dc, rectTmp, *wxBLUE, fastFromDIP(1));
+                                drawRectangleBorder(dc, rectTmp, *wxBLUE, dipToWxsize(1));
 
                             rectTmp.x     += widthNodeIcon_ + gapSize_;
                             rectTmp.width -= widthNodeIcon_ + gapSize_;
@@ -969,7 +969,7 @@ private:
                 const int nodeStatusXLast  = nodeStatusXFirst + widthNodeStatus_;
                 // -> synchronize renderCell() <-> getBestSize() <-> getMouseHover()
 
-                const int tolerance = fastFromDIP(5);
+                const int tolerance = dipToWxsize(5);
                 if (nodeStatusXFirst - tolerance <= cellRelativePosX && cellRelativePosX < nodeStatusXLast + tolerance)
                     return static_cast<HoverArea>(HoverAreaTree::node);
             }
@@ -1167,8 +1167,8 @@ private:
 
     SharedRef<TreeView> treeDataView_ = makeSharedRef<TreeView>();
 
-    const int gapSize_            = fastFromDIP(TREE_GRID_GAP_SIZE_DIP);
-    const int percentageBarWidth_ = fastFromDIP(PERCENTAGE_BAR_WIDTH_DIP);
+    const int gapSize_            = dipToWxsize(TREE_GRID_GAP_SIZE_DIP);
+    const int percentageBarWidth_ = dipToWxsize(PERCENTAGE_BAR_WIDTH_DIP);
 
     const wxImage fileIcon_ = IconBuffer::genericFileIcon(IconBuffer::IconSize::small);
     const wxImage dirIcon_  = IconBuffer::genericDirIcon (IconBuffer::IconSize::small);
@@ -1190,7 +1190,7 @@ void treegrid::init(Grid& grid)
     grid.setDataProvider(std::make_shared<GridDataTree>(grid));
     grid.showRowLabel(false);
 
-    const int rowHeight = std::max(IconBuffer::getSize(IconBuffer::IconSize::small) + 2, //1 extra pixel on top/bottom; dearly needed on OS X!
+    const int rowHeight = std::max(screenToWxsize(IconBuffer::getPixSize(IconBuffer::IconSize::small)) + dipToWxsize(2), //1 extra pixel on top/bottom; dearly needed on OS X!
                                    grid.getMainWin().GetCharHeight()); //seems to already include 3 margin pixels on top/bottom (consider percentage area)
     grid.setRowHeight(rowHeight);
 }
diff --git a/FreeFileSync/Source/ui/tree_grid_attr.h b/FreeFileSync/Source/ui/tree_grid_attr.h
index a6e6dd1f..0866303b 100644
--- a/FreeFileSync/Source/ui/tree_grid_attr.h
+++ b/FreeFileSync/Source/ui/tree_grid_attr.h
@@ -36,9 +36,9 @@ std::vector<ColumnAttribOverview> getOverviewDefaultColAttribs()
     using namespace zen;
     return //harmonize with tree_view.cpp::onGridLabelContext() => expects stretched folder and non-stretched other columns!
     {
-        {ColumnTypeOverview::folder,    - 2 * fastFromDIP(60), 1, true}, //stretch to full width and substract sum of fixed size widths
-        {ColumnTypeOverview::itemCount, fastFromDIP(60), 0, true},
-        {ColumnTypeOverview::bytes,     fastFromDIP(60), 0, true}, //GTK needs a few pixels more width
+        {ColumnTypeOverview::folder, - 2 * dipToWxsize(60), 1, true}, //stretch to full width and substract sum of fixed size widths
+        {ColumnTypeOverview::itemCount,    dipToWxsize(60), 0, true},
+        {ColumnTypeOverview::bytes,        dipToWxsize(60), 0, true}, //GTK needs a few pixels more width
     };
 }
 
diff --git a/FreeFileSync/Source/ui/triple_splitter.cpp b/FreeFileSync/Source/ui/triple_splitter.cpp
index 1ef000c4..f4dff6bc 100644
--- a/FreeFileSync/Source/ui/triple_splitter.cpp
+++ b/FreeFileSync/Source/ui/triple_splitter.cpp
@@ -55,8 +55,8 @@ TripleSplitter::TripleSplitter(wxWindow* parent,
                                const wxPoint& pos,
                                const wxSize& size,
                                long style) : wxWindow(parent, id, pos, size, style | wxTAB_TRAVERSAL), //tab between windows
-    sashSize_          (fastFromDIP(SASH_SIZE_DIP)),
-    childWindowMinSize_(fastFromDIP(CHILD_WINDOW_MIN_SIZE_DIP))
+    sashSize_          (dipToWxsize(SASH_SIZE_DIP)),
+    childWindowMinSize_(dipToWxsize(CHILD_WINDOW_MIN_SIZE_DIP))
 {
     Bind(wxEVT_PAINT, [this](wxPaintEvent& event) { onPaintEvent(event); });
     Bind(wxEVT_SIZE,  [this](wxSizeEvent&  event) { updateWindowSizes(); event.Skip(); });
@@ -143,10 +143,10 @@ void TripleSplitter::onPaintEvent(wxPaintEvent& event)
         clearArea(dc, rect, wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
 
         //left border
-        clearArea(dc, wxRect(rect.GetTopLeft(), wxSize(fastFromDIP(1), rect.height)), wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW));
+        clearArea(dc, wxRect(rect.GetTopLeft(), wxSize(dipToWxsize(1), rect.height)), wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW));
 
         //right border
-        clearArea(dc, wxRect(rect.x + rect.width - fastFromDIP(1), rect.y, fastFromDIP(1), rect.height), wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW));
+        clearArea(dc, wxRect(rect.x + rect.width - dipToWxsize(1), rect.y, dipToWxsize(1), rect.height), wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW));
     };
 
     const wxRect rectSashL(centerPosX,                           0, sashSize_, GetClientRect().height);
@@ -163,7 +163,7 @@ bool TripleSplitter::hitOnSashLine(int posX) const
     const int centerWidth = getCenterWidth();
 
     //we don't get events outside of sash, so SASH_HIT_TOLERANCE_DIP is currently *useless*
-    auto hitSash = [&](int sashX) { return sashX - fastFromDIP(SASH_HIT_TOLERANCE_DIP) <= posX && posX < sashX + sashSize_ + fastFromDIP(SASH_HIT_TOLERANCE_DIP); };
+    auto hitSash = [&](int sashX) { return sashX - dipToWxsize(SASH_HIT_TOLERANCE_DIP) <= posX && posX < sashX + sashSize_ + dipToWxsize(SASH_HIT_TOLERANCE_DIP); };
 
     return hitSash(centerPosX) || hitSash(centerPosX + centerWidth - sashSize_); //hit one of the two sash lines
 }
diff --git a/FreeFileSync/Source/ui/version_check.cpp b/FreeFileSync/Source/ui/version_check.cpp
index 22cd766c..1750e007 100644
--- a/FreeFileSync/Source/ui/version_check.cpp
+++ b/FreeFileSync/Source/ui/version_check.cpp
@@ -90,7 +90,7 @@ std::wstring getIso3166Country()
 
 
 //coordinate with get_latest_version_number.php
-std::vector<std::pair<std::string, std::string>> geHttpPostParameters(wxWindow& parent) //throw SysError
+std::vector<std::pair<std::string, std::string>> geHttpPostParameters() //throw SysError
 {
     assert(runningOnMainThread()); //this function is not thread-safe, e.g. consider wxWidgets usage in getIso639Language()
     std::vector<std::pair<std::string, std::string>> params;
@@ -107,9 +107,9 @@ std::vector<std::pair<std::string, std::string>> geHttpPostParameters(wxWindow&
     params.emplace_back("os_arch", osArch);
 
 #if GTK_MAJOR_VERSION == 2
-    //wxWindow::GetContentScaleFactor() requires GTK3 or later
+    //GetContentScaleFactor() requires GTK3 or later
 #elif GTK_MAJOR_VERSION == 3
-    params.emplace_back("dip_scale", numberTo<std::string>(parent.GetContentScaleFactor()));
+    params.emplace_back("dip_scale", numberTo<std::string>(wxScreenDC().GetContentScaleFactor()));
 #else
 #error unknown GTK version!
 #endif
@@ -146,7 +146,7 @@ void showUpdateAvailableDialog(wxWindow* parent, const std::string& onlineVersio
 
 
     switch (showConfirmationDialog(parent, DialogInfoType::info, PopupDialogCfg().
-                                   setIcon(loadImage("FreeFileSync", fastFromDIP(48))).
+                                   setIcon(loadImage("FreeFileSync", dipToScreen(48))).
                                    setTitle(_("Check for Program Updates")).
                                    setMainInstructions(replaceCpy(_("FreeFileSync %x is available!"), L"%x", utfTo<std::wstring>(onlineVersion)) + L"\n\n" + _("Download now?")).
                                    setDetailInstructions(updateDetailsMsg), _("&Download")))
@@ -208,7 +208,7 @@ void fff::checkForUpdateNow(wxWindow& parent, std::string& lastOnlineVersion)
 {
     try
     {
-        const std::string onlineVersion = getOnlineVersion(geHttpPostParameters(parent)); //throw SysError
+        const std::string onlineVersion = getOnlineVersion(geHttpPostParameters()); //throw SysError
         lastOnlineVersion = onlineVersion;
 
         if (haveNewerVersionOnline(onlineVersion))
@@ -267,7 +267,7 @@ SharedRef<const UpdateCheckResultPrep> fff::automaticUpdateCheckPrepare(wxWindow
     auto prep = makeSharedRef<UpdateCheckResultPrep>();
     try
     {
-        prep.ref().postParameters = geHttpPostParameters(parent); //throw SysError
+        prep.ref().postParameters = geHttpPostParameters(); //throw SysError
     }
     catch (const SysError& e)
     {
diff --git a/FreeFileSync/Source/version/version.h b/FreeFileSync/Source/version/version.h
index f18984c8..b0c5c523 100644
--- a/FreeFileSync/Source/version/version.h
+++ b/FreeFileSync/Source/version/version.h
@@ -3,7 +3,7 @@
 
 namespace fff
 {
-const char ffsVersion[] = "13.1"; //internal linkage!
+const char ffsVersion[] = "13.2"; //internal linkage!
 const char FFS_VERSION_SEPARATOR = '.';
 }
 
diff --git a/libcurl/curl_wrap.cpp b/libcurl/curl_wrap.cpp
index 5f2a7f9d..11ac9dd4 100644
--- a/libcurl/curl_wrap.cpp
+++ b/libcurl/curl_wrap.cpp
@@ -105,8 +105,10 @@ HttpSession::Result HttpSession::perform(const std::string& serverRelPath,
 
     //CURLOPT_TIMEOUT: "Since this puts a hard limit for how long time a request is allowed to take, it has limited use in dynamic use cases with varying transfer times."
     setCurlOption({CURLOPT_LOW_SPEED_TIME, timeoutSec}); //throw SysError
-    setCurlOption({CURLOPT_LOW_SPEED_LIMIT, 1}); //throw SysError
-    //[bytes], can't use "0" which means "inactive", so use some low number
+    setCurlOption({CURLOPT_LOW_SPEED_LIMIT, 1 /*[bytes]*/}); //throw SysError
+    //can't use "0" which means "inactive", so use some low number
+
+    //CURLOPT_SERVER_RESPONSE_TIMEOUT: does not apply to HTTP
 
 
     std::exception_ptr userCallbackException;
@@ -249,6 +251,7 @@ HttpSession::Result HttpSession::perform(const std::string& serverRelPath,
 
     //WTF!!! 1-sec delay when server doesn't support "Expect: 100-continue"!! https://stackoverflow.com/questions/49670008/how-to-disable-expect-100-continue-in-libcurl
     headers = ::curl_slist_append(headers, "Expect:"); //guess, what: www.googleapis.com doesn't support it! e.g. gdriveUploadFile()
+    //CURLOPT_EXPECT_100_TIMEOUT_MS: should not be needed
 
     if (headers)
         setCurlOption({CURLOPT_HTTPHEADER, headers}); //throw SysError
diff --git a/wx+/bitmap_button.h b/wx+/bitmap_button.h
index bbae6397..a3f160e8 100644
--- a/wx+/bitmap_button.h
+++ b/wx+/bitmap_button.h
@@ -36,7 +36,7 @@ public:
 };
 
 //wxButton::SetBitmap() also supports "image + text", but screws up proper gap and border handling
-void setBitmapTextLabel(wxBitmapButton& btn, const wxImage& img, const wxString& text, int gap = fastFromDIP(5), int border = fastFromDIP(5));
+void setBitmapTextLabel(wxBitmapButton& btn, const wxImage& img, const wxString& text, int gap = dipToWxsize(5), int border = dipToWxsize(5));
 
 //set bitmap label flicker free:
 void setImage(wxAnyButton& button, const wxImage& bmp);
@@ -65,12 +65,12 @@ void setBitmapTextLabel(wxBitmapButton& btn, const wxImage& img, const wxString&
     wxImage imgTxt = createImageFromText(text, btn.GetFont(), btn.GetForegroundColour());
     if (img.IsOk())
         imgTxt = btn.GetLayoutDirection() != wxLayout_RightToLeft ?
-                 stackImages(img, imgTxt, ImageStackLayout::horizontal, ImageStackAlignment::center, gap) :
-                 stackImages(imgTxt, img, ImageStackLayout::horizontal, ImageStackAlignment::center, gap);
+                 stackImages(img, imgTxt, ImageStackLayout::horizontal, ImageStackAlignment::center, wxsizeToScreen(gap)) :
+                 stackImages(imgTxt, img, ImageStackLayout::horizontal, ImageStackAlignment::center, wxsizeToScreen(gap));
 
     //SetMinSize() instead of SetSize() is needed here for wxWindows layout determination to work correctly
-    btn.SetMinSize({imgTxt.GetWidth () + 2 * border,
-                    std::max(imgTxt.GetHeight() + 2 * border, getDefaultButtonHeight())});
+    btn.SetMinSize({screenToWxsize(imgTxt.GetWidth()) + 2 * border,
+                    std::max(screenToWxsize(imgTxt.GetHeight()) + 2 * border, getDefaultButtonHeight())});
 
     setImage(btn, imgTxt);
 }
@@ -107,11 +107,12 @@ inline
 wxImage generatePressedButtonBack(const wxSize& sz)
 {
 #if 1
-    return rectangleImage(sz, wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW), {0x11, 0x79, 0xfe} /*light blue*/, fastFromDIP(2));
+    return rectangleImage(sz, wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW), {0x11, 0x79, 0xfe} /*light blue*/, dipToScreen(2));
 
 #else //rectangle border with gradient as background
-    wxBitmap bmp(sz); //seems we don't need to pass 24-bit depth here even for high-contrast color schemes
-    bmp.SetScaleFactor(getDisplayScaleFactor());
+    wxBitmap bmp(wxsizeToScreen(sz.x),
+                 wxsizeToScreen(sz.y)); //seems we don't need to pass 24-bit depth here even for high-contrast color schemes
+    bmp.SetScaleFactor(getScreenDpiScale());
     {
         //draw rectangle border with gradient
         const wxColor colFrom = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE);
@@ -120,9 +121,9 @@ wxImage generatePressedButtonBack(const wxSize& sz)
         wxMemoryDC dc(bmp);
         dc.SetPen(*wxTRANSPARENT_PEN); //wxTRANSPARENT_PEN is about 2x faster than redundantly drawing with col!
 
-        wxRect rect(bmp.GetSize());
+        wxRect rect(sz);
 
-        const int borderSize = fastFromDIP(3);
+        const int borderSize = dipToWxsize(3);
         for (int i = 1 ; i <= borderSize; ++i)
         {
             const wxColor colGradient((colFrom.Red  () * (borderSize - i) + colTo.Red  () * i) / borderSize,
@@ -130,7 +131,7 @@ wxImage generatePressedButtonBack(const wxSize& sz)
                                       (colFrom.Blue () * (borderSize - i) + colTo.Blue () * i) / borderSize);
             dc.SetBrush(colGradient);
             dc.DrawRectangle(rect);
-            rect.Deflate(1);
+            rect.Deflate(dipToWxsize(1));
         }
 
         dc.SetBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
diff --git a/wx+/dc.h b/wx+/dc.h
index 5f744282..619f6628 100644
--- a/wx+/dc.h
+++ b/wx+/dc.h
@@ -35,14 +35,14 @@ namespace zen
 inline
 void clearArea(wxDC& dc, const wxRect& rect, const wxColor& col)
 {
+    assert(col.IsSolid());
     if (rect.width  > 0 && //clearArea() is surprisingly expensive
         rect.height > 0)
     {
-        assert(col.IsSolid());
         //wxDC::DrawRectangle() just widens inner area if wxTRANSPARENT_PEN is used!
         //bonus: wxTRANSPARENT_PEN is about 2x faster than redundantly drawing with col!
-        wxDCPenChanger   areaPen  (dc, *wxTRANSPARENT_PEN);
-        wxDCBrushChanger areaBrush(dc, col);
+        dc.SetPen(*wxTRANSPARENT_PEN);
+        dc.SetBrush(col);
         dc.DrawRectangle(rect);
     }
 }
@@ -50,78 +50,98 @@ void clearArea(wxDC& dc, const wxRect& rect, const wxColor& col)
 
 //properly draw rectangle respecting high DPI (and avoiding wxPen position fuzzyness)
 inline
-void drawFilledRectangle(wxDC& dc, wxRect rect, const wxColor& innerCol, const wxColor& borderCol, int borderWidth)
+void drawFilledRectangle(wxDC& dc, wxRect rect, const wxColor& innerCol, const wxColor& borderCol, int borderSize)
 {
+    assert(innerCol.IsSolid() && borderCol.IsSolid());
     if (rect.width  > 0 &&
         rect.height > 0)
     {
-        assert(innerCol.IsSolid() && borderCol.IsSolid());
-        wxDCPenChanger   rectPen  (dc, *wxTRANSPARENT_PEN);
-        wxDCBrushChanger rectBrush(dc, borderCol);
+        dc.SetPen(*wxTRANSPARENT_PEN);
+        dc.SetBrush(borderCol);
         dc.DrawRectangle(rect);
-        rect.Deflate(borderWidth); //attention, more wxWidgets design mistakes: behavior of wxRect::Deflate depends on object being const/non-const!!!
 
-        dc.SetBrush(innerCol);
-        dc.DrawRectangle(rect);
+        rect.Deflate(borderSize); //more wxWidgets design mistakes: behavior of wxRect::Deflate depends on object being const/non-const!!!
+
+        if (rect.width  > 0 &&
+            rect.height > 0)
+        {
+            dc.SetBrush(innerCol);
+            dc.DrawRectangle(rect);
+        }
     }
 }
 
 
 inline
-void drawRectangleBorder(wxDC& dc, const wxRect& rect, const wxColor& col, int borderWidth)
+void drawRectangleBorder(wxDC& dc, const wxRect& rect, const wxColor& col, int borderSize)
 {
+    assert(col.IsSolid());
     if (rect.width  > 0 &&
         rect.height > 0)
     {
-        assert(col.IsSolid());
-        wxDCPenChanger   areaPen  (dc, *wxTRANSPARENT_PEN);
-        wxDCBrushChanger areaBrush(dc, col);
-        dc.DrawRectangle(rect.GetTopLeft(),                                         {borderWidth, rect.height});
-        dc.DrawRectangle(rect.GetTopLeft() + wxPoint{rect.width - borderWidth, 0},  {borderWidth, rect.height});
-        dc.DrawRectangle(rect.GetTopLeft(),                                         {rect.width, borderWidth});
-        dc.DrawRectangle(rect.GetTopLeft() + wxPoint{0, rect.height - borderWidth}, {rect.width, borderWidth});
+        if (2 * borderSize >= std::min(rect.width, rect.height))
+            return clearArea(dc, rect, col);
+
+        dc.SetPen(*wxTRANSPARENT_PEN);
+        dc.SetBrush(col);
+        dc.DrawRectangle(rect.x, rect.y,                           borderSize, rect.height); //left
+        dc.DrawRectangle(rect.x + rect.width - borderSize, rect.y, borderSize, rect.height); //right
+        dc.DrawRectangle(rect.x, rect.y,                            rect.width, borderSize); //top
+        dc.DrawRectangle(rect.x, rect.y + rect.height - borderSize, rect.width, borderSize); //bottom
     }
 }
 
 
-/* Standard DPI:
-     Windows/Ubuntu: 96 x 96
-     macOS: wxWidgets uses DIP (note: wxScreenDC().GetPPI() returns 72 x 72 which is a lie; looks like 96 x 96)       */
-constexpr int defaultDpi = 96; //on Windows same as wxDisplay::GetStdPPIValue() (however returns 72 on macOS!)
+/*  figure out wxWidgets cross-platform high DPI mess:
+
+    1. "wxsize"    := what wxWidgets is using: device-dependent on Windows, device-indepent on macOS (...mostly)
+    2. screen unit := device-dependent size in pixels
+    3. DIP         := device-independent pixels
+
+    corollary:
+        macOS:   "wxsize = DIP"
+        Windows: "wxsize = screen unit"
+        cross-platform: images are in "screen unit"         */
 
 inline
-int getDPI()
+double getScreenDpiScale()
 {
-#ifndef wxHAS_DPI_INDEPENDENT_PIXELS
-#error why is wxHAS_DPI_INDEPENDENT_PIXELS not defined?
-#endif
     //GTK2 doesn't properly support high DPI: https://freefilesync.org/forum/viewtopic.php?t=6114
     //=> requires general fix at wxWidgets-level
 
     //https://github.com/wxWidgets/wxWidgets/blob/d9d05c2bb201078f5e762c42458ca2f74af5b322/include/wx/window.h#L2060
-    return defaultDpi; //e.g. macOS, GTK3
+    const double scale = 1.0; //e.g. macOS, GTK3
+
+    return scale;
 }
 
 
 inline
-double getDisplayScaleFactor()
+double getWxsizeDpiScale()
 {
-    return static_cast<double>(getDPI()) / defaultDpi;
+#ifndef wxHAS_DPI_INDEPENDENT_PIXELS
+#error why is wxHAS_DPI_INDEPENDENT_PIXELS not defined?
+#endif
+    return 1.0; //e.g. macOS, GTK3
 }
 
 
-inline
-int fastFromDIP(int d) //like wxWindow::FromDIP (but tied to primary monitor and buffered)
-{
-    return numeric::intDivRound(d * getDPI() - 10 /*round values like 1.5 down => 1 pixel on 150% scale*/, defaultDpi);
-}
-int fastFromDIP(double d) = delete;
+//similar to wxWindow::FromDIP (but tied to primary monitor and buffered)
+inline int dipToWxsize   (int d) { return std::round(d * getWxsizeDpiScale() - 0.1 /*round values like 1.5 down => 1 pixel on 150% scale*/); }
+inline int dipToScreen   (int d) { return std::round(d * getScreenDpiScale()); }
+inline int wxsizeToScreen(int u) { return std::round(u / getWxsizeDpiScale() * getScreenDpiScale()); }
+inline int screenToWxsize(int s) { return std::round(s / getScreenDpiScale() * getWxsizeDpiScale()); }
+
+int dipToWxsize   (double d) = delete;
+int dipToScreen   (double d) = delete;
+int wxsizeToScreen(double d) = delete;
+int screenToWxsize(double d) = delete;
 
 
 inline
 int getDpiScalePercent()
 {
-    return numeric::intDivRound(100 * getDPI(), defaultDpi);
+    return std::round(100 * getScreenDpiScale());
 }
 
 
@@ -130,7 +150,7 @@ wxBitmap toScaledBitmap(const wxImage& img /*expected to be DPI-scaled!*/)
 {
     //wxBitmap(const wxImage& image, int depth = -1, double WXUNUSED(scale) = 1.0) => wxWidgets just ignores scale parameter! WTF!
     wxBitmap bmpScaled(img);
-    bmpScaled.SetScaleFactor(getDisplayScaleFactor());
+    bmpScaled.SetScaleFactor(getScreenDpiScale());
     return bmpScaled; //when testing use 175% scaling: wxWidgets' scaling logic doesn't kick in for 150% only
 }
 
@@ -161,7 +181,7 @@ class RecursiveDcClipper
 public:
     RecursiveDcClipper(wxDC& dc, const wxRect& r) : dc_(dc)
     {
-        if (auto it = clippingAreas_.find(&dc);
+        if (auto it = clippingAreas_.find(&dc_);
             it != clippingAreas_.end())
         {
             oldRect_ = it->second;
@@ -196,6 +216,7 @@ private:
     RecursiveDcClipper           (const RecursiveDcClipper&) = delete;
     RecursiveDcClipper& operator=(const RecursiveDcClipper&) = delete;
 
+
     //associate "active" clipping area with each DC
     inline static std::unordered_map<wxDC*, wxRect> clippingAreas_;
 
@@ -219,7 +240,7 @@ public:
     BufferedPaintDC(wxWindow& wnd, std::optional<wxBitmap>& buffer) : buffer_(buffer), paintDc_(&wnd)
     {
         const wxSize clientSize = wnd.GetClientSize();
-        if (clientSize.GetWidth() > 0 && clientSize.GetHeight() > 0) //wxBitmap asserts this!! width may be 0; test case "Grid::CornerWin": compare both sides, then change config
+        if (clientSize.GetWidth() > 0 && clientSize.GetHeight() > 0) //wxBitmap asserts this!! width can be 0; test case "Grid::CornerWin": compare both sides, then change config
         {
             if (!buffer_ || buffer->GetSize() != clientSize)
                 buffer.emplace(clientSize);
diff --git a/wx+/graph.cpp b/wx+/graph.cpp
index d755a839..ad7fd3ec 100644
--- a/wx+/graph.cpp
+++ b/wx+/graph.cpp
@@ -145,19 +145,15 @@ void drawXLabel(wxDC& dc, double xMin, double xMax, int blockCount, const Conver
     if (blockCount <= 0)
         return;
 
-    wxDCPenChanger dummy(dc, wxPen(wxColor(192, 192, 192), fastFromDIP(1))); //light grey => not accessible! but no big deal...
-    wxDCTextColourChanger textColor(dc, wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
-
     const double valRangePerBlock = (xMax - xMin) / blockCount;
 
     for (int i = 1; i < blockCount; ++i)
     {
-        //draw grey vertical lines
         const double valX = xMin + i * valRangePerBlock; //step over raw data, not graph area pixels, to not lose precision
         const int x = graphArea.x + cvrtX.realToScreenRound(valX);
 
-        if (graphArea.height > 0)
-            dc.DrawLine(wxPoint(x, graphArea.y), wxPoint(x, graphArea.y + graphArea.height)); //wxDC::DrawLine() doesn't draw last pixel
+        //draw grey vertical lines
+        clearArea(dc, {x - dipToWxsize(1) / 2, graphArea.y, dipToWxsize(1), graphArea.height}, wxColor(192, 192, 192)); //light grey => not accessible! but no big deal...
 
         //draw x axis labels
         const wxString label = labelFmt.formatText(valX, valRangePerBlock);
@@ -173,9 +169,6 @@ void drawYLabel(wxDC& dc, double yMin, double yMax, int blockCount, const Conver
     if (blockCount <= 0)
         return;
 
-    wxDCPenChanger dummy(dc, wxPen(wxColor(192, 192, 192), fastFromDIP(1))); //light grey => not accessible! but no big deal...
-    wxDCTextColourChanger textColor(dc, wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
-
     const double valRangePerBlock = (yMax - yMin) / blockCount;
 
     for (int i = 1; i < blockCount; ++i)
@@ -184,8 +177,7 @@ void drawYLabel(wxDC& dc, double yMin, double yMax, int blockCount, const Conver
         const double valY = yMin + i * valRangePerBlock; //step over raw data, not graph area pixels, to not lose precision
         const int y = graphArea.y + cvrtY.realToScreenRound(valY);
 
-        if (graphArea.width > 0)
-            dc.DrawLine(wxPoint(graphArea.x, y), wxPoint(graphArea.x + graphArea.width, y)); //wxDC::DrawLine() doesn't draw last pixel
+        clearArea(dc, {graphArea.x, y - dipToWxsize(1) / 2, graphArea.width, dipToWxsize(1)}, wxColor(192, 192, 192)); //light grey => not accessible! but no big deal...
 
         //draw y axis labels
         const wxString label = labelFmt.formatText(valY, valRangePerBlock);
@@ -199,7 +191,7 @@ void drawCornerText(wxDC& dc, const wxRect& graphArea, const wxString& txt, Grap
 {
     if (txt.empty()) return;
 
-    const wxSize border(fastFromDIP(5), fastFromDIP(2));
+    const wxSize border(dipToWxsize(5), dipToWxsize(2));
     //it looks like wxDC::GetMultiLineTextExtent() precisely returns width, but too large a height: maybe they consider "text row height"?
 
     const wxSize boxExtent = dc.GetMultiLineTextExtent(txt) + 2 * border;
@@ -223,7 +215,7 @@ void drawCornerText(wxDC& dc, const wxRect& graphArea, const wxString& txt, Grap
 
     //add text shadow to improve readability:
     wxDCTextColourChanger textColor(dc, colorBack);
-    dc.DrawText(txt, drawPos + border + wxSize(1, 1) /*better without fastFromDIP()?*/);
+    dc.DrawText(txt, drawPos + border + wxSize(1, 1) /*better without dipToWxsize()?*/);
 
     textColor.Set(colorText);
     dc.DrawText(txt, drawPos + border);
@@ -525,6 +517,7 @@ void Graph2D::render(wxDC& dc) const
 {
     //set label font right at the start so that it is considered by wxDC::GetTextExtent() below!
     dc.SetFont(GetFont());
+    dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
 
     const wxRect clientRect = GetClientRect(); //DON'T use wxDC::GetSize()! DC may be larger than visible area!
 
@@ -532,7 +525,7 @@ void Graph2D::render(wxDC& dc) const
     //wxPanel::GetClassDefaultAttributes().colBg :
     //wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE);
 
-    const int xLabelHeight = attr_.xLabelHeight ? *attr_.xLabelHeight : GetCharHeight() + fastFromDIP(2) /*margin*/;
+    const int xLabelHeight = attr_.xLabelHeight ? *attr_.xLabelHeight : GetCharHeight() + dipToWxsize(2) /*margin*/;
     const int yLabelWidth  = attr_.yLabelWidth  ? *attr_.yLabelWidth  : dc.GetTextExtent(L"1.23457e+07").x;
 
     /*  -----------------------
@@ -576,13 +569,12 @@ void Graph2D::render(wxDC& dc) const
     assert(attr_.yLabelpos == YLabelPos::none || attr_.labelFmtY);
 
     //paint graph background (excluding label area)
-    drawFilledRectangle(dc, graphArea, attr_.colorBack, getBorderColor(), fastFromDIP(1));
-    graphArea.Deflate(fastFromDIP(1));
+    drawFilledRectangle(dc, graphArea, attr_.colorBack, getBorderColor(), dipToWxsize(1));
+    graphArea.Deflate(dipToWxsize(1));
 
     //set label areas respecting graph area border!
     const wxRect xLabelArea(graphArea.x, xLabelPosY, graphArea.width, xLabelHeight);
     const wxRect yLabelArea(yLabelPosX, graphArea.y, yLabelWidth, graphArea.height);
-    const wxPoint graphAreaOrigin = graphArea.GetTopLeft();
 
     //detect x value range
     double minX = attr_.minX ? *attr_.minX :  std::numeric_limits<double>::infinity(); //automatic: ensure values are initialized by first curve
@@ -685,38 +677,28 @@ void Graph2D::render(wxDC& dc) const
 
                 auto& dp = drawPoints[index];
                 for (const CurvePoint& pt : cp)
-                    dp.push_back(wxPoint(cvrtX.realToScreenRound(pt.x),
-                                         cvrtY.realToScreenRound(pt.y)) + graphAreaOrigin);
+                    dp.push_back(wxSize(cvrtX.realToScreenRound(pt.x),
+                                        cvrtY.realToScreenRound(pt.y)) + graphArea.GetTopLeft());
             }
 
             //update active mouse selection
             if (activeSel_)
             {
-                auto widen = [](double* low, double* high)
-                {
-                    if (*low > *high)
-                        std::swap(low, high);
-                    *low  -= 0.5;
-                    *high += 0.5;
-                };
-
-                const wxPoint screenStart   = activeSel_->getStartPos()   - graphAreaOrigin; //make relative to graphArea
-                const wxPoint screenCurrent = activeSel_->refCurrentPos() - graphAreaOrigin;
-
-                //normalize positions: a mouse selection is symmetric and *not* an half-open range!
-                double screenFromX = std::clamp(screenStart  .x, 0, graphArea.width  - 1);
-                double screenFromY = std::clamp(screenStart  .y, 0, graphArea.height - 1);
-                double screenToX   = std::clamp(screenCurrent.x, 0, graphArea.width  - 1);
-                double screenToY   = std::clamp(screenCurrent.y, 0, graphArea.height - 1);
-                widen(&screenFromX, &screenToX); //use full pixel range for selection!
-                widen(&screenFromY, &screenToY);
+                wxPoint screenFrom = activeSel_->getStartPos()   - graphArea.GetTopLeft(); //make relative to graphArea
+                wxPoint screenTo   = activeSel_->refCurrentPos() - graphArea.GetTopLeft();
+
+                //normalize positions:
+                screenFrom.x = std::clamp(screenFrom.x, 0, graphArea.width  - 1);
+                screenFrom.y = std::clamp(screenFrom.y, 0, graphArea.height - 1);
+                screenTo  .x = std::clamp(screenTo  .x, 0, graphArea.width  - 1);
+                screenTo  .y = std::clamp(screenTo  .y, 0, graphArea.height - 1);
 
                 //save current selection as "double" coordinates
-                activeSel_->refSelection().from = CurvePoint{cvrtX.screenToReal(screenFromX),
-                                                             cvrtY.screenToReal(screenFromY)};
+                activeSel_->refSelection().from = CurvePoint{cvrtX.screenToReal(screenFrom.x),
+                                                             cvrtY.screenToReal(screenFrom.y)};
 
-                activeSel_->refSelection().to = CurvePoint{cvrtX.screenToReal(screenToX),
-                                                           cvrtY.screenToReal(screenToY)};
+                activeSel_->refSelection().to = CurvePoint{cvrtX.screenToReal(screenTo.x),
+                                                           cvrtY.screenToReal(screenTo.y)};
             }
 
             //#################### begin drawing ####################
@@ -727,9 +709,9 @@ void Graph2D::render(wxDC& dc) const
                         points.size() >= 3)
                     {
                         //wxDC::DrawPolygon() draws *transparent* border if wxTRANSPARENT_PEN is used!
-                        //unlike wxDC::DrawRectangle() which just widens inner area!
-                        wxDCPenChanger   dummy (dc, wxPen(it->second.fillColor, 1 /*[!] width*/));
-                        wxDCBrushChanger dummy2(dc, it->second.fillColor);
+                        //unlike wxDC::DrawRectangle() which widens inner area instead!
+                        dc.SetPen ({it->second.fillColor, 1 /*[!] width*/});
+                        dc.SetBrush(it->second.fillColor);
                         dc.DrawPolygon(static_cast<int>(points.size()), points.data());
                     }
 
@@ -740,51 +722,37 @@ void Graph2D::render(wxDC& dc) const
 
             if (!allSelections.empty())
             {
-                //alpha channel not supported on wxMSW, so draw selection before curves
-                wxDCBrushChanger dummy(dc, wxColor(168, 202, 236)); //light blue
-                wxDCPenChanger dummy2(dc, wxPen(wxColor(51, 153, 255), fastFromDIP(1))); //dark blue
-
-                auto shrink = [](double* low, double* high)
-                {
-                    if (*low > *high)
-                        std::swap(low, high);
-                    *low  += 0.5;
-                    *high -= 0.5;
-                    if (*low > *high)
-                        *low = *high = (*low + *high) / 2;
-                };
+                const wxColor innerCol(168, 202, 236); //light blue
+                const wxColor borderCol(51, 153, 255); //dark blue
 
+                //alpha channel not supported on wxMSW, so draw selection before curves
                 for (const SelectionBlock& sel : allSelections)
                 {
                     //harmonize with active mouse selection above
-                    double screenFromX = cvrtX.realToScreen(sel.from.x);
-                    double screenFromY = cvrtY.realToScreen(sel.from.y);
-                    double screenToX   = cvrtX.realToScreen(sel.to.x);
-                    double screenToY   = cvrtY.realToScreen(sel.to.y);
-                    shrink(&screenFromX, &screenToX);
-                    shrink(&screenFromY, &screenToY);
-
-                    screenFromX = std::clamp(screenFromX, 0.0, graphArea.width  - 1.0);
-                    screenFromY = std::clamp(screenFromY, 0.0, graphArea.height - 1.0);
-                    screenToX   = std::clamp(screenToX,   0.0, graphArea.width  - 1.0);
-                    screenToY   = std::clamp(screenToY,   0.0, graphArea.height - 1.0);
-
-                    const wxPoint pixelFrom = wxPoint(std::round(screenFromX),
-                                                      std::round(screenFromY)) + graphAreaOrigin;
-                    const wxPoint pixelTo = wxPoint(std::round(screenToX),
-                                                    std::round(screenToY)) + graphAreaOrigin;
+                    int screenFromX = cvrtX.realToScreenRound(sel.from.x);
+                    int screenFromY = cvrtY.realToScreenRound(sel.from.y);
+                    int screenToX   = cvrtX.realToScreenRound(sel.to.x);
+                    int screenToY   = cvrtY.realToScreenRound(sel.to.y);
+
+                    if (screenFromX > screenToX) std::swap(screenFromX, screenToX);
+                    if (screenFromY > screenToY) std::swap(screenFromY, screenToY);
+
+                    const wxRect rectSel{graphArea.GetTopLeft() + wxSize(screenFromX,
+                                                                         screenFromY),
+                                         wxSize(screenToX - screenFromX + 1,   //mouse selection is symmetric
+                                                screenToY - screenFromY + 1)}; //and *not* a half-open range!
                     switch (attr_.mouseSelMode)
                     {
                         case GraphSelMode::none:
                             break;
                         case GraphSelMode::rect:
-                            dc.DrawRectangle(wxRect(pixelFrom, pixelTo)); //wxRect considers area *including* both points
+                            drawFilledRectangle(dc, rectSel, innerCol, borderCol, dipToWxsize(1));
                             break;
                         case GraphSelMode::x:
-                            dc.DrawRectangle(wxRect(wxPoint(pixelFrom.x, graphArea.y), wxPoint(pixelTo.x, graphArea.y + graphArea.height - 1)));
+                            drawFilledRectangle(dc, {rectSel.x, graphArea.y, rectSel.width, graphArea.height}, innerCol, borderCol, dipToWxsize(1));
                             break;
                         case GraphSelMode::y:
-                            dc.DrawRectangle(wxRect(wxPoint(graphArea.x, pixelFrom.y), wxPoint(graphArea.x + graphArea.width - 1, pixelTo.y)));
+                            drawFilledRectangle(dc, {graphArea.x, rectSel.y, graphArea.width, rectSel.height}, innerCol, borderCol, dipToWxsize(1));
                             break;
                     }
                 }
@@ -801,7 +769,7 @@ void Graph2D::render(wxDC& dc) const
 
                 for (auto it = curves_.begin(); it != curves_.end(); ++it)
                 {
-                    wxDCPenChanger dummy(dc, wxPen(it->second.color, it->second.lineWidth));
+                    dc.SetPen({it->second.color, it->second.lineWidth});
 
                     const size_t index = it - curves_.begin();
                     const std::vector<wxPoint>& points = drawPoints[index];
@@ -818,7 +786,7 @@ void Graph2D::render(wxDC& dc) const
                         const int pointCount = static_cast<int>(drawIndexLast - drawIndexFirst);
                         if (pointCount > 0)
                         {
-                            if (pointCount >= 2) //on OS X wxWidgets has a nasty assert on this
+                            if (pointCount >= 2) //on macOS wxWidgets has a nasty assert on this
                                 dc.DrawLines(pointCount, &points[drawIndexFirst]);
                             dc.DrawPoint(points[drawIndexLast - 1]); //wxDC::DrawLines() doesn't draw last pixel
                         }
diff --git a/wx+/graph.h b/wx+/graph.h
index 2f73a643..d7ea51b5 100644
--- a/wx+/graph.h
+++ b/wx+/graph.h
@@ -212,7 +212,7 @@ public:
         CurveFillMode fillMode = CurveFillMode::none;
         wxColor fillColor;
 
-        int lineWidth = fastFromDIP(2);
+        int lineWidth = dipToWxsize(2);
     };
 
     void addCurve(const SharedRef<CurveData>& data, const CurveAttributes& ca = CurveAttributes());
diff --git a/wx+/grid.cpp b/wx+/grid.cpp
index 8e9fe592..07196eaf 100644
--- a/wx+/grid.cpp
+++ b/wx+/grid.cpp
@@ -30,7 +30,7 @@ using namespace zen;
 wxColor GridData::getColorSelectionGradientFrom() { return {137, 172, 255}; } //blue: HSL: 158, 255, 196   HSV: 222, 0.46, 1
 wxColor GridData::getColorSelectionGradientTo  () { return {225, 234, 255}; } //      HSL: 158, 255, 240   HSV: 222, 0.12, 1
 
-int GridData::getColumnGapLeft() { return fastFromDIP(4); }
+int GridData::getColumnGapLeft() { return dipToWxsize(4); }
 
 
 namespace
@@ -129,23 +129,16 @@ void GridData::renderCell(wxDC& dc, const wxRect& rect, size_t row, ColumnType c
 
 int GridData::getBestSize(wxDC& dc, size_t row, ColumnType colType)
 {
-    return dc.GetTextExtent(getValue(row, colType)).GetWidth() + 2 * getColumnGapLeft() + fastFromDIP(1); //gap on left and right side + border
+    return dc.GetTextExtent(getValue(row, colType)).GetWidth() + 2 * getColumnGapLeft() + dipToWxsize(1); //gap on left and right side + border
 }
 
 
 wxRect GridData::drawCellBorder(wxDC& dc, const wxRect& rect) //returns remaining rectangle
 {
-    //following code is adapted from clearArea():
-    assert(getColorGridLine().IsSolid());
-    //wxDC::DrawRectangle() just widens inner area if wxTRANSPARENT_PEN is used!
-    //bonus: wxTRANSPARENT_PEN is about 2x faster than redundantly drawing with col!
-    wxDCPenChanger   areaPen  (dc, *wxTRANSPARENT_PEN);
-    wxDCBrushChanger areaBrush(dc, getColorGridLine());
+    clearArea(dc, {rect.x + rect.width - dipToWxsize(1), rect.y, dipToWxsize(1), rect.height}, getColorGridLine()); //right border
+    clearArea(dc, {rect.x, rect.y + rect.height - dipToWxsize(1), rect.width, dipToWxsize(1)}, getColorGridLine()); //bottom border
 
-    dc.DrawRectangle(rect.x + rect.width - fastFromDIP(1), rect.y, fastFromDIP(1), rect.height); //right border
-    dc.DrawRectangle(rect.x, rect.y + rect.height - fastFromDIP(1), rect.width, fastFromDIP(1)); //bottom border
-
-    return wxRect(rect.GetTopLeft(), wxSize(rect.width - fastFromDIP(1), rect.height - fastFromDIP(1)));
+    return {rect.x, rect.y, rect.width - dipToWxsize(1), rect.height - dipToWxsize(1)};
 }
 
 
@@ -238,17 +231,16 @@ wxRect GridData::drawColumnLabelBackground(wxDC& dc, const wxRect& rect, bool hi
         dc.GradientFillLinear(rect, getColorLabelGradientFrom(), getColorLabelGradientTo(), wxSOUTH);
 
     //left border
-    clearArea(dc, wxRect(rect.GetTopLeft(), wxSize(fastFromDIP(1), rect.height)), wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+    clearArea(dc, wxRect(rect.GetTopLeft(), wxSize(dipToWxsize(1), rect.height)), wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
 
     //right border
-    dc.GradientFillLinear(wxRect(rect.x + rect.width - fastFromDIP(1), rect.y, fastFromDIP(1), rect.height),
+    dc.GradientFillLinear(wxRect(rect.x + rect.width - dipToWxsize(1), rect.y, dipToWxsize(1), rect.height),
                           getColorLabelGradientFrom(), wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW), wxSOUTH);
 
     //bottom border
-    clearArea(dc, wxRect(rect.x, rect.y + rect.height - fastFromDIP(1), rect.width, fastFromDIP(1)), wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW));
+    clearArea(dc, wxRect(rect.x, rect.y + rect.height - dipToWxsize(1), rect.width, dipToWxsize(1)), wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW));
 
-    return rect.Deflate(fastFromDIP(1),
-                        fastFromDIP(1));
+    return rect.Deflate(dipToWxsize(1), dipToWxsize(1));
 }
 
 
@@ -420,19 +412,19 @@ private:
         dc.GradientFillLinear(rect, getColorLabelGradientFrom(), getColorLabelGradientTo(), wxSOUTH);
 
         //left border
-        dc.GradientFillLinear(wxRect(rect.GetTopLeft(), wxSize(fastFromDIP(1), rect.height)),
+        dc.GradientFillLinear(wxRect(rect.GetTopLeft(), wxSize(dipToWxsize(1), rect.height)),
                               getColorLabelGradientFrom(), wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW), wxSOUTH);
 
         //left border2
-        clearArea(dc, wxRect(rect.x + fastFromDIP(1), rect.y, fastFromDIP(1), rect.height),
+        clearArea(dc, wxRect(rect.x + dipToWxsize(1), rect.y, dipToWxsize(1), rect.height),
                   wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
 
         //right border
-        dc.GradientFillLinear(wxRect(rect.x + rect.width - fastFromDIP(1), rect.y, fastFromDIP(1), rect.height),
+        dc.GradientFillLinear(wxRect(rect.x + rect.width - dipToWxsize(1), rect.y, dipToWxsize(1), rect.height),
                               getColorLabelGradientFrom(), wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW), wxSOUTH);
 
         //bottom border
-        clearArea(dc, wxRect(rect.x, rect.y + rect.height - fastFromDIP(1), rect.width, fastFromDIP(1)),
+        clearArea(dc, wxRect(rect.x, rect.y + rect.height - dipToWxsize(1), rect.width, dipToWxsize(1)),
                   wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW));
     }
 };
@@ -445,7 +437,7 @@ class Grid::RowLabelWin : public SubWindow
 public:
     explicit RowLabelWin(Grid& parent) :
         SubWindow(parent),
-        rowHeight_(parent.GetCharHeight() + fastFromDIP(2) + fastFromDIP(1)) {} //default height; don't call any functions on "parent" other than those from wxWindow during construction!
+        rowHeight_(parent.GetCharHeight() + dipToWxsize(2) + dipToWxsize(1)) {} //default height; don't call any functions on "parent" other than those from wxWindow during construction!
     //2 for some more space, 1 for bottom border (gives 15 + 2 + 1 on Windows, 17 + 2 + 1 on Ubuntu)
 
     int getBestWidth(ptrdiff_t rowFrom, ptrdiff_t rowTo)
@@ -456,7 +448,7 @@ public:
 
         int bestWidth = 0;
         for (ptrdiff_t i = rowFrom; i <= rowTo; ++i)
-            bestWidth = std::max(bestWidth, dc.GetTextExtent(formatRowNum(i)).GetWidth() + fastFromDIP(2 * ROW_LABEL_BORDER_DIP));
+            bestWidth = std::max(bestWidth, dc.GetTextExtent(formatRowNum(i)).GetWidth() + dipToWxsize(2 * ROW_LABEL_BORDER_DIP));
         return bestWidth;
     }
 
@@ -514,24 +506,20 @@ private:
         dc.GradientFillLinear(rect, getColorLabelGradientFrom(), getColorLabelGradientTo(), wxEAST); //clear overlapping cells
 
         //top border
-        clearArea(dc, wxRect(rect.GetTopLeft(), wxSize(rect.width, fastFromDIP(1))),
-                  wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+        clearArea(dc, wxRect(rect.x, rect.y, rect.width, dipToWxsize(1)), wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
 
         //left border
-        clearArea(dc, wxRect(rect.GetTopLeft(), wxSize(fastFromDIP(1), rect.height)),
-                  wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW));
+        clearArea(dc, wxRect(rect.x, rect.y, dipToWxsize(1), rect.height), wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW));
 
         //right border
-        clearArea(dc, wxRect(rect.x + rect.width - fastFromDIP(1), rect.y, fastFromDIP(1), rect.height),
-                  wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW));
+        clearArea(dc, wxRect(rect.x + rect.width - dipToWxsize(1), rect.y, dipToWxsize(1), rect.height), wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW));
 
         //bottom border
-        clearArea(dc, wxRect(rect.x, rect.y + rect.height - fastFromDIP(1), rect.width, fastFromDIP(1)),
-                  wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW));
+        clearArea(dc, wxRect(rect.x, rect.y + rect.height - dipToWxsize(1), rect.width, dipToWxsize(1)), wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW));
 
         //label text
         wxRect textRect = rect;
-        textRect.Deflate(fastFromDIP(1));
+        textRect.Deflate(dipToWxsize(1));
 
         wxDCTextColourChanger textColor(dc, getColorLabelText(enabled)); //accessibility: always set both foreground AND background colors!
         GridData::drawCellText(dc, textRect, formatRowNum(row), wxALIGN_CENTRE);
@@ -621,7 +609,7 @@ public:
         labelFont_(GetFont().Bold())
     {
         //coordinate with ColLabelWin::render():
-        colLabelHeight_ = fastFromDIP(2 * DEFAULT_COL_LABEL_BORDER_DIP) + labelFont_.GetPixelSize().GetHeight();
+        colLabelHeight_ = dipToWxsize(2 * DEFAULT_COL_LABEL_BORDER_DIP) + labelFont_.GetPixelSize().GetHeight();
     }
 
     int getColumnLabelHeight() const { return colLabelHeight_; }
@@ -633,14 +621,12 @@ private:
     void render(wxDC& dc, const wxRect& rect) override
     {
         clearArea(dc, rect, wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
-        //caveat: system colors can bes partially transparent on macOS:
+        //caveat: system colors can be partially transparent on macOS
 
-        const bool enabled = renderAsEnabled(*this);
-
-        //coordinate with "colLabelHeight" in Grid constructor:
-        dc.SetFont(labelFont_);
+        dc.SetFont(labelFont_); //coordinate with "colLabelHeight" in Grid constructor
+        dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
 
-        wxDCTextColourChanger textColor(dc, wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT)); //use user setting for labels
+        const bool enabled = renderAsEnabled(*this);
 
         wxPoint labelAreaTL(refParent().CalcScrolledPosition(wxPoint(0, 0)).x, 0); //client coordinates
 
@@ -687,7 +673,7 @@ private:
             if (refParent().allowColumnMove_)
                 if (activeClickOrMove_ && activeClickOrMove_->isRealMove())
                 {
-                    const int markerWidth = fastFromDIP(COLUMN_MOVE_MARKER_WIDTH_DIP);
+                    const int markerWidth = dipToWxsize(COLUMN_MOVE_MARKER_WIDTH_DIP);
 
                     if (col + 1 == activeClickOrMove_->refColumnTo()) //handle pos 1, 2, .. up to "at end" position
                         dc.GradientFillLinear(wxRect(rect.x + rect.width - markerWidth, rect.y, markerWidth, rect.height), getColorLabelGradientFrom(), *wxBLUE, wxSOUTH);
@@ -703,7 +689,7 @@ private:
             if (const int absPosX = refParent().CalcUnscrolledPosition(pos).x;
                 absPosX >= 0)
             {
-                const int resizeTolerance = refParent().allowColumnResize_ ? fastFromDIP(COLUMN_RESIZE_TOLERANCE_DIP) : 0;
+                const int resizeTolerance = refParent().allowColumnResize_ ? dipToWxsize(COLUMN_RESIZE_TOLERANCE_DIP) : 0;
                 const std::vector<ColumnWidth>& absWidths = refParent().getColWidths(); //resolve stretched widths
 
                 int accuWidth = 0;
@@ -858,7 +844,7 @@ private:
 
             //check if there's a small gap after last column, if yes, fill it
             const int gapWidth = GetClientSize().GetWidth() - refParent().getColWidthsSum(GetClientSize().GetWidth());
-            if (std::abs(gapWidth) < fastFromDIP(COLUMN_FILL_GAP_TOLERANCE_DIP))
+            if (std::abs(gapWidth) < dipToWxsize(COLUMN_FILL_GAP_TOLERANCE_DIP))
                 refParent().setColumnWidth(newWidth + gapWidth, col, GridEventPolicy::allow);
 
             Refresh();
@@ -867,7 +853,7 @@ private:
         else if (activeClickOrMove_)
         {
             const int clientPosX = clientPos.x;
-            if (std::abs(clientPosX - activeClickOrMove_->getStartPosX()) > fastFromDIP(COLUMN_MOVE_DELAY_DIP)) //real move (not a single click)
+            if (std::abs(clientPosX - activeClickOrMove_->getStartPosX()) > dipToWxsize(COLUMN_MOVE_DELAY_DIP)) //real move (not a single click)
             {
                 activeClickOrMove_->setRealMove();
                 activeClickOrMove_->refColumnTo() = clientPosToMoveTargetColumn(clientPos);
@@ -1003,8 +989,7 @@ private:
         if (auto prov = refParent().getDataProvider())
         {
             dc.SetFont(GetFont()); //harmonize with Grid::getBestColumnSize()
-
-            wxDCTextColourChanger textColor(dc, wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT)); //use user setting for labels
+            dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
 
             const std::vector<ColumnWidth>& absWidths = refParent().getColWidths(); //resolve stretched widths
 
@@ -2306,7 +2291,7 @@ void Grid::setColumnWidth(int width, size_t col, GridEventPolicy columnResizeEve
         //I. fixed-size columns: normalize offset so that resulting width is at least COLUMN_MIN_WIDTH_DIP: this is NOT enforced by getColWidths()!
         //II. stretched columns: do not allow user to set offsets so small that they result in negative (non-normalized) widths: this gives an
         //unusual delay when enlarging the column again later
-        width = std::max(width, fastFromDIP(COLUMN_MIN_WIDTH_DIP));
+        width = std::max(width, dipToWxsize(COLUMN_MIN_WIDTH_DIP));
 
         vcRs.offset = width - stretchedWidths[col]; //width := stretchedWidth + offset
 
@@ -2318,7 +2303,7 @@ void Grid::setColumnWidth(int width, size_t col, GridEventPolicy columnResizeEve
         //4. now verify that the stretched column is resizing immediately if main window is enlarged again
         for (size_t col2 = 0; col2 < visibleCols_.size(); ++col2)
             if (visibleCols_[col2].stretch > 0) //normalize stretched columns only
-                visibleCols_[col2].offset = std::max(visibleCols_[col2].offset, fastFromDIP(COLUMN_MIN_WIDTH_DIP) - stretchedWidths[col2]);
+                visibleCols_[col2].offset = std::max(visibleCols_[col2].offset, dipToWxsize(COLUMN_MIN_WIDTH_DIP) - stretchedWidths[col2]);
 
         if (columnResizeEventPolicy == GridEventPolicy::allow)
         {
@@ -2409,7 +2394,7 @@ std::vector<Grid::ColumnWidth> Grid::getColWidths(int mainWinWidth) const //eval
         int width = stretchedWidths[col2] + vc.offset;
 
         if (vc.stretch > 0)
-            width = std::max(width, fastFromDIP(COLUMN_MIN_WIDTH_DIP)); //normalization really needed here: e.g. smaller main window would result in negative width
+            width = std::max(width, dipToWxsize(COLUMN_MIN_WIDTH_DIP)); //normalization really needed here: e.g. smaller main window would result in negative width
         else
             width = std::max(width, 0); //support smaller width than COLUMN_MIN_WIDTH_DIP if set via configuration
 
diff --git a/wx+/image_resources.cpp b/wx+/image_resources.cpp
index 0ccab219..6157f381 100644
--- a/wx+/image_resources.cpp
+++ b/wx+/image_resources.cpp
@@ -144,7 +144,7 @@ private:
     ImageBuffer& operator=(const ImageBuffer&) = delete;
 
     const wxImage& getRawImage   (const std::string& name);
-    const wxImage& getScaledImage(const std::string& name);
+    const wxImage& getHqScaledImage(const std::string& name);
 
     std::unordered_map<std::string, wxImage> imagesRaw_;
     std::unordered_map<std::string, wxImage> imagesScaled_;
@@ -211,7 +211,7 @@ ImageBuffer::ImageBuffer(const Zstring& zipPath) //throw FileError
     wxImage::AddHandler(new wxPNGHandler/*ownership passed*/); //activate support for .png files
 
     //do we need xBRZ scaling for high quality DPI images?
-    const int hqScale = std::clamp(numeric::intDivCeil(fastFromDIP(1000), 1000), 1, xbrz::SCALE_FACTOR_MAX);
+    const int hqScale = std::clamp(static_cast<int>(std::ceil(getScreenDpiScale())), 1, xbrz::SCALE_FACTOR_MAX);
     //even for 125% DPI scaling, "2xBRZ + bilinear downscale" gives a better result than mere "125% bilinear upscale"!
     if (hqScale > 1)
         hqScaler_ = std::make_unique<HqParallelScaler>(hqScale);
@@ -255,7 +255,7 @@ const wxImage& ImageBuffer::getRawImage(const std::string& name)
 }
 
 
-const wxImage& ImageBuffer::getScaledImage(const std::string& name)
+const wxImage& ImageBuffer::getHqScaledImage(const std::string& name)
 {
     //test: this function is first called about 220ms after ImageBuffer::ImageBuffer() has ended
     //      => should be enough time to finish xBRZ scaling in parallel (which takes 50ms)
@@ -279,8 +279,8 @@ const wxImage& ImageBuffer::getImage(const std::string& name, int maxWidth /*opt
 {
     const wxImage& rawImg = getRawImage(name);
 
-    const wxSize dpiSize(fastFromDIP(rawImg.GetWidth ()),
-                         fastFromDIP(rawImg.GetHeight()));
+    const wxSize dpiSize(dipToScreen(rawImg.GetWidth ()),
+                         dipToScreen(rawImg.GetHeight()));
 
     int outHeight = dpiSize.y;
     if (maxWidth >= 0 && maxWidth < dpiSize.x)
@@ -289,18 +289,17 @@ const wxImage& ImageBuffer::getImage(const std::string& name, int maxWidth /*opt
     if (maxHeight >= 0 && maxHeight < outHeight)
         outHeight = maxHeight;
 
-    const OutImageKey imkey{name, outHeight};
+    const OutImageKey imgKey{name, outHeight};
 
-    auto it = imagesOut_.find(imkey);
+    auto it = imagesOut_.find(imgKey);
     if (it == imagesOut_.end())
     {
         if (rawImg.GetHeight() >= outHeight) //=> skip needless xBRZ upscaling
-            it = imagesOut_.emplace(imkey, shrinkImage(rawImg, -1 /*maxWidth*/, outHeight)).first;
+            it = imagesOut_.emplace(imgKey, shrinkImage(rawImg, -1 /*maxWidth*/, outHeight)).first;
         else if (rawImg.GetHeight() >= 0.9 * outHeight) //almost there: also no need for xBRZ-scale
-            it = imagesOut_.emplace(imkey, bilinearScale(rawImg, numeric::intDivRound(outHeight * rawImg.GetWidth(), rawImg.GetHeight()), outHeight)).first;
-        //however: for 125% DPI scaling, "2xBRZ + bilinear downscale" gives a better result than mere "125% bilinear upscale"
-        else
-            it = imagesOut_.emplace(imkey, shrinkImage(getScaledImage(name), -1 /*maxWidth*/, outHeight)).first;
+            it = imagesOut_.emplace(imgKey, bilinearScale(rawImg, numeric::intDivRound(outHeight * rawImg.GetWidth(), rawImg.GetHeight()), outHeight)).first;
+        else //however: for 125% DPI scaling, "2xBRZ + bilinear downscale" gives a better result than mere "125% bilinear upscale"
+            it = imagesOut_.emplace(imgKey, shrinkImage(getHqScaledImage(name), -1 /*maxWidth*/, outHeight)).first;
     }
     return it->second;
 }
diff --git a/wx+/image_tools.cpp b/wx+/image_tools.cpp
index b054ad78..e95797ca 100644
--- a/wx+/image_tools.cpp
+++ b/wx+/image_tools.cpp
@@ -168,7 +168,7 @@ wxImage zen::stackImages(const wxImage& img1, const wxImage& img2, ImageStackLay
 wxImage zen::createImageFromText(const wxString& text, const wxFont& font, const wxColor& col, ImageStackAlignment textAlign)
 {
     wxMemoryDC dc; //the context used for bitmaps
-    setScaleFactor(dc, getDisplayScaleFactor());
+    setScaleFactor(dc, getScreenDpiScale());
     dc.SetFont(font); //the font parameter of GetTextExtent() 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
@@ -186,8 +186,9 @@ wxImage zen::createImageFromText(const wxString& text, const wxFont& font, const
     if (maxWidth == 0 || lineHeight == 0)
         return wxNullImage;
 
-    wxBitmap newBitmap(maxWidth, lineHeight * lineInfo.size()); //seems we don't need to pass 24-bit depth here even for high-contrast color schemes
-    newBitmap.SetScaleFactor(getDisplayScaleFactor());
+    wxBitmap newBitmap(wxsizeToScreen(maxWidth),
+                       wxsizeToScreen(static_cast<int>(lineHeight * lineInfo.size()))); //seems we don't need to pass 24-bit depth here even for high-contrast color schemes
+    newBitmap.SetScaleFactor(getScreenDpiScale());
     {
         dc.SelectObject(newBitmap); //copies scale factor from wxBitmap
         ZEN_ON_SCOPE_EXIT(dc.SelectObject(wxNullBitmap));
@@ -377,10 +378,10 @@ void zen::convertToVanillaImage(wxImage& img)
         const int height = img.GetHeight();
         if (width <= 0 || height <= 0) return;
 
-        unsigned char mask_r = 0;
-        unsigned char mask_g = 0;
-        unsigned char mask_b = 0;
-        const bool haveMask = img.HasMask() && img.GetOrFindMaskColour(&mask_r, &mask_g, &mask_b);
+        unsigned char maskR = 0;
+        unsigned char maskG = 0;
+        unsigned char maskB = 0;
+        const bool haveMask = img.HasMask() && img.GetOrFindMaskColour(&maskR, &maskG, &maskB);
         //check for mask before calling wxImage::GetOrFindMaskColour() to skip needlessly searching for new mask color
 
         img.SetAlpha();
@@ -402,9 +403,9 @@ void zen::convertToVanillaImage(wxImage& img)
                 const unsigned char g = *rgb++;
                 const unsigned char b = *rgb++;
 
-                if (r == mask_r &&
-                    g == mask_g &&
-                    b == mask_b)
+                if (r == maskR &&
+                    g == maskG &&
+                    b == maskB)
                     alpha[i] = wxIMAGE_ALPHA_TRANSPARENT;
             }
         }
diff --git a/wx+/popup_dlg.cpp b/wx+/popup_dlg.cpp
index 5254ff29..c48bf592 100644
--- a/wx+/popup_dlg.cpp
+++ b/wx+/popup_dlg.cpp
@@ -27,7 +27,7 @@ namespace
 {
 void setBestInitialSize(wxRichTextCtrl& ctrl, const wxString& text, wxSize maxSize)
 {
-    const int scrollbarWidth = fastFromDIP(25); /*not only scrollbar, but also left/right padding (on macOS)!
+    const int scrollbarWidth = dipToWxsize(25); /*not only scrollbar, but also left/right padding (on macOS)!
     better use slightly larger than exact value (Windows: 17, Linux(CentOS): 14, macOS: 25)
     => worst case: minor increase in rowCount (no big deal) + slightly larger bestSize.x (good!)  */
 
@@ -164,8 +164,8 @@ public:
             titleTmp = wxTheApp->GetAppDisplayName() + (!titleTmp.empty() ? SPACED_DASH + titleTmp : wxString());
         SetTitle(titleTmp);
 
-        int maxWidth  = fastFromDIP(500);
-        int maxHeight = fastFromDIP(400); //try to determine better value based on actual display resolution:
+        int maxWidth  = dipToWxsize(500);
+        int maxHeight = dipToWxsize(400); //try to determine better value based on actual display resolution:
         if (parent)
             if (const int disPos = wxDisplay::GetFromWindow(parent); //window must be visible
                 disPos != wxNOT_FOUND)
diff --git a/wx+/rtl.h b/wx+/rtl.h
index 80a75671..07488b6c 100644
--- a/wx+/rtl.h
+++ b/wx+/rtl.h
@@ -42,14 +42,14 @@ void drawBitmapAligned(wxDC& dc, const wxImage& img, const wxRect& rect, int ali
 {
     wxPoint pt = rect.GetTopLeft();
     if (alignment & wxALIGN_RIGHT) //note: wxALIGN_LEFT == 0!
-        pt.x += rect.width - img.GetWidth();
+        pt.x += rect.width - screenToWxsize(img.GetWidth());
     else if (alignment & wxALIGN_CENTER_HORIZONTAL)
-        pt.x += (rect.width - img.GetWidth()) / 2;
+        pt.x += (rect.width - screenToWxsize(img.GetWidth())) / 2;
 
     if (alignment & wxALIGN_BOTTOM) //note: wxALIGN_TOP == 0!
-        pt.y += rect.height - img.GetHeight();
+        pt.y += rect.height - screenToWxsize(img.GetHeight());
     else if (alignment & wxALIGN_CENTER_VERTICAL)
-        pt.y += (rect.height - img.GetHeight()) / 2;
+        pt.y += (rect.height - screenToWxsize(img.GetHeight())) / 2;
 
     dc.DrawBitmap(toScaledBitmap(img), pt);
 }
diff --git a/wx+/std_button_layout.h b/wx+/std_button_layout.h
index 8abc9e3a..86558026 100644
--- a/wx+/std_button_layout.h
+++ b/wx+/std_button_layout.h
@@ -33,9 +33,9 @@ void setStandardButtonLayout(wxBoxSizer& sizer, const StdButtons& buttons = StdB
 
 
 inline
-int getDefaultMenuIconSize()
+constexpr int getMenuIconDipSize()
 {
-    return fastFromDIP(20);
+    return 20;
 }
 
 
@@ -43,7 +43,7 @@ inline
 int getDefaultButtonHeight()
 {
     const int defaultHeight = wxButton::GetDefaultSize().GetHeight(); //buffered by wxWidgets
-    return std::max(defaultHeight, fastFromDIP(31)); //default button height is much too small => increase!
+    return std::max(defaultHeight, dipToWxsize(31)); //default button height is much too small => increase!
 }
 
 
@@ -62,9 +62,9 @@ void setStandardButtonLayout(wxBoxSizer& sizer, const StdButtons& buttons)
     assert(sizer.GetOrientation() == wxHORIZONTAL);
 
     //GNOME Human Interface Guidelines: https://developer.gnome.org/hig-book/3.2/hig-book.html#alert-spacing
-    const int spaceH    = fastFromDIP( 6); //OK
-    const int spaceRimH = fastFromDIP(12); //OK
-    const int spaceRimV = fastFromDIP(12); //OK
+    const int spaceH    = dipToWxsize( 6); //OK
+    const int spaceRimH = dipToWxsize(12); //OK
+    const int spaceRimV = dipToWxsize(12); //OK
 
     StdButtons buttonsTmp = buttons;
 
diff --git a/wx+/tooltip.cpp b/wx+/tooltip.cpp
index 79d4fa1a..01b5ead4 100644
--- a/wx+/tooltip.cpp
+++ b/wx+/tooltip.cpp
@@ -75,8 +75,10 @@ void Tooltip::show(const wxString& text, wxPoint mousePos, const wxImage* img)
     if (txtChanged)
     {
         lastUsedText_ = text;
+        {
             tipWindow_->staticTextMain_->SetLabelText(text);
-        tipWindow_->staticTextMain_->Wrap(fastFromDIP(600));
+            tipWindow_->staticTextMain_->Wrap(dipToWxsize(600));
+        }
     }
 
     if (imgChanged || txtChanged)
@@ -88,8 +90,8 @@ void Tooltip::show(const wxString& text, wxPoint mousePos, const wxImage* img)
 #endif
 
     const wxPoint newPos = wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft ?
-                           mousePos - wxPoint(fastFromDIP(TIP_WINDOW_OFFSET_DIP) + tipWindow_->GetSize().GetWidth(), 0) :
-                           mousePos + wxPoint(fastFromDIP(TIP_WINDOW_OFFSET_DIP),                                    0);
+                           mousePos - wxPoint(dipToWxsize(TIP_WINDOW_OFFSET_DIP) + tipWindow_->GetSize().GetWidth(), 0) :
+                           mousePos + wxPoint(dipToWxsize(TIP_WINDOW_OFFSET_DIP),                                    0);
 
     if (newPos != tipWindow_->GetScreenPosition())
         tipWindow_->Move(newPos);
diff --git a/wx+/window_layout.h b/wx+/window_layout.h
index 8a86ec86..553485bd 100644
--- a/wx+/window_layout.h
+++ b/wx+/window_layout.h
@@ -66,7 +66,7 @@ void setDefaultWidth(wxSpinCtrl& m_spinCtrl)
 
     //get rid of excessive default width on old GTK3 3.14 (Debian);
     //gtk_entry_set_width_chars() not working => mitigate
-    m_spinCtrl.SetMinSize({fastFromDIP(100), -1}); //must be wider than gtk_entry_set_width_chars(), or it breaks newer GTK e.g. 3.22!
+    m_spinCtrl.SetMinSize({dipToWxsize(100), -1}); //must be wider than gtk_entry_set_width_chars(), or it breaks newer GTK e.g. 3.22!
 
 #if 0 //generic property syntax:
     GValue bval = G_VALUE_INIT;
@@ -76,7 +76,7 @@ void setDefaultWidth(wxSpinCtrl& m_spinCtrl)
     ::g_object_set_property(G_OBJECT(m_spinCtrl.m_widget), "visibility", &bval);
 #endif
 #else
-    m_spinCtrl.SetMinSize({fastFromDIP(70), -1});
+    m_spinCtrl.SetMinSize({dipToWxsize(70), -1});
 #endif
 
 }
diff --git a/zen/file_access.cpp b/zen/file_access.cpp
index 6a8a36da..22129157 100644
--- a/zen/file_access.cpp
+++ b/zen/file_access.cpp
@@ -349,9 +349,6 @@ void zen::moveAndRenameItem(const Zstring& pathFrom, const Zstring& pathTo, bool
     }
 }
 
-
-
-
 namespace
 {
 void setWriteTimeNative(const Zstring& itemPath, const timespec& modTime, ProcSymlink procSl) //throw FileError
diff --git a/zen/legacy_compiler.h b/zen/legacy_compiler.h
index fce7fd7d..54909b71 100644
--- a/zen/legacy_compiler.h
+++ b/zen/legacy_compiler.h
@@ -40,6 +40,9 @@ basic_string<Char, Traits, Alloc> operator+(basic_string<Char, Traits, Alloc>&&
 }
 //---------------------------------------------------------------------------------
 
+//support for std::string::resize_and_overwrite()
+    #define ZEN_HAVE_RESIZE_AND_OVERWRITE 1
+
 namespace zen
 {
 double fromChars(const char* first, const char* last);
diff --git a/zen/serialize.h b/zen/serialize.h
index f3e4f7ff..82ea9971 100644
--- a/zen/serialize.h
+++ b/zen/serialize.h
@@ -260,6 +260,10 @@ BinContainer unbufferedLoad(Function tryRead /*(void* buffer, size_t bytesToRead
     BinContainer buf;
     for (;;)
     {
+#ifndef ZEN_HAVE_RESIZE_AND_OVERWRITE
+#error include legacy_compiler.h!
+#endif
+#if ZEN_HAVE_RESIZE_AND_OVERWRITE //permature(?) perf optimization; avoid needless zero-initialization:
         size_t bytesRead = 0;
         buf.resize_and_overwrite(buf.size() + blockSize, [&, bufSizeOld = buf.size()](char* rawBuf, size_t /*rawBufSize: caveat: may be larger than what's requested*/)
                                  //permature(?) perf optimization; avoid needless zero-initialization:
@@ -267,6 +271,11 @@ BinContainer unbufferedLoad(Function tryRead /*(void* buffer, size_t bytesToRead
             bytesRead = tryRead(rawBuf + bufSizeOld, blockSize); //throw X; may return short; only 0 means EOF
             return bufSizeOld + bytesRead;
         });
+#else
+        buf.resize(buf.size() + blockSize); //needless zero-initialization!
+        const size_t bytesRead = tryRead(buf.data() + buf.size() - blockSize, blockSize); //throw X; may return short; only 0 means EOF
+        buf.resize(buf.size() - blockSize + bytesRead); //caveat: unsigned arithmetics
+#endif
         if (bytesRead == 0) //end of file
         {
             //caveat: memory consumption of returned string!
diff --git a/zen/thread.h b/zen/thread.h
index 27b4c9b8..27e23b4a 100644
--- a/zen/thread.h
+++ b/zen/thread.h
@@ -203,10 +203,13 @@ public:
     //non-blocking wait()-alternative: context of controlling thread:
     void notifyWhenDone(const std::function<void()>& onCompletion /*noexcept! runs on worker thread!*/)
     {
-        std::lock_guard dummy(workLoad_.ref().lock);
+        std::unique_lock dummy(workLoad_.ref().lock);
 
         if (workLoad_.ref().tasksPending == 0)
+        {
+            dummy.unlock();
             onCompletion();
+        }
         else
             workLoad_.ref().onCompletionCallbacks.push_back(onCompletion);
     }
@@ -242,8 +245,7 @@ private:
                 if (--(workLoad.tasksPending) == 0)
                     if (!workLoad.onCompletionCallbacks.empty())
                     {
-                        std::vector<std::function<void()>> callbacks;
-                        callbacks.swap(workLoad.onCompletionCallbacks);
+                        std::vector<std::function<void()>> callbacks = std::exchange(workLoad.onCompletionCallbacks, {});
 
                         dummy.unlock();
                         for (const auto& cb : callbacks)