Merge branch '10.8' into 'master'10.8

10.8

See merge request opensource-tracking/FreeFileSync!5

67 files changed, 7404 insertions, 6580 deletions

diff --git a/Changelog.txt b/Changelog.txt
index bf64b73b..c4a33386 100755
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,3 +1,19 @@
+FreeFileSync 10.8 [2019-01-19]
+------------------------------
+Support synchronization with Google Drive
+Don't reset sync directions when changing versioning or deletion handling
+Save last sync time before shutting down system
+Support MTP devices that accept modTime only during file creation
+Avoid dependency on file id to detect duplicate folders (buggy network drivers)
+Check if path exists before creating duplicate MTP folder
+Check for empty MTP item name during folder traversal
+Check if multiple MTP items are referenced by the same path
+Fixed sync config GUI distortion when toggling auto retry (Linux, macOS)
+Fixed FreeFileSync sort order in Windows Uninstall Programs
+Fixed log override path being squashed on high DPI
+Fixed volume serial not considered when file id is missing
+
+
 FreeFileSync 10.7 [2018-12-12]
 ------------------------------
 Correctly resolve ambiguous paths in (S)FTP folder picker
diff --git a/FreeFileSync/Build/Languages/german.lng b/FreeFileSync/Build/Languages/german.lng
index 2ee37021..0a945231 100755
--- a/FreeFileSync/Build/Languages/german.lng
+++ b/FreeFileSync/Build/Languages/german.lng
@@ -127,6 +127,9 @@
 <source>The folders are created automatically when needed.</source>
 <target>Die Ordner werden bei Bedarf automatisch erstellt.</target>
 
+<source>The following folder paths differ in case. Please use a single form in order to avoid duplicate accesses.</source>
+<target>Die folgenden Ordnerpfade unterscheiden sich in der Groß-/Kleinschreibung. Bitte verwenden Sie eine einheitliche Form um doppelte Zugriffe zu vermeiden.</target>
+
 <source>Scanning:</source>
 <target>Suche Dateien:</target>
 
@@ -588,6 +591,9 @@ Tatsächlich: %y bytes
 <source>Cannot open directory %x.</source>
 <target>Das Verzeichnis %x kann nicht geöffnet werden.</target>
 
+<source>Cannot write modification time of %x.</source>
+<target>Die Änderungszeit von %x kann nicht geschrieben werden.</target>
+
 <source>Cannot create directory %x.</source>
 <target>Das Verzeichnis %x kann nicht erstellt werden.</target>
 
@@ -597,9 +603,6 @@ Tatsächlich: %y bytes
 <source>Cannot delete directory %x.</source>
 <target>Das Verzeichnis %x kann nicht gelöscht werden.</target>
 
-<source>Cannot write modification time of %x.</source>
-<target>Die Änderungszeit von %x kann nicht geschrieben werden.</target>
-
 <source>Cannot determine final path for %x.</source>
 <target>Der endgültige Pfad für %x kann nicht ermittelt werden.</target>
 
@@ -612,33 +615,42 @@ Tatsächlich: %y bytes
 <source>Unable to access %x.</source>
 <target>Auf %x kann nicht zugegriffen werden.</target>
 
+<source>The server returned an error:</source>
+<target>Der Server hat einen Fehler zurückgegeben:</target>
+
 <source>Authentication completed.</source>
 <target>Authentifizierung abgeschlossen.</target>
 
-<source>Authentication failed.</source>
-<target>Authentifizierung fehlgeschlagen.</target>
-
 <source>You may close this page now and continue with FreeFileSync.</source>
 <target>Sie können diese Seite nun schließen und mit FreeFileSync fortfahren.</target>
 
-<source>The server returned an error:</source>
-<target>Der Server hat einen Fehler zurückgegeben:</target>
+<source>Authentication failed.</source>
+<target>Authentifizierung fehlgeschlagen.</target>
 
-<source>Cannot determine free disk space for %x.</source>
-<target>Der freie Speicherplatz für %x konnte nicht ermittelt werden.</target>
+<source>Unable to disconnect from %x.</source>
+<target>Die Verbindung zu %x kann nicht getrennt werden.</target>
+
+<source>Cannot monitor directory %x.</source>
+<target>Das Verzeichnis %x kann nicht überwacht werden.</target>
 
 <source>Cannot find %x.</source>
 <target>%x wurde nicht gefunden.</target>
 
+<source>Please authorize access to user account %x.</source>
+<target>Bitte autorisieren Sie den Zugriff auf das Nutzerkonto %x.</target>
+
+<source>Cannot delete symbolic link %x.</source>
+<target>Die symbolischen Verknüpfung %x kann nicht gelöscht werden.</target>
+
+<source>Cannot determine free disk space for %x.</source>
+<target>Der freie Speicherplatz für %x konnte nicht ermittelt werden.</target>
+
 <source>Cannot find device %x.</source>
 <target>Das Gerät %x wurde nicht gefunden.</target>
 
 <source>Type of item %x is not supported:</source>
 <target>Der Typ des Elements %x wird nicht unterstützt:</target>
 
-<source>Cannot delete symbolic link %x.</source>
-<target>Die symbolischen Verknüpfung %x kann nicht gelöscht werden.</target>
-
 <source>Incorrect command line:</source>
 <target>Ungültige Befehlszeile:</target>
 
@@ -1180,12 +1192,21 @@ Die Befehlszeile wird ausgelöst, wenn:
 <source>OK</source>
 <target>OK</target>
 
-<source>Enter your login details:</source>
-<target>Anmeldedaten eingeben:</target>
-
 <source>Connection type:</source>
 <target>Verbindungstyp:</target>
 
+<source>Connected user accounts:</source>
+<target>Verbundene Nutzerkonten:</target>
+
+<source>&Add connection</source>
+<target>&Verbindung hinzufügen</target>
+
+<source>&Disconnect</source>
+<target>&Trennen</target>
+
+<source>Selected user account:</source>
+<target>Ausgewähltes Nutzerkonto:</target>
+
 <source>Server name or IP address:</source>
 <target>Servername oder IP-Adresse:</target>
 
@@ -1699,6 +1720,9 @@ Dadurch wird ein konsistenter Datenstand auch bei schweren Fehlern garantiert.
 <source>Recommended range:</source>
 <target>Empfohlener Bereich:</target>
 
+<source>Do you really want to disconnect from user account %x?</source>
+<target>Soll die Verbindung zum Nutzerkonto %x wirklich getrennt werden?</target>
+
 <source>Password:</source>
 <target>Passwort:</target>
 
@@ -1924,9 +1948,6 @@ Dadurch wird ein konsistenter Datenstand auch bei schweren Fehlern garantiert.
 <source>Unable to register device notifications for %x.</source>
 <target>Die Registrierung für Gerätemeldungen ist für %x fehlgeschlagen.</target>
 
-<source>Cannot monitor directory %x.</source>
-<target>Das Verzeichnis %x kann nicht überwacht werden.</target>
-
 <source>The file is locked by another process:</source>
 <target>Die Datei wird von einem anderen Prozess gesperrt:</target>
 
diff --git a/FreeFileSync/Build/Resources.zip b/FreeFileSync/Build/Resources.zip
index 4fe5268b..9aab102a 100755
--- a/FreeFileSync/Build/Resources.zip
+++ b/FreeFileSync/Build/Resources.zip
diff --git a/FreeFileSync/Source/Makefile b/FreeFileSync/Source/Makefile
index 8c666383..1e581964 100755
--- a/FreeFileSync/Source/Makefile
+++ b/FreeFileSync/Source/Makefile
@@ -85,6 +85,7 @@ CPP_FILES+=../../zen/format_unit.cpp
 CPP_FILES+=../../zen/process_priority.cpp
 CPP_FILES+=../../zen/shutdown.cpp
 CPP_FILES+=../../zen/thread.cpp
+CPP_FILES+=../../zen/zlib_wrap.cpp
 CPP_FILES+=../../wx+/file_drop.cpp
 CPP_FILES+=../../wx+/grid.cpp
 CPP_FILES+=../../wx+/image_tools.cpp
@@ -93,7 +94,6 @@ CPP_FILES+=../../wx+/tooltip.cpp
 CPP_FILES+=../../wx+/image_resources.cpp
 CPP_FILES+=../../wx+/popup_dlg.cpp
 CPP_FILES+=../../wx+/popup_dlg_generated.cpp
-CPP_FILES+=../../wx+/zlib_wrap.cpp
 CPP_FILES+=../../xBRZ/src/xbrz.cpp
 
 OBJ_FILES = $(CPP_FILES:%=../Obj/FFS_GCC_Make_Release/ffs/src/%.o)
diff --git a/FreeFileSync/Source/RealTimeSync/Makefile b/FreeFileSync/Source/RealTimeSync/Makefile
index d04aeb6f..dc129c1c 100755
--- a/FreeFileSync/Source/RealTimeSync/Makefile
+++ b/FreeFileSync/Source/RealTimeSync/Makefile
@@ -27,9 +27,10 @@ CPP_FILES+=../../../zen/dir_watcher.cpp
 CPP_FILES+=../../../zen/file_access.cpp
 CPP_FILES+=../../../zen/file_io.cpp
 CPP_FILES+=../../../zen/file_traverser.cpp
-CPP_FILES+=../../../zen/zstring.cpp
 CPP_FILES+=../../../zen/format_unit.cpp
+CPP_FILES+=../../../zen/shutdown.cpp
 CPP_FILES+=../../../zen/thread.cpp
+CPP_FILES+=../../../zen/zstring.cpp
 CPP_FILES+=../../../wx+/file_drop.cpp
 CPP_FILES+=../../../wx+/image_tools.cpp
 CPP_FILES+=../../../wx+/image_resources.cpp
diff --git a/FreeFileSync/Source/RealTimeSync/application.cpp b/FreeFileSync/Source/RealTimeSync/application.cpp
index af556ace..899d1c69 100755
--- a/FreeFileSync/Source/RealTimeSync/application.cpp
+++ b/FreeFileSync/Source/RealTimeSync/application.cpp
@@ -8,6 +8,7 @@
 #include "main_dlg.h"
 #include <zen/file_access.h>
 #include <zen/thread.h>
+#include <zen/shutdown.h>
 #include <wx/event.h>
 #include <wx/log.h>
 #include <wx/tooltip.h>
@@ -141,6 +142,5 @@ void Application::onQueryEndSession(wxEvent& event)
     if (auto mainWin = dynamic_cast<MainDialog*>(GetTopWindow()))
         mainWin->onQueryEndSession();
     //it's futile to try and clean up while the process is in full swing (CRASH!) => just terminate!
-    std::exit(fff::FFS_RC_ABORTED);
-    //don't use std::abort() => crashes process with "EXC_CRASH (SIGABRT)" on macOS
+    zen::terminateProcess(fff::FFS_RC_ABORTED);
 }
diff --git a/FreeFileSync/Source/base/algorithm.cpp b/FreeFileSync/Source/base/algorithm.cpp
index e35f0bdf..b04cbb36 100755
--- a/FreeFileSync/Source/base/algorithm.cpp
+++ b/FreeFileSync/Source/base/algorithm.cpp
@@ -24,11 +24,11 @@ using namespace zen;
 using namespace fff;
 
 
-void fff::swapGrids(const MainConfiguration& config, FolderComparison& folderCmp) //throw FileError
+void fff::swapGrids(const MainConfiguration& mainCfg, FolderComparison& folderCmp) //throw FileError
 {
     std::for_each(begin(folderCmp), end(folderCmp), [](BaseFolderPair& baseFolder) { baseFolder.flip(); });
 
-    redetermineSyncDirection(config, folderCmp, nullptr /*notifyStatus*/); //throw FileError
+    redetermineSyncDirection(extractDirectionCfg(mainCfg), folderCmp, nullptr /*notifyStatus*/); //throw FileError
 }
 
 //----------------------------------------------------------------------------------------------
@@ -335,9 +335,9 @@ private:
                     exLeftOnlyByPath_.emplace(dbEntry, &file);
                 else if (!file.getFileId<LEFT_SIDE>().empty())
                 {
-                    auto rv = exLeftOnlyById_.emplace(file.getFileId<LEFT_SIDE>(), &file);
-                    if (!rv.second) //duplicate file ID! NTFS hard link/symlink?
-                        rv.first->second = nullptr;
+                    const auto [it, inserted] = exLeftOnlyById_.emplace(file.getFileId<LEFT_SIDE>(), &file);
+                    if (!inserted) //duplicate file ID! NTFS hard link/symlink?
+                        it->second = nullptr;
                 }
             }
             else if (cat == FILE_RIGHT_SIDE_ONLY)
@@ -346,9 +346,9 @@ private:
                     exRightOnlyByPath_.emplace(dbEntry, &file);
                 else if (!file.getFileId<RIGHT_SIDE>().empty())
                 {
-                    auto rv = exRightOnlyById_.emplace(file.getFileId<RIGHT_SIDE>(), &file);
-                    if (!rv.second) //duplicate file ID! NTFS hard link/symlink?
-                        rv.first->second = nullptr;
+                    const auto [it, inserted] = exRightOnlyById_.emplace(file.getFileId<RIGHT_SIDE>(), &file);
+                    if (!inserted) //duplicate file ID! NTFS hard link/symlink?
+                        it->second = nullptr;
                 }
             }
         }
@@ -725,15 +725,13 @@ void fff::redetermineSyncDirection(const DirectionConfig& dirCfg, //throw FileEr
 }
 
 
-void fff::redetermineSyncDirection(const MainConfiguration& mainCfg, //throw FileError
+void fff::redetermineSyncDirection(const std::vector<DirectionConfig>& directCfgs, //throw FileError
                                    FolderComparison& folderCmp,
                                    const std::function<void(const std::wstring& msg)>& notifyStatus)
 {
     if (folderCmp.empty())
         return;
 
-    std::vector<DirectionConfig> directCfgs = extractDirectionCfg(mainCfg);
-
     if (folderCmp.size() != directCfgs.size())
         throw std::logic_error("Contract violation! " + std::string(__FILE__) + ":" + numberTo<std::string>(__LINE__));
 
@@ -1285,7 +1283,7 @@ void copyToAlternateFolderFrom(const std::vector<const FileSystemObject*>& rowsT
                     statReporter.reportDelta(0, bytesDelta);
                     callback.requestUiRefresh(); //throw X
                 };
-                /*const AFS::FileCopyResult result =*/ AFS::copyFileTransactional(sourcePath, sourceAttr, targetPath, //throw FileError, ErrorFileLocked
+                /*const AFS::FileCopyResult result =*/ AFS::copyFileTransactional(sourcePath, sourceAttr, targetPath, //throw FileError, ErrorFileLocked, X
                                                                                   false /*copyFilePermissions*/, true /*transactionalCopy*/, deleteTargetItem, notifyUnbufferedIO);
                 //result.errorModTime? => probably irrelevant (behave like Windows Explorer)
             });
@@ -1684,7 +1682,7 @@ void TempFileBuffer::createTempFiles(const std::set<FileDescriptor>& workLoad, P
                 statReporter.reportDelta(0, bytesDelta);
                 callback.requestUiRefresh(); //throw X
             };
-            /*const AFS::FileCopyResult result =*/ AFS::copyFileTransactional(descr.path, sourceAttr, //throw FileError, ErrorFileLocked
+            /*const AFS::FileCopyResult result =*/ AFS::copyFileTransactional(descr.path, sourceAttr, //throw FileError, ErrorFileLocked, X
                                                                               createItemPathNative(tempFilePath),
                                                                               false /*copyFilePermissions*/, true /*transactionalCopy*/, nullptr /*onDeleteTargetFile*/, notifyUnbufferedIO);
             //result.errorModTime? => irrelevant for temp files!
diff --git a/FreeFileSync/Source/base/algorithm.h b/FreeFileSync/Source/base/algorithm.h
index f7b2cc15..a58e2b50 100755
--- a/FreeFileSync/Source/base/algorithm.h
+++ b/FreeFileSync/Source/base/algorithm.h
@@ -16,7 +16,7 @@
 
 namespace fff
 {
-void swapGrids(const MainConfiguration& config, FolderComparison& folderCmp); //throw FileError
+void swapGrids(const MainConfiguration& mainCfg, FolderComparison& folderCmp); //throw FileError
 
 std::vector<DirectionConfig> extractDirectionCfg(const MainConfiguration& mainCfg);
 
@@ -24,7 +24,7 @@ void redetermineSyncDirection(const DirectionConfig& directConfig, //throw FileE
                               BaseFolderPair& baseFolder,
                               const std::function<void(const std::wstring& msg)>& notifyStatus);
 
-void redetermineSyncDirection(const MainConfiguration& mainCfg, //throw FileError
+void redetermineSyncDirection(const std::vector<DirectionConfig>& directCfgs, //throw FileError
                               FolderComparison& folderCmp,
                               const std::function<void(const std::wstring& msg)>& notifyStatus);
 
diff --git a/FreeFileSync/Source/base/application.cpp b/FreeFileSync/Source/base/application.cpp
index fc07e808..8f156b85 100755
--- a/FreeFileSync/Source/base/application.cpp
+++ b/FreeFileSync/Source/base/application.cpp
@@ -8,6 +8,7 @@
 #include <memory>
 #include <zen/file_access.h>
 #include <zen/perf.h>
+#include <zen/shutdown.h>
 #include <wx/tooltip.h>
 #include <wx/log.h>
 #include <wx+/app_main.h>
@@ -27,6 +28,7 @@
 
     #include <gtk/gtk.h>
 
+
 using namespace zen;
 using namespace fff;
 
@@ -75,6 +77,7 @@ bool Application::OnInit()
     catch (FileError&) { assert(false); }
 
 
+
     Connect(wxEVT_QUERY_END_SESSION, wxEventHandler(Application::onQueryEndSession), nullptr, this);
     Connect(wxEVT_END_SESSION,       wxEventHandler(Application::onQueryEndSession), nullptr, this);
 
@@ -131,8 +134,7 @@ void Application::onQueryEndSession(wxEvent& event)
     if (auto mainWin = dynamic_cast<MainDialog*>(GetTopWindow()))
         mainWin->onQueryEndSession();
     //it's futile to try and clean up while the process is in full swing (CRASH!) => just terminate!
-    std::exit(FFS_RC_ABORTED);
-    //don't use std::abort() => crashes process with "EXC_CRASH (SIGABRT)" on macOS
+    terminateProcess(FFS_RC_ABORTED);
 }
 
 
@@ -455,7 +457,7 @@ void showSyntaxHelp()
     showNotificationDialog(nullptr, DialogInfoType::INFO, PopupDialogCfg().
                            setTitle(_("Command line")).
                            setDetailInstructions(_("Syntax:") + L"\n\n" +
-                                                 L"./FreeFileSync " + L"\n" +
+                                                 L"./FreeFileSync" + L"\n" +
                                                  L"    [" + _("config files:") + L" *.ffs_gui/*.ffs_batch]" + L"\n" +
                                                  L"    [-DirPair " + _("directory") + L" " + _("directory") + L"]" + L"\n" +
                                                  L"    [-Edit]" + L"\n" +
@@ -601,12 +603,8 @@ void runBatchMode(const Zstring& globalConfigFilePath, const XmlBatchConfig& bat
             break;
         }
 
-    //open new top-level window *after* progress dialog is gone => run on main event loop
-    if (r.switchToGuiRequested)
-        return MainDialog::create(globalConfigFilePath, &globalCfg, convertBatchToGui(batchCfg), { cfgFilePath }, true /*startComparison*/);
-
-
-    try //save global settings to XML: e.g. ignored warnings
+    //---------------------------------------------------------------------------
+    try //save global settings to XML: e.g. ignored warnings, last sync stats
     {
         writeConfig(globalCfg, globalConfigFilePath); //FileError
     }
@@ -614,4 +612,22 @@ void runBatchMode(const Zstring& globalConfigFilePath, const XmlBatchConfig& bat
     {
         notifyError(e.toString(), FFS_RC_FINISHED_WITH_WARNINGS);
     }
+
+    using FinalRequest = BatchStatusHandler::FinalRequest;
+    switch (r.finalRequest)
+    {
+        case FinalRequest::none:
+            break;
+        case FinalRequest::switchGui: //open new top-level window *after* progress dialog is gone => run on main event loop
+            MainDialog::create(globalConfigFilePath, &globalCfg, convertBatchToGui(batchCfg), { cfgFilePath }, true /*startComparison*/);
+            break;
+        case FinalRequest::shutdown: //run *after* last sync stats were updated and saved! https://freefilesync.org/forum/viewtopic.php?t=5761
+            try
+            {
+                shutdownSystem(); //throw FileError
+                terminateProcess(0 /*exitCode*/); //no point in continuing and saving cfg again in onQueryEndSession() while the OS will kill us anytime!
+            }
+            catch (const FileError& e) { notifyError(e.toString(), FFS_RC_FINISHED_WITH_WARNINGS); }
+            break;
+    }
 }
diff --git a/FreeFileSync/Source/base/binary.cpp b/FreeFileSync/Source/base/binary.cpp
index 643dba23..db5dee54 100755
--- a/FreeFileSync/Source/base/binary.cpp
+++ b/FreeFileSync/Source/base/binary.cpp
@@ -39,8 +39,8 @@ const size_t BLOCK_SIZE_MAX =  16 * 1024 * 1024;
 
 struct StreamReader
 {
-    StreamReader(const AbstractPath& filePath, const IOCallback& notifyUnbufferedIO) : //throw FileError, X
-        stream_(AFS::getInputStream(filePath, notifyUnbufferedIO)), //throw FileError, ErrorFileLocked, X
+    StreamReader(const AbstractPath& filePath, const IOCallback& notifyUnbufferedIO) : //throw FileError
+        stream_(AFS::getInputStream(filePath, notifyUnbufferedIO)), //throw FileError, ErrorFileLocked
         defaultBlockSize_(stream_->getBlockSize()),
         dynamicBlockSize_(defaultBlockSize_) { assert(defaultBlockSize_ > 0); }
 
@@ -94,11 +94,11 @@ private:
 }
 
 
-bool fff::filesHaveSameContent(const AbstractPath& filePath1, const AbstractPath& filePath2, const IOCallback& notifyUnbufferedIO) //throw FileError
+bool fff::filesHaveSameContent(const AbstractPath& filePath1, const AbstractPath& filePath2, const IOCallback& notifyUnbufferedIO /*throw X*/) //throw FileError, X
 {
     int64_t totalUnbufferedIO = 0;
 
-    StreamReader reader1(filePath1, IOCallbackDivider(notifyUnbufferedIO, totalUnbufferedIO)); //throw FileError, X
+    StreamReader reader1(filePath1, IOCallbackDivider(notifyUnbufferedIO, totalUnbufferedIO)); //throw FileError
     StreamReader reader2(filePath2, IOCallbackDivider(notifyUnbufferedIO, totalUnbufferedIO)); //
 
     StreamReader* readerLow  = &reader1;
diff --git a/FreeFileSync/Source/base/binary.h b/FreeFileSync/Source/base/binary.h
index bba321da..66d8b09c 100755
--- a/FreeFileSync/Source/base/binary.h
+++ b/FreeFileSync/Source/base/binary.h
@@ -12,9 +12,9 @@
 
 namespace fff
 {
-bool filesHaveSameContent(const AbstractPath& filePath1, //throw FileError
+bool filesHaveSameContent(const AbstractPath& filePath1, //throw FileError, X
                           const AbstractPath& filePath2,
-                          const zen::IOCallback& notifyUnbufferedIO); //may be nullptr
+                          const zen::IOCallback& notifyUnbufferedIO  /*throw X*/);
 }
 
 #endif //BINARY_H_3941281398513241134
diff --git a/FreeFileSync/Source/base/cmp_filetime.h b/FreeFileSync/Source/base/cmp_filetime.h
index ce3a04e9..385fba6f 100755
--- a/FreeFileSync/Source/base/cmp_filetime.h
+++ b/FreeFileSync/Source/base/cmp_filetime.h
@@ -14,7 +14,7 @@
 namespace fff
 {
 inline
-bool sameFileTime(int64_t lhs, int64_t rhs, int tolerance, const std::vector<unsigned int>& ignoreTimeShiftMinutes)
+bool sameFileTime(time_t lhs, time_t rhs, int tolerance, const std::vector<unsigned int>& ignoreTimeShiftMinutes)
 {
     if (tolerance < 0) //:= unlimited tolerance by convention!
         return true;
@@ -22,7 +22,7 @@ bool sameFileTime(int64_t lhs, int64_t rhs, int tolerance, const std::vector<uns
     if (lhs < rhs)
         std::swap(lhs, rhs);
 
-    if (rhs > std::numeric_limits<int64_t>::max() - tolerance) //protect against overflow!
+    if (rhs > std::numeric_limits<time_t>::max() - tolerance) //protect against overflow!
         return true;
 
     if (lhs <= rhs + tolerance)
@@ -33,10 +33,10 @@ bool sameFileTime(int64_t lhs, int64_t rhs, int tolerance, const std::vector<uns
         assert(minutes > 0);
         const int shiftSec = static_cast<int>(minutes) * 60;
 
-        int64_t low  = rhs;
-        int64_t high = lhs;
+        time_t low  = rhs;
+        time_t high = lhs;
 
-        if (low <= std::numeric_limits<int64_t>::max() - shiftSec) //protect against overflow!
+        if (low <= std::numeric_limits<time_t>::max() - shiftSec) //protect against overflow!
             low += shiftSec;
         else
             high -= shiftSec;
@@ -44,7 +44,7 @@ bool sameFileTime(int64_t lhs, int64_t rhs, int tolerance, const std::vector<uns
         if (high < low)
             std::swap(high, low);
 
-        if (low > std::numeric_limits<int64_t>::max() - tolerance) //protect against overflow!
+        if (low > std::numeric_limits<time_t>::max() - tolerance) //protect against overflow!
             return true;
 
         if (high <= low + tolerance)
@@ -67,10 +67,10 @@ enum class TimeResult
 
 
 inline
-TimeResult compareFileTime(int64_t lhs, int64_t rhs, int tolerance, const std::vector<unsigned int>& ignoreTimeShiftMinutes)
+TimeResult compareFileTime(time_t lhs, time_t rhs, int tolerance, const std::vector<unsigned int>& ignoreTimeShiftMinutes)
 {
     //number of seconds since Jan 1st 1970 + 1 year (needn't be too precise)
-    static const int64_t oneYearFromNow = std::time(nullptr) + 365 * 24 * 3600;
+    static const time_t oneYearFromNow = std::time(nullptr) + 365 * 24 * 3600;
 
     if (sameFileTime(lhs, rhs, tolerance, ignoreTimeShiftMinutes)) //last write time may differ by up to 2 seconds (NTFS vs FAT32)
         return TimeResult::EQUAL;
diff --git a/FreeFileSync/Source/base/comparison.cpp b/FreeFileSync/Source/base/comparison.cpp
index eaf5aacc..cd873c87 100755
--- a/FreeFileSync/Source/base/comparison.cpp
+++ b/FreeFileSync/Source/base/comparison.cpp
@@ -70,38 +70,34 @@ struct ResolvedBaseFolders
 
 ResolvedBaseFolders initializeBaseFolders(const std::vector<FolderPairCfg>& fpCfgList, const std::map<AfsDevice, size_t>& deviceParallelOps,
                                           bool allowUserInteraction,
-                                          bool& warnFolderNotExisting,
+                                          WarningDialogs& warnings,
                                           ProcessCallback& callback /*throw X*/)
 {
     ResolvedBaseFolders output;
+    std::set<AbstractPath> allFolders;
     std::set<AbstractPath> notExisting;
 
     tryReportingError([&]
     {
         //support "retry" for environment variable and variable driver letter resolution!
-        std::set<AbstractPath> baseFolders;
-        std::vector<std::pair<AbstractPath, AbstractPath>> folderPairs;
-
+        allFolders.clear();
+        output.resolvedPairs.clear();
         for (const FolderPairCfg& fpCfg : fpCfgList)
         {
-            folderPairs.emplace_back(createAbstractPath(fpCfg.folderPathPhraseLeft_),
-                                     createAbstractPath(fpCfg.folderPathPhraseRight_));
+            output.resolvedPairs.push_back(
+            {
+                createAbstractPath(fpCfg.folderPathPhraseLeft_),
+                createAbstractPath(fpCfg.folderPathPhraseRight_)});
 
-            baseFolders.insert(folderPairs.back().first);
-            baseFolders.insert(folderPairs.back().second);
+            allFolders.insert(output.resolvedPairs.back().folderPathLeft);
+            allFolders.insert(output.resolvedPairs.back().folderPathRight);
         }
-
-        const FolderStatus status = getFolderStatusNonBlocking(baseFolders, deviceParallelOps, //re-check *all* directories on each try!
+        //---------------------------------------------------------------------------
+        const FolderStatus status = getFolderStatusNonBlocking(allFolders, deviceParallelOps, //re-check *all* directories on each try!
                                                                allowUserInteraction, callback); //throw X
-        output.resolvedPairs.clear();
-        for (const auto& [folderPathL, folderPathR] : folderPairs)
-            output.resolvedPairs.push_back({ getNormalizedPath(status, folderPathL), getNormalizedPath(status, folderPathR)});
-
-        output.existingBaseFolders.clear();
-        for (const AbstractPath& folderPath : status.existing)
-            output.existingBaseFolders.insert(getNormalizedPath(status, folderPath));
 
-        notExisting = status.notExisting;
+        output.existingBaseFolders = status.existing;
+        notExisting                = status.notExisting;
 
         if (!status.failedChecks.empty())
         {
@@ -129,8 +125,30 @@ ResolvedBaseFolders initializeBaseFolders(const std::vector<FolderPairCfg>& fpCf
         msg += L"\n\n";
         msg +=  _("The folders are created automatically when needed.");
 
-        callback.reportWarning(msg, warnFolderNotExisting); //throw X
+        callback.reportWarning(msg, warnings.warnFolderNotExisting); //throw X
     }
+
+    //---------------------------------------------------------------------------
+    std::map<std::pair<AfsDevice, ZstringNoCase>, std::set<AbstractPath>> ciPathAliases;
+
+    for (const AbstractPath& ap : allFolders)
+        ciPathAliases[std::pair(ap.afsDevice, ap.afsPath.value)].insert(ap);
+
+    if (std::any_of(ciPathAliases.begin(), ciPathAliases.end(), [](const auto& item) { return item.second/*aliases*/.size() > 1; }))
+    {
+        std::wstring msg = _("The following folder paths differ in case. Please use a single form in order to avoid duplicate accesses.");
+        for (const auto& [key, aliases] : ciPathAliases)
+            if (aliases.size() > 1)
+            {
+                msg += L"\n";
+                for (const AbstractPath& aliasPath : aliases)
+                    msg += L"\n" + AFS::getDisplayPath(aliasPath);
+            }
+
+        callback.reportWarning(msg, warnings.warnFoldersDifferInCase); //throw X
+    }
+    warn_static("maybe just use GetFinalPathNameByHandleW/realpath? (limitation: network folders that deny access to parents)")
+
     return output;
 }
 
@@ -439,10 +457,10 @@ namespace parallel
 //ATTENTION CALLBACKS: they also run asynchronously *outside* the singleThread lock!
 //--------------------------------------------------------------
 inline
-bool filesHaveSameContent(const AbstractPath& filePath1, const AbstractPath& filePath2, //throw FileError
-                          const IOCallback& notifyUnbufferedIO, //may be nullptr
+bool filesHaveSameContent(const AbstractPath& filePath1, const AbstractPath& filePath2, //throw FileError, X
+                          const IOCallback& notifyUnbufferedIO /*throw X*/,
                           std::mutex& singleThread)
-{ return parallelScope([=] { return filesHaveSameContent(filePath1, filePath2, notifyUnbufferedIO); /*throw FileError*/ }, singleThread); }
+{ return parallelScope([=] { return filesHaveSameContent(filePath1, filePath2, notifyUnbufferedIO); /*throw FileError, X*/ }, singleThread); }
 }
 
 
@@ -465,7 +483,7 @@ void categorizeFileByContent(FilePair& file, const std::wstring& txtComparingCon
         };
 
         haveSameContent = parallel::filesHaveSameContent(file.getAbstractPath< LEFT_SIDE>(),
-                                                         file.getAbstractPath<RIGHT_SIDE>(), notifyUnbufferedIO, singleThread); //throw FileError
+                                                         file.getAbstractPath<RIGHT_SIDE>(), notifyUnbufferedIO, singleThread); //throw FileError, ThreadInterruption
         statReporter.reportDelta(1, 0);
     }, acb); //throw ThreadInterruption
 
@@ -1056,7 +1074,7 @@ FolderComparison fff::compare(WarningDialogs& warnings,
         callback.reportInfo(e.toString()); //throw X
     }
 
-    const ResolvedBaseFolders& resInfo = initializeBaseFolders(fpCfgList, deviceParallelOps, allowUserInteraction, warnings.warnFolderNotExisting, callback); //throw X
+    const ResolvedBaseFolders& resInfo = initializeBaseFolders(fpCfgList, deviceParallelOps, allowUserInteraction, warnings, callback); //throw X
     //directory existence only checked *once* to avoid race conditions!
     if (resInfo.resolvedPairs.size() != fpCfgList.size())
         throw std::logic_error("Contract violation! " + std::string(__FILE__) + ":" + numberTo<std::string>(__LINE__));
diff --git a/FreeFileSync/Source/base/db_file.cpp b/FreeFileSync/Source/base/db_file.cpp
index 3f06a197..9b83d194 100755
--- a/FreeFileSync/Source/base/db_file.cpp
+++ b/FreeFileSync/Source/base/db_file.cpp
@@ -7,7 +7,7 @@
 #include "db_file.h"
 #include <zen/guid.h>
 #include <zen/crc.h>
-#include <wx+/zlib_wrap.h>
+#include <zen/zlib_wrap.h>
 
 
 using namespace zen;
@@ -61,7 +61,8 @@ AbstractPath getDatabaseFilePath(const BaseFolderPair& baseFolder, bool tempfile
 void saveStreams(const DbStreams& streamList, const AbstractPath& dbPath, const IOCallback& notifyUnbufferedIO) //throw FileError
 {
     const std::unique_ptr<AFS::OutputStream> fileStreamOut = AFS::getOutputStream(dbPath, //throw FileError
-                                                                                  nullptr /*streamSize*/,
+                                                                                  std::nullopt /*streamSize*/,
+                                                                                  std::nullopt /*modTime*/,
                                                                                   notifyUnbufferedIO /*throw X*/);
     //write FreeFileSync file identifier
     writeArray(*fileStreamOut, FILE_FORMAT_DESCR, sizeof(FILE_FORMAT_DESCR)); //throw FileError, X
@@ -70,14 +71,14 @@ void saveStreams(const DbStreams& streamList, const AbstractPath& dbPath, const
     writeNumber<int32_t>(*fileStreamOut, DB_FORMAT_CONTAINER); //throw FileError, X
 
     //write stream list
-    writeNumber<uint32_t>(*fileStreamOut, static_cast<uint32_t>(streamList.size())); //throw FileError, X
+    writeNumber(*fileStreamOut, static_cast<uint32_t>(streamList.size())); //throw FileError, X
 
-    for (const auto& stream : streamList)
+    for (const auto& [sessionID, sessionData] : streamList)
     {
-        writeContainer<std::string>(*fileStreamOut, stream.first ); //throw FileError, X
+        writeContainer<std::string>(*fileStreamOut, sessionID); //throw FileError, X
 
-        writeNumber   <int8_t   >(*fileStreamOut, stream.second.isLeadStream); //
-        writeContainer<ByteArray>(*fileStreamOut, stream.second.rawStream); //
+        writeNumber   <int8_t   >(*fileStreamOut, sessionData.isLeadStream); //
+        writeContainer<ByteArray>(*fileStreamOut, sessionData.rawStream); //
     }
 
     //commit and close stream:
@@ -86,11 +87,11 @@ void saveStreams(const DbStreams& streamList, const AbstractPath& dbPath, const
 }
 
 
-DbStreams loadStreams(const AbstractPath& dbPath, const IOCallback& notifyUnbufferedIO) //throw FileError, FileErrorDatabaseNotExisting
+DbStreams loadStreams(const AbstractPath& dbPath, const IOCallback& notifyUnbufferedIO /*throw X*/) //throw FileError, FileErrorDatabaseNotExisting, X
 {
     try
     {
-        const std::unique_ptr<AFS::InputStream> fileStreamIn = AFS::getInputStream(dbPath, notifyUnbufferedIO); //throw FileError, ErrorFileLocked, X
+        const std::unique_ptr<AFS::InputStream> fileStreamIn = AFS::getInputStream(dbPath, notifyUnbufferedIO); //throw FileError, ErrorFileLocked
 
         //read FreeFileSync file identifier
         char formatDescr[sizeof(FILE_FORMAT_DESCR)] = {};
@@ -109,8 +110,8 @@ DbStreams loadStreams(const AbstractPath& dbPath, const IOCallback& notifyUnbuff
         DbStreams output;
 
         //read stream list
-        size_t dbCount = readNumber<uint32_t>(*fileStreamIn); //throw FileError, ErrorFileLocked, X, UnexpectedEndOfStreamError
-        while (dbCount-- != 0)
+        size_t streamCount = readNumber<uint32_t>(*fileStreamIn); //throw FileError, ErrorFileLocked, X, UnexpectedEndOfStreamError
+        while (streamCount-- != 0)
         {
             //DB id of partner databases
             std::string sessionID = readContainer<std::string>(*fileStreamIn); //throw FileError, ErrorFileLocked, X, UnexpectedEndOfStreamError
@@ -236,33 +237,33 @@ private:
     void recurse(const InSyncFolder& container)
     {
         writeNumber<uint32_t>(streamOutSmallNum_, static_cast<uint32_t>(container.files.size()));
-        for (const auto& dbFile : container.files)
+        for (const auto& [itemName, inSyncData] : container.files)
         {
-            writeUtf8(streamOutText_, dbFile.first);
-            writeNumber(streamOutSmallNum_, static_cast<int32_t>(dbFile.second.cmpVar));
-            writeNumber<uint64_t>(streamOutSmallNum_, dbFile.second.fileSize);
+            writeUtf8(streamOutText_, itemName);
+            writeNumber(streamOutSmallNum_, static_cast<int32_t>(inSyncData.cmpVar));
+            writeNumber<uint64_t>(streamOutSmallNum_, inSyncData.fileSize);
 
-            writeFileDescr(streamOutBigNum_, dbFile.second.left);
-            writeFileDescr(streamOutBigNum_, dbFile.second.right);
+            writeFileDescr(streamOutBigNum_, inSyncData.left);
+            writeFileDescr(streamOutBigNum_, inSyncData.right);
         }
 
         writeNumber<uint32_t>(streamOutSmallNum_, static_cast<uint32_t>(container.symlinks.size()));
-        for (const auto& dbSymlink : container.symlinks)
+        for (const auto& [itemName, inSyncData] : container.symlinks)
         {
-            writeUtf8(streamOutText_, dbSymlink.first);
-            writeNumber(streamOutSmallNum_, static_cast<int32_t>(dbSymlink.second.cmpVar));
+            writeUtf8(streamOutText_, itemName);
+            writeNumber(streamOutSmallNum_, static_cast<int32_t>(inSyncData.cmpVar));
 
-            writeLinkDescr(streamOutBigNum_, dbSymlink.second.left);
-            writeLinkDescr(streamOutBigNum_, dbSymlink.second.right);
+            writeLinkDescr(streamOutBigNum_, inSyncData.left);
+            writeLinkDescr(streamOutBigNum_, inSyncData.right);
         }
 
         writeNumber<uint32_t>(streamOutSmallNum_, static_cast<uint32_t>(container.folders.size()));
-        for (const auto& dbFolder : container.folders)
+        for (const auto& [itemName, inSyncData] : container.folders)
         {
-            writeUtf8(streamOutText_, dbFolder.first);
-            writeNumber<int32_t>(streamOutSmallNum_, dbFolder.second.status);
+            writeUtf8(streamOutText_, itemName);
+            writeNumber<int32_t>(streamOutSmallNum_, inSyncData.status);
 
-            recurse(dbFolder.second);
+            recurse(inSyncData);
         }
     }
 
@@ -270,7 +271,7 @@ private:
 
     static void writeFileDescr(MemoryStreamOut<ByteArray>& streamOut, const InSyncDescrFile& descr)
     {
-        writeNumber<std::int64_t>(streamOut, descr.modTime);
+        writeNumber<int64_t>(streamOut, descr.modTime);
         writeContainer(streamOut, descr.fileId);
         static_assert(std::is_same_v<decltype(descr.fileId), Zbase<char>>);
     }
@@ -561,11 +562,11 @@ private:
     static V& mapAddOrUpdate(M& map, const Zstring& key, V&& value)
     {
         //C++17's map::try_emplace() is faster than map::emplace() if key is already existing
-        auto rv = map.try_emplace(key, std::forward<V>(value)); //and does NOT MOVE r-value arguments unlike map::emplace()!
-        if (!rv.second)
-            rv.first->second = std::forward<V>(value);
+        const auto [it, inserted] = map.try_emplace(key, std::forward<V>(value)); //and does NOT MOVE r-value arguments unlike map::emplace()!
+        if (!inserted)
+            it->second = std::forward<V>(value);
 
-        return rv.first->second;
+        return it->second;
     }
 
     void process(const ContainerObject::FileList& currentFiles, const Zstring& parentRelPath, InSyncFolder::FileList& dbFiles)
@@ -821,7 +822,7 @@ std::shared_ptr<InSyncFolder> fff::loadLastSynchronousState(const BaseFolderPair
 }
 
 
-void fff::saveLastSynchronousState(const BaseFolderPair& baseFolder, const std::function<void(const std::wstring& statusMsg)>& notifyStatus) //throw FileError
+void fff::saveLastSynchronousState(const BaseFolderPair& baseFolder, const std::function<void(const std::wstring& statusMsg)>& notifyStatus /*throw X*/) //throw FileError, X
 {
     //transactional behaviour! write to tmp files first
     const AbstractPath dbPathLeft  = getDatabaseFilePath< LEFT_SIDE>(baseFolder);
@@ -840,9 +841,9 @@ void fff::saveLastSynchronousState(const BaseFolderPair& baseFolder, const std::
     DbStreams streamsLeft; //list of session ID + DirInfo-stream
     DbStreams streamsRight;
 
-    try { streamsLeft  = ::loadStreams(dbPathLeft, notifyLoadL); }
+    try { streamsLeft  = ::loadStreams(dbPathLeft, notifyLoadL); } //throw FileError, FileErrorDatabaseNotExisting, X
     catch (FileError&) {}
-    try { streamsRight = ::loadStreams(dbPathRight, notifyLoadR); }
+    try { streamsRight = ::loadStreams(dbPathRight, notifyLoadR); } //throw FileError, FileErrorDatabaseNotExisting, X
     catch (FileError&) {}
     //if error occurs: just overwrite old file! User is already informed about issues right after comparing!
 
@@ -900,7 +901,7 @@ void fff::saveLastSynchronousState(const BaseFolderPair& baseFolder, const std::
     streamsRight[sessionID] = std::move(sessionDataR);
 
     //write (temp-) files as a transaction
-    saveStreams(streamsLeft,  dbPathLeftTmp,  notifySaveL); //throw FileError
+    saveStreams(streamsLeft,  dbPathLeftTmp,  notifySaveL); //throw FileError, X
     auto guardTmpL = makeGuard<ScopeGuardRunMode::ON_FAIL>([&] { try { AFS::removeFilePlain(dbPathLeftTmp); } catch (FileError&) {} });
     saveStreams(streamsRight, dbPathRightTmp, notifySaveR); //
     auto guardTmpR = makeGuard<ScopeGuardRunMode::ON_FAIL>([&] { try { AFS::removeFilePlain(dbPathRightTmp); } catch (FileError&) {} });
diff --git a/FreeFileSync/Source/base/db_file.h b/FreeFileSync/Source/base/db_file.h
index c0d1b390..e3e4b4d3 100755
--- a/FreeFileSync/Source/base/db_file.h
+++ b/FreeFileSync/Source/base/db_file.h
@@ -97,8 +97,8 @@ DEFINE_NEW_FILE_ERROR(FileErrorDatabaseNotExisting);
 std::shared_ptr<InSyncFolder> loadLastSynchronousState(const BaseFolderPair& baseDirObj, //throw FileError, FileErrorDatabaseNotExisting -> return value always bound!
                                                        const std::function<void(const std::wstring& statusMsg)>& notifyStatus);
 
-void saveLastSynchronousState(const BaseFolderPair& baseDirObj, //throw FileError
-                              const std::function<void(const std::wstring& statusMsg)>& notifyStatus);
+void saveLastSynchronousState(const BaseFolderPair& baseDirObj, //throw FileError, X
+                              const std::function<void(const std::wstring& statusMsg)>& notifyStatus /*throw X*/);
 }
 
 #endif //DB_FILE_H_834275398588021574
diff --git a/FreeFileSync/Source/base/dir_exist_async.h b/FreeFileSync/Source/base/dir_exist_async.h
index ea524d88..097732fc 100755
--- a/FreeFileSync/Source/base/dir_exist_async.h
+++ b/FreeFileSync/Source/base/dir_exist_async.h
@@ -29,16 +29,8 @@ struct FolderStatus
     std::set<AbstractPath> existing;
     std::set<AbstractPath> notExisting;
     std::map<AbstractPath, zen::FileError> failedChecks;
-
-    std::map<AbstractPath, AbstractPath> normalizedPathsEx; //get rid of folder aliases (e.g. path differing in case)
 };
 
-AbstractPath getNormalizedPath(const FolderStatus& status, const AbstractPath& folderPath)
-{
-    auto it = status.normalizedPathsEx.find(folderPath);
-    return it == status.normalizedPathsEx.end() ? folderPath : it->second;
-}
-
 
 FolderStatus getFolderStatusNonBlocking(const std::set<AbstractPath>& folderPaths, const std::map<AfsDevice, size_t>& deviceParallelOps,
                                         bool allowUserInteraction, ProcessCallback& procCallback  /*throw X*/)
@@ -52,9 +44,9 @@ FolderStatus getFolderStatusNonBlocking(const std::set<AbstractPath>& folderPath
         if (!AFS::isNullPath(folderPath)) //skip empty folders
             perDevicePaths[folderPath.afsDevice].insert(folderPath);
 
-    std::vector<std::pair<AbstractPath, std::future<std::optional<AFS::FileId>>>> futureDetails;
+    std::vector<std::pair<AbstractPath, std::future<bool>>> futureDetails;
 
-    std::vector<ThreadGroup<std::packaged_task<std::optional<AFS::FileId>()>>> perDeviceThreads;
+    std::vector<ThreadGroup<std::packaged_task<bool()>>> perDeviceThreads;
     for (const auto& [afsDevice, deviceFolderPaths] : perDevicePaths)
     {
         const size_t parallelOps = getDeviceParallelOps(deviceParallelOps, afsDevice);
@@ -65,36 +57,21 @@ FolderStatus getFolderStatusNonBlocking(const std::set<AbstractPath>& folderPath
 
         for (const AbstractPath& folderPath : deviceFolderPaths)
         {
-            std::packaged_task<std::optional<AFS::FileId>()> pt([folderPath, allowUserInteraction]() -> std::optional<AFS::FileId>
+            std::packaged_task<bool()> pt([folderPath, allowUserInteraction]
             {
                 //1. login to network share, open FTP connection, etc.
                 AFS::connectNetworkFolder(folderPath, allowUserInteraction); //throw FileError
 
-                //2. check dir existence (...by doing something useful and getting the file ID)
-                std::exception_ptr fidError;
-                try
-                {
-                    const AFS::FileId fileId = AFS::getFileId(folderPath); //throw FileError
-                    if (!fileId.empty()) //=> folder exists
-                        return fileId;
-                }
-                catch (FileError&) { fidError = std::current_exception(); }
-                //else: error or fileId not available, e.g. FTP, SFTP
+                //2. check dir existence
 
                 /* CAVEAT: the case-sensitive semantics of AFS::itemStillExists() do not fit here!
                         BUT: its implementation happens to be okay for our use:
                     Assume we have a case-insensitive path match:
                     => AFS::itemStillExists() first checks AFS::getItemType()
                     => either succeeds (fine) or fails because of 1. not existing or 2. access error
-                    => the subsequent folder search reports "no folder": only a problem in case 2
+                    => if the subsequent case-sensitive folder search also doesn't find the folder: only a problem in case 2
                     => FFS tries to create the folder during sync and fails with I. access error (fine) or II. already existing (obscures the previous "access error") */
-                if (!AFS::itemStillExists(folderPath)) //throw FileError
-                    return {};
-
-                if (fidError)
-                    std::rethrow_exception(fidError);
-                else
-                    return AFS::FileId();
+                return static_cast<bool>(AFS::itemStillExists(folderPath)); //throw FileError
                 //consider ItemType::FILE a failure instead? Meanwhile: return "false" IFF nothing (of any type) exists
             });
             auto fut = pt.get_future();
@@ -108,8 +85,6 @@ FolderStatus getFolderStatusNonBlocking(const std::set<AbstractPath>& folderPath
     const auto startTime = std::chrono::steady_clock::now();
 
     FolderStatus output;
-    std::map<std::pair<AfsDevice, AFS::FileId>, AbstractPath> exFoldersById; //volume serial is NOT always globally unique!
-    //=> combine with AfsDevice https://freefilesync.org/forum/viewtopic.php?t=5815
 
     for (auto& [folderPath, future] : futureDetails)
     {
@@ -117,7 +92,7 @@ FolderStatus getFolderStatusNonBlocking(const std::set<AbstractPath>& folderPath
 
         procCallback.reportStatus(replaceCpy(_("Searching for folder %x..."), L"%x", displayPathFmt)); //throw X
 
-        const int deviceTimeOut = AFS::geAccessTimeout(folderPath); //0 if no timeout in force
+        const int deviceTimeOut = AFS::getAccessTimeout(folderPath); //0 if no timeout in force
         const auto timeoutTime = startTime + std::chrono::seconds(deviceTimeOut > 0 ? deviceTimeOut : DEFAULT_FOLDER_ACCESS_TIME_OUT_SEC);
 
         while (std::chrono::steady_clock::now() < timeoutTime &&
@@ -130,17 +105,8 @@ FolderStatus getFolderStatusNonBlocking(const std::set<AbstractPath>& folderPath
             try
             {
                 //call future::get() only *once*! otherwise: undefined behavior!
-                if (std::optional<AFS::FileId> folderInfo = future.get()) //throw FileError
-                {
+                if (future.get()) //throw FileError
                     output.existing.emplace(folderPath);
-
-                    //find folder aliases (e.g. path differing in case)
-                    const AFS::FileId fileId = *folderInfo;
-                    if (!fileId.empty())
-                        exFoldersById.emplace(std::pair(folderPath.afsDevice, fileId), folderPath);
-
-                    output.normalizedPathsEx.emplace(folderPath, fileId.empty() ? folderPath : exFoldersById.find(std::pair(folderPath.afsDevice, fileId))->second);
-                }
                 else
                     output.notExisting.insert(folderPath);
             }
diff --git a/FreeFileSync/Source/base/dir_lock.cpp b/FreeFileSync/Source/base/dir_lock.cpp
index cfcf6699..b144eb99 100755
--- a/FreeFileSync/Source/base/dir_lock.cpp
+++ b/FreeFileSync/Source/base/dir_lock.cpp
@@ -193,7 +193,7 @@ void serialize(const LockInformation& lockInfo, MemoryStreamOut<ByteArray>& stre
 
 LockInformation retrieveLockInfo(const Zstring& lockFilePath) //throw FileError
 {
-    MemoryStreamIn<ByteArray> memStreamIn(loadBinContainer<ByteArray>(lockFilePath,  nullptr /*notifyUnbufferedIO*/)); //throw FileError
+    MemoryStreamIn<ByteArray> memStreamIn(loadBinContainer<ByteArray>(lockFilePath, nullptr /*notifyUnbufferedIO*/)); //throw FileError
     try
     {
         return unserialize(memStreamIn); //throw UnexpectedEndOfStreamError
diff --git a/FreeFileSync/Source/base/ffs_paths.cpp b/FreeFileSync/Source/base/ffs_paths.cpp
index 43ea8fff..fc993c78 100755
--- a/FreeFileSync/Source/base/ffs_paths.cpp
+++ b/FreeFileSync/Source/base/ffs_paths.cpp
@@ -34,13 +34,13 @@ Zstring getExeFolderParentPath()
 
 VolumeId fff::getVolumeSerialOs() //throw FileError
 {
-    return getFileId("/").volumeId; //throw FileError
+    return getFileDetails("/").volumeId; //throw FileError
 }
 
 
 VolumeId fff::getVolumeSerialFfs() //throw FileError
 {
-    return getFileId(getExeFolderPath()).volumeId; //throw FileError
+    return getFileDetails(getExeFolderPath()).volumeId; //throw FileError
 }
 
 
diff --git a/FreeFileSync/Source/base/file_hierarchy.h b/FreeFileSync/Source/base/file_hierarchy.h
index d8038994..d90c88c4 100755
--- a/FreeFileSync/Source/base/file_hierarchy.h
+++ b/FreeFileSync/Source/base/file_hierarchy.h
@@ -121,16 +121,16 @@ struct FolderContainer
 
     void addSubFile(const Zstring& itemName, const FileAttributes& attr)
     {
-        auto rv = files.emplace(itemName, attr);
-        if (!rv.second) //update entry if already existing (e.g. during folder traverser "retry")
-            rv.first->second = attr;
+        const auto [it, inserted] = files.emplace(itemName, attr);
+        if (!inserted) //update entry if already existing (e.g. during folder traverser "retry")
+            it->second = attr;
     }
 
     void addSubLink(const Zstring& itemName, const LinkAttributes& attr)
     {
-        auto rv = symlinks.emplace(itemName, attr);
-        if (!rv.second)
-            rv.first->second = attr;
+        const auto [it, inserted] = symlinks.emplace(itemName, attr);
+        if (!inserted)
+            it->second = attr;
     }
 
     FolderContainer& addSubFolder(const Zstring& itemName, const FolderAttributes& attr)
@@ -139,10 +139,10 @@ struct FolderContainer
         p.first = attr;
         return p.second;
 
-        //auto rv = folders.emplace(itemName, std::pair<FolderAttributes, FolderContainer>(attr, FolderContainer()));
-        //if (!rv.second)
-        //  rv.first->second.first = attr;
-        //return rv.first->second.second;
+        //const auto [it, inserted] = folders.emplace(itemName, std::pair<FolderAttributes, FolderContainer>(attr, FolderContainer()));
+        //if (!inserted)
+        //  it->second.first = attr;
+        //return it->second.second;
     }
 };
 
diff --git a/FreeFileSync/Source/base/generate_logfile.cpp b/FreeFileSync/Source/base/generate_logfile.cpp
index dcb621be..3ce4fbf2 100755
--- a/FreeFileSync/Source/base/generate_logfile.cpp
+++ b/FreeFileSync/Source/base/generate_logfile.cpp
@@ -172,7 +172,7 @@ AbstractPath saveNewLogFile(const ProcessSummary& summary, //throw FileError
 
     const std::wstring& finalStatusLabel = getFinalStatusLabel(summary.finalStatus);
 
-    std::unique_ptr<AFS::OutputStream> logFileStream = AFS::getOutputStream(logFilePath, nullptr, /*streamSize*/ notifyUnbufferedIO); //throw FileError
+    std::unique_ptr<AFS::OutputStream> logFileStream = AFS::getOutputStream(logFilePath, std::nullopt /*streamSize*/, std::nullopt /*modTime*/, notifyUnbufferedIO); //throw FileError
     streamToLogFile(summary, log, finalStatusLabel, *logFileStream); //throw FileError, X
     logFileStream->finalize();                                       //throw FileError, X
 
diff --git a/FreeFileSync/Source/base/localization.cpp b/FreeFileSync/Source/base/localization.cpp
index 2b97fb89..52ed7fdf 100755
--- a/FreeFileSync/Source/base/localization.cpp
+++ b/FreeFileSync/Source/base/localization.cpp
@@ -510,7 +510,7 @@ void fff::setLanguage(wxLanguage lng) //throw FileError
         wxtrans->SetLoader(new MemoryTranslationLoader(lng, std::move(transMapping)));
         const bool catalogAdded = wxtrans->AddCatalog(wxString());
         (void)catalogAdded;
-        assert(catalogAdded);
+        assert(catalogAdded || lng == wxLANGUAGE_ENGLISH_US);
     }
 }
 
diff --git a/FreeFileSync/Source/base/process_xml.cpp b/FreeFileSync/Source/base/process_xml.cpp
index b8081253..227fada4 100755
--- a/FreeFileSync/Source/base/process_xml.cpp
+++ b/FreeFileSync/Source/base/process_xml.cpp
@@ -1433,6 +1433,7 @@ void readConfig(const XmlIn& in, XmlGlobalSettings& cfg, int formatVer)
         inOpt["ConfirmSaveConfig"               ].attribute("Show", cfg.confirmDlgs.popupOnConfigChange);
         inOpt["ConfirmExternalCommandMassInvoke"].attribute("Show", cfg.confirmDlgs.confirmExternalCommandMassInvoke);
         inOpt["WarnFolderNotExisting"         ].attribute("Show", cfg.warnDlgs.warnFolderNotExisting);
+        inOpt["WarnFoldersDifferInCase"       ].attribute("Show", cfg.warnDlgs.warnFoldersDifferInCase);
         inOpt["WarnUnresolvedConflicts"       ].attribute("Show", cfg.warnDlgs.warnUnresolvedConflicts);
         inOpt["WarnNotEnoughDiskSpace"        ].attribute("Show", cfg.warnDlgs.warnNotEnoughDiskSpace);
         inOpt["WarnSignificantDifference"     ].attribute("Show", cfg.warnDlgs.warnSignificantDifference);
@@ -2052,6 +2053,7 @@ void writeConfig(const XmlGlobalSettings& cfg, XmlOut& out)
     outOpt["ConfirmSaveConfig"               ].attribute("Show", cfg.confirmDlgs.popupOnConfigChange);
     outOpt["ConfirmExternalCommandMassInvoke"].attribute("Show", cfg.confirmDlgs.confirmExternalCommandMassInvoke);
     outOpt["WarnFolderNotExisting"         ].attribute("Show", cfg.warnDlgs.warnFolderNotExisting);
+    outOpt["WarnFoldersDifferInCase"       ].attribute("Show", cfg.warnDlgs.warnFoldersDifferInCase);
     outOpt["WarnUnresolvedConflicts"       ].attribute("Show", cfg.warnDlgs.warnUnresolvedConflicts);
     outOpt["WarnNotEnoughDiskSpace"        ].attribute("Show", cfg.warnDlgs.warnNotEnoughDiskSpace);
     outOpt["WarnSignificantDifference"     ].attribute("Show", cfg.warnDlgs.warnSignificantDifference);
diff --git a/FreeFileSync/Source/base/process_xml.h b/FreeFileSync/Source/base/process_xml.h
index 85777a5c..fe4687ba 100755
--- a/FreeFileSync/Source/base/process_xml.h
+++ b/FreeFileSync/Source/base/process_xml.h
@@ -99,6 +99,7 @@ inline bool operator!=(const ConfirmationDialogs& lhs, const ConfirmationDialogs
 struct WarningDialogs
 {
     bool warnFolderNotExisting          = true;
+    bool warnFoldersDifferInCase        = true;
     bool warnDependentFolderPair        = true;
     bool warnDependentBaseFolders       = true;
     bool warnSignificantDifference      = true;
@@ -113,6 +114,7 @@ struct WarningDialogs
 inline bool operator==(const WarningDialogs& lhs, const WarningDialogs& rhs)
 {
     return lhs.warnFolderNotExisting          == rhs.warnFolderNotExisting     &&
+           lhs.warnFoldersDifferInCase        == rhs.warnFoldersDifferInCase   &&
            lhs.warnDependentFolderPair        == rhs.warnDependentFolderPair   &&
            lhs.warnDependentBaseFolders       == rhs.warnDependentBaseFolders  &&
            lhs.warnSignificantDifference      == rhs.warnSignificantDifference &&
diff --git a/FreeFileSync/Source/base/structures.h b/FreeFileSync/Source/base/structures.h
index f5f6aeb5..372d48b5 100755
--- a/FreeFileSync/Source/base/structures.h
+++ b/FreeFileSync/Source/base/structures.h
@@ -161,6 +161,7 @@ bool operator==(const DirectionConfig& lhs, const DirectionConfig& rhs)
            lhs.detectMovedFiles == rhs.detectMovedFiles; //useful to remember this setting even if the current sync variant does not need it
     //adapt effectivelyEqual() on changes, too!
 }
+inline bool operator!=(const DirectionConfig& lhs, const DirectionConfig& rhs) { return !(lhs == rhs); }
 
 inline
 bool effectivelyEqual(const DirectionConfig& lhs, const DirectionConfig& rhs)
@@ -214,7 +215,7 @@ struct SyncConfig
     //sync direction settings
     DirectionConfig directionCfg;
 
-    DeletionPolicy handleDeletion = DeletionPolicy::RECYCLER; //use Recycle, delete permanently or move to user-defined location
+    DeletionPolicy handleDeletion = DeletionPolicy::RECYCLER; //use Recycle Bin, delete permanently or move to user-defined location
 
     //versioning options
     Zstring versioningFolderPhrase;
diff --git a/FreeFileSync/Source/base/synchronization.cpp b/FreeFileSync/Source/base/synchronization.cpp
index 04892fa9..8b86503b 100755
--- a/FreeFileSync/Source/base/synchronization.cpp
+++ b/FreeFileSync/Source/base/synchronization.cpp
@@ -450,7 +450,7 @@ void flushFileBuffers(const Zstring& nativeFilePath) //throw FileError
 }
 
 
-void verifyFiles(const AbstractPath& sourcePath, const AbstractPath& targetPath, const IOCallback& notifyUnbufferedIO) //throw FileError
+void verifyFiles(const AbstractPath& sourcePath, const AbstractPath& targetPath, const IOCallback& notifyUnbufferedIO /*throw X*/) //throw FileError, X
 {
     try
     {
@@ -459,7 +459,7 @@ void verifyFiles(const AbstractPath& sourcePath, const AbstractPath& targetPath,
         if (std::optional<Zstring> nativeTargetPath = AFS::getNativeItemPath(targetPath))
             flushFileBuffers(*nativeTargetPath); //throw FileError
 
-        if (!filesHaveSameContent(sourcePath, targetPath, notifyUnbufferedIO)) //throw FileError
+        if (!filesHaveSameContent(sourcePath, targetPath, notifyUnbufferedIO)) //throw FileError, X
             throw FileError(replaceCpy(replaceCpy(_("%x and %y have different content."),
                                                   L"%x", L"\n" + fmtPath(AFS::getDisplayPath(sourcePath))),
                                        L"%y", L"\n" + fmtPath(AFS::getDisplayPath(targetPath))));
@@ -528,27 +528,27 @@ void removeFolderIfExistsRecursion(const AbstractPath& ap, //throw FileError
 
 
 inline
-AFS::FileCopyResult copyFileTransactional(const AbstractPath& apSource, const AFS::StreamAttributes& attrSource, //throw FileError, ErrorFileLocked
+AFS::FileCopyResult copyFileTransactional(const AbstractPath& apSource, const AFS::StreamAttributes& attrSource, //throw FileError, ErrorFileLocked, X
                                           const AbstractPath& apTarget,
                                           bool copyFilePermissions,
                                           bool transactionalCopy,
-                                          const std::function<void()>& onDeleteTargetFile,
-                                          const IOCallback& notifyUnbufferedIO,
+                                          const std::function<void()>& onDeleteTargetFile /*throw X*/,
+                                          const IOCallback& notifyUnbufferedIO /*throw X*/,
                                           std::mutex& singleThread)
 {
     return parallelScope([=]
     {
-        return AFS::copyFileTransactional(apSource, attrSource, apTarget, copyFilePermissions, transactionalCopy, onDeleteTargetFile, notifyUnbufferedIO); //throw FileError, ErrorFileLocked
+        return AFS::copyFileTransactional(apSource, attrSource, apTarget, copyFilePermissions, transactionalCopy, onDeleteTargetFile, notifyUnbufferedIO); //throw FileError, ErrorFileLocked, X
     }, singleThread);
 }
 
-inline //RecycleSession::recycleItem() is internally synchronized!
-bool recycleItem(AFS::RecycleSession& recyclerSession, const AbstractPath& ap, const Zstring& logicalRelPath, std::mutex& singleThread) //throw FileError
-{ return parallelScope([=, &recyclerSession] { return recyclerSession.recycleItem(ap, logicalRelPath); /*throw FileError*/ }, singleThread); }
+inline //RecycleSession::recycleItemIfExists() is internally synchronized!
+void recycleItemIfExists(AFS::RecycleSession& recyclerSession, const AbstractPath& ap, const Zstring& logicalRelPath, std::mutex& singleThread) //throw FileError
+{ parallelScope([=, &recyclerSession] { return recyclerSession.recycleItemIfExists(ap, logicalRelPath); /*throw FileError*/ }, singleThread); }
 
 inline //FileVersioner::revisionFile() is internally synchronized!
-void revisionFile(FileVersioner& versioner, const FileDescriptor& fileDescr, const Zstring& relativePath, const IOCallback& notifyUnbufferedIO, std::mutex& singleThread) //throw FileError
-{ parallelScope([=, &versioner] { return versioner.revisionFile(fileDescr, relativePath, notifyUnbufferedIO); /*throw FileError*/ }, singleThread); }
+void revisionFile(FileVersioner& versioner, const FileDescriptor& fileDescr, const Zstring& relativePath, const IOCallback& notifyUnbufferedIO /*throw X*/, std::mutex& singleThread) //throw FileError, X
+{ parallelScope([=, &versioner] { return versioner.revisionFile(fileDescr, relativePath, notifyUnbufferedIO); /*throw FileError, X*/ }, singleThread); }
 
 inline //FileVersioner::revisionSymlink() is internally synchronized!
 void revisionSymlink(FileVersioner& versioner, const AbstractPath& linkPath, const Zstring& relativePath, std::mutex& singleThread) //throw FileError
@@ -556,16 +556,16 @@ void revisionSymlink(FileVersioner& versioner, const AbstractPath& linkPath, con
 
 inline //FileVersioner::revisionFolder() is internally synchronized!
 void revisionFolder(FileVersioner& versioner,
-                    const AbstractPath& folderPath, const Zstring& relativePath, //throw FileError
-                    const std::function<void(const std::wstring& displayPathFrom, const std::wstring& displayPathTo)>& onBeforeFileMove,
-                    const std::function<void(const std::wstring& displayPathFrom, const std::wstring& displayPathTo)>& onBeforeFolderMove,
-                    const IOCallback& notifyUnbufferedIO,
-                    std::mutex& singleThread)
-{ parallelScope([=, &versioner] { versioner.revisionFolder(folderPath, relativePath, onBeforeFileMove, onBeforeFolderMove, notifyUnbufferedIO); /*throw FileError*/ }, singleThread); }
+                    const AbstractPath& folderPath, const Zstring& relativePath,
+                    const std::function<void(const std::wstring& displayPathFrom, const std::wstring& displayPathTo)>& onBeforeFileMove    /*throw X*/,
+                    const std::function<void(const std::wstring& displayPathFrom, const std::wstring& displayPathTo)>& onBeforeFolderMove  /*throw X*/,
+                    const IOCallback& notifyUnbufferedIO  /*throw X*/,
+                    std::mutex& singleThread) //throw FileError, X
+{ parallelScope([=, &versioner] { versioner.revisionFolder(folderPath, relativePath, onBeforeFileMove, onBeforeFolderMove, notifyUnbufferedIO); /*throw FileError, X*/ }, singleThread); }
 
 inline
-void verifyFiles(const AbstractPath& apSource, const AbstractPath& apTarget, const IOCallback& notifyUnbufferedIO, std::mutex& singleThread) //throw FileError
-{ parallelScope([=] { ::verifyFiles(apSource, apTarget, notifyUnbufferedIO); /*throw FileError*/ }, singleThread); }
+void verifyFiles(const AbstractPath& apSource, const AbstractPath& apTarget, const IOCallback& notifyUnbufferedIO /*throw X*/, std::mutex& singleThread) //throw FileError, X
+{ parallelScope([=] { ::verifyFiles(apSource, apTarget, notifyUnbufferedIO); /*throw FileError, X*/ }, singleThread); }
 
 }
 
@@ -744,7 +744,7 @@ void DeletionHandler::removeDirWithCallback(const AbstractPath& folderPath,//thr
         break;
 
         case DeletionPolicy::RECYCLER:
-            parallel::recycleItem(getOrCreateRecyclerSession(), folderPath, relativePath, singleThread); //throw FileError
+            parallel::recycleItemIfExists(getOrCreateRecyclerSession(), folderPath, relativePath, singleThread); //throw FileError
             statReporter.reportDelta(1, 0); //moving to recycler is ONE logical operation, irrespective of the number of child elements!
             break;
 
@@ -783,14 +783,14 @@ void DeletionHandler::removeFileWithCallback(const FileDescriptor& fileDescr, //
                 parallel::removeFileIfExists(fileDescr.path, singleThread); //throw FileError
                 break;
             case DeletionPolicy::RECYCLER:
-                parallel::recycleItem(getOrCreateRecyclerSession(), fileDescr.path, relativePath, singleThread); //throw FileError
+                parallel::recycleItemIfExists(getOrCreateRecyclerSession(), fileDescr.path, relativePath, singleThread); //throw FileError
                 break;
             case DeletionPolicy::VERSIONING:
             {
                 //callback runs *outside* singleThread_ lock! => fine
                 auto notifyUnbufferedIO = [&](int64_t bytesDelta) { statReporter.reportDelta(0, bytesDelta); interruptionPoint(); }; //throw ThreadInterruption
 
-                parallel::revisionFile(getOrCreateVersioner(), fileDescr, relativePath, notifyUnbufferedIO, singleThread); //throw FileError
+                parallel::revisionFile(getOrCreateVersioner(), fileDescr, relativePath, notifyUnbufferedIO, singleThread); //throw FileError, ThreadInterruption
             }
             break;
         }
@@ -811,7 +811,7 @@ void DeletionHandler::removeLinkWithCallback(const AbstractPath& linkPath, //thr
             parallel::removeSymlinkIfExists(linkPath, singleThread); //throw FileError
             break;
         case DeletionPolicy::RECYCLER:
-            parallel::recycleItem(getOrCreateRecyclerSession(), linkPath, relativePath, singleThread); //throw FileError
+            parallel::recycleItemIfExists(getOrCreateRecyclerSession(), linkPath, relativePath, singleThread); //throw FileError
             break;
         case DeletionPolicy::VERSIONING:
             parallel::revisionSymlink(getOrCreateVersioner(), linkPath, relativePath, singleThread); //throw FileError
@@ -993,9 +993,9 @@ private:
     }
 
     //target existing after onDeleteTargetFile(): undefined behavior! (fail/overwrite/auto-rename)
-    AFS::FileCopyResult copyFileWithCallback(const FileDescriptor& sourceDescr, //throw FileError, ThreadInterruption
+    AFS::FileCopyResult copyFileWithCallback(const FileDescriptor& sourceDescr, //throw FileError, ThreadInterruption, X
                                              const AbstractPath& targetPath,
-                                             const std::function<void()>& onDeleteTargetFile, //optional!
+                                             const std::function<void()>& onDeleteTargetFile /*throw X*/, //optional!
                                              AsyncItemStatReporter& statReporter);
     std::vector<FileError>& errorsModTime_;
 
@@ -1249,8 +1249,9 @@ auto FolderPairSyncer::createMoveTargetFolder(FileSystemObject& fsObj) -> CmtfSt
                 if (parallel::itemStillExists(parentFolder->getAbstractPath<sideSrc>(), singleThread_)) //throw FileError
                 {
                     AsyncItemStatReporter statReporter(1, 0, acb_);
-                    try //target existing: undefined behavior! (fail/overwrite)
+                    try 
                     {
+						//target existing: fail/ignore
                         parallel::copyNewFolder(parentFolder->getAbstractPath<sideSrc>(), targetPath, copyFilePermissions_, singleThread_); //throw FileError
                     }
                     catch (FileError&)
@@ -1720,7 +1721,7 @@ void FolderPairSyncer::synchronizeFileInt(FilePair& file, SyncOperation syncOp)
             const AFS::FileCopyResult result = copyFileWithCallback({ file.getAbstractPath<sideSrc>(), file.getAttributes<sideSrc>() },
                                                                     targetPathResolvedNew,
                                                                     onDeleteTargetFile,
-                                                                    statReporter); //throw FileError, ThreadInterruption
+                                                                    statReporter); //throw FileError, ThreadInterruption, X
             if (result.errorModTime)
                 errorsModTime_.push_back(*result.errorModTime); //show all warnings later as a single message
 
@@ -1969,7 +1970,7 @@ void FolderPairSyncer::synchronizeFolderInt(FolderPair& folder, SyncOperation sy
                 AsyncItemStatReporter statReporter(1, 0, acb_);
                 try
                 {
-                    //target existing: undefined behavior! (fail/overwrite)
+                    //target existing: fail/ignore
                     parallel::copyNewFolder(folder.getAbstractPath<sideSrc>(), targetPath, copyFilePermissions_, singleThread_); //throw FileError
                 }
                 catch (FileError&)
@@ -2065,9 +2066,9 @@ void FolderPairSyncer::synchronizeFolderInt(FolderPair& folder, SyncOperation sy
 //###########################################################################################
 
 //returns current attributes of source file
-AFS::FileCopyResult FolderPairSyncer::copyFileWithCallback(const FileDescriptor& sourceDescr, //throw FileError, ThreadInterruption
+AFS::FileCopyResult FolderPairSyncer::copyFileWithCallback(const FileDescriptor& sourceDescr, //throw FileError, ThreadInterruption, X
                                                            const AbstractPath& targetPath,
-                                                           const std::function<void()>& onDeleteTargetFile, //optional!
+                                                           const std::function<void()>& onDeleteTargetFile /*throw X*/,
                                                            AsyncItemStatReporter& statReporter)
 {
     const AbstractPath& sourcePath = sourceDescr.path;
@@ -2076,7 +2077,7 @@ AFS::FileCopyResult FolderPairSyncer::copyFileWithCallback(const FileDescriptor&
     auto copyOperation = [this, &sourceAttr, &targetPath, &onDeleteTargetFile, &statReporter](const AbstractPath& sourcePathTmp)
     {
         //target existing after onDeleteTargetFile(): undefined behavior! (fail/overwrite/auto-rename)
-        const AFS::FileCopyResult result = parallel::copyFileTransactional(sourcePathTmp, sourceAttr, //throw FileError, ErrorFileLocked
+        const AFS::FileCopyResult result = parallel::copyFileTransactional(sourcePathTmp, sourceAttr, //throw FileError, ErrorFileLocked, ThreadInterruption, X
                                                                            targetPath,
                                                                            copyFilePermissions_,
                                                                            failSafeFileCopy_, [&]
@@ -2084,7 +2085,7 @@ AFS::FileCopyResult FolderPairSyncer::copyFileWithCallback(const FileDescriptor&
             if (onDeleteTargetFile) //running *outside* singleThread_ lock! => onDeleteTargetFile-callback expects lock being held:
             {
                 std::lock_guard dummy(singleThread_);
-                onDeleteTargetFile();
+                onDeleteTargetFile(); //throw X
             }
         },
         [&](int64_t bytesDelta) //callback runs *outside* singleThread_ lock! => fine
@@ -2105,7 +2106,7 @@ AFS::FileCopyResult FolderPairSyncer::copyFileWithCallback(const FileDescriptor&
             //callback runs *outside* singleThread_ lock! => fine
             auto verifyCallback = [&](int64_t bytesDelta) { interruptionPoint(); }; //throw ThreadInterruption
 
-            parallel::verifyFiles(sourcePathTmp, targetPath, verifyCallback, singleThread_); //throw FileError
+            parallel::verifyFiles(sourcePathTmp, targetPath, verifyCallback, singleThread_); //throw FileError, ThreadInterruption
         }
         //#################### /Verification #############################
 
@@ -2704,7 +2705,7 @@ void fff::synchronize(const std::chrono::system_clock::time_point& syncStartTime
 
                 tryReportingError([&]
                 {
-                    saveLastSynchronousState(baseFolder, //throw FileError
+                    saveLastSynchronousState(baseFolder, //throw FileError, X
                     [&](const std::wstring& statusMsg) { callback.reportStatus(statusMsg); /*throw X*/});
                 }, callback); //throw X
 
diff --git a/FreeFileSync/Source/base/versioning.cpp b/FreeFileSync/Source/base/versioning.cpp
index aa0b0bdf..b4499858 100755
--- a/FreeFileSync/Source/base/versioning.cpp
+++ b/FreeFileSync/Source/base/versioning.cpp
@@ -166,22 +166,22 @@ void moveExistingItemToVersioning(const AbstractPath& sourcePath, const Abstract
 }
 
 
-void FileVersioner::revisionFile(const FileDescriptor& fileDescr, const Zstring& relativePath, const IOCallback& notifyUnbufferedIO) const //throw FileError
+void FileVersioner::revisionFile(const FileDescriptor& fileDescr, const Zstring& relativePath, const IOCallback& notifyUnbufferedIO /*throw X*/) const //throw FileError, X
 {
     if (std::optional<AFS::ItemType> type = AFS::itemStillExists(fileDescr.path)) //throw FileError
     {
         if (*type == AFS::ItemType::SYMLINK)
             revisionSymlinkImpl(fileDescr.path, relativePath, nullptr /*onBeforeMove*/); //throw FileError
         else
-            revisionFileImpl(fileDescr, relativePath, nullptr /*onBeforeMove*/, notifyUnbufferedIO); //throw FileError
+            revisionFileImpl(fileDescr, relativePath, nullptr /*onBeforeMove*/, notifyUnbufferedIO); //throw FileError, X
     }
     //else -> missing source item is not an error => check BEFORE deleting target
 }
 
 
-void FileVersioner::revisionFileImpl(const FileDescriptor& fileDescr, const Zstring& relativePath, //throw FileError
+void FileVersioner::revisionFileImpl(const FileDescriptor& fileDescr, const Zstring& relativePath, //throw FileError, X
                                      const std::function<void(const std::wstring& displayPathFrom, const std::wstring& displayPathTo)>& onBeforeMove,
-                                     const IOCallback& notifyUnbufferedIO) const
+                                     const IOCallback& notifyUnbufferedIO  /*throw X*/) const
 {
     const AbstractPath& filePath = fileDescr.path;
 
@@ -194,7 +194,7 @@ void FileVersioner::revisionFileImpl(const FileDescriptor& fileDescr, const Zstr
     moveExistingItemToVersioning(filePath, targetPath, [&] //throw FileError
     {
         //target existing: copyFileTransactional() undefined behavior! (fail/overwrite/auto-rename) => not expected, but possible if target deletion failed
-        /*const AFS::FileCopyResult result =*/ AFS::copyFileTransactional(filePath, fileAttr, targetPath, //throw FileError, ErrorFileLocked
+        /*const AFS::FileCopyResult result =*/ AFS::copyFileTransactional(filePath, fileAttr, targetPath, //throw FileError, ErrorFileLocked, X
                                                                           false, //copyFilePermissions
                                                                           false,  //transactionalCopy: not needed for versioning! partial copy will be overwritten next time
                                                                           nullptr /*onDeleteTargetFile*/, notifyUnbufferedIO);
@@ -224,10 +224,10 @@ void FileVersioner::revisionSymlinkImpl(const AbstractPath& linkPath, const Zstr
 }
 
 
-void FileVersioner::revisionFolder(const AbstractPath& folderPath, const Zstring& relativePath, //throw FileError
-                                   const std::function<void(const std::wstring& displayPathFrom, const std::wstring& displayPathTo)>& onBeforeFileMove,
-                                   const std::function<void(const std::wstring& displayPathFrom, const std::wstring& displayPathTo)>& onBeforeFolderMove,
-                                   const IOCallback& notifyUnbufferedIO) const
+void FileVersioner::revisionFolder(const AbstractPath& folderPath, const Zstring& relativePath, //throw FileError, X
+                                   const std::function<void(const std::wstring& displayPathFrom, const std::wstring& displayPathTo)>& onBeforeFileMove   /*throw X*/,
+                                   const std::function<void(const std::wstring& displayPathFrom, const std::wstring& displayPathTo)>& onBeforeFolderMove /*throw X*/,
+                                   const IOCallback& notifyUnbufferedIO /*throw X*/) const
 {
     //no error situation if directory is not existing! manual deletion relies on it!
     if (std::optional<AFS::ItemType> type = AFS::itemStillExists(folderPath)) //throw FileError
@@ -235,17 +235,17 @@ void FileVersioner::revisionFolder(const AbstractPath& folderPath, const Zstring
         if (*type == AFS::ItemType::SYMLINK) //on Linux there is just one type of symlink, and since we do revision file symlinks, we should revision dir symlinks as well!
             revisionSymlinkImpl(folderPath, relativePath, onBeforeFileMove); //throw FileError
         else
-            revisionFolderImpl(folderPath, relativePath, onBeforeFileMove, onBeforeFolderMove, notifyUnbufferedIO); //throw FileError
+            revisionFolderImpl(folderPath, relativePath, onBeforeFileMove, onBeforeFolderMove, notifyUnbufferedIO); //throw FileError, X
     }
     else //even if the folder did not exist anymore, significant I/O work was done => report
         if (onBeforeFolderMove) onBeforeFolderMove(AFS::getDisplayPath(folderPath), AFS::getDisplayPath(AFS::appendRelPath(versioningFolderPath_, relativePath)));
 }
 
 
-void FileVersioner::revisionFolderImpl(const AbstractPath& folderPath, const Zstring& relativePath, //throw FileError
+void FileVersioner::revisionFolderImpl(const AbstractPath& folderPath, const Zstring& relativePath, //throw FileError, X
                                        const std::function<void(const std::wstring& displayPathFrom, const std::wstring& displayPathTo)>& onBeforeFileMove,
                                        const std::function<void(const std::wstring& displayPathFrom, const std::wstring& displayPathTo)>& onBeforeFolderMove,
-                                       const IOCallback& notifyUnbufferedIO) const
+                                       const IOCallback& notifyUnbufferedIO /*throw X*/) const
 {
 
     //create target directories only when needed in moveFileToVersioning(): avoid empty directories!
@@ -265,7 +265,7 @@ void FileVersioner::revisionFolderImpl(const AbstractPath& folderPath, const Zst
         const FileDescriptor fileDescr{ AFS::appendRelPath(folderPath, fileInfo.itemName),
                                         FileAttributes(fileInfo.modTime, fileInfo.fileSize, fileInfo.fileId, false /*isSymlink*/)};
 
-        revisionFileImpl(fileDescr, relPathPf + fileInfo.itemName, onBeforeFileMove, notifyUnbufferedIO); //throw FileError
+        revisionFileImpl(fileDescr, relPathPf + fileInfo.itemName, onBeforeFileMove, notifyUnbufferedIO); //throw FileError, X
     }
 
     for (const AFS::SymlinkInfo& linkInfo : symlinks)
@@ -274,7 +274,7 @@ void FileVersioner::revisionFolderImpl(const AbstractPath& folderPath, const Zst
 
     //move folders recursively
     for (const AFS::FolderInfo& folderInfo : folders)
-        revisionFolderImpl(AFS::appendRelPath(folderPath, folderInfo.itemName), //throw FileError
+        revisionFolderImpl(AFS::appendRelPath(folderPath, folderInfo.itemName), //throw FileError, X
                            relPathPf + folderInfo.itemName,
                            onBeforeFileMove, onBeforeFolderMove, notifyUnbufferedIO);
     //delete source
@@ -393,18 +393,19 @@ void fff::applyVersioningLimit(const std::set<VersioningLimitFolder>& folderLimi
 {
     //--------- determine existing folder paths for traversal ---------
     std::set<DirectoryKey> foldersToRead;
-    std::set<VersioningLimitFolder> folderLimitsNorm; //get rid of folder aliases (e.g. path differing in case)
+    std::set<VersioningLimitFolder> folderLimitsTmp;
     {
         std::set<AbstractPath> pathsToCheck;
-        std::vector<VersioningLimitFolder> folderLimitsTmp;
 
         for (const VersioningLimitFolder& vlf : folderLimits)
             if (vlf.versionMaxAgeDays > 0 || vlf.versionCountMax > 0) //only analyze versioning folders when needed!
             {
                 pathsToCheck.insert(vlf.versioningFolderPath);
-                folderLimitsTmp.push_back(vlf);
+                folderLimitsTmp.insert(vlf);
             }
 
+        warn_static("TODO: detect folder aliases (e.g. most importantly insignificant differences in case)")
+
         //we don't want to show an error if version path does not yet exist!
         tryReportingError([&]
         {
@@ -412,14 +413,7 @@ void fff::applyVersioningLimit(const std::set<VersioningLimitFolder>& folderLimi
                                                                    false /*allowUserInteraction*/, callback); //throw X
             foldersToRead.clear();
             for (const AbstractPath& folderPath : status.existing)
-                foldersToRead.insert(DirectoryKey({ getNormalizedPath(status, folderPath), makeSharedRef<NullFilter>(), SymLinkHandling::DIRECT }));
-
-            folderLimitsNorm.clear();
-            for (VersioningLimitFolder vlf : folderLimitsTmp)
-            {
-                vlf.versioningFolderPath = getNormalizedPath(status, vlf.versioningFolderPath);
-                folderLimitsNorm.insert(vlf);
-            }
+                foldersToRead.insert(DirectoryKey({ folderPath, makeSharedRef<NullFilter>(), SymLinkHandling::DIRECT }));
 
             if (!status.failedChecks.empty())
             {
@@ -505,7 +499,7 @@ void fff::applyVersioningLimit(const std::set<VersioningLimitFolder>& folderLimi
         return localToTimeT(tc); //returns -1 on error => swallow => no versions trimmed by versionMaxAgeDays
     }();
 
-    for (const VersioningLimitFolder& vlf : folderLimitsNorm)
+    for (const VersioningLimitFolder& vlf : folderLimitsTmp)
     {
         auto it = versionDetails.find(vlf.versioningFolderPath);
         if (it != versionDetails.end())
diff --git a/FreeFileSync/Source/base/versioning.h b/FreeFileSync/Source/base/versioning.h
index b2d31090..30bb2fd9 100755
--- a/FreeFileSync/Source/base/versioning.h
+++ b/FreeFileSync/Source/base/versioning.h
@@ -51,28 +51,26 @@ public:
     }
 
     //multi-threaded access: internally synchronized!
-    void revisionFile(const FileDescriptor& fileDescr, //throw FileError; return "false" if file is not existing
+    void revisionFile(const FileDescriptor& fileDescr, //throw FileError, X
                       const Zstring& relativePath,
                       //called frequently if move has to revert to copy + delete => see zen::copyFile for limitations when throwing exceptions!
-                      const zen::IOCallback& notifyUnbufferedIO /*optional*/) const;
+                      const zen::IOCallback& notifyUnbufferedIO /*throw X*/) const;
 
-    void revisionSymlink(const AbstractPath& linkPath, const Zstring& relativePath) const; //throw FileError; return "false" if file is not existing
+    void revisionSymlink(const AbstractPath& linkPath, const Zstring& relativePath) const; //throw FileError
 
-    void revisionFolder(const AbstractPath& folderPath, const Zstring& relativePath, //throw FileError
-
-                        //optional callbacks: may be nullptr
-                        const std::function<void(const std::wstring& displayPathFrom, const std::wstring& displayPathTo)>& onBeforeFileMove,   //one call for each object!
-                        const std::function<void(const std::wstring& displayPathFrom, const std::wstring& displayPathTo)>& onBeforeFolderMove, //
+    void revisionFolder(const AbstractPath& folderPath, const Zstring& relativePath, //throw FileError, X
+                        const std::function<void(const std::wstring& displayPathFrom, const std::wstring& displayPathTo)>& onBeforeFileMove,   /*throw X*/
+                        const std::function<void(const std::wstring& displayPathFrom, const std::wstring& displayPathTo)>& onBeforeFolderMove, /*throw X*/
                         //called frequently if move has to revert to copy + delete => see zen::copyFile for limitations when throwing exceptions!
-                        const zen::IOCallback& notifyUnbufferedIO) const;
+                        const zen::IOCallback& notifyUnbufferedIO /*throw X*/) const;
 
 private:
     FileVersioner           (const FileVersioner&) = delete;
     FileVersioner& operator=(const FileVersioner&) = delete;
 
-    void revisionFileImpl(const FileDescriptor& fileDescr, const Zstring& relativePath, //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 /*optional*/) const;
+                          const zen::IOCallback& notifyUnbufferedIO) const;
 
     void revisionSymlinkImpl(const AbstractPath& linkPath, const Zstring& relativePath, //throw FileError
                              const std::function<void(const std::wstring& displayPathFrom, const std::wstring& displayPathTo)>& onBeforeMove) const;
@@ -80,7 +78,7 @@ private:
     void revisionFolderImpl(const AbstractPath& folderPath, const Zstring& relativePath,
                             const std::function<void(const std::wstring& displayPathFrom, const std::wstring& displayPathTo)>& onBeforeFileMove,
                             const std::function<void(const std::wstring& displayPathFrom, const std::wstring& displayPathTo)>& onBeforeFolderMove,
-                            const zen::IOCallback& notifyUnbufferedIO) const; //throw FileError
+                            const zen::IOCallback& notifyUnbufferedIO) const; //throw FileError, X
 
     AbstractPath generateVersionedPath(const Zstring& relativePath) const;
 
diff --git a/FreeFileSync/Source/fs/abstract.cpp b/FreeFileSync/Source/fs/abstract.cpp
index 1c1b9c30..d247bd4e 100755
--- a/FreeFileSync/Source/fs/abstract.cpp
+++ b/FreeFileSync/Source/fs/abstract.cpp
@@ -104,27 +104,27 @@ void AFS::traverseFolderFlat(const AfsPath& afsPath, //throw FileError
 
 
 //target existing: undefined behavior! (fail/overwrite/auto-rename)
-AFS::FileCopyResult AFS::copyFileAsStream(const AfsPath& afsPathSource, const StreamAttributes& attrSource, //throw FileError, ErrorFileLocked
-                                          const AbstractPath& apTarget, const IOCallback& notifyUnbufferedIO) const
+AFS::FileCopyResult AFS::copyFileAsStream(const AfsPath& afsPathSource, const StreamAttributes& attrSource, //throw FileError, ErrorFileLocked, X
+                                          const AbstractPath& apTarget, const IOCallback& notifyUnbufferedIO /*throw X*/) const
 {
     int64_t totalUnbufferedIO = 0;
 
-    auto streamIn = getInputStream(afsPathSource, IOCallbackDivider(notifyUnbufferedIO, totalUnbufferedIO)); //throw FileError, ErrorFileLocked, X
+    auto streamIn = getInputStream(afsPathSource, IOCallbackDivider(notifyUnbufferedIO, totalUnbufferedIO)); //throw FileError, ErrorFileLocked
 
     StreamAttributes attrSourceNew = {};
     //try to get the most current attributes if possible (input file might have changed after comparison!)
     if (std::optional<StreamAttributes> attr = streamIn->getAttributesBuffered()) //throw FileError
-        attrSourceNew = *attr; //Native/MTP
+        attrSourceNew = *attr; //Native/MTP/Gdrive
     else //use more stale ones:
         attrSourceNew = attrSource; //SFTP/FTP
     //TODO: evaluate: consequences of stale attributes
 
     //target existing: undefined behavior! (fail/overwrite/auto-rename)
-    auto streamOut = getOutputStream(apTarget, &attrSourceNew.fileSize, IOCallbackDivider(notifyUnbufferedIO, totalUnbufferedIO)); //throw FileError
+    auto streamOut = getOutputStream(apTarget, attrSourceNew.fileSize, attrSourceNew.modTime, IOCallbackDivider(notifyUnbufferedIO, totalUnbufferedIO)); //throw FileError
 
     bufferedStreamCopy(*streamIn, *streamOut); //throw FileError, ErrorFileLocked, X
 
-    const AFS::FileId targetFileId = streamOut->finalize(); //throw FileError, X
+    const AFS::FinalizeResult finResult = streamOut->finalize(); //throw FileError, X
 
     //check if "expected == actual number of bytes written"
     //-> extra check: bytes reported via notifyUnbufferedIO() should match actual number of bytes written
@@ -134,55 +134,36 @@ AFS::FileCopyResult AFS::copyFileAsStream(const AfsPath& afsPathSource, const St
                                               L"%x", numberTo<std::wstring>(2 * attrSourceNew.fileSize)),
                                    L"%y", numberTo<std::wstring>(totalUnbufferedIO)) + L" [notifyUnbufferedIO]");
 
-    std::optional<FileError> errorModTime;
-    try
-    {
-        /*
-        is setting modtime after closing the file handle a pessimization?
-            Native: no, needed for functional correctness, see file_access.cpp
-            MTP:    maybe a minor one (need to determine objectId one more time)
-            SFTP:   no, needed for functional correctness (synology server), just as for Native
-            FTP:    no: could set modtime via CURLOPT_POSTQUOTE (but this would internally trigger an extra round-trip anyway!)
-        */
-        setModTime(apTarget, attrSourceNew.modTime); //throw FileError, follows symlinks
-    }
-    catch (const FileError& e)
-    {
-        /*
-        Failing to set modification time is not a serious problem from synchronization perspective (treated like external update)
-          => Support additional scenarios:
+    AFS::FileCopyResult cpResult;
+    cpResult.fileSize     = attrSourceNew.fileSize;
+    cpResult.modTime      = attrSourceNew.modTime;
+    cpResult.sourceFileId = attrSourceNew.fileId;
+    cpResult.targetFileId = finResult.fileId;
+    cpResult.errorModTime = finResult.errorModTime;
+    /* Failing to set modification time is not a serious problem from synchronization perspective (treated like external update)
+            => Support additional scenarios:
             - GVFS failing to set modTime for FTP: https://freefilesync.org/forum/viewtopic.php?t=2372
             - GVFS failing to set modTime for MTP: https://freefilesync.org/forum/viewtopic.php?t=2803
             - MTP failing to set modTime in general: fail non-silently rather than silently during file creation
-            - FTP failing to set modTime for servers lacking MFMT-support
-        */
-        errorModTime = FileError(e.toString()); //avoid slicing
-    }
-
-    AFS::FileCopyResult result;
-    result.fileSize     = attrSourceNew.fileSize;
-    result.modTime      = attrSourceNew.modTime;
-    result.sourceFileId = attrSourceNew.fileId;
-    result.targetFileId = targetFileId;
-    result.errorModTime = errorModTime;
-    return result;
+            - FTP failing to set modTime for servers lacking MFMT-support    */
+    return cpResult;
 }
 
 
 //target existing: undefined behavior! (fail/overwrite/auto-rename)
-AFS::FileCopyResult AFS::copyFileTransactional(const AbstractPath& apSource, const StreamAttributes& attrSource, //throw FileError, ErrorFileLocked
+AFS::FileCopyResult AFS::copyFileTransactional(const AbstractPath& apSource, const StreamAttributes& attrSource, //throw FileError, ErrorFileLocked, X
                                                const AbstractPath& apTarget,
                                                bool copyFilePermissions,
                                                bool transactionalCopy,
                                                const std::function<void()>& onDeleteTargetFile,
-                                               const IOCallback& notifyUnbufferedIO)
+                                               const IOCallback& notifyUnbufferedIO /*throw X*/)
 {
     auto copyFilePlain = [&](const AbstractPath& apTargetTmp)
     {
         //caveat: typeid returns static type for pointers, dynamic type for references!!!
         if (typeid(apSource.afsDevice.ref()) == typeid(apTargetTmp.afsDevice.ref()))
             return apSource.afsDevice.ref().copyFileForSameAfsType(apSource.afsPath, attrSource,
-                                                                   apTargetTmp, copyFilePermissions, notifyUnbufferedIO); //throw FileError, ErrorFileLocked
+                                                                   apTargetTmp, copyFilePermissions, notifyUnbufferedIO); //throw FileError, ErrorFileLocked, X
         //target existing: undefined behavior! (fail/overwrite/auto-rename)
 
         //fall back to stream-based file copy:
@@ -190,14 +171,12 @@ AFS::FileCopyResult AFS::copyFileTransactional(const AbstractPath& apSource, con
             throw FileError(replaceCpy(_("Cannot write permissions of %x."), L"%x", fmtPath(AFS::getDisplayPath(apTargetTmp))),
                             _("Operation not supported for different base folder types."));
 
-        return apSource.afsDevice.ref().copyFileAsStream(apSource.afsPath, attrSource, apTargetTmp, notifyUnbufferedIO); //throw FileError, ErrorFileLocked
+        return apSource.afsDevice.ref().copyFileAsStream(apSource.afsPath, attrSource, apTargetTmp, notifyUnbufferedIO); //throw FileError, ErrorFileLocked, X
         //target existing: undefined behavior! (fail/overwrite/auto-rename)
     };
 
-    if (transactionalCopy)
+    if (transactionalCopy && !hasNativeTransactionalCopy(apTarget))
     {
-        warn_static("doesnt make sense for Google Drive")
-
         std::optional<AbstractPath> parentPath = AFS::getParentPath(apTarget);
         if (!parentPath)
             throw FileError(replaceCpy(_("Cannot write file %x."), L"%x", fmtPath(AFS::getDisplayPath(apTarget))), L"Path is device root.");
@@ -246,7 +225,7 @@ AFS::FileCopyResult AFS::copyFileTransactional(const AbstractPath& apSource, con
                 -> skydrive - doesn't allow for .ffs_tmp extension and returns ERROR_INVALID_PARAMETER
                 -> network renaming issues
                 -> allow for true delete before copy to handle low disk space problems
-                -> higher performance on non-buffered drives (e.g. usb sticks)
+                -> higher performance on unbuffered drives (e.g. USB-sticks)
         */
         if (onDeleteTargetFile)
             onDeleteTargetFile();
@@ -273,7 +252,7 @@ void AFS::createFolderIfMissingRecursion(const AbstractPath& ap) //throw FileErr
 
     try
     {
-        //target existing: undefined behavior! (fail/overwrite)
+        //target existing: fail/ignore
         createFolderPlain(ap); //throw FileError
     }
     catch (FileError&)
@@ -332,6 +311,8 @@ void AFS::removeFolderIfExistsRecursion(const AbstractPath& ap, //throw FileErro
                                         const std::function<void (const std::wstring& displayPath)>& onBeforeFileDeletion, //optional
                                         const std::function<void (const std::wstring& displayPath)>& onBeforeFolderDeletion) //one call for each object!
 {
+    warn_static("Support Google Drive simple recursive deletion")
+
     std::function<void(const AbstractPath& folderPath)> removeFolderRecursionImpl;
     removeFolderRecursionImpl = [&onBeforeFileDeletion, &onBeforeFolderDeletion, &removeFolderRecursionImpl](const AbstractPath& folderPath) //throw FileError
     {
diff --git a/FreeFileSync/Source/fs/abstract.h b/FreeFileSync/Source/fs/abstract.h
index 815fbf31..682ddf9b 100755
--- a/FreeFileSync/Source/fs/abstract.h
+++ b/FreeFileSync/Source/fs/abstract.h
@@ -69,9 +69,14 @@ struct AbstractFileSystem //THREAD-SAFETY: "const" member functions must model t
     static std::optional<Zstring> getNativeItemPath(const AbstractPath& ap) { return ap.afsDevice.ref().getNativeItemPath(ap.afsPath); }
 
     //----------------------------------------------------------------------------------------------------------------
-    static void connectNetworkFolder(const AbstractPath& ap, bool allowUserInteraction) { return ap.afsDevice.ref().connectNetworkFolder(ap.afsPath, allowUserInteraction); } //throw FileError
+    static void connectNetworkFolder(const AbstractPath& ap, bool allowUserInteraction) //throw FileError
+    { return ap.afsDevice.ref().connectNetworkFolder(ap.afsPath, allowUserInteraction); }
 
-    static int geAccessTimeout(const AbstractPath& ap) { return ap.afsDevice.ref().getAccessTimeout(); } //returns "0" if no timeout in force
+    static int getAccessTimeout(const AbstractPath& ap) { return ap.afsDevice.ref().getAccessTimeout(); } //returns "0" if no timeout in force
+
+    static bool supportPermissionCopy(const AbstractPath& apSource, const AbstractPath& apTarget); //throw FileError
+
+    static bool hasNativeTransactionalCopy(const AbstractPath& ap) { return ap.afsDevice.ref().hasNativeTransactionalCopy(); }
     //----------------------------------------------------------------------------------------------------------------
 
     using FileId = zen::Zbase<char>; //AfsDevice-dependent unique ID
@@ -91,7 +96,7 @@ struct AbstractFileSystem //THREAD-SAFETY: "const" member functions must model t
     static std::optional<ItemType> itemStillExists(const AbstractPath& ap) { return ap.afsDevice.ref().itemStillExists(ap.afsPath); } //throw FileError
     //----------------------------------------------------------------------------------------------------------------
 
-    //target existing: undefined behavior! (fail/overwrite)
+    //target existing: fail/ignore
     //does NOT create parent directories recursively if not existing
     static void createFolderPlain(const AbstractPath& ap) { ap.afsDevice.ref().createFolderPlain(ap.afsPath); } //throw FileError
 
@@ -110,9 +115,7 @@ struct AbstractFileSystem //THREAD-SAFETY: "const" member functions must model t
     static void removeSymlinkPlain(const AbstractPath& ap) { ap.afsDevice.ref().removeSymlinkPlain(ap.afsPath); } //throw FileError
     static void removeFolderPlain (const AbstractPath& ap) { ap.afsDevice.ref().removeFolderPlain (ap.afsPath); } //throw FileError
     //----------------------------------------------------------------------------------------------------------------
-    static void setModTime(const AbstractPath& ap, time_t modTime) { ap.afsDevice.ref().setModTime(ap.afsPath, modTime); } //throw FileError, follows symlinks
-
-    static FileId /*optional*/ getFileId(const AbstractPath& ap) { return ap.afsDevice.ref().getFileId(ap.afsPath); } //throw FileError
+    //static void setModTime(const AbstractPath& ap, time_t modTime) { ap.afsDevice.ref().setModTime(ap.afsPath, modTime); } //throw FileError, follows symlinks
 
     static AbstractPath getSymlinkResolvedPath(const AbstractPath& ap) { return ap.afsDevice.ref().getSymlinkResolvedPath (ap.afsPath); } //throw FileError
     static std::string getSymlinkBinaryContent(const AbstractPath& ap) { return ap.afsDevice.ref().getSymlinkBinaryContent(ap.afsPath); } //throw FileError
@@ -141,38 +144,46 @@ struct AbstractFileSystem //THREAD-SAFETY: "const" member functions must model t
         virtual std::optional<StreamAttributes> getAttributesBuffered() = 0; //throw FileError
     };
 
+
+    struct FinalizeResult
+    {
+        FileId fileId;
+        std::optional<zen::FileError> errorModTime;
+    };
+
     struct OutputStreamImpl
     {
         virtual ~OutputStreamImpl() {}
         virtual void write(const void* buffer, size_t bytesToWrite) = 0; //throw FileError, X
-        virtual FileId finalize() = 0;                                   //throw FileError, X
+        virtual FinalizeResult finalize() = 0;                           //throw FileError, X
     };
 
     //TRANSACTIONAL output stream! => call finalize when done!
     struct OutputStream
     {
-        OutputStream(std::unique_ptr<OutputStreamImpl>&& outStream, const AbstractPath& filePath, const uint64_t* streamSize);
+        OutputStream(std::unique_ptr<OutputStreamImpl>&& outStream, const AbstractPath& filePath, std::optional<uint64_t> streamSize);
         ~OutputStream();
         void write(const void* buffer, size_t bytesToWrite); //throw FileError, X
-        FileId finalize();                                   //throw FileError, X
+        FinalizeResult finalize();                           //throw FileError, X
 
     private:
         std::unique_ptr<OutputStreamImpl> outStream_; //bound!
         const AbstractPath filePath_;
         bool finalizeSucceeded_ = false;
-        std::optional<uint64_t> bytesExpected_;
+        const std::optional<uint64_t> bytesExpected_;
         uint64_t bytesWrittenTotal_ = 0;
     };
 
     //return value always bound:
-    static std::unique_ptr<InputStream> getInputStream(const AbstractPath& ap, const zen::IOCallback& notifyUnbufferedIO) //throw FileError, ErrorFileLocked, X
+    static std::unique_ptr<InputStream> getInputStream(const AbstractPath& ap, const zen::IOCallback& notifyUnbufferedIO /*throw X*/) //throw FileError, ErrorFileLocked
     { return ap.afsDevice.ref().getInputStream(ap.afsPath, notifyUnbufferedIO); }
 
     //target existing: undefined behavior! (fail/overwrite/auto-rename)
     static std::unique_ptr<OutputStream> getOutputStream(const AbstractPath& ap, //throw FileError
-                                                         const uint64_t* streamSize,           //optional
-                                                         const zen::IOCallback& notifyUnbufferedIO) //
-    { return std::make_unique<OutputStream>(ap.afsDevice.ref().getOutputStream(ap.afsPath, streamSize, notifyUnbufferedIO), ap, streamSize); }
+                                                         std::optional<uint64_t> streamSize,
+                                                         std::optional<time_t> modTime,
+                                                         const zen::IOCallback& notifyUnbufferedIO /*throw X*/)
+    { return std::make_unique<OutputStream>(ap.afsDevice.ref().getOutputStream(ap.afsPath, streamSize, modTime, notifyUnbufferedIO), ap, streamSize); }
     //----------------------------------------------------------------------------------------------------------------
 
     struct SymlinkInfo
@@ -236,8 +247,6 @@ struct AbstractFileSystem //THREAD-SAFETY: "const" member functions must model t
     { ap.afsDevice.ref().traverseFolderFlat(ap.afsPath, onFile, onFolder, onSymlink); }
     //----------------------------------------------------------------------------------------------------------------
 
-    static bool supportPermissionCopy(const AbstractPath& apSource, const AbstractPath& apTarget); //throw FileError
-
     //target existing: undefined behavior! (fail/overwrite/auto-rename)
     static void moveAndRenameItem(const AbstractPath& apSource, const AbstractPath& apTarget); //throw FileError, ErrorDifferentVolume
 
@@ -257,17 +266,17 @@ struct AbstractFileSystem //THREAD-SAFETY: "const" member functions must model t
     //symlink handling: follow
     //target existing: undefined behavior! (fail/overwrite/auto-rename)
     //returns current attributes at the time of copy
-    static FileCopyResult copyFileTransactional(const AbstractPath& apSource, const StreamAttributes& attrSource, //throw FileError, ErrorFileLocked
+    static FileCopyResult copyFileTransactional(const AbstractPath& apSource, const StreamAttributes& attrSource, //throw FileError, ErrorFileLocked, X
                                                 const AbstractPath& apTarget,
                                                 bool copyFilePermissions,
                                                 bool transactionalCopy,
                                                 //if target is existing user *must* implement deletion to avoid undefined behavior
                                                 //if transactionalCopy == true, full read access on source had been proven at this point, so it's safe to delete it.
-                                                const std::function<void()>& onDeleteTargetFile,
+                                                const std::function<void()>& onDeleteTargetFile /*throw X*/,
                                                 //accummulated delta != file size! consider ADS, sparse, compressed files
-                                                const zen::IOCallback& notifyUnbufferedIO);
+                                                const zen::IOCallback& notifyUnbufferedIO /*throw X*/);
 
-    //target existing: undefined behavior! (fail/overwrite)
+    //target existing: fail/ignore
     //symlink handling: follow link!
     static void copyNewFolder(const AbstractPath& apSource, const AbstractPath& apTarget, bool copyFilePermissions); //throw FileError
 
@@ -282,9 +291,8 @@ struct AbstractFileSystem //THREAD-SAFETY: "const" member functions must model t
     struct RecycleSession
     {
         virtual ~RecycleSession() {}
-        //- return true if item existed
         //- multi-threaded access: internally synchronized!
-        virtual bool recycleItem(const AbstractPath& itemPath, const Zstring& logicalRelPath) = 0; //throw FileError;
+        virtual void recycleItemIfExists(const AbstractPath& itemPath, const Zstring& logicalRelPath) = 0; //throw FileError;
 
         virtual void tryCleanup(const std::function<void (const std::wstring& displayPath)>& notifyDeletionStatus /*optional; currentItem may be empty*/) = 0; //throw FileError
     };
@@ -309,8 +317,8 @@ protected:
                             const std::function<void (const SymlinkInfo& si)>& onSymlink) const; //
 
     //target existing: undefined behavior! (fail/overwrite/auto-rename)
-    FileCopyResult copyFileAsStream(const AfsPath& afsPathSource, const StreamAttributes& attrSource, //throw FileError, ErrorFileLocked
-                                    const AbstractPath& apTarget, const zen::IOCallback& notifyUnbufferedIO) const; //may be nullptr; throw X!
+    FileCopyResult copyFileAsStream(const AfsPath& afsPathSource, const StreamAttributes& attrSource, //throw FileError, ErrorFileLocked, X
+                                    const AbstractPath& apTarget, const zen::IOCallback& notifyUnbufferedIO /*throw X*/) const;
 
 private:
     virtual std::optional<Zstring> getNativeItemPath(const AfsPath& afsPath) const { return {}; };
@@ -328,7 +336,7 @@ private:
     virtual std::optional<ItemType> itemStillExists(const AfsPath& afsPath) const = 0; //throw FileError
     //----------------------------------------------------------------------------------------------------------------
 
-    //target existing: undefined behavior! (fail/overwrite)
+    //target existing: fail/ignore
     virtual void createFolderPlain(const AfsPath& afsPath) const = 0; //throw FileError
 
     //non-recursive folder deletion:
@@ -336,19 +344,18 @@ private:
     virtual void removeSymlinkPlain(const AfsPath& afsPath) const = 0; //throw FileError
     virtual void removeFolderPlain (const AfsPath& afsPath) const = 0; //throw FileError
     //----------------------------------------------------------------------------------------------------------------
-    virtual void setModTime(const AfsPath& afsPath, time_t modTime) const = 0; //throw FileError, follows symlinks
-
-    virtual FileId /*optional*/ getFileId(const AfsPath& afsPath) const = 0; //throw FileError
+    //virtual void setModTime(const AfsPath& afsPath, time_t modTime) const = 0; //throw FileError, follows symlinks
 
     virtual AbstractPath getSymlinkResolvedPath(const AfsPath& afsPath) const = 0; //throw FileError
     virtual std::string getSymlinkBinaryContent(const AfsPath& afsPath) const = 0; //throw FileError
     //----------------------------------------------------------------------------------------------------------------
-    virtual std::unique_ptr<InputStream> getInputStream (const AfsPath& afsPath, const zen::IOCallback& notifyUnbufferedIO) const = 0; //throw FileError, ErrorFileLocked, X
+    virtual std::unique_ptr<InputStream> getInputStream(const AfsPath& afsPath, const zen::IOCallback& notifyUnbufferedIO /*throw X*/) const = 0; //throw FileError, ErrorFileLocked
 
     //target existing: undefined behavior! (fail/overwrite/auto-rename)
     virtual std::unique_ptr<OutputStreamImpl> getOutputStream(const AfsPath& afsPath, //throw FileError
-                                                              const uint64_t* streamSize,                      //optional
-                                                              const zen::IOCallback& notifyUnbufferedIO) const = 0; //
+                                                              std::optional<uint64_t> streamSize,
+                                                              std::optional<time_t> modTime,
+                                                              const zen::IOCallback& notifyUnbufferedIO /*throw X*/) const = 0;
     //----------------------------------------------------------------------------------------------------------------
     virtual void traverseFolderRecursive(const TraverserWorkload& workload /*throw X*/, size_t parallelOps) const = 0;
     //----------------------------------------------------------------------------------------------------------------
@@ -359,13 +366,13 @@ private:
 
     //symlink handling: follow link!
     //target existing: undefined behavior! (fail/overwrite/auto-rename)
-    virtual FileCopyResult copyFileForSameAfsType(const AfsPath& afsPathSource, const StreamAttributes& attrSource, //throw FileError, ErrorFileLocked
+    virtual FileCopyResult copyFileForSameAfsType(const AfsPath& afsPathSource, const StreamAttributes& attrSource, //throw FileError, ErrorFileLocked, X
                                                   const AbstractPath& apTarget, bool copyFilePermissions,
                                                   //accummulated delta != file size! consider ADS, sparse, compressed files
-                                                  const zen::IOCallback& notifyUnbufferedIO) const = 0; //may be nullptr; throw X!
+                                                  const zen::IOCallback& notifyUnbufferedIO /*throw X*/) const = 0;
 
 
-    //target existing: undefined behavior! (fail/overwrite)
+    //target existing: fail/ignore
     //symlink handling: follow link!
     virtual void copyNewFolderForSameAfsType(const AfsPath& afsPathSource, const AbstractPath& apTarget, bool copyFilePermissions) const = 0; //throw FileError
 
@@ -378,6 +385,8 @@ private:
     virtual void connectNetworkFolder(const AfsPath& afsPath, bool allowUserInteraction) const = 0; //throw FileError
 
     virtual int getAccessTimeout() const = 0; //returns "0" if no timeout in force
+
+    virtual bool hasNativeTransactionalCopy() const = 0;
     //----------------------------------------------------------------------------------------------------------------
 
     virtual uint64_t getFreeDiskSpace(const AfsPath& afsPath) const = 0; //throw FileError, returns 0 if not available
@@ -413,12 +422,10 @@ AbstractPath AbstractFileSystem::appendRelPath(const AbstractPath& ap, const Zst
 //--------------------------------------------------------------------------
 
 inline
-AbstractFileSystem::OutputStream::OutputStream(std::unique_ptr<OutputStreamImpl>&& outStream, const AbstractPath& filePath, const uint64_t* streamSize) :
-    outStream_(std::move(outStream)), filePath_(filePath)
-{
-    if (streamSize)
-        bytesExpected_ = *streamSize;
-}
+AbstractFileSystem::OutputStream::OutputStream(std::unique_ptr<OutputStreamImpl>&& outStream, const AbstractPath& filePath, std::optional<uint64_t> streamSize) :
+    outStream_(std::move(outStream)),
+    filePath_(filePath),
+    bytesExpected_(streamSize) {}
 
 
 inline
@@ -428,8 +435,9 @@ AbstractFileSystem::OutputStream::~OutputStream()
 
     //we delete the file on errors: => file should not have existed prior to creating OutputStream instance!!
     outStream_.reset(); //close file handle *before* remove!
-
-    if (!finalizeSucceeded_) //transactional output stream! => clean up!
+	   
+    if (!finalizeSucceeded_) //transactional output stream! => clean up! 
+		//even needed for Google Drive: e.g. user might cancel during OutputStreamImpl::finalize(), just after file was written transactionally
         try { AbstractFileSystem::removeFilePlain(filePath_); /*throw FileError*/ }
         catch (FileError& e) { (void)e; }
 }
@@ -444,7 +452,7 @@ void AbstractFileSystem::OutputStream::write(const void* data, size_t len) //thr
 
 
 inline
-AbstractFileSystem::FileId AbstractFileSystem::OutputStream::finalize() //throw FileError, X
+AbstractFileSystem::FinalizeResult AbstractFileSystem::OutputStream::finalize() //throw FileError, X
 {
     using namespace zen;
 
@@ -455,9 +463,9 @@ AbstractFileSystem::FileId AbstractFileSystem::OutputStream::finalize() //throw
                                               L"%x", numberTo<std::wstring>(*bytesExpected_)),
                                    L"%y", numberTo<std::wstring>(bytesWrittenTotal_)));
 
-    const FileId fileId = outStream_->finalize(); //throw FileError, X
+    const FinalizeResult result = outStream_->finalize(); //throw FileError, X
     finalizeSucceeded_ = true;
-    return fileId;
+    return result;
 }
 
 //--------------------------------------------------------------------------
@@ -501,7 +509,7 @@ void AbstractFileSystem::copyNewFolder(const AbstractPath& apSource, const Abstr
         throw FileError(replaceCpy(_("Cannot write permissions of %x."), L"%x", fmtPath(getDisplayPath(apTarget))),
                         _("Operation not supported for different base folder types."));
 
-    //target existing: undefined behavior! (fail/overwrite)
+    //target existing: fail/ignore
     createFolderPlain(apTarget); //throw FileError
 }
 
diff --git a/FreeFileSync/Source/fs/abstract_impl.h b/FreeFileSync/Source/fs/abstract_impl.h
new file mode 100755
index 00000000..8f4a8d3d
--- /dev/null
+++ b/FreeFileSync/Source/fs/abstract_impl.h
@@ -0,0 +1,366 @@
+// *****************************************************************************
+// * This file is part of the FreeFileSync project. It is distributed under    *
+// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0          *
+// * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved *
+// *****************************************************************************
+
+#ifndef IMPL_HELPER_H_873450978453042524534234
+#define IMPL_HELPER_H_873450978453042524534234
+
+#include "abstract.h"
+#include <zen/thread.h>
+#include <zen/ring_buffer.h>
+
+
+namespace fff
+{
+inline
+AfsPath sanitizeRootRelativePath(Zstring relPath)
+{
+    if constexpr (FILE_NAME_SEPARATOR != Zstr('/' )) replace(relPath, Zstr('/'),  FILE_NAME_SEPARATOR);
+    if constexpr (FILE_NAME_SEPARATOR != Zstr('\\')) replace(relPath, Zstr('\\'), FILE_NAME_SEPARATOR);
+    trim(relPath, true, true, [](Zchar c) { return c == FILE_NAME_SEPARATOR; });
+    return AfsPath(std::move(relPath));
+}
+
+
+template <class Function> inline //return ignored error message if available
+std::wstring tryReportingDirError(Function cmd /*throw FileError*/, AbstractFileSystem::TraverserCallback& cb /*throw X*/)
+{
+    for (size_t retryNumber = 0;; ++retryNumber)
+        try
+        {
+            cmd(); //throw FileError
+            return std::wstring();
+        }
+        catch (const zen::FileError& e)
+        {
+            assert(!e.toString().empty());
+            switch (cb.reportDirError(e.toString(), retryNumber)) //throw X
+            {
+                case AbstractFileSystem::TraverserCallback::ON_ERROR_CONTINUE:
+                    return e.toString();
+                case AbstractFileSystem::TraverserCallback::ON_ERROR_RETRY:
+                    break; //continue with loop
+            }
+        }
+}
+
+//==========================================================================================
+
+/*
+implement streaming API on top of libcurl's icky callback-based design
+    => support copying arbitrarily-large files: https://freefilesync.org/forum/viewtopic.php?t=4471
+    => maximum performance through async processing (prefetching + output buffer!)
+    => cost per worker thread creation ~ 1/20 ms
+*/
+class AsyncStreamBuffer
+{
+public:
+    AsyncStreamBuffer(size_t bufferSize) : bufferSize_(bufferSize) { ringBuf_.reserve(bufferSize); }
+
+    //context of output thread, blocking
+    void write(const void* buffer, size_t bytesToWrite) //throw <read error>
+    {
+        totalBytesWritten_ += bytesToWrite; //bytes already processed as far as raw FTP access is concerned
+
+        auto       it    = static_cast<const std::byte*>(buffer);
+        const auto itEnd = it + bytesToWrite;
+
+        for (std::unique_lock dummy(lockStream_); it != itEnd;)
+        {
+            //=> can't use InterruptibleThread's interruptibleWait() :(
+            //   -> AsyncStreamBuffer is used for input and output streaming
+            //    => both AsyncStreamBuffer::write()/read() would have to implement interruptibleWait()
+            //    => one of these usually called from main thread
+            //    => but interruptibleWait() cannot be called from main thread!
+            conditionBytesRead_.wait(dummy, [this] { return errorRead_ || ringBuf_.size() < bufferSize_; });
+
+            if (errorRead_)
+                std::rethrow_exception(errorRead_); //throw <read error>
+
+            const size_t junkSize = std::min(static_cast<size_t>(itEnd - it), bufferSize_ - ringBuf_.size());
+            ringBuf_.insert_back(it, it + junkSize);
+            it += junkSize;
+
+            conditionBytesWritten_.notify_all();
+        }
+    }
+
+    //context of output thread
+    void closeStream()
+    {
+        {
+            std::lock_guard dummy(lockStream_);
+            assert(!eof_);
+            eof_ = true;
+        }
+        conditionBytesWritten_.notify_all();
+    }
+
+    //context of input thread, blocking
+    //return "bytesToRead" bytes unless end of stream!
+    size_t read(void* buffer, size_t bytesToRead) //throw <write error>
+    {
+        auto       it    = static_cast<std::byte*>(buffer);
+        const auto itEnd = it + bytesToRead;
+
+        for (std::unique_lock dummy(lockStream_); it != itEnd;)
+        {
+            conditionBytesWritten_.wait(dummy, [this] { return errorWrite_ || !ringBuf_.empty() || eof_; });
+
+            if (errorWrite_)
+                std::rethrow_exception(errorWrite_); //throw <write error>
+
+            const size_t junkSize = std::min(static_cast<size_t>(itEnd - it), ringBuf_.size());
+            ringBuf_.extract_front(it, it + junkSize);
+            it += junkSize;
+
+            conditionBytesRead_.notify_all();
+
+            if (eof_) //end of file
+                break;
+        }
+
+        const size_t bytesRead = it - static_cast<std::byte*>(buffer);
+        totalBytesRead_ += bytesRead;
+        return bytesRead;
+    }
+
+    //context of input thread
+    void setReadError(const std::exception_ptr& error)
+    {
+        {
+            std::lock_guard dummy(lockStream_);
+            assert(!errorRead_);
+            if (!errorRead_)
+                errorRead_ = error;
+        }
+        conditionBytesRead_.notify_all();
+    }
+
+    //context of output thread
+    void setWriteError(const std::exception_ptr& error)
+    {
+        {
+            std::lock_guard dummy(lockStream_);
+            assert(!errorWrite_);
+            if (!errorWrite_)
+                errorWrite_ = error;
+        }
+        conditionBytesWritten_.notify_all();
+    }
+
+    //context of *output* thread
+    void checkReadErrors() //throw <read error>
+    {
+        std::lock_guard dummy(lockStream_);
+        if (errorRead_)
+            std::rethrow_exception(errorRead_); //throw <read error>
+    }
+
+    // -> function not needed: when EOF is reached (without errors), reading is done => no further error can occur!
+    //void checkWriteErrors() //throw <write error>
+    //{
+    //    std::lock_guard dummy(lockStream_);
+    //    if (errorWrite_)
+    //        std::rethrow_exception(errorWrite_); //throw <write error>
+    //}
+
+    uint64_t getTotalBytesWritten() const { return totalBytesWritten_; }
+    uint64_t getTotalBytesRead   () const { return totalBytesRead_; }
+
+private:
+    AsyncStreamBuffer           (const AsyncStreamBuffer&) = delete;
+    AsyncStreamBuffer& operator=(const AsyncStreamBuffer&) = delete;
+
+    const size_t bufferSize_;
+    std::mutex lockStream_;
+    zen::RingBuffer<std::byte> ringBuf_; //prefetch/output buffer
+    bool eof_ = false;
+    std::exception_ptr errorWrite_;
+    std::exception_ptr errorRead_;
+    std::condition_variable conditionBytesWritten_;
+    std::condition_variable conditionBytesRead_;
+
+    std::atomic<uint64_t> totalBytesWritten_{ 0 }; //std:atomic is uninitialized by default!
+    std::atomic<uint64_t> totalBytesRead_   { 0 }; //
+};
+
+//==========================================================================================
+
+template <class Context, class Function>
+struct Task
+{
+    Function getResult; //throw FileError
+    /* [[no_unique_address]] */ Context ctx;
+};
+
+
+template <class Context, class Function>
+struct TaskResult
+{
+    Task<Context, Function>  wi;
+    std::exception_ptr       error;  //mutually exclusive
+    decltype(wi.getResult()) value;  //
+};
+
+enum class SchedulerStatus
+{
+    HAVE_RESULT,
+    FINISHED,
+};
+
+template <class Context, class... Functions> //avoid std::function memory alloc + virtual calls
+class TaskScheduler
+{
+public:
+    TaskScheduler(size_t threadCount, const std::string& groupName) :
+        threadGroup_(zen::ThreadGroup<std::function<void()>>(threadCount, groupName)) {}
+
+    ~TaskScheduler() { threadGroup_ = {}; } //TaskScheduler must out-live threadGroup! (captured "this")
+
+    //context of controlling thread, non-blocking:
+    template <class Function>
+    void run(Task<Context, Function>&& wi, bool insertFront = false)
+    {
+        threadGroup_->run([this, wi = std::move(wi)]
+        {
+            try {         this->returnResult<Function>({ wi, nullptr, wi.getResult() }); } //throw FileError
+            catch (...) { this->returnResult<Function>({ wi, std::current_exception(), {} }); }
+        }, insertFront);
+
+        std::lock_guard dummy(lockResult_);
+        ++resultsPending_;
+    }
+
+    //context of controlling thread, blocking:
+    SchedulerStatus getResults(std::tuple<std::vector<TaskResult<Context, Functions>>...>& results)
+    {
+        std::apply([](auto&... r) { (..., r.clear()); }, results);
+
+        std::unique_lock dummy(lockResult_);
+
+        auto resultsReady = [&]
+        {
+            bool ready = false;
+            std::apply([&ready](const auto&... r) { ready = (... || !r.empty()); }, results_);
+            return ready;
+        };
+
+        if (!resultsReady() && resultsPending_ == 0)
+            return SchedulerStatus::FINISHED;
+
+        conditionNewResult_.wait(dummy, [&resultsReady] { return resultsReady(); });
+
+        results.swap(results_); //reuse memory + avoid needless item-level mutex locking
+        return SchedulerStatus::HAVE_RESULT;
+    }
+
+private:
+    TaskScheduler           (const TaskScheduler&) = delete;
+    TaskScheduler& operator=(const TaskScheduler&) = delete;
+
+    //context of worker threads, non-blocking:
+    template <class Function>
+    void returnResult(TaskResult<Context, Function>&& r)
+    {
+        {
+            std::lock_guard dummy(lockResult_);
+
+            std::get<std::vector<TaskResult<Context, Function>>>(results_).push_back(std::move(r));
+            --resultsPending_;
+        }
+        conditionNewResult_.notify_all();
+    }
+
+    std::optional<zen::ThreadGroup<std::function<void()>>> threadGroup_;
+
+    std::mutex lockResult_;
+    size_t resultsPending_ = 0;
+    std::tuple<std::vector<TaskResult<Context, Functions>>...> results_;
+    std::condition_variable conditionNewResult_;
+};
+
+
+struct TravContext
+{
+    Zstring errorItemName; //empty if all items affected
+    size_t errorRetryCount = 0;
+    std::shared_ptr<AbstractFileSystem::TraverserCallback> cb; //call by controlling thread only! => don't require traverseFolderParallel() callbacks to be thread-safe!
+};
+
+
+template <class... Functions>
+class GenericDirTraverser
+{
+public:
+    using Function1 = zen::GetFirstOfT<Functions...>;
+
+    GenericDirTraverser(std::vector<Task<TravContext, Function1>>&& initialTasks /*throw X*/, size_t parallelOps, const std::string& threadGroupName) :
+        scheduler_(parallelOps, threadGroupName)
+    {
+        //set the initial work load
+        for (auto& item : initialTasks)
+            scheduler_.template run<Function1>(std::move(item));
+
+        //run loop
+        std::tuple<std::vector<TaskResult<TravContext, Functions>>...> results; //avoid per-getNextResults() memory allocations (=> swap instead!)
+
+        while (scheduler_.getResults(results) == SchedulerStatus::HAVE_RESULT)
+            std::apply([&](auto&... r) { (..., this->evalResultList(r)); }, results); //throw X
+    }
+
+private:
+    GenericDirTraverser           (const GenericDirTraverser&) = delete;
+    GenericDirTraverser& operator=(const GenericDirTraverser&) = delete;
+
+    template <class Function>
+    void evalResultList(std::vector<TaskResult<TravContext, Function>>& results /*throw X*/)
+    {
+        for (TaskResult<TravContext, Function>& result : results)
+            evalResult(result); //throw X
+    }
+
+    template <class Function>
+    void evalResult(TaskResult<TravContext, Function>& result /*throw X*/);
+
+    //specialize!
+    template <class Function>
+    void evalResultValue(const typename Function::Result& r, std::shared_ptr<AbstractFileSystem::TraverserCallback>& cb /*throw X*/);
+
+    TaskScheduler<TravContext, Functions...> scheduler_;
+};
+
+
+template <class... Functions>
+template <class Function>
+void GenericDirTraverser<Functions...>::evalResult(TaskResult<TravContext, Function>& result /*throw X*/)
+{
+    auto& cb = result.wi.ctx.cb;
+    try
+    {
+        if (result.error)
+            std::rethrow_exception(result.error); //throw FileError
+    }
+    catch (const zen::FileError& e)
+    {
+        switch (result.wi.ctx.errorItemName.empty() ?
+                cb->reportDirError (e.toString(), result.wi.ctx.errorRetryCount) : //throw X
+                cb->reportItemError(e.toString(), result.wi.ctx.errorRetryCount, result.wi.ctx.errorItemName)) //throw X
+        {
+            case AbstractFileSystem::TraverserCallback::ON_ERROR_RETRY:
+                //user expects that the task is retried immediately => we can't do much about other errors already waiting in the queue, but at least *prepend* to the work load!
+                scheduler_.template run<Function>({ std::move(result.wi.getResult), TravContext{ result.wi.ctx.errorItemName, result.wi.ctx.errorRetryCount + 1, cb }},
+                                                  true /*insertFront*/);
+                return;
+
+            case AbstractFileSystem::TraverserCallback::ON_ERROR_CONTINUE:
+                return;
+        }
+    }
+    evalResultValue<Function>(result.value, cb); //throw X
+}
+}
+
+#endif //IMPL_HELPER_H_873450978453042524534234
diff --git a/FreeFileSync/Source/fs/concrete.cpp b/FreeFileSync/Source/fs/concrete.cpp
index ebf0778b..337301db 100755
--- a/FreeFileSync/Source/fs/concrete.cpp
+++ b/FreeFileSync/Source/fs/concrete.cpp
@@ -10,6 +10,16 @@
 using namespace fff;
 
 
+void fff::initAfs(const AfsConfig& cfg)
+{
+}
+
+
+void fff::teardownAfs()
+{
+}
+
+
 AbstractPath fff::createAbstractPath(const Zstring& itemPathPhrase) //noexcept
 {
     //greedy: try native evaluation first
diff --git a/FreeFileSync/Source/fs/concrete.h b/FreeFileSync/Source/fs/concrete.h
index 82c04c5b..dec45300 100755
--- a/FreeFileSync/Source/fs/concrete.h
+++ b/FreeFileSync/Source/fs/concrete.h
@@ -11,6 +11,14 @@
 
 namespace fff
 {
+struct AfsConfig
+{
+    Zstring configDirPathPf;   //directory to store AFS-specific files
+    Zstring resourceDirPathPf; //directory to read AFS-specific files
+};
+void initAfs(const AfsConfig& cfg);
+void teardownAfs();
+
 AbstractPath createAbstractPath(const Zstring& itemPathPhrase); //noexcept
 }
 
diff --git a/FreeFileSync/Source/fs/native.cpp b/FreeFileSync/Source/fs/native.cpp
index a3e0a8f2..9aeddc15 100755
--- a/FreeFileSync/Source/fs/native.cpp
+++ b/FreeFileSync/Source/fs/native.cpp
@@ -14,7 +14,7 @@
 #include <zen/thread.h>
 #include <zen/guid.h>
 #include <zen/crc.h>
-#include "concrete_impl.h"
+#include "abstract_impl.h"
 #include "../base/resolve_path.h"
 #include "../base/icon_loader.h"
 
@@ -146,13 +146,13 @@ ItemDetailsRaw getItemDetails(const Zstring& itemPath) //throw FileError
         THROW_LAST_FILE_ERROR(replaceCpy(_("Cannot read file attributes of %x."), L"%x", fmtPath(itemPath)), L"lstat");
 
     if (S_ISLNK(statData.st_mode)) //on Linux there is no distinction between file and directory symlinks!
-        return { ItemType::SYMLINK, statData.st_mtime, 0, extractFileId(statData) };
+        return { ItemType::SYMLINK, statData.st_mtime, 0, generateFileId(statData) };
 
     else if (S_ISDIR(statData.st_mode)) //a directory
-        return { ItemType::FOLDER, statData.st_mtime, 0, extractFileId(statData) };
+        return { ItemType::FOLDER, statData.st_mtime, 0, generateFileId(statData) };
 
     else //a file or named pipe, etc. => dont't check using S_ISREG(): see comment in file_traverser.cpp
-        return { ItemType::FILE, statData.st_mtime, makeUnsigned(statData.st_size), extractFileId(statData) };
+        return { ItemType::FILE, statData.st_mtime, makeUnsigned(statData.st_size), generateFileId(statData) };
 }
 
 ItemDetailsRaw getSymlinkTargetDetails(const Zstring& linkPath) //throw FileError
@@ -162,9 +162,9 @@ ItemDetailsRaw getSymlinkTargetDetails(const Zstring& linkPath) //throw FileErro
         THROW_LAST_FILE_ERROR(replaceCpy(_("Cannot resolve symbolic link %x."), L"%x", fmtPath(linkPath)), L"stat");
 
     if (S_ISDIR(statData.st_mode)) //a directory
-        return { ItemType::FOLDER, statData.st_mtime, 0, extractFileId(statData) };
+        return { ItemType::FOLDER, statData.st_mtime, 0, generateFileId(statData) };
     else //a file or named pipe, etc.
-        return { ItemType::FILE, statData.st_mtime, makeUnsigned(statData.st_size), extractFileId(statData) };
+        return { ItemType::FILE, statData.st_mtime, makeUnsigned(statData.st_size), generateFileId(statData) };
 }
 
 
@@ -310,7 +310,7 @@ class RecycleSessionNative : public AbstractFileSystem::RecycleSession
 public:
     RecycleSessionNative(const Zstring baseFolderPath) : baseFolderPath_(baseFolderPath) {}
 
-    bool recycleItem(const AbstractPath& itemPath, const Zstring& logicalRelPath) override; //throw FileError
+    void recycleItemIfExists(const AbstractPath& itemPath, const Zstring& logicalRelPath) override; //throw FileError
     void tryCleanup(const std::function<void (const std::wstring& displayPath)>& notifyDeletionStatus) override; //throw FileError
 
 private:
@@ -334,7 +334,7 @@ FileAttribs getFileAttributes(FileBase::FileHandle fh, const Zstring& filePath)
 
 struct InputStreamNative : public AbstractFileSystem::InputStream
 {
-    InputStreamNative(const Zstring& filePath, const IOCallback& notifyUnbufferedIO) : fi_(filePath, notifyUnbufferedIO) {} //throw FileError, ErrorFileLocked
+    InputStreamNative(const Zstring& filePath, const IOCallback& notifyUnbufferedIO /*throw X*/) : fi_(filePath, notifyUnbufferedIO) {} //throw FileError, ErrorFileLocked
 
     size_t read(void* buffer, size_t bytesToRead) override { return fi_.read(buffer, bytesToRead); } //throw FileError, ErrorFileLocked, X; return "bytesToRead" bytes unless end of stream!
     size_t getBlockSize() const override { return fi_.getBlockSize(); } //non-zero block size is AFS contract!
@@ -353,7 +353,7 @@ std::optional<AFS::StreamAttributes> InputStreamNative::getAttributesBuffered()
 
     const uint64_t fileSize = makeUnsigned(fileAttr.st_size);
 
-    const AFS::FileId fileId = convertToAbstractFileId(extractFileId(fileAttr));
+    const AFS::FileId fileId = convertToAbstractFileId(generateFileId(fileAttr));
 
     return AFS::StreamAttributes({ modTime, fileSize, fileId });
 }
@@ -362,8 +362,12 @@ std::optional<AFS::StreamAttributes> InputStreamNative::getAttributesBuffered()
 
 struct OutputStreamNative : public AbstractFileSystem::OutputStreamImpl
 {
-    OutputStreamNative(const Zstring& filePath, const uint64_t* streamSize, const IOCallback& notifyUnbufferedIO) :
-        fo_(filePath, FileOutput::ACC_CREATE_NEW, notifyUnbufferedIO) //throw FileError, ErrorTargetExisting
+    OutputStreamNative(const Zstring& filePath,
+                       std::optional<uint64_t> streamSize,
+                       std::optional<time_t> modTime,
+                       const IOCallback& notifyUnbufferedIO /*throw X*/) :
+        fo_(FileOutput::ACC_CREATE_NEW, filePath, notifyUnbufferedIO), //throw FileError, ErrorTargetExisting
+        modTime_(modTime)
     {
         if (streamSize) //pre-allocate file space, because we can
             fo_.preAllocateSpaceBestEffort(*streamSize); //throw FileError
@@ -371,17 +375,28 @@ struct OutputStreamNative : public AbstractFileSystem::OutputStreamImpl
 
     void write(const void* buffer, size_t bytesToWrite) override { fo_.write(buffer, bytesToWrite); } //throw FileError, X
 
-    AFS::FileId finalize() override //throw FileError, X
+    AFS::FinalizeResult finalize() override //throw FileError, X
     {
-        const AFS::FileId fileId = convertToAbstractFileId(extractFileId(getFileAttributes(fo_.getHandle(), fo_.getFilePath()))); //throw FileError
+        AFS::FinalizeResult result;
+        result.fileId = convertToAbstractFileId(generateFileId(getFileAttributes(fo_.getHandle(), fo_.getFilePath()))); //throw FileError
 
         fo_.finalize(); //throw FileError, X
 
-        return fileId;
+        try
+        {
+            if (modTime_)
+                zen::setFileTime(fo_.getFilePath(), *modTime_, ProcSymlink::FOLLOW); //throw FileError
+            /* is setting modtime after closing the file handle a pessimization?
+                Native: no, needed for functional correctness, see file_access.cpp */
+        }
+        catch (const FileError& e) { result.errorModTime = FileError(e.toString()); /*avoid slicing*/ }
+
+        return result;
     }
 
 private:
     FileOutput fo_;
+    const std::optional<time_t> modTime_;
 };
 
 //===========================================================================================================================
@@ -432,7 +447,7 @@ private:
     }
     //----------------------------------------------------------------------------------------------------------------
 
-    //target existing: undefined behavior! (fail/overwrite) => Native will fail and give a clear error message
+    //target existing: fail/ignore => Native will fail and give a clear error message
     void createFolderPlain(const AfsPath& afsPath) const override //throw FileError
     {
         initComForThread(); //throw FileError
@@ -458,18 +473,6 @@ private:
     }
 
     //----------------------------------------------------------------------------------------------------------------
-    void setModTime(const AfsPath& afsPath, time_t modTime) const override //throw FileError, follows symlinks
-    {
-        initComForThread(); //throw FileError
-        zen::setFileTime(getNativePath(afsPath), modTime, ProcSymlink::FOLLOW); //throw FileError
-    }
-
-    FileId /*optional*/ getFileId(const AfsPath& afsPath) const override //throw FileError
-    {
-        initComForThread(); //throw FileError
-        return convertToAbstractFileId(zen::getFileId(getNativePath(afsPath))); //throw FileError
-    }
-
     AbstractPath getSymlinkResolvedPath(const AfsPath& afsPath) const override //throw FileError
     {
         initComForThread(); //throw FileError
@@ -495,7 +498,7 @@ private:
     //----------------------------------------------------------------------------------------------------------------
 
     //return value always bound:
-    std::unique_ptr<InputStream> getInputStream(const AfsPath& afsPath, const IOCallback& notifyUnbufferedIO) const override //throw FileError, ErrorFileLocked, (X)
+    std::unique_ptr<InputStream> getInputStream(const AfsPath& afsPath, const IOCallback& notifyUnbufferedIO /*throw X*/) const override //throw FileError, ErrorFileLocked
     {
         initComForThread(); //throw FileError
         return std::make_unique<InputStreamNative>(getNativePath(afsPath), notifyUnbufferedIO); //throw FileError, ErrorFileLocked
@@ -503,11 +506,12 @@ private:
 
     //target existing: undefined behavior! (fail/overwrite/auto-rename) => Native will fail and give a clear error message
     std::unique_ptr<OutputStreamImpl> getOutputStream(const AfsPath& afsPath, //throw FileError
-                                                      const uint64_t* streamSize,                          //optional
-                                                      const IOCallback& notifyUnbufferedIO) const override //
+                                                      std::optional<uint64_t> streamSize,
+                                                      std::optional<time_t> modTime,
+                                                      const IOCallback& notifyUnbufferedIO /*throw X*/) const override
     {
         initComForThread(); //throw FileError
-        return std::make_unique<OutputStreamNative>(getNativePath(afsPath), streamSize, notifyUnbufferedIO); //throw FileError
+        return std::make_unique<OutputStreamNative>(getNativePath(afsPath), streamSize, modTime, notifyUnbufferedIO); //throw FileError
     }
 
     //----------------------------------------------------------------------------------------------------------------
@@ -525,15 +529,15 @@ private:
 
     //symlink handling: follow link!
     //target existing: undefined behavior! (fail/overwrite/auto-rename) => Native will fail and give a clear error message
-    FileCopyResult copyFileForSameAfsType(const AfsPath& afsPathSource, const StreamAttributes& attrSource, //throw FileError, ErrorFileLocked
-                                          const AbstractPath& apTarget, bool copyFilePermissions, const IOCallback& notifyUnbufferedIO) const override //may be nullptr; throw X!
+    FileCopyResult copyFileForSameAfsType(const AfsPath& afsPathSource, const StreamAttributes& attrSource, //throw FileError, ErrorFileLocked, X
+                                          const AbstractPath& apTarget, bool copyFilePermissions, const IOCallback& notifyUnbufferedIO /*throw X*/) const override
     {
         const Zstring nativePathTarget = static_cast<const NativeFileSystem&>(apTarget.afsDevice.ref()).getNativePath(apTarget.afsPath);
 
         initComForThread(); //throw FileError
 
-        const zen::FileCopyResult nativeResult = copyNewFile(getNativePath(afsPathSource), nativePathTarget, //throw FileError, ErrorTargetExisting, ErrorFileLocked
-                                                             copyFilePermissions, notifyUnbufferedIO); //may be nullptr; throw X!
+        const zen::FileCopyResult nativeResult = copyNewFile(getNativePath(afsPathSource), nativePathTarget, //throw FileError, ErrorTargetExisting, ErrorFileLocked, X
+                                                             copyFilePermissions, notifyUnbufferedIO);
         FileCopyResult result;
         result.fileSize     = nativeResult.fileSize;
         result.modTime      = nativeResult.modTime;
@@ -543,7 +547,7 @@ private:
         return result;
     }
 
-    //target existing: undefined behavior! (fail/overwrite) => Native will fail and give a clear error message
+    //target existing: fail/ignore => Native will fail and give a clear error message
     //symlink handling: follow link!
     void copyNewFolderForSameAfsType(const AfsPath& afsPathSource, const AbstractPath& apTarget, bool copyFilePermissions) const override //throw FileError
     {
@@ -577,7 +581,7 @@ private:
     //target existing: undefined behavior! (fail/overwrite/auto-rename) => Native will fail and give a clear error message
     void moveAndRenameItemForSameAfsType(const AfsPath& afsPathSource, const AbstractPath& apTarget) const override //throw FileError, ErrorDifferentVolume
     {
-        //perf test: detecting different volumes by path is ~30 times faster than having MoveFileEx fail with ERROR_NOT_SAME_DEVICE (6µs vs 190µs)
+        //perf test: detecting different volumes by path is ~30 times faster than having ::MoveFileEx() fail with ERROR_NOT_SAME_DEVICE (6µs vs 190µs)
         //=> maybe we can even save some actual I/O in some cases?
         if (compareDeviceSameAfsType(apTarget.afsDevice.ref()) != 0)
             throw ErrorDifferentVolume(replaceCpy(replaceCpy(_("Cannot move file %x to %y."),
@@ -587,7 +591,7 @@ private:
                                       );
         initComForThread(); //throw FileError
         const Zstring nativePathTarget = static_cast<const NativeFileSystem&>(apTarget.afsDevice.ref()).getNativePath(apTarget.afsPath);
-        zen::renameFile(getNativePath(afsPathSource), nativePathTarget); //throw FileError, ErrorTargetExisting, ErrorDifferentVolume
+        zen::moveAndRenameItem(getNativePath(afsPathSource), nativePathTarget, false /*replaceExisting*/); //throw FileError, ErrorTargetExisting, ErrorDifferentVolume
     }
 
     bool supportsPermissions(const AfsPath& afsPath) const override //throw FileError
@@ -624,6 +628,8 @@ private:
     }
 
     int getAccessTimeout() const override { return 0; } //returns "0" if no timeout in force
+
+    bool hasNativeTransactionalCopy() const override { return false; }
     //----------------------------------------------------------------------------------------------------------------
 
     uint64_t getFreeDiskSpace(const AfsPath& afsPath) const override //throw FileError, returns 0 if not available
@@ -659,7 +665,7 @@ private:
 
 //- return true if item existed
 //- multi-threaded access: internally synchronized!
-bool RecycleSessionNative::recycleItem(const AbstractPath& itemPath, const Zstring& logicalRelPath) //throw FileError
+void RecycleSessionNative::recycleItemIfExists(const AbstractPath& itemPath, const Zstring& logicalRelPath) //throw FileError
 {
     assert(!startsWith(logicalRelPath, FILE_NAME_SEPARATOR));
 
@@ -667,7 +673,7 @@ bool RecycleSessionNative::recycleItem(const AbstractPath& itemPath, const Zstri
     if (!itemPathNative)
         throw std::logic_error("Contract violation! " + std::string(__FILE__) + ":" + numberTo<std::string>(__LINE__));
 
-    return recycleOrDeleteIfExists(*itemPathNative); //throw FileError
+    recycleOrDeleteIfExists(*itemPathNative); //throw FileError
 }
 
 
@@ -680,8 +686,7 @@ void RecycleSessionNative::tryCleanup(const std::function<void (const std::wstri
 //coordinate changes with getResolvedFilePath()!
 bool fff::acceptsItemPathPhraseNative(const Zstring& itemPathPhrase) //noexcept
 {
-    Zstring path = itemPathPhrase;
-    path = expandMacros(path); //expand before trimming!
+    Zstring path = expandMacros(itemPathPhrase); //expand before trimming!
     trim(path);
 
 
diff --git a/FreeFileSync/Source/fs/native.h b/FreeFileSync/Source/fs/native.h
index 657109b9..7c5b004e 100755
--- a/FreeFileSync/Source/fs/native.h
+++ b/FreeFileSync/Source/fs/native.h
@@ -11,7 +11,7 @@
 
 namespace fff
 {
-bool acceptsItemPathPhraseNative (const Zstring& itemPathPhrase); //noexcept
+bool  acceptsItemPathPhraseNative(const Zstring& itemPathPhrase); //noexcept
 AbstractPath createItemPathNative(const Zstring& itemPathPhrase); //noexcept
 
 AbstractPath createItemPathNativeNoFormatting(const Zstring& nativePath); //noexcept
diff --git a/FreeFileSync/Source/ui/batch_status_handler.cpp b/FreeFileSync/Source/ui/batch_status_handler.cpp
index 51eefbf1..345ff451 100755
--- a/FreeFileSync/Source/ui/batch_status_handler.cpp
+++ b/FreeFileSync/Source/ui/batch_status_handler.cpp
@@ -159,6 +159,8 @@ BatchStatusHandler::Result BatchStatusHandler::reportFinalStatus(const Zstring&
     {
         //post sync action
         bool autoClose = false;
+        FinalRequest finalRequest = FinalRequest::none;
+
         if (getAbortStatus() && *getAbortStatus() == AbortTrigger::USER)
             ; //user cancelled => don't run post sync command!
         else
@@ -204,17 +206,18 @@ BatchStatusHandler::Result BatchStatusHandler::reportFinalStatus(const Zstring&
                     break;
                 case PostSyncAction2::SHUTDOWN:
                     if (mayRunAfterCountDown(_("System: Shut down")))
-                        try
-                        {
-                            shutdownSystem(); //throw FileError
-                            autoClose = true;
-                        }
-                        catch (const FileError& e) { errorLog_.logMsg(e.toString(), MSG_TYPE_ERROR); }
+                    {
+                        autoClose = true;
+                        finalRequest = FinalRequest::shutdown; //system shutdown must be handled by calling context!
+                    }
                     break;
             }
         }
         if (switchToGuiRequested_) //-> avoid recursive yield() calls, thous switch not before ending batch mode
+        {
             autoClose = true;
+            finalRequest = FinalRequest::switchGui;
+        }
 
         auto errorLogFinal = std::make_shared<const ErrorLog>(std::move(errorLog_));
 
@@ -235,9 +238,13 @@ BatchStatusHandler::Result BatchStatusHandler::reportFinalStatus(const Zstring&
             if (!progressDlg_) break;
             std::this_thread::sleep_for(UI_UPDATE_INTERVAL);
         }
+
+        return { finalStatus, finalRequest, logFilePath };
     }
+    else
+        return { finalStatus, FinalRequest::none, logFilePath };
+
 
-    return { finalStatus, switchToGuiRequested_, logFilePath };
 }
 
 
diff --git a/FreeFileSync/Source/ui/batch_status_handler.h b/FreeFileSync/Source/ui/batch_status_handler.h
index 847e03d6..e3a73a78 100755
--- a/FreeFileSync/Source/ui/batch_status_handler.h
+++ b/FreeFileSync/Source/ui/batch_status_handler.h
@@ -44,10 +44,16 @@ public:
     void updateDataProcessed(int itemsDelta, int64_t bytesDelta) override; //noexcept
     void forceUiRefreshNoThrow()                                 override; //
 
+    enum class FinalRequest
+    {
+        none,
+        switchGui,
+        shutdown
+    };
     struct Result
     {
         SyncResult finalStatus;
-        bool switchToGuiRequested;
+        FinalRequest finalRequest;
         AbstractPath logFilePath;
     };
     Result reportFinalStatus(const Zstring& altLogFolderPathPhrase, int logfilesMaxAgeDays, const std::set<AbstractPath>& logFilePathsToKeep); //noexcept!!
diff --git a/FreeFileSync/Source/ui/file_view.cpp b/FreeFileSync/Source/ui/file_view.cpp
index f5d2f79e..47a6c178 100755
--- a/FreeFileSync/Source/ui/file_view.cpp
+++ b/FreeFileSync/Source/ui/file_view.cpp
@@ -71,8 +71,8 @@ void FileView::updateView(Predicate pred)
                 const ContainerObject* parent = &fsObj->parent();
                 for (;;) //map all yet unassociated parents to this row
                 {
-                    const auto rv = this->rowPositionsFirstChild_.emplace(parent, viewRef_.size());
-                    if (!rv.second)
+                    const auto [it, inserted] = this->rowPositionsFirstChild_.emplace(parent, viewRef_.size());
+                    if (!inserted)
                         break;
 
                     if (auto folder = dynamic_cast<const FolderPair*>(parent))
diff --git a/FreeFileSync/Source/ui/gui_generated.cpp b/FreeFileSync/Source/ui/gui_generated.cpp
index 201724f6..22919575 100755
--- a/FreeFileSync/Source/ui/gui_generated.cpp
+++ b/FreeFileSync/Source/ui/gui_generated.cpp
@@ -11,1184 +11,1184 @@
 
 MainDialogGenerated::MainDialogGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxSize( 640, 400 ), wxDefaultSize );
-
-    m_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_menuFile->AppendSeparator();
-
-    m_menuItemSave = new wxMenuItem( m_menuFile, wxID_SAVE, wxString( _("&Save") ) + wxT('\t') + wxT("Ctrl+S"), wxEmptyString, wxITEM_NORMAL );
-    m_menuFile->Append( m_menuItemSave );
-
-    m_menuItemSaveAs = new wxMenuItem( m_menuFile, wxID_SAVEAS, wxString( _("Save &as...") ), wxEmptyString, wxITEM_NORMAL );
-    m_menuFile->Append( m_menuItemSaveAs );
-
-    m_menuItemSaveAsBatch = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("Save as &batch job...") ), wxEmptyString, wxITEM_NORMAL );
-    m_menuFile->Append( m_menuItemSaveAsBatch );
-
-    m_menuFile->AppendSeparator();
-
-    wxMenuItem* m_menuItem4;
-    m_menuItem4 = new wxMenuItem( m_menuFile, wxID_EXIT, wxString( _("E&xit") ), wxEmptyString, wxITEM_NORMAL );
-    m_menuFile->Append( m_menuItem4 );
-
-    m_menubar->Append( m_menuFile, _("&File") );
-
-    m_menu4 = new wxMenu();
-    m_menuItemShowLog = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("Show &log") ) + wxT('\t') + wxT("F4"), wxEmptyString, wxITEM_NORMAL );
-    m_menu4->Append( m_menuItemShowLog );
-
-    m_menu4->AppendSeparator();
-
-    m_menuItemCompare = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("Start &comparison") ) + wxT('\t') + wxT("F5"), wxEmptyString, wxITEM_NORMAL );
-    m_menu4->Append( m_menuItemCompare );
-
-    m_menu4->AppendSeparator();
-
-    m_menuItemCompSettings = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("C&omparison settings") ) + wxT('\t') + wxT("F6"), wxEmptyString, wxITEM_NORMAL );
-    m_menu4->Append( m_menuItemCompSettings );
-
-    m_menuItemFilter = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("&Filter settings") ) + wxT('\t') + wxT("F7"), wxEmptyString, wxITEM_NORMAL );
-    m_menu4->Append( m_menuItemFilter );
-
-    m_menuItemSyncSettings = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("S&ynchronization settings") ) + wxT('\t') + wxT("F8"), wxEmptyString, wxITEM_NORMAL );
-    m_menu4->Append( m_menuItemSyncSettings );
-
-    m_menu4->AppendSeparator();
-
-    m_menuItemSynchronize = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("Start &synchronization") ) + wxT('\t') + wxT("F9"), wxEmptyString, wxITEM_NORMAL );
-    m_menu4->Append( m_menuItemSynchronize );
-
-    m_menubar->Append( m_menu4, _("&Actions") );
-
-    m_menuTools = new wxMenu();
-    m_menuItemOptions = new wxMenuItem( m_menuTools, wxID_PREFERENCES, wxString( _("&Preferences") ) + wxT('\t') + wxT("Ctrl+,"), wxEmptyString, wxITEM_NORMAL );
-    m_menuTools->Append( m_menuItemOptions );
-
-    m_menuLanguages = new wxMenu();
-    wxMenuItem* m_menuLanguagesItem = new wxMenuItem( m_menuTools, wxID_ANY, _("&Language"), wxEmptyString, wxITEM_NORMAL, m_menuLanguages );
-    m_menuTools->Append( m_menuLanguagesItem );
-
-    m_menuTools->AppendSeparator();
-
-    m_menuItemFind = new wxMenuItem( m_menuTools, wxID_FIND, wxString( _("&Find...") ) + wxT('\t') + wxT("Ctrl+F"), wxEmptyString, wxITEM_NORMAL );
-    m_menuTools->Append( m_menuItemFind );
-
-    m_menuItemExportList = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("&Export file list...") ), wxEmptyString, wxITEM_NORMAL );
-    m_menuTools->Append( m_menuItemExportList );
-
-    m_menuTools->AppendSeparator();
-
-    wxMenuItem* m_menuItem51;
-    m_menuItem51 = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("&Reset layout") ), wxEmptyString, wxITEM_NORMAL );
-    m_menuTools->Append( m_menuItem51 );
-
-    m_menuItemShowMain = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("dummy") ), wxEmptyString, wxITEM_NORMAL );
-    m_menuTools->Append( m_menuItemShowMain );
-
-    m_menuItemShowFolders = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("dummy") ), wxEmptyString, wxITEM_NORMAL );
-    m_menuTools->Append( m_menuItemShowFolders );
-
-    m_menuItemShowViewFilter = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("dummy") ), wxEmptyString, wxITEM_NORMAL );
-    m_menuTools->Append( m_menuItemShowViewFilter );
-
-    m_menuItemShowConfig = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("dummy") ), wxEmptyString, wxITEM_NORMAL );
-    m_menuTools->Append( m_menuItemShowConfig );
-
-    m_menuItemShowOverview = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("dummy") ), wxEmptyString, wxITEM_NORMAL );
-    m_menuTools->Append( m_menuItemShowOverview );
-
-    m_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->AppendSeparator();
-
-    m_menuItemCheckVersionNow = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("&Check for updates now") ), wxEmptyString, wxITEM_NORMAL );
-    m_menuHelp->Append( m_menuItemCheckVersionNow );
-
-    m_menuItemCheckVersionAuto = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("Check &automatically once a week") ), wxEmptyString, wxITEM_CHECK );
-    m_menuHelp->Append( m_menuItemCheckVersionAuto );
-    m_menuItemCheckVersionAuto->Check( true );
-
-    m_menuHelp->AppendSeparator();
-
-    m_menuItemAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About") ) + wxT('\t') + wxT("Shift+F1"), wxEmptyString, wxITEM_NORMAL );
-    m_menuHelp->Append( m_menuItemAbout );
-
-    m_menubar->Append( m_menuHelp, _("&Help") );
-
-    this->SetMenuBar( m_menubar );
-
-    bSizerPanelHolder = new wxBoxSizer( wxVERTICAL );
-
-    m_panelTopButtons = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    wxBoxSizer* bSizer1791;
-    bSizer1791 = new wxBoxSizer( wxVERTICAL );
-
-    bSizerTopButtons = new wxBoxSizer( wxHORIZONTAL );
-
-    wxBoxSizer* bSizer261;
-    bSizer261 = new wxBoxSizer( wxHORIZONTAL );
-
-
-    bSizer261->Add( 0, 0, 1, 0, 5 );
-
-    m_buttonCancel = new zen::BitmapTextButton( 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 );
-
-    m_buttonCompare = new zen::BitmapTextButton( m_panelTopButtons, wxID_ANY, _("Compare"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_buttonCompare->SetDefault();
-    m_buttonCompare->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-    m_buttonCompare->SetToolTip( _("dummy") );
-
-    bSizer261->Add( m_buttonCompare, 0, wxEXPAND, 5 );
-
-
-    bSizer261->Add( 4, 0, 0, 0, 5 );
-
-    m_bpButtonCmpConfig = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    m_bpButtonCmpConfig->SetToolTip( _("dummy") );
-
-    bSizer261->Add( m_bpButtonCmpConfig, 0, wxEXPAND, 5 );
-
-    m_bpButtonCmpContext = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    m_bpButtonCmpContext->SetToolTip( _("dummy") );
-
-    bSizer261->Add( m_bpButtonCmpContext, 0, wxEXPAND, 5 );
-
-
-    bSizer261->Add( 0, 0, 1, 0, 5 );
-
-
-    bSizerTopButtons->Add( bSizer261, 1, wxEXPAND, 5 );
-
-
-    bSizerTopButtons->Add( 5, 2, 0, 0, 5 );
-
-    wxBoxSizer* bSizer199;
-    bSizer199 = new wxBoxSizer( wxHORIZONTAL );
-
-
-    bSizer199->Add( 0, 0, 1, 0, 5 );
-
-    m_bpButtonFilter = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW|wxFULL_REPAINT_ON_RESIZE );
-    m_bpButtonFilter->SetToolTip( _("dummy") );
-
-    bSizer199->Add( m_bpButtonFilter, 0, wxEXPAND, 5 );
-
-    m_bpButtonFilterContext = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    m_bpButtonFilterContext->SetToolTip( _("dummy") );
-
-    bSizer199->Add( m_bpButtonFilterContext, 0, wxEXPAND, 5 );
-
-
-    bSizer199->Add( 0, 0, 1, 0, 5 );
-
-
-    bSizerTopButtons->Add( bSizer199, 0, wxEXPAND, 5 );
-
-
-    bSizerTopButtons->Add( 5, 2, 0, 0, 5 );
-
-    wxBoxSizer* bSizer262;
-    bSizer262 = new wxBoxSizer( wxHORIZONTAL );
-
-
-    bSizer262->Add( 0, 0, 1, 0, 5 );
-
-    m_bpButtonSyncConfig = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    m_bpButtonSyncConfig->SetToolTip( _("dummy") );
-
-    bSizer262->Add( m_bpButtonSyncConfig, 0, wxEXPAND, 5 );
-
-    m_bpButtonSyncContext = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    m_bpButtonSyncContext->SetToolTip( _("dummy") );
-
-    bSizer262->Add( m_bpButtonSyncContext, 0, wxEXPAND, 5 );
-
-
-    bSizer262->Add( 4, 0, 0, 0, 5 );
-
-    m_buttonSync = new zen::BitmapTextButton( m_panelTopButtons, wxID_ANY, _("Synchronize"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_buttonSync->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-    m_buttonSync->SetToolTip( _("dummy") );
-
-    bSizer262->Add( m_buttonSync, 0, wxEXPAND, 5 );
-
-
-    bSizer262->Add( 0, 0, 1, 0, 5 );
-
-
-    bSizerTopButtons->Add( bSizer262, 1, wxEXPAND, 5 );
-
-
-    bSizer1791->Add( bSizerTopButtons, 1, wxEXPAND, 5 );
-
-
-    m_panelTopButtons->SetSizer( bSizer1791 );
-    m_panelTopButtons->Layout();
-    bSizer1791->Fit( m_panelTopButtons );
-    bSizerPanelHolder->Add( m_panelTopButtons, 0, wxEXPAND, 5 );
-
-    m_panelDirectoryPairs = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSTATIC_BORDER|wxTAB_TRAVERSAL );
-    wxBoxSizer* bSizer1601;
-    bSizer1601 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer91;
-    bSizer91 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_panelTopLeft = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelTopLeft->SetMinSize( wxSize( 1, -1 ) );
-
-    wxFlexGridSizer* fgSizer8;
-    fgSizer8 = new wxFlexGridSizer( 0, 2, 0, 0 );
-    fgSizer8->AddGrowableCol( 1 );
-    fgSizer8->SetFlexibleDirection( wxBOTH );
-    fgSizer8->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_ALL );
-
-
-    fgSizer8->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    m_staticTextResolvedPathL = new wxStaticText( m_panelTopLeft, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextResolvedPathL->Wrap( -1 );
-    fgSizer8->Add( m_staticTextResolvedPathL, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2 );
-
-    wxBoxSizer* bSizer159;
-    bSizer159 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bpButtonAddPair = new wxBitmapButton( m_panelTopLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    m_bpButtonAddPair->SetToolTip( _("Add folder pair") );
-
-    bSizer159->Add( m_bpButtonAddPair, 0, wxEXPAND, 5 );
-
-    m_bpButtonRemovePair = new wxBitmapButton( m_panelTopLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
-
-    bSizer159->Add( m_bpButtonRemovePair, 0, wxEXPAND, 5 );
-
-
-    fgSizer8->Add( bSizer159, 0, wxEXPAND, 5 );
-
-    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_buttonSelectFolderLeft = new wxButton( m_panelTopLeft, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_buttonSelectFolderLeft->SetToolTip( _("Select a folder") );
-
-    bSizer182->Add( m_buttonSelectFolderLeft, 0, wxEXPAND, 5 );
-
-    m_bpButtonSelectAltFolderLeft = new wxBitmapButton( m_panelTopLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    m_bpButtonSelectAltFolderLeft->SetToolTip( _("Access online storage") );
-
-    bSizer182->Add( m_bpButtonSelectAltFolderLeft, 0, wxEXPAND, 5 );
-
-
-    fgSizer8->Add( bSizer182, 0, wxEXPAND, 5 );
-
-
-    m_panelTopLeft->SetSizer( fgSizer8 );
-    m_panelTopLeft->Layout();
-    fgSizer8->Fit( m_panelTopLeft );
-    bSizer91->Add( m_panelTopLeft, 1, wxLEFT|wxALIGN_BOTTOM, 5 );
-
-    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 );
-    m_bpButtonSwapSides->SetToolTip( _("dummy") );
-
-    bSizer1771->Add( m_bpButtonSwapSides, 0, wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer160;
-    bSizer160 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bpButtonLocalCompCfg = new wxBitmapButton( m_panelTopCenter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    m_bpButtonLocalCompCfg->SetToolTip( _("dummy") );
-
-    bSizer160->Add( m_bpButtonLocalCompCfg, 0, wxEXPAND, 5 );
-
-    m_bpButtonLocalFilter = new wxBitmapButton( m_panelTopCenter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    m_bpButtonLocalFilter->SetToolTip( _("dummy") );
-
-    bSizer160->Add( m_bpButtonLocalFilter, 0, wxEXPAND, 5 );
-
-    m_bpButtonLocalSyncCfg = new wxBitmapButton( m_panelTopCenter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    m_bpButtonLocalSyncCfg->SetToolTip( _("dummy") );
-
-    bSizer160->Add( m_bpButtonLocalSyncCfg, 0, wxEXPAND, 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_panelTopRight = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelTopRight->SetMinSize( wxSize( 1, -1 ) );
-
-    wxBoxSizer* bSizer183;
-    bSizer183 = new wxBoxSizer( wxVERTICAL );
-
-    m_staticTextResolvedPathR = new wxStaticText( m_panelTopRight, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextResolvedPathR->Wrap( -1 );
-    bSizer183->Add( m_staticTextResolvedPathR, 0, wxALL, 2 );
-
-    wxBoxSizer* bSizer179;
-    bSizer179 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_folderPathRight = new 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") );
-
-    bSizer179->Add( m_buttonSelectFolderRight, 0, wxEXPAND, 5 );
-
-    m_bpButtonSelectAltFolderRight = new wxBitmapButton( m_panelTopRight, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    m_bpButtonSelectAltFolderRight->SetToolTip( _("Access online storage") );
-
-    bSizer179->Add( m_bpButtonSelectAltFolderRight, 0, wxEXPAND, 5 );
-
-
-    bSizer183->Add( bSizer179, 0, wxEXPAND, 5 );
-
-
-    m_panelTopRight->SetSizer( bSizer183 );
-    m_panelTopRight->Layout();
-    bSizer183->Fit( m_panelTopRight );
-    bSizer91->Add( m_panelTopRight, 1, wxRIGHT|wxALIGN_BOTTOM, 5 );
-
-
-    bSizer1601->Add( bSizer91, 0, wxEXPAND, 5 );
-
-    m_scrolledWindowFolderPairs = new wxScrolledWindow( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxSize( -1, -1 ), wxHSCROLL|wxVSCROLL );
-    m_scrolledWindowFolderPairs->SetScrollRate( 10, 10 );
-    m_scrolledWindowFolderPairs->SetMinSize( wxSize( -1, 0 ) );
-
-    bSizerAddFolderPairs = new wxBoxSizer( wxVERTICAL );
-
-
-    m_scrolledWindowFolderPairs->SetSizer( bSizerAddFolderPairs );
-    m_scrolledWindowFolderPairs->Layout();
-    bSizerAddFolderPairs->Fit( m_scrolledWindowFolderPairs );
-    bSizer1601->Add( m_scrolledWindowFolderPairs, 1, wxEXPAND, 5 );
-
-
-    m_panelDirectoryPairs->SetSizer( bSizer1601 );
-    m_panelDirectoryPairs->Layout();
-    bSizer1601->Fit( m_panelDirectoryPairs );
-    bSizerPanelHolder->Add( m_panelDirectoryPairs, 0, wxEXPAND, 5 );
-
-    m_gridOverview = new zen::Grid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
-    m_gridOverview->SetScrollRate( 5, 5 );
-    bSizerPanelHolder->Add( m_gridOverview, 0, 0, 5 );
-
-    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_gridMainL = new zen::Grid( m_splitterMain, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
-    m_gridMainL->SetScrollRate( 5, 5 );
-    bSizer1781->Add( m_gridMainL, 1, wxEXPAND, 5 );
-
-    m_gridMainC = new zen::Grid( m_splitterMain, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
-    m_gridMainC->SetScrollRate( 5, 5 );
-    bSizer1781->Add( m_gridMainC, 0, wxEXPAND, 5 );
-
-    m_gridMainR = new zen::Grid( m_splitterMain, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
-    m_gridMainR->SetScrollRate( 5, 5 );
-    bSizer1781->Add( m_gridMainR, 1, wxEXPAND, 5 );
-
-
-    m_splitterMain->SetSizer( bSizer1781 );
-    m_splitterMain->Layout();
-    bSizer1781->Fit( m_splitterMain );
-    bSizer1711->Add( m_splitterMain, 1, wxEXPAND, 5 );
-
-    m_panelStatusBar = new wxPanel( m_panelCenter, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSTATIC_BORDER|wxTAB_TRAVERSAL );
-    wxBoxSizer* bSizer451;
-    bSizer451 = new wxBoxSizer( wxHORIZONTAL );
-
-    bSizer451->SetMinSize( wxSize( -1, 22 ) );
-    bSizerFileStatus = new wxBoxSizer( wxHORIZONTAL );
-
-    bSizerStatusLeft = new wxBoxSizer( wxHORIZONTAL );
-
-    wxBoxSizer* bSizer53;
-    bSizer53 = new wxBoxSizer( wxHORIZONTAL );
-
-
-    bSizer53->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizerStatusLeftDirectories = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmapSmallDirectoryLeft = new wxStaticBitmap( m_panelStatusBar, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizerStatusLeftDirectories->Add( m_bitmapSmallDirectoryLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizerStatusLeftDirectories->Add( 2, 0, 0, 0, 5 );
-
-    m_staticTextStatusLeftDirs = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextStatusLeftDirs->Wrap( -1 );
-    bSizerStatusLeftDirectories->Add( m_staticTextStatusLeftDirs, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-
-    bSizer53->Add( bSizerStatusLeftDirectories, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizerStatusLeftFiles = new wxBoxSizer( wxHORIZONTAL );
-
-
-    bSizerStatusLeftFiles->Add( 10, 0, 0, 0, 5 );
-
-    m_bitmapSmallFileLeft = new wxStaticBitmap( m_panelStatusBar, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizerStatusLeftFiles->Add( m_bitmapSmallFileLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizerStatusLeftFiles->Add( 2, 0, 0, 0, 5 );
-
-    m_staticTextStatusLeftFiles = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextStatusLeftFiles->Wrap( -1 );
-    bSizerStatusLeftFiles->Add( m_staticTextStatusLeftFiles, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizerStatusLeftFiles->Add( 4, 0, 0, 0, 5 );
-
-    m_staticTextStatusLeftBytes = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextStatusLeftBytes->Wrap( -1 );
-    bSizerStatusLeftFiles->Add( m_staticTextStatusLeftBytes, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer53->Add( bSizerStatusLeftFiles, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer53->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizerStatusLeft->Add( bSizer53, 1, wxEXPAND, 5 );
-
-    m_staticline9 = new wxStaticLine( m_panelStatusBar, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizerStatusLeft->Add( m_staticline9, 0, wxEXPAND|wxTOP, 2 );
-
-
-    bSizerFileStatus->Add( bSizerStatusLeft, 1, wxEXPAND, 5 );
-
-
-    bSizerFileStatus->Add( 26, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_staticTextStatusCenter = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextStatusCenter->Wrap( -1 );
-    bSizerFileStatus->Add( m_staticTextStatusCenter, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizerFileStatus->Add( 26, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizerStatusRight = new wxBoxSizer( wxHORIZONTAL );
-
-    m_staticline10 = new wxStaticLine( m_panelStatusBar, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizerStatusRight->Add( m_staticline10, 0, wxEXPAND|wxTOP, 2 );
-
-    wxBoxSizer* bSizer52;
-    bSizer52 = new wxBoxSizer( wxHORIZONTAL );
-
-
-    bSizer52->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizerStatusRightDirectories = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmapSmallDirectoryRight = new wxStaticBitmap( m_panelStatusBar, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizerStatusRightDirectories->Add( m_bitmapSmallDirectoryRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizerStatusRightDirectories->Add( 2, 0, 0, 0, 5 );
-
-    m_staticTextStatusRightDirs = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextStatusRightDirs->Wrap( -1 );
-    bSizerStatusRightDirectories->Add( m_staticTextStatusRightDirs, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer52->Add( bSizerStatusRightDirectories, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizerStatusRightFiles = new wxBoxSizer( wxHORIZONTAL );
-
-
-    bSizerStatusRightFiles->Add( 10, 0, 0, 0, 5 );
-
-    m_bitmapSmallFileRight = new wxStaticBitmap( m_panelStatusBar, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizerStatusRightFiles->Add( m_bitmapSmallFileRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizerStatusRightFiles->Add( 2, 0, 0, 0, 5 );
-
-    m_staticTextStatusRightFiles = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextStatusRightFiles->Wrap( -1 );
-    bSizerStatusRightFiles->Add( m_staticTextStatusRightFiles, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizerStatusRightFiles->Add( 4, 0, 0, 0, 5 );
-
-    m_staticTextStatusRightBytes = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextStatusRightBytes->Wrap( -1 );
-    bSizerStatusRightFiles->Add( m_staticTextStatusRightBytes, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer52->Add( bSizerStatusRightFiles, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer52->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizerStatusRight->Add( bSizer52, 1, wxEXPAND, 5 );
-
-
-    bSizerFileStatus->Add( bSizerStatusRight, 1, wxEXPAND, 5 );
-
-
-    bSizer451->Add( bSizerFileStatus, 1, wxEXPAND, 5 );
-
-    m_staticTextFullStatus = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextFullStatus->Wrap( -1 );
-    m_staticTextFullStatus->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-
-    bSizer451->Add( m_staticTextFullStatus, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-
-    m_panelStatusBar->SetSizer( bSizer451 );
-    m_panelStatusBar->Layout();
-    bSizer451->Fit( m_panelStatusBar );
-    bSizer1711->Add( m_panelStatusBar, 0, wxEXPAND, 5 );
-
-
-    m_panelCenter->SetSizer( bSizer1711 );
-    m_panelCenter->Layout();
-    bSizer1711->Fit( m_panelCenter );
-    bSizerPanelHolder->Add( m_panelCenter, 1, wxEXPAND, 5 );
-
-    m_panelSearch = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    wxBoxSizer* bSizer1713;
-    bSizer1713 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bpButtonHideSearch = new wxBitmapButton( m_panelSearch, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    m_bpButtonHideSearch->SetToolTip( _("Close search bar") );
-
-    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_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_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 ) );
-
-    bSizerLog = new wxBoxSizer( wxVERTICAL );
-
-    bSizer42 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmapLogStatus = new wxStaticBitmap( m_panelLog, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer42->Add( m_bitmapLogStatus, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
-
-    m_staticTextLogStatus = new wxStaticText( m_panelLog, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextLogStatus->Wrap( -1 );
-    m_staticTextLogStatus->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-
-    bSizer42->Add( m_staticTextLogStatus, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-    m_panelItemsProcessed = new wxPanel( m_panelLog, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelItemsProcessed->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-
-    wxBoxSizer* bSizer165;
-    bSizer165 = new wxBoxSizer( wxVERTICAL );
-
-
-    bSizer165->Add( 0, 5, 0, 0, 5 );
-
-    wxStaticText* m_staticText962;
-    m_staticText962 = new wxStaticText( m_panelItemsProcessed, wxID_ANY, _("Items processed:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText962->Wrap( -1 );
-    bSizer165->Add( m_staticText962, 0, wxRIGHT|wxLEFT, 5 );
-
-    wxBoxSizer* bSizer169;
-    bSizer169 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_staticTextItemsProcessed = new wxStaticText( m_panelItemsProcessed, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_staticTextItemsProcessed->Wrap( -1 );
-    m_staticTextItemsProcessed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-
-    bSizer169->Add( m_staticTextItemsProcessed, 0, wxALIGN_BOTTOM, 5 );
-
-    m_staticTextBytesProcessed = new wxStaticText( m_panelItemsProcessed, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextBytesProcessed->Wrap( -1 );
-    bSizer169->Add( m_staticTextBytesProcessed, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-
-
-    bSizer165->Add( bSizer169, 0, wxRIGHT|wxLEFT, 5 );
-
-
-    bSizer165->Add( 0, 5, 0, 0, 5 );
-
-
-    m_panelItemsProcessed->SetSizer( bSizer165 );
-    m_panelItemsProcessed->Layout();
-    bSizer165->Fit( m_panelItemsProcessed );
-    bSizer42->Add( m_panelItemsProcessed, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 10 );
-
-    m_panelItemsRemaining = new wxPanel( m_panelLog, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelItemsRemaining->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-
-    wxBoxSizer* bSizer166;
-    bSizer166 = new wxBoxSizer( wxVERTICAL );
-
-
-    bSizer166->Add( 0, 5, 0, 0, 5 );
-
-    wxStaticText* m_staticText971;
-    m_staticText971 = new wxStaticText( m_panelItemsRemaining, wxID_ANY, _("Items remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText971->Wrap( -1 );
-    bSizer166->Add( m_staticText971, 0, wxRIGHT|wxLEFT, 5 );
-
-    wxBoxSizer* bSizer170;
-    bSizer170 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_staticTextItemsRemaining = new wxStaticText( m_panelItemsRemaining, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_staticTextItemsRemaining->Wrap( -1 );
-    m_staticTextItemsRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-
-    bSizer170->Add( m_staticTextItemsRemaining, 0, wxALIGN_BOTTOM, 5 );
-
-    m_staticTextBytesRemaining = new wxStaticText( m_panelItemsRemaining, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextBytesRemaining->Wrap( -1 );
-    bSizer170->Add( m_staticTextBytesRemaining, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-
-
-    bSizer166->Add( bSizer170, 0, wxRIGHT|wxLEFT, 5 );
-
-
-    bSizer166->Add( 0, 5, 0, 0, 5 );
-
-
-    m_panelItemsRemaining->SetSizer( bSizer166 );
-    m_panelItemsRemaining->Layout();
-    bSizer166->Fit( m_panelItemsRemaining );
-    bSizer42->Add( m_panelItemsRemaining, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 10 );
-
-    wxPanel* m_panelTimeElapsed;
-    m_panelTimeElapsed = new wxPanel( m_panelLog, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelTimeElapsed->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-
-    wxBoxSizer* bSizer168;
-    bSizer168 = new wxBoxSizer( wxVERTICAL );
-
-
-    bSizer168->Add( 0, 5, 0, 0, 5 );
-
-    wxStaticText* m_staticText9611;
-    m_staticText9611 = new wxStaticText( m_panelTimeElapsed, wxID_ANY, _("Total time:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText9611->Wrap( -1 );
-    bSizer168->Add( m_staticText9611, 0, wxRIGHT|wxLEFT, 5 );
-
-    m_staticTextTotalTime = new wxStaticText( m_panelTimeElapsed, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextTotalTime->Wrap( -1 );
-    m_staticTextTotalTime->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-
-    bSizer168->Add( m_staticTextTotalTime, 0, wxRIGHT|wxLEFT, 5 );
-
-
-    bSizer168->Add( 0, 5, 0, 0, 5 );
-
-
-    m_panelTimeElapsed->SetSizer( bSizer168 );
-    m_panelTimeElapsed->Layout();
-    bSizer168->Fit( m_panelTimeElapsed );
-    bSizer42->Add( m_panelTimeElapsed, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 10 );
-
-
-    bSizerLog->Add( bSizer42, 0, wxALL, 5 );
-
-    m_staticline70 = new wxStaticLine( m_panelLog, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerLog->Add( m_staticline70, 0, wxEXPAND, 5 );
-
-
-    m_panelLog->SetSizer( bSizerLog );
-    m_panelLog->Layout();
-    bSizerLog->Fit( m_panelLog );
-    bSizerPanelHolder->Add( m_panelLog, 0, 0, 5 );
-
-    m_panelConfig = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    bSizerConfig = new wxBoxSizer( wxHORIZONTAL );
-
-    bSizerCfgHistoryButtons = new wxBoxSizer( wxHORIZONTAL );
-
-    wxBoxSizer* bSizer17611;
-    bSizer17611 = new wxBoxSizer( wxVERTICAL );
-
-    m_bpButtonNew = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    m_bpButtonNew->SetToolTip( _("dummy") );
-
-    bSizer17611->Add( m_bpButtonNew, 0, wxEXPAND, 5 );
-
-    m_staticText951 = new wxStaticText( m_panelConfig, wxID_ANY, _("New"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText951->Wrap( -1 );
-    bSizer17611->Add( m_staticText951, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 2 );
-
-
-    bSizerCfgHistoryButtons->Add( bSizer17611, 0, 0, 5 );
-
-    wxBoxSizer* bSizer1761;
-    bSizer1761 = new wxBoxSizer( wxVERTICAL );
-
-    m_bpButtonOpen = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    m_bpButtonOpen->SetToolTip( _("dummy") );
-
-    bSizer1761->Add( m_bpButtonOpen, 0, wxEXPAND, 5 );
-
-    m_staticText95 = new wxStaticText( m_panelConfig, wxID_ANY, _("Open..."), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText95->Wrap( -1 );
-    bSizer1761->Add( m_staticText95, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 2 );
-
-
-    bSizerCfgHistoryButtons->Add( bSizer1761, 0, 0, 5 );
-
-    wxBoxSizer* bSizer175;
-    bSizer175 = new wxBoxSizer( wxVERTICAL );
-
-    m_bpButtonSave = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    m_bpButtonSave->SetToolTip( _("dummy") );
-
-    bSizer175->Add( m_bpButtonSave, 0, wxEXPAND, 5 );
-
-    m_staticText961 = new wxStaticText( m_panelConfig, wxID_ANY, _("Save"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText961->Wrap( -1 );
-    bSizer175->Add( m_staticText961, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 2 );
-
-
-    bSizerCfgHistoryButtons->Add( bSizer175, 0, 0, 5 );
-
-    wxBoxSizer* bSizer174;
-    bSizer174 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer1772;
-    bSizer1772 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bpButtonSaveAs = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    m_bpButtonSaveAs->SetToolTip( _("dummy") );
-
-    bSizer1772->Add( m_bpButtonSaveAs, 1, 0, 5 );
-
-    m_bpButtonSaveAsBatch = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    m_bpButtonSaveAsBatch->SetToolTip( _("dummy") );
-
-    bSizer1772->Add( m_bpButtonSaveAsBatch, 1, 0, 5 );
-
-
-    bSizer174->Add( bSizer1772, 0, wxEXPAND, 5 );
-
-    m_staticText97 = new wxStaticText( m_panelConfig, wxID_ANY, _("Save as..."), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText97->Wrap( -1 );
-    bSizer174->Add( m_staticText97, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 2 );
-
-
-    bSizerCfgHistoryButtons->Add( bSizer174, 0, 0, 5 );
-
-
-    bSizerConfig->Add( bSizerCfgHistoryButtons, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_gridCfgHistory = new zen::Grid( m_panelConfig, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
-    m_gridCfgHistory->SetScrollRate( 5, 5 );
-    bSizerConfig->Add( m_gridCfgHistory, 1, wxEXPAND, 5 );
-
-
-    m_panelConfig->SetSizer( bSizerConfig );
-    m_panelConfig->Layout();
-    bSizerConfig->Fit( m_panelConfig );
-    bSizerPanelHolder->Add( m_panelConfig, 0, 0, 5 );
-
-    m_panelViewFilter = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    bSizerViewFilter = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bpButtonShowLog = new wxBitmapButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
-    bSizerViewFilter->Add( m_bpButtonShowLog, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-
-    bSizerViewFilter->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    m_staticTextViewType = new wxStaticText( m_panelViewFilter, wxID_ANY, _("View type:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextViewType->Wrap( -1 );
-    bSizerViewFilter->Add( m_staticTextViewType, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_bpButtonViewTypeSyncAction = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    bSizerViewFilter->Add( m_bpButtonViewTypeSyncAction, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT, 5 );
-
-    m_bpButtonShowExcluded = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    bSizerViewFilter->Add( m_bpButtonShowExcluded, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-
-    bSizerViewFilter->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    m_bpButtonViewFilterSave = new wxBitmapButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
-    m_bpButtonViewFilterSave->SetToolTip( _("Save as default") );
-
-    bSizerViewFilter->Add( m_bpButtonViewFilterSave, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
-    m_staticTextSelectView = new wxStaticText( m_panelViewFilter, wxID_ANY, _("Select view:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextSelectView->Wrap( -1 );
-    bSizerViewFilter->Add( m_staticTextSelectView, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_bpButtonShowDeleteLeft = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    bSizerViewFilter->Add( m_bpButtonShowDeleteLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_bpButtonShowUpdateLeft = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    bSizerViewFilter->Add( m_bpButtonShowUpdateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_bpButtonShowCreateLeft = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    bSizerViewFilter->Add( m_bpButtonShowCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_bpButtonShowLeftOnly = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    bSizerViewFilter->Add( m_bpButtonShowLeftOnly, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_bpButtonShowLeftNewer = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    bSizerViewFilter->Add( m_bpButtonShowLeftNewer, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_bpButtonShowEqual = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    bSizerViewFilter->Add( m_bpButtonShowEqual, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_bpButtonShowDoNothing = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    bSizerViewFilter->Add( m_bpButtonShowDoNothing, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_bpButtonShowDifferent = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    bSizerViewFilter->Add( m_bpButtonShowDifferent, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_bpButtonShowRightNewer = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    bSizerViewFilter->Add( m_bpButtonShowRightNewer, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_bpButtonShowRightOnly = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    bSizerViewFilter->Add( m_bpButtonShowRightOnly, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_bpButtonShowCreateRight = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    bSizerViewFilter->Add( m_bpButtonShowCreateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_bpButtonShowUpdateRight = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    bSizerViewFilter->Add( m_bpButtonShowUpdateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_bpButtonShowDeleteRight = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    bSizerViewFilter->Add( m_bpButtonShowDeleteRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_bpButtonShowConflict = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    bSizerViewFilter->Add( m_bpButtonShowConflict, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-
-    bSizerViewFilter->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    m_staticText96 = new wxStaticText( m_panelViewFilter, wxID_ANY, _("Statistics:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText96->Wrap( -1 );
-    bSizerViewFilter->Add( m_staticText96, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_panelStatistics = new wxPanel( m_panelViewFilter, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
-    m_panelStatistics->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-
-    bSizer1801 = new wxBoxSizer( wxVERTICAL );
-
-    bSizerStatistics = new wxBoxSizer( wxHORIZONTAL );
-
-    wxBoxSizer* bSizer173;
-    bSizer173 = new wxBoxSizer( wxVERTICAL );
-
-    m_bitmapDeleteLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapDeleteLeft->SetToolTip( _("Number of files and folders that will be deleted") );
-
-    bSizer173->Add( m_bitmapDeleteLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer173->Add( 5, 2, 0, 0, 5 );
-
-
-    bSizer173->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    m_staticTextDeleteLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextDeleteLeft->Wrap( -1 );
-    m_staticTextDeleteLeft->SetToolTip( _("Number of files and folders that will be deleted") );
-
-    bSizer173->Add( m_staticTextDeleteLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizerStatistics->Add( bSizer173, 0, wxEXPAND, 5 );
-
-
-    bSizerStatistics->Add( 5, 5, 0, 0, 5 );
-
-    wxBoxSizer* bSizer172;
-    bSizer172 = new wxBoxSizer( wxVERTICAL );
-
-    m_bitmapUpdateLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapUpdateLeft->SetToolTip( _("Number of files that will be updated") );
-
-    bSizer172->Add( m_bitmapUpdateLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer172->Add( 5, 2, 0, 0, 5 );
-
-
-    bSizer172->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    m_staticTextUpdateLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextUpdateLeft->Wrap( -1 );
-    m_staticTextUpdateLeft->SetToolTip( _("Number of files that will be updated") );
-
-    bSizer172->Add( m_staticTextUpdateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-
-    bSizerStatistics->Add( bSizer172, 0, wxEXPAND, 5 );
-
-
-    bSizerStatistics->Add( 5, 5, 0, 0, 5 );
-
-    wxBoxSizer* bSizer1712;
-    bSizer1712 = new wxBoxSizer( wxVERTICAL );
-
-    m_bitmapCreateLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapCreateLeft->SetToolTip( _("Number of files and folders that will be created") );
-
-    bSizer1712->Add( m_bitmapCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-
-    bSizer1712->Add( 5, 2, 0, 0, 5 );
-
-
-    bSizer1712->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    m_staticTextCreateLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextCreateLeft->Wrap( -1 );
-    m_staticTextCreateLeft->SetToolTip( _("Number of files and folders that will be created") );
-
-    bSizer1712->Add( m_staticTextCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-
-    bSizerStatistics->Add( bSizer1712, 0, wxEXPAND, 5 );
-
-
-    bSizerStatistics->Add( 5, 5, 0, 0, 5 );
-
-    bSizerData = new wxBoxSizer( wxVERTICAL );
-
-    m_bitmapData = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapData->SetToolTip( _("Total bytes to copy") );
-
-    bSizerData->Add( m_bitmapData, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-
-    bSizerData->Add( 5, 2, 0, 0, 5 );
-
-
-    bSizerData->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    m_staticTextData = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextData->Wrap( -1 );
-    m_staticTextData->SetToolTip( _("Total bytes to copy") );
-
-    bSizerData->Add( m_staticTextData, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizerStatistics->Add( bSizerData, 0, wxEXPAND, 5 );
-
-
-    bSizerStatistics->Add( 5, 5, 0, 0, 5 );
-
-    wxBoxSizer* bSizer178;
-    bSizer178 = new wxBoxSizer( wxVERTICAL );
-
-    m_bitmapCreateRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapCreateRight->SetToolTip( _("Number of files and folders that will be created") );
-
-    bSizer178->Add( m_bitmapCreateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-
-    bSizer178->Add( 5, 2, 0, 0, 5 );
-
-
-    bSizer178->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    m_staticTextCreateRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextCreateRight->Wrap( -1 );
-    m_staticTextCreateRight->SetToolTip( _("Number of files and folders that will be created") );
-
-    bSizer178->Add( m_staticTextCreateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizerStatistics->Add( bSizer178, 0, wxEXPAND, 5 );
-
-
-    bSizerStatistics->Add( 5, 5, 0, 0, 5 );
-
-    wxBoxSizer* bSizer177;
-    bSizer177 = new wxBoxSizer( wxVERTICAL );
-
-    m_bitmapUpdateRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapUpdateRight->SetToolTip( _("Number of files that will be updated") );
-
-    bSizer177->Add( m_bitmapUpdateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-
-    bSizer177->Add( 5, 2, 0, 0, 5 );
-
-
-    bSizer177->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    m_staticTextUpdateRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextUpdateRight->Wrap( -1 );
-    m_staticTextUpdateRight->SetToolTip( _("Number of files that will be updated") );
-
-    bSizer177->Add( m_staticTextUpdateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizerStatistics->Add( bSizer177, 0, wxEXPAND, 5 );
-
-
-    bSizerStatistics->Add( 5, 5, 0, 0, 5 );
-
-    wxBoxSizer* bSizer176;
-    bSizer176 = new wxBoxSizer( wxVERTICAL );
-
-    m_bitmapDeleteRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapDeleteRight->SetToolTip( _("Number of files and folders that will be deleted") );
-
-    bSizer176->Add( m_bitmapDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer176->Add( 5, 2, 0, 0, 5 );
-
-
-    bSizer176->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    m_staticTextDeleteRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextDeleteRight->Wrap( -1 );
-    m_staticTextDeleteRight->SetToolTip( _("Number of files and folders that will be deleted") );
-
-    bSizer176->Add( m_staticTextDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizerStatistics->Add( bSizer176, 0, wxEXPAND, 5 );
-
-
-    bSizer1801->Add( bSizerStatistics, 0, wxALL, 4 );
-
-
-    m_panelStatistics->SetSizer( bSizer1801 );
-    m_panelStatistics->Layout();
-    bSizer1801->Fit( m_panelStatistics );
-    bSizerViewFilter->Add( m_panelStatistics, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-
-    m_panelViewFilter->SetSizer( bSizerViewFilter );
-    m_panelViewFilter->Layout();
-    bSizerViewFilter->Fit( m_panelViewFilter );
-    bSizerPanelHolder->Add( m_panelViewFilter, 0, 0, 5 );
-
-
-    this->SetSizer( bSizerPanelHolder );
-    this->Layout();
-    bSizerPanelHolder->Fit( this );
-
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainDialogGenerated::OnClose ) );
-    this->Connect( m_menuItemNew->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigNew ) );
-    this->Connect( m_menuItemLoad->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigLoad ) );
-    this->Connect( m_menuItemSave->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigSave ) );
-    this->Connect( m_menuItemSaveAs->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigSaveAs ) );
-    this->Connect( m_menuItemSaveAsBatch->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSaveAsBatchJob ) );
-    this->Connect( m_menuItem4->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuQuit ) );
-    this->Connect( m_menuItemShowLog->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnShowLog ) );
-    this->Connect( m_menuItemCompare->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnCompare ) );
-    this->Connect( m_menuItemCompSettings->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnCmpSettings ) );
-    this->Connect( m_menuItemFilter->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigureFilter ) );
-    this->Connect( m_menuItemSyncSettings->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSyncSettings ) );
-    this->Connect( m_menuItemSynchronize->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ) );
-    this->Connect( m_menuItemOptions->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuOptions ) );
-    this->Connect( m_menuItemFind->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuFindItem ) );
-    this->Connect( m_menuItemExportList->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuExportFileList ) );
-    this->Connect( m_menuItem51->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuResetLayout ) );
-    this->Connect( m_menuItemHelp->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnShowHelp ) );
-    this->Connect( m_menuItemCheckVersionNow->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuCheckVersion ) );
-    this->Connect( m_menuItemCheckVersionAuto->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuCheckVersionAutomatically ) );
-    this->Connect( m_menuItemAbout->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuAbout ) );
-    m_buttonCompare->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCompare ), NULL, this );
-    m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCmpSettings ), NULL, this );
-    m_bpButtonCmpConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnCompSettingsContext ), NULL, this );
-    m_bpButtonCmpContext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCompSettingsContext ), NULL, this );
-    m_bpButtonCmpContext->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnCompSettingsContext ), NULL, this );
-    m_bpButtonFilter->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigureFilter ), NULL, this );
-    m_bpButtonFilter->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnGlobalFilterContext ), NULL, this );
-    m_bpButtonFilterContext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnGlobalFilterContext ), NULL, this );
-    m_bpButtonFilterContext->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnGlobalFilterContext ), NULL, this );
-    m_bpButtonSyncConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncSettings ), NULL, this );
-    m_bpButtonSyncConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnSyncSettingsContext ), NULL, this );
-    m_bpButtonSyncContext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncSettingsContext ), NULL, this );
-    m_bpButtonSyncContext->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnSyncSettingsContext ), NULL, this );
-    m_buttonSync->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ), NULL, this );
-    m_bpButtonAddPair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnTopFolderPairAdd ), NULL, this );
-    m_bpButtonRemovePair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnTopFolderPairRemove ), NULL, this );
-    m_bpButtonSwapSides->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSwapSides ), NULL, this );
-    m_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_bpButtonShowLog->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnShowLog ), NULL, this );
-    m_bpButtonViewTypeSyncAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewType ), NULL, this );
-    m_bpButtonShowExcluded->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-    m_bpButtonViewFilterSave->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnViewFilterSave ), NULL, this );
-    m_bpButtonShowDeleteLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-    m_bpButtonShowUpdateLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-    m_bpButtonShowCreateLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-    m_bpButtonShowLeftOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-    m_bpButtonShowLeftNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-    m_bpButtonShowEqual->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-    m_bpButtonShowDoNothing->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-    m_bpButtonShowDifferent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-    m_bpButtonShowRightNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-    m_bpButtonShowRightOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-    m_bpButtonShowCreateRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-    m_bpButtonShowUpdateRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-    m_bpButtonShowDeleteRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-    m_bpButtonShowConflict->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+	this->SetSizeHints( wxSize( 640,400 ), 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_menuItemLoad = new wxMenuItem( m_menuFile, wxID_OPEN, wxString( _("&Open...") ) + wxT('\t') + wxT("Ctrl+O"), wxEmptyString, wxITEM_NORMAL );
+	m_menuFile->Append( m_menuItemLoad );
+	
+	m_menuFile->AppendSeparator();
+	
+	m_menuItemSave = new wxMenuItem( m_menuFile, wxID_SAVE, wxString( _("&Save") ) + wxT('\t') + wxT("Ctrl+S"), wxEmptyString, wxITEM_NORMAL );
+	m_menuFile->Append( m_menuItemSave );
+	
+	m_menuItemSaveAs = new wxMenuItem( m_menuFile, wxID_SAVEAS, wxString( _("Save &as...") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuFile->Append( m_menuItemSaveAs );
+	
+	m_menuItemSaveAsBatch = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("Save as &batch job...") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuFile->Append( m_menuItemSaveAsBatch );
+	
+	m_menuFile->AppendSeparator();
+	
+	wxMenuItem* m_menuItem4;
+	m_menuItem4 = new wxMenuItem( m_menuFile, wxID_EXIT, wxString( _("E&xit") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuFile->Append( m_menuItem4 );
+	
+	m_menubar->Append( m_menuFile, _("&File") ); 
+	
+	m_menu4 = new wxMenu();
+	m_menuItemShowLog = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("Show &log") ) + wxT('\t') + wxT("F4"), wxEmptyString, wxITEM_NORMAL );
+	m_menu4->Append( m_menuItemShowLog );
+	
+	m_menu4->AppendSeparator();
+	
+	m_menuItemCompare = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("Start &comparison") ) + wxT('\t') + wxT("F5"), wxEmptyString, wxITEM_NORMAL );
+	m_menu4->Append( m_menuItemCompare );
+	
+	m_menu4->AppendSeparator();
+	
+	m_menuItemCompSettings = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("C&omparison settings") ) + wxT('\t') + wxT("F6"), wxEmptyString, wxITEM_NORMAL );
+	m_menu4->Append( m_menuItemCompSettings );
+	
+	m_menuItemFilter = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("&Filter settings") ) + wxT('\t') + wxT("F7"), wxEmptyString, wxITEM_NORMAL );
+	m_menu4->Append( m_menuItemFilter );
+	
+	m_menuItemSyncSettings = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("S&ynchronization settings") ) + wxT('\t') + wxT("F8"), wxEmptyString, wxITEM_NORMAL );
+	m_menu4->Append( m_menuItemSyncSettings );
+	
+	m_menu4->AppendSeparator();
+	
+	m_menuItemSynchronize = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("Start &synchronization") ) + wxT('\t') + wxT("F9"), wxEmptyString, wxITEM_NORMAL );
+	m_menu4->Append( m_menuItemSynchronize );
+	
+	m_menubar->Append( m_menu4, _("&Actions") ); 
+	
+	m_menuTools = new wxMenu();
+	m_menuItemOptions = new wxMenuItem( m_menuTools, wxID_PREFERENCES, wxString( _("&Preferences") ) + wxT('\t') + wxT("Ctrl+,"), wxEmptyString, wxITEM_NORMAL );
+	m_menuTools->Append( m_menuItemOptions );
+	
+	m_menuLanguages = new wxMenu();
+	wxMenuItem* m_menuLanguagesItem = new wxMenuItem( m_menuTools, wxID_ANY, _("&Language"), wxEmptyString, wxITEM_NORMAL, m_menuLanguages );
+	m_menuTools->Append( m_menuLanguagesItem );
+	
+	m_menuTools->AppendSeparator();
+	
+	m_menuItemFind = new wxMenuItem( m_menuTools, wxID_FIND, wxString( _("&Find...") ) + wxT('\t') + wxT("Ctrl+F"), wxEmptyString, wxITEM_NORMAL );
+	m_menuTools->Append( m_menuItemFind );
+	
+	m_menuItemExportList = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("&Export file list...") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuTools->Append( m_menuItemExportList );
+	
+	m_menuTools->AppendSeparator();
+	
+	wxMenuItem* m_menuItem51;
+	m_menuItem51 = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("&Reset layout") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuTools->Append( m_menuItem51 );
+	
+	m_menuItemShowMain = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("dummy") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuTools->Append( m_menuItemShowMain );
+	
+	m_menuItemShowFolders = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("dummy") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuTools->Append( m_menuItemShowFolders );
+	
+	m_menuItemShowViewFilter = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("dummy") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuTools->Append( m_menuItemShowViewFilter );
+	
+	m_menuItemShowConfig = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("dummy") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuTools->Append( m_menuItemShowConfig );
+	
+	m_menuItemShowOverview = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("dummy") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuTools->Append( m_menuItemShowOverview );
+	
+	m_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->AppendSeparator();
+	
+	m_menuItemCheckVersionNow = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("&Check for updates now") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuHelp->Append( m_menuItemCheckVersionNow );
+	
+	m_menuItemCheckVersionAuto = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("Check &automatically once a week") ) , wxEmptyString, wxITEM_CHECK );
+	m_menuHelp->Append( m_menuItemCheckVersionAuto );
+	m_menuItemCheckVersionAuto->Check( true );
+	
+	m_menuHelp->AppendSeparator();
+	
+	m_menuItemAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About") ) + wxT('\t') + wxT("Shift+F1"), wxEmptyString, wxITEM_NORMAL );
+	m_menuHelp->Append( m_menuItemAbout );
+	
+	m_menubar->Append( m_menuHelp, _("&Help") ); 
+	
+	this->SetMenuBar( m_menubar );
+	
+	bSizerPanelHolder = new wxBoxSizer( wxVERTICAL );
+	
+	m_panelTopButtons = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer1791;
+	bSizer1791 = new wxBoxSizer( wxVERTICAL );
+	
+	bSizerTopButtons = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bSizer261;
+	bSizer261 = new wxBoxSizer( wxHORIZONTAL );
+	
+	
+	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();
+	
+	bSizer261->Add( m_buttonCancel, 0, wxEXPAND, 5 );
+	
+	m_buttonCompare = new zen::BitmapTextButton( m_panelTopButtons, wxID_ANY, _("Compare"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_buttonCompare->SetDefault(); 
+	m_buttonCompare->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonCompare->SetToolTip( _("dummy") );
+	
+	bSizer261->Add( m_buttonCompare, 0, wxEXPAND, 5 );
+	
+	
+	bSizer261->Add( 4, 0, 0, 0, 5 );
+	
+	m_bpButtonCmpConfig = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	m_bpButtonCmpConfig->SetToolTip( _("dummy") );
+	
+	bSizer261->Add( m_bpButtonCmpConfig, 0, wxEXPAND, 5 );
+	
+	m_bpButtonCmpContext = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	m_bpButtonCmpContext->SetToolTip( _("dummy") );
+	
+	bSizer261->Add( m_bpButtonCmpContext, 0, wxEXPAND, 5 );
+	
+	
+	bSizer261->Add( 0, 0, 1, 0, 5 );
+	
+	
+	bSizerTopButtons->Add( bSizer261, 1, wxEXPAND, 5 );
+	
+	
+	bSizerTopButtons->Add( 5, 2, 0, 0, 5 );
+	
+	wxBoxSizer* bSizer199;
+	bSizer199 = new wxBoxSizer( wxHORIZONTAL );
+	
+	
+	bSizer199->Add( 0, 0, 1, 0, 5 );
+	
+	m_bpButtonFilter = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|wxFULL_REPAINT_ON_RESIZE );
+	m_bpButtonFilter->SetToolTip( _("dummy") );
+	
+	bSizer199->Add( m_bpButtonFilter, 0, wxEXPAND, 5 );
+	
+	m_bpButtonFilterContext = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	m_bpButtonFilterContext->SetToolTip( _("dummy") );
+	
+	bSizer199->Add( m_bpButtonFilterContext, 0, wxEXPAND, 5 );
+	
+	
+	bSizer199->Add( 0, 0, 1, 0, 5 );
+	
+	
+	bSizerTopButtons->Add( bSizer199, 0, wxEXPAND, 5 );
+	
+	
+	bSizerTopButtons->Add( 5, 2, 0, 0, 5 );
+	
+	wxBoxSizer* bSizer262;
+	bSizer262 = new wxBoxSizer( wxHORIZONTAL );
+	
+	
+	bSizer262->Add( 0, 0, 1, 0, 5 );
+	
+	m_bpButtonSyncConfig = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	m_bpButtonSyncConfig->SetToolTip( _("dummy") );
+	
+	bSizer262->Add( m_bpButtonSyncConfig, 0, wxEXPAND, 5 );
+	
+	m_bpButtonSyncContext = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	m_bpButtonSyncContext->SetToolTip( _("dummy") );
+	
+	bSizer262->Add( m_bpButtonSyncContext, 0, wxEXPAND, 5 );
+	
+	
+	bSizer262->Add( 4, 0, 0, 0, 5 );
+	
+	m_buttonSync = new zen::BitmapTextButton( m_panelTopButtons, wxID_ANY, _("Synchronize"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_buttonSync->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonSync->SetToolTip( _("dummy") );
+	
+	bSizer262->Add( m_buttonSync, 0, wxEXPAND, 5 );
+	
+	
+	bSizer262->Add( 0, 0, 1, 0, 5 );
+	
+	
+	bSizerTopButtons->Add( bSizer262, 1, wxEXPAND, 5 );
+	
+	
+	bSizer1791->Add( bSizerTopButtons, 1, wxEXPAND, 5 );
+	
+	
+	m_panelTopButtons->SetSizer( bSizer1791 );
+	m_panelTopButtons->Layout();
+	bSizer1791->Fit( m_panelTopButtons );
+	bSizerPanelHolder->Add( m_panelTopButtons, 0, wxEXPAND, 5 );
+	
+	m_panelDirectoryPairs = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSTATIC_BORDER|wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer1601;
+	bSizer1601 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer91;
+	bSizer91 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_panelTopLeft = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelTopLeft->SetMinSize( wxSize( 1,-1 ) );
+	
+	wxFlexGridSizer* fgSizer8;
+	fgSizer8 = new wxFlexGridSizer( 0, 2, 0, 0 );
+	fgSizer8->AddGrowableCol( 1 );
+	fgSizer8->SetFlexibleDirection( wxBOTH );
+	fgSizer8->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_ALL );
+	
+	
+	fgSizer8->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_staticTextResolvedPathL = new wxStaticText( m_panelTopLeft, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextResolvedPathL->Wrap( -1 );
+	fgSizer8->Add( m_staticTextResolvedPathL, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2 );
+	
+	wxBoxSizer* bSizer159;
+	bSizer159 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bpButtonAddPair = new wxBitmapButton( m_panelTopLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	m_bpButtonAddPair->SetToolTip( _("Add folder pair") );
+	
+	bSizer159->Add( m_bpButtonAddPair, 0, wxEXPAND, 5 );
+	
+	m_bpButtonRemovePair = new wxBitmapButton( m_panelTopLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
+	
+	bSizer159->Add( m_bpButtonRemovePair, 0, wxEXPAND, 5 );
+	
+	
+	fgSizer8->Add( bSizer159, 0, wxEXPAND, 5 );
+	
+	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_buttonSelectFolderLeft = new wxButton( m_panelTopLeft, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonSelectFolderLeft->SetToolTip( _("Select a folder") );
+	
+	bSizer182->Add( m_buttonSelectFolderLeft, 0, wxEXPAND, 5 );
+	
+	m_bpButtonSelectAltFolderLeft = new wxBitmapButton( m_panelTopLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	m_bpButtonSelectAltFolderLeft->SetToolTip( _("Access online storage") );
+	
+	bSizer182->Add( m_bpButtonSelectAltFolderLeft, 0, wxEXPAND, 5 );
+	
+	
+	fgSizer8->Add( bSizer182, 0, wxEXPAND, 5 );
+	
+	
+	m_panelTopLeft->SetSizer( fgSizer8 );
+	m_panelTopLeft->Layout();
+	fgSizer8->Fit( m_panelTopLeft );
+	bSizer91->Add( m_panelTopLeft, 1, wxLEFT|wxALIGN_BOTTOM, 5 );
+	
+	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 );
+	m_bpButtonSwapSides->SetToolTip( _("dummy") );
+	
+	bSizer1771->Add( m_bpButtonSwapSides, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer160;
+	bSizer160 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bpButtonLocalCompCfg = new wxBitmapButton( m_panelTopCenter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	m_bpButtonLocalCompCfg->SetToolTip( _("dummy") );
+	
+	bSizer160->Add( m_bpButtonLocalCompCfg, 0, wxEXPAND, 5 );
+	
+	m_bpButtonLocalFilter = new wxBitmapButton( m_panelTopCenter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	m_bpButtonLocalFilter->SetToolTip( _("dummy") );
+	
+	bSizer160->Add( m_bpButtonLocalFilter, 0, wxEXPAND, 5 );
+	
+	m_bpButtonLocalSyncCfg = new wxBitmapButton( m_panelTopCenter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	m_bpButtonLocalSyncCfg->SetToolTip( _("dummy") );
+	
+	bSizer160->Add( m_bpButtonLocalSyncCfg, 0, wxEXPAND, 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_panelTopRight = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelTopRight->SetMinSize( wxSize( 1,-1 ) );
+	
+	wxBoxSizer* bSizer183;
+	bSizer183 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticTextResolvedPathR = new wxStaticText( m_panelTopRight, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextResolvedPathR->Wrap( -1 );
+	bSizer183->Add( m_staticTextResolvedPathR, 0, wxALL, 2 );
+	
+	wxBoxSizer* bSizer179;
+	bSizer179 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_folderPathRight = new 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") );
+	
+	bSizer179->Add( m_buttonSelectFolderRight, 0, wxEXPAND, 5 );
+	
+	m_bpButtonSelectAltFolderRight = new wxBitmapButton( m_panelTopRight, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	m_bpButtonSelectAltFolderRight->SetToolTip( _("Access online storage") );
+	
+	bSizer179->Add( m_bpButtonSelectAltFolderRight, 0, wxEXPAND, 5 );
+	
+	
+	bSizer183->Add( bSizer179, 0, wxEXPAND, 5 );
+	
+	
+	m_panelTopRight->SetSizer( bSizer183 );
+	m_panelTopRight->Layout();
+	bSizer183->Fit( m_panelTopRight );
+	bSizer91->Add( m_panelTopRight, 1, wxRIGHT|wxALIGN_BOTTOM, 5 );
+	
+	
+	bSizer1601->Add( bSizer91, 0, wxEXPAND, 5 );
+	
+	m_scrolledWindowFolderPairs = new wxScrolledWindow( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxHSCROLL|wxVSCROLL );
+	m_scrolledWindowFolderPairs->SetScrollRate( 10, 10 );
+	m_scrolledWindowFolderPairs->SetMinSize( wxSize( -1,0 ) );
+	
+	bSizerAddFolderPairs = new wxBoxSizer( wxVERTICAL );
+	
+	
+	m_scrolledWindowFolderPairs->SetSizer( bSizerAddFolderPairs );
+	m_scrolledWindowFolderPairs->Layout();
+	bSizerAddFolderPairs->Fit( m_scrolledWindowFolderPairs );
+	bSizer1601->Add( m_scrolledWindowFolderPairs, 1, wxEXPAND, 5 );
+	
+	
+	m_panelDirectoryPairs->SetSizer( bSizer1601 );
+	m_panelDirectoryPairs->Layout();
+	bSizer1601->Fit( m_panelDirectoryPairs );
+	bSizerPanelHolder->Add( m_panelDirectoryPairs, 0, wxEXPAND, 5 );
+	
+	m_gridOverview = new zen::Grid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
+	m_gridOverview->SetScrollRate( 5, 5 );
+	bSizerPanelHolder->Add( m_gridOverview, 0, 0, 5 );
+	
+	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_gridMainL = new zen::Grid( m_splitterMain, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
+	m_gridMainL->SetScrollRate( 5, 5 );
+	bSizer1781->Add( m_gridMainL, 1, wxEXPAND, 5 );
+	
+	m_gridMainC = new zen::Grid( m_splitterMain, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
+	m_gridMainC->SetScrollRate( 5, 5 );
+	bSizer1781->Add( m_gridMainC, 0, wxEXPAND, 5 );
+	
+	m_gridMainR = new zen::Grid( m_splitterMain, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
+	m_gridMainR->SetScrollRate( 5, 5 );
+	bSizer1781->Add( m_gridMainR, 1, wxEXPAND, 5 );
+	
+	
+	m_splitterMain->SetSizer( bSizer1781 );
+	m_splitterMain->Layout();
+	bSizer1781->Fit( m_splitterMain );
+	bSizer1711->Add( m_splitterMain, 1, wxEXPAND, 5 );
+	
+	m_panelStatusBar = new wxPanel( m_panelCenter, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSTATIC_BORDER|wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer451;
+	bSizer451 = new wxBoxSizer( wxHORIZONTAL );
+	
+	bSizer451->SetMinSize( wxSize( -1,22 ) ); 
+	bSizerFileStatus = new wxBoxSizer( wxHORIZONTAL );
+	
+	bSizerStatusLeft = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bSizer53;
+	bSizer53 = new wxBoxSizer( wxHORIZONTAL );
+	
+	
+	bSizer53->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizerStatusLeftDirectories = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapSmallDirectoryLeft = new wxStaticBitmap( m_panelStatusBar, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerStatusLeftDirectories->Add( m_bitmapSmallDirectoryLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizerStatusLeftDirectories->Add( 2, 0, 0, 0, 5 );
+	
+	m_staticTextStatusLeftDirs = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextStatusLeftDirs->Wrap( -1 );
+	bSizerStatusLeftDirectories->Add( m_staticTextStatusLeftDirs, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	
+	bSizer53->Add( bSizerStatusLeftDirectories, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizerStatusLeftFiles = new wxBoxSizer( wxHORIZONTAL );
+	
+	
+	bSizerStatusLeftFiles->Add( 10, 0, 0, 0, 5 );
+	
+	m_bitmapSmallFileLeft = new wxStaticBitmap( m_panelStatusBar, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerStatusLeftFiles->Add( m_bitmapSmallFileLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizerStatusLeftFiles->Add( 2, 0, 0, 0, 5 );
+	
+	m_staticTextStatusLeftFiles = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextStatusLeftFiles->Wrap( -1 );
+	bSizerStatusLeftFiles->Add( m_staticTextStatusLeftFiles, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizerStatusLeftFiles->Add( 4, 0, 0, 0, 5 );
+	
+	m_staticTextStatusLeftBytes = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextStatusLeftBytes->Wrap( -1 );
+	bSizerStatusLeftFiles->Add( m_staticTextStatusLeftBytes, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer53->Add( bSizerStatusLeftFiles, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer53->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizerStatusLeft->Add( bSizer53, 1, wxEXPAND, 5 );
+	
+	m_staticline9 = new wxStaticLine( m_panelStatusBar, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizerStatusLeft->Add( m_staticline9, 0, wxEXPAND|wxTOP, 2 );
+	
+	
+	bSizerFileStatus->Add( bSizerStatusLeft, 1, wxEXPAND, 5 );
+	
+	
+	bSizerFileStatus->Add( 26, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_staticTextStatusCenter = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextStatusCenter->Wrap( -1 );
+	bSizerFileStatus->Add( m_staticTextStatusCenter, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizerFileStatus->Add( 26, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizerStatusRight = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_staticline10 = new wxStaticLine( m_panelStatusBar, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizerStatusRight->Add( m_staticline10, 0, wxEXPAND|wxTOP, 2 );
+	
+	wxBoxSizer* bSizer52;
+	bSizer52 = new wxBoxSizer( wxHORIZONTAL );
+	
+	
+	bSizer52->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizerStatusRightDirectories = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapSmallDirectoryRight = new wxStaticBitmap( m_panelStatusBar, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerStatusRightDirectories->Add( m_bitmapSmallDirectoryRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizerStatusRightDirectories->Add( 2, 0, 0, 0, 5 );
+	
+	m_staticTextStatusRightDirs = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextStatusRightDirs->Wrap( -1 );
+	bSizerStatusRightDirectories->Add( m_staticTextStatusRightDirs, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer52->Add( bSizerStatusRightDirectories, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizerStatusRightFiles = new wxBoxSizer( wxHORIZONTAL );
+	
+	
+	bSizerStatusRightFiles->Add( 10, 0, 0, 0, 5 );
+	
+	m_bitmapSmallFileRight = new wxStaticBitmap( m_panelStatusBar, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerStatusRightFiles->Add( m_bitmapSmallFileRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizerStatusRightFiles->Add( 2, 0, 0, 0, 5 );
+	
+	m_staticTextStatusRightFiles = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextStatusRightFiles->Wrap( -1 );
+	bSizerStatusRightFiles->Add( m_staticTextStatusRightFiles, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizerStatusRightFiles->Add( 4, 0, 0, 0, 5 );
+	
+	m_staticTextStatusRightBytes = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextStatusRightBytes->Wrap( -1 );
+	bSizerStatusRightFiles->Add( m_staticTextStatusRightBytes, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer52->Add( bSizerStatusRightFiles, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer52->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizerStatusRight->Add( bSizer52, 1, wxEXPAND, 5 );
+	
+	
+	bSizerFileStatus->Add( bSizerStatusRight, 1, wxEXPAND, 5 );
+	
+	
+	bSizer451->Add( bSizerFileStatus, 1, wxEXPAND, 5 );
+	
+	m_staticTextFullStatus = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextFullStatus->Wrap( -1 );
+	m_staticTextFullStatus->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	
+	bSizer451->Add( m_staticTextFullStatus, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	
+	m_panelStatusBar->SetSizer( bSizer451 );
+	m_panelStatusBar->Layout();
+	bSizer451->Fit( m_panelStatusBar );
+	bSizer1711->Add( m_panelStatusBar, 0, wxEXPAND, 5 );
+	
+	
+	m_panelCenter->SetSizer( bSizer1711 );
+	m_panelCenter->Layout();
+	bSizer1711->Fit( m_panelCenter );
+	bSizerPanelHolder->Add( m_panelCenter, 1, wxEXPAND, 5 );
+	
+	m_panelSearch = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer1713;
+	bSizer1713 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bpButtonHideSearch = new wxBitmapButton( m_panelSearch, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	m_bpButtonHideSearch->SetToolTip( _("Close search bar") );
+	
+	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_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_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 ) );
+	
+	bSizerLog = new wxBoxSizer( wxVERTICAL );
+	
+	bSizer42 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapLogStatus = new wxStaticBitmap( m_panelLog, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer42->Add( m_bitmapLogStatus, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
+	
+	m_staticTextLogStatus = new wxStaticText( m_panelLog, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextLogStatus->Wrap( -1 );
+	m_staticTextLogStatus->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	
+	bSizer42->Add( m_staticTextLogStatus, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_panelItemsProcessed = new wxPanel( m_panelLog, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_panelItemsProcessed->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	
+	wxBoxSizer* bSizer165;
+	bSizer165 = new wxBoxSizer( wxVERTICAL );
+	
+	
+	bSizer165->Add( 0, 5, 0, 0, 5 );
+	
+	wxStaticText* m_staticText962;
+	m_staticText962 = new wxStaticText( m_panelItemsProcessed, wxID_ANY, _("Items processed:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText962->Wrap( -1 );
+	bSizer165->Add( m_staticText962, 0, wxRIGHT|wxLEFT, 5 );
+	
+	wxBoxSizer* bSizer169;
+	bSizer169 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_staticTextItemsProcessed = new wxStaticText( m_panelItemsProcessed, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_staticTextItemsProcessed->Wrap( -1 );
+	m_staticTextItemsProcessed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	
+	bSizer169->Add( m_staticTextItemsProcessed, 0, wxALIGN_BOTTOM, 5 );
+	
+	m_staticTextBytesProcessed = new wxStaticText( m_panelItemsProcessed, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextBytesProcessed->Wrap( -1 );
+	bSizer169->Add( m_staticTextBytesProcessed, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+	
+	
+	bSizer165->Add( bSizer169, 0, wxRIGHT|wxLEFT, 5 );
+	
+	
+	bSizer165->Add( 0, 5, 0, 0, 5 );
+	
+	
+	m_panelItemsProcessed->SetSizer( bSizer165 );
+	m_panelItemsProcessed->Layout();
+	bSizer165->Fit( m_panelItemsProcessed );
+	bSizer42->Add( m_panelItemsProcessed, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 10 );
+	
+	m_panelItemsRemaining = new wxPanel( m_panelLog, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_panelItemsRemaining->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	
+	wxBoxSizer* bSizer166;
+	bSizer166 = new wxBoxSizer( wxVERTICAL );
+	
+	
+	bSizer166->Add( 0, 5, 0, 0, 5 );
+	
+	wxStaticText* m_staticText971;
+	m_staticText971 = new wxStaticText( m_panelItemsRemaining, wxID_ANY, _("Items remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText971->Wrap( -1 );
+	bSizer166->Add( m_staticText971, 0, wxRIGHT|wxLEFT, 5 );
+	
+	wxBoxSizer* bSizer170;
+	bSizer170 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_staticTextItemsRemaining = new wxStaticText( m_panelItemsRemaining, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_staticTextItemsRemaining->Wrap( -1 );
+	m_staticTextItemsRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	
+	bSizer170->Add( m_staticTextItemsRemaining, 0, wxALIGN_BOTTOM, 5 );
+	
+	m_staticTextBytesRemaining = new wxStaticText( m_panelItemsRemaining, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextBytesRemaining->Wrap( -1 );
+	bSizer170->Add( m_staticTextBytesRemaining, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+	
+	
+	bSizer166->Add( bSizer170, 0, wxRIGHT|wxLEFT, 5 );
+	
+	
+	bSizer166->Add( 0, 5, 0, 0, 5 );
+	
+	
+	m_panelItemsRemaining->SetSizer( bSizer166 );
+	m_panelItemsRemaining->Layout();
+	bSizer166->Fit( m_panelItemsRemaining );
+	bSizer42->Add( m_panelItemsRemaining, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 10 );
+	
+	wxPanel* m_panelTimeElapsed;
+	m_panelTimeElapsed = new wxPanel( m_panelLog, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_panelTimeElapsed->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	
+	wxBoxSizer* bSizer168;
+	bSizer168 = new wxBoxSizer( wxVERTICAL );
+	
+	
+	bSizer168->Add( 0, 5, 0, 0, 5 );
+	
+	wxStaticText* m_staticText9611;
+	m_staticText9611 = new wxStaticText( m_panelTimeElapsed, wxID_ANY, _("Total time:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText9611->Wrap( -1 );
+	bSizer168->Add( m_staticText9611, 0, wxRIGHT|wxLEFT, 5 );
+	
+	m_staticTextTotalTime = new wxStaticText( m_panelTimeElapsed, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextTotalTime->Wrap( -1 );
+	m_staticTextTotalTime->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	
+	bSizer168->Add( m_staticTextTotalTime, 0, wxRIGHT|wxLEFT, 5 );
+	
+	
+	bSizer168->Add( 0, 5, 0, 0, 5 );
+	
+	
+	m_panelTimeElapsed->SetSizer( bSizer168 );
+	m_panelTimeElapsed->Layout();
+	bSizer168->Fit( m_panelTimeElapsed );
+	bSizer42->Add( m_panelTimeElapsed, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 10 );
+	
+	
+	bSizerLog->Add( bSizer42, 0, wxALL, 5 );
+	
+	m_staticline70 = new wxStaticLine( m_panelLog, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerLog->Add( m_staticline70, 0, wxEXPAND, 5 );
+	
+	
+	m_panelLog->SetSizer( bSizerLog );
+	m_panelLog->Layout();
+	bSizerLog->Fit( m_panelLog );
+	bSizerPanelHolder->Add( m_panelLog, 0, 0, 5 );
+	
+	m_panelConfig = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	bSizerConfig = new wxBoxSizer( wxHORIZONTAL );
+	
+	bSizerCfgHistoryButtons = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bSizer17611;
+	bSizer17611 = new wxBoxSizer( wxVERTICAL );
+	
+	m_bpButtonNew = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	m_bpButtonNew->SetToolTip( _("dummy") );
+	
+	bSizer17611->Add( m_bpButtonNew, 0, wxEXPAND, 5 );
+	
+	m_staticText951 = new wxStaticText( m_panelConfig, wxID_ANY, _("New"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText951->Wrap( -1 );
+	bSizer17611->Add( m_staticText951, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 2 );
+	
+	
+	bSizerCfgHistoryButtons->Add( bSizer17611, 0, 0, 5 );
+	
+	wxBoxSizer* bSizer1761;
+	bSizer1761 = new wxBoxSizer( wxVERTICAL );
+	
+	m_bpButtonOpen = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	m_bpButtonOpen->SetToolTip( _("dummy") );
+	
+	bSizer1761->Add( m_bpButtonOpen, 0, wxEXPAND, 5 );
+	
+	m_staticText95 = new wxStaticText( m_panelConfig, wxID_ANY, _("Open..."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText95->Wrap( -1 );
+	bSizer1761->Add( m_staticText95, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 2 );
+	
+	
+	bSizerCfgHistoryButtons->Add( bSizer1761, 0, 0, 5 );
+	
+	wxBoxSizer* bSizer175;
+	bSizer175 = new wxBoxSizer( wxVERTICAL );
+	
+	m_bpButtonSave = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	m_bpButtonSave->SetToolTip( _("dummy") );
+	
+	bSizer175->Add( m_bpButtonSave, 0, wxEXPAND, 5 );
+	
+	m_staticText961 = new wxStaticText( m_panelConfig, wxID_ANY, _("Save"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText961->Wrap( -1 );
+	bSizer175->Add( m_staticText961, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 2 );
+	
+	
+	bSizerCfgHistoryButtons->Add( bSizer175, 0, 0, 5 );
+	
+	wxBoxSizer* bSizer174;
+	bSizer174 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer1772;
+	bSizer1772 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bpButtonSaveAs = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	m_bpButtonSaveAs->SetToolTip( _("dummy") );
+	
+	bSizer1772->Add( m_bpButtonSaveAs, 1, 0, 5 );
+	
+	m_bpButtonSaveAsBatch = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	m_bpButtonSaveAsBatch->SetToolTip( _("dummy") );
+	
+	bSizer1772->Add( m_bpButtonSaveAsBatch, 1, 0, 5 );
+	
+	
+	bSizer174->Add( bSizer1772, 0, wxEXPAND, 5 );
+	
+	m_staticText97 = new wxStaticText( m_panelConfig, wxID_ANY, _("Save as..."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText97->Wrap( -1 );
+	bSizer174->Add( m_staticText97, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 2 );
+	
+	
+	bSizerCfgHistoryButtons->Add( bSizer174, 0, 0, 5 );
+	
+	
+	bSizerConfig->Add( bSizerCfgHistoryButtons, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_gridCfgHistory = new zen::Grid( m_panelConfig, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
+	m_gridCfgHistory->SetScrollRate( 5, 5 );
+	bSizerConfig->Add( m_gridCfgHistory, 1, wxEXPAND, 5 );
+	
+	
+	m_panelConfig->SetSizer( bSizerConfig );
+	m_panelConfig->Layout();
+	bSizerConfig->Fit( m_panelConfig );
+	bSizerPanelHolder->Add( m_panelConfig, 0, 0, 5 );
+	
+	m_panelViewFilter = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	bSizerViewFilter = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bpButtonShowLog = new wxBitmapButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
+	bSizerViewFilter->Add( m_bpButtonShowLog, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	
+	bSizerViewFilter->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_staticTextViewType = new wxStaticText( m_panelViewFilter, wxID_ANY, _("View type:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextViewType->Wrap( -1 );
+	bSizerViewFilter->Add( m_staticTextViewType, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_bpButtonViewTypeSyncAction = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	bSizerViewFilter->Add( m_bpButtonViewTypeSyncAction, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT, 5 );
+	
+	m_bpButtonShowExcluded = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	bSizerViewFilter->Add( m_bpButtonShowExcluded, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	
+	bSizerViewFilter->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_bpButtonViewFilterSave = new wxBitmapButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
+	m_bpButtonViewFilterSave->SetToolTip( _("Save as default") );
+	
+	bSizerViewFilter->Add( m_bpButtonViewFilterSave, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	
+	m_staticTextSelectView = new wxStaticText( m_panelViewFilter, wxID_ANY, _("Select view:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextSelectView->Wrap( -1 );
+	bSizerViewFilter->Add( m_staticTextSelectView, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_bpButtonShowDeleteLeft = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	bSizerViewFilter->Add( m_bpButtonShowDeleteLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_bpButtonShowUpdateLeft = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	bSizerViewFilter->Add( m_bpButtonShowUpdateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_bpButtonShowCreateLeft = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	bSizerViewFilter->Add( m_bpButtonShowCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_bpButtonShowLeftOnly = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	bSizerViewFilter->Add( m_bpButtonShowLeftOnly, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_bpButtonShowLeftNewer = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	bSizerViewFilter->Add( m_bpButtonShowLeftNewer, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_bpButtonShowEqual = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	bSizerViewFilter->Add( m_bpButtonShowEqual, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_bpButtonShowDoNothing = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	bSizerViewFilter->Add( m_bpButtonShowDoNothing, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_bpButtonShowDifferent = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	bSizerViewFilter->Add( m_bpButtonShowDifferent, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_bpButtonShowRightNewer = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	bSizerViewFilter->Add( m_bpButtonShowRightNewer, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_bpButtonShowRightOnly = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	bSizerViewFilter->Add( m_bpButtonShowRightOnly, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_bpButtonShowCreateRight = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	bSizerViewFilter->Add( m_bpButtonShowCreateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_bpButtonShowUpdateRight = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	bSizerViewFilter->Add( m_bpButtonShowUpdateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_bpButtonShowDeleteRight = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	bSizerViewFilter->Add( m_bpButtonShowDeleteRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_bpButtonShowConflict = new zen::ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	bSizerViewFilter->Add( m_bpButtonShowConflict, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	
+	bSizerViewFilter->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_staticText96 = new wxStaticText( m_panelViewFilter, wxID_ANY, _("Statistics:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText96->Wrap( -1 );
+	bSizerViewFilter->Add( m_staticText96, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_panelStatistics = new wxPanel( m_panelViewFilter, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
+	m_panelStatistics->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	
+	bSizer1801 = new wxBoxSizer( wxVERTICAL );
+	
+	bSizerStatistics = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bSizer173;
+	bSizer173 = new wxBoxSizer( wxVERTICAL );
+	
+	m_bitmapDeleteLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapDeleteLeft->SetToolTip( _("Number of files and folders that will be deleted") );
+	
+	bSizer173->Add( m_bitmapDeleteLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer173->Add( 5, 2, 0, 0, 5 );
+	
+	
+	bSizer173->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_staticTextDeleteLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextDeleteLeft->Wrap( -1 );
+	m_staticTextDeleteLeft->SetToolTip( _("Number of files and folders that will be deleted") );
+	
+	bSizer173->Add( m_staticTextDeleteLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizerStatistics->Add( bSizer173, 0, wxEXPAND, 5 );
+	
+	
+	bSizerStatistics->Add( 5, 5, 0, 0, 5 );
+	
+	wxBoxSizer* bSizer172;
+	bSizer172 = new wxBoxSizer( wxVERTICAL );
+	
+	m_bitmapUpdateLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapUpdateLeft->SetToolTip( _("Number of files that will be updated") );
+	
+	bSizer172->Add( m_bitmapUpdateLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer172->Add( 5, 2, 0, 0, 5 );
+	
+	
+	bSizer172->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_staticTextUpdateLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextUpdateLeft->Wrap( -1 );
+	m_staticTextUpdateLeft->SetToolTip( _("Number of files that will be updated") );
+	
+	bSizer172->Add( m_staticTextUpdateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	
+	bSizerStatistics->Add( bSizer172, 0, wxEXPAND, 5 );
+	
+	
+	bSizerStatistics->Add( 5, 5, 0, 0, 5 );
+	
+	wxBoxSizer* bSizer1712;
+	bSizer1712 = new wxBoxSizer( wxVERTICAL );
+	
+	m_bitmapCreateLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapCreateLeft->SetToolTip( _("Number of files and folders that will be created") );
+	
+	bSizer1712->Add( m_bitmapCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	
+	bSizer1712->Add( 5, 2, 0, 0, 5 );
+	
+	
+	bSizer1712->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_staticTextCreateLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextCreateLeft->Wrap( -1 );
+	m_staticTextCreateLeft->SetToolTip( _("Number of files and folders that will be created") );
+	
+	bSizer1712->Add( m_staticTextCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	
+	bSizerStatistics->Add( bSizer1712, 0, wxEXPAND, 5 );
+	
+	
+	bSizerStatistics->Add( 5, 5, 0, 0, 5 );
+	
+	bSizerData = new wxBoxSizer( wxVERTICAL );
+	
+	m_bitmapData = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapData->SetToolTip( _("Total bytes to copy") );
+	
+	bSizerData->Add( m_bitmapData, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	
+	bSizerData->Add( 5, 2, 0, 0, 5 );
+	
+	
+	bSizerData->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_staticTextData = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextData->Wrap( -1 );
+	m_staticTextData->SetToolTip( _("Total bytes to copy") );
+	
+	bSizerData->Add( m_staticTextData, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizerStatistics->Add( bSizerData, 0, wxEXPAND, 5 );
+	
+	
+	bSizerStatistics->Add( 5, 5, 0, 0, 5 );
+	
+	wxBoxSizer* bSizer178;
+	bSizer178 = new wxBoxSizer( wxVERTICAL );
+	
+	m_bitmapCreateRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapCreateRight->SetToolTip( _("Number of files and folders that will be created") );
+	
+	bSizer178->Add( m_bitmapCreateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	
+	bSizer178->Add( 5, 2, 0, 0, 5 );
+	
+	
+	bSizer178->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_staticTextCreateRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextCreateRight->Wrap( -1 );
+	m_staticTextCreateRight->SetToolTip( _("Number of files and folders that will be created") );
+	
+	bSizer178->Add( m_staticTextCreateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizerStatistics->Add( bSizer178, 0, wxEXPAND, 5 );
+	
+	
+	bSizerStatistics->Add( 5, 5, 0, 0, 5 );
+	
+	wxBoxSizer* bSizer177;
+	bSizer177 = new wxBoxSizer( wxVERTICAL );
+	
+	m_bitmapUpdateRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapUpdateRight->SetToolTip( _("Number of files that will be updated") );
+	
+	bSizer177->Add( m_bitmapUpdateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	
+	bSizer177->Add( 5, 2, 0, 0, 5 );
+	
+	
+	bSizer177->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_staticTextUpdateRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextUpdateRight->Wrap( -1 );
+	m_staticTextUpdateRight->SetToolTip( _("Number of files that will be updated") );
+	
+	bSizer177->Add( m_staticTextUpdateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizerStatistics->Add( bSizer177, 0, wxEXPAND, 5 );
+	
+	
+	bSizerStatistics->Add( 5, 5, 0, 0, 5 );
+	
+	wxBoxSizer* bSizer176;
+	bSizer176 = new wxBoxSizer( wxVERTICAL );
+	
+	m_bitmapDeleteRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapDeleteRight->SetToolTip( _("Number of files and folders that will be deleted") );
+	
+	bSizer176->Add( m_bitmapDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer176->Add( 5, 2, 0, 0, 5 );
+	
+	
+	bSizer176->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_staticTextDeleteRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextDeleteRight->Wrap( -1 );
+	m_staticTextDeleteRight->SetToolTip( _("Number of files and folders that will be deleted") );
+	
+	bSizer176->Add( m_staticTextDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizerStatistics->Add( bSizer176, 0, wxEXPAND, 5 );
+	
+	
+	bSizer1801->Add( bSizerStatistics, 0, wxALL, 4 );
+	
+	
+	m_panelStatistics->SetSizer( bSizer1801 );
+	m_panelStatistics->Layout();
+	bSizer1801->Fit( m_panelStatistics );
+	bSizerViewFilter->Add( m_panelStatistics, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	
+	m_panelViewFilter->SetSizer( bSizerViewFilter );
+	m_panelViewFilter->Layout();
+	bSizerViewFilter->Fit( m_panelViewFilter );
+	bSizerPanelHolder->Add( m_panelViewFilter, 0, 0, 5 );
+	
+	
+	this->SetSizer( bSizerPanelHolder );
+	this->Layout();
+	bSizerPanelHolder->Fit( this );
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainDialogGenerated::OnClose ) );
+	this->Connect( m_menuItemNew->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigNew ) );
+	this->Connect( m_menuItemLoad->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigLoad ) );
+	this->Connect( m_menuItemSave->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigSave ) );
+	this->Connect( m_menuItemSaveAs->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigSaveAs ) );
+	this->Connect( m_menuItemSaveAsBatch->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSaveAsBatchJob ) );
+	this->Connect( m_menuItem4->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuQuit ) );
+	this->Connect( m_menuItemShowLog->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnShowLog ) );
+	this->Connect( m_menuItemCompare->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnCompare ) );
+	this->Connect( m_menuItemCompSettings->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnCmpSettings ) );
+	this->Connect( m_menuItemFilter->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigureFilter ) );
+	this->Connect( m_menuItemSyncSettings->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSyncSettings ) );
+	this->Connect( m_menuItemSynchronize->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ) );
+	this->Connect( m_menuItemOptions->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuOptions ) );
+	this->Connect( m_menuItemFind->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuFindItem ) );
+	this->Connect( m_menuItemExportList->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuExportFileList ) );
+	this->Connect( m_menuItem51->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuResetLayout ) );
+	this->Connect( m_menuItemHelp->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnShowHelp ) );
+	this->Connect( m_menuItemCheckVersionNow->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuCheckVersion ) );
+	this->Connect( m_menuItemCheckVersionAuto->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuCheckVersionAutomatically ) );
+	this->Connect( m_menuItemAbout->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuAbout ) );
+	m_buttonCompare->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCompare ), NULL, this );
+	m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCmpSettings ), NULL, this );
+	m_bpButtonCmpConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnCompSettingsContext ), NULL, this );
+	m_bpButtonCmpContext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCompSettingsContext ), NULL, this );
+	m_bpButtonCmpContext->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnCompSettingsContext ), NULL, this );
+	m_bpButtonFilter->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigureFilter ), NULL, this );
+	m_bpButtonFilter->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnGlobalFilterContext ), NULL, this );
+	m_bpButtonFilterContext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnGlobalFilterContext ), NULL, this );
+	m_bpButtonFilterContext->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnGlobalFilterContext ), NULL, this );
+	m_bpButtonSyncConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncSettings ), NULL, this );
+	m_bpButtonSyncConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnSyncSettingsContext ), NULL, this );
+	m_bpButtonSyncContext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncSettingsContext ), NULL, this );
+	m_bpButtonSyncContext->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnSyncSettingsContext ), NULL, this );
+	m_buttonSync->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ), NULL, this );
+	m_bpButtonAddPair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnTopFolderPairAdd ), NULL, this );
+	m_bpButtonRemovePair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnTopFolderPairRemove ), NULL, this );
+	m_bpButtonSwapSides->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSwapSides ), NULL, this );
+	m_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_bpButtonShowLog->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnShowLog ), NULL, this );
+	m_bpButtonViewTypeSyncAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewType ), NULL, this );
+	m_bpButtonShowExcluded->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+	m_bpButtonViewFilterSave->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnViewFilterSave ), NULL, this );
+	m_bpButtonShowDeleteLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+	m_bpButtonShowUpdateLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+	m_bpButtonShowCreateLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+	m_bpButtonShowLeftOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+	m_bpButtonShowLeftNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+	m_bpButtonShowEqual->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+	m_bpButtonShowDoNothing->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+	m_bpButtonShowDifferent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+	m_bpButtonShowRightNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+	m_bpButtonShowRightOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+	m_bpButtonShowCreateRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+	m_bpButtonShowUpdateRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+	m_bpButtonShowDeleteRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+	m_bpButtonShowConflict->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
 }
 
 MainDialogGenerated::~MainDialogGenerated()
@@ -1197,98 +1197,98 @@ MainDialogGenerated::~MainDialogGenerated()
 
 FolderPairPanelGenerated::FolderPairPanelGenerated( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
 {
-    wxBoxSizer* bSizer74;
-    bSizer74 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_panelLeft = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelLeft->SetMinSize( wxSize( 1, -1 ) );
-
-    wxBoxSizer* bSizer134;
-    bSizer134 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bpButtonFolderPairOptions = new wxBitmapButton( m_panelLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    m_bpButtonFolderPairOptions->SetToolTip( _("Arrange folder pair") );
-
-    bSizer134->Add( m_bpButtonFolderPairOptions, 0, wxEXPAND, 5 );
-
-    m_bpButtonRemovePair = new wxBitmapButton( m_panelLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
-
-    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_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 );
-
-    m_bpButtonSelectAltFolderLeft = new wxBitmapButton( m_panelLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    m_bpButtonSelectAltFolderLeft->SetToolTip( _("Access online storage") );
-
-    bSizer134->Add( m_bpButtonSelectAltFolderLeft, 0, wxEXPAND, 5 );
-
-
-    m_panelLeft->SetSizer( bSizer134 );
-    m_panelLeft->Layout();
-    bSizer134->Fit( m_panelLeft );
-    bSizer74->Add( m_panelLeft, 0, wxLEFT|wxEXPAND, 5 );
-
-    m_panel20 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    wxBoxSizer* bSizer95;
-    bSizer95 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bpButtonLocalCompCfg = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    m_bpButtonLocalCompCfg->SetToolTip( _("dummy") );
-
-    bSizer95->Add( m_bpButtonLocalCompCfg, 0, wxEXPAND, 5 );
-
-    m_bpButtonLocalFilter = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    m_bpButtonLocalFilter->SetToolTip( _("dummy") );
-
-    bSizer95->Add( m_bpButtonLocalFilter, 0, wxEXPAND, 5 );
-
-    m_bpButtonLocalSyncCfg = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    m_bpButtonLocalSyncCfg->SetToolTip( _("dummy") );
-
-    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_panelRight = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelRight->SetMinSize( wxSize( 1, -1 ) );
-
-    wxBoxSizer* bSizer135;
-    bSizer135 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_folderPathRight = new 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") );
-
-    bSizer135->Add( m_buttonSelectFolderRight, 0, wxEXPAND, 5 );
-
-    m_bpButtonSelectAltFolderRight = new wxBitmapButton( m_panelRight, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    m_bpButtonSelectAltFolderRight->SetToolTip( _("Access online storage") );
-
-    bSizer135->Add( m_bpButtonSelectAltFolderRight, 0, wxEXPAND, 5 );
-
-
-    m_panelRight->SetSizer( bSizer135 );
-    m_panelRight->Layout();
-    bSizer135->Fit( m_panelRight );
-    bSizer74->Add( m_panelRight, 1, wxRIGHT|wxEXPAND, 5 );
-
-
-    this->SetSizer( bSizer74 );
-    this->Layout();
-    bSizer74->Fit( this );
+	wxBoxSizer* bSizer74;
+	bSizer74 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_panelLeft = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelLeft->SetMinSize( wxSize( 1,-1 ) );
+	
+	wxBoxSizer* bSizer134;
+	bSizer134 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bpButtonFolderPairOptions = new wxBitmapButton( m_panelLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	m_bpButtonFolderPairOptions->SetToolTip( _("Arrange folder pair") );
+	
+	bSizer134->Add( m_bpButtonFolderPairOptions, 0, wxEXPAND, 5 );
+	
+	m_bpButtonRemovePair = new wxBitmapButton( m_panelLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
+	
+	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_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 );
+	
+	m_bpButtonSelectAltFolderLeft = new wxBitmapButton( m_panelLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	m_bpButtonSelectAltFolderLeft->SetToolTip( _("Access online storage") );
+	
+	bSizer134->Add( m_bpButtonSelectAltFolderLeft, 0, wxEXPAND, 5 );
+	
+	
+	m_panelLeft->SetSizer( bSizer134 );
+	m_panelLeft->Layout();
+	bSizer134->Fit( m_panelLeft );
+	bSizer74->Add( m_panelLeft, 0, wxLEFT|wxEXPAND, 5 );
+	
+	m_panel20 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer95;
+	bSizer95 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bpButtonLocalCompCfg = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	m_bpButtonLocalCompCfg->SetToolTip( _("dummy") );
+	
+	bSizer95->Add( m_bpButtonLocalCompCfg, 0, wxEXPAND, 5 );
+	
+	m_bpButtonLocalFilter = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	m_bpButtonLocalFilter->SetToolTip( _("dummy") );
+	
+	bSizer95->Add( m_bpButtonLocalFilter, 0, wxEXPAND, 5 );
+	
+	m_bpButtonLocalSyncCfg = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	m_bpButtonLocalSyncCfg->SetToolTip( _("dummy") );
+	
+	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_panelRight = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelRight->SetMinSize( wxSize( 1,-1 ) );
+	
+	wxBoxSizer* bSizer135;
+	bSizer135 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_folderPathRight = new 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") );
+	
+	bSizer135->Add( m_buttonSelectFolderRight, 0, wxEXPAND, 5 );
+	
+	m_bpButtonSelectAltFolderRight = new wxBitmapButton( m_panelRight, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	m_bpButtonSelectAltFolderRight->SetToolTip( _("Access online storage") );
+	
+	bSizer135->Add( m_bpButtonSelectAltFolderRight, 0, wxEXPAND, 5 );
+	
+	
+	m_panelRight->SetSizer( bSizer135 );
+	m_panelRight->Layout();
+	bSizer135->Fit( m_panelRight );
+	bSizer74->Add( m_panelRight, 1, wxRIGHT|wxEXPAND, 5 );
+	
+	
+	this->SetSizer( bSizer74 );
+	this->Layout();
+	bSizer74->Fit( this );
 }
 
 FolderPairPanelGenerated::~FolderPairPanelGenerated()
@@ -1297,1139 +1297,1139 @@ 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 ) );
-
-    wxBoxSizer* bSizer7;
-    bSizer7 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer190;
-    bSizer190 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxBoxSizer* bSizer1911;
-    bSizer1911 = new wxBoxSizer( wxVERTICAL );
-
-    m_staticTextFolderPairLabel = new wxStaticText( this, wxID_ANY, _("Folder pair:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextFolderPairLabel->Wrap( -1 );
-    bSizer1911->Add( m_staticTextFolderPairLabel, 0, wxALL, 5 );
-
-    m_listBoxFolderPair = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_NEEDED_SB );
-    bSizer1911->Add( m_listBoxFolderPair, 1, 0, 5 );
-
-
-    bSizer190->Add( bSizer1911, 0, wxEXPAND|wxLEFT, 5 );
-
-    m_notebook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_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 );
-
-    bSizerHeaderCompSettings = new wxBoxSizer( wxVERTICAL );
-
-    m_staticTextMainCompSettings = new wxStaticText( m_panelCompSettingsTab, wxID_ANY, _("Main settings:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextMainCompSettings->Wrap( -1 );
-    bSizerHeaderCompSettings->Add( m_staticTextMainCompSettings, 0, wxALL, 10 );
-
-    m_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 );
-
-    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 );
-
-    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* bSizer159;
-    bSizer159 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer178;
-    bSizer178 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxBoxSizer* bSizer182;
-    bSizer182 = new wxBoxSizer( wxVERTICAL );
-
-    m_staticText91 = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("Select a variant:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText91->Wrap( -1 );
-    bSizer182->Add( m_staticText91, 0, wxALL, 5 );
-
-    wxBoxSizer* bSizer2381;
-    bSizer2381 = new wxBoxSizer( wxVERTICAL );
-
-    m_toggleBtnByTimeSize = new wxToggleButton( m_panelComparisonSettings, wxID_ANY, _("File time and size"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_toggleBtnByTimeSize->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-
-    bSizer2381->Add( m_toggleBtnByTimeSize, 0, wxEXPAND|wxBOTTOM, 5 );
-
-    m_toggleBtnByContent = new wxToggleButton( m_panelComparisonSettings, wxID_ANY, _("File content"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_toggleBtnByContent->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-
-    bSizer2381->Add( m_toggleBtnByContent, 0, wxEXPAND|wxBOTTOM, 5 );
-
-    m_toggleBtnBySize = new wxToggleButton( m_panelComparisonSettings, wxID_ANY, _("File size"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_toggleBtnBySize->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-
-    bSizer2381->Add( m_toggleBtnBySize, 0, wxEXPAND, 5 );
-
-
-    bSizer182->Add( bSizer2381, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
-
-    bSizer178->Add( bSizer182, 0, wxALL, 5 );
-
-    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_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 );
-
-
-    bSizer178->Add( bSizer2371, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-
-    bSizer159->Add( bSizer178, 0, wxEXPAND, 5 );
-
-    m_staticline33 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer159->Add( m_staticline33, 0, wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer1734;
-    bSizer1734 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxBoxSizer* bSizer1721;
-    bSizer1721 = new wxBoxSizer( wxVERTICAL );
-
-    m_checkBoxSymlinksInclude = new wxCheckBox( m_panelComparisonSettings, wxID_ANY, _("Include &symbolic links:"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer1721->Add( m_checkBoxSymlinksInclude, 0, wxALL, 5 );
-
-    wxBoxSizer* bSizer176;
-    bSizer176 = new wxBoxSizer( wxVERTICAL );
-
-    m_radioBtnSymlinksFollow = new wxRadioButton( m_panelComparisonSettings, wxID_ANY, _("&Follow"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_radioBtnSymlinksFollow->SetValue( true );
-    bSizer176->Add( m_radioBtnSymlinksFollow, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
-    m_radioBtnSymlinksDirect = new wxRadioButton( m_panelComparisonSettings, wxID_ANY, _("&Direct"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer176->Add( m_radioBtnSymlinksDirect, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
-
-    bSizer1721->Add( bSizer176, 0, wxLEFT|wxEXPAND, 18 );
-
-
-    bSizer1721->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    m_hyperlink24 = new wxHyperlinkCtrl( m_panelComparisonSettings, wxID_ANY, _("More information"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    bSizer1721->Add( m_hyperlink24, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
-
-    bSizer1734->Add( bSizer1721, 0, wxALL|wxEXPAND, 5 );
-
-    m_staticline44 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer1734->Add( m_staticline44, 0, wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer1733;
-    bSizer1733 = new wxBoxSizer( wxVERTICAL );
-
-    m_staticText112 = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("&Ignore time shift [hh:mm]"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText112->Wrap( -1 );
-    bSizer1733->Add( m_staticText112, 0, wxALL, 5 );
-
-    m_textCtrlTimeShift = new wxTextCtrl( m_panelComparisonSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-    m_textCtrlTimeShift->SetToolTip( _("List of file time offsets to ignore") );
-
-    bSizer1733->Add( m_textCtrlTimeShift, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
-    wxBoxSizer* bSizer197;
-    bSizer197 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_staticText1381 = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("Example:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText1381->Wrap( -1 );
-    m_staticText1381->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-
-    bSizer197->Add( m_staticText1381, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
-    m_staticText13811 = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("1, 2, 4:30"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText13811->Wrap( -1 );
-    m_staticText13811->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-
-    bSizer197->Add( m_staticText13811, 0, wxBOTTOM|wxRIGHT, 5 );
-
-
-    bSizer1733->Add( bSizer197, 0, 0, 5 );
-
-
-    bSizer1733->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    m_hyperlink241 = new wxHyperlinkCtrl( m_panelComparisonSettings, wxID_ANY, _("Handle daylight saving time"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    bSizer1733->Add( m_hyperlink241, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
-
-    bSizer1734->Add( bSizer1733, 0, wxALL|wxEXPAND, 5 );
-
-    m_staticline441 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer1734->Add( m_staticline441, 0, wxEXPAND, 5 );
-
-
-    bSizer159->Add( bSizer1734, 0, 0, 5 );
-
-    m_staticline331 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer159->Add( m_staticline331, 0, wxEXPAND, 5 );
-
-    bSizerCompMisc = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer2781;
-    bSizer2781 = new wxBoxSizer( wxHORIZONTAL );
-
-    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_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_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 );
-
-    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_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_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 );
-
-
-    bSizerCompMisc->Add( bSizer2781, 0, wxEXPAND, 5 );
-
-    m_staticline3311 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerCompMisc->Add( m_staticline3311, 0, wxEXPAND, 5 );
-
-
-    bSizer159->Add( bSizerCompMisc, 0, wxEXPAND, 5 );
-
-
-    bSizer2561->Add( bSizer159, 0, wxEXPAND, 5 );
-
-    m_staticlinePerformance = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer2561->Add( m_staticlinePerformance, 0, wxEXPAND, 5 );
-
-    bSizerPerformance = new wxBoxSizer( wxVERTICAL );
-
-    m_staticTextPerfDeRequired = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("Requires FreeFileSync Donation Edition"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextPerfDeRequired->Wrap( -1 );
-    bSizerPerformance->Add( m_staticTextPerfDeRequired, 0, wxALL, 5 );
-
-    m_staticlinePerfDeRequired = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerPerformance->Add( m_staticlinePerfDeRequired, 0, wxEXPAND, 5 );
-
-    m_panelPerfHeader = new wxPanel( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelPerfHeader->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-
-    wxBoxSizer* bSizer2191;
-    bSizer2191 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmapPerf = new wxStaticBitmap( m_panelPerfHeader, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer2191->Add( m_bitmapPerf, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-    m_staticText13611 = new wxStaticText( m_panelPerfHeader, wxID_ANY, _("Performance improvements:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText13611->Wrap( -1 );
-    bSizer2191->Add( m_staticText13611, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
-
-
-    m_panelPerfHeader->SetSizer( bSizer2191 );
-    m_panelPerfHeader->Layout();
-    bSizer2191->Fit( m_panelPerfHeader );
-    bSizerPerformance->Add( m_panelPerfHeader, 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 );
-
-    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_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 );
-
-
-    m_scrolledWindowPerf->SetSizer( fgSizerPerf );
-    m_scrolledWindowPerf->Layout();
-    fgSizerPerf->Fit( m_scrolledWindowPerf );
-    bSizer260->Add( m_scrolledWindowPerf, 1, wxALL|wxEXPAND, 5 );
-
-    m_hyperlink1711 = new wxHyperlinkCtrl( m_panelComparisonSettings, wxID_ANY, _("How to get best performance?"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    bSizer260->Add( m_hyperlink1711, 0, wxALL, 5 );
-
-
-    bSizerPerformance->Add( bSizer260, 1, wxALL|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_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 );
-
-    bSizerHeaderFilterSettings = new wxBoxSizer( wxVERTICAL );
-
-    m_staticTextMainFilterSettings = new wxStaticText( m_panelFilterSettingsTab, wxID_ANY, _("Main settings:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextMainFilterSettings->Wrap( -1 );
-    bSizerHeaderFilterSettings->Add( m_staticTextMainFilterSettings, 0, wxALL, 10 );
-
-    m_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 );
-
-
-    bSizer278->Add( bSizerHeaderFilterSettings, 0, wxEXPAND, 5 );
-
-    m_panelFilterSettings = new wxPanel( m_panelFilterSettingsTab, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelFilterSettings->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-
-    wxBoxSizer* bSizer1591;
-    bSizer1591 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxBoxSizer* bSizer166;
-    bSizer166 = new wxBoxSizer( wxVERTICAL );
-
-
-    bSizer166->Add( 0, 10, 0, 0, 5 );
-
-    wxBoxSizer* bSizer1661;
-    bSizer1661 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmapInclude = new wxStaticBitmap( m_panelFilterSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer1661->Add( m_bitmapInclude, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
-
-    wxBoxSizer* bSizer1731;
-    bSizer1731 = new wxBoxSizer( wxVERTICAL );
-
-    m_staticText78 = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("Include:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText78->Wrap( -1 );
-    bSizer1731->Add( m_staticText78, 0, 0, 5 );
-
-    m_textCtrlInclude = new wxTextCtrl( m_panelFilterSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), wxTE_MULTILINE );
-    bSizer1731->Add( m_textCtrlInclude, 1, wxEXPAND|wxTOP, 5 );
-
-
-    bSizer1661->Add( bSizer1731, 1, wxEXPAND, 5 );
-
-
-    bSizer166->Add( bSizer1661, 3, wxEXPAND|wxLEFT, 5 );
-
-
-    bSizer166->Add( 0, 10, 0, 0, 5 );
-
-    wxBoxSizer* bSizer1651;
-    bSizer1651 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmapExclude = new wxStaticBitmap( m_panelFilterSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer1651->Add( m_bitmapExclude, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-    wxBoxSizer* bSizer1742;
-    bSizer1742 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer189;
-    bSizer189 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_staticText77 = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("Exclude:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText77->Wrap( -1 );
-    bSizer189->Add( m_staticText77, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer189->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    m_hyperlink171 = new wxHyperlinkCtrl( m_panelFilterSettings, wxID_ANY, _("Show examples"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    bSizer189->Add( m_hyperlink171, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-
-
-    bSizer1742->Add( bSizer189, 0, wxEXPAND, 5 );
-
-    m_textCtrlExclude = new wxTextCtrl( m_panelFilterSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), wxTE_MULTILINE );
-    bSizer1742->Add( m_textCtrlExclude, 1, wxEXPAND|wxTOP, 5 );
-
-
-    bSizer1651->Add( bSizer1742, 1, wxEXPAND, 5 );
-
-
-    bSizer166->Add( bSizer1651, 5, wxEXPAND|wxLEFT, 5 );
-
-    m_staticTextFilterDescr = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair."), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_staticTextFilterDescr->Wrap( -1 );
-    m_staticTextFilterDescr->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-
-    bSizer166->Add( m_staticTextFilterDescr, 0, wxALL, 10 );
-
-
-    bSizer1591->Add( bSizer166, 1, wxEXPAND, 5 );
-
-    m_staticline24 = new wxStaticLine( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer1591->Add( m_staticline24, 0, wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer160;
-    bSizer160 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer168;
-    bSizer168 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmapFilterSize = new wxStaticBitmap( m_panelFilterSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer168->Add( m_bitmapFilterSize, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
-
-    wxBoxSizer* bSizer158;
-    bSizer158 = new wxBoxSizer( wxVERTICAL );
-
-    m_staticText80 = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("File size:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText80->Wrap( -1 );
-    bSizer158->Add( m_staticText80, 0, wxBOTTOM, 5 );
-
-    wxBoxSizer* bSizer162;
-    bSizer162 = new wxBoxSizer( wxVERTICAL );
-
-    m_staticText101 = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("Minimum:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText101->Wrap( -1 );
-    bSizer162->Add( m_staticText101, 0, wxBOTTOM, 2 );
-
-    m_spinCtrlMinSize = new wxSpinCtrl( m_panelFilterSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
-    bSizer162->Add( m_spinCtrlMinSize, 0, wxEXPAND, 5 );
-
-    wxArrayString m_choiceUnitMinSizeChoices;
-    m_choiceUnitMinSize = new wxChoice( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitMinSizeChoices, 0 );
-    m_choiceUnitMinSize->SetSelection( 0 );
-    bSizer162->Add( m_choiceUnitMinSize, 0, wxEXPAND, 5 );
-
-
-    bSizer158->Add( bSizer162, 0, wxBOTTOM|wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer163;
-    bSizer163 = new wxBoxSizer( wxVERTICAL );
-
-    m_staticText102 = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("Maximum:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText102->Wrap( -1 );
-    bSizer163->Add( m_staticText102, 0, wxBOTTOM, 2 );
-
-    m_spinCtrlMaxSize = new wxSpinCtrl( m_panelFilterSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
-    bSizer163->Add( m_spinCtrlMaxSize, 0, wxEXPAND, 5 );
-
-    wxArrayString m_choiceUnitMaxSizeChoices;
-    m_choiceUnitMaxSize = new wxChoice( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitMaxSizeChoices, 0 );
-    m_choiceUnitMaxSize->SetSelection( 0 );
-    bSizer163->Add( m_choiceUnitMaxSize, 0, wxEXPAND, 5 );
-
-
-    bSizer158->Add( bSizer163, 0, wxEXPAND, 5 );
-
-
-    bSizer168->Add( bSizer158, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-
-
-    bSizer160->Add( bSizer168, 2, wxEXPAND|wxALL, 5 );
-
-    m_staticline23 = new wxStaticLine( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer160->Add( m_staticline23, 0, wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer167;
-    bSizer167 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmapFilterDate = new wxStaticBitmap( m_panelFilterSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer167->Add( m_bitmapFilterDate, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-    wxBoxSizer* bSizer165;
-    bSizer165 = new wxBoxSizer( wxVERTICAL );
-
-    m_staticText79 = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("Time span:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText79->Wrap( -1 );
-    bSizer165->Add( m_staticText79, 0, wxBOTTOM, 5 );
-
-    m_spinCtrlTimespan = new wxSpinCtrl( m_panelFilterSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
-    bSizer165->Add( m_spinCtrlTimespan, 0, wxEXPAND, 5 );
-
-    wxArrayString m_choiceUnitTimespanChoices;
-    m_choiceUnitTimespan = new wxChoice( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitTimespanChoices, 0 );
-    m_choiceUnitTimespan->SetSelection( 0 );
-    bSizer165->Add( m_choiceUnitTimespan, 0, wxEXPAND, 5 );
-
-
-    bSizer167->Add( bSizer165, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-
-
-    bSizer160->Add( bSizer167, 1, wxEXPAND|wxALL, 5 );
-
-    m_staticline231 = new wxStaticLine( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer160->Add( m_staticline231, 0, wxEXPAND, 5 );
-
-    m_buttonClear = new wxButton( m_panelFilterSettings, wxID_ANY, _("C&lear"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer160->Add( m_buttonClear, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 10 );
-
-
-    bSizer1591->Add( bSizer160, 0, wxEXPAND, 5 );
-
-
-    m_panelFilterSettings->SetSizer( bSizer1591 );
-    m_panelFilterSettings->Layout();
-    bSizer1591->Fit( m_panelFilterSettings );
-    bSizer278->Add( m_panelFilterSettings, 1, wxEXPAND, 5 );
-
-
-    m_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 );
-
-    bSizerHeaderSyncSettings = new wxBoxSizer( wxVERTICAL );
-
-    m_staticTextMainSyncSettings = new wxStaticText( m_panelSyncSettingsTab, wxID_ANY, _("Main settings:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextMainSyncSettings->Wrap( -1 );
-    bSizerHeaderSyncSettings->Add( m_staticTextMainSyncSettings, 0, wxALL, 10 );
-
-    m_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 );
-
-
-    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 ) );
-
-    wxBoxSizer* bSizer232;
-    bSizer232 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer237;
-    bSizer237 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxBoxSizer* bSizer235;
-    bSizer235 = new wxBoxSizer( wxVERTICAL );
-
-    m_staticText86 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Select a variant:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText86->Wrap( -1 );
-    bSizer235->Add( m_staticText86, 0, wxALL, 5 );
-
-    wxBoxSizer* bSizer236;
-    bSizer236 = new wxBoxSizer( wxVERTICAL );
-
-    m_toggleBtnTwoWay = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_toggleBtnTwoWay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-
-    bSizer236->Add( m_toggleBtnTwoWay, 0, wxBOTTOM|wxEXPAND, 5 );
-
-    m_toggleBtnMirror = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_toggleBtnMirror->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-
-    bSizer236->Add( m_toggleBtnMirror, 0, wxEXPAND|wxBOTTOM, 5 );
-
-    m_toggleBtnUpdate = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_toggleBtnUpdate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-
-    bSizer236->Add( m_toggleBtnUpdate, 0, wxEXPAND|wxBOTTOM, 5 );
-
-    m_toggleBtnCustom = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_toggleBtnCustom->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-
-    bSizer236->Add( m_toggleBtnCustom, 0, wxEXPAND, 5 );
-
-
-    bSizer235->Add( bSizer236, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
-
-    bSizer237->Add( bSizer235, 0, wxALL, 5 );
-
-
-    bSizer237->Add( 10, 0, 0, 0, 5 );
-
-    wxBoxSizer* bSizer238;
-    bSizer238 = new wxBoxSizer( wxVERTICAL );
-
-
-    bSizer238->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    bSizerSyncDirHolder = new wxBoxSizer( wxHORIZONTAL );
-
-    bSizerSyncDirections = new wxBoxSizer( wxVERTICAL );
-
-    m_staticTextCategory = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Category"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextCategory->Wrap( -1 );
-    bSizerSyncDirections->Add( m_staticTextCategory, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    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") );
-
-    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") );
-
-    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") );
-
-    ffgSizer11->Add( m_bitmapDifferent, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_bitmapConflict = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_bitmapConflict->SetToolTip( _("Conflict/item cannot be categorized") );
-
-    ffgSizer11->Add( m_bitmapConflict, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_bitmapRightNewer = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_bitmapRightNewer->SetToolTip( _("Right side is newer") );
-
-    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") );
-
-    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 );
-    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 );
-    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 );
-    ffgSizer11->Add( m_bpButtonDifferent, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_bpButtonConflict = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    ffgSizer11->Add( m_bpButtonConflict, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_bpButtonRightNewer = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    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 );
-    ffgSizer11->Add( m_bpButtonRightOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizerSyncDirections->Add( ffgSizer11, 0, 0, 5 );
-
-    m_staticText120 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Action"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText120->Wrap( -1 );
-    bSizerSyncDirections->Add( m_staticText120, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP, 5 );
-
-
-    bSizerSyncDirHolder->Add( bSizerSyncDirections, 0, 0, 5 );
-
-    bSizerDatabase = new wxWrapSizer( wxVERTICAL );
-
-    m_bitmapDatabase = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizerDatabase->Add( m_bitmapDatabase, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-
-    bSizerDatabase->Add( 0, 3, 0, 0, 5 );
-
-    m_staticText145 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("sync.ffs_db"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText145->Wrap( -1 );
-    m_staticText145->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_SWISS, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL, false, wxT("Arial") ) );
-    m_staticText145->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-
-    bSizerDatabase->Add( m_staticText145, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-
-    bSizerSyncDirHolder->Add( bSizerDatabase, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_staticTextSyncVarDescription = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_staticTextSyncVarDescription->Wrap( -1 );
-    m_staticTextSyncVarDescription->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-
-    bSizerSyncDirHolder->Add( m_staticTextSyncVarDescription, 0, wxALL|wxALIGN_CENTER_VERTICAL, 10 );
-
-
-    bSizer238->Add( bSizerSyncDirHolder, 0, wxTOP|wxBOTTOM|wxRIGHT, 10 );
-
-
-    bSizer238->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    m_staticline431 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer238->Add( m_staticline431, 0, wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer201;
-    bSizer201 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_staticline72 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer201->Add( m_staticline72, 0, wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer249;
-    bSizer249 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_checkBoxDetectMove = new wxCheckBox( m_panelSyncSettings, wxID_ANY, _("Detect moved files"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_checkBoxDetectMove->SetToolTip( _("- Not supported by all file systems\n- Requires and creates database files\n- Detection not available for first sync") );
-
-    bSizer249->Add( m_checkBoxDetectMove, 0, wxALL|wxEXPAND, 5 );
-
-    m_hyperlink242 = new wxHyperlinkCtrl( m_panelSyncSettings, wxID_ANY, _("More information"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    bSizer249->Add( m_hyperlink242, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 );
-
-
-    bSizer201->Add( bSizer249, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer238->Add( bSizer201, 0, 0, 5 );
-
-
-    bSizer237->Add( bSizer238, 1, 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 );
-
-    bSizer2361 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxBoxSizer* bSizer202;
-    bSizer202 = new wxBoxSizer( wxVERTICAL );
-
-    m_staticText87 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Delete files:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText87->Wrap( -1 );
-    bSizer202->Add( m_staticText87, 0, wxALL, 5 );
-
-    wxBoxSizer* bSizer234;
-    bSizer234 = new wxBoxSizer( wxVERTICAL );
-
-    m_toggleBtnRecycler = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("&Recycle bin"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer234->Add( m_toggleBtnRecycler, 0, wxEXPAND, 5 );
-
-    m_toggleBtnPermanent = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("&Permanent"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer234->Add( m_toggleBtnPermanent, 0, wxEXPAND, 5 );
-
-    m_toggleBtnVersioning = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("&Versioning"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer234->Add( m_toggleBtnVersioning, 0, wxEXPAND, 5 );
-
-
-    bSizer202->Add( bSizer234, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
-
-    bSizer2361->Add( bSizer202, 0, wxALL, 5 );
-
-    bSizerVersioningHolder = new wxBoxSizer( wxVERTICAL );
-
-
-    bSizerVersioningHolder->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    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_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 );
-
-
-    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 ) );
-
-    wxBoxSizer* bSizer191;
-    bSizer191 = new wxBoxSizer( wxVERTICAL );
-
-
-    bSizer191->Add( 0, 5, 0, 0, 5 );
-
-    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 );
-
-    wxBoxSizer* bSizer253;
-    bSizer253 = new wxBoxSizer( wxVERTICAL );
-
-    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 ) );
-
-    bSizer254->Add( m_staticText155, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
-
-    bSizer254->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    m_hyperlink243 = new wxHyperlinkCtrl( m_panelVersioning, wxID_ANY, _("Show examples"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    bSizer254->Add( m_hyperlink243, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-
-
-    bSizer253->Add( bSizer254, 0, wxEXPAND|wxBOTTOM, 5 );
-
-    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_buttonSelectVersioningFolder = new wxButton( m_panelVersioning, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_buttonSelectVersioningFolder->SetToolTip( _("Select a folder") );
-
-    bSizer156->Add( m_buttonSelectVersioningFolder, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_bpButtonSelectVersioningAltFolder = new wxBitmapButton( m_panelVersioning, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    m_bpButtonSelectVersioningAltFolder->SetToolTip( _("Access online storage") );
-
-    bSizer156->Add( m_bpButtonSelectVersioningAltFolder, 0, wxEXPAND, 5 );
-
-
-    bSizer253->Add( bSizer156, 0, wxEXPAND, 5 );
-
-
-    bSizer252->Add( bSizer253, 1, wxRIGHT, 5 );
-
-
-    bSizer191->Add( bSizer252, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
-
-    wxBoxSizer* bSizer198;
-    bSizer198 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxBoxSizer* bSizer255;
-    bSizer255 = new wxBoxSizer( wxVERTICAL );
-
-    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 );
-
-    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 );
-
-    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 ) );
-
-    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 ) );
-
-    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 ) );
-
-    bSizer257->Add( m_staticTextNamingCvtPart3, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer255->Add( bSizer257, 0, wxBOTTOM|wxRIGHT|wxLEFT, 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 );
-
-    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 );
-
-    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_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_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_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 );
-
-
-    bSizer198->Add( bSizer258, 0, wxALL, 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 );
-
-
-    bSizerVersioningHolder->Add( 0, 0, 1, wxEXPAND, 5 );
-
-
-    bSizer2361->Add( bSizerVersioningHolder, 1, wxALIGN_CENTER_VERTICAL, 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 );
-
-    bSizerSyncMisc = 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 ) );
-
-    wxBoxSizer* bSizer1912;
-    bSizer1912 = new wxBoxSizer( wxVERTICAL );
-
-    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|wxRIGHT, 5 );
-
-    m_checkBoxSaveLog = new wxCheckBox( m_panelLogfile, wxID_ANY, _("&Override default log path:"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer279->Add( m_checkBoxSaveLog, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-    m_buttonSelectLogFolder = new wxButton( m_panelLogfile, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_buttonSelectLogFolder->SetToolTip( _("Select a folder") );
-
-    bSizer279->Add( m_buttonSelectLogFolder, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_bpButtonSelectAltLogFolder = new wxBitmapButton( m_panelLogfile, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    m_bpButtonSelectAltLogFolder->SetToolTip( _("Access online storage") );
-
-    bSizer279->Add( m_bpButtonSelectAltLogFolder, 0, wxEXPAND, 5 );
-
-
-    bSizer1912->Add( bSizer279, 0, wxEXPAND, 5 );
-
-    m_logFolderPath = new fff::FolderHistoryBox( m_panelLogfile, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
-    bSizer1912->Add( m_logFolderPath, 0, wxEXPAND|wxTOP, 5 );
-
-
-    m_panelLogfile->SetSizer( bSizer1912 );
-    m_panelLogfile->Layout();
-    bSizer1912->Fit( m_panelLogfile );
-    bSizer2372->Add( m_panelLogfile, 1, 0, 5 );
-
-
-    bSizerSyncMisc->Add( bSizer2372, 1, wxALL, 10 );
-
-    m_staticline57 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizerSyncMisc->Add( m_staticline57, 0, wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer247;
-    bSizer247 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer251;
-    bSizer251 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_staticText89 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Run a command:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText89->Wrap( -1 );
-    bSizer251->Add( m_staticText89, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
-
-    bSizer251->Add( 0, 0, 1, 0, 5 );
-
-    wxArrayString m_choicePostSyncConditionChoices;
-    m_choicePostSyncCondition = new wxChoice( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choicePostSyncConditionChoices, 0 );
-    m_choicePostSyncCondition->SetSelection( 0 );
-    bSizer251->Add( m_choicePostSyncCondition, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer247->Add( bSizer251, 0, wxEXPAND, 5 );
-
-    m_comboBoxPostSyncCommand = new fff::CommandBox( m_panelSyncSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
-    bSizer247->Add( m_comboBoxPostSyncCommand, 0, wxTOP|wxEXPAND, 5 );
-
-
-    bSizerSyncMisc->Add( bSizer247, 1, wxALL, 10 );
-
-
-    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_panelSyncSettingsTab->SetSizer( bSizer276 );
-    m_panelSyncSettingsTab->Layout();
-    bSizer276->Fit( m_panelSyncSettingsTab );
-    m_notebook->AddPage( m_panelSyncSettingsTab, _("dummy"), true );
-
-    bSizer190->Add( m_notebook, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
-
-
-    bSizer7->Add( bSizer190, 1, wxEXPAND, 5 );
-
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
-
-    m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_buttonOkay->SetDefault();
-    m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-
-    bSizerStdButtons->Add( m_buttonOkay, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-
-
-    bSizer7->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
-
-
-    this->SetSizer( bSizer7 );
-    this->Layout();
-    bSizer7->Fit( this );
-
-    this->Centre( wxBOTH );
-
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( ConfigDlgGenerated::OnClose ) );
-    m_listBoxFolderPair->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( ConfigDlgGenerated::onListBoxKeyEvent ), NULL, this );
-    m_listBoxFolderPair->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnSelectFolderPair ), NULL, this );
-    m_checkBoxUseLocalCmpOptions->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleLocalCompSettings ), NULL, this );
-    m_toggleBtnByTimeSize->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnCompByTimeSizeDouble ), NULL, this );
-    m_toggleBtnByTimeSize->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnCompByTimeSize ), NULL, this );
-    m_toggleBtnByContent->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnCompByContentDouble ), NULL, this );
-    m_toggleBtnByContent->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnCompByContent ), NULL, this );
-    m_toggleBtnBySize->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnCompBySizeDouble ), NULL, this );
-    m_toggleBtnBySize->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnCompBySize ), NULL, this );
-    m_checkBoxSymlinksInclude->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeCompOption ), NULL, this );
-    m_hyperlink24->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( ConfigDlgGenerated::OnHelpComparisonSettings ), NULL, this );
-    m_textCtrlTimeShift->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( ConfigDlgGenerated::onlTimeShiftKeyDown ), NULL, this );
-    m_hyperlink241->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( ConfigDlgGenerated::OnHelpTimeShift ), NULL, this );
-    m_checkBoxIgnoreErrors->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleIgnoreErrors ), NULL, this );
-    m_checkBoxAutoRetry->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleAutoRetry ), NULL, this );
-    m_hyperlink1711->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( ConfigDlgGenerated::OnHelpPerformance ), NULL, this );
-    m_textCtrlInclude->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeFilterOption ), NULL, this );
-    m_hyperlink171->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( ConfigDlgGenerated::OnHelpShowExamples ), NULL, this );
-    m_textCtrlExclude->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeFilterOption ), NULL, this );
-    m_choiceUnitMinSize->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeFilterOption ), NULL, this );
-    m_choiceUnitMaxSize->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeFilterOption ), NULL, this );
-    m_choiceUnitTimespan->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeFilterOption ), NULL, this );
-    m_buttonClear->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnFilterReset ), NULL, this );
-    m_checkBoxUseLocalSyncOptions->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleLocalSyncSettings ), NULL, this );
-    m_toggleBtnTwoWay->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnSyncTwoWayDouble ), NULL, this );
-    m_toggleBtnTwoWay->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnSyncTwoWay ), NULL, this );
-    m_toggleBtnMirror->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnSyncMirrorDouble ), NULL, this );
-    m_toggleBtnMirror->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnSyncMirror ), NULL, this );
-    m_toggleBtnUpdate->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnSyncUpdateDouble ), NULL, this );
-    m_toggleBtnUpdate->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnSyncUpdate ), NULL, this );
-    m_toggleBtnCustom->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnSyncCustomDouble ), NULL, this );
-    m_toggleBtnCustom->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnSyncCustom ), NULL, this );
-    m_bpButtonLeftOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnExLeftSideOnly ), NULL, this );
-    m_bpButtonLeftNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnLeftNewer ), NULL, this );
-    m_bpButtonDifferent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnDifferent ), NULL, this );
-    m_bpButtonConflict->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnConflict ), NULL, this );
-    m_bpButtonRightNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnRightNewer ), NULL, this );
-    m_bpButtonRightOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnExRightSideOnly ), NULL, this );
-    m_checkBoxDetectMove->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleDetectMovedFiles ), NULL, this );
-    m_hyperlink242->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( ConfigDlgGenerated::OnHelpDetectMovedFiles ), NULL, this );
-    m_toggleBtnRecycler->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnDeletionRecycler ), NULL, this );
-    m_toggleBtnPermanent->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnDeletionPermanent ), NULL, this );
-    m_toggleBtnVersioning->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnDeletionVersioning ), NULL, this );
-    m_hyperlink243->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( ConfigDlgGenerated::OnHelpVersioning ), 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_checkBoxSaveLog->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleSaveLogfile ), NULL, this );
-    m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnOkay ), NULL, this );
-    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnCancel ), NULL, this );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	
+	wxBoxSizer* bSizer7;
+	bSizer7 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer190;
+	bSizer190 = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bSizer1911;
+	bSizer1911 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticTextFolderPairLabel = new wxStaticText( this, wxID_ANY, _("Folder pair:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextFolderPairLabel->Wrap( -1 );
+	bSizer1911->Add( m_staticTextFolderPairLabel, 0, wxALL, 5 );
+	
+	m_listBoxFolderPair = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_NEEDED_SB ); 
+	bSizer1911->Add( m_listBoxFolderPair, 1, 0, 5 );
+	
+	
+	bSizer190->Add( bSizer1911, 0, wxEXPAND|wxLEFT, 5 );
+	
+	m_notebook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_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 );
+	
+	bSizerHeaderCompSettings = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticTextMainCompSettings = new wxStaticText( m_panelCompSettingsTab, wxID_ANY, _("Main settings:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextMainCompSettings->Wrap( -1 );
+	bSizerHeaderCompSettings->Add( m_staticTextMainCompSettings, 0, wxALL, 10 );
+	
+	m_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 );
+	
+	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 );
+	
+	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* bSizer159;
+	bSizer159 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer178;
+	bSizer178 = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bSizer182;
+	bSizer182 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticText91 = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("Select a variant:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText91->Wrap( -1 );
+	bSizer182->Add( m_staticText91, 0, wxALL, 5 );
+	
+	wxBoxSizer* bSizer2381;
+	bSizer2381 = new wxBoxSizer( wxVERTICAL );
+	
+	m_toggleBtnByTimeSize = new wxToggleButton( m_panelComparisonSettings, wxID_ANY, _("File time and size"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_toggleBtnByTimeSize->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	
+	bSizer2381->Add( m_toggleBtnByTimeSize, 0, wxEXPAND|wxBOTTOM, 5 );
+	
+	m_toggleBtnByContent = new wxToggleButton( m_panelComparisonSettings, wxID_ANY, _("File content"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_toggleBtnByContent->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	
+	bSizer2381->Add( m_toggleBtnByContent, 0, wxEXPAND|wxBOTTOM, 5 );
+	
+	m_toggleBtnBySize = new wxToggleButton( m_panelComparisonSettings, wxID_ANY, _("File size"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_toggleBtnBySize->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	
+	bSizer2381->Add( m_toggleBtnBySize, 0, wxEXPAND, 5 );
+	
+	
+	bSizer182->Add( bSizer2381, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	
+	bSizer178->Add( bSizer182, 0, wxALL, 5 );
+	
+	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_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 );
+	
+	
+	bSizer178->Add( bSizer2371, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	
+	bSizer159->Add( bSizer178, 0, wxEXPAND, 5 );
+	
+	m_staticline33 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer159->Add( m_staticline33, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer1734;
+	bSizer1734 = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bSizer1721;
+	bSizer1721 = new wxBoxSizer( wxVERTICAL );
+	
+	m_checkBoxSymlinksInclude = new wxCheckBox( m_panelComparisonSettings, wxID_ANY, _("Include &symbolic links:"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer1721->Add( m_checkBoxSymlinksInclude, 0, wxALL, 5 );
+	
+	wxBoxSizer* bSizer176;
+	bSizer176 = new wxBoxSizer( wxVERTICAL );
+	
+	m_radioBtnSymlinksFollow = new wxRadioButton( m_panelComparisonSettings, wxID_ANY, _("&Follow"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_radioBtnSymlinksFollow->SetValue( true ); 
+	bSizer176->Add( m_radioBtnSymlinksFollow, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	m_radioBtnSymlinksDirect = new wxRadioButton( m_panelComparisonSettings, wxID_ANY, _("&Direct"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer176->Add( m_radioBtnSymlinksDirect, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	
+	bSizer1721->Add( bSizer176, 0, wxLEFT|wxEXPAND, 18 );
+	
+	
+	bSizer1721->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_hyperlink24 = new wxHyperlinkCtrl( m_panelComparisonSettings, wxID_ANY, _("More information"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	bSizer1721->Add( m_hyperlink24, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	
+	bSizer1734->Add( bSizer1721, 0, wxALL|wxEXPAND, 5 );
+	
+	m_staticline44 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer1734->Add( m_staticline44, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer1733;
+	bSizer1733 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticText112 = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("&Ignore time shift [hh:mm]"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText112->Wrap( -1 );
+	bSizer1733->Add( m_staticText112, 0, wxALL, 5 );
+	
+	m_textCtrlTimeShift = new wxTextCtrl( m_panelComparisonSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_textCtrlTimeShift->SetToolTip( _("List of file time offsets to ignore") );
+	
+	bSizer1733->Add( m_textCtrlTimeShift, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	wxBoxSizer* bSizer197;
+	bSizer197 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_staticText1381 = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("Example:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText1381->Wrap( -1 );
+	m_staticText1381->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	
+	bSizer197->Add( m_staticText1381, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	m_staticText13811 = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("1, 2, 4:30"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText13811->Wrap( -1 );
+	m_staticText13811->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	
+	bSizer197->Add( m_staticText13811, 0, wxBOTTOM|wxRIGHT, 5 );
+	
+	
+	bSizer1733->Add( bSizer197, 0, 0, 5 );
+	
+	
+	bSizer1733->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_hyperlink241 = new wxHyperlinkCtrl( m_panelComparisonSettings, wxID_ANY, _("Handle daylight saving time"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	bSizer1733->Add( m_hyperlink241, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	
+	bSizer1734->Add( bSizer1733, 0, wxALL|wxEXPAND, 5 );
+	
+	m_staticline441 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer1734->Add( m_staticline441, 0, wxEXPAND, 5 );
+	
+	
+	bSizer159->Add( bSizer1734, 0, 0, 5 );
+	
+	m_staticline331 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer159->Add( m_staticline331, 0, wxEXPAND, 5 );
+	
+	bSizerCompMisc = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer2781;
+	bSizer2781 = new wxBoxSizer( wxHORIZONTAL );
+	
+	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_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_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 );
+	
+	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_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_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 );
+	
+	
+	bSizerCompMisc->Add( bSizer2781, 0, wxEXPAND, 5 );
+	
+	m_staticline3311 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerCompMisc->Add( m_staticline3311, 0, wxEXPAND, 5 );
+	
+	
+	bSizer159->Add( bSizerCompMisc, 0, wxEXPAND, 5 );
+	
+	
+	bSizer2561->Add( bSizer159, 0, wxEXPAND, 5 );
+	
+	m_staticlinePerformance = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer2561->Add( m_staticlinePerformance, 0, wxEXPAND, 5 );
+	
+	bSizerPerformance = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticTextPerfDeRequired = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("Requires FreeFileSync Donation Edition"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextPerfDeRequired->Wrap( -1 );
+	bSizerPerformance->Add( m_staticTextPerfDeRequired, 0, wxALL, 5 );
+	
+	m_staticlinePerfDeRequired = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerPerformance->Add( m_staticlinePerfDeRequired, 0, wxEXPAND, 5 );
+	
+	m_panelPerfHeader = new wxPanel( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelPerfHeader->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	
+	wxBoxSizer* bSizer2191;
+	bSizer2191 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapPerf = new wxStaticBitmap( m_panelPerfHeader, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer2191->Add( m_bitmapPerf, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_staticText13611 = new wxStaticText( m_panelPerfHeader, wxID_ANY, _("Performance improvements:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText13611->Wrap( -1 );
+	bSizer2191->Add( m_staticText13611, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 10 );
+	
+	
+	m_panelPerfHeader->SetSizer( bSizer2191 );
+	m_panelPerfHeader->Layout();
+	bSizer2191->Fit( m_panelPerfHeader );
+	bSizerPerformance->Add( m_panelPerfHeader, 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 );
+	
+	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_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 );
+	
+	
+	m_scrolledWindowPerf->SetSizer( fgSizerPerf );
+	m_scrolledWindowPerf->Layout();
+	fgSizerPerf->Fit( m_scrolledWindowPerf );
+	bSizer260->Add( m_scrolledWindowPerf, 1, wxALL|wxEXPAND, 5 );
+	
+	m_hyperlink1711 = new wxHyperlinkCtrl( m_panelComparisonSettings, wxID_ANY, _("How to get best performance?"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	bSizer260->Add( m_hyperlink1711, 0, wxALL, 5 );
+	
+	
+	bSizerPerformance->Add( bSizer260, 1, wxALL|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_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 );
+	
+	bSizerHeaderFilterSettings = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticTextMainFilterSettings = new wxStaticText( m_panelFilterSettingsTab, wxID_ANY, _("Main settings:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextMainFilterSettings->Wrap( -1 );
+	bSizerHeaderFilterSettings->Add( m_staticTextMainFilterSettings, 0, wxALL, 10 );
+	
+	m_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 );
+	
+	
+	bSizer278->Add( bSizerHeaderFilterSettings, 0, wxEXPAND, 5 );
+	
+	m_panelFilterSettings = new wxPanel( m_panelFilterSettingsTab, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelFilterSettings->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	
+	wxBoxSizer* bSizer1591;
+	bSizer1591 = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bSizer166;
+	bSizer166 = new wxBoxSizer( wxVERTICAL );
+	
+	
+	bSizer166->Add( 0, 10, 0, 0, 5 );
+	
+	wxBoxSizer* bSizer1661;
+	bSizer1661 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapInclude = new wxStaticBitmap( m_panelFilterSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer1661->Add( m_bitmapInclude, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+	
+	wxBoxSizer* bSizer1731;
+	bSizer1731 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticText78 = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("Include:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText78->Wrap( -1 );
+	bSizer1731->Add( m_staticText78, 0, 0, 5 );
+	
+	m_textCtrlInclude = new wxTextCtrl( m_panelFilterSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE );
+	bSizer1731->Add( m_textCtrlInclude, 1, wxEXPAND|wxTOP, 5 );
+	
+	
+	bSizer1661->Add( bSizer1731, 1, wxEXPAND, 5 );
+	
+	
+	bSizer166->Add( bSizer1661, 3, wxEXPAND|wxLEFT, 5 );
+	
+	
+	bSizer166->Add( 0, 10, 0, 0, 5 );
+	
+	wxBoxSizer* bSizer1651;
+	bSizer1651 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapExclude = new wxStaticBitmap( m_panelFilterSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer1651->Add( m_bitmapExclude, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	wxBoxSizer* bSizer1742;
+	bSizer1742 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer189;
+	bSizer189 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_staticText77 = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("Exclude:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText77->Wrap( -1 );
+	bSizer189->Add( m_staticText77, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer189->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_hyperlink171 = new wxHyperlinkCtrl( m_panelFilterSettings, wxID_ANY, _("Show examples"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	bSizer189->Add( m_hyperlink171, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+	
+	
+	bSizer1742->Add( bSizer189, 0, wxEXPAND, 5 );
+	
+	m_textCtrlExclude = new wxTextCtrl( m_panelFilterSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE );
+	bSizer1742->Add( m_textCtrlExclude, 1, wxEXPAND|wxTOP, 5 );
+	
+	
+	bSizer1651->Add( bSizer1742, 1, wxEXPAND, 5 );
+	
+	
+	bSizer166->Add( bSizer1651, 5, wxEXPAND|wxLEFT, 5 );
+	
+	m_staticTextFilterDescr = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair."), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_staticTextFilterDescr->Wrap( -1 );
+	m_staticTextFilterDescr->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	
+	bSizer166->Add( m_staticTextFilterDescr, 0, wxALL, 10 );
+	
+	
+	bSizer1591->Add( bSizer166, 1, wxEXPAND, 5 );
+	
+	m_staticline24 = new wxStaticLine( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer1591->Add( m_staticline24, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer160;
+	bSizer160 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer168;
+	bSizer168 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapFilterSize = new wxStaticBitmap( m_panelFilterSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer168->Add( m_bitmapFilterSize, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+	
+	wxBoxSizer* bSizer158;
+	bSizer158 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticText80 = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("File size:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText80->Wrap( -1 );
+	bSizer158->Add( m_staticText80, 0, wxBOTTOM, 5 );
+	
+	wxBoxSizer* bSizer162;
+	bSizer162 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticText101 = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("Minimum:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText101->Wrap( -1 );
+	bSizer162->Add( m_staticText101, 0, wxBOTTOM, 2 );
+	
+	m_spinCtrlMinSize = new wxSpinCtrl( m_panelFilterSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
+	bSizer162->Add( m_spinCtrlMinSize, 0, wxEXPAND, 5 );
+	
+	wxArrayString m_choiceUnitMinSizeChoices;
+	m_choiceUnitMinSize = new wxChoice( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitMinSizeChoices, 0 );
+	m_choiceUnitMinSize->SetSelection( 0 );
+	bSizer162->Add( m_choiceUnitMinSize, 0, wxEXPAND, 5 );
+	
+	
+	bSizer158->Add( bSizer162, 0, wxBOTTOM|wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer163;
+	bSizer163 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticText102 = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("Maximum:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText102->Wrap( -1 );
+	bSizer163->Add( m_staticText102, 0, wxBOTTOM, 2 );
+	
+	m_spinCtrlMaxSize = new wxSpinCtrl( m_panelFilterSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
+	bSizer163->Add( m_spinCtrlMaxSize, 0, wxEXPAND, 5 );
+	
+	wxArrayString m_choiceUnitMaxSizeChoices;
+	m_choiceUnitMaxSize = new wxChoice( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitMaxSizeChoices, 0 );
+	m_choiceUnitMaxSize->SetSelection( 0 );
+	bSizer163->Add( m_choiceUnitMaxSize, 0, wxEXPAND, 5 );
+	
+	
+	bSizer158->Add( bSizer163, 0, wxEXPAND, 5 );
+	
+	
+	bSizer168->Add( bSizer158, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	
+	
+	bSizer160->Add( bSizer168, 2, wxEXPAND|wxALL, 5 );
+	
+	m_staticline23 = new wxStaticLine( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer160->Add( m_staticline23, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer167;
+	bSizer167 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapFilterDate = new wxStaticBitmap( m_panelFilterSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer167->Add( m_bitmapFilterDate, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	wxBoxSizer* bSizer165;
+	bSizer165 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticText79 = new wxStaticText( m_panelFilterSettings, wxID_ANY, _("Time span:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText79->Wrap( -1 );
+	bSizer165->Add( m_staticText79, 0, wxBOTTOM, 5 );
+	
+	m_spinCtrlTimespan = new wxSpinCtrl( m_panelFilterSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
+	bSizer165->Add( m_spinCtrlTimespan, 0, wxEXPAND, 5 );
+	
+	wxArrayString m_choiceUnitTimespanChoices;
+	m_choiceUnitTimespan = new wxChoice( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitTimespanChoices, 0 );
+	m_choiceUnitTimespan->SetSelection( 0 );
+	bSizer165->Add( m_choiceUnitTimespan, 0, wxEXPAND, 5 );
+	
+	
+	bSizer167->Add( bSizer165, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	
+	
+	bSizer160->Add( bSizer167, 1, wxEXPAND|wxALL, 5 );
+	
+	m_staticline231 = new wxStaticLine( m_panelFilterSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer160->Add( m_staticline231, 0, wxEXPAND, 5 );
+	
+	m_buttonClear = new wxButton( m_panelFilterSettings, wxID_ANY, _("C&lear"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer160->Add( m_buttonClear, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 10 );
+	
+	
+	bSizer1591->Add( bSizer160, 0, wxEXPAND, 5 );
+	
+	
+	m_panelFilterSettings->SetSizer( bSizer1591 );
+	m_panelFilterSettings->Layout();
+	bSizer1591->Fit( m_panelFilterSettings );
+	bSizer278->Add( m_panelFilterSettings, 1, wxEXPAND, 5 );
+	
+	
+	m_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 );
+	
+	bSizerHeaderSyncSettings = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticTextMainSyncSettings = new wxStaticText( m_panelSyncSettingsTab, wxID_ANY, _("Main settings:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextMainSyncSettings->Wrap( -1 );
+	bSizerHeaderSyncSettings->Add( m_staticTextMainSyncSettings, 0, wxALL, 10 );
+	
+	m_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 );
+	
+	
+	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 ) );
+	
+	wxBoxSizer* bSizer232;
+	bSizer232 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer237;
+	bSizer237 = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bSizer235;
+	bSizer235 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticText86 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Select a variant:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText86->Wrap( -1 );
+	bSizer235->Add( m_staticText86, 0, wxALL, 5 );
+	
+	wxBoxSizer* bSizer236;
+	bSizer236 = new wxBoxSizer( wxVERTICAL );
+	
+	m_toggleBtnTwoWay = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_toggleBtnTwoWay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	
+	bSizer236->Add( m_toggleBtnTwoWay, 0, wxBOTTOM|wxEXPAND, 5 );
+	
+	m_toggleBtnMirror = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_toggleBtnMirror->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	
+	bSizer236->Add( m_toggleBtnMirror, 0, wxEXPAND|wxBOTTOM, 5 );
+	
+	m_toggleBtnUpdate = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_toggleBtnUpdate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	
+	bSizer236->Add( m_toggleBtnUpdate, 0, wxEXPAND|wxBOTTOM, 5 );
+	
+	m_toggleBtnCustom = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_toggleBtnCustom->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	
+	bSizer236->Add( m_toggleBtnCustom, 0, wxEXPAND, 5 );
+	
+	
+	bSizer235->Add( bSizer236, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	
+	bSizer237->Add( bSizer235, 0, wxALL, 5 );
+	
+	
+	bSizer237->Add( 10, 0, 0, 0, 5 );
+	
+	wxBoxSizer* bSizer238;
+	bSizer238 = new wxBoxSizer( wxVERTICAL );
+	
+	
+	bSizer238->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	bSizerSyncDirHolder = new wxBoxSizer( wxHORIZONTAL );
+	
+	bSizerSyncDirections = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticTextCategory = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Category"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextCategory->Wrap( -1 );
+	bSizerSyncDirections->Add( m_staticTextCategory, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	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") );
+	
+	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") );
+	
+	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") );
+	
+	ffgSizer11->Add( m_bitmapDifferent, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_bitmapConflict = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_bitmapConflict->SetToolTip( _("Conflict/item cannot be categorized") );
+	
+	ffgSizer11->Add( m_bitmapConflict, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_bitmapRightNewer = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_bitmapRightNewer->SetToolTip( _("Right side is newer") );
+	
+	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") );
+	
+	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 );
+	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 );
+	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 );
+	ffgSizer11->Add( m_bpButtonDifferent, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_bpButtonConflict = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	ffgSizer11->Add( m_bpButtonConflict, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_bpButtonRightNewer = new wxBitmapButton( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	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 );
+	ffgSizer11->Add( m_bpButtonRightOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizerSyncDirections->Add( ffgSizer11, 0, 0, 5 );
+	
+	m_staticText120 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Action"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText120->Wrap( -1 );
+	bSizerSyncDirections->Add( m_staticText120, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP, 5 );
+	
+	
+	bSizerSyncDirHolder->Add( bSizerSyncDirections, 0, 0, 5 );
+	
+	bSizerDatabase = new wxWrapSizer( wxVERTICAL );
+	
+	m_bitmapDatabase = new wxStaticBitmap( m_panelSyncSettings, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizerDatabase->Add( m_bitmapDatabase, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	
+	bSizerDatabase->Add( 0, 3, 0, 0, 5 );
+	
+	m_staticText145 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("sync.ffs_db"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText145->Wrap( -1 );
+	m_staticText145->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_SWISS, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL, false, wxT("Arial") ) );
+	m_staticText145->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	
+	bSizerDatabase->Add( m_staticText145, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	
+	bSizerSyncDirHolder->Add( bSizerDatabase, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_staticTextSyncVarDescription = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_staticTextSyncVarDescription->Wrap( -1 );
+	m_staticTextSyncVarDescription->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	
+	bSizerSyncDirHolder->Add( m_staticTextSyncVarDescription, 0, wxALL|wxALIGN_CENTER_VERTICAL, 10 );
+	
+	
+	bSizer238->Add( bSizerSyncDirHolder, 0, wxTOP|wxBOTTOM|wxRIGHT, 10 );
+	
+	
+	bSizer238->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_staticline431 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer238->Add( m_staticline431, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer201;
+	bSizer201 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_staticline72 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer201->Add( m_staticline72, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer249;
+	bSizer249 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_checkBoxDetectMove = new wxCheckBox( m_panelSyncSettings, wxID_ANY, _("Detect moved files"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_checkBoxDetectMove->SetToolTip( _("- Not supported by all file systems\n- Requires and creates database files\n- Detection not available for first sync") );
+	
+	bSizer249->Add( m_checkBoxDetectMove, 0, wxALL|wxEXPAND, 5 );
+	
+	m_hyperlink242 = new wxHyperlinkCtrl( m_panelSyncSettings, wxID_ANY, _("More information"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	bSizer249->Add( m_hyperlink242, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	
+	
+	bSizer201->Add( bSizer249, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer238->Add( bSizer201, 0, 0, 5 );
+	
+	
+	bSizer237->Add( bSizer238, 1, 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 );
+	
+	bSizer2361 = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bSizer202;
+	bSizer202 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticText87 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Delete files:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText87->Wrap( -1 );
+	bSizer202->Add( m_staticText87, 0, wxALL, 5 );
+	
+	wxBoxSizer* bSizer234;
+	bSizer234 = new wxBoxSizer( wxVERTICAL );
+	
+	m_toggleBtnRecycler = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("&Recycle bin"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer234->Add( m_toggleBtnRecycler, 0, wxEXPAND, 5 );
+	
+	m_toggleBtnPermanent = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("&Permanent"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer234->Add( m_toggleBtnPermanent, 0, wxEXPAND, 5 );
+	
+	m_toggleBtnVersioning = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("&Versioning"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer234->Add( m_toggleBtnVersioning, 0, wxEXPAND, 5 );
+	
+	
+	bSizer202->Add( bSizer234, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	
+	bSizer2361->Add( bSizer202, 0, wxALL, 5 );
+	
+	bSizerVersioningHolder = new wxBoxSizer( wxVERTICAL );
+	
+	
+	bSizerVersioningHolder->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	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_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 );
+	
+	
+	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 ) );
+	
+	wxBoxSizer* bSizer191;
+	bSizer191 = new wxBoxSizer( wxVERTICAL );
+	
+	
+	bSizer191->Add( 0, 5, 0, 0, 5 );
+	
+	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 );
+	
+	wxBoxSizer* bSizer253;
+	bSizer253 = new wxBoxSizer( wxVERTICAL );
+	
+	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 ) );
+	
+	bSizer254->Add( m_staticText155, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	
+	
+	bSizer254->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_hyperlink243 = new wxHyperlinkCtrl( m_panelVersioning, wxID_ANY, _("Show examples"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	bSizer254->Add( m_hyperlink243, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+	
+	
+	bSizer253->Add( bSizer254, 0, wxEXPAND|wxBOTTOM, 5 );
+	
+	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_buttonSelectVersioningFolder = new wxButton( m_panelVersioning, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonSelectVersioningFolder->SetToolTip( _("Select a folder") );
+	
+	bSizer156->Add( m_buttonSelectVersioningFolder, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_bpButtonSelectVersioningAltFolder = new wxBitmapButton( m_panelVersioning, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	m_bpButtonSelectVersioningAltFolder->SetToolTip( _("Access online storage") );
+	
+	bSizer156->Add( m_bpButtonSelectVersioningAltFolder, 0, wxEXPAND, 5 );
+	
+	
+	bSizer253->Add( bSizer156, 0, wxEXPAND, 5 );
+	
+	
+	bSizer252->Add( bSizer253, 1, wxRIGHT, 5 );
+	
+	
+	bSizer191->Add( bSizer252, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	wxBoxSizer* bSizer198;
+	bSizer198 = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bSizer255;
+	bSizer255 = new wxBoxSizer( wxVERTICAL );
+	
+	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 );
+	
+	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 );
+	
+	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 ) );
+	
+	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 ) );
+	
+	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 ) );
+	
+	bSizer257->Add( m_staticTextNamingCvtPart3, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer255->Add( bSizer257, 0, wxBOTTOM|wxRIGHT|wxLEFT, 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 );
+	
+	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 );
+	
+	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_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_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_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 );
+	
+	
+	bSizer198->Add( bSizer258, 0, wxALL, 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 );
+	
+	
+	bSizerVersioningHolder->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	
+	bSizer2361->Add( bSizerVersioningHolder, 1, wxALIGN_CENTER_VERTICAL, 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 );
+	
+	bSizerSyncMisc = 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 ) );
+	
+	wxBoxSizer* bSizer1912;
+	bSizer1912 = new wxBoxSizer( wxVERTICAL );
+	
+	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|wxRIGHT, 5 );
+	
+	m_checkBoxSaveLog = new wxCheckBox( m_panelLogfile, wxID_ANY, _("&Override default log path:"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer279->Add( m_checkBoxSaveLog, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_buttonSelectLogFolder = new wxButton( m_panelLogfile, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonSelectLogFolder->SetToolTip( _("Select a folder") );
+	
+	bSizer279->Add( m_buttonSelectLogFolder, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_bpButtonSelectAltLogFolder = new wxBitmapButton( m_panelLogfile, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	m_bpButtonSelectAltLogFolder->SetToolTip( _("Access online storage") );
+	
+	bSizer279->Add( m_bpButtonSelectAltLogFolder, 0, wxEXPAND, 5 );
+	
+	
+	bSizer1912->Add( bSizer279, 0, wxEXPAND, 5 );
+	
+	m_logFolderPath = new fff::FolderHistoryBox( m_panelLogfile, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
+	bSizer1912->Add( m_logFolderPath, 0, wxEXPAND|wxTOP, 5 );
+	
+	
+	m_panelLogfile->SetSizer( bSizer1912 );
+	m_panelLogfile->Layout();
+	bSizer1912->Fit( m_panelLogfile );
+	bSizer2372->Add( m_panelLogfile, 1, 0, 5 );
+	
+	
+	bSizerSyncMisc->Add( bSizer2372, 1, wxALL, 10 );
+	
+	m_staticline57 = new wxStaticLine( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizerSyncMisc->Add( m_staticline57, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer247;
+	bSizer247 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer251;
+	bSizer251 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_staticText89 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Run a command:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText89->Wrap( -1 );
+	bSizer251->Add( m_staticText89, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	
+	
+	bSizer251->Add( 0, 0, 1, 0, 5 );
+	
+	wxArrayString m_choicePostSyncConditionChoices;
+	m_choicePostSyncCondition = new wxChoice( m_panelSyncSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choicePostSyncConditionChoices, 0 );
+	m_choicePostSyncCondition->SetSelection( 0 );
+	bSizer251->Add( m_choicePostSyncCondition, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer247->Add( bSizer251, 0, wxEXPAND, 5 );
+	
+	m_comboBoxPostSyncCommand = new fff::CommandBox( m_panelSyncSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
+	bSizer247->Add( m_comboBoxPostSyncCommand, 0, wxTOP|wxEXPAND, 5 );
+	
+	
+	bSizerSyncMisc->Add( bSizer247, 1, wxALL, 10 );
+	
+	
+	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_panelSyncSettingsTab->SetSizer( bSizer276 );
+	m_panelSyncSettingsTab->Layout();
+	bSizer276->Fit( m_panelSyncSettingsTab );
+	m_notebook->AddPage( m_panelSyncSettingsTab, _("dummy"), true );
+	
+	bSizer190->Add( m_notebook, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	
+	bSizer7->Add( bSizer190, 1, wxEXPAND, 5 );
+	
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_buttonOkay->SetDefault(); 
+	m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	
+	bSizerStdButtons->Add( m_buttonOkay, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	
+	
+	bSizer7->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
+	
+	
+	this->SetSizer( bSizer7 );
+	this->Layout();
+	bSizer7->Fit( this );
+	
+	this->Centre( wxBOTH );
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( ConfigDlgGenerated::OnClose ) );
+	m_listBoxFolderPair->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( ConfigDlgGenerated::onListBoxKeyEvent ), NULL, this );
+	m_listBoxFolderPair->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnSelectFolderPair ), NULL, this );
+	m_checkBoxUseLocalCmpOptions->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleLocalCompSettings ), NULL, this );
+	m_toggleBtnByTimeSize->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnCompByTimeSizeDouble ), NULL, this );
+	m_toggleBtnByTimeSize->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnCompByTimeSize ), NULL, this );
+	m_toggleBtnByContent->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnCompByContentDouble ), NULL, this );
+	m_toggleBtnByContent->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnCompByContent ), NULL, this );
+	m_toggleBtnBySize->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnCompBySizeDouble ), NULL, this );
+	m_toggleBtnBySize->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnCompBySize ), NULL, this );
+	m_checkBoxSymlinksInclude->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeCompOption ), NULL, this );
+	m_hyperlink24->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( ConfigDlgGenerated::OnHelpComparisonSettings ), NULL, this );
+	m_textCtrlTimeShift->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( ConfigDlgGenerated::onlTimeShiftKeyDown ), NULL, this );
+	m_hyperlink241->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( ConfigDlgGenerated::OnHelpTimeShift ), NULL, this );
+	m_checkBoxIgnoreErrors->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleIgnoreErrors ), NULL, this );
+	m_checkBoxAutoRetry->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleAutoRetry ), NULL, this );
+	m_hyperlink1711->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( ConfigDlgGenerated::OnHelpPerformance ), NULL, this );
+	m_textCtrlInclude->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeFilterOption ), NULL, this );
+	m_hyperlink171->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( ConfigDlgGenerated::OnHelpShowExamples ), NULL, this );
+	m_textCtrlExclude->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeFilterOption ), NULL, this );
+	m_choiceUnitMinSize->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeFilterOption ), NULL, this );
+	m_choiceUnitMaxSize->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeFilterOption ), NULL, this );
+	m_choiceUnitTimespan->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeFilterOption ), NULL, this );
+	m_buttonClear->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnFilterReset ), NULL, this );
+	m_checkBoxUseLocalSyncOptions->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleLocalSyncSettings ), NULL, this );
+	m_toggleBtnTwoWay->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnSyncTwoWayDouble ), NULL, this );
+	m_toggleBtnTwoWay->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnSyncTwoWay ), NULL, this );
+	m_toggleBtnMirror->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnSyncMirrorDouble ), NULL, this );
+	m_toggleBtnMirror->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnSyncMirror ), NULL, this );
+	m_toggleBtnUpdate->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnSyncUpdateDouble ), NULL, this );
+	m_toggleBtnUpdate->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnSyncUpdate ), NULL, this );
+	m_toggleBtnCustom->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnSyncCustomDouble ), NULL, this );
+	m_toggleBtnCustom->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnSyncCustom ), NULL, this );
+	m_bpButtonLeftOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnExLeftSideOnly ), NULL, this );
+	m_bpButtonLeftNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnLeftNewer ), NULL, this );
+	m_bpButtonDifferent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnDifferent ), NULL, this );
+	m_bpButtonConflict->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnConflict ), NULL, this );
+	m_bpButtonRightNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnRightNewer ), NULL, this );
+	m_bpButtonRightOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnExRightSideOnly ), NULL, this );
+	m_checkBoxDetectMove->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleDetectMovedFiles ), NULL, this );
+	m_hyperlink242->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( ConfigDlgGenerated::OnHelpDetectMovedFiles ), NULL, this );
+	m_toggleBtnRecycler->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnDeletionRecycler ), NULL, this );
+	m_toggleBtnPermanent->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnDeletionPermanent ), NULL, this );
+	m_toggleBtnVersioning->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnDeletionVersioning ), NULL, this );
+	m_hyperlink243->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( ConfigDlgGenerated::OnHelpVersioning ), 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_checkBoxSaveLog->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleSaveLogfile ), 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()
@@ -2438,383 +2438,500 @@ 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 ) );
-
-    wxBoxSizer* bSizer134;
-    bSizer134 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer72;
-    bSizer72 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmapCloud = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer72->Add( m_bitmapCloud, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
-
-    m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("Enter your login details:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextHeader->Wrap( -1 );
-    bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 10 );
-
-
-    bSizer72->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer231;
-    bSizer231 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_staticText136 = new wxStaticText( this, wxID_ANY, _("Connection type:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText136->Wrap( -1 );
-    bSizer231->Add( m_staticText136, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
-    m_toggleBtnSftp = new wxToggleButton( this, wxID_ANY, _("SFTP"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_toggleBtnSftp->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-
-    bSizer231->Add( m_toggleBtnSftp, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
-    m_toggleBtnFtp = new wxToggleButton( this, wxID_ANY, _("FTP"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_toggleBtnFtp->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-
-    bSizer231->Add( m_toggleBtnFtp, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-
-    bSizer72->Add( bSizer231, 0, wxALL, 5 );
-
-
-    bSizer134->Add( bSizer72, 0, wxEXPAND, 5 );
-
-    m_staticline371 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxSize( -1, -1 ), wxLI_HORIZONTAL );
-    bSizer134->Add( m_staticline371, 0, wxEXPAND, 5 );
-
-    m_panel41 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel41->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-
-    wxBoxSizer* bSizer185;
-    bSizer185 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer245;
-    bSizer245 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_staticText12311 = new wxStaticText( m_panel41, wxID_ANY, _("Server name or IP address:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText12311->Wrap( -1 );
-    bSizer245->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 );
-    bSizer245->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 );
-    bSizer245->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 );
-    bSizer245->Add( m_textCtrlPort, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer185->Add( bSizer245, 0, wxALL|wxEXPAND, 5 );
-
-    m_staticline58 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer185->Add( m_staticline58, 0, wxEXPAND, 5 );
-
-    bSizerAuth = new wxBoxSizer( wxHORIZONTAL );
-
-    bSizerFtpEncrypt = new wxBoxSizer( wxHORIZONTAL );
-
-    wxBoxSizer* bSizer2181;
-    bSizer2181 = new wxBoxSizer( wxVERTICAL );
-
-    m_staticText1251 = new wxStaticText( m_panel41, wxID_ANY, _("Encryption:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText1251->Wrap( -1 );
-    bSizer2181->Add( m_staticText1251, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-
-    m_radioBtnEncryptNone = new wxRadioButton( m_panel41, wxID_ANY, _("&Disabled"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
-    m_radioBtnEncryptNone->SetValue( true );
-    bSizer2181->Add( m_radioBtnEncryptNone, 0, wxEXPAND|wxALL, 5 );
-
-    m_radioBtnEncryptSsl = new wxRadioButton( m_panel41, wxID_ANY, _("&Explicit SSL/TLS"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer2181->Add( m_radioBtnEncryptSsl, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-
-
-    bSizerFtpEncrypt->Add( bSizer2181, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_staticline5721 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizerFtpEncrypt->Add( m_staticline5721, 0, wxEXPAND, 5 );
-
-
-    bSizerAuth->Add( bSizerFtpEncrypt, 0, wxEXPAND, 5 );
-
-    bSizerSftpAuth = new wxBoxSizer( wxHORIZONTAL );
-
-    wxBoxSizer* bSizer218;
-    bSizer218 = new wxBoxSizer( wxVERTICAL );
-
-    m_staticText125 = new wxStaticText( m_panel41, wxID_ANY, _("Authentication:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText125->Wrap( -1 );
-    bSizer218->Add( m_staticText125, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-
-    m_radioBtnPassword = new wxRadioButton( m_panel41, wxID_ANY, _("&Password"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
-    m_radioBtnPassword->SetValue( true );
-    bSizer218->Add( m_radioBtnPassword, 0, wxEXPAND|wxALL, 5 );
-
-    m_radioBtnKeyfile = new wxRadioButton( m_panel41, wxID_ANY, _("&Key file"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer218->Add( m_radioBtnKeyfile, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-
-    m_radioBtnAgent = new wxRadioButton( m_panel41, wxID_ANY, _("&SSH agent"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer218->Add( m_radioBtnAgent, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
-
-    bSizerSftpAuth->Add( bSizer218, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_staticline572 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizerSftpAuth->Add( m_staticline572, 0, wxEXPAND, 5 );
-
-
-    bSizerAuth->Add( bSizerSftpAuth, 0, wxEXPAND, 5 );
-
-    m_panelAuth = new wxPanel( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelAuth->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-
-    wxBoxSizer* bSizer221;
-    bSizer221 = new wxBoxSizer( wxVERTICAL );
-
-    wxFlexGridSizer* fgSizer161;
-    fgSizer161 = new wxFlexGridSizer( 0, 2, 0, 0 );
-    fgSizer161->AddGrowableCol( 1 );
-    fgSizer161->SetFlexibleDirection( wxBOTH );
-    fgSizer161->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-
-    m_staticText123 = new wxStaticText( m_panelAuth, wxID_ANY, _("User name:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText123->Wrap( -1 );
-    fgSizer161->Add( m_staticText123, 0, wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_textCtrlUserName = new wxTextCtrl( m_panelAuth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-    fgSizer161->Add( m_textCtrlUserName, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_staticTextKeyfile = new wxStaticText( m_panelAuth, wxID_ANY, _("Private key file:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextKeyfile->Wrap( -1 );
-    fgSizer161->Add( m_staticTextKeyfile, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
-
-    bSizerKeyFile = new wxBoxSizer( wxHORIZONTAL );
-
-    m_textCtrlKeyfilePath = new wxTextCtrl( m_panelAuth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizerKeyFile->Add( m_textCtrlKeyfilePath, 1, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_buttonSelectKeyfile = new wxButton( m_panelAuth, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_buttonSelectKeyfile->SetToolTip( _("Select a folder") );
-
-    bSizerKeyFile->Add( m_buttonSelectKeyfile, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    fgSizer161->Add( bSizerKeyFile, 0, wxALL|wxEXPAND, 5 );
-
-    m_staticTextPassword = new wxStaticText( m_panelAuth, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextPassword->Wrap( -1 );
-    fgSizer161->Add( m_staticTextPassword, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
-    bSizerPassword = new wxBoxSizer( wxHORIZONTAL );
-
-    m_textCtrlPasswordVisible = new wxTextCtrl( m_panelAuth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizerPassword->Add( m_textCtrlPasswordVisible, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
-    m_textCtrlPasswordHidden = new wxTextCtrl( m_panelAuth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD );
-    bSizerPassword->Add( m_textCtrlPasswordHidden, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
-    m_checkBoxShowPassword = new wxCheckBox( m_panelAuth, wxID_ANY, _("&Show password"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizerPassword->Add( m_checkBoxShowPassword, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-
-    fgSizer161->Add( bSizerPassword, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-
-
-    bSizer221->Add( fgSizer161, 0, wxALL|wxEXPAND, 5 );
-
-
-    m_panelAuth->SetSizer( bSizer221 );
-    m_panelAuth->Layout();
-    bSizer221->Fit( m_panelAuth );
-    bSizerAuth->Add( m_panelAuth, 1, wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer185->Add( bSizerAuth, 0, wxEXPAND, 5 );
-
-    m_staticline581 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer185->Add( m_staticline581, 0, wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer269;
-    bSizer269 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer270;
-    bSizer270 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmapServerDir = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer270->Add( m_bitmapServerDir, 0, wxALIGN_BOTTOM|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
-    m_staticText1232 = new wxStaticText( m_panel41, wxID_ANY, _("Directory on server:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText1232->Wrap( -1 );
-    bSizer270->Add( m_staticText1232, 1, wxALL|wxALIGN_BOTTOM, 5 );
-
-    m_staticline72 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer270->Add( m_staticline72, 0, wxEXPAND|wxLEFT, 5 );
-
-    wxBoxSizer* bSizer271;
-    bSizer271 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_staticTextTimeout = new wxStaticText( m_panel41, wxID_ANY, _("Access timeout (in seconds):"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextTimeout->Wrap( -1 );
-    bSizer271->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 );
-    bSizer271->Add( m_spinCtrlTimeout, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer270->Add( bSizer271, 0, wxALL, 5 );
-
-
-    bSizer269->Add( bSizer270, 0, wxEXPAND|wxLEFT, 5 );
-
-    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|wxBOTTOM|wxLEFT, 5 );
-
-    m_buttonSelectFolder = new wxButton( m_panel41, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_buttonSelectFolder->SetToolTip( _("Select a folder") );
-
-    bSizer217->Add( m_buttonSelectFolder, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 );
-
-
-    bSizer269->Add( bSizer217, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
-
-    bSizer185->Add( bSizer269, 0, wxEXPAND, 5 );
-
-
-    m_panel41->SetSizer( bSizer185 );
-    m_panel41->Layout();
-    bSizer185->Fit( m_panel41 );
-    bSizer134->Add( m_panel41, 0, wxEXPAND, 5 );
-
-    bSizer255 = new wxBoxSizer( wxVERTICAL );
-
-    m_staticline571 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer255->Add( m_staticline571, 0, wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer219;
-    bSizer219 = new wxBoxSizer( wxHORIZONTAL );
-
-
-    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_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 );
-
-    m_hyperlink171 = new wxHyperlinkCtrl( this, wxID_ANY, _("How to get best performance?"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    bSizer219->Add( m_hyperlink171, 0, wxALL|wxALIGN_CENTER_VERTICAL, 10 );
-
-
-    bSizer255->Add( bSizer219, 0, wxEXPAND, 5 );
-
-    m_staticline57 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer255->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 ) );
-
-    wxBoxSizer* bSizer1851;
-    bSizer1851 = new wxBoxSizer( wxVERTICAL );
-
-    wxFlexGridSizer* fgSizer1611;
-    fgSizer1611 = new wxFlexGridSizer( 0, 3, 0, 0 );
-    fgSizer1611->AddGrowableCol( 1 );
-    fgSizer1611->SetFlexibleDirection( wxBOTH );
-    fgSizer1611->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-
-    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_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 );
-
-    m_spinCtrlConnectionCount = new wxSpinCtrl( m_panel411, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
-    fgSizer1611->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 ) );
-
-    fgSizer1611->Add( m_staticTextConnectionCountDescr, 0, wxALIGN_CENTER_VERTICAL|wxALL, 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_spinCtrlChannelCountSftp = new wxSpinCtrl( m_panel411, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
-    fgSizer1611->Add( m_spinCtrlChannelCountSftp, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_buttonChannelCountSftp = new wxButton( m_panel411, wxID_ANY, _("Detect server limit"), wxDefaultPosition, wxDefaultSize, 0 );
-    fgSizer1611->Add( m_buttonChannelCountSftp, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-
-    bSizer1851->Add( fgSizer1611, 0, wxALL, 5 );
-
-
-    m_panel411->SetSizer( bSizer1851 );
-    m_panel411->Layout();
-    bSizer1851->Fit( m_panel411 );
-    bSizer255->Add( m_panel411, 1, wxEXPAND, 5 );
-
-
-    bSizer134->Add( bSizer255, 1, wxEXPAND, 5 );
-
-    m_staticline12 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer134->Add( m_staticline12, 0, wxEXPAND, 5 );
-
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
-
-    m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    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 );
-
-    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-
-
-    bSizer134->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
-
-
-    this->SetSizer( bSizer134 );
-    this->Layout();
-    bSizer134->Fit( this );
-
-    this->Centre( wxBOTH );
-
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CloudSetupDlgGenerated::OnClose ) );
-    m_toggleBtnSftp->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnConnectionSftp ), NULL, this );
-    m_toggleBtnFtp->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnConnectionFtp ), NULL, this );
-    m_radioBtnPassword->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CloudSetupDlgGenerated::OnAuthPassword ), NULL, this );
-    m_radioBtnKeyfile->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CloudSetupDlgGenerated::OnAuthKeyfile ), NULL, this );
-    m_radioBtnAgent->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CloudSetupDlgGenerated::OnAuthAgent ), NULL, this );
-    m_buttonSelectKeyfile->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnSelectKeyfile ), NULL, this );
-    m_checkBoxShowPassword->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnToggleShowPassword ), NULL, this );
-    m_buttonSelectFolder->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnBrowseCloudFolder ), NULL, this );
-    m_hyperlink171->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( CloudSetupDlgGenerated::OnHelpFtpPerformance ), 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 );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	
+	wxBoxSizer* bSizer134;
+	bSizer134 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer72;
+	bSizer72 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapCloud = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer72->Add( m_bitmapCloud, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
+	
+	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 );
+	
+	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 ) );
+	
+	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 ) );
+	
+	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 ) );
+	
+	bSizer231->Add( m_toggleBtnFtp, 0, wxALL|wxEXPAND, 5 );
+	
+	
+	bSizer272->Add( bSizer231, 0, 0, 5 );
+	
+	
+	bSizer72->Add( bSizer272, 0, wxALL, 5 );
+	
+	
+	bSizer134->Add( bSizer72, 0, wxEXPAND, 5 );
+	
+	m_staticline371 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxLI_HORIZONTAL );
+	bSizer134->Add( m_staticline371, 0, wxEXPAND, 5 );
+	
+	m_panel41 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel41->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	
+	wxBoxSizer* bSizer185;
+	bSizer185 = new wxBoxSizer( wxVERTICAL );
+	
+	bSizerGdrive = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer284;
+	bSizer284 = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bSizer285;
+	bSizer285 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticText166 = new wxStaticText( m_panel41, wxID_ANY, _("Connected user accounts:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText166->Wrap( -1 );
+	bSizer285->Add( m_staticText166, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_listBoxGdriveUsers = new wxListBox( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_NEEDED_SB|wxLB_SINGLE|wxLB_SORT ); 
+	bSizer285->Add( m_listBoxGdriveUsers, 1, wxTOP|wxBOTTOM|wxLEFT, 5 );
+	
+	
+	bSizer284->Add( bSizer285, 0, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	
+	wxBoxSizer* bSizer286;
+	bSizer286 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer289;
+	bSizer289 = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bSizer288;
+	bSizer288 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticText167 = new wxStaticText( m_panel41, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText167->Wrap( -1 );
+	bSizer288->Add( m_staticText167, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_buttonGdriveAddUser = new zen::BitmapTextButton( m_panel41, wxID_ANY, _("&Add connection"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer288->Add( m_buttonGdriveAddUser, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_buttonGdriveRemoveUser = new zen::BitmapTextButton( m_panel41, wxID_ANY, _("&Disconnect"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer288->Add( m_buttonGdriveRemoveUser, 0, wxEXPAND|wxALL, 5 );
+	
+	
+	bSizer289->Add( bSizer288, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	
+	m_staticline76 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer289->Add( m_staticline76, 0, wxEXPAND, 5 );
+	
+	
+	bSizer286->Add( bSizer289, 0, 0, 5 );
+	
+	m_staticline74 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer286->Add( m_staticline74, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer287;
+	bSizer287 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticText165 = new wxStaticText( m_panel41, wxID_ANY, _("Selected user account:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText165->Wrap( -1 );
+	bSizer287->Add( m_staticText165, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	wxBoxSizer* bSizer279;
+	bSizer279 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapGdriveSelectedUser = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer279->Add( m_bitmapGdriveSelectedUser, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	
+	m_staticTextGdriveUser = new wxStaticText( m_panel41, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextGdriveUser->Wrap( -1 );
+	bSizer279->Add( m_staticTextGdriveUser, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer287->Add( bSizer279, 0, 0, 5 );
+	
+	
+	bSizer286->Add( bSizer287, 0, wxALL, 5 );
+	
+	
+	bSizer284->Add( bSizer286, 1, 0, 5 );
+	
+	
+	bSizerGdrive->Add( bSizer284, 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, 0, wxEXPAND, 5 );
+	
+	bSizerServer = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer276;
+	bSizer276 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapServer = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer276->Add( m_bitmapServer, 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_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 );
+	
+	
+	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 );
+	
+	
+	bSizer185->Add( bSizerServer, 0, wxEXPAND, 5 );
+	
+	bSizerAuth = new wxBoxSizer( wxVERTICAL );
+	
+	bSizerAuthInner = new wxBoxSizer( wxHORIZONTAL );
+	
+	bSizerFtpEncrypt = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bSizer2181;
+	bSizer2181 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticText1251 = new wxStaticText( m_panel41, wxID_ANY, _("Encryption:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText1251->Wrap( -1 );
+	bSizer2181->Add( m_staticText1251, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_radioBtnEncryptNone = new wxRadioButton( m_panel41, wxID_ANY, _("&Disabled"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
+	m_radioBtnEncryptNone->SetValue( true ); 
+	bSizer2181->Add( m_radioBtnEncryptNone, 0, wxEXPAND|wxALL, 5 );
+	
+	m_radioBtnEncryptSsl = new wxRadioButton( m_panel41, wxID_ANY, _("&Explicit SSL/TLS"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer2181->Add( m_radioBtnEncryptSsl, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	
+	
+	bSizerFtpEncrypt->Add( bSizer2181, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_staticline5721 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizerFtpEncrypt->Add( m_staticline5721, 0, wxEXPAND, 5 );
+	
+	
+	bSizerAuthInner->Add( bSizerFtpEncrypt, 0, wxEXPAND, 5 );
+	
+	bSizerSftpAuth = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bSizer218;
+	bSizer218 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticText125 = new wxStaticText( m_panel41, wxID_ANY, _("Authentication:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText125->Wrap( -1 );
+	bSizer218->Add( m_staticText125, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_radioBtnPassword = new wxRadioButton( m_panel41, wxID_ANY, _("&Password"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
+	m_radioBtnPassword->SetValue( true ); 
+	bSizer218->Add( m_radioBtnPassword, 0, wxEXPAND|wxALL, 5 );
+	
+	m_radioBtnKeyfile = new wxRadioButton( m_panel41, wxID_ANY, _("&Key file"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer218->Add( m_radioBtnKeyfile, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	
+	m_radioBtnAgent = new wxRadioButton( m_panel41, wxID_ANY, _("&SSH agent"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer218->Add( m_radioBtnAgent, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	
+	bSizerSftpAuth->Add( bSizer218, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_staticline572 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizerSftpAuth->Add( m_staticline572, 0, wxEXPAND, 5 );
+	
+	
+	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 ) );
+	
+	wxBoxSizer* bSizer221;
+	bSizer221 = new wxBoxSizer( wxVERTICAL );
+	
+	wxFlexGridSizer* fgSizer161;
+	fgSizer161 = new wxFlexGridSizer( 0, 2, 0, 0 );
+	fgSizer161->AddGrowableCol( 1 );
+	fgSizer161->SetFlexibleDirection( wxBOTH );
+	fgSizer161->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	m_staticText123 = new wxStaticText( m_panelAuth, wxID_ANY, _("User name:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText123->Wrap( -1 );
+	fgSizer161->Add( m_staticText123, 0, wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_textCtrlUserName = new wxTextCtrl( m_panelAuth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer161->Add( m_textCtrlUserName, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_staticTextKeyfile = new wxStaticText( m_panelAuth, wxID_ANY, _("Private key file:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextKeyfile->Wrap( -1 );
+	fgSizer161->Add( m_staticTextKeyfile, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
+	
+	bSizerKeyFile = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_textCtrlKeyfilePath = new wxTextCtrl( m_panelAuth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerKeyFile->Add( m_textCtrlKeyfilePath, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_buttonSelectKeyfile = new wxButton( m_panelAuth, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonSelectKeyfile->SetToolTip( _("Select a folder") );
+	
+	bSizerKeyFile->Add( m_buttonSelectKeyfile, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	fgSizer161->Add( bSizerKeyFile, 0, wxALL|wxEXPAND, 5 );
+	
+	m_staticTextPassword = new wxStaticText( m_panelAuth, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextPassword->Wrap( -1 );
+	fgSizer161->Add( m_staticTextPassword, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	
+	bSizerPassword = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_textCtrlPasswordVisible = new wxTextCtrl( m_panelAuth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerPassword->Add( m_textCtrlPasswordVisible, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	
+	m_textCtrlPasswordHidden = new wxTextCtrl( m_panelAuth, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD );
+	bSizerPassword->Add( m_textCtrlPasswordHidden, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	
+	m_checkBoxShowPassword = new wxCheckBox( m_panelAuth, wxID_ANY, _("&Show password"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerPassword->Add( m_checkBoxShowPassword, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	
+	fgSizer161->Add( bSizerPassword, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	
+	
+	bSizer221->Add( fgSizer161, 0, wxALL|wxEXPAND, 5 );
+	
+	
+	m_panelAuth->SetSizer( bSizer221 );
+	m_panelAuth->Layout();
+	bSizer221->Fit( m_panelAuth );
+	bSizerAuthInner->Add( m_panelAuth, 1, wxALIGN_CENTER_VERTICAL, 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 );
+	
+	
+	bSizer185->Add( bSizerAuth, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer269;
+	bSizer269 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer270;
+	bSizer270 = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bSizer275;
+	bSizer275 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapServerDir = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer275->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 );
+	bSizer275->Add( m_staticText1232, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer270->Add( bSizer275, 1, wxALIGN_BOTTOM|wxTOP|wxRIGHT, 5 );
+	
+	bSizerAccessTimeout = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_staticline72 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizerAccessTimeout->Add( m_staticline72, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer273;
+	bSizer273 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_staticTextTimeout = new wxStaticText( m_panel41, wxID_ANY, _("Access timeout (in seconds):"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextTimeout->Wrap( -1 );
+	bSizer273->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 );
+	bSizer273->Add( m_spinCtrlTimeout, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizerAccessTimeout->Add( bSizer273, 0, wxALL, 5 );
+	
+	
+	bSizer270->Add( bSizerAccessTimeout, 0, 0, 5 );
+	
+	
+	bSizer269->Add( bSizer270, 0, wxEXPAND|wxLEFT, 5 );
+	
+	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|wxBOTTOM|wxLEFT, 5 );
+	
+	m_buttonSelectFolder = new wxButton( m_panel41, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonSelectFolder->SetToolTip( _("Select a folder") );
+	
+	bSizer217->Add( m_buttonSelectFolder, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 );
+	
+	
+	bSizer269->Add( bSizer217, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	
+	bSizer185->Add( bSizer269, 0, wxEXPAND, 5 );
+	
+	
+	m_panel41->SetSizer( bSizer185 );
+	m_panel41->Layout();
+	bSizer185->Fit( m_panel41 );
+	bSizer134->Add( m_panel41, 0, wxEXPAND, 5 );
+	
+	bSizer255 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticline571 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer255->Add( m_staticline571, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer219;
+	bSizer219 = new wxBoxSizer( wxHORIZONTAL );
+	
+	
+	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_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 );
+	
+	m_hyperlink171 = new wxHyperlinkCtrl( this, wxID_ANY, _("How to get best performance?"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	bSizer219->Add( m_hyperlink171, 0, wxALL|wxALIGN_CENTER_VERTICAL, 10 );
+	
+	
+	bSizer255->Add( bSizer219, 0, wxEXPAND, 5 );
+	
+	m_staticline57 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer255->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 ) );
+	
+	wxBoxSizer* bSizer1851;
+	bSizer1851 = new wxBoxSizer( wxVERTICAL );
+	
+	wxFlexGridSizer* fgSizer1611;
+	fgSizer1611 = new wxFlexGridSizer( 0, 3, 0, 0 );
+	fgSizer1611->AddGrowableCol( 1 );
+	fgSizer1611->SetFlexibleDirection( wxBOTH );
+	fgSizer1611->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	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_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 );
+	
+	m_spinCtrlConnectionCount = new wxSpinCtrl( m_panel411, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
+	fgSizer1611->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 ) );
+	
+	fgSizer1611->Add( m_staticTextConnectionCountDescr, 0, wxALIGN_CENTER_VERTICAL|wxALL, 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_spinCtrlChannelCountSftp = new wxSpinCtrl( m_panel411, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
+	fgSizer1611->Add( m_spinCtrlChannelCountSftp, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_buttonChannelCountSftp = new wxButton( m_panel411, wxID_ANY, _("Detect server limit"), wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer1611->Add( m_buttonChannelCountSftp, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	
+	bSizer1851->Add( fgSizer1611, 0, wxALL, 5 );
+	
+	
+	m_panel411->SetSizer( bSizer1851 );
+	m_panel411->Layout();
+	bSizer1851->Fit( m_panel411 );
+	bSizer255->Add( m_panel411, 1, wxEXPAND, 5 );
+	
+	
+	bSizer134->Add( bSizer255, 1, wxEXPAND, 5 );
+	
+	m_staticline12 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer134->Add( m_staticline12, 0, wxEXPAND, 5 );
+	
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	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 );
+	
+	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	
+	
+	bSizer134->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
+	
+	
+	this->SetSizer( bSizer134 );
+	this->Layout();
+	bSizer134->Fit( this );
+	
+	this->Centre( wxBOTH );
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CloudSetupDlgGenerated::OnClose ) );
+	m_toggleBtnGdrive->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnConnectionGdrive ), NULL, this );
+	m_toggleBtnSftp->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnConnectionSftp ), NULL, this );
+	m_toggleBtnFtp->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnConnectionFtp ), NULL, this );
+	m_listBoxGdriveUsers->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( CloudSetupDlgGenerated::OnGdriveUserSelect ), NULL, this );
+	m_buttonGdriveAddUser->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnGdriveUserAdd ), NULL, this );
+	m_buttonGdriveRemoveUser->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnGdriveUserRemove ), NULL, this );
+	m_radioBtnPassword->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CloudSetupDlgGenerated::OnAuthPassword ), NULL, this );
+	m_radioBtnKeyfile->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CloudSetupDlgGenerated::OnAuthKeyfile ), NULL, this );
+	m_radioBtnAgent->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CloudSetupDlgGenerated::OnAuthAgent ), NULL, this );
+	m_buttonSelectKeyfile->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnSelectKeyfile ), NULL, this );
+	m_checkBoxShowPassword->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnToggleShowPassword ), NULL, this );
+	m_buttonSelectFolder->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CloudSetupDlgGenerated::OnBrowseCloudFolder ), NULL, this );
+	m_hyperlink171->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( CloudSetupDlgGenerated::OnHelpFtpPerformance ), 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()
@@ -2823,72 +2940,72 @@ CloudSetupDlgGenerated::~CloudSetupDlgGenerated()
 
 AbstractFolderPickerGenerated::AbstractFolderPickerGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-
-    wxBoxSizer* bSizer134;
-    bSizer134 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer72;
-    bSizer72 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmapServer = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer72->Add( m_bitmapServer, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
-
-    m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("Select a directory on the server:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextHeader->Wrap( -1 );
-    bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 10 );
-
-
-    bSizer134->Add( bSizer72, 0, 0, 5 );
-
-    m_staticline371 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxSize( -1, -1 ), wxLI_HORIZONTAL );
-    bSizer134->Add( m_staticline371, 0, wxEXPAND, 5 );
-
-    m_panel41 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel41->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-
-    wxBoxSizer* bSizer185;
-    bSizer185 = new wxBoxSizer( wxVERTICAL );
-
-    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|wxNO_BORDER );
-    bSizer185->Add( m_treeCtrlFileSystem, 1, wxEXPAND, 5 );
-
-
-    m_panel41->SetSizer( bSizer185 );
-    m_panel41->Layout();
-    bSizer185->Fit( m_panel41 );
-    bSizer134->Add( m_panel41, 1, wxEXPAND, 5 );
-
-    m_staticline12 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer134->Add( m_staticline12, 0, wxEXPAND, 5 );
-
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
-
-    m_buttonOkay = new wxButton( this, wxID_OK, _("Select Folder"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_buttonOkay->SetDefault();
-    m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-
-    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 );
-
-
-    bSizer134->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
-
-
-    this->SetSizer( bSizer134 );
-    this->Layout();
-    bSizer134->Fit( this );
-
-    this->Centre( wxBOTH );
-
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( AbstractFolderPickerGenerated::OnClose ) );
-    m_treeCtrlFileSystem->Connect( wxEVT_COMMAND_TREE_ITEM_EXPANDING, wxTreeEventHandler( AbstractFolderPickerGenerated::OnExpandNode ), NULL, this );
-    m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AbstractFolderPickerGenerated::OnOkay ), NULL, this );
-    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AbstractFolderPickerGenerated::OnCancel ), NULL, this );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	
+	wxBoxSizer* bSizer134;
+	bSizer134 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer72;
+	bSizer72 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapServer = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer72->Add( m_bitmapServer, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
+	
+	m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("Select a directory on the server:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextHeader->Wrap( -1 );
+	bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 10 );
+	
+	
+	bSizer134->Add( bSizer72, 0, 0, 5 );
+	
+	m_staticline371 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxLI_HORIZONTAL );
+	bSizer134->Add( m_staticline371, 0, wxEXPAND, 5 );
+	
+	m_panel41 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel41->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	
+	wxBoxSizer* bSizer185;
+	bSizer185 = new wxBoxSizer( wxVERTICAL );
+	
+	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|wxNO_BORDER );
+	bSizer185->Add( m_treeCtrlFileSystem, 1, wxEXPAND, 5 );
+	
+	
+	m_panel41->SetSizer( bSizer185 );
+	m_panel41->Layout();
+	bSizer185->Fit( m_panel41 );
+	bSizer134->Add( m_panel41, 1, wxEXPAND, 5 );
+	
+	m_staticline12 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer134->Add( m_staticline12, 0, wxEXPAND, 5 );
+	
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_buttonOkay = new wxButton( this, wxID_OK, _("Select Folder"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_buttonOkay->SetDefault(); 
+	m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	
+	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 );
+	
+	
+	bSizer134->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
+	
+	
+	this->SetSizer( bSizer134 );
+	this->Layout();
+	bSizer134->Fit( this );
+	
+	this->Centre( wxBOTH );
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( AbstractFolderPickerGenerated::OnClose ) );
+	m_treeCtrlFileSystem->Connect( wxEVT_COMMAND_TREE_ITEM_EXPANDING, wxTreeEventHandler( AbstractFolderPickerGenerated::OnExpandNode ), NULL, this );
+	m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AbstractFolderPickerGenerated::OnOkay ), NULL, this );
+	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AbstractFolderPickerGenerated::OnCancel ), NULL, this );
 }
 
 AbstractFolderPickerGenerated::~AbstractFolderPickerGenerated()
@@ -2897,221 +3014,221 @@ AbstractFolderPickerGenerated::~AbstractFolderPickerGenerated()
 
 SyncConfirmationDlgGenerated::SyncConfirmationDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-
-    wxBoxSizer* bSizer134;
-    bSizer134 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer72;
-    bSizer72 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmapSync = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer72->Add( m_bitmapSync, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
-
-    m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("Start synchronization now?"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextHeader->Wrap( -1 );
-    bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 10 );
-
-
-    bSizer134->Add( bSizer72, 0, 0, 5 );
-
-    m_staticline371 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer134->Add( m_staticline371, 0, wxEXPAND, 5 );
-
-    m_panelStatistics = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelStatistics->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-
-    wxBoxSizer* bSizer185;
-    bSizer185 = new wxBoxSizer( wxHORIZONTAL );
-
-
-    bSizer185->Add( 40, 0, 0, 0, 5 );
-
-
-    bSizer185->Add( 0, 0, 1, 0, 5 );
-
-    m_staticline38 = new wxStaticLine( m_panelStatistics, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer185->Add( m_staticline38, 0, wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer162;
-    bSizer162 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer182;
-    bSizer182 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_staticText84 = new wxStaticText( m_panelStatistics, wxID_ANY, _("Variant:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText84->Wrap( -1 );
-    bSizer182->Add( m_staticText84, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
-
-    bSizer182->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    m_staticTextVariant = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextVariant->Wrap( -1 );
-    m_staticTextVariant->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-
-    bSizer182->Add( m_staticTextVariant, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-
-    bSizer182->Add( 0, 0, 1, wxEXPAND, 5 );
-
-
-    bSizer162->Add( bSizer182, 0, wxALL|wxEXPAND, 5 );
-
-    m_staticline14 = new wxStaticLine( m_panelStatistics, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer162->Add( m_staticline14, 0, wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer181;
-    bSizer181 = new wxBoxSizer( wxVERTICAL );
-
-    m_staticText83 = new wxStaticText( m_panelStatistics, wxID_ANY, _("Statistics:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText83->Wrap( -1 );
-    bSizer181->Add( m_staticText83, 0, wxALL, 5 );
-
-    wxFlexGridSizer* fgSizer11;
-    fgSizer11 = new wxFlexGridSizer( 2, 7, 2, 5 );
-    fgSizer11->SetFlexibleDirection( wxBOTH );
-    fgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-
-    m_bitmapDeleteLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapDeleteLeft->SetToolTip( _("Number of files and folders that will be deleted") );
-
-    fgSizer11->Add( m_bitmapDeleteLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_bitmapUpdateLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapUpdateLeft->SetToolTip( _("Number of files that will be updated") );
-
-    fgSizer11->Add( m_bitmapUpdateLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_bitmapCreateLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapCreateLeft->SetToolTip( _("Number of files and folders that will be created") );
-
-    fgSizer11->Add( m_bitmapCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_bitmapData = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapData->SetToolTip( _("Total bytes to copy") );
-
-    fgSizer11->Add( m_bitmapData, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_bitmapCreateRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapCreateRight->SetToolTip( _("Number of files and folders that will be created") );
-
-    fgSizer11->Add( m_bitmapCreateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_bitmapUpdateRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapUpdateRight->SetToolTip( _("Number of files that will be updated") );
-
-    fgSizer11->Add( m_bitmapUpdateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_bitmapDeleteRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapDeleteRight->SetToolTip( _("Number of files and folders that will be deleted") );
-
-    fgSizer11->Add( m_bitmapDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_staticTextDeleteLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextDeleteLeft->Wrap( -1 );
-    m_staticTextDeleteLeft->SetToolTip( _("Number of files and folders that will be deleted") );
-
-    fgSizer11->Add( m_staticTextDeleteLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_staticTextUpdateLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextUpdateLeft->Wrap( -1 );
-    m_staticTextUpdateLeft->SetToolTip( _("Number of files that will be updated") );
-
-    fgSizer11->Add( m_staticTextUpdateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_staticTextCreateLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextCreateLeft->Wrap( -1 );
-    m_staticTextCreateLeft->SetToolTip( _("Number of files and folders that will be created") );
-
-    fgSizer11->Add( m_staticTextCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_staticTextData = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextData->Wrap( -1 );
-    m_staticTextData->SetToolTip( _("Total bytes to copy") );
-
-    fgSizer11->Add( m_staticTextData, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_staticTextCreateRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextCreateRight->Wrap( -1 );
-    m_staticTextCreateRight->SetToolTip( _("Number of files and folders that will be created") );
-
-    fgSizer11->Add( m_staticTextCreateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_staticTextUpdateRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextUpdateRight->Wrap( -1 );
-    m_staticTextUpdateRight->SetToolTip( _("Number of files that will be updated") );
-
-    fgSizer11->Add( m_staticTextUpdateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_staticTextDeleteRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextDeleteRight->Wrap( -1 );
-    m_staticTextDeleteRight->SetToolTip( _("Number of files and folders that will be deleted") );
-
-    fgSizer11->Add( m_staticTextDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer181->Add( fgSizer11, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-
-
-    bSizer162->Add( bSizer181, 0, wxEXPAND|wxALL, 5 );
-
-
-    bSizer185->Add( bSizer162, 0, 0, 5 );
-
-    m_staticline381 = new wxStaticLine( m_panelStatistics, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer185->Add( m_staticline381, 0, wxEXPAND, 5 );
-
-
-    bSizer185->Add( 0, 0, 1, 0, 5 );
-
-
-    bSizer185->Add( 40, 0, 0, 0, 5 );
-
-
-    m_panelStatistics->SetSizer( bSizer185 );
-    m_panelStatistics->Layout();
-    bSizer185->Fit( m_panelStatistics );
-    bSizer134->Add( m_panelStatistics, 0, wxEXPAND, 5 );
-
-    m_staticline12 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer134->Add( m_staticline12, 0, wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer164;
-    bSizer164 = new wxBoxSizer( wxVERTICAL );
-
-    m_checkBoxDontShowAgain = new wxCheckBox( this, wxID_ANY, _("&Don't show this dialog again"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer164->Add( m_checkBoxDontShowAgain, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
-
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
-
-    m_buttonStartSync = new wxButton( this, wxID_OK, _("Start"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_buttonStartSync->SetDefault();
-    m_buttonStartSync->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-
-    bSizerStdButtons->Add( m_buttonStartSync, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
-    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 );
-
-
-    bSizer164->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
-
-
-    bSizer134->Add( bSizer164, 1, wxEXPAND, 5 );
-
-
-    this->SetSizer( bSizer134 );
-    this->Layout();
-    bSizer134->Fit( this );
-
-    this->Centre( wxBOTH );
-
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncConfirmationDlgGenerated::OnClose ) );
-    m_buttonStartSync->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncConfirmationDlgGenerated::OnStartSync ), NULL, this );
-    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncConfirmationDlgGenerated::OnCancel ), NULL, this );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	
+	wxBoxSizer* bSizer134;
+	bSizer134 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer72;
+	bSizer72 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapSync = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer72->Add( m_bitmapSync, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
+	
+	m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("Start synchronization now?"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextHeader->Wrap( -1 );
+	bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 10 );
+	
+	
+	bSizer134->Add( bSizer72, 0, 0, 5 );
+	
+	m_staticline371 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer134->Add( m_staticline371, 0, wxEXPAND, 5 );
+	
+	m_panelStatistics = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_panelStatistics->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	
+	wxBoxSizer* bSizer185;
+	bSizer185 = new wxBoxSizer( wxHORIZONTAL );
+	
+	
+	bSizer185->Add( 40, 0, 0, 0, 5 );
+	
+	
+	bSizer185->Add( 0, 0, 1, 0, 5 );
+	
+	m_staticline38 = new wxStaticLine( m_panelStatistics, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer185->Add( m_staticline38, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer162;
+	bSizer162 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer182;
+	bSizer182 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_staticText84 = new wxStaticText( m_panelStatistics, wxID_ANY, _("Variant:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText84->Wrap( -1 );
+	bSizer182->Add( m_staticText84, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	
+	
+	bSizer182->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_staticTextVariant = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextVariant->Wrap( -1 );
+	m_staticTextVariant->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	
+	bSizer182->Add( m_staticTextVariant, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	
+	bSizer182->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	
+	bSizer162->Add( bSizer182, 0, wxALL|wxEXPAND, 5 );
+	
+	m_staticline14 = new wxStaticLine( m_panelStatistics, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer162->Add( m_staticline14, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer181;
+	bSizer181 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticText83 = new wxStaticText( m_panelStatistics, wxID_ANY, _("Statistics:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText83->Wrap( -1 );
+	bSizer181->Add( m_staticText83, 0, wxALL, 5 );
+	
+	wxFlexGridSizer* fgSizer11;
+	fgSizer11 = new wxFlexGridSizer( 2, 7, 2, 5 );
+	fgSizer11->SetFlexibleDirection( wxBOTH );
+	fgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	m_bitmapDeleteLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapDeleteLeft->SetToolTip( _("Number of files and folders that will be deleted") );
+	
+	fgSizer11->Add( m_bitmapDeleteLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_bitmapUpdateLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapUpdateLeft->SetToolTip( _("Number of files that will be updated") );
+	
+	fgSizer11->Add( m_bitmapUpdateLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_bitmapCreateLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapCreateLeft->SetToolTip( _("Number of files and folders that will be created") );
+	
+	fgSizer11->Add( m_bitmapCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_bitmapData = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapData->SetToolTip( _("Total bytes to copy") );
+	
+	fgSizer11->Add( m_bitmapData, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_bitmapCreateRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapCreateRight->SetToolTip( _("Number of files and folders that will be created") );
+	
+	fgSizer11->Add( m_bitmapCreateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_bitmapUpdateRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapUpdateRight->SetToolTip( _("Number of files that will be updated") );
+	
+	fgSizer11->Add( m_bitmapUpdateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_bitmapDeleteRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapDeleteRight->SetToolTip( _("Number of files and folders that will be deleted") );
+	
+	fgSizer11->Add( m_bitmapDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_staticTextDeleteLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextDeleteLeft->Wrap( -1 );
+	m_staticTextDeleteLeft->SetToolTip( _("Number of files and folders that will be deleted") );
+	
+	fgSizer11->Add( m_staticTextDeleteLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_staticTextUpdateLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextUpdateLeft->Wrap( -1 );
+	m_staticTextUpdateLeft->SetToolTip( _("Number of files that will be updated") );
+	
+	fgSizer11->Add( m_staticTextUpdateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_staticTextCreateLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextCreateLeft->Wrap( -1 );
+	m_staticTextCreateLeft->SetToolTip( _("Number of files and folders that will be created") );
+	
+	fgSizer11->Add( m_staticTextCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_staticTextData = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextData->Wrap( -1 );
+	m_staticTextData->SetToolTip( _("Total bytes to copy") );
+	
+	fgSizer11->Add( m_staticTextData, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_staticTextCreateRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextCreateRight->Wrap( -1 );
+	m_staticTextCreateRight->SetToolTip( _("Number of files and folders that will be created") );
+	
+	fgSizer11->Add( m_staticTextCreateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_staticTextUpdateRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextUpdateRight->Wrap( -1 );
+	m_staticTextUpdateRight->SetToolTip( _("Number of files that will be updated") );
+	
+	fgSizer11->Add( m_staticTextUpdateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_staticTextDeleteRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextDeleteRight->Wrap( -1 );
+	m_staticTextDeleteRight->SetToolTip( _("Number of files and folders that will be deleted") );
+	
+	fgSizer11->Add( m_staticTextDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer181->Add( fgSizer11, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	
+	
+	bSizer162->Add( bSizer181, 0, wxEXPAND|wxALL, 5 );
+	
+	
+	bSizer185->Add( bSizer162, 0, 0, 5 );
+	
+	m_staticline381 = new wxStaticLine( m_panelStatistics, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer185->Add( m_staticline381, 0, wxEXPAND, 5 );
+	
+	
+	bSizer185->Add( 0, 0, 1, 0, 5 );
+	
+	
+	bSizer185->Add( 40, 0, 0, 0, 5 );
+	
+	
+	m_panelStatistics->SetSizer( bSizer185 );
+	m_panelStatistics->Layout();
+	bSizer185->Fit( m_panelStatistics );
+	bSizer134->Add( m_panelStatistics, 0, wxEXPAND, 5 );
+	
+	m_staticline12 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer134->Add( m_staticline12, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer164;
+	bSizer164 = new wxBoxSizer( wxVERTICAL );
+	
+	m_checkBoxDontShowAgain = new wxCheckBox( this, wxID_ANY, _("&Don't show this dialog again"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer164->Add( m_checkBoxDontShowAgain, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+	
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_buttonStartSync = new wxButton( this, wxID_OK, _("Start"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_buttonStartSync->SetDefault(); 
+	m_buttonStartSync->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	
+	bSizerStdButtons->Add( m_buttonStartSync, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 );
+	
+	
+	bSizer164->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
+	
+	
+	bSizer134->Add( bSizer164, 1, wxEXPAND, 5 );
+	
+	
+	this->SetSizer( bSizer134 );
+	this->Layout();
+	bSizer134->Fit( this );
+	
+	this->Centre( wxBOTH );
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncConfirmationDlgGenerated::OnClose ) );
+	m_buttonStartSync->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncConfirmationDlgGenerated::OnStartSync ), NULL, this );
+	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncConfirmationDlgGenerated::OnCancel ), NULL, this );
 }
 
 SyncConfirmationDlgGenerated::~SyncConfirmationDlgGenerated()
@@ -3120,161 +3237,161 @@ SyncConfirmationDlgGenerated::~SyncConfirmationDlgGenerated()
 
 CompareProgressDlgGenerated::CompareProgressDlgGenerated( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
 {
-    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-
-    wxBoxSizer* bSizer40;
-    bSizer40 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_panelStatistics = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelStatistics->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-
-    wxBoxSizer* bSizer187;
-    bSizer187 = new wxBoxSizer( wxVERTICAL );
-
-
-    bSizer187->Add( 0, 5, 0, 0, 5 );
-
-    wxFlexGridSizer* fgSizer7;
-    fgSizer7 = new wxFlexGridSizer( 0, 2, 5, 5 );
-    fgSizer7->SetFlexibleDirection( wxHORIZONTAL );
-    fgSizer7->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-
-    m_staticTextItemsFoundLabel = new wxStaticText( m_panelStatistics, wxID_ANY, _("Items found:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextItemsFoundLabel->Wrap( -1 );
-    fgSizer7->Add( m_staticTextItemsFoundLabel, 0, wxALIGN_BOTTOM, 5 );
-
-    m_staticTextItemsFound = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextItemsFound->Wrap( -1 );
-    m_staticTextItemsFound->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-
-    fgSizer7->Add( m_staticTextItemsFound, 0, wxALIGN_BOTTOM, 5 );
-
-    m_staticTextItemsRemainingLabel = new wxStaticText( m_panelStatistics, wxID_ANY, _("Items remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextItemsRemainingLabel->Wrap( -1 );
-    fgSizer7->Add( m_staticTextItemsRemainingLabel, 0, wxALIGN_BOTTOM, 5 );
-
-    bSizerItemsRemaining = new wxBoxSizer( wxHORIZONTAL );
-
-    m_staticTextItemsRemaining = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextItemsRemaining->Wrap( -1 );
-    m_staticTextItemsRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-
-    bSizerItemsRemaining->Add( m_staticTextItemsRemaining, 0, wxALIGN_BOTTOM, 5 );
-
-    m_staticTextBytesRemaining = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextBytesRemaining->Wrap( -1 );
-    bSizerItemsRemaining->Add( m_staticTextBytesRemaining, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-
-
-    fgSizer7->Add( bSizerItemsRemaining, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_staticTextTimeRemainingLabel = new wxStaticText( m_panelStatistics, wxID_ANY, _("Time remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextTimeRemainingLabel->Wrap( -1 );
-    fgSizer7->Add( m_staticTextTimeRemainingLabel, 0, wxALIGN_BOTTOM, 5 );
-
-    m_staticTextTimeRemaining = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextTimeRemaining->Wrap( -1 );
-    m_staticTextTimeRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-
-    fgSizer7->Add( m_staticTextTimeRemaining, 0, wxALIGN_BOTTOM, 5 );
-
-    wxStaticText* m_staticText37;
-    m_staticText37 = new wxStaticText( m_panelStatistics, wxID_ANY, _("Time elapsed:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText37->Wrap( -1 );
-    fgSizer7->Add( m_staticText37, 0, wxALIGN_BOTTOM, 5 );
-
-    m_staticTextTimeElapsed = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextTimeElapsed->Wrap( -1 );
-    m_staticTextTimeElapsed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-
-    fgSizer7->Add( m_staticTextTimeElapsed, 0, wxALIGN_BOTTOM, 5 );
-
-
-    bSizer187->Add( fgSizer7, 0, wxRIGHT|wxLEFT, 5 );
-
-
-    bSizer187->Add( 0, 5, 0, 0, 5 );
-
-
-    m_panelStatistics->SetSizer( bSizer187 );
-    m_panelStatistics->Layout();
-    bSizer187->Fit( m_panelStatistics );
-    bSizer40->Add( m_panelStatistics, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-    wxBoxSizer* bSizer181;
-    bSizer181 = new wxBoxSizer( wxVERTICAL );
-
-    m_staticTextStatus = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextStatus->Wrap( -1 );
-    bSizer181->Add( m_staticTextStatus, 0, 0, 5 );
-
-    wxBoxSizer* bSizer199;
-    bSizer199 = new wxBoxSizer( wxHORIZONTAL );
-
-    bSizerErrorsRetry = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmapRetryErrors = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizerErrorsRetry->Add( m_bitmapRetryErrors, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_staticText1461 = new wxStaticText( this, wxID_ANY, _("Automatic retry"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText1461->Wrap( -1 );
-    bSizerErrorsRetry->Add( m_staticText1461, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-
-    m_staticTextRetryCount = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextRetryCount->Wrap( -1 );
-    bSizerErrorsRetry->Add( m_staticTextRetryCount, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
-
-    bSizer199->Add( bSizerErrorsRetry, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
-    bSizerErrorsIgnore = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmapIgnoreErrors = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizerErrorsIgnore->Add( m_bitmapIgnoreErrors, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_staticText146 = new wxStaticText( this, wxID_ANY, _("Ignore errors"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText146->Wrap( -1 );
-    bSizerErrorsIgnore->Add( m_staticText146, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-
-
-    bSizer199->Add( bSizerErrorsIgnore, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
-    bSizerProgressGraph = new wxBoxSizer( wxHORIZONTAL );
-
-    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 );
-
-    wxBoxSizer* bSizer247;
-    bSizer247 = new wxBoxSizer( wxVERTICAL );
-
-    wxStaticText* m_staticText99;
-    m_staticText99 = new wxStaticText( this, wxID_ANY, _("Bytes"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText99->Wrap( -1 );
-    bSizer247->Add( m_staticText99, 0, wxALL, 5 );
-
-    wxStaticText* m_staticText100;
-    m_staticText100 = new wxStaticText( this, wxID_ANY, _("Items"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText100->Wrap( -1 );
-    bSizer247->Add( m_staticText100, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
-
-    bSizerProgressGraph->Add( bSizer247, 0, 0, 5 );
-
-
-    bSizer199->Add( bSizerProgressGraph, 1, wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer181->Add( bSizer199, 0, wxTOP|wxEXPAND, 5 );
-
-
-    bSizer40->Add( bSizer181, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-
-    this->SetSizer( bSizer40 );
-    this->Layout();
-    bSizer40->Fit( this );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	
+	wxBoxSizer* bSizer40;
+	bSizer40 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_panelStatistics = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_panelStatistics->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	
+	wxBoxSizer* bSizer187;
+	bSizer187 = new wxBoxSizer( wxVERTICAL );
+	
+	
+	bSizer187->Add( 0, 5, 0, 0, 5 );
+	
+	wxFlexGridSizer* fgSizer7;
+	fgSizer7 = new wxFlexGridSizer( 0, 2, 5, 5 );
+	fgSizer7->SetFlexibleDirection( wxHORIZONTAL );
+	fgSizer7->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	m_staticTextItemsFoundLabel = new wxStaticText( m_panelStatistics, wxID_ANY, _("Items found:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextItemsFoundLabel->Wrap( -1 );
+	fgSizer7->Add( m_staticTextItemsFoundLabel, 0, wxALIGN_BOTTOM, 5 );
+	
+	m_staticTextItemsFound = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextItemsFound->Wrap( -1 );
+	m_staticTextItemsFound->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	
+	fgSizer7->Add( m_staticTextItemsFound, 0, wxALIGN_BOTTOM, 5 );
+	
+	m_staticTextItemsRemainingLabel = new wxStaticText( m_panelStatistics, wxID_ANY, _("Items remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextItemsRemainingLabel->Wrap( -1 );
+	fgSizer7->Add( m_staticTextItemsRemainingLabel, 0, wxALIGN_BOTTOM, 5 );
+	
+	bSizerItemsRemaining = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_staticTextItemsRemaining = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextItemsRemaining->Wrap( -1 );
+	m_staticTextItemsRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	
+	bSizerItemsRemaining->Add( m_staticTextItemsRemaining, 0, wxALIGN_BOTTOM, 5 );
+	
+	m_staticTextBytesRemaining = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextBytesRemaining->Wrap( -1 );
+	bSizerItemsRemaining->Add( m_staticTextBytesRemaining, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+	
+	
+	fgSizer7->Add( bSizerItemsRemaining, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_staticTextTimeRemainingLabel = new wxStaticText( m_panelStatistics, wxID_ANY, _("Time remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextTimeRemainingLabel->Wrap( -1 );
+	fgSizer7->Add( m_staticTextTimeRemainingLabel, 0, wxALIGN_BOTTOM, 5 );
+	
+	m_staticTextTimeRemaining = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextTimeRemaining->Wrap( -1 );
+	m_staticTextTimeRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	
+	fgSizer7->Add( m_staticTextTimeRemaining, 0, wxALIGN_BOTTOM, 5 );
+	
+	wxStaticText* m_staticText37;
+	m_staticText37 = new wxStaticText( m_panelStatistics, wxID_ANY, _("Time elapsed:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText37->Wrap( -1 );
+	fgSizer7->Add( m_staticText37, 0, wxALIGN_BOTTOM, 5 );
+	
+	m_staticTextTimeElapsed = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextTimeElapsed->Wrap( -1 );
+	m_staticTextTimeElapsed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	
+	fgSizer7->Add( m_staticTextTimeElapsed, 0, wxALIGN_BOTTOM, 5 );
+	
+	
+	bSizer187->Add( fgSizer7, 0, wxRIGHT|wxLEFT, 5 );
+	
+	
+	bSizer187->Add( 0, 5, 0, 0, 5 );
+	
+	
+	m_panelStatistics->SetSizer( bSizer187 );
+	m_panelStatistics->Layout();
+	bSizer187->Fit( m_panelStatistics );
+	bSizer40->Add( m_panelStatistics, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	wxBoxSizer* bSizer181;
+	bSizer181 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticTextStatus = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextStatus->Wrap( -1 );
+	bSizer181->Add( m_staticTextStatus, 0, 0, 5 );
+	
+	wxBoxSizer* bSizer199;
+	bSizer199 = new wxBoxSizer( wxHORIZONTAL );
+	
+	bSizerErrorsRetry = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapRetryErrors = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerErrorsRetry->Add( m_bitmapRetryErrors, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_staticText1461 = new wxStaticText( this, wxID_ANY, _("Automatic retry"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText1461->Wrap( -1 );
+	bSizerErrorsRetry->Add( m_staticText1461, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+	
+	m_staticTextRetryCount = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextRetryCount->Wrap( -1 );
+	bSizerErrorsRetry->Add( m_staticTextRetryCount, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	
+	
+	bSizer199->Add( bSizerErrorsRetry, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	
+	bSizerErrorsIgnore = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapIgnoreErrors = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerErrorsIgnore->Add( m_bitmapIgnoreErrors, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_staticText146 = new wxStaticText( this, wxID_ANY, _("Ignore errors"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText146->Wrap( -1 );
+	bSizerErrorsIgnore->Add( m_staticText146, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+	
+	
+	bSizer199->Add( bSizerErrorsIgnore, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	
+	bSizerProgressGraph = new wxBoxSizer( wxHORIZONTAL );
+	
+	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 );
+	
+	wxBoxSizer* bSizer247;
+	bSizer247 = new wxBoxSizer( wxVERTICAL );
+	
+	wxStaticText* m_staticText99;
+	m_staticText99 = new wxStaticText( this, wxID_ANY, _("Bytes"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText99->Wrap( -1 );
+	bSizer247->Add( m_staticText99, 0, wxALL, 5 );
+	
+	wxStaticText* m_staticText100;
+	m_staticText100 = new wxStaticText( this, wxID_ANY, _("Items"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText100->Wrap( -1 );
+	bSizer247->Add( m_staticText100, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	
+	bSizerProgressGraph->Add( bSizer247, 0, 0, 5 );
+	
+	
+	bSizer199->Add( bSizerProgressGraph, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer181->Add( bSizer199, 0, wxTOP|wxEXPAND, 5 );
+	
+	
+	bSizer40->Add( bSizer181, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	
+	this->SetSizer( bSizer40 );
+	this->Layout();
+	bSizer40->Fit( this );
 }
 
 CompareProgressDlgGenerated::~CompareProgressDlgGenerated()
@@ -3283,346 +3400,346 @@ CompareProgressDlgGenerated::~CompareProgressDlgGenerated()
 
 SyncProgressPanelGenerated::SyncProgressPanelGenerated( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
 {
-    bSizerRoot = new wxBoxSizer( wxVERTICAL );
-
-    m_panel53 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel53->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-
-    bSizer42 = new wxBoxSizer( wxHORIZONTAL );
-
-
-    bSizer42->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    m_bitmapStatus = new wxStaticBitmap( m_panel53, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer42->Add( m_bitmapStatus, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2 );
-
-    m_staticTextPhase = new wxStaticText( m_panel53, wxID_ANY, _("Synchronizing..."), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextPhase->Wrap( -1 );
-    m_staticTextPhase->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-
-    bSizer42->Add( m_staticTextPhase, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-
-    wxBoxSizer* bSizer247;
-    bSizer247 = new wxBoxSizer( wxHORIZONTAL );
-
-
-    bSizer247->Add( 0, 0, 1, 0, 5 );
-
-    m_bpButtonMinimizeToTray = new wxBitmapButton( m_panel53, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    m_bpButtonMinimizeToTray->SetToolTip( _("Minimize to notification area") );
-
-    bSizer247->Add( m_bpButtonMinimizeToTray, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
-
-
-    bSizer42->Add( bSizer247, 1, wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    m_panel53->SetSizer( bSizer42 );
-    m_panel53->Layout();
-    bSizer42->Fit( m_panel53 );
-    bSizerRoot->Add( m_panel53, 0, wxEXPAND, 5 );
-
-    bSizerStatusText = new wxBoxSizer( wxVERTICAL );
-
-
-    bSizerStatusText->Add( 0, 5, 0, 0, 5 );
-
-    m_staticTextStatus = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextStatus->Wrap( -1 );
-    bSizerStatusText->Add( m_staticTextStatus, 0, wxEXPAND|wxLEFT, 10 );
-
-
-    bSizerStatusText->Add( 0, 5, 0, 0, 5 );
-
-
-    bSizerRoot->Add( bSizerStatusText, 0, wxEXPAND, 5 );
-
-    m_panelProgress = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelProgress->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-
-    wxBoxSizer* bSizer173;
-    bSizer173 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxBoxSizer* 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 ) );
-
-    bSizer161->Add( m_panelGraphBytes, 1, wxEXPAND|wxLEFT, 10 );
-
-    wxBoxSizer* bSizer232;
-    bSizer232 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_panelItemsProcessed = new wxPanel( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelItemsProcessed->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-
-    wxBoxSizer* bSizer165;
-    bSizer165 = new wxBoxSizer( wxVERTICAL );
-
-
-    bSizer165->Add( 0, 5, 0, 0, 5 );
-
-    wxStaticText* m_staticText96;
-    m_staticText96 = new wxStaticText( m_panelItemsProcessed, wxID_ANY, _("Items processed:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText96->Wrap( -1 );
-    bSizer165->Add( m_staticText96, 0, wxRIGHT|wxLEFT, 5 );
-
-    wxBoxSizer* bSizer169;
-    bSizer169 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_staticTextItemsProcessed = new wxStaticText( m_panelItemsProcessed, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_staticTextItemsProcessed->Wrap( -1 );
-    m_staticTextItemsProcessed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-
-    bSizer169->Add( m_staticTextItemsProcessed, 0, wxALIGN_BOTTOM, 5 );
-
-    m_staticTextBytesProcessed = new wxStaticText( m_panelItemsProcessed, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextBytesProcessed->Wrap( -1 );
-    bSizer169->Add( m_staticTextBytesProcessed, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-
-
-    bSizer165->Add( bSizer169, 0, wxRIGHT|wxLEFT, 5 );
-
-
-    bSizer165->Add( 0, 5, 0, 0, 5 );
-
-
-    m_panelItemsProcessed->SetSizer( bSizer165 );
-    m_panelItemsProcessed->Layout();
-    bSizer165->Fit( m_panelItemsProcessed );
-    bSizer232->Add( m_panelItemsProcessed, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 10 );
-
-    m_panelItemsRemaining = new wxPanel( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelItemsRemaining->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-
-    wxBoxSizer* bSizer166;
-    bSizer166 = new wxBoxSizer( wxVERTICAL );
-
-
-    bSizer166->Add( 0, 5, 0, 0, 5 );
-
-    wxStaticText* m_staticText97;
-    m_staticText97 = new wxStaticText( m_panelItemsRemaining, wxID_ANY, _("Items remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText97->Wrap( -1 );
-    bSizer166->Add( m_staticText97, 0, wxRIGHT|wxLEFT, 5 );
-
-    wxBoxSizer* bSizer170;
-    bSizer170 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_staticTextItemsRemaining = new wxStaticText( m_panelItemsRemaining, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_staticTextItemsRemaining->Wrap( -1 );
-    m_staticTextItemsRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-
-    bSizer170->Add( m_staticTextItemsRemaining, 0, wxALIGN_BOTTOM, 5 );
-
-    m_staticTextBytesRemaining = new wxStaticText( m_panelItemsRemaining, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextBytesRemaining->Wrap( -1 );
-    bSizer170->Add( m_staticTextBytesRemaining, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-
-
-    bSizer166->Add( bSizer170, 0, wxRIGHT|wxLEFT, 5 );
-
-
-    bSizer166->Add( 0, 5, 0, 0, 5 );
-
-
-    m_panelItemsRemaining->SetSizer( bSizer166 );
-    m_panelItemsRemaining->Layout();
-    bSizer166->Fit( m_panelItemsRemaining );
-    bSizer232->Add( m_panelItemsRemaining, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 10 );
-
-    m_panelTimeRemaining = new wxPanel( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelTimeRemaining->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-
-    wxBoxSizer* bSizer167;
-    bSizer167 = new wxBoxSizer( wxVERTICAL );
-
-
-    bSizer167->Add( 0, 5, 0, 0, 5 );
-
-    wxStaticText* m_staticText98;
-    m_staticText98 = new wxStaticText( m_panelTimeRemaining, wxID_ANY, _("Time remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText98->Wrap( -1 );
-    bSizer167->Add( m_staticText98, 0, wxRIGHT|wxLEFT, 5 );
-
-    m_staticTextTimeRemaining = new wxStaticText( m_panelTimeRemaining, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextTimeRemaining->Wrap( -1 );
-    m_staticTextTimeRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-
-    bSizer167->Add( m_staticTextTimeRemaining, 0, wxRIGHT|wxLEFT, 5 );
-
-
-    bSizer167->Add( 0, 5, 0, 0, 5 );
-
-
-    m_panelTimeRemaining->SetSizer( bSizer167 );
-    m_panelTimeRemaining->Layout();
-    bSizer167->Fit( m_panelTimeRemaining );
-    bSizer232->Add( m_panelTimeRemaining, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 10 );
-
-    wxPanel* m_panelTimeElapsed;
-    m_panelTimeElapsed = new wxPanel( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelTimeElapsed->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-
-    wxBoxSizer* bSizer168;
-    bSizer168 = new wxBoxSizer( wxVERTICAL );
-
-
-    bSizer168->Add( 0, 5, 0, 0, 5 );
-
-    wxStaticText* m_staticText961;
-    m_staticText961 = new wxStaticText( m_panelTimeElapsed, wxID_ANY, _("Time elapsed:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText961->Wrap( -1 );
-    bSizer168->Add( m_staticText961, 0, wxRIGHT|wxLEFT, 5 );
-
-    m_staticTextTimeElapsed = new wxStaticText( m_panelTimeElapsed, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextTimeElapsed->Wrap( -1 );
-    m_staticTextTimeElapsed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-
-    bSizer168->Add( m_staticTextTimeElapsed, 0, wxRIGHT|wxLEFT, 5 );
-
-
-    bSizer168->Add( 0, 5, 0, 0, 5 );
-
-
-    m_panelTimeElapsed->SetSizer( bSizer168 );
-    m_panelTimeElapsed->Layout();
-    bSizer168->Fit( m_panelTimeElapsed );
-    bSizer232->Add( m_panelTimeElapsed, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 10 );
-
-    wxBoxSizer* bSizer233;
-    bSizer233 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer175;
-    bSizer175 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmapGraphKeyBytes = new wxStaticBitmap( m_panelProgress, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer175->Add( m_bitmapGraphKeyBytes, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
-    wxStaticText* m_staticText99;
-    m_staticText99 = new wxStaticText( m_panelProgress, wxID_ANY, _("Bytes"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText99->Wrap( -1 );
-    bSizer175->Add( m_staticText99, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer233->Add( bSizer175, 0, 0, 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 );
-
-    wxStaticText* m_staticText100;
-    m_staticText100 = new wxStaticText( m_panelProgress, wxID_ANY, _("Items"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText100->Wrap( -1 );
-    bSizer174->Add( m_staticText100, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer233->Add( bSizer174, 0, wxTOP, 5 );
-
-
-    bSizer232->Add( bSizer233, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 10 );
-
-
-    bSizer161->Add( bSizer232, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM, 10 );
-
-    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 );
-
-    bSizerProgressFooter = 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_staticText1461 = new wxStaticText( m_panelProgress, wxID_ANY, _("Automatic retry"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText1461->Wrap( -1 );
-    bSizerErrorsRetry->Add( m_staticText1461, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-
-    m_staticTextRetryCount = new wxStaticText( m_panelProgress, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextRetryCount->Wrap( -1 );
-    bSizerErrorsRetry->Add( m_staticTextRetryCount, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
-
-    bSizerProgressFooter->Add( bSizerErrorsRetry, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
-    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_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( 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 );
-
-    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 );
-
-
-    bSizer173->Add( bSizer161, 1, wxEXPAND|wxLEFT, 10 );
-
-
-    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 ) );
-
-
-    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 );
-
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
-
-    m_checkBoxAutoClose = new wxCheckBox( this, wxID_ANY, _("Auto-close"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizerStdButtons->Add( m_checkBoxAutoClose, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-
-    bSizerStdButtons->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    m_buttonClose = new wxButton( this, wxID_OK, _("Close"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_buttonClose->SetDefault();
-    m_buttonClose->Enable( false );
-
-    bSizerStdButtons->Add( m_buttonClose, 0, wxALIGN_CENTER_VERTICAL|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 );
-
-
-    bSizerRoot->Add( bSizerStdButtons, 0, wxEXPAND, 5 );
-
-
-    this->SetSizer( bSizerRoot );
-    this->Layout();
-    bSizerRoot->Fit( this );
+	bSizerRoot = new wxBoxSizer( wxVERTICAL );
+	
+	m_panel53 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel53->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	
+	bSizer42 = new wxBoxSizer( wxHORIZONTAL );
+	
+	
+	bSizer42->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_bitmapStatus = new wxStaticBitmap( m_panel53, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer42->Add( m_bitmapStatus, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2 );
+	
+	m_staticTextPhase = new wxStaticText( m_panel53, wxID_ANY, _("Synchronizing..."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextPhase->Wrap( -1 );
+	m_staticTextPhase->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	
+	bSizer42->Add( m_staticTextPhase, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	
+	wxBoxSizer* bSizer247;
+	bSizer247 = new wxBoxSizer( wxHORIZONTAL );
+	
+	
+	bSizer247->Add( 0, 0, 1, 0, 5 );
+	
+	m_bpButtonMinimizeToTray = new wxBitmapButton( m_panel53, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	m_bpButtonMinimizeToTray->SetToolTip( _("Minimize to notification area") );
+	
+	bSizer247->Add( m_bpButtonMinimizeToTray, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
+	
+	
+	bSizer42->Add( bSizer247, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	m_panel53->SetSizer( bSizer42 );
+	m_panel53->Layout();
+	bSizer42->Fit( m_panel53 );
+	bSizerRoot->Add( m_panel53, 0, wxEXPAND, 5 );
+	
+	bSizerStatusText = new wxBoxSizer( wxVERTICAL );
+	
+	
+	bSizerStatusText->Add( 0, 5, 0, 0, 5 );
+	
+	m_staticTextStatus = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextStatus->Wrap( -1 );
+	bSizerStatusText->Add( m_staticTextStatus, 0, wxEXPAND|wxLEFT, 10 );
+	
+	
+	bSizerStatusText->Add( 0, 5, 0, 0, 5 );
+	
+	
+	bSizerRoot->Add( bSizerStatusText, 0, wxEXPAND, 5 );
+	
+	m_panelProgress = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelProgress->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	
+	wxBoxSizer* bSizer173;
+	bSizer173 = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* 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 ) );
+	
+	bSizer161->Add( m_panelGraphBytes, 1, wxEXPAND|wxLEFT, 10 );
+	
+	wxBoxSizer* bSizer232;
+	bSizer232 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_panelItemsProcessed = new wxPanel( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_panelItemsProcessed->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	
+	wxBoxSizer* bSizer165;
+	bSizer165 = new wxBoxSizer( wxVERTICAL );
+	
+	
+	bSizer165->Add( 0, 5, 0, 0, 5 );
+	
+	wxStaticText* m_staticText96;
+	m_staticText96 = new wxStaticText( m_panelItemsProcessed, wxID_ANY, _("Items processed:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText96->Wrap( -1 );
+	bSizer165->Add( m_staticText96, 0, wxRIGHT|wxLEFT, 5 );
+	
+	wxBoxSizer* bSizer169;
+	bSizer169 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_staticTextItemsProcessed = new wxStaticText( m_panelItemsProcessed, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_staticTextItemsProcessed->Wrap( -1 );
+	m_staticTextItemsProcessed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	
+	bSizer169->Add( m_staticTextItemsProcessed, 0, wxALIGN_BOTTOM, 5 );
+	
+	m_staticTextBytesProcessed = new wxStaticText( m_panelItemsProcessed, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextBytesProcessed->Wrap( -1 );
+	bSizer169->Add( m_staticTextBytesProcessed, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+	
+	
+	bSizer165->Add( bSizer169, 0, wxRIGHT|wxLEFT, 5 );
+	
+	
+	bSizer165->Add( 0, 5, 0, 0, 5 );
+	
+	
+	m_panelItemsProcessed->SetSizer( bSizer165 );
+	m_panelItemsProcessed->Layout();
+	bSizer165->Fit( m_panelItemsProcessed );
+	bSizer232->Add( m_panelItemsProcessed, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 10 );
+	
+	m_panelItemsRemaining = new wxPanel( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_panelItemsRemaining->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	
+	wxBoxSizer* bSizer166;
+	bSizer166 = new wxBoxSizer( wxVERTICAL );
+	
+	
+	bSizer166->Add( 0, 5, 0, 0, 5 );
+	
+	wxStaticText* m_staticText97;
+	m_staticText97 = new wxStaticText( m_panelItemsRemaining, wxID_ANY, _("Items remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText97->Wrap( -1 );
+	bSizer166->Add( m_staticText97, 0, wxRIGHT|wxLEFT, 5 );
+	
+	wxBoxSizer* bSizer170;
+	bSizer170 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_staticTextItemsRemaining = new wxStaticText( m_panelItemsRemaining, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_staticTextItemsRemaining->Wrap( -1 );
+	m_staticTextItemsRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	
+	bSizer170->Add( m_staticTextItemsRemaining, 0, wxALIGN_BOTTOM, 5 );
+	
+	m_staticTextBytesRemaining = new wxStaticText( m_panelItemsRemaining, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextBytesRemaining->Wrap( -1 );
+	bSizer170->Add( m_staticTextBytesRemaining, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+	
+	
+	bSizer166->Add( bSizer170, 0, wxRIGHT|wxLEFT, 5 );
+	
+	
+	bSizer166->Add( 0, 5, 0, 0, 5 );
+	
+	
+	m_panelItemsRemaining->SetSizer( bSizer166 );
+	m_panelItemsRemaining->Layout();
+	bSizer166->Fit( m_panelItemsRemaining );
+	bSizer232->Add( m_panelItemsRemaining, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 10 );
+	
+	m_panelTimeRemaining = new wxPanel( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_panelTimeRemaining->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	
+	wxBoxSizer* bSizer167;
+	bSizer167 = new wxBoxSizer( wxVERTICAL );
+	
+	
+	bSizer167->Add( 0, 5, 0, 0, 5 );
+	
+	wxStaticText* m_staticText98;
+	m_staticText98 = new wxStaticText( m_panelTimeRemaining, wxID_ANY, _("Time remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText98->Wrap( -1 );
+	bSizer167->Add( m_staticText98, 0, wxRIGHT|wxLEFT, 5 );
+	
+	m_staticTextTimeRemaining = new wxStaticText( m_panelTimeRemaining, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextTimeRemaining->Wrap( -1 );
+	m_staticTextTimeRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	
+	bSizer167->Add( m_staticTextTimeRemaining, 0, wxRIGHT|wxLEFT, 5 );
+	
+	
+	bSizer167->Add( 0, 5, 0, 0, 5 );
+	
+	
+	m_panelTimeRemaining->SetSizer( bSizer167 );
+	m_panelTimeRemaining->Layout();
+	bSizer167->Fit( m_panelTimeRemaining );
+	bSizer232->Add( m_panelTimeRemaining, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 10 );
+	
+	wxPanel* m_panelTimeElapsed;
+	m_panelTimeElapsed = new wxPanel( m_panelProgress, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_panelTimeElapsed->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	
+	wxBoxSizer* bSizer168;
+	bSizer168 = new wxBoxSizer( wxVERTICAL );
+	
+	
+	bSizer168->Add( 0, 5, 0, 0, 5 );
+	
+	wxStaticText* m_staticText961;
+	m_staticText961 = new wxStaticText( m_panelTimeElapsed, wxID_ANY, _("Time elapsed:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText961->Wrap( -1 );
+	bSizer168->Add( m_staticText961, 0, wxRIGHT|wxLEFT, 5 );
+	
+	m_staticTextTimeElapsed = new wxStaticText( m_panelTimeElapsed, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextTimeElapsed->Wrap( -1 );
+	m_staticTextTimeElapsed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	
+	bSizer168->Add( m_staticTextTimeElapsed, 0, wxRIGHT|wxLEFT, 5 );
+	
+	
+	bSizer168->Add( 0, 5, 0, 0, 5 );
+	
+	
+	m_panelTimeElapsed->SetSizer( bSizer168 );
+	m_panelTimeElapsed->Layout();
+	bSizer168->Fit( m_panelTimeElapsed );
+	bSizer232->Add( m_panelTimeElapsed, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 10 );
+	
+	wxBoxSizer* bSizer233;
+	bSizer233 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer175;
+	bSizer175 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapGraphKeyBytes = new wxStaticBitmap( m_panelProgress, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer175->Add( m_bitmapGraphKeyBytes, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	
+	wxStaticText* m_staticText99;
+	m_staticText99 = new wxStaticText( m_panelProgress, wxID_ANY, _("Bytes"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText99->Wrap( -1 );
+	bSizer175->Add( m_staticText99, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer233->Add( bSizer175, 0, 0, 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 );
+	
+	wxStaticText* m_staticText100;
+	m_staticText100 = new wxStaticText( m_panelProgress, wxID_ANY, _("Items"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText100->Wrap( -1 );
+	bSizer174->Add( m_staticText100, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer233->Add( bSizer174, 0, wxTOP, 5 );
+	
+	
+	bSizer232->Add( bSizer233, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 10 );
+	
+	
+	bSizer161->Add( bSizer232, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM, 10 );
+	
+	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 );
+	
+	bSizerProgressFooter = 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_staticText1461 = new wxStaticText( m_panelProgress, wxID_ANY, _("Automatic retry"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText1461->Wrap( -1 );
+	bSizerErrorsRetry->Add( m_staticText1461, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+	
+	m_staticTextRetryCount = new wxStaticText( m_panelProgress, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextRetryCount->Wrap( -1 );
+	bSizerErrorsRetry->Add( m_staticTextRetryCount, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	
+	
+	bSizerProgressFooter->Add( bSizerErrorsRetry, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	
+	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_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( 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 );
+	
+	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 );
+	
+	
+	bSizer173->Add( bSizer161, 1, wxEXPAND|wxLEFT, 10 );
+	
+	
+	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 ) );
+	
+	
+	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 );
+	
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_checkBoxAutoClose = new wxCheckBox( this, wxID_ANY, _("Auto-close"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerStdButtons->Add( m_checkBoxAutoClose, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	
+	bSizerStdButtons->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_buttonClose = new wxButton( this, wxID_OK, _("Close"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_buttonClose->SetDefault(); 
+	m_buttonClose->Enable( false );
+	
+	bSizerStdButtons->Add( m_buttonClose, 0, wxALIGN_CENTER_VERTICAL|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 );
+	
+	
+	bSizerRoot->Add( bSizerStdButtons, 0, wxEXPAND, 5 );
+	
+	
+	this->SetSizer( bSizerRoot );
+	this->Layout();
+	bSizerRoot->Fit( this );
 }
 
 SyncProgressPanelGenerated::~SyncProgressPanelGenerated()
@@ -3631,42 +3748,42 @@ SyncProgressPanelGenerated::~SyncProgressPanelGenerated()
 
 LogPanelGenerated::LogPanelGenerated( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
 {
-    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-
-    wxBoxSizer* bSizer153;
-    bSizer153 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxBoxSizer* bSizer154;
-    bSizer154 = new wxBoxSizer( wxVERTICAL );
-
-    m_bpButtonErrors = new zen::ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    bSizer154->Add( m_bpButtonErrors, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_bpButtonWarnings = new zen::ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    bSizer154->Add( m_bpButtonWarnings, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_bpButtonInfo = new zen::ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    bSizer154->Add( m_bpButtonInfo, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-
-    bSizer153->Add( bSizer154, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-
-    m_staticline13 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer153->Add( m_staticline13, 0, wxEXPAND, 5 );
-
-    m_gridMessages = new zen::Grid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
-    m_gridMessages->SetScrollRate( 5, 5 );
-    bSizer153->Add( m_gridMessages, 1, wxEXPAND, 5 );
-
-
-    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 );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	
+	wxBoxSizer* bSizer153;
+	bSizer153 = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bSizer154;
+	bSizer154 = new wxBoxSizer( wxVERTICAL );
+	
+	m_bpButtonErrors = new zen::ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	bSizer154->Add( m_bpButtonErrors, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_bpButtonWarnings = new zen::ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	bSizer154->Add( m_bpButtonWarnings, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_bpButtonInfo = new zen::ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	bSizer154->Add( m_bpButtonInfo, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	
+	bSizer153->Add( bSizer154, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+	
+	m_staticline13 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer153->Add( m_staticline13, 0, wxEXPAND, 5 );
+	
+	m_gridMessages = new zen::Grid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
+	m_gridMessages->SetScrollRate( 5, 5 );
+	bSizer153->Add( m_gridMessages, 1, wxEXPAND, 5 );
+	
+	
+	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 );
 }
 
 LogPanelGenerated::~LogPanelGenerated()
@@ -3675,173 +3792,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 ) );
-
-    wxBoxSizer* bSizer54;
-    bSizer54 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer72;
-    bSizer72 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmapBatchJob = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer72->Add( m_bitmapBatchJob, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
-
-    m_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 );
-
-    m_staticline18 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer54->Add( m_staticline18, 0, wxEXPAND, 5 );
-
-    m_panel35 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel35->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-
-    wxBoxSizer* bSizer172;
-    bSizer172 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer180;
-    bSizer180 = new wxBoxSizer( wxHORIZONTAL );
-
-    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 );
-
-    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_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 );
-
-    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 );
-
-
-    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 );
-
-    wxBoxSizer* bSizer242;
-    bSizer242 = new wxBoxSizer( wxVERTICAL );
-
-    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_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|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    wxBoxSizer* bSizer246;
-    bSizer246 = new wxBoxSizer( wxVERTICAL );
-
-    m_radioBtnErrorDialogShow = new wxRadioButton( m_panel35, wxID_ANY, _("&Show error dialog"), 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 );
-
-    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 );
-
-
-    bSizer242->Add( bSizer246, 0, wxALIGN_CENTER_HORIZONTAL, 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 );
-
-    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 );
-
-    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 );
-
-    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 );
-
-    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?"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    bSizer172->Add( m_hyperlink17, 0, wxALL, 10 );
-
-
-    m_panel35->SetSizer( bSizer172 );
-    m_panel35->Layout();
-    bSizer172->Fit( m_panel35 );
-    bSizer54->Add( m_panel35, 1, wxEXPAND, 5 );
-
-    m_staticline13 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer54->Add( m_staticline13, 0, wxEXPAND, 5 );
-
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
-
-    m_buttonSaveAs = new wxButton( this, wxID_SAVE, _("Save &as..."), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_buttonSaveAs->SetDefault();
-    m_buttonSaveAs->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-
-    bSizerStdButtons->Add( m_buttonSaveAs, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-
-
-    bSizer54->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
-
-
-    this->SetSizer( bSizer54 );
-    this->Layout();
-    bSizer54->Fit( this );
-
-    this->Centre( wxBOTH );
-
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( BatchDlgGenerated::OnClose ) );
-    m_checkBoxRunMinimized->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnToggleRunMinimized ), NULL, this );
-    m_checkBoxIgnoreErrors->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnToggleIgnoreErrors ), NULL, this );
-    m_radioBtnErrorDialogShow->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( BatchDlgGenerated::OnErrorDialogShow ), NULL, this );
-    m_radioBtnErrorDialogCancel->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( BatchDlgGenerated::OnErrorDialogCancel ), NULL, this );
-    m_hyperlink17->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( BatchDlgGenerated::OnHelpScheduleBatch ), NULL, this );
-    m_buttonSaveAs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnSaveBatchJob ), NULL, this );
-    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnCancel ), NULL, this );
+	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	
+	wxBoxSizer* bSizer54;
+	bSizer54 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer72;
+	bSizer72 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapBatchJob = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer72->Add( m_bitmapBatchJob, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
+	
+	m_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 );
+	
+	m_staticline18 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer54->Add( m_staticline18, 0, wxEXPAND, 5 );
+	
+	m_panel35 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel35->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	
+	wxBoxSizer* bSizer172;
+	bSizer172 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer180;
+	bSizer180 = new wxBoxSizer( wxHORIZONTAL );
+	
+	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 );
+	
+	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_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 );
+	
+	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 );
+	
+	
+	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 );
+	
+	wxBoxSizer* bSizer242;
+	bSizer242 = new wxBoxSizer( wxVERTICAL );
+	
+	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_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|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	wxBoxSizer* bSizer246;
+	bSizer246 = new wxBoxSizer( wxVERTICAL );
+	
+	m_radioBtnErrorDialogShow = new wxRadioButton( m_panel35, wxID_ANY, _("&Show error dialog"), 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 );
+	
+	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 );
+	
+	
+	bSizer242->Add( bSizer246, 0, wxALIGN_CENTER_HORIZONTAL, 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 );
+	
+	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 );
+	
+	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 );
+	
+	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 );
+	
+	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?"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	bSizer172->Add( m_hyperlink17, 0, wxALL, 10 );
+	
+	
+	m_panel35->SetSizer( bSizer172 );
+	m_panel35->Layout();
+	bSizer172->Fit( m_panel35 );
+	bSizer54->Add( m_panel35, 1, wxEXPAND, 5 );
+	
+	m_staticline13 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer54->Add( m_staticline13, 0, wxEXPAND, 5 );
+	
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_buttonSaveAs = new wxButton( this, wxID_SAVE, _("Save &as..."), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_buttonSaveAs->SetDefault(); 
+	m_buttonSaveAs->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	
+	bSizerStdButtons->Add( m_buttonSaveAs, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	
+	
+	bSizer54->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
+	
+	
+	this->SetSizer( bSizer54 );
+	this->Layout();
+	bSizer54->Fit( this );
+	
+	this->Centre( wxBOTH );
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( BatchDlgGenerated::OnClose ) );
+	m_checkBoxRunMinimized->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnToggleRunMinimized ), NULL, this );
+	m_checkBoxIgnoreErrors->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnToggleIgnoreErrors ), NULL, this );
+	m_radioBtnErrorDialogShow->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( BatchDlgGenerated::OnErrorDialogShow ), NULL, this );
+	m_radioBtnErrorDialogCancel->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( BatchDlgGenerated::OnErrorDialogCancel ), NULL, this );
+	m_hyperlink17->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( BatchDlgGenerated::OnHelpScheduleBatch ), NULL, this );
+	m_buttonSaveAs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnSaveBatchJob ), NULL, this );
+	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnCancel ), NULL, this );
 }
 
 BatchDlgGenerated::~BatchDlgGenerated()
@@ -3850,84 +3967,84 @@ BatchDlgGenerated::~BatchDlgGenerated()
 
 DeleteDlgGenerated::DeleteDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxSize( -1, -1 ), wxDefaultSize );
-    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-
-    wxBoxSizer* bSizer24;
-    bSizer24 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer72;
-    bSizer72 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmapDeleteType = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer72->Add( m_bitmapDeleteType, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
-
-    m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextHeader->Wrap( -1 );
-    bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_VERTICAL|wxALL, 10 );
-
-
-    bSizer24->Add( bSizer72, 0, 0, 5 );
-
-    m_staticline91 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer24->Add( m_staticline91, 0, wxEXPAND, 5 );
-
-    m_panel31 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel31->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-
-    wxBoxSizer* bSizer185;
-    bSizer185 = new wxBoxSizer( wxHORIZONTAL );
-
-
-    bSizer185->Add( 60, 0, 0, 0, 5 );
-
-    m_staticline42 = new wxStaticLine( m_panel31, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer185->Add( m_staticline42, 0, wxEXPAND, 5 );
-
-    m_textCtrlFileList = new wxTextCtrl( m_panel31, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY|wxNO_BORDER );
-    bSizer185->Add( m_textCtrlFileList, 1, wxEXPAND, 5 );
-
-
-    m_panel31->SetSizer( bSizer185 );
-    m_panel31->Layout();
-    bSizer185->Fit( m_panel31 );
-    bSizer24->Add( m_panel31, 1, wxEXPAND, 5 );
-
-    m_staticline9 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer24->Add( m_staticline9, 0, wxEXPAND, 5 );
-
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
-
-    m_checkBoxUseRecycler = new wxCheckBox( this, wxID_ANY, _("&Recycle bin"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizerStdButtons->Add( m_checkBoxUseRecycler, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-
-    bSizerStdButtons->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    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 ) );
-
-    bSizerStdButtons->Add( m_buttonOK, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-
-    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-
-
-    bSizer24->Add( bSizerStdButtons, 0, wxEXPAND, 5 );
-
-
-    this->SetSizer( bSizer24 );
-    this->Layout();
-    bSizer24->Fit( this );
-
-    this->Centre( wxBOTH );
-
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DeleteDlgGenerated::OnClose ) );
-    m_checkBoxUseRecycler->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnUseRecycler ), NULL, this );
-    m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnOK ), NULL, this );
-    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnCancel ), NULL, this );
+	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	
+	wxBoxSizer* bSizer24;
+	bSizer24 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer72;
+	bSizer72 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapDeleteType = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer72->Add( m_bitmapDeleteType, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
+	
+	m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextHeader->Wrap( -1 );
+	bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_VERTICAL|wxALL, 10 );
+	
+	
+	bSizer24->Add( bSizer72, 0, 0, 5 );
+	
+	m_staticline91 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer24->Add( m_staticline91, 0, wxEXPAND, 5 );
+	
+	m_panel31 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel31->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	
+	wxBoxSizer* bSizer185;
+	bSizer185 = new wxBoxSizer( wxHORIZONTAL );
+	
+	
+	bSizer185->Add( 60, 0, 0, 0, 5 );
+	
+	m_staticline42 = new wxStaticLine( m_panel31, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer185->Add( m_staticline42, 0, wxEXPAND, 5 );
+	
+	m_textCtrlFileList = new wxTextCtrl( m_panel31, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY|wxNO_BORDER );
+	bSizer185->Add( m_textCtrlFileList, 1, wxEXPAND, 5 );
+	
+	
+	m_panel31->SetSizer( bSizer185 );
+	m_panel31->Layout();
+	bSizer185->Fit( m_panel31 );
+	bSizer24->Add( m_panel31, 1, wxEXPAND, 5 );
+	
+	m_staticline9 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer24->Add( m_staticline9, 0, wxEXPAND, 5 );
+	
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_checkBoxUseRecycler = new wxCheckBox( this, wxID_ANY, _("&Recycle bin"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerStdButtons->Add( m_checkBoxUseRecycler, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	
+	bSizerStdButtons->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	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 ) );
+	
+	bSizerStdButtons->Add( m_buttonOK, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	
+	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	
+	
+	bSizer24->Add( bSizerStdButtons, 0, wxEXPAND, 5 );
+	
+	
+	this->SetSizer( bSizer24 );
+	this->Layout();
+	bSizer24->Fit( this );
+	
+	this->Centre( wxBOTH );
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DeleteDlgGenerated::OnClose ) );
+	m_checkBoxUseRecycler->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnUseRecycler ), NULL, this );
+	m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnOK ), NULL, this );
+	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnCancel ), NULL, this );
 }
 
 DeleteDlgGenerated::~DeleteDlgGenerated()
@@ -3936,121 +4053,121 @@ DeleteDlgGenerated::~DeleteDlgGenerated()
 
 CopyToDlgGenerated::CopyToDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxSize( -1, -1 ), wxDefaultSize );
-    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-
-    wxBoxSizer* bSizer24;
-    bSizer24 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer72;
-    bSizer72 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmapCopyTo = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer72->Add( m_bitmapCopyTo, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
-
-    m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextHeader->Wrap( -1 );
-    bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_VERTICAL|wxALL, 10 );
-
-
-    bSizer24->Add( bSizer72, 0, 0, 5 );
-
-    m_staticline91 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer24->Add( m_staticline91, 0, wxEXPAND, 5 );
-
-    m_panel31 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel31->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-
-    wxBoxSizer* bSizer242;
-    bSizer242 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer185;
-    bSizer185 = new wxBoxSizer( wxHORIZONTAL );
-
-
-    bSizer185->Add( 60, 0, 0, 0, 5 );
-
-    m_staticline42 = new wxStaticLine( m_panel31, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer185->Add( m_staticline42, 0, wxEXPAND, 5 );
-
-    m_textCtrlFileList = new wxTextCtrl( m_panel31, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY|wxNO_BORDER );
-    bSizer185->Add( m_textCtrlFileList, 1, wxEXPAND, 5 );
-
-
-    bSizer242->Add( bSizer185, 1, wxEXPAND, 5 );
-
-    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_buttonSelectTargetFolder = new wxButton( m_panel31, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_buttonSelectTargetFolder->SetToolTip( _("Select a folder") );
-
-    bSizer182->Add( m_buttonSelectTargetFolder, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_bpButtonSelectAltTargetFolder = new wxBitmapButton( m_panel31, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    m_bpButtonSelectAltTargetFolder->SetToolTip( _("Access online storage") );
-
-    bSizer182->Add( m_bpButtonSelectAltTargetFolder, 0, wxEXPAND, 5 );
-
-
-    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_staticline9 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer24->Add( m_staticline9, 0, wxEXPAND, 5 );
-
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
-
-    wxBoxSizer* bSizer189;
-    bSizer189 = new wxBoxSizer( wxVERTICAL );
-
-    m_checkBoxKeepRelPath = new wxCheckBox( this, wxID_ANY, _("&Keep relative paths"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_checkBoxKeepRelPath->SetValue(true);
-    bSizer189->Add( m_checkBoxKeepRelPath, 0, wxALL|wxEXPAND, 5 );
-
-    m_checkBoxOverwriteIfExists = new wxCheckBox( this, wxID_ANY, _("&Overwrite existing files"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_checkBoxOverwriteIfExists->SetValue(true);
-    bSizer189->Add( m_checkBoxOverwriteIfExists, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-
-
-    bSizerStdButtons->Add( bSizer189, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizerStdButtons->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    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 ) );
-
-    bSizerStdButtons->Add( m_buttonOK, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-
-    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-
-
-    bSizer24->Add( bSizerStdButtons, 0, wxEXPAND, 5 );
-
-
-    this->SetSizer( bSizer24 );
-    this->Layout();
-    bSizer24->Fit( this );
-
-    this->Centre( wxBOTH );
-
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CopyToDlgGenerated::OnClose ) );
-    m_checkBoxKeepRelPath->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CopyToDlgGenerated::OnUseRecycler ), NULL, this );
-    m_checkBoxOverwriteIfExists->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CopyToDlgGenerated::OnUseRecycler ), NULL, this );
-    m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CopyToDlgGenerated::OnOK ), NULL, this );
-    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CopyToDlgGenerated::OnCancel ), NULL, this );
+	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	
+	wxBoxSizer* bSizer24;
+	bSizer24 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer72;
+	bSizer72 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapCopyTo = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer72->Add( m_bitmapCopyTo, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
+	
+	m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextHeader->Wrap( -1 );
+	bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_VERTICAL|wxALL, 10 );
+	
+	
+	bSizer24->Add( bSizer72, 0, 0, 5 );
+	
+	m_staticline91 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer24->Add( m_staticline91, 0, wxEXPAND, 5 );
+	
+	m_panel31 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel31->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	
+	wxBoxSizer* bSizer242;
+	bSizer242 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer185;
+	bSizer185 = new wxBoxSizer( wxHORIZONTAL );
+	
+	
+	bSizer185->Add( 60, 0, 0, 0, 5 );
+	
+	m_staticline42 = new wxStaticLine( m_panel31, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer185->Add( m_staticline42, 0, wxEXPAND, 5 );
+	
+	m_textCtrlFileList = new wxTextCtrl( m_panel31, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY|wxNO_BORDER );
+	bSizer185->Add( m_textCtrlFileList, 1, wxEXPAND, 5 );
+	
+	
+	bSizer242->Add( bSizer185, 1, wxEXPAND, 5 );
+	
+	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_buttonSelectTargetFolder = new wxButton( m_panel31, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonSelectTargetFolder->SetToolTip( _("Select a folder") );
+	
+	bSizer182->Add( m_buttonSelectTargetFolder, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_bpButtonSelectAltTargetFolder = new wxBitmapButton( m_panel31, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	m_bpButtonSelectAltTargetFolder->SetToolTip( _("Access online storage") );
+	
+	bSizer182->Add( m_bpButtonSelectAltTargetFolder, 0, wxEXPAND, 5 );
+	
+	
+	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_staticline9 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer24->Add( m_staticline9, 0, wxEXPAND, 5 );
+	
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bSizer189;
+	bSizer189 = new wxBoxSizer( wxVERTICAL );
+	
+	m_checkBoxKeepRelPath = new wxCheckBox( this, wxID_ANY, _("&Keep relative paths"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_checkBoxKeepRelPath->SetValue(true); 
+	bSizer189->Add( m_checkBoxKeepRelPath, 0, wxALL|wxEXPAND, 5 );
+	
+	m_checkBoxOverwriteIfExists = new wxCheckBox( this, wxID_ANY, _("&Overwrite existing files"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_checkBoxOverwriteIfExists->SetValue(true); 
+	bSizer189->Add( m_checkBoxOverwriteIfExists, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	
+	
+	bSizerStdButtons->Add( bSizer189, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizerStdButtons->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	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 ) );
+	
+	bSizerStdButtons->Add( m_buttonOK, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	
+	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	
+	
+	bSizer24->Add( bSizerStdButtons, 0, wxEXPAND, 5 );
+	
+	
+	this->SetSizer( bSizer24 );
+	this->Layout();
+	bSizer24->Fit( this );
+	
+	this->Centre( wxBOTH );
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CopyToDlgGenerated::OnClose ) );
+	m_checkBoxKeepRelPath->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CopyToDlgGenerated::OnUseRecycler ), NULL, this );
+	m_checkBoxOverwriteIfExists->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CopyToDlgGenerated::OnUseRecycler ), NULL, this );
+	m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CopyToDlgGenerated::OnOK ), NULL, this );
+	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CopyToDlgGenerated::OnCancel ), NULL, this );
 }
 
 CopyToDlgGenerated::~CopyToDlgGenerated()
@@ -4059,296 +4176,296 @@ CopyToDlgGenerated::~CopyToDlgGenerated()
 
 OptionsDlgGenerated::OptionsDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxSize( -1, -1 ), wxDefaultSize );
-    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-
-    wxBoxSizer* bSizer95;
-    bSizer95 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer72;
-    bSizer72 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmapSettings = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer72->Add( m_bitmapSettings, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
-
-    m_staticText44 = new wxStaticText( this, wxID_ANY, _("The following settings are used for all synchronization jobs."), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_staticText44->Wrap( -1 );
-    bSizer72->Add( m_staticText44, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 10 );
-
-
-    bSizer95->Add( bSizer72, 0, 0, 5 );
-
-    m_staticline20 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer95->Add( m_staticline20, 0, wxEXPAND, 5 );
-
-    m_panel39 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel39->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-
-    wxBoxSizer* bSizer166;
-    bSizer166 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer186;
-    bSizer186 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxBoxSizer* bSizer160;
-    bSizer160 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer176;
-    bSizer176 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_checkBoxFailSafe = new wxCheckBox( m_panel39, wxID_ANY, _("Fail-safe file copy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_checkBoxFailSafe->SetValue(true);
-    m_checkBoxFailSafe->SetToolTip( _("Copy to a temporary file (*.ffs_tmp) before overwriting target.\nThis guarantees a consistent state even in case of a serious error.") );
-
-    bSizer176->Add( m_checkBoxFailSafe, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_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 );
-
-    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 );
-
-    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 );
-
-
-    bSizer160->Add( bSizer176, 0, wxEXPAND, 5 );
-
-    bSizerLockedFiles = new wxBoxSizer( wxHORIZONTAL );
-
-    m_checkBoxCopyLocked = new wxCheckBox( m_panel39, wxID_ANY, _("Copy locked files"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_checkBoxCopyLocked->SetValue(true);
-    m_checkBoxCopyLocked->SetToolTip( _("Copy shared or locked files using the Volume Shadow Copy Service.") );
-
-    bSizerLockedFiles->Add( m_checkBoxCopyLocked, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_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 );
-
-    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 );
-
-    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 );
-
-
-    bSizer160->Add( bSizerLockedFiles, 0, wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer178;
-    bSizer178 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_checkBoxCopyPermissions = new wxCheckBox( m_panel39, wxID_ANY, _("Copy file access permissions"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_checkBoxCopyPermissions->SetValue(true);
-    m_checkBoxCopyPermissions->SetToolTip( _("Transfer file and folder permissions.") );
-
-    bSizer178->Add( m_checkBoxCopyPermissions, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-    m_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 );
-
-    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 );
-
-    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 );
-
-
-    bSizer160->Add( bSizer178, 0, wxEXPAND, 5 );
-
-
-    bSizer186->Add( bSizer160, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_staticline39 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer186->Add( m_staticline39, 0, wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer1881;
-    bSizer1881 = new wxBoxSizer( wxVERTICAL );
-
-    m_staticTextResetDialogs = new wxStaticText( m_panel39, wxID_ANY, _("Show all permanently hidden dialogs and warning messages again"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextResetDialogs->Wrap( -1 );
-    m_staticTextResetDialogs->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-
-    bSizer1881->Add( m_staticTextResetDialogs, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-
-    m_buttonResetDialogs = new zen::BitmapTextButton( m_panel39, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer1881->Add( m_buttonResetDialogs, 0, wxALL, 5 );
-
-
-    bSizer186->Add( bSizer1881, 0, wxALL|wxALIGN_CENTER_VERTICAL, 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 );
-
-    wxBoxSizer* bSizer259;
-    bSizer259 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer258;
-    bSizer258 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmapLogFile = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer258->Add( m_bitmapLogFile, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_staticText163 = new wxStaticText( m_panel39, wxID_ANY, _("Default log path:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText163->Wrap( -1 );
-    bSizer258->Add( m_staticText163, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-
-    m_hyperlinkLogFolder = new wxHyperlinkCtrl( m_panel39, wxID_ANY, _("dummy"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    bSizer258->Add( m_hyperlinkLogFolder, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-
-
-    bSizer259->Add( bSizer258, 0, wxALL|wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer282;
-    bSizer282 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_checkBoxLogFilesMaxAge = new wxCheckBox( m_panel39, wxID_ANY, _("&Delete logs after x days:"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer282->Add( m_checkBoxLogFilesMaxAge, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
-    m_spinCtrlLogFilesMaxAge = new wxSpinCtrl( m_panel39, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, -1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
-    bSizer282->Add( m_spinCtrlLogFilesMaxAge, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer259->Add( bSizer282, 0, wxALL, 5 );
-
-
-    bSizer166->Add( bSizer259, 0, wxALL|wxEXPAND, 5 );
-
-    m_staticline361 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer166->Add( m_staticline361, 0, wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer181;
-    bSizer181 = new wxBoxSizer( wxVERTICAL );
-
-    m_staticText85 = new wxStaticText( m_panel39, wxID_ANY, _("Customize context menu:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText85->Wrap( -1 );
-    bSizer181->Add( m_staticText85, 0, wxBOTTOM, 5 );
-
-    m_gridCustomCommand = new wxGrid( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-
-    // Grid
-    m_gridCustomCommand->CreateGrid( 3, 2 );
-    m_gridCustomCommand->EnableEditing( true );
-    m_gridCustomCommand->EnableGridLines( true );
-    m_gridCustomCommand->EnableDragGridSize( false );
-    m_gridCustomCommand->SetMargins( 0, 0 );
-
-    // Columns
-    m_gridCustomCommand->EnableDragColMove( false );
-    m_gridCustomCommand->EnableDragColSize( true );
-    m_gridCustomCommand->SetColLabelSize( -1 );
-    m_gridCustomCommand->SetColLabelValue( 0, _("Description") );
-    m_gridCustomCommand->SetColLabelValue( 1, _("Command line") );
-    m_gridCustomCommand->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-
-    // Rows
-    m_gridCustomCommand->EnableDragRowSize( false );
-    m_gridCustomCommand->SetRowLabelSize( 1 );
-    m_gridCustomCommand->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-
-    // Label Appearance
-
-    // Cell Defaults
-    m_gridCustomCommand->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
-    bSizer181->Add( m_gridCustomCommand, 1, wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer193;
-    bSizer193 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bpButtonAddRow = new wxBitmapButton( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    bSizer193->Add( m_bpButtonAddRow, 0, wxEXPAND, 5 );
-
-    m_bpButtonRemoveRow = new wxBitmapButton( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), wxBU_AUTODRAW );
-    bSizer193->Add( m_bpButtonRemoveRow, 0, wxEXPAND, 5 );
-
-
-    bSizer193->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    m_hyperlink17 = new wxHyperlinkCtrl( m_panel39, wxID_ANY, _("Show examples"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    bSizer193->Add( m_hyperlink17, 0, wxLEFT, 5 );
-
-
-    bSizer181->Add( bSizer193, 0, wxTOP|wxEXPAND, 5 );
-
-
-    bSizer166->Add( bSizer181, 1, wxEXPAND|wxALL, 10 );
-
-
-    m_panel39->SetSizer( bSizer166 );
-    m_panel39->Layout();
-    bSizer166->Fit( m_panel39 );
-    bSizer95->Add( m_panel39, 1, wxEXPAND, 5 );
-
-    m_staticline36 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer95->Add( m_staticline36, 0, wxEXPAND, 5 );
-
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
-
-    m_buttonDefault = new wxButton( this, wxID_DEFAULT, _("&Default"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizerStdButtons->Add( m_buttonDefault, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizerStdButtons->Add( 0, 0, 1, 0, 5 );
-
-    m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_buttonOkay->SetDefault();
-    m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-
-    bSizerStdButtons->Add( m_buttonOkay, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-
-
-    bSizer95->Add( bSizerStdButtons, 0, wxEXPAND, 5 );
-
-
-    this->SetSizer( bSizer95 );
-    this->Layout();
-    bSizer95->Fit( this );
-
-    this->Centre( wxBOTH );
-
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( OptionsDlgGenerated::OnClose ) );
-    m_buttonResetDialogs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnResetDialogs ), NULL, this );
-    m_hyperlinkLogFolder->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( OptionsDlgGenerated::OnShowLogFolder ), NULL, this );
-    m_checkBoxLogFilesMaxAge->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnToggleLogfilesLimit ), NULL, this );
-    m_bpButtonAddRow->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnAddRow ), NULL, this );
-    m_bpButtonRemoveRow->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnRemoveRow ), NULL, this );
-    m_hyperlink17->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( OptionsDlgGenerated::OnHelpShowExamples ), NULL, this );
-    m_buttonDefault->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnDefault ), NULL, this );
-    m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnOkay ), NULL, this );
-    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnCancel ), NULL, this );
+	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	
+	wxBoxSizer* bSizer95;
+	bSizer95 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer72;
+	bSizer72 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapSettings = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer72->Add( m_bitmapSettings, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
+	
+	m_staticText44 = new wxStaticText( this, wxID_ANY, _("The following settings are used for all synchronization jobs."), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_staticText44->Wrap( -1 );
+	bSizer72->Add( m_staticText44, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 10 );
+	
+	
+	bSizer95->Add( bSizer72, 0, 0, 5 );
+	
+	m_staticline20 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer95->Add( m_staticline20, 0, wxEXPAND, 5 );
+	
+	m_panel39 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel39->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	
+	wxBoxSizer* bSizer166;
+	bSizer166 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer186;
+	bSizer186 = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bSizer160;
+	bSizer160 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer176;
+	bSizer176 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_checkBoxFailSafe = new wxCheckBox( m_panel39, wxID_ANY, _("Fail-safe file copy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_checkBoxFailSafe->SetValue(true); 
+	m_checkBoxFailSafe->SetToolTip( _("Copy to a temporary file (*.ffs_tmp) before overwriting target.\nThis guarantees a consistent state even in case of a serious error.") );
+	
+	bSizer176->Add( m_checkBoxFailSafe, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_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 );
+	
+	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 );
+	
+	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 );
+	
+	
+	bSizer160->Add( bSizer176, 0, wxEXPAND, 5 );
+	
+	bSizerLockedFiles = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_checkBoxCopyLocked = new wxCheckBox( m_panel39, wxID_ANY, _("Copy locked files"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_checkBoxCopyLocked->SetValue(true); 
+	m_checkBoxCopyLocked->SetToolTip( _("Copy shared or locked files using the Volume Shadow Copy Service.") );
+	
+	bSizerLockedFiles->Add( m_checkBoxCopyLocked, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_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 );
+	
+	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 );
+	
+	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 );
+	
+	
+	bSizer160->Add( bSizerLockedFiles, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer178;
+	bSizer178 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_checkBoxCopyPermissions = new wxCheckBox( m_panel39, wxID_ANY, _("Copy file access permissions"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_checkBoxCopyPermissions->SetValue(true); 
+	m_checkBoxCopyPermissions->SetToolTip( _("Transfer file and folder permissions.") );
+	
+	bSizer178->Add( m_checkBoxCopyPermissions, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_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 );
+	
+	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 );
+	
+	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 );
+	
+	
+	bSizer160->Add( bSizer178, 0, wxEXPAND, 5 );
+	
+	
+	bSizer186->Add( bSizer160, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_staticline39 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer186->Add( m_staticline39, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer1881;
+	bSizer1881 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticTextResetDialogs = new wxStaticText( m_panel39, wxID_ANY, _("Show all permanently hidden dialogs and warning messages again"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextResetDialogs->Wrap( -1 );
+	m_staticTextResetDialogs->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	
+	bSizer1881->Add( m_staticTextResetDialogs, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_buttonResetDialogs = new zen::BitmapTextButton( m_panel39, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer1881->Add( m_buttonResetDialogs, 0, wxALL, 5 );
+	
+	
+	bSizer186->Add( bSizer1881, 0, wxALL|wxALIGN_CENTER_VERTICAL, 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 );
+	
+	wxBoxSizer* bSizer259;
+	bSizer259 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer258;
+	bSizer258 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapLogFile = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer258->Add( m_bitmapLogFile, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_staticText163 = new wxStaticText( m_panel39, wxID_ANY, _("Default log path:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText163->Wrap( -1 );
+	bSizer258->Add( m_staticText163, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+	
+	m_hyperlinkLogFolder = new wxHyperlinkCtrl( m_panel39, wxID_ANY, _("dummy"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	bSizer258->Add( m_hyperlinkLogFolder, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+	
+	
+	bSizer259->Add( bSizer258, 0, wxALL|wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer282;
+	bSizer282 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_checkBoxLogFilesMaxAge = new wxCheckBox( m_panel39, wxID_ANY, _("&Delete logs after x days:"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer282->Add( m_checkBoxLogFilesMaxAge, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	
+	m_spinCtrlLogFilesMaxAge = new wxSpinCtrl( m_panel39, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
+	bSizer282->Add( m_spinCtrlLogFilesMaxAge, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer259->Add( bSizer282, 0, wxALL, 5 );
+	
+	
+	bSizer166->Add( bSizer259, 0, wxALL|wxEXPAND, 5 );
+	
+	m_staticline361 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer166->Add( m_staticline361, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer181;
+	bSizer181 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticText85 = new wxStaticText( m_panel39, wxID_ANY, _("Customize context menu:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText85->Wrap( -1 );
+	bSizer181->Add( m_staticText85, 0, wxBOTTOM, 5 );
+	
+	m_gridCustomCommand = new wxGrid( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	
+	// Grid
+	m_gridCustomCommand->CreateGrid( 3, 2 );
+	m_gridCustomCommand->EnableEditing( true );
+	m_gridCustomCommand->EnableGridLines( true );
+	m_gridCustomCommand->EnableDragGridSize( false );
+	m_gridCustomCommand->SetMargins( 0, 0 );
+	
+	// Columns
+	m_gridCustomCommand->EnableDragColMove( false );
+	m_gridCustomCommand->EnableDragColSize( true );
+	m_gridCustomCommand->SetColLabelSize( -1 );
+	m_gridCustomCommand->SetColLabelValue( 0, _("Description") );
+	m_gridCustomCommand->SetColLabelValue( 1, _("Command line") );
+	m_gridCustomCommand->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+	
+	// Rows
+	m_gridCustomCommand->EnableDragRowSize( false );
+	m_gridCustomCommand->SetRowLabelSize( 1 );
+	m_gridCustomCommand->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+	
+	// Label Appearance
+	
+	// Cell Defaults
+	m_gridCustomCommand->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	bSizer181->Add( m_gridCustomCommand, 1, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer193;
+	bSizer193 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bpButtonAddRow = new wxBitmapButton( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	bSizer193->Add( m_bpButtonAddRow, 0, wxEXPAND, 5 );
+	
+	m_bpButtonRemoveRow = new wxBitmapButton( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	bSizer193->Add( m_bpButtonRemoveRow, 0, wxEXPAND, 5 );
+	
+	
+	bSizer193->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_hyperlink17 = new wxHyperlinkCtrl( m_panel39, wxID_ANY, _("Show examples"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	bSizer193->Add( m_hyperlink17, 0, wxLEFT, 5 );
+	
+	
+	bSizer181->Add( bSizer193, 0, wxTOP|wxEXPAND, 5 );
+	
+	
+	bSizer166->Add( bSizer181, 1, wxEXPAND|wxALL, 10 );
+	
+	
+	m_panel39->SetSizer( bSizer166 );
+	m_panel39->Layout();
+	bSizer166->Fit( m_panel39 );
+	bSizer95->Add( m_panel39, 1, wxEXPAND, 5 );
+	
+	m_staticline36 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer95->Add( m_staticline36, 0, wxEXPAND, 5 );
+	
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_buttonDefault = new wxButton( this, wxID_DEFAULT, _("&Default"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizerStdButtons->Add( m_buttonDefault, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizerStdButtons->Add( 0, 0, 1, 0, 5 );
+	
+	m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_buttonOkay->SetDefault(); 
+	m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	
+	bSizerStdButtons->Add( m_buttonOkay, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	
+	
+	bSizer95->Add( bSizerStdButtons, 0, wxEXPAND, 5 );
+	
+	
+	this->SetSizer( bSizer95 );
+	this->Layout();
+	bSizer95->Fit( this );
+	
+	this->Centre( wxBOTH );
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( OptionsDlgGenerated::OnClose ) );
+	m_buttonResetDialogs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnResetDialogs ), NULL, this );
+	m_hyperlinkLogFolder->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( OptionsDlgGenerated::OnShowLogFolder ), NULL, this );
+	m_checkBoxLogFilesMaxAge->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnToggleLogfilesLimit ), NULL, this );
+	m_bpButtonAddRow->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnAddRow ), NULL, this );
+	m_bpButtonRemoveRow->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnRemoveRow ), NULL, this );
+	m_hyperlink17->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( OptionsDlgGenerated::OnHelpShowExamples ), NULL, this );
+	m_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()
@@ -4357,22 +4474,22 @@ OptionsDlgGenerated::~OptionsDlgGenerated()
 
 TooltipDlgGenerated::TooltipDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-
-    wxBoxSizer* bSizer158;
-    bSizer158 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmapLeft = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer158->Add( m_bitmapLeft, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_staticTextMain = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextMain->Wrap( 600 );
-    bSizer158->Add( m_staticTextMain, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    this->SetSizer( bSizer158 );
-    this->Layout();
-    bSizer158->Fit( this );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	
+	wxBoxSizer* bSizer158;
+	bSizer158 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapLeft = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer158->Add( m_bitmapLeft, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_staticTextMain = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextMain->Wrap( 600 );
+	bSizer158->Add( m_staticTextMain, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	this->SetSizer( bSizer158 );
+	this->Layout();
+	bSizer158->Fit( this );
 }
 
 TooltipDlgGenerated::~TooltipDlgGenerated()
@@ -4381,60 +4498,60 @@ TooltipDlgGenerated::~TooltipDlgGenerated()
 
 SelectTimespanDlgGenerated::SelectTimespanDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-
-    wxBoxSizer* bSizer96;
-    bSizer96 = new wxBoxSizer( wxVERTICAL );
-
-    m_panel35 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel35->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-
-    wxBoxSizer* bSizer98;
-    bSizer98 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_calendarFrom = new wxCalendarCtrl( m_panel35, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxCAL_SHOW_HOLIDAYS|wxNO_BORDER );
-    bSizer98->Add( m_calendarFrom, 0, wxTOP|wxBOTTOM|wxLEFT, 10 );
-
-    m_calendarTo = new wxCalendarCtrl( m_panel35, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxCAL_SHOW_HOLIDAYS|wxNO_BORDER );
-    bSizer98->Add( m_calendarTo, 0, wxALL, 10 );
-
-
-    m_panel35->SetSizer( bSizer98 );
-    m_panel35->Layout();
-    bSizer98->Fit( m_panel35 );
-    bSizer96->Add( m_panel35, 0, wxEXPAND, 5 );
-
-    m_staticline21 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer96->Add( m_staticline21, 0, wxEXPAND, 5 );
-
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
-
-    m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_buttonOkay->SetDefault();
-    m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-
-    bSizerStdButtons->Add( m_buttonOkay, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-
-
-    bSizer96->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
-
-
-    this->SetSizer( bSizer96 );
-    this->Layout();
-    bSizer96->Fit( this );
-
-    this->Centre( wxBOTH );
-
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SelectTimespanDlgGenerated::OnClose ) );
-    m_calendarFrom->Connect( wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEventHandler( SelectTimespanDlgGenerated::OnChangeSelectionFrom ), NULL, this );
-    m_calendarTo->Connect( wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEventHandler( SelectTimespanDlgGenerated::OnChangeSelectionTo ), NULL, this );
-    m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SelectTimespanDlgGenerated::OnOkay ), NULL, this );
-    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SelectTimespanDlgGenerated::OnCancel ), NULL, this );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	
+	wxBoxSizer* bSizer96;
+	bSizer96 = new wxBoxSizer( wxVERTICAL );
+	
+	m_panel35 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel35->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	
+	wxBoxSizer* bSizer98;
+	bSizer98 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_calendarFrom = new wxCalendarCtrl( m_panel35, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxCAL_SHOW_HOLIDAYS|wxNO_BORDER );
+	bSizer98->Add( m_calendarFrom, 0, wxTOP|wxBOTTOM|wxLEFT, 10 );
+	
+	m_calendarTo = new wxCalendarCtrl( m_panel35, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxCAL_SHOW_HOLIDAYS|wxNO_BORDER );
+	bSizer98->Add( m_calendarTo, 0, wxALL, 10 );
+	
+	
+	m_panel35->SetSizer( bSizer98 );
+	m_panel35->Layout();
+	bSizer98->Fit( m_panel35 );
+	bSizer96->Add( m_panel35, 0, wxEXPAND, 5 );
+	
+	m_staticline21 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer96->Add( m_staticline21, 0, wxEXPAND, 5 );
+	
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_buttonOkay->SetDefault(); 
+	m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	
+	bSizerStdButtons->Add( m_buttonOkay, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	
+	
+	bSizer96->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
+	
+	
+	this->SetSizer( bSizer96 );
+	this->Layout();
+	bSizer96->Fit( this );
+	
+	this->Centre( wxBOTH );
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SelectTimespanDlgGenerated::OnClose ) );
+	m_calendarFrom->Connect( wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEventHandler( SelectTimespanDlgGenerated::OnChangeSelectionFrom ), NULL, this );
+	m_calendarTo->Connect( wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEventHandler( SelectTimespanDlgGenerated::OnChangeSelectionTo ), NULL, this );
+	m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SelectTimespanDlgGenerated::OnOkay ), NULL, this );
+	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SelectTimespanDlgGenerated::OnCancel ), NULL, this );
 }
 
 SelectTimespanDlgGenerated::~SelectTimespanDlgGenerated()
@@ -4443,379 +4560,379 @@ SelectTimespanDlgGenerated::~SelectTimespanDlgGenerated()
 
 AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-
-    wxBoxSizer* bSizer31;
-    bSizer31 = new wxBoxSizer( wxVERTICAL );
-
-    m_panel41 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel41->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-
-    wxBoxSizer* bSizer174;
-    bSizer174 = new wxBoxSizer( wxHORIZONTAL );
-
-    bSizerMainSection = new wxBoxSizer( wxVERTICAL );
-
-    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 );
-
-    wxBoxSizer* bSizer186;
-    bSizer186 = new wxBoxSizer( wxVERTICAL );
-
-    m_staticText94 = new wxStaticText( m_panel41, wxID_ANY, _("Feedback and suggestions are welcome:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText94->Wrap( -1 );
-    bSizer186->Add( m_staticText94, 0, wxALL, 5 );
-
-    wxBoxSizer* bSizer166;
-    bSizer166 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxBoxSizer* bSizer251;
-    bSizer251 = new wxBoxSizer( wxVERTICAL );
-
-    m_bitmapHomepage = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_bitmapHomepage->SetToolTip( _("Home page") );
-
-    bSizer251->Add( m_bitmapHomepage, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_hyperlink1 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("FreeFileSync.org"), wxT("https://freefilesync.org/"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink1->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, true, wxEmptyString ) );
-    m_hyperlink1->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-    m_hyperlink1->SetToolTip( _("https://freefilesync.org") );
-
-    bSizer251->Add( m_hyperlink1, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-
-    bSizer166->Add( bSizer251, 0, wxALIGN_BOTTOM|wxRIGHT|wxLEFT, 5 );
-
-    wxBoxSizer* bSizer250;
-    bSizer250 = new wxBoxSizer( wxVERTICAL );
-
-    m_bitmapForum = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_bitmapForum->SetToolTip( _("FreeFileSync Forum") );
-
-    bSizer250->Add( m_bitmapForum, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_hyperlink21 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("FreeFileSync Forum"), wxT("https://freefilesync.org/forum/"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink21->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, true, wxEmptyString ) );
-    m_hyperlink21->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-    m_hyperlink21->SetToolTip( _("https://freefilesync.org/forum/") );
-
-    bSizer250->Add( m_hyperlink21, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-
-    bSizer166->Add( bSizer250, 0, wxALIGN_BOTTOM|wxRIGHT|wxLEFT, 5 );
-
-    wxBoxSizer* bSizer249;
-    bSizer249 = new wxBoxSizer( wxVERTICAL );
-
-    m_bitmapEmail = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_bitmapEmail->SetToolTip( _("Email") );
-
-    bSizer249->Add( m_bitmapEmail, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_hyperlink2 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("zenju@freefilesync.org"), wxT("mailto:zenju@freefilesync.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink2->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, true, wxEmptyString ) );
-    m_hyperlink2->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-    m_hyperlink2->SetToolTip( _("mailto:zenju@freefilesync.org") );
-
-    bSizer249->Add( m_hyperlink2, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-
-    bSizer166->Add( bSizer249, 0, wxALIGN_BOTTOM|wxRIGHT|wxLEFT, 5 );
-
-
-    bSizer186->Add( bSizer166, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-
-    bSizerMainSection->Add( bSizer186, 0, wxALL|wxEXPAND, 5 );
-
-    m_staticline3412 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerMainSection->Add( m_staticline3412, 0, wxEXPAND, 5 );
-
-    m_panelDonate = new wxPanel( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelDonate->SetBackgroundColour( wxColour( 153, 170, 187 ) );
-
-    wxBoxSizer* bSizer183;
-    bSizer183 = new wxBoxSizer( wxVERTICAL );
-
-    m_panel39 = new wxPanel( m_panelDonate, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel39->SetBackgroundColour( wxColour( 248, 248, 248 ) );
-
-    wxBoxSizer* bSizer184;
-    bSizer184 = new wxBoxSizer( wxHORIZONTAL );
-
-
-    bSizer184->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    m_bitmapDonate = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer184->Add( m_bitmapDonate, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
-    wxBoxSizer* bSizer178;
-    bSizer178 = new wxBoxSizer( wxVERTICAL );
-
-    m_staticTextDonate = new wxStaticText( m_panel39, wxID_ANY, _("If you like FreeFileSync:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextDonate->Wrap( -1 );
-    m_staticTextDonate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
-    m_staticTextDonate->SetForegroundColour( wxColour( 0, 0, 0 ) );
-
-    bSizer178->Add( m_staticTextDonate, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_buttonDonate = new wxButton( m_panel39, wxID_ANY, _("Support with a donation"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_buttonDonate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-    m_buttonDonate->SetToolTip( _("https://freefilesync.org/donate.php") );
-
-    bSizer178->Add( m_buttonDonate, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-
-    bSizer184->Add( bSizer178, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
-
-    bSizer184->Add( 0, 0, 1, wxEXPAND, 5 );
-
-
-    m_panel39->SetSizer( bSizer184 );
-    m_panel39->Layout();
-    bSizer184->Fit( m_panel39 );
-    bSizer183->Add( m_panel39, 0, wxALL|wxEXPAND, 5 );
-
-
-    m_panelDonate->SetSizer( bSizer183 );
-    m_panelDonate->Layout();
-    bSizer183->Fit( m_panelDonate );
-    bSizerMainSection->Add( m_panelDonate, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 );
-
-    m_panelThankYou = new wxPanel( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelThankYou->SetBackgroundColour( wxColour( 153, 170, 187 ) );
-
-    wxBoxSizer* bSizer1831;
-    bSizer1831 = new wxBoxSizer( wxVERTICAL );
-
-    m_panel391 = new wxPanel( m_panelThankYou, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel391->SetBackgroundColour( wxColour( 248, 248, 248 ) );
-
-    wxBoxSizer* bSizer243;
-    bSizer243 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer1841;
-    bSizer1841 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmapThanks = new wxStaticBitmap( m_panel391, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer1841->Add( m_bitmapThanks, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
-    m_staticTextThanks = new wxStaticText( m_panel391, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextThanks->Wrap( -1 );
-    m_staticTextThanks->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
-    m_staticTextThanks->SetForegroundColour( wxColour( 0, 0, 0 ) );
-
-    bSizer1841->Add( m_staticTextThanks, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer243->Add( bSizer1841, 1, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 5 );
-
-    m_staticTextNoAutoUpdate = new wxStaticText( m_panel391, wxID_ANY, _("The auto updater was disabled by the administrator."), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextNoAutoUpdate->Wrap( -1 );
-    m_staticTextNoAutoUpdate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
-
-    bSizer243->Add( m_staticTextNoAutoUpdate, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
-    m_buttonShowDonationDetails = new wxButton( m_panel391, wxID_ANY, _("Donation details"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_buttonShowDonationDetails->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
-
-    bSizer243->Add( m_buttonShowDonationDetails, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-
-
-    m_panel391->SetSizer( bSizer243 );
-    m_panel391->Layout();
-    bSizer243->Fit( m_panel391 );
-    bSizer1831->Add( m_panel391, 0, wxEXPAND|wxALL, 5 );
-
-
-    m_panelThankYou->SetSizer( bSizer1831 );
-    m_panelThankYou->Layout();
-    bSizer1831->Fit( m_panelThankYou );
-    bSizerMainSection->Add( m_panelThankYou, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 );
-
-    wxBoxSizer* bSizer187;
-    bSizer187 = new wxBoxSizer( wxVERTICAL );
-
-    m_staticText96 = new wxStaticText( m_panel41, wxID_ANY, _("Source code written in C++ using:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText96->Wrap( -1 );
-    bSizer187->Add( m_staticText96, 0, wxALL, 5 );
-
-    wxBoxSizer* bSizer171;
-    bSizer171 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_hyperlink11 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("MS Visual Studio"), wxT("https://www.visualstudio.com"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink11->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-    m_hyperlink11->SetToolTip( _("https://www.visualstudio.com") );
-
-    bSizer171->Add( m_hyperlink11, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
-    m_hyperlink7 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("wxWidgets"), wxT("http://www.wxwidgets.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink7->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-    m_hyperlink7->SetToolTip( _("http://www.wxwidgets.org") );
-
-    bSizer171->Add( m_hyperlink7, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
-    m_hyperlink14 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("wxFormBuilder"), wxT("https://github.com/wxFormBuilder/wxFormBuilder"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink14->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-    m_hyperlink14->SetToolTip( _("https://github.com/wxFormBuilder/wxFormBuilder") );
-
-    bSizer171->Add( m_hyperlink14, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
-    m_hyperlink16 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("Artistic Style"), wxT("http://astyle.sourceforge.net"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink16->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-    m_hyperlink16->SetToolTip( _("http://astyle.sourceforge.net") );
-
-    bSizer171->Add( m_hyperlink16, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer187->Add( bSizer171, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
-    wxBoxSizer* bSizer172;
-    bSizer172 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_hyperlink15 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("zen::Xml"), wxT("http://zenxml.sourceforge.net"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink15->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-    m_hyperlink15->SetToolTip( _("http://zenxml.sourceforge.net") );
-
-    bSizer172->Add( m_hyperlink15, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
-    m_hyperlink12 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("Google Test"), wxT("https://github.com/google/googletest"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink12->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-    m_hyperlink12->SetToolTip( _("https://github.com/google/googletest") );
-
-    bSizer172->Add( m_hyperlink12, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
-    m_hyperlink10 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("libssh2"), wxT("https://www.libssh2.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink10->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-    m_hyperlink10->SetToolTip( _("https://www.libssh2.org") );
-
-    bSizer172->Add( m_hyperlink10, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
-    m_hyperlink101 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("libcurl"), wxT("https://curl.haxx.se/libcurl"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink101->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-    m_hyperlink101->SetToolTip( _("https://curl.haxx.se/libcurl") );
-
-    bSizer172->Add( m_hyperlink101, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_hyperlink18 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("NSIS"), wxT("http://nsis.sourceforge.net"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink18->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-    m_hyperlink18->SetToolTip( _("http://nsis.sourceforge.net") );
-
-    bSizer172->Add( m_hyperlink18, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
-    m_hyperlink9 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("Inno Setup"), wxT("http://www.jrsoftware.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink9->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-    m_hyperlink9->SetToolTip( _("http://www.jrsoftware.org") );
-
-    bSizer172->Add( m_hyperlink9, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer187->Add( bSizer172, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-
-    bSizerMainSection->Add( bSizer187, 0, wxALL|wxEXPAND, 5 );
-
-    m_staticline34 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizerMainSection->Add( m_staticline34, 0, wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer185;
-    bSizer185 = new wxBoxSizer( wxVERTICAL );
-
-    m_staticText93 = new wxStaticText( m_panel41, wxID_ANY, _("Published under the GNU General Public License:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText93->Wrap( -1 );
-    bSizer185->Add( m_staticText93, 0, wxALL, 5 );
-
-    wxBoxSizer* bSizer1671;
-    bSizer1671 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmapGpl = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer1671->Add( m_bitmapGpl, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
-    m_hyperlink5 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("https://www.gnu.org/licenses/gpl-3.0"), wxT("https://www.gnu.org/licenses/gpl-3.0"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink5->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-
-    bSizer1671->Add( m_hyperlink5, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer185->Add( bSizer1671, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
-
-    bSizerMainSection->Add( bSizer185, 0, wxALL|wxEXPAND, 5 );
-
-
-    bSizer174->Add( bSizerMainSection, 0, 0, 5 );
-
-    m_staticline37 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer174->Add( m_staticline37, 0, wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer177;
-    bSizer177 = new wxBoxSizer( wxVERTICAL );
-
-    m_staticline74 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer177->Add( m_staticline74, 0, wxEXPAND, 5 );
-
-    m_staticTextThanksForLoc = new wxStaticText( m_panel41, wxID_ANY, _("Many thanks for localization:"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_staticTextThanksForLoc->Wrap( -1 );
-    m_staticTextThanksForLoc->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-
-    bSizer177->Add( m_staticTextThanksForLoc, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT, 10 );
-
-
-    bSizer177->Add( 0, 5, 0, 0, 5 );
-
-    m_scrolledWindowTranslators = new wxScrolledWindow( m_panel41, wxID_ANY, wxDefaultPosition, wxSize( -1, -1 ), wxVSCROLL );
-    m_scrolledWindowTranslators->SetScrollRate( 10, 10 );
-    m_scrolledWindowTranslators->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-
-    fgSizerTranslators = new wxFlexGridSizer( 0, 2, 2, 10 );
-    fgSizerTranslators->SetFlexibleDirection( wxBOTH );
-    fgSizerTranslators->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-
-
-    m_scrolledWindowTranslators->SetSizer( fgSizerTranslators );
-    m_scrolledWindowTranslators->Layout();
-    fgSizerTranslators->Fit( m_scrolledWindowTranslators );
-    bSizer177->Add( m_scrolledWindowTranslators, 1, wxLEFT|wxEXPAND, 10 );
-
-
-    bSizer174->Add( bSizer177, 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 );
-
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
-
-    m_buttonClose = new wxButton( this, wxID_OK, _("Close"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_buttonClose->SetDefault();
-    bSizerStdButtons->Add( m_buttonClose, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer31->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
-
-
-    this->SetSizer( bSizer31 );
-    this->Layout();
-    bSizer31->Fit( this );
-
-    this->Centre( wxBOTH );
-
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( AboutDlgGenerated::OnClose ) );
-    m_buttonDonate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnDonate ), NULL, this );
-    m_buttonShowDonationDetails->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnShowDonationDetails ), NULL, this );
-    m_buttonClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnOK ), NULL, this );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	
+	wxBoxSizer* bSizer31;
+	bSizer31 = new wxBoxSizer( wxVERTICAL );
+	
+	m_panel41 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel41->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	
+	wxBoxSizer* bSizer174;
+	bSizer174 = new wxBoxSizer( wxHORIZONTAL );
+	
+	bSizerMainSection = new wxBoxSizer( wxVERTICAL );
+	
+	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 );
+	
+	wxBoxSizer* bSizer186;
+	bSizer186 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticText94 = new wxStaticText( m_panel41, wxID_ANY, _("Feedback and suggestions are welcome:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText94->Wrap( -1 );
+	bSizer186->Add( m_staticText94, 0, wxALL, 5 );
+	
+	wxBoxSizer* bSizer166;
+	bSizer166 = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bSizer251;
+	bSizer251 = new wxBoxSizer( wxVERTICAL );
+	
+	m_bitmapHomepage = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_bitmapHomepage->SetToolTip( _("Home page") );
+	
+	bSizer251->Add( m_bitmapHomepage, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_hyperlink1 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("FreeFileSync.org"), wxT("https://freefilesync.org/"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink1->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, true, wxEmptyString ) );
+	m_hyperlink1->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_hyperlink1->SetToolTip( _("https://freefilesync.org") );
+	
+	bSizer251->Add( m_hyperlink1, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	
+	bSizer166->Add( bSizer251, 0, wxALIGN_BOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	wxBoxSizer* bSizer250;
+	bSizer250 = new wxBoxSizer( wxVERTICAL );
+	
+	m_bitmapForum = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_bitmapForum->SetToolTip( _("FreeFileSync Forum") );
+	
+	bSizer250->Add( m_bitmapForum, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_hyperlink21 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("FreeFileSync Forum"), wxT("https://freefilesync.org/forum/"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink21->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, true, wxEmptyString ) );
+	m_hyperlink21->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_hyperlink21->SetToolTip( _("https://freefilesync.org/forum/") );
+	
+	bSizer250->Add( m_hyperlink21, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	
+	bSizer166->Add( bSizer250, 0, wxALIGN_BOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	wxBoxSizer* bSizer249;
+	bSizer249 = new wxBoxSizer( wxVERTICAL );
+	
+	m_bitmapEmail = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_bitmapEmail->SetToolTip( _("Email") );
+	
+	bSizer249->Add( m_bitmapEmail, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_hyperlink2 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("zenju@freefilesync.org"), wxT("mailto:zenju@freefilesync.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink2->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, true, wxEmptyString ) );
+	m_hyperlink2->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_hyperlink2->SetToolTip( _("mailto:zenju@freefilesync.org") );
+	
+	bSizer249->Add( m_hyperlink2, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	
+	bSizer166->Add( bSizer249, 0, wxALIGN_BOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	
+	bSizer186->Add( bSizer166, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	
+	bSizerMainSection->Add( bSizer186, 0, wxALL|wxEXPAND, 5 );
+	
+	m_staticline3412 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerMainSection->Add( m_staticline3412, 0, wxEXPAND, 5 );
+	
+	m_panelDonate = new wxPanel( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelDonate->SetBackgroundColour( wxColour( 153, 170, 187 ) );
+	
+	wxBoxSizer* bSizer183;
+	bSizer183 = new wxBoxSizer( wxVERTICAL );
+	
+	m_panel39 = new wxPanel( m_panelDonate, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel39->SetBackgroundColour( wxColour( 248, 248, 248 ) );
+	
+	wxBoxSizer* bSizer184;
+	bSizer184 = new wxBoxSizer( wxHORIZONTAL );
+	
+	
+	bSizer184->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_bitmapDonate = new wxStaticBitmap( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer184->Add( m_bitmapDonate, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	
+	wxBoxSizer* bSizer178;
+	bSizer178 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticTextDonate = new wxStaticText( m_panel39, wxID_ANY, _("If you like FreeFileSync:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextDonate->Wrap( -1 );
+	m_staticTextDonate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	m_staticTextDonate->SetForegroundColour( wxColour( 0, 0, 0 ) );
+	
+	bSizer178->Add( m_staticTextDonate, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_buttonDonate = new wxButton( m_panel39, wxID_ANY, _("Support with a donation"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonDonate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	m_buttonDonate->SetToolTip( _("https://freefilesync.org/donate.php") );
+	
+	bSizer178->Add( m_buttonDonate, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	
+	bSizer184->Add( bSizer178, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	
+	
+	bSizer184->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	
+	m_panel39->SetSizer( bSizer184 );
+	m_panel39->Layout();
+	bSizer184->Fit( m_panel39 );
+	bSizer183->Add( m_panel39, 0, wxALL|wxEXPAND, 5 );
+	
+	
+	m_panelDonate->SetSizer( bSizer183 );
+	m_panelDonate->Layout();
+	bSizer183->Fit( m_panelDonate );
+	bSizerMainSection->Add( m_panelDonate, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 );
+	
+	m_panelThankYou = new wxPanel( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelThankYou->SetBackgroundColour( wxColour( 153, 170, 187 ) );
+	
+	wxBoxSizer* bSizer1831;
+	bSizer1831 = new wxBoxSizer( wxVERTICAL );
+	
+	m_panel391 = new wxPanel( m_panelThankYou, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel391->SetBackgroundColour( wxColour( 248, 248, 248 ) );
+	
+	wxBoxSizer* bSizer243;
+	bSizer243 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer1841;
+	bSizer1841 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapThanks = new wxStaticBitmap( m_panel391, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer1841->Add( m_bitmapThanks, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	
+	m_staticTextThanks = new wxStaticText( m_panel391, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextThanks->Wrap( -1 );
+	m_staticTextThanks->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	m_staticTextThanks->SetForegroundColour( wxColour( 0, 0, 0 ) );
+	
+	bSizer1841->Add( m_staticTextThanks, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer243->Add( bSizer1841, 1, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 5 );
+	
+	m_staticTextNoAutoUpdate = new wxStaticText( m_panel391, wxID_ANY, _("The auto updater was disabled by the administrator."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextNoAutoUpdate->Wrap( -1 );
+	m_staticTextNoAutoUpdate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	
+	bSizer243->Add( m_staticTextNoAutoUpdate, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	m_buttonShowDonationDetails = new wxButton( m_panel391, wxID_ANY, _("Donation details"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonShowDonationDetails->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	
+	bSizer243->Add( m_buttonShowDonationDetails, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	
+	
+	m_panel391->SetSizer( bSizer243 );
+	m_panel391->Layout();
+	bSizer243->Fit( m_panel391 );
+	bSizer1831->Add( m_panel391, 0, wxEXPAND|wxALL, 5 );
+	
+	
+	m_panelThankYou->SetSizer( bSizer1831 );
+	m_panelThankYou->Layout();
+	bSizer1831->Fit( m_panelThankYou );
+	bSizerMainSection->Add( m_panelThankYou, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 );
+	
+	wxBoxSizer* bSizer187;
+	bSizer187 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticText96 = new wxStaticText( m_panel41, wxID_ANY, _("Source code written in C++ using:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText96->Wrap( -1 );
+	bSizer187->Add( m_staticText96, 0, wxALL, 5 );
+	
+	wxBoxSizer* bSizer171;
+	bSizer171 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_hyperlink11 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("MS Visual Studio"), wxT("https://www.visualstudio.com"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink11->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_hyperlink11->SetToolTip( _("https://www.visualstudio.com") );
+	
+	bSizer171->Add( m_hyperlink11, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	
+	m_hyperlink7 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("wxWidgets"), wxT("http://www.wxwidgets.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink7->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_hyperlink7->SetToolTip( _("http://www.wxwidgets.org") );
+	
+	bSizer171->Add( m_hyperlink7, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	
+	m_hyperlink14 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("wxFormBuilder"), wxT("https://github.com/wxFormBuilder/wxFormBuilder"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink14->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_hyperlink14->SetToolTip( _("https://github.com/wxFormBuilder/wxFormBuilder") );
+	
+	bSizer171->Add( m_hyperlink14, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	
+	m_hyperlink16 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("Artistic Style"), wxT("http://astyle.sourceforge.net"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink16->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_hyperlink16->SetToolTip( _("http://astyle.sourceforge.net") );
+	
+	bSizer171->Add( m_hyperlink16, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer187->Add( bSizer171, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	wxBoxSizer* bSizer172;
+	bSizer172 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_hyperlink15 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("zen::Xml"), wxT("http://zenxml.sourceforge.net"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink15->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_hyperlink15->SetToolTip( _("http://zenxml.sourceforge.net") );
+	
+	bSizer172->Add( m_hyperlink15, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	
+	m_hyperlink12 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("Google Test"), wxT("https://github.com/google/googletest"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink12->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_hyperlink12->SetToolTip( _("https://github.com/google/googletest") );
+	
+	bSizer172->Add( m_hyperlink12, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	
+	m_hyperlink10 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("libssh2"), wxT("https://www.libssh2.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink10->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_hyperlink10->SetToolTip( _("https://www.libssh2.org") );
+	
+	bSizer172->Add( m_hyperlink10, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	
+	m_hyperlink101 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("libcurl"), wxT("https://curl.haxx.se/libcurl"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink101->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_hyperlink101->SetToolTip( _("https://curl.haxx.se/libcurl") );
+	
+	bSizer172->Add( m_hyperlink101, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_hyperlink18 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("NSIS"), wxT("http://nsis.sourceforge.net"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink18->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_hyperlink18->SetToolTip( _("http://nsis.sourceforge.net") );
+	
+	bSizer172->Add( m_hyperlink18, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	
+	m_hyperlink9 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("Inno Setup"), wxT("http://www.jrsoftware.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink9->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_hyperlink9->SetToolTip( _("http://www.jrsoftware.org") );
+	
+	bSizer172->Add( m_hyperlink9, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer187->Add( bSizer172, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	
+	bSizerMainSection->Add( bSizer187, 0, wxALL|wxEXPAND, 5 );
+	
+	m_staticline34 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizerMainSection->Add( m_staticline34, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer185;
+	bSizer185 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticText93 = new wxStaticText( m_panel41, wxID_ANY, _("Published under the GNU General Public License:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText93->Wrap( -1 );
+	bSizer185->Add( m_staticText93, 0, wxALL, 5 );
+	
+	wxBoxSizer* bSizer1671;
+	bSizer1671 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapGpl = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer1671->Add( m_bitmapGpl, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	
+	m_hyperlink5 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("https://www.gnu.org/licenses/gpl-3.0"), wxT("https://www.gnu.org/licenses/gpl-3.0"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink5->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	
+	bSizer1671->Add( m_hyperlink5, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer185->Add( bSizer1671, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	
+	bSizerMainSection->Add( bSizer185, 0, wxALL|wxEXPAND, 5 );
+	
+	
+	bSizer174->Add( bSizerMainSection, 0, 0, 5 );
+	
+	m_staticline37 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer174->Add( m_staticline37, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer177;
+	bSizer177 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticline74 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer177->Add( m_staticline74, 0, wxEXPAND, 5 );
+	
+	m_staticTextThanksForLoc = new wxStaticText( m_panel41, wxID_ANY, _("Many thanks for localization:"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_staticTextThanksForLoc->Wrap( -1 );
+	m_staticTextThanksForLoc->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	
+	bSizer177->Add( m_staticTextThanksForLoc, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT, 10 );
+	
+	
+	bSizer177->Add( 0, 5, 0, 0, 5 );
+	
+	m_scrolledWindowTranslators = new wxScrolledWindow( m_panel41, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxVSCROLL );
+	m_scrolledWindowTranslators->SetScrollRate( 10, 10 );
+	m_scrolledWindowTranslators->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	
+	fgSizerTranslators = new wxFlexGridSizer( 0, 2, 2, 10 );
+	fgSizerTranslators->SetFlexibleDirection( wxBOTH );
+	fgSizerTranslators->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	
+	m_scrolledWindowTranslators->SetSizer( fgSizerTranslators );
+	m_scrolledWindowTranslators->Layout();
+	fgSizerTranslators->Fit( m_scrolledWindowTranslators );
+	bSizer177->Add( m_scrolledWindowTranslators, 1, wxLEFT|wxEXPAND, 10 );
+	
+	
+	bSizer174->Add( bSizer177, 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 );
+	
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_buttonClose = new wxButton( this, wxID_OK, _("Close"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_buttonClose->SetDefault(); 
+	bSizerStdButtons->Add( m_buttonClose, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer31->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
+	
+	
+	this->SetSizer( bSizer31 );
+	this->Layout();
+	bSizer31->Fit( this );
+	
+	this->Centre( wxBOTH );
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( AboutDlgGenerated::OnClose ) );
+	m_buttonDonate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnDonate ), NULL, this );
+	m_buttonShowDonationDetails->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnShowDonationDetails ), NULL, this );
+	m_buttonClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnOK ), NULL, this );
 }
 
 AboutDlgGenerated::~AboutDlgGenerated()
@@ -4824,60 +4941,60 @@ AboutDlgGenerated::~AboutDlgGenerated()
 
 DownloadProgressDlgGenerated::DownloadProgressDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-
-    wxBoxSizer* bSizer24;
-    bSizer24 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer72;
-    bSizer72 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmapDownloading = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer72->Add( m_bitmapDownloading, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
-
-    m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextHeader->Wrap( -1 );
-    bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_VERTICAL|wxALL, 10 );
-
-
-    bSizer72->Add( 20, 0, 0, 0, 5 );
-
-
-    bSizer24->Add( bSizer72, 0, 0, 5 );
-
-    wxBoxSizer* bSizer212;
-    bSizer212 = new wxBoxSizer( wxVERTICAL );
-
-    m_gaugeProgress = new wxGauge( this, wxID_ANY, 100, wxDefaultPosition, wxDefaultSize, wxGA_HORIZONTAL );
-    m_gaugeProgress->SetValue( 0 );
-    bSizer212->Add( m_gaugeProgress, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-
-    m_staticTextDetails = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextDetails->Wrap( -1 );
-    bSizer212->Add( m_staticTextDetails, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
-
-
-    bSizer24->Add( bSizer212, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
-    m_staticline9 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer24->Add( m_staticline9, 0, wxEXPAND, 5 );
-
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
-
-    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_buttonCancel->SetDefault();
-    bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-
-    bSizer24->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
-
-
-    this->SetSizer( bSizer24 );
-    this->Layout();
-    bSizer24->Fit( this );
-
-    // Connect Events
-    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DownloadProgressDlgGenerated::OnCancel ), NULL, this );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	
+	wxBoxSizer* bSizer24;
+	bSizer24 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer72;
+	bSizer72 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapDownloading = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer72->Add( m_bitmapDownloading, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 );
+	
+	m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextHeader->Wrap( -1 );
+	bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_VERTICAL|wxALL, 10 );
+	
+	
+	bSizer72->Add( 20, 0, 0, 0, 5 );
+	
+	
+	bSizer24->Add( bSizer72, 0, 0, 5 );
+	
+	wxBoxSizer* bSizer212;
+	bSizer212 = new wxBoxSizer( wxVERTICAL );
+	
+	m_gaugeProgress = new wxGauge( this, wxID_ANY, 100, wxDefaultPosition, wxDefaultSize, wxGA_HORIZONTAL );
+	m_gaugeProgress->SetValue( 0 ); 
+	bSizer212->Add( m_gaugeProgress, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+	
+	m_staticTextDetails = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextDetails->Wrap( -1 );
+	bSizer212->Add( m_staticTextDetails, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+	
+	
+	bSizer24->Add( bSizer212, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	m_staticline9 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer24->Add( m_staticline9, 0, wxEXPAND, 5 );
+	
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_buttonCancel->SetDefault(); 
+	bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	
+	bSizer24->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
+	
+	
+	this->SetSizer( bSizer24 );
+	this->Layout();
+	bSizer24->Fit( this );
+	
+	// Connect Events
+	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DownloadProgressDlgGenerated::OnCancel ), NULL, this );
 }
 
 DownloadProgressDlgGenerated::~DownloadProgressDlgGenerated()
@@ -4886,174 +5003,174 @@ DownloadProgressDlgGenerated::~DownloadProgressDlgGenerated()
 
 ActivationDlgGenerated::ActivationDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxSize( -1, -1 ), wxDefaultSize );
-    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-
-    wxBoxSizer* bSizer54;
-    bSizer54 = new wxBoxSizer( wxVERTICAL );
-
-    m_panel35 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel35->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-
-    wxBoxSizer* bSizer172;
-    bSizer172 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer165;
-    bSizer165 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmapActivation = new wxStaticBitmap( m_panel35, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizer165->Add( m_bitmapActivation, 0, wxALL, 10 );
-
-
-    bSizer165->Add( 0, 120, 0, 0, 5 );
-
-    wxBoxSizer* bSizer16;
-    bSizer16 = new wxBoxSizer( wxVERTICAL );
-
-
-    bSizer16->Add( 0, 10, 0, 0, 5 );
-
-    m_textCtrlLastError = new wxTextCtrl( m_panel35, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxNO_BORDER );
-    bSizer16->Add( m_textCtrlLastError, 1, wxEXPAND, 5 );
-
-
-    bSizer16->Add( 0, 5, 0, 0, 5 );
-
-
-    bSizer165->Add( bSizer16, 1, wxEXPAND, 5 );
-
-
-    bSizer172->Add( bSizer165, 1, wxEXPAND, 5 );
-
-    m_staticTextMain = new wxStaticText( m_panel35, wxID_ANY, _("Activate the FreeFileSync Donation Edition by one of the following methods:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextMain->Wrap( -1 );
-    bSizer172->Add( m_staticTextMain, 0, wxBOTTOM|wxRIGHT|wxLEFT, 10 );
-
-
-    m_panel35->SetSizer( bSizer172 );
-    m_panel35->Layout();
-    bSizer172->Fit( m_panel35 );
-    bSizer54->Add( m_panel35, 1, wxEXPAND, 5 );
-
-    m_staticline181 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer54->Add( m_staticline181, 0, wxEXPAND|wxBOTTOM, 5 );
-
-    m_staticline18111 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer54->Add( m_staticline18111, 0, wxEXPAND|wxTOP, 5 );
-
-    m_panel3511 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel3511->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-
-    wxBoxSizer* bSizer263;
-    bSizer263 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer234;
-    bSizer234 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_staticText136 = new wxStaticText( m_panel3511, wxID_ANY, _("1. Activate via internet now:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText136->Wrap( -1 );
-    bSizer234->Add( m_staticText136, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
-    m_buttonActivateOnline = new wxButton( m_panel3511, wxID_ANY, _("Activate online"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_buttonActivateOnline->SetDefault();
-    m_buttonActivateOnline->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-
-    bSizer234->Add( m_buttonActivateOnline, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-
-    bSizer263->Add( bSizer234, 0, wxEXPAND|wxALL, 5 );
-
-
-    m_panel3511->SetSizer( bSizer263 );
-    m_panel3511->Layout();
-    bSizer263->Fit( m_panel3511 );
-    bSizer54->Add( m_panel3511, 0, wxEXPAND, 5 );
-
-    m_staticline181111 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer54->Add( m_staticline181111, 0, wxEXPAND|wxBOTTOM, 5 );
-
-    m_staticline181112 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer54->Add( m_staticline181112, 0, wxEXPAND|wxTOP, 5 );
-
-    m_panel351 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel351->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-
-    wxBoxSizer* bSizer266;
-    bSizer266 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer237;
-    bSizer237 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer236;
-    bSizer236 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_staticText1361 = new wxStaticText( m_panel351, wxID_ANY, _("2. Retrieve an offline activation key from the following URL:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText1361->Wrap( -1 );
-    bSizer236->Add( m_staticText1361, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
-    m_buttonCopyUrl = new wxButton( m_panel351, wxID_ANY, _("&Copy to clipboard"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_buttonCopyUrl->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
-
-    bSizer236->Add( m_buttonCopyUrl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-
-    bSizer237->Add( bSizer236, 0, wxEXPAND, 5 );
-
-    m_textCtrlManualActivationUrl = new wxTextCtrl( m_panel351, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1, 55 ), wxTE_MULTILINE|wxTE_READONLY );
-    bSizer237->Add( m_textCtrlManualActivationUrl, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer235;
-    bSizer235 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_staticText13611 = new wxStaticText( m_panel351, wxID_ANY, _("Enter activation key:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText13611->Wrap( -1 );
-    bSizer235->Add( m_staticText13611, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
-    m_textCtrlOfflineActivationKey = new wxTextCtrl( m_panel351, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 250, -1 ), wxTE_PROCESS_ENTER );
-    bSizer235->Add( m_textCtrlOfflineActivationKey, 1, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_buttonActivateOffline = new wxButton( m_panel351, wxID_ANY, _("Activate offline"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_buttonActivateOffline->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-
-    bSizer235->Add( m_buttonActivateOffline, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer237->Add( bSizer235, 0, wxEXPAND, 5 );
-
-
-    bSizer266->Add( bSizer237, 0, wxALL|wxEXPAND, 5 );
-
-
-    m_panel351->SetSizer( bSizer266 );
-    m_panel351->Layout();
-    bSizer266->Fit( m_panel351 );
-    bSizer54->Add( m_panel351, 0, wxEXPAND, 5 );
-
-    m_staticline13 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer54->Add( m_staticline13, 0, wxEXPAND, 5 );
-
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
-
-    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-
-
-    bSizer54->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
-
-
-    this->SetSizer( bSizer54 );
-    this->Layout();
-    bSizer54->Fit( this );
-
-    this->Centre( wxBOTH );
-
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( ActivationDlgGenerated::OnClose ) );
-    m_buttonActivateOnline->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ActivationDlgGenerated::OnActivateOnline ), NULL, this );
-    m_buttonCopyUrl->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ActivationDlgGenerated::OnCopyUrl ), NULL, this );
-    m_textCtrlOfflineActivationKey->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( ActivationDlgGenerated::OnOfflineActivationEnter ), NULL, this );
-    m_buttonActivateOffline->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ActivationDlgGenerated::OnActivateOffline ), NULL, this );
-    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ActivationDlgGenerated::OnCancel ), NULL, this );
+	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	
+	wxBoxSizer* bSizer54;
+	bSizer54 = new wxBoxSizer( wxVERTICAL );
+	
+	m_panel35 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel35->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	
+	wxBoxSizer* bSizer172;
+	bSizer172 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer165;
+	bSizer165 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapActivation = new wxStaticBitmap( m_panel35, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizer165->Add( m_bitmapActivation, 0, wxALL, 10 );
+	
+	
+	bSizer165->Add( 0, 120, 0, 0, 5 );
+	
+	wxBoxSizer* bSizer16;
+	bSizer16 = new wxBoxSizer( wxVERTICAL );
+	
+	
+	bSizer16->Add( 0, 10, 0, 0, 5 );
+	
+	m_textCtrlLastError = new wxTextCtrl( m_panel35, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxNO_BORDER );
+	bSizer16->Add( m_textCtrlLastError, 1, wxEXPAND, 5 );
+	
+	
+	bSizer16->Add( 0, 5, 0, 0, 5 );
+	
+	
+	bSizer165->Add( bSizer16, 1, wxEXPAND, 5 );
+	
+	
+	bSizer172->Add( bSizer165, 1, wxEXPAND, 5 );
+	
+	m_staticTextMain = new wxStaticText( m_panel35, wxID_ANY, _("Activate the FreeFileSync Donation Edition by one of the following methods:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextMain->Wrap( -1 );
+	bSizer172->Add( m_staticTextMain, 0, wxBOTTOM|wxRIGHT|wxLEFT, 10 );
+	
+	
+	m_panel35->SetSizer( bSizer172 );
+	m_panel35->Layout();
+	bSizer172->Fit( m_panel35 );
+	bSizer54->Add( m_panel35, 1, wxEXPAND, 5 );
+	
+	m_staticline181 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer54->Add( m_staticline181, 0, wxEXPAND|wxBOTTOM, 5 );
+	
+	m_staticline18111 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer54->Add( m_staticline18111, 0, wxEXPAND|wxTOP, 5 );
+	
+	m_panel3511 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel3511->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	
+	wxBoxSizer* bSizer263;
+	bSizer263 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer234;
+	bSizer234 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_staticText136 = new wxStaticText( m_panel3511, wxID_ANY, _("1. Activate via internet now:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText136->Wrap( -1 );
+	bSizer234->Add( m_staticText136, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	
+	m_buttonActivateOnline = new wxButton( m_panel3511, wxID_ANY, _("Activate online"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_buttonActivateOnline->SetDefault(); 
+	m_buttonActivateOnline->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	
+	bSizer234->Add( m_buttonActivateOnline, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	
+	bSizer263->Add( bSizer234, 0, wxEXPAND|wxALL, 5 );
+	
+	
+	m_panel3511->SetSizer( bSizer263 );
+	m_panel3511->Layout();
+	bSizer263->Fit( m_panel3511 );
+	bSizer54->Add( m_panel3511, 0, wxEXPAND, 5 );
+	
+	m_staticline181111 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer54->Add( m_staticline181111, 0, wxEXPAND|wxBOTTOM, 5 );
+	
+	m_staticline181112 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer54->Add( m_staticline181112, 0, wxEXPAND|wxTOP, 5 );
+	
+	m_panel351 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel351->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	
+	wxBoxSizer* bSizer266;
+	bSizer266 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer237;
+	bSizer237 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer236;
+	bSizer236 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_staticText1361 = new wxStaticText( m_panel351, wxID_ANY, _("2. Retrieve an offline activation key from the following URL:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText1361->Wrap( -1 );
+	bSizer236->Add( m_staticText1361, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	
+	m_buttonCopyUrl = new wxButton( m_panel351, wxID_ANY, _("&Copy to clipboard"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_buttonCopyUrl->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	
+	bSizer236->Add( m_buttonCopyUrl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	
+	bSizer237->Add( bSizer236, 0, wxEXPAND, 5 );
+	
+	m_textCtrlManualActivationUrl = new wxTextCtrl( m_panel351, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,55 ), wxTE_MULTILINE|wxTE_READONLY );
+	bSizer237->Add( m_textCtrlManualActivationUrl, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer235;
+	bSizer235 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_staticText13611 = new wxStaticText( m_panel351, wxID_ANY, _("Enter activation key:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText13611->Wrap( -1 );
+	bSizer235->Add( m_staticText13611, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	
+	m_textCtrlOfflineActivationKey = new wxTextCtrl( m_panel351, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 250,-1 ), wxTE_PROCESS_ENTER );
+	bSizer235->Add( m_textCtrlOfflineActivationKey, 1, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_buttonActivateOffline = new wxButton( m_panel351, wxID_ANY, _("Activate offline"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_buttonActivateOffline->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	
+	bSizer235->Add( m_buttonActivateOffline, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer237->Add( bSizer235, 0, wxEXPAND, 5 );
+	
+	
+	bSizer266->Add( bSizer237, 0, wxALL|wxEXPAND, 5 );
+	
+	
+	m_panel351->SetSizer( bSizer266 );
+	m_panel351->Layout();
+	bSizer266->Fit( m_panel351 );
+	bSizer54->Add( m_panel351, 0, wxEXPAND, 5 );
+	
+	m_staticline13 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer54->Add( m_staticline13, 0, wxEXPAND, 5 );
+	
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	
+	
+	bSizer54->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
+	
+	
+	this->SetSizer( bSizer54 );
+	this->Layout();
+	bSizer54->Fit( this );
+	
+	this->Centre( wxBOTH );
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( ActivationDlgGenerated::OnClose ) );
+	m_buttonActivateOnline->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ActivationDlgGenerated::OnActivateOnline ), NULL, this );
+	m_buttonCopyUrl->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ActivationDlgGenerated::OnCopyUrl ), NULL, this );
+	m_textCtrlOfflineActivationKey->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( ActivationDlgGenerated::OnOfflineActivationEnter ), NULL, this );
+	m_buttonActivateOffline->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ActivationDlgGenerated::OnActivateOffline ), NULL, this );
+	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ActivationDlgGenerated::OnCancel ), NULL, this );
 }
 
 ActivationDlgGenerated::~ActivationDlgGenerated()
@@ -5062,65 +5179,65 @@ ActivationDlgGenerated::~ActivationDlgGenerated()
 
 CfgHighlightDlgGenerated::CfgHighlightDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-
-    wxBoxSizer* bSizer96;
-    bSizer96 = new wxBoxSizer( wxVERTICAL );
-
-    m_panel35 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panel35->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-
-    wxBoxSizer* bSizer98;
-    bSizer98 = new wxBoxSizer( wxHORIZONTAL );
-
-    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_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 );
-
-
-    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 );
-
-    bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
-
-    m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    m_buttonOkay->SetDefault();
-    m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-
-    bSizerStdButtons->Add( m_buttonOkay, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 );
-    bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-
-
-    bSizer96->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
-
-
-    this->SetSizer( bSizer96 );
-    this->Layout();
-    bSizer96->Fit( this );
-
-    this->Centre( wxBOTH );
-
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( 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 );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	
+	wxBoxSizer* bSizer96;
+	bSizer96 = new wxBoxSizer( wxVERTICAL );
+	
+	m_panel35 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panel35->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	
+	wxBoxSizer* bSizer98;
+	bSizer98 = new wxBoxSizer( wxHORIZONTAL );
+	
+	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_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 );
+	
+	
+	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 );
+	
+	bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_buttonOkay->SetDefault(); 
+	m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
+	
+	bSizerStdButtons->Add( m_buttonOkay, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	
+	
+	bSizer96->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 );
+	
+	
+	this->SetSizer( bSizer96 );
+	this->Layout();
+	bSizer96->Fit( this );
+	
+	this->Centre( wxBOTH );
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( 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()
diff --git a/FreeFileSync/Source/ui/gui_generated.h b/FreeFileSync/Source/ui/gui_generated.h
index f0b05c75..7523ea04 100755
--- a/FreeFileSync/Source/ui/gui_generated.h
+++ b/FreeFileSync/Source/ui/gui_generated.h
@@ -61,1182 +61,1202 @@
 ///////////////////////////////////////////////////////////////////////////////
 /// Class MainDialogGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class MainDialogGenerated : public wxFrame
+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;
-    wxMenu* m_menu4;
-    wxMenuItem* m_menuItemShowLog;
-    wxMenuItem* m_menuItemCompare;
-    wxMenuItem* m_menuItemCompSettings;
-    wxMenuItem* m_menuItemFilter;
-    wxMenuItem* m_menuItemSyncSettings;
-    wxMenuItem* m_menuItemSynchronize;
-    wxMenu* m_menuTools;
-    wxMenuItem* m_menuItemOptions;
-    wxMenu* m_menuLanguages;
-    wxMenuItem* m_menuItemFind;
-    wxMenuItem* m_menuItemExportList;
-    wxMenuItem* m_menuItemShowMain;
-    wxMenuItem* m_menuItemShowFolders;
-    wxMenuItem* m_menuItemShowViewFilter;
-    wxMenuItem* m_menuItemShowConfig;
-    wxMenuItem* m_menuItemShowOverview;
-    wxMenu* m_menuHelp;
-    wxMenuItem* m_menuItemHelp;
-    wxMenuItem* m_menuItemCheckVersionNow;
-    wxMenuItem* m_menuItemCheckVersionAuto;
-    wxMenuItem* m_menuItemAbout;
-    wxBoxSizer* bSizerPanelHolder;
-    wxPanel* m_panelTopButtons;
-    wxBoxSizer* bSizerTopButtons;
-    zen::BitmapTextButton* m_buttonCancel;
-    zen::BitmapTextButton* m_buttonCompare;
-    wxBitmapButton* m_bpButtonCmpConfig;
-    wxBitmapButton* m_bpButtonCmpContext;
-    wxBitmapButton* m_bpButtonFilter;
-    wxBitmapButton* m_bpButtonFilterContext;
-    wxBitmapButton* m_bpButtonSyncConfig;
-    wxBitmapButton* m_bpButtonSyncContext;
-    zen::BitmapTextButton* m_buttonSync;
-    wxPanel* m_panelDirectoryPairs;
-    wxStaticText* m_staticTextResolvedPathL;
-    wxBitmapButton* m_bpButtonAddPair;
-    wxButton* m_buttonSelectFolderLeft;
-    wxPanel* m_panelTopCenter;
-    wxBitmapButton* m_bpButtonSwapSides;
-    wxStaticText* m_staticTextResolvedPathR;
-    wxButton* m_buttonSelectFolderRight;
-    wxScrolledWindow* m_scrolledWindowFolderPairs;
-    wxBoxSizer* bSizerAddFolderPairs;
-    zen::Grid* m_gridOverview;
-    wxPanel* m_panelCenter;
-    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;
-    wxStaticLine* m_staticline70;
-    wxPanel* m_panelConfig;
-    wxBoxSizer* bSizerConfig;
-    wxBoxSizer* bSizerCfgHistoryButtons;
-    wxBitmapButton* m_bpButtonNew;
-    wxStaticText* m_staticText951;
-    wxBitmapButton* m_bpButtonOpen;
-    wxStaticText* m_staticText95;
-    wxBitmapButton* m_bpButtonSave;
-    wxStaticText* m_staticText961;
-    wxBitmapButton* m_bpButtonSaveAs;
-    wxBitmapButton* m_bpButtonSaveAsBatch;
-    wxStaticText* m_staticText97;
-    zen::Grid* m_gridCfgHistory;
-    wxPanel* m_panelViewFilter;
-    wxBoxSizer* bSizerViewFilter;
-    wxBitmapButton* m_bpButtonShowLog;
-    wxStaticText* m_staticTextViewType;
-    zen::ToggleButton* m_bpButtonViewTypeSyncAction;
-    zen::ToggleButton* m_bpButtonShowExcluded;
-    wxBitmapButton* m_bpButtonViewFilterSave;
-    wxStaticText* m_staticTextSelectView;
-    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;
-    wxStaticText* m_staticText96;
-    wxPanel* m_panelStatistics;
-    wxBoxSizer* bSizer1801;
-    wxStaticBitmap* m_bitmapDeleteLeft;
-    wxStaticText* m_staticTextDeleteLeft;
-    wxStaticBitmap* m_bitmapUpdateLeft;
-    wxStaticText* m_staticTextUpdateLeft;
-    wxStaticBitmap* m_bitmapCreateLeft;
-    wxStaticText* m_staticTextCreateLeft;
-    wxStaticBitmap* m_bitmapData;
-    wxStaticText* m_staticTextData;
-    wxStaticBitmap* m_bitmapCreateRight;
-    wxStaticText* m_staticTextCreateRight;
-    wxStaticBitmap* m_bitmapUpdateRight;
-    wxStaticText* m_staticTextUpdateRight;
-    wxStaticBitmap* m_bitmapDeleteRight;
-    wxStaticText* m_staticTextDeleteRight;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnConfigNew( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnConfigLoad( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnConfigSave( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnConfigSaveAs( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSaveAsBatchJob( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnMenuQuit( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnShowLog( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCompare( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCmpSettings( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnConfigureFilter( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSyncSettings( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnStartSync( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnMenuOptions( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnMenuFindItem( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnMenuExportFileList( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnMenuResetLayout( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnShowHelp( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnMenuCheckVersion( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnMenuCheckVersionAutomatically( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnMenuAbout( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCompSettingsContext( wxMouseEvent& event ) { event.Skip(); }
-    virtual void OnCompSettingsContext( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnGlobalFilterContext( wxMouseEvent& event ) { event.Skip(); }
-    virtual void OnGlobalFilterContext( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSyncSettingsContext( wxMouseEvent& event ) { event.Skip(); }
-    virtual void OnSyncSettingsContext( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnTopFolderPairAdd( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnTopFolderPairRemove( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSwapSides( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnTopLocalCompCfg( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnTopLocalFilterCfg( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnTopLocalSyncCfg( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnHideSearchPanel( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSearchGridEnter( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnToggleViewType( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnToggleViewButton( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnViewFilterSave( 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_bitmapLogStatus;
-    wxStaticText* m_staticTextLogStatus;
-    wxPanel* m_panelItemsProcessed;
-    wxStaticText* m_staticTextItemsProcessed;
-    wxStaticText* m_staticTextBytesProcessed;
-    wxPanel* m_panelItemsRemaining;
-    wxStaticText* m_staticTextItemsRemaining;
-    wxStaticText* m_staticTextBytesRemaining;
-    wxStaticText* m_staticTextTotalTime;
-    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;
+		wxMenu* m_menu4;
+		wxMenuItem* m_menuItemShowLog;
+		wxMenuItem* m_menuItemCompare;
+		wxMenuItem* m_menuItemCompSettings;
+		wxMenuItem* m_menuItemFilter;
+		wxMenuItem* m_menuItemSyncSettings;
+		wxMenuItem* m_menuItemSynchronize;
+		wxMenu* m_menuTools;
+		wxMenuItem* m_menuItemOptions;
+		wxMenu* m_menuLanguages;
+		wxMenuItem* m_menuItemFind;
+		wxMenuItem* m_menuItemExportList;
+		wxMenuItem* m_menuItemShowMain;
+		wxMenuItem* m_menuItemShowFolders;
+		wxMenuItem* m_menuItemShowViewFilter;
+		wxMenuItem* m_menuItemShowConfig;
+		wxMenuItem* m_menuItemShowOverview;
+		wxMenu* m_menuHelp;
+		wxMenuItem* m_menuItemHelp;
+		wxMenuItem* m_menuItemCheckVersionNow;
+		wxMenuItem* m_menuItemCheckVersionAuto;
+		wxMenuItem* m_menuItemAbout;
+		wxBoxSizer* bSizerPanelHolder;
+		wxPanel* m_panelTopButtons;
+		wxBoxSizer* bSizerTopButtons;
+		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;
+		wxStaticLine* m_staticline70;
+		wxPanel* m_panelConfig;
+		wxBoxSizer* bSizerConfig;
+		wxBoxSizer* bSizerCfgHistoryButtons;
+		wxBitmapButton* m_bpButtonNew;
+		wxStaticText* m_staticText951;
+		wxBitmapButton* m_bpButtonOpen;
+		wxStaticText* m_staticText95;
+		wxBitmapButton* m_bpButtonSave;
+		wxStaticText* m_staticText961;
+		wxBitmapButton* m_bpButtonSaveAs;
+		wxBitmapButton* m_bpButtonSaveAsBatch;
+		wxStaticText* m_staticText97;
+		zen::Grid* m_gridCfgHistory;
+		wxPanel* m_panelViewFilter;
+		wxBoxSizer* bSizerViewFilter;
+		wxBitmapButton* m_bpButtonShowLog;
+		wxStaticText* m_staticTextViewType;
+		zen::ToggleButton* m_bpButtonViewTypeSyncAction;
+		zen::ToggleButton* m_bpButtonShowExcluded;
+		wxBitmapButton* m_bpButtonViewFilterSave;
+		wxStaticText* m_staticTextSelectView;
+		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;
+		wxStaticText* m_staticText96;
+		wxPanel* m_panelStatistics;
+		wxBoxSizer* bSizer1801;
+		wxStaticBitmap* m_bitmapDeleteLeft;
+		wxStaticText* m_staticTextDeleteLeft;
+		wxStaticBitmap* m_bitmapUpdateLeft;
+		wxStaticText* m_staticTextUpdateLeft;
+		wxStaticBitmap* m_bitmapCreateLeft;
+		wxStaticText* m_staticTextCreateLeft;
+		wxStaticBitmap* m_bitmapData;
+		wxStaticText* m_staticTextData;
+		wxStaticBitmap* m_bitmapCreateRight;
+		wxStaticText* m_staticTextCreateRight;
+		wxStaticBitmap* m_bitmapUpdateRight;
+		wxStaticText* m_staticTextUpdateRight;
+		wxStaticBitmap* m_bitmapDeleteRight;
+		wxStaticText* m_staticTextDeleteRight;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnConfigNew( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnConfigLoad( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnConfigSave( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnConfigSaveAs( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSaveAsBatchJob( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnMenuQuit( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnShowLog( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCompare( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCmpSettings( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnConfigureFilter( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSyncSettings( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnStartSync( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnMenuOptions( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnMenuFindItem( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnMenuExportFileList( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnMenuResetLayout( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnShowHelp( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnMenuCheckVersion( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnMenuCheckVersionAutomatically( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnMenuAbout( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCompSettingsContext( wxMouseEvent& event ) { event.Skip(); }
+		virtual void OnCompSettingsContext( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnGlobalFilterContext( wxMouseEvent& event ) { event.Skip(); }
+		virtual void OnGlobalFilterContext( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSyncSettingsContext( wxMouseEvent& event ) { event.Skip(); }
+		virtual void OnSyncSettingsContext( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnTopFolderPairAdd( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnTopFolderPairRemove( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSwapSides( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnTopLocalCompCfg( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnTopLocalFilterCfg( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnTopLocalSyncCfg( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnHideSearchPanel( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSearchGridEnter( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnToggleViewType( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnToggleViewButton( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnViewFilterSave( 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_bitmapLogStatus;
+		wxStaticText* m_staticTextLogStatus;
+		wxPanel* m_panelItemsProcessed;
+		wxStaticText* m_staticTextItemsProcessed;
+		wxStaticText* m_staticTextBytesProcessed;
+		wxPanel* m_panelItemsRemaining;
+		wxStaticText* m_staticTextItemsRemaining;
+		wxStaticText* m_staticTextBytesRemaining;
+		wxStaticText* m_staticTextTotalTime;
+		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();
+	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class FolderPairPanelGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class FolderPairPanelGenerated : public wxPanel
+class FolderPairPanelGenerated : public wxPanel 
 {
-private:
-
-protected:
-    wxButton* m_buttonSelectFolderLeft;
-    wxButton* m_buttonSelectFolderRight;
-
-public:
-    wxPanel* m_panelLeft;
-    wxBitmapButton* m_bpButtonFolderPairOptions;
-    wxBitmapButton* m_bpButtonRemovePair;
-    fff::FolderHistoryBox* m_folderPathLeft;
-    wxBitmapButton* m_bpButtonSelectAltFolderLeft;
-    wxPanel* m_panel20;
-    wxBitmapButton* m_bpButtonLocalCompCfg;
-    wxBitmapButton* m_bpButtonLocalFilter;
-    wxBitmapButton* m_bpButtonLocalSyncCfg;
-    wxPanel* m_panelRight;
-    fff::FolderHistoryBox* m_folderPathRight;
-    wxBitmapButton* m_bpButtonSelectAltFolderRight;
-
-    FolderPairPanelGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0 );
-    ~FolderPairPanelGenerated();
-
+	private:
+	
+	protected:
+		wxButton* m_buttonSelectFolderLeft;
+		wxButton* m_buttonSelectFolderRight;
+	
+	public:
+		wxPanel* m_panelLeft;
+		wxBitmapButton* m_bpButtonFolderPairOptions;
+		wxBitmapButton* m_bpButtonRemovePair;
+		fff::FolderHistoryBox* m_folderPathLeft;
+		wxBitmapButton* m_bpButtonSelectAltFolderLeft;
+		wxPanel* m_panel20;
+		wxBitmapButton* m_bpButtonLocalCompCfg;
+		wxBitmapButton* m_bpButtonLocalFilter;
+		wxBitmapButton* m_bpButtonLocalSyncCfg;
+		wxPanel* m_panelRight;
+		fff::FolderHistoryBox* m_folderPathRight;
+		wxBitmapButton* m_bpButtonSelectAltFolderRight;
+		
+		FolderPairPanelGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0 ); 
+		~FolderPairPanelGenerated();
+	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class ConfigDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class ConfigDlgGenerated : public wxDialog
+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;
-    wxToggleButton* m_toggleBtnByTimeSize;
-    wxToggleButton* m_toggleBtnByContent;
-    wxToggleButton* m_toggleBtnBySize;
-    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_staticline441;
-    wxStaticLine* m_staticline331;
-    wxBoxSizer* bSizerCompMisc;
-    wxStaticBitmap* m_bitmapIgnoreErrors;
-    wxCheckBox* m_checkBoxIgnoreErrors;
-    wxCheckBox* m_checkBoxAutoRetry;
-    wxFlexGridSizer* fgSizerAutoRetry;
-    wxStaticText* m_staticText96;
-    wxStaticText* m_staticTextAutoRetryDelay;
-    wxSpinCtrl* m_spinCtrlAutoRetryCount;
-    wxSpinCtrl* m_spinCtrlAutoRetryDelay;
-    wxStaticLine* m_staticline3311;
-    wxStaticLine* m_staticlinePerformance;
-    wxBoxSizer* bSizerPerformance;
-    wxStaticText* m_staticTextPerfDeRequired;
-    wxStaticLine* m_staticlinePerfDeRequired;
-    wxPanel* m_panelPerfHeader;
-    wxStaticBitmap* m_bitmapPerf;
-    wxStaticText* m_staticText13611;
-    wxBoxSizer* bSizer260;
-    wxStaticText* m_staticTextPerfParallelOps;
-    wxScrolledWindow* m_scrolledWindowPerf;
-    wxFlexGridSizer* fgSizerPerf;
-    wxHyperlinkCtrl* m_hyperlink1711;
-    wxPanel* m_panelFilterSettingsTab;
-    wxBoxSizer* bSizerHeaderFilterSettings;
-    wxStaticText* m_staticTextMainFilterSettings;
-    wxStaticText* m_staticTextLocalFilterSettings;
-    wxStaticLine* m_staticlineFilterHeader;
-    wxPanel* m_panelFilterSettings;
-    wxStaticBitmap* m_bitmapInclude;
-    wxStaticText* m_staticText78;
-    wxTextCtrl* m_textCtrlInclude;
-    wxStaticBitmap* m_bitmapExclude;
-    wxStaticText* m_staticText77;
-    wxHyperlinkCtrl* m_hyperlink171;
-    wxTextCtrl* m_textCtrlExclude;
-    wxStaticLine* m_staticline24;
-    wxStaticBitmap* m_bitmapFilterSize;
-    wxStaticText* m_staticText80;
-    wxStaticText* m_staticText101;
-    wxSpinCtrl* m_spinCtrlMinSize;
-    wxChoice* m_choiceUnitMinSize;
-    wxStaticText* m_staticText102;
-    wxSpinCtrl* m_spinCtrlMaxSize;
-    wxChoice* m_choiceUnitMaxSize;
-    wxStaticLine* m_staticline23;
-    wxStaticBitmap* m_bitmapFilterDate;
-    wxStaticText* m_staticText79;
-    wxSpinCtrl* m_spinCtrlTimespan;
-    wxChoice* m_choiceUnitTimespan;
-    wxStaticLine* m_staticline231;
-    wxButton* m_buttonClear;
-    wxPanel* m_panelSyncSettingsTab;
-    wxBoxSizer* bSizerHeaderSyncSettings;
-    wxStaticText* m_staticTextMainSyncSettings;
-    wxCheckBox* m_checkBoxUseLocalSyncOptions;
-    wxStaticLine* m_staticlineSyncHeader;
-    wxPanel* m_panelSyncSettings;
-    wxStaticText* m_staticText86;
-    wxToggleButton* m_toggleBtnTwoWay;
-    wxToggleButton* m_toggleBtnMirror;
-    wxToggleButton* m_toggleBtnUpdate;
-    wxToggleButton* m_toggleBtnCustom;
-    wxBoxSizer* bSizerSyncDirHolder;
-    wxBoxSizer* bSizerSyncDirections;
-    wxStaticText* m_staticTextCategory;
-    wxFlexGridSizer* ffgSizer11;
-    wxStaticBitmap* m_bitmapLeftOnly;
-    wxStaticBitmap* m_bitmapLeftNewer;
-    wxStaticBitmap* m_bitmapDifferent;
-    wxStaticBitmap* m_bitmapConflict;
-    wxStaticBitmap* m_bitmapRightNewer;
-    wxStaticBitmap* m_bitmapRightOnly;
-    wxBitmapButton* m_bpButtonLeftOnly;
-    wxBitmapButton* m_bpButtonLeftNewer;
-    wxBitmapButton* m_bpButtonDifferent;
-    wxBitmapButton* m_bpButtonConflict;
-    wxBitmapButton* m_bpButtonRightNewer;
-    wxBitmapButton* m_bpButtonRightOnly;
-    wxStaticText* m_staticText120;
-    wxWrapSizer* bSizerDatabase;
-    wxStaticBitmap* m_bitmapDatabase;
-    wxStaticText* m_staticText145;
-    wxStaticText* m_staticTextSyncVarDescription;
-    wxStaticLine* m_staticline431;
-    wxStaticLine* m_staticline72;
-    wxCheckBox* m_checkBoxDetectMove;
-    wxHyperlinkCtrl* m_hyperlink242;
-    wxStaticLine* m_staticline54;
-    wxBoxSizer* bSizer2361;
-    wxStaticText* m_staticText87;
-    wxToggleButton* m_toggleBtnRecycler;
-    wxToggleButton* m_toggleBtnPermanent;
-    wxToggleButton* m_toggleBtnVersioning;
-    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;
-    wxPanel* m_panelLogfile;
-    wxStaticBitmap* m_bitmapLogFile;
-    wxCheckBox* m_checkBoxSaveLog;
-    wxButton* m_buttonSelectLogFolder;
-    wxStaticLine* m_staticline57;
-    wxStaticText* m_staticText89;
-    fff::CommandBox* m_comboBoxPostSyncCommand;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonOkay;
-    wxButton* m_buttonCancel;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void onListBoxKeyEvent( wxKeyEvent& event ) { event.Skip(); }
-    virtual void OnSelectFolderPair( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnToggleLocalCompSettings( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCompByTimeSizeDouble( wxMouseEvent& event ) { event.Skip(); }
-    virtual void OnCompByTimeSize( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCompByContentDouble( wxMouseEvent& event ) { event.Skip(); }
-    virtual void OnCompByContent( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCompBySizeDouble( wxMouseEvent& event ) { event.Skip(); }
-    virtual void OnCompBySize( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnChangeCompOption( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnHelpComparisonSettings( wxHyperlinkEvent& event ) { event.Skip(); }
-    virtual void onlTimeShiftKeyDown( wxKeyEvent& event ) { event.Skip(); }
-    virtual void OnHelpTimeShift( wxHyperlinkEvent& event ) { event.Skip(); }
-    virtual void OnToggleIgnoreErrors( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnToggleAutoRetry( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnHelpPerformance( wxHyperlinkEvent& event ) { event.Skip(); }
-    virtual void OnChangeFilterOption( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnHelpShowExamples( wxHyperlinkEvent& event ) { event.Skip(); }
-    virtual void OnFilterReset( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnToggleLocalSyncSettings( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSyncTwoWayDouble( wxMouseEvent& event ) { event.Skip(); }
-    virtual void OnSyncTwoWay( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSyncMirrorDouble( wxMouseEvent& event ) { event.Skip(); }
-    virtual void OnSyncMirror( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSyncUpdateDouble( wxMouseEvent& event ) { event.Skip(); }
-    virtual void OnSyncUpdate( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSyncCustomDouble( wxMouseEvent& event ) { event.Skip(); }
-    virtual void OnSyncCustom( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnExLeftSideOnly( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnLeftNewer( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnDifferent( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnConflict( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnRightNewer( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnExRightSideOnly( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnToggleDetectMovedFiles( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnHelpDetectMovedFiles( wxHyperlinkEvent& event ) { event.Skip(); }
-    virtual void OnDeletionRecycler( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnDeletionPermanent( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnDeletionVersioning( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnHelpVersioning( wxHyperlinkEvent& event ) { event.Skip(); }
-    virtual void OnChanegVersioningStyle( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnToggleVersioningLimit( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnToggleSaveLogfile( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-    wxStaticBitmap* m_bitmapRetryErrors;
-    wxStaticText* m_staticTextFilterDescr;
-    wxBitmapButton* m_bpButtonSelectVersioningAltFolder;
-    wxBitmapButton* m_bpButtonSelectAltLogFolder;
-    fff::FolderHistoryBox* m_logFolderPath;
-    wxChoice* m_choicePostSyncCondition;
-
-    ConfigDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Synchronization Settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1, -1 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER );
-    ~ConfigDlgGenerated();
-
+	private:
+	
+	protected:
+		wxStaticText* m_staticTextFolderPairLabel;
+		wxListBox* m_listBoxFolderPair;
+		wxNotebook* m_notebook;
+		wxPanel* m_panelCompSettingsTab;
+		wxBoxSizer* bSizerHeaderCompSettings;
+		wxStaticText* m_staticTextMainCompSettings;
+		wxCheckBox* m_checkBoxUseLocalCmpOptions;
+		wxStaticLine* m_staticlineCompHeader;
+		wxPanel* m_panelComparisonSettings;
+		wxStaticText* m_staticText91;
+		wxToggleButton* m_toggleBtnByTimeSize;
+		wxToggleButton* m_toggleBtnByContent;
+		wxToggleButton* m_toggleBtnBySize;
+		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_staticline441;
+		wxStaticLine* m_staticline331;
+		wxBoxSizer* bSizerCompMisc;
+		wxStaticBitmap* m_bitmapIgnoreErrors;
+		wxCheckBox* m_checkBoxIgnoreErrors;
+		wxCheckBox* m_checkBoxAutoRetry;
+		wxFlexGridSizer* fgSizerAutoRetry;
+		wxStaticText* m_staticText96;
+		wxStaticText* m_staticTextAutoRetryDelay;
+		wxSpinCtrl* m_spinCtrlAutoRetryCount;
+		wxSpinCtrl* m_spinCtrlAutoRetryDelay;
+		wxStaticLine* m_staticline3311;
+		wxStaticLine* m_staticlinePerformance;
+		wxBoxSizer* bSizerPerformance;
+		wxStaticText* m_staticTextPerfDeRequired;
+		wxStaticLine* m_staticlinePerfDeRequired;
+		wxPanel* m_panelPerfHeader;
+		wxStaticBitmap* m_bitmapPerf;
+		wxStaticText* m_staticText13611;
+		wxBoxSizer* bSizer260;
+		wxStaticText* m_staticTextPerfParallelOps;
+		wxScrolledWindow* m_scrolledWindowPerf;
+		wxFlexGridSizer* fgSizerPerf;
+		wxHyperlinkCtrl* m_hyperlink1711;
+		wxPanel* m_panelFilterSettingsTab;
+		wxBoxSizer* bSizerHeaderFilterSettings;
+		wxStaticText* m_staticTextMainFilterSettings;
+		wxStaticText* m_staticTextLocalFilterSettings;
+		wxStaticLine* m_staticlineFilterHeader;
+		wxPanel* m_panelFilterSettings;
+		wxStaticBitmap* m_bitmapInclude;
+		wxStaticText* m_staticText78;
+		wxTextCtrl* m_textCtrlInclude;
+		wxStaticBitmap* m_bitmapExclude;
+		wxStaticText* m_staticText77;
+		wxHyperlinkCtrl* m_hyperlink171;
+		wxTextCtrl* m_textCtrlExclude;
+		wxStaticLine* m_staticline24;
+		wxStaticBitmap* m_bitmapFilterSize;
+		wxStaticText* m_staticText80;
+		wxStaticText* m_staticText101;
+		wxSpinCtrl* m_spinCtrlMinSize;
+		wxChoice* m_choiceUnitMinSize;
+		wxStaticText* m_staticText102;
+		wxSpinCtrl* m_spinCtrlMaxSize;
+		wxChoice* m_choiceUnitMaxSize;
+		wxStaticLine* m_staticline23;
+		wxStaticBitmap* m_bitmapFilterDate;
+		wxStaticText* m_staticText79;
+		wxSpinCtrl* m_spinCtrlTimespan;
+		wxChoice* m_choiceUnitTimespan;
+		wxStaticLine* m_staticline231;
+		wxButton* m_buttonClear;
+		wxPanel* m_panelSyncSettingsTab;
+		wxBoxSizer* bSizerHeaderSyncSettings;
+		wxStaticText* m_staticTextMainSyncSettings;
+		wxCheckBox* m_checkBoxUseLocalSyncOptions;
+		wxStaticLine* m_staticlineSyncHeader;
+		wxPanel* m_panelSyncSettings;
+		wxStaticText* m_staticText86;
+		wxToggleButton* m_toggleBtnTwoWay;
+		wxToggleButton* m_toggleBtnMirror;
+		wxToggleButton* m_toggleBtnUpdate;
+		wxToggleButton* m_toggleBtnCustom;
+		wxBoxSizer* bSizerSyncDirHolder;
+		wxBoxSizer* bSizerSyncDirections;
+		wxStaticText* m_staticTextCategory;
+		wxFlexGridSizer* ffgSizer11;
+		wxStaticBitmap* m_bitmapLeftOnly;
+		wxStaticBitmap* m_bitmapLeftNewer;
+		wxStaticBitmap* m_bitmapDifferent;
+		wxStaticBitmap* m_bitmapConflict;
+		wxStaticBitmap* m_bitmapRightNewer;
+		wxStaticBitmap* m_bitmapRightOnly;
+		wxBitmapButton* m_bpButtonLeftOnly;
+		wxBitmapButton* m_bpButtonLeftNewer;
+		wxBitmapButton* m_bpButtonDifferent;
+		wxBitmapButton* m_bpButtonConflict;
+		wxBitmapButton* m_bpButtonRightNewer;
+		wxBitmapButton* m_bpButtonRightOnly;
+		wxStaticText* m_staticText120;
+		wxWrapSizer* bSizerDatabase;
+		wxStaticBitmap* m_bitmapDatabase;
+		wxStaticText* m_staticText145;
+		wxStaticText* m_staticTextSyncVarDescription;
+		wxStaticLine* m_staticline431;
+		wxStaticLine* m_staticline72;
+		wxCheckBox* m_checkBoxDetectMove;
+		wxHyperlinkCtrl* m_hyperlink242;
+		wxStaticLine* m_staticline54;
+		wxBoxSizer* bSizer2361;
+		wxStaticText* m_staticText87;
+		wxToggleButton* m_toggleBtnRecycler;
+		wxToggleButton* m_toggleBtnPermanent;
+		wxToggleButton* m_toggleBtnVersioning;
+		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;
+		wxPanel* m_panelLogfile;
+		wxStaticBitmap* m_bitmapLogFile;
+		wxCheckBox* m_checkBoxSaveLog;
+		wxButton* m_buttonSelectLogFolder;
+		wxStaticLine* m_staticline57;
+		wxStaticText* m_staticText89;
+		fff::CommandBox* m_comboBoxPostSyncCommand;
+		wxBoxSizer* bSizerStdButtons;
+		wxButton* m_buttonOkay;
+		wxButton* m_buttonCancel;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void onListBoxKeyEvent( wxKeyEvent& event ) { event.Skip(); }
+		virtual void OnSelectFolderPair( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnToggleLocalCompSettings( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCompByTimeSizeDouble( wxMouseEvent& event ) { event.Skip(); }
+		virtual void OnCompByTimeSize( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCompByContentDouble( wxMouseEvent& event ) { event.Skip(); }
+		virtual void OnCompByContent( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCompBySizeDouble( wxMouseEvent& event ) { event.Skip(); }
+		virtual void OnCompBySize( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnChangeCompOption( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnHelpComparisonSettings( wxHyperlinkEvent& event ) { event.Skip(); }
+		virtual void onlTimeShiftKeyDown( wxKeyEvent& event ) { event.Skip(); }
+		virtual void OnHelpTimeShift( wxHyperlinkEvent& event ) { event.Skip(); }
+		virtual void OnToggleIgnoreErrors( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnToggleAutoRetry( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnHelpPerformance( wxHyperlinkEvent& event ) { event.Skip(); }
+		virtual void OnChangeFilterOption( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnHelpShowExamples( wxHyperlinkEvent& event ) { event.Skip(); }
+		virtual void OnFilterReset( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnToggleLocalSyncSettings( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSyncTwoWayDouble( wxMouseEvent& event ) { event.Skip(); }
+		virtual void OnSyncTwoWay( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSyncMirrorDouble( wxMouseEvent& event ) { event.Skip(); }
+		virtual void OnSyncMirror( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSyncUpdateDouble( wxMouseEvent& event ) { event.Skip(); }
+		virtual void OnSyncUpdate( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSyncCustomDouble( wxMouseEvent& event ) { event.Skip(); }
+		virtual void OnSyncCustom( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnExLeftSideOnly( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnLeftNewer( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnDifferent( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnConflict( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnRightNewer( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnExRightSideOnly( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnToggleDetectMovedFiles( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnHelpDetectMovedFiles( wxHyperlinkEvent& event ) { event.Skip(); }
+		virtual void OnDeletionRecycler( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnDeletionPermanent( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnDeletionVersioning( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnHelpVersioning( wxHyperlinkEvent& event ) { event.Skip(); }
+		virtual void OnChanegVersioningStyle( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnToggleVersioningLimit( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnToggleSaveLogfile( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		wxStaticBitmap* m_bitmapRetryErrors;
+		wxStaticText* m_staticTextFilterDescr;
+		wxBitmapButton* m_bpButtonSelectVersioningAltFolder;
+		wxBitmapButton* m_bpButtonSelectAltLogFolder;
+		fff::FolderHistoryBox* m_logFolderPath;
+		wxChoice* m_choicePostSyncCondition;
+		
+		ConfigDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Synchronization Settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER ); 
+		~ConfigDlgGenerated();
+	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class CloudSetupDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class CloudSetupDlgGenerated : public wxDialog
+class CloudSetupDlgGenerated : public wxDialog 
 {
-private:
-
-protected:
-    wxStaticBitmap* m_bitmapCloud;
-    wxStaticText* m_staticTextHeader;
-    wxStaticText* m_staticText136;
-    wxToggleButton* m_toggleBtnSftp;
-    wxToggleButton* m_toggleBtnFtp;
-    wxStaticLine* m_staticline371;
-    wxPanel* m_panel41;
-    wxStaticText* m_staticText12311;
-    wxTextCtrl* m_textCtrlServer;
-    wxStaticText* m_staticText1233;
-    wxTextCtrl* m_textCtrlPort;
-    wxStaticLine* m_staticline58;
-    wxBoxSizer* bSizerAuth;
-    wxBoxSizer* bSizerFtpEncrypt;
-    wxStaticText* m_staticText1251;
-    wxRadioButton* m_radioBtnEncryptNone;
-    wxRadioButton* m_radioBtnEncryptSsl;
-    wxStaticLine* m_staticline5721;
-    wxBoxSizer* bSizerSftpAuth;
-    wxStaticText* m_staticText125;
-    wxRadioButton* m_radioBtnPassword;
-    wxRadioButton* m_radioBtnKeyfile;
-    wxRadioButton* m_radioBtnAgent;
-    wxStaticLine* m_staticline572;
-    wxPanel* m_panelAuth;
-    wxStaticText* m_staticText123;
-    wxTextCtrl* m_textCtrlUserName;
-    wxStaticText* m_staticTextKeyfile;
-    wxBoxSizer* bSizerKeyFile;
-    wxTextCtrl* m_textCtrlKeyfilePath;
-    wxButton* m_buttonSelectKeyfile;
-    wxStaticText* m_staticTextPassword;
-    wxBoxSizer* bSizerPassword;
-    wxTextCtrl* m_textCtrlPasswordVisible;
-    wxTextCtrl* m_textCtrlPasswordHidden;
-    wxCheckBox* m_checkBoxShowPassword;
-    wxStaticLine* m_staticline581;
-    wxStaticBitmap* m_bitmapServerDir;
-    wxStaticText* m_staticText1232;
-    wxStaticLine* m_staticline72;
-    wxStaticText* m_staticTextTimeout;
-    wxSpinCtrl* m_spinCtrlTimeout;
-    wxTextCtrl* m_textCtrlServerPath;
-    wxButton* m_buttonSelectFolder;
-    wxBoxSizer* bSizer255;
-    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;
-    wxStaticText* m_staticTextChannelCountSftp;
-    wxSpinCtrl* m_spinCtrlChannelCountSftp;
-    wxButton* m_buttonChannelCountSftp;
-    wxStaticLine* m_staticline12;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonOkay;
-    wxButton* m_buttonCancel;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnConnectionSftp( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnConnectionFtp( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnAuthPassword( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnAuthKeyfile( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnAuthAgent( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSelectKeyfile( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnToggleShowPassword( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnBrowseCloudFolder( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnHelpFtpPerformance( wxHyperlinkEvent& event ) { event.Skip(); }
-    virtual void OnDetectServerChannelLimit( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-
-    CloudSetupDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Access Online Storage"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1, -1 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER );
-    ~CloudSetupDlgGenerated();
-
+	private:
+	
+	protected:
+		wxStaticBitmap* m_bitmapCloud;
+		wxStaticText* m_staticText136;
+		wxToggleButton* m_toggleBtnGdrive;
+		wxToggleButton* m_toggleBtnSftp;
+		wxToggleButton* m_toggleBtnFtp;
+		wxStaticLine* m_staticline371;
+		wxPanel* m_panel41;
+		wxBoxSizer* bSizerGdrive;
+		wxStaticText* m_staticText166;
+		wxListBox* m_listBoxGdriveUsers;
+		wxStaticText* m_staticText167;
+		zen::BitmapTextButton* m_buttonGdriveAddUser;
+		zen::BitmapTextButton* m_buttonGdriveRemoveUser;
+		wxStaticLine* m_staticline76;
+		wxStaticLine* m_staticline74;
+		wxStaticText* m_staticText165;
+		wxStaticBitmap* m_bitmapGdriveSelectedUser;
+		wxStaticText* m_staticTextGdriveUser;
+		wxStaticLine* m_staticline73;
+		wxBoxSizer* bSizerServer;
+		wxStaticBitmap* m_bitmapServer;
+		wxStaticText* m_staticText12311;
+		wxTextCtrl* m_textCtrlServer;
+		wxStaticText* m_staticText1233;
+		wxTextCtrl* m_textCtrlPort;
+		wxStaticLine* m_staticline58;
+		wxBoxSizer* bSizerAuth;
+		wxBoxSizer* bSizerAuthInner;
+		wxBoxSizer* bSizerFtpEncrypt;
+		wxStaticText* m_staticText1251;
+		wxRadioButton* m_radioBtnEncryptNone;
+		wxRadioButton* m_radioBtnEncryptSsl;
+		wxStaticLine* m_staticline5721;
+		wxBoxSizer* bSizerSftpAuth;
+		wxStaticText* m_staticText125;
+		wxRadioButton* m_radioBtnPassword;
+		wxRadioButton* m_radioBtnKeyfile;
+		wxRadioButton* m_radioBtnAgent;
+		wxStaticLine* m_staticline572;
+		wxPanel* m_panelAuth;
+		wxStaticText* m_staticText123;
+		wxTextCtrl* m_textCtrlUserName;
+		wxStaticText* m_staticTextKeyfile;
+		wxBoxSizer* bSizerKeyFile;
+		wxTextCtrl* m_textCtrlKeyfilePath;
+		wxButton* m_buttonSelectKeyfile;
+		wxStaticText* m_staticTextPassword;
+		wxBoxSizer* bSizerPassword;
+		wxTextCtrl* m_textCtrlPasswordVisible;
+		wxTextCtrl* m_textCtrlPasswordHidden;
+		wxCheckBox* m_checkBoxShowPassword;
+		wxStaticLine* m_staticline581;
+		wxStaticBitmap* m_bitmapServerDir;
+		wxStaticText* m_staticText1232;
+		wxBoxSizer* bSizerAccessTimeout;
+		wxStaticLine* m_staticline72;
+		wxStaticText* m_staticTextTimeout;
+		wxSpinCtrl* m_spinCtrlTimeout;
+		wxTextCtrl* m_textCtrlServerPath;
+		wxButton* m_buttonSelectFolder;
+		wxBoxSizer* bSizer255;
+		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;
+		wxStaticText* m_staticTextChannelCountSftp;
+		wxSpinCtrl* m_spinCtrlChannelCountSftp;
+		wxButton* m_buttonChannelCountSftp;
+		wxStaticLine* m_staticline12;
+		wxBoxSizer* bSizerStdButtons;
+		wxButton* m_buttonOkay;
+		wxButton* m_buttonCancel;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnConnectionGdrive( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnConnectionSftp( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnConnectionFtp( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnGdriveUserSelect( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnGdriveUserAdd( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnGdriveUserRemove( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnAuthPassword( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnAuthKeyfile( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnAuthAgent( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSelectKeyfile( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnToggleShowPassword( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnBrowseCloudFolder( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnHelpFtpPerformance( wxHyperlinkEvent& event ) { event.Skip(); }
+		virtual void OnDetectServerChannelLimit( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		CloudSetupDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Access Online Storage"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER ); 
+		~CloudSetupDlgGenerated();
+	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class AbstractFolderPickerGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class AbstractFolderPickerGenerated : public wxDialog
+class AbstractFolderPickerGenerated : public wxDialog 
 {
-private:
-
-protected:
-    wxStaticBitmap* m_bitmapServer;
-    wxStaticText* m_staticTextHeader;
-    wxStaticLine* m_staticline371;
-    wxPanel* m_panel41;
-    wxTreeCtrl* m_treeCtrlFileSystem;
-    wxStaticLine* m_staticline12;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonOkay;
-    wxButton* m_buttonCancel;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnExpandNode( wxTreeEvent& event ) { event.Skip(); }
-    virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-
-    AbstractFolderPickerGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1, -1 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER );
-    ~AbstractFolderPickerGenerated();
-
+	private:
+	
+	protected:
+		wxStaticBitmap* m_bitmapServer;
+		wxStaticText* m_staticTextHeader;
+		wxStaticLine* m_staticline371;
+		wxPanel* m_panel41;
+		wxTreeCtrl* m_treeCtrlFileSystem;
+		wxStaticLine* m_staticline12;
+		wxBoxSizer* bSizerStdButtons;
+		wxButton* m_buttonOkay;
+		wxButton* m_buttonCancel;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnExpandNode( wxTreeEvent& event ) { event.Skip(); }
+		virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		AbstractFolderPickerGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER ); 
+		~AbstractFolderPickerGenerated();
+	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class SyncConfirmationDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class SyncConfirmationDlgGenerated : public wxDialog
+class SyncConfirmationDlgGenerated : public wxDialog 
 {
-private:
-
-protected:
-    wxStaticBitmap* m_bitmapSync;
-    wxStaticText* m_staticTextHeader;
-    wxStaticLine* m_staticline371;
-    wxPanel* m_panelStatistics;
-    wxStaticLine* m_staticline38;
-    wxStaticText* m_staticText84;
-    wxStaticText* m_staticTextVariant;
-    wxStaticLine* m_staticline14;
-    wxStaticText* m_staticText83;
-    wxStaticBitmap* m_bitmapDeleteLeft;
-    wxStaticBitmap* m_bitmapUpdateLeft;
-    wxStaticBitmap* m_bitmapCreateLeft;
-    wxStaticBitmap* m_bitmapData;
-    wxStaticBitmap* m_bitmapCreateRight;
-    wxStaticBitmap* m_bitmapUpdateRight;
-    wxStaticBitmap* m_bitmapDeleteRight;
-    wxStaticText* m_staticTextDeleteLeft;
-    wxStaticText* m_staticTextUpdateLeft;
-    wxStaticText* m_staticTextCreateLeft;
-    wxStaticText* m_staticTextData;
-    wxStaticText* m_staticTextCreateRight;
-    wxStaticText* m_staticTextUpdateRight;
-    wxStaticText* m_staticTextDeleteRight;
-    wxStaticLine* m_staticline381;
-    wxStaticLine* m_staticline12;
-    wxCheckBox* m_checkBoxDontShowAgain;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonStartSync;
-    wxButton* m_buttonCancel;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnStartSync( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-
-    SyncConfirmationDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("FreeFileSync"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
-    ~SyncConfirmationDlgGenerated();
-
+	private:
+	
+	protected:
+		wxStaticBitmap* m_bitmapSync;
+		wxStaticText* m_staticTextHeader;
+		wxStaticLine* m_staticline371;
+		wxPanel* m_panelStatistics;
+		wxStaticLine* m_staticline38;
+		wxStaticText* m_staticText84;
+		wxStaticText* m_staticTextVariant;
+		wxStaticLine* m_staticline14;
+		wxStaticText* m_staticText83;
+		wxStaticBitmap* m_bitmapDeleteLeft;
+		wxStaticBitmap* m_bitmapUpdateLeft;
+		wxStaticBitmap* m_bitmapCreateLeft;
+		wxStaticBitmap* m_bitmapData;
+		wxStaticBitmap* m_bitmapCreateRight;
+		wxStaticBitmap* m_bitmapUpdateRight;
+		wxStaticBitmap* m_bitmapDeleteRight;
+		wxStaticText* m_staticTextDeleteLeft;
+		wxStaticText* m_staticTextUpdateLeft;
+		wxStaticText* m_staticTextCreateLeft;
+		wxStaticText* m_staticTextData;
+		wxStaticText* m_staticTextCreateRight;
+		wxStaticText* m_staticTextUpdateRight;
+		wxStaticText* m_staticTextDeleteRight;
+		wxStaticLine* m_staticline381;
+		wxStaticLine* m_staticline12;
+		wxCheckBox* m_checkBoxDontShowAgain;
+		wxBoxSizer* bSizerStdButtons;
+		wxButton* m_buttonStartSync;
+		wxButton* m_buttonCancel;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnStartSync( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		SyncConfirmationDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("FreeFileSync"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
+		~SyncConfirmationDlgGenerated();
+	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class CompareProgressDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class CompareProgressDlgGenerated : public wxPanel
+class CompareProgressDlgGenerated : public wxPanel 
 {
-private:
-
-protected:
-    wxPanel* m_panelStatistics;
-    wxStaticText* m_staticTextItemsFoundLabel;
-    wxStaticText* m_staticTextItemsFound;
-    wxStaticText* m_staticTextItemsRemainingLabel;
-    wxBoxSizer* bSizerItemsRemaining;
-    wxStaticText* m_staticTextItemsRemaining;
-    wxStaticText* m_staticTextBytesRemaining;
-    wxStaticText* m_staticTextTimeRemainingLabel;
-    wxStaticText* m_staticTextTimeRemaining;
-    wxStaticText* m_staticTextTimeElapsed;
-    wxStaticText* m_staticTextStatus;
-    wxStaticText* m_staticText1461;
-    wxStaticText* m_staticTextRetryCount;
-    wxStaticText* m_staticText146;
-    wxBoxSizer* bSizerProgressGraph;
-    zen::Graph2D* m_panelProgressGraph;
-
-public:
-    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 = wxRAISED_BORDER );
-    ~CompareProgressDlgGenerated();
-
+	private:
+	
+	protected:
+		wxPanel* m_panelStatistics;
+		wxStaticText* m_staticTextItemsFoundLabel;
+		wxStaticText* m_staticTextItemsFound;
+		wxStaticText* m_staticTextItemsRemainingLabel;
+		wxBoxSizer* bSizerItemsRemaining;
+		wxStaticText* m_staticTextItemsRemaining;
+		wxStaticText* m_staticTextBytesRemaining;
+		wxStaticText* m_staticTextTimeRemainingLabel;
+		wxStaticText* m_staticTextTimeRemaining;
+		wxStaticText* m_staticTextTimeElapsed;
+		wxStaticText* m_staticTextStatus;
+		wxStaticText* m_staticText1461;
+		wxStaticText* m_staticTextRetryCount;
+		wxStaticText* m_staticText146;
+		wxBoxSizer* bSizerProgressGraph;
+		zen::Graph2D* m_panelProgressGraph;
+	
+	public:
+		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 = wxRAISED_BORDER ); 
+		~CompareProgressDlgGenerated();
+	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class SyncProgressPanelGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class SyncProgressPanelGenerated : public wxPanel
+class SyncProgressPanelGenerated : public wxPanel 
 {
-private:
-
-protected:
-    wxPanel* m_panel53;
-    wxBoxSizer* bSizer42;
-    wxStaticText* m_staticText1461;
-    wxStaticText* m_staticText146;
-    wxStaticText* m_staticText137;
-
-public:
-    wxBoxSizer* bSizerRoot;
-    wxStaticBitmap* m_bitmapStatus;
-    wxStaticText* m_staticTextPhase;
-    wxBitmapButton* m_bpButtonMinimizeToTray;
-    wxBoxSizer* bSizerStatusText;
-    wxStaticText* m_staticTextStatus;
-    wxPanel* m_panelProgress;
-    zen::Graph2D* m_panelGraphBytes;
-    wxPanel* m_panelItemsProcessed;
-    wxStaticText* m_staticTextItemsProcessed;
-    wxStaticText* m_staticTextBytesProcessed;
-    wxPanel* m_panelItemsRemaining;
-    wxStaticText* m_staticTextItemsRemaining;
-    wxStaticText* m_staticTextBytesRemaining;
-    wxPanel* m_panelTimeRemaining;
-    wxStaticText* m_staticTextTimeRemaining;
-    wxStaticText* m_staticTextTimeElapsed;
-    wxStaticBitmap* m_bitmapGraphKeyBytes;
-    wxStaticBitmap* m_bitmapGraphKeyItems;
-    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 );
-    ~SyncProgressPanelGenerated();
-
+	private:
+	
+	protected:
+		wxPanel* m_panel53;
+		wxBoxSizer* bSizer42;
+		wxStaticText* m_staticText1461;
+		wxStaticText* m_staticText146;
+		wxStaticText* m_staticText137;
+	
+	public:
+		wxBoxSizer* bSizerRoot;
+		wxStaticBitmap* m_bitmapStatus;
+		wxStaticText* m_staticTextPhase;
+		wxBitmapButton* m_bpButtonMinimizeToTray;
+		wxBoxSizer* bSizerStatusText;
+		wxStaticText* m_staticTextStatus;
+		wxPanel* m_panelProgress;
+		zen::Graph2D* m_panelGraphBytes;
+		wxPanel* m_panelItemsProcessed;
+		wxStaticText* m_staticTextItemsProcessed;
+		wxStaticText* m_staticTextBytesProcessed;
+		wxPanel* m_panelItemsRemaining;
+		wxStaticText* m_staticTextItemsRemaining;
+		wxStaticText* m_staticTextBytesRemaining;
+		wxPanel* m_panelTimeRemaining;
+		wxStaticText* m_staticTextTimeRemaining;
+		wxStaticText* m_staticTextTimeElapsed;
+		wxStaticBitmap* m_bitmapGraphKeyBytes;
+		wxStaticBitmap* m_bitmapGraphKeyItems;
+		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 ); 
+		~SyncProgressPanelGenerated();
+	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class LogPanelGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class LogPanelGenerated : public wxPanel
+class LogPanelGenerated : public wxPanel 
 {
-private:
-
-protected:
-    zen::ToggleButton* m_bpButtonErrors;
-    zen::ToggleButton* m_bpButtonWarnings;
-    zen::ToggleButton* m_bpButtonInfo;
-    wxStaticLine* m_staticline13;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnErrors( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnWarnings( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnInfo( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-    zen::Grid* m_gridMessages;
-
-    LogPanelGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL );
-    ~LogPanelGenerated();
-
+	private:
+	
+	protected:
+		zen::ToggleButton* m_bpButtonErrors;
+		zen::ToggleButton* m_bpButtonWarnings;
+		zen::ToggleButton* m_bpButtonInfo;
+		wxStaticLine* m_staticline13;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnErrors( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnWarnings( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnInfo( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		zen::Grid* m_gridMessages;
+		
+		LogPanelGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL ); 
+		~LogPanelGenerated();
+	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class BatchDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class BatchDlgGenerated : public wxDialog
+class BatchDlgGenerated : public wxDialog 
 {
-private:
-
-protected:
-    wxStaticBitmap* m_bitmapBatchJob;
-    wxStaticText* m_staticTextHeader;
-    wxStaticLine* m_staticline18;
-    wxPanel* m_panel35;
-    wxStaticText* m_staticText146;
-    wxFlexGridSizer* ffgSizer11;
-    wxStaticBitmap* m_bitmapMinimizeToTray;
-    wxCheckBox* m_checkBoxRunMinimized;
-    wxStaticLine* m_staticline26;
-    wxStaticBitmap* m_bitmapIgnoreErrors;
-    wxCheckBox* m_checkBoxIgnoreErrors;
-    wxRadioButton* m_radioBtnErrorDialogShow;
-    wxRadioButton* m_radioBtnErrorDialogCancel;
-    wxStaticLine* m_staticline261;
-    wxStaticText* m_staticText137;
-    wxStaticLine* m_staticline262;
-    wxStaticLine* m_staticline25;
-    wxHyperlinkCtrl* m_hyperlink17;
-    wxStaticLine* m_staticline13;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonSaveAs;
-    wxButton* m_buttonCancel;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnToggleRunMinimized( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnToggleIgnoreErrors( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnErrorDialogShow( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnErrorDialogCancel( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnHelpScheduleBatch( wxHyperlinkEvent& event ) { event.Skip(); }
-    virtual void OnSaveBatchJob( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-    wxCheckBox* m_checkBoxAutoClose;
-    wxChoice* m_choicePostSyncAction;
-
-    BatchDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Save as a Batch Job"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
-    ~BatchDlgGenerated();
-
+	private:
+	
+	protected:
+		wxStaticBitmap* m_bitmapBatchJob;
+		wxStaticText* m_staticTextHeader;
+		wxStaticLine* m_staticline18;
+		wxPanel* m_panel35;
+		wxStaticText* m_staticText146;
+		wxFlexGridSizer* ffgSizer11;
+		wxStaticBitmap* m_bitmapMinimizeToTray;
+		wxCheckBox* m_checkBoxRunMinimized;
+		wxStaticLine* m_staticline26;
+		wxStaticBitmap* m_bitmapIgnoreErrors;
+		wxCheckBox* m_checkBoxIgnoreErrors;
+		wxRadioButton* m_radioBtnErrorDialogShow;
+		wxRadioButton* m_radioBtnErrorDialogCancel;
+		wxStaticLine* m_staticline261;
+		wxStaticText* m_staticText137;
+		wxStaticLine* m_staticline262;
+		wxStaticLine* m_staticline25;
+		wxHyperlinkCtrl* m_hyperlink17;
+		wxStaticLine* m_staticline13;
+		wxBoxSizer* bSizerStdButtons;
+		wxButton* m_buttonSaveAs;
+		wxButton* m_buttonCancel;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnToggleRunMinimized( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnToggleIgnoreErrors( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnErrorDialogShow( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnErrorDialogCancel( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnHelpScheduleBatch( wxHyperlinkEvent& event ) { event.Skip(); }
+		virtual void OnSaveBatchJob( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		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();
+	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class DeleteDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class DeleteDlgGenerated : public wxDialog
+class DeleteDlgGenerated : public wxDialog 
 {
-private:
-
-protected:
-    wxStaticBitmap* m_bitmapDeleteType;
-    wxStaticText* m_staticTextHeader;
-    wxStaticLine* m_staticline91;
-    wxPanel* m_panel31;
-    wxStaticLine* m_staticline42;
-    wxTextCtrl* m_textCtrlFileList;
-    wxStaticLine* m_staticline9;
-    wxBoxSizer* bSizerStdButtons;
-    wxCheckBox* m_checkBoxUseRecycler;
-    wxButton* m_buttonOK;
-    wxButton* m_buttonCancel;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnUseRecycler( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnOK( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-
-    DeleteDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Delete Items"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1, -1 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER );
-    ~DeleteDlgGenerated();
-
+	private:
+	
+	protected:
+		wxStaticBitmap* m_bitmapDeleteType;
+		wxStaticText* m_staticTextHeader;
+		wxStaticLine* m_staticline91;
+		wxPanel* m_panel31;
+		wxStaticLine* m_staticline42;
+		wxTextCtrl* m_textCtrlFileList;
+		wxStaticLine* m_staticline9;
+		wxBoxSizer* bSizerStdButtons;
+		wxCheckBox* m_checkBoxUseRecycler;
+		wxButton* m_buttonOK;
+		wxButton* m_buttonCancel;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnUseRecycler( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnOK( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		DeleteDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Delete Items"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER ); 
+		~DeleteDlgGenerated();
+	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class CopyToDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class CopyToDlgGenerated : public wxDialog
+class CopyToDlgGenerated : public wxDialog 
 {
-private:
-
-protected:
-    wxStaticBitmap* m_bitmapCopyTo;
-    wxStaticText* m_staticTextHeader;
-    wxStaticLine* m_staticline91;
-    wxPanel* m_panel31;
-    wxStaticLine* m_staticline42;
-    wxTextCtrl* m_textCtrlFileList;
-    wxButton* m_buttonSelectTargetFolder;
-    wxStaticLine* m_staticline9;
-    wxBoxSizer* bSizerStdButtons;
-    wxCheckBox* m_checkBoxKeepRelPath;
-    wxCheckBox* m_checkBoxOverwriteIfExists;
-    wxButton* m_buttonOK;
-    wxButton* m_buttonCancel;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnUseRecycler( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnOK( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-    fff::FolderHistoryBox* m_targetFolderPath;
-    wxBitmapButton* m_bpButtonSelectAltTargetFolder;
-
-    CopyToDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Copy Items"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1, -1 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER );
-    ~CopyToDlgGenerated();
-
+	private:
+	
+	protected:
+		wxStaticBitmap* m_bitmapCopyTo;
+		wxStaticText* m_staticTextHeader;
+		wxStaticLine* m_staticline91;
+		wxPanel* m_panel31;
+		wxStaticLine* m_staticline42;
+		wxTextCtrl* m_textCtrlFileList;
+		wxButton* m_buttonSelectTargetFolder;
+		wxStaticLine* m_staticline9;
+		wxBoxSizer* bSizerStdButtons;
+		wxCheckBox* m_checkBoxKeepRelPath;
+		wxCheckBox* m_checkBoxOverwriteIfExists;
+		wxButton* m_buttonOK;
+		wxButton* m_buttonCancel;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnUseRecycler( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnOK( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		fff::FolderHistoryBox* m_targetFolderPath;
+		wxBitmapButton* m_bpButtonSelectAltTargetFolder;
+		
+		CopyToDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Copy Items"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER ); 
+		~CopyToDlgGenerated();
+	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class OptionsDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class OptionsDlgGenerated : public wxDialog
+class OptionsDlgGenerated : public wxDialog 
 {
-private:
-
-protected:
-    wxStaticBitmap* m_bitmapSettings;
-    wxStaticText* m_staticText44;
-    wxStaticLine* m_staticline20;
-    wxPanel* m_panel39;
-    wxCheckBox* m_checkBoxFailSafe;
-    wxStaticText* m_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;
-    wxStaticText* m_staticTextResetDialogs;
-    zen::BitmapTextButton* m_buttonResetDialogs;
-    wxStaticLine* m_staticline191;
-    wxStaticBitmap* m_bitmapLogFile;
-    wxStaticText* m_staticText163;
-    wxHyperlinkCtrl* m_hyperlinkLogFolder;
-    wxCheckBox* m_checkBoxLogFilesMaxAge;
-    wxSpinCtrl* m_spinCtrlLogFilesMaxAge;
-    wxStaticLine* m_staticline361;
-    wxStaticText* m_staticText85;
-    wxGrid* m_gridCustomCommand;
-    wxBitmapButton* m_bpButtonAddRow;
-    wxBitmapButton* m_bpButtonRemoveRow;
-    wxHyperlinkCtrl* m_hyperlink17;
-    wxStaticLine* m_staticline36;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonDefault;
-    wxButton* m_buttonOkay;
-    wxButton* m_buttonCancel;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnResetDialogs( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnShowLogFolder( wxHyperlinkEvent& event ) { event.Skip(); }
-    virtual void OnToggleLogfilesLimit( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnAddRow( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnRemoveRow( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnHelpShowExamples( wxHyperlinkEvent& event ) { event.Skip(); }
-    virtual void OnDefault( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-
-    OptionsDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
-    ~OptionsDlgGenerated();
-
+	private:
+	
+	protected:
+		wxStaticBitmap* m_bitmapSettings;
+		wxStaticText* m_staticText44;
+		wxStaticLine* m_staticline20;
+		wxPanel* m_panel39;
+		wxCheckBox* m_checkBoxFailSafe;
+		wxStaticText* m_staticText911;
+		wxStaticText* m_staticText91;
+		wxStaticText* m_staticText9111;
+		wxBoxSizer* bSizerLockedFiles;
+		wxCheckBox* m_checkBoxCopyLocked;
+		wxStaticText* m_staticText921;
+		wxStaticText* m_staticText92;
+		wxStaticText* m_staticText922;
+		wxCheckBox* m_checkBoxCopyPermissions;
+		wxStaticText* m_staticText931;
+		wxStaticText* m_staticText93;
+		wxStaticText* m_staticText932;
+		wxStaticLine* m_staticline39;
+		wxStaticText* m_staticTextResetDialogs;
+		zen::BitmapTextButton* m_buttonResetDialogs;
+		wxStaticLine* m_staticline191;
+		wxStaticBitmap* m_bitmapLogFile;
+		wxStaticText* m_staticText163;
+		wxHyperlinkCtrl* m_hyperlinkLogFolder;
+		wxCheckBox* m_checkBoxLogFilesMaxAge;
+		wxSpinCtrl* m_spinCtrlLogFilesMaxAge;
+		wxStaticLine* m_staticline361;
+		wxStaticText* m_staticText85;
+		wxGrid* m_gridCustomCommand;
+		wxBitmapButton* m_bpButtonAddRow;
+		wxBitmapButton* m_bpButtonRemoveRow;
+		wxHyperlinkCtrl* m_hyperlink17;
+		wxStaticLine* m_staticline36;
+		wxBoxSizer* bSizerStdButtons;
+		wxButton* m_buttonDefault;
+		wxButton* m_buttonOkay;
+		wxButton* m_buttonCancel;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnResetDialogs( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnShowLogFolder( wxHyperlinkEvent& event ) { event.Skip(); }
+		virtual void OnToggleLogfilesLimit( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnAddRow( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnRemoveRow( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnHelpShowExamples( wxHyperlinkEvent& event ) { event.Skip(); }
+		virtual void OnDefault( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		OptionsDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
+		~OptionsDlgGenerated();
+	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class TooltipDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class TooltipDlgGenerated : public wxDialog
+class TooltipDlgGenerated : public wxDialog 
 {
-private:
-
-protected:
-
-public:
-    wxStaticBitmap* m_bitmapLeft;
-    wxStaticText* m_staticTextMain;
-
-    TooltipDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
-    ~TooltipDlgGenerated();
-
+	private:
+	
+	protected:
+	
+	public:
+		wxStaticBitmap* m_bitmapLeft;
+		wxStaticText* m_staticTextMain;
+		
+		TooltipDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
+		~TooltipDlgGenerated();
+	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class SelectTimespanDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class SelectTimespanDlgGenerated : public wxDialog
+class SelectTimespanDlgGenerated : public wxDialog 
 {
-private:
-
-protected:
-    wxPanel* m_panel35;
-    wxCalendarCtrl* m_calendarFrom;
-    wxCalendarCtrl* m_calendarTo;
-    wxStaticLine* m_staticline21;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonOkay;
-    wxButton* m_buttonCancel;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnChangeSelectionFrom( wxCalendarEvent& event ) { event.Skip(); }
-    virtual void OnChangeSelectionTo( wxCalendarEvent& event ) { event.Skip(); }
-    virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-
-    SelectTimespanDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Select Time Span"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
-    ~SelectTimespanDlgGenerated();
-
+	private:
+	
+	protected:
+		wxPanel* m_panel35;
+		wxCalendarCtrl* m_calendarFrom;
+		wxCalendarCtrl* m_calendarTo;
+		wxStaticLine* m_staticline21;
+		wxBoxSizer* bSizerStdButtons;
+		wxButton* m_buttonOkay;
+		wxButton* m_buttonCancel;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnChangeSelectionFrom( wxCalendarEvent& event ) { event.Skip(); }
+		virtual void OnChangeSelectionTo( wxCalendarEvent& event ) { event.Skip(); }
+		virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		SelectTimespanDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Select Time Span"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
+		~SelectTimespanDlgGenerated();
+	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class AboutDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class AboutDlgGenerated : public wxDialog
+class AboutDlgGenerated : public wxDialog 
 {
-private:
-
-protected:
-    wxPanel* m_panel41;
-    wxBoxSizer* bSizerMainSection;
-    wxStaticBitmap* m_bitmapLogo;
-    wxStaticLine* m_staticline341;
-    wxStaticText* m_staticText94;
-    wxStaticBitmap* m_bitmapHomepage;
-    wxHyperlinkCtrl* m_hyperlink1;
-    wxStaticBitmap* m_bitmapForum;
-    wxHyperlinkCtrl* m_hyperlink21;
-    wxStaticBitmap* m_bitmapEmail;
-    wxHyperlinkCtrl* m_hyperlink2;
-    wxStaticLine* m_staticline3412;
-    wxPanel* m_panelDonate;
-    wxPanel* m_panel39;
-    wxStaticBitmap* m_bitmapDonate;
-    wxStaticText* m_staticTextDonate;
-    wxButton* m_buttonDonate;
-    wxPanel* m_panelThankYou;
-    wxPanel* m_panel391;
-    wxStaticBitmap* m_bitmapThanks;
-    wxStaticText* m_staticTextThanks;
-    wxStaticText* m_staticTextNoAutoUpdate;
-    wxButton* m_buttonShowDonationDetails;
-    wxStaticText* m_staticText96;
-    wxHyperlinkCtrl* m_hyperlink11;
-    wxHyperlinkCtrl* m_hyperlink7;
-    wxHyperlinkCtrl* m_hyperlink14;
-    wxHyperlinkCtrl* m_hyperlink16;
-    wxHyperlinkCtrl* m_hyperlink15;
-    wxHyperlinkCtrl* m_hyperlink12;
-    wxHyperlinkCtrl* m_hyperlink10;
-    wxHyperlinkCtrl* m_hyperlink101;
-    wxHyperlinkCtrl* m_hyperlink18;
-    wxHyperlinkCtrl* m_hyperlink9;
-    wxStaticLine* m_staticline34;
-    wxStaticText* m_staticText93;
-    wxStaticBitmap* m_bitmapGpl;
-    wxHyperlinkCtrl* m_hyperlink5;
-    wxStaticLine* m_staticline37;
-    wxStaticLine* m_staticline74;
-    wxStaticText* m_staticTextThanksForLoc;
-    wxScrolledWindow* m_scrolledWindowTranslators;
-    wxFlexGridSizer* fgSizerTranslators;
-    wxStaticLine* m_staticline36;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonClose;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnDonate( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnShowDonationDetails( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnOK( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-
-    AboutDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("About"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
-    ~AboutDlgGenerated();
-
+	private:
+	
+	protected:
+		wxPanel* m_panel41;
+		wxBoxSizer* bSizerMainSection;
+		wxStaticBitmap* m_bitmapLogo;
+		wxStaticLine* m_staticline341;
+		wxStaticText* m_staticText94;
+		wxStaticBitmap* m_bitmapHomepage;
+		wxHyperlinkCtrl* m_hyperlink1;
+		wxStaticBitmap* m_bitmapForum;
+		wxHyperlinkCtrl* m_hyperlink21;
+		wxStaticBitmap* m_bitmapEmail;
+		wxHyperlinkCtrl* m_hyperlink2;
+		wxStaticLine* m_staticline3412;
+		wxPanel* m_panelDonate;
+		wxPanel* m_panel39;
+		wxStaticBitmap* m_bitmapDonate;
+		wxStaticText* m_staticTextDonate;
+		wxButton* m_buttonDonate;
+		wxPanel* m_panelThankYou;
+		wxPanel* m_panel391;
+		wxStaticBitmap* m_bitmapThanks;
+		wxStaticText* m_staticTextThanks;
+		wxStaticText* m_staticTextNoAutoUpdate;
+		wxButton* m_buttonShowDonationDetails;
+		wxStaticText* m_staticText96;
+		wxHyperlinkCtrl* m_hyperlink11;
+		wxHyperlinkCtrl* m_hyperlink7;
+		wxHyperlinkCtrl* m_hyperlink14;
+		wxHyperlinkCtrl* m_hyperlink16;
+		wxHyperlinkCtrl* m_hyperlink15;
+		wxHyperlinkCtrl* m_hyperlink12;
+		wxHyperlinkCtrl* m_hyperlink10;
+		wxHyperlinkCtrl* m_hyperlink101;
+		wxHyperlinkCtrl* m_hyperlink18;
+		wxHyperlinkCtrl* m_hyperlink9;
+		wxStaticLine* m_staticline34;
+		wxStaticText* m_staticText93;
+		wxStaticBitmap* m_bitmapGpl;
+		wxHyperlinkCtrl* m_hyperlink5;
+		wxStaticLine* m_staticline37;
+		wxStaticLine* m_staticline74;
+		wxStaticText* m_staticTextThanksForLoc;
+		wxScrolledWindow* m_scrolledWindowTranslators;
+		wxFlexGridSizer* fgSizerTranslators;
+		wxStaticLine* m_staticline36;
+		wxBoxSizer* bSizerStdButtons;
+		wxButton* m_buttonClose;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnDonate( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnShowDonationDetails( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnOK( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		AboutDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("About"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
+		~AboutDlgGenerated();
+	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class DownloadProgressDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class DownloadProgressDlgGenerated : public wxDialog
+class DownloadProgressDlgGenerated : public wxDialog 
 {
-private:
-
-protected:
-    wxStaticBitmap* m_bitmapDownloading;
-    wxStaticText* m_staticTextHeader;
-    wxGauge* m_gaugeProgress;
-    wxStaticText* m_staticTextDetails;
-    wxStaticLine* m_staticline9;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonCancel;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-
-    DownloadProgressDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0 );
-    ~DownloadProgressDlgGenerated();
-
+	private:
+	
+	protected:
+		wxStaticBitmap* m_bitmapDownloading;
+		wxStaticText* m_staticTextHeader;
+		wxGauge* m_gaugeProgress;
+		wxStaticText* m_staticTextDetails;
+		wxStaticLine* m_staticline9;
+		wxBoxSizer* bSizerStdButtons;
+		wxButton* m_buttonCancel;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		DownloadProgressDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0 ); 
+		~DownloadProgressDlgGenerated();
+	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class ActivationDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class ActivationDlgGenerated : public wxDialog
+class ActivationDlgGenerated : public wxDialog 
 {
-private:
-
-protected:
-    wxPanel* m_panel35;
-    wxStaticBitmap* m_bitmapActivation;
-    wxTextCtrl* m_textCtrlLastError;
-    wxStaticText* m_staticTextMain;
-    wxStaticLine* m_staticline181;
-    wxStaticLine* m_staticline18111;
-    wxPanel* m_panel3511;
-    wxStaticText* m_staticText136;
-    wxButton* m_buttonActivateOnline;
-    wxStaticLine* m_staticline181111;
-    wxStaticLine* m_staticline181112;
-    wxPanel* m_panel351;
-    wxStaticText* m_staticText1361;
-    wxButton* m_buttonCopyUrl;
-    wxTextCtrl* m_textCtrlManualActivationUrl;
-    wxStaticText* m_staticText13611;
-    wxTextCtrl* m_textCtrlOfflineActivationKey;
-    wxButton* m_buttonActivateOffline;
-    wxStaticLine* m_staticline13;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonCancel;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnActivateOnline( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCopyUrl( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnOfflineActivationEnter( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnActivateOffline( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-
-    ActivationDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("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;
+		wxTextCtrl* m_textCtrlLastError;
+		wxStaticText* m_staticTextMain;
+		wxStaticLine* m_staticline181;
+		wxStaticLine* m_staticline18111;
+		wxPanel* m_panel3511;
+		wxStaticText* m_staticText136;
+		wxButton* m_buttonActivateOnline;
+		wxStaticLine* m_staticline181111;
+		wxStaticLine* m_staticline181112;
+		wxPanel* m_panel351;
+		wxStaticText* m_staticText1361;
+		wxButton* m_buttonCopyUrl;
+		wxTextCtrl* m_textCtrlManualActivationUrl;
+		wxStaticText* m_staticText13611;
+		wxTextCtrl* m_textCtrlOfflineActivationKey;
+		wxButton* m_buttonActivateOffline;
+		wxStaticLine* m_staticline13;
+		wxBoxSizer* bSizerStdButtons;
+		wxButton* m_buttonCancel;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnActivateOnline( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCopyUrl( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnOfflineActivationEnter( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnActivateOffline( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		ActivationDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("dummy"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
+		~ActivationDlgGenerated();
+	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class CfgHighlightDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class CfgHighlightDlgGenerated : public wxDialog
+class CfgHighlightDlgGenerated : public wxDialog 
 {
-private:
-
-protected:
-    wxPanel* m_panel35;
-    wxStaticText* m_staticTextHighlight;
-    wxSpinCtrl* m_spinCtrlOverdueDays;
-    wxStaticLine* m_staticline21;
-    wxBoxSizer* bSizerStdButtons;
-    wxButton* m_buttonOkay;
-    wxButton* m_buttonCancel;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-
-
-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();
-
+	private:
+	
+	protected:
+		wxPanel* m_panel35;
+		wxStaticText* m_staticTextHighlight;
+		wxSpinCtrl* m_spinCtrlOverdueDays;
+		wxStaticLine* m_staticline21;
+		wxBoxSizer* bSizerStdButtons;
+		wxButton* m_buttonOkay;
+		wxButton* m_buttonCancel;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	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();
+	
 };
 
 #endif //__GUI_GENERATED_H__
diff --git a/FreeFileSync/Source/ui/gui_status_handler.cpp b/FreeFileSync/Source/ui/gui_status_handler.cpp
index 1e0460e5..52d6ff69 100755
--- a/FreeFileSync/Source/ui/gui_status_handler.cpp
+++ b/FreeFileSync/Source/ui/gui_status_handler.cpp
@@ -448,7 +448,7 @@ StatusHandlerFloatingDialog::Result StatusHandlerFloatingDialog::reportFinalStat
 
         //post sync action
         bool autoClose = false;
-        bool exitAfterSync = false;
+        FinalRequest finalRequest = FinalRequest::none;
 
         if (getAbortStatus() && *getAbortStatus() == AbortTrigger::USER)
             ; //user cancelled => don't run post sync command!
@@ -459,7 +459,8 @@ StatusHandlerFloatingDialog::Result StatusHandlerFloatingDialog::reportFinalStat
                     autoClose = progressDlg_->getOptionAutoCloseDialog();
                     break;
                 case PostSyncAction2::EXIT:
-                    autoClose = exitAfterSync = true; //program exit must be handled by calling context!
+                    autoClose = true;
+                    finalRequest = FinalRequest::exit; //program exit must be handled by calling context!
                     break;
                 case PostSyncAction2::SLEEP:
                     if (mayRunAfterCountDown(_("System: Sleep")))
@@ -472,12 +473,10 @@ StatusHandlerFloatingDialog::Result StatusHandlerFloatingDialog::reportFinalStat
                     break;
                 case PostSyncAction2::SHUTDOWN:
                     if (mayRunAfterCountDown(_("System: Shut down")))
-                        try
-                        {
-                            shutdownSystem(); //throw FileError
-                            autoClose = exitAfterSync = true;
-                        }
-                        catch (const FileError& e) { errorLog_.logMsg(e.toString(), MSG_TYPE_ERROR); }
+                    {
+                        autoClose = true;
+                        finalRequest = FinalRequest::shutdown; //system shutdown must be handled by calling context!
+                    }
                     break;
             }
 
@@ -485,7 +484,7 @@ StatusHandlerFloatingDialog::Result StatusHandlerFloatingDialog::reportFinalStat
 
         //close progress dialog
         if (autoClose)
-            progressDlg_->closeDirectly(!exitAfterSync /*restoreParentFrame*/);
+            progressDlg_->closeDirectly(finalRequest == FinalRequest::none /*restoreParentFrame*/);
         else
             progressDlg_->showSummary(finalStatus, errorLogFinal);
 
@@ -499,10 +498,10 @@ StatusHandlerFloatingDialog::Result StatusHandlerFloatingDialog::reportFinalStat
             std::this_thread::sleep_for(UI_UPDATE_INTERVAL);
         }
 
-        return { summary, errorLogFinal, exitAfterSync, logFilePath };
+        return { summary, errorLogFinal, finalRequest, logFilePath };
     }
     else
-        return { summary, std::make_shared<const ErrorLog>(std::move(errorLog_)), false /*exitAfterSync */, logFilePath };
+        return { summary, std::make_shared<const ErrorLog>(std::move(errorLog_)), FinalRequest::none, logFilePath };
 }
 
 
diff --git a/FreeFileSync/Source/ui/gui_status_handler.h b/FreeFileSync/Source/ui/gui_status_handler.h
index 7ba3878b..0bd6dac4 100755
--- a/FreeFileSync/Source/ui/gui_status_handler.h
+++ b/FreeFileSync/Source/ui/gui_status_handler.h
@@ -77,11 +77,17 @@ public:
     void updateDataProcessed(int itemsDelta, int64_t bytesDelta) override; //noexcept!!
     void forceUiRefreshNoThrow()                                 override; //
 
+    enum class FinalRequest
+    {
+        none,
+        exit,
+        shutdown
+    };
     struct Result
     {
         ProcessSummary summary;
         std::shared_ptr<const zen::ErrorLog> errorLog;
-        bool exitAfterSync;
+        FinalRequest finalRequest;
         AbstractPath logFilePath;
     };
     Result reportFinalStatus(const Zstring& altLogFolderPathPhrase, int logfilesMaxAgeDays, const std::set<AbstractPath>& logFilePathsToKeep); //noexcept!!
diff --git a/FreeFileSync/Source/ui/main_dlg.cpp b/FreeFileSync/Source/ui/main_dlg.cpp
index 92a545ee..55e20fbd 100755
--- a/FreeFileSync/Source/ui/main_dlg.cpp
+++ b/FreeFileSync/Source/ui/main_dlg.cpp
@@ -11,6 +11,7 @@
 #include <zen/thread.h>
 #include <zen/shell_execute.h>
 #include <zen/perf.h>
+#include <zen/shutdown.h>
 #include <wx/clipbrd.h>
 #include <wx/wupdlock.h>
 #include <wx/sound.h>
@@ -152,7 +153,7 @@ private:
     std::unique_ptr<FilterConfig>& getFilterCfgOnClipboardRef() override { return mainDlg_.filterCfgOnClipboard_; }
 
     void onLocalCompCfgChange  () override { mainDlg_.applyCompareConfig(false /*setDefaultViewType*/); }
-    void onLocalSyncCfgChange  () override { mainDlg_.applySyncConfig  (); }
+    void onLocalSyncCfgChange  () override { mainDlg_.applySyncDirections(); }
     void onLocalFilterCfgChange() override { mainDlg_.applyFilterConfig(); } //re-apply filter
 
     const std::function<bool(const std::vector<Zstring>& shellItemPaths)> droppedPathsFilter_ = [&](const std::vector<Zstring>& shellItemPaths)
@@ -460,7 +461,7 @@ MainDialog::MainDialog(const Zstring& globalConfigFilePath,
     updateTopButton(*m_buttonCompare, getResourceImage(L"compare"), L"Dummy", false /*makeGrey*/);
     m_panelTopButtons->GetSizer()->SetSizeHints(m_panelTopButtons); //~=Fit() + SetMinSize()
 
-    setBitmapTextLabel(*m_buttonCancel, wxImage(), m_buttonCancel->GetLabel()); //we can't use a wxButton for cancel: it's rendered smaller on OS X than a wxBitmapButton!
+    m_buttonCancel->SetBitmap(getTransparentPixel()); //set dummy image (can't be empty!): text-only buttons are rendered smaller on OS X!
     m_buttonCancel->SetMinSize(wxSize(std::max(m_buttonCancel->GetSize().x, fastFromDIP(TOP_BUTTON_OPTIMAL_WIDTH_DIP)),
                                       std::max(m_buttonCancel->GetSize().y, m_buttonCompare->GetSize().y)));
 
@@ -2665,7 +2666,7 @@ void MainDialog::OnSyncSettingsContext(wxEvent& event)
     auto setVariant = [&](DirectionConfig::Variant var)
     {
         currentCfg_.mainCfg.syncCfg.directionCfg.var = var;
-        applySyncConfig();
+        applySyncDirections();
     };
 
     const auto currentVar = getConfig().mainCfg.syncCfg.directionCfg.var;
@@ -2769,12 +2770,8 @@ void MainDialog::updateUnsavedCfgStatus()
     }
     else
     {
-        const std::wstring versionName = [&]
-        {
-            return L"FreeFileSync " + utfTo<std::wstring>(ffsVersion);
-        }();
-
-        title += versionName + SPACED_DASH + _("Folder Comparison and Synchronization");
+        title += L"FreeFileSync " + utfTo<std::wstring>(ffsVersion);
+        title += SPACED_DASH + _("Folder Comparison and Synchronization");
     }
 
     SetTitle(title);
@@ -3366,14 +3363,14 @@ void MainDialog::showConfigDialog(SyncConfigPanel panelToShow, int localPairInde
     globalPairCfg.syncCfg = currentCfg_.mainCfg.syncCfg;
     globalPairCfg.filter  = currentCfg_.mainCfg.globalFilter;
 
-    globalPairCfg.miscCfg.deviceParallelOps   = currentCfg_.mainCfg.deviceParallelOps;
-    globalPairCfg.miscCfg.ignoreErrors        = currentCfg_.mainCfg.ignoreErrors;
-    globalPairCfg.miscCfg.automaticRetryCount = currentCfg_.mainCfg.automaticRetryCount;
-    globalPairCfg.miscCfg.automaticRetryDelay = currentCfg_.mainCfg.automaticRetryDelay;
+    globalPairCfg.miscCfg.deviceParallelOps      = currentCfg_.mainCfg.deviceParallelOps;
+    globalPairCfg.miscCfg.ignoreErrors           = currentCfg_.mainCfg.ignoreErrors;
+    globalPairCfg.miscCfg.automaticRetryCount    = currentCfg_.mainCfg.automaticRetryCount;
+    globalPairCfg.miscCfg.automaticRetryDelay    = currentCfg_.mainCfg.automaticRetryDelay;
     globalPairCfg.miscCfg.altLogFolderPathPhrase = currentCfg_.mainCfg.altLogFolderPathPhrase;
-    globalPairCfg.miscCfg.postSyncCommand     = currentCfg_.mainCfg.postSyncCommand;
-    globalPairCfg.miscCfg.postSyncCondition   = currentCfg_.mainCfg.postSyncCondition;
-    globalPairCfg.miscCfg.commandHistory      = globalCfg_.gui.commandHistory;
+    globalPairCfg.miscCfg.postSyncCommand        = currentCfg_.mainCfg.postSyncCommand;
+    globalPairCfg.miscCfg.postSyncCondition      = currentCfg_.mainCfg.postSyncCondition;
+    globalPairCfg.miscCfg.commandHistory         = globalCfg_.gui.commandHistory;
 
     //don't recalculate value but consider current screen status!!!
     //e.g. it's possible that the first folder pair local config is shown with all config initial if user just removed local config via mouse context menu!
@@ -3409,14 +3406,14 @@ void MainDialog::showConfigDialog(SyncConfigPanel panelToShow, int localPairInde
     currentCfg_.mainCfg.syncCfg      = globalPairCfg.syncCfg;
     currentCfg_.mainCfg.globalFilter = globalPairCfg.filter;
 
-    currentCfg_.mainCfg.deviceParallelOps   = globalPairCfg.miscCfg.deviceParallelOps;
-    currentCfg_.mainCfg.ignoreErrors        = globalPairCfg.miscCfg.ignoreErrors;
-    currentCfg_.mainCfg.automaticRetryCount = globalPairCfg.miscCfg.automaticRetryCount;
-    currentCfg_.mainCfg.automaticRetryDelay = globalPairCfg.miscCfg.automaticRetryDelay;
+    currentCfg_.mainCfg.deviceParallelOps      = globalPairCfg.miscCfg.deviceParallelOps;
+    currentCfg_.mainCfg.ignoreErrors           = globalPairCfg.miscCfg.ignoreErrors;
+    currentCfg_.mainCfg.automaticRetryCount    = globalPairCfg.miscCfg.automaticRetryCount;
+    currentCfg_.mainCfg.automaticRetryDelay    = globalPairCfg.miscCfg.automaticRetryDelay;
     currentCfg_.mainCfg.altLogFolderPathPhrase = globalPairCfg.miscCfg.altLogFolderPathPhrase;
-    currentCfg_.mainCfg.postSyncCommand     = globalPairCfg.miscCfg.postSyncCommand;
-    currentCfg_.mainCfg.postSyncCondition   = globalPairCfg.miscCfg.postSyncCondition;
-    globalCfg_.gui.commandHistory           = globalPairCfg.miscCfg.commandHistory;
+    currentCfg_.mainCfg.postSyncCommand        = globalPairCfg.miscCfg.postSyncCommand;
+    currentCfg_.mainCfg.postSyncCondition      = globalPairCfg.miscCfg.postSyncCondition;
+    globalCfg_.gui.commandHistory              = globalPairCfg.miscCfg.commandHistory;
 
     firstFolderPair_->setValues(localCfgs[0]);
 
@@ -3433,10 +3430,12 @@ void MainDialog::showConfigDialog(SyncConfigPanel panelToShow, int localPairInde
         return false;
     }();
 
-    const bool syncConfigChanged = globalPairCfg.syncCfg != globalPairCfgOld.syncCfg || [&]
+    //[!] don't redetermine sync directions if only options for deletion handling or versioning are changed!!!
+    const bool syncDirectionsChanged = globalPairCfg.syncCfg.directionCfg != globalPairCfgOld.syncCfg.directionCfg || [&]
     {
         for (size_t i = 0; i < localCfgs.size(); ++i)
-            if (localCfgs[i].localSyncCfg != localPairCfgOld[i].localSyncCfg)
+            if (static_cast<bool>(localCfgs[i].localSyncCfg) != static_cast<bool>(localPairCfgOld[i].localSyncCfg) ||
+                (localCfgs[i].localSyncCfg && localCfgs[i].localSyncCfg->directionCfg != localPairCfgOld[i].localSyncCfg->directionCfg))
                 return true;
         return false;
     }();
@@ -3460,13 +3459,10 @@ void MainDialog::showConfigDialog(SyncConfigPanel panelToShow, int localPairInde
     //------------------------------------------------------------------------------------
 
     if (cmpConfigChanged)
-    {
-        const bool setDefaultViewType = globalPairCfg.cmpCfg.compareVar != globalPairCfgOld.cmpCfg.compareVar;
-        applyCompareConfig(setDefaultViewType);
-    }
+        applyCompareConfig(globalPairCfg.cmpCfg.compareVar != globalPairCfgOld.cmpCfg.compareVar /*setDefaultViewType*/);
 
-    if (syncConfigChanged)
-        applySyncConfig();
+    if (syncDirectionsChanged)
+        applySyncDirections();
 
     if (filterConfigChanged)
     {
@@ -3475,7 +3471,7 @@ void MainDialog::showConfigDialog(SyncConfigPanel panelToShow, int localPairInde
     }
 
     if (miscConfigChanged)
-        updateUnsavedCfgStatus(); //usually included by: updateGui();
+        updateUnsavedCfgStatus(); //usually included by updateGui();
 }
 
 
@@ -3892,11 +3888,12 @@ void MainDialog::OnStartSync(wxCommandEvent& event)
     const Zstring activeCfgFilePath = activeConfigFiles_.size() == 1 && !equalNativePath(activeConfigFiles_[0], lastRunConfigPath_) ? activeConfigFiles_[0] : Zstring();
     const std::chrono::system_clock::time_point syncStartTime = std::chrono::system_clock::now();
 
-    bool exitAfterSync = false;
+    using FinalRequest = StatusHandlerFloatingDialog::FinalRequest;
+    FinalRequest finalRequest = FinalRequest::none;
     {
         disableAllElements(false); //StatusHandlerFloatingDialog will internally process Window messages, so avoid unexpected callbacks!
         ZEN_ON_SCOPE_EXIT(enableAllElements());
-        //run this->enableAllElements() BEFORE "exitAfterSync" buf AFTER StatusHandlerFloatingDialog::reportFinalStatus()
+        //run this->enableAllElements() BEFORE "exitRequest" buf AFTER StatusHandlerFloatingDialog::reportFinalStatus()
 
         //class handling status updates and error messages
         StatusHandlerFloatingDialog statusHandler(this,
@@ -3965,11 +3962,28 @@ void MainDialog::OnStartSync(wxCommandEvent& event)
 
         updateGui();
 
-        exitAfterSync = r.exitAfterSync;
+        finalRequest = r.finalRequest;
     }
 
-    if (exitAfterSync) //don't use Close(): we don't want to show the prompt to save current config in OnClose()
-        Destroy();
+    //---------------------------------------------------------------------------
+    switch (finalRequest)
+    {
+        case FinalRequest::none:
+            break;
+        case FinalRequest::exit:
+            Destroy(); //don't use Close(): we don't want to show the prompt to save current config in OnClose()
+            break;
+        case FinalRequest::shutdown: //run *after* last sync stats were updated and saved! https://freefilesync.org/forum/viewtopic.php?t=5761
+            try
+            {
+                onQueryEndSession(); //(try to) save GlobalSettings.xml => don't block shutdown if failed!!!
+                shutdownSystem(); //throw FileError
+                terminateProcess(0 /*exitCode*/); //no point in continuing and saving cfg again in ~MainDialog()/onQueryEndSession() while the OS will kill us anytime!
+            }
+            catch (const FileError& e) { showNotificationDialog(this, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(e.toString())); }
+            //[!] ignores current error handling setting, BUT this is not a sync error!
+            break;
+    }
 }
 
 
@@ -4391,11 +4405,12 @@ void MainDialog::applyFilterConfig()
 }
 
 
-void MainDialog::applySyncConfig()
+void MainDialog::applySyncDirections()
 {
     try
     {
-        redetermineSyncDirection(getConfig().mainCfg, folderCmp_, nullptr /*notifyStatus*/); //throw FileError
+        const std::vector<DirectionConfig> directCfgs = extractDirectionCfg(getConfig().mainCfg);
+        redetermineSyncDirection(directCfgs, folderCmp_, nullptr /*notifyStatus*/); //throw FileError
     }
     catch (const FileError& e)
     {
@@ -4942,7 +4957,7 @@ void MainDialog::OnMenuExportFileList(wxCommandEvent& event)
         try
         {
             //write file
-            FileOutput fileOut(filePath, FileOutput::ACC_OVERWRITE, nullptr /*notifyUnbufferedIO*/); //throw FileError
+            FileOutput fileOut(FileOutput::ACC_OVERWRITE, filePath, nullptr /*notifyUnbufferedIO*/); //throw FileError
 
             fileOut.write(&*header.begin(), header.size()); //throw FileError, (X)
             //main grid: write rows one after the other instead of creating one big string: memory allocation might fail; think 1 million rows!
diff --git a/FreeFileSync/Source/ui/main_dlg.h b/FreeFileSync/Source/ui/main_dlg.h
index fb37e667..3a66974e 100755
--- a/FreeFileSync/Source/ui/main_dlg.h
+++ b/FreeFileSync/Source/ui/main_dlg.h
@@ -253,7 +253,7 @@ private:
     void onAddFolderPairKeyEvent(wxKeyEvent& event);
 
     void applyFilterConfig();
-    void applySyncConfig();
+    void applySyncDirections();
 
     void showFindPanel(); //CTRL + F
     void hideFindPanel();
diff --git a/FreeFileSync/Source/ui/small_dlgs.cpp b/FreeFileSync/Source/ui/small_dlgs.cpp
index f9c5f704..c37d88e2 100755
--- a/FreeFileSync/Source/ui/small_dlgs.cpp
+++ b/FreeFileSync/Source/ui/small_dlgs.cpp
@@ -5,6 +5,7 @@
 // *****************************************************************************
 
 #include "small_dlgs.h"
+#include <variant>
 #include <zen/time.h>
 #include <zen/format_unit.h>
 #include <zen/build_info.h>
@@ -21,6 +22,7 @@
 #include <wx+/font_size.h>
 #include <wx+/std_button_layout.h>
 #include <wx+/popup_dlg.h>
+#include <wx+/async_task.h>
 #include <wx+/image_resources.h>
 #include "gui_generated.h"
 #include "folder_selector.h"
diff --git a/FreeFileSync/Source/ui/sync_cfg.cpp b/FreeFileSync/Source/ui/sync_cfg.cpp
index 728c9bbe..d0876de2 100755
--- a/FreeFileSync/Source/ui/sync_cfg.cpp
+++ b/FreeFileSync/Source/ui/sync_cfg.cpp
@@ -415,6 +415,8 @@ commandHistItemsMax_(commandHistItemsMax)
     globalPairCfg_.syncCfg.versioningFolderPhrase = Zstr("dummy");             //set tentatively for sync dir height calculation below
     globalPairCfg_.syncCfg.versioningStyle  = VersioningStyle::TIMESTAMP_FILE; //
     globalPairCfg_.syncCfg.versionMaxAgeDays = 30;                             //
+    globalPairCfg_.miscCfg.altLogFolderPathPhrase = Zstr("dummy");             //
+
 
     selectFolderPairConfig(-1);
 
@@ -1262,7 +1264,7 @@ void ConfigDialog::updateMiscGui()
 
     fgSizerAutoRetry->Show(miscCfg.automaticRetryCount > 0);
 
-    bSizerCompMisc->Layout();
+    m_panelComparisonSettings->Layout(); //showing "retry count" can affect bSizerPerformance!
     //----------------------------------------------------------------------------
 
     m_bitmapLogFile->SetBitmap(m_checkBoxSaveLog->GetValue() ? getResourceImage(L"log_file_sicon") : greyScale(getResourceImage(L"log_file_sicon")));
diff --git a/FreeFileSync/Source/ui/version_check.cpp b/FreeFileSync/Source/ui/version_check.cpp
index d7d0926d..9ff430df 100755
--- a/FreeFileSync/Source/ui/version_check.cpp
+++ b/FreeFileSync/Source/ui/version_check.cpp
@@ -35,7 +35,7 @@ std::wstring getIso639Language()
     assert(runningMainThread()); //this function is not thread-safe, consider wxWidgets usage
 
     std::wstring localeName(wxLocale::GetLanguageCanonicalName(wxLocale::GetSystemLanguage()));
-    localeName = beforeFirst(localeName, L"@", IF_MISSING_RETURN_ALL); //the locale may contain an @ on Linux, e.g. "en_US@morestuff"
+    localeName = beforeFirst(localeName, L"@", IF_MISSING_RETURN_ALL); //the locale may contain an @, e.g. "sr_RS@latin"; see wxLocale::InitLanguagesDB()
 
     if (!localeName.empty())
     {
@@ -52,7 +52,7 @@ std::wstring getIso3166Country()
     assert(runningMainThread()); //this function is not thread-safe, consider wxWidgets usage
 
     std::wstring localeName(wxLocale::GetLanguageCanonicalName(wxLocale::GetSystemLanguage()));
-    localeName = beforeFirst(localeName, L"@", IF_MISSING_RETURN_ALL); //the locale may contain an @ on Linux, e.g. "en_US@morestuff"
+    localeName = beforeFirst(localeName, L"@", IF_MISSING_RETURN_ALL); //the locale may contain an @, e.g. "sr_RS@latin"; see wxLocale::InitLanguagesDB()
 
     if (contains(localeName, L"_"))
         return afterFirst(localeName, L"_", IF_MISSING_RETURN_NONE);
diff --git a/FreeFileSync/Source/version/version.h b/FreeFileSync/Source/version/version.h
index 9861b161..c5482d96 100755
--- a/FreeFileSync/Source/version/version.h
+++ b/FreeFileSync/Source/version/version.h
@@ -3,7 +3,7 @@
 
 namespace fff
 {
-const char ffsVersion[] = "10.7"; //internal linkage!
+const char ffsVersion[] = "10.8"; //internal linkage!
 const char FFS_VERSION_SEPARATOR = '.';
 }
 
diff --git a/wx+/bitmap_button.h b/wx+/bitmap_button.h
index dc7615c1..738a62ff 100755
--- a/wx+/bitmap_button.h
+++ b/wx+/bitmap_button.h
@@ -29,6 +29,7 @@ public:
         wxBitmapButton(parent, id, wxNullBitmap, pos, size, style | wxBU_AUTODRAW, validator, name) { SetLabel(label); }
 };
 
+//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));
 
 //set bitmap label flicker free:
@@ -54,12 +55,9 @@ void setBitmapTextLabel(wxBitmapButton& btn, const wxImage& img, const wxString&
 
     wxImage dynImage = createImageFromText(text, btn.GetFont(), btn.GetForegroundColour());
     if (img.IsOk())
-    {
-        if (btn.GetLayoutDirection() != wxLayout_RightToLeft)
-            dynImage = stackImages(img, dynImage, ImageStackLayout::HORIZONTAL, ImageStackAlignment::CENTER, gap);
-        else
-            dynImage = stackImages(dynImage, img, ImageStackLayout::HORIZONTAL, ImageStackAlignment::CENTER, gap);
-    }
+        dynImage = btn.GetLayoutDirection() != wxLayout_RightToLeft ?
+            stackImages(img, dynImage, ImageStackLayout::HORIZONTAL, ImageStackAlignment::CENTER, gap) :
+            stackImages(dynImage, img, ImageStackLayout::HORIZONTAL, ImageStackAlignment::CENTER, gap);
 
     //SetMinSize() instead of SetSize() is needed here for wxWindows layout determination to work corretly
     const int defaultHeight = wxButton::GetDefaultSize().GetHeight();
diff --git a/wx+/image_tools.h b/wx+/image_tools.h
index 06d7f0ba..bef4cb67 100755
--- a/wx+/image_tools.h
+++ b/wx+/image_tools.h
@@ -53,10 +53,14 @@ void convertToVanillaImage(wxImage& img); //add alpha channel if missing + remov
 //wxColor hsvColor(double h, double s, double v); //h within [0, 360), s, v within [0, 1]
 
 
-
-
-
-
+inline
+wxImage getTransparentPixel()
+{
+    wxImage dummyImage(1, 1);
+    dummyImage.SetAlpha();
+    ::memset(dummyImage.GetAlpha(), 1 /*opacity*/, 1 * 1); //suprise: can't use wxIMAGE_ALPHA_TRANSPARENT(0), painted black on Windows!
+    return dummyImage;
+}
 
 
 
diff --git a/xBRZ/src/xbrz_config.h b/xBRZ/src/xbrz_config.h
index fc036d17..fcfda99a 100755
--- a/xBRZ/src/xbrz_config.h
+++ b/xBRZ/src/xbrz_config.h
@@ -25,7 +25,7 @@ struct ScalerCfg
 {
     double luminanceWeight            = 1;
     double equalColorTolerance        = 30;
-	double centerDirectionBias        = 4;
+    double centerDirectionBias        = 4;
     double dominantDirectionThreshold = 3.6;
     double steepDirectionThreshold    = 2.2;
     double newTestAttribute           = 0; //unused; test new parameters
diff --git a/zen/file_access.cpp b/zen/file_access.cpp
index ea19b6c7..d257b7c2 100755
--- a/zen/file_access.cpp
+++ b/zen/file_access.cpp
@@ -170,16 +170,6 @@ namespace
 }
 
 
-uint64_t zen::getFileSize(const Zstring& filePath) //throw FileError
-{
-    struct ::stat fileInfo = {};
-    if (::stat(filePath.c_str(), &fileInfo) != 0)
-        THROW_LAST_FILE_ERROR(replaceCpy(_("Cannot read file attributes of %x."), L"%x", fmtPath(filePath)), L"stat");
-
-    return fileInfo.st_size;
-}
-
-
 uint64_t zen::getFreeDiskSpace(const Zstring& path) //throw FileError, returns 0 if not available
 {
     struct ::statfs info = {};
@@ -190,13 +180,19 @@ uint64_t zen::getFreeDiskSpace(const Zstring& path) //throw FileError, returns 0
 }
 
 
-FileId /*optional*/ zen::getFileId(const Zstring& itemPath) //throw FileError
+FileDetails zen::getFileDetails(const Zstring& itemPath) //throw FileError
 {
     struct ::stat fileInfo = {};
     if (::stat(itemPath.c_str(), &fileInfo) != 0)
         THROW_LAST_FILE_ERROR(replaceCpy(_("Cannot read file attributes of %x."), L"%x", fmtPath(itemPath)), L"stat");
 
-    return extractFileId(fileInfo);
+    return
+    {
+        makeUnsigned(fileInfo.st_size),
+        fileInfo.st_mtime,
+        fileInfo.st_dev,        
+	//FileIndex fileIndex = fileInfo.st_ino;
+    };
 }
 
 
@@ -301,19 +297,14 @@ namespace
 
 /* Usage overview: (avoid circular pattern!)
 
-  renameFile()  -->  renameFile_sub()
-      |               /|\
-     \|/               |
-      Fix8Dot3NameClash()
+  moveAndRenameItem()  -->  moveAndRenameFileSub()
+      |                              /|\
+     \|/                              |
+             Fix8Dot3NameClash()
 */
 //wrapper for file system rename function:
-void renameFile_sub(const Zstring& pathSource, const Zstring& pathTarget) //throw FileError, ErrorDifferentVolume, ErrorTargetExisting
+void moveAndRenameFileSub(const Zstring& pathSource, const Zstring& pathTarget, bool replaceExisting) //throw FileError, ErrorDifferentVolume, ErrorTargetExisting
 {
-    //rename() will never fail with EEXIST, but always (atomically) overwrite!
-    //=> equivalent to SetFileInformationByHandle() + FILE_RENAME_INFO::ReplaceIfExists or ::MoveFileEx + MOVEFILE_REPLACE_EXISTING
-    //Linux: renameat2() with RENAME_NOREPLACE -> still new, probably buggy
-    //macOS: no solution
-
     auto throwException = [&](int ec)
     {
         const std::wstring errorMsg = replaceCpy(replaceCpy(_("Cannot move file %x to %y."), L"%x", L"\n" + fmtPath(pathSource)), L"%y", L"\n" + fmtPath(pathTarget));
@@ -326,19 +317,27 @@ void renameFile_sub(const Zstring& pathSource, const Zstring& pathTarget) //thro
         throw FileError(errorMsg, errorDescr);
     };
 
-    struct ::stat infoSrc = {};
-    if (::lstat(pathSource.c_str(), &infoSrc) != 0)
-        THROW_LAST_FILE_ERROR(replaceCpy(_("Cannot read file attributes of %x."), L"%x", fmtPath(pathSource)), L"stat");
+    //rename() will never fail with EEXIST, but always (atomically) overwrite!
+    //=> equivalent to SetFileInformationByHandle() + FILE_RENAME_INFO::ReplaceIfExists or ::MoveFileEx() + MOVEFILE_REPLACE_EXISTING
+    //Linux: renameat2() with RENAME_NOREPLACE -> still new, probably buggy
+    //macOS: no solution https://developer.apple.com/legacy/library/documentation/Darwin/Reference/ManPages/man2/rename.2.html
+    if (!replaceExisting)
+    {
+        struct ::stat infoSrc = {};
+        if (::lstat(pathSource.c_str(), &infoSrc) != 0)
+            THROW_LAST_FILE_ERROR(replaceCpy(_("Cannot read file attributes of %x."), L"%x", fmtPath(pathSource)), L"stat");
 
-	struct ::stat infoTrg = {};
-    if (::lstat(pathTarget.c_str(), &infoTrg) == 0)
-	{
-		if (infoSrc.st_dev != infoTrg.st_dev ||
-		    infoSrc.st_ino != infoTrg.st_ino)
-			throwException(EEXIST); //that's what we're really here for
-		//else: continue with a rename in case
-	}
-	//else: not existing or access error (hopefully ::rename will also fail!)
+        struct ::stat infoTrg = {};
+        if (::lstat(pathTarget.c_str(), &infoTrg) == 0)
+        {
+            if (infoSrc.st_dev != infoTrg.st_dev ||
+                infoSrc.st_ino != infoTrg.st_ino)
+                throwException(EEXIST); //that's what we're really here for
+            //else: continue with a rename in case
+			//caveat: if we have a hardlink referenced by two different paths, the source one will be unlinked => fine, but not exactly a "rename"...
+        }
+        //else: not existing or access error (hopefully ::rename will also fail!)
+    }
 
     if (::rename(pathSource.c_str(), pathTarget.c_str()) != 0)
         throwException(errno);
@@ -349,11 +348,11 @@ void renameFile_sub(const Zstring& pathSource, const Zstring& pathTarget) //thro
 
 
 //rename file: no copying!!!
-void zen::renameFile(const Zstring& pathSource, const Zstring& pathTarget) //throw FileError, ErrorDifferentVolume, ErrorTargetExisting
+void zen::moveAndRenameItem(const Zstring& pathSource, const Zstring& pathTarget, bool replaceExisting) //throw FileError, ErrorDifferentVolume, ErrorTargetExisting
 {
     try
     {
-        renameFile_sub(pathSource, pathTarget); //throw FileError, ErrorDifferentVolume, ErrorTargetExisting
+        moveAndRenameFileSub(pathSource, pathTarget, replaceExisting); //throw FileError, ErrorDifferentVolume, ErrorTargetExisting
     }
     catch (ErrorTargetExisting&)
     {
@@ -369,9 +368,9 @@ void zen::renameFile(const Zstring& pathSource, const Zstring& pathTarget) //thr
                 return; //non-sensical request
 
             const Zstring tempFilePath = getTemporaryPath8Dot3(pathSource); //throw FileError
-            renameFile_sub(pathSource, tempFilePath); //throw FileError, ErrorDifferentVolume, ErrorTargetExisting
-            ZEN_ON_SCOPE_FAIL(renameFile_sub(tempFilePath, pathSource)); //"try" our best to be "atomic" :>
-            renameFile_sub(tempFilePath, pathTarget); //throw FileError, ErrorDifferentVolume, ErrorTargetExisting
+            moveAndRenameFileSub(pathSource, tempFilePath); //throw FileError, ErrorDifferentVolume, ErrorTargetExisting
+            ZEN_ON_SCOPE_FAIL(moveAndRenameFileSub(tempFilePath, pathSource)); //"try" our best to be "atomic" :>
+            moveAndRenameFileSub(tempFilePath, pathTarget); //throw FileError, ErrorDifferentVolume, ErrorTargetExisting
             return;
         }
 #endif
@@ -398,7 +397,7 @@ void setWriteTimeNative(const Zstring& itemPath, const struct ::timespec& modTim
     struct ::timespec newTimes[2] = {};
     newTimes[0].tv_sec = ::time(nullptr); //access time; using UTIME_OMIT for tv_nsec would trigger even more bugs: https://freefilesync.org/forum/viewtopic.php?t=1701
     newTimes[1] = modTime; //modification time
-	//test: even modTime == 0 is correctly applied (no NOOP!) test2: same behavior for "utime()"
+    //test: even modTime == 0 is correctly applied (no NOOP!) test2: same behavior for "utime()"
 
     if (procSl == ProcSymlink::FOLLOW)
     {
@@ -680,8 +679,8 @@ FileCopyResult copyFileOsSpecific(const Zstring& sourceFile, //throw FileError,
     FileCopyResult result;
     result.fileSize = sourceInfo.st_size;
     result.modTime = sourceInfo.st_mtim.tv_sec; //
-    result.sourceFileId = extractFileId(sourceInfo);
-    result.targetFileId = extractFileId(targetInfo);
+    result.sourceFileId = generateFileId(sourceInfo);
+    result.targetFileId = generateFileId(targetInfo);
     result.errorModTime = errorModTime;
     return result;
 }
@@ -700,10 +699,10 @@ copyFileWindowsDefault(::CopyFileEx)  copyFileWindowsStream(::BackupRead/::Backu
 }
 
 
-FileCopyResult zen::copyNewFile(const Zstring& sourceFile, const Zstring& targetFile, bool copyFilePermissions, //throw FileError, ErrorTargetExisting, ErrorFileLocked
-                                const IOCallback& notifyUnbufferedIO)
+FileCopyResult zen::copyNewFile(const Zstring& sourceFile, const Zstring& targetFile, bool copyFilePermissions, //throw FileError, ErrorTargetExisting, ErrorFileLocked, X
+                                const IOCallback& notifyUnbufferedIO /*throw X*/)
 {
-    const FileCopyResult result = copyFileOsSpecific(sourceFile, targetFile, notifyUnbufferedIO); //throw FileError, ErrorTargetExisting, ErrorFileLocked
+    const FileCopyResult result = copyFileOsSpecific(sourceFile, targetFile, notifyUnbufferedIO); //throw FileError, ErrorTargetExisting, ErrorFileLocked, X
 
     //at this point we know we created a new file, so it's fine to delete it for cleanup!
     ZEN_ON_SCOPE_FAIL(try { removeFilePlain(targetFile); }
diff --git a/zen/file_access.h b/zen/file_access.h
index 514d798e..d981dcc3 100755
--- a/zen/file_access.h
+++ b/zen/file_access.h
@@ -52,10 +52,17 @@ enum class ProcSymlink
 };
 void setFileTime(const Zstring& filePath, time_t modTime, ProcSymlink procSl); //throw FileError
 
-//symlink handling: always evaluate target
-uint64_t getFileSize(const Zstring& filePath); //throw FileError
+//symlink handling: always follow
 uint64_t getFreeDiskSpace(const Zstring& path); //throw FileError, returns 0 if not available
-FileId /*optional*/ getFileId(const Zstring& itemPath); //throw FileError
+
+struct FileDetails
+{
+    uint64_t  fileSize  = 0;
+    time_t    modTime   = 0; //number of seconds since Jan. 1st 1970 UTC
+    VolumeId  volumeId  = 0;
+};
+//symlink handling: always follow
+FileDetails getFileDetails(const Zstring& itemPath); //throw FileError
 
 //get per-user directory designated for temporary files:
 Zstring getTempFolderPath(); //throw FileError
@@ -65,8 +72,7 @@ void removeSymlinkPlain  (const Zstring& linkPath);         //throw FileError; E
 void removeDirectoryPlain(const Zstring& dirPath );         //throw FileError; ERROR if not existing
 void removeDirectoryPlainRecursion(const Zstring& dirPath); //throw FileError; ERROR if not existing
 
-//rename file or directory: no copying!!!
-void renameFile(const Zstring& itemPathOld, const Zstring& itemPathNew); //throw FileError, ErrorDifferentVolume, ErrorTargetExisting
+void moveAndRenameItem(const Zstring& itemPathOld, const Zstring& itemPathNew, bool replaceExisting); //throw FileError, ErrorDifferentVolume, ErrorTargetExisting
 
 bool supportsPermissions(const Zstring& dirPath); //throw FileError, follows symlinks
 //copy permissions for files, directories or symbolic links: requires admin rights
@@ -94,9 +100,9 @@ struct FileCopyResult
     std::optional<FileError> errorModTime; //failure to set modification time
 };
 
-FileCopyResult copyNewFile(const Zstring& sourceFile, const Zstring& targetFile, bool copyFilePermissions, //throw FileError, ErrorTargetExisting, ErrorFileLocked
+FileCopyResult copyNewFile(const Zstring& sourceFile, const Zstring& targetFile, bool copyFilePermissions, //throw FileError, ErrorTargetExisting, ErrorFileLocked, X
                            //accummulated delta != file size! consider ADS, sparse, compressed files
-                           const IOCallback& notifyUnbufferedIO); //may be nullptr; throw X!
+                           const IOCallback& notifyUnbufferedIO /*throw X*/); 
 }
 
 #endif //FILE_ACCESS_H_8017341345614857
diff --git a/zen/file_id_def.h b/zen/file_id_def.h
index f58cb479..55ee77f5 100755
--- a/zen/file_id_def.h
+++ b/zen/file_id_def.h
@@ -21,7 +21,14 @@ using FileIndex = decltype(impl::StatDummy::st_ino);
 struct FileId //always available on Linux, and *generally* available on Windows)
 {
     FileId() {}
-    FileId(VolumeId volId, FileIndex fIdx) : volumeId(volId), fileIndex(fIdx) {}
+    FileId(VolumeId volId, FileIndex fIdx) : volumeId(volId), fileIndex(fIdx)
+    {
+        if (volId == 0 || fIdx == 0)
+        {
+            volumeId  = 0;
+            fileIndex = 0;
+        }
+    }
     VolumeId  volumeId  = 0;
     FileIndex fileIndex = 0;
 };
@@ -29,10 +36,9 @@ inline bool operator==(const FileId& lhs, const FileId& rhs) { return lhs.volume
 
 
 inline
-FileId extractFileId(const struct ::stat& fileInfo)
+FileId generateFileId(const struct ::stat& fileInfo)
 {
-    return fileInfo.st_dev != 0 && fileInfo.st_ino != 0 ?
-           FileId(fileInfo.st_dev, fileInfo.st_ino) : FileId();
+    return FileId(fileInfo.st_dev, fileInfo.st_ino);
 }
 }
 
diff --git a/zen/file_io.cpp b/zen/file_io.cpp
index 80fb3153..1c6ab6f2 100755
--- a/zen/file_io.cpp
+++ b/zen/file_io.cpp
@@ -128,7 +128,7 @@ size_t FileInput::tryRead(void* buffer, size_t bytesToRead) //throw FileError, E
     return bytesRead; //"zero indicates end of file"
 }
 
- 
+
 size_t FileInput::read(void* buffer, size_t bytesToRead) //throw FileError, ErrorFileLocked, X; return "bytesToRead" bytes unless end of stream!
 {
     /*
@@ -203,7 +203,7 @@ FileOutput::FileOutput(FileHandle handle, const Zstring& filePath, const IOCallb
     FileBase(handle, filePath), notifyUnbufferedIO_(notifyUnbufferedIO) {}
 
 
-FileOutput::FileOutput(const Zstring& filePath, AccessFlag access, const IOCallback& notifyUnbufferedIO) :
+FileOutput::FileOutput(AccessFlag access, const Zstring& filePath, const IOCallback& notifyUnbufferedIO) :
     FileBase(openHandleForWrite(filePath, access), filePath), notifyUnbufferedIO_(notifyUnbufferedIO) {} //throw FileError, ErrorTargetExisting
 
 
diff --git a/zen/file_io.h b/zen/file_io.h
index d05d97db..bf23d22c 100755
--- a/zen/file_io.h
+++ b/zen/file_io.h
@@ -56,8 +56,8 @@ private:
 class FileInput : public FileBase
 {
 public:
-    FileInput(const Zstring& filePath, const IOCallback& notifyUnbufferedIO); //throw FileError, ErrorFileLocked
-    FileInput(FileHandle handle, const Zstring& filePath, const IOCallback& notifyUnbufferedIO); //takes ownership!
+    FileInput(                   const Zstring& filePath, const IOCallback& notifyUnbufferedIO /*throw X*/); //throw FileError, ErrorFileLocked
+    FileInput(FileHandle handle, const Zstring& filePath, const IOCallback& notifyUnbufferedIO /*throw X*/); //takes ownership!
 
     size_t read(void* buffer, size_t bytesToRead); //throw FileError, ErrorFileLocked, X; return "bytesToRead" bytes unless end of stream!
 
@@ -80,8 +80,8 @@ public:
         ACC_OVERWRITE,
         ACC_CREATE_NEW
     };
-    FileOutput(const Zstring& filePath, AccessFlag access, const IOCallback& notifyUnbufferedIO); //throw FileError, ErrorTargetExisting
-    FileOutput(FileHandle handle, const Zstring& filePath, const IOCallback& notifyUnbufferedIO); //takes ownership!
+    FileOutput(AccessFlag access, const Zstring& filePath, const IOCallback& notifyUnbufferedIO /*throw X*/); //throw FileError, ErrorTargetExisting
+    FileOutput(FileHandle handle, const Zstring& filePath, const IOCallback& notifyUnbufferedIO /*throw X*/); //takes ownership!
     ~FileOutput();
 
     void preAllocateSpaceBestEffort(uint64_t expectedSize); //throw FileError
@@ -105,8 +105,7 @@ private:
 //native stream I/O convenience functions:
 
 template <class BinContainer> inline
-BinContainer loadBinContainer(const Zstring& filePath, //throw FileError
-                              const IOCallback& notifyUnbufferedIO)
+BinContainer loadBinContainer(const Zstring& filePath, const IOCallback& notifyUnbufferedIO /*throw X*/) //throw FileError, X
 {
     FileInput streamIn(filePath, notifyUnbufferedIO); //throw FileError, ErrorFileLocked
     return bufferedLoad<BinContainer>(streamIn); //throw FileError, X;
@@ -114,10 +113,9 @@ BinContainer loadBinContainer(const Zstring& filePath, //throw FileError
 
 
 template <class BinContainer> inline
-void saveBinContainer(const Zstring& filePath, const BinContainer& buffer, //throw FileError
-                      const IOCallback& notifyUnbufferedIO)
+void saveBinContainer(const Zstring& filePath, const BinContainer& buffer, const IOCallback& notifyUnbufferedIO /*throw X*/) //throw FileError, X
 {
-    FileOutput fileOut(filePath, FileOutput::ACC_OVERWRITE, notifyUnbufferedIO); //throw FileError, (ErrorTargetExisting)
+    FileOutput fileOut(FileOutput::ACC_OVERWRITE, filePath, notifyUnbufferedIO); //throw FileError, (ErrorTargetExisting)
     if (!buffer.empty())
     {
         /*snake oil?*/ fileOut.preAllocateSpaceBestEffort(buffer.size()); //throw FileError
diff --git a/zen/format_unit.h b/zen/format_unit.h
index 3686f39c..de5a0811 100755
--- a/zen/format_unit.h
+++ b/zen/format_unit.h
@@ -24,7 +24,6 @@ std::wstring formatThreeDigitPrecision(double value); //(unless value is too lar
 
 std::wstring formatNumber(int64_t n); //format integer number including thousands separator
 
-
 }
 
 #endif
diff --git a/zen/legacy_compiler.h b/zen/legacy_compiler.h
index bebf5a05..54605945 100755
--- a/zen/legacy_compiler.h
+++ b/zen/legacy_compiler.h
@@ -27,10 +27,10 @@ public:
 
     template <class Container>
     span(Container& cont) : span(cont.begin(), cont.end()) {}
-    
+
     using iterator        = T*;
     using const_iterator  = const T*;
-       
+
     iterator begin() { return data_; }
     iterator end  () { return data_ + size_; }
 
diff --git a/zen/shutdown.cpp b/zen/shutdown.cpp
index 1794e4a8..a25e9c64 100755
--- a/zen/shutdown.cpp
+++ b/zen/shutdown.cpp
@@ -18,8 +18,7 @@ void zen::shutdownSystem() //throw FileError
     //https://linux.die.net/man/2/reboot => needs admin rights!
 
     //"systemctl" should work without admin rights:
-    shellExecute("sleep 1; systemctl poweroff", ExecutionType::ASYNC); //throw FileError
-    //sleep 1: give FFS some time to properly shut down!
+    shellExecute("systemctl poweroff", ExecutionType::SYNC); //throw FileError
 
 }
 
@@ -27,10 +26,20 @@ void zen::shutdownSystem() //throw FileError
 void zen::suspendSystem() //throw FileError
 {
     //"systemctl" should work without admin rights:
-    shellExecute("systemctl suspend", ExecutionType::ASYNC); //throw FileError
+    shellExecute("systemctl suspend", ExecutionType::SYNC); //throw FileError
 
 }
 
+
+void zen::terminateProcess(int exitCode)
+{
+    std::exit(exitCode); //[[noreturn]]; "Stack is not unwound: destructors of variables with automatic storage duration are not called." => perfect
+    //don't use std::abort() => crashes process with "EXC_CRASH (SIGABRT)" on macOS
+    for (;;) //why still here?? => crash deliberately!
+        *reinterpret_cast<volatile int*>(0) = 0; //crude but at least we'll get crash dumps if it happens
+}
+
+
 /*
 Command line alternatives:
 
diff --git a/zen/shutdown.h b/zen/shutdown.h
index df2314f8..2d66d1e8 100755
--- a/zen/shutdown.h
+++ b/zen/shutdown.h
@@ -14,6 +14,7 @@ namespace zen
 {
 void shutdownSystem(); //throw FileError
 void suspendSystem();  //
+void terminateProcess(int exitCode); //will NOT return!
 }
 
 #endif //SHUTDOWN_H_3423847870238407783265
diff --git a/zen/stl_tools.h b/zen/stl_tools.h
index d8bda888..f1ab7c16 100755
--- a/zen/stl_tools.h
+++ b/zen/stl_tools.h
@@ -57,7 +57,15 @@ BidirectionalIterator findLast(BidirectionalIterator first, BidirectionalIterato
 //replacement for std::find_end taking advantage of bidirectional iterators (and giving the algorithm a reasonable name)
 template <class BidirectionalIterator1, class BidirectionalIterator2>
 BidirectionalIterator1 searchLast(BidirectionalIterator1 first1, BidirectionalIterator1 last1,
-                                   BidirectionalIterator2 first2, BidirectionalIterator2 last2);
+                                  BidirectionalIterator2 first2, BidirectionalIterator2 last2);
+
+
+//read-only variant of std::merge; input: two sorted ranges
+template <class Iterator, class FunctionLeftOnly, class FunctionBoth, class FunctionRightOnly>
+void mergeTraversal(Iterator first1, Iterator last1,
+                    Iterator first2, Iterator last2,
+                    FunctionLeftOnly lo, FunctionBoth bo, FunctionRightOnly ro);
+
 
 template <class Num, class ByteIterator> Num hashBytes                   (ByteIterator first, ByteIterator last);
 template <class Num, class ByteIterator> Num hashBytesAppend(Num hashVal, ByteIterator first, ByteIterator last);
@@ -109,11 +117,13 @@ private:
 };
 
 template <class T, class... Args> inline
-SharedRef<T> makeSharedRef(Args&&... args) { return SharedRef<T>(std::make_shared<T>(std::forward<Args>(args)...)); }
+SharedRef<T> makeSharedRef(Args&& ... args) { return SharedRef<T>(std::make_shared<T>(std::forward<Args>(args)...)); }
 //===========================================================================
 
 
 
+
+
 //######################## implementation ########################
 
 template <class T, class Alloc, class Predicate> inline
@@ -208,7 +218,7 @@ BidirectionalIterator findLast(const BidirectionalIterator first, const Bidirect
 
 template <class BidirectionalIterator1, class BidirectionalIterator2> inline
 BidirectionalIterator1 searchLast(const BidirectionalIterator1 first1,       BidirectionalIterator1 last1,
-                                   const BidirectionalIterator2 first2, const BidirectionalIterator2 last2)
+                                  const BidirectionalIterator2 first2, const BidirectionalIterator2 last2)
 {
     const BidirectionalIterator1 itNotFound = last1;
 
@@ -233,6 +243,46 @@ BidirectionalIterator1 searchLast(const BidirectionalIterator1 first1,       Bid
 }
 
 
+//read-only variant of std::merge; input: two sorted ranges
+template <class Iterator, class FunctionLeftOnly, class FunctionBoth, class FunctionRightOnly> inline
+void mergeTraversal(Iterator first1, Iterator last1,
+                    Iterator first2, Iterator last2,
+                    FunctionLeftOnly lo, FunctionBoth bo, FunctionRightOnly ro)
+{
+    auto itL = first1;
+    auto itR = first2;
+
+    auto finishLeft  = [&] { std::for_each(itL, last1, lo); };
+    auto finishRight = [&] { std::for_each(itR, last2, ro); };
+
+    if (itL == last1) return finishRight();
+    if (itR == last2) return finishLeft ();
+
+    for (;;)
+        if (itL->first < itR->first)
+        {
+            lo(*itL);
+            if (++itL == last1)
+                return finishRight();
+        }
+        else if (itR->first < itL->first)
+        {
+            ro(*itR);
+            if (++itR == last2)
+                return finishLeft();
+        }
+        else
+        {
+            bo(*itL, *itR);
+            ++itL; //
+            ++itR; //increment BOTH before checking for end of range!
+            if (itL == last1) return finishRight();
+            if (itR == last2) return finishLeft ();
+            //simplify loop by placing both EOB checks at the beginning? => slightly slower
+        }
+}
+
+
 //FNV-1a: http://en.wikipedia.org/wiki/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function
 template <class Num, class ByteIterator> inline
 Num hashBytes(ByteIterator first, ByteIterator last)
diff --git a/zen/string_base.h b/zen/string_base.h
index 91a6d5bd..2247f93a 100755
--- a/zen/string_base.h
+++ b/zen/string_base.h
@@ -423,7 +423,7 @@ size_t Zbase<Char, SP>::rfind(const Char* str, size_t pos) const
     const size_t len = length();
     const Char* currEnd = begin() + (pos == npos ? len : std::min(pos + strLen, len));
     const Char* it = searchLast(begin(), currEnd,
-                                 str, str + strLen);
+                                str, str + strLen);
     return it == currEnd ? npos : it - begin();
 }
 
diff --git a/zen/string_tools.h b/zen/string_tools.h
index 8579a460..c3970d05 100755
--- a/zen/string_tools.h
+++ b/zen/string_tools.h
@@ -300,7 +300,7 @@ S afterLast(const S& str, const T& term, FailureReturnVal rv)
     const auto* const termFirst = strBegin(term);
 
     const auto* it = searchLast(strFirst, strLast,
-                                 termFirst, termFirst + termLen);
+                                termFirst, termFirst + termLen);
     if (it == strLast)
         return rv == IF_MISSING_RETURN_ALL ? str : S();
 
@@ -321,7 +321,7 @@ S beforeLast(const S& str, const T& term, FailureReturnVal rv)
     const auto* const termFirst = strBegin(term);
 
     const auto* it = searchLast(strFirst, strLast,
-                                 termFirst, termFirst + termLen);
+                                termFirst, termFirst + termLen);
     if (it == strLast)
         return rv == IF_MISSING_RETURN_ALL ? str : S();
 
diff --git a/zen/thread.h b/zen/thread.h
index 8a9adc87..5e298ba1 100755
--- a/zen/thread.h
+++ b/zen/thread.h
@@ -119,7 +119,7 @@ class Protected
 public:
     Protected() {}
     Protected(T& value) : value_(value) {}
-    //Protected(      T&& tmp ) : value_(std::move(tmp)) {} <- wait until needed
+    //Protected(T&& tmp ) : value_(std::move(tmp)) {} <- wait until needed
 
     template <class Function>
     auto access(Function fun) //-> decltype(fun(std::declval<T&>()))
diff --git a/zen/zlib_wrap.cpp b/zen/zlib_wrap.cpp
new file mode 100755
index 00000000..fbbe2f09
--- /dev/null
+++ b/zen/zlib_wrap.cpp
@@ -0,0 +1,53 @@
+// *****************************************************************************
+// * This file is part of the FreeFileSync project. It is distributed under    *
+// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0          *
+// * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved *
+// *****************************************************************************
+
+#include "zlib_wrap.h"
+//Windows:     use the SAME zlib version that wxWidgets is linking against! //C:\Data\Projects\wxWidgets\Source\src\zlib\zlib.h
+//Linux/macOS: use zlib system header for both wxWidgets and Curl (zlib is required for HTTP)
+//             => don't compile wxWidgets with: --with-zlib=builtin
+#include <zlib.h>
+
+using namespace zen;
+
+
+size_t zen::impl::zlib_compressBound(size_t len)
+{
+    return ::compressBound(static_cast<uLong>(len)); //upper limit for buffer size, larger than input size!!!
+}
+
+
+size_t zen::impl::zlib_compress(const void* src, size_t srcLen, void* trg, size_t trgLen, int level) //throw ZlibInternalError
+{
+    uLongf bufferSize = static_cast<uLong>(trgLen);
+    const int rv = ::compress2(static_cast<Bytef*>(trg),       //Bytef* dest,
+                               &bufferSize,                    //uLongf* destLen,
+                               static_cast<const Bytef*>(src), //const Bytef* source,
+                               static_cast<uLong>(srcLen),     //uLong sourceLen,
+                               level);                         //int level
+    // Z_OK: success
+    // Z_MEM_ERROR: not enough memory
+    // Z_BUF_ERROR: not enough room in the output buffer
+    if (rv != Z_OK || bufferSize > trgLen)
+        throw ZlibInternalError();
+    return bufferSize;
+}
+
+
+size_t zen::impl::zlib_decompress(const void* src, size_t srcLen, void* trg, size_t trgLen) //throw ZlibInternalError
+{
+    uLongf bufferSize = static_cast<uLong>(trgLen);
+    const int rv = ::uncompress(static_cast<Bytef*>(trg),       //Bytef* dest,
+                                &bufferSize,                    //uLongf* destLen,
+                                static_cast<const Bytef*>(src), //const Bytef* source,
+                                static_cast<uLong>(srcLen));    //uLong sourceLen
+    // Z_OK: success
+    // Z_MEM_ERROR: not enough memory
+    // Z_BUF_ERROR: not enough room in the output buffer
+    // Z_DATA_ERROR: input data was corrupted or incomplete
+    if (rv != Z_OK || bufferSize > trgLen)
+        throw ZlibInternalError();
+    return bufferSize;
+}
diff --git a/zen/zlib_wrap.h b/zen/zlib_wrap.h
new file mode 100755
index 00000000..b92a8eba
--- /dev/null
+++ b/zen/zlib_wrap.h
@@ -0,0 +1,114 @@
+// *****************************************************************************
+// * This file is part of the FreeFileSync project. It is distributed under    *
+// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0          *
+// * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved *
+// *****************************************************************************
+
+#ifndef ZLIB_WRAP_H_428597064566
+#define ZLIB_WRAP_H_428597064566
+
+#include "serialize.h"
+
+
+namespace zen
+{
+class ZlibInternalError {};
+
+// compression level must be between 0 and 9:
+// 0: no compression
+// 9: best compression
+template <class BinContainer> //as specified in serialize.h
+BinContainer compress(const BinContainer& stream, int level); //throw ZlibInternalError
+//caveat: output stream is physically larger than input! => strip additional reserved space if needed: "BinContainer(output.begin(), output.end())"
+
+template <class BinContainer>
+BinContainer decompress(const BinContainer& stream);          //throw ZlibInternalError
+
+
+
+
+
+
+
+
+
+
+
+//######################## implementation ##########################
+namespace impl
+{
+size_t zlib_compressBound(size_t len);
+size_t zlib_compress  (const void* src, size_t srcLen, void* trg, size_t trgLen, int level); //throw ZlibInternalError
+size_t zlib_decompress(const void* src, size_t srcLen, void* trg, size_t trgLen);            //throw ZlibInternalError
+}
+
+
+template <class BinContainer>
+BinContainer compress(const BinContainer& stream, int level) //throw ZlibInternalError
+{
+    BinContainer contOut;
+    if (!stream.empty()) //don't dereference iterator into empty container!
+    {
+        //save uncompressed stream size for decompression
+        const uint64_t uncompressedSize = stream.size(); //use portable number type!
+        contOut.resize(sizeof(uncompressedSize));
+        std::copy(reinterpret_cast<const std::byte*>(&uncompressedSize),
+                  reinterpret_cast<const std::byte*>(&uncompressedSize) + sizeof(uncompressedSize),
+                  &*contOut.begin());
+
+        const size_t bufferEstimate = impl::zlib_compressBound(stream.size()); //upper limit for buffer size, larger than input size!!!
+
+        contOut.resize(contOut.size() + bufferEstimate);
+
+        const size_t bytesWritten = impl::zlib_compress(&*stream.begin(),
+                                                        stream.size(),
+                                                        &*contOut.begin() + contOut.size() - bufferEstimate,
+                                                        bufferEstimate,
+                                                        level); //throw ZlibInternalError
+        if (bytesWritten < bufferEstimate)
+            contOut.resize(contOut.size() - (bufferEstimate - bytesWritten)); //caveat: unsigned arithmetics
+        //caveat: physical memory consumption still *unchanged*!
+    }
+    return contOut;
+}
+
+
+template <class BinContainer>
+BinContainer decompress(const BinContainer& stream) //throw ZlibInternalError
+{
+    BinContainer contOut;
+    if (!stream.empty()) //don't dereference iterator into empty container!
+    {
+        //retrieve size of uncompressed data
+        uint64_t uncompressedSize = 0; //use portable number type!
+        if (stream.size() < sizeof(uncompressedSize))
+            throw ZlibInternalError();
+        std::copy(&*stream.begin(),
+                  &*stream.begin() + sizeof(uncompressedSize),
+                  reinterpret_cast<std::byte*>(&uncompressedSize));
+        //attention: contOut MUST NOT be empty! Else it will pass a nullptr to zlib_decompress() => Z_STREAM_ERROR although "uncompressedSize == 0"!!!
+        //secondary bug: don't dereference iterator into empty container!
+        if (uncompressedSize == 0) //cannot be 0: compress() directly maps empty -> empty container skipping zlib!
+            throw ZlibInternalError();
+
+        try
+        {
+            contOut.resize(static_cast<size_t>(uncompressedSize)); //throw std::bad_alloc
+        }
+        catch (std::bad_alloc&) //most likely due to data corruption!
+        {
+            throw ZlibInternalError();
+        }
+
+        const size_t bytesWritten = impl::zlib_decompress(&*stream.begin() + sizeof(uncompressedSize),
+                                                          stream.size() - sizeof(uncompressedSize),
+                                                          &*contOut.begin(),
+                                                          static_cast<size_t>(uncompressedSize)); //throw ZlibInternalError
+        if (bytesWritten != static_cast<size_t>(uncompressedSize))
+            throw ZlibInternalError();
+    }
+    return contOut;
+}
+}
+
+#endif //ZLIB_WRAP_H_428597064566
diff --git a/zen/zstring.h b/zen/zstring.h
index a511e4e0..6727253b 100755
--- a/zen/zstring.h
+++ b/zen/zstring.h
@@ -32,9 +32,9 @@ Zstring makeUpperCopy(const Zstring& str);
 //Windows, Linux: precomposed
 //macOS: decomposed
 Zstring getUnicodeNormalForm(const Zstring& str);
-//	"In fact, Unicode declares that there is an equivalence relationship between decomposed and composed sequences, 
-//	and conformant software should not treat canonically equivalent sequences, whether composed or decomposed or something inbetween, as different."
-//																							http://www.win.tue.nl/~aeb/linux/uc/nfc_vs_nfd.html
+//  "In fact, Unicode declares that there is an equivalence relationship between decomposed and composed sequences,
+//  and conformant software should not treat canonically equivalent sequences, whether composed or decomposed or something inbetween, as different."
+//                                                                                          http://www.win.tue.nl/~aeb/linux/uc/nfc_vs_nfd.html
 
 struct LessUnicodeNormal { bool operator()(const Zstring& lhs, const Zstring& rhs) const { return getUnicodeNormalForm(lhs) < getUnicodeNormalForm(rhs);} };
 
diff --git a/zenXml/zenxml/xml.h b/zenXml/zenxml/xml.h
index 15d635bd..27701248 100755
--- a/zenXml/zenxml/xml.h
+++ b/zenXml/zenxml/xml.h
@@ -90,7 +90,7 @@ void saveXml(const XmlDoc& doc, const Zstring& filePath) //throw FileError
 
     try //only update XML file if there are changes
     {
-        if (getFileSize(filePath) == stream.size()) //throw FileError
+        if (getFileDetails(filePath).fileSize == stream.size()) //throw FileError
             if (loadBinContainer<std::string>(filePath, nullptr /*notifyUnbufferedIO*/) == stream) //throw FileError
                 return;
     }